niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

sfc: Separate efx_nic memory from net_device memory

Browse source 
As we have a lot of common code this applies to all NIC architectures.

Signed-off-by: Jonathan Cooper <jonathan.s.cooper@amd.com>
Co-developed-by: Martin Habets <habetsm.xilinx@gmail.com>
Signed-off-by: Martin Habets <habetsm.xilinx@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jonathan Cooper 2022-06-28 14:59:57 +01:00 • committed by David S. Miller
parent 8cb03f4e08
commit 7e773594da
4 changed files with 46 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/net/ethernet/sfc/ef100.c
View file

@ -423,6 +423,7 @@ static int ef100_pci_find_func_ctrl_window(struct efx_nic *efx,
*/ */
static void ef100_pci_remove(struct pci_dev *pci_dev) static void ef100_pci_remove(struct pci_dev *pci_dev)
{ {
struct efx_probe_data *probe_data;
struct efx_nic *efx; struct efx_nic *efx;
efx = pci_get_drvdata(pci_dev); efx = pci_get_drvdata(pci_dev);
@ -448,6 +449,8 @@ static void ef100_pci_remove(struct pci_dev *pci_dev)
pci_set_drvdata(pci_dev, NULL); pci_set_drvdata(pci_dev, NULL);
efx_fini_struct(efx); efx_fini_struct(efx);
free_netdev(efx->net_dev); free_netdev(efx->net_dev);
probe_data = container_of(efx, struct efx_probe_data, efx);
kfree(probe_data);
pci_disable_pcie_error_reporting(pci_dev); pci_disable_pcie_error_reporting(pci_dev);
}; };
@ -455,16 +458,25 @@ static void ef100_pci_remove(struct pci_dev *pci_dev)
static int ef100_pci_probe(struct pci_dev *pci_dev, static int ef100_pci_probe(struct pci_dev *pci_dev,
const struct pci_device_id *entry) const struct pci_device_id *entry)
{ {
struct efx_probe_data *probe_data, **probe_ptr;
struct ef100_func_ctl_window fcw = { 0 }; struct ef100_func_ctl_window fcw = { 0 };
struct net_device *net_dev; struct net_device *net_dev;
struct efx_nic *efx; struct efx_nic *efx;
int rc; int rc;
/* Allocate and initialise a struct net_device and struct efx_nic */ /* Allocate probe data and struct efx_nic */
net_dev = alloc_etherdev_mq(sizeof(*efx), EFX_MAX_CORE_TX_QUEUES); probe_data = kzalloc(sizeof(*probe_data), GFP_KERNEL);
if (!probe_data)
return -ENOMEM;
probe_data->pci_dev = pci_dev;
efx = &probe_data->efx;
/* Allocate and initialise a struct net_device */
net_dev = alloc_etherdev_mq(sizeof(probe_data), EFX_MAX_CORE_TX_QUEUES);
if (!net_dev) if (!net_dev)
return -ENOMEM; return -ENOMEM;
efx = efx_netdev_priv(net_dev); probe_ptr = netdev_priv(net_dev);
*probe_ptr = probe_data;
efx->type = (const struct efx_nic_type *)entry->driver_data; efx->type = (const struct efx_nic_type *)entry->driver_data;
pci_set_drvdata(pci_dev, efx); pci_set_drvdata(pci_dev, efx);

2
drivers/net/ethernet/sfc/ef100_netdev.c
View file

@ -243,7 +243,7 @@ int ef100_netdev_event(struct notifier_block *this,
struct efx_nic *efx = container_of(this, struct efx_nic, netdev_notifier); struct efx_nic *efx = container_of(this, struct efx_nic, netdev_notifier);
struct net_device *net_dev = netdev_notifier_info_to_dev(ptr); struct net_device *net_dev = netdev_notifier_info_to_dev(ptr);
if (efx_netdev_priv(net_dev) == efx && event == NETDEV_CHANGENAME) if (efx->net_dev == net_dev && event == NETDEV_CHANGENAME)
ef100_update_name(efx); ef100_update_name(efx);
return NOTIFY_DONE; return NOTIFY_DONE;

20
drivers/net/ethernet/sfc/efx.c
View file

@ -861,6 +861,7 @@ static void efx_pci_remove_main(struct efx_nic *efx)
*/ */
static void efx_pci_remove(struct pci_dev *pci_dev) static void efx_pci_remove(struct pci_dev *pci_dev)
{ {
struct efx_probe_data *probe_data;
struct efx_nic *efx; struct efx_nic *efx;
efx = pci_get_drvdata(pci_dev); efx = pci_get_drvdata(pci_dev);
@ -889,6 +890,8 @@ static void efx_pci_remove(struct pci_dev *pci_dev)
efx_fini_struct(efx); efx_fini_struct(efx);
free_netdev(efx->net_dev); free_netdev(efx->net_dev);
probe_data = container_of(efx, struct efx_probe_data, efx);
kfree(probe_data);
pci_disable_pcie_error_reporting(pci_dev); pci_disable_pcie_error_reporting(pci_dev);
}; };
@ -1042,16 +1045,25 @@ static int efx_pci_probe_post_io(struct efx_nic *efx)
static int efx_pci_probe(struct pci_dev *pci_dev, static int efx_pci_probe(struct pci_dev *pci_dev,
const struct pci_device_id *entry) const struct pci_device_id *entry)
{ {
struct efx_probe_data *probe_data, **probe_ptr;
struct net_device *net_dev; struct net_device *net_dev;
struct efx_nic *efx; struct efx_nic *efx;
int rc; int rc;
/* Allocate and initialise a struct net_device and struct efx_nic */ /* Allocate probe data and struct efx_nic */
net_dev = alloc_etherdev_mqs(sizeof(*efx), EFX_MAX_CORE_TX_QUEUES, probe_data = kzalloc(sizeof(*probe_data), GFP_KERNEL);
EFX_MAX_RX_QUEUES); if (!probe_data)
return -ENOMEM;
probe_data->pci_dev = pci_dev;
efx = &probe_data->efx;
/* Allocate and initialise a struct net_device */
net_dev = alloc_etherdev_mq(sizeof(probe_data), EFX_MAX_CORE_TX_QUEUES);
if (!net_dev) if (!net_dev)
return -ENOMEM; return -ENOMEM;
efx = efx_netdev_priv(net_dev); probe_ptr = netdev_priv(net_dev);
*probe_ptr = probe_data;
efx->net_dev = net_dev;
efx->type = (const struct efx_nic_type *) entry->driver_data; efx->type = (const struct efx_nic_type *) entry->driver_data;
efx->fixed_features |= NETIF_F_HIGHDMA; efx->fixed_features |= NETIF_F_HIGHDMA;

15
drivers/net/ethernet/sfc/net_driver.h
View file

@ -1166,9 +1166,22 @@ struct efx_nic {
atomic_t n_rx_noskb_drops; atomic_t n_rx_noskb_drops;
}; };
/**
* struct efx_probe_data - State after hardware probe
* @pci_dev: The PCI device
* @efx: Efx NIC details
*/
struct efx_probe_data {
struct pci_dev *pci_dev;
struct efx_nic efx;
};
static inline struct efx_nic *efx_netdev_priv(struct net_device *dev) static inline struct efx_nic *efx_netdev_priv(struct net_device *dev)
{ {
return netdev_priv(dev); struct efx_probe_data **probe_ptr = netdev_priv(dev);
struct efx_probe_data *probe_data = *probe_ptr;
return &probe_data->efx;
} }
static inline int efx_dev_registered(struct efx_nic *efx) static inline int efx_dev_registered(struct efx_nic *efx)