ahci: bail out on ICH6 before using AHCI BAR (6fec8871) · Commits · 戴 / test

The check for "combined mode" (which disables ahci support) on ICH6 is done after the first use of AHCI BAR. But if ahci is not enabled AHCI BAR is initialized to 0x00000000. (At least it is on the ICH6-M I tested this on. If I understand the datasheet correctly it should also be on ICH6R.) This apparently makes the call of pcim_iomap_regions_request_all() return -EINVAL. And we end up with ahci: probe of 0000:00:1f.2 failed with error -22 (at warning level) in the logs. So check for "combined mode" before calling pcim_iomap_regions_request_all(). Signed-off-by:

Paul Bolle <pebolle@tiscali.nl> Signed-off-by:

Tejun Heo <tj@kernel.org>

drivers/ata/ahci.c

+9 −9

Original line number	Diff line number	Diff line
		@@ -1238,15 +1238,6 @@ static int ahci_init_one(struct pci_dev pdev, const struct pci_device_id ent)
		if (rc)
		return rc;

		/* AHCI controllers often implement SFF compatible interface.
		* Grab all PCI BARs just in case.
		*/
		rc = pcim_iomap_regions_request_all(pdev, 1 << ahci_pci_bar, DRV_NAME);
		if (rc == -EBUSY)
		pcim_pin_device(pdev);
		if (rc)
		return rc;

		if (pdev->vendor == PCI_VENDOR_ID_INTEL &&
		(pdev->device == 0x2652 \|\| pdev->device == 0x2653)) {
		u8 map;
		@@ -1263,6 +1254,15 @@ static int ahci_init_one(struct pci_dev pdev, const struct pci_device_id ent)
		}
		}

		/* AHCI controllers often implement SFF compatible interface.
		* Grab all PCI BARs just in case.
		*/
		rc = pcim_iomap_regions_request_all(pdev, 1 << ahci_pci_bar, DRV_NAME);
		if (rc == -EBUSY)
		pcim_pin_device(pdev);
		if (rc)
		return rc;

		hpriv = devm_kzalloc(dev, sizeof(*hpriv), GFP_KERNEL);
		if (!hpriv)
		return -ENOMEM;

Admin message