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

Commit 0d5ff566 authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

libata: convert to iomap 



Convert libata core layer and LLDs to use iomap.

* managed iomap is used.  Pointer to pcim_iomap_table() is cached at
  host->iomap and used through out LLDs.  This basically replaces
  host->mmio_base.

* if possible, pcim_iomap_regions() is used

Most iomap operation conversions are taken from Jeff Garzik
<jgarzik@pobox.com>'s iomap branch.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 1a68ff13

drivers/ata/ahci.c

+34 −45
Original line number Diff line number Diff line
@@ -446,16 +446,12 @@ static inline int ahci_nr_ports(u32 cap) 
	return (cap & 0x1f) + 1;

}



static inline unsigned long ahci_port_base_ul (unsigned long base, unsigned int port)

static inline void __iomem *ahci_port_base(void __iomem *base,

					   unsigned int port)

{

	return base + 0x100 + (port * 0x80);

}



static inline void __iomem *ahci_port_base (void __iomem *base, unsigned int port)

{

	return (void __iomem *) ahci_port_base_ul((unsigned long)base, port);

}



static u32 ahci_scr_read (struct ata_port *ap, unsigned int sc_reg_in)

{

	unsigned int sc_reg;
@@ -469,7 +465,7 @@ static u32 ahci_scr_read (struct ata_port *ap, unsigned int sc_reg_in) 
		return 0xffffffffU;

	}



	return readl((void __iomem *) ap->ioaddr.scr_addr + (sc_reg * 4));

	return readl(ap->ioaddr.scr_addr + (sc_reg * 4));

}
@@ -487,7 +483,7 @@ static void ahci_scr_write (struct ata_port *ap, unsigned int sc_reg_in, 
		return;

	}



	writel(val, (void __iomem *) ap->ioaddr.scr_addr + (sc_reg * 4));

	writel(val, ap->ioaddr.scr_addr + (sc_reg * 4));

}



