bnxt_en: hide CONFIG_DETECT_HUNG_TASK specific code

[PATCH] bnxt_en: hide CONFIG_DETECT_HUNG_TASK specific code

Posted by Arnd Bergmann 7 months, 4 weeks ago

From: Arnd Bergmann <arnd@arndb.de>

The CONFIG_DEFAULT_HUNG_TASK_TIMEOUT setting is only available when the
hung task detection is enabled, otherwise the code now produces a build
failure:

drivers/net/ethernet/broadcom/bnxt/bnxt.c:10188:21: error: use of undeclared identifier 'CONFIG_DEFAULT_HUNG_TASK_TIMEOUT'
 10188 |             max_tmo_secs > CONFIG_DEFAULT_HUNG_TASK_TIMEOUT) {

Enclose this warning logic in an #ifdef to ensure this builds.

Fixes: 0fcad44a86bd ("bnxt_en: Change FW message timeout warning")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
I'm not really happy with my version either, but could not come up
with a better approach. This may need a larger rework.
---
 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index ad30445b4799..18359fabe087 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -10184,11 +10184,13 @@ static int bnxt_hwrm_ver_get(struct bnxt *bp)
 	if (!bp->hwrm_cmd_max_timeout)
 		bp->hwrm_cmd_max_timeout = HWRM_CMD_MAX_TIMEOUT;
 	max_tmo_secs = bp->hwrm_cmd_max_timeout / 1000;
+#ifdef CONFIG_DETECT_HUNG_TASK
 	if (bp->hwrm_cmd_max_timeout > HWRM_CMD_MAX_TIMEOUT ||
 	    max_tmo_secs > CONFIG_DEFAULT_HUNG_TASK_TIMEOUT) {
 		netdev_warn(bp->dev, "Device requests max timeout of %d seconds, may trigger hung task watchdog (kernel default %ds)\n",
 			    max_tmo_secs, CONFIG_DEFAULT_HUNG_TASK_TIMEOUT);
 	}
+#endif
 
 	if (resp->hwrm_intf_maj_8b >= 1) {
 		bp->hwrm_max_req_len = le16_to_cpu(resp->max_req_win_len);
-- 
2.39.5

Re: [PATCH] bnxt_en: hide CONFIG_DETECT_HUNG_TASK specific code

Posted by Michael Chan 7 months, 4 weeks ago

On Wed, Apr 23, 2025 at 9:28 AM Arnd Bergmann <arnd@kernel.org> wrote:
>
> From: Arnd Bergmann <arnd@arndb.de>
>
> The CONFIG_DEFAULT_HUNG_TASK_TIMEOUT setting is only available when the
> hung task detection is enabled, otherwise the code now produces a build
> failure:
>
> drivers/net/ethernet/broadcom/bnxt/bnxt.c:10188:21: error: use of undeclared identifier 'CONFIG_DEFAULT_HUNG_TASK_TIMEOUT'
>  10188 |             max_tmo_secs > CONFIG_DEFAULT_HUNG_TASK_TIMEOUT) {
>
> Enclose this warning logic in an #ifdef to ensure this builds.
>
> Fixes: 0fcad44a86bd ("bnxt_en: Change FW message timeout warning")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

I also cannot think of a better way, so this looks fine to me.  Thanks.
Reviewed-by: Michael Chan <michael.chan@broadcom.com>

Re: [PATCH] bnxt_en: hide CONFIG_DETECT_HUNG_TASK specific code

Posted by Jacob Keller 7 months, 4 weeks ago


On 4/23/2025 10:28 AM, Michael Chan wrote:
> On Wed, Apr 23, 2025 at 9:28 AM Arnd Bergmann <arnd@kernel.org> wrote:
>>
>> From: Arnd Bergmann <arnd@arndb.de>
>>
>> The CONFIG_DEFAULT_HUNG_TASK_TIMEOUT setting is only available when the
>> hung task detection is enabled, otherwise the code now produces a build
>> failure:
>>
>> drivers/net/ethernet/broadcom/bnxt/bnxt.c:10188:21: error: use of undeclared identifier 'CONFIG_DEFAULT_HUNG_TASK_TIMEOUT'
>>  10188 |             max_tmo_secs > CONFIG_DEFAULT_HUNG_TASK_TIMEOUT) {
>>
>> Enclose this warning logic in an #ifdef to ensure this builds.
>>
>> Fixes: 0fcad44a86bd ("bnxt_en: Change FW message timeout warning")
>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> 
> I also cannot think of a better way, so this looks fine to me.  Thanks.
> Reviewed-by: Michael Chan <michael.chan@broadcom.com>

I ran into this just now, and this fixed compilation for me.

Tested-by: Jacob Keller <jacob.e.keller@intel.com>