Commit 24f11024 authored by Shannon Nelson's avatar Shannon Nelson Committed by David S. Miller
Browse files

ionic: pass opcode to devcmd_wait 



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: default avatarShannon Nelson <shannon.nelson@amd.com>
Reviewed-by: default avatarBrett Creeley <brett.creeley@amd.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e5bc1f4c

drivers/net/ethernet/pensando/ionic/ionic_dev.c

+1 −0
Original line number Diff line number Diff line
@@ -321,6 +321,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);

drivers/net/ethernet/pensando/ionic/ionic_dev.h

+1 −0
Original line number Diff line number Diff line
@@ -153,6 +153,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;

drivers/net/ethernet/pensando/ionic/ionic_main.c

+1 −1
Original line number Diff line number Diff line
@@ -443,7 +443,7 @@ static 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;

	for (fw_up = ionic_is_fw_running(idev);

	     !done && fw_up && time_before(jiffies, max_wait);