Commit 1682fe6d authored by Ivo van Doorn's avatar Ivo van Doorn Committed by John W. Linville
Browse files

rt2x00: Add suspend/resume handlers to rt2x00rfkill



Add suspend/resume handlers to rt2x00rfkill to have it stop
the input-polldev and prevent it from calling rt2x00 during
suspend period. This could lead to a NULL pointer fault when
rt2x00 suspended, but polldev send a request, because
the csr_addr is NULL.

Also don't let the rfkill allocation/registration block
the initialization of the entire device. Just print a warning
and continue as if nothing happened.
Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f50e4a84
...@@ -620,6 +620,9 @@ struct rt2x00_dev { ...@@ -620,6 +620,9 @@ struct rt2x00_dev {
* This will only be compiled in when required. * This will only be compiled in when required.
*/ */
#ifdef CONFIG_RT2X00_LIB_RFKILL #ifdef CONFIG_RT2X00_LIB_RFKILL
unsigned long rfkill_state;
#define RFKILL_STATE_ALLOCATED 1
#define RFKILL_STATE_REGISTERED 2
struct rfkill *rfkill; struct rfkill *rfkill;
struct input_polled_dev *poll_dev; struct input_polled_dev *poll_dev;
#endif /* CONFIG_RT2X00_LIB_RFKILL */ #endif /* CONFIG_RT2X00_LIB_RFKILL */
......
...@@ -1098,7 +1098,7 @@ static void rt2x00lib_uninitialize(struct rt2x00_dev *rt2x00dev) ...@@ -1098,7 +1098,7 @@ static void rt2x00lib_uninitialize(struct rt2x00_dev *rt2x00dev)
return; return;
/* /*
* Unregister rfkill. * Unregister extra components.
*/ */
rt2x00rfkill_unregister(rt2x00dev); rt2x00rfkill_unregister(rt2x00dev);
...@@ -1139,11 +1139,9 @@ static int rt2x00lib_initialize(struct rt2x00_dev *rt2x00dev) ...@@ -1139,11 +1139,9 @@ static int rt2x00lib_initialize(struct rt2x00_dev *rt2x00dev)
__set_bit(DEVICE_INITIALIZED, &rt2x00dev->flags); __set_bit(DEVICE_INITIALIZED, &rt2x00dev->flags);
/* /*
* Register the rfkill handler. * Register the extra components.
*/ */
status = rt2x00rfkill_register(rt2x00dev); rt2x00rfkill_register(rt2x00dev);
if (status)
goto exit_unitialize;
return 0; return 0;
...@@ -1313,15 +1311,9 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev) ...@@ -1313,15 +1311,9 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev)
} }
/* /*
* Allocatie rfkill. * Register extra components.
*/
retval = rt2x00rfkill_allocate(rt2x00dev);
if (retval)
goto exit;
/*
* Open the debugfs entry.
*/ */
rt2x00rfkill_allocate(rt2x00dev);
rt2x00debug_register(rt2x00dev); rt2x00debug_register(rt2x00dev);
__set_bit(DEVICE_PRESENT, &rt2x00dev->flags); __set_bit(DEVICE_PRESENT, &rt2x00dev->flags);
...@@ -1350,13 +1342,9 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev) ...@@ -1350,13 +1342,9 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev)
rt2x00lib_uninitialize(rt2x00dev); rt2x00lib_uninitialize(rt2x00dev);
/* /*
* Close debugfs entry. * Free extra components
*/ */
rt2x00debug_deregister(rt2x00dev); rt2x00debug_deregister(rt2x00dev);
/*
* Free rfkill
*/
rt2x00rfkill_free(rt2x00dev); rt2x00rfkill_free(rt2x00dev);
/* /*
...@@ -1395,11 +1383,15 @@ int rt2x00lib_suspend(struct rt2x00_dev *rt2x00dev, pm_message_t state) ...@@ -1395,11 +1383,15 @@ int rt2x00lib_suspend(struct rt2x00_dev *rt2x00dev, pm_message_t state)
__set_bit(DEVICE_STARTED_SUSPEND, &rt2x00dev->flags); __set_bit(DEVICE_STARTED_SUSPEND, &rt2x00dev->flags);
/* /*
* Disable radio and unitialize all items * Disable radio.
* that must be recreated on resume.
*/ */
rt2x00lib_stop(rt2x00dev); rt2x00lib_stop(rt2x00dev);
rt2x00lib_uninitialize(rt2x00dev); rt2x00lib_uninitialize(rt2x00dev);
/*
* Suspend/disable extra components.
*/
rt2x00rfkill_suspend(rt2x00dev);
rt2x00debug_deregister(rt2x00dev); rt2x00debug_deregister(rt2x00dev);
exit: exit:
...@@ -1422,9 +1414,10 @@ int rt2x00lib_resume(struct rt2x00_dev *rt2x00dev) ...@@ -1422,9 +1414,10 @@ int rt2x00lib_resume(struct rt2x00_dev *rt2x00dev)
NOTICE(rt2x00dev, "Waking up.\n"); NOTICE(rt2x00dev, "Waking up.\n");
/* /*
* Open the debugfs entry. * Restore/enable extra components.
*/ */
rt2x00debug_register(rt2x00dev); rt2x00debug_register(rt2x00dev);
rt2x00rfkill_resume(rt2x00dev);
/* /*
* Only continue if mac80211 had open interfaces. * Only continue if mac80211 had open interfaces.
......
...@@ -100,28 +100,36 @@ static inline void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev, ...@@ -100,28 +100,36 @@ static inline void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev,
* RFkill handlers. * RFkill handlers.
*/ */
#ifdef CONFIG_RT2X00_LIB_RFKILL #ifdef CONFIG_RT2X00_LIB_RFKILL
int rt2x00rfkill_register(struct rt2x00_dev *rt2x00dev); void rt2x00rfkill_register(struct rt2x00_dev *rt2x00dev);
void rt2x00rfkill_unregister(struct rt2x00_dev *rt2x00dev); void rt2x00rfkill_unregister(struct rt2x00_dev *rt2x00dev);
int rt2x00rfkill_allocate(struct rt2x00_dev *rt2x00dev); void rt2x00rfkill_allocate(struct rt2x00_dev *rt2x00dev);
void rt2x00rfkill_free(struct rt2x00_dev *rt2x00dev); void rt2x00rfkill_free(struct rt2x00_dev *rt2x00dev);
void rt2x00rfkill_suspend(struct rt2x00_dev *rt2x00dev);
void rt2x00rfkill_resume(struct rt2x00_dev *rt2x00dev);
#else #else
static inline int rt2x00rfkill_register(struct rt2x00_dev *rt2x00dev) static inline void rt2x00rfkill_register(struct rt2x00_dev *rt2x00dev)
{ {
return 0;
} }
static inline void rt2x00rfkill_unregister(struct rt2x00_dev *rt2x00dev) static inline void rt2x00rfkill_unregister(struct rt2x00_dev *rt2x00dev)
{ {
} }
static inline int rt2x00rfkill_allocate(struct rt2x00_dev *rt2x00dev) static inline void rt2x00rfkill_allocate(struct rt2x00_dev *rt2x00dev)
{ {
return 0;
} }
static inline void rt2x00rfkill_free(struct rt2x00_dev *rt2x00dev) static inline void rt2x00rfkill_free(struct rt2x00_dev *rt2x00dev)
{ {
} }
static inline void rt2x00rfkill_suspend(struct rt2x00_dev *rt2x00dev)
{
}
static inline void rt2x00rfkill_resume(struct rt2x00_dev *rt2x00dev)
{
}
#endif /* CONFIG_RT2X00_LIB_RFKILL */ #endif /* CONFIG_RT2X00_LIB_RFKILL */
#endif /* RT2X00LIB_H */ #endif /* RT2X00LIB_H */
...@@ -69,56 +69,81 @@ static void rt2x00rfkill_poll(struct input_polled_dev *poll_dev) ...@@ -69,56 +69,81 @@ static void rt2x00rfkill_poll(struct input_polled_dev *poll_dev)
} }
} }
int rt2x00rfkill_register(struct rt2x00_dev *rt2x00dev) void rt2x00rfkill_register(struct rt2x00_dev *rt2x00dev)
{ {
int retval; if (!test_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags) ||
!test_bit(RFKILL_STATE_ALLOCATED, &rt2x00dev->rfkill_state))
if (!test_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags)) return;
return 0;
retval = rfkill_register(rt2x00dev->rfkill); if (rfkill_register(rt2x00dev->rfkill)) {
if (retval) {
ERROR(rt2x00dev, "Failed to register rfkill handler.\n"); ERROR(rt2x00dev, "Failed to register rfkill handler.\n");
return retval; return;
} }
retval = input_register_polled_device(rt2x00dev->poll_dev); if (input_register_polled_device(rt2x00dev->poll_dev)) {
if (retval) {
ERROR(rt2x00dev, "Failed to register polled device.\n"); ERROR(rt2x00dev, "Failed to register polled device.\n");
rfkill_unregister(rt2x00dev->rfkill); rfkill_unregister(rt2x00dev->rfkill);
return retval; return;
} }
__set_bit(RFKILL_STATE_REGISTERED, &rt2x00dev->rfkill_state);
/* /*
* Force initial poll which will detect the initial device state, * Force initial poll which will detect the initial device state,
* and correctly sends the signal to the rfkill layer about this * and correctly sends the signal to the rfkill layer about this
* state. * state.
*/ */
rt2x00rfkill_poll(rt2x00dev->poll_dev); rt2x00rfkill_poll(rt2x00dev->poll_dev);
return 0;
} }
void rt2x00rfkill_unregister(struct rt2x00_dev *rt2x00dev) void rt2x00rfkill_unregister(struct rt2x00_dev *rt2x00dev)
{ {
if (!test_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags)) if (!test_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags) ||
!test_bit(RFKILL_STATE_REGISTERED, &rt2x00dev->rfkill_state))
return; return;
input_unregister_polled_device(rt2x00dev->poll_dev); input_unregister_polled_device(rt2x00dev->poll_dev);
rfkill_unregister(rt2x00dev->rfkill); rfkill_unregister(rt2x00dev->rfkill);
__clear_bit(RFKILL_STATE_REGISTERED, &rt2x00dev->rfkill_state);
} }
int rt2x00rfkill_allocate(struct rt2x00_dev *rt2x00dev) static struct input_polled_dev *
rt2x00rfkill_allocate_polldev(struct rt2x00_dev *rt2x00dev)
{ {
struct device *device = wiphy_dev(rt2x00dev->hw->wiphy); struct input_polled_dev *poll_dev;
poll_dev = input_allocate_polled_device();
if (!poll_dev)
return NULL;
poll_dev->private = rt2x00dev;
poll_dev->poll = rt2x00rfkill_poll;
poll_dev->poll_interval = RFKILL_POLL_INTERVAL;
poll_dev->input->name = rt2x00dev->ops->name;
poll_dev->input->phys = wiphy_name(rt2x00dev->hw->wiphy);
poll_dev->input->id.bustype = BUS_HOST;
poll_dev->input->id.vendor = 0x1814;
poll_dev->input->id.product = rt2x00dev->chip.rt;
poll_dev->input->id.version = rt2x00dev->chip.rev;
poll_dev->input->dev.parent = wiphy_dev(rt2x00dev->hw->wiphy);
poll_dev->input->evbit[0] = BIT(EV_KEY);
set_bit(KEY_WLAN, poll_dev->input->keybit);
return poll_dev;
}
void rt2x00rfkill_allocate(struct rt2x00_dev *rt2x00dev)
{
if (!test_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags)) if (!test_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags))
return 0; return;
rt2x00dev->rfkill = rfkill_allocate(device, RFKILL_TYPE_WLAN); rt2x00dev->rfkill =
rfkill_allocate(wiphy_dev(rt2x00dev->hw->wiphy), RFKILL_TYPE_WLAN);
if (!rt2x00dev->rfkill) { if (!rt2x00dev->rfkill) {
ERROR(rt2x00dev, "Failed to allocate rfkill handler.\n"); ERROR(rt2x00dev, "Failed to allocate rfkill handler.\n");
goto exit; return;
} }
rt2x00dev->rfkill->name = rt2x00dev->ops->name; rt2x00dev->rfkill->name = rt2x00dev->ops->name;
...@@ -126,40 +151,49 @@ int rt2x00rfkill_allocate(struct rt2x00_dev *rt2x00dev) ...@@ -126,40 +151,49 @@ int rt2x00rfkill_allocate(struct rt2x00_dev *rt2x00dev)
rt2x00dev->rfkill->state = -1; rt2x00dev->rfkill->state = -1;
rt2x00dev->rfkill->toggle_radio = rt2x00rfkill_toggle_radio; rt2x00dev->rfkill->toggle_radio = rt2x00rfkill_toggle_radio;
rt2x00dev->poll_dev = input_allocate_polled_device(); rt2x00dev->poll_dev = rt2x00rfkill_allocate_polldev(rt2x00dev);
if (!rt2x00dev->poll_dev) { if (!rt2x00dev->poll_dev) {
ERROR(rt2x00dev, "Failed to allocate polled device.\n"); ERROR(rt2x00dev, "Failed to allocate polled device.\n");
goto exit_free_rfkill; rfkill_free(rt2x00dev->rfkill);
rt2x00dev->rfkill = NULL;
return;
} }
rt2x00dev->poll_dev->private = rt2x00dev; return;
rt2x00dev->poll_dev->poll = rt2x00rfkill_poll; }
rt2x00dev->poll_dev->poll_interval = RFKILL_POLL_INTERVAL;
rt2x00dev->poll_dev->input->name = rt2x00dev->ops->name; void rt2x00rfkill_free(struct rt2x00_dev *rt2x00dev)
rt2x00dev->poll_dev->input->phys = wiphy_name(rt2x00dev->hw->wiphy); {
rt2x00dev->poll_dev->input->id.bustype = BUS_HOST; if (!test_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags) ||
rt2x00dev->poll_dev->input->id.vendor = 0x1814; !test_bit(RFKILL_STATE_ALLOCATED, &rt2x00dev->rfkill_state))
rt2x00dev->poll_dev->input->id.product = rt2x00dev->chip.rt; return;
rt2x00dev->poll_dev->input->id.version = rt2x00dev->chip.rev;
rt2x00dev->poll_dev->input->dev.parent = device;
rt2x00dev->poll_dev->input->evbit[0] = BIT(EV_KEY);
set_bit(KEY_WLAN, rt2x00dev->poll_dev->input->keybit);
return 0; input_free_polled_device(rt2x00dev->poll_dev);
rt2x00dev->poll_dev = NULL;
exit_free_rfkill:
rfkill_free(rt2x00dev->rfkill); rfkill_free(rt2x00dev->rfkill);
rt2x00dev->rfkill = NULL;
exit:
return -ENOMEM;
} }
void rt2x00rfkill_free(struct rt2x00_dev *rt2x00dev) void rt2x00rfkill_suspend(struct rt2x00_dev *rt2x00dev)
{ {
if (!test_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags)) if (!test_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags) ||
!test_bit(RFKILL_STATE_ALLOCATED, &rt2x00dev->rfkill_state))
return; return;
input_free_polled_device(rt2x00dev->poll_dev); input_free_polled_device(rt2x00dev->poll_dev);
rfkill_free(rt2x00dev->rfkill); rt2x00dev->poll_dev = NULL;
}
void rt2x00rfkill_resume(struct rt2x00_dev *rt2x00dev)
{
if (!test_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags) ||
!test_bit(RFKILL_STATE_ALLOCATED, &rt2x00dev->rfkill_state))
return;
rt2x00dev->poll_dev = rt2x00rfkill_allocate_polldev(rt2x00dev);
if (!rt2x00dev->poll_dev) {
ERROR(rt2x00dev, "Failed to allocate polled device.\n");
return;
}
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment