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

Commit 989e0aac authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Tejun Heo
Browse files

ata: pass queued command to ->sff_data_xfer method 



For Atari Falcon PATA support we need to check the current command
in its ->sff_data_xfer method.  Update core code and all users
accordingly.

There should be no functional changes caused by this patch.

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 7563f625

drivers/ata/libata-sff.c

+15 −14
Original line number Diff line number Diff line
@@ -542,7 +542,7 @@ static inline void ata_tf_to_host(struct ata_port *ap, 


/**

 *	ata_sff_data_xfer - Transfer data by PIO

 *	@dev: device to target

 *	@qc: queued command

 *	@buf: data buffer

 *	@buflen: buffer length

 *	@rw: read/write
@@ -555,10 +555,10 @@ static inline void ata_tf_to_host(struct ata_port *ap, 
 *	RETURNS:

 *	Bytes consumed.

 */

unsigned int ata_sff_data_xfer(struct ata_device *dev, unsigned char *buf,

unsigned int ata_sff_data_xfer(struct ata_queued_cmd *qc, unsigned char *buf,

			       unsigned int buflen, int rw)

{

	struct ata_port *ap = dev->link->ap;

	struct ata_port *ap = qc->dev->link->ap;

	void __iomem *data_addr = ap->ioaddr.data_addr;

	unsigned int words = buflen >> 1;
@@ -595,7 +595,7 @@ EXPORT_SYMBOL_GPL(ata_sff_data_xfer); 


/**

 *	ata_sff_data_xfer32 - Transfer data by PIO

 *	@dev: device to target

 *	@qc: queued command

 *	@buf: data buffer

 *	@buflen: buffer length

 *	@rw: read/write
@@ -610,16 +610,17 @@ EXPORT_SYMBOL_GPL(ata_sff_data_xfer); 
 *	Bytes consumed.

 */



unsigned int ata_sff_data_xfer32(struct ata_device *dev, unsigned char *buf,

unsigned int ata_sff_data_xfer32(struct ata_queued_cmd *qc, unsigned char *buf,

			       unsigned int buflen, int rw)

{

	struct ata_device *dev = qc->dev;

	struct ata_port *ap = dev->link->ap;

	void __iomem *data_addr = ap->ioaddr.data_addr;

	unsigned int words = buflen >> 2;

	int slop = buflen & 3;



	if (!(ap->pflags & ATA_PFLAG_PIO32))

		return ata_sff_data_xfer(dev, buf, buflen, rw);

		return ata_sff_data_xfer(qc, buf, buflen, rw);



	/* Transfer multiple of 4 bytes */

	if (rw == READ)
@@ -658,7 +659,7 @@ EXPORT_SYMBOL_GPL(ata_sff_data_xfer32); 


/**

 *	ata_sff_data_xfer_noirq - Transfer data by PIO

 *	@dev: device to target

 *	@qc: queued command

 *	@buf: data buffer

 *	@buflen: buffer length

 *	@rw: read/write
@@ -672,14 +673,14 @@ EXPORT_SYMBOL_GPL(ata_sff_data_xfer32); 
 *	RETURNS:

 *	Bytes consumed.

 */

unsigned int ata_sff_data_xfer_noirq(struct ata_device *dev, unsigned char *buf,

unsigned int ata_sff_data_xfer_noirq(struct ata_queued_cmd *qc, unsigned char *buf,

				     unsigned int buflen, int rw)

{

	unsigned long flags;

	unsigned int consumed;



	local_irq_save(flags);

	consumed = ata_sff_data_xfer32(dev, buf, buflen, rw);

	consumed = ata_sff_data_xfer32(qc, buf, buflen, rw);

	local_irq_restore(flags);



	return consumed;
@@ -723,14 +724,14 @@ static void ata_pio_sector(struct ata_queued_cmd *qc) 
		buf = kmap_atomic(page);



		/* do the actual data transfer */

		ap->ops->sff_data_xfer(qc->dev, buf + offset, qc->sect_size,

		ap->ops->sff_data_xfer(qc, buf + offset, qc->sect_size,

				       do_write);



		kunmap_atomic(buf);

		local_irq_restore(flags);

	} else {

		buf = page_address(page);

		ap->ops->sff_data_xfer(qc->dev, buf + offset, qc->sect_size,

		ap->ops->sff_data_xfer(qc, buf + offset, qc->sect_size,

				       do_write);

	}
@@ -791,7 +792,7 @@ static void atapi_send_cdb(struct ata_port *ap, struct ata_queued_cmd *qc) 
	DPRINTK("send cdb\n");

	WARN_ON_ONCE(qc->dev->cdb_len < 12);



	ap->ops->sff_data_xfer(qc->dev, qc->cdb, qc->dev->cdb_len, 1);

	ap->ops->sff_data_xfer(qc, qc->cdb, qc->dev->cdb_len, 1);

	ata_sff_sync(ap);

	/* FIXME: If the CDB is for DMA do we need to do the transition delay

	   or is bmdma_start guaranteed to do it ? */
@@ -868,14 +869,14 @@ static int __atapi_pio_bytes(struct ata_queued_cmd *qc, unsigned int bytes) 
		buf = kmap_atomic(page);



		/* do the actual data transfer */

		consumed = ap->ops->sff_data_xfer(dev,  buf + offset,

		consumed = ap->ops->sff_data_xfer(qc, buf + offset,

								count, rw);



		kunmap_atomic(buf);

		local_irq_restore(flags);

	} else {

		buf = page_address(page);

		consumed = ap->ops->sff_data_xfer(dev,  buf + offset,

		consumed = ap->ops->sff_data_xfer(qc, buf + offset,

								count, rw);

	}

drivers/ata/pata_at91.c

+3 −3
Original line number Diff line number Diff line
@@ -286,10 +286,10 @@ static void pata_at91_set_piomode(struct ata_port *ap, struct ata_device *adev) 
	set_smc_timing(ap->dev, adev, info, &timing);

}



static unsigned int pata_at91_data_xfer_noirq(struct ata_device *dev,

static unsigned int pata_at91_data_xfer_noirq(struct ata_queued_cmd *qc,

		unsigned char *buf, unsigned int buflen, int rw)

{

	struct at91_ide_info *info = dev->link->ap->host->private_data;

	struct at91_ide_info *info = qc->dev->link->ap->host->private_data;

	unsigned int consumed;

	unsigned int mode;

	unsigned long flags;
@@ -301,7 +301,7 @@ static unsigned int pata_at91_data_xfer_noirq(struct ata_device *dev, 
	regmap_fields_write(fields.mode, info->cs, (mode & ~AT91_SMC_DBW) |

			    AT91_SMC_DBW_16);



	consumed = ata_sff_data_xfer(dev, buf, buflen, rw);

	consumed = ata_sff_data_xfer(qc, buf, buflen, rw);



	/* restore 8bit mode after data is written */

	regmap_fields_write(fields.mode, info->cs, (mode & ~AT91_SMC_DBW) |

drivers/ata/pata_bf54x.c

+4 −3
Original line number Diff line number Diff line
@@ -1143,7 +1143,7 @@ static unsigned char bfin_bmdma_status(struct ata_port *ap) 


/**

 *	bfin_data_xfer - Transfer data by PIO

 *	@adev: device for this I/O

 *	@qc: queued command

 *	@buf: data buffer

 *	@buflen: buffer length

 *	@write_data: read/write
@@ -1151,10 +1151,11 @@ static unsigned char bfin_bmdma_status(struct ata_port *ap) 
 *	Note: Original code is ata_sff_data_xfer().

 */



static unsigned int bfin_data_xfer(struct ata_device *dev, unsigned char *buf,

static unsigned int bfin_data_xfer(struct ata_queued_cmd *qc,

				   unsigned char *buf,

				   unsigned int buflen, int rw)

{

	struct ata_port *ap = dev->link->ap;

	struct ata_port *ap = qc->dev->link->ap;

	void __iomem *base = (void __iomem *)ap->ioaddr.ctl_addr;

	unsigned int words = buflen >> 1;

	unsigned short *buf16 = (u16 *)buf;

drivers/ata/pata_ep93xx.c

+2 −2
Original line number Diff line number Diff line
@@ -474,11 +474,11 @@ static void ep93xx_pata_set_devctl(struct ata_port *ap, u8 ctl) 
}



/* Note: original code is ata_sff_data_xfer */

static unsigned int ep93xx_pata_data_xfer(struct ata_device *adev,

static unsigned int ep93xx_pata_data_xfer(struct ata_queued_cmd *qc,

					  unsigned char *buf,

					  unsigned int buflen, int rw)

{

	struct ata_port *ap = adev->link->ap;

	struct ata_port *ap = qc->dev->link->ap;

	struct ep93xx_pata_data *drv_data = ap->host->private_data;

	u16 *data = (u16 *)buf;

	unsigned int words = buflen >> 1;

drivers/ata/pata_ixp4xx_cf.c

+2 −2
Original line number Diff line number Diff line
@@ -40,13 +40,13 @@ static int ixp4xx_set_mode(struct ata_link *link, struct ata_device **error) 
	return 0;

}



static unsigned int ixp4xx_mmio_data_xfer(struct ata_device *dev,

static unsigned int ixp4xx_mmio_data_xfer(struct ata_queued_cmd *qc,

				unsigned char *buf, unsigned int buflen, int rw)

{

	unsigned int i;

	unsigned int words = buflen >> 1;

	u16 *buf16 = (u16 *) buf;

	struct ata_port *ap = dev->link->ap;

	struct ata_port *ap = qc->dev->link->ap;

	void __iomem *mmio = ap->ioaddr.data_addr;

	struct ixp4xx_pata_data *data = dev_get_platdata(ap->host->dev);