Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5bfb151f authored by Joao Ramos's avatar Joao Ramos Committed by Bartlomiej Zolnierkiewicz
Browse files

ide: do not access ide_drive_t 'drive_data' field directly 



Change ide_drive_t 'drive_data' field from 'unsigned int' type to 'void *'
type, allowing a wider range of values/types to be stored in this field.

Added 'ide_get_drivedata' and 'ide_set_drivedata' helpers to get and set
the 'drive_data' field.

Fixed all host drivers to maintain coherency with the change in the
'drive_data' field type.

Signed-off-by: default avatarJoao Ramos <joao.ramos@inov.pt>
[bart: fix qd65xx build, cast to 'unsigned long', minor Coding Style fixups]
Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.montavista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 3779f818

drivers/ide/cmd64x.c

+5 −3
Original line number Diff line number Diff line
@@ -118,8 +118,9 @@ static void cmd64x_tune_pio(ide_drive_t *drive, const u8 pio) 
	ide_hwif_t *hwif	= drive->hwif;

	struct pci_dev *dev	= to_pci_dev(hwif->dev);

	struct ide_timing *t	= ide_timing_find_mode(XFER_PIO_0 + pio);

	unsigned long setup_count;

	unsigned int cycle_time;

	u8 setup_count, arttim = 0;

	u8 arttim = 0;



	static const u8 setup_values[] = {0x40, 0x40, 0x40, 0x80, 0, 0xc0};

	static const u8 arttim_regs[4] = {ARTTIM0, ARTTIM1, ARTTIM23, ARTTIM23};
@@ -140,10 +141,11 @@ static void cmd64x_tune_pio(ide_drive_t *drive, const u8 pio) 
	if (hwif->channel) {

		ide_drive_t *pair = ide_get_pair_dev(drive);



		drive->drive_data = setup_count;

		ide_set_drivedata(drive, (void *)setup_count);



		if (pair)

			setup_count = max_t(u8, setup_count, pair->drive_data);

			setup_count = max_t(u8, setup_count,

					(unsigned long)ide_get_drivedata(pair));

	}



	if (setup_count > 5)		/* shouldn't actually happen... */

drivers/ide/cs5536.c

+15 −8
Original line number Diff line number Diff line
@@ -146,14 +146,16 @@ static void cs5536_set_pio_mode(ide_drive_t *drive, const u8 pio) 
	struct pci_dev *pdev = to_pci_dev(drive->hwif->dev);

	ide_drive_t *pair = ide_get_pair_dev(drive);

	int cshift = (drive->dn & 1) ? IDE_CAST_D1_SHIFT : IDE_CAST_D0_SHIFT;

	unsigned long timings = (unsigned long)ide_get_drivedata(drive);

	u32 cast;

	u8 cmd_pio = pio;



	if (pair)

		cmd_pio = min(pio, ide_get_best_pio_mode(pair, 255, 4));



	drive->drive_data &= (IDE_DRV_MASK << 8);

	drive->drive_data |= drv_timings[pio];

	timings &= (IDE_DRV_MASK << 8);

	timings |= drv_timings[pio];

	ide_set_drivedata(drive, (void *)timings);



	cs5536_program_dtc(drive, drv_timings[pio]);
@@ -186,6 +188,7 @@ static void cs5536_set_dma_mode(ide_drive_t *drive, const u8 mode) 


	struct pci_dev *pdev = to_pci_dev(drive->hwif->dev);

	int dshift = (drive->dn & 1) ? IDE_D1_SHIFT : IDE_D0_SHIFT;

	unsigned long timings = (unsigned long)ide_get_drivedata(drive);

	u32 etc;



	cs5536_read(pdev, ETC, &etc);
