From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 07 Jul 2022 10:29:01 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1o9Msc-008xRy-17 for lore@lore.pengutronix.de; Thu, 07 Jul 2022 10:29:01 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1o9Mse-0007uZ-2Q for lore@pengutronix.de; Thu, 07 Jul 2022 10:29:00 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=SO/UOKZde1SzzvWuLun2qAtO3lOIBnf3FjDL1F/6NCM=; b=4GLyKzRac36FWKG2lJ/QYiBE/J eWEN1j73082c9WCZYDeHxuTGo/8sn2C8RucOtWUYJjinchkGwLvmhna1OOBqn7hAZl3Q7n2MewqbT 4MchEoY514Xwy5azOlO3gOyeHu3ohVshnJ/BWW87/37M8Xm7OLnYiwir9CbsfiFyDvKinecJiWWlU UHW638hafkgis08Sae+uECCDud8X/BbpGA3PhuxX1k8QPQfdOy12feXe0PaNf+gu9GmBr5Mh6U5Xh K7lX01Ewenv6RaCymwWRXzmXV6eMsXZMycQc/0tAq6tJ3xIlTBpSRzy62C2Ql02qp4n7k8QrfxZSy 8OlaPWHg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o9Mr0-00FCSi-Lg; Thu, 07 Jul 2022 08:27:18 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o9Mqu-00FCOt-2K for barebox@lists.infradead.org; Thu, 07 Jul 2022 08:27:14 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1o9Mqn-0007ga-Im; Thu, 07 Jul 2022 10:27:05 +0200 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1o9Mqj-004v6P-Ar; Thu, 07 Jul 2022 10:27:04 +0200 Received: from jzi by dude03.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1o9Mqm-009wj9-3a; Thu, 07 Jul 2022 10:27:04 +0200 From: Johannes Zink To: barebox@lists.infradead.org Cc: Johannes Zink Date: Thu, 7 Jul 2022 10:25:08 +0200 Message-Id: <20220707082506.2367374-1-j.zink@pengutronix.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220707_012712_191045_FAB20F5B X-CRM114-Status: GOOD ( 18.18 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.1 required=4.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH] base: driver: store probe deferred reason in device structure X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) This ignores prevents probe deferred warnings in the log output and stores the probe deferred reason in the device structure. If a probe is permanently deferred, the last deferral reason why it was displayed. Other dev_err_probe outputs are displayed as before. Signed-off-by: Johannes Zink --- drivers/base/driver.c | 53 +++++++++++++++++++++++++++++++++++++------ include/driver.h | 6 +++++ 2 files changed, 52 insertions(+), 7 deletions(-) diff --git a/drivers/base/driver.c b/drivers/base/driver.c index 303ca061c..8eb68306f 100644 --- a/drivers/base/driver.c +++ b/drivers/base/driver.c @@ -283,6 +283,8 @@ void free_device_res(struct device_d *dev) dev->name = NULL; free(dev->unique_name); dev->unique_name = NULL; + if (dev->deferred_probe_reason) + kfree(dev->deferred_probe_reason); } EXPORT_SYMBOL(free_device_res); @@ -300,6 +302,16 @@ void free_device(struct device_d *dev) } EXPORT_SYMBOL(free_device); + +static int device_get_deferred_probe_reason(const struct device_d *dev, char **reason) +{ + if (dev->deferred_probe_reason) { + *reason = dev->deferred_probe_reason; + return 0; + } else + return 1; +} + /* * Loop over list of deferred devices as long as at least one * device is successfully probed. Devices that again request @@ -312,6 +324,7 @@ static int device_probe_deferred(void) struct device_d *dev, *tmp; struct driver_d *drv; bool success; + char *reason; do { success = false; @@ -333,9 +346,12 @@ static int device_probe_deferred(void) } } while (success); - list_for_each_entry(dev, &deferred, active) - dev_err(dev, "probe permanently deferred\n"); - + list_for_each_entry(dev, &deferred, active) { + if (device_get_deferred_probe_reason(dev, &reason)) + dev_err(dev, "probe permanently deferred\n"); + else + dev_err(dev, "probe permanently deferred (%s)\n", reason); + } return 0; } late_initcall(device_probe_deferred); @@ -573,6 +589,17 @@ const void *device_get_match_data(struct device_d *dev) return NULL; } +static void device_set_deferred_probe_reason(struct device_d *dev, const struct va_format *vaf) +{ + const char *drv = dev_name(dev); + char* reason; + + if (dev->deferred_probe_reason) + kfree(dev->deferred_probe_reason); + + reason = basprintf("%s: %pV", drv, vaf); + dev->deferred_probe_reason = reason; +} /** * dev_err_probe - probe error check and log helper * @loglevel: log level configured in source file @@ -584,8 +611,12 @@ const void *device_get_match_data(struct device_d *dev) * This helper implements common pattern present in probe functions for error * checking: print debug or error message depending if the error value is * -EPROBE_DEFER and propagate error upwards. - * In case of -EPROBE_DEFER it sets also defer probe reason, which can be - * checked later by reading devices_deferred debugfs attribute. + * + * In case of -EPROBE_DEFER it sets the device's defered_probe_reason attribute, + * but does not report an error. The error is recorded and displayed later, if + * (and only if) the probe is permanently defered. For all other error codes, + * it just ouputs the error + * * It replaces code sequence:: * * if (err != -EPROBE_DEFER) @@ -606,13 +637,19 @@ int dev_err_probe(const struct device_d *dev, int err, const char *fmt, ...) { struct va_format vaf; va_list args; + char* reason; va_start(args, fmt); vaf.fmt = fmt; vaf.va = &args; - dev_printf(err == -EPROBE_DEFER ? MSG_DEBUG : MSG_ERR, - dev, "error %pe: %pV", ERR_PTR(err), &vaf); + //deferred probe, just remember the error reason + if(err == -EPROBE_DEFER){ + device_set_deferred_probe_reason(dev, &vaf); + } + else { + dev_printf(MSG_ERR, dev, "error %pe: %pV\n", ERR_PTR(err), &vaf); + } va_end(args); @@ -620,6 +657,8 @@ int dev_err_probe(const struct device_d *dev, int err, const char *fmt, ...) } EXPORT_SYMBOL_GPL(dev_err_probe); + + /* * device_find_child - device iterator for locating a particular device. * @parent: parent struct device_d diff --git a/include/driver.h b/include/driver.h index b35b5f397..a41e3d478 100644 --- a/include/driver.h +++ b/include/driver.h @@ -88,6 +88,12 @@ struct device_d { * when the driver should actually detect client devices */ int (*detect) (struct device_d *); + + /** + * if a driver probe is deferred, this stores the last error + **/ + + char *deferred_probe_reason; }; /** @brief Describes a driver present in the system */ -- 2.30.2