lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add pci class code for SATA & AHCI, and replace some magic numbers.

Browse Source 
Signed-off-by: Conke Hu <conke.hu@amd.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Conke Hu
2007-01-09 05:32:51 -05:00
committed by Jeff Garzik
parent 95006188cb
commit c9f89475a5
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/ata/ahci.c
View File

@@ -431,7 +431,7 @@ static const struct pci_device_id ahci_pci_tbl[] = {
/* Generic, PCI class code for AHCI */ /* Generic, PCI class code for AHCI */
{ PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, { PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
0x010601, 0xffffff, board_ahci }, PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff, board_ahci },
{ } /* terminate list */ { } /* terminate list */
}; };
@@ -1619,11 +1619,11 @@ static void ahci_print_info(struct ata_probe_ent *probe_ent)
speed_s = "?"; speed_s = "?";
pci_read_config_word(pdev, 0x0a, &cc); pci_read_config_word(pdev, 0x0a, &cc);
if (cc == 0x0101) if (cc == PCI_CLASS_STORAGE_IDE)
scc_s = "IDE"; scc_s = "IDE";
else if (cc == 0x0106) else if (cc == PCI_CLASS_STORAGE_SATA)
scc_s = "SATA"; scc_s = "SATA";
else if (cc == 0x0104) else if (cc == PCI_CLASS_STORAGE_RAID)
scc_s = "RAID"; scc_s = "RAID";
else else
scc_s = "unknown"; scc_s = "unknown";

2
drivers/pci/quirks.c
View File

@@ -871,7 +871,7 @@ static void __devinit quirk_sb600_sata(struct pci_dev *pdev)
pci_write_config_byte(pdev, 0xa, 6); pci_write_config_byte(pdev, 0xa, 6);
pci_write_config_byte(pdev, 0x40, tmp); pci_write_config_byte(pdev, 0x40, tmp);
pdev->class = 0x010601; pdev->class = PCI_CLASS_STORAGE_SATA_AHCI;
} }
} }
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_SATA, quirk_sb600_sata); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_SATA, quirk_sb600_sata);

2
include/linux/pci_ids.h
View File

@@ -15,6 +15,8 @@
#define PCI_CLASS_STORAGE_FLOPPY 0x0102 #define PCI_CLASS_STORAGE_FLOPPY 0x0102
#define PCI_CLASS_STORAGE_IPI 0x0103 #define PCI_CLASS_STORAGE_IPI 0x0103
#define PCI_CLASS_STORAGE_RAID 0x0104 #define PCI_CLASS_STORAGE_RAID 0x0104
#define PCI_CLASS_STORAGE_SATA 0x0106
#define PCI_CLASS_STORAGE_SATA_AHCI 0x010601
#define PCI_CLASS_STORAGE_SAS 0x0107 #define PCI_CLASS_STORAGE_SAS 0x0107
#define PCI_CLASS_STORAGE_OTHER 0x0180 #define PCI_CLASS_STORAGE_OTHER 0x0180