Commit 045203e9 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'nfp-enhanced-debug-dump-via-ethtool' 



Simon Horman says:

====================
nfp: enhanced debug dump via ethtool

Add debug dump implementation to the NFP driver. This makes use of
existing ethtool infrastructure.  ethtool -W is used to select the dump
level and ethtool -w is used to dump NFP state.

The existing behaviour of dump level 0, dumping the arm.diag resource, is
preserved. Dump levels greater than 0 are implemented by this patchset and
optionally supported by firmware providing a _abi_dump_spec rtsym. This
rtsym provides a specification, in TLV format, of the information to be
dumped from the NFP at each supported dump level.

Dumps are also structured using a TLVs. They consist a prolog and the data
described int he corresponding dump.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents efbf7897 60b84a9b

drivers/net/ethernet/netronome/nfp/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ nfp-objs := \ 
	    nfp_hwmon.o \

	    nfp_hwmon.o \

	    nfp_main.o \

	    nfp_main.o \

	    nfp_net_common.o \

	    nfp_net_common.o \

	    nfp_net_debugdump.o \

	    nfp_net_ethtool.o \

	    nfp_net_ethtool.o \

	    nfp_net_main.o \

	    nfp_net_main.o \

	    nfp_net_repr.o \

	    nfp_net_repr.o \

drivers/net/ethernet/netronome/nfp/nfp_asm.h

