Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5261b31 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman
Browse files

dmaengine: acpi: Avoid comparison GSI with Linux vIRQ 



commit 67db87dc8284070adb15b3c02c1c31d5cf51c5d6 upstream.

Currently the CRST parsing relies on the fact that on most of x86 devices
the IRQ mapping is 1:1 with Linux vIRQ. However, it may be not true for
some. Fix this by converting GSI to Linux vIRQ before checking it.

Fixes: ee8209fd ("dma: acpi-dma: parse CSRT to extract additional resources")
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20210730202715.24375-1-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4d2de0d2

drivers/dma/acpi-dma.c

+7 −3
Original line number Original line Diff line number Diff line
@@ -72,10 +72,14 @@ static int acpi_dma_parse_resource_group(const struct acpi_csrt_group *grp, 




	si = (const struct acpi_csrt_shared_info *)&grp[1];

	si = (const struct acpi_csrt_shared_info *)&grp[1];





	/* Match device by MMIO and IRQ */

	/* Match device by MMIO */

	if (si->mmio_base_low != lower_32_bits(mem) ||

	if (si->mmio_base_low != lower_32_bits(mem) ||

	    si->mmio_base_high != upper_32_bits(mem) ||

	    si->mmio_base_high != upper_32_bits(mem))

	    si->gsi_interrupt != irq)

		return 0;



	/* Match device by Linux vIRQ */

	ret = acpi_register_gsi(NULL, si->gsi_interrupt, si->interrupt_mode, si->interrupt_polarity);

	if (ret != irq)

		return 0;

		return 0;





	dev_dbg(&adev->dev, "matches with %.4s%04X (rev %u)\n",

	dev_dbg(&adev->dev, "matches with %.4s%04X (rev %u)\n",