static void ahci_start_engine(void __iomem *port_mmio)
@@ -729,7 +725,7 @@ static void ahci_init_controller(void __iomem *mmio, struct pci_dev *pdev, 


static unsigned int ahci_dev_classify(struct ata_port *ap)

{

	void __iomem *port_mmio = (void __iomem *) ap->ioaddr.cmd_addr;

	void __iomem *port_mmio = ap->ioaddr.cmd_addr;

	struct ata_taskfile tf;

	u32 tmp;
@@ -757,7 +753,7 @@ static void ahci_fill_cmd_slot(struct ahci_port_priv *pp, unsigned int tag, 


static int ahci_clo(struct ata_port *ap)

{

	void __iomem *port_mmio = (void __iomem *) ap->ioaddr.cmd_addr;

	void __iomem *port_mmio = ap->ioaddr.cmd_addr;

	struct ahci_host_priv *hpriv = ap->host->private_data;

	u32 tmp;
@@ -779,7 +775,7 @@ static int ahci_clo(struct ata_port *ap) 
static int ahci_softreset(struct ata_port *ap, unsigned int *class)

{

	struct ahci_port_priv *pp = ap->private_data;

	void __iomem *mmio = ap->host->mmio_base;

	void __iomem *mmio = ap->host->iomap[AHCI_PCI_BAR];

	void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);

	const u32 cmd_fis_len = 5; /* five dwords */

	const char *reason = NULL;
@@ -887,7 +883,7 @@ static int ahci_hardreset(struct ata_port *ap, unsigned int *class) 
	struct ahci_port_priv *pp = ap->private_data;

	u8 *d2h_fis = pp->rx_fis + RX_FIS_D2H_REG;

	struct ata_taskfile tf;

	void __iomem *mmio = ap->host->mmio_base;

	void __iomem *mmio = ap->host->iomap[AHCI_PCI_BAR];

	void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);

	int rc;
@@ -915,7 +911,7 @@ static int ahci_hardreset(struct ata_port *ap, unsigned int *class) 


static int ahci_vt8251_hardreset(struct ata_port *ap, unsigned int *class)

{

	void __iomem *mmio = ap->host->mmio_base;

	void __iomem *mmio = ap->host->iomap[AHCI_PCI_BAR];

	void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);

	int rc;
@@ -940,7 +936,7 @@ static int ahci_vt8251_hardreset(struct ata_port *ap, unsigned int *class) 


static void ahci_postreset(struct ata_port *ap, unsigned int *class)

{

	void __iomem *port_mmio = (void __iomem *) ap->ioaddr.cmd_addr;

	void __iomem *port_mmio = ap->ioaddr.cmd_addr;

	u32 new_tmp, tmp;



	ata_std_postreset(ap, class);
@@ -959,7 +955,7 @@ static void ahci_postreset(struct ata_port *ap, unsigned int *class) 


static u8 ahci_check_status(struct ata_port *ap)

{

	void __iomem *mmio = (void __iomem *) ap->ioaddr.cmd_addr;

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



	return readl(mmio + PORT_TFDATA) & 0xFF;

}
@@ -1105,7 +1101,7 @@ static void ahci_error_intr(struct ata_port *ap, u32 irq_stat) 


static void ahci_host_intr(struct ata_port *ap)

{

	void __iomem *mmio = ap->host->mmio_base;

	void __iomem *mmio = ap->host->iomap[AHCI_PCI_BAR];

	void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);

	struct ata_eh_info *ehi = &ap->eh_info;

	struct ahci_port_priv *pp = ap->private_data;
@@ -1203,7 +1199,7 @@ static irqreturn_t ahci_interrupt(int irq, void *dev_instance) 
	VPRINTK("ENTER\n");



	hpriv = host->private_data;

	mmio = host->mmio_base;

	mmio = host->iomap[AHCI_PCI_BAR];



	/* sigh.  0xffffffff is a valid return from h/w */

	irq_stat = readl(mmio + HOST_IRQ_STAT);
@@ -1248,7 +1244,7 @@ static irqreturn_t ahci_interrupt(int irq, void *dev_instance) 
static unsigned int ahci_qc_issue(struct ata_queued_cmd *qc)

{

	struct ata_port *ap = qc->ap;

	void __iomem *port_mmio = (void __iomem *) ap->ioaddr.cmd_addr;

	void __iomem *port_mmio = ap->ioaddr.cmd_addr;



	if (qc->tf.protocol == ATA_PROT_NCQ)

		writel(1 << qc->tag, port_mmio + PORT_SCR_ACT);
@@ -1260,7 +1256,7 @@ static unsigned int ahci_qc_issue(struct ata_queued_cmd *qc) 


static void ahci_freeze(struct ata_port *ap)

{

	void __iomem *mmio = ap->host->mmio_base;

	void __iomem *mmio = ap->host->iomap[AHCI_PCI_BAR];

	void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);



	/* turn IRQ off */
@@ -1269,7 +1265,7 @@ static void ahci_freeze(struct ata_port *ap) 


static void ahci_thaw(struct ata_port *ap)

{

	void __iomem *mmio = ap->host->mmio_base;

	void __iomem *mmio = ap->host->iomap[AHCI_PCI_BAR];

	void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);

	u32 tmp;
@@ -1284,7 +1280,7 @@ static void ahci_thaw(struct ata_port *ap) 


static void ahci_error_handler(struct ata_port *ap)

{

	void __iomem *mmio = ap->host->mmio_base;

	void __iomem *mmio = ap->host->iomap[AHCI_PCI_BAR];

	void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);



	if (!(ap->pflags & ATA_PFLAG_FROZEN)) {
@@ -1300,7 +1296,7 @@ static void ahci_error_handler(struct ata_port *ap) 


static void ahci_vt8251_error_handler(struct ata_port *ap)

{

	void __iomem *mmio = ap->host->mmio_base;

	void __iomem *mmio = ap->host->iomap[AHCI_PCI_BAR];

	void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);



	if (!(ap->pflags & ATA_PFLAG_FROZEN)) {
@@ -1317,7 +1313,7 @@ static void ahci_vt8251_error_handler(struct ata_port *ap) 
static void ahci_post_internal_cmd(struct ata_queued_cmd *qc)

{

	struct ata_port *ap = qc->ap;

	void __iomem *mmio = ap->host->mmio_base;

	void __iomem *mmio = ap->host->iomap[AHCI_PCI_BAR];

	void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);



	if (qc->flags & ATA_QCFLAG_FAILED)
@@ -1334,7 +1330,7 @@ static int ahci_port_suspend(struct ata_port *ap, pm_message_t mesg) 
{

	struct ahci_host_priv *hpriv = ap->host->private_data;

	struct ahci_port_priv *pp = ap->private_data;

	void __iomem *mmio = ap->host->mmio_base;

	void __iomem *mmio = ap->host->iomap[AHCI_PCI_BAR];

	void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);

	const char *emsg = NULL;

	int rc;
@@ -1355,7 +1351,7 @@ static int ahci_port_resume(struct ata_port *ap) 
{

	struct ahci_port_priv *pp = ap->private_data;

	struct ahci_host_priv *hpriv = ap->host->private_data;

	void __iomem *mmio = ap->host->mmio_base;

	void __iomem *mmio = ap->host->iomap[AHCI_PCI_BAR];

	void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);



	ahci_power_up(port_mmio, hpriv->cap);
@@ -1367,7 +1363,7 @@ static int ahci_port_resume(struct ata_port *ap) 
static int ahci_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg)

{

	struct ata_host *host = dev_get_drvdata(&pdev->dev);

	void __iomem *mmio = host->mmio_base;

	void __iomem *mmio = host->iomap[AHCI_PCI_BAR];

	u32 ctl;



	if (mesg.event == PM_EVENT_SUSPEND) {
@@ -1388,7 +1384,7 @@ static int ahci_pci_device_resume(struct pci_dev *pdev) 
{

	struct ata_host *host = dev_get_drvdata(&pdev->dev);

	struct ahci_host_priv *hpriv = host->private_data;

	void __iomem *mmio = host->mmio_base;

	void __iomem *mmio = host->iomap[AHCI_PCI_BAR];

	int rc;



	rc = ata_pci_device_do_resume(pdev);
@@ -1414,7 +1410,7 @@ static int ahci_port_start(struct ata_port *ap) 
	struct device *dev = ap->host->dev;

	struct ahci_host_priv *hpriv = ap->host->private_data;

	struct ahci_port_priv *pp;

	void __iomem *mmio = ap->host->mmio_base;

	void __iomem *mmio = ap->host->iomap[AHCI_PCI_BAR];

	void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);

	void *mem;

	dma_addr_t mem_dma;
@@ -1474,7 +1470,7 @@ static int ahci_port_start(struct ata_port *ap) 
static void ahci_port_stop(struct ata_port *ap)

{

	struct ahci_host_priv *hpriv = ap->host->private_data;

	void __iomem *mmio = ap->host->mmio_base;

	void __iomem *mmio = ap->host->iomap[AHCI_PCI_BAR];

	void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);

	const char *emsg = NULL;

	int rc;
@@ -1485,11 +1481,11 @@ static void ahci_port_stop(struct ata_port *ap) 
		ata_port_printk(ap, KERN_WARNING, "%s (%d)\n", emsg, rc);

}



static void ahci_setup_port(struct ata_ioports *port, unsigned long base,

static void ahci_setup_port(struct ata_ioports *port, void __iomem *base,

			    unsigned int port_idx)

{

	VPRINTK("ENTER, base==0x%lx, port_idx %u\n", base, port_idx);

	base = ahci_port_base_ul(base, port_idx);

	base = ahci_port_base(base, port_idx);

	VPRINTK("base now==0x%lx\n", base);



	port->cmd_addr		= base;
@@ -1502,7 +1498,7 @@ static int ahci_host_init(struct ata_probe_ent *probe_ent) 
{

	struct ahci_host_priv *hpriv = probe_ent->private_data;

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

	void __iomem *mmio = probe_ent->mmio_base;

	void __iomem *mmio = probe_ent->iomap[AHCI_PCI_BAR];

	unsigned int i, cap_n_ports, using_dac;

	int rc;
@@ -1569,7 +1565,7 @@ static int ahci_host_init(struct ata_probe_ent *probe_ent) 
	}



	for (i = 0; i < probe_ent->n_ports; i++)

		ahci_setup_port(&probe_ent->port[i], (unsigned long) mmio, i);

		ahci_setup_port(&probe_ent->port[i], mmio, i);



	ahci_init_controller(mmio, pdev, probe_ent->n_ports,

			     probe_ent->port_flags, hpriv);
@@ -1583,7 +1579,7 @@ static void ahci_print_info(struct ata_probe_ent *probe_ent) 
{

	struct ahci_host_priv *hpriv = probe_ent->private_data;

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

	void __iomem *mmio = probe_ent->mmio_base;

	void __iomem *mmio = probe_ent->iomap[AHCI_PCI_BAR];

	u32 vers, cap, impl, speed;

	const char *speed_s;

	u16 cc;
@@ -1657,8 +1653,6 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	struct device *dev = &pdev->dev;

	struct ata_probe_ent *probe_ent;

	struct ahci_host_priv *hpriv;

	unsigned long base;

	void __iomem *mmio_base;

	int rc;



	VPRINTK("ENTER\n");
@@ -1679,11 +1673,11 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (rc)

		return rc;



	rc = pci_request_regions(pdev, DRV_NAME);

	if (rc) {

	rc = pcim_iomap_regions(pdev, 1 << AHCI_PCI_BAR, DRV_NAME);

	if (rc == -EBUSY)

		pcim_pin_device(pdev);

	if (rc)

		return rc;

	}



	if (pci_enable_msi(pdev))

		pci_intx(pdev, 1);
@@ -1695,11 +1689,6 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	probe_ent->dev = pci_dev_to_dev(pdev);

	INIT_LIST_HEAD(&probe_ent->node);



	mmio_base = pcim_iomap(pdev, AHCI_PCI_BAR, 0);

	if (mmio_base == NULL)

		return -ENOMEM;

	base = (unsigned long) mmio_base;



	hpriv = devm_kzalloc(dev, sizeof(*hpriv), GFP_KERNEL);

	if (!hpriv)

		return -ENOMEM;
@@ -1712,7 +1701,7 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 


       	probe_ent->irq = pdev->irq;

       	probe_ent->irq_flags = IRQF_SHARED;

	probe_ent->mmio_base = mmio_base;

	probe_ent->iomap = pcim_iomap_table(pdev);

	probe_ent->private_data = hpriv;



	/* initialize adapter */

drivers/ata/ata_generic.c

+2 −2
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ static int generic_set_mode(struct ata_port *ap, struct ata_device **unused) 


	/* Bits 5 and 6 indicate if DMA is active on master/slave */

	if (ap->ioaddr.bmdma_addr)

		dma_enabled = inb(ap->ioaddr.bmdma_addr + ATA_DMA_CMD);

		dma_enabled = ioread8(ap->ioaddr.bmdma_addr + ATA_DMA_CMD);



	for (i = 0; i < ATA_MAX_DEVICES; i++) {

		struct ata_device *dev = &ap->device[i];
@@ -138,7 +138,7 @@ static struct ata_port_operations generic_port_ops = { 
	.bmdma_stop	= ata_bmdma_stop,

	.bmdma_status 	= ata_bmdma_status,



	.data_xfer	= ata_pio_data_xfer,

	.data_xfer	= ata_data_xfer,



	.freeze		= ata_bmdma_freeze,

	.thaw		= ata_bmdma_thaw,

drivers/ata/ata_piix.c

+3 −3
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ static const struct ata_port_operations piix_pata_ops = { 
	.bmdma_status		= ata_bmdma_status,

	.qc_prep		= ata_qc_prep,

	.qc_issue		= ata_qc_issue_prot,

	.data_xfer		= ata_pio_data_xfer,

	.data_xfer		= ata_data_xfer,



	.freeze			= ata_bmdma_freeze,

	.thaw			= ata_bmdma_thaw,
@@ -330,7 +330,7 @@ static const struct ata_port_operations ich_pata_ops = { 
	.bmdma_status		= ata_bmdma_status,

	.qc_prep		= ata_qc_prep,

	.qc_issue		= ata_qc_issue_prot,

	.data_xfer		= ata_pio_data_xfer,

	.data_xfer		= ata_data_xfer,



	.freeze			= ata_bmdma_freeze,

	.thaw			= ata_bmdma_thaw,
@@ -358,7 +358,7 @@ static const struct ata_port_operations piix_sata_ops = { 
	.bmdma_status		= ata_bmdma_status,

	.qc_prep		= ata_qc_prep,

	.qc_issue		= ata_qc_issue_prot,

	.data_xfer		= ata_pio_data_xfer,

	.data_xfer		= ata_data_xfer,



	.freeze			= ata_bmdma_freeze,

	.thaw			= ata_bmdma_thaw,

drivers/ata/libata-core.c

+37 −176
Original line number Diff line number Diff line
@@ -601,51 +601,7 @@ void ata_dev_disable(struct ata_device *dev) 
}



/**

 *	ata_pio_devchk - PATA device presence detection

 *	@ap: ATA channel to examine

 *	@device: Device to examine (starting at zero)

 *

 *	This technique was originally described in

 *	Hale Landis's ATADRVR (www.ata-atapi.com), and

 *	later found its way into the ATA/ATAPI spec.

 *

 *	Write a pattern to the ATA shadow registers,

 *	and if a device is present, it will respond by

 *	correctly storing and echoing back the

 *	ATA shadow register contents.

 *

 *	LOCKING:

 *	caller.

 */



static unsigned int ata_pio_devchk(struct ata_port *ap,

				   unsigned int device)

{

	struct ata_ioports *ioaddr = &ap->ioaddr;

	u8 nsect, lbal;



	ap->ops->dev_select(ap, device);



	outb(0x55, ioaddr->nsect_addr);

	outb(0xaa, ioaddr->lbal_addr);



	outb(0xaa, ioaddr->nsect_addr);

	outb(0x55, ioaddr->lbal_addr);



	outb(0x55, ioaddr->nsect_addr);

	outb(0xaa, ioaddr->lbal_addr);



	nsect = inb(ioaddr->nsect_addr);

	lbal = inb(ioaddr->lbal_addr);



	if ((nsect == 0x55) && (lbal == 0xaa))

		return 1;	/* we found a device */



	return 0;		/* nothing found */

}



/**

 *	ata_mmio_devchk - PATA device presence detection

 *	ata_devchk - PATA device presence detection

 *	@ap: ATA channel to examine

 *	@device: Device to examine (starting at zero)

 *
@@ -662,25 +618,24 @@ static unsigned int ata_pio_devchk(struct ata_port *ap, 
 *	caller.

 */



static unsigned int ata_mmio_devchk(struct ata_port *ap,

				    unsigned int device)

static unsigned int ata_devchk(struct ata_port *ap, unsigned int device)

{

	struct ata_ioports *ioaddr = &ap->ioaddr;

	u8 nsect, lbal;



	ap->ops->dev_select(ap, device);



	writeb(0x55, (void __iomem *) ioaddr->nsect_addr);

	writeb(0xaa, (void __iomem *) ioaddr->lbal_addr);

	iowrite8(0x55, ioaddr->nsect_addr);

	iowrite8(0xaa, ioaddr->lbal_addr);



	writeb(0xaa, (void __iomem *) ioaddr->nsect_addr);

	writeb(0x55, (void __iomem *) ioaddr->lbal_addr);

	iowrite8(0xaa, ioaddr->nsect_addr);

	iowrite8(0x55, ioaddr->lbal_addr);



	writeb(0x55, (void __iomem *) ioaddr->nsect_addr);

	writeb(0xaa, (void __iomem *) ioaddr->lbal_addr);

	iowrite8(0x55, ioaddr->nsect_addr);

	iowrite8(0xaa, ioaddr->lbal_addr);



	nsect = readb((void __iomem *) ioaddr->nsect_addr);

	lbal = readb((void __iomem *) ioaddr->lbal_addr);

	nsect = ioread8(ioaddr->nsect_addr);

	lbal = ioread8(ioaddr->lbal_addr);



	if ((nsect == 0x55) && (lbal == 0xaa))

		return 1;	/* we found a device */
@@ -688,27 +643,6 @@ static unsigned int ata_mmio_devchk(struct ata_port *ap, 
	return 0;		/* nothing found */

}



/**

 *	ata_devchk - PATA device presence detection

 *	@ap: ATA channel to examine

 *	@device: Device to examine (starting at zero)

 *

 *	Dispatch ATA device presence detection, depending

 *	on whether we are using PIO or MMIO to talk to the

 *	ATA shadow registers.

 *

 *	LOCKING:

 *	caller.

 */



static unsigned int ata_devchk(struct ata_port *ap,

				    unsigned int device)

{

	if (ap->flags & ATA_FLAG_MMIO)

		return ata_mmio_devchk(ap, device);

	return ata_pio_devchk(ap, device);

}



/**

 *	ata_dev_classify - determine device type based on ATA-spec signature

 *	@tf: ATA taskfile register set for device to be identified
@@ -926,11 +860,7 @@ void ata_std_dev_select (struct ata_port *ap, unsigned int device) 
	else

		tmp = ATA_DEVICE_OBS | ATA_DEV1;



	if (ap->flags & ATA_FLAG_MMIO) {

		writeb(tmp, (void __iomem *) ap->ioaddr.device_addr);

	} else {

		outb(tmp, ap->ioaddr.device_addr);

	}

	iowrite8(tmp, ap->ioaddr.device_addr);

	ata_pause(ap);		/* needed; also flushes, for mmio */

}
@@ -2616,13 +2546,8 @@ static void ata_bus_post_reset(struct ata_port *ap, unsigned int devmask) 
		u8 nsect, lbal;



		ap->ops->dev_select(ap, 1);

		if (ap->flags & ATA_FLAG_MMIO) {

			nsect = readb((void __iomem *) ioaddr->nsect_addr);

			lbal = readb((void __iomem *) ioaddr->lbal_addr);

		} else {

			nsect = inb(ioaddr->nsect_addr);

			lbal = inb(ioaddr->lbal_addr);

		}

		nsect = ioread8(ioaddr->nsect_addr);

		lbal = ioread8(ioaddr->lbal_addr);

		if ((nsect == 1) && (lbal == 1))

			break;

		if (time_after(jiffies, timeout)) {
@@ -2650,19 +2575,11 @@ static unsigned int ata_bus_softreset(struct ata_port *ap, 
	DPRINTK("ata%u: bus reset via SRST\n", ap->id);



	/* software reset.  causes dev0 to be selected */

	if (ap->flags & ATA_FLAG_MMIO) {

		writeb(ap->ctl, (void __iomem *) ioaddr->ctl_addr);

	iowrite8(ap->ctl, ioaddr->ctl_addr);

	udelay(20);	/* FIXME: flush */

		writeb(ap->ctl | ATA_SRST, (void __iomem *) ioaddr->ctl_addr);

	iowrite8(ap->ctl | ATA_SRST, ioaddr->ctl_addr);

	udelay(20);	/* FIXME: flush */

		writeb(ap->ctl, (void __iomem *) ioaddr->ctl_addr);

	} else {

		outb(ap->ctl, ioaddr->ctl_addr);

		udelay(10);

		outb(ap->ctl | ATA_SRST, ioaddr->ctl_addr);

		udelay(10);

		outb(ap->ctl, ioaddr->ctl_addr);

	}

	iowrite8(ap->ctl, ioaddr->ctl_addr);



	/* spec mandates ">= 2ms" before checking status.

	 * We wait 150ms, because that was the magic delay used for
@@ -2763,10 +2680,7 @@ void ata_bus_reset(struct ata_port *ap) 


	if (ap->flags & (ATA_FLAG_SATA_RESET | ATA_FLAG_SRST)) {

		/* set up device control for ATA_FLAG_SATA_RESET */

		if (ap->flags & ATA_FLAG_MMIO)

			writeb(ap->ctl, (void __iomem *) ioaddr->ctl_addr);

		else

			outb(ap->ctl, ioaddr->ctl_addr);

		iowrite8(ap->ctl, ioaddr->ctl_addr);

	}



	DPRINTK("EXIT\n");
@@ -3159,12 +3073,8 @@ void ata_std_postreset(struct ata_port *ap, unsigned int *classes) 
	}



	/* set up device control */

	if (ap->ioaddr.ctl_addr) {

		if (ap->flags & ATA_FLAG_MMIO)

			writeb(ap->ctl, (void __iomem *) ap->ioaddr.ctl_addr);

		else

			outb(ap->ctl, ap->ioaddr.ctl_addr);

	}

	if (ap->ioaddr.ctl_addr)

		iowrite8(ap->ctl, ap->ioaddr.ctl_addr);



	DPRINTK("EXIT\n");

}
@@ -3880,53 +3790,7 @@ void swap_buf_le16(u16 *buf, unsigned int buf_words) 
}



/**

 *	ata_mmio_data_xfer - Transfer data by MMIO

 *	@adev: device for this I/O

 *	@buf: data buffer

 *	@buflen: buffer length

 *	@write_data: read/write

 *

 *	Transfer data from/to the device data register by MMIO.

 *

 *	LOCKING:

 *	Inherited from caller.

 */



void ata_mmio_data_xfer(struct ata_device *adev, unsigned char *buf,

			unsigned int buflen, int write_data)

{

	struct ata_port *ap = adev->ap;

	unsigned int i;

	unsigned int words = buflen >> 1;

	u16 *buf16 = (u16 *) buf;

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



	/* Transfer multiple of 2 bytes */

	if (write_data) {

		for (i = 0; i < words; i++)

			writew(le16_to_cpu(buf16[i]), mmio);

	} else {

		for (i = 0; i < words; i++)

			buf16[i] = cpu_to_le16(readw(mmio));

	}



	/* Transfer trailing 1 byte, if any. */

	if (unlikely(buflen & 0x01)) {

		u16 align_buf[1] = { 0 };

		unsigned char *trailing_buf = buf + buflen - 1;



		if (write_data) {

			memcpy(align_buf, trailing_buf, 1);

			writew(le16_to_cpu(align_buf[0]), mmio);

		} else {

			align_buf[0] = cpu_to_le16(readw(mmio));

			memcpy(trailing_buf, align_buf, 1);

		}

	}

}



/**

 *	ata_pio_data_xfer - Transfer data by PIO

 *	ata_data_xfer - Transfer data by PIO

 *	@adev: device to target

 *	@buf: data buffer

 *	@buflen: buffer length
@@ -3937,8 +3801,7 @@ void ata_mmio_data_xfer(struct ata_device *adev, unsigned char *buf, 
 *	LOCKING:

 *	Inherited from caller.

 */



void ata_pio_data_xfer(struct ata_device *adev, unsigned char *buf,

void ata_data_xfer(struct ata_device *adev, unsigned char *buf,

		   unsigned int buflen, int write_data)

{

	struct ata_port *ap = adev->ap;
@@ -3946,9 +3809,9 @@ void ata_pio_data_xfer(struct ata_device *adev, unsigned char *buf, 


	/* Transfer multiple of 2 bytes */

	if (write_data)

		outsw(ap->ioaddr.data_addr, buf, words);

		iowrite16_rep(ap->ioaddr.data_addr, buf, words);

	else

		insw(ap->ioaddr.data_addr, buf, words);

		ioread16_rep(ap->ioaddr.data_addr, buf, words);



	/* Transfer trailing 1 byte, if any. */

	if (unlikely(buflen & 0x01)) {
@@ -3957,16 +3820,16 @@ void ata_pio_data_xfer(struct ata_device *adev, unsigned char *buf, 


		if (write_data) {

			memcpy(align_buf, trailing_buf, 1);

			outw(le16_to_cpu(align_buf[0]), ap->ioaddr.data_addr);

			iowrite16(le16_to_cpu(align_buf[0]), ap->ioaddr.data_addr);

		} else {

			align_buf[0] = cpu_to_le16(inw(ap->ioaddr.data_addr));

			align_buf[0] = cpu_to_le16(ioread16(ap->ioaddr.data_addr));

			memcpy(trailing_buf, align_buf, 1);

		}

	}

}



/**

 *	ata_pio_data_xfer_noirq - Transfer data by PIO

 *	ata_data_xfer_noirq - Transfer data by PIO

 *	@adev: device to target

 *	@buf: data buffer

 *	@buflen: buffer length
@@ -3978,13 +3841,12 @@ void ata_pio_data_xfer(struct ata_device *adev, unsigned char *buf, 
 *	LOCKING:

 *	Inherited from caller.

 */



void ata_pio_data_xfer_noirq(struct ata_device *adev, unsigned char *buf,

void ata_data_xfer_noirq(struct ata_device *adev, unsigned char *buf,

			 unsigned int buflen, int write_data)

{

	unsigned long flags;

	local_irq_save(flags);

	ata_pio_data_xfer(adev, buf, buflen, write_data);

	ata_data_xfer(adev, buf, buflen, write_data);

	local_irq_restore(flags);

}
@@ -5770,7 +5632,7 @@ int ata_device_add(const struct ata_probe_ent *ent) 
	host->n_ports = ent->n_ports;

	host->irq = ent->irq;

	host->irq2 = ent->irq2;

	host->mmio_base = ent->mmio_base;

	host->iomap = ent->iomap;

	host->private_data = ent->private_data;



	/* register each port bound to this device */
@@ -5808,8 +5670,8 @@ int ata_device_add(const struct ata_probe_ent *ent) 
				(ap->pio_mask << ATA_SHIFT_PIO);



		/* print per-port info to dmesg */

		ata_port_printk(ap, KERN_INFO, "%cATA max %s cmd 0x%lX "

				"ctl 0x%lX bmdma 0x%lX irq %d\n",

		ata_port_printk(ap, KERN_INFO, "%cATA max %s cmd 0x%p "

				"ctl 0x%p bmdma 0x%p irq %d\n",

				ap->flags & ATA_FLAG_SATA ? 'S' : 'P',

				ata_mode_string(xfer_mode_mask),

				ap->ioaddr.cmd_addr,
@@ -6328,9 +6190,8 @@ EXPORT_SYMBOL_GPL(ata_altstatus); 
EXPORT_SYMBOL_GPL(ata_exec_command);

EXPORT_SYMBOL_GPL(ata_port_start);

EXPORT_SYMBOL_GPL(ata_interrupt);

EXPORT_SYMBOL_GPL(ata_mmio_data_xfer);

EXPORT_SYMBOL_GPL(ata_pio_data_xfer);

EXPORT_SYMBOL_GPL(ata_pio_data_xfer_noirq);

EXPORT_SYMBOL_GPL(ata_data_xfer);

EXPORT_SYMBOL_GPL(ata_data_xfer_noirq);

EXPORT_SYMBOL_GPL(ata_qc_prep);

EXPORT_SYMBOL_GPL(ata_noop_qc_prep);

EXPORT_SYMBOL_GPL(ata_bmdma_setup);

drivers/ata/libata-sff.c

+108 −436

File changed.

Preview size limit exceeded, changes collapsed.