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

Commit 0d1bad21 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: manage resources for PCI devices in ide_pci_enable() (take 3) 



* Reserve PCI BARs 0-3 (0-1 for single port controllers) in
  ide_pci_enable() and remove ide_hwif_request_regions() call
  from ide_device_add_all() (also cleanup resource management
  in scc_pata host driver).

* Fix handling of PCI BAR 4 in ide_pci_enable(), then cleanup
  ide_iomio_dma() (+ init_hwif_trm290() in trm290 host driver)
  and remove ide_release[_iomio]_dma().

v2:
* Fixup trm290 host driver.

v3:
* Because of scc_pata host driver changes we need to call
  pci_request_selected_regions() also in setup_mmio_scc().

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 7ebe5936

drivers/ide/ide-dma.c

+3 −40
Original line number Diff line number Diff line
@@ -810,7 +810,7 @@ void ide_dma_timeout (ide_drive_t *drive) 


EXPORT_SYMBOL(ide_dma_timeout);



static void ide_release_dma_engine(ide_hwif_t *hwif)

void ide_release_dma_engine(ide_hwif_t *hwif)

{

	if (hwif->dmatable_cpu) {

		struct pci_dev *pdev = to_pci_dev(hwif->dev);
@@ -821,27 +821,6 @@ static void ide_release_dma_engine(ide_hwif_t *hwif) 
	}

}



static int ide_release_iomio_dma(ide_hwif_t *hwif)

{

	release_region(hwif->dma_base, 8);

	if (hwif->extra_ports)

		release_region(hwif->extra_base, hwif->extra_ports);

	return 1;

}



/*

 * Needed for allowing full modular support of ide-driver

 */

int ide_release_dma(ide_hwif_t *hwif)

{

	ide_release_dma_engine(hwif);



	if (hwif->mmio)

		return 1;

	else

		return ide_release_iomio_dma(hwif);

}



static int ide_allocate_dma_engine(ide_hwif_t *hwif)

{

	struct pci_dev *pdev = to_pci_dev(hwif->dev);
@@ -871,25 +850,9 @@ static int ide_iomio_dma(ide_hwif_t *hwif, unsigned long base) 
	printk(KERN_INFO "    %s: BM-DMA at 0x%04lx-0x%04lx",

	       hwif->name, base, base + 7);



	if (!request_region(base, 8, hwif->name)) {

		printk(" -- Error, ports in use.\n");

		return 1;

	}



	if (hwif->cds->extra) {

	if (hwif->cds->extra)

		hwif->extra_base = base + (hwif->channel ? 8 : 16);



		if (!hwif->mate || !hwif->mate->extra_ports) {

			if (!request_region(hwif->extra_base,

					    hwif->cds->extra, hwif->cds->name)) {

				printk(" -- Error, extra ports in use.\n");

				release_region(base, 8);

				return 1;

			}

			hwif->extra_ports = hwif->cds->extra;

		}

	}



	return 0;

}
@@ -909,7 +872,7 @@ void ide_setup_dma(ide_hwif_t *hwif, unsigned long base) 
		return;



	if (ide_allocate_dma_engine(hwif)) {

		ide_release_dma(hwif);

		ide_release_dma_engine(hwif);

		return;

	}

drivers/ide/ide-probe.c

+0 −6
Original line number Diff line number Diff line
@@ -1530,12 +1530,6 @@ int ide_device_add_all(u8 *idx, const struct ide_port_info *d) 


		hwif = &ide_hwifs[idx[i]];



		if (ide_hwif_request_regions(hwif)) {

			printk(KERN_ERR "%s: ports already in use, "

					"skipping probe\n", hwif->name);

			continue;

		}



		if (ide_probe_port(hwif) == 0)

			hwif->present = 1;

drivers/ide/ide.c

+1 −1
Original line number Diff line number Diff line
@@ -413,7 +413,7 @@ void ide_unregister(unsigned int index) 
	spin_lock_irq(&ide_lock);



	if (hwif->dma_base)

		(void)ide_release_dma(hwif);

		ide_release_dma_engine(hwif);



	/* restore hwif data to pristine status */

	ide_init_port_data(hwif, index);

