summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Stevens <darren@stevens-zone.net>2017-12-31 22:11:05 +0100
committerTejun Heo <tj@kernel.org>2018-01-08 13:02:02 +0100
commite47ecd4e48030c516e7521403f98903ea1c8f9a7 (patch)
tree88dfdc637f52f9e765ca0927de1d2c56db779200
parentata: ahci_brcm: Avoid clobbering SATA_TOP_CTRL_BUS_CTRL (diff)
downloadlinux-e47ecd4e48030c516e7521403f98903ea1c8f9a7.tar.xz
linux-e47ecd4e48030c516e7521403f98903ea1c8f9a7.zip
libata:pata_atiixp: Don't use unconnected secondary port on SB600
The AMD SB600 southbridge has an PATA IDE interface, but the secondary port has no physical connections, so is disabled in the PCI header which makes it appear as a legacy port. On most systems this causes no trouble, but the Amigaone X1000 has an SB600 connected to a PowerPC SoC PCI-e root port, with an emulated ISA bus. On this system a kernel panic occurs at boot time during device attach for the secondary port. Mark the port as 'dummy' to prevent this. As a bonus, disabling this will slightly speed up booting on PC systems using an SB600 as they will now skip 2 known empty ports. Signed-off-by: Darren Stevens <Darren@stevens-zone.net> Signed-off-by: Tejun Heo <tj@kernel.org>
-rw-r--r--drivers/ata/pata_atiixp.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/ata/pata_atiixp.c b/drivers/ata/pata_atiixp.c
index 49d705c9f0f7..4d49fd3c927b 100644
--- a/drivers/ata/pata_atiixp.c
+++ b/drivers/ata/pata_atiixp.c
@@ -278,6 +278,10 @@ static int atiixp_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
};
const struct ata_port_info *ppi[] = { &info, &info };
+ /* SB600 doesn't have secondary port wired */
+ if((pdev->device == PCI_DEVICE_ID_ATI_IXP600_IDE))
+ ppi[1] = &ata_dummy_port_info;
+
return ata_pci_bmdma_init_one(pdev, ppi, &atiixp_sht, NULL,
ATA_HOST_PARALLEL_SCAN);
}