ALSA: hda/intel: Make MSI address limit based on the device DMA limit

The hda/intel driver restricts the MSI message address for devices which do
not advertise full 64-bit DMA address space support to 32-bit due to the
former restrictions of the PCI/MSI code which only allowed either 32-bit or
a full 64-bit address range.

This does not work on platforms which have a MSI doorbell address above the
32-bit boundary but do not support the full 64 bit address range.

The PCI/MSI core converted this binary decision to a DMA_BIT_MASK() based
decision, which allows to describe the device limitations precisely.

Convert the driver to provide the exact DMA address limitations to the
PCI/MSI core. That allows devices which do not support the full 64-bit
address space to work on platforms which have a MSI doorbell address above
the 32-bit limit as long as it is within the hardware's addressable range.

[ tglx: Massage changelog ]

Signed-off-by: Vivian Wang <wangruikang@iscas.ac.cn>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Acked-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20260129-pci-msi-addr-mask-v4-4-70da998f2750@iscas.ac.cn

diff --git a/sound/hda/controllers/intel.c b/sound/hda/controllers/intel.c
index c9542ebdf7e2b7eb0ae13b5246e9c57c500f9747..a44de2306a2b718ec540f10c6298f5629f82d860 100644 (file)
--- a/sound/hda/controllers/intel.c
+++ b/sound/hda/controllers/intel.c
@@ -1903,11 +1903,6 @@ static int azx_first_init(struct azx *chip)
                chip->gts_present = true;
 #endif
 
-       if (chip->msi && chip->driver_caps & AZX_DCAPS_NO_MSI64) {
-               dev_dbg(card->dev, "Disabling 64bit MSI\n");
-               pci->msi_addr_mask = DMA_BIT_MASK(32);
-       }
-
        pci_set_master(pci);
 
        gcap = azx_readw(chip, GCAP);
@@ -1958,6 +1953,11 @@ static int azx_first_init(struct azx *chip)
                dma_set_mask_and_coherent(&pci->dev, DMA_BIT_MASK(32));
        dma_set_max_seg_size(&pci->dev, UINT_MAX);
 
+       if (chip->msi && chip->driver_caps & AZX_DCAPS_NO_MSI64) {
+               dev_dbg(card->dev, "Restricting MSI to %u-bit\n", dma_bits);
+               pci->msi_addr_mask = DMA_BIT_MASK(dma_bits);
+       }
+
        /* read number of streams from GCAP register instead of using
         * hardcoded value
         */