From: Takashi Iwai <tiwai@xxxxxxx> commit 3f7f36a4559ef78a6418c5f0447fbfbdcf671956 upstream. This reverts commit 478689b5990deb626a0b3f1ebf165979914d6be4. The fix seems leading to regressions for other systems. Also, the way to check the presence of IOMMU via get_dma_ops() isn't reliable and it's no longer applicable for 6.12. After all, it's no right fix, so let's revert it at first. To be noted, the PCM buffer allocation has been changed to try the continuous pages at first since 6.12, so the problem could be already addressed without this hackish workaround. Reported-by: Salvatore Bonaccorso <carnil@xxxxxxxxxx> Closes: https://lore.kernel.org/ZvgCdYfKgwHpJXGE@xxxxxxxxxxx Link: https://patch.msgid.link/20241002155948.4859-1-tiwai@xxxxxxx Signed-off-by: Takashi Iwai <tiwai@xxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- sound/pci/hda/hda_controller.h | 2 +- sound/pci/hda/hda_intel.c | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) --- a/sound/pci/hda/hda_controller.h +++ b/sound/pci/hda/hda_controller.h @@ -28,7 +28,7 @@ #else #define AZX_DCAPS_I915_COMPONENT 0 /* NOP */ #endif -#define AZX_DCAPS_AMD_ALLOC_FIX (1 << 14) /* AMD allocation workaround */ +/* 14 unused */ #define AZX_DCAPS_CTX_WORKAROUND (1 << 15) /* X-Fi workaround */ #define AZX_DCAPS_POSFIX_LPIB (1 << 16) /* Use LPIB as default */ #define AZX_DCAPS_AMD_WORKAROUND (1 << 17) /* AMD-specific workaround */ --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -40,7 +40,6 @@ #ifdef CONFIG_X86 /* for snoop control */ -#include <linux/dma-map-ops.h> #include <asm/set_memory.h> #include <asm/cpufeature.h> #endif @@ -301,7 +300,7 @@ enum { /* quirks for ATI HDMI with snoop off */ #define AZX_DCAPS_PRESET_ATI_HDMI_NS \ - (AZX_DCAPS_PRESET_ATI_HDMI | AZX_DCAPS_AMD_ALLOC_FIX) + (AZX_DCAPS_PRESET_ATI_HDMI | AZX_DCAPS_SNOOP_OFF) /* quirks for AMD SB */ #define AZX_DCAPS_PRESET_AMD_SB \ @@ -1719,13 +1718,6 @@ static void azx_check_snoop_available(st if (chip->driver_caps & AZX_DCAPS_SNOOP_OFF) snoop = false; -#ifdef CONFIG_X86 - /* check the presence of DMA ops (i.e. IOMMU), disable snoop conditionally */ - if ((chip->driver_caps & AZX_DCAPS_AMD_ALLOC_FIX) && - !get_dma_ops(chip->card->dev)) - snoop = false; -#endif - chip->snoop = snoop; if (!snoop) { dev_info(chip->card->dev, "Force to non-snoop mode\n"); Patches currently in stable-queue which might be from tiwai@xxxxxxx are queue-6.1/alsa-mixer_oss-remove-some-incorrect-kfree_const-usa.patch queue-6.1/alsa-hda-generic-unconditionally-prefer-preferred_da.patch queue-6.1/alsa-usb-audio-add-logitech-audio-profile-quirk.patch queue-6.1/alsa-asihpi-fix-potential-oob-array-access.patch queue-6.1/alsa-hda-realtek-fix-the-push-button-function-for-th.patch queue-6.1/alsa-hda-cs35l41-fix-module-autoloading.patch queue-6.1/alsa-usb-audio-support-multiple-control-interfaces.patch queue-6.1/revert-alsa-hda-conditionally-use-snooping-for-amd-hdmi.patch queue-6.1/alsa-hda-conexant-fix-conflicting-quirk-for-system76.patch queue-6.1/alsa-hdsp-break-infinite-midi-input-flush-loop.patch queue-6.1/alsa-usb-audio-replace-complex-quirk-lines-with-macr.patch queue-6.1/alsa-usb-audio-define-macros-for-quirk-table-entries.patch queue-6.1/alsa-usb-audio-add-input-value-sanity-checks-for-sta.patch
