UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

nfp: dump all hwinfo 

- Dump hwinfo as separate TLV chunk, in a packed format containing
  zero-separated key and value strings.
- This provides additional debug context, if requested by the dumpspec.

Signed-off-by: Carl Heymann <carl.heymann@netronome.com>
Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Carl Heymann 2017-12-04 23:34:17 +01:00 committed by David S. Miller
parent e1e798e3fd
commit 24ff8455af
3 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/net/ethernet/netronome/nfp/nfp_net_debugdump.c
View File

@ -44,6 +44,7 @@
enum nfp_dumpspec_type {
NFP_DUMPSPEC_TYPE_RTSYM = 4,
NFP_DUMPSPEC_TYPE_HWINFO = 5,
NFP_DUMPSPEC_TYPE_PROLOG = 10000,
NFP_DUMPSPEC_TYPE_ERROR = 10001,
};
@ -222,11 +223,16 @@ static int
nfp_add_tlv_size(struct nfp_pf *pf, struct nfp_dump_tl *tl, void *param)
{
u32 *size = param;
u32 hwinfo_size;
switch (be32_to_cpu(tl->type)) {
case NFP_DUMPSPEC_TYPE_RTSYM:
*size += nfp_calc_rtsym_dump_sz(pf, tl);
break;
case NFP_DUMPSPEC_TYPE_HWINFO:
hwinfo_size = nfp_hwinfo_get_packed_str_size(pf->hwinfo);
*size += sizeof(struct nfp_dump_tl) + ALIGN8(hwinfo_size);
break;
default:
*size += nfp_dump_error_tlv_size(tl);
break;
@ -306,6 +312,28 @@ nfp_dump_error_tlv(struct nfp_dump_tl *spec, int error,
return 0;
}
static int
nfp_dump_hwinfo(struct nfp_pf *pf, struct nfp_dump_tl *spec,
struct nfp_dump_state *dump)
{
struct nfp_dump_tl *dump_header = dump->p;
u32 hwinfo_size, total_size;
char *hwinfo;
int err;
hwinfo = nfp_hwinfo_get_packed_strings(pf->hwinfo);
hwinfo_size = nfp_hwinfo_get_packed_str_size(pf->hwinfo);
total_size = sizeof(*dump_header) + ALIGN8(hwinfo_size);
err = nfp_add_tlv(NFP_DUMPSPEC_TYPE_HWINFO, total_size, dump);
if (err)
return err;
memcpy(dump_header->data, hwinfo, hwinfo_size);
return 0;
}
static int
nfp_dump_single_rtsym(struct nfp_pf *pf, struct nfp_dumpspec_rtsym *spec,
struct nfp_dump_state *dump)
@ -377,6 +405,11 @@ nfp_dump_for_tlv(struct nfp_pf *pf, struct nfp_dump_tl *tl, void *param)
if (err)
return err;
break;
case NFP_DUMPSPEC_TYPE_HWINFO:
err = nfp_dump_hwinfo(pf, tl, dump);
if (err)
return err;
break;
default:
err = nfp_dump_error_tlv(tl, -EOPNOTSUPP, dump);
if (err)

2
drivers/net/ethernet/netronome/nfp/nfpcore/nfp.h
View File

@ -49,6 +49,8 @@
struct nfp_hwinfo;
struct nfp_hwinfo *nfp_hwinfo_read(struct nfp_cpp *cpp);
const char *nfp_hwinfo_lookup(struct nfp_hwinfo *hwinfo, const char *lookup);
char *nfp_hwinfo_get_packed_strings(struct nfp_hwinfo *hwinfo);
u32 nfp_hwinfo_get_packed_str_size(struct nfp_hwinfo *hwinfo);
/* Implemented in nfp_nsp.c, low level functions */

10
drivers/net/ethernet/netronome/nfp/nfpcore/nfp_hwinfo.c
View File

@ -302,3 +302,13 @@ const char *nfp_hwinfo_lookup(struct nfp_hwinfo *hwinfo, const char *lookup)
return NULL;
}
char *nfp_hwinfo_get_packed_strings(struct nfp_hwinfo *hwinfo)
{
return hwinfo->data;
}
u32 nfp_hwinfo_get_packed_str_size(struct nfp_hwinfo *hwinfo)
{
return le32_to_cpu(hwinfo->size) - sizeof(u32);
}