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

Commit 55a6adee authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

libata: fix native mode disabled port handling 



Disabled port handling in ata_pci_init_native_mode() is slightly
broken in that it may end up using the wrong port_info.  This patch
updates it such that disables ports are made dummy as done in the
legacy and other cases.

While at it, fix indentation in ata_resources_present().

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

drivers/ata/libata-sff.c

+35 −27
Original line number Diff line number Diff line
@@ -554,11 +554,26 @@ struct ata_probe_ent * 
ata_pci_init_native_mode(struct pci_dev *pdev, struct ata_port_info **port, int ports)

{

	struct ata_probe_ent *probe_ent;

	int i, p = 0;

	int i;

	void __iomem * const *iomap;



	/* Discard disabled ports.  Some controllers show their unused

	 * channels this way.  Disabled ports will be made dummy.

	 */

	if (ata_resources_present(pdev, 0) == 0)

		ports &= ~ATA_PORT_PRIMARY;

	if (ata_resources_present(pdev, 1) == 0)

		ports &= ~ATA_PORT_SECONDARY;



	if (!ports) {

		dev_printk(KERN_ERR, &pdev->dev, "no available port\n");

		return NULL;

	}



	/* iomap BARs */

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

		if (!(ports & (1 << (i / 2))))

			continue;

		if (pcim_iomap(pdev, i, 0) == NULL) {

			dev_printk(KERN_ERR, &pdev->dev,

				   "failed to iomap PCI BAR %d\n", i);
@@ -574,48 +589,41 @@ ata_pci_init_native_mode(struct pci_dev *pdev, struct ata_port_info **port, int 
	if (!probe_ent)

		return NULL;



	probe_ent->n_ports = 2;

	probe_ent->irq = pdev->irq;

	probe_ent->irq_flags = IRQF_SHARED;



	/* Discard disabled ports. Some controllers show their

	   unused channels this way */

	if (ata_resources_present(pdev, 0) == 0)

		ports &= ~ATA_PORT_PRIMARY;

	if (ata_resources_present(pdev, 1) == 0)

		ports &= ~ATA_PORT_SECONDARY;



	if (ports & ATA_PORT_PRIMARY) {

		probe_ent->port[p].cmd_addr = iomap[0];

		probe_ent->port[p].altstatus_addr =

		probe_ent->port[p].ctl_addr = (void __iomem *)

		probe_ent->port[0].cmd_addr = iomap[0];

		probe_ent->port[0].altstatus_addr =

		probe_ent->port[0].ctl_addr = (void __iomem *)

			((unsigned long)iomap[1] | ATA_PCI_CTL_OFS);

		if (iomap[4]) {

			if ((!(port[p]->flags & ATA_FLAG_IGN_SIMPLEX)) &&

			if ((!(port[0]->flags & ATA_FLAG_IGN_SIMPLEX)) &&

			    (ioread8(iomap[4] + 2) & 0x80))

				probe_ent->_host_flags |= ATA_HOST_SIMPLEX;

			probe_ent->port[p].bmdma_addr = iomap[4];

		}

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

		p++;

			probe_ent->port[0].bmdma_addr = iomap[4];

		}

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

	} else

		probe_ent->dummy_port_mask |= ATA_PORT_PRIMARY;



	if (ports & ATA_PORT_SECONDARY) {

		probe_ent->port[p].cmd_addr = iomap[2];

		probe_ent->port[p].altstatus_addr =

		probe_ent->port[p].ctl_addr = (void __iomem *)

		probe_ent->port[1].cmd_addr = iomap[2];

		probe_ent->port[1].altstatus_addr =

		probe_ent->port[1].ctl_addr = (void __iomem *)

			((unsigned long)iomap[3] | ATA_PCI_CTL_OFS);

		if (iomap[4]) {

			if ((!(port[p]->flags & ATA_FLAG_IGN_SIMPLEX)) &&

			if ((!(port[1]->flags & ATA_FLAG_IGN_SIMPLEX)) &&

			    (ioread8(iomap[4] + 10) & 0x80))

				probe_ent->_host_flags |= ATA_HOST_SIMPLEX;

			probe_ent->port[p].bmdma_addr = iomap[4] + 8;

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

		}

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

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

		probe_ent->pinfo2 = port[1];

		p++;

	}

	} else

		probe_ent->dummy_port_mask |= ATA_PORT_SECONDARY;



	probe_ent->n_ports = p;

	return probe_ent;

}