ATA100 patch source code:
Subsystems (2)
it's final version, but why it's not work ?
Documentation/Configure.help +24 -5
@@ -673,6 +673,25 @@ If in doubt, say N. +PnP BIOS DMA Forced Enabled +CONFIG_BLK_DEV_IDEDMA_FORCED + If you say Y here, and your DMA original Triton I/II, VIA, ALI + fail to setup the DMA address space and it used to work in 2.0.34 + with the Jumbo Patch series or works in 2.0.39, then you should + consider enabling this option. + + If in doubt, say N. + +Attempt to HACK around Chipsets that TIMEOUT (EXPERIMENTAL) +CONFIG_BLK_DEV_IDEDMA_TIMEOUT + If you say Y here, this is a NASTY UGLY HACK! + + We have to issue an abort and requeue the request DMA engine got + turned off by a goofy ASIC, and we have to clean up the mess, and + here is as good as any. Do it globally for all chipsets. + + If in doubt, say N. + Boot off-board chipsets first support CONFIG_BLK_DEV_OFFBOARD Normally, IDE controllers built into the motherboard (on-board
@@ -780,18 +799,18 @@ SAY NO! -AMD7409 chipset support -CONFIG_BLK_DEV_AMD7409 - This driver ensures (U)DMA support for the AMD756 Viper chipset. +AMD74XX chipset support +CONFIG_BLK_DEV_AMD74XX + This driver ensures (U)DMA support for the AMD756/765 Viper chipset. If you say Y here, you also need to say Y to "Use DMA by default when available", above. - Please read the comments at the top of drivers/ide/amd7409.c + Please read the comments at the top of drivers/ide/amd74xx.c If unsure, say N. AMD Viper ATA-66 Override support (WIP) -CONFIG_AMD7409_OVERRIDE +CONFIG_AMD74XX_OVERRIDE This option auto-forces the ata66 flag. This effect can be also invoked by calling "idex=ata66" If unsure, say N.
drivers/ide/Config.in +6 -3
@@ -45,15 +45,18 @@ bool ' Generic PCI bus-master DMA support' CONFIG_BLK_DEV_IDEDMA_PCI bool ' Boot off-board chipsets first support' CONFIG_BLK_DEV_OFFBOARD dep_bool ' Use PCI DMA by default when available' CONFIG_IDEDMA_PCI_AUTO $CONFIG_BLK_DEV_IDEDMA_PCI + dep_bool ' PnP BIOS DMA Forced Enabled' CONFIG_BLK_DEV_IDEDMA_FORCED $CONFIG_BLK_DEV_IDEDMA_PCI define_bool CONFIG_BLK_DEV_IDEDMA $CONFIG_BLK_DEV_IDEDMA_PCI dep_bool ' ATA Work(s) In Progress (EXPERIMENTAL)' CONFIG_IDEDMA_PCI_WIP $CONFIG_BLK_DEV_IDEDMA_PCI $CONFIG_EXPERIMENTAL dep_bool ' Good-Bad DMA Model-Firmware (WIP)' CONFIG_IDEDMA_NEW_DRIVE_LISTINGS $CONFIG_IDEDMA_PCI_WIP + dep_bool ' Attempt to HACK around Chipsets that TIMEOUT (WIP)' CONFIG_BLK_DEV_IDEDMA_TIMEOUT $CONFIG_IDEDMA_PCI_WIP + dep_bool ' AEC62XX chipset support' CONFIG_BLK_DEV_AEC62XX $CONFIG_BLK_DEV_IDEDMA_PCI dep_mbool ' AEC62XX Tuning support' CONFIG_AEC62XX_TUNING $CONFIG_BLK_DEV_AEC62XX dep_bool ' ALI M15x3 chipset support' CONFIG_BLK_DEV_ALI15X3 $CONFIG_BLK_DEV_IDEDMA_PCI dep_mbool ' ALI M15x3 WDC support (DANGEROUS)' CONFIG_WDC_ALI15X3 $CONFIG_BLK_DEV_ALI15X3 - dep_bool ' AMD Viper support' CONFIG_BLK_DEV_AMD7409 $CONFIG_BLK_DEV_IDEDMA_PCI - dep_mbool ' AMD Viper ATA-66 Override (WIP)' CONFIG_AMD7409_OVERRIDE $CONFIG_BLK_DEV_AMD7409 $CONFIG_IDEDMA_PCI_WIP + dep_bool ' AMD Viper support' CONFIG_BLK_DEV_AMD74XX $CONFIG_BLK_DEV_IDEDMA_PCI + dep_mbool ' AMD Viper ATA-66 Override (WIP)' CONFIG_AMD74XX_OVERRIDE $CONFIG_BLK_DEV_AMD74XX $CONFIG_IDEDMA_PCI_WIP dep_bool ' CMD64X chipset support' CONFIG_BLK_DEV_CMD64X $CONFIG_BLK_DEV_IDEDMA_PCI dep_bool ' CY82C693 chipset support' CONFIG_BLK_DEV_CY82C693 $CONFIG_BLK_DEV_IDEDMA_PCI dep_bool ' Cyrix CS5530 MediaGX chipset support' CONFIG_BLK_DEV_CS5530 $CONFIG_BLK_DEV_IDEDMA_PCI
@@ -147,7 +150,7 @@ if [ "$CONFIG_IDE_CHIPSETS" = "y" -o \ "$CONFIG_BLK_DEV_AEC62XX" = "y" -o \ "$CONFIG_BLK_DEV_ALI15X3" = "y" -o \ - "$CONFIG_BLK_DEV_AMD7409" = "y" -o \ + "$CONFIG_BLK_DEV_AMD74XX" = "y" -o \ "$CONFIG_BLK_DEV_CMD640" = "y" -o \ "$CONFIG_BLK_DEV_CMD64X" = "y" -o \ "$CONFIG_BLK_DEV_CS5530" = "y" -o \
drivers/ide/Makefile +1 -1
@@ -28,7 +28,7 @@ ide-obj-$(CONFIG_BLK_DEV_AEC62XX) += aec62xx.o ide-obj-$(CONFIG_BLK_DEV_ALI14XX) += ali14xx.o ide-obj-$(CONFIG_BLK_DEV_ALI15X3) += alim15x3.o -ide-obj-$(CONFIG_BLK_DEV_AMD7409) += amd7409.o +ide-obj-$(CONFIG_BLK_DEV_AMD74XX) += amd74xx.o ide-obj-$(CONFIG_BLK_DEV_BUDDHA) += buddha.o ide-obj-$(CONFIG_BLK_DEV_CMD640) += cmd640.o ide-obj-$(CONFIG_BLK_DEV_CMD64X) += cmd64x.o
drivers/ide/amd7409.c +0 -470
470 lines not on this page · raw message
drivers/ide/amd74xx.c +478 -0
478 lines not on this page · raw message
drivers/ide/hpt366.c +3 -0
@@ -55,6 +55,9 @@ };const char *bad_ata66_4[] = { +"IBM-DTLA-307075" , +"IBM-DTLA-307045" , +"IBM-DTLA-307030" ,"WDC AC310200R" ,NULL };
drivers/ide/ide-dma.c +87 -5
141 lines not on this page · raw message
drivers/ide/ide-pci.c +22 -18
@@ -70,8 +70,9 @@#define DEVID_CY82C693 ((ide_pci_devid_t){PCI_VENDOR_ID_CONTAQ, PCI_DEVICE_ID_CONTAQ_82C693})#define DEVID_HINT ((ide_pci_devid_t){0x3388, 0x8013})#define DEVID_CS5530 ((ide_pci_devid_t){PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5530_IDE}) -#define DEVID_AMD7403 ((ide_pci_devid_t){PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_COBRA_7403}) +#define DEVID_AMD7401 ((ide_pci_devid_t){PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_COBRA_7401})#define DEVID_AMD7409 ((ide_pci_devid_t){PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_VIPER_7409}) +#define DEVID_AMD7411 ((ide_pci_devid_t){PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_VIPER_7411})#define DEVID_SLC90E66 ((ide_pci_devid_t){PCI_VENDOR_ID_EFAR, PCI_DEVICE_ID_EFAR_SLC90E66_1})#define DEVID_OSB4 ((ide_pci_devid_t){PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_OSB4IDE})
@@ -109,20 +110,20 @@#define DMA_ALI15X3 NULL#endif -#ifdef CONFIG_BLK_DEV_AMD7409 -extern unsigned int pci_init_amd7409 (struct pci_dev *,const char *); -extern unsigned int ata66_amd7409 (ide_hwif_t *); -extern void ide_init_amd7409 (ide_hwif_t *); -extern void ide_dmacapable_amd7409 (ide_hwif_t *,unsigned long ); -#define PCI_AMD7409 &pci_init_amd7409 -#define ATA66_AMD7409 &ata66_amd7409 -#define INIT_AMD7409 &ide_init_amd7409 -#define DMA_AMD7409 &ide_dmacapable_amd7409 -#else -#define PCI_AMD7409 NULL -#define ATA66_AMD7409 NULL -#define INIT_AMD7409 NULL -#define DMA_AMD7409 NULL +#ifdef CONFIG_BLK_DEV_AMD74XX +extern unsigned int pci_init_amd74xx (struct pci_dev *,const char *); +extern unsigned int ata66_amd74xx (ide_hwif_t *); +extern void ide_init_amd74xx (ide_hwif_t *); +extern void ide_dmacapable_amd74xx (ide_hwif_t *,unsigned long ); +#define PCI_AMD74XX &pci_init_amd74xx +#define ATA66_AMD74XX &ata66_amd74xx +#define INIT_AMD74XX &ide_init_amd74xx +#define DMA_AMD74XX &ide_dmacapable_amd74xx +#else +#define PCI_AMD74XX NULL +#define ATA66_AMD74XX NULL +#define INIT_AMD74XX NULL +#define DMA_AMD74XX NULL#endif #ifdef CONFIG_BLK_DEV_CMD64X
@@ -377,8 +378,9 @@ {DEVID_CY82C693,"CY82C693", PCI_CY82C693, NULL, INIT_CY82C693, NULL, {{0x00,0x00,0x00}, {0x00,0x00,0x00}}, ON_BOARD, 0 }, {DEVID_HINT, "HINT_IDE", NULL, NULL, NULL, NULL, {{0x00,0x00,0x00}, {0x00,0x00,0x00}}, ON_BOARD, 0 }, {DEVID_CS5530, "CS5530", PCI_CS5530, NULL, INIT_CS5530, NULL, {{0x00,0x00,0x00}, {0x00,0x00,0x00}}, ON_BOARD, 0 }, - {DEVID_AMD7403, "AMD7403", NULL, NULL, NULL, NULL, {{0x00,0x00,0x00}, {0x00,0x00,0x00}}, ON_BOARD, 0 }, - {DEVID_AMD7409, "AMD7409", PCI_AMD7409, ATA66_AMD7409, INIT_AMD7409, DMA_AMD7409, {{0x40,0x01,0x01}, {0x40,0x02,0x02}}, ON_BOARD, 0 }, + {DEVID_AMD7401, "AMD7401", NULL, NULL, NULL, NULL, {{0x00,0x00,0x00}, {0x00,0x00,0x00}}, ON_BOARD, 0 }, + {DEVID_AMD7409, "AMD7409", PCI_AMD74XX, ATA66_AMD74XX, INIT_AMD74XX, DMA_AMD74XX, {{0x40,0x01,0x01}, {0x40,0x02,0x02}}, ON_BOARD, 0 }, + {DEVID_AMD7411, "AMD7411", PCI_AMD74XX, ATA66_AMD74XX, INIT_AMD74XX, DMA_AMD74XX, {{0x40,0x01,0x01}, {0x40,0x02,0x02}}, ON_BOARD, 0 }, {DEVID_SLC90E66,"SLC90E66", PCI_SLC90E66, ATA66_SLC90E66, INIT_SLC90E66, NULL, {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, ON_BOARD, 0 }, {DEVID_OSB4, "ServerWorks OSB4", PCI_OSB4, ATA66_OSB4, INIT_OSB4, NULL, {{0x00,0x00,0x00}, {0x00,0x00,0x00}}, ON_BOARD, 0 }, {IDE_PCI_DEVID_NULL, "PCI_IDE", NULL, NULL, NULL, NULL, {{0x00,0x00,0x00}, {0x00,0x00,0x00}}, ON_BOARD, 0 }};
@@ -663,7 +665,9 @@if (IDE_PCI_DEVID_EQ (d->devid,DEVID_SIS5513 ) ||IDE_PCI_DEVID_EQ (d->devid,DEVID_AEC6260 ) ||IDE_PCI_DEVID_EQ (d->devid,DEVID_PIIX4NX ) || -IDE_PCI_DEVID_EQ (d->devid,DEVID_HPT34X )) +IDE_PCI_DEVID_EQ (d->devid,DEVID_HPT34X ) || +IDE_PCI_DEVID_EQ (d->devid,DEVID_VIA_IDE ) || +IDE_PCI_DEVID_EQ (d->devid,DEVID_VP_IDE )) autodma =0 ;if (autodma) hwif->autodma =1 ;
drivers/ide/ide-proc.c +12 -12
@@ -81,10 +81,10 @@extern byte ali_proc;int (*ali_display_info)(char *,char **,off_t ,int ) =NULL ;#endif /* CONFIG_BLK_DEV_ALI15X3 */ -#ifdef CONFIG_BLK_DEV_AMD7409 -extern byte amd7409_proc; -int (*amd7409_display_info)(char *,char **,off_t ,int ) =NULL ; -#endif /* CONFIG_BLK_DEV_AMD7409 */ +#ifdef CONFIG_BLK_DEV_AMD74XX +extern byte amd74xx_proc; +int (*amd74xx_display_info)(char *,char **,off_t ,int ) =NULL ; +#endif /* CONFIG_BLK_DEV_AMD74XX */ #ifdef CONFIG_BLK_DEV_CMD64X extern byte cmd64x_proc;int (*cmd64x_display_info)(char *,char **,off_t ,int ) =NULL ;
@@ -817,10 +817,10 @@if ((ali_display_info) && (ali_proc))create_proc_info_entry ("ali" ,0 , proc_ide_root, ali_display_info);#endif /* CONFIG_BLK_DEV_ALI15X3 */ -#ifdef CONFIG_BLK_DEV_AMD7409 -if ((amd7409_display_info) && (amd7409_proc)) -create_proc_info_entry ("amd7409" ,0 , proc_ide_root, amd7409_display_info); -#endif /* CONFIG_BLK_DEV_AMD7409 */ +#ifdef CONFIG_BLK_DEV_AMD74XX +if ((amd74xx_display_info) && (amd74xx_proc)) +create_proc_info_entry ("amd74xx" ,0 , proc_ide_root, amd74xx_display_info); +#endif /* CONFIG_BLK_DEV_AMD74XX */ #ifdef CONFIG_BLK_DEV_CMD64X if ((cmd64x_display_info) && (cmd64x_proc))create_proc_info_entry ("cmd64x" ,0 , proc_ide_root, cmd64x_display_info);
@@ -877,10 +877,10 @@if ((ali_display_info) && (ali_proc))remove_proc_entry ("ide/ali" ,0 );#endif /* CONFIG_BLK_DEV_ALI15X3 */ -#ifdef CONFIG_BLK_DEV_AMD7409 -if ((amd7409_display_info) && (amd7409_proc)) -remove_proc_entry ("ide/amd7409" ,0 ); -#endif /* CONFIG_BLK_DEV_AMD7409 */ +#ifdef CONFIG_BLK_DEV_AMD74XX +if ((amd74xx_display_info) && (amd74xx_proc)) +remove_proc_entry ("ide/amd74xx" ,0 ); +#endif /* CONFIG_BLK_DEV_AMD74XX */ #ifdef CONFIG_BLK_DEV_CMD64X if ((cmd64x_display_info) && (cmd64x_proc))remove_proc_entry ("ide/cmd64x" ,0 );
drivers/ide/ide.c +14 -0
@@ -1195,6 +1195,19 @@return ide_stopped; } +ide_startstop_t restart_request (ide_drive_t *drive) +{ +ide_hwgroup_t *hwgroup =HWGROUP (drive); +unsigned long flags; + +spin_lock_irqsave (&io_request_lock, flags); + hwgroup->handler =NULL ; +del_timer (&hwgroup->timer); +spin_unlock_irqrestore (&io_request_lock, flags); + +return start_request (drive); +} +/* * ide_stall_queue() can be used by a drive to give excess bandwidth back * to the hwgroup by sleeping for timeout jiffies.
@@ -3533,6 +3546,7 @@EXPORT_SYMBOL (ide_fixstring);EXPORT_SYMBOL (ide_wait_stat);EXPORT_SYMBOL (ide_do_reset); +EXPORT_SYMBOL (restart_request);EXPORT_SYMBOL (ide_init_drive_cmd);EXPORT_SYMBOL (ide_do_drive_cmd);EXPORT_SYMBOL (ide_end_drive_cmd);
drivers/pci/pci.ids +6 -0
@@ -457,6 +457,8 @@ 2040 79c974 7006 AMD-751 [Irongate] System Controller 7007 AMD-751 [Irongate] AGP Bridge + 700E AMD-760 [Irongate] System Controller + 700F AMD-760 [Irongate] AGP Bridge 7400 AMD-755 [Cobra] ISA 7401 AMD-755 [Cobra] IDE 7403 AMD-755 [Cobra] ACPI
@@ -465,6 +467,10 @@ 7409 AMD-756 [Viper] IDE 740b AMD-756 [Viper] ACPI 740c AMD-756 [Viper] USB + 7410 AMD-765 [Viper] ISA + 7411 AMD-765 [Viper] IDE + 7413 AMD-765 [Viper] ACPI + 7414 AMD-765 [Viper] USB 1023 Trident Microsystems 0194 82C194 2000 4DWave DX
include/linux/ide.h +6 -0
@@ -738,6 +738,12 @@ide_startstop_t ide_do_reset (ide_drive_t *);/* +* Re-Start an operation for an IDE interface. +* The caller should return immediately after invoking this. +*/ +ide_startstop_t restart_request (ide_drive_t *); + +/* * This function is intended to be used prior to invoking ide_do_drive_cmd(). */ void ide_init_drive_cmd (struct request *rq);
include/linux/pci_ids.h +7 -0
@@ -279,6 +279,9 @@#define PCI_DEVICE_ID_AMD_LANCE_HOME 0x2001#define PCI_DEVICE_ID_AMD_SCSI 0x2020#define PCI_DEVICE_ID_AMD_FE_GATE_7006 0x7006 +#define PCI_DEVICE_ID_AMD_FE_GATE_7007 0x7007 +#define PCI_DEVICE_ID_AMD_FE_GATE_700E 0x700E +#define PCI_DEVICE_ID_AMD_FE_GATE_700F 0x700F#define PCI_DEVICE_ID_AMD_COBRA_7400 0x7400#define PCI_DEVICE_ID_AMD_COBRA_7401 0x7401#define PCI_DEVICE_ID_AMD_COBRA_7403 0x7403
@@ -287,6 +290,10 @@#define PCI_DEVICE_ID_AMD_VIPER_7409 0x7409#define PCI_DEVICE_ID_AMD_VIPER_740B 0x740B#define PCI_DEVICE_ID_AMD_VIPER_740C 0x740C +#define PCI_DEVICE_ID_AMD_VIPER_7410 0x7410 +#define PCI_DEVICE_ID_AMD_VIPER_7411 0x7411 +#define PCI_DEVICE_ID_AMD_VIPER_7413 0x7413 +#define PCI_DEVICE_ID_AMD_VIPER_7414 0x7414#define PCI_VENDOR_ID_TRIDENT 0x1023#define PCI_DEVICE_ID_TRIDENT_4DWAVE_DX 0x2000