it821x: Add ultra_mask quirk for Vortex86SX
On Vortex86SX with IDE controller revision 0x11 ultra DMA must be disabled. This patch was tested by DMP and seems to work.
It is a cleaned up version of their older Kernel patch:
http://www.dmp.com.tw/tech/vortex86sx/patch-2.6.24-DMP.gz
--- drivers/ide/it821x.c | 13 +++++++++++++ include/linux/pci_ids.h | 1 + 2 files changed, 14 insertions(+)
drivers/ide/it821x.c +13 -0
@@ -68,6 +68,8 @@#define DRV_NAME "it821x" +#define QUIRK_VORTEX86 1 +struct it821x_dev { unsigned int smart:1, /* Are we in smart raid mode */
@@ -79,6 +81,7 @@ struct it821x_devu16 pio[2 ];/* Cached PIO values */ u16 mwdma[2 ];/* Cached MWDMA values */ u16 udma[2 ];/* Cached UDMA values (per drive) */ +u16 quirks; };#define ATA_66 0
@@ -580,6 +583,13 @@ static void __devinit init_hwif_it821x(i hwif->ultra_mask =ATA_UDMA6 ; hwif->mwdma_mask =ATA_MWDMA2 ; + +/* Vortex86SX quirk: prevent Ultra-DMA mode to fix BadCRC issue */ +if (idev->quirks &QUIRK_VORTEX86 ) { +pci_read_config_byte (dev,0x08 , &conf); +if (conf ==0x11 ) + hwif->ultra_mask =0 ; + } }static void it8212_disable_raid (struct pci_dev *dev)
@@ -652,6 +662,8 @@ static int __devinit it821x_init_one(strreturn -ENOMEM ; } + itdevs->quirks = id->driver_data; + rc =ide_pci_init_one (dev, &it821x_chipset, itdevs);if (rc)kfree (itdevs);
@@ -671,6 +683,7 @@ static void __devexit it821x_remove(strustatic const struct pci_device_id it821x_pci_tbl[] = { {PCI_VDEVICE (ITE ,PCI_DEVICE_ID_ITE_8211 ),0 }, {PCI_VDEVICE (ITE ,PCI_DEVICE_ID_ITE_8212 ),0 }, + {PCI_VDEVICE (RDC ,PCI_DEVICE_ID_RDC_D1010 ),QUIRK_VORTEX86 }, {0 , }, };
include/linux/pci_ids.h +1 -0
@@ -2173,6 +2173,7 @@#define PCI_DEVICE_ID_RDC_R6040 0x6040#define PCI_DEVICE_ID_RDC_R6060 0x6060#define PCI_DEVICE_ID_RDC_R6061 0x6061 +#define PCI_DEVICE_ID_RDC_D1010 0x1010#define PCI_VENDOR_ID_LENOVO 0x17aa
Alan Cox
NAKdrivers/ide/it821x.c static void __devinit init_hwif_it821x(i · line 591
Quoted 3 lines
drivers/ide/it821x.c +3
-0+pci_read_config_byte (dev,0x08 , &conf); +if (conf ==0x11 ) + hwif->ultra_mask =0 ;
NAK
Should use dev->revision as this is already kept by the kernel. Otherwise looks fine. pata_it821x already knows about this but not that it's only a bug in rev 0x11 so I'll propogate that bit up.
Alan
PATCH v2 1/1 it821x: Add ultra_mask quirk for Vortex86SX
On Vortex86SX with IDE controller revision 0x11 ultra DMA must be disabled. This patch was tested by DMP and seems to work.
It is a cleaned up version of their older Kernel patch:
http://www.dmp.com.tw/tech/vortex86sx/patch-2.6.24-DMP.gz
--- drivers/ide/it821x.c | 12 ++++++++++++ include/linux/pci_ids.h | 1 + 2 files changed, 13 insertions(+)
drivers/ide/it821x.c +12 -0
@@ -68,6 +68,8 @@#define DRV_NAME "it821x" +#define QUIRK_VORTEX86 1 +struct it821x_dev { unsigned int smart:1, /* Are we in smart raid mode */
@@ -79,6 +81,7 @@ struct it821x_devu16 pio[2 ];/* Cached PIO values */ u16 mwdma[2 ];/* Cached MWDMA values */ u16 udma[2 ];/* Cached UDMA values (per drive) */ +u16 quirks; };#define ATA_66 0
@@ -580,6 +583,12 @@ static void __devinit init_hwif_it821x(i hwif->ultra_mask =ATA_UDMA6 ; hwif->mwdma_mask =ATA_MWDMA2 ; + +/* Vortex86SX quirk: prevent Ultra-DMA mode to fix BadCRC issue */ +if (idev->quirks &QUIRK_VORTEX86 ) { +if (dev->revision ==0x11 ) + hwif->ultra_mask =0 ; + } }static void it8212_disable_raid (struct pci_dev *dev)
@@ -652,6 +661,8 @@ static int __devinit it821x_init_one(strreturn -ENOMEM ; } + itdevs->quirks = id->driver_data; + rc =ide_pci_init_one (dev, &it821x_chipset, itdevs);if (rc)kfree (itdevs);
@@ -671,6 +682,7 @@ static void __devexit it821x_remove(strustatic const struct pci_device_id it821x_pci_tbl[] = { {PCI_VDEVICE (ITE ,PCI_DEVICE_ID_ITE_8211 ),0 }, {PCI_VDEVICE (ITE ,PCI_DEVICE_ID_ITE_8212 ),0 }, + {PCI_VDEVICE (RDC ,PCI_DEVICE_ID_RDC_D1010 ),QUIRK_VORTEX86 }, {0 , }, };
include/linux/pci_ids.h +1 -0
@@ -2173,6 +2173,7 @@#define PCI_DEVICE_ID_RDC_R6040 0x6040#define PCI_DEVICE_ID_RDC_R6060 0x6060#define PCI_DEVICE_ID_RDC_R6061 0x6061 +#define PCI_DEVICE_ID_RDC_D1010 0x1010#define PCI_VENDOR_ID_LENOVO 0x17aa
Bartlomiej Zolnierkiewicz
AppliedQuoted 8 lines · Brandon Philips
On Vortex86SX with IDE controller revision
0x11ultra DMA must be disabled. This patch was tested by DMP and seems to work.It is a cleaned up version of their older Kernel patch:
http://www.dmp.com.tw/tech/vortex86sx/patch-2.6.24-DMP.gzTested-by Shawn Lin <[email protected]>Signed-off-by Brandon Philips <[email protected]>
applied
PATCH 1/1 it821x.c: use dev->revision instead of pci_read_config_byte
In reply to Alan CoxMinor cleanup.
--- drivers/ide/it821x.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/ide/it821x.c +1 -2
@@ -563,8 +563,7 @@ static void __devinit init_hwif_it821x(i* this is necessary. */ -pci_read_config_byte (dev,0x08 , &conf); -if (conf ==0x10 ) { +if (dev->revision ==0x10 ) { idev->timing10 =1 ; hwif->host_flags |=IDE_HFLAG_NO_ATAPI_DMA ;if (idev->smart ==0 )
Bartlomiej Zolnierkiewicz
AppliedRe: [PATCH] it821x.c: use dev->revision instead of pci_read_config_byte
Quoted 3 lines · Brandon Philips
Minor cleanup.
Signed-off-by Brandon Philips <[email protected]>
applied