Skip to content

Commit 34ceea2

Browse files
Lorenzo Pieralisiwildea01
authored andcommitted
ACPI/IORT: Introduce linker section for IORT entries probing
Since commit e647b53 ("ACPI: Add early device probing infrastructure") the kernel has gained the infrastructure that allows adding linker script section entries to execute ACPI driver callbacks (ie probe routines) for all subsystems that register a table entry in the respective kernel section (eg clocksource, irqchip). Since ARM IOMMU devices data is described through IORT tables when booting with ACPI, the ARM IOMMU drivers must be made able to hook ACPI callback routines that are called to probe IORT entries and initialize the respective IOMMU devices. To avoid adding driver specific hooks into IORT table initialization code (breaking therefore code modularity - ie ACPI IORT code must be made aware of ARM SMMU drivers ACPI init callbacks), this patch adds code that allows ARM SMMU drivers to take advantage of the ACPI early probing infrastructure, so that they can add linker script section entries containing drivers callback to be executed on IORT tables detection. Since IORT nodes are differentiated by a type, the callback routines can easily parse the IORT table entries, check the IORT nodes and carry out some actions whenever the IORT node type associated with the driver specific callback is matched. Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Reviewed-by: Hanjun Guo <hanjun.guo@linaro.org> Reviewed-by: Tomasz Nowicki <tn@semihalf.com> Tested-by: Hanjun Guo <hanjun.guo@linaro.org> Tested-by: Tomasz Nowicki <tn@semihalf.com> Cc: Tomasz Nowicki <tn@semihalf.com> Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net> Cc: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
1 parent 027b25b commit 34ceea2

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

drivers/acpi/arm64/iort.c

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -361,8 +361,15 @@ void __init acpi_iort_init(void)
361361
acpi_status status;
362362

363363
status = acpi_get_table(ACPI_SIG_IORT, 0, &iort_table);
364-
if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
365-
const char *msg = acpi_format_exception(status);
366-
pr_err("Failed to get table, %s\n", msg);
364+
if (ACPI_FAILURE(status)) {
365+
if (status != AE_NOT_FOUND) {
366+
const char *msg = acpi_format_exception(status);
367+
368+
pr_err("Failed to get table, %s\n", msg);
369+
}
370+
371+
return;
367372
}
373+
374+
acpi_probe_device_table(iort);
368375
}

include/asm-generic/vmlinux.lds.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -566,6 +566,7 @@
566566
IRQCHIP_OF_MATCH_TABLE() \
567567
ACPI_PROBE_TABLE(irqchip) \
568568
ACPI_PROBE_TABLE(clksrc) \
569+
ACPI_PROBE_TABLE(iort) \
569570
EARLYCON_TABLE()
570571

571572
#define INIT_TEXT \

include/linux/acpi_iort.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,7 @@ static inline struct irq_domain *iort_get_device_domain(struct device *dev,
3939
{ return NULL; }
4040
#endif
4141

42+
#define IORT_ACPI_DECLARE(name, table_id, fn) \
43+
ACPI_DECLARE_PROBE_ENTRY(iort, name, table_id, 0, NULL, 0, fn)
44+
4245
#endif /* __ACPI_IORT_H__ */

0 commit comments

Comments
 (0)