From patchwork Thu May 16 16:05:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Souradeep Chakrabarti X-Patchwork-Id: 13666364 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 135A914B953; Thu, 16 May 2024 16:06:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=13.77.154.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715875621; cv=none; b=QdswXMcAxTf6ygHHrxIUbtzdyAcLgzuH5BA1LN8H5344SZ4QIM5fXufC/aVzJgXWIZbyNXwYc/DttpxIizeVGg32KPxlBdtJzOm4AaVBtsRyT6G3FtpuTyg290UipA92bo5zxOniJzgaGen/Dpp7gaddHg86iZB1b3If3o/WHos= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715875621; c=relaxed/simple; bh=NDl1/On8Xl0p+o2LhYUeEkJ4uggR90m3F+FyFOP1acI=; h=From:To:Cc:Subject:Date:Message-Id; b=CqsJQxS0B0s4RmwAbyYko2vuanq6rg0ncArbvBWBhQs6ZMiNLSOwdKVqJH2qVo7LzZye6C1osyOjy1qQ4RdxcBCRLUfoh+asIEdyq60xBdqTlSqFFKwrslUrxkslzzluENfjbtU5qPIwKZejREeDsKMTuec9p1sjHOjh/g2xR+I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com; spf=pass smtp.mailfrom=linux.microsoft.com; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b=D+vybkna; arc=none smtp.client-ip=13.77.154.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.microsoft.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b="D+vybkna" Received: by linux.microsoft.com (Postfix, from userid 1099) id A63DD20B915A; Thu, 16 May 2024 09:06:59 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com A63DD20B915A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1715875619; bh=H1h4r/pbYCGt93I7ZZhMxZkjxnhh2Z7CdrZM+aGCgc4=; h=From:To:Cc:Subject:Date:From; b=D+vybknaQfz6UUVxhmK+s6MkF/uqCV2n77dyEOSCZnAiG3zoC7TaFRLhckgd2UIJo SQFBIEVDS6/eD/0GUj2t/W/x9U/R4krC42cgVzaaBuC5fSkyeEK7wyoUYHxInNXplO pSEz0qef+V1q4z9SjL/tzUwUb4QZZMCVy89+Iuxw= From: Souradeep Chakrabarti To: kys@microsoft.com, haiyangz@microsoft.com, wei.liu@kernel.org, decui@microsoft.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, longli@microsoft.com, yury.norov@gmail.com, leon@kernel.org, cai.huoqing@linux.dev, ssengar@linux.microsoft.com, vkuznets@redhat.com, tglx@linutronix.de, linux-hyperv@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org Cc: schakrabarti@microsoft.com, Souradeep Chakrabarti , stable@vger.kernel.org Subject: [PATCH] net: mana: Fix the extra HZ in mana_hwc_send_request Date: Thu, 16 May 2024 09:05:38 -0700 Message-Id: <1715875538-21499-1-git-send-email-schakrabarti@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 Precedence: bulk X-Mailing-List: linux-rdma@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Commit 62c1bff593b7 added an extra HZ along with msecs_to_jiffies. This patch fixes that. Cc: stable@vger.kernel.org Fixes: 62c1bff593b7 ("net: mana: Configure hwc timeout from hardware") Signed-off-by: Souradeep Chakrabarti Reviewed-by: Dexuan Cui Reviewed-by: Brett Creeley --- drivers/net/ethernet/microsoft/mana/hw_channel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/microsoft/mana/hw_channel.c b/drivers/net/ethernet/microsoft/mana/hw_channel.c index 2729a2c5acf9..ca814fe8a775 100644 --- a/drivers/net/ethernet/microsoft/mana/hw_channel.c +++ b/drivers/net/ethernet/microsoft/mana/hw_channel.c @@ -848,7 +848,7 @@ int mana_hwc_send_request(struct hw_channel_context *hwc, u32 req_len, } if (!wait_for_completion_timeout(&ctx->comp_event, - (msecs_to_jiffies(hwc->hwc_timeout) * HZ))) { + (msecs_to_jiffies(hwc->hwc_timeout)))) { dev_err(hwc->dev, "HWC: Request timed out!\n"); err = -ETIMEDOUT; goto out;