adapter: Keep track of whether the adapter is rfkill'ed
PATCH v6 1/6 adapter: Keep track of whether the adapter is rfkill'ed
Instead of only replying to D-Bus requests with an error saying the adapter is blocked, keep track of the rfkill being enabled or disabled so we know the rfkill state of the adapter at all times.
--- src/adapter.c | 25 +++++++++++++++++-- src/adapter.h | 1 + src/btd.h | 1 + src/rfkill.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++-- 4 files changed, 91 insertions(+), 4 deletions(-)
src/adapter.c +23 -2
@@ -250,6 +250,7 @@ struct btd_adapter {uint32_t dev_class;/* controller class of device */ char *name;/* controller device name */ char *short_name;/* controller short name */ +bool blocked;/* whether rfkill is enabled */ uint32_t supported_settings;/* controller supported settings */ uint32_t pending_settings;/* pending controller settings */ uint32_t current_settings;/* current controller settings */
@@ -654,6 +655,8 @@ static void set_mode_complete(uint8_t status, uint16_t length,if (status !=MGMT_STATUS_SUCCESS ) {btd_error (adapter->dev_id,"Failed to set mode: %s (0x%02x)" ,mgmt_errstr (status), status); +if (status ==MGMT_STATUS_RFKILLED ) + adapter->blocked = true; adapter->pending_settings &= ~data->setting;return ; }
@@ -2947,10 +2950,12 @@ static void property_set_mode_complete(uint8_t status, uint16_t length,btd_error (adapter->dev_id,"Failed to set mode: %s (0x%02x)" ,mgmt_errstr (status), status); -if (status ==MGMT_STATUS_RFKILLED ) +if (status ==MGMT_STATUS_RFKILLED ) { dbus_err =ERROR_INTERFACE ".Blocked" ; -else + adapter->blocked = true; + }else { dbus_err =ERROR_INTERFACE ".Failed" ; + }g_dbus_pending_property_error (data->id, dbus_err,mgmt_errstr (status));
@@ -6681,6 +6686,7 @@ static void load_config(struct btd_adapter *adapter)static struct btd_adapter *btd_adapter_new (uint16_t index) {struct btd_adapter *adapter; +int blocked; adapter = g_try_new0(struct btd_adapter, 1);if (!adapter)
@@ -6689,6 +6695,9 @@ static struct btd_adapter *btd_adapter_new(uint16_t index) adapter->dev_id = index; adapter->mgmt =mgmt_ref (mgmt_primary); adapter->pincode_requested = false; + blocked =rfkill_get_blocked (index); +if (blocked >0 ) + adapter->blocked = true;/* * Setup default configuration values. These are either adapter
@@ -6714,6 +6723,8 @@ static struct btd_adapter *btd_adapter_new(uint16_t index)DBG ("Modalias: %s" , adapter->modalias);DBG ("Discoverable timeout: %u seconds" , adapter->discoverable_timeout);DBG ("Pairable timeout: %u seconds" , adapter->pairable_timeout); +if (blocked >0 ) +DBG ("Blocked: yes" ); adapter->auths =g_queue_new (); adapter->exps =queue_new ();
@@ -7581,6 +7592,9 @@ int btd_cancel_authorization(guint id)int btd_adapter_restore_powered (struct btd_adapter *adapter) { +if (adapter->blocked) + adapter->blocked = false; +if (btd_adapter_get_powered (adapter))return 0 ;
@@ -7589,6 +7603,13 @@ int btd_adapter_restore_powered(struct btd_adapter *adapter)return 0 ; } +int btd_adapter_set_blocked (struct btd_adapter *adapter) +{ +if (!adapter->blocked) + adapter->blocked = true; +return 0 ; +} +void btd_adapter_register_pin_cb (struct btd_adapter *adapter,btd_adapter_pin_cb_t cb) {
src/adapter.h +1 -0
@@ -144,6 +144,7 @@ guint btd_request_authorization_cable_configured(const bdaddr_t *src, const bdadint btd_cancel_authorization (guint id);int btd_adapter_restore_powered (struct btd_adapter *adapter); +int btd_adapter_set_blocked (struct btd_adapter *adapter); typedef ssize_t (*btd_adapter_pin_cb_t) (struct btd_adapter *adapter, struct btd_device *dev, char *out, bool *display,
src/btd.h +1 -0
@@ -144,6 +144,7 @@ void plugin_cleanup(void);void rfkill_init (void );void rfkill_exit (void ); +int rfkill_get_blocked (uint16_t index);GKeyFile *btd_get_main_conf (void );bool btd_kernel_experimental_enabled (const char *uuid);
src/rfkill.c +66 -2
92 lines not on this page · raw message
Signature · 1 line
2.37.2
PATCH v6 2/6 adapter: Implement PowerState property
This property should allow any program to show whether an adapter is in the process of being turned on.
As turning on an adapter isn't instantaneous, it's important that the UI reflects the transitional state of the adapter's power, and doesn't assume the device is already turned on but not yet working, or still off despite having requested for it to be turned on, in both cases making the UI feel unresponsive.
This can also not be implemented in front-ends directly as, then, the status of an adapter wouldn't be reflected correctly in the Settings window if it's turned on in the system menu. Implementing it in the front-ends would also preclude from having feedback about the state of the adapter when bluetoothd is the one powering up the adapter after the rfkill was unblocked.
See https://gitlab.gnome.org/GNOME/gnome-bluetooth/-/issues/121
and the original https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5773
--- src/adapter.c | 135 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 124 insertions(+), 11 deletions(-)
src/adapter.c +124 -11
@@ -239,6 +239,14 @@ struct btd_adapter_pin_cb_iter {/* When the iterator reaches the end, it is NULL and attempt is 0 */ }; +enum { +ADAPTER_POWER_STATE_OFF , +ADAPTER_POWER_STATE_ON , +ADAPTER_POWER_STATE_ON_DISABLING , +ADAPTER_POWER_STATE_OFF_ENABLING , +ADAPTER_POWER_STATE_OFF_BLOCKED , +}; +struct btd_adapter {int ref_count;
@@ -250,9 +258,9 @@ struct btd_adapter {uint32_t dev_class;/* controller class of device */ char *name;/* controller device name */ char *short_name;/* controller short name */ -bool blocked;/* whether rfkill is enabled */ uint32_t supported_settings;/* controller supported settings */ uint32_t pending_settings;/* pending controller settings */ +uint32_t power_state;/* the power state */ uint32_t current_settings;/* current controller settings */ char *path;/* adapter object path */
@@ -326,6 +334,24 @@ struct btd_adapter {struct queue *exps; }; +static char *adapter_power_state_str (uint32_t power_state) +{ +switch (power_state) { +case ADAPTER_POWER_STATE_OFF : +return "off" ; +case ADAPTER_POWER_STATE_ON : +return "on" ; +case ADAPTER_POWER_STATE_ON_DISABLING : +return "on-disabling" ; +case ADAPTER_POWER_STATE_OFF_ENABLING : +return "off-enabling" ; +case ADAPTER_POWER_STATE_OFF_BLOCKED : +return "off-blocked" ; + } +DBG ("Invalid power state %d" , power_state); +return "" ; +} + typedef enum { ADAPTER_AUTHORIZE_DISCONNECTED = 0, ADAPTER_AUTHORIZE_CHECK_CONNECTED
@@ -619,6 +645,28 @@ static void settings_changed(struct btd_adapter *adapter, uint32_t settings) } } +static void adapter_set_power_state (struct btd_adapter *adapter,uint32_t value) +{ +if (adapter->power_state == value) +return ; + +DBG ("%s" ,adapter_power_state_str (value)); + adapter->power_state = value; +g_dbus_emit_property_changed (dbus_conn, adapter->path, +ADAPTER_INTERFACE ,"PowerState" ); +} + +static void reset_power_state_target (struct btd_adapter *adapter,uint32_t value) +{ +if (value && + adapter->power_state ==ADAPTER_POWER_STATE_OFF_ENABLING ) { +adapter_set_power_state (adapter,ADAPTER_POWER_STATE_ON ); + }else if (!value && + adapter->power_state ==ADAPTER_POWER_STATE_ON_DISABLING ) { +adapter_set_power_state (adapter,ADAPTER_POWER_STATE_OFF ); + } +} +static void new_settings_callback (uint16_t index,uint16_t length,const void *param,void *user_data) {
@@ -636,6 +684,12 @@ static void new_settings_callback(uint16_t index, uint16_t length,if (settings == adapter->current_settings)return ; +if ((adapter->current_settings ^ settings) &MGMT_SETTING_POWERED ) { +reset_power_state_target (adapter, + settings &MGMT_SETTING_POWERED ? +0x01 :0x00 ); + } +DBG ("Settings: 0x%08x" , settings);settings_changed (adapter, settings);
@@ -644,6 +698,7 @@ static void new_settings_callback(uint16_t index, uint16_t length,struct set_mode_data {struct btd_adapter *adapter;uint32_t setting; +uint8_t value; }; static void set_mode_complete(uint8_t status, uint16_t length,
@@ -656,8 +711,11 @@ static void set_mode_complete(uint8_t status, uint16_t length,btd_error (adapter->dev_id,"Failed to set mode: %s (0x%02x)" ,mgmt_errstr (status), status);if (status ==MGMT_STATUS_RFKILLED ) - adapter->blocked = true; +adapter_set_power_state (adapter,ADAPTER_POWER_STATE_OFF_BLOCKED ); adapter->pending_settings &= ~data->setting; +if (status !=MGMT_STATUS_RFKILLED && + data->setting &MGMT_SETTING_POWERED ) +reset_power_state_target (adapter, data->value);return ; }
@@ -695,6 +753,11 @@ static bool set_mode(struct btd_adapter *adapter, uint16_t opcode,switch (opcode) {case MGMT_OP_SET_POWERED : setting =MGMT_SETTING_POWERED ; +if (adapter->power_state !=ADAPTER_POWER_STATE_OFF_BLOCKED ) { +adapter_set_power_state (adapter, mode ? +ADAPTER_POWER_STATE_OFF_ENABLING : +ADAPTER_POWER_STATE_ON_DISABLING ); + }break ;case MGMT_OP_SET_CONNECTABLE : setting =MGMT_SETTING_CONNECTABLE ;
@@ -715,6 +778,7 @@ static bool set_mode(struct btd_adapter *adapter, uint16_t opcode, data = g_new0(struct set_mode_data, 1); data->adapter = adapter; data->setting = setting; + data->value = mode; if (mgmt_send(adapter->mgmt, opcode, adapter->dev_id, sizeof(cp), &cp,
@@ -722,8 +786,13 @@ static bool set_mode(struct btd_adapter *adapter, uint16_t opcode, adapter->pending_settings |= setting;return true; } -g_free (data); +if (setting ==MGMT_SETTING_POWERED ) { +/* cancel the earlier setting */ +adapter_set_power_state (adapter, mode ? +ADAPTER_POWER_STATE_OFF : +ADAPTER_POWER_STATE_ON ); + }btd_error (adapter->dev_id,"Failed to set mode for index %u" , adapter->dev_id);
@@ -2934,6 +3003,7 @@ struct property_set_data {struct btd_adapter *adapter;uint32_t setting;GDBusPendingPropertySet id; +uint8_t value; }; static void property_set_mode_complete(uint8_t status, uint16_t length,
@@ -2952,7 +3022,7 @@ static void property_set_mode_complete(uint8_t status, uint16_t length,if (status ==MGMT_STATUS_RFKILLED ) { dbus_err =ERROR_INTERFACE ".Blocked" ; - adapter->blocked = true; +adapter_set_power_state (adapter,ADAPTER_POWER_STATE_OFF_BLOCKED ); }else { dbus_err =ERROR_INTERFACE ".Failed" ; }
@@ -2961,6 +3031,9 @@ static void property_set_mode_complete(uint8_t status, uint16_t length, mgmt_errstr(status)); adapter->pending_settings &= ~data->setting; +if (status !=MGMT_STATUS_RFKILLED && + data->setting &MGMT_SETTING_POWERED ) +reset_power_state_target (adapter, data->value);return ; }
@@ -3084,6 +3157,15 @@ static void property_set_mode(struct btd_adapter *adapter, uint32_t setting, data->adapter = adapter; data->setting = setting; data->id = id; + data->setting = setting; + data->value = mode; + +if (setting ==MGMT_SETTING_POWERED && + adapter->power_state !=ADAPTER_POWER_STATE_OFF_BLOCKED ) { +adapter_set_power_state (adapter, mode ? +ADAPTER_POWER_STATE_OFF_ENABLING : +ADAPTER_POWER_STATE_ON_DISABLING ); + }if (mgmt_send (adapter->mgmt, opcode, adapter->dev_id, len, param, property_set_mode_complete, data, g_free) >0 ) {
@@ -3092,6 +3174,12 @@ static void property_set_mode(struct btd_adapter *adapter, uint32_t setting, }g_free (data); +if (setting ==MGMT_SETTING_POWERED ) { +/* cancel the earlier setting */ +adapter_set_power_state (adapter, mode ? +ADAPTER_POWER_STATE_OFF : +ADAPTER_POWER_STATE_ON ); + } failed: btd_error(adapter->dev_id, "Failed to set mode for index %u",
@@ -3123,6 +3211,18 @@ static void property_set_powered(const GDBusPropertyTable *property,property_set_mode (adapter,MGMT_SETTING_POWERED , iter, id); } +static gboolean property_get_power_state (const GDBusPropertyTable *property, +DBusMessageIter *iter,void *user_data) +{ +struct btd_adapter *adapter = user_data; +const char *str; + + str =adapter_power_state_str (adapter->power_state); +dbus_message_iter_append_basic (iter,DBUS_TYPE_STRING , &str); + +return TRUE; +} +static gboolean property_get_discoverable (const GDBusPropertyTable *property,DBusMessageIter *iter,void *user_data) {
@@ -3761,6 +3861,8 @@ static const GDBusPropertyTable adapter_properties[] = { { "Alias", "s", property_get_alias, property_set_alias }, { "Class", "u", property_get_class }, { "Powered", "b", property_get_powered, property_set_powered }, + { "PowerState", "s", property_get_power_state, NULL, NULL, + G_DBUS_PROPERTY_FLAG_EXPERIMENTAL }, { "Discoverable", "b", property_get_discoverable, property_set_discoverable }, { "DiscoverableTimeout", "u", property_get_discoverable_timeout,
@@ -5567,6 +5669,7 @@ static void adapter_start(struct btd_adapter *adapter) {g_dbus_emit_property_changed (dbus_conn, adapter->path,ADAPTER_INTERFACE ,"Powered" ); +adapter_set_power_state (adapter,ADAPTER_POWER_STATE_ON );DBG ("adapter %s has been enabled" , adapter->path);
@@ -6697,7 +6800,7 @@ static struct btd_adapter *btd_adapter_new(uint16_t index) adapter->pincode_requested = false; blocked =rfkill_get_blocked (index);if (blocked >0 ) - adapter->blocked = true; + adapter->power_state =ADAPTER_POWER_STATE_OFF_BLOCKED ;/* * Setup default configuration values. These are either adapter
@@ -6724,7 +6827,7 @@ static struct btd_adapter *btd_adapter_new(uint16_t index)DBG ("Discoverable timeout: %u seconds" , adapter->discoverable_timeout);DBG ("Pairable timeout: %u seconds" , adapter->pairable_timeout);if (blocked >0 ) -DBG ("Blocked: yes" ); +DBG ("Power state: %s" ,adapter_power_state_str (adapter->power_state)); adapter->auths =g_queue_new (); adapter->exps =queue_new ();
@@ -7316,6 +7419,9 @@ static void adapter_stop(struct btd_adapter *adapter)g_dbus_emit_property_changed (dbus_conn, adapter->path,ADAPTER_INTERFACE ,"Powered" ); +g_dbus_emit_property_changed (dbus_conn, adapter->path, +ADAPTER_INTERFACE , +"PowerState" );DBG ("adapter %s has been disabled" , adapter->path); }
@@ -7592,10 +7698,18 @@ int btd_cancel_authorization(guint id)int btd_adapter_restore_powered (struct btd_adapter *adapter) { -if (adapter->blocked) - adapter->blocked = false; +bool powered; -if (btd_adapter_get_powered (adapter)) + powered =btd_adapter_get_powered (adapter); +if (adapter->power_state ==ADAPTER_POWER_STATE_OFF_BLOCKED && +rfkill_get_blocked (adapter->dev_id) ==0 ) { +adapter_set_power_state (adapter, + powered ? +ADAPTER_POWER_STATE_ON : +ADAPTER_POWER_STATE_OFF ); + } + +if (powered)return 0 ;set_mode (adapter,MGMT_OP_SET_POWERED ,0x01 );
@@ -7605,8 +7719,7 @@ int btd_adapter_restore_powered(struct btd_adapter *adapter)int btd_adapter_set_blocked (struct btd_adapter *adapter) { -if (!adapter->blocked) - adapter->blocked = true; +adapter_set_power_state (adapter,ADAPTER_POWER_STATE_OFF_BLOCKED );return 0 ; }
Signature · 1 line
2.37.2
PATCH v6 3/6 client: Print the PowerState property
In reply to Bastien Nocera--- client/main.c | 1 + 1 file changed, 1 insertion(+)
client/main.c +1 -0
@@ -981,6 +981,7 @@ static void cmd_show(int argc, char *argv[])print_property (adapter->proxy,"Alias" );print_property (adapter->proxy,"Class" );print_property (adapter->proxy,"Powered" ); +print_property (adapter->proxy,"PowerState" );print_property (adapter->proxy,"Discoverable" );print_property (adapter->proxy,"DiscoverableTimeout" );print_property (adapter->proxy,"Pairable" );
Signature · 1 line
2.37.2
PATCH v6 4/6 adapter-api: Add PowerState property documentation
In reply to Bastien Nocera--- doc/adapter-api.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
doc/adapter-api.txt +15 -0
@@ -269,6 +269,21 @@ Properties string Address [readonly] restart or unplugging of the adapter it will reset back to false. + string PowerState [readonly, experimental] + + The power state of an adapter. + + The power state will show whether the adapter is + turning off, or turning on, as well as being on + or off. + + Possible values: + "on" - powered on + "off" - powered off + "off-enabling" - transitioning from "off" to "on" + "on-disabling" - transitioning from "on" to "off" + "off-blocked" - blocked by rfkill + boolean Discoverable [readwrite] Switch an adapter to discoverable or non-discoverable
Signature · 1 line
2.37.2
PATCH v6 5/6 adapter: Fix typo in function name
In reply to Bastien Nocera--- src/adapter.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
src/adapter.c +2 -2
@@ -3508,7 +3508,7 @@ static gboolean property_get_experimental(const GDBusPropertyTable *property,return TRUE; } -static gboolean property_experimental_exits (const GDBusPropertyTable *property, +static gboolean property_experimental_exists (const GDBusPropertyTable *property,void *data) {struct btd_adapter *adapter = data;
@@ -3876,7 +3876,7 @@ static const GDBusPropertyTable adapter_properties[] = { property_exists_modalias }, { "Roles", "as", property_get_roles }, { "ExperimentalFeatures", "as", property_get_experimental, NULL, - property_experimental_exits }, + property_experimental_exists }, { } };
Signature · 1 line
2.37.2
PATCH v6 6/6 adapter: Remove experimental flag for PowerState
In reply to Bastien NoceraNow that the feature has been tested, that the API is deemed adequate and the reliability sufficient.
--- src/adapter.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
src/adapter.c +1 -2
@@ -3861,8 +3861,7 @@ static const GDBusPropertyTable adapter_properties[] = { { "Alias", "s", property_get_alias, property_set_alias }, { "Class", "u", property_get_class }, { "Powered", "b", property_get_powered, property_set_powered }, - { "PowerState", "s", property_get_power_state, NULL, NULL, - G_DBUS_PROPERTY_FLAG_EXPERIMENTAL }, + { "PowerState", "s", property_get_power_state }, { "Discoverable", "b", property_get_discoverable, property_set_discoverable }, { "DiscoverableTimeout", "u", property_get_discoverable_timeout,
Signature · 1 line
2.37.2
Quoted 8 lines · Bastien Nocera
src/rfkill.c +0
-0@@ -55,12 +55,73 @@ struct rfkill_event { }; #define RFKILL_EVENT_SIZE_V1 8
src/rfkill.c struct rfkill_event { · line 63
Quoted 6 lines
src/rfkill.c +6
-0+int rfkill_get_blocked (uint16_t index) +{ + struct rfkill_event event = { 0 }; + int fd; + ssize_t len; + int blocked = -1;
I simplified this code in v7 (as well as fixing indentation problems).
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=673181
---Test result---
Test Summary:
CheckPatch FAIL 6.85 seconds GitLint PASS 4.57 seconds Prep - Setup ELL PASS 26.48 seconds Build - Prep PASS 0.70 seconds Build - Configure PASS 8.06 seconds Build - Make PASS 714.85 seconds Make Check PASS 11.37 seconds Make Check w/Valgrind PASS 284.31 seconds Make Distcheck PASS 232.78 seconds Build w/ext ELL - Configure PASS 8.10 seconds Build w/ext ELL - Make PASS 81.59 seconds Incremental Build w/ patches PASS 578.06 seconds Scan Build PASS 585.92 seconds
Details
##############################
Test: CheckPatch - FAIL
Desc: Run checkpatch.pl script with rule in .checkpatch.conf
Output:
[BlueZ,v6,2/6] adapter: Implement PowerState property WARNING:LONG_LINE: line length of 81 exceeds 80 columns
#137: FILE: src/adapter.c:659:
+static void reset_power_state_target(struct btd_adapter *adapter, uint32_t value)
WARNING:LONG_LINE: line length of 90 exceeds 80 columns #177: FILE: src/adapter.c:714:
+ adapter_set_power_state(adapter, ADAPTER_POWER_STATE_OFF_BLOCKED);
WARNING:LONG_LINE: line length of 82 exceeds 80 columns #191: FILE: src/adapter.c:758:
+ ADAPTER_POWER_STATE_OFF_ENABLING :
WARNING:LONG_LINE: line length of 82 exceeds 80 columns #192: FILE: src/adapter.c:759:
+ ADAPTER_POWER_STATE_ON_DISABLING);
WARNING:LONG_LINE: line length of 90 exceeds 80 columns #233: FILE: src/adapter.c:3025:
+ adapter_set_power_state(adapter, ADAPTER_POWER_STATE_OFF_BLOCKED);
WARNING:LONG_LINE: line length of 86 exceeds 80 columns #326: FILE: src/adapter.c:6830:
+ DBG("Power state: %s", adapter_power_state_str(adapter->power_state));
/github/workspace/src/12962285.patch total: 0 errors, 6 warnings, 278 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
/github/workspace/src/12962285.patch has style problems, please review.
NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPDX_LICENSE_TAG SPLIT_STRING SSCANF_TO_KSTRTO
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
---
Regards,
Linux Bluetooth