Received-SPF: pass (google.com: domain of linux-kernel+bounces-153692-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Precedence: bulk
MIME-Version: 1.0
References: <cover.1713523251.git.robin.murphy@arm.com> <3ae004dfc581fa12fc9432c5008f1225882d5464.1713523251.git.robin.murphy@arm.com>
In-Reply-To: <3ae004dfc581fa12fc9432c5008f1225882d5464.1713523251.git.robin.murphy@arm.com>
From: "Rafael J. Wysocki" <rafael@kernel.org>
Date: Mon, 22 Apr 2024 18:18:27 +0200
Message-ID: <CAJZ5v0iMY1eKYgcH20Uxd1nW0yZ2xt980ob0Rcb_4n4OONWSZA@mail.gmail.com>
Subject: Re: [PATCH 2/4] ACPI: Retire acpi_iommu_fwspec_ops()
To: Robin Murphy <robin.murphy@arm.com>
Cc: Will Deacon <will@kernel.org>, Joerg Roedel <joro@8bytes.org>, linux-acpi@vger.kernel.org, 
	linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, 
	iommu@lists.linux.dev, devicetree@vger.kernel.org, 
	Rob Herring <robh@kernel.org>, Saravana Kannan <saravanak@google.com>, 
	Lorenzo Pieralisi <lpieralisi@kernel.org>, Hanjun Guo <guohanjun@huawei.com>, 
	Sudeep Holla <sudeep.holla@arm.com>, "Rafael J. Wysocki" <rafael@kernel.org>, Len Brown <lenb@kernel.org>, 
	Jean-Philippe Brucker <jean-philippe@linaro.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Fri, Apr 19, 2024 at 6:56=E2=80=AFPM Robin Murphy <robin.murphy@arm.com>=
 wrote:
>
> Now that iommu_fwspec_init() can signal for probe deferral directly,
> acpi_iommu_fwspec_ops() is unneeded and can be cleaned up.
>
> Signed-off-by: Robin Murphy <robin.murphy@arm.com>

Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

> ---
>  drivers/acpi/scan.c | 30 ++++++------------------------
>  1 file changed, 6 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
> index 9d36fc3dc5ac..d6b64dcbf9a6 100644
> --- a/drivers/acpi/scan.c
> +++ b/drivers/acpi/scan.c
> @@ -1588,26 +1588,14 @@ int acpi_iommu_fwspec_init(struct device *dev, u3=
2 id,
>         return ret;
>  }
>
> -static inline const struct iommu_ops *acpi_iommu_fwspec_ops(struct devic=
e *dev)
> -{
> -       struct iommu_fwspec *fwspec =3D dev_iommu_fwspec_get(dev);
> -
> -       return fwspec ? fwspec->ops : NULL;
> -}
> -
>  static int acpi_iommu_configure_id(struct device *dev, const u32 *id_in)
>  {
>         int err;
> -       const struct iommu_ops *ops;
>
>         /* Serialise to make dev->iommu stable under our potential fwspec=
 */
>         mutex_lock(&iommu_probe_device_lock);
> -       /*
> -        * If we already translated the fwspec there is nothing left to d=
o,
> -        * return the iommu_ops.
> -        */
> -       ops =3D acpi_iommu_fwspec_ops(dev);
> -       if (ops) {
> +       /* If we already translated the fwspec there is nothing left to d=
o */
> +       if (dev_iommu_fwspec_get(dev)) {
>                 mutex_unlock(&iommu_probe_device_lock);
>                 return 0;
>         }
> @@ -1624,16 +1612,7 @@ static int acpi_iommu_configure_id(struct device *=
dev, const u32 *id_in)
>         if (!err && dev->bus)
>                 err =3D iommu_probe_device(dev);
>
> -       /* Ignore all other errors apart from EPROBE_DEFER */
> -       if (err =3D=3D -EPROBE_DEFER) {
> -               return err;
> -       } else if (err) {
> -               dev_dbg(dev, "Adding to IOMMU failed: %d\n", err);
> -               return -ENODEV;
> -       }
> -       if (!acpi_iommu_fwspec_ops(dev))
> -               return -ENODEV;
> -       return 0;
> +       return err;
>  }
>
>  #else /* !CONFIG_IOMMU_API */
> @@ -1672,6 +1651,9 @@ int acpi_dma_configure_id(struct device *dev, enum =
dev_dma_attr attr,
>         ret =3D acpi_iommu_configure_id(dev, input_id);
>         if (ret =3D=3D -EPROBE_DEFER)
>                 return -EPROBE_DEFER;
> +       /* Ignore all other errors apart from EPROBE_DEFER */
> +       if (ret)
> +               dev_dbg(dev, "Adding to IOMMU failed: %d\n", ret);
>
>         arch_setup_dma_ops(dev, attr =3D=3D DEV_DMA_COHERENT);
>
> --
> 2.39.2.101.g768bb238c484.dirty
>