Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9baa4885 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

nfp: remove automatic caching of HWInfo 



Make callers take care of managing life time of HWInfo.

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent af4fa7ea

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

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ int nfp_app_nic_vnic_init(struct nfp_app *app, struct nfp_net *nn, 
	if (err)

		return err < 0 ? err : 0;



	nfp_net_get_mac_addr(nn, app->cpp, id);

	nfp_net_get_mac_addr(app->pf, nn, id);



	return 0;

}

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

+12 −8
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ nfp_net_fw_find(struct pci_dev *pdev, struct nfp_pf *pf) 
		return NULL;

	}



	fw_model = nfp_hwinfo_lookup(pf->cpp, "assembly.partno");

	fw_model = nfp_hwinfo_lookup(pf->hwinfo, "assembly.partno");

	if (!fw_model) {

		dev_err(&pdev->dev, "Error: can't read part number\n");

		return NULL;
@@ -358,16 +358,18 @@ static int nfp_pci_probe(struct pci_dev *pdev, 
		goto err_disable_msix;

	}



	pf->hwinfo = nfp_hwinfo_read(pf->cpp);



	dev_info(&pdev->dev, "Assembly: %s%s%s-%s CPLD: %s\n",

		 nfp_hwinfo_lookup(pf->cpp, "assembly.vendor"),

		 nfp_hwinfo_lookup(pf->cpp, "assembly.partno"),

		 nfp_hwinfo_lookup(pf->cpp, "assembly.serial"),

		 nfp_hwinfo_lookup(pf->cpp, "assembly.revision"),

		 nfp_hwinfo_lookup(pf->cpp, "cpld.version"));

		 nfp_hwinfo_lookup(pf->hwinfo, "assembly.vendor"),

		 nfp_hwinfo_lookup(pf->hwinfo, "assembly.partno"),

		 nfp_hwinfo_lookup(pf->hwinfo, "assembly.serial"),

		 nfp_hwinfo_lookup(pf->hwinfo, "assembly.revision"),

		 nfp_hwinfo_lookup(pf->hwinfo, "cpld.version"));



	err = devlink_register(devlink, &pdev->dev);

	if (err)

		goto err_cpp_free;

		goto err_hwinfo_free;



	err = nfp_nsp_init(pdev, pf);

	if (err)
@@ -403,7 +405,8 @@ static int nfp_pci_probe(struct pci_dev *pdev, 
	kfree(pf->nspi);

err_devlink_unreg:

	devlink_unregister(devlink);

err_cpp_free:

err_hwinfo_free:

	kfree(pf->hwinfo);

	nfp_cpp_free(pf->cpp);

err_disable_msix:

	pci_set_drvdata(pdev, NULL);
@@ -438,6 +441,7 @@ static void nfp_pci_remove(struct pci_dev *pdev) 
		nfp_fw_unload(pf);



	pci_set_drvdata(pdev, NULL);

	kfree(pf->hwinfo);

	nfp_cpp_free(pf->cpp);



	kfree(pf->eth_tbl);

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

+4 −1
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ struct pci_dev; 
struct nfp_cpp;

struct nfp_cpp_area;

struct nfp_eth_table;

struct nfp_hwinfo;

struct nfp_net;

struct nfp_nsp_identify;

struct nfp_rtsym_table;
@@ -72,6 +73,7 @@ struct nfp_rtsym_table; 
 * @fw_loaded:		Is the firmware loaded?

 * @ctrl_vnic:		Pointer to the control vNIC if available

 * @rtbl:		RTsym table

 * @hwinfo:		HWInfo table

 * @eth_tbl:		NSP ETH table

 * @nspi:		NSP identification info

 * @hwmon_dev:		pointer to hwmon device
@@ -104,6 +106,7 @@ struct nfp_pf { 
	struct nfp_net *ctrl_vnic;



	struct nfp_rtsym_table *rtbl;

	struct nfp_hwinfo *hwinfo;

	struct nfp_eth_table *eth_tbl;

	struct nfp_nsp_identify *nspi;
@@ -133,7 +136,7 @@ void nfp_hwmon_unregister(struct nfp_pf *pf); 
struct nfp_eth_table_port *

nfp_net_find_port(struct nfp_eth_table *eth_tbl, unsigned int id);

void

nfp_net_get_mac_addr(struct nfp_net *nn, struct nfp_cpp *cpp, unsigned int id);

nfp_net_get_mac_addr(struct nfp_pf *pf, struct nfp_net *nn, unsigned int id);



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

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

+6 −6
Original line number Diff line number Diff line
@@ -63,13 +63,13 @@ 


#define NFP_PF_CSR_SLICE_SIZE	(32 * 1024)



static int nfp_is_ready(struct nfp_cpp *cpp)

static int nfp_is_ready(struct nfp_pf *pf)

{

	const char *cp;

	long state;

	int err;



	cp = nfp_hwinfo_lookup(cpp, "board.state");

	cp = nfp_hwinfo_lookup(pf->hwinfo, "board.state");

	if (!cp)

		return 0;
@@ -134,15 +134,15 @@ static u8 __iomem *nfp_net_map_area(struct nfp_cpp *cpp, 


/**

 * nfp_net_get_mac_addr() - Get the MAC address.

 * @pf:       NFP PF handle

 * @nn:       NFP Network structure

 * @cpp:      NFP CPP handle

 * @id:	      NFP port id

 *

 * First try to get the MAC address from NSP ETH table. If that

 * fails try HWInfo.  As a last resort generate a random address.

 */

void

nfp_net_get_mac_addr(struct nfp_net *nn, struct nfp_cpp *cpp, unsigned int id)

nfp_net_get_mac_addr(struct nfp_pf *pf, struct nfp_net *nn, unsigned int id)

{

	struct nfp_eth_table_port *eth_port;

	struct nfp_net_dp *dp = &nn->dp;
@@ -159,7 +159,7 @@ nfp_net_get_mac_addr(struct nfp_net *nn, struct nfp_cpp *cpp, unsigned int id) 


	snprintf(name, sizeof(name), "eth%d.mac", id);



	mac_str = nfp_hwinfo_lookup(cpp, name);

	mac_str = nfp_hwinfo_lookup(pf->hwinfo, name);

	if (!mac_str) {

		dev_warn(dp->dev, "Can't lookup MAC address. Generate\n");

		eth_hw_addr_random(dp->netdev);
@@ -713,7 +713,7 @@ int nfp_net_pci_probe(struct nfp_pf *pf) 
	INIT_WORK(&pf->port_refresh_work, nfp_net_refresh_vnics);



	/* Verify that the board has completed initialization */

	if (!nfp_is_ready(pf->cpp)) {

	if (!nfp_is_ready(pf)) {

		nfp_err(pf->cpp, "NFP is not ready for NIC operation.\n");

		return -EINVAL;

	}

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

+3 −1
Original line number Diff line number Diff line
@@ -46,7 +46,9 @@ 


/* Implemented in nfp_hwinfo.c */



const char *nfp_hwinfo_lookup(struct nfp_cpp *cpp, const char *lookup);

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);



/* Implemented in nfp_nsp.c, low level functions */