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

Commit 751b9a5d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'powerpc-4.8-7' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull one more powerpc fix from Michael Ellerman:
 "powernv/pci: Fix m64 checks for SR-IOV and window alignment from
  Russell Currey"

* tag 'powerpc-4.8-7' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/powernv/pci: Fix m64 checks for SR-IOV and window alignment
parents 8d2c0d36 b79331a5

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

+9 −2
Original line number Diff line number Diff line
@@ -124,6 +124,13 @@ static inline bool pnv_pci_is_m64(struct pnv_phb *phb, struct resource *r) 
		r->start < (phb->ioda.m64_base + phb->ioda.m64_size));

}



static inline bool pnv_pci_is_m64_flags(unsigned long resource_flags)

{

	unsigned long flags = (IORESOURCE_MEM_64 | IORESOURCE_PREFETCH);



	return (resource_flags & flags) == flags;

}



static struct pnv_ioda_pe *pnv_ioda_init_pe(struct pnv_phb *phb, int pe_no)

{

	phb->ioda.pe_array[pe_no].phb = phb;
@@ -2871,7 +2878,7 @@ static void pnv_pci_ioda_fixup_iov_resources(struct pci_dev *pdev) 
		res = &pdev->resource[i + PCI_IOV_RESOURCES];

		if (!res->flags || res->parent)

			continue;

		if (!pnv_pci_is_m64(phb, res)) {

		if (!pnv_pci_is_m64_flags(res->flags)) {

			dev_warn(&pdev->dev, "Don't support SR-IOV with"

					" non M64 VF BAR%d: %pR. \n",

				 i, res);
@@ -3096,7 +3103,7 @@ static resource_size_t pnv_pci_window_alignment(struct pci_bus *bus, 
	 * alignment for any 64-bit resource, PCIe doesn't care and

	 * bridges only do 64-bit prefetchable anyway.

	 */

	if (phb->ioda.m64_segsize && (type & IORESOURCE_MEM_64))

	if (phb->ioda.m64_segsize && pnv_pci_is_m64_flags(type))

		return phb->ioda.m64_segsize;

	if (type & IORESOURCE_MEM)

		return phb->ioda.m32_segsize;