+10 −0
Original line number Original line Diff line number Diff line
@@ -262,6 +262,7 @@ enum lcsr_wr_src { 
#define OP_CARB_BASE		0x0e000000000ULL

#define OP_CARB_BASE		0x0e000000000ULL

#define OP_CARB_OR		0x00000010000ULL

#define OP_CARB_OR		0x00000010000ULL





#define NFP_CSR_CTX_PTR		0x20

#define NFP_CSR_ACT_LM_ADDR0	0x64

#define NFP_CSR_ACT_LM_ADDR0	0x64

#define NFP_CSR_ACT_LM_ADDR1	0x6c

#define NFP_CSR_ACT_LM_ADDR1	0x6c

#define NFP_CSR_ACT_LM_ADDR2	0x94

#define NFP_CSR_ACT_LM_ADDR2	0x94
@@ -382,4 +383,13 @@ int swreg_to_restricted(swreg dst, swreg lreg, swreg rreg, 
int nfp_ustore_check_valid_no_ecc(u64 insn);

int nfp_ustore_check_valid_no_ecc(u64 insn);

u64 nfp_ustore_calc_ecc_insn(u64 insn);

u64 nfp_ustore_calc_ecc_insn(u64 insn);





#define NFP_IND_ME_REFL_WR_SIG_INIT	3

#define NFP_IND_ME_CTX_PTR_BASE_MASK	GENMASK(9, 0)

#define NFP_IND_NUM_CONTEXTS		8



static inline u32 nfp_get_ind_csr_ctx_ptr_offs(u32 read_offset)

{

	return (read_offset & ~NFP_IND_ME_CTX_PTR_BASE_MASK) | NFP_CSR_CTX_PTR;

}



#endif
 
#endif

drivers/net/ethernet/netronome/nfp/nfp_main.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -45,6 +45,7 @@ 
#include <linux/pci.h>

#include <linux/pci.h>

#include <linux/firmware.h>

#include <linux/firmware.h>

#include <linux/vermagic.h>

#include <linux/vermagic.h>

#include <linux/vmalloc.h>

#include <net/devlink.h>

#include <net/devlink.h>





#include "nfpcore/nfp.h"

#include "nfpcore/nfp.h"
@@ -509,6 +510,9 @@ static int nfp_pci_probe(struct pci_dev *pdev, 
	pf->mip = nfp_mip_open(pf->cpp);

	pf->mip = nfp_mip_open(pf->cpp);

	pf->rtbl = __nfp_rtsym_table_read(pf->cpp, pf->mip);

	pf->rtbl = __nfp_rtsym_table_read(pf->cpp, pf->mip);





	pf->dump_flag = NFP_DUMP_NSP_DIAG;

	pf->dumpspec = nfp_net_dump_load_dumpspec(pf->cpp, pf->rtbl);



	err = nfp_pcie_sriov_read_nfd_limit(pf);

	err = nfp_pcie_sriov_read_nfd_limit(pf);

	if (err)

	if (err)

		goto err_fw_unload;

		goto err_fw_unload;
@@ -544,6 +548,7 @@ err_fw_unload: 
		nfp_fw_unload(pf);

		nfp_fw_unload(pf);

	kfree(pf->eth_tbl);

	kfree(pf->eth_tbl);

	kfree(pf->nspi);

	kfree(pf->nspi);

	vfree(pf->dumpspec);

err_devlink_unreg:

err_devlink_unreg:

	devlink_unregister(devlink);

	devlink_unregister(devlink);

err_hwinfo_free:

err_hwinfo_free:
@@ -579,6 +584,7 @@ static void nfp_pci_remove(struct pci_dev *pdev) 




	devlink_unregister(devlink);

	devlink_unregister(devlink);





	vfree(pf->dumpspec);

	kfree(pf->rtbl);

	kfree(pf->rtbl);

	nfp_mip_close(pf->mip);

	nfp_mip_close(pf->mip);

	if (pf->fw_loaded)

	if (pf->fw_loaded)

drivers/net/ethernet/netronome/nfp/nfp_main.h

+29 −0
Original line number Original line Diff line number Diff line
@@ -39,6 +39,7 @@ 
#ifndef NFP_MAIN_H

#ifndef NFP_MAIN_H

#define NFP_MAIN_H

#define NFP_MAIN_H





#include <linux/ethtool.h>

#include <linux/list.h>

#include <linux/list.h>

#include <linux/types.h>

#include <linux/types.h>

#include <linux/msi.h>

#include <linux/msi.h>
@@ -61,6 +62,17 @@ struct nfp_nsp_identify; 
struct nfp_port;

struct nfp_port;

struct nfp_rtsym_table;

struct nfp_rtsym_table;





/**

 * struct nfp_dumpspec - NFP FW dump specification structure

 * @size:	Size of the data

 * @data:	Sequence of TLVs, each being an instruction to dump some data

 *		from FW

 */

struct nfp_dumpspec {

	u32 size;

	u8 data[0];

};



/**

/**

 * struct nfp_pf - NFP PF-specific device structure

 * struct nfp_pf - NFP PF-specific device structure

 * @pdev:		Backpointer to PCI device

 * @pdev:		Backpointer to PCI device
@@ -83,6 +95,9 @@ struct nfp_rtsym_table; 
 * @mip:		MIP handle

 * @mip:		MIP handle

 * @rtbl:		RTsym table

 * @rtbl:		RTsym table

 * @hwinfo:		HWInfo table

 * @hwinfo:		HWInfo table

 * @dumpspec:		Debug dump specification

 * @dump_flag:		Store dump flag between set_dump and get_dump_flag

 * @dump_len:		Store dump length between set_dump and get_dump_flag

 * @eth_tbl:		NSP ETH table

 * @eth_tbl:		NSP ETH table

 * @nspi:		NSP identification info

 * @nspi:		NSP identification info

 * @hwmon_dev:		pointer to hwmon device

 * @hwmon_dev:		pointer to hwmon device
@@ -124,6 +139,9 @@ struct nfp_pf { 
	const struct nfp_mip *mip;

	const struct nfp_mip *mip;

	struct nfp_rtsym_table *rtbl;

	struct nfp_rtsym_table *rtbl;

	struct nfp_hwinfo *hwinfo;

	struct nfp_hwinfo *hwinfo;

	struct nfp_dumpspec *dumpspec;

	u32 dump_flag;

	u32 dump_len;

	struct nfp_eth_table *eth_tbl;

	struct nfp_eth_table *eth_tbl;

	struct nfp_nsp_identify *nspi;

	struct nfp_nsp_identify *nspi;
@@ -157,4 +175,15 @@ void nfp_net_get_mac_addr(struct nfp_pf *pf, struct nfp_port *port); 




bool nfp_ctrl_tx(struct nfp_net *nn, struct sk_buff *skb);

bool nfp_ctrl_tx(struct nfp_net *nn, struct sk_buff *skb);





enum nfp_dump_diag {

	NFP_DUMP_NSP_DIAG = 0,

};



struct nfp_dumpspec *

nfp_net_dump_load_dumpspec(struct nfp_cpp *cpp, struct nfp_rtsym_table *rtbl);

s64 nfp_net_dump_calculate_size(struct nfp_pf *pf, struct nfp_dumpspec *spec,

				u32 flag);

int nfp_net_dump_populate_buffer(struct nfp_pf *pf, struct nfp_dumpspec *spec,

				 struct ethtool_dump *dump_param, void *dest);



#endif /* NFP_MAIN_H */
 
#endif /* NFP_MAIN_H */

drivers/net/ethernet/netronome/nfp/nfp_net_debugdump.c

0 → 100644
+787 −0

File added.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE