Commit 364718c9 authored by Deren Wu's avatar Deren Wu Committed by Felix Fietkau
Browse files

mt76: mt7921s: fix possible sdio deadlock in command fail 



Move sdio_release_host() to final resource handing

Fixes: b12deb5e ("mt76: mt7921s: fix mt7921s_mcu_[fw|drv]_pmctrl")
Reported-by: default avatarYN Chen <YN.Chen@mediatek.com>
Co-developed-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarDeren Wu <deren.wu@mediatek.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent f4a92547

drivers/net/wireless/mediatek/mt76/mt7921/sdio_mcu.c

+5 −5
Original line number Diff line number Diff line
@@ -135,8 +135,8 @@ int mt7921s_mcu_fw_pmctrl(struct mt7921_dev *dev) 
	struct sdio_func *func = dev->mt76.sdio.func;

	struct mt76_phy *mphy = &dev->mt76.phy;

	struct mt76_connac_pm *pm = &dev->pm;

	int err = 0;

	u32 status;

	int err;



	sdio_claim_host(func);
@@ -147,7 +147,7 @@ int mt7921s_mcu_fw_pmctrl(struct mt7921_dev *dev) 
					 2000, 1000000);

		if (err < 0) {

			dev_err(dev->mt76.dev, "mailbox ACK not cleared\n");

			goto err;

			goto out;

		}

	}
@@ -155,18 +155,18 @@ int mt7921s_mcu_fw_pmctrl(struct mt7921_dev *dev) 


	err = readx_poll_timeout(mt76s_read_pcr, &dev->mt76, status,

				 !(status & WHLPCR_IS_DRIVER_OWN), 2000, 1000000);

out:

	sdio_release_host(func);



err:

	if (err < 0) {

		dev_err(dev->mt76.dev, "firmware own failed\n");

		clear_bit(MT76_STATE_PM, &mphy->state);

		err = -EIO;

		return -EIO;

	}



	pm->stats.last_doze_event = jiffies;

	pm->stats.awake_time += pm->stats.last_doze_event -

				pm->stats.last_wake_event;



	return err;

	return 0;

}