From b6cbe285626fe2c2f7dd7dc530c1f6653d146dec Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 20 Aug 2020 10:43:28 +0200 Subject: [PATCH] 4.19-stable patches added patches: arm64-dts-marvell-espressobin-add-ethernet-alias.patch drm-added-orientation-quirk-for-asus-tablet-model-t103haf.patch drm-amdgpu-fix-bug-where-dpm-is-not-enabled-after-hibernate-and-resume.patch drm-radeon-fix-fb_div-check-in-ni_init_smc_spll_table.patch khugepaged-retract_page_tables-remember-to-test-exit.patch --- ...rvell-espressobin-add-ethernet-alias.patch | 37 ++++++++ ...-quirk-for-asus-tablet-model-t103haf.patch | 34 +++++++ ...t-enabled-after-hibernate-and-resume.patch | 60 ++++++++++++ ..._div-check-in-ni_init_smc_spll_table.patch | 33 +++++++ ...ct_page_tables-remember-to-test-exit.patch | 94 +++++++++++++++++++ queue-4.19/series | 5 + 6 files changed, 263 insertions(+) create mode 100644 queue-4.19/arm64-dts-marvell-espressobin-add-ethernet-alias.patch create mode 100644 queue-4.19/drm-added-orientation-quirk-for-asus-tablet-model-t103haf.patch create mode 100644 queue-4.19/drm-amdgpu-fix-bug-where-dpm-is-not-enabled-after-hibernate-and-resume.patch create mode 100644 queue-4.19/drm-radeon-fix-fb_div-check-in-ni_init_smc_spll_table.patch create mode 100644 queue-4.19/khugepaged-retract_page_tables-remember-to-test-exit.patch diff --git a/queue-4.19/arm64-dts-marvell-espressobin-add-ethernet-alias.patch b/queue-4.19/arm64-dts-marvell-espressobin-add-ethernet-alias.patch new file mode 100644 index 00000000000..428db54215b --- /dev/null +++ b/queue-4.19/arm64-dts-marvell-espressobin-add-ethernet-alias.patch @@ -0,0 +1,37 @@ +From 5253cb8c00a6f4356760efb38bca0e0393aa06de Mon Sep 17 00:00:00 2001 +From: Tomasz Maciej Nowak +Date: Thu, 27 Feb 2020 17:52:32 +0100 +Subject: arm64: dts: marvell: espressobin: add ethernet alias + +From: Tomasz Maciej Nowak + +commit 5253cb8c00a6f4356760efb38bca0e0393aa06de upstream. + +The maker of this board and its variants, stores MAC address in U-Boot +environment. Add alias for bootloader to recognise, to which ethernet +node inject the factory MAC address. + +Signed-off-by: Tomasz Maciej Nowak +Signed-off-by: Gregory CLEMENT +[pali: Backported to 5.4 and older versions] +Signed-off-by: Pali Rohár +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts ++++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts +@@ -19,6 +19,12 @@ + model = "Globalscale Marvell ESPRESSOBin Board"; + compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3710"; + ++ aliases { ++ ethernet0 = ð0; ++ serial0 = &uart0; ++ serial1 = &uart1; ++ }; ++ + chosen { + stdout-path = "serial0:115200n8"; + }; diff --git a/queue-4.19/drm-added-orientation-quirk-for-asus-tablet-model-t103haf.patch b/queue-4.19/drm-added-orientation-quirk-for-asus-tablet-model-t103haf.patch new file mode 100644 index 00000000000..9f2e7a5a843 --- /dev/null +++ b/queue-4.19/drm-added-orientation-quirk-for-asus-tablet-model-t103haf.patch @@ -0,0 +1,34 @@ +From b5ac98cbb8e5e30c34ebc837d1e5a3982d2b5f5c Mon Sep 17 00:00:00 2001 +From: Marius Iacob +Date: Sat, 1 Aug 2020 15:34:46 +0300 +Subject: drm: Added orientation quirk for ASUS tablet model T103HAF + +From: Marius Iacob + +commit b5ac98cbb8e5e30c34ebc837d1e5a3982d2b5f5c upstream. + +Signed-off-by: Marius Iacob +Cc: stable@vger.kernel.org +Signed-off-by: Daniel Vetter +Link: https://patchwork.freedesktop.org/patch/msgid/20200801123445.1514567-1-themariusus@gmail.com +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/drm_panel_orientation_quirks.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- a/drivers/gpu/drm/drm_panel_orientation_quirks.c ++++ b/drivers/gpu/drm/drm_panel_orientation_quirks.c +@@ -107,6 +107,12 @@ static const struct dmi_system_id orient + DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T101HA"), + }, + .driver_data = (void *)&lcd800x1280_rightside_up, ++ }, { /* Asus T103HAF */ ++ .matches = { ++ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), ++ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T103HAF"), ++ }, ++ .driver_data = (void *)&lcd800x1280_rightside_up, + }, { /* GPD MicroPC (generic strings, also match on bios date) */ + .matches = { + DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Default string"), diff --git a/queue-4.19/drm-amdgpu-fix-bug-where-dpm-is-not-enabled-after-hibernate-and-resume.patch b/queue-4.19/drm-amdgpu-fix-bug-where-dpm-is-not-enabled-after-hibernate-and-resume.patch new file mode 100644 index 00000000000..5044757ad34 --- /dev/null +++ b/queue-4.19/drm-amdgpu-fix-bug-where-dpm-is-not-enabled-after-hibernate-and-resume.patch @@ -0,0 +1,60 @@ +From f87812284172a9809820d10143b573d833cd3f75 Mon Sep 17 00:00:00 2001 +From: Sandeep Raghuraman +Date: Thu, 6 Aug 2020 22:52:20 +0530 +Subject: drm/amdgpu: Fix bug where DPM is not enabled after hibernate and resume + +From: Sandeep Raghuraman + +commit f87812284172a9809820d10143b573d833cd3f75 upstream. + +Reproducing bug report here: +After hibernating and resuming, DPM is not enabled. This remains the case +even if you test hibernate using the steps here: +https://www.kernel.org/doc/html/latest/power/basic-pm-debugging.html + +I debugged the problem, and figured out that in the file hardwaremanager.c, +in the function, phm_enable_dynamic_state_management(), the check +'if (!hwmgr->pp_one_vf && smum_is_dpm_running(hwmgr) && !amdgpu_passthrough(adev) && adev->in_suspend)' +returns true for the hibernate case, and false for the suspend case. + +This means that for the hibernate case, the AMDGPU driver doesn't enable DPM +(even though it should) and simply returns from that function. +In the suspend case, it goes ahead and enables DPM, even though it doesn't need to. + +I debugged further, and found out that in the case of suspend, for the +CIK/Hawaii GPUs, smum_is_dpm_running(hwmgr) returns false, while in the case of +hibernate, smum_is_dpm_running(hwmgr) returns true. + +For CIK, the ci_is_dpm_running() function calls the ci_is_smc_ram_running() function, +which is ultimately used to determine if DPM is currently enabled or not, +and this seems to provide the wrong answer. + +I've changed the ci_is_dpm_running() function to instead use the same method that +some other AMD GPU chips do (e.g Fiji), which seems to read the voltage controller. +I've tested on my R9 390 and it seems to work correctly for both suspend and +hibernate use cases, and has been stable so far. + +Bug: https://bugzilla.kernel.org/show_bug.cgi?id=208839 +Signed-off-by: Sandeep Raghuraman +Signed-off-by: Alex Deucher +Cc: stable@vger.kernel.org +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +--- a/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c ++++ b/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c +@@ -2723,7 +2723,10 @@ static int ci_initialize_mc_reg_table(st + + static bool ci_is_dpm_running(struct pp_hwmgr *hwmgr) + { +- return ci_is_smc_ram_running(hwmgr); ++ return (1 == PHM_READ_INDIRECT_FIELD(hwmgr->device, ++ CGS_IND_REG__SMC, FEATURE_STATUS, ++ VOLTAGE_CONTROLLER_ON)) ++ ? true : false; + } + + static int ci_smu_init(struct pp_hwmgr *hwmgr) diff --git a/queue-4.19/drm-radeon-fix-fb_div-check-in-ni_init_smc_spll_table.patch b/queue-4.19/drm-radeon-fix-fb_div-check-in-ni_init_smc_spll_table.patch new file mode 100644 index 00000000000..8ab4b61c217 --- /dev/null +++ b/queue-4.19/drm-radeon-fix-fb_div-check-in-ni_init_smc_spll_table.patch @@ -0,0 +1,33 @@ +From f29aa08852e1953e461f2d47ab13c34e14bc08b3 Mon Sep 17 00:00:00 2001 +From: Denis Efremov +Date: Mon, 22 Jun 2020 23:31:22 +0300 +Subject: drm/radeon: fix fb_div check in ni_init_smc_spll_table() + +From: Denis Efremov + +commit f29aa08852e1953e461f2d47ab13c34e14bc08b3 upstream. + +clk_s is checked twice in a row in ni_init_smc_spll_table(). +fb_div should be checked instead. + +Fixes: 69e0b57a91ad ("drm/radeon/kms: add dpm support for cayman (v5)") +Cc: stable@vger.kernel.org +Signed-off-by: Denis Efremov +Signed-off-by: Alex Deucher +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/radeon/ni_dpm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/gpu/drm/radeon/ni_dpm.c ++++ b/drivers/gpu/drm/radeon/ni_dpm.c +@@ -2123,7 +2123,7 @@ static int ni_init_smc_spll_table(struct + if (p_div & ~(SMC_NISLANDS_SPLL_DIV_TABLE_PDIV_MASK >> SMC_NISLANDS_SPLL_DIV_TABLE_PDIV_SHIFT)) + ret = -EINVAL; + +- if (clk_s & ~(SMC_NISLANDS_SPLL_DIV_TABLE_CLKS_MASK >> SMC_NISLANDS_SPLL_DIV_TABLE_CLKS_SHIFT)) ++ if (fb_div & ~(SMC_NISLANDS_SPLL_DIV_TABLE_FBDIV_MASK >> SMC_NISLANDS_SPLL_DIV_TABLE_FBDIV_SHIFT)) + ret = -EINVAL; + + if (fb_div & ~(SMC_NISLANDS_SPLL_DIV_TABLE_FBDIV_MASK >> SMC_NISLANDS_SPLL_DIV_TABLE_FBDIV_SHIFT)) diff --git a/queue-4.19/khugepaged-retract_page_tables-remember-to-test-exit.patch b/queue-4.19/khugepaged-retract_page_tables-remember-to-test-exit.patch new file mode 100644 index 00000000000..bfef5e471f1 --- /dev/null +++ b/queue-4.19/khugepaged-retract_page_tables-remember-to-test-exit.patch @@ -0,0 +1,94 @@ +From 18e77600f7a1ed69f8ce46c9e11cad0985712dfa Mon Sep 17 00:00:00 2001 +From: Hugh Dickins +Date: Thu, 6 Aug 2020 23:26:22 -0700 +Subject: khugepaged: retract_page_tables() remember to test exit + +From: Hugh Dickins + +commit 18e77600f7a1ed69f8ce46c9e11cad0985712dfa upstream. + +Only once have I seen this scenario (and forgot even to notice what forced +the eventual crash): a sequence of "BUG: Bad page map" alerts from +vm_normal_page(), from zap_pte_range() servicing exit_mmap(); +pmd:00000000, pte values corresponding to data in physical page 0. + +The pte mappings being zapped in this case were supposed to be from a huge +page of ext4 text (but could as well have been shmem): my belief is that +it was racing with collapse_file()'s retract_page_tables(), found *pmd +pointing to a page table, locked it, but *pmd had become 0 by the time +start_pte was decided. + +In most cases, that possibility is excluded by holding mmap lock; but +exit_mmap() proceeds without mmap lock. Most of what's run by khugepaged +checks khugepaged_test_exit() after acquiring mmap lock: +khugepaged_collapse_pte_mapped_thps() and hugepage_vma_revalidate() do so, +for example. But retract_page_tables() did not: fix that. + +The fix is for retract_page_tables() to check khugepaged_test_exit(), +after acquiring mmap lock, before doing anything to the page table. +Getting the mmap lock serializes with __mmput(), which briefly takes and +drops it in __khugepaged_exit(); then the khugepaged_test_exit() check on +mm_users makes sure we don't touch the page table once exit_mmap() might +reach it, since exit_mmap() will be proceeding without mmap lock, not +expecting anyone to be racing with it. + +Fixes: f3f0e1d2150b ("khugepaged: add support of collapse for tmpfs/shmem pages") +Signed-off-by: Hugh Dickins +Signed-off-by: Andrew Morton +Acked-by: Kirill A. Shutemov +Cc: Andrea Arcangeli +Cc: Mike Kravetz +Cc: Song Liu +Cc: [4.8+] +Link: http://lkml.kernel.org/r/alpine.LSU.2.11.2008021215400.27773@eggly.anvils +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman +--- + mm/khugepaged.c | 22 +++++++++++++--------- + 1 file changed, 13 insertions(+), 9 deletions(-) + +--- a/mm/khugepaged.c ++++ b/mm/khugepaged.c +@@ -1251,6 +1251,7 @@ static void collect_mm_slot(struct mm_sl + static void retract_page_tables(struct address_space *mapping, pgoff_t pgoff) + { + struct vm_area_struct *vma; ++ struct mm_struct *mm; + unsigned long addr; + pmd_t *pmd, _pmd; + +@@ -1264,7 +1265,8 @@ static void retract_page_tables(struct a + continue; + if (vma->vm_end < addr + HPAGE_PMD_SIZE) + continue; +- pmd = mm_find_pmd(vma->vm_mm, addr); ++ mm = vma->vm_mm; ++ pmd = mm_find_pmd(mm, addr); + if (!pmd) + continue; + /* +@@ -1273,14 +1275,16 @@ static void retract_page_tables(struct a + * re-fault. Not ideal, but it's more important to not disturb + * the system too much. + */ +- if (down_write_trylock(&vma->vm_mm->mmap_sem)) { +- spinlock_t *ptl = pmd_lock(vma->vm_mm, pmd); +- /* assume page table is clear */ +- _pmd = pmdp_collapse_flush(vma, addr, pmd); +- spin_unlock(ptl); +- up_write(&vma->vm_mm->mmap_sem); +- mm_dec_nr_ptes(vma->vm_mm); +- pte_free(vma->vm_mm, pmd_pgtable(_pmd)); ++ if (down_write_trylock(&mm->mmap_sem)) { ++ if (!khugepaged_test_exit(mm)) { ++ spinlock_t *ptl = pmd_lock(mm, pmd); ++ /* assume page table is clear */ ++ _pmd = pmdp_collapse_flush(vma, addr, pmd); ++ spin_unlock(ptl); ++ mm_dec_nr_ptes(mm); ++ pte_free(mm, pmd_pgtable(_pmd)); ++ } ++ up_write(&mm->mmap_sem); + } + } + i_mmap_unlock_write(mapping); diff --git a/queue-4.19/series b/queue-4.19/series index db5d5fecab2..76312511f3c 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -85,3 +85,8 @@ alsa-echoaudio-fix-potential-oops-in-snd_echo_resume.patch perf-bench-mem-always-memset-source-before-memcpy.patch tools-build-feature-quote-cc-and-cxx-for-their-argum.patch sh-landisk-add-missing-initialization-of-sh_io_port_.patch +khugepaged-retract_page_tables-remember-to-test-exit.patch +arm64-dts-marvell-espressobin-add-ethernet-alias.patch +drm-radeon-fix-fb_div-check-in-ni_init_smc_spll_table.patch +drm-added-orientation-quirk-for-asus-tablet-model-t103haf.patch +drm-amdgpu-fix-bug-where-dpm-is-not-enabled-after-hibernate-and-resume.patch -- 2.47.3