mt76: mt7915: fix polling firmware-own status

nbd168 · nbd168 · commit 71bb496ce17f · 2022-02-03T13:57:56.000+01:00
Check the register status bit instead of the trigger bit

Signed-off-by: Felix Fietkau &lt;nbd@nbd.name&gt;
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
@@ -2697,7 +2697,7 @@ static int mt7915_driver_own(struct mt7915_dev *dev)
 {
 	mt76_wr(dev, MT_TOP_LPCR_HOST_BAND0, MT_TOP_LPCR_HOST_DRV_OWN);
 	if (!mt76_poll_msec(dev, MT_TOP_LPCR_HOST_BAND0,
-			    MT_TOP_LPCR_HOST_FW_OWN, 0, 500)) {
+			    MT_TOP_LPCR_HOST_FW_OWN_STAT, 0, 500)) {
 		dev_err(dev->mt76.dev, "Timeout for driver own\n");
 		return -EIO;
 	}
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/regs.h b/drivers/net/wireless/mediatek/mt76/mt7915/regs.h
@@ -567,6 +567,7 @@
 #define MT_TOP_LPCR_HOST_BAND0		MT_TOP(0x10)
 #define MT_TOP_LPCR_HOST_FW_OWN		BIT(0)
 #define MT_TOP_LPCR_HOST_DRV_OWN	BIT(1)
+#define MT_TOP_LPCR_HOST_FW_OWN_STAT	BIT(2)
 
 #define MT_TOP_MISC			MT_TOP(0xf0)
 #define MT_TOP_MISC_FW_STATE		GENMASK(2, 0)

Original file line number	Diff line number	Diff line change
`@@ -2697,7 +2697,7 @@ static int mt7915_driver_own(struct mt7915_dev *dev)`
`2697`	`2697`	`{`
`2698`	`2698`	`mt76_wr(dev, MT_TOP_LPCR_HOST_BAND0, MT_TOP_LPCR_HOST_DRV_OWN);`
`2699`	`2699`	`if (!mt76_poll_msec(dev, MT_TOP_LPCR_HOST_BAND0,`
`2700`		`- MT_TOP_LPCR_HOST_FW_OWN, 0, 500)) {`
	`2700`	`+ MT_TOP_LPCR_HOST_FW_OWN_STAT, 0, 500)) {`
`2701`	`2701`	`dev_err(dev->mt76.dev, "Timeout for driver own\n");`
`2702`	`2702`	`return -EIO;`
`2703`	`2703`	`}`