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

Commit ec67f2d2 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: pcie: fix PCIe L0s and L1 ASPM support"

parents 58011f35 e023d014

drivers/pci/host/pci-msm.c

+3 −3
Original line number Original line Diff line number Diff line 
/* Copyright (c) 2014-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2018, The Linux Foundation. All rights reserved.

 *

 *

 * This program is free software; you can redistribute it and/or modify

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * it under the terms of the GNU General Public License version 2 and
@@ -5560,7 +5560,7 @@ static void msm_pcie_config_link_pm_rc(struct msm_pcie_dev_t *dev, 
			u32 val;

			u32 val;





			pci_read_config_dword(child_pdev,

			pci_read_config_dword(child_pdev,

				pdev->pcie_cap + PCI_EXP_LNKCTL, &val);

				child_pdev->pcie_cap + PCI_EXP_LNKCTL, &val);

			child_l0s_enable = !!(val & PCI_EXP_LNKCTL_ASPM_L0S);

			child_l0s_enable = !!(val & PCI_EXP_LNKCTL_ASPM_L0S);

			if (child_l0s_enable)

			if (child_l0s_enable)

				break;

				break;
@@ -5608,7 +5608,7 @@ static void msm_pcie_config_link_pm_rc(struct msm_pcie_dev_t *dev, 
			u32 val;

			u32 val;





			pci_read_config_dword(child_pdev,

			pci_read_config_dword(child_pdev,

				pdev->pcie_cap + PCI_EXP_LNKCTL, &val);

				child_pdev->pcie_cap + PCI_EXP_LNKCTL, &val);

			child_l1_enable = !!(val & PCI_EXP_LNKCTL_ASPM_L1);

			child_l1_enable = !!(val & PCI_EXP_LNKCTL_ASPM_L1);

			if (child_l1_enable)

			if (child_l1_enable)

				break;

				break;