From patchwork Thu Sep 14 07:12:11 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: 13384707 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 04ECFEDE983 for ; Thu, 14 Sep 2023 07:07:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232119AbjINHHq (ORCPT ); Thu, 14 Sep 2023 03:07:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46016 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235823AbjINHHp (ORCPT ); Thu, 14 Sep 2023 03:07:45 -0400 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2049.outbound.protection.outlook.com [40.107.22.49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CE662CCD; Thu, 14 Sep 2023 00:07:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=F50VCTDLXnWd5EkLPdXBBola2ugBKskKLTSwZASqorhsGb3p0F7HMak42vciAtSEPP8gqlUZ0aPAVd0wNCdejxIZvpsScHqPnasPwMza7vzOUnBuS0phf2zlGvJLdq4H+GHGwWSG8NgwKLJkOmJfVeqDiQXJ4lve+16MHAyNsI8acEeLy7OzZEcOUlvX6gO3kEjVgth/+7CYey4pHnICEScHoIbsXBUzhHNiJEmK96kXWi9dUhDDuSbRNveZI5NnVMox83LUsv2IST5FU2apgRf0LGAp5iYBCicbzmyyybwObw5LSiTWXAWGqU8TNFJ9aCASl+vngdgXV34Xgtq31Q== 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=kpbg+Xj9NL50HAbQf3ZQ7PmXQHiyE7zB5X2SgiVY3eY=; b=HVlPmILxvvJJ7dYdw922R2UCwXXWB37ifCL0pW4UjPOuG92DIOuKbPdxuVuZtw2kaSg2uL9nvEa47qGVdQHYK47VF5Zq61zRo75n9ce1ozUYeNwe5/B/pgO06cO3GzUzph3N6oxX5AQss72/+lW0aq/SBY8tKT6t0P/WBFgza/kKN+VTveceruowtzsjR10ZhLfQBuDbl3mjKYZLzHyx79CsyL8/Wqy6eaw+Lvv5ag1+hb9M8nxUpGV1DXgNoYfPtj0E+bMo+x+80RIBdX08DVabVrM/gjAIudeig2is1vxfa0sbHG4tjQVNb2HTPwewAxifFfjuN0Z242+5ZiNVow== 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=kpbg+Xj9NL50HAbQf3ZQ7PmXQHiyE7zB5X2SgiVY3eY=; b=ezcJdNdqr7PHGwYvEd0A7F5x1IF4gc7JPZAyjrLarQlhU8LQQvxcNsJ/zBzV5r1jqc9ijp1pAvzVyoPRHjj0PRAfk8YKIcEW8Pjierkc5ubB330KI+YVYodtgNqa/JoAk8nJ+/gXCBDi4EK3RQcnYMJ8SqxBp0hByABSGNAW4gI= 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 DBBPR04MB7628.eurprd04.prod.outlook.com (2603:10a6:10:204::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.20; Thu, 14 Sep 2023 07:07:38 +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.6768.029; Thu, 14 Sep 2023 07:07:38 +0000 From: "Peng Fan (OSS)" Date: Thu, 14 Sep 2023 15:12:11 +0800 Subject: [PATCH 1/2] firmware: arm_scmi: clock: support clock parents Message-Id: <20230914-scmi-clock-v1-1-bf8edfb0546e@nxp.com> References: <20230914-scmi-clock-v1-0-bf8edfb0546e@nxp.com> In-Reply-To: <20230914-scmi-clock-v1-0-bf8edfb0546e@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, Ranjani Vaidyanathan , Peng Fan X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1694675547; l=7633; i=peng.fan@nxp.com; s=20230812; h=from:subject:message-id; bh=ErGHLOqEK1WHpE9AKwhhDhglPm0XzUGpJH0MFiBpj00=; b=oSBrjTe5BDYPbqxQB2fTTlNytF2dl04naMOUohw3HUNy+7K2EhChJ04mMC77mn+yZQw2a+9Tx c+/QgCiTe+sBOTUuq+mVJc7UWzPuFN7fBaGFpdVVjUwNxIZkX1l0pEn X-Developer-Key: i=peng.fan@nxp.com; a=ed25519; pk=I4sJg7atIT1g63H7bb5lDRGR2gJW14RKDD0wFL8TT1g= X-ClientProxiedBy: SI1PR02CA0041.apcprd02.prod.outlook.com (2603:1096:4:1f6::18) 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_|DBBPR04MB7628:EE_ X-MS-Office365-Filtering-Correlation-Id: 30bc39e4-27a4-4a2f-ebd8-08dbb4f14754 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: bKQJPCHR5o/iJEqzmJScbH3stYWBaNVYtvwzQ6baGTJoP4xbfMIwvhowqkYa5e47kbX0BugMzIg6/wqadylpPgAZAp2x+vGIJmOZLKIuvXR56d33z55JYo2/bTNC/cT/BbIiom1LbH0jT8Nfm/ygH/7L3cNaqPVsE50kIQWpLtq1bQU1r/QQ/22MoTMg0vf6iSZ6qXExgxqymmMOHFycZZU/sxwpCBGcuUyM14minNo4DFi7PvfMljlM2dmzgAQ58XNo0y8hTkNIU+3ZQxGtyc1JOrNcpQuRFY0DlRnWsJmaJPlvRv/ct5ydeXZINGL/yRTSPSnkkksmDcOjhZ83OS6hng0YCOLZabsHDkKfKz5IV3yhiqynpabL1rLA0HwVlIJ7dkeUAn080gnC5OKe5bkYfSKDjByecyMlXWfdeW9JM9sq/U2cNPc/wuYCt6eWuhTyuT5Kz/3dgsaA2HEXBPSuKOXdA+g2+VY6GOFPgalfpIctEwm21zUIygMWnZ7QYspn+bDhbrz1Cg8SFIcAOqwIDe2ENFlgaZzDCnhPz1BrpcB/O7VzhXTgMoqG5gWfYIwiUFhq91AdXvSBxISgEPCICzT3TmqRq3JP6HIcQM7mY1ozYKxcXzzE8uaW6ibh 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)(136003)(39860400002)(376002)(396003)(366004)(346002)(186009)(1800799009)(451199024)(316002)(54906003)(110136005)(66556008)(66946007)(66476007)(41300700001)(478600001)(38100700002)(38350700002)(86362001)(36756003)(2906002)(5660300002)(8936002)(8676002)(26005)(4326008)(83380400001)(6666004)(6506007)(6512007)(9686003)(52116002)(6486002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?/401gFfvNvyiw4EERzPK0NjzjLuQ?= =?utf-8?q?uwAsMniVBPOQ36XLuxcJ6gDuBzj1bRSSCHAyTAD6aEHLxuU1L0i/R1V3tpcRQ2X12?= =?utf-8?q?NTapCPRZdjEXwe6aCJALBkI1rjmrk/SX8Z8hI8L8K+hf6GLBVAtCs8fRdaaroRPNN?= =?utf-8?q?xJDYdLMpbjTXZG1NdtPtSQRHHsYB/cp4WJt67DJejmLOhAbbur/xvew0hll6unUzU?= =?utf-8?q?ZxLiHipEdDgOBd0eiRLT7II9cw9cbUjYAGilQ9D3ri4VvbLw22f/wTPmaLsmw7aud?= =?utf-8?q?SVUpMnnKeN80pGImUzvFRQoM2sRK51ihcjw7dRwV7ZQ8DndUaFN/ohnrXDZKLXHDl?= =?utf-8?q?PWBMpyXu3fTTKZTC67J2xN7P/tfqSf+urc7uTXcxDa3uR4ioUYQr0QNVu301hiHe0?= =?utf-8?q?DbKytYfKWsyHqB8aaTzhefimG82SfmHPi6J4JKX78+LjrQhbWEYVY2yGBnT48kh66?= =?utf-8?q?E6CrTpni4yrc4ny5KOa7nUykyqyOBOCOf2j31QZoiowWKvqkuRRrOux8E9qaCkyEx?= =?utf-8?q?hgafWvWodXNOGuK8aVZmzE/h2RedTWE/FJVeTDCqPOG2aO9Qsy5sYs6Mo/CM07XNI?= =?utf-8?q?UISUhD+87IUa4w2TleFRjcak+5QNAxwAkWj2bgmdm3w378jVcAzKI3zlSOJMQ0s2L?= =?utf-8?q?6BlCfdfEch1qOVLzj7zW+t6J+/Dn8GsUkWNVO7NOGNa0Mo3+9NDU4GoXQ56NdZZhQ?= =?utf-8?q?XviD0vtU3ZKOe82R3ql47Gk60lEi83rPzlyHDsXlqUfb9CFOVx8okas1ZqIwHSBVv?= =?utf-8?q?ZqDHxRHPIh9WPhHM8ofMKBXEOxBDPQGF6T9Jv0udiwQR/kI1NJFHw1m6ECVqQXLtU?= =?utf-8?q?xmeomE/CMVd5196LKY9RcqD0TpjOZdDBajHN+m3VMwccyDPW9gfzihjkJMQwM3jPA?= =?utf-8?q?dur5FeaM2RYMs3+bZSjLEBsPeZy2T1IYD5l/FALpY/VoLYmAG7yglTDi3z7f+xKGL?= =?utf-8?q?sLlbe8tdOhhsVFVpazZO5dB9a6oN+0bwDrwNjaRZYerCxJzKEcgqpVjDl8xljXvfs?= =?utf-8?q?S0NQItPdAYwatAizGA1SbF3Jnrs/Qn2rrPas//TkFqNO0nvbi4cUV/o4+61hV12DT?= =?utf-8?q?1bfO8/T3s8EhFVQLR0BALwllUVfnzFkic7ON5kqPegq8vj6j3NifIji7aOSYb5pgq?= =?utf-8?q?FchaNFEizpe97ZyIE8umAs/myGFAXW+epP42NOD5VR82mwYpTT9gvvfWJnjt8j4TU?= =?utf-8?q?yGn1QgNMU76VT3BissdTCO5NrwOeEtmjES5cst3EgSileFCgwAA16v/KoJ/y9yb97?= =?utf-8?q?bsSE2zurBRd+h0vRYXj4cHmtPs1NOWb1Io234IqGN24KymPivo51AzjqHqER9KphU?= =?utf-8?q?WL6XKJjlrj1yPj5sRZ6U0xrb+KMq0iSOrK9vp91v2zn8gnjUfIHuPpvDAF33BsS1D?= =?utf-8?q?OS0VyPlj6xEk2e692l7RkPXmXPjIWNfDfAjNPNuxG05vg8Dtz3e9ALC6dEW3MU2QP?= =?utf-8?q?kuGLdCa1ZC4Pf2Hz1bOGCvtqz9p/njCNNN3N0VZ6z37kh6fZCSNVjcgtGy8SdMaCN?= =?utf-8?q?WABM0GDu6I2T?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 30bc39e4-27a4-4a2f-ebd8-08dbb4f14754 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2023 07:07:38.1464 (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: DtwkXhLtuL+0hAHrtWn9KEEnYrgdyEGnkpJoEWso1TwnD24c6xUuqmZeCkcXzC570zjjWEIrSzCHc8UDGjipeQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7628 Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org From: Peng Fan SCMI v3.2 spec introduces CLOCK_POSSIBLE_PARENTS_GET, CLOCK_PARENT_SET and CLOCK_PARENT_GET. This patch is to add the upper three new commands. Signed-off-by: Peng Fan --- drivers/firmware/arm_scmi/clock.c | 156 ++++++++++++++++++++++++++++++++++++-- include/linux/scmi_protocol.h | 5 ++ 2 files changed, 155 insertions(+), 6 deletions(-) diff --git a/drivers/firmware/arm_scmi/clock.c b/drivers/firmware/arm_scmi/clock.c index d18bf789fc24..38278922890a 100644 --- a/drivers/firmware/arm_scmi/clock.c +++ b/drivers/firmware/arm_scmi/clock.c @@ -22,6 +22,9 @@ enum scmi_clock_protocol_cmd { CLOCK_RATE_NOTIFY = 0x9, CLOCK_RATE_CHANGE_REQUESTED_NOTIFY = 0xA, CLOCK_CONFIG_GET = 0xB, + CLOCK_POSSIBLE_PARENTS_GET = 0xC, + CLOCK_PARENT_SET = 0xD, + CLOCK_PARENT_GET = 0xE, }; enum clk_state { @@ -42,10 +45,28 @@ struct scmi_msg_resp_clock_attributes { #define SUPPORTS_RATE_CHANGED_NOTIF(x) ((x) & BIT(31)) #define SUPPORTS_RATE_CHANGE_REQUESTED_NOTIF(x) ((x) & BIT(30)) #define SUPPORTS_EXTENDED_NAMES(x) ((x) & BIT(29)) +#define SUPPORTS_PARENT_CLOCK(x) ((x) & BIT(28)) u8 name[SCMI_SHORT_NAME_MAX_SIZE]; __le32 clock_enable_latency; }; +struct scmi_msg_clock_possible_parents { + __le32 id; + __le32 skip_parents; +}; + +struct scmi_msg_resp_clock_possible_parents { + __le32 num_parent_flags; +#define NUM_PARENTS_RETURNED(x) ((x) & 0xff) +#define NUM_PARENTS_REMAINING(x) ((x) >> 24) + u32 possible_parents[]; +}; + +struct scmi_msg_clock_set_parent { + __le32 id; + __le32 parent_id; +}; + struct scmi_msg_clock_config_set_v2 { __le32 id; __le32 attributes; @@ -167,6 +188,81 @@ scmi_clock_protocol_attributes_get(const struct scmi_protocol_handle *ph, return ret; } +struct scmi_clk_ipriv { + struct device *dev; + u32 clk_id; + struct scmi_clock_info *clk; +}; + +static void iter_clk_possible_parents_prepare_message(void *message, unsigned int desc_index, + const void *priv) +{ + struct scmi_msg_clock_possible_parents *msg = message; + const struct scmi_clk_ipriv *p = priv; + + msg->id = cpu_to_le32(p->clk_id); + /* Set the number of OPPs to be skipped/already read */ + msg->skip_parents = cpu_to_le32(desc_index); +} + +static int iter_clk_possible_parents_update_state(struct scmi_iterator_state *st, + const void *response, void *priv) +{ + const struct scmi_msg_resp_clock_possible_parents *r = response; + u32 flags; + + flags = le32_to_cpu(r->num_parent_flags); + st->num_returned = NUM_PARENTS_RETURNED(flags); + st->num_remaining = NUM_PARENTS_REMAINING(flags); + + return 0; +} + +static int iter_clk_possible_parents_process_response(const struct scmi_protocol_handle *ph, + const void *response, + struct scmi_iterator_state *st, + void *priv) +{ + const struct scmi_msg_resp_clock_possible_parents *r = response; + struct scmi_clk_ipriv *p = priv; + + u32 *parent = &p->clk->parents[st->desc_index + st->loop_idx]; + + *parent = le32_to_cpu(r->possible_parents[st->loop_idx]); + p->clk->num_parents++; + + return 0; +} + +static int scmi_clock_possible_parents(const struct scmi_protocol_handle *ph, u32 clk_id, + struct scmi_clock_info *clk) +{ + struct scmi_iterator_ops ops = { + .prepare_message = iter_clk_possible_parents_prepare_message, + .update_state = iter_clk_possible_parents_update_state, + .process_response = iter_clk_possible_parents_process_response, + }; + + struct scmi_clk_ipriv ppriv = { + .clk_id = clk_id, + .clk = clk, + .dev = ph->dev, + }; + void *iter; + int ret; + + iter = ph->hops->iter_response_init(ph, &ops, SCMI_MAX_NUM_PARENTS, + CLOCK_POSSIBLE_PARENTS_GET, + sizeof(struct scmi_msg_clock_possible_parents), + &ppriv); + if (IS_ERR(iter)) + return PTR_ERR(iter); + + ret = ph->hops->iter_response_run(iter); + + return ret; +} + static int scmi_clock_attributes_get(const struct scmi_protocol_handle *ph, u32 clk_id, struct scmi_clock_info *clk, u32 version) @@ -211,6 +307,8 @@ static int scmi_clock_attributes_get(const struct scmi_protocol_handle *ph, clk->rate_changed_notifications = true; if (SUPPORTS_RATE_CHANGE_REQUESTED_NOTIF(attributes)) clk->rate_change_requested_notifications = true; + if (SUPPORTS_PARENT_CLOCK(attributes)) + scmi_clock_possible_parents(ph, clk_id, clk); } return ret; @@ -228,12 +326,6 @@ static int rate_cmp_func(const void *_r1, const void *_r2) return 1; } -struct scmi_clk_ipriv { - struct device *dev; - u32 clk_id; - struct scmi_clock_info *clk; -}; - static void iter_clk_describe_prepare_message(void *message, const unsigned int desc_index, const void *priv) @@ -457,6 +549,56 @@ scmi_clock_config_set_v2(const struct scmi_protocol_handle *ph, u32 clk_id, return ret; } +static int +scmi_clock_set_parent(const struct scmi_protocol_handle *ph, u32 clk_id, + u32 parent_id) +{ + int ret; + struct scmi_xfer *t; + struct scmi_msg_clock_set_parent *cfg; + struct clock_info *ci = ph->get_priv(ph); + struct scmi_clock_info *clk = ci->clk + clk_id; + + ret = ph->xops->xfer_get_init(ph, CLOCK_PARENT_SET, + sizeof(*cfg), 0, &t); + if (ret) + return ret; + + t->hdr.poll_completion = false; + + cfg = t->tx.buf; + cfg->id = cpu_to_le32(clk_id); + cfg->parent_id = cpu_to_le32(clk->parents[parent_id]); + + ret = ph->xops->do_xfer(ph, t); + + ph->xops->xfer_put(ph, t); + + return ret; +} + +static int +scmi_clock_get_parent(const struct scmi_protocol_handle *ph, u32 clk_id, + u32 *parent_id) +{ + int ret; + struct scmi_xfer *t; + + ret = ph->xops->xfer_get_init(ph, CLOCK_PARENT_GET, + sizeof(__le32), sizeof(u32), &t); + if (ret) + return ret; + + put_unaligned_le32(clk_id, t->tx.buf); + + ret = ph->xops->do_xfer(ph, t); + if (!ret) + *parent_id = get_unaligned_le32(t->rx.buf); + + ph->xops->xfer_put(ph, t); + return ret; +} + static int scmi_clock_config_set_v21(const struct scmi_protocol_handle *ph, u32 clk_id, enum clk_state state, u8 oem_type, u32 oem_val, @@ -647,6 +789,8 @@ static const struct scmi_clk_proto_ops clk_proto_ops = { .state_get = scmi_clock_state_get, .config_oem_get = scmi_clock_config_oem_get, .config_oem_set = scmi_clock_config_oem_set, + .parent_set = scmi_clock_set_parent, + .parent_get = scmi_clock_get_parent, }; static int scmi_clk_rate_notify(const struct scmi_protocol_handle *ph, diff --git a/include/linux/scmi_protocol.h b/include/linux/scmi_protocol.h index e09ac428fa1b..e8c76f1155cf 100644 --- a/include/linux/scmi_protocol.h +++ b/include/linux/scmi_protocol.h @@ -16,6 +16,7 @@ #define SCMI_MAX_STR_SIZE 64 #define SCMI_SHORT_NAME_MAX_SIZE 16 #define SCMI_MAX_NUM_RATES 16 +#define SCMI_MAX_NUM_PARENTS 8 /** * struct scmi_revision_info - version information structure @@ -58,6 +59,8 @@ struct scmi_clock_info { u64 step_size; } range; }; + int num_parents; + u32 parents[SCMI_MAX_NUM_PARENTS]; }; enum scmi_power_scale { @@ -104,6 +107,8 @@ struct scmi_clk_proto_ops { bool atomic); int (*config_oem_set)(const struct scmi_protocol_handle *ph, u32 clk_id, u8 oem_type, u32 oem_val, bool atomic); + int (*parent_get)(const struct scmi_protocol_handle *ph, u32 clk_id, u32 *parent_id); + int (*parent_set)(const struct scmi_protocol_handle *ph, u32 clk_id, u32 parent_id); }; /** From patchwork Thu Sep 14 07:12:12 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: 13384708 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 047C6EDE988 for ; Thu, 14 Sep 2023 07:07:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235885AbjINHHt (ORCPT ); Thu, 14 Sep 2023 03:07:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46086 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235823AbjINHHr (ORCPT ); Thu, 14 Sep 2023 03:07:47 -0400 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2083.outbound.protection.outlook.com [40.107.22.83]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AB3D5CF1; Thu, 14 Sep 2023 00:07:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jCay/xLTiyQJim7XlVBSc3zmxwyz1LF4QrvixYAI1G+EjWka63i2N9F3C+gKACZIsPsaYGTHvO0ep1yTvCvyR5sfg0Xg5Cq/8L1n+2g5Mgb6BZVZxa+Tyn56+FgR0+e/k7InVrMGHtGkFSr2aILiHnk2lStNbUvjc2WbIYbIi2RnDNETyNHmqWpH1DEMq8l9EvMp3IbpedgvxZooJ6fdj7K18Gepg/qbnMWm1WDugDVRLHPqeNsfy9kUvUhtFKxB7UqH2GBA8vA5hDfLilFDCx6c3xBMeq4YKHikpxzKgWlT6VHu+zfUKgml7aAgboj37Eyxp41YHczJkTWsZPVRlA== 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=w7GEJdMLv02qYPHlPu72P2aoCKLzhVJHSZH0rJYBNuo=; b=LVGuHXUmpfR+9xMkluuqTHsu/uYFn9xEjhJdvG0h98dvDcqNM6kd6X4ciOSP/784RnfOgDoGQ4cPq8wwbGfQv05hXlJxI743fF9pD830AHZOEzFWBrgW17ASR1j+iLemfBx4BV5uX0bdF8xXTLkeBPS8ERSrzY67wfAhVdWpIk0FvNCXN179Jkb010zt5q7XKNKzkqGH8hItQQjD3YpsT4MJN0mAVmfsQwgZ/KfrKmiqUwmcKgmCHjuLyGaWh4kYzpLO5rkcFQ0qTkU40FWUzUY/61CsuoUlNZ31wmgxARc3qOzZwIQ1FT/DCxGbzg8x+yqT6G/Gs3VSHm6RSejtdQ== 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=w7GEJdMLv02qYPHlPu72P2aoCKLzhVJHSZH0rJYBNuo=; b=NdfpAtKAyXUvzANEgxnpuexVNisvgEtknXLBSUwt1iyzjeuiL1EKv8+3zNl1LS8LH4J8+/hsCXvNvrF84qso9dNdvteOA8tyV3slm+SX2gekeZSOvvQnOzA4V13oIulXLR5vYAW6UQBjj2/41/61WvC0cQ2NlYhXoLGYiN5lsfI= 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 DBBPR04MB7628.eurprd04.prod.outlook.com (2603:10a6:10:204::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.20; Thu, 14 Sep 2023 07:07:41 +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.6768.029; Thu, 14 Sep 2023 07:07:41 +0000 From: "Peng Fan (OSS)" Date: Thu, 14 Sep 2023 15:12:12 +0800 Subject: [PATCH 2/2] clk: scmi: add set/get_parent support Message-Id: <20230914-scmi-clock-v1-2-bf8edfb0546e@nxp.com> References: <20230914-scmi-clock-v1-0-bf8edfb0546e@nxp.com> In-Reply-To: <20230914-scmi-clock-v1-0-bf8edfb0546e@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, Ranjani Vaidyanathan , Peng Fan X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1694675547; l=3053; i=peng.fan@nxp.com; s=20230812; h=from:subject:message-id; bh=tW+XZs/tR9PEWaSz3puVeFpnietDoPGkVjeloq9GITw=; b=Ax+yBfSWa11SzVDs/heYDKiepBbFStf7urPfAE+rjkvm/stcdPlIeTc9SY8phyCutXXBVST6C U63AVGPPh0cCkKnJNC8LwrbcGbT0aS9pvLzXTMRTPTgKJhOt6Y1LdCA X-Developer-Key: i=peng.fan@nxp.com; a=ed25519; pk=I4sJg7atIT1g63H7bb5lDRGR2gJW14RKDD0wFL8TT1g= X-ClientProxiedBy: SI1PR02CA0041.apcprd02.prod.outlook.com (2603:1096:4:1f6::18) 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_|DBBPR04MB7628:EE_ X-MS-Office365-Filtering-Correlation-Id: f00893ca-e024-4ce1-2289-08dbb4f14928 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: d02kAO7Qvel8L+PNl9XR1xdsf3VCacsb3H4ZbfC5W4hN4/0Wa21JT/p0tkook7E/sfcaXd6laS8ZUOYw3n7K85cITWUrWe+Xq0plVFG0UMOx8hGgom2EcAOIi51UngqzzXcAXL0t+CpeHi63wsCBkmay3Hn1vpKm7h13fShL5g8rKX/s3PK0R61eYICz6igjLGXJ0n4dOu0FaLUqbS5w/t5plCO+sKfnoMFrHpWl/BS0DWSV6N1x1iozNpWTsKkPAonLh4T8hRcOC1BDmY3lEva4NbI2KmBe0onKJze8fZPMulUIJa+wBYjAH2RaFS8vuocl+LlzmzoWf0e1Tj+hWO15wgMa/XkSb6hEIyRS5HySJFb+yitYtrQKdR8G9hT2DHFkVmHcbbmr/6VEXNoB8XD84HkXu2S7TGAoEY9DlTkDpvQiZft5IO/hEzu2oMcbuPCpAotHDKDGm7zTl3wS+caAy+HzeywSoFE1IhT13l7d7KorCDU8MHqUYgep0kTxKcyKCJYxZmlcPApRZxklOP+81e+NkxCBIo+E9VjuSjd0eBaYidt0yMvGDHB+u57KtZycAUmLA9UWuZ/ASNB/wVO69vCztMmQyTlTqLPE+AXhtZMiemjyI5Q7Xk/P4hzl 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)(136003)(39860400002)(376002)(396003)(366004)(346002)(186009)(1800799009)(451199024)(316002)(54906003)(110136005)(66556008)(66946007)(66476007)(41300700001)(478600001)(38100700002)(38350700002)(86362001)(36756003)(2906002)(5660300002)(8936002)(8676002)(26005)(4326008)(83380400001)(6666004)(6506007)(6512007)(9686003)(52116002)(6486002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?OXgUfzIjo2TN8FlUFKtJeusNGxpQ?= =?utf-8?q?dzAVgXgiotAoaqnPhNOF96y5jpNzMEvoauncGL8mONs+NFdSl58vadpcy7DUUUDZV?= =?utf-8?q?3rqcMLMDWx6YwFrf//k7Omd9igu8y7/jPEl/gMraRS0kjT6xIVtsNWSIqAJK2Bxmz?= =?utf-8?q?qculfRm0Tg2JVrMa9x9zlEyIi6CMIY/rwFDZkSZnHilO+JXXptMx4g48OAraLq1ZG?= =?utf-8?q?aXeei2iwz5yYGoUrp9Mfx2aErY3m3QUzm+6h+IDNDitz3nSeg6nUaYxC5ns2vQmSe?= =?utf-8?q?cFTov3p124IDw5rbroHMEcMfC4KJnqtLKTJIVOSYYPJ01C7XRkrUUFN/stmkREFX9?= =?utf-8?q?viUAgz+9YHOGnBk3qej3o8v6EhEiGC+XKPLRc0cYCR2Kgm49GkUbqzax0uVeb9q7H?= =?utf-8?q?rHpUfNkjNh4MRrC6hbVxHq1TNPX3jNv/6m8YEo4r8ptA8a800HOYjBZNMwWvOsFlp?= =?utf-8?q?ZB6lzmKfFv+N6KQeGlsp/uRa1I7VkP0jjqMk0bl6MIkfoDZYRT7EGsGXxp9xyZFDj?= =?utf-8?q?nXkFcr5q1dRYYcWTJEgguLpAXi/UkQ2XpRHsXrrvfHgVCvzs6/ACzllLh9ZELbaD6?= =?utf-8?q?tQ8yUvy2ihxxm16E/MfyHRvm7fDIL81Dcz8TG9X5KAQPLgA9Z5Ncm/NIcVCsPcaN7?= =?utf-8?q?4X8bqdVyn+eHaDYI3A8MfdpfWomtj6POBn0SmOem+9TbiOq1fdvi4brEeGTbYbqVB?= =?utf-8?q?SCX7xASgvYZEqOr4DzIt+ULY9gq2c0L1JgvoLyTz2FYCpK4ySuf5BT48gw6DA/mju?= =?utf-8?q?tYmPiDpMiuN5e3JgkntHotOh5CI+vQVuEY+V/3eIt8lDQTHPsO561IsXCFTPoT+27?= =?utf-8?q?+KEVD3KB1DHNWuUkJuy7zd2z79AoQ83N/asiZobI2qt8a2OQa/kpnqQ1qGh4gnu/0?= =?utf-8?q?NHvR2LcMn9D5byB86Hi3mauRwSjiAc1bT1JxVzUMbsXBdxPQHBfZrcg36BEu8i5rF?= =?utf-8?q?jr0jkk17NMjvTe9wpS9Z+h9I9EABqFYF6RM4vfOc+KzqeVJBWrF662Akhe5xJ+j+d?= =?utf-8?q?YSVoafewZ4pvBavkMst9OmJl4c7CBCSF1ekOR53+HI05YfcOdsCzCg2Ut8QJM47Gf?= =?utf-8?q?+d8olqNbmckkCknZ19THKkZNFjvR0XlOG/FVwwnm+/tHXUWXOOyFjlrQ8jATR/loS?= =?utf-8?q?mGEGh52ksZFCyb13yL9eVjrhMYV5iN/GSXjCFDQTZxuNWzbXTwZ2eeYriP6ec7i6Z?= =?utf-8?q?e2gToUYonwGrINNXNdzrhF6G7pN9aP7i45JiijEoKWq/P8evXu+CSk1Bms5wD7NKm?= =?utf-8?q?5pnLlKlGTKzM4kPBWkRHcfJXEHxPGudH59IyIxlV1FxLOdA3scs7I5r9subTRH4vO?= =?utf-8?q?ttKCRFUZNeRHAJEiyFe6WGioytDyAJX2E4nZJUsmQ7w+wVok8M0V7sVfbpjJO99Ep?= =?utf-8?q?6hnI/bbmvqkoKM54hNasUS5We9cc4zBCT0QquUd5Kb/WdJZLxTpRY/y/yCyq/RKs4?= =?utf-8?q?swuYrU8BnVQXCKdLvklE3k7bNVSrNWlkQ6WzyzazoL76+kghd2L8JzM+DeBQOb03q?= =?utf-8?q?wwzPE9fko70T?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: f00893ca-e024-4ce1-2289-08dbb4f14928 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2023 07:07:41.1534 (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: wcc45MvB7BhLll18PrZWilqR6qucjyJ+M1WlMymVuCXhHromEDjxP/kfMD4ETaWh4JOPZCmks9uFBqwmkhJqJw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7628 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 | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/drivers/clk/clk-scmi.c b/drivers/clk/clk-scmi.c index 2e1337b511eb..6a283020cbde 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,26 @@ 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_enable(struct clk_hw *hw) { struct scmi_clk *clk = to_scmi_clk(hw); @@ -139,6 +160,8 @@ 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, }; static const struct clk_ops scmi_atomic_clk_ops = { @@ -148,6 +171,8 @@ 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, }; static int scmi_clk_ops_init(struct device *dev, struct scmi_clk *sclk, @@ -158,9 +183,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 +276,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);