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

Commit 054581e6 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

cnic: Don't use netdev->base_addr 



commit c0357e97
    bnx2: stop using net_device.{base_addr, irq}.

removed netdev->base_addr so we need to update cnic to get the MMIO
base address from pci_resource_start().  Otherwise, mmap of the uio
device will fail.

Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6fecd35d

drivers/net/ethernet/broadcom/cnic.c

+5 −2
Original line number Diff line number Diff line
@@ -1053,12 +1053,13 @@ static int cnic_init_uio(struct cnic_dev *dev) 


	uinfo = &udev->cnic_uinfo;



	uinfo->mem[0].addr = dev->netdev->base_addr;

	uinfo->mem[0].addr = pci_resource_start(dev->pcidev, 0);

	uinfo->mem[0].internal_addr = dev->regview;

	uinfo->mem[0].size = dev->netdev->mem_end - dev->netdev->mem_start;

	uinfo->mem[0].memtype = UIO_MEM_PHYS;



	if (test_bit(CNIC_F_BNX2_CLASS, &dev->flags)) {

		uinfo->mem[0].size = MB_GET_CID_ADDR(TX_TSS_CID +

						     TX_MAX_TSS_RINGS + 1);

		uinfo->mem[1].addr = (unsigned long) cp->status_blk.gen &

					PAGE_MASK;

		if (cp->ethdev->drv_state & CNIC_DRV_STATE_USING_MSIX)
@@ -1068,6 +1069,8 @@ static int cnic_init_uio(struct cnic_dev *dev) 


		uinfo->name = "bnx2_cnic";

	} else if (test_bit(CNIC_F_BNX2X_CLASS, &dev->flags)) {

		uinfo->mem[0].size = pci_resource_len(dev->pcidev, 0);



		uinfo->mem[1].addr = (unsigned long) cp->bnx2x_def_status_blk &

			PAGE_MASK;

		uinfo->mem[1].size = sizeof(*cp->bnx2x_def_status_blk);