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

Commit 38274637 authored by Yongji Xie's avatar Yongji Xie Committed by Bjorn Helgaas
Browse files

powerpc/powernv: Override pcibios_default_alignment() to force PCI devices to be page aligned 



Override pcibios_default_alignment() to set default alignment to PAGE_SIZE
for all PCI devices on PowerNV platform.  Thus sub-page BARs would not
share a page and could be mapped into guest when VFIO passthrough them.

Signed-off-by: default avatarYongji Xie <elohimes@gmail.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 0a701aa6

arch/powerpc/include/asm/machdep.h

+2 −0
Original line number Diff line number Diff line
@@ -173,6 +173,8 @@ struct machdep_calls { 
	/* Called after scan and before resource survey */

	void (*pcibios_fixup_phb)(struct pci_controller *hose);



	resource_size_t (*pcibios_default_alignment)(void);



#ifdef CONFIG_PCI_IOV

	void (*pcibios_fixup_sriov)(struct pci_dev *pdev);

	resource_size_t (*pcibios_iov_resource_alignment)(struct pci_dev *, int resno);

arch/powerpc/kernel/pci-common.c

+8 −0
Original line number Diff line number Diff line
@@ -233,6 +233,14 @@ void pcibios_reset_secondary_bus(struct pci_dev *dev) 
	pci_reset_secondary_bus(dev);

}



resource_size_t pcibios_default_alignment(void)

{

	if (ppc_md.pcibios_default_alignment)

		return ppc_md.pcibios_default_alignment();



	return 0;

}



#ifdef CONFIG_PCI_IOV

resource_size_t pcibios_iov_resource_alignment(struct pci_dev *pdev, int resno)

{

arch/powerpc/platforms/powernv/pci-ioda.c

+7 −0
Original line number Diff line number Diff line
@@ -3287,6 +3287,11 @@ static void pnv_pci_setup_bridge(struct pci_bus *bus, unsigned long type) 
	}

}



static resource_size_t pnv_pci_default_alignment(void)

{

	return PAGE_SIZE;

}



#ifdef CONFIG_PCI_IOV

static resource_size_t pnv_pci_iov_resource_alignment(struct pci_dev *pdev,

						      int resno)
@@ -3820,6 +3825,8 @@ static void __init pnv_pci_init_ioda_phb(struct device_node *np, 
		hose->controller_ops = pnv_pci_ioda_controller_ops;

	}



	ppc_md.pcibios_default_alignment = pnv_pci_default_alignment;



#ifdef CONFIG_PCI_IOV

	ppc_md.pcibios_fixup_sriov = pnv_pci_ioda_fixup_iov_resources;

	ppc_md.pcibios_iov_resource_alignment = pnv_pci_iov_resource_alignment;