[PATCH RESEND 2/3] ahci: add AMD CZ SATA device ID

[PATCH RESEND 2/3] ahci: add AMD CZ SATA device ID

[Shane Huang]

To add AMD CZ SATA controller device ID of IDE mode.

Signed-off-by: Shane Huang <shane.huang@amd.com>
Reviewed-by: Tejun Heo <tj@kernel.org>
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
-- 
1.8.1.2

Re: [PATCH RESEND 2/3] ahci: add AMD CZ SATA device ID

[Sergei Shtylyov]

Hello.

On 03-06-2013 14:24, Shane Huang wrote:

> To add AMD CZ SATA controller device ID of IDE mode.

> Signed-off-by: Shane Huang <shane.huang-5C7GfCeVMHo@public.gmane.org>
> Reviewed-by: Tejun Heo <tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
> Cc: stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.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/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

    We don't add the device IDs to this file anymore. And if you added 
it, why didn't you use it in ahci.c?

MBR, Sergei

Re: [PATCH RESEND 2/3] ahci: add AMD CZ SATA device ID

[Bjorn Helgaas]

On Mon, Jun 3, 2013 at 4:04 AM, Sergei Shtylyov
<sergei.shtylyov@cogentembedded.com> wrote:
> Hello.
>
>
> On 03-06-2013 14:24, Shane Huang wrote:
>
>> To add AMD CZ SATA controller device ID of IDE mode.
>
>
>> Signed-off-by: Shane Huang <shane.huang@amd.com>
>> Reviewed-by: Tejun Heo <tj@kernel.org>
>> 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/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
>
>
>    We don't add the device IDs to this file anymore. And if you added it,
> why didn't you use it in ahci.c?

Sergei has a good point.  I first thought it was used in both ahci.c
and quirks.c, but since it's not, it seems easier to forget about the
pci_ids.h update.

I dropped the pci_ids.h updates from patches 2 and 3 and pushed the
result to http://git.kernel.org/cgit/linux/kernel/git/helgaas/pci.git/log/?h=pci/shane-amd-ahci-i2c

Let me know if anybody objects.  Otherwise, I'll merge it into my
-next branch tomorrow.

Bjorn

RE: [PATCH RESEND 2/3] ahci: add AMD CZ SATA device ID

[Huang, Shane]

Bjorn,

> Let me know if anybody objects.  Otherwise, I'll merge it into my
> -next branch tomorrow.

The change is fine with me, thanks to you and Sergei.

Shane

Re: [PATCH RESEND 2/3] ahci: add AMD CZ SATA device ID

[Bjorn Helgaas]

On Mon, Jun 3, 2013 at 8:09 PM, Huang, Shane <Shane.Huang@amd.com> wrote:
> Bjorn,
>
>> Let me know if anybody objects.  Otherwise, I'll merge it into my
>> -next branch tomorrow.
>
> The change is fine with me, thanks to you and Sergei.

OK, all three are now in the PCI -next branch, headed for v3.11.

After removing the dependences on pci_ids.h, they could have gone
individually via i2c and ahci trees, but in the interest of getting on
with it, I just put them in.

Bjorn