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

Commit cbd2981a authored by Michael S. Tsirkin's avatar Michael S. Tsirkin Committed by Roland Dreier
Browse files

IB/mthca: Relax UAR size check 



There are some cards around that have UAR (user access region) size
different from 8 MB.  Relax our sanity check to make sure that the PCI
BAR is big enough to access the UAR size reported by the device
firmware instead.

Signed-off-by: default avatarMichael S. Tsirkin <mst@mellanox.co.il>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent f9e61929

drivers/infiniband/hw/mthca/mthca_main.c

+8 −2
Original line number Diff line number Diff line
@@ -155,6 +155,13 @@ static int __devinit mthca_dev_lim(struct mthca_dev *mdev, struct mthca_dev_lim 
		return -ENODEV;

	}



	if (dev_lim->uar_size > pci_resource_len(mdev->pdev, 2)) {

		mthca_err(mdev, "HCA reported UAR size of 0x%x bigger than "

			  "PCI resource 2 size of 0x%lx, aborting.\n",

			  dev_lim->uar_size, pci_resource_len(mdev->pdev, 2));

		return -ENODEV;

	}



	mdev->limits.num_ports      	= dev_lim->num_ports;

	mdev->limits.vl_cap             = dev_lim->max_vl;

	mdev->limits.mtu_cap            = dev_lim->max_mtu;
@@ -976,8 +983,7 @@ static int __devinit mthca_init_one(struct pci_dev *pdev, 
		err = -ENODEV;

		goto err_disable_pdev;

	}

	if (!(pci_resource_flags(pdev, 2) & IORESOURCE_MEM) ||

	    pci_resource_len(pdev, 2) != 1 << 23) {

	if (!(pci_resource_flags(pdev, 2) & IORESOURCE_MEM)) {

		dev_err(&pdev->dev, "Missing UAR, aborting.\n");

		err = -ENODEV;

		goto err_disable_pdev;