From patchwork Mon Jun 3 10:24:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shane Huang X-Patchwork-Id: 248159 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.180.67]) by ozlabs.org (Postfix) with ESMTP id 2C7722C00A2 for ; Mon, 3 Jun 2013 12:22:34 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756844Ab3FCCWb (ORCPT ); Sun, 2 Jun 2013 22:22:31 -0400 Received: from co9ehsobe002.messaging.microsoft.com ([207.46.163.25]:1810 "EHLO co9outboundpool.messaging.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753050Ab3FCCWa (ORCPT ); Sun, 2 Jun 2013 22:22:30 -0400 Received: from mail178-co9-R.bigfish.com (10.236.132.242) by CO9EHSOBE004.bigfish.com (10.236.130.67) with Microsoft SMTP Server id 14.1.225.23; Mon, 3 Jun 2013 02:22:29 +0000 Received: from mail178-co9 (localhost [127.0.0.1]) by mail178-co9-R.bigfish.com (Postfix) with ESMTP id 6DE84BC01D0; Mon, 3 Jun 2013 02:22:29 +0000 (UTC) X-Forefront-Antispam-Report: CIP:163.181.249.109; KIP:(null); UIP:(null); IPV:NLI; H:ausb3twp02.amd.com; RD:none; EFVD:NLI X-SpamScore: 1 X-BigFish: VPS1(z551bizzz1f42h1ee6h1de0h1fdah1202h1e76h1d1ah1d2ah1fc6hzz8275bh8275dhz2dh668h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1d0ch1d2eh1d3fh1dc1h1dfeh1dffh1155h) Received: from mail178-co9 (localhost.localdomain [127.0.0.1]) by mail178-co9 (MessageSwitch) id 1370226147290581_12945; Mon, 3 Jun 2013 02:22:27 +0000 (UTC) Received: from CO9EHSMHS013.bigfish.com (unknown [10.236.132.232]) by mail178-co9.bigfish.com (Postfix) with ESMTP id 3A231180045; Mon, 3 Jun 2013 02:22:27 +0000 (UTC) Received: from ausb3twp02.amd.com (163.181.249.109) by CO9EHSMHS013.bigfish.com (10.236.130.23) with Microsoft SMTP Server id 14.1.225.23; Mon, 3 Jun 2013 02:22:27 +0000 X-WSS-ID: 0MNSP9B-02-H30-02 X-M-MSG: Received: from sausexedgep01.amd.com (sausexedgep01-ext.amd.com [163.181.249.72]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by ausb3twp02.amd.com (Axway MailGate 3.8.1) with ESMTP id 242D6C808A; Sun, 2 Jun 2013 21:22:23 -0500 (CDT) Received: from SAUSEXDAG01.amd.com (163.181.55.1) by sausexedgep01.amd.com (163.181.36.54) with Microsoft SMTP Server (TLS) id 8.3.192.1; Sun, 2 Jun 2013 21:22:53 -0500 Received: from SCYBEXDAG02.amd.com (10.34.11.12) by sausexdag01.amd.com (163.181.55.1) with Microsoft SMTP Server (TLS) id 14.2.328.9; Sun, 2 Jun 2013 21:22:24 -0500 Received: from shane-Annapurna.amd.com (10.237.74.105) by SCYBEXDAG02.amd.com (10.34.11.12) with Microsoft SMTP Server id 14.2.328.9; Mon, 3 Jun 2013 10:22:20 +0800 From: Shane Huang To: Bjorn Helgaas CC: Tejun Heo , Jean Delvare , , , , Shane Huang , Subject: [PATCH RESEND 2/3] ahci: add AMD CZ SATA device ID Date: Mon, 3 Jun 2013 18:24:10 +0800 Message-ID: <1370255050-2358-1-git-send-email-shane.huang@amd.com> X-Mailer: git-send-email 1.8.1.2 MIME-Version: 1.0 X-OriginatorOrg: amd.com Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org To add AMD CZ SATA controller device ID of IDE mode. Signed-off-by: Shane Huang Reviewed-by: Tejun Heo Cc: stable@vger.kernel.org --- drivers/ata/ahci.c | 1 + drivers/pci/quirks.c | 2 ++ include/linux/pci_ids.h | 1 + 3 files changed, 4 insertions(+) diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 751f1ea..548f1c3 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -310,6 +310,7 @@ static const struct pci_device_id ahci_pci_tbl[] = { /* AMD */ { PCI_VDEVICE(AMD, 0x7800), board_ahci }, /* AMD Hudson-2 */ + { PCI_VDEVICE(AMD, 0x7900), board_ahci }, /* AMD CZ */ /* AMD is using RAID class only for ahci controllers */ { PCI_VENDOR_ID_AMD, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_STORAGE_RAID << 8, 0xffffff, board_ahci }, diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 7d68aee..5aced49 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -1022,6 +1022,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP700_SATA, quirk 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_HUDSON2_SATA_IDE, quirk_amd_ide_mode); DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_HUDSON2_SATA_IDE, quirk_amd_ide_mode); +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CZ_SATA_IDE, quirk_amd_ide_mode); +DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CZ_SATA_IDE, quirk_amd_ide_mode); /* * Serverworks CSB5 IDE does not fully support native mode diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index e0b5623..22449c1 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -570,6 +570,7 @@ #define PCI_DEVICE_ID_AMD_HUDSON2_IDE 0x780c #define PCI_DEVICE_ID_AMD_HUDSON2_SATA_IDE 0x7800 #define PCI_DEVICE_ID_AMD_HUDSON2_SMBUS 0x780b +#define PCI_DEVICE_ID_AMD_CZ_SATA_IDE 0x7900 #define PCI_VENDOR_ID_TRIDENT 0x1023 #define PCI_DEVICE_ID_TRIDENT_4DWAVE_DX 0x2000