Skip to contentSkip to conversation

Add AMD SB900 SATA/IDE controller device IDs

PATCH In review Shane Huang 3 participants 5 messages Jul 28, 2009 – Jul 29, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Add AMD SB900 SATA/IDE controller device IDs

Add AMD SB900 SATA/IDE controller device IDs.

drivers/ata/ahci.c +5 -0
diff -ruN a/drivers/ata/ahci.c b/drivers/ata/ahci.c
@@ -533,6 +533,11 @@
 	{ PCI_VDEVICE(ATI, 0x4394), board_ahci_sb700 }, /* ATI SB700/800 */
 	{ PCI_VDEVICE(ATI, 0x4395), board_ahci_sb700 }, /* ATI SB700/800 */
 
+	/* AMD */
+	{ PCI_VDEVICE(AMD, 0x7800), board_ahci }, /* AMD SB900 */
+	{ PCI_VENDOR_ID_AMD, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
+	  PCI_CLASS_STORAGE_RAID << 8, 0xffffff, board_ahci }, /* AMD RAID */
+
 	/* VIA */
 	{ PCI_VDEVICE(VIA, 0x3349), board_ahci_vt8251 }, /* VIA VT8251 */
 	{ PCI_VDEVICE(VIA, 0x6287), board_ahci_vt8251 }, /* VIA VT8251 */
drivers/ata/pata_atiixp.c +1 -0
diff -ruN a/drivers/ata/pata_atiixp.c b/drivers/ata/pata_atiixp.c
@@ -245,6 +245,7 @@
 	{ PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_IXP400_IDE), },
 	{ PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_IXP600_IDE), },
 	{ PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_IXP700_IDE), },
+	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_SB900_IDE), },
 
 	{ },
 };
drivers/ide/atiixp.c +1 -0
diff -ruN a/drivers/ide/atiixp.c b/drivers/ide/atiixp.c
@@ -177,6 +177,7 @@
 	{ PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_IXP400_IDE), 0 },
 	{ PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_IXP600_IDE), 1 },
 	{ PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_IXP700_IDE), 0 },
+	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_SB900_IDE), 0 },
 	{ 0, },
 };
 MODULE_DEVICE_TABLE(pci, atiixp_pci_tbl);
drivers/pci/quirks.c +3 -1
diff -ruN a/drivers/pci/quirks.c b/drivers/pci/quirks.c
@@ -992,7 +992,7 @@
 
 static void __devinit quirk_amd_ide_mode(struct pci_dev *pdev)
 {
-	/* set sb600/sb700/sb800 sata to ahci mode */
+	/* set SBX00 SATA in IDE mode to AHCI mode */
 	u8 tmp;
 
 	pci_read_config_byte(pdev, PCI_CLASS_DEVICE, &tmp);
@@ -1011,6 +1011,8 @@
 DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_SATA, quirk_amd_ide_mode);
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP700_SATA, quirk_amd_ide_mode);
 DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP700_SATA, quirk_amd_ide_mode);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_SB900_SATA_IDE, quirk_amd_ide_mode);
+DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_SB900_SATA_IDE, quirk_amd_ide_mode);
 
 /*
  *	Serverworks CSB5 IDE does not fully support native mode
include/linux/pci_ids.h +3 -0
diff -ruN a/include/linux/pci_ids.h b/include/linux/pci_ids.h
@@ -376,6 +376,9 @@
 #define PCI_DEVICE_ID_ATI_IXP600_IDE	0x438c
 #define PCI_DEVICE_ID_ATI_IXP700_SATA	0x4390
 #define PCI_DEVICE_ID_ATI_IXP700_IDE	0x439c
+/* AMD SB Chipset */
+#define PCI_DEVICE_ID_AMD_SB900_IDE	 0x780c
+#define PCI_DEVICE_ID_AMD_SB900_SATA_IDE 0x7800
 
 #define PCI_VENDOR_ID_VLSI		0x1004
 #define PCI_DEVICE_ID_VLSI_82C592	0x0005
Acked-by on v1 1/1
#1 lore raw
Quoted 3 lines · Shane Huang

Add AMD SB900 SATA/IDE controller device IDs.

drivers/ata/ahci.c line 539

Quoted 4 lines
drivers/ata/ahci.c +4 -0
+	/* AMD */
+	{ PCI_VDEVICE(AMD, 0x7800), board_ahci }, /* AMD SB900 */
+	{ PCI_VENDOR_ID_AMD, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
+	  PCI_CLASS_STORAGE_RAID << 8, 0xffffff, board_ahci }, /* AMD RAID */

Adding a comment declaring that AMD is committed to use RAID class only for ahci controllers would be nice.

Thanks.

Signature · 1 line
tejun
#2 lore raw
In reply to Shane Huang
Quoted 8 lines · Shane Huang

Add AMD SB900 SATA/IDE controller device IDs.

diff -ruN a/drivers/ata/ahci.c b/drivers/ata/ahci.c

drivers/ata/ahci.c line 539

Quoted 7 lines
drivers/ata/ahci.c +4 -0
@@ -533,6 +533,11 @@
 	{ PCI_VDEVICE(ATI, 0x4394), board_ahci_sb700 }, /* ATI SB700/800 */
 	{ PCI_VDEVICE(ATI, 0x4395), board_ahci_sb700 }, /* ATI SB700/800 */
 
+	/* AMD */
+	{ PCI_VDEVICE(AMD, 0x7800), board_ahci }, /* AMD SB900 */
+	{ PCI_VENDOR_ID_AMD, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
+	  PCI_CLASS_STORAGE_RAID << 8, 0xffffff, board_ahci }, /* AMD RAID */

Are you _absolutely_ certain that future AMD PCI_CLASS_STORAGE_RAID hardware will be compatible with AHCI?

Jeff

#3 lore raw

Hi Jeff,

Quoted 12 lines

-----Original Message-----
From: Jeff Garzik [mailto:[email protected]]

drivers/ata/ahci.c

Quoted 5 lines
drivers/ata/ahci.c +4 -0
+	/* AMD */
+	{ PCI_VDEVICE(AMD, 0x7800), board_ahci }, /* AMD SB900 */
+	{ PCI_VENDOR_ID_AMD, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
+	  PCI_CLASS_STORAGE_RAID << 8, 0xffffff, board_ahci }, 

/* AMD RAID */

Are you _absolutely_ certain that future AMD PCI_CLASS_STORAGE_RAID hardware will be compatible with AHCI?

Yes, we discussed this issue in our team and do not see the risk, so we decided to submit the generic RAID support.

I will update this patch with Tejun's request to add one comment.

Thanks
Shane

#4 lore raw
Quoted 12 lines · Shane

Hi Jeff,

Quoted 9 lines

-----Original Message-----
From: Jeff Garzik [mailto:[email protected]]

drivers/ata/ahci.c

Quoted 5 lines
drivers/ata/ahci.c +4 -0
+	/* AMD */
+	{ PCI_VDEVICE(AMD, 0x7800), board_ahci }, /* AMD SB900 */
+	{ PCI_VENDOR_ID_AMD, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
+	  PCI_CLASS_STORAGE_RAID << 8, 0xffffff, board_ahci }, 

/* AMD RAID */

Quoted 7 lines
Quoted 2 lines

Are you _absolutely_ certain that future AMD PCI_CLASS_STORAGE_RAID hardware will be compatible with AHCI?

Yes, we discussed this issue in our team and do not see the risk, so we decided to submit the generic RAID support.

I will update this patch with Tejun's request to add one comment.

Sounds good, thanks...

Jeff