android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ionic: pass opcode to devcmd_wait

Browse Source 
[ 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 <shannon.nelson@amd.com>
Reviewed-by: Brett Creeley <brett.creeley@amd.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Shannon Nelson 2023-12-11 10:57:57 -08:00 committed by Greg Kroah-Hartman
parent 7dc0fefd37
commit 434fcaf372
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/ethernet/pensando/ionic/ionic_dev.c
View File

@ -293,6 +293,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) 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)); memcpy_toio(&idev->dev_cmd_regs->cmd, cmd, sizeof(*cmd));
iowrite32(0, &idev->dev_cmd_regs->done); iowrite32(0, &idev->dev_cmd_regs->done);
iowrite32(1, &idev->dev_cmd_regs->doorbell); iowrite32(1, &idev->dev_cmd_regs->doorbell);

1
drivers/net/ethernet/pensando/ionic/ionic_dev.h
View File

@ -150,6 +150,7 @@ struct ionic_dev {
bool fw_hb_ready; bool fw_hb_ready;
bool fw_status_ready; bool fw_status_ready;
u8 fw_generation; u8 fw_generation;
u8 opcode;
u64 __iomem *db_pages; u64 __iomem *db_pages;
dma_addr_t phy_db_pages; dma_addr_t phy_db_pages;

2
drivers/net/ethernet/pensando/ionic/ionic_main.c
View File

@ -465,7 +465,7 @@ static int __ionic_dev_cmd_wait(struct ionic *ionic, unsigned long max_seconds,
*/ */
max_wait = jiffies + (max_seconds * HZ); max_wait = jiffies + (max_seconds * HZ);
try_again: try_again:
opcode = readb(&idev->dev_cmd_regs->cmd.cmd.opcode); opcode = idev->opcode;
start_time = jiffies; start_time = jiffies;
for (fw_up = ionic_is_fw_running(idev); for (fw_up = ionic_is_fw_running(idev);
!done && fw_up && time_before(jiffies, max_wait); !done && fw_up && time_before(jiffies, max_wait);