From 1035dcf6dbe8910cd09e39c953194e06ec195603 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 31 Aug 2023 12:33:05 +0200 Subject: [PATCH] 5.10-stable patches added patches: mhi-pci_generic-fix-implicit-conversion-warning.patch revert-drm-amdgpu-install-stub-fence-into-potential-unused-fence-pointers.patch revert-mips-alchemy-fix-dbdma2.patch --- ...eric-fix-implicit-conversion-warning.patch | 38 +++++++++ ...into-potential-unused-fence-pointers.patch | 56 +++++++++++++ .../revert-mips-alchemy-fix-dbdma2.patch | 82 +++++++++++++++++++ queue-5.10/series | 3 + 4 files changed, 179 insertions(+) create mode 100644 queue-5.10/mhi-pci_generic-fix-implicit-conversion-warning.patch create mode 100644 queue-5.10/revert-drm-amdgpu-install-stub-fence-into-potential-unused-fence-pointers.patch create mode 100644 queue-5.10/revert-mips-alchemy-fix-dbdma2.patch diff --git a/queue-5.10/mhi-pci_generic-fix-implicit-conversion-warning.patch b/queue-5.10/mhi-pci_generic-fix-implicit-conversion-warning.patch new file mode 100644 index 00000000000..6535a5c4296 --- /dev/null +++ b/queue-5.10/mhi-pci_generic-fix-implicit-conversion-warning.patch @@ -0,0 +1,38 @@ +From 4ea6fa2cb921cb17812501a27c3761037d64a217 Mon Sep 17 00:00:00 2001 +From: Loic Poulain +Date: Wed, 2 Dec 2020 09:12:30 +0100 +Subject: mhi: pci_generic: Fix implicit conversion warning + +From: Loic Poulain + +commit 4ea6fa2cb921cb17812501a27c3761037d64a217 upstream. + +Fix the following warning with explicit cast: + +warning: implicit conversion from 'unsigned long long' to +'dma_addr_t' (aka 'unsigned int') +mhi_cntrl->iova_stop = DMA_BIT_MASK(info->dma_data_width); + +Fixes: 855a70c12021 ("bus: mhi: Add MHI PCI support for WWAN modems") +Signed-off-by: Loic Poulain +Reported-by: kernel test robot +Reviewed-by: Nathan Chancellor +Reviewed-by: Manivannan Sadhasivam +Signed-off-by: Manivannan Sadhasivam +Cc: Guenter Roeck +Signed-off-by: Greg Kroah-Hartman +--- + drivers/bus/mhi/host/pci_generic.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/bus/mhi/host/pci_generic.c ++++ b/drivers/bus/mhi/host/pci_generic.c +@@ -273,7 +273,7 @@ static int mhi_pci_probe(struct pci_dev + mhi_cntrl_config = info->config; + mhi_cntrl->cntrl_dev = &pdev->dev; + mhi_cntrl->iova_start = 0; +- mhi_cntrl->iova_stop = DMA_BIT_MASK(info->dma_data_width); ++ mhi_cntrl->iova_stop = (dma_addr_t)DMA_BIT_MASK(info->dma_data_width); + mhi_cntrl->fw_image = info->fw; + mhi_cntrl->edl_image = info->edl; + diff --git a/queue-5.10/revert-drm-amdgpu-install-stub-fence-into-potential-unused-fence-pointers.patch b/queue-5.10/revert-drm-amdgpu-install-stub-fence-into-potential-unused-fence-pointers.patch new file mode 100644 index 00000000000..32c0d55c282 --- /dev/null +++ b/queue-5.10/revert-drm-amdgpu-install-stub-fence-into-potential-unused-fence-pointers.patch @@ -0,0 +1,56 @@ +From e0b68aa6dbb170585111e0565669ae7eed15bc07 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +Date: Thu, 31 Aug 2023 12:27:47 +0200 +Subject: Revert "drm/amdgpu: install stub fence into potential unused fence pointers" + +From: Greg Kroah-Hartman + +This reverts commit 04bd3a362d2f1788272776bd8b10e5a012e69b77 which is +commit 187916e6ed9d0c3b3abc27429f7a5f8c936bd1f0 upstream. + +It is reported to cause lots of log spam, so it should be dropped for +now. + +Reported-by: Guenter Roeck +Link: https://lore.kernel.org/r/27d08b24-3581-4451-b8db-5df144784d6a@roeck-us.net +Reported-by: From: Chia-I Wu +Link: https://lore.kernel.org/r/CAPaKu7RTgAMBLHbwtp4zgiBSDrTFtAj07k5qMzkuLQy2Zr+sZA@mail.gmail.com +Cc: Christian König +Cc: Lang Yu +Cc: Alex Deucher +Cc: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +@@ -2155,7 +2155,6 @@ struct amdgpu_bo_va *amdgpu_vm_bo_add(st + amdgpu_vm_bo_base_init(&bo_va->base, vm, bo); + + bo_va->ref_count = 1; +- bo_va->last_pt_update = dma_fence_get_stub(); + INIT_LIST_HEAD(&bo_va->valids); + INIT_LIST_HEAD(&bo_va->invalids); + +@@ -2868,8 +2867,7 @@ int amdgpu_vm_init(struct amdgpu_device + vm->update_funcs = &amdgpu_vm_cpu_funcs; + else + vm->update_funcs = &amdgpu_vm_sdma_funcs; +- +- vm->last_update = dma_fence_get_stub(); ++ vm->last_update = NULL; + vm->last_unlocked = dma_fence_get_stub(); + + mutex_init(&vm->eviction_lock); +@@ -3044,7 +3042,7 @@ int amdgpu_vm_make_compute(struct amdgpu + vm->update_funcs = &amdgpu_vm_sdma_funcs; + } + dma_fence_put(vm->last_update); +- vm->last_update = dma_fence_get_stub(); ++ vm->last_update = NULL; + vm->is_compute_context = true; + + if (vm->pasid) { diff --git a/queue-5.10/revert-mips-alchemy-fix-dbdma2.patch b/queue-5.10/revert-mips-alchemy-fix-dbdma2.patch new file mode 100644 index 00000000000..10558f03ac5 --- /dev/null +++ b/queue-5.10/revert-mips-alchemy-fix-dbdma2.patch @@ -0,0 +1,82 @@ +From 1a4039bdcf972a7d2e469bb1a5ea616c4c2216fb Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +Date: Thu, 31 Aug 2023 12:30:23 +0200 +Subject: Revert "MIPS: Alchemy: fix dbdma2" + +From: Greg Kroah-Hartman + +This reverts commit 619672bf2d04cdc1bc3925defd0312c2ef11e5d0 which is +commit 2d645604f69f3a772d58ead702f9a8e84ab2b342 upstream. + +It breaks the build, so should be dropped. + +Reported-by: Guenter Roeck +Link: https://lore.kernel.org/r/5b30ff73-46cb-1d1e-3823-f175dbfbd91b@roeck-us.net +Cc: Thomas Bogendoerfer +Cc: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Greg Kroah-Hartman +--- + arch/mips/alchemy/common/dbdma.c | 27 ++++++++++++--------------- + 1 file changed, 12 insertions(+), 15 deletions(-) + +--- a/arch/mips/alchemy/common/dbdma.c ++++ b/arch/mips/alchemy/common/dbdma.c +@@ -30,7 +30,6 @@ + * + */ + +-#include /* for dma_default_coherent */ + #include + #include + #include +@@ -624,18 +623,17 @@ u32 au1xxx_dbdma_put_source(u32 chanid, + dp->dscr_cmd0 &= ~DSCR_CMD0_IE; + + /* +- * There is an erratum on certain Au1200/Au1550 revisions that could +- * result in "stale" data being DMA'ed. It has to do with the snoop +- * logic on the cache eviction buffer. dma_default_coherent is set +- * to false on these parts. ++ * There is an errata on the Au1200/Au1550 parts that could result ++ * in "stale" data being DMA'ed. It has to do with the snoop logic on ++ * the cache eviction buffer. DMA_NONCOHERENT is on by default for ++ * these parts. If it is fixed in the future, these dma_cache_inv will ++ * just be nothing more than empty macros. See io.h. + */ +- if (!dma_default_coherent) +- dma_cache_wback_inv(KSEG0ADDR(buf), nbytes); ++ dma_cache_wback_inv((unsigned long)buf, nbytes); + dp->dscr_cmd0 |= DSCR_CMD0_V; /* Let it rip */ + wmb(); /* drain writebuffer */ + dma_cache_wback_inv((unsigned long)dp, sizeof(*dp)); + ctp->chan_ptr->ddma_dbell = 0; +- wmb(); /* force doorbell write out to dma engine */ + + /* Get next descriptor pointer. */ + ctp->put_ptr = phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr)); +@@ -687,18 +685,17 @@ u32 au1xxx_dbdma_put_dest(u32 chanid, dm + dp->dscr_source1, dp->dscr_dest0, dp->dscr_dest1); + #endif + /* +- * There is an erratum on certain Au1200/Au1550 revisions that could +- * result in "stale" data being DMA'ed. It has to do with the snoop +- * logic on the cache eviction buffer. dma_default_coherent is set +- * to false on these parts. ++ * There is an errata on the Au1200/Au1550 parts that could result in ++ * "stale" data being DMA'ed. It has to do with the snoop logic on the ++ * cache eviction buffer. DMA_NONCOHERENT is on by default for these ++ * parts. If it is fixed in the future, these dma_cache_inv will just ++ * be nothing more than empty macros. See io.h. + */ +- if (!dma_default_coherent) +- dma_cache_inv(KSEG0ADDR(buf), nbytes); ++ dma_cache_inv((unsigned long)buf, nbytes); + dp->dscr_cmd0 |= DSCR_CMD0_V; /* Let it rip */ + wmb(); /* drain writebuffer */ + dma_cache_wback_inv((unsigned long)dp, sizeof(*dp)); + ctp->chan_ptr->ddma_dbell = 0; +- wmb(); /* force doorbell write out to dma engine */ + + /* Get next descriptor pointer. */ + ctp->put_ptr = phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr)); diff --git a/queue-5.10/series b/queue-5.10/series index 99968740a4a..0c5e0c481ca 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -2,3 +2,6 @@ module-expose-module_init_layout_section.patch arm64-module-plts-inline-linux-moduleloader.h.patch arm64-module-use-module_init_layout_section-to-spot-init-sections.patch arm-module-use-module_init_layout_section-to-spot-init-sections.patch +mhi-pci_generic-fix-implicit-conversion-warning.patch +revert-drm-amdgpu-install-stub-fence-into-potential-unused-fence-pointers.patch +revert-mips-alchemy-fix-dbdma2.patch -- 2.47.3