From 5d233f146efcfd6c125fe856bd3509dc13bf6604 Mon Sep 17 00:00:00 2001 From: CTCaer Date: Mon, 28 Sep 2020 07:48:06 +0000 Subject: [PATCH] arm64: icosa: Enable PCIE performance mode Now that the problematic BCM4356 is not informed about D3, switch to performance mode. --- arch/arm64/configs/tegra_linux_defconfig | 2 +- drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/configs/tegra_linux_defconfig b/arch/arm64/configs/tegra_linux_defconfig index 191553b9dd93..ca234d9b6357 100644 --- a/arch/arm64/configs/tegra_linux_defconfig +++ b/arch/arm64/configs/tegra_linux_defconfig @@ -45,7 +45,7 @@ CONFIG_CFQ_GROUP_IOSCHED=y CONFIG_ARCH_TEGRA=y CONFIG_PCI=y CONFIG_PCIE_ECRC=y -CONFIG_PCIEASPM_POWERSAVE=y +CONFIG_PCIEASPM_PERFORMANCE=y CONFIG_PCI_IOV=y CONFIG_PCI_TEGRA=y CONFIG_PCIE_TEGRA_DW=y diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c index 8c03bb4961d8..85ac2192ab35 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c @@ -1957,7 +1957,7 @@ static int brcmf_pcie_pm_enter_D3(struct device *dev) BRCMF_PCIE_MBDATA_TIMEOUT); if (!devinfo->mbdata_completed) { brcmf_err("Timeout on response for entering D3 substate\n"); - rcmf_bus_change_state(bus, BRCMF_BUS_UP); + brcmf_bus_change_state(bus, BRCMF_BUS_UP); return -EIO; }