2023-06-12 10:37:01

by Sarath Babu Naidu Gaddam

Subject: [PATCH] ptp: clockmatrix: Add Defer probe if firmware load fails

Clock matrix driver can be probed before the rootfs containing
firmware/initialization .bin is available. The current driver
throws a warning and proceeds to execute probe even when firmware
is not ready. Instead, defer probe and wait for the .bin file to
be available.

Signed-off-by: Sarath Babu Naidu Gaddam <[email protected]>
---
drivers/ptp/ptp_clockmatrix.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/ptp/ptp_clockmatrix.c b/drivers/ptp/ptp_clockmatrix.c
index c9d451bf89e2..96328dfb7e55 100644
--- a/drivers/ptp/ptp_clockmatrix.c
+++ b/drivers/ptp/ptp_clockmatrix.c
@@ -2424,9 +2424,13 @@ static int idtcm_probe(struct platform_device *pdev)

err = idtcm_load_firmware(idtcm, &pdev->dev);

- if (err)
+ if (err) {
dev_warn(idtcm->dev, "loading firmware failed with %d", err);

+ if (err == -ENOENT)
+ return -EPROBE_DEFER;
+ }
+
wait_for_chip_ready(idtcm);

if (idtcm->tod_mask) {
--
2.25.1

2023-06-12 13:45:40

by Simon Horman

Subject: Re: [PATCH] ptp: clockmatrix: Add Defer probe if firmware load fails

On Mon, Jun 12, 2023 at 03:30:44PM +0530, Sarath Babu Naidu Gaddam wrote:
> Clock matrix driver can be probed before the rootfs containing
> firmware/initialization .bin is available. The current driver
> throws a warning and proceeds to execute probe even when firmware
> is not ready. Instead, defer probe and wait for the .bin file to
> be available.
>
> Signed-off-by: Sarath Babu Naidu Gaddam <[email protected]>
> ---
> drivers/ptp/ptp_clockmatrix.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/ptp/ptp_clockmatrix.c b/drivers/ptp/ptp_clockmatrix.c
> index c9d451bf89e2..96328dfb7e55 100644
> --- a/drivers/ptp/ptp_clockmatrix.c
> +++ b/drivers/ptp/ptp_clockmatrix.c
> @@ -2424,9 +2424,13 @@ static int idtcm_probe(struct platform_device *pdev)
>
> err = idtcm_load_firmware(idtcm, &pdev->dev);
>
> - if (err)
> + if (err) {
> dev_warn(idtcm->dev, "loading firmware failed with %d", err);
>
> + if (err == -ENOENT)
> + return -EPROBE_DEFER;

Hi Sarath,

Smatch reports that idtcm->lock is leaked here.

> + }
> +
> wait_for_chip_ready(idtcm);
>
> if (idtcm->tod_mask) {
> --
> 2.25.1
>
>

2023-06-12 15:23:17

by Andrew Lunn

Subject: Re: [PATCH] ptp: clockmatrix: Add Defer probe if firmware load fails

On Mon, Jun 12, 2023 at 03:30:44PM +0530, Sarath Babu Naidu Gaddam wrote:
> Clock matrix driver can be probed before the rootfs containing
> firmware/initialization .bin is available. The current driver
> throws a warning and proceeds to execute probe even when firmware
> is not ready. Instead, defer probe and wait for the .bin file to
> be available.
>
> Signed-off-by: Sarath Babu Naidu Gaddam <[email protected]>
> ---
> drivers/ptp/ptp_clockmatrix.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/ptp/ptp_clockmatrix.c b/drivers/ptp/ptp_clockmatrix.c
> index c9d451bf89e2..96328dfb7e55 100644
> --- a/drivers/ptp/ptp_clockmatrix.c
> +++ b/drivers/ptp/ptp_clockmatrix.c
> @@ -2424,9 +2424,13 @@ static int idtcm_probe(struct platform_device *pdev)
>
> err = idtcm_load_firmware(idtcm, &pdev->dev);
>
> - if (err)
> + if (err) {
> dev_warn(idtcm->dev, "loading firmware failed with %d", err);
>
> + if (err == -ENOENT)
> + return -EPROBE_DEFER;
> + }

Maybe move the dev_warn() after the test so you don't spam the logs
with failures which are not yet real failures?

Andrew