| Message ID | 1491301105-5274-13-git-send-email-sricharan@codeaurora.org (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
On 04/04/17 11:18, Sricharan R wrote: > From: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> > > The IORT linker section introduced by commit 34ceea275f62 > ("ACPI/IORT: Introduce linker section for IORT entries probing") > was needed to make sure SMMU drivers are registered (and therefore > probed) in the kernel before devices using the SMMU have a chance > to probe in turn. > > Through the introduction of deferred IOMMU configuration the linker > section based IORT probing infrastructure is not needed any longer, in > that device/SMMU probe dependencies are managed through the probe > deferral mechanism, making the IORT linker section infrastructure > unused, so that it can be removed. > > Remove the unused IORT linker section probing infrastructure > from the kernel to complete the ACPI IORT IOMMU configure probe > deferral mechanism implementation. Reviewed-by: Robin Murphy <robin.murphy@arm.com> > Tested-by: Hanjun Guo <hanjun.guo@linaro.org> > Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> > Cc: Robin Murphy <robin.murphy@arm.com> > Cc: Sricharan R <sricharan@codeaurora.org> > --- > drivers/acpi/arm64/iort.c | 2 -- > include/asm-generic/vmlinux.lds.h | 1 - > include/linux/acpi_iort.h | 3 --- > 3 files changed, 6 deletions(-) > > diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c > index e323ece..e7b1940 100644 > --- a/drivers/acpi/arm64/iort.c > +++ b/drivers/acpi/arm64/iort.c > @@ -1000,6 +1000,4 @@ void __init acpi_iort_init(void) > } > > iort_init_platform_devices(); > - > - acpi_probe_device_table(iort); > } > diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h > index 0968d13..9faa26c 100644 > --- a/include/asm-generic/vmlinux.lds.h > +++ b/include/asm-generic/vmlinux.lds.h > @@ -566,7 +566,6 @@ > IRQCHIP_OF_MATCH_TABLE() \ > ACPI_PROBE_TABLE(irqchip) \ > ACPI_PROBE_TABLE(clksrc) \ > - ACPI_PROBE_TABLE(iort) \ > EARLYCON_TABLE() > > #define INIT_TEXT \ > diff --git a/include/linux/acpi_iort.h b/include/linux/acpi_iort.h > index 77e0809..f167e1d04 100644 > --- a/include/linux/acpi_iort.h > +++ b/include/linux/acpi_iort.h > @@ -52,7 +52,4 @@ const struct iommu_ops *iort_iommu_configure(struct device *dev) > { return NULL; } > #endif > > -#define IORT_ACPI_DECLARE(name, table_id, fn) \ > - ACPI_DECLARE_PROBE_ENTRY(iort, name, table_id, 0, NULL, 0, fn) > - > #endif /* __ACPI_IORT_H__ */ >
diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c index e323ece..e7b1940 100644 --- a/drivers/acpi/arm64/iort.c +++ b/drivers/acpi/arm64/iort.c @@ -1000,6 +1000,4 @@ void __init acpi_iort_init(void) } iort_init_platform_devices(); - - acpi_probe_device_table(iort); } diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 0968d13..9faa26c 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -566,7 +566,6 @@ IRQCHIP_OF_MATCH_TABLE() \ ACPI_PROBE_TABLE(irqchip) \ ACPI_PROBE_TABLE(clksrc) \ - ACPI_PROBE_TABLE(iort) \ EARLYCON_TABLE() #define INIT_TEXT \ diff --git a/include/linux/acpi_iort.h b/include/linux/acpi_iort.h index 77e0809..f167e1d04 100644 --- a/include/linux/acpi_iort.h +++ b/include/linux/acpi_iort.h @@ -52,7 +52,4 @@ const struct iommu_ops *iort_iommu_configure(struct device *dev) { return NULL; } #endif -#define IORT_ACPI_DECLARE(name, table_id, fn) \ - ACPI_DECLARE_PROBE_ENTRY(iort, name, table_id, 0, NULL, 0, fn) - #endif /* __ACPI_IORT_H__ */