From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 34E53421A01; Wed, 4 Feb 2026 15:12:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770217957; cv=none; b=hRbMABW9WGaalc3WTjk4wrJHqbbX5erLBQtJAHLbCwXm+o1syvoSTd02rqyHx+4uIdi8Cbt93Zvo2oNA07y1z9Vl/K4hHSp3r+6IDUtZVe8teKZEDRTc2imw9mviQdI5YgmfREKcWOMY+sIIcmSy7FhYYsMoL5i8+dP5yymONiU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770217957; c=relaxed/simple; bh=1NVgiO51Bnx5qt/EI2l8M7D/cooeong+z6+tlVa1MUU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VMJnAsnjeeJz2QItm0BzYJFYdsxfk0Ol1BCGTJpLX1RRbyox8vH3I0yT1gcvqbyYt9vIjXzPkbk5kh7nECdRkgYqo+i1aN+/QkMkwXxlrpIVvn98ymZz6grkY1VyzLopjO+9J+XKtPfC/FujrtQqYcIXhvQSrDcYwafmcI7J+e4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=hwfD7r8J; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="hwfD7r8J" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 629C9C116C6; Wed, 4 Feb 2026 15:12:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1770217956; bh=1NVgiO51Bnx5qt/EI2l8M7D/cooeong+z6+tlVa1MUU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hwfD7r8JGJLfixCBm+OcMjx5X1iZ8uPw4DlFw5CyReA9ouZqdCbKNTzTZUJoPaGF3 w0fC4sbAPB7kXr66pO02db+NKjVMgySij/f/RPM2YoK7vktxfXL4JOBDKBlULm6KsH 35gBj2FDx7fKvU89CbKcSZq3RKs7JV7PLdyB+q/0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Johan Hovold Subject: [PATCH 6.1 170/280] slimbus: core: fix runtime PM imbalance on report present Date: Wed, 4 Feb 2026 15:39:04 +0100 Message-ID: <20260204143915.737796276@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260204143909.614719725@linuxfoundation.org> References: <20260204143909.614719725@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Johan Hovold commit 0eb4ff6596114aabba1070a66afa2c2f5593739f upstream. Make sure to balance the runtime PM usage count in case slimbus device or address allocation fails on report present, which would otherwise prevent the controller from suspending. Fixes: 4b14e62ad3c9 ("slimbus: Add support for 'clock-pause' feature") Cc: stable@vger.kernel.org # 4.16 Signed-off-by: Johan Hovold Link: https://patch.msgid.link/20251126145329.5022-3-johan@kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/slimbus/core.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) --- a/drivers/slimbus/core.c +++ b/drivers/slimbus/core.c @@ -496,21 +496,23 @@ int slim_device_report_present(struct sl if (ctrl->sched.clk_state != SLIM_CLK_ACTIVE) { dev_err(ctrl->dev, "slim ctrl not active,state:%d, ret:%d\n", ctrl->sched.clk_state, ret); - goto slimbus_not_active; + goto out_put_rpm; } sbdev = slim_get_device(ctrl, e_addr); - if (IS_ERR(sbdev)) - return -ENODEV; + if (IS_ERR(sbdev)) { + ret = -ENODEV; + goto out_put_rpm; + } if (sbdev->is_laddr_valid) { *laddr = sbdev->laddr; - return 0; + ret = 0; + } else { + ret = slim_device_alloc_laddr(sbdev, true); } - ret = slim_device_alloc_laddr(sbdev, true); - -slimbus_not_active: +out_put_rpm: pm_runtime_mark_last_busy(ctrl->dev); pm_runtime_put_autosuspend(ctrl->dev); return ret;