From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yx1-f42.google.com (mail-yx1-f42.google.com [74.125.224.42]) (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 D722D28489B for ; Fri, 19 Dec 2025 04:34:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.224.42 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766118890; cv=none; b=K57XZ8Hrrry3rdgyu0MKD+U8wxVNF2s1N/IPjab9I9/FEY8VT7R/Mkc1AQjsIk1jb8oSkJB7ApGD9UYMbNuwdYjroUa6G0ZeuSLQZbOzq6cZqjT+csH/LUbC+yP7Li5Wxstbtg4udxrZFktost8jd1A1zhzyI/A/Vexmx9ZlBxA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766118890; c=relaxed/simple; bh=W+Ym9BwKVAgvE+GU5fNU+tY01VS2aGs7fB4odK3Uwn4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=r9zFbXNWMXOF9w74oDFrop2QGkKcnOcMQz+D13jOeu0aD/F73lrwdmUjztbLa/P2OQ8rmb6ScmbtJpYT36p6QSAxNeyx7F+8Bdw+ZfxxsuSCFD1iMcH4cRD5EXnt/otGd5xQ+2iZqgeJwgqcCxzc2wLz7OcXmpgWJhexHWal9L0= 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=kFrkCIrp; arc=none smtp.client-ip=74.125.224.42 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="kFrkCIrp" Received: by mail-yx1-f42.google.com with SMTP id 956f58d0204a3-6447743ce90so1183215d50.2 for ; Thu, 18 Dec 2025 20:34:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766118887; x=1766723687; darn=vger.kernel.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=5DWjzd7lB1ZvwMkSR5wsbL0YfoCyC9gajogbuJSaS6g=; b=kFrkCIrpzHOEw3EHIPzPbWhWiwyJhaxkRLhrC/mz4Jk9Bt5qayEUxjWolI/Lkg3+D/ CjrFyf5TzDXG8yNecaGCKHw7bpKwuxupqZEYqn2J11tvEzqDqpH2BeMT/J9bbdbBONfT f094XnbD/fUpAwqE9RNLux9yq4fVaJ/IEgAkV8eCIrxEGGRVyKo8fqbEfOZ+d7rOcWX5 rwR7DP5yXvh+U6ovQMfASU1gjks2t0Z5MdE5mArqaggvSwSc0fdKqny6owM+jNg3GQss YKnjdMLimIEn635QmV2M5FKJNLv9WhgiIWxP/DNGAaZCBjR1f0pb2w9Vnu4t1QivXA85 mDNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766118887; x=1766723687; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=5DWjzd7lB1ZvwMkSR5wsbL0YfoCyC9gajogbuJSaS6g=; b=dSM+Zj7OxaJcYKDdltRPgms8x6tozbles3peCw6MaMnbyVj/iasqgHstYsHlnjWCJ2 fPuW30pxBDrgMeztiIKrbayswmeX0nxk2s6sA3170ZUctBab/fBq72JESlkasPRK7ASm 0Xsrx65F4d8VZ9sQSXN5IIwwLYNKUZWL7JOsKFLkbJWQyud+moAgx2EhQZdviY7WRLID 2Imji4WriQlF913zQKIQEx+Z/jIqdJZKd2vR8nFhuInHP6ERa8Bqjaku4e6UeI+7oWWH NgJ/xxYUKjuMIwxriHauQ5TYmspPe0CjlbYEgymQajG4DyLUXZolyqheZleowJ+YIwHR hcoA== X-Forwarded-Encrypted: i=1; AJvYcCVj3M2aM1RjbgYMkNX+ZYmsFV9kwHsLp0GgDIIiZcLsq6GMS8aH/2V8kItMYD0rRw4NfKDMxNMoZtiXGAa79hoz@vger.kernel.org X-Gm-Message-State: AOJu0YyX2SzcJ9EtedhSoztRvZF45iqYsqiZLqs2dUEgRsDzSsFOwiuf E92JUWZVZOcs5fM93I7+K7F/cWcdck9Q8RlfuJE+iNdzVaYXh7OBmdpX X-Gm-Gg: AY/fxX6idyBA33jy5jhfL7IrJ1Urq3sLX/DgRv2NCcBViLfASqq3t2+Ec7F1HpmcCNm UcT0THDbZlAwH1PVzybI+HHrRNHrIsxygpoy7mUEf6YLdM6EpDdKphJKp+8jVJ/PJ6r35hCjzup 6zfsyBUNMlX1yqM1EEFoA2DHAG5dos0sSWYOL7zO/dXBqvNiAbZSS4bHy51JiFfcLfkyqe0ijSo q8p9jfF8+YxPYebQKLriKqkT3nMft+bjzD/kC2+c3hVlvs2LROH5Tn7sy8ElAlBhJmBruhLRyeH voSrAaizQI5EZA0c2m9LiiBjPGxqDRs+fq2hHDQQ0IvovcUnpQuT6U13hEZtuVlfbBD2IlOUu0Y OCU11d2eMBVmwQyYsh8NGbwyVDaF3dtGHLOhIRcQqkgkJcmyhPxmlWJuHnznIFW/9iux8sOE1kI yshmgsLgUt8AmCar1W+bWF7XNvQQ0ZEKcWg7WJhrp4Pyuc3DzoROAfTgnKQrQMPnddLMOjKWHJ8 FwWjKR0NM9rbqYxtc5s5k3dtI5J X-Google-Smtp-Source: AGHT+IFrIBWXB2bXHe1+4R7Z+71FLciua4PtqTKrSkfV7kRAhsQ1iy96n4rmYXw/EaRBzDta+VB3iw== X-Received: by 2002:a05:690e:bcc:b0:645:5b0e:c91b with SMTP id 956f58d0204a3-6466a8321bcmr1437733d50.14.1766118886872; Thu, 18 Dec 2025 20:34:46 -0800 (PST) Received: from nukework.lan (c-98-57-15-22.hsd1.tx.comcast.net. [98.57.15.22]) by smtp.gmail.com with ESMTPSA id 00721157ae682-78fb452c441sm5610227b3.46.2025.12.18.20.34.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Dec 2025 20:34:45 -0800 (PST) From: Alexandru Gagniuc To: andersson@kernel.org, mathieu.poirier@linaro.org, krzk+dt@kernel.org Cc: Alexandru Gagniuc , linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 9/9] remoteproc: qcom_q6v5_wcss: use bulk clk API for q6 clocks in QCS404 Date: Thu, 18 Dec 2025 22:34:17 -0600 Message-ID: <20251219043425.888585-9-mr.nuke.me@gmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20251219043425.888585-1-mr.nuke.me@gmail.com> References: <20251219043425.888585-1-mr.nuke.me@gmail.com> Precedence: bulk X-Mailing-List: linux-remoteproc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Five of the clocks on QCS404 are consistently enabled and disabled together. Use the bulk clock API to get and enable them. They are enabled after the Q6 reset is deasserted, implying they are required by the Q6. Store them in q6_clks. Signed-off-by: Alexandru Gagniuc --- drivers/remoteproc/qcom_q6v5_wcss.c | 99 ++++++++--------------------- 1 file changed, 28 insertions(+), 71 deletions(-) diff --git a/drivers/remoteproc/qcom_q6v5_wcss.c b/drivers/remoteproc/qcom_q6v5_wcss.c index bcfd79b12fde9..d510769519966 100644 --- a/drivers/remoteproc/qcom_q6v5_wcss.c +++ b/drivers/remoteproc/qcom_q6v5_wcss.c @@ -126,14 +126,9 @@ struct q6v5_wcss { u32 halt_nc; struct clk *xo; - struct clk *ahbfabric_cbcr_clk; struct clk *gcc_abhs_cbcr; struct clk *gcc_axim_cbcr; - struct clk *lcc_csr_cbcr; struct clk *ahbs_cbcr; - struct clk *tcm_slave_cbcr; - struct clk *qdsp6ss_abhm_cbcr; - struct clk *qdsp6ss_axim_cbcr; struct clk *lcc_bcr_sleep; struct clk_bulk_data *clks; /* clocks that must be started before the Q6 is booted */ @@ -416,35 +411,16 @@ static int q6v5_wcss_qcs404_power_on(struct q6v5_wcss *wcss) /* Remove reset to the WCNSS QDSP6SS */ reset_control_deassert(wcss->wcss_q6_bcr_reset); - /* Enable Q6SSTOP_AHBFABRIC_CBCR clock */ - ret = clk_prepare_enable(wcss->ahbfabric_cbcr_clk); - if (ret) + ret = clk_bulk_prepare_enable(wcss->num_q6_clks, wcss->q6_clks); + if (ret) { + dev_err(wcss->dev, "failed to enable q6 clocks, err=%d\n", ret); goto disable_gcc_abhs_cbcr_clk; - - /* Enable the LCCCSR CBC clock, Q6SSTOP_Q6SSTOP_LCC_CSR_CBCR clock */ - ret = clk_prepare_enable(wcss->lcc_csr_cbcr); - if (ret) - goto disable_ahbfabric_cbcr_clk; + }; /* Enable the Q6AHBS CBC, Q6SSTOP_Q6SS_AHBS_CBCR clock */ ret = clk_prepare_enable(wcss->ahbs_cbcr); if (ret) - goto disable_csr_cbcr_clk; - - /* Enable the TCM slave CBC, Q6SSTOP_Q6SS_TCM_SLAVE_CBCR clock */ - ret = clk_prepare_enable(wcss->tcm_slave_cbcr); - if (ret) - goto disable_ahbs_cbcr_clk; - - /* Enable the Q6SS AHB master CBC, Q6SSTOP_Q6SS_AHBM_CBCR clock */ - ret = clk_prepare_enable(wcss->qdsp6ss_abhm_cbcr); - if (ret) - goto disable_tcm_slave_cbcr_clk; - - /* Enable the Q6SS AXI master CBC, Q6SSTOP_Q6SS_AXIM_CBCR clock */ - ret = clk_prepare_enable(wcss->qdsp6ss_axim_cbcr); - if (ret) - goto disable_abhm_cbcr_clk; + goto disable_q6_clks; /* Enable the Q6SS XO CBC */ val = readl(wcss->reg_base + Q6SS_XO_CBCR); @@ -527,17 +503,9 @@ static int q6v5_wcss_qcs404_power_on(struct q6v5_wcss *wcss) val = readl(wcss->reg_base + Q6SS_XO_CBCR); val &= ~Q6SS_CLK_ENABLE; writel(val, wcss->reg_base + Q6SS_XO_CBCR); - clk_disable_unprepare(wcss->qdsp6ss_axim_cbcr); -disable_abhm_cbcr_clk: - clk_disable_unprepare(wcss->qdsp6ss_abhm_cbcr); -disable_tcm_slave_cbcr_clk: - clk_disable_unprepare(wcss->tcm_slave_cbcr); -disable_ahbs_cbcr_clk: clk_disable_unprepare(wcss->ahbs_cbcr); -disable_csr_cbcr_clk: - clk_disable_unprepare(wcss->lcc_csr_cbcr); -disable_ahbfabric_cbcr_clk: - clk_disable_unprepare(wcss->ahbfabric_cbcr_clk); +disable_q6_clks: + clk_bulk_disable_unprepare(wcss->num_q6_clks, wcss->q6_clks); disable_gcc_abhs_cbcr_clk: clk_disable_unprepare(wcss->gcc_abhs_cbcr); @@ -655,11 +623,7 @@ static int q6v5_qcs404_wcss_shutdown(struct q6v5_wcss *wcss) val &= ~Q6SS_BHS_ON; writel(val, wcss->reg_base + Q6SS_PWR_CTL_REG); - clk_disable_unprepare(wcss->ahbfabric_cbcr_clk); - clk_disable_unprepare(wcss->lcc_csr_cbcr); - clk_disable_unprepare(wcss->tcm_slave_cbcr); - clk_disable_unprepare(wcss->qdsp6ss_abhm_cbcr); - clk_disable_unprepare(wcss->qdsp6ss_axim_cbcr); + clk_bulk_disable_unprepare(wcss->num_q6_clks, wcss->q6_clks); val = readl(wcss->reg_base + Q6SS_SLEEP_CBCR); val &= ~BIT(0); @@ -1099,6 +1063,20 @@ static int q6v5_alloc_memory_region(struct q6v5_wcss *wcss) static int q6v5_wcss_init_clock(struct q6v5_wcss *wcss) { + static const char *const q6_clks[] = { + "lcc_ahbfabric_cbc", "tcsr_lcc_cbc", "lcc_tcm_slave_cbc", + "lcc_abhm_cbc", "lcc_axim_cbc" }; + int ret, i; + + wcss->num_q6_clks = ARRAY_SIZE(q6_clks); + wcss->q6_clks = devm_kcalloc(wcss->dev, wcss->num_q6_clks, + sizeof(*wcss->q6_clks), GFP_KERNEL); + if (!wcss->q6_clks) + return -ENOMEM; + + for (i = 0; i < wcss->num_q6_clks; i++) + wcss->q6_clks[i].id = q6_clks[i]; + wcss->xo = devm_clk_get(wcss->dev, "xo"); if (IS_ERR(wcss->xo)) return dev_err_probe(wcss->dev, PTR_ERR(wcss->xo), @@ -1114,44 +1092,23 @@ static int q6v5_wcss_init_clock(struct q6v5_wcss *wcss) return dev_err_probe(wcss->dev, PTR_ERR(wcss->gcc_axim_cbcr), "failed to get gcc axim clock\n"); - wcss->ahbfabric_cbcr_clk = devm_clk_get(wcss->dev, - "lcc_ahbfabric_cbc"); - if (IS_ERR(wcss->ahbfabric_cbcr_clk)) - return dev_err_probe(wcss->dev, PTR_ERR(wcss->ahbfabric_cbcr_clk), - "failed to get ahbfabric clock\n"); - - wcss->lcc_csr_cbcr = devm_clk_get(wcss->dev, "tcsr_lcc_cbc"); - if (IS_ERR(wcss->lcc_csr_cbcr)) - return dev_err_probe(wcss->dev, PTR_ERR(wcss->lcc_csr_cbcr), - "failed to get csr cbcr clk\n"); - wcss->ahbs_cbcr = devm_clk_get(wcss->dev, "lcc_abhs_cbc"); if (IS_ERR(wcss->ahbs_cbcr)) return dev_err_probe(wcss->dev, PTR_ERR(wcss->ahbs_cbcr), "failed to get ahbs_cbcr clk\n"); - wcss->tcm_slave_cbcr = devm_clk_get(wcss->dev, - "lcc_tcm_slave_cbc"); - if (IS_ERR(wcss->tcm_slave_cbcr)) - return dev_err_probe(wcss->dev, PTR_ERR(wcss->tcm_slave_cbcr), - "failed to get tcm cbcr clk\n"); - - wcss->qdsp6ss_abhm_cbcr = devm_clk_get(wcss->dev, "lcc_abhm_cbc"); - if (IS_ERR(wcss->qdsp6ss_abhm_cbcr)) - return dev_err_probe(wcss->dev, PTR_ERR(wcss->qdsp6ss_abhm_cbcr), - "failed to get abhm cbcr clk\n"); - - wcss->qdsp6ss_axim_cbcr = devm_clk_get(wcss->dev, "lcc_axim_cbc"); - if (IS_ERR(wcss->qdsp6ss_axim_cbcr)) - return dev_err_probe(wcss->dev, PTR_ERR(wcss->qdsp6ss_axim_cbcr), - "failed to get axim cbcr clk\n"); - wcss->lcc_bcr_sleep = devm_clk_get(wcss->dev, "lcc_bcr_sleep"); if (IS_ERR(wcss->lcc_bcr_sleep)) return dev_err_probe(wcss->dev, PTR_ERR(wcss->lcc_bcr_sleep), "failed to get bcr cbcr clk\n"); + ret = devm_clk_bulk_get(wcss->dev, wcss->num_q6_clks, wcss->q6_clks); + if (ret < 0) { + return dev_err_probe(wcss->dev, ret, + "failed to bulk get q6 clocks\n"); + } + return 0; } -- 2.45.1