leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nfp: only clean sp_indiff when application firmware is unloaded

Browse Source 
Currently `sp_indiff` is cleaned when driver is removed. This will
cause problem in multi-PF/multi-host case, considering one PF is
removed while another is still in use.

Since `sp_indiff` is the application firmware property, it should
only be cleaned when the firmware is unloaded. Now let management
firmware to clean it when necessary, driver only set it.

Fixes: b1e4f11e42 ("nfp: refine the ABI of getting `sp_indiff` info")
Signed-off-by: Yinjun Zhang <yinjun.zhang@corigine.com>
Signed-off-by: Simon Horman <simon.horman@corigine.com>
Link: https://lore.kernel.org/r/20221020081411.80186-1-simon.horman@corigine.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Yinjun Zhang 2022-10-20 09:14:11 +01:00 committed by Jakub Kicinski
parent 0a09f01f11
commit 0bda03623e
1 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/net/ethernet/netronome/nfp/nfp_main.c
View File

@ -716,16 +716,26 @@ static u64 nfp_net_pf_get_app_cap(struct nfp_pf *pf)
return val; return val;
} }
static int nfp_pf_cfg_hwinfo(struct nfp_pf *pf, bool sp_indiff) static void nfp_pf_cfg_hwinfo(struct nfp_pf *pf)
{ {
struct nfp_nsp *nsp; struct nfp_nsp *nsp;
char hwinfo[32]; char hwinfo[32];
bool sp_indiff;
int err; int err;
nsp = nfp_nsp_open(pf->cpp); nsp = nfp_nsp_open(pf->cpp);
if (IS_ERR(nsp)) if (IS_ERR(nsp))
return PTR_ERR(nsp); return;
if (!nfp_nsp_has_hwinfo_set(nsp))
goto end;
sp_indiff = (nfp_net_pf_get_app_id(pf) == NFP_APP_FLOWER_NIC) ||
(nfp_net_pf_get_app_cap(pf) & NFP_NET_APP_CAP_SP_INDIFF);
/* No need to clean `sp_indiff` in driver, management firmware
* will do it when application firmware is unloaded.
*/
snprintf(hwinfo, sizeof(hwinfo), "sp_indiff=%d", sp_indiff); snprintf(hwinfo, sizeof(hwinfo), "sp_indiff=%d", sp_indiff);
err = nfp_nsp_hwinfo_set(nsp, hwinfo, sizeof(hwinfo)); err = nfp_nsp_hwinfo_set(nsp, hwinfo, sizeof(hwinfo));
/* Not a fatal error, no need to return error to stop driver from loading */ /* Not a fatal error, no need to return error to stop driver from loading */
@ -739,21 +749,8 @@ static int nfp_pf_cfg_hwinfo(struct nfp_pf *pf, bool sp_indiff)
pf->eth_tbl = __nfp_eth_read_ports(pf->cpp, nsp); pf->eth_tbl = __nfp_eth_read_ports(pf->cpp, nsp);
} }
end:
nfp_nsp_close(nsp); nfp_nsp_close(nsp);
return 0;
}
static int nfp_pf_nsp_cfg(struct nfp_pf *pf)
{
bool sp_indiff = (nfp_net_pf_get_app_id(pf) == NFP_APP_FLOWER_NIC) ||
(nfp_net_pf_get_app_cap(pf) & NFP_NET_APP_CAP_SP_INDIFF);
return nfp_pf_cfg_hwinfo(pf, sp_indiff);
}
static void nfp_pf_nsp_clean(struct nfp_pf *pf)
{
nfp_pf_cfg_hwinfo(pf, false);
} }
static int nfp_pci_probe(struct pci_dev *pdev, static int nfp_pci_probe(struct pci_dev *pdev,
@ -856,13 +853,11 @@ static int nfp_pci_probe(struct pci_dev *pdev,
goto err_fw_unload; goto err_fw_unload;
} }
err = nfp_pf_nsp_cfg(pf); nfp_pf_cfg_hwinfo(pf);
if (err)
goto err_fw_unload;
err = nfp_net_pci_probe(pf); err = nfp_net_pci_probe(pf);
if (err) if (err)
goto err_nsp_clean; goto err_fw_unload;
err = nfp_hwmon_register(pf); err = nfp_hwmon_register(pf);
if (err) { if (err) {
@ -874,8 +869,6 @@ static int nfp_pci_probe(struct pci_dev *pdev,
err_net_remove: err_net_remove:
nfp_net_pci_remove(pf); nfp_net_pci_remove(pf);
err_nsp_clean:
nfp_pf_nsp_clean(pf);
err_fw_unload: err_fw_unload:
kfree(pf->rtbl); kfree(pf->rtbl);
nfp_mip_close(pf->mip); nfp_mip_close(pf->mip);
@ -915,7 +908,6 @@ static void __nfp_pci_shutdown(struct pci_dev *pdev, bool unload_fw)
nfp_net_pci_remove(pf); nfp_net_pci_remove(pf);
nfp_pf_nsp_clean(pf);
vfree(pf->dumpspec); vfree(pf->dumpspec);
kfree(pf->rtbl); kfree(pf->rtbl);
nfp_mip_close(pf->mip); nfp_mip_close(pf->mip);