rtw88: use a for loop in rtw_power_mode_change(), not goto (4ee2f342) · Commits · 戴 / test

drivers/net/wireless/realtek/rtw88/ps.c

+29 −32

Original line number	Diff line number	Diff line
		@@ -69,7 +69,7 @@ void rtw_power_mode_change(struct rtw_dev *rtwdev, bool enter)
		u8 polling_cnt;
		u8 retry_cnt = 0;

		retry:
		for (retry_cnt = 0; retry_cnt < 3; retry_cnt++) {
		request = rtw_read8(rtwdev, rtwdev->hci.rpwm_addr);
		confirm = rtw_read8(rtwdev, rtwdev->hci.cpwm_addr);

		@@ -85,8 +85,10 @@ retry:

		rtw_write8(rtwdev, rtwdev->hci.rpwm_addr, request);

		if (enter)
		return;

		/* check confirm power mode has left power save state */
		if (!enter) {
		for (polling_cnt = 0; polling_cnt < 3; polling_cnt++) {
		polling = rtw_read8(rtwdev, rtwdev->hci.cpwm_addr);
		if ((polling ^ confirm) & BIT_RPWM_TOGGLE)
		@@ -94,24 +96,19 @@ retry:
		mdelay(20);
		}

		/* in case of fw/hw missed the request, retry 3 times */
		if (retry_cnt < 3) {
		/* in case of fw/hw missed the request, retry */
		rtw_warn(rtwdev, "failed to leave deep PS, retry=%d\n",
		retry_cnt);
		retry_cnt++;
		goto retry;
		}

		/* Hit here means that driver failed to change hardware
		* power mode to active state after retry 3 times.
		* If the power state is locked at Deep sleep, most of
		* the hardware circuits is not working, even register
		* read/write. It should be treated as fatal error and
		/* Hit here means that driver failed to change hardware power mode to
		* active state after retry 3 times. If the power state is locked at
		* Deep sleep, most of the hardware circuits is not working, even
		* register read/write. It should be treated as fatal error and
		* requires an entire analysis about the firmware/hardware
		*/
		WARN(1, "Hardware power state locked\n");
		}
		}
		EXPORT_SYMBOL(rtw_power_mode_change);

		static void __rtw_leave_lps_deep(struct rtw_dev *rtwdev)

Admin message