Commit 2311b1f2 authored by Michael Ellerman's avatar Michael Ellerman Committed by Greg Kroah-Hartman
Browse files

[PATCH] PCI: fix-pci-mmap-on-ppc-and-ppc64.patch 



This is an updated version of Ben's fix-pci-mmap-on-ppc-and-ppc64.patch
which is in 2.6.12-rc4-mm1.

It fixes the patch to work on PPC iSeries, removes some debug printks
at Ben's request, and incorporates your
fix-pci-mmap-on-ppc-and-ppc64-fix.patch also.

Originally from Benjamin Herrenschmidt <benh@kernel.crashing.org>

This patch was discussed at length on linux-pci and so far, the last
iteration of it didn't raise any comment.  It's effect is a nop on
architecture that don't define the new pci_resource_to_user() callback
anyway.  It allows architecture like ppc who put weird things inside of
PCI resource structures to convert to some different value for user
visible ones.  It also fixes mmap'ing of IO space on those archs.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a0d399a8

arch/ppc/kernel/pci.c

+19 −2
Original line number Diff line number Diff line
@@ -1495,7 +1495,7 @@ static struct resource *__pci_mmap_make_offset(struct pci_dev *dev, 
		*offset += hose->pci_mem_offset;

		res_bit = IORESOURCE_MEM;

	} else {

		io_offset = (unsigned long)hose->io_base_virt;

		io_offset = hose->io_base_virt - ___IO_BASE;

		*offset += io_offset;

		res_bit = IORESOURCE_IO;

	}
@@ -1522,7 +1522,7 @@ static struct resource *__pci_mmap_make_offset(struct pci_dev *dev, 


		/* found it! construct the final physical address */

		if (mmap_state == pci_mmap_io)

			*offset += hose->io_base_phys - _IO_BASE;

			*offset += hose->io_base_phys - io_offset;

		return rp;

	}
@@ -1739,6 +1739,23 @@ long sys_pciconfig_iobase(long which, unsigned long bus, unsigned long devfn) 
	return result;

}



void pci_resource_to_user(const struct pci_dev *dev, int bar,

			  const struct resource *rsrc,

			  u64 *start, u64 *end)

{

	struct pci_controller *hose = pci_bus_to_hose(dev->bus->number);

	unsigned long offset = 0;



	if (hose == NULL)

		return;



	if (rsrc->flags & IORESOURCE_IO)

		offset = ___IO_BASE - hose->io_base_virt + hose->io_base_phys;



	*start = rsrc->start + offset;

	*end = rsrc->end + offset;

}



void __init

pci_init_resource(struct resource *res, unsigned long start, unsigned long end,

		  int flags, char *name)

arch/ppc64/kernel/pci.c

+20 −2
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ static struct resource *__pci_mmap_make_offset(struct pci_dev *dev, 
		*offset += hose->pci_mem_offset;

		res_bit = IORESOURCE_MEM;

	} else {

		io_offset = (unsigned long)hose->io_base_virt;

		io_offset = (unsigned long)hose->io_base_virt - pci_io_base;

		*offset += io_offset;

		res_bit = IORESOURCE_IO;

	}
@@ -944,4 +944,22 @@ int pci_read_irq_line(struct pci_dev *pci_dev) 
}

EXPORT_SYMBOL(pci_read_irq_line);



void pci_resource_to_user(const struct pci_dev *dev, int bar,

			  const struct resource *rsrc,

			  u64 *start, u64 *end)

{

	struct pci_controller *hose = pci_bus_to_host(dev->bus);

	unsigned long offset = 0;



	if (hose == NULL)

		return;



	if (rsrc->flags & IORESOURCE_IO)

		offset = pci_io_base - (unsigned long)hose->io_base_virt +

			hose->io_base_phys;



	*start = rsrc->start + offset;

	*end = rsrc->end + offset;

}



#endif /* CONFIG_PPC_MULTIPLATFORM */

drivers/pci/pci-sysfs.c

+21 −5
Original line number Diff line number Diff line
@@ -60,15 +60,18 @@ resource_show(struct device * dev, struct device_attribute *attr, char * buf) 
	char * str = buf;

	int i;

	int max = 7;

	u64 start, end;



	if (pci_dev->subordinate)

		max = DEVICE_COUNT_RESOURCE;



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

		str += sprintf(str,"0x%016lx 0x%016lx 0x%016lx\n",

			       pci_resource_start(pci_dev,i),

			       pci_resource_end(pci_dev,i),

			       pci_resource_flags(pci_dev,i));

		struct resource *res =  &pci_dev->resource[i];

		pci_resource_to_user(pci_dev, i, res, &start, &end);

		str += sprintf(str,"0x%016llx 0x%016llx 0x%016llx\n",

			       (unsigned long long)start,

			       (unsigned long long)end,

			       (unsigned long long)res->flags);

	}

	return (str - buf);

}
@@ -313,8 +316,21 @@ pci_mmap_resource(struct kobject *kobj, struct bin_attribute *attr, 
						       struct device, kobj));

	struct resource *res = (struct resource *)attr->private;

	enum pci_mmap_state mmap_type;

	u64 start, end;

	int i;



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

		if (res == &pdev->resource[i])

			break;

	if (i >= PCI_ROM_RESOURCE)

		return -ENODEV;



	vma->vm_pgoff += res->start >> PAGE_SHIFT;

	/* pci_mmap_page_range() expects the same kind of entry as coming

	 * from /proc/bus/pci/ which is a "user visible" value. If this is

	 * different from the resource itself, arch will do necessary fixup.

	 */

	pci_resource_to_user(pdev, i, res, &start, &end);

	vma->vm_pgoff += start >> PAGE_SHIFT;

	mmap_type = res->flags & IORESOURCE_MEM ? pci_mmap_mem : pci_mmap_io;



	return pci_mmap_page_range(pdev, vma, mmap_type, 0);

drivers/pci/proc.c

+10 −4
Original line number Diff line number Diff line
@@ -355,14 +355,20 @@ static int show_device(struct seq_file *m, void *v) 
			dev->device,

			dev->irq);

	/* Here should be 7 and not PCI_NUM_RESOURCES as we need to preserve compatibility */

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

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

		u64 start, end;

		pci_resource_to_user(dev, i, &dev->resource[i], &start, &end);

		seq_printf(m, LONG_FORMAT,

			dev->resource[i].start |

			((unsigned long)start) |

			(dev->resource[i].flags & PCI_REGION_FLAG_MASK));

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

	}

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

		u64 start, end;

		pci_resource_to_user(dev, i, &dev->resource[i], &start, &end);

		seq_printf(m, LONG_FORMAT,

			dev->resource[i].start < dev->resource[i].end ?

			dev->resource[i].end - dev->resource[i].start + 1 : 0);

			(unsigned long)(end - start) + 1 : 0);

	}

	seq_putc(m, '\t');

	if (drv)

		seq_printf(m, "%s", drv->name);

include/asm-ppc/pci.h

+6 −0
Original line number Diff line number Diff line
@@ -103,6 +103,12 @@ extern pgprot_t pci_phys_mem_access_prot(struct file *file, 
					 unsigned long size,

					 pgprot_t prot);



#define HAVE_ARCH_PCI_RESOURCE_TO_USER

extern void pci_resource_to_user(const struct pci_dev *dev, int bar,

				 const struct resource *rsrc,

				 u64 *start, u64 *end);





#endif	/* __KERNEL__ */



#endif /* __PPC_PCI_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE