patches: refresh c6.1 v3 (drop wake GPIO on enter_lp_mode timeout)
This commit is contained in:
+10
-11
@@ -1,4 +1,4 @@
|
||||
From aea2b411713a192db26c3144abcda21914520705 Mon Sep 17 00:00:00 2001
|
||||
From 706a594dab68779294e4fff9705a6e1df46ec1af Mon Sep 17 00:00:00 2001
|
||||
From: Markus Fritsche <fritsche.markus@gmail.com>
|
||||
Date: Tue, 28 Apr 2026 15:23:35 +0200
|
||||
Subject: [PATCH] bes2600: short-circuit wake handshake when chip is confirmed
|
||||
@@ -76,8 +76,8 @@ field added in the prerequisite patch.
|
||||
Signed-off-by: Markus Fritsche <fritsche.markus@gmail.com>
|
||||
---
|
||||
drivers/staging/bes2600/bes2600_sdio.c | 15 ++++++-
|
||||
drivers/staging/bes2600/bes_pwr.c | 58 ++++++++++++++++++++++----
|
||||
2 files changed, 63 insertions(+), 10 deletions(-)
|
||||
drivers/staging/bes2600/bes_pwr.c | 56 ++++++++++++++++++++++----
|
||||
2 files changed, 62 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/drivers/staging/bes2600/bes2600_sdio.c b/drivers/staging/bes2600/bes2600_sdio.c
|
||||
index b9d836fab7af..929503547cfd 100644
|
||||
@@ -113,10 +113,10 @@ index b9d836fab7af..929503547cfd 100644
|
||||
return;
|
||||
}
|
||||
diff --git a/drivers/staging/bes2600/bes_pwr.c b/drivers/staging/bes2600/bes_pwr.c
|
||||
index ec0e0cc14ea4..43087ca3b0ed 100644
|
||||
index de46e5826ee7..d54e1a0bab0c 100644
|
||||
--- a/drivers/staging/bes2600/bes_pwr.c
|
||||
+++ b/drivers/staging/bes2600/bes_pwr.c
|
||||
@@ -597,19 +597,61 @@ static int bes2600_pwr_enter_lp_mode(struct bes2600_common *hw_priv)
|
||||
@@ -621,19 +621,61 @@ static int bes2600_pwr_enter_lp_mode(struct bes2600_common *hw_priv)
|
||||
static void bes2600_pwr_device_exit_lp_mode(struct bes2600_common *hw_priv)
|
||||
{
|
||||
int ret = 0;
|
||||
@@ -129,11 +129,6 @@ index ec0e0cc14ea4..43087ca3b0ed 100644
|
||||
- bes_devel("host lock lmac\n");
|
||||
- if(hw_priv->sbus_ops->gpio_wake)
|
||||
- hw_priv->sbus_ops->gpio_wake(hw_priv->sbus_priv, GPIO_WAKE_FLAG_MCU);
|
||||
-
|
||||
- if(hw_priv->sbus_ops->sbus_active) {
|
||||
- ret = hw_priv->sbus_ops->sbus_active(hw_priv->sbus_priv, SUBSYSTEM_MCU);
|
||||
- if (ret)
|
||||
- bes_err("%s, active mcu fail\n", __func__);
|
||||
+ /*
|
||||
+ * Consult chip_pm_state set by bes2600_pwr_notify_ps_changed().
|
||||
+ * If we last saw the firmware confirm ACTIVE, skip ONLY the
|
||||
@@ -158,7 +153,11 @@ index ec0e0cc14ea4..43087ca3b0ed 100644
|
||||
+ if (hw_priv->sbus_ops->gpio_wake)
|
||||
+ hw_priv->sbus_ops->gpio_wake(hw_priv->sbus_priv,
|
||||
+ GPIO_WAKE_FLAG_MCU);
|
||||
+
|
||||
|
||||
- if(hw_priv->sbus_ops->sbus_active) {
|
||||
- ret = hw_priv->sbus_ops->sbus_active(hw_priv->sbus_priv, SUBSYSTEM_MCU);
|
||||
- if (ret)
|
||||
- bes_err("%s, active mcu fail\n", __func__);
|
||||
+ if (hw_priv->sbus_ops->sbus_active) {
|
||||
+ ret = hw_priv->sbus_ops->sbus_active(hw_priv->sbus_priv,
|
||||
+ SUBSYSTEM_MCU);
|
||||
|
||||
Reference in New Issue
Block a user