diff options
Diffstat (limited to 'common/recipes-kernel')
10 files changed, 321 insertions, 1 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/5759-mmc-sdhci-add-tuning-error-codes.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/5759-mmc-sdhci-add-tuning-error-codes.patch new file mode 100644 index 00000000..898d0c2d --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/5759-mmc-sdhci-add-tuning-error-codes.patch @@ -0,0 +1,78 @@ +From a506f9c83131d69c3a1ccfb3684f128ddb379111 Mon Sep 17 00:00:00 2001 +From: Yinbo Zhu <yinbo.zhu@nxp.com> +Date: Thu, 23 Aug 2018 16:48:31 +0800 +Subject: [PATCH 5759/5765] mmc: sdhci: add tuning error codes + +This patch is to add tuning error codes to +judge tuning state + +Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com> +Acked-by: Adrian Hunter <adrian.hunter@intel.com> +Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> +Signed-off-by: Sudheesh Mavila <sudheesh.mavila@amd.com> +--- + drivers/mmc/host/sdhci.c | 9 +++++---- + drivers/mmc/host/sdhci.h | 1 + + 2 files changed, 6 insertions(+), 4 deletions(-) + +diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c +index 7e29a39d5873..21dff5c7d96d 100644 +--- a/drivers/mmc/host/sdhci.c ++++ b/drivers/mmc/host/sdhci.c +@@ -2261,7 +2261,7 @@ void sdhci_send_tuning(struct sdhci_host *host, u32 opcode) + } + EXPORT_SYMBOL_GPL(sdhci_send_tuning); + +-static void __sdhci_execute_tuning(struct sdhci_host *host, u32 opcode) ++static int __sdhci_execute_tuning(struct sdhci_host *host, u32 opcode) + { + int i; + +@@ -2278,13 +2278,13 @@ static void __sdhci_execute_tuning(struct sdhci_host *host, u32 opcode) + pr_info("%s: Tuning timeout, falling back to fixed sampling clock\n", + mmc_hostname(host->mmc)); + sdhci_abort_tuning(host, opcode); +- return; ++ return -ETIMEDOUT; + } + + ctrl = sdhci_readw(host, SDHCI_HOST_CONTROL2); + if (!(ctrl & SDHCI_CTRL_EXEC_TUNING)) { + if (ctrl & SDHCI_CTRL_TUNED_CLK) +- return; /* Success! */ ++ return 0; /* Success! */ + break; + } + +@@ -2296,6 +2296,7 @@ static void __sdhci_execute_tuning(struct sdhci_host *host, u32 opcode) + pr_info("%s: Tuning failed, falling back to fixed sampling clock\n", + mmc_hostname(host->mmc)); + sdhci_reset_tuning(host); ++ return -EAGAIN; + } + + int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode) +@@ -2357,7 +2358,7 @@ int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode) + + sdhci_start_tuning(host); + +- __sdhci_execute_tuning(host, opcode); ++ host->tuning_err = __sdhci_execute_tuning(host, opcode); + + sdhci_end_tuning(host); + out: +diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h +index dd3219ebbf22..0a96a0ef017a 100755 +--- a/drivers/mmc/host/sdhci.h ++++ b/drivers/mmc/host/sdhci.h +@@ -564,6 +564,7 @@ struct sdhci_host { + + unsigned int tuning_count; /* Timer count for re-tuning */ + unsigned int tuning_mode; /* Re-tuning mode supported by host */ ++ unsigned int tuning_err; /* Error code for re-tuning */ + #define SDHCI_TUNING_MODE_1 0 + #define SDHCI_TUNING_MODE_2 1 + #define SDHCI_TUNING_MODE_3 2 +-- +2.17.1 + diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/5760-Revert-drm-amdgpu-interim-disable-RV2-GFX-CG-flag-fo.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/5760-Revert-drm-amdgpu-interim-disable-RV2-GFX-CG-flag-fo.patch new file mode 100644 index 00000000..abd22a27 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/5760-Revert-drm-amdgpu-interim-disable-RV2-GFX-CG-flag-fo.patch @@ -0,0 +1,32 @@ +From 1d4dea8800eb44b9d134d8f3a470627c2d056e69 Mon Sep 17 00:00:00 2001 +From: Raveendra Talabattula <raveendra.talabattula@amd.com> +Date: Fri, 22 Feb 2019 16:24:07 +0530 +Subject: [PATCH 5760/5765] Revert drm/amdgpu: interim disable RV2 GFX CG flag + for urgent use + +Signed-off-by: Raveendra Talabattula <raveendra.talabattula@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/soc15.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c +index 5614c2bf4161..a741913b3dee 100644 +--- a/drivers/gpu/drm/amd/amdgpu/soc15.c ++++ b/drivers/gpu/drm/amd/amdgpu/soc15.c +@@ -705,9 +705,12 @@ static int soc15_common_early_init(void *handle) + adev->external_rev_id = 0x1; + + if (adev->rev_id >= 0x8) { +- adev->cg_flags = AMD_CG_SUPPORT_GFX_MGLS | ++ adev->cg_flags = AMD_CG_SUPPORT_GFX_MGCG | ++ AMD_CG_SUPPORT_GFX_MGLS | + AMD_CG_SUPPORT_GFX_CP_LS | ++ AMD_CG_SUPPORT_GFX_3D_CGCG | + AMD_CG_SUPPORT_GFX_3D_CGLS | ++ AMD_CG_SUPPORT_GFX_CGCG | + AMD_CG_SUPPORT_GFX_CGLS | + AMD_CG_SUPPORT_BIF_LS | + AMD_CG_SUPPORT_HDP_LS | +-- +2.17.1 + diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/5761-net-phy-marvell10g-remove-XGMII-as-an-option-for-88x.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/5761-net-phy-marvell10g-remove-XGMII-as-an-option-for-88x.patch new file mode 100644 index 00000000..e5317536 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/5761-net-phy-marvell10g-remove-XGMII-as-an-option-for-88x.patch @@ -0,0 +1,34 @@ +From 244867f0fc21846b3ddce22a4623823b4a72be34 Mon Sep 17 00:00:00 2001 +From: Russell King <rmk+kernel@armlinux.org.uk> +Date: Tue, 12 Dec 2017 12:53:18 +0000 +Subject: [PATCH 5761/5765] net: phy: marvell10g: remove XGMII as an option for + 88x3310 + +Remove XGMII as an option for the 88x3310 PHY driver, as the PHY doesn't +support XGMII's 32-bit data lanes. It supports USXGMII, which is not +XGMII, but a single-lane serdes interface - see +https://developer.cisco.com/site/usgmii-usxgmii/ + +Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> +Reviewed-by: Andrew Lunn <andrew@lunn.ch> +Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Sudheesh Mavila <sudheesh.mavila@amd.com> +--- + drivers/net/phy/marvell10g.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c +index 21b3f36e023a..f0cfba4e758b 100644 +--- a/drivers/net/phy/marvell10g.c ++++ b/drivers/net/phy/marvell10g.c +@@ -84,7 +84,6 @@ static int mv3310_config_init(struct phy_device *phydev) + + /* Check that the PHY interface type is compatible */ + if (phydev->interface != PHY_INTERFACE_MODE_SGMII && +- phydev->interface != PHY_INTERFACE_MODE_XGMII && + phydev->interface != PHY_INTERFACE_MODE_XAUI && + phydev->interface != PHY_INTERFACE_MODE_RXAUI && + phydev->interface != PHY_INTERFACE_MODE_10GKR) +-- +2.17.1 + diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/5762-net-phy-marvell10g-update-header-comments.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/5762-net-phy-marvell10g-update-header-comments.patch new file mode 100644 index 00000000..692e419f --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/5762-net-phy-marvell10g-update-header-comments.patch @@ -0,0 +1,43 @@ +From 231159c6d1a9ec9c43435a2e166f0c325f41f5df Mon Sep 17 00:00:00 2001 +From: Russell King <rmk+kernel@armlinux.org.uk> +Date: Fri, 29 Dec 2017 12:46:22 +0000 +Subject: [PATCH 5762/5765] net: phy: marvell10g: update header comments + +Update header comments to indicate the newly found behaviour with XAUI +interfaces. + +Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> +Reviewed-by: Andrew Lunn <andrew@lunn.ch> +Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Sudheesh Mavila <sudheesh.mavila@amd.com> +--- + drivers/net/phy/marvell10g.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c +index f0cfba4e758b..37ba68d7c385 100644 +--- a/drivers/net/phy/marvell10g.c ++++ b/drivers/net/phy/marvell10g.c +@@ -6,12 +6,18 @@ + * + * There appears to be several different data paths through the PHY which + * are automatically managed by the PHY. The following has been determined +- * via observation and experimentation: ++ * via observation and experimentation for a setup using single-lane Serdes: + * + * SGMII PHYXS -- BASE-T PCS -- 10G PMA -- AN -- Copper (for <= 1G) + * 10GBASE-KR PHYXS -- BASE-T PCS -- 10G PMA -- AN -- Copper (for 10G) + * 10GBASE-KR PHYXS -- BASE-R PCS -- Fiber + * ++ * With XAUI, observation shows: ++ * ++ * XAUI PHYXS -- <appropriate PCS as above> ++ * ++ * and no switching of the host interface mode occurs. ++ * + * If both the fiber and copper ports are connected, the first to gain + * link takes priority and the other port is completely locked out. + */ +-- +2.17.1 + diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/5763-amd-xgbe-Sometimes-driver-report-incorrect-link-stat.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/5763-amd-xgbe-Sometimes-driver-report-incorrect-link-stat.patch new file mode 100644 index 00000000..6c869f19 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/5763-amd-xgbe-Sometimes-driver-report-incorrect-link-stat.patch @@ -0,0 +1,39 @@ +From 6f83e3fea99f8c90cc17dc04b6591910377a06e2 Mon Sep 17 00:00:00 2001 +From: Sudheesh Mavila <sudheesh.mavila@amd.com> +Date: Tue, 12 Mar 2019 22:33:11 +0530 +Subject: [PATCH 5763/5765] amd-xgbe Sometimes driver report incorrect link + status and results in timeout error in driver Fix to EMBSWDEV-6825 + +Signed-off-by: Sudheesh Mavila <sudheesh.mavila@amd.com> +--- + drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c b/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c +index 151bdb629e8a..ff4eeb55ab79 100755 +--- a/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c ++++ b/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c +@@ -2565,8 +2565,18 @@ static int xgbe_phy_link_status(struct xgbe_prv_data *pdata, int *an_restart) + */ + reg = XMDIO_READ(pdata, MDIO_MMD_PCS, MDIO_STAT1); + reg = XMDIO_READ(pdata, MDIO_MMD_PCS, MDIO_STAT1); +- if (reg & MDIO_STAT1_LSTATUS) +- return 1; ++ if(phy_data->sfp_speed == XGBE_SFP_SPEED_10000) { ++ if ((reg & MDIO_STAT1_LSTATUS) && !(reg & MDIO_STAT1_FAULT)) { ++ return 1; ++ } else { ++ *an_restart = 1; ++ pdata->phy_if.phy_reset(pdata); ++ return 0; ++ } ++ } else { ++ if (reg & MDIO_STAT1_LSTATUS) ++ return 1; ++ } + + /* No link, attempt a receiver reset cycle */ + if (phy_data->rrc_count++ > XGBE_RRC_FREQUENCY) { +-- +2.17.1 + diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/5764-Revert-drm-amdgpu-enable-gfxoff-in-non-sriov-and-stu.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/5764-Revert-drm-amdgpu-enable-gfxoff-in-non-sriov-and-stu.patch new file mode 100644 index 00000000..6f13687e --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/5764-Revert-drm-amdgpu-enable-gfxoff-in-non-sriov-and-stu.patch @@ -0,0 +1,55 @@ +From e0052b6c488f10357f71ce3bc86aee5ad6c1fef2 Mon Sep 17 00:00:00 2001 +From: Raveendra Talabattula <raveendra.talabattula@amd.com> +Date: Thu, 6 Sep 2018 14:56:19 +0800 +Subject: [PATCH 5764/5765] Revert drm/amdgpu:enable gfxoff in non-sriov and + stutter mode by default + +This patch is causing system hang randomly when S3 is performed with +playback + +Change-Id: I91a5db7cabbfa66d97bfb522a671a12695b51b22 +Signed-off-by: Kenneth Feng <kenneth.feng@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +Signed-off-by: Raveendra Talabattula <raveendra.talabattula@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 -- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 4 ++-- + 2 files changed, 2 insertions(+), 4 deletions(-) + mode change 100755 => 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c + mode change 100755 => 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +old mode 100755 +new mode 100644 +index ef0fc426d125..ef7b92235f8b +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +@@ -1520,8 +1520,6 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev) + } + + adev->powerplay.pp_feature = amdgpu_pp_feature_mask; +- if (amdgpu_sriov_vf(adev)) +- adev->powerplay.pp_feature &= ~PP_GFXOFF_MASK; + + for (i = 0; i < adev->num_ip_blocks; i++) { + if ((amdgpu_ip_block_mask & (1 << i)) == 0) { +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +old mode 100755 +new mode 100644 +index da922c6bcf53..8af64fda53f8 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +@@ -120,8 +120,8 @@ uint amdgpu_pg_mask = 0xffffffff; + uint amdgpu_sdma_phase_quantum = 32; + char *amdgpu_disable_cu = NULL; + char *amdgpu_virtual_display = NULL; +-/* OverDrive(bit 14) disabled by default*/ +-uint amdgpu_pp_feature_mask = 0xffffbfff; ++/* OverDrive(bit 14),gfxoff(bit 15),stutter mode(bit 17) disabled by default*/ ++uint amdgpu_pp_feature_mask = 0xfffd3fff; + int amdgpu_ngg = 0; + int amdgpu_prim_buf_per_se = 0; + int amdgpu_pos_buf_per_se = 0; +-- +2.17.1 + diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/5765-drm-amd-powerplay-enable-UMDPSTATE-support-on-raven2.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/5765-drm-amd-powerplay-enable-UMDPSTATE-support-on-raven2.patch new file mode 100644 index 00000000..f1dd23e9 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/5765-drm-amd-powerplay-enable-UMDPSTATE-support-on-raven2.patch @@ -0,0 +1,33 @@ +From 7263bf34a3ffb2123e336bc0bf4cba055197b3ab Mon Sep 17 00:00:00 2001 +From: Pavan Kumar Ramayanam <pavan.ramayanam@amd.com> +Date: Tue, 23 Apr 2019 10:16:19 +0530 +Subject: [PATCH 5765/5765] drm/amd/powerplay: enable UMDPSTATE support on + raven2 enable UMDPSTATE support to force performance level for raven2. + +Signed-off-by: Chengming Gui <Jack.Gui@amd.com> +Reviewed-by: Huang Rui <ray.huang@amd.com> + +Signed-off-by: Pavan Kumar Ramayanam <pavan.ramayanam@amd.com> +--- + drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c +index 7100c74422cd..de047fb004ec 100644 +--- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c ++++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c +@@ -560,11 +560,6 @@ static int smu10_dpm_force_dpm_level(struct pp_hwmgr *hwmgr, + return 0; + } + +- /* Disable UMDPSTATE support on rv2 temporarily */ +- if ((adev->asic_type == CHIP_RAVEN) && +- (adev->rev_id >= 8)) +- return 0; +- + if (min_sclk < data->gfx_min_freq_limit) + min_sclk = data->gfx_min_freq_limit; + +-- +2.17.1 + diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/amd-emmc-patches.scc b/common/recipes-kernel/linux/linux-yocto-4.14.71/amd-emmc-patches.scc index b7c8d685..45ac77d3 100644 --- a/common/recipes-kernel/linux/linux-yocto-4.14.71/amd-emmc-patches.scc +++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/amd-emmc-patches.scc @@ -15,3 +15,4 @@ patch 5737-mmc-sdhci-Add-32-bit-block-count-support-for-v4-mode.patch patch 5738-mmc-sdhci-Add-Auto-CMD-Auto-Select-support.patch patch 5746-amd-eMMC-sdhci-HS400-workaround-for-ZP.patch patch 5758-RTQA4-Fix-build-error-for-hs400-and-hs200.patch +patch 5759-mmc-sdhci-add-tuning-error-codes.patch diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/amd-xgbe-patches.scc b/common/recipes-kernel/linux/linux-yocto-4.14.71/amd-xgbe-patches.scc index 32d73c30..9de599b9 100644 --- a/common/recipes-kernel/linux/linux-yocto-4.14.71/amd-xgbe-patches.scc +++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/amd-xgbe-patches.scc @@ -20,3 +20,6 @@ patch 5744-net-phy-Add-helper-for-advertise-to-lcl-value.patch patch 5745-drivers-net-remove-net-busy_poll.h-inclusion-when-no.patch patch 5749-net-phy-Also-request-modules-for-C45-IDs.patch patch 5750-amd-xgbe-Fix-mdio-access-for-non-zero-ports-and-clau.patch +patch 5761-net-phy-marvell10g-remove-XGMII-as-an-option-for-88x.patch +patch 5762-net-phy-marvell10g-update-header-comments.patch +patch 5763-amd-xgbe-Sometimes-driver-report-incorrect-link-stat.patch diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/amdgpu-patches.scc b/common/recipes-kernel/linux/linux-yocto-4.14.71/amdgpu-patches.scc index 0618a367..6788d267 100755 --- a/common/recipes-kernel/linux/linux-yocto-4.14.71/amdgpu-patches.scc +++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/amdgpu-patches.scc @@ -5714,4 +5714,6 @@ patch 5754-drm-amdgpu-make-gfx9-enter-into-rlc-safe-mode-when-s.patch patch 5755-Revert-drm-amdgpu-revert-the-commit-interim-disable-.patch patch 5756-Revert-drm-amdgpu-revert-psp-firmware-load-status-ch.patch patch 5757-drm-amdgpu-psp-ignore-psp-response-status.patch - +patch 5760-Revert-drm-amdgpu-interim-disable-RV2-GFX-CG-flag-fo.patch +patch 5764-Revert-drm-amdgpu-enable-gfxoff-in-non-sriov-and-stu.patch +patch 5765-drm-amd-powerplay-enable-UMDPSTATE-support-on-raven2.patch |