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

Commit 661fcb45 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Michael Ellerman
Browse files

powerpc/powernv: remove pnv_pci_ioda_pe_single_vendor 



This function is completely bogus - the fact that two PCIe devices come
from the same vendor has absolutely nothing to say about the DMA
capabilities and characteristics.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 9f4a68d4

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

+2 −26
Original line number Diff line number Diff line
@@ -1756,31 +1756,6 @@ static void pnv_pci_ioda_dma_dev_setup(struct pnv_phb *phb, struct pci_dev *pdev 
	 */

}



static bool pnv_pci_ioda_pe_single_vendor(struct pnv_ioda_pe *pe)

{

	unsigned short vendor = 0;

	struct pci_dev *pdev;



	if (pe->device_count == 1)

		return true;



	/* pe->pdev should be set if it's a single device, pe->pbus if not */

	if (!pe->pbus)

		return true;



	list_for_each_entry(pdev, &pe->pbus->devices, bus_list) {

		if (!vendor) {

			vendor = pdev->vendor;

			continue;

		}



		if (pdev->vendor != vendor)

			return false;

	}



	return true;

}



/*

 * Reconfigure TVE#0 to be usable as 64-bit DMA space.

 *
@@ -1881,7 +1856,8 @@ static int pnv_pci_ioda_dma_set_mask(struct pci_dev *pdev, u64 dma_mask) 
		 */

		if (dma_mask >> 32 &&

		    dma_mask > (memory_hotplug_max() + (1ULL << 32)) &&

		    pnv_pci_ioda_pe_single_vendor(pe) &&

		    /* pe->pdev should be set if it's a single device, pe->pbus if not */

		    (pe->device_count == 1 || !pe->pbus) &&

		    phb->model == PNV_PHB_MODEL_PHB3) {

			/* Configure the bypass mode */

			rc = pnv_pci_ioda_dma_64bit_bypass(pe);