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

Commit 086ea356 authored by Ben Hutchings's avatar Ben Hutchings Committed by Jeff Garzik
Browse files

sfc: Use resource_size_t for PCI bus address 



This should make the driver work on 32-bit systems with 64-bit PCI support.

Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 184be0c2

drivers/net/sfc/efx.c

+6 −5
Original line number Diff line number Diff line
@@ -778,15 +778,16 @@ static int efx_init_io(struct efx_nic *efx) 
	efx->membase = ioremap_nocache(efx->membase_phys,

				       efx->type->mem_map_size);

	if (!efx->membase) {

		EFX_ERR(efx, "could not map memory BAR %d at %lx+%x\n",

			efx->type->mem_bar, efx->membase_phys,

		EFX_ERR(efx, "could not map memory BAR %d at %llx+%x\n",

			efx->type->mem_bar,

			(unsigned long long)efx->membase_phys,

			efx->type->mem_map_size);

		rc = -ENOMEM;

		goto fail4;

	}

	EFX_LOG(efx, "memory BAR %u at %lx+%x (virtual %p)\n",

		efx->type->mem_bar, efx->membase_phys, efx->type->mem_map_size,

		efx->membase);

	EFX_LOG(efx, "memory BAR %u at %llx+%x (virtual %p)\n",

		efx->type->mem_bar, (unsigned long long)efx->membase_phys,

		efx->type->mem_map_size, efx->membase);



	return 0;

drivers/net/sfc/net_driver.h

+1 −1
Original line number Diff line number Diff line
@@ -686,7 +686,7 @@ struct efx_nic { 
	struct workqueue_struct *workqueue;

	struct work_struct reset_work;

	struct delayed_work monitor_work;

	unsigned long membase_phys;

	resource_size_t membase_phys;

	void __iomem *membase;

	spinlock_t biu_lock;

	enum efx_int_mode interrupt_mode;