Re: [PATCH v3] iommu/arm-smmu-qcom: hook up qcom_smmu_impl for ACPI boot

[Robin Murphy <robin.murphy@xxxxxxx>]

On 2021-05-23 07:05, Shawn Guo wrote:
> On Sun, May 09, 2021 at 10:26:07AM +0800, Shawn Guo wrote:
> > The hookup with qcom_smmu_impl is required to do ACPI boot on SC8180X
> > based devices like Lenovo Flex 5G laptop and Microsoft Surface Pro X.
> > Define acpi_platform_list for these platforms and match them using
> > acpi_match_platform_list() call, and create qcom_smmu_impl accordingly.
> >
> > (np == NULL) is used to check ACPI boot, because fwnode of SMMU device
> > is a static allocation and thus helpers like has_acpi_companion() don't
> > work here.
> >
> > Signed-off-by: Shawn Guo <shawn.guo@xxxxxxxxxx>
> > ---
> > Changes for v3:
> >   - Call acpi_match_platform_list() to match platform in qcom smmu
> >     driver rather than IORT code.
>
> Hi Robin,
>
> How does this version look?

So good that I glanced at it, thought "nice!", then having no remaining 
concerns promptly moved on to something else forgot about it. Sorry 
about that!

Reviewed-by: Robin Murphy <robin.murphy@xxxxxxx>

Cheers,
Robin.

> Shawn
>
> > Changes for v2:
> >   - Rather than using asl_compiler_id in IORT table, follow suggestion
> >     from Robin Murphy to use acpi_match_platform_list() to match platform.
> >
> >   drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 13 +++++++++++++
> >   1 file changed, 13 insertions(+)
> >
> > diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
> > index 98b3a1c2a181..f7e187f3fa66 100644
> > --- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
> > +++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
> > @@ -3,6 +3,7 @@
> >    * Copyright (c) 2019, The Linux Foundation. All rights reserved.
> >    */
> >   
> > +#include <linux/acpi.h>
> >   #include <linux/adreno-smmu-priv.h>
> >   #include <linux/of_device.h>
> >   #include <linux/qcom_scm.h>
> > @@ -339,10 +340,22 @@ static const struct of_device_id __maybe_unused qcom_smmu_impl_of_match[] = {
> >   	{ }
> >   };
> >   
> > +static struct acpi_platform_list qcom_acpi_platlist[] = {
> > +	{ "LENOVO", "CB-01   ", 0x8180, ACPI_SIG_IORT, equal, "QCOM SMMU" },
> > +	{ "QCOM  ", "QCOMEDK2", 0x8180, ACPI_SIG_IORT, equal, "QCOM SMMU" },
> > +	{ }
> > +};
> > +
> >   struct arm_smmu_device *qcom_smmu_impl_init(struct arm_smmu_device *smmu)
> >   {
> >   	const struct device_node *np = smmu->dev->of_node;
> >   
> > +	if (np == NULL) {
> > +		/* Match platform for ACPI boot */
> > +		if (acpi_match_platform_list(qcom_acpi_platlist) >= 0)
> > +			return qcom_smmu_create(smmu, &qcom_smmu_impl);
> > +	}
> > +
> >   	if (of_match_node(qcom_smmu_impl_of_match, np))
> >   		return qcom_smmu_create(smmu, &qcom_smmu_impl);
> >   
> > --
> > 2.17.1