drivers/ide/pci/scc_pata.c

+9 −22
Original line number Diff line number Diff line
@@ -483,7 +483,7 @@ static int setup_mmio_scc (struct pci_dev *dev, const char *name) 
	unsigned long dma_size = pci_resource_len(dev, 1);

	void __iomem *ctl_addr;

	void __iomem *dma_addr;

	int i;

	int i, ret;



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

		if (scc_ports[i].ctl == 0)
@@ -492,21 +492,17 @@ static int setup_mmio_scc (struct pci_dev *dev, const char *name) 
	if (i >= MAX_HWIFS)

		return -ENOMEM;



	if (!request_mem_region(ctl_base, ctl_size, name)) {

		printk(KERN_WARNING "%s: IDE controller MMIO ports not available.\n", SCC_PATA_NAME);

		goto fail_0;

	}



	if (!request_mem_region(dma_base, dma_size, name)) {

		printk(KERN_WARNING "%s: IDE controller MMIO ports not available.\n", SCC_PATA_NAME);

		goto fail_1;

	ret = pci_request_selected_regions(dev, (1 << 2) - 1, name);

	if (ret < 0) {

		printk(KERN_ERR "%s: can't reserve resources\n", name);

		return ret;

	}



	if ((ctl_addr = ioremap(ctl_base, ctl_size)) == NULL)

		goto fail_2;

		goto fail_0;



	if ((dma_addr = ioremap(dma_base, dma_size)) == NULL)

		goto fail_3;

		goto fail_1;



	pci_set_master(dev);

	scc_ports[i].ctl = (unsigned long)ctl_addr;
@@ -515,12 +511,8 @@ static int setup_mmio_scc (struct pci_dev *dev, const char *name) 


	return 1;



 fail_3:

	iounmap(ctl_addr);

 fail_2:

	release_mem_region(dma_base, dma_size);

 fail_1:

	release_mem_region(ctl_base, ctl_size);

	iounmap(ctl_addr);

 fail_0:

	return -ENOMEM;

}
@@ -757,10 +749,6 @@ static void __devexit scc_remove(struct pci_dev *dev) 
{

	struct scc_ports *ports = pci_get_drvdata(dev);

	ide_hwif_t *hwif = ports->hwif;

	unsigned long ctl_base = pci_resource_start(dev, 0);

	unsigned long dma_base = pci_resource_start(dev, 1);

	unsigned long ctl_size = pci_resource_len(dev, 0);

	unsigned long dma_size = pci_resource_len(dev, 1);



	if (hwif->dmatable_cpu) {

		pci_free_consistent(dev, PRD_ENTRIES * PRD_BYTES,
@@ -773,8 +761,7 @@ static void __devexit scc_remove(struct pci_dev *dev) 
	hwif->chipset = ide_unknown;

	iounmap((void*)ports->dma);

	iounmap((void*)ports->ctl);

	release_mem_region(dma_base, dma_size);

	release_mem_region(ctl_base, ctl_size);

	pci_release_selected_regions(dev, (1 << 2) - 1);

	memset(ports, 0, sizeof(*ports));

}

drivers/ide/pci/trm290.c

+0 −6
Original line number Diff line number Diff line
@@ -257,16 +257,10 @@ static void __devinit init_hwif_trm290(ide_hwif_t *hwif) 
	printk(KERN_INFO "    %s: BM-DMA at 0x%04lx-0x%04lx",

	       hwif->name, hwif->dma_base, hwif->dma_base + 3);



	if (!request_region(hwif->dma_base, 4, hwif->name)) {

		printk(KERN_CONT " -- Error, ports in use.\n");

		return;

	}



	hwif->dmatable_cpu = pci_alloc_consistent(dev, PRD_ENTRIES * PRD_BYTES,

						  &hwif->dmatable_dma);

	if (!hwif->dmatable_cpu) {

		printk(KERN_CONT " -- Error, unable to allocate DMA table.\n");

		release_region(hwif->dma_base, 4);

		return;

	}

	printk(KERN_CONT "\n");