public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] PCI subsystem: AMD SATA IDE mode quirk
@ 2008-02-02  5:56 Cai, Crane
  2008-02-02  6:19 ` Jeff Garzik
  0 siblings, 1 reply; 2+ messages in thread
From: Cai, Crane @ 2008-02-02  5:56 UTC (permalink / raw)
  To: gregkh; +Cc: linux-kernel, linux-pci

From: Crane Cai <crane.cai@amd.com>

PCI: modify SATA IDE mode quirk
When initialize and resume, SB600/700/800 need to set SATA mode
correctly.

Signed-off-by: Crane Cai <crane.cai@amd.com>
--------------------------------------------
--- a/drivers/pci/quirks.c	2007-09-24 14:16:32.000000000 -0400
+++ b/drivers/pci/quirks.c	2008-02-02 11:23:47.000000000 -0500
@@ -859,12 +859,13 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN
 DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,
PCI_DEVICE_ID_INTEL_82454NX,	quirk_disable_pxb );
 
 
-static void __devinit quirk_sb600_sata(struct pci_dev *pdev)
+static void __devinit quirk_amd_ide_mode(struct pci_dev *pdev)
 {
-	/* set sb600 sata to ahci mode */
-	if ((pdev->class >> 8) == PCI_CLASS_STORAGE_IDE) {
-		u8 tmp;
+	/* set sb600/sb700/sb800 sata to ahci mode */
+	u8 tmp;
 
+	pci_read_config_byte(pdev, PCI_CLASS_DEVICE, &tmp);
+	if (tmp == 0x01) {
 		pci_read_config_byte(pdev, 0x40, &tmp);
 		pci_write_config_byte(pdev, 0x40, tmp|1);
 		pci_write_config_byte(pdev, 0x9, 1);
@@ -872,10 +873,13 @@ static void __devinit quirk_sb600_sata(s
 		pci_write_config_byte(pdev, 0x40, tmp);
 
 		pdev->class = PCI_CLASS_STORAGE_SATA_AHCI;
+		printk(KERN_INFO "PCI: set SATA to AHCI mode\n");
 	}
 }
-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_IXP700_SATA, quirk_sb600_sata);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATI,
PCI_DEVICE_ID_ATI_IXP600_SATA, quirk_amd_ide_mode);
+DECLARE_PCI_FIXUP_RESUME(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(PCI_VENDOR_ID_ATI,
PCI_DEVICE_ID_ATI_IXP700_SATA, quirk_amd_ide_mode);
 
 /*
  *	Serverworks CSB5 IDE does not fully support native mode



^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] PCI subsystem: AMD SATA IDE mode quirk
  2008-02-02  5:56 [PATCH] PCI subsystem: AMD SATA IDE mode quirk Cai, Crane
@ 2008-02-02  6:19 ` Jeff Garzik
  0 siblings, 0 replies; 2+ messages in thread
From: Jeff Garzik @ 2008-02-02  6:19 UTC (permalink / raw)
  To: Cai, Crane; +Cc: gregkh, linux-kernel, linux-pci, Linux IDE mailing list

Cai, Crane wrote:
> From: Crane Cai <crane.cai@amd.com>
> 
> PCI: modify SATA IDE mode quirk
> When initialize and resume, SB600/700/800 need to set SATA mode
> correctly.
> 
> Signed-off-by: Crane Cai <crane.cai@amd.com>
> --------------------------------------------
> --- a/drivers/pci/quirks.c	2007-09-24 14:16:32.000000000 -0400
> +++ b/drivers/pci/quirks.c	2008-02-02 11:23:47.000000000 -0500
> @@ -859,12 +859,13 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN
>  DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,
> PCI_DEVICE_ID_INTEL_82454NX,	quirk_disable_pxb );
>  
>  
> -static void __devinit quirk_sb600_sata(struct pci_dev *pdev)
> +static void __devinit quirk_amd_ide_mode(struct pci_dev *pdev)
>  {
> -	/* set sb600 sata to ahci mode */
> -	if ((pdev->class >> 8) == PCI_CLASS_STORAGE_IDE) {
> -		u8 tmp;
> +	/* set sb600/sb700/sb800 sata to ahci mode */
> +	u8 tmp;
>  
> +	pci_read_config_byte(pdev, PCI_CLASS_DEVICE, &tmp);
> +	if (tmp == 0x01) {
>  		pci_read_config_byte(pdev, 0x40, &tmp);
>  		pci_write_config_byte(pdev, 0x40, tmp|1);
>  		pci_write_config_byte(pdev, 0x9, 1);
> @@ -872,10 +873,13 @@ static void __devinit quirk_sb600_sata(s
>  		pci_write_config_byte(pdev, 0x40, tmp);
>  
>  		pdev->class = PCI_CLASS_STORAGE_SATA_AHCI;
> +		printk(KERN_INFO "PCI: set SATA to AHCI mode\n");
>  	}
>  }
> -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_IXP700_SATA, quirk_sb600_sata);
> +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATI,
> PCI_DEVICE_ID_ATI_IXP600_SATA, quirk_amd_ide_mode);
> +DECLARE_PCI_FIXUP_RESUME(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(PCI_VENDOR_ID_ATI,
> PCI_DEVICE_ID_ATI_IXP700_SATA, quirk_amd_ide_mode);

ACK

In the future, please also CC linux-ide@vger.kernel.org, as that's where 
the ATA folks hang out :)

	Jeff



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2008-02-02  6:20 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-02-02  5:56 [PATCH] PCI subsystem: AMD SATA IDE mode quirk Cai, Crane
2008-02-02  6:19 ` Jeff Garzik

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox