From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C6C3663414; Tue, 16 Jan 2024 19:59:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705435172; cv=none; b=NTVhX9/PCSzsC4NzEI/ufvKQYe6IKcIXMeg9ldvFHpVPpl54EC1TetKveVkjg/hsllPNlPB2XcUAgjbMtDDyICMP0LNvUaG9sBhXmgGOB/pHucKs4FDWwYwuBH7t34qRB8VFKcpsQttC2RiZghgy1kvelnIgIYPaYkmAD1uE7Sw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705435172; c=relaxed/simple; bh=xqS0SsVkNmE+5vAFxNQEbvH3Za02WzIV3UdstbhBM3A=; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID: X-Mailer:In-Reply-To:References:MIME-Version:X-stable: X-Patchwork-Hint:X-stable-base:Content-Transfer-Encoding; b=O00VHj0WLpZYFvJnrx9TR+kBsfbhnhn9bp1nOvRbVtH+9h/QhheAKD1extXcCusUYeMBMrTTWGLooFrDteCbm/xSFx+ZjMLHxM+DEyKr30hy+xDFPHgl8Lsg9VMhrXtgdBoIbhvbJkXRsnf0gFuW2kQ3FDm1GgpFnvqQ8soruEE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=WvRyTDky; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="WvRyTDky" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7DE35C43394; Tue, 16 Jan 2024 19:59:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705435172; bh=xqS0SsVkNmE+5vAFxNQEbvH3Za02WzIV3UdstbhBM3A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WvRyTDkyNiyYFUrP/xr9jcLVHBZVxUPPA+H6MW91lDsuXveFg3JkPe6nlJcGpl27H 33GC1qAbmkTqk/k9KR4rw+OVioaZSwrv6jC9Fql2lYdIiNceoqSH28rG/jfLBXPYup fDEjyfKTvOwA+VXQWzw7GS/cF1E2A76RHv//TXAS0wUJ1wTNN48RYO3/oXDoofz1Ef XnSpD21BYTZEV5MaJDVqYJBA23H6AlEHhwSR9Oz/jxoWcw8V6RSrpuGiKktAelKFoe 6Axt0BJL6CX89HprJnLAJr+vWgCqRUEbWsl8LwUtd/FDfySwK/fv3Nf+F3VnHkAru5 lLrjvS2Z01fLw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Shannon Nelson , Brett Creeley , "David S . Miller" , Sasha Levin , drivers@pensando.io, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, florian.fainelli@broadcom.com, allen.hubbe@amd.com, yuehaibing@huawei.com, drc@linux.vnet.ibm.com, keescook@chromium.org, justinstitt@google.com, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 26/47] ionic: pass opcode to devcmd_wait Date: Tue, 16 Jan 2024 14:57:29 -0500 Message-ID: <20240116195834.257313-26-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240116195834.257313-1-sashal@kernel.org> References: <20240116195834.257313-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.147 Content-Transfer-Encoding: 8bit From: Shannon Nelson [ Upstream commit 24f110240c03c6b5368f1203bac72883d511e606 ] Don't rely on the PCI memory for the devcmd opcode because we read a 0xff value if the PCI bus is broken, which can cause us to report a bogus dev_cmd opcode later. Signed-off-by: Shannon Nelson Reviewed-by: Brett Creeley Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/pensando/ionic/ionic_dev.c | 1 + drivers/net/ethernet/pensando/ionic/ionic_dev.h | 1 + drivers/net/ethernet/pensando/ionic/ionic_main.c | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/pensando/ionic/ionic_dev.c b/drivers/net/ethernet/pensando/ionic/ionic_dev.c index b778d8264bca..f81b00c7e106 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_dev.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_dev.c @@ -268,6 +268,7 @@ void ionic_dev_cmd_comp(struct ionic_dev *idev, union ionic_dev_cmd_comp *comp) void ionic_dev_cmd_go(struct ionic_dev *idev, union ionic_dev_cmd *cmd) { + idev->opcode = cmd->cmd.opcode; memcpy_toio(&idev->dev_cmd_regs->cmd, cmd, sizeof(*cmd)); iowrite32(0, &idev->dev_cmd_regs->done); iowrite32(1, &idev->dev_cmd_regs->doorbell); diff --git a/drivers/net/ethernet/pensando/ionic/ionic_dev.h b/drivers/net/ethernet/pensando/ionic/ionic_dev.h index 38f38fe8f21d..1ab86eee8b5a 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_dev.h +++ b/drivers/net/ethernet/pensando/ionic/ionic_dev.h @@ -144,6 +144,7 @@ struct ionic_dev { bool fw_hb_ready; bool fw_status_ready; u8 fw_generation; + u8 opcode; u64 __iomem *db_pages; dma_addr_t phy_db_pages; diff --git a/drivers/net/ethernet/pensando/ionic/ionic_main.c b/drivers/net/ethernet/pensando/ionic/ionic_main.c index 538c024afed5..7942a7f0f7b3 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_main.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_main.c @@ -350,7 +350,7 @@ int ionic_dev_cmd_wait(struct ionic *ionic, unsigned long max_seconds) */ max_wait = jiffies + (max_seconds * HZ); try_again: - opcode = readb(&idev->dev_cmd_regs->cmd.cmd.opcode); + opcode = idev->opcode; start_time = jiffies; do { done = ionic_dev_cmd_done(idev); -- 2.43.0