sfc: make mem_bar a function rather than a constant

Support using BAR 0 on SFC9250, even though the driver doesn't bind to such
 devices yet.

Signed-off-by: Edward Cree <ecree@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 e566dbb3343d7cfbd4b244fbb534c09deb3a74f4..5cc786aec7c452adcf6f2d4ea629a992f7443bb6 100644 (file)
--- a/drivers/net/ethernet/sfc/ef10.c
+++ b/drivers/net/ethernet/sfc/ef10.c
@@ -160,11 +160,31 @@ static int efx_ef10_get_warm_boot_count(struct efx_nic *efx)
                EFX_DWORD_FIELD(reg, EFX_WORD_0) : -EIO;
 }
 
+/* On all EF10s up to and including SFC9220 (Medford1), all PFs use BAR 0 for
+ * I/O space and BAR 2(&3) for memory.  On SFC9250 (Medford2), there is no I/O
+ * bar; PFs use BAR 0/1 for memory.
+ */
+static unsigned int efx_ef10_pf_mem_bar(struct efx_nic *efx)
+{
+       switch (efx->pci_dev->device) {
+       case 0x0b03: /* SFC9250 PF */
+               return 0;
+       default:
+               return 2;
+       }
+}
+
+/* All VFs use BAR 0/1 for memory */
+static unsigned int efx_ef10_vf_mem_bar(struct efx_nic *efx)
+{
+       return 0;
+}
+
 static unsigned int efx_ef10_mem_map_size(struct efx_nic *efx)
 {
        int bar;
 
-       bar = efx->type->mem_bar;
+       bar = efx->type->mem_bar(efx);
        return resource_size(&efx->pci_dev->resource[bar]);
 }
 
@@ -6392,7 +6412,7 @@ out_unlock:
 
 const struct efx_nic_type efx_hunt_a0_vf_nic_type = {
        .is_vf = true,
-       .mem_bar = EFX_MEM_VF_BAR,
+       .mem_bar = efx_ef10_vf_mem_bar,
        .mem_map_size = efx_ef10_mem_map_size,
        .probe = efx_ef10_probe_vf,
        .remove = efx_ef10_remove,
@@ -6500,7 +6520,7 @@ const struct efx_nic_type efx_hunt_a0_vf_nic_type = {
 
 const struct efx_nic_type efx_hunt_a0_nic_type = {
        .is_vf = false,
-       .mem_bar = EFX_MEM_BAR,
+       .mem_bar = efx_ef10_pf_mem_bar,
        .mem_map_size = efx_ef10_mem_map_size,
        .probe = efx_ef10_probe_pf,
        .remove = efx_ef10_remove,

diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
index e3c492fcaff07d9c6b3c5211609c3bd0bde0eac4..bbe4ace7dd9d35eaa71c2ac822216bc35bdc561b 100644 (file)
--- a/drivers/net/ethernet/sfc/efx.c
+++ b/drivers/net/ethernet/sfc/efx.c
@@ -1248,7 +1248,7 @@ static int efx_init_io(struct efx_nic *efx)
 
        netif_dbg(efx, probe, efx->net_dev, "initialising I/O\n");
 
-       bar = efx->type->mem_bar;
+       bar = efx->type->mem_bar(efx);
 
        rc = pci_enable_device(pci_dev);
        if (rc) {
@@ -1323,7 +1323,7 @@ static void efx_fini_io(struct efx_nic *efx)
        }
 
        if (efx->membase_phys) {
-               bar = efx->type->mem_bar;
+               bar = efx->type->mem_bar(efx);
                pci_release_region(efx->pci_dev, bar);
                efx->membase_phys = 0;
        }

diff --git a/drivers/net/ethernet/sfc/efx.h b/drivers/net/ethernet/sfc/efx.h
index 52c84b782901f93ac153aa65b112c8969f6f76d0..16da3e9a60001302a98f5bed3630b20e868fdcd5 100644 (file)
--- a/drivers/net/ethernet/sfc/efx.h
+++ b/drivers/net/ethernet/sfc/efx.h
@@ -14,11 +14,6 @@
 #include "net_driver.h"
 #include "filter.h"
 
-/* All controllers use BAR 0 for I/O space and BAR 2(&3) for memory */
-/* All VFs use BAR 0/1 for memory */
-#define EFX_MEM_BAR 2
-#define EFX_MEM_VF_BAR 0
-
 int efx_net_open(struct net_device *net_dev);
 int efx_net_stop(struct net_device *net_dev);
 

diff --git a/drivers/net/ethernet/sfc/net_driver.h b/drivers/net/ethernet/sfc/net_driver.h
index c0537ea06c9ac495803f19266e2cd26c5b12a097..2b6599f8d9fa9c92f0f5725d50eb7d5dc7cdd3c7 100644 (file)
--- a/drivers/net/ethernet/sfc/net_driver.h
+++ b/drivers/net/ethernet/sfc/net_driver.h
@@ -1154,7 +1154,7 @@ struct efx_udp_tunnel {
  */
 struct efx_nic_type {
        bool is_vf;
-       unsigned int mem_bar;
+       unsigned int (*mem_bar)(struct efx_nic *efx);
        unsigned int (*mem_map_size)(struct efx_nic *efx);
        int (*probe)(struct efx_nic *efx);
        void (*remove)(struct efx_nic *efx);

diff --git a/drivers/net/ethernet/sfc/siena.c b/drivers/net/ethernet/sfc/siena.c
index a617f657eae35fa710e777d524c9b33708f3bdee..22d49ebb347c9bf75f9c59deb581acf134bb223a 100644 (file)
--- a/drivers/net/ethernet/sfc/siena.c
+++ b/drivers/net/ethernet/sfc/siena.c
@@ -242,6 +242,14 @@ static int siena_dimension_resources(struct efx_nic *efx)
        return 0;
 }
 
+/* On all Falcon-architecture NICs, PFs use BAR 0 for I/O space and BAR 2(&3)
+ * for memory.
+ */
+static unsigned int siena_mem_bar(struct efx_nic *efx)
+{
+       return 2;
+}
+
 static unsigned int siena_mem_map_size(struct efx_nic *efx)
 {
        return FR_CZ_MC_TREG_SMEM +
@@ -950,7 +958,7 @@ fail:
 
 const struct efx_nic_type siena_a0_nic_type = {
        .is_vf = false,
-       .mem_bar = EFX_MEM_BAR,
+       .mem_bar = siena_mem_bar,
        .mem_map_size = siena_mem_map_size,
        .probe = siena_probe_nic,
        .remove = siena_remove_nic,