From patchwork Mon Oct 23 14:49:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ma=C3=ADra_Canal?= X-Patchwork-Id: 738122 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B670EC001E0 for ; Mon, 23 Oct 2023 14:52:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230404AbjJWOwO (ORCPT ); Mon, 23 Oct 2023 10:52:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47402 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229578AbjJWOwO (ORCPT ); Mon, 23 Oct 2023 10:52:14 -0400 Received: from fanzine2.igalia.com (fanzine.igalia.com [178.60.130.6]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E2A851A4 for ; Mon, 23 Oct 2023 07:52:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:Content-Type:MIME-Version:Message-ID: Date:Subject:Cc:To:From:Sender:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=xO/b9+rtpyBvWYTWzbYffb+u3mS3/L9CQ7VRMbckm88=; b=o4TcMgZJmxP6KiudUsC2zDln4J +5Y9ildBb6TqudkLgvNPglvcYyRTTDmKGrJAmIqF2Hu3jsLkALP7U7ItVXl8gg+zgn/FQKUVBoOZo 7uJglIvcg0e91NsttXA4RrNcJEurvP4T4pZ3v15uuBo8RzGGXcTVteocO1ecQtzrJqDV0HvGvtitf jJLylFwfOx1diT9rd4BYHfQ6CDMdWMEHQbHUN2dYd6mtGCk0BBPqc35Oj9cvaxfFmhp5V8psUVrW1 cEvtOeGkZ8kdNgh+Ajz5KqshgaBOp7J9GgWodfsymO7R0W/bLCHxvkVXVia5nqMmGrC44JUowZROc hp0kW50w==; Received: from [177.34.168.16] (helo=morissey..) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim) id 1quwHY-005hIQ-LV; Mon, 23 Oct 2023 16:51:53 +0200 From: =?utf-8?q?Ma=C3=ADra_Canal?= To: Ulf Hansson , Florian Fainelli , Ray Jui , Scott Branden , Nick Alcock , Peter Robinson , Lee Jones , Stefan Wahren , Melissa Wen Cc: bcm-kernel-feedback-list@broadcom.com, linux-pm@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, kernel-dev@igalia.com, =?utf-8?q?Ma=C3=ADra_Canal?= Subject: [PATCH] pmdomain: bcm: bcm2835-power: check if the ASB register is equal to enable Date: Mon, 23 Oct 2023 11:49:45 -0300 Message-ID: <20231023145004.284826-2-mcanal@igalia.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org The commit c494a447c14e ("soc: bcm: bcm2835-power: Refactor ASB control") refactored the ASB control by using a general function to handle both the enable and disable. But this patch introduced a subtle regression: we need to check if (readl(base + reg) & ASB_ACK) == enable, not just check if (readl(base + reg) & ASB_ACK) == true. Currently, this is causing an invalid register state in V3D when unloading and loading the driver, because `bcm2835_asb_disable()` will return -ETIMEDOUT and `bcm2835_asb_power_off()` will fail to disable the ASB slave for V3D. Fixes: c494a447c14e ("soc: bcm: bcm2835-power: Refactor ASB control") Signed-off-by: Maíra Canal --- drivers/pmdomain/bcm/bcm2835-power.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.41.0 diff --git a/drivers/pmdomain/bcm/bcm2835-power.c b/drivers/pmdomain/bcm/bcm2835-power.c index 1a179d4e011c..2d3636bc277e 100644 --- a/drivers/pmdomain/bcm/bcm2835-power.c +++ b/drivers/pmdomain/bcm/bcm2835-power.c @@ -175,7 +175,7 @@ static int bcm2835_asb_control(struct bcm2835_power *power, u32 reg, bool enable } writel(PM_PASSWORD | val, base + reg); - while (readl(base + reg) & ASB_ACK) { + while ((readl(base + reg) & ASB_ACK) == enable) { cpu_relax(); if (ktime_get_ns() - start >= 1000) return -ETIMEDOUT;