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

Commit 1d051e00 authored by Shradha Shah's avatar Shradha Shah Committed by David S. Miller
Browse files

sfc: Implement ndo_gets_phys_port_id() for EF10 VFs 



Signed-off-by: default avatarShradha Shah <sshah@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0f5c0845

drivers/net/ethernet/sfc/ef10.c

+11 −0
Original line number Diff line number Diff line
@@ -406,6 +406,16 @@ static int efx_ef10_probe(struct efx_nic *efx) 


	efx_ptp_probe(efx, NULL);



#ifdef CONFIG_SFC_SRIOV

	if ((efx->pci_dev->physfn) && (!efx->pci_dev->is_physfn)) {

		struct pci_dev *pci_dev_pf = efx->pci_dev->physfn;

		struct efx_nic *efx_pf = pci_get_drvdata(pci_dev_pf);



		efx_pf->type->get_mac_address(efx_pf, nic_data->port_id);

	} else

#endif

		ether_addr_copy(nic_data->port_id, efx->net_dev->perm_addr);



	return 0;



fail5:
@@ -4140,6 +4150,7 @@ const struct efx_nic_type efx_hunt_a0_vf_nic_type = { 
	.vswitching_probe = efx_ef10_vswitching_probe_vf,

	.vswitching_restore = efx_ef10_vswitching_restore_vf,

	.vswitching_remove = efx_ef10_vswitching_remove_vf,

	.sriov_get_phys_port_id = efx_ef10_sriov_get_phys_port_id,

#endif

	.get_mac_address = efx_ef10_get_mac_address_vf,

	.set_mac_address = efx_ef10_set_mac_address,

drivers/net/ethernet/sfc/ef10_sriov.c

+14 −0
Original line number Diff line number Diff line
@@ -736,3 +736,17 @@ int efx_ef10_sriov_get_vf_config(struct efx_nic *efx, int vf_i, 


	return 0;

}



int efx_ef10_sriov_get_phys_port_id(struct efx_nic *efx,

				    struct netdev_phys_item_id *ppid)

{

	struct efx_ef10_nic_data *nic_data = efx->nic_data;



	if (!is_valid_ether_addr(nic_data->port_id))

		return -EOPNOTSUPP;



	ppid->id_len = ETH_ALEN;

	memcpy(ppid->id, nic_data->port_id, ppid->id_len);



	return 0;

}

drivers/net/ethernet/sfc/ef10_sriov.h

+3 −0
Original line number Diff line number Diff line
@@ -54,6 +54,9 @@ int efx_ef10_sriov_get_vf_config(struct efx_nic *efx, int vf_i, 
int efx_ef10_sriov_set_vf_link_state(struct efx_nic *efx, int vf_i,

				     int link_state);



int efx_ef10_sriov_get_phys_port_id(struct efx_nic *efx,

				    struct netdev_phys_item_id *ppid);



int efx_ef10_vswitching_probe_pf(struct efx_nic *efx);

int efx_ef10_vswitching_probe_vf(struct efx_nic *efx);

int efx_ef10_vswitching_restore_pf(struct efx_nic *efx);

drivers/net/ethernet/sfc/efx.c

+1 −0
Original line number Diff line number Diff line
@@ -2282,6 +2282,7 @@ static const struct net_device_ops efx_netdev_ops = { 
	.ndo_set_vf_spoofchk	= efx_sriov_set_vf_spoofchk,

	.ndo_get_vf_config	= efx_sriov_get_vf_config,

	.ndo_set_vf_link_state  = efx_sriov_set_vf_link_state,

	.ndo_get_phys_port_id   = efx_sriov_get_phys_port_id,

#endif

#ifdef CONFIG_NET_POLL_CONTROLLER

	.ndo_poll_controller = efx_netpoll,

drivers/net/ethernet/sfc/net_driver.h

+2 −0
Original line number Diff line number Diff line
@@ -1350,6 +1350,8 @@ struct efx_nic_type { 
				   struct ifla_vf_info *ivi);

	int (*sriov_set_vf_link_state)(struct efx_nic *efx, int vf_i,

				       int link_state);

	int (*sriov_get_phys_port_id)(struct efx_nic *efx,

				      struct netdev_phys_item_id *ppid);

	int (*vswitching_probe)(struct efx_nic *efx);

	int (*vswitching_restore)(struct efx_nic *efx);

	void (*vswitching_remove)(struct efx_nic *efx);