@@ -195,8 +198,9 @@ static void cs5536_set_dma_mode(ide_drive_t *drive, const u8 mode) 
		etc |= udma_timings[mode - XFER_UDMA_0] << dshift;

	} else { /* MWDMA */

		etc &= ~(IDE_ETC_UDMA_MASK << dshift);

		drive->drive_data &= IDE_DRV_MASK;

		drive->drive_data |= mwdma_timings[mode - XFER_MW_DMA_0] << 8;

		timings &= IDE_DRV_MASK;

		timings |= mwdma_timings[mode - XFER_MW_DMA_0] << 8;

		ide_set_drivedata(drive, (void *)timings);

	}



	cs5536_write(pdev, ETC, etc);
@@ -204,9 +208,11 @@ static void cs5536_set_dma_mode(ide_drive_t *drive, const u8 mode) 


static void cs5536_dma_start(ide_drive_t *drive)

{

	unsigned long timings = (unsigned long)ide_get_drivedata(drive);



	if (drive->current_speed < XFER_UDMA_0 &&

	    (drive->drive_data >> 8) != (drive->drive_data & IDE_DRV_MASK))

		cs5536_program_dtc(drive, drive->drive_data >> 8);

	    (timings >> 8) != (timings & IDE_DRV_MASK))

		cs5536_program_dtc(drive, timings >> 8);



	ide_dma_start(drive);

}
@@ -214,10 +220,11 @@ static void cs5536_dma_start(ide_drive_t *drive) 
static int cs5536_dma_end(ide_drive_t *drive)

{

	int ret = ide_dma_end(drive);

	unsigned long timings = (unsigned long)ide_get_drivedata(drive);



	if (drive->current_speed < XFER_UDMA_0 &&

	    (drive->drive_data >> 8) != (drive->drive_data & IDE_DRV_MASK))

		cs5536_program_dtc(drive, drive->drive_data & IDE_DRV_MASK);

	    (timings >> 8) != (timings & IDE_DRV_MASK))

		cs5536_program_dtc(drive, timings & IDE_DRV_MASK);



	return ret;

}

drivers/ide/ht6560b.c

+24 −9
Original line number Diff line number Diff line
@@ -44,7 +44,12 @@ 
 *    bit3 (0x08): "1" 3 cycle time, "0" 2 cycle time	      (?)

 */

#define HT_CONFIG_PORT	  0x3e6

#define HT_CONFIG(drivea) (u8)(((drivea)->drive_data & 0xff00) >> 8)



static inline u8 HT_CONFIG(ide_drive_t *drive)

{

	return ((unsigned long)ide_get_drivedata(drive) & 0xff00) >> 8;

}



/*

 * FIFO + PREFETCH (both a/b-model)

 */
@@ -90,7 +95,11 @@ 
 * Active Time for each drive. Smaller value gives higher speed.

 * In case of failures you should probably fall back to a higher value.

 */

#define HT_TIMING(drivea) (u8)((drivea)->drive_data & 0x00ff)

static inline u8 HT_TIMING(ide_drive_t *drive)

{

	return (unsigned long)ide_get_drivedata(drive) & 0x00ff;

}



#define HT_TIMING_DEFAULT 0xff



/*
@@ -242,23 +251,27 @@ static DEFINE_SPINLOCK(ht6560b_lock); 
 */

static void ht_set_prefetch(ide_drive_t *drive, u8 state)

