net/sfc/base: export the zero-based MCDI port number

Proxy authorization module for SR-IOV requires one instance of proxy
data structures per card. In order to achieve this, proxy data
structures will be allocated only for primary port (port id 0) and other
secondary ports in the card will access those data structures through
reference to primary port. Accordingly, the port number obtained from
efx_mcdi_get_port_assignment is stored in NIC configuration as
enc_mcdi_port.

Signed-off-by: Gautam Dawar <gdawar@solarflare.com>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>

diff --git a/drivers/net/sfc/base/ef10_nic.c b/drivers/net/sfc/base/ef10_nic.c
index 4c90e10a8b5fcd5ff4a67f985397b62c00c834c0..8ee80479aa998bbabb1fb20429f7fd38850625c1 100644 (file)
--- a/drivers/net/sfc/base/ef10_nic.c
+++ b/drivers/net/sfc/base/ef10_nic.c
@@ -1840,6 +1840,8 @@ ef10_nic_board_cfg(
        /* EFX MCDI interface uses one-based port numbers */
        emip->emi_port = port + 1;
 
+       encp->enc_assigned_port = port;
+
        if ((rc = ef10_external_port_mapping(enp, port,
                    &encp->enc_external_port)) != 0)
                goto fail2;

diff --git a/drivers/net/sfc/base/efx.h b/drivers/net/sfc/base/efx.h
index 6b6538cae62d6c5050085d67eeedeca4dedfbb4d..40308ff58df49315d6f32b785e4317e5f296ab7a 100644 (file)
--- a/drivers/net/sfc/base/efx.h
+++ b/drivers/net/sfc/base/efx.h
@@ -1407,6 +1407,8 @@ typedef struct efx_nic_cfg_s {
        boolean_t               enc_filter_action_flag_supported;
        boolean_t               enc_filter_action_mark_supported;
        uint32_t                enc_filter_action_mark_max;
+       /* Port assigned to this PCI function */
+       uint32_t                enc_assigned_port;
 } efx_nic_cfg_t;
 
 #define        EFX_PCI_FUNCTION_IS_PF(_encp)   ((_encp)->enc_vf == 0xffff)