From patchwork Fri Feb 16 22:32:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Protsenko X-Patchwork-Id: 13560770 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 37210C48260 for ; Fri, 16 Feb 2024 22:34:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=kqLxOkBfzwE4aOjlx/CZrEobaEmqkLYCkQQxvAZQ6Fg=; b=CEMedYnuUyNaqn j4RNw44Y064t0gxIgCBXrH0NygEJqq0X36964Cp7xA2LgaBjNzNoq50wsdDuSaO8Jr7OyiRHlOYcZ ikwL1XzhfvS24oRCtevqli1M0NT1yai7nYgi5xFM+IZCkh8dEBLV1JiMt9buLp45j5kfX5KLvF7Fc Eub7zUeDtg7OtKyt0cywkEWFOUQn1R8Lqf4ZX5vKfN5CqS+ohJN+tTKs03BSWJS+Jz5URBJdkReem CdLlV7LMiz0oGR9LmcZnmgNHqN501sA7Oke3+JjMYmoNTBp7XVBSzTW5nEcvkiGS8CTC0Yfc2jaTp i989nQzZ2HvH2rcWJzzg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rb6mP-00000003wMP-4A06; Fri, 16 Feb 2024 22:34:02 +0000 Received: from mail-oa1-x32.google.com ([2001:4860:4864:20::32]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rb6lN-00000003veF-3eZi for linux-arm-kernel@lists.infradead.org; Fri, 16 Feb 2024 22:33:00 +0000 Received: by mail-oa1-x32.google.com with SMTP id 586e51a60fabf-20503dc09adso1504784fac.2 for ; Fri, 16 Feb 2024 14:32:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1708122776; x=1708727576; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dv24mbqztn1Vrin55e28olHgU7+Z3ekpJo7z50Ef2KU=; b=tzAd95JSl3mcyNTZC5WmQ/Jxuei1uO43s+UVDAAwo3vqjE+0dz17YTdxoVUs4BIMfa KvcU/gnf5cmhNbNo02CTSoLFlmfERjUdwzxo4NncJeZHDP5ZnbwwKWPatJH7NQuWklxF 99lS+Kknf8qux5P4fUteXvsyhBQGUritIysEG4znK7DRcIENN4dgkGlTjc09dvp8FBhN HlKA+ID5esLDA6fqM8hwJyR153+TNFc45626UbL5/up6KOVXyvAH36kX6zswmh/MuFPU bhB3Loosuf03aMgz96jKXtbsRtjqPbXJN6YLhOaDDBM6LVbv7fv5m5mEtdahUSYu2iOb X+MA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708122776; x=1708727576; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dv24mbqztn1Vrin55e28olHgU7+Z3ekpJo7z50Ef2KU=; b=N9z14T/wN2AezML9rpL0x4WboihHlt6GHy1KWa64k5FuFD3m3rppSGLGbaPIHOfzK1 8meJR8dWJNG9DQDKeUKn59HvlbSwY+WJaOv1sxaGdPoiafQE+GQCcIgDwBKCTcZ2Fp38 6Adqa5aQ6+wWgSlmQv2ieK7oKtTW/LIp3qIRWU3Np+WDQ9gfQ15KcHV/oiIpENqvtJC4 ay7wuqfHcRAWeEojxi8bMAWwl6YM9zB+yY16HZRLoze0iL7OjnJVaKwwgAMcSR6sY86O 5mhIrUG8C8UuA3w4hdjrNt7GcYNTx6igPKGUDNvLvnE2Rl1biVqUSqU32Wqa7nTdvO78 uPVQ== X-Forwarded-Encrypted: i=1; AJvYcCUmPr7ouvuVWJWHiDashRNIZ4A+/pW4HYtWSwBUJMP3qgLNmDuUTOyIs3nbpfIbzTcbfHAdA43AQ0nEtbkNy+EWiW8I09emqXX5I5gEsNLIZVr3le0= X-Gm-Message-State: AOJu0YxJHt14XhCf/sAi6G9Pf5+q6AGOYIK+lY6ZPv/xrrOfkzrIAMNs iWA1vxh2Wr08brKKzCMrH0KgGrK6wpQRZ+9vGZzUAKmoH7EkrKLNdAh3tXTGp5c= X-Google-Smtp-Source: AGHT+IHSp7Y+lZqtIwhuV38Vy9LKfAOo074hUyw0pXjuu9Ts+M1Gi0UOFUXmjH8H0xsqSEj6G14+kQ== X-Received: by 2002:a05:6870:8192:b0:21e:6672:a46f with SMTP id k18-20020a056870819200b0021e6672a46fmr3255262oae.29.1708122775911; Fri, 16 Feb 2024 14:32:55 -0800 (PST) Received: from localhost ([136.62.192.75]) by smtp.gmail.com with ESMTPSA id ov11-20020a056870cb8b00b0021e70d17dc7sm199912oab.30.2024.02.16.14.32.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Feb 2024 14:32:55 -0800 (PST) From: Sam Protsenko To: Krzysztof Kozlowski , Sylwester Nawrocki , Chanwoo Choi Cc: Alim Akhtar , Michael Turquette , Stephen Boyd , Rob Herring , Conor Dooley , Tomasz Figa , linux-samsung-soc@vger.kernel.org, linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 12/16] clk: samsung: Pass mask to wait_until_mux_stable() Date: Fri, 16 Feb 2024 16:32:41 -0600 Message-Id: <20240216223245.12273-13-semen.protsenko@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240216223245.12273-1-semen.protsenko@linaro.org> References: <20240216223245.12273-1-semen.protsenko@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240216_143258_084521_BF22C2B7 X-CRM114-Status: GOOD ( 13.46 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Make it possible to use wait_until_mux_stable() for MUX registers where the mask is different from MUX_MASK (e.g. in upcoming CPU clock implementation for Exynos850). No functional change. Signed-off-by: Sam Protsenko --- drivers/clk/samsung/clk-cpu.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/clk/samsung/clk-cpu.c b/drivers/clk/samsung/clk-cpu.c index 744b609c222d..5ea618da0bc1 100644 --- a/drivers/clk/samsung/clk-cpu.c +++ b/drivers/clk/samsung/clk-cpu.c @@ -134,16 +134,16 @@ static void wait_until_divider_stable(void __iomem *div_reg, unsigned long mask) * value was changed. */ static void wait_until_mux_stable(void __iomem *mux_reg, u32 mux_pos, - unsigned long mux_value) + unsigned long mask, unsigned long mux_value) { unsigned long timeout = jiffies + msecs_to_jiffies(MAX_STAB_TIME); do { - if (((readl(mux_reg) >> mux_pos) & MUX_MASK) == mux_value) + if (((readl(mux_reg) >> mux_pos) & mask) == mux_value) return; } while (time_before(jiffies, timeout)); - if (((readl(mux_reg) >> mux_pos) & MUX_MASK) == mux_value) + if (((readl(mux_reg) >> mux_pos) & mask) == mux_value) return; pr_err("%s: re-parenting mux timed-out\n", __func__); @@ -248,7 +248,7 @@ static int exynos_cpuclk_pre_rate_change(struct clk_notifier_data *ndata, /* select sclk_mpll as the alternate parent */ mux_reg = readl(base + regs->mux_sel); writel(mux_reg | (1 << 16), base + regs->mux_sel); - wait_until_mux_stable(base + regs->mux_stat, 16, 2); + wait_until_mux_stable(base + regs->mux_stat, 16, MUX_MASK, 2); /* alternate parent is active now. set the dividers */ writel(div0, base + regs->div_cpu0); @@ -289,7 +289,7 @@ static int exynos_cpuclk_post_rate_change(struct clk_notifier_data *ndata, /* select mout_apll as the alternate parent */ mux_reg = readl(base + regs->mux_sel); writel(mux_reg & ~(1 << 16), base + regs->mux_sel); - wait_until_mux_stable(base + regs->mux_stat, 16, 1); + wait_until_mux_stable(base + regs->mux_stat, 16, MUX_MASK, 1); if (cpuclk->flags & CLK_CPU_NEEDS_DEBUG_ALT_DIV) { div |= (cfg_data->div0 & E4210_DIV0_ATB_MASK); @@ -361,7 +361,7 @@ static int exynos5433_cpuclk_pre_rate_change(struct clk_notifier_data *ndata, /* select the alternate parent */ mux_reg = readl(base + regs->mux_sel); writel(mux_reg | 1, base + regs->mux_sel); - wait_until_mux_stable(base + regs->mux_stat, 0, 2); + wait_until_mux_stable(base + regs->mux_stat, 0, MUX_MASK, 2); /* alternate parent is active now. set the dividers */ writel(div0, base + regs->div_cpu0); @@ -389,7 +389,7 @@ static int exynos5433_cpuclk_post_rate_change(struct clk_notifier_data *ndata, /* select apll as the alternate parent */ mux_reg = readl(base + regs->mux_sel); writel(mux_reg & ~1, base + regs->mux_sel); - wait_until_mux_stable(base + regs->mux_stat, 0, 1); + wait_until_mux_stable(base + regs->mux_stat, 0, MUX_MASK, 1); exynos_set_safe_div(cpuclk, div, div_mask); spin_unlock_irqrestore(cpuclk->lock, flags);