cmd64x: fix multiword and remove single-word DMA support
Fix the multiword DMA and drop the single-word DMA support (which nobody will
miss, I think). In order to do it, a number of changes was necessary:
- rename program_drive_counts() to program_cycle_times(), pass to it cycle's
total/active times instead of the clock counts, and convert them into the
active/recovery clocks there instead of cmd64x_tune_pio() -- this causes
quantize_timing() to also move;
- contrarywise, move all the code handling the address setup timing into
cmd64x_tune_pio(), so that setting MWDMA mode wouldn't change address setup;
- remove from the speedproc() method the bogus code pretending to set the DMA
timings by twiddling bits in the BMIDE status register, handle setting MWDMA
by just calling program_cycle_times(); while at it, improve the style of that
whole switch statement;
- stop fiddling with the DMA capable bits in the speedproc() method -- they do
not enable DMA, and are properly dealt with by the dma_host_{on,off} methods;
- don't set hwif->swdma_mask in the init_hwif() method anymore.
In addition to those changes, do the following:
- in cmd64x_tune_pio(), when writing to ARTTIM23 register preserve the interrupt
status bit, eliminate local_irq_{save|restore}() around this code as there's
*no* actual race with the interrupt handler, and move cmdprintk() to a more
fitting place -- after ide_get_best_pio_mode() call;
- make {arttim|drwtim}_regs arrays single-dimensional, indexed with drive->dn;
- rename {setup|recovery}_counts[] into more fitting {setup|recovery}_values[];
- in the speedproc() method, get rid of the duplicate reads/writes from/to the
UDIDETCRx registers and of the extra variable used to store the transfer mode
value after filtering, use another method of determining master/slave drive,
and cleanup useless parens;
- beautify cmdprintk() output here and there.
While at it, remove meaningless comment about the driver being used only on
UltraSPARC and long non-relevant RCS tag. :-)
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2007-05-06 04:03:49 +08:00
|
|
|
/*
|
2007-07-10 05:17:55 +08:00
|
|
|
* linux/drivers/ide/pci/cmd64x.c Version 1.50 May 10, 2007
|
2005-04-17 06:20:36 +08:00
|
|
|
*
|
|
|
|
|
* cmd64x.c: Enable interrupts at initialization time on Ultra/PCI machines.
|
|
|
|
|
* Due to massive hardware bugs, UltraDMA is only supported
|
|
|
|
|
* on the 646U2 and not on the 646U.
|
|
|
|
|
*
|
|
|
|
|
* Copyright (C) 1998 Eddie C. Dost (ecd@skynet.be)
|
|
|
|
|
* Copyright (C) 1998 David S. Miller (davem@redhat.com)
|
|
|
|
|
*
|
|
|
|
|
* Copyright (C) 1999-2002 Andre Hedrick <andre@linux-ide.org>
|
2007-03-04 00:48:53 +08:00
|
|
|
* Copyright (C) 2007 MontaVista Software, Inc. <source@mvista.com>
|
2005-04-17 06:20:36 +08:00
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <linux/module.h>
|
|
|
|
|
#include <linux/types.h>
|
|
|
|
|
#include <linux/pci.h>
|
|
|
|
|
#include <linux/delay.h>
|
|
|
|
|
#include <linux/hdreg.h>
|
|
|
|
|
#include <linux/ide.h>
|
|
|
|
|
#include <linux/init.h>
|
|
|
|
|
|
|
|
|
|
#include <asm/io.h>
|
|
|
|
|
|
|
|
|
|
#define DISPLAY_CMD64X_TIMINGS
|
|
|
|
|
|
|
|
|
|
#define CMD_DEBUG 0
|
|
|
|
|
|
|
|
|
|
#if CMD_DEBUG
|
|
|
|
|
#define cmdprintk(x...) printk(x)
|
|
|
|
|
#else
|
|
|
|
|
#define cmdprintk(x...)
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* CMD64x specific registers definition.
|
|
|
|
|
*/
|
|
|
|
|
#define CFR 0x50
|
2007-05-06 04:03:49 +08:00
|
|
|
#define CFR_INTR_CH0 0x04
|
2005-04-17 06:20:36 +08:00
|
|
|
#define CNTRL 0x51
|
2007-05-06 04:03:50 +08:00
|
|
|
#define CNTRL_ENA_1ST 0x04
|
|
|
|
|
#define CNTRL_ENA_2ND 0x08
|
|
|
|
|
#define CNTRL_DIS_RA0 0x40
|
|
|
|
|
#define CNTRL_DIS_RA1 0x80
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
#define CMDTIM 0x52
|
|
|
|
|
#define ARTTIM0 0x53
|
|
|
|
|
#define DRWTIM0 0x54
|
|
|
|
|
#define ARTTIM1 0x55
|
|
|
|
|
#define DRWTIM1 0x56
|
|
|
|
|
#define ARTTIM23 0x57
|
|
|
|
|
#define ARTTIM23_DIS_RA2 0x04
|
|
|
|
|
#define ARTTIM23_DIS_RA3 0x08
|
|
|
|
|
#define ARTTIM23_INTR_CH1 0x10
|
|
|
|
|
#define DRWTIM2 0x58
|
|
|
|
|
#define BRST 0x59
|
|
|
|
|
#define DRWTIM3 0x5b
|
|
|
|
|
|
|
|
|
|
#define BMIDECR0 0x70
|
|
|
|
|
#define MRDMODE 0x71
|
|
|
|
|
#define MRDMODE_INTR_CH0 0x04
|
|
|
|
|
#define MRDMODE_INTR_CH1 0x08
|
|
|
|
|
#define MRDMODE_BLK_CH0 0x10
|
|
|
|
|
#define MRDMODE_BLK_CH1 0x20
|
|
|
|
|
#define BMIDESR0 0x72
|
|
|
|
|
#define UDIDETCR0 0x73
|
|
|
|
|
#define DTPR0 0x74
|
|
|
|
|
#define BMIDECR1 0x78
|
|
|
|
|
#define BMIDECSR 0x79
|
|
|
|
|
#define BMIDESR1 0x7A
|
|
|
|
|
#define UDIDETCR1 0x7B
|
|
|
|
|
#define DTPR1 0x7C
|
|
|
|
|
|
2007-05-10 06:01:09 +08:00
|
|
|
#if defined(DISPLAY_CMD64X_TIMINGS) && defined(CONFIG_IDE_PROC_FS)
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <linux/stat.h>
|
|
|
|
|
#include <linux/proc_fs.h>
|
|
|
|
|
|
|
|
|
|
static u8 cmd64x_proc = 0;
|
|
|
|
|
|
|
|
|
|
#define CMD_MAX_DEVS 5
|
|
|
|
|
|
|
|
|
|
static struct pci_dev *cmd_devs[CMD_MAX_DEVS];
|
|
|
|
|
static int n_cmd_devs;
|
|
|
|
|
|
|
|
|
|
static char * print_cmd64x_get_info (char *buf, struct pci_dev *dev, int index)
|
|
|
|
|
{
|
|
|
|
|
char *p = buf;
|
|
|
|
|
u8 reg72 = 0, reg73 = 0; /* primary */
|
|
|
|
|
u8 reg7a = 0, reg7b = 0; /* secondary */
|
2007-05-06 04:03:50 +08:00
|
|
|
u8 reg50 = 1, reg51 = 1, reg57 = 0, reg71 = 0; /* extra */
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
p += sprintf(p, "\nController: %d\n", index);
|
2007-05-06 04:03:50 +08:00
|
|
|
p += sprintf(p, "PCI-%x Chipset.\n", dev->device);
|
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
(void) pci_read_config_byte(dev, CFR, ®50);
|
2007-05-06 04:03:50 +08:00
|
|
|
(void) pci_read_config_byte(dev, CNTRL, ®51);
|
|
|
|
|
(void) pci_read_config_byte(dev, ARTTIM23, ®57);
|
2005-04-17 06:20:36 +08:00
|
|
|
(void) pci_read_config_byte(dev, MRDMODE, ®71);
|
|
|
|
|
(void) pci_read_config_byte(dev, BMIDESR0, ®72);
|
|
|
|
|
(void) pci_read_config_byte(dev, UDIDETCR0, ®73);
|
|
|
|
|
(void) pci_read_config_byte(dev, BMIDESR1, ®7a);
|
|
|
|
|
(void) pci_read_config_byte(dev, UDIDETCR1, ®7b);
|
|
|
|
|
|
2007-05-06 04:03:50 +08:00
|
|
|
/* PCI0643/6 originally didn't have the primary channel enable bit */
|
|
|
|
|
if ((dev->device == PCI_DEVICE_ID_CMD_643) ||
|
2007-06-09 06:46:36 +08:00
|
|
|
(dev->device == PCI_DEVICE_ID_CMD_646 && dev->revision < 3))
|
2007-05-06 04:03:50 +08:00
|
|
|
reg51 |= CNTRL_ENA_1ST;
|
|
|
|
|
|
|
|
|
|
p += sprintf(p, "---------------- Primary Channel "
|
|
|
|
|
"---------------- Secondary Channel ------------\n");
|
|
|
|
|
p += sprintf(p, " %s %s\n",
|
|
|
|
|
(reg51 & CNTRL_ENA_1ST) ? "enabled " : "disabled",
|
|
|
|
|
(reg51 & CNTRL_ENA_2ND) ? "enabled " : "disabled");
|
|
|
|
|
p += sprintf(p, "---------------- drive0 --------- drive1 "
|
|
|
|
|
"-------- drive0 --------- drive1 ------\n");
|
|
|
|
|
p += sprintf(p, "DMA enabled: %s %s"
|
|
|
|
|
" %s %s\n",
|
|
|
|
|
(reg72 & 0x20) ? "yes" : "no ", (reg72 & 0x40) ? "yes" : "no ",
|
|
|
|
|
(reg7a & 0x20) ? "yes" : "no ", (reg7a & 0x40) ? "yes" : "no ");
|
|
|
|
|
p += sprintf(p, "UltraDMA mode: %s (%c) %s (%c)",
|
|
|
|
|
( reg73 & 0x01) ? " on" : "off",
|
|
|
|
|
((reg73 & 0x30) == 0x30) ? ((reg73 & 0x04) ? '3' : '0') :
|
|
|
|
|
((reg73 & 0x30) == 0x20) ? ((reg73 & 0x04) ? '3' : '1') :
|
|
|
|
|
((reg73 & 0x30) == 0x10) ? ((reg73 & 0x04) ? '4' : '2') :
|
|
|
|
|
((reg73 & 0x30) == 0x00) ? ((reg73 & 0x04) ? '5' : '2') : '?',
|
|
|
|
|
( reg73 & 0x02) ? " on" : "off",
|
|
|
|
|
((reg73 & 0xC0) == 0xC0) ? ((reg73 & 0x08) ? '3' : '0') :
|
|
|
|
|
((reg73 & 0xC0) == 0x80) ? ((reg73 & 0x08) ? '3' : '1') :
|
|
|
|
|
((reg73 & 0xC0) == 0x40) ? ((reg73 & 0x08) ? '4' : '2') :
|
|
|
|
|
((reg73 & 0xC0) == 0x00) ? ((reg73 & 0x08) ? '5' : '2') : '?');
|
|
|
|
|
p += sprintf(p, " %s (%c) %s (%c)\n",
|
|
|
|
|
( reg7b & 0x01) ? " on" : "off",
|
|
|
|
|
((reg7b & 0x30) == 0x30) ? ((reg7b & 0x04) ? '3' : '0') :
|
|
|
|
|
((reg7b & 0x30) == 0x20) ? ((reg7b & 0x04) ? '3' : '1') :
|
|
|
|
|
((reg7b & 0x30) == 0x10) ? ((reg7b & 0x04) ? '4' : '2') :
|
|
|
|
|
((reg7b & 0x30) == 0x00) ? ((reg7b & 0x04) ? '5' : '2') : '?',
|
|
|
|
|
( reg7b & 0x02) ? " on" : "off",
|
|
|
|
|
((reg7b & 0xC0) == 0xC0) ? ((reg7b & 0x08) ? '3' : '0') :
|
|
|
|
|
((reg7b & 0xC0) == 0x80) ? ((reg7b & 0x08) ? '3' : '1') :
|
|
|
|
|
((reg7b & 0xC0) == 0x40) ? ((reg7b & 0x08) ? '4' : '2') :
|
|
|
|
|
((reg7b & 0xC0) == 0x00) ? ((reg7b & 0x08) ? '5' : '2') : '?');
|
|
|
|
|
p += sprintf(p, "Interrupt: %s, %s %s, %s\n",
|
|
|
|
|
(reg71 & MRDMODE_BLK_CH0 ) ? "blocked" : "enabled",
|
|
|
|
|
(reg50 & CFR_INTR_CH0 ) ? "pending" : "clear ",
|
|
|
|
|
(reg71 & MRDMODE_BLK_CH1 ) ? "blocked" : "enabled",
|
|
|
|
|
(reg57 & ARTTIM23_INTR_CH1) ? "pending" : "clear ");
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
return (char *)p;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int cmd64x_get_info (char *buffer, char **addr, off_t offset, int count)
|
|
|
|
|
{
|
|
|
|
|
char *p = buffer;
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < n_cmd_devs; i++) {
|
|
|
|
|
struct pci_dev *dev = cmd_devs[i];
|
|
|
|
|
p = print_cmd64x_get_info(p, dev, i);
|
|
|
|
|
}
|
|
|
|
|
return p-buffer; /* => must be less than 4k! */
|
|
|
|
|
}
|
|
|
|
|
|
2007-05-10 06:01:09 +08:00
|
|
|
#endif /* defined(DISPLAY_CMD64X_TIMINGS) && defined(CONFIG_IDE_PROC_FS) */
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-03-18 04:57:24 +08:00
|
|
|
static u8 quantize_timing(int timing, int quant)
|
|
|
|
|
{
|
|
|
|
|
return (timing + quant - 1) / quant;
|
|
|
|
|
}
|
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/*
|
cmd64x: fix multiword and remove single-word DMA support
Fix the multiword DMA and drop the single-word DMA support (which nobody will
miss, I think). In order to do it, a number of changes was necessary:
- rename program_drive_counts() to program_cycle_times(), pass to it cycle's
total/active times instead of the clock counts, and convert them into the
active/recovery clocks there instead of cmd64x_tune_pio() -- this causes
quantize_timing() to also move;
- contrarywise, move all the code handling the address setup timing into
cmd64x_tune_pio(), so that setting MWDMA mode wouldn't change address setup;
- remove from the speedproc() method the bogus code pretending to set the DMA
timings by twiddling bits in the BMIDE status register, handle setting MWDMA
by just calling program_cycle_times(); while at it, improve the style of that
whole switch statement;
- stop fiddling with the DMA capable bits in the speedproc() method -- they do
not enable DMA, and are properly dealt with by the dma_host_{on,off} methods;
- don't set hwif->swdma_mask in the init_hwif() method anymore.
In addition to those changes, do the following:
- in cmd64x_tune_pio(), when writing to ARTTIM23 register preserve the interrupt
status bit, eliminate local_irq_{save|restore}() around this code as there's
*no* actual race with the interrupt handler, and move cmdprintk() to a more
fitting place -- after ide_get_best_pio_mode() call;
- make {arttim|drwtim}_regs arrays single-dimensional, indexed with drive->dn;
- rename {setup|recovery}_counts[] into more fitting {setup|recovery}_values[];
- in the speedproc() method, get rid of the duplicate reads/writes from/to the
UDIDETCRx registers and of the extra variable used to store the transfer mode
value after filtering, use another method of determining master/slave drive,
and cleanup useless parens;
- beautify cmdprintk() output here and there.
While at it, remove meaningless comment about the driver being used only on
UltraSPARC and long non-relevant RCS tag. :-)
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2007-05-06 04:03:49 +08:00
|
|
|
* This routine calculates active/recovery counts and then writes them into
|
|
|
|
|
* the chipset registers.
|
2005-04-17 06:20:36 +08:00
|
|
|
*/
|
cmd64x: fix multiword and remove single-word DMA support
Fix the multiword DMA and drop the single-word DMA support (which nobody will
miss, I think). In order to do it, a number of changes was necessary:
- rename program_drive_counts() to program_cycle_times(), pass to it cycle's
total/active times instead of the clock counts, and convert them into the
active/recovery clocks there instead of cmd64x_tune_pio() -- this causes
quantize_timing() to also move;
- contrarywise, move all the code handling the address setup timing into
cmd64x_tune_pio(), so that setting MWDMA mode wouldn't change address setup;
- remove from the speedproc() method the bogus code pretending to set the DMA
timings by twiddling bits in the BMIDE status register, handle setting MWDMA
by just calling program_cycle_times(); while at it, improve the style of that
whole switch statement;
- stop fiddling with the DMA capable bits in the speedproc() method -- they do
not enable DMA, and are properly dealt with by the dma_host_{on,off} methods;
- don't set hwif->swdma_mask in the init_hwif() method anymore.
In addition to those changes, do the following:
- in cmd64x_tune_pio(), when writing to ARTTIM23 register preserve the interrupt
status bit, eliminate local_irq_{save|restore}() around this code as there's
*no* actual race with the interrupt handler, and move cmdprintk() to a more
fitting place -- after ide_get_best_pio_mode() call;
- make {arttim|drwtim}_regs arrays single-dimensional, indexed with drive->dn;
- rename {setup|recovery}_counts[] into more fitting {setup|recovery}_values[];
- in the speedproc() method, get rid of the duplicate reads/writes from/to the
UDIDETCRx registers and of the extra variable used to store the transfer mode
value after filtering, use another method of determining master/slave drive,
and cleanup useless parens;
- beautify cmdprintk() output here and there.
While at it, remove meaningless comment about the driver being used only on
UltraSPARC and long non-relevant RCS tag. :-)
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2007-05-06 04:03:49 +08:00
|
|
|
static void program_cycle_times (ide_drive_t *drive, int cycle_time, int active_time)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
cmd64x: fix multiword and remove single-word DMA support
Fix the multiword DMA and drop the single-word DMA support (which nobody will
miss, I think). In order to do it, a number of changes was necessary:
- rename program_drive_counts() to program_cycle_times(), pass to it cycle's
total/active times instead of the clock counts, and convert them into the
active/recovery clocks there instead of cmd64x_tune_pio() -- this causes
quantize_timing() to also move;
- contrarywise, move all the code handling the address setup timing into
cmd64x_tune_pio(), so that setting MWDMA mode wouldn't change address setup;
- remove from the speedproc() method the bogus code pretending to set the DMA
timings by twiddling bits in the BMIDE status register, handle setting MWDMA
by just calling program_cycle_times(); while at it, improve the style of that
whole switch statement;
- stop fiddling with the DMA capable bits in the speedproc() method -- they do
not enable DMA, and are properly dealt with by the dma_host_{on,off} methods;
- don't set hwif->swdma_mask in the init_hwif() method anymore.
In addition to those changes, do the following:
- in cmd64x_tune_pio(), when writing to ARTTIM23 register preserve the interrupt
status bit, eliminate local_irq_{save|restore}() around this code as there's
*no* actual race with the interrupt handler, and move cmdprintk() to a more
fitting place -- after ide_get_best_pio_mode() call;
- make {arttim|drwtim}_regs arrays single-dimensional, indexed with drive->dn;
- rename {setup|recovery}_counts[] into more fitting {setup|recovery}_values[];
- in the speedproc() method, get rid of the duplicate reads/writes from/to the
UDIDETCRx registers and of the extra variable used to store the transfer mode
value after filtering, use another method of determining master/slave drive,
and cleanup useless parens;
- beautify cmdprintk() output here and there.
While at it, remove meaningless comment about the driver being used only on
UltraSPARC and long non-relevant RCS tag. :-)
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2007-05-06 04:03:49 +08:00
|
|
|
struct pci_dev *dev = HWIF(drive)->pci_dev;
|
|
|
|
|
int clock_time = 1000 / system_bus_clock();
|
|
|
|
|
u8 cycle_count, active_count, recovery_count, drwtim;
|
|
|
|
|
static const u8 recovery_values[] =
|
2005-04-17 06:20:36 +08:00
|
|
|
{15, 15, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 0};
|
cmd64x: fix multiword and remove single-word DMA support
Fix the multiword DMA and drop the single-word DMA support (which nobody will
miss, I think). In order to do it, a number of changes was necessary:
- rename program_drive_counts() to program_cycle_times(), pass to it cycle's
total/active times instead of the clock counts, and convert them into the
active/recovery clocks there instead of cmd64x_tune_pio() -- this causes
quantize_timing() to also move;
- contrarywise, move all the code handling the address setup timing into
cmd64x_tune_pio(), so that setting MWDMA mode wouldn't change address setup;
- remove from the speedproc() method the bogus code pretending to set the DMA
timings by twiddling bits in the BMIDE status register, handle setting MWDMA
by just calling program_cycle_times(); while at it, improve the style of that
whole switch statement;
- stop fiddling with the DMA capable bits in the speedproc() method -- they do
not enable DMA, and are properly dealt with by the dma_host_{on,off} methods;
- don't set hwif->swdma_mask in the init_hwif() method anymore.
In addition to those changes, do the following:
- in cmd64x_tune_pio(), when writing to ARTTIM23 register preserve the interrupt
status bit, eliminate local_irq_{save|restore}() around this code as there's
*no* actual race with the interrupt handler, and move cmdprintk() to a more
fitting place -- after ide_get_best_pio_mode() call;
- make {arttim|drwtim}_regs arrays single-dimensional, indexed with drive->dn;
- rename {setup|recovery}_counts[] into more fitting {setup|recovery}_values[];
- in the speedproc() method, get rid of the duplicate reads/writes from/to the
UDIDETCRx registers and of the extra variable used to store the transfer mode
value after filtering, use another method of determining master/slave drive,
and cleanup useless parens;
- beautify cmdprintk() output here and there.
While at it, remove meaningless comment about the driver being used only on
UltraSPARC and long non-relevant RCS tag. :-)
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2007-05-06 04:03:49 +08:00
|
|
|
static const u8 drwtim_regs[4] = {DRWTIM0, DRWTIM1, DRWTIM2, DRWTIM3};
|
|
|
|
|
|
|
|
|
|
cmdprintk("program_cycle_times parameters: total=%d, active=%d\n",
|
|
|
|
|
cycle_time, active_time);
|
|
|
|
|
|
|
|
|
|
cycle_count = quantize_timing( cycle_time, clock_time);
|
|
|
|
|
active_count = quantize_timing(active_time, clock_time);
|
|
|
|
|
recovery_count = cycle_count - active_count;
|
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/*
|
cmd64x: fix multiword and remove single-word DMA support
Fix the multiword DMA and drop the single-word DMA support (which nobody will
miss, I think). In order to do it, a number of changes was necessary:
- rename program_drive_counts() to program_cycle_times(), pass to it cycle's
total/active times instead of the clock counts, and convert them into the
active/recovery clocks there instead of cmd64x_tune_pio() -- this causes
quantize_timing() to also move;
- contrarywise, move all the code handling the address setup timing into
cmd64x_tune_pio(), so that setting MWDMA mode wouldn't change address setup;
- remove from the speedproc() method the bogus code pretending to set the DMA
timings by twiddling bits in the BMIDE status register, handle setting MWDMA
by just calling program_cycle_times(); while at it, improve the style of that
whole switch statement;
- stop fiddling with the DMA capable bits in the speedproc() method -- they do
not enable DMA, and are properly dealt with by the dma_host_{on,off} methods;
- don't set hwif->swdma_mask in the init_hwif() method anymore.
In addition to those changes, do the following:
- in cmd64x_tune_pio(), when writing to ARTTIM23 register preserve the interrupt
status bit, eliminate local_irq_{save|restore}() around this code as there's
*no* actual race with the interrupt handler, and move cmdprintk() to a more
fitting place -- after ide_get_best_pio_mode() call;
- make {arttim|drwtim}_regs arrays single-dimensional, indexed with drive->dn;
- rename {setup|recovery}_counts[] into more fitting {setup|recovery}_values[];
- in the speedproc() method, get rid of the duplicate reads/writes from/to the
UDIDETCRx registers and of the extra variable used to store the transfer mode
value after filtering, use another method of determining master/slave drive,
and cleanup useless parens;
- beautify cmdprintk() output here and there.
While at it, remove meaningless comment about the driver being used only on
UltraSPARC and long non-relevant RCS tag. :-)
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2007-05-06 04:03:49 +08:00
|
|
|
* In case we've got too long recovery phase, try to lengthen
|
|
|
|
|
* the active phase
|
2005-04-17 06:20:36 +08:00
|
|
|
*/
|
cmd64x: fix multiword and remove single-word DMA support
Fix the multiword DMA and drop the single-word DMA support (which nobody will
miss, I think). In order to do it, a number of changes was necessary:
- rename program_drive_counts() to program_cycle_times(), pass to it cycle's
total/active times instead of the clock counts, and convert them into the
active/recovery clocks there instead of cmd64x_tune_pio() -- this causes
quantize_timing() to also move;
- contrarywise, move all the code handling the address setup timing into
cmd64x_tune_pio(), so that setting MWDMA mode wouldn't change address setup;
- remove from the speedproc() method the bogus code pretending to set the DMA
timings by twiddling bits in the BMIDE status register, handle setting MWDMA
by just calling program_cycle_times(); while at it, improve the style of that
whole switch statement;
- stop fiddling with the DMA capable bits in the speedproc() method -- they do
not enable DMA, and are properly dealt with by the dma_host_{on,off} methods;
- don't set hwif->swdma_mask in the init_hwif() method anymore.
In addition to those changes, do the following:
- in cmd64x_tune_pio(), when writing to ARTTIM23 register preserve the interrupt
status bit, eliminate local_irq_{save|restore}() around this code as there's
*no* actual race with the interrupt handler, and move cmdprintk() to a more
fitting place -- after ide_get_best_pio_mode() call;
- make {arttim|drwtim}_regs arrays single-dimensional, indexed with drive->dn;
- rename {setup|recovery}_counts[] into more fitting {setup|recovery}_values[];
- in the speedproc() method, get rid of the duplicate reads/writes from/to the
UDIDETCRx registers and of the extra variable used to store the transfer mode
value after filtering, use another method of determining master/slave drive,
and cleanup useless parens;
- beautify cmdprintk() output here and there.
While at it, remove meaningless comment about the driver being used only on
UltraSPARC and long non-relevant RCS tag. :-)
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2007-05-06 04:03:49 +08:00
|
|
|
if (recovery_count > 16) {
|
|
|
|
|
active_count += recovery_count - 16;
|
|
|
|
|
recovery_count = 16;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
cmd64x: fix multiword and remove single-word DMA support
Fix the multiword DMA and drop the single-word DMA support (which nobody will
miss, I think). In order to do it, a number of changes was necessary:
- rename program_drive_counts() to program_cycle_times(), pass to it cycle's
total/active times instead of the clock counts, and convert them into the
active/recovery clocks there instead of cmd64x_tune_pio() -- this causes
quantize_timing() to also move;
- contrarywise, move all the code handling the address setup timing into
cmd64x_tune_pio(), so that setting MWDMA mode wouldn't change address setup;
- remove from the speedproc() method the bogus code pretending to set the DMA
timings by twiddling bits in the BMIDE status register, handle setting MWDMA
by just calling program_cycle_times(); while at it, improve the style of that
whole switch statement;
- stop fiddling with the DMA capable bits in the speedproc() method -- they do
not enable DMA, and are properly dealt with by the dma_host_{on,off} methods;
- don't set hwif->swdma_mask in the init_hwif() method anymore.
In addition to those changes, do the following:
- in cmd64x_tune_pio(), when writing to ARTTIM23 register preserve the interrupt
status bit, eliminate local_irq_{save|restore}() around this code as there's
*no* actual race with the interrupt handler, and move cmdprintk() to a more
fitting place -- after ide_get_best_pio_mode() call;
- make {arttim|drwtim}_regs arrays single-dimensional, indexed with drive->dn;
- rename {setup|recovery}_counts[] into more fitting {setup|recovery}_values[];
- in the speedproc() method, get rid of the duplicate reads/writes from/to the
UDIDETCRx registers and of the extra variable used to store the transfer mode
value after filtering, use another method of determining master/slave drive,
and cleanup useless parens;
- beautify cmdprintk() output here and there.
While at it, remove meaningless comment about the driver being used only on
UltraSPARC and long non-relevant RCS tag. :-)
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2007-05-06 04:03:49 +08:00
|
|
|
if (active_count > 16) /* shouldn't actually happen... */
|
|
|
|
|
active_count = 16;
|
|
|
|
|
|
|
|
|
|
cmdprintk("Final counts: total=%d, active=%d, recovery=%d\n",
|
|
|
|
|
cycle_count, active_count, recovery_count);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Convert values to internal chipset representation
|
|
|
|
|
*/
|
cmd64x: fix multiword and remove single-word DMA support
Fix the multiword DMA and drop the single-word DMA support (which nobody will
miss, I think). In order to do it, a number of changes was necessary:
- rename program_drive_counts() to program_cycle_times(), pass to it cycle's
total/active times instead of the clock counts, and convert them into the
active/recovery clocks there instead of cmd64x_tune_pio() -- this causes
quantize_timing() to also move;
- contrarywise, move all the code handling the address setup timing into
cmd64x_tune_pio(), so that setting MWDMA mode wouldn't change address setup;
- remove from the speedproc() method the bogus code pretending to set the DMA
timings by twiddling bits in the BMIDE status register, handle setting MWDMA
by just calling program_cycle_times(); while at it, improve the style of that
whole switch statement;
- stop fiddling with the DMA capable bits in the speedproc() method -- they do
not enable DMA, and are properly dealt with by the dma_host_{on,off} methods;
- don't set hwif->swdma_mask in the init_hwif() method anymore.
In addition to those changes, do the following:
- in cmd64x_tune_pio(), when writing to ARTTIM23 register preserve the interrupt
status bit, eliminate local_irq_{save|restore}() around this code as there's
*no* actual race with the interrupt handler, and move cmdprintk() to a more
fitting place -- after ide_get_best_pio_mode() call;
- make {arttim|drwtim}_regs arrays single-dimensional, indexed with drive->dn;
- rename {setup|recovery}_counts[] into more fitting {setup|recovery}_values[];
- in the speedproc() method, get rid of the duplicate reads/writes from/to the
UDIDETCRx registers and of the extra variable used to store the transfer mode
value after filtering, use another method of determining master/slave drive,
and cleanup useless parens;
- beautify cmdprintk() output here and there.
While at it, remove meaningless comment about the driver being used only on
UltraSPARC and long non-relevant RCS tag. :-)
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2007-05-06 04:03:49 +08:00
|
|
|
recovery_count = recovery_values[recovery_count];
|
|
|
|
|
active_count &= 0x0f;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
cmd64x: fix multiword and remove single-word DMA support
Fix the multiword DMA and drop the single-word DMA support (which nobody will
miss, I think). In order to do it, a number of changes was necessary:
- rename program_drive_counts() to program_cycle_times(), pass to it cycle's
total/active times instead of the clock counts, and convert them into the
active/recovery clocks there instead of cmd64x_tune_pio() -- this causes
quantize_timing() to also move;
- contrarywise, move all the code handling the address setup timing into
cmd64x_tune_pio(), so that setting MWDMA mode wouldn't change address setup;
- remove from the speedproc() method the bogus code pretending to set the DMA
timings by twiddling bits in the BMIDE status register, handle setting MWDMA
by just calling program_cycle_times(); while at it, improve the style of that
whole switch statement;
- stop fiddling with the DMA capable bits in the speedproc() method -- they do
not enable DMA, and are properly dealt with by the dma_host_{on,off} methods;
- don't set hwif->swdma_mask in the init_hwif() method anymore.
In addition to those changes, do the following:
- in cmd64x_tune_pio(), when writing to ARTTIM23 register preserve the interrupt
status bit, eliminate local_irq_{save|restore}() around this code as there's
*no* actual race with the interrupt handler, and move cmdprintk() to a more
fitting place -- after ide_get_best_pio_mode() call;
- make {arttim|drwtim}_regs arrays single-dimensional, indexed with drive->dn;
- rename {setup|recovery}_counts[] into more fitting {setup|recovery}_values[];
- in the speedproc() method, get rid of the duplicate reads/writes from/to the
UDIDETCRx registers and of the extra variable used to store the transfer mode
value after filtering, use another method of determining master/slave drive,
and cleanup useless parens;
- beautify cmdprintk() output here and there.
While at it, remove meaningless comment about the driver being used only on
UltraSPARC and long non-relevant RCS tag. :-)
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2007-05-06 04:03:49 +08:00
|
|
|
/* Program the active/recovery counts into the DRWTIM register */
|
|
|
|
|
drwtim = (active_count << 4) | recovery_count;
|
|
|
|
|
(void) pci_write_config_byte(dev, drwtim_regs[drive->dn], drwtim);
|
|
|
|
|
cmdprintk("Write 0x%02x to reg 0x%x\n", drwtim, drwtim_regs[drive->dn]);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
2007-10-12 05:54:00 +08:00
|
|
|
* This routine writes into the chipset registers
|
|
|
|
|
* PIO setup/active/recovery timings.
|
2005-04-17 06:20:36 +08:00
|
|
|
*/
|
2007-10-12 05:54:00 +08:00
|
|
|
static void cmd64x_tune_pio(ide_drive_t *drive, const u8 pio)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
cmd64x: fix multiword and remove single-word DMA support
Fix the multiword DMA and drop the single-word DMA support (which nobody will
miss, I think). In order to do it, a number of changes was necessary:
- rename program_drive_counts() to program_cycle_times(), pass to it cycle's
total/active times instead of the clock counts, and convert them into the
active/recovery clocks there instead of cmd64x_tune_pio() -- this causes
quantize_timing() to also move;
- contrarywise, move all the code handling the address setup timing into
cmd64x_tune_pio(), so that setting MWDMA mode wouldn't change address setup;
- remove from the speedproc() method the bogus code pretending to set the DMA
timings by twiddling bits in the BMIDE status register, handle setting MWDMA
by just calling program_cycle_times(); while at it, improve the style of that
whole switch statement;
- stop fiddling with the DMA capable bits in the speedproc() method -- they do
not enable DMA, and are properly dealt with by the dma_host_{on,off} methods;
- don't set hwif->swdma_mask in the init_hwif() method anymore.
In addition to those changes, do the following:
- in cmd64x_tune_pio(), when writing to ARTTIM23 register preserve the interrupt
status bit, eliminate local_irq_{save|restore}() around this code as there's
*no* actual race with the interrupt handler, and move cmdprintk() to a more
fitting place -- after ide_get_best_pio_mode() call;
- make {arttim|drwtim}_regs arrays single-dimensional, indexed with drive->dn;
- rename {setup|recovery}_counts[] into more fitting {setup|recovery}_values[];
- in the speedproc() method, get rid of the duplicate reads/writes from/to the
UDIDETCRx registers and of the extra variable used to store the transfer mode
value after filtering, use another method of determining master/slave drive,
and cleanup useless parens;
- beautify cmdprintk() output here and there.
While at it, remove meaningless comment about the driver being used only on
UltraSPARC and long non-relevant RCS tag. :-)
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2007-05-06 04:03:49 +08:00
|
|
|
ide_hwif_t *hwif = HWIF(drive);
|
|
|
|
|
struct pci_dev *dev = hwif->pci_dev;
|
2007-07-20 07:11:56 +08:00
|
|
|
unsigned int cycle_time;
|
2007-10-12 05:54:00 +08:00
|
|
|
u8 setup_count, arttim = 0;
|
|
|
|
|
|
cmd64x: fix multiword and remove single-word DMA support
Fix the multiword DMA and drop the single-word DMA support (which nobody will
miss, I think). In order to do it, a number of changes was necessary:
- rename program_drive_counts() to program_cycle_times(), pass to it cycle's
total/active times instead of the clock counts, and convert them into the
active/recovery clocks there instead of cmd64x_tune_pio() -- this causes
quantize_timing() to also move;
- contrarywise, move all the code handling the address setup timing into
cmd64x_tune_pio(), so that setting MWDMA mode wouldn't change address setup;
- remove from the speedproc() method the bogus code pretending to set the DMA
timings by twiddling bits in the BMIDE status register, handle setting MWDMA
by just calling program_cycle_times(); while at it, improve the style of that
whole switch statement;
- stop fiddling with the DMA capable bits in the speedproc() method -- they do
not enable DMA, and are properly dealt with by the dma_host_{on,off} methods;
- don't set hwif->swdma_mask in the init_hwif() method anymore.
In addition to those changes, do the following:
- in cmd64x_tune_pio(), when writing to ARTTIM23 register preserve the interrupt
status bit, eliminate local_irq_{save|restore}() around this code as there's
*no* actual race with the interrupt handler, and move cmdprintk() to a more
fitting place -- after ide_get_best_pio_mode() call;
- make {arttim|drwtim}_regs arrays single-dimensional, indexed with drive->dn;
- rename {setup|recovery}_counts[] into more fitting {setup|recovery}_values[];
- in the speedproc() method, get rid of the duplicate reads/writes from/to the
UDIDETCRx registers and of the extra variable used to store the transfer mode
value after filtering, use another method of determining master/slave drive,
and cleanup useless parens;
- beautify cmdprintk() output here and there.
While at it, remove meaningless comment about the driver being used only on
UltraSPARC and long non-relevant RCS tag. :-)
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2007-05-06 04:03:49 +08:00
|
|
|
static const u8 setup_values[] = {0x40, 0x40, 0x40, 0x80, 0, 0xc0};
|
|
|
|
|
static const u8 arttim_regs[4] = {ARTTIM0, ARTTIM1, ARTTIM23, ARTTIM23};
|
2007-07-20 07:11:56 +08:00
|
|
|
|
2007-10-12 05:54:00 +08:00
|
|
|
cycle_time = ide_pio_cycle_time(drive, pio);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-07-20 07:11:56 +08:00
|
|
|
program_cycle_times(drive, cycle_time,
|
2007-10-12 05:54:00 +08:00
|
|
|
ide_pio_timings[pio].active_time);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-10-12 05:54:00 +08:00
|
|
|
setup_count = quantize_timing(ide_pio_timings[pio].setup_time,
|
cmd64x: fix multiword and remove single-word DMA support
Fix the multiword DMA and drop the single-word DMA support (which nobody will
miss, I think). In order to do it, a number of changes was necessary:
- rename program_drive_counts() to program_cycle_times(), pass to it cycle's
total/active times instead of the clock counts, and convert them into the
active/recovery clocks there instead of cmd64x_tune_pio() -- this causes
quantize_timing() to also move;
- contrarywise, move all the code handling the address setup timing into
cmd64x_tune_pio(), so that setting MWDMA mode wouldn't change address setup;
- remove from the speedproc() method the bogus code pretending to set the DMA
timings by twiddling bits in the BMIDE status register, handle setting MWDMA
by just calling program_cycle_times(); while at it, improve the style of that
whole switch statement;
- stop fiddling with the DMA capable bits in the speedproc() method -- they do
not enable DMA, and are properly dealt with by the dma_host_{on,off} methods;
- don't set hwif->swdma_mask in the init_hwif() method anymore.
In addition to those changes, do the following:
- in cmd64x_tune_pio(), when writing to ARTTIM23 register preserve the interrupt
status bit, eliminate local_irq_{save|restore}() around this code as there's
*no* actual race with the interrupt handler, and move cmdprintk() to a more
fitting place -- after ide_get_best_pio_mode() call;
- make {arttim|drwtim}_regs arrays single-dimensional, indexed with drive->dn;
- rename {setup|recovery}_counts[] into more fitting {setup|recovery}_values[];
- in the speedproc() method, get rid of the duplicate reads/writes from/to the
UDIDETCRx registers and of the extra variable used to store the transfer mode
value after filtering, use another method of determining master/slave drive,
and cleanup useless parens;
- beautify cmdprintk() output here and there.
While at it, remove meaningless comment about the driver being used only on
UltraSPARC and long non-relevant RCS tag. :-)
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2007-05-06 04:03:49 +08:00
|
|
|
1000 / system_bus_clock());
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* The primary channel has individual address setup timing registers
|
|
|
|
|
* for each drive and the hardware selects the slowest timing itself.
|
|
|
|
|
* The secondary channel has one common register and we have to select
|
|
|
|
|
* the slowest address setup timing ourselves.
|
|
|
|
|
*/
|
|
|
|
|
if (hwif->channel) {
|
|
|
|
|
ide_drive_t *drives = hwif->drives;
|
|
|
|
|
|
|
|
|
|
drive->drive_data = setup_count;
|
|
|
|
|
setup_count = max(drives[0].drive_data, drives[1].drive_data);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
cmd64x: fix multiword and remove single-word DMA support
Fix the multiword DMA and drop the single-word DMA support (which nobody will
miss, I think). In order to do it, a number of changes was necessary:
- rename program_drive_counts() to program_cycle_times(), pass to it cycle's
total/active times instead of the clock counts, and convert them into the
active/recovery clocks there instead of cmd64x_tune_pio() -- this causes
quantize_timing() to also move;
- contrarywise, move all the code handling the address setup timing into
cmd64x_tune_pio(), so that setting MWDMA mode wouldn't change address setup;
- remove from the speedproc() method the bogus code pretending to set the DMA
timings by twiddling bits in the BMIDE status register, handle setting MWDMA
by just calling program_cycle_times(); while at it, improve the style of that
whole switch statement;
- stop fiddling with the DMA capable bits in the speedproc() method -- they do
not enable DMA, and are properly dealt with by the dma_host_{on,off} methods;
- don't set hwif->swdma_mask in the init_hwif() method anymore.
In addition to those changes, do the following:
- in cmd64x_tune_pio(), when writing to ARTTIM23 register preserve the interrupt
status bit, eliminate local_irq_{save|restore}() around this code as there's
*no* actual race with the interrupt handler, and move cmdprintk() to a more
fitting place -- after ide_get_best_pio_mode() call;
- make {arttim|drwtim}_regs arrays single-dimensional, indexed with drive->dn;
- rename {setup|recovery}_counts[] into more fitting {setup|recovery}_values[];
- in the speedproc() method, get rid of the duplicate reads/writes from/to the
UDIDETCRx registers and of the extra variable used to store the transfer mode
value after filtering, use another method of determining master/slave drive,
and cleanup useless parens;
- beautify cmdprintk() output here and there.
While at it, remove meaningless comment about the driver being used only on
UltraSPARC and long non-relevant RCS tag. :-)
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2007-05-06 04:03:49 +08:00
|
|
|
if (setup_count > 5) /* shouldn't actually happen... */
|
|
|
|
|
setup_count = 5;
|
|
|
|
|
cmdprintk("Final address setup count: %d\n", setup_count);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
cmd64x: fix multiword and remove single-word DMA support
Fix the multiword DMA and drop the single-word DMA support (which nobody will
miss, I think). In order to do it, a number of changes was necessary:
- rename program_drive_counts() to program_cycle_times(), pass to it cycle's
total/active times instead of the clock counts, and convert them into the
active/recovery clocks there instead of cmd64x_tune_pio() -- this causes
quantize_timing() to also move;
- contrarywise, move all the code handling the address setup timing into
cmd64x_tune_pio(), so that setting MWDMA mode wouldn't change address setup;
- remove from the speedproc() method the bogus code pretending to set the DMA
timings by twiddling bits in the BMIDE status register, handle setting MWDMA
by just calling program_cycle_times(); while at it, improve the style of that
whole switch statement;
- stop fiddling with the DMA capable bits in the speedproc() method -- they do
not enable DMA, and are properly dealt with by the dma_host_{on,off} methods;
- don't set hwif->swdma_mask in the init_hwif() method anymore.
In addition to those changes, do the following:
- in cmd64x_tune_pio(), when writing to ARTTIM23 register preserve the interrupt
status bit, eliminate local_irq_{save|restore}() around this code as there's
*no* actual race with the interrupt handler, and move cmdprintk() to a more
fitting place -- after ide_get_best_pio_mode() call;
- make {arttim|drwtim}_regs arrays single-dimensional, indexed with drive->dn;
- rename {setup|recovery}_counts[] into more fitting {setup|recovery}_values[];
- in the speedproc() method, get rid of the duplicate reads/writes from/to the
UDIDETCRx registers and of the extra variable used to store the transfer mode
value after filtering, use another method of determining master/slave drive,
and cleanup useless parens;
- beautify cmdprintk() output here and there.
While at it, remove meaningless comment about the driver being used only on
UltraSPARC and long non-relevant RCS tag. :-)
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2007-05-06 04:03:49 +08:00
|
|
|
/*
|
|
|
|
|
* Program the address setup clocks into the ARTTIM registers.
|
|
|
|
|
* Avoid clearing the secondary channel's interrupt bit.
|
|
|
|
|
*/
|
|
|
|
|
(void) pci_read_config_byte (dev, arttim_regs[drive->dn], &arttim);
|
|
|
|
|
if (hwif->channel)
|
|
|
|
|
arttim &= ~ARTTIM23_INTR_CH1;
|
|
|
|
|
arttim &= ~0xc0;
|
|
|
|
|
arttim |= setup_values[setup_count];
|
|
|
|
|
(void) pci_write_config_byte(dev, arttim_regs[drive->dn], arttim);
|
|
|
|
|
cmdprintk("Write 0x%02x to reg 0x%x\n", arttim, arttim_regs[drive->dn]);
|
2007-03-04 00:48:53 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Attempts to set drive's PIO mode.
|
2007-10-12 05:54:00 +08:00
|
|
|
* Special cases are 8: prefetch off, 9: prefetch on (both never worked)
|
2007-03-04 00:48:53 +08:00
|
|
|
*/
|
2007-10-12 05:54:00 +08:00
|
|
|
|
|
|
|
|
static void cmd64x_set_pio_mode(ide_drive_t *drive, const u8 pio)
|
2007-03-04 00:48:53 +08:00
|
|
|
{
|
|
|
|
|
/*
|
|
|
|
|
* Filter out the prefetch control values
|
|
|
|
|
* to prevent PIO5 from being programmed
|
|
|
|
|
*/
|
|
|
|
|
if (pio == 8 || pio == 9)
|
|
|
|
|
return;
|
|
|
|
|
|
2007-10-12 05:54:00 +08:00
|
|
|
cmd64x_tune_pio(drive, pio);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
ide: move ide_config_drive_speed() calls to upper layers (take 2)
* Convert {ide_hwif_t,ide_pci_device_t}->host_flag to be u16.
* Add IDE_HFLAG_POST_SET_MODE host flag to indicate the need to program
the host for the transfer mode after programming the device. Set it
in au1xxx-ide, amd74xx, cs5530, cs5535, pdc202xx_new, sc1200, pmac
and via82cxxx host drivers.
* Add IDE_HFLAG_NO_SET_MODE host flag to indicate the need to completely
skip programming of host/device for the transfer mode ("smart" hosts).
Set it in it821x host driver and check it in ide_tune_dma().
* Add ide_set_pio_mode()/ide_set_dma_mode() helpers and convert all
direct ->set_pio_mode/->speedproc users to use these helpers.
* Move ide_config_drive_speed() calls from ->set_pio_mode/->speedproc
methods to callers.
* Rename ->speedproc method to ->set_dma_mode, make it void and update
all implementations accordingly.
* Update ide_set_xfer_rate() comments.
* Unexport ide_config_drive_speed().
v2:
* Fix issues noticed by Sergei:
- export ide_set_dma_mode() instead of moving ->set_pio_mode abuse wrt
to setting DMA modes from sc1200_set_pio_mode() to do_special()
- check IDE_HFLAG_NO_SET_MODE in ide_tune_dma()
- check for (hwif->set_pio_mode) == NULL in ide_set_pio_mode()
- check for (hwif->set_dma_mode) == NULL in ide_set_dma_mode()
- return -1 from ide_set_{pio,dma}_mode() if ->set_{pio,dma}_mode == NULL
- don't set ->set_{pio,dma}_mode on it821x in "smart" mode
- fix build problem in pmac.c
- minor fixes in au1xxx-ide.c/cs5530.c/siimage.c
- improve patch description
Changes in behavior caused by this patch:
- HDIO_SET_PIO_MODE ioctl would now return -ENOSYS for attempts to change
PIO mode if it821x controller is in "smart" mode
- removal of two debugging printk-s (from cs5530.c and sc1200.c)
- transfer modes 0x00-0x07 passed from user space may be programmed twice on
the device (not really an issue since 0x00 is not supported correctly by
any host driver ATM, 0x01 is not supported at all and 0x02-0x07 are invalid)
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2007-10-13 23:47:51 +08:00
|
|
|
static void cmd64x_set_dma_mode(ide_drive_t *drive, const u8 speed)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
|
ide_hwif_t *hwif = HWIF(drive);
|
|
|
|
|
struct pci_dev *dev = hwif->pci_dev;
|
cmd64x: fix multiword and remove single-word DMA support
Fix the multiword DMA and drop the single-word DMA support (which nobody will
miss, I think). In order to do it, a number of changes was necessary:
- rename program_drive_counts() to program_cycle_times(), pass to it cycle's
total/active times instead of the clock counts, and convert them into the
active/recovery clocks there instead of cmd64x_tune_pio() -- this causes
quantize_timing() to also move;
- contrarywise, move all the code handling the address setup timing into
cmd64x_tune_pio(), so that setting MWDMA mode wouldn't change address setup;
- remove from the speedproc() method the bogus code pretending to set the DMA
timings by twiddling bits in the BMIDE status register, handle setting MWDMA
by just calling program_cycle_times(); while at it, improve the style of that
whole switch statement;
- stop fiddling with the DMA capable bits in the speedproc() method -- they do
not enable DMA, and are properly dealt with by the dma_host_{on,off} methods;
- don't set hwif->swdma_mask in the init_hwif() method anymore.
In addition to those changes, do the following:
- in cmd64x_tune_pio(), when writing to ARTTIM23 register preserve the interrupt
status bit, eliminate local_irq_{save|restore}() around this code as there's
*no* actual race with the interrupt handler, and move cmdprintk() to a more
fitting place -- after ide_get_best_pio_mode() call;
- make {arttim|drwtim}_regs arrays single-dimensional, indexed with drive->dn;
- rename {setup|recovery}_counts[] into more fitting {setup|recovery}_values[];
- in the speedproc() method, get rid of the duplicate reads/writes from/to the
UDIDETCRx registers and of the extra variable used to store the transfer mode
value after filtering, use another method of determining master/slave drive,
and cleanup useless parens;
- beautify cmdprintk() output here and there.
While at it, remove meaningless comment about the driver being used only on
UltraSPARC and long non-relevant RCS tag. :-)
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2007-05-06 04:03:49 +08:00
|
|
|
u8 unit = drive->dn & 0x01;
|
|
|
|
|
u8 regU = 0, pciU = hwif->channel ? UDIDETCR1 : UDIDETCR0;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-03-04 00:48:53 +08:00
|
|
|
if (speed >= XFER_SW_DMA_0) {
|
2005-04-17 06:20:36 +08:00
|
|
|
(void) pci_read_config_byte(dev, pciU, ®U);
|
|
|
|
|
regU &= ~(unit ? 0xCA : 0x35);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
switch(speed) {
|
cmd64x: fix multiword and remove single-word DMA support
Fix the multiword DMA and drop the single-word DMA support (which nobody will
miss, I think). In order to do it, a number of changes was necessary:
- rename program_drive_counts() to program_cycle_times(), pass to it cycle's
total/active times instead of the clock counts, and convert them into the
active/recovery clocks there instead of cmd64x_tune_pio() -- this causes
quantize_timing() to also move;
- contrarywise, move all the code handling the address setup timing into
cmd64x_tune_pio(), so that setting MWDMA mode wouldn't change address setup;
- remove from the speedproc() method the bogus code pretending to set the DMA
timings by twiddling bits in the BMIDE status register, handle setting MWDMA
by just calling program_cycle_times(); while at it, improve the style of that
whole switch statement;
- stop fiddling with the DMA capable bits in the speedproc() method -- they do
not enable DMA, and are properly dealt with by the dma_host_{on,off} methods;
- don't set hwif->swdma_mask in the init_hwif() method anymore.
In addition to those changes, do the following:
- in cmd64x_tune_pio(), when writing to ARTTIM23 register preserve the interrupt
status bit, eliminate local_irq_{save|restore}() around this code as there's
*no* actual race with the interrupt handler, and move cmdprintk() to a more
fitting place -- after ide_get_best_pio_mode() call;
- make {arttim|drwtim}_regs arrays single-dimensional, indexed with drive->dn;
- rename {setup|recovery}_counts[] into more fitting {setup|recovery}_values[];
- in the speedproc() method, get rid of the duplicate reads/writes from/to the
UDIDETCRx registers and of the extra variable used to store the transfer mode
value after filtering, use another method of determining master/slave drive,
and cleanup useless parens;
- beautify cmdprintk() output here and there.
While at it, remove meaningless comment about the driver being used only on
UltraSPARC and long non-relevant RCS tag. :-)
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2007-05-06 04:03:49 +08:00
|
|
|
case XFER_UDMA_5:
|
|
|
|
|
regU |= unit ? 0x0A : 0x05;
|
|
|
|
|
break;
|
|
|
|
|
case XFER_UDMA_4:
|
|
|
|
|
regU |= unit ? 0x4A : 0x15;
|
|
|
|
|
break;
|
|
|
|
|
case XFER_UDMA_3:
|
|
|
|
|
regU |= unit ? 0x8A : 0x25;
|
|
|
|
|
break;
|
|
|
|
|
case XFER_UDMA_2:
|
|
|
|
|
regU |= unit ? 0x42 : 0x11;
|
|
|
|
|
break;
|
|
|
|
|
case XFER_UDMA_1:
|
|
|
|
|
regU |= unit ? 0x82 : 0x21;
|
|
|
|
|
break;
|
|
|
|
|
case XFER_UDMA_0:
|
|
|
|
|
regU |= unit ? 0xC2 : 0x31;
|
|
|
|
|
break;
|
|
|
|
|
case XFER_MW_DMA_2:
|
|
|
|
|
program_cycle_times(drive, 120, 70);
|
|
|
|
|
break;
|
|
|
|
|
case XFER_MW_DMA_1:
|
|
|
|
|
program_cycle_times(drive, 150, 80);
|
|
|
|
|
break;
|
|
|
|
|
case XFER_MW_DMA_0:
|
|
|
|
|
program_cycle_times(drive, 480, 215);
|
|
|
|
|
break;
|
|
|
|
|
default:
|
ide: move ide_config_drive_speed() calls to upper layers (take 2)
* Convert {ide_hwif_t,ide_pci_device_t}->host_flag to be u16.
* Add IDE_HFLAG_POST_SET_MODE host flag to indicate the need to program
the host for the transfer mode after programming the device. Set it
in au1xxx-ide, amd74xx, cs5530, cs5535, pdc202xx_new, sc1200, pmac
and via82cxxx host drivers.
* Add IDE_HFLAG_NO_SET_MODE host flag to indicate the need to completely
skip programming of host/device for the transfer mode ("smart" hosts).
Set it in it821x host driver and check it in ide_tune_dma().
* Add ide_set_pio_mode()/ide_set_dma_mode() helpers and convert all
direct ->set_pio_mode/->speedproc users to use these helpers.
* Move ide_config_drive_speed() calls from ->set_pio_mode/->speedproc
methods to callers.
* Rename ->speedproc method to ->set_dma_mode, make it void and update
all implementations accordingly.
* Update ide_set_xfer_rate() comments.
* Unexport ide_config_drive_speed().
v2:
* Fix issues noticed by Sergei:
- export ide_set_dma_mode() instead of moving ->set_pio_mode abuse wrt
to setting DMA modes from sc1200_set_pio_mode() to do_special()
- check IDE_HFLAG_NO_SET_MODE in ide_tune_dma()
- check for (hwif->set_pio_mode) == NULL in ide_set_pio_mode()
- check for (hwif->set_dma_mode) == NULL in ide_set_dma_mode()
- return -1 from ide_set_{pio,dma}_mode() if ->set_{pio,dma}_mode == NULL
- don't set ->set_{pio,dma}_mode on it821x in "smart" mode
- fix build problem in pmac.c
- minor fixes in au1xxx-ide.c/cs5530.c/siimage.c
- improve patch description
Changes in behavior caused by this patch:
- HDIO_SET_PIO_MODE ioctl would now return -ENOSYS for attempts to change
PIO mode if it821x controller is in "smart" mode
- removal of two debugging printk-s (from cs5530.c and sc1200.c)
- transfer modes 0x00-0x07 passed from user space may be programmed twice on
the device (not really an issue since 0x00 is not supported correctly by
any host driver ATM, 0x01 is not supported at all and 0x02-0x07 are invalid)
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2007-10-13 23:47:51 +08:00
|
|
|
return;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
cmd64x: fix multiword and remove single-word DMA support
Fix the multiword DMA and drop the single-word DMA support (which nobody will
miss, I think). In order to do it, a number of changes was necessary:
- rename program_drive_counts() to program_cycle_times(), pass to it cycle's
total/active times instead of the clock counts, and convert them into the
active/recovery clocks there instead of cmd64x_tune_pio() -- this causes
quantize_timing() to also move;
- contrarywise, move all the code handling the address setup timing into
cmd64x_tune_pio(), so that setting MWDMA mode wouldn't change address setup;
- remove from the speedproc() method the bogus code pretending to set the DMA
timings by twiddling bits in the BMIDE status register, handle setting MWDMA
by just calling program_cycle_times(); while at it, improve the style of that
whole switch statement;
- stop fiddling with the DMA capable bits in the speedproc() method -- they do
not enable DMA, and are properly dealt with by the dma_host_{on,off} methods;
- don't set hwif->swdma_mask in the init_hwif() method anymore.
In addition to those changes, do the following:
- in cmd64x_tune_pio(), when writing to ARTTIM23 register preserve the interrupt
status bit, eliminate local_irq_{save|restore}() around this code as there's
*no* actual race with the interrupt handler, and move cmdprintk() to a more
fitting place -- after ide_get_best_pio_mode() call;
- make {arttim|drwtim}_regs arrays single-dimensional, indexed with drive->dn;
- rename {setup|recovery}_counts[] into more fitting {setup|recovery}_values[];
- in the speedproc() method, get rid of the duplicate reads/writes from/to the
UDIDETCRx registers and of the extra variable used to store the transfer mode
value after filtering, use another method of determining master/slave drive,
and cleanup useless parens;
- beautify cmdprintk() output here and there.
While at it, remove meaningless comment about the driver being used only on
UltraSPARC and long non-relevant RCS tag. :-)
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2007-05-06 04:03:49 +08:00
|
|
|
if (speed >= XFER_SW_DMA_0)
|
2005-04-17 06:20:36 +08:00
|
|
|
(void) pci_write_config_byte(dev, pciU, regU);
|
|
|
|
|
}
|
|
|
|
|
|
2007-05-06 04:03:50 +08:00
|
|
|
static int cmd648_ide_dma_end (ide_drive_t *drive)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2007-05-06 04:03:50 +08:00
|
|
|
ide_hwif_t *hwif = HWIF(drive);
|
|
|
|
|
int err = __ide_dma_end(drive);
|
|
|
|
|
u8 irq_mask = hwif->channel ? MRDMODE_INTR_CH1 :
|
|
|
|
|
MRDMODE_INTR_CH0;
|
|
|
|
|
u8 mrdmode = inb(hwif->dma_master + 0x01);
|
|
|
|
|
|
|
|
|
|
/* clear the interrupt bit */
|
|
|
|
|
outb(mrdmode | irq_mask, hwif->dma_master + 0x01);
|
|
|
|
|
|
|
|
|
|
return err;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int cmd64x_ide_dma_end (ide_drive_t *drive)
|
|
|
|
|
{
|
|
|
|
|
ide_hwif_t *hwif = HWIF(drive);
|
|
|
|
|
struct pci_dev *dev = hwif->pci_dev;
|
2007-05-06 04:03:50 +08:00
|
|
|
int irq_reg = hwif->channel ? ARTTIM23 : CFR;
|
|
|
|
|
u8 irq_mask = hwif->channel ? ARTTIM23_INTR_CH1 :
|
|
|
|
|
CFR_INTR_CH0;
|
|
|
|
|
u8 irq_stat = 0;
|
|
|
|
|
int err = __ide_dma_end(drive);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-05-06 04:03:50 +08:00
|
|
|
(void) pci_read_config_byte(dev, irq_reg, &irq_stat);
|
|
|
|
|
/* clear the interrupt bit */
|
|
|
|
|
(void) pci_write_config_byte(dev, irq_reg, irq_stat | irq_mask);
|
|
|
|
|
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int cmd648_ide_dma_test_irq (ide_drive_t *drive)
|
|
|
|
|
{
|
|
|
|
|
ide_hwif_t *hwif = HWIF(drive);
|
|
|
|
|
u8 irq_mask = hwif->channel ? MRDMODE_INTR_CH1 :
|
|
|
|
|
MRDMODE_INTR_CH0;
|
|
|
|
|
u8 dma_stat = inb(hwif->dma_status);
|
|
|
|
|
u8 mrdmode = inb(hwif->dma_master + 0x01);
|
|
|
|
|
|
|
|
|
|
#ifdef DEBUG
|
|
|
|
|
printk("%s: dma_stat: 0x%02x mrdmode: 0x%02x irq_mask: 0x%02x\n",
|
|
|
|
|
drive->name, dma_stat, mrdmode, irq_mask);
|
|
|
|
|
#endif
|
|
|
|
|
if (!(mrdmode & irq_mask))
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
/* return 1 if INTR asserted */
|
|
|
|
|
if (dma_stat & 4)
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
|
|
return 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int cmd64x_ide_dma_test_irq (ide_drive_t *drive)
|
|
|
|
|
{
|
2007-05-06 04:03:49 +08:00
|
|
|
ide_hwif_t *hwif = HWIF(drive);
|
|
|
|
|
struct pci_dev *dev = hwif->pci_dev;
|
2007-05-06 04:03:50 +08:00
|
|
|
int irq_reg = hwif->channel ? ARTTIM23 : CFR;
|
|
|
|
|
u8 irq_mask = hwif->channel ? ARTTIM23_INTR_CH1 :
|
|
|
|
|
CFR_INTR_CH0;
|
|
|
|
|
u8 dma_stat = inb(hwif->dma_status);
|
|
|
|
|
u8 irq_stat = 0;
|
2007-05-06 04:03:49 +08:00
|
|
|
|
|
|
|
|
(void) pci_read_config_byte(dev, irq_reg, &irq_stat);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
#ifdef DEBUG
|
2007-05-06 04:03:50 +08:00
|
|
|
printk("%s: dma_stat: 0x%02x irq_stat: 0x%02x irq_mask: 0x%02x\n",
|
|
|
|
|
drive->name, dma_stat, irq_stat, irq_mask);
|
2005-04-17 06:20:36 +08:00
|
|
|
#endif
|
2007-05-06 04:03:50 +08:00
|
|
|
if (!(irq_stat & irq_mask))
|
2005-04-17 06:20:36 +08:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
/* return 1 if INTR asserted */
|
2007-05-06 04:03:50 +08:00
|
|
|
if (dma_stat & 4)
|
2005-04-17 06:20:36 +08:00
|
|
|
return 1;
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* ASUS P55T2P4D with CMD646 chipset revision 0x01 requires the old
|
|
|
|
|
* event order for DMA transfers.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
static int cmd646_1_ide_dma_end (ide_drive_t *drive)
|
|
|
|
|
{
|
|
|
|
|
ide_hwif_t *hwif = HWIF(drive);
|
|
|
|
|
u8 dma_stat = 0, dma_cmd = 0;
|
|
|
|
|
|
|
|
|
|
drive->waiting_for_dma = 0;
|
|
|
|
|
/* get DMA status */
|
2007-02-17 09:40:25 +08:00
|
|
|
dma_stat = inb(hwif->dma_status);
|
2005-04-17 06:20:36 +08:00
|
|
|
/* read DMA command state */
|
2007-02-17 09:40:25 +08:00
|
|
|
dma_cmd = inb(hwif->dma_command);
|
2005-04-17 06:20:36 +08:00
|
|
|
/* stop DMA */
|
2007-02-17 09:40:25 +08:00
|
|
|
outb(dma_cmd & ~1, hwif->dma_command);
|
2005-04-17 06:20:36 +08:00
|
|
|
/* clear the INTR & ERROR bits */
|
2007-02-17 09:40:25 +08:00
|
|
|
outb(dma_stat | 6, hwif->dma_status);
|
2005-04-17 06:20:36 +08:00
|
|
|
/* and free any DMA resources */
|
|
|
|
|
ide_destroy_dmatable(drive);
|
|
|
|
|
/* verify good DMA status */
|
|
|
|
|
return (dma_stat & 7) != 4;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static unsigned int __devinit init_chipset_cmd64x(struct pci_dev *dev, const char *name)
|
|
|
|
|
{
|
|
|
|
|
u8 mrdmode = 0;
|
|
|
|
|
|
2007-07-10 05:17:55 +08:00
|
|
|
if (dev->device == PCI_DEVICE_ID_CMD_646) {
|
|
|
|
|
u8 rev = 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-07-10 05:17:55 +08:00
|
|
|
pci_read_config_byte(dev, PCI_REVISION_ID, &rev);
|
|
|
|
|
|
|
|
|
|
switch (rev) {
|
|
|
|
|
case 0x07:
|
|
|
|
|
case 0x05:
|
2007-08-02 05:46:44 +08:00
|
|
|
printk("%s: UltraDMA capable\n", name);
|
2005-04-17 06:20:36 +08:00
|
|
|
break;
|
2007-07-10 05:17:55 +08:00
|
|
|
case 0x03:
|
2005-04-17 06:20:36 +08:00
|
|
|
default:
|
2007-08-02 05:46:44 +08:00
|
|
|
printk("%s: MultiWord DMA force limited\n", name);
|
2007-07-10 05:17:55 +08:00
|
|
|
break;
|
|
|
|
|
case 0x01:
|
|
|
|
|
printk("%s: MultiWord DMA limited, "
|
|
|
|
|
"IRQ workaround enabled\n", name);
|
2005-04-17 06:20:36 +08:00
|
|
|
break;
|
2007-07-10 05:17:55 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Set a good latency timer and cache line size value. */
|
|
|
|
|
(void) pci_write_config_byte(dev, PCI_LATENCY_TIMER, 64);
|
|
|
|
|
/* FIXME: pci_set_master() to ensure a good latency timer value */
|
|
|
|
|
|
2007-07-10 05:17:55 +08:00
|
|
|
/*
|
|
|
|
|
* Enable interrupts, select MEMORY READ LINE for reads.
|
|
|
|
|
*
|
|
|
|
|
* NOTE: although not mentioned in the PCI0646U specs,
|
|
|
|
|
* bits 0-1 are write only and won't be read back as
|
|
|
|
|
* set or not -- PCI0646U2 specs clarify this point.
|
2005-04-17 06:20:36 +08:00
|
|
|
*/
|
2007-07-10 05:17:55 +08:00
|
|
|
(void) pci_read_config_byte (dev, MRDMODE, &mrdmode);
|
|
|
|
|
mrdmode &= ~0x30;
|
|
|
|
|
(void) pci_write_config_byte(dev, MRDMODE, (mrdmode | 0x02));
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-05-10 06:01:09 +08:00
|
|
|
#if defined(DISPLAY_CMD64X_TIMINGS) && defined(CONFIG_IDE_PROC_FS)
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
cmd_devs[n_cmd_devs++] = dev;
|
|
|
|
|
|
|
|
|
|
if (!cmd64x_proc) {
|
|
|
|
|
cmd64x_proc = 1;
|
|
|
|
|
ide_pci_create_host_proc("cmd64x", cmd64x_get_info);
|
|
|
|
|
}
|
2007-05-10 06:01:09 +08:00
|
|
|
#endif /* DISPLAY_CMD64X_TIMINGS && CONFIG_IDE_PROC_FS */
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2007-07-10 05:17:58 +08:00
|
|
|
static u8 __devinit ata66_cmd64x(ide_hwif_t *hwif)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2007-07-10 05:17:55 +08:00
|
|
|
struct pci_dev *dev = hwif->pci_dev;
|
|
|
|
|
u8 bmidecsr = 0, mask = hwif->channel ? 0x02 : 0x01;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-07-10 05:17:55 +08:00
|
|
|
switch (dev->device) {
|
|
|
|
|
case PCI_DEVICE_ID_CMD_648:
|
|
|
|
|
case PCI_DEVICE_ID_CMD_649:
|
|
|
|
|
pci_read_config_byte(dev, BMIDECSR, &bmidecsr);
|
2007-07-10 05:17:58 +08:00
|
|
|
return (bmidecsr & mask) ? ATA_CBL_PATA80 : ATA_CBL_PATA40;
|
2007-07-10 05:17:55 +08:00
|
|
|
default:
|
2007-07-10 05:17:58 +08:00
|
|
|
return ATA_CBL_PATA40;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void __devinit init_hwif_cmd64x(ide_hwif_t *hwif)
|
|
|
|
|
{
|
|
|
|
|
struct pci_dev *dev = hwif->pci_dev;
|
2007-07-10 05:17:55 +08:00
|
|
|
u8 rev = 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-07-10 05:17:55 +08:00
|
|
|
pci_read_config_byte(dev, PCI_REVISION_ID, &rev);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-10-12 05:54:00 +08:00
|
|
|
hwif->set_pio_mode = &cmd64x_set_pio_mode;
|
ide: move ide_config_drive_speed() calls to upper layers (take 2)
* Convert {ide_hwif_t,ide_pci_device_t}->host_flag to be u16.
* Add IDE_HFLAG_POST_SET_MODE host flag to indicate the need to program
the host for the transfer mode after programming the device. Set it
in au1xxx-ide, amd74xx, cs5530, cs5535, pdc202xx_new, sc1200, pmac
and via82cxxx host drivers.
* Add IDE_HFLAG_NO_SET_MODE host flag to indicate the need to completely
skip programming of host/device for the transfer mode ("smart" hosts).
Set it in it821x host driver and check it in ide_tune_dma().
* Add ide_set_pio_mode()/ide_set_dma_mode() helpers and convert all
direct ->set_pio_mode/->speedproc users to use these helpers.
* Move ide_config_drive_speed() calls from ->set_pio_mode/->speedproc
methods to callers.
* Rename ->speedproc method to ->set_dma_mode, make it void and update
all implementations accordingly.
* Update ide_set_xfer_rate() comments.
* Unexport ide_config_drive_speed().
v2:
* Fix issues noticed by Sergei:
- export ide_set_dma_mode() instead of moving ->set_pio_mode abuse wrt
to setting DMA modes from sc1200_set_pio_mode() to do_special()
- check IDE_HFLAG_NO_SET_MODE in ide_tune_dma()
- check for (hwif->set_pio_mode) == NULL in ide_set_pio_mode()
- check for (hwif->set_dma_mode) == NULL in ide_set_dma_mode()
- return -1 from ide_set_{pio,dma}_mode() if ->set_{pio,dma}_mode == NULL
- don't set ->set_{pio,dma}_mode on it821x in "smart" mode
- fix build problem in pmac.c
- minor fixes in au1xxx-ide.c/cs5530.c/siimage.c
- improve patch description
Changes in behavior caused by this patch:
- HDIO_SET_PIO_MODE ioctl would now return -ENOSYS for attempts to change
PIO mode if it821x controller is in "smart" mode
- removal of two debugging printk-s (from cs5530.c and sc1200.c)
- transfer modes 0x00-0x07 passed from user space may be programmed twice on
the device (not really an issue since 0x00 is not supported correctly by
any host driver ATM, 0x01 is not supported at all and 0x02-0x07 are invalid)
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2007-10-13 23:47:51 +08:00
|
|
|
hwif->set_dma_mode = &cmd64x_set_dma_mode;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-03-04 00:48:53 +08:00
|
|
|
hwif->drives[0].autotune = hwif->drives[1].autotune = 1;
|
|
|
|
|
|
|
|
|
|
if (!hwif->dma_base)
|
2005-04-17 06:20:36 +08:00
|
|
|
return;
|
|
|
|
|
|
2007-07-10 05:17:55 +08:00
|
|
|
hwif->atapi_dma = 1;
|
|
|
|
|
hwif->mwdma_mask = 0x07;
|
2007-05-10 06:01:07 +08:00
|
|
|
hwif->ultra_mask = hwif->cds->udma_mask;
|
|
|
|
|
|
2007-05-10 06:01:08 +08:00
|
|
|
/*
|
|
|
|
|
* UltraDMA only supported on PCI646U and PCI646U2, which
|
|
|
|
|
* correspond to revisions 0x03, 0x05 and 0x07 respectively.
|
|
|
|
|
* Actually, although the CMD tech support people won't
|
|
|
|
|
* tell me the details, the 0x03 revision cannot support
|
|
|
|
|
* UDMA correctly without hardware modifications, and even
|
|
|
|
|
* then it only works with Quantum disks due to some
|
|
|
|
|
* hold time assumptions in the 646U part which are fixed
|
|
|
|
|
* in the 646U2.
|
|
|
|
|
*
|
|
|
|
|
* So we only do UltraDMA on revision 0x05 and 0x07 chipsets.
|
|
|
|
|
*/
|
2007-07-10 05:17:55 +08:00
|
|
|
if (dev->device == PCI_DEVICE_ID_CMD_646 && rev < 5)
|
2007-05-10 06:01:07 +08:00
|
|
|
hwif->ultra_mask = 0x00;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-07-10 05:17:58 +08:00
|
|
|
if (hwif->cbl != ATA_CBL_PATA40_SHORT)
|
|
|
|
|
hwif->cbl = ata66_cmd64x(hwif);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-07-10 05:17:55 +08:00
|
|
|
switch (dev->device) {
|
2007-05-06 04:03:50 +08:00
|
|
|
case PCI_DEVICE_ID_CMD_648:
|
|
|
|
|
case PCI_DEVICE_ID_CMD_649:
|
|
|
|
|
alt_irq_bits:
|
|
|
|
|
hwif->ide_dma_end = &cmd648_ide_dma_end;
|
|
|
|
|
hwif->ide_dma_test_irq = &cmd648_ide_dma_test_irq;
|
|
|
|
|
break;
|
|
|
|
|
case PCI_DEVICE_ID_CMD_646:
|
2005-04-17 06:20:36 +08:00
|
|
|
hwif->chipset = ide_cmd646;
|
2007-07-10 05:17:55 +08:00
|
|
|
if (rev == 0x01) {
|
2005-04-17 06:20:36 +08:00
|
|
|
hwif->ide_dma_end = &cmd646_1_ide_dma_end;
|
2007-05-06 04:03:50 +08:00
|
|
|
break;
|
2007-07-10 05:17:55 +08:00
|
|
|
} else if (rev >= 0x03)
|
2007-05-06 04:03:50 +08:00
|
|
|
goto alt_irq_bits;
|
|
|
|
|
/* fall thru */
|
|
|
|
|
default:
|
|
|
|
|
hwif->ide_dma_end = &cmd64x_ide_dma_end;
|
|
|
|
|
hwif->ide_dma_test_irq = &cmd64x_ide_dma_test_irq;
|
|
|
|
|
break;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!noautodma)
|
|
|
|
|
hwif->autodma = 1;
|
2007-07-10 05:17:55 +08:00
|
|
|
hwif->drives[0].autodma = hwif->drives[1].autodma = hwif->autodma;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
2007-05-06 04:03:49 +08:00
|
|
|
static int __devinit init_setup_cmd64x(struct pci_dev *dev, ide_pci_device_t *d)
|
|
|
|
|
{
|
|
|
|
|
return ide_setup_pci_device(dev, d);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int __devinit init_setup_cmd646(struct pci_dev *dev, ide_pci_device_t *d)
|
|
|
|
|
{
|
|
|
|
|
/*
|
|
|
|
|
* The original PCI0646 didn't have the primary channel enable bit,
|
|
|
|
|
* it appeared starting with PCI0646U (i.e. revision ID 3).
|
|
|
|
|
*/
|
2007-06-09 06:46:36 +08:00
|
|
|
if (dev->revision < 3)
|
2007-05-06 04:03:49 +08:00
|
|
|
d->enablebits[0].reg = 0;
|
|
|
|
|
|
|
|
|
|
return ide_setup_pci_device(dev, d);
|
|
|
|
|
}
|
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
static ide_pci_device_t cmd64x_chipsets[] __devinitdata = {
|
|
|
|
|
{ /* 0 */
|
|
|
|
|
.name = "CMD643",
|
2007-05-06 04:03:49 +08:00
|
|
|
.init_setup = init_setup_cmd64x,
|
2005-04-17 06:20:36 +08:00
|
|
|
.init_chipset = init_chipset_cmd64x,
|
|
|
|
|
.init_hwif = init_hwif_cmd64x,
|
|
|
|
|
.autodma = AUTODMA,
|
2007-05-06 04:03:49 +08:00
|
|
|
.enablebits = {{0x00,0x00,0x00}, {0x51,0x08,0x08}},
|
2005-04-17 06:20:36 +08:00
|
|
|
.bootable = ON_BOARD,
|
2007-10-12 05:54:00 +08:00
|
|
|
.host_flags = IDE_HFLAG_ABUSE_PREFETCH,
|
2007-07-20 07:11:59 +08:00
|
|
|
.pio_mask = ATA_PIO5,
|
2007-05-10 06:01:07 +08:00
|
|
|
.udma_mask = 0x00, /* no udma */
|
2005-04-17 06:20:36 +08:00
|
|
|
},{ /* 1 */
|
|
|
|
|
.name = "CMD646",
|
2007-05-06 04:03:49 +08:00
|
|
|
.init_setup = init_setup_cmd646,
|
2005-04-17 06:20:36 +08:00
|
|
|
.init_chipset = init_chipset_cmd64x,
|
|
|
|
|
.init_hwif = init_hwif_cmd64x,
|
|
|
|
|
.autodma = AUTODMA,
|
2007-05-06 04:03:49 +08:00
|
|
|
.enablebits = {{0x51,0x04,0x04}, {0x51,0x08,0x08}},
|
2005-04-17 06:20:36 +08:00
|
|
|
.bootable = ON_BOARD,
|
2007-10-12 05:54:00 +08:00
|
|
|
.host_flags = IDE_HFLAG_ABUSE_PREFETCH,
|
2007-07-20 07:11:59 +08:00
|
|
|
.pio_mask = ATA_PIO5,
|
2007-05-10 06:01:07 +08:00
|
|
|
.udma_mask = 0x07, /* udma0-2 */
|
2005-04-17 06:20:36 +08:00
|
|
|
},{ /* 2 */
|
|
|
|
|
.name = "CMD648",
|
2007-05-06 04:03:49 +08:00
|
|
|
.init_setup = init_setup_cmd64x,
|
2005-04-17 06:20:36 +08:00
|
|
|
.init_chipset = init_chipset_cmd64x,
|
|
|
|
|
.init_hwif = init_hwif_cmd64x,
|
|
|
|
|
.autodma = AUTODMA,
|
2007-05-06 04:03:49 +08:00
|
|
|
.enablebits = {{0x51,0x04,0x04}, {0x51,0x08,0x08}},
|
2005-04-17 06:20:36 +08:00
|
|
|
.bootable = ON_BOARD,
|
2007-10-12 05:54:00 +08:00
|
|
|
.host_flags = IDE_HFLAG_ABUSE_PREFETCH,
|
2007-07-20 07:11:59 +08:00
|
|
|
.pio_mask = ATA_PIO5,
|
2007-05-10 06:01:07 +08:00
|
|
|
.udma_mask = 0x1f, /* udma0-4 */
|
2005-04-17 06:20:36 +08:00
|
|
|
},{ /* 3 */
|
|
|
|
|
.name = "CMD649",
|
2007-05-06 04:03:49 +08:00
|
|
|
.init_setup = init_setup_cmd64x,
|
2005-04-17 06:20:36 +08:00
|
|
|
.init_chipset = init_chipset_cmd64x,
|
|
|
|
|
.init_hwif = init_hwif_cmd64x,
|
|
|
|
|
.autodma = AUTODMA,
|
2007-05-06 04:03:49 +08:00
|
|
|
.enablebits = {{0x51,0x04,0x04}, {0x51,0x08,0x08}},
|
2005-04-17 06:20:36 +08:00
|
|
|
.bootable = ON_BOARD,
|
2007-10-12 05:54:00 +08:00
|
|
|
.host_flags = IDE_HFLAG_ABUSE_PREFETCH,
|
2007-07-20 07:11:59 +08:00
|
|
|
.pio_mask = ATA_PIO5,
|
2007-05-10 06:01:07 +08:00
|
|
|
.udma_mask = 0x3f, /* udma0-5 */
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
2007-05-06 04:03:49 +08:00
|
|
|
/*
|
|
|
|
|
* We may have to modify enablebits for PCI0646, so we'd better pass
|
|
|
|
|
* a local copy of the ide_pci_device_t structure down the call chain...
|
|
|
|
|
*/
|
2005-04-17 06:20:36 +08:00
|
|
|
static int __devinit cmd64x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
|
|
|
|
|
{
|
2007-05-06 04:03:49 +08:00
|
|
|
ide_pci_device_t d = cmd64x_chipsets[id->driver_data];
|
|
|
|
|
|
|
|
|
|
return d.init_setup(dev, &d);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static struct pci_device_id cmd64x_pci_tbl[] = {
|
|
|
|
|
{ PCI_VENDOR_ID_CMD, PCI_DEVICE_ID_CMD_643, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
|
|
|
|
|
{ PCI_VENDOR_ID_CMD, PCI_DEVICE_ID_CMD_646, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1},
|
|
|
|
|
{ PCI_VENDOR_ID_CMD, PCI_DEVICE_ID_CMD_648, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2},
|
|
|
|
|
{ PCI_VENDOR_ID_CMD, PCI_DEVICE_ID_CMD_649, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 3},
|
|
|
|
|
{ 0, },
|
|
|
|
|
};
|
|
|
|
|
MODULE_DEVICE_TABLE(pci, cmd64x_pci_tbl);
|
|
|
|
|
|
|
|
|
|
static struct pci_driver driver = {
|
|
|
|
|
.name = "CMD64x_IDE",
|
|
|
|
|
.id_table = cmd64x_pci_tbl,
|
|
|
|
|
.probe = cmd64x_init_one,
|
|
|
|
|
};
|
|
|
|
|
|
2007-01-27 20:46:56 +08:00
|
|
|
static int __init cmd64x_ide_init(void)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
|
return ide_pci_register_driver(&driver);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
module_init(cmd64x_ide_init);
|
|
|
|
|
|
|
|
|
|
MODULE_AUTHOR("Eddie Dost, David Miller, Andre Hedrick");
|
|
|
|
|
MODULE_DESCRIPTION("PCI driver module for CMD64x IDE");
|
|
|
|
|
MODULE_LICENSE("GPL");
|
