Piteball/android_kernel_samsung_msm8226
1
0
Fork 0
mirror of https://github.com/S3NEO/android_kernel_samsung_msm8226.git synced 2024-11-07 03:47:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

ide: change ->set_dma_mode method parameters

Browse source 
Change ->set_dma_mode method parameters to match ->set_dmamode method
used in struct ata_port_operations.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2010-01-19 01:45:29 -08:00 committed by David S. Miller
parent e085b3cae8
commit 8776168ca2
36 changed files with 101 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/ide/aec62xx.c
View file

@ -81,15 +81,15 @@ static u8 pci_bus_clock_list_ultra (u8 speed, struct chipset_bus_clock_list_entr
return chipset_table->ultra_settings; return chipset_table->ultra_settings;
} }
static void aec6210_set_mode(ide_drive_t *drive, const u8 speed) static void aec6210_set_mode(ide_hwif_t *hwif, ide_drive_t *drive)
{ {
ide_hwif_t *hwif = drive->hwif;
struct pci_dev *dev = to_pci_dev(hwif->dev); struct pci_dev *dev = to_pci_dev(hwif->dev);
struct ide_host *host = pci_get_drvdata(dev); struct ide_host *host = pci_get_drvdata(dev);
struct chipset_bus_clock_list_entry *bus_clock = host->host_priv; struct chipset_bus_clock_list_entry *bus_clock = host->host_priv;
u16 d_conf = 0; u16 d_conf = 0;
u8 ultra = 0, ultra_conf = 0; u8 ultra = 0, ultra_conf = 0;
u8 tmp0 = 0, tmp1 = 0, tmp2 = 0; u8 tmp0 = 0, tmp1 = 0, tmp2 = 0;
const u8 speed = drive->dma_mode;
unsigned long flags; unsigned long flags;
local_irq_save(flags); local_irq_save(flags);
@ -109,15 +109,15 @@ static void aec6210_set_mode(ide_drive_t *drive, const u8 speed)
local_irq_restore(flags); local_irq_restore(flags);
} }
static void aec6260_set_mode(ide_drive_t *drive, const u8 speed) static void aec6260_set_mode(ide_hwif_t *hwif, ide_drive_t *drive)
{ {
ide_hwif_t *hwif = drive->hwif;
struct pci_dev *dev = to_pci_dev(hwif->dev); struct pci_dev *dev = to_pci_dev(hwif->dev);
struct ide_host *host = pci_get_drvdata(dev); struct ide_host *host = pci_get_drvdata(dev);
struct chipset_bus_clock_list_entry *bus_clock = host->host_priv; struct chipset_bus_clock_list_entry *bus_clock = host->host_priv;
u8 unit = drive->dn & 1; u8 unit = drive->dn & 1;
u8 tmp1 = 0, tmp2 = 0; u8 tmp1 = 0, tmp2 = 0;
u8 ultra = 0, drive_conf = 0, ultra_conf = 0; u8 ultra = 0, drive_conf = 0, ultra_conf = 0;
const u8 speed = drive->dma_mode;
unsigned long flags; unsigned long flags;
local_irq_save(flags); local_irq_save(flags);
@ -137,7 +137,7 @@ static void aec6260_set_mode(ide_drive_t *drive, const u8 speed)
static void aec_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive) static void aec_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)
{ {
drive->dma_mode = drive->pio_mode; drive->dma_mode = drive->pio_mode;
hwif->port_ops->set_dma_mode(drive, drive->dma_mode); hwif->port_ops->set_dma_mode(hwif, drive);
} }
static int init_chipset_aec62xx(struct pci_dev *dev) static int init_chipset_aec62xx(struct pci_dev *dev)

6
drivers/ide/alim15x3.c
View file

