Commit fa2648a3 authored by Tony Lindgren's avatar Tony Lindgren Committed by Kalle Valo
Browse files

wlcore: Add support for runtime PM 



We can update wlcore to use PM runtime by adding functions for
wlcore_runtime_suspend() and wlcore_runtime_resume() and replacing
calls to wl1271_ps_elp_wakeup() and wl1271_ps_elp_sleep() with calls
to pm_runtime_get_sync() and pm_runtime_put().

Note that the new wlcore_runtime_suspend() and wlcore_runtime_resume()
functions are based on simplified versions of wl1271_ps_elp_sleep() and
wl1271_ps_elp_wakeup().

We don't want to use the old functions as we can now take advantage of
the runtime PM usage count. And we don't need the old elp_work at all.
And we can also remove WL1271_FLAG_ELP_REQUESTED that is no longer needed.

Pretty much the only place where we are not just converting the existing
functions is wl1271_op_suspend() where we add pm_runtime_put_noidle()
to keep the calls paired.

As the next step is to implement runtime PM autosuspend, let's not add
wrapper functions for the generic runtime PM calls. We would be getting
rid of any wrapper functions anyways.

After autoidle we should be able to start using Linux generic wakeirqs
for the padconf interrupt.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 02edf813

drivers/net/wireless/ti/wl18xx/debugfs.c

+17 −9
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 
 *

 */



#include <linux/pm_runtime.h>



#include "../wlcore/debugfs.h"

#include "../wlcore/wlcore.h"

