Skip to contentSkip to conversation

scsi: hisi_sas: Undo RPM resume for failed notify phy event for v3 HW

PATCH Applied John Garry 2 participants 3 messages May 6, 2022 – May 17, 2022

Subsystems (2)
lore
Share & tools
lore

John Garry

author
#0 lore raw

PATCH 1/1 scsi: hisi_sas: Undo RPM resume for failed notify phy event for v3 HW

From: Xiang Chen <[email protected]>

If we fail to notify the phy up event then undo the RPM resume, as the phy up notify event handling pairs with that RPM resume.

---
Please consider for 5.19, thanks!

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +8 -2
index 79f87d7c3e68..7d819fc0395e 100644
@@ -1563,9 +1563,15 @@ static irqreturn_t phy_up_v3_hw(int phy_no, struct hisi_hba *hisi_hba)
 
 	phy->port_id = port_id;
 
-	/* Call pm_runtime_put_sync() with pairs in hisi_sas_phyup_pm_work() */
+	/*
+	 * Call pm_runtime_get_noresume() which pairs with
+	 * hisi_sas_phyup_pm_work() -> pm_runtime_put_sync().
+	 * For failure call pm_runtime_put() as we are in a hardirq context.
+	 */
 	pm_runtime_get_noresume(dev);
-	hisi_sas_notify_phy_event(phy, HISI_PHYE_PHY_UP_PM);
+	res = hisi_sas_notify_phy_event(phy, HISI_PHYE_PHY_UP_PM);
+	if (!res)
+		pm_runtime_put(dev);
 
 	res = IRQ_HANDLED;
 
Signature · 1 line
2.26.2
#1 lore raw

John,

Quoted 2 lines

If we fail to notify the phy up event then undo the RPM resume, as the phy up notify event handling pairs with that RPM resume.

Applied to 5.19/scsi-staging, thanks!

Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering