From patchwork Thu Apr 17 17:24:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Chan X-Patchwork-Id: 14055929 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3C1362550D2 for ; Thu, 17 Apr 2025 17:25:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744910731; cv=none; b=bVccgDVLXTvAXpfGVuwItTstiywK+huUEFffMUKgkxV0tBzczGKcJZs92BR4LYOxZa6L/2s7Zr/eee2RVm09wK+95hTT+6k7zXasZb1enShKBKQEg7wYXHeoFd4AT+cpg5I5KLHBYMi6h6VBNnU+9K8po++F+7h2DzKPgmgjPoU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744910731; c=relaxed/simple; bh=OW2gJhUxk3smeevyoweR68z8NRE83N01HlX5nNLPeiI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=q1BHlJsbVWaBh0PneAEXPdmlv5q/koIT5evJdNfFR/rhs46MwueTTkFhxmhcDAv1VCWGCkd+25wU+wS5Xw04y6VAKBxxPqvVEM95uaRQlhBs5Dn9MtaWZcsMn9U6pDFvoU7zLrgBfbChOunn17gQWMpVF1ubZmNRTLNGJPDzlw8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=IOklRELW; arc=none smtp.client-ip=209.85.210.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="IOklRELW" Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-736ad42dfd6so981961b3a.3 for ; Thu, 17 Apr 2025 10:25:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1744910729; x=1745515529; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Adu9Vv9aPN6vaxOCO+Bfb6Z7K/eIEjER/fselG8cw5g=; b=IOklRELWOjHOCjuy39OGbGKsLm4yT+iFELO++12If1+8IEokp/0xlcwLohOXqP+YeI 7hmF3k4aAIi1WTxS9h3koVTBifmSgiJJywkX32S4W0M5/HaGH3zrW0Y2v7YsyGtgPApe qeTZy8GF8d/XWK0NeVmlEYJE2oz7qiL2Kr8Ew= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744910729; x=1745515529; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Adu9Vv9aPN6vaxOCO+Bfb6Z7K/eIEjER/fselG8cw5g=; b=gpzp3Klr+9bi2+Sl0ulBdsjSE8PeKFZgEwfNa0UfJpNKV5KQeWd4yf8Zv8Fw06+PFY NCFW/cHj4e6XvjuMGQWCuHFfHUzKFJ4p7IhemcshyBxh96/T8Nmc5QwWkCKByjagBHNN qbsCNYvfEHZGfrHaXpx04EBRx/tdc8COrcEmH+jEioBZFEbxEPxATVfOkgZuY8a71SNv ViEDC5/qyjG4XfScDIixADUiwHv/WSDv/3M+oL1Xc340iixSDISRZqz5Iyw6pEyi+J8y wWoBsN//toj1jfUbUE/RXyHxGAwZGaRWUaWnyMFBo9VBfz2+UnVRKDH18eX2hRZIOmSb +KYg== X-Gm-Message-State: AOJu0YxTORWx6bNxfw+5mbbqT1FEMdsIH3AzRlWhZ2NdK24ZLRj4nnUL oJ08QOu74Pz2yeNsUhiOlXJUm/cXL4JsjJFYE+nI2c61r7eSAEkRnrYDe3h5QA== X-Gm-Gg: ASbGncubM6BfR7wSqY2l/2x7rOD/BtFHpH4MHRiHVIq6ngNzhnssxlppghg1KXLEhZF JVrXmRaJRlC95YXgK/cJqQqorLIe/7mSlxSVq+YboNekfTONebFBSGNnhrBqAIkIJV91sTSLlgG kUFpGRCdXcJFlUKHfd4ev3qqRSDRmt/vY6Tp1XUPDql6JK/5sXcD9ROiyw6W4RYk0YqLZ5+YCB0 dZkVQzNrURwh59i6wDdMqKiJmqkvI0FvFShuj6he2Q8zXoh4JQQDdAEU3dCCzsPr+A3uRcbpYF2 JIo9vTeUnhHU8OLS8YBpvUkncBJ/itFa7uVxoHcjQE16n8PlxofcUja/kVFuYkz5jQhl2C8ceJD 5xpNHhc8wnSVabp8H X-Google-Smtp-Source: AGHT+IHiplUVRjx/3CgkBC2/KAm0JdODThITBhUDsKX8gh4jA9yX7Pj0Yhn3qhyU1PWDGULKElYypw== X-Received: by 2002:a05:6a00:2348:b0:736:a7ec:a366 with SMTP id d2e1a72fcca58-73c266f9c5bmr7506747b3a.9.1744910729250; Thu, 17 Apr 2025 10:25:29 -0700 (PDT) Received: from lvnvda3289.lvn.broadcom.net ([192.19.161.250]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73dbf8ea9a4sm109879b3a.41.2025.04.17.10.25.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Apr 2025 10:25:28 -0700 (PDT) From: Michael Chan To: davem@davemloft.net Cc: netdev@vger.kernel.org, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, andrew+netdev@lunn.ch, pavan.chebbi@broadcom.com, andrew.gospodarek@broadcom.com, Kalesh AP Subject: [PATCH net-next v2 1/4] bnxt_en: Change FW message timeout warning Date: Thu, 17 Apr 2025 10:24:45 -0700 Message-ID: <20250417172448.1206107-2-michael.chan@broadcom.com> X-Mailer: git-send-email 2.43.4 In-Reply-To: <20250417172448.1206107-1-michael.chan@broadcom.com> References: <20250417172448.1206107-1-michael.chan@broadcom.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org The firmware advertises a "hwrm_cmd_max_timeout" value to the driver for NVRAM and coredump related functions that can take tens of seconds to complete. The driver polls for the operation to complete under mutex and may trigger hung task watchdog warning if the wait is too long. To warn the user about this, the driver currently prints a warning if this advertised value exceeds 40 seconds: Device requests max timeout of %d seconds, may trigger hung task watchdog Initially, we chose 40 seconds, well below the kernel's default CONFIG_DEFAULT_HUNG_TASK_TIMEOUT (120 seconds) to avoid triggering the hung task watchdog. But 60 seconds is the timeout on most production FW and cannot be reduced further. Change the driver's warning threshold to 60 seconds to avoid triggering this warning on all production devices. We also print the warning if the value exceeds CONFIG_DEFAULT_HUNG_TASK_TIMEOUT which may be set to architecture specific defaults as low as 10 seconds. Reviewed-by: Kalesh AP Reviewed-by: Pavan Chebbi Reviewed-by: Andy Gospodarek Signed-off-by: Michael Chan --- v2: Add check for CONFIG_DEFAULT_HUNG_TASK_TIMEOUT v1: https://lore.kernel.org/netdev/20250415174818.1088646-2-michael.chan@broadcom.com/ --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 11 +++++++---- drivers/net/ethernet/broadcom/bnxt/bnxt_hwrm.h | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 83608b7447f4..e16a3a8e96bb 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -10110,7 +10110,7 @@ static int bnxt_hwrm_ver_get(struct bnxt *bp) struct hwrm_ver_get_input *req; u16 fw_maj, fw_min, fw_bld, fw_rsv; u32 dev_caps_cfg, hwrm_ver; - int rc, len; + int rc, len, max_tmo_secs; rc = hwrm_req_init(bp, req, HWRM_VER_GET); if (rc) @@ -10183,9 +10183,12 @@ static int bnxt_hwrm_ver_get(struct bnxt *bp) bp->hwrm_cmd_max_timeout = le16_to_cpu(resp->max_req_timeout) * 1000; if (!bp->hwrm_cmd_max_timeout) bp->hwrm_cmd_max_timeout = HWRM_CMD_MAX_TIMEOUT; - else if (bp->hwrm_cmd_max_timeout > HWRM_CMD_MAX_TIMEOUT) - netdev_warn(bp->dev, "Device requests max timeout of %d seconds, may trigger hung task watchdog\n", - bp->hwrm_cmd_max_timeout / 1000); + max_tmo_secs = bp->hwrm_cmd_max_timeout / 1000; + 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); + } if (resp->hwrm_intf_maj_8b >= 1) { bp->hwrm_max_req_len = le16_to_cpu(resp->max_req_win_len); diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_hwrm.h b/drivers/net/ethernet/broadcom/bnxt/bnxt_hwrm.h index 15ca51b5d204..fb5f5b063c3d 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_hwrm.h +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_hwrm.h @@ -58,7 +58,7 @@ void hwrm_update_token(struct bnxt *bp, u16 seq, enum bnxt_hwrm_wait_state s); #define BNXT_HWRM_MAX_REQ_LEN (bp->hwrm_max_req_len) #define BNXT_HWRM_SHORT_REQ_LEN sizeof(struct hwrm_short_input) -#define HWRM_CMD_MAX_TIMEOUT 40000U +#define HWRM_CMD_MAX_TIMEOUT 60000U #define SHORT_HWRM_CMD_TIMEOUT 20 #define HWRM_CMD_TIMEOUT (bp->hwrm_cmd_timeout) #define HWRM_RESET_TIMEOUT ((HWRM_CMD_TIMEOUT) * 4) From patchwork Thu Apr 17 17:24:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Chan X-Patchwork-Id: 14055930 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4574D255244 for ; Thu, 17 Apr 2025 17:25:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744910732; cv=none; b=K7s+hy7zeubDIA8yK8riTD3YqPsHwVZvoQUq7xrGrARwJJIQotfnQgKPkpNQfCu/kOhA723xfaRJLbQHSJzAgFOLZPDg/i4iOnP2xN7yzykEyDyK7mDIyhwaf6VurkQhkd61Co/7GoWdBY18DcGq47X08o1Q9RIMCh7QX5cYq7Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744910732; c=relaxed/simple; bh=P4grIgMcFBx6uX0VhGtxuvQCENvc2Rsj2FroJKBMbDQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EpfClhLHawwk6NnScnG5bbriQBjjFPm/tGsdH7duV8GB3cjMbYqTgQ3gPDI6IGPahWM4aMYHJDdsB6ILcN95AbaBdTWL7scLW3jIBrwNsqRUoVc6RpitIGKflUaHG4CrkvbOILlxz00s4Z3eG53Yx21Wq7/BgmDVXXsqF+8Fe3k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=NihIWnC5; arc=none smtp.client-ip=209.85.210.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="NihIWnC5" Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-7376dd56f60so867628b3a.3 for ; Thu, 17 Apr 2025 10:25:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1744910730; x=1745515530; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YgSwWLJCnsmrTM6Kf/YHkuzpzYvCE+MfEaXp8mEkXW0=; b=NihIWnC5CovRi6FW9hbpl5vmYOo5CNTLXbLpZyQqKv3jzkbfMsLb4Dccw8X47kwLAM qi418byHKRlrNYqB6OI7Xk8LMxMTfSWPki06uuiDxtV2c0Kx2MWzbBnbbA8RoY39taDS RSrbIDFP9THvAMdamLkHPsSrdcjUnEKqYh1RY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744910730; x=1745515530; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YgSwWLJCnsmrTM6Kf/YHkuzpzYvCE+MfEaXp8mEkXW0=; b=C6ZKkwAWLV8T8D2gGYcPeaqpRb4Ab2AwQBSB2rUAywQW8ZQVQO1HV+aI+Iy+eb4uYK QgHt9q35bqfkSig1Qy2Dw2J3SIcH6Qdzj0ZhaTF0BqASf2t6u06uOQ1itEvLPJd1qSzF UrPXyoJHE3G7cTeB6SW5h44K//NbvfWQ38EUmT5oXBPFamRaW9KGteWU6ECNVCyaBtsF dfM6INQtkA5Yvnsj6IaBOiwz8u/WZepmDpzQTdvRTevvYHae68pFN+LtbeNcuv/2KNiM AbDnXnIhgbsgp/hbaUTWoxmcY5vL4PJgxhGwoboN/lAr7Z3l6PPSomkYbyDdGouzz42L 2EJQ== X-Gm-Message-State: AOJu0YzViWUSza7jr4h8/UaVho9ROAdaKJAmzjMAmOgDo3lPcau163rp UAn0RDkF0eX6SwTu76X+sIN886KIgNQjX0//Bb9iewfPFf01iFZ43lS69F8KIA== X-Gm-Gg: ASbGncvI8iWziHU30jqsI8nbBxT7HD7JFXv4dFeb7T+hNbSqRxxpxVHK4ZRhRyRyFyN nWgcbkITV/3CyBV8CiOIhwQ1ixABvUWX0DGMQ+EzflCk+QPVOscN1JAHX3mi3CjK/JJfFhdtIAX z2AKt73yLzcMEyhsXVvLbqr2IMbOagXjoVelH0t8J1XmIg50B54NfTC1+ngEh9C8lCy14e6+SOS MEhk+HPlCd3rzihFiaJ9kdznm8i59hhBQNxl3p0MtWzi/r+6Jv4rtHXE3AdBs9R45S0rWFNMpJk YI1NPIaxsi1DTMF4oCr9smxqO0mljj/7L9SIhj1n8ESXIdqGFus04ayGgYODfnaVy3JLkk3I+95 gkCC9Y2zbSSRPzqg+v9HuOuXxen8= X-Google-Smtp-Source: AGHT+IHYGyJuMXA4G4Gwt4hZEjxzc9Kb1hN/hhhnpUtu2ZLQBfdinuXX4/Io7u/iV4dJL28+8bdaUw== X-Received: by 2002:a05:6a00:1da6:b0:739:3f55:b23f with SMTP id d2e1a72fcca58-73c2671803fmr8951472b3a.14.1744910730451; Thu, 17 Apr 2025 10:25:30 -0700 (PDT) Received: from lvnvda3289.lvn.broadcom.net ([192.19.161.250]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73dbf8ea9a4sm109879b3a.41.2025.04.17.10.25.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Apr 2025 10:25:30 -0700 (PDT) From: Michael Chan To: davem@davemloft.net Cc: netdev@vger.kernel.org, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, andrew+netdev@lunn.ch, pavan.chebbi@broadcom.com, andrew.gospodarek@broadcom.com, Shruti Parab , Damodharam Ammepalli Subject: [PATCH net-next v2 2/4] bnxt_en: Report the ethtool coredump length after copying the coredump Date: Thu, 17 Apr 2025 10:24:46 -0700 Message-ID: <20250417172448.1206107-3-michael.chan@broadcom.com> X-Mailer: git-send-email 2.43.4 In-Reply-To: <20250417172448.1206107-1-michael.chan@broadcom.com> References: <20250417172448.1206107-1-michael.chan@broadcom.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Shruti Parab ethtool first calls .get_dump_flags() to get the dump length. For coredump, the driver calls the FW to get the coredump length (L1). The min. of L1 and the user specified length is then passed to .get_dump_data() (L2) to get the coredump. The actual coredump length retrieved by the FW (L3) during .get_dump_data() may be smaller than L1. This length discrepancy will trigger a WARN_ON() in ethtool_get_dump_data(). ethtool has already vzalloc'ed a buffer with size L1. Just report the coredump length as L2 even though the actual coredump length L3 may be smaller. The extra zero padding does not matter. This will prevent the warning that may alarm the user. For correctness, only do the final length update if there is no error. Reviewed-by: Andy Gospodarek Reviewed-by: Damodharam Ammepalli Signed-off-by: Shruti Parab Signed-off-by: Michael Chan --- drivers/net/ethernet/broadcom/bnxt/bnxt_coredump.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_coredump.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_coredump.c index 5576e7cf8463..9b6489e417fc 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_coredump.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_coredump.c @@ -496,9 +496,16 @@ static int __bnxt_get_coredump(struct bnxt *bp, u16 dump_type, void *buf, start_utc, coredump.total_segs + 1, rc); kfree(coredump.data); - *dump_len += sizeof(struct bnxt_coredump_record); - if (rc == -ENOBUFS) + if (!rc) { + *dump_len += sizeof(struct bnxt_coredump_record); + /* The actual coredump length can be smaller than the FW + * reported length earlier. Use the ethtool provided length. + */ + if (buf_len) + *dump_len = buf_len; + } else if (rc == -ENOBUFS) { netdev_err(bp->dev, "Firmware returned large coredump buffer\n"); + } return rc; } From patchwork Thu Apr 17 17:24:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Chan X-Patchwork-Id: 14055931 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 94626255258 for ; Thu, 17 Apr 2025 17:25:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744910734; cv=none; b=hampoX4g5tCk4gywaNgqo3jZjHmpb25KqVLvfKXHYi7mXj/X44uP/hy2Gw3Ps8KlU/KFWQNtRh1zhAcJH0vol66eJ88lrrEZaQDq7qXvPhcEWkXhxWoHIswhsT8FZCxjwVtgRAjdOuMH0hn5L7KQYM1Hzj27KNuRq027UF68SV8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744910734; c=relaxed/simple; bh=SL9PCqtts6Mv/ggwdLxgp+QFbDaOWxeKY8izfswvdWA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=piFWFbnvjIX4Jq2cbfIDDT6nqPppt8gJ7NQjVdd9NPVbuOXuxyaz1XIlUbmWAn9fxJoIUP5ibwOm4UV+7egZW8lRgmZIax9wMFO9S4I0im+qbEYm4GojtEFDfxi72P91uibRBb7W1DYz/v1RaR2pxY0GPvElui4C7NUQDxMTLEM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=RHJLbwtq; arc=none smtp.client-ip=209.85.210.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="RHJLbwtq" Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-73712952e1cso1109448b3a.1 for ; Thu, 17 Apr 2025 10:25:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1744910732; x=1745515532; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=r9yHAaw/uQvwxq1qnIfTLfjQQMXVxIDQXkvOd3fiXj0=; b=RHJLbwtq/SyF0ZOturZ+9AkjRbFHzEEKFlZ2QZrNFFIjA585/yW+UOwvnIfTtbVLCw kvGQk1U3y8B83sWoWE2xhrKVOFiJN0i4tQi7f9hEdRJ82aoS32JOiOoaTsWXx9G30ehx gaAAJFDRkkEa80jyaxkPto9A1ssBQDRrfLY7Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744910732; x=1745515532; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=r9yHAaw/uQvwxq1qnIfTLfjQQMXVxIDQXkvOd3fiXj0=; b=nyGrEv6X/KapUkwZzvQMP60YPLSfsy8nvE93STuH65RSWNw/VkvJlilw984SMz+EZ6 CDNB8Dn3TP8IzfvM47/t8PMKMhJIDukTMlVSqH9LppfBcUn+GqShkUlR5wZFCi5A2DpC Kk6O2+rjS0lC33srcb4jcMqQfp85sCqYT9enwSM3SGhyEYNrikk9XT8GXMlXUIYXcxMT gVdRWr8mXl6Smf+5qUwBTsIiEwE8W4c9rjGTo4SRFk5RhLqxoZAFx9M6t34F3mwjPBVM XCJZL3DeiFJUckI+8gYOKU4ElmLH9g+iUdtV7oiuJtGKZ/Pbzez/6jrSAVD6VqAg1UvI EZAw== X-Gm-Message-State: AOJu0YwlADvQG7q8GG+x7nrxMpcq927qh42vbu6GkNgnd7I3RFq5zw+Y dFkEKyD9UnfkvKtVC9eCjF31Wpr9c677uECC2go558xOFOvfJBMldV5KWJ1ZmA== X-Gm-Gg: ASbGncvZAp0aruFagDUBXf2R91VGLfEW5LJY4pMaSN58OfJ2jzqytzytOgqAqKymmIK KmTLrspOXn/YKHimQ8C+YGPHZOLS/WYSURlCwozYUT6IobF+bZdVfpA3TGeh7wq6Fjk3jNhbDe7 XXtLgkTV0ldK5BiKOFaJavKObhMFWq1XZ3g73eDNjIgM06L+ZSHxlcZSI6gtozzGAhxFVRuql0e wrDrjhUOzqMjzGJ2bs5gNUOoda+mNrWrqInDE8zsQV100tJM2Wd6S0/ZsY+lBXS44gLM9/C3te9 V1biWAk9hC9DyNjEL31X4Bb5TC7kq2ef1piHKb/tQ7JIXn0Pe9lOm0vxVfON8mNpFqw9oB7pdt+ j+zOuy9Yvr4pQWro1 X-Google-Smtp-Source: AGHT+IFk4jwFBrsca8R3CXEMJkJTSj6F8Gn3J/VDBrkNzWEknghynyJIy32lhDgsZmMsXbsoOojVXw== X-Received: by 2002:a05:6a00:23c1:b0:730:9502:d564 with SMTP id d2e1a72fcca58-73c2672479bmr8908636b3a.14.1744910731723; Thu, 17 Apr 2025 10:25:31 -0700 (PDT) Received: from lvnvda3289.lvn.broadcom.net ([192.19.161.250]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73dbf8ea9a4sm109879b3a.41.2025.04.17.10.25.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Apr 2025 10:25:31 -0700 (PDT) From: Michael Chan To: davem@davemloft.net Cc: netdev@vger.kernel.org, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, andrew+netdev@lunn.ch, pavan.chebbi@broadcom.com, andrew.gospodarek@broadcom.com, Kalesh AP , Somnath Kotur Subject: [PATCH net-next v2 3/4] bnxt_en: Remove unused field "ref_count" in struct bnxt_ulp Date: Thu, 17 Apr 2025 10:24:47 -0700 Message-ID: <20250417172448.1206107-4-michael.chan@broadcom.com> X-Mailer: git-send-email 2.43.4 In-Reply-To: <20250417172448.1206107-1-michael.chan@broadcom.com> References: <20250417172448.1206107-1-michael.chan@broadcom.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Kalesh AP The "ref_count" field in struct bnxt_ulp is unused after commit a43c26fa2e6c ("RDMA/bnxt_re: Remove the sriov config callback"). So we can just remove it now. Reviewed-by: Somnath Kotur Signed-off-by: Kalesh AP Signed-off-by: Michael Chan --- drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 5 ----- drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h | 1 - 2 files changed, 6 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c index a8e930d5dbb0..238db9a1aebf 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c @@ -148,7 +148,6 @@ void bnxt_unregister_dev(struct bnxt_en_dev *edev) struct net_device *dev = edev->net; struct bnxt *bp = netdev_priv(dev); struct bnxt_ulp *ulp; - int i = 0; ulp = edev->ulp_tbl; netdev_lock(dev); @@ -164,10 +163,6 @@ void bnxt_unregister_dev(struct bnxt_en_dev *edev) synchronize_rcu(); ulp->max_async_event_id = 0; ulp->async_events_bmap = NULL; - while (atomic_read(&ulp->ref_count) != 0 && i < 10) { - msleep(100); - i++; - } mutex_unlock(&edev->en_dev_lock); netdev_unlock(dev); return; diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h index 7fa3b8d1ebd2..f6b5efb5e775 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h @@ -50,7 +50,6 @@ struct bnxt_ulp { unsigned long *async_events_bmap; u16 max_async_event_id; u16 msix_requested; - atomic_t ref_count; }; struct bnxt_en_dev { From patchwork Thu Apr 17 17:24:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Chan X-Patchwork-Id: 14055932 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0F82F2561A0 for ; Thu, 17 Apr 2025 17:25:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744910735; cv=none; b=fTy3mwqPFK4P814Qk/R+v4WgDKZuYbYKUlDG6Q8np+fQPN/5dpAgVpFDTAiFcFs6MmGCncU4fpBZ/XffRIANUIZJKdn2li9BFY5bKbdYfKnSjq654cPftIx6Z0uz3xvY0BEQq7xwrh50ONEKj2ASVSe5s5DtDmk8fz2NkwzRpDI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744910735; c=relaxed/simple; bh=dJxRfYEp2QuH4TryMHj3DfMxIJ06gv4yfAAKnOyob3E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PsWXpeU9KXOR3+0qIYCJl3RmW/eO+q/+v/9Xk3ZUWcM8OfC5A8o/HUN04F3FDZcwNtBsPcBoMC7FYO7NokNTyG3SGjpXCBSSpLdTtJSNnLbANVGECHHS0GLlKoZnyDROXZyYVmN/rpdPJrutkeP5xY3IZ/yah1vp8dU+ABcpApw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=cjdJ3BDc; arc=none smtp.client-ip=209.85.210.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="cjdJ3BDc" Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-73bf1cef6ceso1049587b3a.0 for ; Thu, 17 Apr 2025 10:25:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1744910733; x=1745515533; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tsBl+7evj4S3BwRvVEmsLlhXAkdHNshIeD4Nby9HkP0=; b=cjdJ3BDcX6Wg/4peYjhBsB9oVbYakZ7EosV5M77uwbNVnD6d0pbjx5FzBhk6lrG1eE b1X017Rer+1jp3b6+AEoYQQoK1bGzFDH4K3YdOooWwUjbnj5l0cBlYmLQKluefQKqK2L Wx7C8Cbw/9aCmNjY/H98/h6UW/Yfht8Bbph3o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744910733; x=1745515533; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tsBl+7evj4S3BwRvVEmsLlhXAkdHNshIeD4Nby9HkP0=; b=ph6dadZQmE9xWHdSdxUmI0Bb+VFZeJLeZtfTJgKTZCf7S4WrJf/uHuOJUMT/8FoZ8O C0vdnYvWJTuJThHkjvVGRN8p5r4VOFroIsZxjP0t5VIezVOWAYBQaZO7USV0U2AGDMoc pETgfClEsiLB53ATKhOjxqZ0NtZEifMPuOPhQCqmu24PXJ9Qw8hGPNQNX01bPhoco2jO HWObmYqmTN4vxziTBQNNVYLWhnFwt0Zv5U2BaMUSFFiL5AaDnHW9cZNeluMN8i6RIOGJ 8VdxorfrzVmNZxbpMQ+ReCZ784i3AmuBf6g/gosIRZMG4hUaJIO0dCYW7YeDC1rdkm4+ eTGA== X-Gm-Message-State: AOJu0YzWrSgY4mflIPt+gNAOKlUwVYwsImnHuM5L2Y+hN1yrlqyV0/Eo q/I0LbYfFXPNLVLACcyeGp6u3BB/FUYJbbAEwHXercz6yCtRuktw07zJwnhKBA== X-Gm-Gg: ASbGncvnoWzzlGyutRLSjxweR05q6+MiI9/UCS/npeBbrZNnyyKQ1aVMenaj/XBuIu0 3NP7s5ITCmelMnHmQu81jkQn82sXTaw7dGLFekMtfo1jlmd3AeJzNWaIbjhnBr5o7LNd82dQ448 eNr7U8KMbusGz6GI/jxTn1Di94ZETwQrWf2FF7LQEmAbZimItrEDAEGLVP/ZqKDL4FL8oyvVdlL 8wrCeEndbLRN4uwwmOhmFZjeThaBN3hymbPwgirN5gOjM6L9QvQCZtS1mkceM98lQeE8XlGFtEh nvu4A+PG+9UppFxAvM/b8bVfS/V6SrUTcqX2bh8u5z/Fk68hhVCxL8seQgsTqKd6olo0o0MPq/l 2rCJPyt+p1I/WDL2J X-Google-Smtp-Source: AGHT+IEQ2LUOidIoR0KfQGr2KXkDUFN1wC5LDgNuIt7vbrDjVHrSK79cTTPScWJHNU6Adn70J4jqHw== X-Received: by 2002:a05:6a00:3001:b0:736:5753:12fd with SMTP id d2e1a72fcca58-73c266b5da4mr9123992b3a.4.1744910733231; Thu, 17 Apr 2025 10:25:33 -0700 (PDT) Received: from lvnvda3289.lvn.broadcom.net ([192.19.161.250]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73dbf8ea9a4sm109879b3a.41.2025.04.17.10.25.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Apr 2025 10:25:32 -0700 (PDT) From: Michael Chan To: davem@davemloft.net Cc: netdev@vger.kernel.org, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, andrew+netdev@lunn.ch, pavan.chebbi@broadcom.com, andrew.gospodarek@broadcom.com, Kalesh AP , Shruti Parab Subject: [PATCH net-next v2 4/4] bnxt_en: Remove unused macros in bnxt_ulp.h Date: Thu, 17 Apr 2025 10:24:48 -0700 Message-ID: <20250417172448.1206107-5-michael.chan@broadcom.com> X-Mailer: git-send-email 2.43.4 In-Reply-To: <20250417172448.1206107-1-michael.chan@broadcom.com> References: <20250417172448.1206107-1-michael.chan@broadcom.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Kalesh AP BNXT_ROCE_ULP and BNXT_MAX_ULP are no longer used. Remove them to clean up the code. Reviewed-by: Shruti Parab Signed-off-by: Kalesh AP Signed-off-by: Michael Chan --- drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h index f6b5efb5e775..7b9dd8ebe4bc 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h @@ -10,9 +10,6 @@ #ifndef BNXT_ULP_H #define BNXT_ULP_H -#define BNXT_ROCE_ULP 0 -#define BNXT_MAX_ULP 1 - #define BNXT_MIN_ROCE_CP_RINGS 2 #define BNXT_MIN_ROCE_STAT_CTXS 1