IDE driver for MIPS Toshiba RBTX4939
PATCH 1/1 IDE driver for MIPS Toshiba RBTX4939
Hello. I'm submitting, mainly for review (questions, comments, etc) the IDE driver for the MIPS-based Toshiba RBTX4939. In some private emails with Bartlomiej about the ide-dma changes, I understand there's at least one problem with the driver (happy to fix with a pointer to a good example). And I see real quickly there's a few style things a Lindent'ing would fix. Thanks.
drivers/ide/Kconfig +5 -0
@@ -1015,6 +1015,11 @@ config BLK_DEV_UMC8672 See the files <file:Documentation/ide.txt> and <file:drivers/ide/legacy/umc8672.c> for more info. +config BLK_DEV_IDE_TX4939 + tristate "TX4939 internal IDE support" + depends TOSHIBA_RBTX4939 + help + endif config BLK_DEV_IDEDMA
drivers/ide/ide-cd.c +13 -1
@@ -678,6 +678,13 @@ static int cdrom_decode_status(ide_drive err =HWIF (drive)->INB (IDE_ERROR_REG ); sense_key = err >>4 ; +#if defined(CONFIG_BLK_DEV_IDE_TX4939 ) +if (IS_IDE_TX4939 ) { +extern void tx4939_ide_softreset (ide_drive_t *); +tx4939_ide_softreset (drive); + } +#endif +if (rq ==NULL ) {printk ("%s: missing rq in cdrom_decode_status\n" , drive->name);return 1 ;
@@ -3254,7 +3261,12 @@ int ide_cdrom_setup (ide_drive_t *drive) info->changer_info =NULL ; info->last_block =0 ; info->start_seek =0 ; - +#ifdef CONFIG_BLK_DEV_IDE_TX4939 + { +extern void tx4939_ide_cdrom_setup (ide_drive_t *drive); +tx4939_ide_cdrom_setup (drive); + } +#endif nslots =ide_cdrom_probe_capabilities (drive);/*
drivers/ide/ide-dma.c +3 -2
@@ -856,7 +856,8 @@ int ide_mapped_mmio_dma (ide_hwif_t *hwiprintk (KERN_INFO " %s: MMIO-DMA " , hwif->name); hwif->dma_base = base; -if (hwif->cds->extra && hwif->channel ==0 ) + +if (hwif->cds && hwif->cds->extra && hwif->channel ==0 ) hwif->dma_extra = hwif->cds->extra;if (hwif->mate)
@@ -875,7 +876,7 @@ int ide_iomio_dma (ide_hwif_t *hwif, unsreturn 1 ; } hwif->dma_base = base; -if ((hwif->cds->extra) && (hwif->channel ==0 )) { +if (hwif->cds && (hwif->cds->extra) && (hwif->channel ==0 )) {request_region (base+16 , hwif->cds->extra, hwif->cds->name); hwif->dma_extra = hwif->cds->extra; }
drivers/ide/ide-proc.c +1 -0
@@ -64,6 +64,7 @@ static int proc_ide_read_imodelcase ide_cy82c693: name ="cy82c693" ;break ;case ide_4drives: name ="4drives" ;break ;case ide_pmac: name ="mac-io" ;break ; +case ide_tx4939: name ="tx4939" ;break ;default : name ="(unknown)" ;break ; } len =sprintf (page,"%s\n" , name);
drivers/ide/ide.c +9 -0
@@ -2151,6 +2151,15 @@ static void __init probe_for_hwifs (voidswarm_ide_probe (); }#endif /* CONFIG_BLK_IDE_SWARM */ +#ifdef CONFIG_BLK_DEV_IDE_TX4939 + { +extern void tx4939_ide_init (int ch); +tx4939_ide_init (0 ); +#ifdef CONFIG_TOSHIBA_TX4939_MPLEX_ATA1 +tx4939_ide_init (1 ); +#endif + } +#endif /* CONFIG_BLK_DEV_IDE_TX4939 */ #ifdef CONFIG_BLK_DEV_BUDDHA {extern void buddha_init (void );
drivers/ide/mips/Makefile +1 -0
@@ -1,3 +1,4 @@ obj-$(CONFIG_BLK_DEV_IDE_SWARM) += swarm.o +obj-$(CONFIG_BLK_DEV_IDE_TX4939) += ide-tx4939.o EXTRA_CFLAGS := -I../
drivers/ide/mips/ide-tx4939.c new file +534 -0
534 lines not on this page · raw message
include/asm-mips/tx4939/ide.h new file +71 -0
71 lines not on this page · raw message
include/linux/ide.h +1 -0
@@ -223,6 +223,7 @@ typedef enum { ide_unknown, ide_generic, ide_rz1000, ide_trm290, ide_cmd646, ide_cy82c693, ide_4drives, ide_pmac, ide_etrax100, ide_acorn, + ide_tx4939, ide_forced } hwif_chipset_t;
Signature · 2 lines
Tom Rini http://gate.crashing.org/~trini/
Hi,
Quoted 31 lines · Tom Rini
Hello. I'm submitting, mainly for review (questions, comments, etc) the IDE driver for the MIPS-based Toshiba RBTX4939. In some private emails with Bartlomiej about the ide-dma changes, I understand there's at least one problem with the driver (happy to fix with a pointer to a good example). And I see real quickly there's a few style things a Lindent'ing would fix. Thanks.
Signed-off-by Hiroshi DOYU <[email protected]>Signed-off-by Tom Rini <[email protected]>Index: linux-2.6.10/drivers/ide/Kconfig
===================================================================drivers/ide/Kconfig +5
-0@@ -1015,6 +1015,11 @@ config BLK_DEV_UMC8672 See the files <file:Documentation/ide.txt> and <file:drivers/ide/legacy/umc8672.c> for more info. +config BLK_DEV_IDE_TX4939 + tristate "TX4939 internal IDE support" + depends TOSHIBA_RBTX4939 + help + endif config BLK_DEV_IDEDMAIndex:
linux-2.6.10/drivers/ide/ide-cd.c
===================================================================
drivers/ide/ide-cd.c static int cdrom_decode_status(ide_drive · line 687
Quoted 10 lines
drivers/ide/ide-cd.c +7
-0@@ -678,6 +678,13 @@ static int cdrom_decode_status(ide_drive err =HWIF (drive)->INB (IDE_ERROR_REG ); sense_key = err >>4 ; +#if defined(CONFIG_BLK_DEV_IDE_TX4939 ) +if (IS_IDE_TX4939 ) { +extern void tx4939_ide_softreset (ide_drive_t *); +tx4939_ide_softreset (drive); + } +#endif +
Why is this needed?
Moreover if you really need to hook into device driver please add generic interface (i.e. hwif->atapi_softreset) not chipset specific #fidefs.
Quoted 4 lines
drivers/ide/ide-cd.c +0
-0if (rq ==NULL ) {printk ("%s: missing rq in cdrom_decode_status\n" , drive->name);return 1 ;
drivers/ide/ide-cd.c int ide_cdrom_setup (ide_drive_t *drive) · line 3269
Quoted 10 lines
drivers/ide/ide-cd.c +6
-1@@ -3254,7 +3261,12 @@ int ide_cdrom_setup (ide_drive_t *drive) info->changer_info =NULL ; info->last_block =0 ; info->start_seek =0 ; - +#ifdef CONFIG_BLK_DEV_IDE_TX4939 + { +extern void tx4939_ide_cdrom_setup (ide_drive_t *drive); +tx4939_ide_cdrom_setup (drive); + } +#endif
ditto
Quoted 43 lines
drivers/ide/ide-cd.c +0
-0nslots =ide_cdrom_probe_capabilities (drive);/* Index:
linux-2.6.10/drivers/ide/ide-dma.c
===================================================================drivers/ide/ide-dma.c +3
-2@@ -856,7 +856,8 @@ int ide_mapped_mmio_dma (ide_hwif_t *hwiprintk (KERN_INFO " %s: MMIO-DMA " , hwif->name); hwif->dma_base = base; -if (hwif->cds->extra && hwif->channel ==0 ) + +if (hwif->cds && hwif->cds->extra && hwif->channel ==0 ) hwif->dma_extra = hwif->cds->extra;if (hwif->mate)@@ -875,7 +876,7 @@ int ide_iomio_dma (ide_hwif_t *hwif, unsreturn 1 ; } hwif->dma_base = base; -if ((hwif->cds->extra) && (hwif->channel ==0 )) { +if (hwif->cds && (hwif->cds->extra) && (hwif->channel ==0 )) {request_region (base+16 , hwif->cds->extra, hwif->cds->name); hwif->dma_extra = hwif->cds->extra; }Index:
linux-2.6.10/drivers/ide/ide-proc.c
===================================================================drivers/ide/ide-proc.c +1
-0@@ -64,6 +64,7 @@ static int proc_ide_read_imodelcase ide_cy82c693: name ="cy82c693" ;break ;case ide_4drives: name ="4drives" ;break ;case ide_pmac: name ="mac-io" ;break ; +case ide_tx4939: name ="tx4939" ;break ;default : name ="(unknown)" ;break ; } len =sprintf (page,"%s\n" , name);Index:
linux-2.6.10/drivers/ide/ide.c
===================================================================
drivers/ide/ide.c static void __init probe_for_hwifs (void · line 2160
Quoted 10 lines
drivers/ide/ide.c +7
-0@@ -2151,6 +2151,15 @@ static void __init probe_for_hwifs (voidswarm_ide_probe (); }#endif /* CONFIG_BLK_IDE_SWARM */ +#ifdef CONFIG_BLK_DEV_IDE_TX4939 + { +extern void tx4939_ide_init (int ch); +tx4939_ide_init (0 ); +#ifdef CONFIG_TOSHIBA_TX4939_MPLEX_ATA1 +tx4939_ide_init (1 ); +#endif
CONFIG_TOSHIBA_TX4939_MPLEX_ATA1 should be checked
inside ide-tx4939.c and tx4939_ide_init() should take 'void' argument.
Quoted 26 lines
drivers/ide/ide.c +2
-0+ } +#endif /* CONFIG_BLK_DEV_IDE_TX4939 */ #ifdef CONFIG_BLK_DEV_BUDDHA {extern void buddha_init (void );Index: linux-2.6.10/drivers/ide/mips/Makefile
===================================================================drivers/ide/mips/Makefile +1
-0@@ -1,3 +1,4 @@ obj-$(CONFIG_BLK_DEV_IDE_SWARM) += swarm.o +obj-$(CONFIG_BLK_DEV_IDE_TX4939) += ide-tx4939.o EXTRA_CFLAGS := -I../Index:
linux-2.6.10/drivers/ide/mips/ide-tx4939.c
===================================================================drivers/ide/mips/ide-tx4939.c new file +7
-0@@ -0,0 +1,534 @@ +/* +* drivers/ide/mips/ide-tx4939.c +* +* TX4939 internal IDE driver +* +* (C) Copyright TOSHIBA CORPORATION SEMICONDUCTOR COMPANY 2000-2001,2005 +*
drivers/ide/mips/ide-tx4939.c line 17
Quoted 10 lines
drivers/ide/mips/ide-tx4939.c new file +10
-0+* 2001-2005 (c) MontaVista Software, Inc. This file is licensed under +* the terms of the GNU General Public License version 2. This program +* is licensed "as is" without any warranty of any kind, whether express +* or implied. +* +* Support for TX4939 in 2.6 - Hiroshi DOYU <[email protected]> +*/ + +#include <linux/types.h> +#include <linux/mm.h>
Is this really needed?
drivers/ide/mips/ide-tx4939.c line 22
Quoted 5 lines
drivers/ide/mips/ide-tx4939.c new file +5
-0+#include <linux/interrupt.h> +#include <linux/blkdev.h> +#include <linux/hdreg.h> +#include <linux/ide.h> +#include <linux/pci.h>
ditto
drivers/ide/mips/ide-tx4939.c line 26
Quoted 4 lines
drivers/ide/mips/ide-tx4939.c new file +4
-0+#include <linux/init.h> +#include <linux/delay.h> +#include <asm/bootinfo.h> +#include <asm/pci.h>
ditto
drivers/ide/mips/ide-tx4939.c line 36
Quoted 10 lines
drivers/ide/mips/ide-tx4939.c new file +10
-0+#include <asm/delay.h> +#include <asm/tx4939/tx4939.h> + +/* from ide-cd.h */ +#define CD_FRAMESIZE 2048 +#define SECTOR_BITS 9 +#define SECTORS_PER_FRAME (CD_FRAMESIZE >> SECTOR_BITS) + +/* add command line TX4939 IDE DMA setteing */ +byte tx4939_ide_udma_mode;
Unused. What is the reason for this setting?
drivers/ide/mips/ide-tx4939.c line 41
Quoted 4 lines
drivers/ide/mips/ide-tx4939.c new file +4
-0+/* wait for transfer end */ +static u16 wait_transfer_end[2 ]; + +#define IS_ATAPI (drive) ((drive)->media == ide_cdrom || (drive)->media == ide_scsi)
What about ide_optical / ide_floppy / ide_tape?
drivers/ide/mips/ide-tx4939.c line 42
Quoted 1 line
drivers/ide/mips/ide-tx4939.c new file +1
-0+#define GET_CH (hwif) (hwif->irq == TX4939_IRQ_ATA(0) ? 0 : 1)
What about using hwif->channel instead?
drivers/ide/mips/ide-tx4939.c line 46
Quoted 3 lines
drivers/ide/mips/ide-tx4939.c new file +3
-0+void tx4939_ide_softreset (ide_drive_t * drive) +{ +int ch =GET_CH (HWIF (drive));
Please don't use HWIF() and HWHROUP() macros.
drivers/ide/mips/ide-tx4939.c line 51
Quoted 5 lines
drivers/ide/mips/ide-tx4939.c new file +5
-0+u16 lo_bcnt, hi_bcnt, s; + +/* save ata controller valiable */ + lo_bcnt =reg_rd16 (&tx4939_ataptr (ch)->lo_bcnt); + hi_bcnt =reg_rd16 (&tx4939_ataptr (ch)->hi_bcnt);
Could I see tx4939_ataptr() (I guess it is in <asm/tx4939/tx4939.h>)?
Quoted 15 lines
drivers/ide/mips/ide-tx4939.c new file +15
-0+/* Soft Reset */ + s =reg_rd16 (&tx4939_ataptr (ch)->sysctl1); +reg_wr16 (&tx4939_ataptr (ch)->sysctl1, s|TX4939_ATA_SC_SOFT_RESET ); +wbflush (); +udelay (1 ); + +/* load ata controller valiable */ +reg_wr16 (&tx4939_ataptr (ch)->lo_bcnt, lo_bcnt); +reg_wr16 (&tx4939_ataptr (ch)->hi_bcnt, hi_bcnt); +} + +/** +* tx4939_ide_tune_drive - ide_tuneproc_t function for TX4939-IDE +* @drive: This is the drive data. +* @pio: This is used to select the PIO mode by number (0,1,2,3,4,5).
drivers/ide/mips/ide-tx4939.c line 77
Quoted 10 lines
drivers/ide/mips/ide-tx4939.c new file +10
-0+* +* An ide_tuneproc_t() is used to set the speed of an IDE interface +* to a particular PIO mode. The "byte" parameter is used +* to select the PIO mode by number (0,1,2,3,4,5), and a value of 255 +* indicates that the interface driver should "auto-tune" the PIO mode +* according to the drive capabilities in drive->id; +* +* Not all interface types support tuning, and not all of those +* support all possible PIO settings. They may silently ignore +* or round values as they see fit.
ide_tuneproc_t type is not present in the current kernel tree, please move the comment to <linux/ide.h>:hwif->tuneproc.
drivers/ide/mips/ide-tx4939.c line 80
Quoted 3 lines
drivers/ide/mips/ide-tx4939.c new file +3
-0+*/ + +static void tx4939_ide_tune_drive (ide_drive_t * drive,byte pio)
please use 'u8' instead of 'byte'
drivers/ide/mips/ide-tx4939.c line 90
Quoted 10 lines
drivers/ide/mips/ide-tx4939.c new file +10
-0+{ +u16 data =0 ; +u16 mode =0 ; +byte speed =XFER_PIO_0 ; +unsigned long data_port; +unsigned long sc_port; +int is_slave = (&HWIF (drive)->drives[1 ] == drive); +ide_hwif_t *hwif = drive->hwif; + + data_port = (unsigned long )hwif->io_ports[IDE_DATA_OFFSET ];
redundant cast
drivers/ide/mips/ide-tx4939.c line 95
Quoted 5 lines
drivers/ide/mips/ide-tx4939.c new file +5
-0+ sc_port = (!is_slave) ? + data_port +TX4939_ATA_SYSTEM_CONTROL1_OFFSET : + data_port +TX4939_ATA_SYSTEM_CONTROL2_OFFSET ; + +if (!hwif->channel) {/* primary */
Why only primary channel is tuned?
Quoted 13 lines
drivers/ide/mips/ide-tx4939.c new file +13
-0+ pio =ide_get_best_pio_mode (drive, pio,4 ,NULL ); +switch (pio) { +case 4 : + mode =TX4939_ATA_SC_MODE_XFER_PIO_4 ; + speed =XFER_PIO_4 ; +break ; +case 3 : + mode =TX4939_ATA_SC_MODE_XFER_PIO_3 ; + speed =XFER_PIO_3 ; +break ; +case 2 : + mode =TX4939_ATA_SC_MODE_XFER_PIO_2 ; + speed =XFER_PIO_2 ;
drivers/ide/mips/ide-tx4939.c line 118
Quoted 10 lines
drivers/ide/mips/ide-tx4939.c new file +10
-0+break ; +case 1 : + mode =TX4939_ATA_SC_MODE_XFER_PIO_1 ; + speed =XFER_PIO_1 ; +break ; +case 0 : + mode =TX4939_ATA_SC_MODE_XFER_PIO_0 ; + speed =XFER_PIO_0 ; +break ; +default :
BUG() if PIO mode is invalid
drivers/ide/mips/ide-tx4939.c line 117
Quoted 2 lines
drivers/ide/mips/ide-tx4939.c new file +2
-0+break ; + }
speed = XFER_PIO_0 + pio;
drivers/ide/mips/ide-tx4939.c line 128
Quoted 7 lines
drivers/ide/mips/ide-tx4939.c new file +7
-0+ data =inw (sc_port); + data &= ~TX4939_ATA_SC_MODE_MASK ; + data |= mode; +outw (data, sc_port); + } + + drive->current_speed = speed;
ide_config_drive_speed() updates drive->current_speed
Quoted 12 lines
drivers/ide/mips/ide-tx4939.c new file +12
-0+ide_config_drive_speed (drive, speed); +} + +/** +* tx4939_ide_tune_chipset - ide_speedproc_t function for TX4939-IDE +* @drive: This is the drive data. +* @speed: This parameter is used to select the transfer mode. +* +* This function sets the transfer mode. +*/ + +static int tx4939_ide_tune_chipset (ide_drive_t * drive,byte speed)
drivers/ide/mips/ide-tx4939.c line 150
Quoted 10 lines
drivers/ide/mips/ide-tx4939.c new file +10
-0+{ +u16 data =0 ; +u16 mode =0 ; +unsigned long data_port; +unsigned long sc_port; +int err; + +int is_slave = (&HWIF (drive)->drives[1 ] == drive); +ide_hwif_t *hwif =HWIF (drive); + data_port = (unsigned long )hwif->io_ports[IDE_DATA_OFFSET ];
redundant cast
drivers/ide/mips/ide-tx4939.c line 155
Quoted 5 lines
drivers/ide/mips/ide-tx4939.c new file +5
-0+ sc_port = (!is_slave) ? + data_port +TX4939_ATA_SYSTEM_CONTROL1_OFFSET : + data_port +TX4939_ATA_SYSTEM_CONTROL2_OFFSET ; + +if (!hwif->channel) {
Why only primary channel is tuned?
Quoted 18 lines
drivers/ide/mips/ide-tx4939.c new file +18
-0+switch (speed) { +case XFER_UDMA_5 : + mode =TX4939_ATA_SC_MODE_XFER_UDMA_5 ; +break ; +case XFER_UDMA_4 : + mode =TX4939_ATA_SC_MODE_XFER_UDMA_4 ; +break ; +case XFER_UDMA_3 : + mode =TX4939_ATA_SC_MODE_XFER_UDMA_3 ; +break ; +case XFER_UDMA_2 : + mode =TX4939_ATA_SC_MODE_XFER_UDMA_2 ; +break ; +case XFER_UDMA_1 : + mode =TX4939_ATA_SC_MODE_XFER_UDMA_1 ; +break ; +case XFER_UDMA_0 : + mode =TX4939_ATA_SC_MODE_XFER_UDMA_0 ;
drivers/ide/mips/ide-tx4939.c line 183
Quoted 10 lines
drivers/ide/mips/ide-tx4939.c new file +10
-0+break ; +case XFER_MW_DMA_2 : + mode =TX4939_ATA_SC_MODE_XFER_MDMA_2 ; +break ; +case XFER_MW_DMA_1 : + mode =TX4939_ATA_SC_MODE_XFER_MDMA_1 ; +break ; +case XFER_MW_DMA_0 : + mode =TX4939_ATA_SC_MODE_XFER_MDMA_0 ; +break ;
SW DMA can't be used but hwif->swdma_mask indicates otherwise.
drivers/ide/mips/ide-tx4939.c line 193
Quoted 10 lines
drivers/ide/mips/ide-tx4939.c new file +10
-0+default : +return -1 ; + } + + data =inw (sc_port); + data &= ~TX4939_ATA_SC_MODE_MASK ; + data |= + mode | (TX4939_ATA_SC_MODE_XFER_PIO_4 & +TX4939_ATA_SC_CMD_MODE_MASK ); +outw (data, sc_port);
Please add tx4939_ide_set_mode(drive, mode) helper which can be used by tx4939_ide_tune_drive() and tx4939_ide_tune_chipset().
drivers/ide/mips/ide-tx4939.c line 200
Quoted 7 lines
drivers/ide/mips/ide-tx4939.c new file +7
-0+ } + +if (!drive->init_speed) { + drive->init_speed = speed; + } + + drive->current_speed = speed;
ide_config_drive_speed() updates drive->current_speed and drive->init_speed (if necessary).
drivers/ide/mips/ide-tx4939.c line 207
Quoted 7 lines
drivers/ide/mips/ide-tx4939.c new file +7
-0+ err =ide_config_drive_speed (drive, speed); + +return err; +} + +/* called from ide_cdrom_setup */ +void tx4939_ide_cdrom_setup (ide_drive_t * drive)
Some comment why this is needed would be helpful.
drivers/ide/mips/ide-tx4939.c line 219
Quoted 12 lines
drivers/ide/mips/ide-tx4939.c new file +12
-0+{ +unsigned int ch =GET_CH (HWIF (drive)); +ide_hwif_t *hwif =HWIF (drive); +int is_slave = (&hwif->drives[1 ] == drive); + +if (!is_slave) +reg_wr16 (&tx4939_ataptr (ch)->xfer_cnt1,CD_FRAMESIZE /2 );/* word, not byte */ +else +reg_wr16 (&tx4939_ataptr (ch)->xfer_cnt2,CD_FRAMESIZE /2 ); +} + +/* called from cdrom_transfer_packet_bytes */
This is no such function in the current kernel tree.
drivers/ide/mips/ide-tx4939.c line 222
Quoted 3 lines
drivers/ide/mips/ide-tx4939.c new file +3
-0+static void +tx4939_ide_atapi_output_bytes (ide_drive_t * drive,void *buffer, +unsigned int bytecount)
Some comment why this is needed would be helpful.
Quoted 8 lines
drivers/ide/mips/ide-tx4939.c new file +8
-0+{ +unsigned int ch =GET_CH (HWIF (drive)); +unsigned int i; +u16 s; + +if (bytecount <12 ) { +printk (KERN_ERR "tx4939_ide_atapi_output_command: bad count %d\n" , + bytecount);
drivers/ide/mips/ide-tx4939.c line 240
Quoted 10 lines
drivers/ide/mips/ide-tx4939.c new file +10
-0+return ; + } +#if 0 /* This driver uses Packet Command Register */ +for (i =0 ; i < bytecount; i +=2 ) { +OUT_WORD (*(u16 *) (buffer + i),IDE_DATA_REG ); + } +do { + }while ((IN_BYTE (IDE_NSECTOR_REG ) &0x1 ) ==0x1 );/* wait C/D clear */ +return ; +#endif
Dead code, please remove it.
Quoted 63 lines
drivers/ide/mips/ide-tx4939.c new file +63
-0+/* set interrupt mask (Data Transfer End) */ +reg_wr16 (&tx4939_ataptr (ch)->int_ctl,TX4939_ATA_IC_DATA_TRANSFER_END <<8 ); + +/* set the command packet in FIFO */ +for (i =0 ; i < bytecount; i +=2 ) { +reg_wr16 (&tx4939_ataptr (ch)->pkt_cmd, *(u16 *) (buffer + i)); + } + +/* set the transfer count and the packet start bit */ +reg_wr16 (&tx4939_ataptr (ch)->pkt_xfer_ct, + ((bytecount /2 -1 ) <<8 ) |TX4939_ATA_PTC_PACKET_START ); + +/* wait for command out from FIFO (Data Transfer End) */ +do { + s =reg_rd16 (&tx4939_ataptr (ch)->int_ctl); + }while (!(s &TX4939_ATA_IC_DATA_TRANSFER_END )); +reg_wr16 (&tx4939_ataptr (ch)->int_ctl, s &TX4939_ATA_IC_DATA_TRANSFER_END ); + +/* clear packet transfer count register and */ +reg_wr16 (&tx4939_ataptr (ch)->pkt_xfer_ct,0 ); +} + +/** +* tx4939_ide_intr - interrupt handler for TX4939-IDE +* @hwif: +* +* This function calls from ide_intr function which is entry point for +* all interrupts of IDE driver. +* +* If TX4939-IDE has HOSTINT interrupt (which indicates INTRQ), +* continues ide_intr process. +*/ + +#define INT_ERROR_MASK (TX4939_ATA_IC_BUS_ERROR |\ + TX4939_ATA_IC_DEV_TIMING_ERROR |\ + TX4939_ATA_IC_REACH_MALTIPLE_INT |\ + TX4939_ATA_IC_ADDRESS_ERROR_INT) + +static int tx4939_ide_intr (struct hwif_s *hwif) +{ +unsigned int ch =GET_CH (hwif); +ide_drive_t *drive; +u16 int_ctl; + + drive = hwif->drives; + +/* get and clear interrupt status */ + int_ctl =reg_rd16 (&tx4939_ataptr (ch)->int_ctl); +reg_wr16 (&tx4939_ataptr (ch)->int_ctl, int_ctl); +#ifdef DEBUG +/* check error sattus */ +if (int_ctl &INT_ERROR_MASK ) { +if (int_ctl &TX4939_ATA_IC_ADDRESS_ERROR_INT ) +printk (KERN_INFO "%s: Address Error\n" , drive->name); +if (int_ctl &TX4939_ATA_IC_REACH_MALTIPLE_INT ) +printk (KERN_INFO "%s: PIO transfer in the break state\n" , + drive->name); +if (int_ctl &TX4939_ATA_IC_DEV_TIMING_ERROR ) +printk (KERN_INFO "%s: Device timing error (out of spec) - 0x%04x\n" , + drive->name,reg_rd16 (&tx4939_ataptr (ch)->dev_terr)); +if (int_ctl &TX4939_ATA_IC_DMA_DEV_TERMINATE ) { + printk(KERN_INFO + "%s: The device terminated DMA transfer\n",
drivers/ide/mips/ide-tx4939.c line 314
Quoted 10 lines
drivers/ide/mips/ide-tx4939.c new file +10
-0+ drive->name); + } +if (int_ctl &TX4939_ATA_IC_BUS_ERROR ) +printk (KERN_INFO "%s: Bus error\n" , drive->name); + } +#endif +/* wait for transfer end in DMA mode */ +if (drive->waiting_for_dma ==1 ) { + wait_transfer_end[ch] |= int_ctl; +if ((wait_transfer_end[ch] &0x3 ) ==0x3 )
What is the purpose of wait_transfer_end[]?
It is only written with non-zero value in this function.
Quoted 16 lines
drivers/ide/mips/ide-tx4939.c new file +16
-0+return 1 ; +return 0 ; + } +return (int_ctl &TX4939_ATA_IC_HOSTINT ); +/* HOSTINT indicates that INTRQ */ +} + +/* returns 1 on error, 0 otherwise */ +static int tx4939_ide_dma_end (ide_drive_t *drive) +{ +ide_hwif_t *hwif =HWIF (drive); +unsigned int ch =GET_CH (HWIF (drive)); + +u8 dma_stat =0 , dma_cmd =0 ; + + drive->waiting_for_dma =0 ;
drivers/ide/mips/ide-tx4939.c line 340
Quoted 10 lines
drivers/ide/mips/ide-tx4939.c new file +10
-0+/* get dma_command mode */ + dma_cmd = hwif->INB (hwif->dma_command); +/* stop DMA */ + hwif->OUTB (dma_cmd&~1 , hwif->dma_command); +/* get DMA status */ + dma_stat = hwif->INB (hwif->dma_status); +/* clear the INTR & ERROR bits */ + hwif->OUTB (dma_stat|6 , hwif->dma_status); +/* purge DMA mappings */ +ide_destroy_dmatable (drive);
Why dma_stat is not checked?
drivers/ide/mips/ide-tx4939.c line 347
Quoted 6 lines
drivers/ide/mips/ide-tx4939.c new file +6
-0+return (reg_rd16 (&tx4939_ataptr (ch)->sec_cnt) !=0 ); +} + +static int tx4939_ide_dma_test_irq (ide_drive_t *drive) +{ +return 1 ;
Ehm?
Quoted 25 lines
drivers/ide/mips/ide-tx4939.c new file +25
-0+} + +/** +* tx4939_ide_config_drive_for_dma +* @drive +* +*/ + +static int +tx4939_ide_config_drive_for_dma (ide_drive_t * drive) +{ +ide_hwif_t *hwif =HWIF (drive); +struct hd_driveid *id = drive->id; +int ultra =1 ; +byte speed =0 ; +byte udma_66 =eighty_ninty_three (drive);/* hwif->udma_four 0:default 1:ATA66 */ + +if ((id->dma_ultra &0x0020 ) && (ultra)) { + speed = (udma_66) ?XFER_UDMA_5 :XFER_UDMA_2 ; + }else if ((id->dma_ultra &0x0010 ) && (ultra)) { + speed = (udma_66) ?XFER_UDMA_4 :XFER_UDMA_2 ; + }else if ((id->dma_ultra &0x0008 ) && (ultra)) { + speed = (udma_66) ?XFER_UDMA_3 :XFER_UDMA_1 ; + }else if ((id->dma_ultra &0x0004 ) && (ultra)) { + speed =XFER_UDMA_2 ;
drivers/ide/mips/ide-tx4939.c line 382
Quoted 10 lines
drivers/ide/mips/ide-tx4939.c new file +10
-0+ }else if ((id->dma_ultra &0x0002 ) && (ultra)) { + speed =XFER_UDMA_1 ; + }else if ((id->dma_ultra &0x0001 ) && (ultra)) { + speed =XFER_UDMA_0 ; + }else if (id->dma_mword &0x0004 ) { + speed =XFER_MW_DMA_2 ; + }else if (id->dma_mword &0x0002 ) { + speed =XFER_MW_DMA_1 ; + }else if (id->dma_1word &0x0004 ) { + speed =XFER_SW_DMA_2 ;
* DMA blacklist check is missing.
* (id->capability & 1) must be checked for DMA
* (id->field_valid & 4) must be checked before checking UDMA modes
* (id->field_valid & 2) must be checked before checking DMA modes
* What about MW DMA 0 and SW DMA 0-1?
Please use ide_use_dma() + ide_dma_speed() instead (see aec62xx.c)
Quoted 8 lines
drivers/ide/mips/ide-tx4939.c new file +8
-0+ }else { +/* speed = XFER_PIO_0 + ide_get_best_pio_mode(drive, 255, 5, NULL); */ +return hwif->ide_dma_off_quietly (drive); + } + +/* add command line TX4939IDE DMA setting */ +if (tx4939_ide_udma_mode && speed >=XFER_UDMA_0 ) { + speed =
drivers/ide/mips/ide-tx4939.c line 400
Quoted 10 lines
drivers/ide/mips/ide-tx4939.c new file +10
-0+ (tx4939_ide_udma_mode > + speed) ? speed : tx4939_ide_udma_mode; + } + +tx4939_ide_tune_chipset (drive, speed); + +return ((int ) ((id->dma_ultra >>11 ) &7 ) ? hwif->ide_dma_on (drive) : + ((id->dma_ultra >>8 ) &7 ) ? hwif->ide_dma_on (drive) : + ((id->dma_mword >>8 ) &7 ) ? hwif->ide_dma_on (drive) : + ((id->dma_1word >>8 ) &7 ) ? hwif->ide_dma_on (drive) : hwif->ide_dma_off_quietly (drive));
Please use ide_dma_enable().
Quoted 4 lines
drivers/ide/mips/ide-tx4939.c new file +4
-0+} + + +/**
drivers/ide/mips/ide-tx4939.c line 414
Quoted 10 lines
drivers/ide/mips/ide-tx4939.c new file +10
-0+* tx4939_ide_dma_check - check DMA setup +* @drive: drive to check +* +* Don't use - due for extermination +*/ + +static int tx4939_ide_dma_check (ide_drive_t *drive) +{ +return tx4939_ide_config_drive_for_dma (drive); +}
Needless wrapper, please remove it.
drivers/ide/mips/ide-tx4939.c line 423
Quoted 8 lines
drivers/ide/mips/ide-tx4939.c new file +8
-0+/** +* tx4939_ide_dma_setup - begin a DMA phase +* @drive: target device +* +* Build an IDE DMA PRD (IDE speak for scatter gather table) +* and then set up the DMA transfer registers for a device +* that follows generic IDE PCI DMA behaviour. Controllers can +* override this function if they need to
Comment copied from ide_setup_dma(), please remove it.
Quoted 21 lines
drivers/ide/mips/ide-tx4939.c new file +21
-0+* Returns 0 on success. If a PIO fallback is required then 1 +* is returned. +*/ + +static int tx4939_ide_dma_setup (ide_drive_t *drive) +{ +unsigned int ch =GET_CH (HWIF (drive)); +ide_hwif_t *hwif =HWIF (drive); +struct request *rq =HWGROUP (drive)->rq; +unsigned int reading; +u8 dma_stat; +u16 s; + +/* FIFO reset */ + s =reg_rd16 (&tx4939_ataptr (ch)->sysctl1); +reg_wr16 (&tx4939_ataptr (ch)->sysctl1, s|TX4939_ATA_SC_FIFO_RESET ); +wbflush (); +udelay (1 );/* ATA I/F controller spec 12 UPSCLK cycles */ + +/* set sector count (cpu:c10h) */ +if (!IS_ATAPI (drive)) {
drivers/ide/mips/ide-tx4939.c line 455
Quoted 10 lines
drivers/ide/mips/ide-tx4939.c new file +10
-0+reg_wr16 (&tx4939_ataptr (ch)->sec_cnt, rq->nr_sectors); + }else { +unsigned int nframes =0 ; +struct bio *b = rq->bio; +int is_slave = (&hwif->drives[1 ] == drive); + +do { + nframes += b->bi_size; + }while ((b = b->bi_next) !=NULL ); + nframes /=CD_FRAMESIZE ;
Layering violation - host drivers shouldn't access rq->bio. rq->hard_nr_sectors / CD_FRAMESIZE?
drivers/ide/mips/ide-tx4939.c line 461
Quoted 7 lines
drivers/ide/mips/ide-tx4939.c new file +5
-0+reg_wr16 (&tx4939_ataptr (ch)->sec_cnt, nframes); +if (!is_slave) +reg_wr16 (&tx4939_ataptr (ch)->xfer_cnt1,CD_FRAMESIZE /2 );/* word, not byte */ +else +reg_wr16 (&tx4939_ataptr (ch)->xfer_cnt2,CD_FRAMESIZE /2 );
Can't tx4939_ide_cdrom_setup() be used here?
drivers/ide/mips/ide-tx4939.c line 467
Quoted 5 lines
drivers/ide/mips/ide-tx4939.c new file +5
-0+ } + + wait_transfer_end[ch] =0 ; + +return ide_dma_setup (drive);
ide_dma_setup() requires CONFIG_BLK_DEV_IDEDMA_PCI=y.
Quoted 10 lines
drivers/ide/mips/ide-tx4939.c new file +10
-0+} + +/** +* tx4939_ide_init - initialize TX4939 IDE function +* @ch: TX4939-ATA controller channel +* +*/ +void __init tx4939_ide_init (int ch) +{ +hw_regs_t hw;
drivers/ide/mips/ide-tx4939.c line 487
Quoted 10 lines
drivers/ide/mips/ide-tx4939.c new file +10
-0+int i, idx; +int offsets[IDE_NR_PORTS ]; +void *base; +ide_hwif_t *hwif; +unsigned long dma_base; + +for (i =0 ; i <8 ; i++) + offsets[i] = i; + + offsets[IDE_CONTROL_OFFSET ] =TX4939_ATA_ALT_STATUS_OFFSET ;
offsets[IDE_IRQ_OFFSET] is uninitialized which can result in a wrong I/O port being reserved.
drivers/ide/mips/ide-tx4939.c line 493
Quoted 6 lines
drivers/ide/mips/ide-tx4939.c new file +6
-0+ base = (void *)(TX4939_ATA_REG (ch) - mips_io_port_base); + +memset (&hw,0 ,sizeof (hw)); + +ide_setup_ports (&hw, (unsigned long )base, offsets, +0 ,0 , tx4939_ide_intr,TX4939_IRQ_ATA (ch));
Please just use ide_std_init_ports() instead
(+ set ->ack_irq and ->irq).
Quoted 1 line
+ idx =
ide_register_hw(&hw, NULL);
ide_register_hw(&hw, &hwif);
Quoted 4 lines
drivers/ide/mips/ide-tx4939.c new file +4
-0+if (idx ==-1 ) { +printk (KERN_ERR "%s: IDE I/F register failed\n" , __FILE__); +return ; + }
drivers/ide/mips/ide-tx4939.c line 509
Quoted 10 lines
drivers/ide/mips/ide-tx4939.c new file +10
-0+ + hwif = &ide_hwifs[idx]; +printk (KERN_INFO "%s: TX4939 IDE interface\n" , hwif->name); + +/* set hwif functions */ + hwif->chipset = ide_tx4939; + hwif->tuneproc = tx4939_ide_tune_drive; + hwif->speedproc = tx4939_ide_tune_chipset; + + hwif->ultra_mask =0x7f ;
Shouldn't it be 0x3f (UDMA0-5)?
drivers/ide/mips/ide-tx4939.c line 521
Quoted 12 lines
drivers/ide/mips/ide-tx4939.c new file +12
-0+ hwif->mwdma_mask =0x07 ; + hwif->swdma_mask =0x07 ; + + hwif->mmio =0 ; + +/* cable(PDIAGN) check */ +if (!(hwif->udma_four)) { +unsigned int pdiagn; +/* bit13(PDIAGN) = 0:(80pin cable) 1:(40pin cable) */ + pdiagn = (reg_rd16 (&tx4939_ataptr (ch)->sysctl1) &TX4939_ATA_SC_PDIAGN ); + hwif->udma_four = pdiagn ?0 :1 ; + }
Please move cable detection into a separate function.
drivers/ide/mips/ide-tx4939.c line 531
Quoted 10 lines
drivers/ide/mips/ide-tx4939.c new file +10
-0+#ifdef CONFIG_BLK_DEV_IDEDMA + hwif->autodma =1 ; + hwif->atapi_dma =1 ; + hwif->ide_dma_check = &tx4939_ide_dma_check; + hwif->dma_setup = &tx4939_ide_dma_setup; + hwif->ide_dma_test_irq = &tx4939_ide_dma_test_irq; + hwif->ide_dma_end = &tx4939_ide_dma_end; + hwif->atapi_output_bytes = &tx4939_ide_atapi_output_bytes; + dma_base =TX4939_ATA_REG (ch) +TX4939_ATA_DMA_BASE_OFFSET - mips_io_port_base; +ide_setup_dma (hwif, dma_base,8 );
ide_setup_dma() also requires CONFIG_BLK_DEV_IDEDMA_PCI ("depends on BLK_DEV_IDEDMA_PCI" in Kconfig) and it also needs hwif->pci_dev for mapping S/G table but TX4939 doesn't have PCI associated device, right?.
Quoted 47 lines
drivers/ide/mips/ide-tx4939.c new file +3
-0+#endif /*CONFIG_BLK_DEV_IDEDMA */ +} +Index:
linux-2.6.10/include/asm-mips/tx4939/ide.h
===================================================================include/asm-mips/tx4939/ide.h new file +39
-0@@ -0,0 +1,71 @@ +/* +* include/asm-mips/tx4939/ide.h +* +* ide supplement routines +* +* (C) Copyright TOSHIBA CORPORATION SEMICONDUCTOR COMPANY 2005 +* +* Author: [email protected], +* Hiroshi DOYU <[email protected]> +* +* 2005 (c) MontaVista Software, Inc. This file is licensed under +* the terms of the GNU General Public License version 2. This program +* is licensed "as is" without any warranty of any kind, whether express +* or implied. +* +*/ + +#ifndef __ASM_MACH_TX4939_IDE_H +#define __ASM_MACH_TX4939_IDE_H + +#ifdef __KERNEL__ + +#ifndef MAX_HWIFS +# ifdef CONFIG_BLK_DEV_IDEPCI +#define MAX_HWIFS 10 +# else +#define MAX_HWIFS 6 +# endif +#endif + +/* +* Our Physical Region Descriptor (PRD) table should be large enough +* to handle the biggest I/O request we are likely to see. Since requests +* can have no more than 256 sectors, and since the typical blocksize is +* two or more sectors, we could get by with a limit of 128 entries here for +* the usual worst case. Most requests seem to include some contiguous blocks, +* further reducing the number of table entries required. +* +* The driver reverts to PIO mode for individual requests that exceed
include/asm-mips/tx4939/ide.h line 49
Quoted 10 lines
include/asm-mips/tx4939/ide.h new file +10
-0+* this limit (possible with 512 byte blocksizes, eg. MSDOS f/s), so handling +* 100% of all crazy scenarios here is not necessary. +* +* As it turns out though, we must allocate a full 4KB page for this, +* so the two PRD tables (ide0 & ide1) will each get half of that, +* allowing each to have about 256 entries (8 bytes each) from this. +*/ + +#define PRD_BYTES 8 +#define PRD_ENTRIES (PAGE_SIZE / (2 * PRD_BYTES))
The above comment and PRD_BYTES define is copied from <linux/ide.h> (PRD_ENTRIES is defined to 256 in <linux/ide.h>), why?
Quoted 26 lines
include/asm-mips/tx4939/ide.h new file +21
-0+ +#define ide_ack_intr (hwif) (hwif->hw.ack_intr ? hwif->hw.ack_intr(hwif) : 1) +#define IDE_ARCH_ACK_INTR + +#define __ide_insw insw +#define __ide_insl insl +#define __ide_outsw outsw +#define __ide_outsl outsl + +#define __ide_mm_insw readsw +#define __ide_mm_insl readsl +#define __ide_mm_outsw writesw +#define __ide_mm_outsl writesl + + +#endif /* __KERNEL__ */ + +#define IS_IDE_TX4939 (HWIF(drive)->chipset == ide_tx4939) + +#endif /* __ASM_MACH_TX4939_IDE_H */ +Index:
linux-2.6.10/include/linux/ide.h
===================================================================
include/linux/ide.h typedef enum { ide_unknown, ide_generic, · line 228
Quoted 6 lines
include/linux/ide.h +1
-0@@ -223,6 +223,7 @@ typedef enum { ide_unknown, ide_generic, ide_rz1000, ide_trm290, ide_cmd646, ide_cy82c693, ide_4drives, ide_pmac, ide_etrax100, ide_acorn, + ide_tx4939, ide_forced } hwif_chipset_t;
BTW Is there any documentation available for TX4939?
Thanks,
Bartlomiej
Quoted 1 line · Bartlomiej Zolnierkiewicz
On 9/29/05, Tom Rini <[email protected]> wrote:
[snip]
Quoted 5 lines
Review
Quoted 3 lines
(quoted diff) +3
-0+ /* save ata controller valiable */ + lo_bcnt = reg_rd16(&tx4939_ataptr(ch)->lo_bcnt); + hi_bcnt = reg_rd16(&tx4939_ataptr(ch)->hi_bcnt);Could I see
tx4939_ataptr()(I guess it is in <asm/tx4939/tx4939.h>)?
Indeed, sorry (lots of other stuff snipped out):
include/asm-mips/tx4939/tx4939.h new file +0 -0
@@ -0,0 +1,1670 @@
[snip]
+/* TX4939 REGISTER ADDRESS MAP */
+
+#define TX4939_REG_BASE 0xff1f0000
+#define TX4939_REG_SIZE 0x00010000
+
+#define TX4939_ATA_REG(ch) (TX4939_REG_BASE + 0x3000 + (ch) * 0x1000)
[snip]
+#ifdef __BIG_ENDIAN
+#define endian_def_s4(e1,e2,e3,e4) \
+ u16 e1,e2,e3,e4
+#else
+#define endian_def_s4(e1,e2,e3,e4) \
+ u16 e4,e3,e2,e1
+#endif /* __ASSEMBLY__ */
+
+/* TX4939 REGISTER STRUCTURE */
+
+#ifndef __ASSEMBLY__
+
+struct tx4939_ata_reg {
+ u64 ata_shadow;
+ u64 unused0[127];
+ endian_def_b8(unused10, unused11, unused12, unused13, unused14,
+ alt_devctl, unused16, unused17);
+ u64 unused1[127];
+ endian_def_b8(unused20, unused21, unused22, prd_tbl, unused24,
+ dma_stat, unused26, dma_cmd);
+ u64 unused2[127];
+ endian_def_s4(unused30, unused31, sysctl2, sysctl1); /* +0xc00 */
+ endian_def_s4(unused32, unused33, xfer_cnt2, xfer_cnt1);
+ endian_def_s4(unused34, unused35, unused36, sec_cnt);
+ endian_def_s4(unused37, unused38, unused39, strt_addl);
+ endian_def_s4(unused40, unused41, unused42, strt_addu);
+ endian_def_s4(unused43, unused44, unused45, add_ctrl);
+ endian_def_s4(unused46, unused47, unused48, lo_bcnt);
+ endian_def_s4(unused49, unused50, unused51, hi_bcnt);
+ volatile u64 unused52[9];
+ endian_def_s4(unused53, unused54, unused55, pio_acc); + endian_def_s4(unused56, unused57, unused58, h_rst_tim); + endian_def_s4(unused59, unused60, unused61, int_ctl); + volatile u64 unused62[3]; + endian_def_s4(unused63, unused64, unused65, pkt_cmd); + endian_def_s4(unused66, unused67, unused68, bxfer_cnth); + endian_def_s4(unused69, unused70, unused71, bxfer_cntl); + endian_def_s4(unused72, unused73, unused74, dev_terr); + endian_def_s4(unused75, unused76, unused77, pkt_xfer_ct); + endian_def_s4(unused78, unused79, unused80, strt_addr);
+};
[snip]
+#define tx4939_ataptr(ch) \
+ ((struct tx4939_ata_reg *)TX4939_ATA_REG(ch))
Signature · 2 lines
Tom Rini http://gate.crashing.org/~trini/
Hello.
Quoted 33 lines · Bartlomiej Zolnierkiewicz
Quoted 15 lines · Tom Rini
Hello. I'm submitting, mainly for review (questions, comments, etc) the IDE driver for the MIPS-based Toshiba RBTX4939. In some private emails with Bartlomiej about the ide-dma changes, I understand there's at least one problem with the driver (happy to fix with a pointer to a good example). And I see real quickly there's a few style things a Lindent'ing would fix. Thanks.
Signed-off-by Hiroshi DOYU <[email protected]>Signed-off-by Tom Rini <[email protected]>Index:
linux-2.6.10/drivers/ide/ide-cd.c
===================================================================drivers/ide/ide-cd.c static int cdrom_decode_status(ide_drive · line 687
Quoted 10 lines
drivers/ide/ide-cd.c +7
-0@@ -678,6 +678,13 @@ static int cdrom_decode_status(ide_drive err =HWIF (drive)->INB (IDE_ERROR_REG ); sense_key = err >>4 ; +#if defined(CONFIG_BLK_DEV_IDE_TX4939 ) +if (IS_IDE_TX4939 ) { +extern void tx4939_ide_softreset (ide_drive_t *); +tx4939_ide_softreset (drive); + } +#endif +Why is this needed?
Moreover if you really need to hook into device driver please add generic interface (i.e.
hwif->atapi_softreset) not chipset specific #fidefs.
Quoted 16 lines
Quoted 4 lines
drivers/ide/ide-cd.c +0
-0if (rq ==NULL ) {printk ("%s: missing rq in cdrom_decode_status\n" , drive->name);return 1 ;drivers/ide/ide-cd.c int ide_cdrom_setup (ide_drive_t *drive) · line 3269
Quoted 10 lines
drivers/ide/ide-cd.c +6
-1@@ -3254,7 +3261,12 @@ int ide_cdrom_setup (ide_drive_t *drive) info->changer_info =NULL ; info->last_block =0 ; info->start_seek =0 ; - +#ifdef CONFIG_BLK_DEV_IDE_TX4939 + { +extern void tx4939_ide_cdrom_setup (ide_drive_t *drive); +tx4939_ide_cdrom_setup (drive); + } +#endif ditto
Not sure that this was needed at all. At laest I've manget to do witjout
it in another, alike Toshiba driver (still hoping to submit it some day). Maybe I'll try to resubmit this driver as well since the ATAPI support in it appeared to be buggy anyway...
Quoted 13 lines
Quoted 13 lines
Index:
linux-2.6.10/drivers/ide/ide-dma.c
===================================================================drivers/ide/ide-dma.c +2
-1@@ -856,7 +856,8 @@ int ide_mapped_mmio_dma (ide_hwif_t *hwiprintk (KERN_INFO " %s: MMIO-DMA " , hwif->name); hwif->dma_base = base; -if (hwif->cds->extra && hwif->channel ==0 ) + +if (hwif->cds && hwif->cds->extra && hwif->channel ==0 ) hwif->dma_extra = hwif->cds->extra;
Quoted 10 lines
drivers/ide/ide-dma.c int ide_iomio_dma (ide_hwif_t *hwif, uns · line 882
Quoted 10 lines
drivers/ide/ide-dma.c +1
-1if (hwif->mate)@@ -875,7 +876,7 @@ int ide_iomio_dma (ide_hwif_t *hwif, unsreturn 1 ; } hwif->dma_base = base; -if ((hwif->cds->extra) && (hwif->channel ==0 )) { +if (hwif->cds && (hwif->cds->extra) && (hwif->channel ==0 )) {request_region (base+16 , hwif->cds->extra, hwif->cds->name); hwif->dma_extra = hwif->cds->extra; }
This is due to erroneous use of ide_setup_dma(), should disappear.
Quoted 10 lines
Quoted 10 lines
Index:
linux-2.6.10/drivers/ide/ide.c
===================================================================drivers/ide/ide.c +2
-0@@ -2151,6 +2151,15 @@ static void __init probe_for_hwifs (voidswarm_ide_probe (); }#endif /* CONFIG_BLK_IDE_SWARM */ +#ifdef CONFIG_BLK_DEV_IDE_TX4939 + {
Quoted 8 lines
drivers/ide/ide.c static void __init probe_for_hwifs (void · line 2160
Quoted 5 lines
drivers/ide/ide.c +5
-0+extern void tx4939_ide_init (int ch); +tx4939_ide_init (0 ); +#ifdef CONFIG_TOSHIBA_TX4939_MPLEX_ATA1 +tx4939_ide_init (1 ); +#endif
CONFIG_TOSHIBA_TX4939_MPLEX_ATA1should be checked
insideide-tx4939.candtx4939_ide_init()should take 'void' argument.
Yes, this was horrible. As well as any Toshiba IDE driver seen by me so
far... :-)
Quoted 11 lines
drivers/ide/mips/ide-tx4939.c line 41
Quoted 9 lines
Index:
linux-2.6.10/drivers/ide/mips/ide-tx4939.c
===================================================================drivers/ide/mips/ide-tx4939.c new file +4
-0+/* wait for transfer end */ +static u16 wait_transfer_end[2 ]; + +#define IS_ATAPI (drive) ((drive)->media == ide_cdrom || (drive)->media == ide_scsi)What about
ide_optical/ide_floppy/ide_tape?
This driver is prepared to handle only CD-ROMs I guess...
Quoted 9 lines
Quoted 1 line
+#define
GET_CH(hwif)(hwif->irq==TX4939_IRQ_ATA(0)? 0 : 1)What about using
hwif->channelinstead?drivers/ide/mips/ide-tx4939.c line 46
Quoted 3 lines
drivers/ide/mips/ide-tx4939.c new file +3
-0+void tx4939_ide_softreset (ide_drive_t * drive) +{ +int ch =GET_CH (HWIF (drive));Please don't use
HWIF()andHWHROUP()macros.
Hm, what's wrong with them (I stuck to using them in the HighPoint driver
rewrite)?
Quoted 7 lines
drivers/ide/mips/ide-tx4939.c line 95
Quoted 5 lines
drivers/ide/mips/ide-tx4939.c new file +5
-0+ sc_port = (!is_slave) ? + data_port +TX4939_ATA_SYSTEM_CONTROL1_OFFSET : + data_port +TX4939_ATA_SYSTEM_CONTROL2_OFFSET ; + +if (!hwif->channel) {/* primary */ Why only primary channel is tuned?
You won't believe: it's single channel, and that's how Toshiba deals with
this. :-)
Worse still: this controller has only _one_ timing register for both
master and slave, and doesn't define selectproc! Though wait, they prefer to handle this in tx4939_ide_outb(). The driver seems even more broken-minded than I initially thought... And that tuneproc() stupidity where they're clearing the DMA mode...
Quoted 9 lines
drivers/ide/mips/ide-tx4939.c line 207
Quoted 7 lines
drivers/ide/mips/ide-tx4939.c new file +7
-0+ err =ide_config_drive_speed (drive, speed); + +return err; +} + +/* called from ide_cdrom_setup */ +void tx4939_ide_cdrom_setup (ide_drive_t * drive)Some comment why this is needed would be helpful.
To set the sector size, IIUC. The stupid DMA engine relies on that.
Quoted 6 lines
Quoted 6 lines
drivers/ide/mips/ide-tx4939.c new file +6
-0+{ +unsigned int ch =GET_CH (HWIF (drive)); +ide_hwif_t *hwif =HWIF (drive); +int is_slave = (&hwif->drives[1 ] == drive); + +if (!is_slave)
Quoted 8 lines
drivers/ide/mips/ide-tx4939.c line 219
Quoted 6 lines
drivers/ide/mips/ide-tx4939.c new file +6
-0+reg_wr16 (&tx4939_ataptr (ch)->xfer_cnt1,CD_FRAMESIZE /2 );/* word, not byte */ + else + reg_wr16(&tx4939_ataptr(ch)->xfer_cnt2, CD_FRAMESIZE / 2); +} + +/* called from cdrom_transfer_packet_bytes */ This is no such function in the current kernel tree.
I guess the driver was taken from 2.4, and thrown into 2.6...
Quoted 5 lines
drivers/ide/mips/ide-tx4939.c line 222
Quoted 3 lines
drivers/ide/mips/ide-tx4939.c new file +3
-0+static void +tx4939_ide_atapi_output_bytes (ide_drive_t * drive,void *buffer, +unsigned int bytecount)Some comment why this is needed would be helpful.
To feed the ATAPI packet to device. That thing is totally broken-minded --
makes ATAPI device non-writeable. And in addition, it's not even necessary, IIUC... Toshiba just can't do it... :-(
Quoted 8 lines
drivers/ide/mips/ide-tx4939.c line 461
Quoted 6 lines
drivers/ide/mips/ide-tx4939.c new file +5
-0+reg_wr16 (&tx4939_ataptr (ch)->sec_cnt, nframes); +if (!is_slave) +reg_wr16 (&tx4939_ataptr (ch)->xfer_cnt1,CD_FRAMESIZE /2 );/* word, not byte */ +else +reg_wr16 (&tx4939_ataptr (ch)->xfer_cnt2,CD_FRAMESIZE /2 );Can't
tx4939_ide_cdrom_setup()be used here?
Sure, it can. But actually, one shouldn't even bother with the sector
sizes leaving tham 512, IIUC...
Quoted 6 lines
Quoted 6 lines
drivers/ide/mips/ide-tx4939.c new file +6
-0+ hwif->mwdma_mask =0x07 ; + hwif->swdma_mask =0x07 ; + + hwif->mmio =0 ; + +/* cable(PDIAGN) check */
Quoted 8 lines
drivers/ide/mips/ide-tx4939.c line 521
Quoted 6 lines
drivers/ide/mips/ide-tx4939.c new file +6
-0+if (!(hwif->udma_four)) { +unsigned int pdiagn; +/* bit13(PDIAGN) = 0:(80pin cable) 1:(40pin cable) */ + pdiagn = (reg_rd16 (&tx4939_ataptr (ch)->sysctl1) &TX4939_ATA_SC_PDIAGN ); + hwif->udma_four = pdiagn ?0 :1 ; + }Please move cable detection into a separate function.
What's the point? Cable detection is not the driver method for a long time
already...
Quoted 1 line
Quoted 1 line
+
hwif->atapi_output_bytes=&tx4939_ide_atapi_output_bytes;
Never ever think of hooking this...
Quoted 7 lines
drivers/ide/mips/ide-tx4939.c line 531
Quoted 2 lines
drivers/ide/mips/ide-tx4939.c new file +2
-0+ dma_base =TX4939_ATA_REG (ch) +TX4939_ATA_DMA_BASE_OFFSET - mips_io_port_base; +ide_setup_dma (hwif, dma_base,8 );
ide_setup_dma()also requiresCONFIG_BLK_DEV_IDEDMA_PCI("depends onBLK_DEV_IDEDMA_PCI" inKconfig) and it also needshwif->pci_devfor mapping S/G table but TX4939 doesn't have PCI associated device, right?.
Right, that code is just b0rked...
Quoted 1 line
BTW Is there any documentation available for TX4939?
The datasheet is here:
MBR, Sergei
Quoted 18 lines · Hello, I wrote:
Quoted 18 lines
Quoted 18 lines
Hello. I'm submitting, mainly for review (questions, comments, etc) the IDE driver for the MIPS-based Toshiba RBTX4939. In some private emails with Bartlomiej about the ide-dma changes, I understand there's at least one problem with the driver (happy to fix with a pointer to a good example). And I see real quickly there's a few style things a Lindent'ing would fix. Thanks.
Signed-off-by Hiroshi DOYU <[email protected]>Signed-off-by Tom Rini <[email protected]>Index:
linux-2.6.10/drivers/ide/ide-cd.c
===================================================================drivers/ide/ide-cd.c +0
-0@@ -678,6 +678,13 @@ static int cdrom_decode_status(ide_drive err =HWIF (drive)->INB (IDE_ERROR_REG ); sense_key = err >>4 ;
Quoted 9 lines
Quoted 9 lines
drivers/ide/ide-cd.c static int cdrom_decode_status(ide_drive · line 687
Quoted 7 lines
drivers/ide/ide-cd.c +7
-0+#if defined(CONFIG_BLK_DEV_IDE_TX4939 ) +if (IS_IDE_TX4939 ) { +extern void tx4939_ide_softreset (ide_drive_t *); +tx4939_ide_softreset (drive); + } +#endif +Why is this needed?
The datasheet says only about the DMA transfer being stopped by a bus
error case. So, who knows? I'm afraid, even Toshiba engineers don't... :-)
Quoted 11 lines
Quoted 10 lines
Quoted 10 lines
Index:
linux-2.6.10/drivers/ide/mips/ide-tx4939.c
===================================================================drivers/ide/mips/ide-tx4939.c new file +5
-0+ sc_port = (!is_slave) ? + data_port +TX4939_ATA_SYSTEM_CONTROL1_OFFSET : + data_port +TX4939_ATA_SYSTEM_CONTROL2_OFFSET ; + +if (!hwif->channel) {/* primary */
Quoted 4 lines
Quoted 1 line
Why only primary channel is tuned?
You won't believe: it's single channel, and that's how Toshiba deals
with this. :-)
Worse, it's dual channel. Then I have no idea other than that this was
copied from another driver for the single-channel chip (I've seen such code already). Oh, horror... :-/
Quoted 2 lines
Worse still: this controller has only _one_ timing register for both
master and slave, and doesn't define selectproc!
BTW, the datasheet is contradictory here. The register map has 2 system
control regs per channel, while ATAP setcion says about the single one, and warns that it must be changed with every change of DEV bit...
Quoted 1 line
Though wait, they prefer to handle this in
tx4939_ide_outb(). The driver seems even more broken-minded than I initially thought... And thattuneproc()stupidity where they're clearing the DMA mode...
Well, this is not as stupid, DMA mode should be off anyway...
MBR, Sergei