From patchwork Tue Oct 3 23:42:23 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: 13408123 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 9E1EDE8FDC0 for ; Tue, 3 Oct 2023 23:37:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236883AbjJCXhy (ORCPT ); Tue, 3 Oct 2023 19:37:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51432 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232052AbjJCXhw (ORCPT ); Tue, 3 Oct 2023 19:37:52 -0400 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2076.outbound.protection.outlook.com [40.107.20.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD135B8; Tue, 3 Oct 2023 16:37:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AROiA1GTDZwYoc2YlJIdFrE9/BT9SQB5LQCJIBrny98+uqyMwT3SzlH0iKvMLJhcfzTxp1UnDaMWVM/Y9kiXGpzVQC1+7HSn5NGiT2Y1OJ+oacpnTA8HfFfCRtqDOZrmddzvNzyZyLbCjNg5jIKHpFkAGhME0QgZqwHIDL3MXJ0uU+xFxiM6Ye6dYymeJztXLMSy6lmRygbVjlEJu6/zX0ylA3WKvARzoSHvP0Esb4Sp5XdlmuzYchHYtULqgCm3+7tOgURjZS5Hc+oJCyMtkzH9p1BPNSKApQomwlW0nygUd8k5IsbXSDz68fA5e8cvNGAD4p7PNJZVFniZkq2J/Q== 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=qDaMTsSdyXwdGgx/APFq6ktvOfPiHQM8TN3MqsyHXZc=; b=J/ybqINsTCwYghVxNPQgNJUGWaY6CVVsFxuTNtGt573ekHTqOo7wW9L+qsb3eNi9xlqMRcmf+8fXMoTm86oLVaUAv6c/tqkq/MWYvL7+TVvHPhbIEnAQ3t7PvkY7bp+u7zBzM7YEHrEt0n/Y1g+H2XRzARy1z0SKyPoT+W7EIDjf+Q0dq3H9W4g/AKnSexIcSHrO+oRWlaWPMbLUzluQfl+g61BwnvkkYHFw85TBSsNgrAAp+96SGlqqjecnR9sECk04VkwCWsNMdhUQGU5Yr4J7MCNKNxLGI2MZv1tgw5SdWDQdMlAXgfF7NKXIwiV8v6GGtN9rElpI5Mil8F1IJA== 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=qDaMTsSdyXwdGgx/APFq6ktvOfPiHQM8TN3MqsyHXZc=; b=mdPEH8CKCiQGGSVaVqRtdq80YnsaigpjMpcUL8lRpDm7sJ4toij1JYinni0R0QmPsYaoEe+DpNwwsoTa55u1RXK/DsBcXLWj1wO510d5k6FhSDQ52iEGX7TEL4MgghNeY4GxFR5jsfNm3IYTSXSY1ZHvQGJJRfDofZb5dgPwitk= 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 AS8PR04MB8754.eurprd04.prod.outlook.com (2603:10a6:20b:42d::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.33; Tue, 3 Oct 2023 23:37:46 +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.6838.024; Tue, 3 Oct 2023 23:37:46 +0000 From: "Peng Fan (OSS)" Date: Wed, 04 Oct 2023 07:42:23 +0800 Subject: [PATCH v5 1/2] firmware: arm_scmi: clock: support clock parents Message-Id: <20231004-scmi-clock-v3-v5-1-1b8a1435673e@nxp.com> References: <20231004-scmi-clock-v3-v5-0-1b8a1435673e@nxp.com> In-Reply-To: <20231004-scmi-clock-v3-v5-0-1b8a1435673e@nxp.com> To: Sudeep Holla , Cristian Marussi , Michael Turquette , Stephen Boyd Cc: Peng Fan , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1696376552; l=8554; i=peng.fan@nxp.com; s=20230812; h=from:subject:message-id; bh=c/OXxmNAJsNthHXSHkouIaDUXrqUc8uJxtJutrOHMO0=; b=eOTvYWlg3imR37GXpil+xZ9ye8wZAWHXGAk0QoRzTEY6C/FcuTXC/ZmqtKa93XtoaQqNrhHDK vEyg4TNbzs5CdkoiE/XGYgVFRjvDqyrBx6J2czp7Sdi0f4DRJb1v6f2 X-Developer-Key: i=peng.fan@nxp.com; a=ed25519; pk=I4sJg7atIT1g63H7bb5lDRGR2gJW14RKDD0wFL8TT1g= X-ClientProxiedBy: SI2PR01CA0045.apcprd01.prod.exchangelabs.com (2603:1096:4:193::19) 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_|AS8PR04MB8754:EE_ X-MS-Office365-Filtering-Correlation-Id: 519e3ce4-fa99-4bc9-8817-08dbc469bf28 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: ah+B6VA2LBJ63S3D5IznIcclvxYTbB0h8fj+huHFKebeVDc/WJSozN0nOYMT4IvZN9brmQrhKyWr6bFRVGzclU4GqJaPPqRVBMYiXi55Tn7iHs46IXxBjxduxw+k9RC44caKjPINTufSCmANY8cmvch4+fvMWYlXZtTFb8GSOUYwZsiiFD9XW71ui8icEvZm0WlNQ8xm4quFubKh5whcFv4gcA1gdKuM63QtgSepmfJSrnNNuR5hL5iA5ML4dN1oZMvCTU4PlPDkwI7LG/Yx98m4CMFZTLXMl5GFQyVAzyKS1NhgYwTvnh/FBCtenrA0pdsFzayc6fHlNXBDhwvtA1H6ILaBEDWdoqJvnbDtoPjFW4JHwa5VdYnQHXH+1Or6JIRSEWOJ5QHh+r9J89RThlXFfDempEomQR1fUGcUohmCkQbm1WivYZLfdHdN/ZLQC66oX+y/VsXH8WDmNuB6j4oY3oMAOfsmXMSKrSm6urv6qGJm1oZxOXioDnnaFdiTbA1/GfZHDx8NH/zuCH4H5abMkpe7XHt66QNJz0eqf1NoAdgexwWYCvWElIwmaftN4Qk7+sZk4nTcsK3IyTV6Nt6c8khvZv5FXU4sgP8xO4PNwI7bFBVxfuERekuVuP8w 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)(396003)(346002)(376002)(366004)(39860400002)(136003)(230922051799003)(186009)(451199024)(64100799003)(1800799009)(6506007)(6512007)(6666004)(6486002)(9686003)(52116002)(478600001)(83380400001)(26005)(2906002)(4326008)(110136005)(41300700001)(66946007)(66556008)(66476007)(8936002)(5660300002)(8676002)(316002)(36756003)(86362001)(38100700002)(38350700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?9Okl+6HwiwqWp6GZmKL1JhbdopCq?= =?utf-8?q?F1ep4Au8B58vUbx7rhGbDclY3uUkyjes9TVmXPQejS2Yq6IFDHiERZZOZLwMUdDgP?= =?utf-8?q?dtMfkrGd003C2nvRxLo8nt1hvQLFjgUW4xqdQlGA/cBdEncT6MTQRkj4JcNEUaPh9?= =?utf-8?q?LH5tD10b07+U5c3iYhp3y4Ux/dv44jaWsZbu/xcXP8iRJ0gAKHVFmojp/z3oyrqQd?= =?utf-8?q?VI3jALz7Jdud+sE9BmnqlkLurtXYomUW0idEMqsyR7Dp1qd8/xCLAp9lAiIIh0t2V?= =?utf-8?q?/62R8fQxBsqwHkffs9LoFd+Oti2R2fCLwaiF2LgdwS87Rz8Ansu0vzbF7yt1mooSD?= =?utf-8?q?S7Su4BwexXqKZRyiR5RtcZ3x6xVeEqwe/GL/tiWwF14j/OvtGsZQ/loHUmWCQdebz?= =?utf-8?q?E7hCWgiRmPswMkUKj2X8yPtx08/V2/D3Ci84DbvnrsMZ37ChIHfcU3inA2h0+kAsd?= =?utf-8?q?JybYfNc9Q1uXu6ciZdYOEbVEPxY+WeZPDLLEBrClUXCCkDevLwcsdLqgJFeEG1Ydm?= =?utf-8?q?GCPv1xz0LorvUywj8Zrz+wZsnIk5c8wKpiYTnk3PhB1zWxsBrNDZQfRlvyCLmOM7t?= =?utf-8?q?QckV1akfsDpv+gHwsXi2Gyh82tfQtvFTLWvTGKhVktL9D7KIW5mN+pCzUzhICcwLG?= =?utf-8?q?IRgtFEjBFm9cPfrkeuzVv7ViAcICDuAmALFPkGHwSIwiF40nKevtZ0tzxJ91UoihZ?= =?utf-8?q?+6+lhFteNy6ha7mccEapuNI16zGxprmq4BZ343RXYlnTVYuITzQS2gii5eLS1880j?= =?utf-8?q?7EEeBYfgbWVpB3x/GMw7agnE+//vCQaekVtCKVRFB7MITDv60c7w8DF/5RNdnqv2d?= =?utf-8?q?XJZ2laGUaj3kUvgzjgoCbMcPdiM53nuGeNv/gjhJgw6tmV1aJvRsMN/IIaYXGxwGE?= =?utf-8?q?h50zjO3U5yQ/7guVs3+YhV6ZX3R5MthOh9ZetRj0igHEKCYE2Tkumzk9LYDNALH0s?= =?utf-8?q?eYMFqZkOCsvCz1kGISTgzWOmFo/FXs40g7O3Ikrh+QueSo9UOOg7qdgUMZUYmNtZL?= =?utf-8?q?iKRmw/5akhH/2vnzYuIlTR4vepfFTakO2HkNsyAZT9o2C7QSj/iAi0cQd5plf6Egu?= =?utf-8?q?yULZsP0NoHWTP38i4wTjA1Kg5PaZ4uMalM6ramzm6jxmJ+ifPSL971D4UPVwYGJ8J?= =?utf-8?q?uX80dsPSg6v04xSPRtecYuXGwVfshmNbVBKtZG7XkSXECAOdKqUlmqzTFCuK/tYZI?= =?utf-8?q?hmtBtUehk329XkL/tZ8bTOl4IESAfN1N8fPw/Gq23Q08a9tPh0FnX7JkOSTa6Q4KD?= =?utf-8?q?xQffiat/kGBXX9IhznbZCxhY+wndhZsuYTQsosJV3mFYQKo9b6chqxoCxE9TjHpih?= =?utf-8?q?vgikicAof5deptLWfJ0VZeghy3jwTX3+zSza+J13IQsliftwTPaDRfOB3qLUJK/Gc?= =?utf-8?q?2XkQnkQaoh8afz612vPM9b/U9L3zdjRFE2hyoDpEf/YsOAgEqghkOPGO86aFOD8R+?= =?utf-8?q?5SkLMlG4U662C+J6+3amvH3PGagZcA/3Xo6PP4LC/dUvEeFjDAH3g8rOwboZhSlqI?= =?utf-8?q?D1HozvH5r8ng?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 519e3ce4-fa99-4bc9-8817-08dbc469bf28 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2023 23:37:46.2084 (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: RoiK9zPqVd7Pama8ivtD/QfWWaG+2ggat3mjHWqeQ19kBbSkdaMyw7rQewPOMXvxX8TM9/3FwFPVbsMZFi4Vzw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8754 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. Reviewed-by: Cristian Marussi Signed-off-by: Peng Fan --- drivers/firmware/arm_scmi/clock.c | 182 ++++++++++++++++++++++++++++++++++++-- include/linux/scmi_protocol.h | 6 ++ 2 files changed, 182 insertions(+), 6 deletions(-) diff --git a/drivers/firmware/arm_scmi/clock.c b/drivers/firmware/arm_scmi/clock.c index 9c0e33c1efab..ddaef34cd88b 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 { __le32 id; __le32 attributes; @@ -168,6 +189,99 @@ 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; + struct scmi_clk_ipriv *p = priv; + struct device *dev = ((struct scmi_clk_ipriv *)p)->dev; + u32 flags; + + flags = le32_to_cpu(r->num_parent_flags); + st->num_returned = NUM_PARENTS_RETURNED(flags); + st->num_remaining = NUM_PARENTS_REMAINING(flags); + + /* + * num parents is not declared previously anywhere so we + * assume it's returned+remaining on first call. + */ + if (!st->max_resources) { + p->clk->num_parents = st->num_returned + st->num_remaining; + p->clk->parents = devm_kcalloc(dev, p->clk->num_parents, + sizeof(*p->clk->parents), + GFP_KERNEL); + if (!p->clk->parents) { + p->clk->num_parents = 0; + return -ENOMEM; + } + + st->max_resources = st->num_returned + st->num_remaining; + }; + + 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]); + + 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, 0, + 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) @@ -212,6 +326,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; @@ -229,12 +345,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) @@ -458,6 +568,64 @@ scmi_clock_config_set(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; + + if (clk_id >= ci->num_clocks) + return -EINVAL; + + clk = ci->clk + clk_id; + + if (parent_id >= clk->num_parents) + return -EINVAL; + + 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; +} + /* For SCMI clock v2.1 and onwards */ static int scmi_clock_config_set_v2(const struct scmi_protocol_handle *ph, u32 clk_id, @@ -650,6 +818,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 27bfa5a65b45..f2f05fb42d28 100644 --- a/include/linux/scmi_protocol.h +++ b/include/linux/scmi_protocol.h @@ -58,6 +58,8 @@ struct scmi_clock_info { u64 step_size; } range; }; + int num_parents; + u32 *parents; }; enum scmi_power_scale { @@ -83,6 +85,8 @@ struct scmi_protocol_handle; * @state_get: get the status of the specified clock * @config_oem_get: get the value of an OEM specific clock config * @config_oem_set: set the value of an OEM specific clock config + * @parent_get: get the parent id of a clk + * @parent_set: set the parent of a clock */ struct scmi_clk_proto_ops { int (*count_get)(const struct scmi_protocol_handle *ph); @@ -104,6 +108,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); }; struct scmi_perf_domain_info { From patchwork Tue Oct 3 23:42:24 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: 13408124 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 63696E8FDC2 for ; Tue, 3 Oct 2023 23:37:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237343AbjJCXhy (ORCPT ); Tue, 3 Oct 2023 19:37:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51450 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236548AbjJCXhx (ORCPT ); Tue, 3 Oct 2023 19:37:53 -0400 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2076.outbound.protection.outlook.com [40.107.20.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B173BAF; Tue, 3 Oct 2023 16:37:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZxHkjRS8QmJCDe4f6o6vTnE77a8W5MoHNDqXPu6L7xaVo4lLLQV8RB8q/Eq4lFy7Sv5LD/9FOtC+4C40O++WSDZ0et2uISZoVFTAhoyCjVQpDwRsLS/N5UB+bfo6g8hn6ZE3BRtIKbu82F6jSZdvZOE/mrFjFS4nDk05RjCpGBn82ccHsHQFEUhpOe2Atv4NMNV3aasoPFobhYinh9KcE8rpSS/yEuf+7wyNrxC0OCm/f80tY9jc/B/bnMI+OgL092nXX6v/DePFTBb1QsqGaWs6s8p/bBensjKY2FZ+KnVPbDDXLUyFcwljOEUvnxL0J4heW70jkVWcxcpPP31VAA== 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=kZwkiVt1kHf5dCHQ0xr8jc9uETCAps2NFYI3l4uDMNQ=; b=YrmC7RkkZA1/cbFg6uGthGegsqVuWu37yIZ2J8LiTupJ/rMVaF8Pm89jsBm+wJ7EJdgOK71cMaKYQ/vVnhrn+tb47oPYwClPdgR06mujkS9hWRtht6JHNpm/e4GkbDSrxXMoZY6d1VkUAEC/rBL2Qh/RxPTw2Ra9ALXshUyKasoEbWaoOcthWGnLLZHLPSNRtHzgyURzJtzVPdGeWz6uMSC1fdoz1+U/ujW6sx+KVgpU+ZhBp/VrMGZeSgBciTCA0saas8XiqP1weFUQqp+SlsF2l9pYzAoUoEQCopHkSXMZI6gTept5gemI2uqvMtPpUVZlsY6+Qt6Ane/kTlD/cw== 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=kZwkiVt1kHf5dCHQ0xr8jc9uETCAps2NFYI3l4uDMNQ=; b=ImocjTt9B5RfSwUG5K+o0BuN2of9mFCE62+H5GQqDlLU0y7JBPksZt5jTqICHKZRpegiWqYaJTuyy+6nNv6TAoeeapxe02T5nym/YLGOmPOOELa9AJUwVwImGflLDOc4kpDBfb9f1juspYONXr2Mp8xNYkwsnjDgFS/HMdQ2tH4= 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 AS8PR04MB8754.eurprd04.prod.outlook.com (2603:10a6:20b:42d::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.33; Tue, 3 Oct 2023 23:37:49 +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.6838.024; Tue, 3 Oct 2023 23:37:49 +0000 From: "Peng Fan (OSS)" Date: Wed, 04 Oct 2023 07:42:24 +0800 Subject: [PATCH v5 2/2] clk: scmi: add set/get_parent support Message-Id: <20231004-scmi-clock-v3-v5-2-1b8a1435673e@nxp.com> References: <20231004-scmi-clock-v3-v5-0-1b8a1435673e@nxp.com> In-Reply-To: <20231004-scmi-clock-v3-v5-0-1b8a1435673e@nxp.com> To: Sudeep Holla , Cristian Marussi , Michael Turquette , Stephen Boyd Cc: Peng Fan , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1696376552; l=3625; i=peng.fan@nxp.com; s=20230812; h=from:subject:message-id; bh=7BvJQbtvanJoBfjUgYdcKhXHAOMYJ6zypk9Y8ZPFLnA=; b=3ukrCrulkg5MHNzFKFllUZ8R8GuKsudY2vBcjf7ruk8wFxoTx75xr3LIZbaH4K/JDF7ka1FCY dZyOibu1pTSAw1afNjvo/Te69hu/amJ9ivCwBdID3dbacFdsMNXB9jL X-Developer-Key: i=peng.fan@nxp.com; a=ed25519; pk=I4sJg7atIT1g63H7bb5lDRGR2gJW14RKDD0wFL8TT1g= X-ClientProxiedBy: SI2PR01CA0045.apcprd01.prod.exchangelabs.com (2603:1096:4:193::19) 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_|AS8PR04MB8754:EE_ X-MS-Office365-Filtering-Correlation-Id: 8ab63bc0-f47c-439b-fde9-08dbc469c0d7 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: TgcWS7XHbgwBEgZmwdRfTpIG5OSD76RV0V9AzsPDQFx6mBqDe9SjShM3i5f45Dbo6xUMhLtprh+s/xzf2sNdKUEaVBPFzVYA3SWRSCrlNB1TQYj1iyQCUaevVM0Lw9xkgON7xuo3cqm5ERn+1Y65Znvwz+PXReI7JYEUNceQA8DmX1C87OpLaRJZUiAs7sqD6jp26GJHHmf4QnHhO1ELfpJVcDUbW7BhgJVd90e7YuYlQaMaY5LgCESpjSdPkumpQ+/EUp4qhwyzONTZFk1sv9XSNj+sZKlXUQvJxoolxdEkeuYId4Ir/oiuJ5sYXfsgebuRlv2hE0T7nBa2JB5+aK/2wizK5iUUVtvlR7KFwgnUGmHT3BAN2E4ABdLZZlGbtoZX+ub1fS+Bd9zWMlyR1IrZHgh3vJpHpKs3WNVSGKCN043vLDoe8ju0hKqMTlo+hM0PQBHYt/peR0lIT5rzXbxRLhvkJO7b2c3ZqGhPrlw2fUhcBhrAbq+UaPLTYEm4MeOxpSdUlHiIB8Vm/XLBUJFwOFmjL7dqYkaM4yLFO/0hRQXHhLGEz/SBV/CZalV2zTQqPj5aTrqGA+DsM0065OriUYLco2Y2tL1B4Bi8EIDED/yzTl0pJihcHqo1iuZU 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)(396003)(346002)(376002)(366004)(39860400002)(136003)(230922051799003)(186009)(451199024)(64100799003)(1800799009)(6506007)(6512007)(6666004)(6486002)(9686003)(52116002)(478600001)(83380400001)(26005)(2906002)(4326008)(110136005)(41300700001)(66946007)(66556008)(66476007)(8936002)(5660300002)(8676002)(316002)(36756003)(86362001)(38100700002)(38350700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?OkS5UH0I2ltAPvLFzzxCNLnEHmlI?= =?utf-8?q?V9JYDmvyP0htl0YzSyNWsPzCTSba8NoRqiiAgT8TPpgS5CyxtFiOqnKZAm7aTMVlo?= =?utf-8?q?a9Z7a+t56tdgfw7jmU6+iJ5fQoLp48UdJaUGjFCoADdUY3ROmta8MzzJV8EsLQAI0?= =?utf-8?q?ksarfe7rM4JbD81GDUi+X+lwwA4zI0FrvJwq4rx/e4UdL6o+a7VZDDsKJeoBCXlPZ?= =?utf-8?q?gdQZDz7aQmdI3RUCwIsUPiN2A38c/fWPIF3lCajIoYHCgmy9B/bbhARVJaN4akBUu?= =?utf-8?q?/HKYmBB1BPNVpnm31hwvyPG8r7tPFfxd91arMRUNijvwhV1aQwFm/S+eSnnm0NJPD?= =?utf-8?q?ijuOMLiafEhDOxmHm9c+vymKQsJWm24HjYUg3+uNd17ofjgHUawp51cWyTQl9i0JS?= =?utf-8?q?69Sf8MZRxWuwd5p3hClVeaNFQsHZthOeMV66iFXiojs9VXjLQELs6jvKV1igvs09v?= =?utf-8?q?vNiAXWJFVw4DNKrptIrwbRkJnj5hQDgL4fBtwKA/C2myAA8P7T2/boy+t0eISKHJE?= =?utf-8?q?i3+tZ160NCK68LjaQuPxo/xtM18cOa7hZ4t0d7o3YsQ34xxMCFRqOp9YCpnGPdekb?= =?utf-8?q?G09fTc66JQ9U1MkoN/c8DcZULNY1tqp0jFskUrwYzurjvUR2vr4g0Ahc8f7NJNckg?= =?utf-8?q?KVgVPiKB0H5LHcldFVvDt/8m2BDN5mk7KOmF47jtXF0an+xCjkktjUF8TP4/auuRc?= =?utf-8?q?np87ymlYfmyRpz5lqUioWTnmou7KATdnyz5KERrvzRAe+Dw0TW6H6QHG61SraWk4G?= =?utf-8?q?P1Q2CugpSlmpMp1VnQ9z1VlXpRfSnHdpr+cki1zWfbO9Xm5hD0tiX8pkfdlbx5qVC?= =?utf-8?q?PqZCurZqPhqld5zD8eZEts4+zoWAzmVJUV2zRtfJNAVCC+KAgWB0ZMQq6ec/1iUFo?= =?utf-8?q?/1aUPmwnIJGhE8E948HkjJJ8Htajw/ghBcBP+DTvBCwUT1PEmpJFfVJPhIIog187/?= =?utf-8?q?MmEK0vOCvh0Vf+zTlkFyL7SpFQoD/ftc09ln3gEffP82YcfQ76OJTh2DD3TeVGjEc?= =?utf-8?q?10OvadqI25f/xSIgPhCE+rkY7oAgJX590HPqhE0liMUZkbnkJq/qW6a6JNDqtVDyG?= =?utf-8?q?kre5PO/QC+XR4akuy35jvh19uUGK8FTIp7DfV6eOr8nt3nmIh9ADPwL8SPrR0HUhl?= =?utf-8?q?s2k8zdqvtEChblXspwa4xbJHDrm02ALwaslpB29jenH5SuuykyTdD0+rA7II7/SYV?= =?utf-8?q?wDHNnoC/SLO9llrMbTz9ZtRIAWAZlqLrBhIg0+pEwFDqy7Z+zy3GS0UkyQ0Cl5w75?= =?utf-8?q?FkLDTnFXHIl9BjpPpfblRrNKwbuvoiKcr5cC85NKw4rliTe9dHjHzh63yGXNel9EL?= =?utf-8?q?xd4WrSnGiwbBiVWWdtZQZK1Zbs9PpI9j6xbiV7gaJH1+rtvjJhYVetYRj2sNn4qDM?= =?utf-8?q?TzhrZGX95wErwa7adPewFs3K5xZ5VQCnituRqVB/AvzBJDsV314RdKNSmZ4oro2oa?= =?utf-8?q?hLOiep6PvrEi4wHDF9Sbap3Zo2M11CYGw7d4NJLsucbpjm3JjZCuOyKSL90FuFDVz?= =?utf-8?q?eafvYQFYaJCF?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8ab63bc0-f47c-439b-fde9-08dbc469c0d7 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2023 23:37:49.0191 (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: V0Z3WHJUVSjuCdUkCfKjt5gEpZMdOjcvTjNxEAnqoRe3u8J13LD2KhFKTjrpHyz5RUnwEKosJIdOhRmLW5KNyQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8754 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 Acked-by: Stephen Boyd --- drivers/clk/clk-scmi.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) diff --git a/drivers/clk/clk-scmi.c b/drivers/clk/clk-scmi.c index 2e1337b511eb..4163cacb65d4 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,43 @@ 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, p_idx; + int ret; + + ret = scmi_proto_clk_ops->parent_get(clk->ph, clk->id, &parent_id); + if (ret) + return 0; + + for (p_idx = 0; p_idx < clk->info->num_parents; p_idx++) { + if (clk->parent_data[p_idx].index == parent_id) + break; + } + + if (p_idx == clk->info->num_parents) + return 0; + + return p_idx; +} + +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 +177,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 +189,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 +202,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 +295,19 @@ 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); + if (!sclk->parent_data) + return -ENOMEM; + + 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);