openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

nfp: update port state in place 

Always updating port state in place by overriding values in exiting
pf->eth_tbl makes things easier to manage and allows us to have a
common helper for both full and per-port refresh.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jakub Kicinski 2017-05-22 10:59:29 -07:00 committed by David S. Miller
parent eb488c26d7
commit 3d4ed1e701
1 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
drivers/net/ethernet/netronome/nfp/nfp_net_main.c
View File

@ -518,6 +518,30 @@ static void nfp_net_pci_remove_finish(struct nfp_pf *pf)
nfp_cpp_area_release_free(pf->data_vnic_bar); nfp_cpp_area_release_free(pf->data_vnic_bar);
} }
static int
nfp_net_eth_port_update(struct nfp_cpp *cpp, struct nfp_port *port,
struct nfp_eth_table *eth_table)
{
struct nfp_eth_table_port *eth_port;
ASSERT_RTNL();
eth_port = nfp_net_find_port(eth_table, port->eth_id);
if (!eth_port) {
nfp_warn(cpp, "Warning: port #%d not present after reconfig\n",
port->eth_id);
return -EIO;
}
if (eth_port->override_changed) {
nfp_warn(cpp, "Port #%d config changed, unregistering. Reboot required before port will be operational again.\n", port->eth_id);
port->type = NFP_PORT_INVALID;
}
memcpy(port->eth_port, eth_port, sizeof(*eth_port));
return 0;
}
static void nfp_net_refresh_vnics(struct work_struct *work) static void nfp_net_refresh_vnics(struct work_struct *work)
{ {
struct nfp_pf *pf = container_of(work, struct nfp_pf, struct nfp_pf *pf = container_of(work, struct nfp_pf,
@ -544,23 +568,12 @@ static void nfp_net_refresh_vnics(struct work_struct *work)
list_for_each_entry(nn, &pf->vnics, vnic_list) { list_for_each_entry(nn, &pf->vnics, vnic_list) {
if (!__nfp_port_get_eth_port(nn->port)) if (!__nfp_port_get_eth_port(nn->port))
continue; continue;
nn->port->eth_port = nfp_net_find_port(eth_table,
nn->port->eth_id); nfp_net_eth_port_update(pf->cpp, nn->port, eth_table);
if (!nn->port->eth_port) {
nfp_warn(pf->cpp, "Warning: port #%d not present after reconfig\n",
nn->port->eth_id);
continue;
}
if (nn->port->eth_port->override_changed) {
nfp_warn(pf->cpp, "Port config changed, unregistering. Reboot required before port will be operational again.\n");
nn->port->type = NFP_PORT_INVALID;
continue;
}
} }
rtnl_unlock(); rtnl_unlock();
kfree(pf->eth_tbl); kfree(eth_table);
pf->eth_tbl = eth_table;
list_for_each_entry_safe(nn, next, &pf->vnics, vnic_list) { list_for_each_entry_safe(nn, next, &pf->vnics, vnic_list) {
if (!nn->port || nn->port->type != NFP_PORT_INVALID) if (!nn->port || nn->port->type != NFP_PORT_INVALID)
@ -588,8 +601,8 @@ void nfp_net_refresh_port_table(struct nfp_port *port)
int nfp_net_refresh_eth_port(struct nfp_port *port) int nfp_net_refresh_eth_port(struct nfp_port *port)
{ {
struct nfp_cpp *cpp = port->app->cpp; struct nfp_cpp *cpp = port->app->cpp;
struct nfp_eth_table_port *eth_port;
struct nfp_eth_table *eth_table; struct nfp_eth_table *eth_table;
int ret;
eth_table = nfp_eth_read_ports(cpp); eth_table = nfp_eth_read_ports(cpp);
if (!eth_table) { if (!eth_table) {
@ -597,18 +610,11 @@ int nfp_net_refresh_eth_port(struct nfp_port *port)
return -EIO; return -EIO;
} }
eth_port = nfp_net_find_port(eth_table, port->eth_id); ret = nfp_net_eth_port_update(cpp, port, eth_table);
if (!eth_port) {
nfp_err(cpp, "Error finding state of the port!\n");
kfree(eth_table);
return -EIO;
}
memcpy(port->eth_port, eth_port, sizeof(*eth_port));
kfree(eth_table); kfree(eth_table);
return 0; return ret;
} }
/* /*