From patchwork Mon Sep 25 08:47:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 13397522 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 90126CE7A89 for ; Mon, 25 Sep 2023 08:43:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233030AbjIYInX (ORCPT ); Mon, 25 Sep 2023 04:43:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57476 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233032AbjIYInU (ORCPT ); Mon, 25 Sep 2023 04:43:20 -0400 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on2057.outbound.protection.outlook.com [40.107.15.57]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8598BD3; Mon, 25 Sep 2023 01:43:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gP/39DtxXKmUPvHTBcAQipmSBJCmkT11XgYVkp2Be96MmWh9q3uh+fmAQp5ZOKj8H7sLSkLy4E/uD1wMgRBEEtmiDwbcR8ey5hpvpZI7TRabFJ7jfyypq+RpZ5dQsJQT0W38TsSVIWk1k2iv4OMeoyMbmznvb//k5PXENjjYrZTjRT6mJ/5j4P3xOgE+PzCdjLe7DbH4U0ZHPtmSUX7NY/aMSeHh1SrhK48DYEj98AqiQy3+FMTS0uEDRgWVn9AxR0iNp5pFUHg9/RTDysvBc1ImVs0WYx7ecfmhr9HPwp/AWZjEOmxJFMaMMgyLuX4kG93nvGqVaJrP8wEaOEinLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Ix9KVBYwnHweBcpYqs+IfJUUWkaBBJmN8RTU5DV6tWM=; b=Yni15Pwh4BuwC6QVng0kR+1/g3Or0fyqUc2hbt2rdWzBc7N3daMEpqPQ8Uezi2BdsKUcYg1xm0yfEELf+GQFCGd0g6yXpyLNp0vJ84Gjuprzmt/QOkNNHOYYCV/oxEkGBUyogtSYpEGjEhzxL7nUnMpySkuC1xdiBYz4XXzauJHAePwZZqlG6LQcbh5xyx6+oXRqozkRIVqmSSd4JJXGRHbjd1QOQPf0eMjiN7hw6HG8W1sfYCXQI0Nm+Wh+VDEmLglgxLK8T09ZETar3P19urXiHr5dC84WgMVx2xkDTPzvb/QSOm7SUDTFuXZzZ8tli6exXOPvaKek9OSwXmWePg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Ix9KVBYwnHweBcpYqs+IfJUUWkaBBJmN8RTU5DV6tWM=; b=jel6tHn8dNZtX/4OgKnW/awm97X7VOzLiI2vdWgE0fwmBeGrzHVASm0utRCNh2I4BUR9lL0GNusL9nY28Y4GqR0MNuGHJzaGtJvZvC1Lj+Re53gNtzJ/zHfRsBE4YyVWxM94B9XyTHjTZys3ZSFdZNz3t9b+1ugw6S2hQQcFQJc= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by DB9PR04MB9401.eurprd04.prod.outlook.com (2603:10a6:10:36b::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Mon, 25 Sep 2023 08:43:09 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::2b3:d8de:95c8:b28b]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::2b3:d8de:95c8:b28b%3]) with mapi id 15.20.6813.027; Mon, 25 Sep 2023 08:43:09 +0000 From: "Peng Fan (OSS)" Date: Mon, 25 Sep 2023 16:47:43 +0800 Subject: [PATCH v2 2/2] clk: scmi: add set/get_parent support Message-Id: <20230925-scmi-clock-v2-v2-2-2d4d7127ebc1@nxp.com> References: <20230925-scmi-clock-v2-v2-0-2d4d7127ebc1@nxp.com> In-Reply-To: <20230925-scmi-clock-v2-v2-0-2d4d7127ebc1@nxp.com> To: Sudeep Holla , Cristian Marussi , Michael Turquette , Stephen Boyd Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, Peng Fan X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1695631674; l=3380; i=peng.fan@nxp.com; s=20230812; h=from:subject:message-id; bh=GEoaMPEKFPMe5D3pfktJgZun60qYQRSSGhLzuwR/Q7I=; b=0OkVcU5hD3ZSvop2QEm6JW84xrIleREJijHZAkYOf+F37wOodCw3x5TOunCQjZxE3YUogJo5V iHXfqsFvxxqDR5ES4aaJvpozEiLq3TCoBQQk9Ag7x0FEXKEgNG629NG X-Developer-Key: i=peng.fan@nxp.com; a=ed25519; pk=I4sJg7atIT1g63H7bb5lDRGR2gJW14RKDD0wFL8TT1g= X-ClientProxiedBy: SG2PR01CA0183.apcprd01.prod.exchangelabs.com (2603:1096:4:189::16) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0PR04MB9417:EE_|DB9PR04MB9401:EE_ X-MS-Office365-Filtering-Correlation-Id: b28b8c7e-3d97-46a2-64df-08dbbda371fd X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ddU3B4xGbTyvo332nRT7KshUCDzLvlyFByEdzdHigrGO58MQmWpS2HtFLHoQA1gj7llrcKpXqQ0GDOXQpsH3BbaYeM/RNCQrZg32aMb8Yr+BzomV3+vfB1X3p06lTlceQ/kjEKrES5xsMow6bqxSLwqKUZ4uqAE/bSjz2sKy9hZDqkna2CbSf3yQOFaygalU1TXkvyfJiIw72ik0jxivSMDuVMi3M/UcJIgKS23MkR2tON5UQUcHSMFsuHodeSge7FO55ldSyDxqwcxY6VmHjng/b64umLm8avqtMRlHuZScUUWiVRdipjCeW5adH3kAAmT4EP7cJzVV4wdn0L/RvIMucIXZbZ4HqDWxqvuVPsEPraaNEelRGx7OWFYuG8va+QUts3LNhuRKYzXyOpatqcW46OXADP96PM7dvQdGZ+YP/KQmti+K0ks1OaBw0coZVhwrAt7jzT+sMmRz49+SI2vo2/qnV2u/BAhTbbRzFlU/wsaU+vMBr0G5ks6ZhaLJ/vkOR1/Wev1V81eIe7bvYsCi1Y6bz8rguMRLuhMDw6/rF8GdvvaMxg/cL0L1HpjqHzx0eoej7Q8kZEXJZJmvi7ztbhOCLzy4ZTq6RidxJI+wf2yJt85aO/cB8+BCuH3A X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU0PR04MB9417.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(346002)(376002)(136003)(396003)(366004)(39860400002)(230922051799003)(1800799009)(186009)(451199024)(2906002)(38350700002)(38100700002)(83380400001)(478600001)(52116002)(9686003)(6512007)(66946007)(66556008)(66476007)(110136005)(6666004)(6486002)(6506007)(5660300002)(26005)(41300700001)(316002)(8936002)(8676002)(4326008)(86362001)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?b99x6jRZUdraddiS7kxNXgCCr4Sq?= =?utf-8?q?ipRy38N5pR9VeAbbouiTQE6kFBTUX2Y+jnE6HoRM5XSiFaXWbRcJ3xtdjdBQKxeio?= =?utf-8?q?sGu2p4RjSgF6elkFOBuWDCTblPCpsKOuEcbdE9ZtbAIjz055dP5oZePziNkKjOBra?= =?utf-8?q?Hie0NtT6HjA9EtzfxhBSR0KvKy+lozqfI9onysxQNiaO6sda/K5LEJgfmCyoETJ0/?= =?utf-8?q?5mqsSj5czSwZBbXY5DNp0JX8/P2A/9zDi7X2rzCMa3g06bl/SKQ7EMIu6yQpWfzWx?= =?utf-8?q?rf66grPfe0u1XqRURckBtTgVgRnZY4lUXdAVM7NOHdremulGWZZeJ5kGjM0Y13TkN?= =?utf-8?q?IAQRsQyGMAJW3QvRdE9cxNKJaGvzDcjRBUpX+XtXhNYUGxs4/J4jpKiTtFKuADqmQ?= =?utf-8?q?dOLBH9kMBx4nMyyNzM7sy9KxKvBrMXD/sjTzLvLFp8K1ihTHgPNNS/qjiDqqPO5Dd?= =?utf-8?q?0ijLIJYtXaPlL7UpAVpGr0DTw045NvL6/dA4KA3h1xkhwBkuF3HVmvNXqFSh1ZVAn?= =?utf-8?q?t9scHC2ET3M46Brvm2OvDAUQj3lzeRpFu5akxeqFCxQbr3imBUKyx7d5a4a8lNw1x?= =?utf-8?q?85Sdxo/hhRze4iqRavFdcUISACVm8XeDsB/7eCb4GpbmToZg21+RHNhqpgMu65bNn?= =?utf-8?q?S7u1KNPhz8ewAWFloCmUpaGkErqkh7IdjeQjFnQx4IN8U3IyfUbIV/pBuAkS6Vhvq?= =?utf-8?q?M/5YCTS5UTXZpBu99TKEv3E73fcaDGPW9HLZHfxR7k4SUgS3k6XsISvL3av4VJ4mh?= =?utf-8?q?62UfvtElpgk10OP8T4esm98xQWblRb93gk+xgHK0lGscj3Ov454ZqF308hup9zQFZ?= =?utf-8?q?SzN0/5Hx5WOT1pX2jhG3TQubMEpv9zWNnOcif5h3DPuqpAYY432tYVfsPhK6pI9Np?= =?utf-8?q?m/ym5SDCmyoSuOX4xLQyOZRmXAcjFekL/ZIXtgo/i8lF4Jop2J6LzhavMGbmiraBN?= =?utf-8?q?CnMz9bq8B0d73qf0T9sFaGJqxX07ePbjDmCIcjyO/h31ZErgi6mkZXcD/GeutLT/K?= =?utf-8?q?I8t2z87yblbxWvMPnCC8ZCD9tzEPoqFo5LLn4cns1+brFSpc4+9Pt0ETS6Qmu6t6n?= =?utf-8?q?MfdFKTtHj2ZpmhIwDPUlmc0Vddvj9QaeEH99Pjw5AUniNGLN7XFeqcYlfSLTuC/2e?= =?utf-8?q?Ke4gpU5+EluobdvmHNzJcP7kIRpJHLSiBDfjpYi8kH7WEL1jg4ZZqjX5JZp0P8kAC?= =?utf-8?q?uRsUmyp/wQ9n/maoQr8StwXlKjpGiVMRxG+vXY7BTqMVppOLAe70xyHNj9tvZ0xT6?= =?utf-8?q?9+lTMEzUQXxGAZXQA28NwDWlcVv8Wm0K7X/eG+K4w6TANVRr4EDWCFTAayOGFprdR?= =?utf-8?q?0nKHO8Lgs6sIfgssJBrsWU/IZ/s95UPEIhF+/ltacBRAHT7hjz2FA2WGKIJHjwzji?= =?utf-8?q?eaYQpInhvtljN7x1AvBLSrdxUyTxRLRbHgZbcEWAXI01kk8aT2tnDKSKfJf8U9FGG?= =?utf-8?q?vewCZqoum4yoe2CUmU7EQi3jZmi3W/jgIrA1Dxs3o2sI2R/2mTmb/TwmFupyIzx3W?= =?utf-8?q?zdgjs3hcwHIw?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: b28b8c7e-3d97-46a2-64df-08dbbda371fd X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Sep 2023 08:43:09.4115 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: H20hnQ16iTdHQ2xX4gpkmM9mUaFygz+q+T3FIcRW3xOVDAx212HSLlalxdIoK3RLacAI1cjnNgyLS8pdQQbGqQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9401 Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org From: Peng Fan SCMI v3.2 adds set/get parent clock commands, so update the clk driver to support them. Signed-off-by: Peng Fan --- drivers/clk/clk-scmi.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/drivers/clk/clk-scmi.c b/drivers/clk/clk-scmi.c index 2e1337b511eb..5aaca674830f 100644 --- a/drivers/clk/clk-scmi.c +++ b/drivers/clk/clk-scmi.c @@ -24,6 +24,7 @@ struct scmi_clk { struct clk_hw hw; const struct scmi_clock_info *info; const struct scmi_protocol_handle *ph; + struct clk_parent_data *parent_data; }; #define to_scmi_clk(clk) container_of(clk, struct scmi_clk, hw) @@ -78,6 +79,35 @@ static int scmi_clk_set_rate(struct clk_hw *hw, unsigned long rate, return scmi_proto_clk_ops->rate_set(clk->ph, clk->id, rate); } +static int scmi_clk_set_parent(struct clk_hw *hw, u8 parent_index) +{ + struct scmi_clk *clk = to_scmi_clk(hw); + + return scmi_proto_clk_ops->parent_set(clk->ph, clk->id, parent_index); +} + +static u8 scmi_clk_get_parent(struct clk_hw *hw) +{ + struct scmi_clk *clk = to_scmi_clk(hw); + u32 parent_id; + int ret; + + ret = scmi_proto_clk_ops->parent_get(clk->ph, clk->id, &parent_id); + if (ret) + return 0; + + return parent_id; +} + +static int scmi_clk_determine_rate(struct clk_hw *hw, struct clk_rate_request *req) +{ + /* + * Suppose all the requested rates are supported, and let firmware + * to handle the left work. + */ + return 0; +} + static int scmi_clk_enable(struct clk_hw *hw) { struct scmi_clk *clk = to_scmi_clk(hw); @@ -139,6 +169,9 @@ static const struct clk_ops scmi_clk_ops = { .set_rate = scmi_clk_set_rate, .prepare = scmi_clk_enable, .unprepare = scmi_clk_disable, + .set_parent = scmi_clk_set_parent, + .get_parent = scmi_clk_get_parent, + .determine_rate = scmi_clk_determine_rate, }; static const struct clk_ops scmi_atomic_clk_ops = { @@ -148,6 +181,9 @@ static const struct clk_ops scmi_atomic_clk_ops = { .enable = scmi_clk_atomic_enable, .disable = scmi_clk_atomic_disable, .is_enabled = scmi_clk_atomic_is_enabled, + .set_parent = scmi_clk_set_parent, + .get_parent = scmi_clk_get_parent, + .determine_rate = scmi_clk_determine_rate, }; static int scmi_clk_ops_init(struct device *dev, struct scmi_clk *sclk, @@ -158,9 +194,10 @@ static int scmi_clk_ops_init(struct device *dev, struct scmi_clk *sclk, struct clk_init_data init = { .flags = CLK_GET_RATE_NOCACHE, - .num_parents = 0, + .num_parents = sclk->info->num_parents, .ops = scmi_ops, .name = sclk->info->name, + .parent_data = sclk->parent_data, }; sclk->hw.init = &init; @@ -250,6 +287,17 @@ static int scmi_clocks_probe(struct scmi_device *sdev) else scmi_ops = &scmi_clk_ops; + /* Initialize clock parent data. */ + if (sclk->info->num_parents > 0) { + sclk->parent_data = devm_kcalloc(dev, sclk->info->num_parents, + sizeof(*sclk->parent_data), GFP_KERNEL); + + for (int i = 0; i < sclk->info->num_parents; i++) { + sclk->parent_data[i].index = sclk->info->parents[i]; + sclk->parent_data[i].hw = hws[sclk->info->parents[i]]; + } + } + err = scmi_clk_ops_init(dev, sclk, scmi_ops); if (err) { dev_err(dev, "failed to register clock %d\n", idx);