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

Commit 7c12d906 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

powerpc: Fix sysfs pci mmap on 32-bit machines with 64-bit PCI 



When manipulating 64-bit PCI addresses, the code would lose the
top 32-bit in a couple of places when shifting a pfn due to missing
type casting from the 32-bit pfn to a 64-bit resource before the
shift.

This breaks using newer X servers for example on 440 machines
with the PCI bus above 32-bit.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 76c31f23

arch/powerpc/kernel/pci-common.c

+3 −2
Original line number Diff line number Diff line
@@ -419,7 +419,7 @@ pgprot_t pci_phys_mem_access_prot(struct file *file, 
	struct pci_dev *pdev = NULL;

	struct resource *found = NULL;

	unsigned long prot = pgprot_val(protection);

	unsigned long offset = pfn << PAGE_SHIFT;

	resource_size_t offset = ((resource_size_t)pfn) << PAGE_SHIFT;

	int i;



	if (page_is_ram(pfn))
@@ -470,7 +470,8 @@ pgprot_t pci_phys_mem_access_prot(struct file *file, 
int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,

			enum pci_mmap_state mmap_state, int write_combine)

{

	resource_size_t offset = vma->vm_pgoff << PAGE_SHIFT;

	resource_size_t offset =

		((resource_size_t)vma->vm_pgoff) << PAGE_SHIFT;

	struct resource *rp;

	int ret;