{

	unsigned long flags;

	unsigned long flags, config;

	int t = HT_PREFETCH_MODE << 8;



	spin_lock_irqsave(&ht6560b_lock, flags);



	config = (unsigned long)ide_get_drivedata(drive);



	/*

	 *  Prefetch mode and unmask irq seems to conflict

	 */

	if (state) {

		drive->drive_data |= t;   /* enable prefetch mode */

		config |= t;   /* enable prefetch mode */

		drive->dev_flags |= IDE_DFLAG_NO_UNMASK;

		drive->dev_flags &= ~IDE_DFLAG_UNMASK;

	} else {

		drive->drive_data &= ~t;  /* disable prefetch mode */

		config &= ~t;  /* disable prefetch mode */

		drive->dev_flags &= ~IDE_DFLAG_NO_UNMASK;

	}



	ide_set_drivedata(drive, (void *)config);



	spin_unlock_irqrestore(&ht6560b_lock, flags);



#ifdef DEBUG
@@ -268,7 +281,7 @@ static void ht_set_prefetch(ide_drive_t *drive, u8 state) 


static void ht6560b_set_pio_mode(ide_drive_t *drive, const u8 pio)

{

	unsigned long flags;

	unsigned long flags, config;

	u8 timing;

	

	switch (pio) {
@@ -281,8 +294,10 @@ static void ht6560b_set_pio_mode(ide_drive_t *drive, const u8 pio) 
	timing = ht_pio2timings(drive, pio);



	spin_lock_irqsave(&ht6560b_lock, flags);

	drive->drive_data &= 0xff00;

	drive->drive_data |= timing;

	config = (unsigned long)ide_get_drivedata(drive);

	config &= 0xff00;

	config |= timing;

	ide_set_drivedata(drive, (void *)config);

	spin_unlock_irqrestore(&ht6560b_lock, flags);



#ifdef DEBUG
@@ -299,7 +314,7 @@ static void __init ht6560b_init_dev(ide_drive_t *drive) 
	if (hwif->channel)

		t |= (HT_SECONDARY_IF << 8);



	drive->drive_data = t;

	ide_set_drivedata(drive, (void *)t);

}



static int probe_ht6560b;

drivers/ide/icside.c

+6 −4
Original line number Diff line number Diff line
@@ -187,7 +187,8 @@ static const expansioncard_ops_t icside_ops_arcin_v6 = { 
 */

static void icside_set_dma_mode(ide_drive_t *drive, const u8 xfer_mode)

{

	int cycle_time, use_dma_info = 0;

	unsigned long cycle_time;

	int use_dma_info = 0;



	switch (xfer_mode) {

	case XFER_MW_DMA_2:
@@ -218,10 +219,11 @@ static void icside_set_dma_mode(ide_drive_t *drive, const u8 xfer_mode) 
	if (use_dma_info && drive->id[ATA_ID_EIDE_DMA_TIME] > cycle_time)

		cycle_time = drive->id[ATA_ID_EIDE_DMA_TIME];



	drive->drive_data = cycle_time;

	ide_set_drivedata(drive, (void *)cycle_time);



	printk("%s: %s selected (peak %dMB/s)\n", drive->name,

		ide_xfer_verbose(xfer_mode), 2000 / drive->drive_data);

		ide_xfer_verbose(xfer_mode),

		2000 / (unsigned long)ide_get_drivedata(drive));

}



static const struct ide_port_ops icside_v6_port_ops = {
@@ -277,7 +279,7 @@ static int icside_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd) 
	/*

	 * Select the correct timing for this drive.

	 */

	set_dma_speed(ec->dma, drive->drive_data);

	set_dma_speed(ec->dma, (unsigned long)ide_get_drivedata(drive));



	/*

	 * Tell the DMA engine about the SG table and

drivers/ide/opti621.c

+5 −3
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ static void opti621_set_pio_mode(ide_drive_t *drive, const u8 pio) 
	ide_hwif_t *hwif = drive->hwif;

	ide_drive_t *pair = ide_get_pair_dev(drive);

	unsigned long flags;

	unsigned long mode = XFER_PIO_0 + pio, pair_mode;

	u8 tim, misc, addr_pio = pio, clk;



	/* DRDY is default 2 (by OPTi Databook) */
@@ -150,11 +151,12 @@ static void opti621_set_pio_mode(ide_drive_t *drive, const u8 pio) 
		{ 0x48, 0x34, 0x21, 0x10, 0x10 }	/* 25 MHz */

	};



	drive->drive_data = XFER_PIO_0 + pio;

	ide_set_drivedata(drive, (void *)mode);



	if (pair) {

		if (pair->drive_data && pair->drive_data < drive->drive_data)

			addr_pio = pair->drive_data - XFER_PIO_0;

		pair_mode = (unsigned long)ide_get_drivedata(pair);

		if (pair_mode && pair_mode < mode)

			addr_pio = pair_mode - XFER_PIO_0;

	}



	spin_lock_irqsave(&opti621_lock, flags);