sfc: Implement ndo_gets_phys_port_id() for EF10 VFs

Signed-off-by: Shradha Shah <sshah@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/sfc/ef10.c b/drivers/net/ethernet/sfc/ef10.c
index e659da818c6c849c2097493279795bdf671499f1..22c5dc3ba43ba237579fd011309218ae888233d9 100644 (file)
--- a/drivers/net/ethernet/sfc/ef10.c
+++ b/drivers/net/ethernet/sfc/ef10.c
@@ -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,

diff --git a/drivers/net/ethernet/sfc/ef10_sriov.c b/drivers/net/ethernet/sfc/ef10_sriov.c
index 3969b1bf7ef3ba633e2e3237dab95a5b2888ed61..cd524543c363aef959e1e383104ced52fb012f0a 100644 (file)
--- a/drivers/net/ethernet/sfc/ef10_sriov.c
+++ b/drivers/net/ethernet/sfc/ef10_sriov.c
@@ -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;
+}

diff --git a/drivers/net/ethernet/sfc/ef10_sriov.h b/drivers/net/ethernet/sfc/ef10_sriov.h
index b98557670f730580870529359e9891b72365fbab..ffc92a504c3f36a32ef582fca3edcedea9e522b2 100644 (file)
--- a/drivers/net/ethernet/sfc/ef10_sriov.h
+++ b/drivers/net/ethernet/sfc/ef10_sriov.h
@@ -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);

diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
index 2d4853c032c396b834c682757f60f111d8656942..de16cec7ec61d770db4c101213b9a87a301ed28b 100644 (file)
--- a/drivers/net/ethernet/sfc/efx.c
+++ b/drivers/net/ethernet/sfc/efx.c
@@ -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,

diff --git a/drivers/net/ethernet/sfc/net_driver.h b/drivers/net/ethernet/sfc/net_driver.h
index a468a22e7a8862ad681f9853e90939b09628da04..d72f522bf9c3b2c0d9df322a7798ec1be6a1aba8 100644 (file)
--- a/drivers/net/ethernet/sfc/net_driver.h
+++ b/drivers/net/ethernet/sfc/net_driver.h
@@ -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);

diff --git a/drivers/net/ethernet/sfc/nic.h b/drivers/net/ethernet/sfc/nic.h
index db8562ec586d66a1c3f6e6e0d42c7e8b97f7a31f..e146e30780a1eb90aa4a1a32743faa68d0c9b5c3 100644 (file)
--- a/drivers/net/ethernet/sfc/nic.h
+++ b/drivers/net/ethernet/sfc/nic.h
@@ -524,6 +524,7 @@ struct efx_ef10_nic_data {
        unsigned int vport_id;
        bool must_probe_vswitching;
        unsigned int pf_index;
+       u8 port_id[ETH_ALEN];
 #ifdef CONFIG_SFC_SRIOV
        unsigned int vf_index;
        struct ef10_vf *vf;

diff --git a/drivers/net/ethernet/sfc/sriov.c b/drivers/net/ethernet/sfc/sriov.c
index 6c5edbdbfa27edaa29a0d7d0b281447387d56c66..816c44689e6763f879c29b7650051a20efca8c8d 100644 (file)
--- a/drivers/net/ethernet/sfc/sriov.c
+++ b/drivers/net/ethernet/sfc/sriov.c
@@ -70,3 +70,14 @@ int efx_sriov_set_vf_link_state(struct net_device *net_dev, int vf_i,
        else
                return -EOPNOTSUPP;
 }
+
+int efx_sriov_get_phys_port_id(struct net_device *net_dev,
+                              struct netdev_phys_item_id *ppid)
+{
+       struct efx_nic *efx = netdev_priv(net_dev);
+
+       if (efx->type->sriov_get_phys_port_id)
+               return efx->type->sriov_get_phys_port_id(efx, ppid);
+       else
+               return -EOPNOTSUPP;
+}

diff --git a/drivers/net/ethernet/sfc/sriov.h b/drivers/net/ethernet/sfc/sriov.h
index 3be15a54c562d7eb176fb7657bd976a4634cf59a..400df526586dde3883e28702364dcbc4ab023c57 100644 (file)
--- a/drivers/net/ethernet/sfc/sriov.h
+++ b/drivers/net/ethernet/sfc/sriov.h
@@ -23,6 +23,8 @@ int efx_sriov_get_vf_config(struct net_device *net_dev, int vf_i,
                            struct ifla_vf_info *ivi);
 int efx_sriov_set_vf_link_state(struct net_device *net_dev, int vf_i,
                                int link_state);
+int efx_sriov_get_phys_port_id(struct net_device *net_dev,
+                              struct netdev_phys_item_id *ppid);
 
 #endif /* CONFIG_SFC_SRIOV */