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

Commit 3835f204 authored by Yan He's avatar Yan He
Browse files

msm: pcie: Correct the mapping of PCI device 



The two Root Complexes (RCs) on APQ8084 have the same vender ID
and device ID. So we can't distinguish two RCs by vender ID and
device ID. When we map PCI device structure to msm PCIe device
structure, we need to look through the PCI device list and check
the pointer of msm PCIe device as well.

Change-Id: Ide58d621b95bbb542b7fc4472105eb9ece46a228
Signed-off-by: default avatarYan He <yanhe@codeaurora.org>
parent 95ace943

arch/arm/mach-msm/pcie.c

+24 −3
Original line number Diff line number Diff line
@@ -1127,10 +1127,34 @@ int msm_pcie_enumerate(u32 rc_idx) 


		/* kick start ARM PCI configuration framework */

		if (!ret) {

			struct pci_dev *pcidev = NULL;

			bool found = false;



			msm_pci[rc_idx].private_data = (void **)&dev;

			pci_common_init(&msm_pci[rc_idx]);

			/* This has to happen only once */

			dev->enumerated = true;



			do {

				pcidev = pci_get_device(PCIE_VENDOR_ID_RCP,

					PCIE_DEVICE_ID_RCP, pcidev);

				if (pcidev && (&msm_pcie_dev[rc_idx] ==

					(struct msm_pcie_dev_t *)

					PCIE_BUS_PRIV_DATA(pcidev))) {

					msm_pcie_dev[rc_idx].dev = pcidev;

					found = true;

					PCIE_DBG(

						"PCI device is found for RC %d\n",

						rc_idx);

				}

			} while (!found && pcidev);



			if (!pcidev) {

				pr_err(

					"PCIe: %s: Did not find PCI device for RC %d.\n",

					__func__, dev->rc_idx);

				return -ENODEV;

			}

		} else {

			pr_err("PCIe: %s: failed to enable RC %d.\n",

				__func__, dev->rc_idx);
@@ -1270,9 +1294,6 @@ static int msm_pcie_probe(struct platform_device *pdev) 
	else

		PCIE_DBG("RC %d is enabled in bootup\n", rc_idx);



	msm_pcie_dev[rc_idx].dev = pci_get_device(PCIE_VENDOR_ID_RCP,

					PCIE_DEVICE_ID_RCP, NULL);



	PCIE_DBG("PCIE probed %s\n", dev_name(&(pdev->dev)));

	mutex_unlock(&pcie_drv.drv_lock);

	return 0;