IB/hfi1: Check device id early during init (5d6f08af) · Commits · 戴 / test

If there is a wrong device passed to the driver it should fail early, without trying to initialize the device only to find out that it has an invalid device later during the init. Reviewed-by:

Ira Weiny <ira.weiny@intel.com> Signed-off-by:

Tadeusz Struk <tadeusz.struk@intel.com> Signed-off-by:

Dennis Dalessandro <dennis.dalessandro@intel.com> Signed-off-by:

Doug Ledford <dledford@redhat.com>

drivers/infiniband/hw/hfi1/init.c

+10 −9

Original line number	Diff line number	Diff line
		@@ -1425,6 +1425,16 @@ static int init_one(struct pci_dev pdev, const struct pci_device_id ent)
		/* First, lock the non-writable module parameters */
		HFI1_CAP_LOCK();

		/* Validate dev ids */
		if (!(ent->device == PCI_DEVICE_ID_INTEL0 \|\|
		ent->device == PCI_DEVICE_ID_INTEL1)) {
		hfi1_early_err(&pdev->dev,
		"Failing on unknown Intel deviceid 0x%x\n",
		ent->device);
		ret = -ENODEV;
		goto bail;
		}

		/* Validate some global module parameters */
		ret = init_validate_rcvhdrcnt(&pdev->dev, rcvhdrcnt);
		if (ret)
		@@ -1470,15 +1480,6 @@ static int init_one(struct pci_dev pdev, const struct pci_device_id ent)
		if (ret)
		goto bail;

		if (!(ent->device == PCI_DEVICE_ID_INTEL0 \|\|
		ent->device == PCI_DEVICE_ID_INTEL1)) {
		hfi1_early_err(&pdev->dev,
		"Failing on unknown Intel deviceid 0x%x\n",
		ent->device);
		ret = -ENODEV;
		goto clean_bail;
		}

		/*
		* Do device-specific initialization, function table setup, dd
		* allocation, etc.

Admin message