From patchwork Tue Jul 28 06:29:26 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shane Huang X-Patchwork-Id: 30285 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by bilbo.ozlabs.org (Postfix) with ESMTP id B8955B70AD for ; Tue, 28 Jul 2009 16:44:48 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751104AbZG1Goq (ORCPT ); Tue, 28 Jul 2009 02:44:46 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753104AbZG1Goq (ORCPT ); Tue, 28 Jul 2009 02:44:46 -0400 Received: from sg2ehsobe002.messaging.microsoft.com ([207.46.51.76]:8395 "EHLO SG2EHSOBE002.bigfish.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751104AbZG1Gop (ORCPT ); Tue, 28 Jul 2009 02:44:45 -0400 X-Greylist: delayed 901 seconds by postgrey-1.27 at vger.kernel.org; Tue, 28 Jul 2009 02:44:44 EDT Received: from mail112-sin-R.bigfish.com (10.210.100.254) by SG2EHSOBE002.bigfish.com (10.210.112.22) with Microsoft SMTP Server id 8.1.340.0; Tue, 28 Jul 2009 06:29:42 +0000 Received: from mail112-sin (localhost.localdomain [127.0.0.1]) by mail112-sin-R.bigfish.com (Postfix) with ESMTP id 0E7971960135; Tue, 28 Jul 2009 06:29:31 +0000 (UTC) X-SpamScore: -2 X-BigFish: VPS-2(zz936eMzz1202hzzz32i203h6bh43j62h) X-Spam-TCS-SCL: 1:0 Received: by mail112-sin (MessageSwitch) id 1248762569356637_15920; Tue, 28 Jul 2009 06:29:29 +0000 (UCT) Received: from svlb1extmailp02.amd.com (unknown [139.95.251.11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail112-sin.bigfish.com (Postfix) with ESMTP id BD90E240050; Tue, 28 Jul 2009 06:29:28 +0000 (UTC) Received: from svlb1twp01.amd.com ([139.95.250.34]) by svlb1extmailp02.amd.com (Switch-3.2.7/Switch-3.2.7) with ESMTP id n6S6TT2u003514; Mon, 27 Jul 2009 23:29:32 -0700 X-WSS-ID: 0KNHBD8-03-JUA-01 Received: from SSVLEXBH1.amd.com (ssvlexbh1.amd.com [139.95.53.182]) by svlb1twp01.amd.com (Tumbleweed MailGate 3.5.1) with ESMTP id 200AE884943; Mon, 27 Jul 2009 23:29:31 -0700 (PDT) Received: from ssvlexmb2.amd.com ([139.95.53.7]) by SSVLEXBH1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Mon, 27 Jul 2009 23:29:32 -0700 Received: from storexbh1.amd.com ([10.1.1.17]) by ssvlexmb2.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Mon, 27 Jul 2009 23:29:31 -0700 Received: from sshaexmb1.amd.com ([10.237.2.11]) by storexbh1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Tue, 28 Jul 2009 02:29:30 -0400 Received: from 10.237.82.10 ([10.237.82.10]) by sshaexmb1.amd.com ([10.237.2.11]) with Microsoft Exchange Server HTTP-DAV ; Tue, 28 Jul 2009 06:29:26 +0000 Received: from zm-desktop by sshaexmb1.amd.com; 28 Jul 2009 14:29:26 +0800 Subject: [PATCH] Add AMD SB900 SATA/IDE controller device IDs From: Shane Huang Reply-To: shane.huang@amd.com To: jgarzik@pobox.com, tj@kernel.org CC: linux-ide@vger.kernel.org, "Huang, Shane" Organization: AMD Date: Tue, 28 Jul 2009 14:29:26 +0800 Message-ID: <1248762566.3437.7.camel@zm-desktop> MIME-Version: 1.0 X-Mailer: Evolution 2.26.1 X-OriginalArrivalTime: 28 Jul 2009 06:29:30.0417 (UTC) FILETIME=[C36DE210:01CA0F4C] Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org Add AMD SB900 SATA/IDE controller device IDs. Signed-off-by: Shane Huang Acked-by: Tejun Heo --- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff -ruN a/drivers/ata/ahci.c b/drivers/ata/ahci.c --- a/drivers/ata/ahci.c 2009-07-27 18:55:43.000000000 +0800 +++ b/drivers/ata/ahci.c 2009-07-27 18:55:47.000000000 +0800 @@ -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 */ diff -ruN a/drivers/ata/pata_atiixp.c b/drivers/ata/pata_atiixp.c --- a/drivers/ata/pata_atiixp.c 2009-07-27 18:55:56.000000000 +0800 +++ b/drivers/ata/pata_atiixp.c 2009-07-27 18:56:01.000000000 +0800 @@ -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), }, { }, }; diff -ruN a/drivers/ide/atiixp.c b/drivers/ide/atiixp.c --- a/drivers/ide/atiixp.c 2009-07-27 18:57:07.000000000 +0800 +++ b/drivers/ide/atiixp.c 2009-07-27 18:57:12.000000000 +0800 @@ -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); diff -ruN a/drivers/pci/quirks.c b/drivers/pci/quirks.c --- a/drivers/pci/quirks.c 2009-07-27 18:56:41.000000000 +0800 +++ b/drivers/pci/quirks.c 2009-07-27 18:56:46.000000000 +0800 @@ -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 diff -ruN a/include/linux/pci_ids.h b/include/linux/pci_ids.h --- a/include/linux/pci_ids.h 2009-07-27 18:54:41.000000000 +0800 +++ b/include/linux/pci_ids.h 2009-07-27 18:55:17.000000000 +0800 @@ -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