Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795055832; b=YisTF7KHRp0+P6p1uIQ78ZHinAhFZX0I8Fek+9nzCB9CkHPpB1pkjN0PWi2R2cczznwc 9zn5najYouvbiIJq3OQzBaedeLo8Uv1bA6k+JZfi5PkSQ9+Z+tYyBLhA1qw39SXezzSAy Pau49sH4YlHtliyNQUb9EdH/Xd9MKjv72dzqLQo/Ar4CMzk72K1w5vBsHOe1AfjOnaj5v 5SuUvWki1sBQ9m8/HcjEbkmDM1xVwwV9HKuSZHxv4eGM4nJB7qf0lMWa/+KFz2JGnftWE fitMSRngCAOOxyItAl9apAmFCNUHXxe0MWnJmCNbuCBZNGAu8uBIBRREGCh/v/6Y+0A== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795055832; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=3YGWifL/FcX7rX9pAOw9puZ4CFO5I+u+aYIWL+//FZ0=; b=2UbGv91coerXe+1tUfrYdfq/W3msgS706+D3rB5D/Ecc5UEuiyeMmGrBjPduQuW31rzK 0FyUidC0NMzrT3hmAibUJ1JDVhB2HsGzlZWi2C+K+Eer3E4bIOcqDfJi3LW5JzfzlbtmH HafZdyQ/slBm8Vvtad4N2zfKLFJRoZcEwMUS+CX2LjYTOty4ZXKhPrMJjXm/rrKeU08ZJ FB6K91lF53kgdc/j04NweRSnirZpabik8hPWR1XmfbTVHQFZdKAuMrM4bmZo8XAYG9noO OgU0u3rxU/UQ3sCTusI4SKHEwbn1sxlN3z7SJLZleD+7L2St0RxCw1TeEE7nO6y9vng== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=iIhdj0uT; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 23442606A320; Thu, 19 Nov 2026 02:37:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=iIhdj0uT Received: by smtp.kernel.org (Postfix) with ESMTPSA id 78A041F000C4; Thu, 19 Nov 2026 02:37:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795055832; bh=3YGWifL/FcX7rX9pAOw9puZ4CFO5I+u+aYIWL+//FZ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=iIhdj0uTtGPX80NrKexOhFxdxGiVOcjMnUAiuWF1T31JzZIWWJWTO6D5HkNfqcQkT Yd3YqJ6RGyWf2rOxQLHjKs+Z7+O8RhNcnWuwDlctzdMBZAkV8BlQPhPRFkjqBQogkm xI69rAd9lLsACn5WfA2frWBGWxb/28YeAhyNv00I= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Linus Walleij , Sebastian Reichel , Sasha Levin Subject: [PATCH 5.15 1730/2214] power: supply: ab8500_charger: Recover inactive AB8505 charger Date: Wed, 18 Nov 2026 15:56:46 +0100 Message-ID: <20261118150120.896797717@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Linus Walleij [ Upstream commit 76bdf9d78245bb068207c23e9bf43d4b9bb201c3 ] UsbChCtrl1.UsbChEna can remain set while UsbChStatus1.UsbChOn is clear. The existing recovery only checks the control bit, so it considers the charger enabled and leaves charging stopped. The Samsung-GT-S7710-Skomer, Samsung-SGH-I407-Kyle, and Samsung-SGH-T599-Codina-TMO product trees are reference points for checking both bits and cycling the charger when they disagree. Extend the USB charger check to detect this AB8505 state and enable the check in the charging algorithm for AB8505. Only cycle the charger when VBUS is debounced and no charger-not-OK, thermal, overvoltage, or watchdog fault accounts for the inactive hardware. Fixes: 4dcdf57773fd ("ab8500-bm: Quick re-attach charging behaviour") Assisted-by: LLM Signed-off-by: Linus Walleij Link: https://patch.msgid.link/20260916-ab8500-charging-v1-13-e986ed321cc6@kernel.org Signed-off-by: Sebastian Reichel Signed-off-by: Sasha Levin --- drivers/power/supply/ab8500_chargalg.c | 9 ++--- drivers/power/supply/ab8500_charger.c | 51 +++++++++++++++++++++++++- 2 files changed, 53 insertions(+), 7 deletions(-) diff --git a/drivers/power/supply/ab8500_chargalg.c b/drivers/power/supply/ab8500_chargalg.c index b809fa5abbbaf..6ba09782c25bc 100644 --- a/drivers/power/supply/ab8500_chargalg.c +++ b/drivers/power/supply/ab8500_chargalg.c @@ -1304,12 +1304,9 @@ static void ab8500_chargalg_algorithm(struct ab8500_chargalg *di) charger_status = ab8500_chargalg_check_charger_connection(di); ab8500_chargalg_check_current_step_status(di); - if (is_ab8500(di->parent)) { - ret = ab8500_chargalg_check_charger_enable(di); - if (ret < 0) - dev_err(di->dev, "Checking charger is enabled error" - ": Returned Value %d\n", ret); - } + ret = ab8500_chargalg_check_charger_enable(di); + if (ret < 0) + dev_err(di->dev, "Checking charger enable failed: %d\n", ret); /* * First check if we have a charger connected. diff --git a/drivers/power/supply/ab8500_charger.c b/drivers/power/supply/ab8500_charger.c index fe1af689c0819..665ee71b75df7 100644 --- a/drivers/power/supply/ab8500_charger.c +++ b/drivers/power/supply/ab8500_charger.c @@ -52,6 +52,7 @@ #define MAIN_CH_DET 0x01 #define MAIN_CH_CV_ON 0x04 #define USB_CH_CV_ON 0x08 +#define USB_CH_ON 0x04 #define VBUS_DET_DBNC_LONG 0x02 #define VBUS_DET_DBNC1 0x01 #define OTP_ENABLE_WD 0x01 @@ -1747,6 +1748,9 @@ static int ab8500_charger_usb_check_enable(struct ux500_charger *charger, int vset, int iset) { u8 usbch_ctrl1 = 0; + u8 usbch_status1; + u8 usbch_status2; + bool reenable; int ret = 0; struct ab8500_charger *di = to_ab8500_charger_usb_device_info(charger); @@ -1762,7 +1766,52 @@ static int ab8500_charger_usb_check_enable(struct ux500_charger *charger, } dev_dbg(di->dev, "USB charger ctrl: 0x%02x\n", usbch_ctrl1); - if (!(usbch_ctrl1 & USB_CH_ENA)) { + reenable = !(usbch_ctrl1 & USB_CH_ENA); + if (is_ab8505(di->parent)) { + ret = abx500_get_register_interruptible(di->dev, + AB8500_CHARGER, + AB8500_CH_USBCH_STAT1_REG, + &usbch_status1); + if (ret < 0) { + dev_err(di->dev, "USB charger status read failed\n"); + return ret; + } + + if (!reenable && (usbch_status1 & USB_CH_ON)) + return 0; + + if (!(usbch_status1 & VBUS_DET_DBNC_LONG)) + return 0; + + ret = abx500_get_register_interruptible(di->dev, + AB8500_CHARGER, + AB8500_CH_USBCH_STAT2_REG, + &usbch_status2); + if (ret < 0) { + dev_err(di->dev, "USB charger fault status read failed\n"); + return ret; + } + + if ((usbch_status2 & + (VBUS_CH_NOK | USB_CH_TH_PROT | VBUS_OVV_TH)) || + di->flags.usbchargernotok || di->flags.usb_thermal_prot || + di->flags.vbus_ovv || di->usb.wd_expired) + return 0; + + if (!reenable) { + dev_info(di->dev, + "USB charger enabled but inactive, cycling it\n"); + ret = abx500_mask_and_set_register_interruptible(di->dev, + AB8500_CHARGER, + AB8500_USBCH_CTRL1_REG, + USB_CH_ENA, 0); + if (ret < 0) + return ret; + reenable = true; + } + } + + if (reenable) { dev_info(di->dev, "Charging has been disabled abnormally and will be re-enabled\n"); ret = abx500_mask_and_set_register_interruptible(di->dev, -- 2.53.0