From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qv1-f48.google.com (mail-qv1-f48.google.com [209.85.219.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3C7E143C7CA for ; Tue, 7 Jul 2026 18:22:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783448572; cv=none; b=NAQxPf4fvFwpk/gCBXfAlKnJ4Y6IFUTUTFSOd2fka7mo8PlKRK0cplJN9yKI3XwHOb+2qBSBxS8xUBOvKKOEppnvBtURiUW9xNf4b+ECBj0Pm5FRN9FO5J7Y9UBUqS9vjIMiy9ikheLb1DQDqIOXEMlgsv6BHvtnh/W7jI/DJu4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783448572; c=relaxed/simple; bh=eIESVbWkiTn3nQcJUbDvpwtdHS+2G80WYOlLFXzPvXA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=j+auxhM2A4NkwugzKXtxtk9eBMhLP2vx5/idSR4fhy6Uk9pm26JBehYIR5m8Eq1A2Hykx63W9wW8uDE6feK+ALU0/hoqJg8At8EIeU90tOpu7xZM+C0vXKDiRGEQ0naAogBx4t/XbCu+lqWAgWDXNB8DR3VwjNc9x+NZLJOzD5I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Q2KYJDJj; arc=none smtp.client-ip=209.85.219.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Q2KYJDJj" Received: by mail-qv1-f48.google.com with SMTP id 6a1803df08f44-8efef6533aaso35363826d6.0 for ; Tue, 07 Jul 2026 11:22:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783448570; x=1784053370; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=JRocRXocEJx0XApkIDz1QpkH/du1waR/GC79Fz6Qc8M=; b=Q2KYJDJjsPcN9bVSBBnuus0mDx0m/Ux7iEJbgfxMorWQxv5Mm16UutfmmIP2sjDkJ6 6DP7kY0daTdA2S0iwIbI7Vt9mGQklUXzarANpLYh6h43iKXIvSqH/+W0vJSg7Am5Ptfi voDDZ11LWud5qxZDB/I4nzsCboF3923KXuCQsrEeX6+lRZQw2hSN7zmw5jrwxgQ8/urZ 0aS6mP8Ao86PYnkKo1OhNhsHHmoRX5C7K6Zc9GC68hYZmJGCidNnDcVJUFe6IZBfcE5u k9xxso0bemADwAWf2T9ppswq6leEeLtJheoi+MZQKPJdW4P/FjCPSlekYdk8dCTqq8lY j5SA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783448570; x=1784053370; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=JRocRXocEJx0XApkIDz1QpkH/du1waR/GC79Fz6Qc8M=; b=IvKR9/+5G3xUyBtQ3V2HKldx7nRCFakX4u+BOsQPhYkqDjDAe6EDuxqBpKRD8BOi22 hgeF4hkmLDbmoH5gOrLBCOjFKRp3NXQe6Ae3crKvQEaNPETwk5YinQaau/YGepAYCHml wqfAk/fbdEXlAZYCa8JF4wwxuNQIuaGxkXrTH3cTScJm3D/B4sdmoAQxEXZhN9J+uHrW lIAA+nZxt19FJgthouZ4BZZanvXSi/qWx8tUXAeEyOREa5eWUwstMVVBAU+MaB3jtYvz Q6ee5qblp5kQHbI4WGUDpwHN/NUS9+goZPjNXGJ5E546IBpDM3IhnlcWU22MlOIc36+i jiGQ== X-Forwarded-Encrypted: i=1; AHgh+Ro2Gus/FcJRVy5h0wiCXKX0GXuQJEplWeHDnOhOZ6omQg3FFZiW1srZyEV+dx1JDGthy4V5baFblhiGMWQ=@vger.kernel.org X-Gm-Message-State: AOJu0YxtjMzEZwFWK582ooIUHmDSkN9/yg6hLJgMg7G2lfN1m8Wz6oBr 1tT89tyrQKiR+k+2QOCl+G3y/fZRNcjthH3dDA+45ddRt3xHToYOQ6kdh5h/dbcwnxo= X-Gm-Gg: AfdE7clP8if72H2TxEn/B+Y06/0LEkmoZkhfJHv7D2g7geFa851NgOW0MKUXxW/77wQ ni9U4LggYA28JXs9gruNo7IJqjDAZeNUigPc7CCO62eP0mjvBS27ohyd8llgUqL94P0F2IVDl6n qUaoYURGIDjCI1iAkqBp4O2Dytdr7KJav/mZq0Lrp5Uwgmox0DD+m2j7Ewd/M3lWNYckEQVv9Qt ID0bV6VIPP/8ZZaknV+m1c5lqlL3CuCa26J27OxNF02sHowAOrrTihPfVKcI6mJBx5VPn8cSFOS AWqBssOmjCfM8I+WiaOdYokSg0y9506HlPfDIRuvx6vSo4qtVzTejOKxXrLGOrMPaETMuYndrfQ OqQmrsNddevtF0cEXYDQYeasTNvJmtUvSq7SnWrlcmusJpUUU3tb8J/Mb7O1MfwTrcf/HOqOqDN TtOMYfi+2K9M0l8bSpa5Ixj3V8Ll7REESwNDDTnhsVydgU4pBlR0OMvIBW5Z8UOpzeMlxA/68QR klKSHR+ISM+xrDQCfjk7y/Ttg== X-Received: by 2002:a05:6214:f2f:b0:8ee:756a:f1cb with SMTP id 6a1803df08f44-8fcb3d3ee19mr77205816d6.28.1783448570037; Tue, 07 Jul 2026 11:22:50 -0700 (PDT) Received: from i4-gl-tmk5904.ad.psu.edu ([130.203.156.186]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8f472a9b1c4sm166067566d6.48.2026.07.07.11.22.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jul 2026 11:22:49 -0700 (PDT) From: Yuho Choi To: Russell King Cc: Ulf Hansson , Claudiu Beznea , Mathieu Poirier , Danilo Krummrich , Kees Cook , linux-kernel@vger.kernel.org, Yuho Choi Subject: [PATCH v1] amba: Fix pclk leak on runtime resume failure Date: Tue, 7 Jul 2026 14:22:44 -0400 Message-ID: <20260707182245.420594-1-dbgh9129@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit amba_pm_runtime_resume() enables the AMBA pclk before calling the driver runtime resume callback. If that callback fails, the function returns with pclk still enabled. Disable pclk on pm_generic_runtime_resume() failure, matching the clock state rollback expected by the runtime suspend/resume path. Fixes: 92b97f0aaccb ("PM: add runtime PM support to core Primecell driver") Signed-off-by: Yuho Choi --- drivers/amba/bus.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c index d721d64a9858..5a36463f1438 100644 --- a/drivers/amba/bus.c +++ b/drivers/amba/bus.c @@ -389,7 +389,15 @@ static int amba_pm_runtime_resume(struct device *dev) return ret; } - return pm_generic_runtime_resume(dev); + ret = pm_generic_runtime_resume(dev); + if (ret && dev->driver) { + if (pm_runtime_is_irq_safe(dev)) + clk_disable(pcdev->pclk); + else + clk_disable_unprepare(pcdev->pclk); + } + + return ret; } #endif /* CONFIG_PM */ -- 2.43.0