Skip to content

Commit cbf4fbc

Browse files
vlsuniljoergroedel
authored andcommitted
ACPI: scan: Add support for RISC-V in acpi_iommu_configure_id()
acpi_iommu_configure_id() currently supports only IORT (ARM) and VIOT. Add support for RISC-V as well. Signed-off-by: Sunil V L <[email protected]> Acked-by: Rafael J. Wysocki <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Joerg Roedel <[email protected]>
1 parent 8f77295 commit cbf4fbc

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

drivers/acpi/scan.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include <linux/kernel.h>
1212
#include <linux/acpi.h>
1313
#include <linux/acpi_iort.h>
14+
#include <linux/acpi_rimt.h>
1415
#include <linux/acpi_viot.h>
1516
#include <linux/iommu.h>
1617
#include <linux/signal.h>
@@ -1628,8 +1629,11 @@ static int acpi_iommu_configure_id(struct device *dev, const u32 *id_in)
16281629
}
16291630

16301631
err = iort_iommu_configure_id(dev, id_in);
1632+
if (err && err != -EPROBE_DEFER)
1633+
err = rimt_iommu_configure_id(dev, id_in);
16311634
if (err && err != -EPROBE_DEFER)
16321635
err = viot_iommu_configure(dev);
1636+
16331637
mutex_unlock(&iommu_probe_device_lock);
16341638

16351639
return err;

0 commit comments

Comments
 (0)