net: lan966x: Fix sleep in atomic context when injecting frames

HoratiuVultur · davem330 · commit b6ab149654ef · 2022-01-26T15:45:49.000Z
On lan966x, when injecting a frame it was polling the register QS_INJ_STATUS to see if it can continue with the injection of the frame. The problem was that it was using readx_poll_timeout which could sleep in atomic context. This patch fixes this issue by using readx_poll_timeout_atomic. Fixes: d28d6d2 ("net: lan966x: add port module support") Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_main.c b/drivers/net/ethernet/microchip/lan966x/lan966x_main.c
@@ -182,9 +182,9 @@ static int lan966x_port_inj_ready(struct lan966x *lan966x, u8 grp)
 {
 	u32 val;
 
-	return readx_poll_timeout(lan966x_port_inj_status, lan966x, val,
-				  QS_INJ_STATUS_FIFO_RDY_GET(val) & BIT(grp),
-				  READL_SLEEP_US, READL_TIMEOUT_US);
+	return readx_poll_timeout_atomic(lan966x_port_inj_status, lan966x, val,
+					 QS_INJ_STATUS_FIFO_RDY_GET(val) & BIT(grp),
+					 READL_SLEEP_US, READL_TIMEOUT_US);
 }
 
 static int lan966x_port_ifh_xmit(struct sk_buff *skb,

Original file line number	Diff line number	Diff line change
`@@ -182,9 +182,9 @@ static int lan966x_port_inj_ready(struct lan966x *lan966x, u8 grp)`
`182`	`182`	`{`
`183`	`183`	`u32 val;`
`184`	`184`
`185`		`- return readx_poll_timeout(lan966x_port_inj_status, lan966x, val,`
`186`		`- QS_INJ_STATUS_FIFO_RDY_GET(val) & BIT(grp),`
`187`		`- READL_SLEEP_US, READL_TIMEOUT_US);`
	`185`	`+ return readx_poll_timeout_atomic(lan966x_port_inj_status, lan966x, val,`
	`186`	`+ QS_INJ_STATUS_FIFO_RDY_GET(val) & BIT(grp),`
	`187`	`+ READL_SLEEP_US, READL_TIMEOUT_US);`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`static int lan966x_port_ifh_xmit(struct sk_buff *skb,`