From patchwork Sun Oct 1 04:38: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: 13405282 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 EDE04E748E9 for ; Sun, 1 Oct 2023 04:34:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229683AbjJAEeS (ORCPT ); Sun, 1 Oct 2023 00:34:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50312 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229455AbjJAEeP (ORCPT ); Sun, 1 Oct 2023 00:34:15 -0400 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on2068.outbound.protection.outlook.com [40.107.6.68]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 07B15A6; Sat, 30 Sep 2023 21:34:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=J4HnPup76t5wa6iMN+KfwmTAQ4joRyIz3Wov04CFSMh/Ctmco/rvuVvGnpN1jKdNB935sEQvEvdAEDNFVFUeD99q+NORrAx65r8f+YC+xMeWtGR0nkHEl2exVQEod54uat8cweZXx2I/Zyb0QuI4AOrv2rkkLhRKRZvc+z13n7HzGnXHbKmXNYNfXpAyXbZU15StkHuN2TET2LaXKKhkbxe3DZ2Z1+IA8kNMKn/KnFNc40uQxZjpNn7F7q6pzqdVuIzFvgsd3gSQFgWx+wbWTZ5VyA8hvjgTolJYHVwzVhZHhaGi1R8wNcAyKQMGuM52i6aSc7fVY+/Wz/YQvd4jgg== 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=fDWZg28iU11kqaOdvitaddmih8kAAzFRpfJyWHUBXt4=; b=Jh6KQIFgt6g7+FPnfKASkxFcs9xzGzg08ZzzGQUkxwo0/o8+ayHXI38UpEmNCFBnHmniEd7n6BL9gPFp1oxXPkaPVF31/YdyuPlAXUGymOThvZk4TGgybzsqnPj/vmPnKHgzQ0v0+StcInZkGe69zJXCOyQRH/JW5UBwgnYXmDY4bbYwJiFLyzwc4bPBAozfKGTNc2c6AbBfM1IrkiWsMeCqFbIFBVM04ibc955MIiK7zftlk/pEd2U8cd3sEIE0KxhQ7VX1uFeCOhUhZt3atAnQZOytYjpTh2S38NhtMSlPcwrk76+tFK8FkApq4tqS1ksSKKFXY+CsXTTDOKJogw== 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=fDWZg28iU11kqaOdvitaddmih8kAAzFRpfJyWHUBXt4=; b=AqKrlXHkpX9XupJP6XVfQuM6J+sZ0mcQzaseDcfAc60xEtcRwGyMdHgNUnM/dkSZD81vV1SjZlx75AqNP3MXSZBreHnljxj2IHtxJ/Dg4N0REFvTABo0tEzoamhLQyQaMC+P/Zh/r8ZJaNFxEjzf/nmsqphDZLz1ibJqg4fa6vI= 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 PAXPR04MB8335.eurprd04.prod.outlook.com (2603:10a6:102:1c2::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.29; Sun, 1 Oct 2023 04:34: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.6838.024; Sun, 1 Oct 2023 04:34:09 +0000 From: "Peng Fan (OSS)" Date: Sun, 01 Oct 2023 12:38:43 +0800 Subject: [PATCH v3 1/2] firmware: arm_scmi: clock: support clock parents Message-Id: <20231001-scmi-clock-v2-v3-1-898bd92d8939@nxp.com> References: <20231001-scmi-clock-v2-v3-0-898bd92d8939@nxp.com> In-Reply-To: <20231001-scmi-clock-v2-v3-0-898bd92d8939@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=1696135135; l=8518; i=peng.fan@nxp.com; s=20230812; h=from:subject:message-id; bh=SDllrj0vZP8gvMNHNp2vykuCQP3J0H324haZC9h1guw=; b=+ycFZW71Hi3Kgq9gmDsztR7zkDjiSP7UMTocQjuNsuOac06lXWlwLKcgSSuS8K9cdT1QEasTD MNhn0xGnSF9AkwcH3VxFT/j3dlYviQUsb0VbMl+eOXHYN55m4rEZxPT X-Developer-Key: i=peng.fan@nxp.com; a=ed25519; pk=I4sJg7atIT1g63H7bb5lDRGR2gJW14RKDD0wFL8TT1g= X-ClientProxiedBy: SG2PR04CA0212.apcprd04.prod.outlook.com (2603:1096:4:187::8) 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_|PAXPR04MB8335:EE_ X-MS-Office365-Filtering-Correlation-Id: a7f225a5-3c89-447f-ac78-08dbc237a76a 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: 3E0tvRZoe5udtJiD4FO9QZN7FHn79pOGGXhnnIbCon7iIFI6BlTOzdrSkmBUMojigkRpd9lknBuBSt57VVOJRtlrYKy88n2AXNdwTJZMAMDyqQg8aViZb4HmJfnktCo1+Fa/Z3gi7TJwjqBM/RQUA4eEwAmI4Ib65BmCqr1pc3KENmMQz2S0Rf3K9R1NMQOyVVUFn71iEHtOEYOXxjJDcYBqjOOFcwdu8DrLAybdZ4C+NjQ3sfuj99LIkExC0qRazfY4/xrtqTsiAXNFnX2QbPhLtwa8RFOiDtRiSjvOAZqDXGhJgI00nlzhG8MtcLfgLOCPwqCUDR8eLRI07F2v6+0dVmRSKMnHvdDUNVb9LOu8atQRICo1Vrh6Powqe6tw+dbIvpGTbipNkjncQfCur3X+JpjN6P9RZIMDq6GYHiEBfCiNudSTxnP1hoHRFn1rolVXMmZVpeGF6Tsqw3p4+aZBsbvoNQ6IY08pzasWHOepxkaep271XHm6VUM2sZ/nHZ1lmtgVYvuTLWyDTk5ET7CX0Ma4s+uhrqXCArJxrwmphd1nSD79AM0073JAIlXea6OZc/ZOCNAaCnj/F8jcPWXBpXU7C6HJI1P7iPkAtvpbr2AonCoxohIbw5KNKz9M 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)(39860400002)(346002)(136003)(396003)(366004)(376002)(230922051799003)(64100799003)(451199024)(1800799009)(186009)(26005)(38100700002)(86362001)(38350700002)(36756003)(83380400001)(316002)(4326008)(8936002)(8676002)(5660300002)(41300700001)(66476007)(66556008)(66946007)(110136005)(2906002)(6506007)(6666004)(52116002)(9686003)(6512007)(6486002)(478600001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?sxb4LUbmkYlpIAHVnhw6riMkbL3+?= =?utf-8?q?gtmXnYUrQ/AAdDHFaVeyEeUbeU+K064xrRfbCUSujiMm02DGUVn+paWFCEIw+Reiu?= =?utf-8?q?yBY6b/lV7S7hO6WajipLH6v/YAj58SKXAf9qg9292cRorvO6kgC1nGz+a3lvPbcyA?= =?utf-8?q?74DVajYKV0KH9R1Oto2BfSwx+Vq9EFHMDDm2Y/mz7VDOdeXeksCl75tAUDXnCNnzv?= =?utf-8?q?o/QCXgQ2Xnfp/iWq2jraZivICHo/u6VPmC6v61Ovalb3OLwOXshjuBjBo5rrW5WY/?= =?utf-8?q?I7j9hQwKvNeOTV47hz+31RJ/uo2KKABECCBEijmMiXfJeO8QRW82dDQ4CSyLj/Xyz?= =?utf-8?q?Y/qh10wdrXm+4n3vnsdV0dN5T5N91H48zJQTFlK8/a9op3Jqik8HhGYRGg0D49LNd?= =?utf-8?q?rlMRqZuCP0D/ZxIGe7znoU3kbFqlrVUxyOwMCHT/x+n+FGgTiwy/12Sec/wwfznVO?= =?utf-8?q?0Wej6e5X8ma/3i1cbuejD3NCFOuAS5vwlp95b4+l6rKA+AZhb6ihgUWbDJhVs4bE7?= =?utf-8?q?gHeoqwSCw8CTEsqjt+4CwVtUM90SDT21LXBWNGk5fJrJSbkxMEmlwPRBOgzDBssPf?= =?utf-8?q?mXqRqvKdl/aR338ijj60teQSLPBNRR/i0IOey1wt7LlHi70ohWrxxsL3+2aAPUN/2?= =?utf-8?q?Fxxf/ysuKuXRJnSrNcLDVJKybxer9nO461Rwp7G6AhC/ZpMIlNEvkr4lC62KjP17K?= =?utf-8?q?qeekNV/E19l+k+GGrOwskwiAjFp9WXuL2cLX1fVdX/4PePhoASoKFpSWTXZz5lxjS?= =?utf-8?q?JuJRzgHzO1klg6DJFKRkBjjF7967vSeOhygKbCw3rSsTO503kblsZDGqjLy45tZej?= =?utf-8?q?8hcP+fU/T36TiMvuFdr7nCHJ1+rKhGqKlhLZwlUpi77OgMBp/rBCnlEVxsdU0r48a?= =?utf-8?q?mrj+/By/WI5NSMh4XrgNRjeUiXQBi0TjJUXkharh0qpSdFwf346XJpZBI1V+OQ739?= =?utf-8?q?tRTeXFEOznkvr1w0RS2kDiESjpxa+Fs0U3G0esaxe3TNlRVClwatSgyikOjjch+nA?= =?utf-8?q?0Puor/HJo/OAmeI0+sYK9vWIG5rx1ocJpkIJzTEkYY8oQ6f7tz3f+31viv34nBX9a?= =?utf-8?q?jTAVSjKqZWSzPdKjghW8PSDd6fyjS25ZON64b0hMshIyOB9Zfeyda7xzBvifxZbeY?= =?utf-8?q?Ibr3bfOIIHKqyaNMNLroB93YPMSQqxe1moavH1gQrHqsxG0FoveaKhtpj53gm1gQy?= =?utf-8?q?/BdsYmcTddZ2du4to5fgR2K42O2XKn+Ezgj4fsCyONWaDm5Gyz0kqw8qVoHgzRRVq?= =?utf-8?q?LT6wkveIMQp7cvrxFrE1RQPeqOrz7HSQ7MyK3eT4sn2f6l0/Q8w/veBsKDtVDkht3?= =?utf-8?q?xOLDUJQVaRGugCz+JsQehvPqn8PPND8L2j0dWg/bRSMAIPJU8rEgvrOB6zP+zZqFJ?= =?utf-8?q?QTdPinet9egQk7knVysBcjZsX7i2eRZgWAAe4pcB9+z6rTU608o7+IH5J/rkRSN41?= =?utf-8?q?YTmhtoRjfE/AkPbzxsR674al/fiuX+KODCWYXHV7/rZaYfEIijy7nkOy/xXnO/g1e?= =?utf-8?q?WK0R6cDM+TPm?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: a7f225a5-3c89-447f-ac78-08dbc237a76a X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2023 04:34:09.1976 (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: iPYZ/Dur/b5gmdCnEAztJvy7RcZ5DHDcPf4S8TkSk25N6XFovTBo5oRYU+/ko7OIMx7Da4J6R19UKFIcEd/CPw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8335 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 Reviewed-by: Cristian Marussi --- 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 d18bf789fc24..9b95239d63ae 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,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) @@ -211,6 +325,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 +344,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 +567,64 @@ 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; + + 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; +} + 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 +815,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 Sun Oct 1 04:38:44 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: 13405283 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 B1B70E748F3 for ; Sun, 1 Oct 2023 04:34:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232577AbjJAEeT (ORCPT ); Sun, 1 Oct 2023 00:34:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52806 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231660AbjJAEeR (ORCPT ); Sun, 1 Oct 2023 00:34:17 -0400 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on2068.outbound.protection.outlook.com [40.107.6.68]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 756C6D3; Sat, 30 Sep 2023 21:34:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=If52zqE08ntfTPzD2AhZDPdbl2l40W4v0OlG0sLjWqPYif8hlJykRVY7L/h6wrn7uYRlXIIyFtMP8jn6fn7DVnDJ36gpQ0zco7BZ0HA4L9XFiEAw6E5zLzvmXj0RQJj2afUvs2lADglliiXE4x8p4kHyRpmlU+xr5r4gO60clf9lh+HUCYi7pa/TglLSsF0r+Pl8/p4XTPZexMQ+9TM71lIhGL3iZgBYAer4+TFL2UCKSV4NbJbDB6Cm0VPmzkv1RqlohfvHTRnr5eAtEtpOVzqmmhJobn2vZiUklA5HVJPRtHA7wgsFNxak7Nd+0JOmPHtYmVze1uYbC92XBon1IQ== 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=MldFxaelk99wVIII0BTGpTJMlUfEvx6O7wcrkyHSAFxY/KzCY5vDiIS+g647FSpKZzdpwSvvVi90+VnhFAf/l3nwEPXHTXVKJ9U3eMxB7immfeWARyWp0deD2uHoO4h1gaZlBNFjnu+pXOwl0jUTuSMsFiB8zgg6Ji675DUrxF4rVKPBHs8JOmJXZ4qHvdbG9IhROoUCvAAI8ywCobXWLRtcaIF1SlffQkfm/PziX8wv3pZ/wadnEBOZtl0SAf56VPjfZrA0pOf1O4K1aKbTHANBU8izT6TTF1DwqW4qCRAF/pRFwC+wFTOuZYV0j4oTLLdKY57KUb7uzST0ochMZQ== 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=bBfM6wTqiUt6LeYbKT85rvYNeERn8LM7p4v8vwOVWBBhdGxB4hKBGJaDbJNHK7B1iPsG9HGnVmEIR34fk6INoaNzkGR6jg389b99+Q2pr2BDgFDWCQE+4ZEL7vyjFPzTHbUXuaU6+8bj6Q6Ir4zZlZ9yQjXIg/dQLsdKauO1aKA= 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 PAXPR04MB8335.eurprd04.prod.outlook.com (2603:10a6:102:1c2::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.29; Sun, 1 Oct 2023 04:34:11 +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; Sun, 1 Oct 2023 04:34:11 +0000 From: "Peng Fan (OSS)" Date: Sun, 01 Oct 2023 12:38:44 +0800 Subject: [PATCH v3 2/2] clk: scmi: add set/get_parent support Message-Id: <20231001-scmi-clock-v2-v3-2-898bd92d8939@nxp.com> References: <20231001-scmi-clock-v2-v3-0-898bd92d8939@nxp.com> In-Reply-To: <20231001-scmi-clock-v2-v3-0-898bd92d8939@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=1696135135; l=3380; i=peng.fan@nxp.com; s=20230812; h=from:subject:message-id; bh=GEoaMPEKFPMe5D3pfktJgZun60qYQRSSGhLzuwR/Q7I=; b=hXGJDAHx2IW00hotreyGGPQS2C2hOWCV+M/HezUHfTrbBij/tPhOjKhYm0jfWz0D4OMOTwe2Y h29ULmzQ0E9Byp5888THqNAq0PbbIrZ/xYLRinCSDkpZLl4HVe6umwC X-Developer-Key: i=peng.fan@nxp.com; a=ed25519; pk=I4sJg7atIT1g63H7bb5lDRGR2gJW14RKDD0wFL8TT1g= X-ClientProxiedBy: SG2PR04CA0212.apcprd04.prod.outlook.com (2603:1096:4:187::8) 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_|PAXPR04MB8335:EE_ X-MS-Office365-Filtering-Correlation-Id: df3154fc-44ec-4322-3735-08dbc237a90e 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: Dgi7+pJcMI61ISw94UKUA6PP7egK2QBjpUqY5YaMtC87Tl3YRZdxhMCjzxSykT0wB5msBr2G0VvZx+RqmQYohKYy6JQ+5NNljYQaTTXOh9qKrmp8+cbsJKowz+7cVfUn6O6HLVWsIbYWzOixT1p0x7V6wooPoLc9Yl1uzp1gJaRZft1nZuDqzMZ5R7CKHaf7qFuah8RZlfGx/CU+gQpRGMLJoxwvFQU/OoJu+WJs5PCcd92wjb7L2kfjqoDpAe62shgqHykvZKDMyQ5ZKDsOFLmDYtTaCZfvMqjGqmh0nMVmaQCAoovodKwt/VwHb68cFrORzGAz4pWt8IH7tHR7EZVaGPJ0I1Ss6MTzockj5j2JVjzBCxubVDhyPUnBvoHDTGjymyPwwWzVpiaKdSydc9dwmF1zivpdxssvwgySDxk5Qqxn/0HUx1z4BSJL4tYirAA5T4bSl4dBT7XzzvqgUUcRfr5tthM1fY3XVLgEsRVXEk9mb/+mPwp+4T2hzLPQqeJj2FHVDKF7sTRCqYXcz9hbSlCmTfc0s5XMzE06RYahkXHneBMM4q3cEIeHdbdyZi3Uc/rM8s/iGE54ldIOU1+WlWZ4LGMiRXWGw5U/PxEmhmA26TyeYN7p+4un87wk 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)(39860400002)(346002)(136003)(396003)(366004)(376002)(230922051799003)(64100799003)(451199024)(1800799009)(186009)(26005)(38100700002)(86362001)(38350700002)(36756003)(83380400001)(316002)(4326008)(8936002)(8676002)(5660300002)(41300700001)(66476007)(66556008)(66946007)(110136005)(2906002)(6506007)(6666004)(52116002)(9686003)(6512007)(6486002)(478600001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?VJteWqMw7c3LJ2cwqZwvgqB/l3SH?= =?utf-8?q?AZhPoChy7XPClrIF1S7JnrZBuly+GesuC4ePoT8OfYVUa3os1VNIJl4I4afnw3JFM?= =?utf-8?q?n5BgD/uu8+KjY1tqu0tlgXec4IOPnf0EwAGxXH9H8fr5wpZ2Mi6lXefoFmfsPaBH4?= =?utf-8?q?GWjj5ZMFfJTjm/30VkkfEi2/Ac8+ec1YPj8B7QsLBJxbaiAj2ep8jfgE8VG1FN4a/?= =?utf-8?q?y6/FZD5h2W8NX4e0VXLt3hQmDHp4fKQGAwIlNFIOdWQPiRSrl6/zm+jdguE1i9rz+?= =?utf-8?q?djqHL8MVmohlP0KvAsGxg+40iD1zKFqTumNQBveXlevlifUhSgZNMNoAh0Y28srnK?= =?utf-8?q?Gx1oq95yBSJlXWB5ISCFUakZw8FeEKBHIRMKFkreWqNplafnYT4oLDnbYldqk1fgY?= =?utf-8?q?/k4TVTqDNu76pEJH+yjaS5nfyIcqhat1nuDw92FqYA0RZIRkG+BS+mfT0C6AqCHGt?= =?utf-8?q?n6RvrUM8qv0rXMATq1pX/MabUffxvO/5MeZgMvo0KPSoxxdW0wdajEuSUXaR2ZqVQ?= =?utf-8?q?iBq2lGunroQXw8/TJabrrLTMOskeVlO76zzQI6aiBCh4uFaHsCcaref35nr/PRy2Z?= =?utf-8?q?YOIje4DNbUPmF2Q+sROKSsaJaGajuWKnwW/khSmsFJtxRix3q5vVfyFgEQqbc1Oxo?= =?utf-8?q?wKh8IwXq9judtSFotCfWpBzxO7xUKu+j102RxKK5tWCp5MNlcJIoWbox6Pdo6wM94?= =?utf-8?q?5cF/osLP4hCobKpuJ0Mh2P60XVNnbswoZNd4Ht/p/ry5BN34BWv3Fd/XC52c3OC2w?= =?utf-8?q?hCsOJUYlgsI4+T2NfYIqg4HAfooa328Nr64OPCR5RvUJIhezcS7ttXqmrsxGU3gGf?= =?utf-8?q?J4Ys/z7k9xZNi5GhCA1GkvPAU4CFFfeVDFgo5P8wE6OKIbk5k7yP5QNdDWwDWcc3e?= =?utf-8?q?XenE+0NJ++kZiTSoERvKF2Ee72TW3Guw+9/70wvQBayCxRA2OF/eNJQr2GPRSK7Tk?= =?utf-8?q?iykpgUbG/U6EpII7aUOtbEppSiSqIgk3E8op1fEtr5FwoFhKmDCwSwIeEE8fnQjrl?= =?utf-8?q?8GZlX+s7/Qj9QCRxChOPEXLApC3cFONakZurTLT6UEq2ELK7i+FL4sysJlYPj24DN?= =?utf-8?q?4bxTBH+BsD1NO0NHJUFBynzhqIUXyVQzk1ILTtWA8gph1d32Eyb+xjn89gIUBjHyO?= =?utf-8?q?5TYwv/37mMUNtJxaknv8OjyXCxeW0I0OFCEkls7sHW+LHtxk9i2jaRV2VASZlyMRZ?= =?utf-8?q?9H0Q37P1EP6KeLkFGD3rALmtGOqm6eZ5Wcagd5S7ipCa72gU527l+Q37PETtgJQrN?= =?utf-8?q?hYyuXyL2OZ737OjccuynqGANEeR11jqU51rqP8QUH1Z9bwVaG1vOWGbzQzoOrmq2o?= =?utf-8?q?VShBVrcMg8ZuYCGRQU9U2xSEKTt6yXgKjbua4KRSRhBlxcOKZUIQjpaHRfr+kxKUT?= =?utf-8?q?dySV8gLu+9Fq3NP9Pjc7QCnX9zgms1DxhKLfXt4f+3WglcamfFaMbpz7ESRhQrDIZ?= =?utf-8?q?VDJVR9Y4c7zv2XsvScbj3pJ28W3aFqdMTfmvBtBTU/IlGuLV/2n3iv60Fa7KtSOb8?= =?utf-8?q?pDKHViUZZkG0?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: df3154fc-44ec-4322-3735-08dbc237a90e X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2023 04:34:11.9150 (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: BJjwHRv0MnDbDl9mrGspn7uWJuPIvI/E+Zp5n38jxD1w5G+OeU8cXju282yu42qbmEK5zGaMP2xZlARPXR2lIw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8335 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);