@ -121,16 +121,16 @@ static u8 ali_udma_filter(ide_drive_t *drive)
/** /**
* ali_set_dma_mode - set host controller for DMA mode * ali_set_dma_mode - set host controller for DMA mode
* @hwif: port
* @drive: drive * @drive: drive
* @speed: DMA mode
* *
* Configure the hardware for the desired IDE transfer mode. * Configure the hardware for the desired IDE transfer mode.
*/ */
static void ali_set_dma_mode(ide_drive_t *drive, const u8 speed) static void ali_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive)
{ {
ide_hwif_t *hwif = drive->hwif;
struct pci_dev *dev = to_pci_dev(hwif->dev); struct pci_dev *dev = to_pci_dev(hwif->dev);
const u8 speed = drive->dma_mode;
u8 speed1 = speed; u8 speed1 = speed;
u8 unit = drive->dn & 1; u8 unit = drive->dn & 1;
u8 tmpbyte = 0x00; u8 tmpbyte = 0x00;

7
drivers/ide/amd74xx.c
View file

@ -79,14 +79,14 @@ static void amd_set_speed(struct pci_dev *dev, u8 dn, u8 udma_mask,
* to a desired transfer mode. It also can be called by upper layers. * to a desired transfer mode. It also can be called by upper layers.
*/ */
static void amd_set_drive(ide_drive_t *drive, const u8 speed) static void amd_set_drive(ide_hwif_t *hwif, ide_drive_t *drive)
{ {
ide_hwif_t *hwif = drive->hwif;
struct pci_dev *dev = to_pci_dev(hwif->dev); struct pci_dev *dev = to_pci_dev(hwif->dev);
ide_drive_t *peer = ide_get_pair_dev(drive); ide_drive_t *peer = ide_get_pair_dev(drive);
struct ide_timing t, p; struct ide_timing t, p;
int T, UT; int T, UT;
u8 udma_mask = hwif->ultra_mask; u8 udma_mask = hwif->ultra_mask;
const u8 speed = drive->dma_mode;
T = 1000000000 / amd_clock; T = 1000000000 / amd_clock;
UT = (udma_mask == ATA_UDMA2) ? T : (T / 2); UT = (udma_mask == ATA_UDMA2) ? T : (T / 2);
@ -110,7 +110,8 @@ static void amd_set_drive(ide_drive_t *drive, const u8 speed)
static void amd_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive) static void amd_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)
{ {
amd_set_drive(drive, drive->pio_mode); drive->dma_mode = drive->pio_mode;
amd_set_drive(hwif, drive);
} }
static void amd7409_cable_detect(struct pci_dev *dev) static void amd7409_cable_detect(struct pci_dev *dev)

7
drivers/ide/atiixp.c
View file

@ -75,21 +75,22 @@ static void atiixp_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)
/** /**
* atiixp_set_dma_mode - set host controller for DMA mode * atiixp_set_dma_mode - set host controller for DMA mode
* @hwif: port
* @drive: drive * @drive: drive
* @speed: DMA mode
* *
* Set a ATIIXP host controller to the desired DMA mode. This involves * Set a ATIIXP host controller to the desired DMA mode. This involves
* programming the right timing data into the PCI configuration space. * programming the right timing data into the PCI configuration space.
*/ */
static void atiixp_set_dma_mode(ide_drive_t *drive, const u8 speed) static void atiixp_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive)
{ {
struct pci_dev *dev = to_pci_dev(drive->hwif->dev); struct pci_dev *dev = to_pci_dev(hwif->dev);
unsigned long flags; unsigned long flags;
int timing_shift = (drive->dn ^ 1) * 8; int timing_shift = (drive->dn ^ 1) * 8;
u32 tmp32; u32 tmp32;
u16 tmp16; u16 tmp16;
u16 udma_ctl = 0; u16 udma_ctl = 0;
const u8 speed = drive->dma_mode;
spin_lock_irqsave(&atiixp_lock, flags); spin_lock_irqsave(&atiixp_lock, flags);

4
drivers/ide/au1xxx-ide.c
View file

@ -160,11 +160,11 @@ static void au1xxx_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)
au_writel(mem_stcfg,MEM_STCFG2); au_writel(mem_stcfg,MEM_STCFG2);
} }
static void auide_set_dma_mode(ide_drive_t *drive, const u8 speed) static void auide_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive)
{ {
int mem_sttime = 0, mem_stcfg = au_readl(MEM_STCFG2); int mem_sttime = 0, mem_stcfg = au_readl(MEM_STCFG2);
switch(speed) { switch (drive->dma_mode) {
#ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
case XFER_MW_DMA_2: case XFER_MW_DMA_2:
mem_sttime = SBC_IDE_TIMING(MDMA2); mem_sttime = SBC_IDE_TIMING(MDMA2);

4
drivers/ide/cmd64x.c
View file

@ -141,12 +141,12 @@ static void cmd64x_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)
cmd64x_program_timings(drive, XFER_PIO_0 + pio); cmd64x_program_timings(drive, XFER_PIO_0 + pio);
} }
static void cmd64x_set_dma_mode(ide_drive_t *drive, const u8 speed) static void cmd64x_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive)
{ {
ide_hwif_t *hwif = drive->hwif;
struct pci_dev *dev = to_pci_dev(hwif->dev); struct pci_dev *dev = to_pci_dev(hwif->dev);
u8 unit = drive->dn & 0x01; u8 unit = drive->dn & 0x01;
u8 regU = 0, pciU = hwif->channel ? UDIDETCR1 : UDIDETCR0; u8 regU = 0, pciU = hwif->channel ? UDIDETCR1 : UDIDETCR0;
const u8 speed = drive->dma_mode;
pci_read_config_byte(dev, pciU, &regU); pci_read_config_byte(dev, pciU, &regU);
regU &= ~(unit ? 0xCA : 0x35); regU &= ~(unit ? 0xCA : 0x35);

4
drivers/ide/cs5520.c
View file

@ -81,12 +81,12 @@ static void cs5520_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)
(cs5520_pio_clocks[pio].assert)); (cs5520_pio_clocks[pio].assert));
} }
static void cs5520_set_dma_mode(ide_drive_t *drive, const u8 speed) static void cs5520_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive)
{ {
printk(KERN_ERR "cs55x0: bad ide timing.\n"); printk(KERN_ERR "cs55x0: bad ide timing.\n");
drive->pio_mode = XFER_PIO_0 + 0; drive->pio_mode = XFER_PIO_0 + 0;
cs5520_set_pio_mode(drive->hwif, drive); cs5520_set_pio_mode(hwif, drive);
} }
static const struct ide_port_ops cs5520_port_ops = { static const struct ide_port_ops cs5520_port_ops = {

6
drivers/ide/cs5530.c
View file

@ -100,12 +100,12 @@ out:
return mask; return mask;
} }
static void cs5530_set_dma_mode(ide_drive_t *drive, const u8 mode) static void cs5530_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive)
{ {
unsigned long basereg; unsigned long basereg;
unsigned int reg, timings = 0; unsigned int reg, timings = 0;
switch (mode) { switch (drive->dma_mode) {
case XFER_UDMA_0: timings = 0x00921250; break; case XFER_UDMA_0: timings = 0x00921250; break;
case XFER_UDMA_1: timings = 0x00911140; break; case XFER_UDMA_1: timings = 0x00911140; break;
case XFER_UDMA_2: timings = 0x00911030; break; case XFER_UDMA_2: timings = 0x00911030; break;
@ -113,7 +113,7 @@ static void cs5530_set_dma_mode(ide_drive_t *drive, const u8 mode)
case XFER_MW_DMA_1: timings = 0x00012121; break; case XFER_MW_DMA_1: timings = 0x00012121; break;
case XFER_MW_DMA_2: timings = 0x00002020; break; case XFER_MW_DMA_2: timings = 0x00002020; break;
} }
basereg = CS5530_BASEREG(drive->hwif); basereg = CS5530_BASEREG(hwif);
reg = inl(basereg + 4); /* get drive0 config register */ reg = inl(basereg + 4); /* get drive0 config register */
timings |= reg & 0x80000000; /* preserve PIO format bit */ timings |= reg & 0x80000000; /* preserve PIO format bit */
if ((drive-> dn & 1) == 0) { /* are we configuring drive0? */ if ((drive-> dn & 1) == 0) { /* are we configuring drive0? */

6
drivers/ide/cs5535.c
View file

@ -129,15 +129,15 @@ static void cs5535_set_speed(ide_drive_t *drive, const u8 speed)
/** /**
* cs5535_set_dma_mode - set host controller for DMA mode * cs5535_set_dma_mode - set host controller for DMA mode
* @hwif: port
* @drive: drive * @drive: drive
* @speed: DMA mode
* *
* Programs the chipset for DMA mode. * Programs the chipset for DMA mode.
*/ */
static void cs5535_set_dma_mode(ide_drive_t *drive, const u8 speed) static void cs5535_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive)
{ {
cs5535_set_speed(drive, speed); cs5535_set_speed(drive, drive->dma_mode);
} }
/** /**

7
drivers/ide/cs5536.c
View file

@ -173,11 +173,11 @@ static void cs5536_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)
/** /**
* cs5536_set_dma_mode - DMA timing setup * cs5536_set_dma_mode - DMA timing setup
* @hwif: ATA port
* @drive: ATA device * @drive: ATA device
* @mode: DMA mode
*/ */
static void cs5536_set_dma_mode(ide_drive_t *drive, const u8 mode) static void cs5536_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive)
{ {
static const u8 udma_timings[6] = { static const u8 udma_timings[6] = {
0xc2, 0xc1, 0xc0, 0xc4, 0xc5, 0xc6, 0xc2, 0xc1, 0xc0, 0xc4, 0xc5, 0xc6,
@ -187,10 +187,11 @@ static void cs5536_set_dma_mode(ide_drive_t *drive, const u8 mode)
0x67, 0x21, 0x20, 0x67, 0x21, 0x20,
}; };
struct pci_dev *pdev = to_pci_dev(drive->hwif->dev); struct pci_dev *pdev = to_pci_dev(hwif->dev);
int dshift = (drive->dn & 1) ? IDE_D1_SHIFT : IDE_D0_SHIFT; int dshift = (drive->dn & 1) ? IDE_D1_SHIFT : IDE_D0_SHIFT;
unsigned long timings = (unsigned long)ide_get_drivedata(drive); unsigned long timings = (unsigned long)ide_get_drivedata(drive);
u32 etc; u32 etc;
const u8 mode = drive->dma_mode;
cs5536_read(pdev, ETC, &etc); cs5536_read(pdev, ETC, &etc);

4
drivers/ide/cy82c693.c
View file

@ -53,9 +53,9 @@
* set DMA mode a specific channel for CY82C693 * set DMA mode a specific channel for CY82C693
*/ */
static void cy82c693_set_dma_mode(ide_drive_t *drive, const u8 mode) static void cy82c693_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive)
{ {
ide_hwif_t *hwif = drive->hwif; const u8 mode = drive->dma_mode;
u8 single = (mode & 0x10) >> 4, index = 0, data = 0; u8 single = (mode & 0x10) >> 4, index = 0, data = 0;
index = hwif->channel ? CY82_INDEX_CHANNEL1 : CY82_INDEX_CHANNEL0; index = hwif->channel ? CY82_INDEX_CHANNEL1 : CY82_INDEX_CHANNEL0;

7
drivers/ide/hpt366.c
View file

@ -627,14 +627,14 @@ static u32 get_speed_setting(u8 speed, struct hpt_info *info)
return info->timings->clock_table[info->clock][i]; return info->timings->clock_table[info->clock][i];
} }
static void hpt3xx_set_mode(ide_drive_t *drive, const u8 speed) static void hpt3xx_set_mode(ide_hwif_t *hwif, ide_drive_t *drive)
{ {
ide_hwif_t *hwif = drive->hwif;
struct pci_dev *dev = to_pci_dev(hwif->dev); struct pci_dev *dev = to_pci_dev(hwif->dev);
struct hpt_info *info = hpt3xx_get_info(hwif->dev); struct hpt_info *info = hpt3xx_get_info(hwif->dev);
struct hpt_timings *t = info->timings; struct hpt_timings *t = info->timings;
u8 itr_addr = 0x40 + (drive->dn * 4); u8 itr_addr = 0x40 + (drive->dn * 4);
u32 old_itr = 0; u32 old_itr = 0;
const u8 speed = drive->dma_mode;
u32 new_itr = get_speed_setting(speed, info); u32 new_itr = get_speed_setting(speed, info);
u32 itr_mask = speed < XFER_MW_DMA_0 ? t->pio_mask : u32 itr_mask = speed < XFER_MW_DMA_0 ? t->pio_mask :
(speed < XFER_UDMA_0 ? t->dma_mask : (speed < XFER_UDMA_0 ? t->dma_mask :
@ -653,7 +653,8 @@ static void hpt3xx_set_mode(ide_drive_t *drive, const u8 speed)
static void hpt3xx_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive) static void hpt3xx_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)
{ {
hpt3xx_set_mode(drive, drive->pio_mode); drive->dma_mode = drive->pio_mode;
hpt3xx_set_mode(hwif, drive);
} }
static void hpt3xx_maskproc(ide_drive_t *drive, int mask) static void hpt3xx_maskproc(ide_drive_t *drive, int mask)

3
drivers/ide/icside.c
View file

@ -185,10 +185,11 @@ static const expansioncard_ops_t icside_ops_arcin_v6 = {
* MW1 80 50 50 150 C * MW1 80 50 50 150 C
* MW2 70 25 25 120 C * MW2 70 25 25 120 C
*/ */
static void icside_set_dma_mode(ide_drive_t *drive, const u8 xfer_mode) static void icside_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive)
{ {
unsigned long cycle_time; unsigned long cycle_time;
int use_dma_info = 0; int use_dma_info = 0;
const u8 xfer_mode = drive->dma_mode;
switch (xfer_mode) { switch (xfer_mode) {
case XFER_MW_DMA_2: case XFER_MW_DMA_2:

4
drivers/ide/ide-xfer-mode.c
View file

@ -168,11 +168,11 @@ int ide_set_dma_mode(ide_drive_t *drive, const u8 mode)
if (ide_config_drive_speed(drive, mode)) if (ide_config_drive_speed(drive, mode))
return -1; return -1;
drive->dma_mode = mode; drive->dma_mode = mode;
port_ops->set_dma_mode(drive, mode); port_ops->set_dma_mode(hwif, drive);
return 0; return 0;
} else { } else {
drive->dma_mode = mode; drive->dma_mode = mode;
port_ops->set_dma_mode(drive, mode); port_ops->set_dma_mode(hwif, drive);
return ide_config_drive_speed(drive, mode); return ide_config_drive_speed(drive, mode);
} }
} }

4
drivers/ide/it8172.c
View file

@ -77,14 +77,14 @@ static void it8172_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)
pci_write_config_dword(dev, 0x44, drive_timing); pci_write_config_dword(dev, 0x44, drive_timing);
} }
static void it8172_set_dma_mode(ide_drive_t *drive, const u8 speed) static void it8172_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive)
{ {
ide_hwif_t *hwif = drive->hwif;
struct pci_dev *dev = to_pci_dev(hwif->dev); struct pci_dev *dev = to_pci_dev(hwif->dev);
int a_speed = 3 << (drive->dn * 4); int a_speed = 3 << (drive->dn * 4);
int u_flag = 1 << drive->dn; int u_flag = 1 << drive->dn;
int u_speed = 0; int u_speed = 0;
u8 reg48, reg4a; u8 reg48, reg4a;
const u8 speed = drive->dma_mode;
pci_read_config_byte(dev, 0x48, &reg48); pci_read_config_byte(dev, 0x48, &reg48);
pci_read_config_byte(dev, 0x4a, &reg4a); pci_read_config_byte(dev, 0x4a, &reg4a);

6
drivers/ide/it8213.c
View file

@ -74,15 +74,14 @@ static void it8213_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)
/** /**
* it8213_set_dma_mode - set host controller for DMA mode * it8213_set_dma_mode - set host controller for DMA mode
* @hwif: port
* @drive: drive * @drive: drive
* @speed: DMA mode
* *
* Tune the ITE chipset for the DMA mode. * Tune the ITE chipset for the DMA mode.
*/ */
static void it8213_set_dma_mode(ide_drive_t *drive, const u8 speed) static void it8213_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive)
{ {
ide_hwif_t *hwif = drive->hwif;
struct pci_dev *dev = to_pci_dev(hwif->dev); struct pci_dev *dev = to_pci_dev(hwif->dev);
u8 maslave = 0x40; u8 maslave = 0x40;
int a_speed = 3 << (drive->dn * 4); int a_speed = 3 << (drive->dn * 4);
@ -92,6 +91,7 @@ static void it8213_set_dma_mode(ide_drive_t *drive, const u8 speed)
int u_speed = 0; int u_speed = 0;
u16 reg4042, reg4a; u16 reg4042, reg4a;
u8 reg48, reg54, reg55; u8 reg48, reg54, reg55;
const u8 speed = drive->dma_mode;
pci_read_config_word(dev, maslave, &reg4042); pci_read_config_word(dev, maslave, &reg4042);
pci_read_config_byte(dev, 0x48, &reg48); pci_read_config_byte(dev, 0x48, &reg48);

6
drivers/ide/it821x.c
View file

@ -393,14 +393,16 @@ static int it821x_dma_end(ide_drive_t *drive)
/** /**
* it821x_set_dma_mode - set host controller for DMA mode * it821x_set_dma_mode - set host controller for DMA mode
* @hwif: port
* @drive: drive * @drive: drive
* @speed: DMA mode
* *
* Tune the ITE chipset for the desired DMA mode. * Tune the ITE chipset for the desired DMA mode.
*/ */
static void it821x_set_dma_mode(ide_drive_t *drive, const u8 speed) static void it821x_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive)
{ {
const u8 speed = drive->dma_mode;
/* /*
* MWDMA tuning is really hard because our MWDMA and PIO * MWDMA tuning is really hard because our MWDMA and PIO
* timings are kept in the same place. We can switch in the * timings are kept in the same place. We can switch in the

4
drivers/ide/jmicron.c
View file

@ -86,13 +86,13 @@ static void jmicron_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)
/** /**
* jmicron_set_dma_mode - set host controller for DMA mode * jmicron_set_dma_mode - set host controller for DMA mode
* @hwif: port
* @drive: drive * @drive: drive
* @mode: DMA mode
* *
* As the JMicron snoops for timings we don't need to do anything here. * As the JMicron snoops for timings we don't need to do anything here.
*/ */
static void jmicron_set_dma_mode(ide_drive_t *drive, const u8 mode) static void jmicron_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive)
{ {
} }

5
drivers/ide/palm_bk3710.c
View file

@ -188,10 +188,11 @@ static void palm_bk3710_setpiomode(void __iomem *base, ide_drive_t *mate,
writel(val32, base + BK3710_REGRCVR); writel(val32, base + BK3710_REGRCVR);
} }
static void palm_bk3710_set_dma_mode(ide_drive_t *drive, u8 xferspeed) static void palm_bk3710_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive)
{ {
int is_slave = drive->dn & 1; int is_slave = drive->dn & 1;
void __iomem *base = (void *)drive->hwif->dma_base; void __iomem *base = (void *)hwif->dma_base;
const u8 xferspeed = drive->dma_mode;
if (xferspeed >= XFER_UDMA_0) { if (xferspeed >= XFER_UDMA_0) {
palm_bk3710_setudmamode(base, is_slave, palm_bk3710_setudmamode(base, is_slave,

4
drivers/ide/pdc202xx_new.c
View file

@ -129,11 +129,11 @@ static struct udma_timing {
{ 0x1a, 0x01, 0xcb }, /* UDMA mode 6 */ { 0x1a, 0x01, 0xcb }, /* UDMA mode 6 */
}; };
static void pdcnew_set_dma_mode(ide_drive_t *drive, const u8 speed) static void pdcnew_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive)
{ {
ide_hwif_t *hwif = drive->hwif;
struct pci_dev *dev = to_pci_dev(hwif->dev); struct pci_dev *dev = to_pci_dev(hwif->dev);
u8 adj = (drive->dn & 1) ? 0x08 : 0x00; u8 adj = (drive->dn & 1) ? 0x08 : 0x00;
const u8 speed = drive->dma_mode;
/* /*
* IDE core issues SETFEATURES_XFER to the drive first (thanks to * IDE core issues SETFEATURES_XFER to the drive first (thanks to

7
drivers/ide/pdc202xx_old.c
View file

@ -21,11 +21,11 @@
#define DRV_NAME "pdc202xx_old" #define DRV_NAME "pdc202xx_old"
static void pdc202xx_set_mode(ide_drive_t *drive, const u8 speed) static void pdc202xx_set_mode(ide_hwif_t *hwif, ide_drive_t *drive)
{ {
ide_hwif_t *hwif = drive->hwif;
struct pci_dev *dev = to_pci_dev(hwif->dev); struct pci_dev *dev = to_pci_dev(hwif->dev);
u8 drive_pci = 0x60 + (drive->dn << 2); u8 drive_pci = 0x60 + (drive->dn << 2);
const u8 speed = drive->dma_mode;
u8 AP = 0, BP = 0, CP = 0; u8 AP = 0, BP = 0, CP = 0;
u8 TA = 0, TB = 0, TC = 0; u8 TA = 0, TB = 0, TC = 0;
@ -78,7 +78,8 @@ static void pdc202xx_set_mode(ide_drive_t *drive, const u8 speed)
static void pdc202xx_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive) static void pdc202xx_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)
{ {
pdc202xx_set_mode(drive, drive->pio_mode); drive->dma_mode = drive->pio_mode;
pdc202xx_set_mode(hwif, drive);
} }
static int pdc202xx_test_irq(ide_hwif_t *hwif) static int pdc202xx_test_irq(ide_hwif_t *hwif)

6
drivers/ide/piix.c
View file

@ -127,16 +127,15 @@ static void piix_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)
/** /**
* piix_set_dma_mode - set host controller for DMA mode * piix_set_dma_mode - set host controller for DMA mode
* @hwif: port
* @drive: drive * @drive: drive
* @speed: DMA mode
* *
* Set a PIIX host controller to the desired DMA mode. This involves * Set a PIIX host controller to the desired DMA mode. This involves
* programming the right timing data into the PCI configuration space. * programming the right timing data into the PCI configuration space.
*/ */
static void piix_set_dma_mode(ide_drive_t *drive, const u8 speed) static void piix_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive)
{ {
ide_hwif_t *hwif = drive->hwif;
struct pci_dev *dev = to_pci_dev(hwif->dev); struct pci_dev *dev = to_pci_dev(hwif->dev);
u8 maslave = hwif->channel ? 0x42 : 0x40; u8 maslave = hwif->channel ? 0x42 : 0x40;
int a_speed = 3 << (drive->dn * 4); int a_speed = 3 << (drive->dn * 4);
@ -147,6 +146,7 @@ static void piix_set_dma_mode(ide_drive_t *drive, const u8 speed)
int sitre; int sitre;
u16 reg4042, reg4a; u16 reg4042, reg4a;
u8 reg48, reg54, reg55; u8 reg48, reg54, reg55;
const u8 speed = drive->dma_mode;
pci_read_config_word(dev, maslave, &reg4042); pci_read_config_word(dev, maslave, &reg4042);
sitre = (reg4042 & 0x4000) ? 1 : 0; sitre = (reg4042 & 0x4000) ? 1 : 0;

4
drivers/ide/pmac.c
View file

@ -777,14 +777,14 @@ set_timings_mdma(ide_drive_t *drive, int intf_type, u32 *timings, u32 *timings2,
#endif #endif
} }
static void pmac_ide_set_dma_mode(ide_drive_t *drive, const u8 speed) static void pmac_ide_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive)
{ {
ide_hwif_t *hwif = drive->hwif;
pmac_ide_hwif_t *pmif = pmac_ide_hwif_t *pmif =
(pmac_ide_hwif_t *)dev_get_drvdata(hwif->gendev.parent); (pmac_ide_hwif_t *)dev_get_drvdata(hwif->gendev.parent);
int ret = 0; int ret = 0;
u32 *timings, *timings2, tl[2]; u32 *timings, *timings2, tl[2];
u8 unit = drive->dn & 1; u8 unit = drive->dn & 1;
const u8 speed = drive->dma_mode;
timings = &pmif->timings[unit]; timings = &pmif->timings[unit];
timings2 = &pmif->timings[unit+2]; timings2 = &pmif->timings[unit+2];

4
drivers/ide/sc1200.c
View file

@ -122,13 +122,13 @@ out:
return mask; return mask;
} }
static void sc1200_set_dma_mode(ide_drive_t *drive, const u8 mode) static void sc1200_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive)
{ {
ide_hwif_t *hwif = drive->hwif;
struct pci_dev *dev = to_pci_dev(hwif->dev); struct pci_dev *dev = to_pci_dev(hwif->dev);
unsigned int reg, timings; unsigned int reg, timings;
unsigned short pci_clock; unsigned short pci_clock;
unsigned int basereg = hwif->channel ? 0x50 : 0x40; unsigned int basereg = hwif->channel ? 0x50 : 0x40;
const u8 mode = drive->dma_mode;
static const u32 udma_timing[3][3] = { static const u32 udma_timing[3][3] = {
{ 0x00921250, 0x00911140, 0x00911030 }, { 0x00921250, 0x00911140, 0x00911030 },

6
drivers/ide/scc_pata.c
View file

@ -231,16 +231,15 @@ static void scc_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)
/** /**
* scc_set_dma_mode - set host controller for DMA mode * scc_set_dma_mode - set host controller for DMA mode
* @hwif: port
* @drive: drive * @drive: drive
* @speed: DMA mode
* *
* Load the timing settings for this device mode into the * Load the timing settings for this device mode into the
* controller. * controller.
*/ */
static void scc_set_dma_mode(ide_drive_t *drive, const u8 speed) static void scc_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive)
{ {
ide_hwif_t *hwif = drive->hwif;
struct scc_ports *ports = ide_get_hwifdata(hwif); struct scc_ports *ports = ide_get_hwifdata(hwif);
unsigned long ctl_base = ports->ctl; unsigned long ctl_base = ports->ctl;
unsigned long cckctrl_port = ctl_base + 0xff0; unsigned long cckctrl_port = ctl_base + 0xff0;
@ -254,6 +253,7 @@ static void scc_set_dma_mode(ide_drive_t *drive, const u8 speed)
int offset, idx; int offset, idx;
unsigned long reg; unsigned long reg;
unsigned long jcactsel; unsigned long jcactsel;
const u8 speed = drive->dma_mode;
reg = in_be32((void __iomem *)cckctrl_port); reg = in_be32((void __iomem *)cckctrl_port);
if (reg & CCKCTRL_ATACLKOEN) { if (reg & CCKCTRL_ATACLKOEN) {

4
drivers/ide/serverworks.c
View file

@ -128,14 +128,14 @@ static void svwks_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)
} }
} }
static void svwks_set_dma_mode(ide_drive_t *drive, const u8 speed) static void svwks_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive)
{ {
static const u8 udma_modes[] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05 }; static const u8 udma_modes[] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05 };
static const u8 dma_modes[] = { 0x77, 0x21, 0x20 }; static const u8 dma_modes[] = { 0x77, 0x21, 0x20 };
static const u8 drive_pci2[] = { 0x45, 0x44, 0x47, 0x46 }; static const u8 drive_pci2[] = { 0x45, 0x44, 0x47, 0x46 };
ide_hwif_t *hwif = drive->hwif;
struct pci_dev *dev = to_pci_dev(hwif->dev); struct pci_dev *dev = to_pci_dev(hwif->dev);
const u8 speed = drive->dma_mode;
u8 unit = drive->dn & 1; u8 unit = drive->dn & 1;
u8 ultra_enable = 0, ultra_timing = 0, dma_timing = 0; u8 ultra_enable = 0, ultra_timing = 0, dma_timing = 0;

2
drivers/ide/sgiioc4.c
View file

@ -255,7 +255,7 @@ static int sgiioc4_dma_end(ide_drive_t *drive)
return dma_stat; return dma_stat;
} }
static void sgiioc4_set_dma_mode(ide_drive_t *drive, const u8 speed) static void sgiioc4_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive)
{ {
} }

6
drivers/ide/siimage.c
View file

@ -289,19 +289,18 @@ static void sil_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)
/** /**
* sil_set_dma_mode - set host controller for DMA mode * sil_set_dma_mode - set host controller for DMA mode
* @hwif: port
* @drive: drive * @drive: drive
* @speed: DMA mode
* *
* Tune the SiI chipset for the desired DMA mode. * Tune the SiI chipset for the desired DMA mode.
*/ */
static void sil_set_dma_mode(ide_drive_t *drive, const u8 speed) static void sil_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive)
{ {
static const u8 ultra6[] = { 0x0F, 0x0B, 0x07, 0x05, 0x03, 0x02, 0x01 }; static const u8 ultra6[] = { 0x0F, 0x0B, 0x07, 0x05, 0x03, 0x02, 0x01 };
static const u8 ultra5[] = { 0x0C, 0x07, 0x05, 0x04, 0x02, 0x01 }; static const u8 ultra5[] = { 0x0C, 0x07, 0x05, 0x04, 0x02, 0x01 };
static const u16 dma[] = { 0x2208, 0x10C2, 0x10C1 }; static const u16 dma[] = { 0x2208, 0x10C2, 0x10C1 };
ide_hwif_t *hwif = drive->hwif;
struct pci_dev *dev = to_pci_dev(hwif->dev); struct pci_dev *dev = to_pci_dev(hwif->dev);
unsigned long base = (unsigned long)hwif->hwif_data; unsigned long base = (unsigned long)hwif->hwif_data;
u16 ultra = 0, multi = 0; u16 ultra = 0, multi = 0;
@ -311,6 +310,7 @@ static void sil_set_dma_mode(ide_drive_t *drive, const u8 speed)
: (mmio ? 0xB4 : 0x80); : (mmio ? 0xB4 : 0x80);
unsigned long ma = siimage_seldev(drive, 0x08); unsigned long ma = siimage_seldev(drive, 0x08);
unsigned long ua = siimage_seldev(drive, 0x0C); unsigned long ua = siimage_seldev(drive, 0x0C);
const u8 speed = drive->dma_mode;
scsc = sil_ioread8 (dev, base + (mmio ? 0x4A : 0x8A)); scsc = sil_ioread8 (dev, base + (mmio ? 0x4A : 0x8A));
mode = sil_ioread8 (dev, base + addr_mask); mode = sil_ioread8 (dev, base + addr_mask);

4
drivers/ide/sis5513.c
View file

@ -340,8 +340,10 @@ static void sis_program_udma_timings(ide_drive_t *drive, const u8 mode)
sis_ata33_program_udma_timings(drive, mode); sis_ata33_program_udma_timings(drive, mode);
} }
static void sis_set_dma_mode(ide_drive_t *drive, const u8 speed) static void sis_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive)
{ {
const u8 speed = drive->dma_mode;
if (speed >= XFER_UDMA_0) if (speed >= XFER_UDMA_0)
sis_program_udma_timings(drive, speed); sis_program_udma_timings(drive, speed);
else else

3
drivers/ide/sl82c105.c
View file

@ -92,11 +92,12 @@ static void sl82c105_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)
/* /*
* Configure the chipset for DMA mode. * Configure the chipset for DMA mode.
*/ */
static void sl82c105_set_dma_mode(ide_drive_t *drive, const u8 speed) static void sl82c105_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive)
{ {
static u16 mwdma_timings[] = {0x0707, 0x0201, 0x0200}; static u16 mwdma_timings[] = {0x0707, 0x0201, 0x0200};
unsigned long timings = (unsigned long)ide_get_drivedata(drive); unsigned long timings = (unsigned long)ide_get_drivedata(drive);
u16 drv_ctrl; u16 drv_ctrl;
const u8 speed = drive->dma_mode;
drv_ctrl = mwdma_timings[speed - XFER_MW_DMA_0]; drv_ctrl = mwdma_timings[speed - XFER_MW_DMA_0];

4
drivers/ide/slc90e66.c
View file

@ -72,14 +72,14 @@ static void slc90e66_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)
spin_unlock_irqrestore(&slc90e66_lock, flags); spin_unlock_irqrestore(&slc90e66_lock, flags);
} }
static void slc90e66_set_dma_mode(ide_drive_t *drive, const u8 speed) static void slc90e66_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive)
{ {
ide_hwif_t *hwif = drive->hwif;
struct pci_dev *dev = to_pci_dev(hwif->dev); struct pci_dev *dev = to_pci_dev(hwif->dev);
u8 maslave = hwif->channel ? 0x42 : 0x40; u8 maslave = hwif->channel ? 0x42 : 0x40;
int sitre = 0, a_speed = 7 << (drive->dn * 4); int sitre = 0, a_speed = 7 << (drive->dn * 4);
int u_speed = 0, u_flag = 1 << drive->dn; int u_speed = 0, u_flag = 1 << drive->dn;
u16 reg4042, reg44, reg48, reg4a; u16 reg4042, reg44, reg48, reg4a;
const u8 speed = drive->dma_mode;
pci_read_config_word(dev, maslave, &reg4042); pci_read_config_word(dev, maslave, &reg4042);
sitre = (reg4042 & 0x4000) ? 1 : 0; sitre = (reg4042 & 0x4000) ? 1 : 0;

7
drivers/ide/tc86c001.c
View file

@ -13,11 +13,11 @@
#define DRV_NAME "tc86c001" #define DRV_NAME "tc86c001"
static void tc86c001_set_mode(ide_drive_t *drive, const u8 speed) static void tc86c001_set_mode(ide_hwif_t *hwif, ide_drive_t *drive)
{ {
ide_hwif_t *hwif = drive->hwif;
unsigned long scr_port = hwif->config_data + (drive->dn ? 0x02 : 0x00); unsigned long scr_port = hwif->config_data + (drive->dn ? 0x02 : 0x00);
u16 mode, scr = inw(scr_port); u16 mode, scr = inw(scr_port);
const u8 speed = drive->dma_mode;
switch (speed) { switch (speed) {
case XFER_UDMA_4: mode = 0x00c0; break; case XFER_UDMA_4: mode = 0x00c0; break;
@ -43,7 +43,8 @@ static void tc86c001_set_mode(ide_drive_t *drive, const u8 speed)
static void tc86c001_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive) static void tc86c001_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)
{ {
tc86c001_set_mode(drive, drive->pio_mode); drive->dma_mode = drive->pio_mode;
tc86c001_set_mode(hwif, drive);
} }
/* /*

8
drivers/ide/triflex.c
View file

@ -34,9 +34,8 @@
#define DRV_NAME "triflex" #define DRV_NAME "triflex"
static void triflex_set_mode(ide_drive_t *drive, const u8 speed) static void triflex_set_mode(ide_hwif_t *hwif, ide_drive_t *drive)
{ {
ide_hwif_t *hwif = drive->hwif;
struct pci_dev *dev = to_pci_dev(hwif->dev); struct pci_dev *dev = to_pci_dev(hwif->dev);
u32 triflex_timings = 0; u32 triflex_timings = 0;
u16 timing = 0; u16 timing = 0;
@ -44,7 +43,7 @@ static void triflex_set_mode(ide_drive_t *drive, const u8 speed)
pci_read_config_dword(dev, channel_offset, &triflex_timings); pci_read_config_dword(dev, channel_offset, &triflex_timings);
switch(speed) { switch (drive->dma_mode) {
case XFER_MW_DMA_2: case XFER_MW_DMA_2:
timing = 0x0103; timing = 0x0103;
break; break;
@ -84,7 +83,8 @@ static void triflex_set_mode(ide_drive_t *drive, const u8 speed)
static void triflex_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive) static void triflex_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)
{ {
triflex_set_mode(drive, drive->pio_mode); drive->dma_mode = drive->pio_mode;
triflex_set_mode(hwif, drive);
} }
static const struct ide_port_ops triflex_port_ops = { static const struct ide_port_ops triflex_port_ops = {

4
drivers/ide/tx4939ide.c
View file

@ -125,10 +125,10 @@ static void tx4939ide_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)
/* tx4939ide_tf_load_fixup() will set the Sys_Ctl register */ /* tx4939ide_tf_load_fixup() will set the Sys_Ctl register */
} }
static void tx4939ide_set_dma_mode(ide_drive_t *drive, const u8 mode) static void tx4939ide_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive)
{ {
ide_hwif_t *hwif = drive->hwif;
u32 mask, val; u32 mask, val;
const u8 mode = drive->dma_mode;
/* Update Data Transfer Mode for this drive. */ /* Update Data Transfer Mode for this drive. */
if (mode >= XFER_UDMA_0) if (mode >= XFER_UDMA_0)

9
drivers/ide/via82cxxx.c
View file

@ -169,22 +169,22 @@ static void via_set_speed(ide_hwif_t *hwif, u8 dn, struct ide_timing *timing)
/** /**
* via_set_drive - configure transfer mode * via_set_drive - configure transfer mode
* @hwif: port
* @drive: Drive to set up * @drive: Drive to set up
* @speed: desired speed
* *
* via_set_drive() computes timing values configures the chipset to * via_set_drive() computes timing values configures the chipset to
* a desired transfer mode. It also can be called by upper layers. * a desired transfer mode. It also can be called by upper layers.
*/ */
static void via_set_drive(ide_drive_t *drive, const u8 speed) static void via_set_drive(ide_hwif_t *hwif, ide_drive_t *drive)
{ {
ide_hwif_t *hwif = drive->hwif;
ide_drive_t *peer = ide_get_pair_dev(drive); ide_drive_t *peer = ide_get_pair_dev(drive);
struct pci_dev *dev = to_pci_dev(hwif->dev); struct pci_dev *dev = to_pci_dev(hwif->dev);
struct ide_host *host = pci_get_drvdata(dev); struct ide_host *host = pci_get_drvdata(dev);
struct via82cxxx_dev *vdev = host->host_priv; struct via82cxxx_dev *vdev = host->host_priv;
struct ide_timing t, p; struct ide_timing t, p;
unsigned int T, UT; unsigned int T, UT;
const u8 speed = drive->dma_mode;
T = 1000000000 / via_clock; T = 1000000000 / via_clock;
@ -216,7 +216,8 @@ static void via_set_drive(ide_drive_t *drive, const u8 speed)
static void via_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive) static void via_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)
{ {
via_set_drive(drive, drive->pio_mode); drive->dma_mode = drive->pio_mode;
via_set_drive(hwif, drive);
} }
static struct via_isa_bridge *via_config_find(struct pci_dev **isa) static struct via_isa_bridge *via_config_find(struct pci_dev **isa)

2
include/linux/ide.h
View file

@ -625,7 +625,7 @@ extern const struct ide_tp_ops default_tp_ops;
struct ide_port_ops { struct ide_port_ops {
void (*init_dev)(ide_drive_t *); void (*init_dev)(ide_drive_t *);
void (*set_pio_mode)(struct hwif_s *, ide_drive_t *); void (*set_pio_mode)(struct hwif_s *, ide_drive_t *);
void (*set_dma_mode)(ide_drive_t *, const u8); void (*set_dma_mode)(struct hwif_s *, ide_drive_t *);
int (*reset_poll)(ide_drive_t *); int (*reset_poll)(ide_drive_t *);
void (*pre_reset)(ide_drive_t *); void (*pre_reset)(ide_drive_t *);
void (*resetproc)(ide_drive_t *); void (*resetproc)(ide_drive_t *);