#include "../wlcore/debug.h"
@@ -276,15 +278,17 @@ static ssize_t radar_detection_write(struct file *file, 
	if (unlikely(wl->state != WLCORE_STATE_ON))

		goto out;



	ret = wl1271_ps_elp_wakeup(wl);

	if (ret < 0)

	ret = pm_runtime_get_sync(wl->dev);

	if (ret < 0) {

		pm_runtime_put_noidle(wl->dev);

		goto out;

	}



	ret = wl18xx_cmd_radar_detection_debug(wl, channel);

	if (ret < 0)

		count = ret;



	wl1271_ps_elp_sleep(wl);

	pm_runtime_put(wl->dev);

out:

	mutex_unlock(&wl->mutex);

	return count;
@@ -315,15 +319,17 @@ static ssize_t dynamic_fw_traces_write(struct file *file, 
	if (unlikely(wl->state != WLCORE_STATE_ON))

		goto out;



	ret = wl1271_ps_elp_wakeup(wl);

	if (ret < 0)

	ret = pm_runtime_get_sync(wl->dev);

	if (ret < 0) {

		pm_runtime_put_noidle(wl->dev);

		goto out;

	}



	ret = wl18xx_acx_dynamic_fw_traces(wl);

	if (ret < 0)

		count = ret;



	wl1271_ps_elp_sleep(wl);

	pm_runtime_put(wl->dev);

out:

	mutex_unlock(&wl->mutex);

	return count;
@@ -374,9 +380,11 @@ static ssize_t radar_debug_mode_write(struct file *file, 
	if (unlikely(wl->state != WLCORE_STATE_ON))

		goto out;



	ret = wl1271_ps_elp_wakeup(wl);

	if (ret < 0)

	ret = pm_runtime_get_sync(wl->dev);

	if (ret < 0) {

		pm_runtime_put_noidle(wl->dev);

		goto out;

	}



	wl12xx_for_each_wlvif_ap(wl, wlvif) {

		wlcore_cmd_generic_cfg(wl, wlvif,
@@ -384,7 +392,7 @@ static ssize_t radar_debug_mode_write(struct file *file, 
				       wl->radar_debug_mode, 0);

	}



	wl1271_ps_elp_sleep(wl);

	pm_runtime_put(wl->dev);

out:

	mutex_unlock(&wl->mutex);

	return count;

drivers/net/wireless/ti/wlcore/acx.c

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include "wlcore.h"

#include "debug.h"

#include "wl12xx_80211.h"

#include "ps.h"

#include "hw_ops.h"



int wl1271_acx_wake_up_conditions(struct wl1271 *wl, struct wl12xx_vif *wlvif,

drivers/net/wireless/ti/wlcore/cmd.c

+7 −4
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 


#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/pm_runtime.h>

#include <linux/spi/spi.h>

#include <linux/etherdevice.h>

#include <linux/ieee80211.h>
@@ -35,7 +36,6 @@ 
#include "wl12xx_80211.h"

#include "cmd.h"

#include "event.h"

#include "ps.h"

#include "tx.h"

#include "hw_ops.h"
@@ -192,9 +192,12 @@ int wlcore_cmd_wait_for_event_or_timeout(struct wl1271 *wl, 


	timeout_time = jiffies + msecs_to_jiffies(WL1271_EVENT_TIMEOUT);



	ret = wl1271_ps_elp_wakeup(wl);

	if (ret < 0)

	ret = pm_runtime_get_sync(wl->dev);

	if (ret < 0) {

		pm_runtime_put_noidle(wl->dev);



		return ret;

	}



	do {

		if (time_after(jiffies, timeout_time)) {
@@ -227,7 +230,7 @@ int wlcore_cmd_wait_for_event_or_timeout(struct wl1271 *wl, 
	} while (!event);



out:

	wl1271_ps_elp_sleep(wl);

	pm_runtime_put(wl->dev);

	kfree(events_vector);

	return ret;

}

drivers/net/wireless/ti/wlcore/debugfs.c

+49 −30
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/skbuff.h>

#include <linux/slab.h>

#include <linux/module.h>

#include <linux/pm_runtime.h>



#include "wlcore.h"

#include "debug.h"
@@ -65,9 +66,11 @@ void wl1271_debugfs_update_stats(struct wl1271 *wl) 
	if (unlikely(wl->state != WLCORE_STATE_ON))

		goto out;



	ret = wl1271_ps_elp_wakeup(wl);

	if (ret < 0)

	ret = pm_runtime_get_sync(wl->dev);

	if (ret < 0) {

		pm_runtime_put_noidle(wl->dev);

		goto out;

	}



	if (!wl->plt &&

	    time_after(jiffies, wl->stats.fw_stats_update +
@@ -76,7 +79,7 @@ void wl1271_debugfs_update_stats(struct wl1271 *wl) 
		wl->stats.fw_stats_update = jiffies;

	}



	wl1271_ps_elp_sleep(wl);

	pm_runtime_put(wl->dev);



out:

	mutex_unlock(&wl->mutex);
@@ -118,14 +121,17 @@ static void chip_op_handler(struct wl1271 *wl, unsigned long value, 
		return;

	}



	ret = wl1271_ps_elp_wakeup(wl);

	if (ret < 0)

	ret = pm_runtime_get_sync(wl->dev);

	if (ret < 0) {

		pm_runtime_put_noidle(wl->dev);



		return;

	}



	chip_op = arg;

	chip_op(wl);



	wl1271_ps_elp_sleep(wl);

	pm_runtime_put(wl->dev);

}
@@ -292,9 +298,11 @@ static ssize_t dynamic_ps_timeout_write(struct file *file, 
	if (unlikely(wl->state != WLCORE_STATE_ON))

		goto out;



	ret = wl1271_ps_elp_wakeup(wl);

	if (ret < 0)

	ret = pm_runtime_get_sync(wl->dev);

	if (ret < 0) {

		pm_runtime_put_noidle(wl->dev);

		goto out;

	}



	/* In case we're already in PSM, trigger it again to set new timeout

	 * immediately without waiting for re-association
@@ -305,7 +313,7 @@ static ssize_t dynamic_ps_timeout_write(struct file *file, 
			wl1271_ps_set_mode(wl, wlvif, STATION_AUTO_PS_MODE);

	}



	wl1271_ps_elp_sleep(wl);

	pm_runtime_put(wl->dev);



out:

	mutex_unlock(&wl->mutex);
@@ -359,9 +367,11 @@ static ssize_t forced_ps_write(struct file *file, 
	if (unlikely(wl->state != WLCORE_STATE_ON))

		goto out;



	ret = wl1271_ps_elp_wakeup(wl);

	if (ret < 0)

	ret = pm_runtime_get_sync(wl->dev);

	if (ret < 0) {

		pm_runtime_put_noidle(wl->dev);

		goto out;

	}



	/* In case we're already in PSM, trigger it again to switch mode

	 * immediately without waiting for re-association
@@ -374,7 +384,7 @@ static ssize_t forced_ps_write(struct file *file, 
			wl1271_ps_set_mode(wl, wlvif, ps_mode);

	}



	wl1271_ps_elp_sleep(wl);

	pm_runtime_put(wl->dev);



out:

	mutex_unlock(&wl->mutex);
@@ -838,15 +848,17 @@ static ssize_t rx_streaming_interval_write(struct file *file, 


	wl->conf.rx_streaming.interval = value;



	ret = wl1271_ps_elp_wakeup(wl);

	if (ret < 0)

	ret = pm_runtime_get_sync(wl->dev);

	if (ret < 0) {

		pm_runtime_put_noidle(wl->dev);

		goto out;

	}



	wl12xx_for_each_wlvif_sta(wl, wlvif) {

		wl1271_recalc_rx_streaming(wl, wlvif);

	}



	wl1271_ps_elp_sleep(wl);

	pm_runtime_put(wl->dev);

out:

	mutex_unlock(&wl->mutex);

	return count;
@@ -893,15 +905,17 @@ static ssize_t rx_streaming_always_write(struct file *file, 


	wl->conf.rx_streaming.always = value;



	ret = wl1271_ps_elp_wakeup(wl);

	if (ret < 0)

	ret = pm_runtime_get_sync(wl->dev);

	if (ret < 0) {

		pm_runtime_put_noidle(wl->dev);

		goto out;

	}



	wl12xx_for_each_wlvif_sta(wl, wlvif) {

		wl1271_recalc_rx_streaming(wl, wlvif);

	}



	wl1271_ps_elp_sleep(wl);

	pm_runtime_put(wl->dev);

out:

	mutex_unlock(&wl->mutex);

	return count;
@@ -940,15 +954,17 @@ static ssize_t beacon_filtering_write(struct file *file, 


	mutex_lock(&wl->mutex);



	ret = wl1271_ps_elp_wakeup(wl);

	if (ret < 0)

	ret = pm_runtime_get_sync(wl->dev);

	if (ret < 0) {

		pm_runtime_put_noidle(wl->dev);

		goto out;

	}



	wl12xx_for_each_wlvif(wl, wlvif) {

		ret = wl1271_acx_beacon_filter_opt(wl, wlvif, !!value);

	}



	wl1271_ps_elp_sleep(wl);

	pm_runtime_put(wl->dev);

out:

	mutex_unlock(&wl->mutex);

	return count;
@@ -1019,16 +1035,18 @@ static ssize_t sleep_auth_write(struct file *file, 
		goto out;

	}



	ret = wl1271_ps_elp_wakeup(wl);

	if (ret < 0)

	ret = pm_runtime_get_sync(wl->dev);

	if (ret < 0) {

		pm_runtime_put_noidle(wl->dev);

		goto out;

	}



	ret = wl1271_acx_sleep_auth(wl, value);

	if (ret < 0)

		goto out_sleep;



out_sleep:

	wl1271_ps_elp_sleep(wl);

	pm_runtime_put(wl->dev);

out:

	mutex_unlock(&wl->mutex);

	return count;
@@ -1083,7 +1101,7 @@ static ssize_t dev_mem_read(struct file *file, 
	 * Don't fail if elp_wakeup returns an error, so the device's memory

	 * could be read even if the FW crashed

	 */

	wl1271_ps_elp_wakeup(wl);

	pm_runtime_get_sync(wl->dev);



	/* store current partition and switch partition */

	memcpy(&old_part, &wl->curr_part, sizeof(old_part));
@@ -1102,7 +1120,7 @@ read_err: 
		goto part_err;



part_err:

	wl1271_ps_elp_sleep(wl);

	pm_runtime_put(wl->dev);



skip_read:

	mutex_unlock(&wl->mutex);
@@ -1164,7 +1182,7 @@ static ssize_t dev_mem_write(struct file *file, const char __user *user_buf, 
	 * Don't fail if elp_wakeup returns an error, so the device's memory

	 * could be read even if the FW crashed

	 */

	wl1271_ps_elp_wakeup(wl);

	pm_runtime_get_sync(wl->dev);



	/* store current partition and switch partition */

	memcpy(&old_part, &wl->curr_part, sizeof(old_part));
@@ -1183,7 +1201,7 @@ write_err: 
		goto part_err;



part_err:

	wl1271_ps_elp_sleep(wl);

	pm_runtime_put(wl->dev);



skip_write:

	mutex_unlock(&wl->mutex);
@@ -1247,8 +1265,9 @@ static ssize_t fw_logger_write(struct file *file, 
	}



	mutex_lock(&wl->mutex);

	ret = wl1271_ps_elp_wakeup(wl);

	ret = pm_runtime_get_sync(wl->dev);

	if (ret < 0) {

		pm_runtime_put_noidle(wl->dev);

		count = ret;

		goto out;

	}
@@ -1257,7 +1276,7 @@ static ssize_t fw_logger_write(struct file *file, 


	ret = wl12xx_cmd_config_fwlog(wl);



	wl1271_ps_elp_sleep(wl);

	pm_runtime_put(wl->dev);



out:

	mutex_unlock(&wl->mutex);

drivers/net/wireless/ti/wlcore/main.c

+295 −115

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE