Commit 03714bbb authored by Edward Cree's avatar Edward Cree Committed by David S. Miller
Browse files

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: default avatarEdward Cree <ecree@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 59436c9e

drivers/net/ethernet/sfc/ef10.c

+23 −3
Original line number Diff line number Diff line
@@ -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,

drivers/net/ethernet/sfc/efx.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

	}

drivers/net/ethernet/sfc/efx.h

+0 −5
Original line number Diff line number Diff line
@@ -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);

drivers/net/ethernet/sfc/net_driver.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/net/ethernet/sfc/siena.c

+9 −1
Original line number Diff line number Diff line
@@ -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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE