This is a note to let you know that I've just added the patch titled
um: Use asm-generic/dma-mapping.h
to the 5.17-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
um-use-asm-generic-dma-mapping.h.patch
and it can be found in the queue-5.17 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 365719035526e8eda214a1cedb2e1c96e969a0d7 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Mon, 28 Mar 2022 09:46:25 +0200
Subject: um: Use asm-generic/dma-mapping.h
From: Johannes Berg <johannes.berg@xxxxxxxxx>
commit 365719035526e8eda214a1cedb2e1c96e969a0d7 upstream.
If DMA (PCI over virtio) is enabled, then some drivers may
enable CONFIG_DMA_OPS as well, and then we pull in the x86
definition of get_arch_dma_ops(), which uses the dma_ops
symbol, which isn't defined.
Since we don't have real DMA ops nor any kind of IOMMU fix
this in the simplest possible way: pull in the asm-generic
file instead of inheriting the x86 one. It's not clear why
those drivers that do (e.g. VDPA) "select DMA_OPS", and if
they'd even work with this, but chances are nobody will be
wanting to do that anyway, so fixing the build failure is
good enough.
Reported-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
Fixes: 68f5d3f3b654 ("um: add PCI over virtio emulation driver")
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Tested-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
Acked-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Richard Weinberger <richard@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/um/include/asm/Kbuild | 1 +
1 file changed, 1 insertion(+)
--- a/arch/um/include/asm/Kbuild
+++ b/arch/um/include/asm/Kbuild
@@ -4,6 +4,7 @@ generic-y += bug.h
generic-y += compat.h
generic-y += current.h
generic-y += device.h
+generic-y += dma-mapping.h
generic-y += emergency-restart.h
generic-y += exec.h
generic-y += extable.h
Patches currently in stable-queue which might be from johannes.berg@xxxxxxxxx are
queue-5.17/iwlwifi-mei-fix-potential-null-ptr-deref.patch
queue-5.17/mac80211-upgrade-passive-scan-to-active-scan-on-dfs-channels-after-beacon-rx.patch
queue-5.17/wifi-mac80211-fix-use-after-free-in-chanctx-code.patch
queue-5.17/nl80211-show-ssid-for-p2p_go-interfaces.patch
queue-5.17/iwlwifi-mvm-fix-assert-1f04-upon-reconfig.patch
queue-5.17/nl80211-don-t-hold-rtnl-in-color-change-request.patch
queue-5.17/iwlwifi-mei-clear-the-sap-data-header-before-sending.patch
queue-5.17/cfg80211-declare-module_firmware-for-regulatory.db.patch
queue-5.17/mac80211-minstrel_ht-fix-where-rate-stats-are-stored.patch
queue-5.17/um-chan_user-fix-winch_tramp-return-value.patch
queue-5.17/iwlwifi-fw-init-sar-geo-table-only-if-data-is-present.patch
queue-5.17/um-virtio_uml-fix-broken-device-handling-in-time-travel.patch
queue-5.17/um-use-asm-generic-dma-mapping.h.patch
