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

Commit cca3974e authored by Jeff Garzik's avatar Jeff Garzik
Browse files

libata: Grand renaming. 



The biggest change is that ata_host_set is renamed to ata_host.

* ata_host_set			=> ata_host
* ata_probe_ent->host_flags	=> ata_probe_ent->port_flags
* ata_probe_ent->host_set_flags	=> ata_probe_ent->_host_flags
* ata_host_stats		=> ata_port_stats
* ata_port->host		=> ata_port->scsi_host
* ata_port->host_set		=> ata_port->host
* ata_port_info->host_flags	=> ata_port_info->flags
* ata_(.*)host_set(.*)\(\)	=> ata_\1host\2()

The leading underscore in ata_probe_ent->_host_flags is to avoid
reusing ->host_flags for different purpose.  Currently, the only user
of the field is libata-bmdma.c and probe_ent itself is scheduled to be
removed.

ata_port->host is reused for different purpose but this field is used
inside libata core proper and of different type.

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

drivers/ata/ahci.c

+49 −49
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ static const struct ata_port_info ahci_port_info[] = { 
	/* board_ahci */

	{

		.sht		= &ahci_sht,

		.host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |

		.flags		= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |

				  ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA |

				  ATA_FLAG_SKIP_D2H_BSY,

		.pio_mask	= 0x1f, /* pio0-4 */
@@ -287,7 +287,7 @@ static const struct ata_port_info ahci_port_info[] = { 
	/* board_ahci_vt8251 */

	{

		.sht		= &ahci_sht,

		.host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |

		.flags		= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |

				  ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA |

				  ATA_FLAG_SKIP_D2H_BSY |

				  AHCI_FLAG_RESET_NEEDS_CLO | AHCI_FLAG_NO_NCQ,
@@ -709,7 +709,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;

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

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

	u32 tmp;



	if (!(hpriv->cap & HOST_CAP_CLO))
@@ -741,7 +741,7 @@ static int ahci_prereset(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_set->mmio_base;

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

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

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

	const char *reason = NULL;
@@ -850,7 +850,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_set->mmio_base;

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

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

	int rc;
@@ -1039,7 +1039,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_set->mmio_base;

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

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

	struct ata_eh_info *ehi = &ap->eh_info;

	u32 status, qc_active;
@@ -1091,7 +1091,7 @@ static void ahci_irq_clear(struct ata_port *ap) 


static irqreturn_t ahci_interrupt(int irq, void *dev_instance, struct pt_regs *regs)

{

	struct ata_host_set *host_set = dev_instance;

	struct ata_host *host = dev_instance;

	struct ahci_host_priv *hpriv;

	unsigned int i, handled = 0;

	void __iomem *mmio;
@@ -1099,8 +1099,8 @@ static irqreturn_t ahci_interrupt(int irq, void *dev_instance, struct pt_regs *r 


	VPRINTK("ENTER\n");



	hpriv = host_set->private_data;

	mmio = host_set->mmio_base;

	hpriv = host->private_data;

	mmio = host->mmio_base;



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

	irq_stat = readl(mmio + HOST_IRQ_STAT);
@@ -1108,22 +1108,22 @@ static irqreturn_t ahci_interrupt(int irq, void *dev_instance, struct pt_regs *r 
	if (!irq_stat)

		return IRQ_NONE;



        spin_lock(&host_set->lock);

        spin_lock(&host->lock);



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

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

		struct ata_port *ap;



		if (!(irq_stat & (1 << i)))

			continue;



		ap = host_set->ports[i];

		ap = host->ports[i];

		if (ap) {

			ahci_host_intr(ap);

			VPRINTK("port %u\n", i);

		} else {

			VPRINTK("port %u (no irq)\n", i);

			if (ata_ratelimit())

				dev_printk(KERN_WARNING, host_set->dev,

				dev_printk(KERN_WARNING, host->dev,

					"interrupt on disabled port %u\n", i);

		}
@@ -1135,7 +1135,7 @@ static irqreturn_t ahci_interrupt(int irq, void *dev_instance, struct pt_regs *r 
		handled = 1;

	}



	spin_unlock(&host_set->lock);

	spin_unlock(&host->lock);



	VPRINTK("EXIT\n");
@@ -1157,7 +1157,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_set->mmio_base;

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

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



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


static void ahci_thaw(struct ata_port *ap)

{

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

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

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

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


static void ahci_error_handler(struct ata_port *ap)

{

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

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

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



	if (!(ap->pflags & ATA_PFLAG_FROZEN)) {
@@ -1198,7 +1198,7 @@ static void ahci_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_set->mmio_base;

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

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



	if (qc->flags & ATA_QCFLAG_FAILED)
@@ -1213,9 +1213,9 @@ static void ahci_post_internal_cmd(struct ata_queued_cmd *qc) 


static int ahci_port_suspend(struct ata_port *ap, pm_message_t mesg)

{

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

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

	struct ahci_port_priv *pp = ap->private_data;

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

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

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

	const char *emsg = NULL;

	int rc;
@@ -1233,8 +1233,8 @@ static int ahci_port_suspend(struct ata_port *ap, pm_message_t mesg) 
static int ahci_port_resume(struct ata_port *ap)

{

	struct ahci_port_priv *pp = ap->private_data;

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

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

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

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

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



	ahci_init_port(port_mmio, hpriv->cap, pp->cmd_slot_dma, pp->rx_fis_dma);
@@ -1244,8 +1244,8 @@ 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_set *host_set = dev_get_drvdata(&pdev->dev);

	void __iomem *mmio = host_set->mmio_base;

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

	void __iomem *mmio = host->mmio_base;

	u32 ctl;



	if (mesg.event == PM_EVENT_SUSPEND) {
@@ -1264,9 +1264,9 @@ static int ahci_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg) 


static int ahci_pci_device_resume(struct pci_dev *pdev)

{

	struct ata_host_set *host_set = dev_get_drvdata(&pdev->dev);

	struct ahci_host_priv *hpriv = host_set->private_data;

	void __iomem *mmio = host_set->mmio_base;

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

	struct ahci_host_priv *hpriv = host->private_data;

	void __iomem *mmio = host->mmio_base;

	int rc;



	ata_pci_device_do_resume(pdev);
@@ -1276,20 +1276,20 @@ static int ahci_pci_device_resume(struct pci_dev *pdev) 
		if (rc)

			return rc;



		ahci_init_controller(mmio, pdev, host_set->n_ports, hpriv->cap);

		ahci_init_controller(mmio, pdev, host->n_ports, hpriv->cap);

	}



	ata_host_set_resume(host_set);

	ata_host_resume(host);



	return 0;

}



static int ahci_port_start(struct ata_port *ap)

{

	struct device *dev = ap->host_set->dev;

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

	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_set->mmio_base;

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

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

	void *mem;

	dma_addr_t mem_dma;
@@ -1350,10 +1350,10 @@ static int ahci_port_start(struct ata_port *ap) 


static void ahci_port_stop(struct ata_port *ap)

{

	struct device *dev = ap->host_set->dev;

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

	struct device *dev = ap->host->dev;

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

	struct ahci_port_priv *pp = ap->private_data;

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

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

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

	const char *emsg = NULL;

	int rc;
@@ -1581,7 +1581,7 @@ static int ahci_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) 
	memset(hpriv, 0, sizeof(*hpriv));



	probe_ent->sht		= ahci_port_info[board_idx].sht;

	probe_ent->host_flags	= ahci_port_info[board_idx].host_flags;

	probe_ent->port_flags	= ahci_port_info[board_idx].flags;

	probe_ent->pio_mask	= ahci_port_info[board_idx].pio_mask;

	probe_ent->udma_mask	= ahci_port_info[board_idx].udma_mask;

	probe_ent->port_ops	= ahci_port_info[board_idx].port_ops;
@@ -1599,9 +1599,9 @@ static int ahci_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (rc)

		goto err_out_hpriv;



	if (!(probe_ent->host_flags & AHCI_FLAG_NO_NCQ) &&

	if (!(probe_ent->port_flags & AHCI_FLAG_NO_NCQ) &&

	    (hpriv->cap & HOST_CAP_NCQ))

		probe_ent->host_flags |= ATA_FLAG_NCQ;

		probe_ent->port_flags |= ATA_FLAG_NCQ;



	ahci_print_info(probe_ent);
@@ -1632,27 +1632,27 @@ static int ahci_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) 
static void ahci_remove_one (struct pci_dev *pdev)

{

	struct device *dev = pci_dev_to_dev(pdev);

	struct ata_host_set *host_set = dev_get_drvdata(dev);

	struct ahci_host_priv *hpriv = host_set->private_data;

	struct ata_host *host = dev_get_drvdata(dev);

	struct ahci_host_priv *hpriv = host->private_data;

	unsigned int i;

	int have_msi;



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

		ata_port_detach(host_set->ports[i]);

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

		ata_port_detach(host->ports[i]);



	have_msi = hpriv->flags & AHCI_FLAG_MSI;

	free_irq(host_set->irq, host_set);

	free_irq(host->irq, host);



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

		struct ata_port *ap = host_set->ports[i];

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

		struct ata_port *ap = host->ports[i];



		ata_scsi_release(ap->host);

		scsi_host_put(ap->host);

		ata_scsi_release(ap->scsi_host);

		scsi_host_put(ap->scsi_host);

	}



	kfree(hpriv);

	pci_iounmap(pdev, host_set->mmio_base);

	kfree(host_set);

	pci_iounmap(pdev, host->mmio_base);

	kfree(host);



	if (have_msi)

		pci_disable_msi(pdev);

drivers/ata/ata_piix.c

+28 −28
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ struct piix_host_priv { 


static int piix_init_one (struct pci_dev *pdev,

				    const struct pci_device_id *ent);

static void piix_host_stop(struct ata_host_set *host_set);

static void piix_host_stop(struct ata_host *host);

static void piix_set_piomode (struct ata_port *ap, struct ata_device *adev);

static void piix_set_dmamode (struct ata_port *ap, struct ata_device *adev);

static void piix_pata_error_handler(struct ata_port *ap);
@@ -362,7 +362,7 @@ static struct ata_port_info piix_port_info[] = { 
	/* piix4_pata */

	{

		.sht		= &piix_sht,

		.host_flags	= ATA_FLAG_SLAVE_POSS,

		.flags		= ATA_FLAG_SLAVE_POSS,

		.pio_mask	= 0x1f,	/* pio0-4 */

#if 0

		.mwdma_mask	= 0x06, /* mwdma1-2 */
@@ -376,7 +376,7 @@ static struct ata_port_info piix_port_info[] = { 
	/* ich5_pata */

	{

		.sht		= &piix_sht,

		.host_flags	= ATA_FLAG_SLAVE_POSS | PIIX_FLAG_CHECKINTR,

		.flags		= ATA_FLAG_SLAVE_POSS | PIIX_FLAG_CHECKINTR,

		.pio_mask	= 0x1f,	/* pio0-4 */

#if 0

		.mwdma_mask	= 0x06, /* mwdma1-2 */
@@ -390,7 +390,7 @@ static struct ata_port_info piix_port_info[] = { 
	/* ich5_sata */

	{

		.sht		= &piix_sht,

		.host_flags	= ATA_FLAG_SATA | PIIX_FLAG_CHECKINTR |

		.flags		= ATA_FLAG_SATA | PIIX_FLAG_CHECKINTR |

				  PIIX_FLAG_IGNORE_PCS,

		.pio_mask	= 0x1f,	/* pio0-4 */

		.mwdma_mask	= 0x07, /* mwdma0-2 */
@@ -401,7 +401,7 @@ static struct ata_port_info piix_port_info[] = { 
	/* i6300esb_sata */

	{

		.sht		= &piix_sht,

		.host_flags	= ATA_FLAG_SATA |

		.flags		= ATA_FLAG_SATA |

				  PIIX_FLAG_CHECKINTR | PIIX_FLAG_IGNORE_PCS,

		.pio_mask	= 0x1f,	/* pio0-4 */

		.mwdma_mask	= 0x07, /* mwdma0-2 */
@@ -412,7 +412,7 @@ static struct ata_port_info piix_port_info[] = { 
	/* ich6_sata */

	{

		.sht		= &piix_sht,

		.host_flags	= ATA_FLAG_SATA |

		.flags		= ATA_FLAG_SATA |

				  PIIX_FLAG_CHECKINTR | PIIX_FLAG_SCR,

		.pio_mask	= 0x1f,	/* pio0-4 */

		.mwdma_mask	= 0x07, /* mwdma0-2 */
@@ -423,7 +423,7 @@ static struct ata_port_info piix_port_info[] = { 
	/* ich6_sata_ahci */

	{

		.sht		= &piix_sht,

		.host_flags	= ATA_FLAG_SATA |

		.flags		= ATA_FLAG_SATA |

				  PIIX_FLAG_CHECKINTR | PIIX_FLAG_SCR |

				  PIIX_FLAG_AHCI,

		.pio_mask	= 0x1f,	/* pio0-4 */
@@ -435,7 +435,7 @@ static struct ata_port_info piix_port_info[] = { 
	/* ich6m_sata_ahci */

	{

		.sht		= &piix_sht,

		.host_flags	= ATA_FLAG_SATA |

		.flags		= ATA_FLAG_SATA |

				  PIIX_FLAG_CHECKINTR | PIIX_FLAG_SCR |

				  PIIX_FLAG_AHCI,

		.pio_mask	= 0x1f,	/* pio0-4 */
@@ -447,7 +447,7 @@ static struct ata_port_info piix_port_info[] = { 
	/* ich8_sata_ahci */

	{

		.sht		= &piix_sht,

		.host_flags	= ATA_FLAG_SATA |

		.flags		= ATA_FLAG_SATA |

				  PIIX_FLAG_CHECKINTR | PIIX_FLAG_SCR |

				  PIIX_FLAG_AHCI,

		.pio_mask	= 0x1f,	/* pio0-4 */
@@ -485,7 +485,7 @@ MODULE_PARM_DESC(force_pcs, "force honoring or ignoring PCS to work around " 
 */

static void piix_pata_cbl_detect(struct ata_port *ap)

{

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

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

	u8 tmp, mask;



	/* no 80c support in host controller? */
@@ -517,7 +517,7 @@ static void piix_pata_cbl_detect(struct ata_port *ap) 
 */

static int piix_pata_prereset(struct ata_port *ap)

{

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

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



	if (!pci_test_config_bits(pdev, &piix_enable_bits[ap->port_no])) {

		ata_port_printk(ap, KERN_INFO, "port disabled. ignoring.\n");
@@ -551,8 +551,8 @@ static void piix_pata_error_handler(struct ata_port *ap) 
 */

static unsigned int piix_sata_present_mask(struct ata_port *ap)

{

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

	struct piix_host_priv *hpriv = ap->host_set->private_data;

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

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

	const unsigned int *map = hpriv->map;

	int base = 2 * ap->port_no;

	unsigned int present_mask = 0;
@@ -631,7 +631,7 @@ static void piix_sata_error_handler(struct ata_port *ap) 
static void piix_set_piomode (struct ata_port *ap, struct ata_device *adev)

{

	unsigned int pio	= adev->pio_mode - XFER_PIO_0;

	struct pci_dev *dev	= to_pci_dev(ap->host_set->dev);

	struct pci_dev *dev	= to_pci_dev(ap->host->dev);

	unsigned int is_slave	= (adev->devno != 0);

	unsigned int master_port= ap->port_no ? 0x42 : 0x40;

	unsigned int slave_port	= 0x44;
@@ -683,7 +683,7 @@ static void piix_set_piomode (struct ata_port *ap, struct ata_device *adev) 
static void piix_set_dmamode (struct ata_port *ap, struct ata_device *adev)

{

	unsigned int udma	= adev->dma_mode; /* FIXME: MWDMA too */

	struct pci_dev *dev	= to_pci_dev(ap->host_set->dev);

	struct pci_dev *dev	= to_pci_dev(ap->host->dev);

	u8 maslave		= ap->port_no ? 0x42 : 0x40;

	u8 speed		= udma;

	unsigned int drive_dn	= (ap->port_no ? 2 : 0) + adev->devno;
@@ -835,13 +835,13 @@ static void __devinit piix_init_pcs(struct pci_dev *pdev, 
	if (force_pcs == 1) {

		dev_printk(KERN_INFO, &pdev->dev,

			   "force ignoring PCS (0x%x)\n", new_pcs);

		pinfo[0].host_flags |= PIIX_FLAG_IGNORE_PCS;

		pinfo[1].host_flags |= PIIX_FLAG_IGNORE_PCS;

		pinfo[0].flags |= PIIX_FLAG_IGNORE_PCS;

		pinfo[1].flags |= PIIX_FLAG_IGNORE_PCS;

	} else if (force_pcs == 2) {

		dev_printk(KERN_INFO, &pdev->dev,

			   "force honoring PCS (0x%x)\n", new_pcs);

		pinfo[0].host_flags &= ~PIIX_FLAG_IGNORE_PCS;

		pinfo[1].host_flags &= ~PIIX_FLAG_IGNORE_PCS;

		pinfo[0].flags &= ~PIIX_FLAG_IGNORE_PCS;

		pinfo[1].flags &= ~PIIX_FLAG_IGNORE_PCS;

	}

}
@@ -881,7 +881,7 @@ static void __devinit piix_init_sata_map(struct pci_dev *pdev, 
		default:

			printk(" P%d", map[i]);

			if (i & 1)

				pinfo[i / 2].host_flags |= ATA_FLAG_SLAVE_POSS;

				pinfo[i / 2].flags |= ATA_FLAG_SLAVE_POSS;

			break;

		}

	}
@@ -916,7 +916,7 @@ static int piix_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) 
	struct ata_port_info port_info[2];

	struct ata_port_info *ppinfo[2] = { &port_info[0], &port_info[1] };

	struct piix_host_priv *hpriv;

	unsigned long host_flags;

	unsigned long port_flags;



	if (!printed_version++)

		dev_printk(KERN_DEBUG, &pdev->dev,
@@ -935,9 +935,9 @@ static int piix_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) 
	port_info[0].private_data = hpriv;

	port_info[1].private_data = hpriv;



	host_flags = port_info[0].host_flags;

	port_flags = port_info[0].flags;



	if (host_flags & PIIX_FLAG_AHCI) {

	if (port_flags & PIIX_FLAG_AHCI) {

		u8 tmp;

		pci_read_config_byte(pdev, PIIX_SCC, &tmp);

		if (tmp == PIIX_AHCI_DEVICE) {
@@ -948,7 +948,7 @@ static int piix_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) 
	}



	/* Initialize SATA map */

	if (host_flags & ATA_FLAG_SATA) {

	if (port_flags & ATA_FLAG_SATA) {

		piix_init_sata_map(pdev, port_info,

				   piix_map_db_table[ent->driver_data]);

		piix_init_pcs(pdev, port_info,
@@ -961,7 +961,7 @@ static int piix_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) 
	 * MSI is disabled (and it is disabled, as we don't use

	 * message-signalled interrupts currently).

	 */

	if (host_flags & PIIX_FLAG_CHECKINTR)

	if (port_flags & PIIX_FLAG_CHECKINTR)

		pci_intx(pdev, 1);



	if (piix_check_450nx_errata(pdev)) {
@@ -976,11 +976,11 @@ static int piix_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) 
	return ata_pci_init_one(pdev, ppinfo, 2);

}



static void piix_host_stop(struct ata_host_set *host_set)

static void piix_host_stop(struct ata_host *host)

{

	struct piix_host_priv *hpriv = host_set->private_data;

	struct piix_host_priv *hpriv = host->private_data;



	ata_host_stop(host_set);

	ata_host_stop(host);



	kfree(hpriv);

}

drivers/ata/libata-bmdma.c

+17 −17
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ void ata_tf_load(struct ata_port *ap, const struct ata_taskfile *tf) 
 *	synchronization with interrupt handler / other threads.

 *

 *	LOCKING:

 *	spin_lock_irqsave(host_set lock)

 *	spin_lock_irqsave(host lock)

 */



static void ata_exec_command_pio(struct ata_port *ap, const struct ata_taskfile *tf)
@@ -216,7 +216,7 @@ static void ata_exec_command_pio(struct ata_port *ap, const struct ata_taskfile 
 *	FIXME: missing write posting for 400nS delay enforcement

 *

 *	LOCKING:

 *	spin_lock_irqsave(host_set lock)

 *	spin_lock_irqsave(host lock)

 */



static void ata_exec_command_mmio(struct ata_port *ap, const struct ata_taskfile *tf)
@@ -237,7 +237,7 @@ static void ata_exec_command_mmio(struct ata_port *ap, const struct ata_taskfile 
 *	synchronization with interrupt handler / other threads.

 *

 *	LOCKING:

 *	spin_lock_irqsave(host_set lock)

 *	spin_lock_irqsave(host lock)

 */

void ata_exec_command(struct ata_port *ap, const struct ata_taskfile *tf)

{
@@ -422,7 +422,7 @@ u8 ata_altstatus(struct ata_port *ap) 
 *	@qc: Info associated with this ATA transaction.

 *

 *	LOCKING:

 *	spin_lock_irqsave(host_set lock)

 *	spin_lock_irqsave(host lock)

 */



static void ata_bmdma_setup_mmio (struct ata_queued_cmd *qc)
@@ -452,7 +452,7 @@ static void ata_bmdma_setup_mmio (struct ata_queued_cmd *qc) 
 *	@qc: Info associated with this ATA transaction.

 *

 *	LOCKING:

 *	spin_lock_irqsave(host_set lock)

 *	spin_lock_irqsave(host lock)

 */



static void ata_bmdma_start_mmio (struct ata_queued_cmd *qc)
@@ -483,7 +483,7 @@ static void ata_bmdma_start_mmio (struct ata_queued_cmd *qc) 
 *	@qc: Info associated with this ATA transaction.

 *

 *	LOCKING:

 *	spin_lock_irqsave(host_set lock)

 *	spin_lock_irqsave(host lock)

 */



static void ata_bmdma_setup_pio (struct ata_queued_cmd *qc)
@@ -511,7 +511,7 @@ static void ata_bmdma_setup_pio (struct ata_queued_cmd *qc) 
 *	@qc: Info associated with this ATA transaction.

 *

 *	LOCKING:

 *	spin_lock_irqsave(host_set lock)

 *	spin_lock_irqsave(host lock)

 */



static void ata_bmdma_start_pio (struct ata_queued_cmd *qc)
@@ -535,7 +535,7 @@ static void ata_bmdma_start_pio (struct ata_queued_cmd *qc) 
 *	May be used as the bmdma_start() entry in ata_port_operations.

 *

 *	LOCKING:

 *	spin_lock_irqsave(host_set lock)

 *	spin_lock_irqsave(host lock)

 */

void ata_bmdma_start(struct ata_queued_cmd *qc)

{
@@ -557,7 +557,7 @@ void ata_bmdma_start(struct ata_queued_cmd *qc) 
 *	May be used as the bmdma_setup() entry in ata_port_operations.

 *

 *	LOCKING:

 *	spin_lock_irqsave(host_set lock)

 *	spin_lock_irqsave(host lock)

 */

void ata_bmdma_setup(struct ata_queued_cmd *qc)

{
@@ -577,7 +577,7 @@ void ata_bmdma_setup(struct ata_queued_cmd *qc) 
 *	May be used as the irq_clear() entry in ata_port_operations.

 *

 *	LOCKING:

 *	spin_lock_irqsave(host_set lock)

 *	spin_lock_irqsave(host lock)

 */



void ata_bmdma_irq_clear(struct ata_port *ap)
@@ -605,7 +605,7 @@ void ata_bmdma_irq_clear(struct ata_port *ap) 
 *	May be used as the bmdma_status() entry in ata_port_operations.

 *

 *	LOCKING:

 *	spin_lock_irqsave(host_set lock)

 *	spin_lock_irqsave(host lock)

 */



u8 ata_bmdma_status(struct ata_port *ap)
@@ -629,7 +629,7 @@ u8 ata_bmdma_status(struct ata_port *ap) 
 *	May be used as the bmdma_stop() entry in ata_port_operations.

 *

 *	LOCKING:

 *	spin_lock_irqsave(host_set lock)

 *	spin_lock_irqsave(host lock)

 */



void ata_bmdma_stop(struct ata_queued_cmd *qc)
@@ -838,7 +838,7 @@ ata_pci_init_native_mode(struct pci_dev *pdev, struct ata_port_info **port, int 
		bmdma = pci_resource_start(pdev, 4);

		if (bmdma) {

			if (inb(bmdma + 2) & 0x80)

				probe_ent->host_set_flags |= ATA_HOST_SIMPLEX;

				probe_ent->_host_flags |= ATA_HOST_SIMPLEX;

			probe_ent->port[p].bmdma_addr = bmdma;

		}

		ata_std_ports(&probe_ent->port[p]);
@@ -854,7 +854,7 @@ ata_pci_init_native_mode(struct pci_dev *pdev, struct ata_port_info **port, int 
		if (bmdma) {

			bmdma += 8;

			if(inb(bmdma + 2) & 0x80)

				probe_ent->host_set_flags |= ATA_HOST_SIMPLEX;

				probe_ent->_host_flags |= ATA_HOST_SIMPLEX;

			probe_ent->port[p].bmdma_addr = bmdma;

		}

		ata_std_ports(&probe_ent->port[p]);
@@ -887,7 +887,7 @@ static struct ata_probe_ent *ata_pci_init_legacy_port(struct pci_dev *pdev, 
		if (bmdma) {

			probe_ent->port[0].bmdma_addr = bmdma;

			if (inb(bmdma + 2) & 0x80)

				probe_ent->host_set_flags |= ATA_HOST_SIMPLEX;

				probe_ent->_host_flags |= ATA_HOST_SIMPLEX;

		}

		ata_std_ports(&probe_ent->port[0]);

	} else
@@ -904,7 +904,7 @@ static struct ata_probe_ent *ata_pci_init_legacy_port(struct pci_dev *pdev, 
		if (bmdma) {

			probe_ent->port[1].bmdma_addr = bmdma + 8;

			if (inb(bmdma + 10) & 0x80)

				probe_ent->host_set_flags |= ATA_HOST_SIMPLEX;

				probe_ent->_host_flags |= ATA_HOST_SIMPLEX;

		}

		ata_std_ports(&probe_ent->port[1]);

	} else
@@ -957,7 +957,7 @@ int ata_pci_init_one (struct pci_dev *pdev, struct ata_port_info **port_info, 
	else

		port[1] = port[0];



	if ((port[0]->host_flags & ATA_FLAG_NO_LEGACY) == 0

	if ((port[0]->flags & ATA_FLAG_NO_LEGACY) == 0

	    && (pdev->class >> 8) == PCI_CLASS_STORAGE_IDE) {

		/* TODO: What if one channel is in native mode ... */

		pci_read_config_byte(pdev, PCI_CLASS_PROG, &tmp8);

drivers/ata/libata-core.c

+146 −146

File changed.

Preview size limit exceeded, changes collapsed.

drivers/ata/libata-eh.c

+8 −8
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ void ata_scsi_error(struct Scsi_Host *host) 
	/* synchronize with port task */

	ata_port_flush_task(ap);



	/* synchronize with host_set lock and sort out timeouts */

	/* synchronize with host lock and sort out timeouts */



	/* For new EH, all qcs are finished in one of three ways -

	 * normal completion, error completion, and SCSI timeout.
@@ -377,7 +377,7 @@ void ata_port_wait_eh(struct ata_port *ap) 
	spin_unlock_irqrestore(ap->lock, flags);



	/* make sure SCSI EH is complete */

	if (scsi_host_in_recovery(ap->host)) {

	if (scsi_host_in_recovery(ap->scsi_host)) {

		msleep(10);

		goto retry;

	}
@@ -486,7 +486,7 @@ void ata_eng_timeout(struct ata_port *ap) 
 *	other commands are drained.

 *

 *	LOCKING:

 *	spin_lock_irqsave(host_set lock)

 *	spin_lock_irqsave(host lock)

 */

void ata_qc_schedule_eh(struct ata_queued_cmd *qc)

{
@@ -513,14 +513,14 @@ void ata_qc_schedule_eh(struct ata_queued_cmd *qc) 
 *	all commands are drained.

 *

 *	LOCKING:

 *	spin_lock_irqsave(host_set lock)

 *	spin_lock_irqsave(host lock)

 */

void ata_port_schedule_eh(struct ata_port *ap)

{

	WARN_ON(!ap->ops->error_handler);



	ap->pflags |= ATA_PFLAG_EH_PENDING;

	scsi_schedule_eh(ap->host);

	scsi_schedule_eh(ap->scsi_host);



	DPRINTK("port EH scheduled\n");

}
@@ -532,7 +532,7 @@ void ata_port_schedule_eh(struct ata_port *ap) 
 *	Abort all active qc's of @ap and schedule EH.

 *

 *	LOCKING:

 *	spin_lock_irqsave(host_set lock)

 *	spin_lock_irqsave(host lock)

 *

 *	RETURNS:

 *	Number of aborted qc's.
@@ -575,7 +575,7 @@ int ata_port_abort(struct ata_port *ap) 
 *	is frozen.

 *

 *	LOCKING:

 *	spin_lock_irqsave(host_set lock)

 *	spin_lock_irqsave(host lock)

 */

static void __ata_port_freeze(struct ata_port *ap)

{
@@ -596,7 +596,7 @@ static void __ata_port_freeze(struct ata_port *ap) 
 *	Abort and freeze @ap.

 *

 *	LOCKING:

 *	spin_lock_irqsave(host_set lock)

 *	spin_lock_irqsave(host lock)

 *

 *	RETURNS:

 *	Number of aborted commands.