[PATCH] ACPI/IORT: Remove obsolete ACPI_IORT_SMMU_V3_CAVIUM_CN99XX define

Lorenzo Pieralisi lorenzo.pieralisi at arm.com
Wed Feb 28 08:53:05 PST 2018


On Wed, Feb 28, 2018 at 04:35:17PM +0000, Robin Murphy wrote:
> Hi Lorenzo,
> 
> On 28/02/18 16:24, Lorenzo Pieralisi wrote:
> >To defeat ACPICA<->kernel merge order dependencies a preprocessor define
> >value was introduced in the IORT compilation unit according to IORT
> >revision C, IORT_SMMU_V3_CAVIUM_CN99XX, so that even if the value was
> >not defined in ACPICA headers the IORT kernel layer would still be able
> >to function and use it.
> >
> >Since commit 0c2021c047ba ("ACPICA: IORT: Update SMMU models for
> >revision C") finally added the define in ACPICA headers, as required by
> >ACPICA IORT support, the preprocessor definition in the IORT kernel
> >compilation unit has become obsolete and can be removed.
> 
> Can the version check around iort_get_id_mapping_index() go as well?

https://marc.info/?l=linux-acpi&m=151817852003174&w=2

Gone :) (just did two patches since they were part of different
changes), I will batch them up and send them in a pull request for
v4.17.

Thanks,
Lorenzo

> 
> Robin.
> 
> >Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi at arm.com>
> >Cc: Will Deacon <will.deacon at arm.com>
> >Cc: Hanjun Guo <hanjun.guo at linaro.org>
> >Cc: Sudeep Holla <sudeep.holla at arm.com>
> >Cc: Catalin Marinas <catalin.marinas at arm.com>
> >Cc: Robin Murphy <robin.murphy at arm.com>
> >Cc: "Rafael J. Wysocki" <rjw at rjwysocki.net>
> >---
> >  drivers/acpi/arm64/iort.c | 5 -----
> >  1 file changed, 5 deletions(-)
> >
> >diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c
> >index 95255ecfae7c..c87b17ea03b7 100644
> >--- a/drivers/acpi/arm64/iort.c
> >+++ b/drivers/acpi/arm64/iort.c
> >@@ -31,11 +31,6 @@
> >  #define IORT_IOMMU_TYPE		((1 << ACPI_IORT_NODE_SMMU) |	\
> >  				(1 << ACPI_IORT_NODE_SMMU_V3))
> >-/* Until ACPICA headers cover IORT rev. C */
> >-#ifndef ACPI_IORT_SMMU_V3_CAVIUM_CN99XX
> >-#define ACPI_IORT_SMMU_V3_CAVIUM_CN99XX		0x2
> >-#endif
> >-
> >  struct iort_its_msi_chip {
> >  	struct list_head	list;
> >  	struct fwnode_handle	*fw_node;
> >



More information about the linux-arm-kernel mailing list