Skip to content

Commit 94cad2d

Browse files
yeapaJiri Kosina
authored andcommitted
HID: intel_ish-hid: HBM: Use connected standby state bit during suspend/resume
The individual sensor drivers implemented in the ISH firmware needs capability to take special actions when there is a change in the system standby state. The ISH core firmware passes this notification to individual sensor drivers in response to the OS request via connected standby bit in the SYSTEM_STATE_STATUS command. This change sets CONNECTED_STANDBY_STATE_BIT bit to 1 during suspend callback and clears during resume callback. Signed-off-by: Ye Xiang <xiang.ye@intel.com> [srinivas.pandruvada@linux.intel.com: changelog rewrite] Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
1 parent e71da1f commit 94cad2d

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

drivers/hid/intel-ish-hid/ishtp/hbm.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -914,7 +914,7 @@ static inline void fix_cl_hdr(struct ishtp_msg_hdr *hdr, size_t length,
914914
/*** Suspend and resume notification ***/
915915

916916
static uint32_t current_state;
917-
static uint32_t supported_states = 0 | SUSPEND_STATE_BIT;
917+
static uint32_t supported_states = SUSPEND_STATE_BIT | CONNECTED_STANDBY_STATE_BIT;
918918

919919
/**
920920
* ishtp_send_suspend() - Send suspend message to FW
@@ -933,7 +933,7 @@ void ishtp_send_suspend(struct ishtp_device *dev)
933933
memset(&state_status_msg, 0, len);
934934
state_status_msg.hdr.cmd = SYSTEM_STATE_STATUS;
935935
state_status_msg.supported_states = supported_states;
936-
current_state |= SUSPEND_STATE_BIT;
936+
current_state |= (SUSPEND_STATE_BIT | CONNECTED_STANDBY_STATE_BIT);
937937
dev->print_log(dev, "%s() sends SUSPEND notification\n", __func__);
938938
state_status_msg.states_status = current_state;
939939

@@ -959,7 +959,7 @@ void ishtp_send_resume(struct ishtp_device *dev)
959959
memset(&state_status_msg, 0, len);
960960
state_status_msg.hdr.cmd = SYSTEM_STATE_STATUS;
961961
state_status_msg.supported_states = supported_states;
962-
current_state &= ~SUSPEND_STATE_BIT;
962+
current_state &= ~(CONNECTED_STANDBY_STATE_BIT | SUSPEND_STATE_BIT);
963963
dev->print_log(dev, "%s() sends RESUME notification\n", __func__);
964964
state_status_msg.states_status = current_state;
965965

drivers/hid/intel-ish-hid/ishtp/hbm.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,7 @@ struct dma_xfer_hbm {
235235
#define SYSTEM_STATE_QUERY_SUBSCRIBERS 0x3
236236
#define SYSTEM_STATE_STATE_CHANGE_REQ 0x4
237237
/*indicates suspend and resume states*/
238+
#define CONNECTED_STANDBY_STATE_BIT (1<<0)
238239
#define SUSPEND_STATE_BIT (1<<1)
239240

240241
struct ish_system_states_header {

0 commit comments

Comments
 (0)