Skip to contentSkip to conversation

ata_piix.c: check PCI sub-class code before AHCI disabling

PATCH Applied Greg Felix 2 participants 2 messages Mar 5, 2005 – Jul 28, 2005 libata

lore
Share & tools
lore

Greg Felix

author
#0 lore raw

PATCH 1/1 ata_piix.c: check PCI sub-class code before AHCI disabling

This patch adds functionality to check the PCI sub-class code of an AHCI capable device before disabling AHCI. It fixes a bug where an ICH7 sata controller is being setup by the BIOS as sub-class 1 (ide) and the AHCI control registers weren't being initialized, thus causing an IO error in piix_disable_ahci().

Thanks,
Greg Felix

scsi/ata_piix.c 2005-03-04 15:27:55.942404850 -0700 renamed from scsi/ata_piix.c.orig 2005-03-04 15:25:48.966846795 -0700 +10 -3
@@ -38,6 +38,7 @@ enum {
        PIIX_IOCFG              = 0x54, /* IDE I/O configuration register */
        ICH5_PMR                = 0x90, /* port mapping register */
        ICH5_PCS                = 0x92, /* port control and status */
+       PIIX_SCC                = 0x0A, /* sub-class code register */
 
        PIIX_FLAG_AHCI          = (1 << 28), /* AHCI possible */
        PIIX_FLAG_CHECKINTR     = (1 << 29), /* make sure PCI INTx enabled */
@@ -61,6 +62,8 @@ enum {
        ich6_sata               = 3,
        ich6_sata_rm            = 4,
        ich7_sata               = 5,
+
+       PIIX_AHCI_DEVICE        = 6,
 };
 
 static int piix_init_one (struct pci_dev *pdev,
@@ -609,9 +612,13 @@ static int piix_init_one (struct pci_dev
        port_info[1] = NULL;
 
        if (port_info[0]->host_flags & PIIX_FLAG_AHCI) {
-               int rc = piix_disable_ahci(pdev);
-               if (rc)
-                       return rc;
+               u8 tmp;
+               pci_read_config_byte(pdev, PIIX_SCC, &tmp);
+               if (tmp == PIIX_AHCI_DEVICE) {
+                       int rc = piix_disable_ahci(pdev);
+                       if (rc)
+                           return rc;
+               }
        }
 
        if (port_info[0]->host_flags & PIIX_FLAG_COMBINED) {
Applied
#1 lore raw
Quoted 11 lines · Greg Felix

This patch adds functionality to check the PCI sub-class code of an AHCI capable device before disabling AHCI. It fixes a bug where an ICH7 sata controller is being setup by the BIOS as sub-class 1 (ide) and the AHCI control registers weren't being initialized, thus causing an IO error in piix_disable_ahci().

Thanks,
Greg Felix

Applied to 2.6.x, and uploads to 'upstream' branch of libata-dev.git.

Will apply to 2.4.x as soon as Marcelo pulls what I just submitted.

Jeff