From patchwork Sun Jan 21 10:21:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan \(OSS\)" X-Patchwork-Id: 764838 Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02on2085.outbound.protection.outlook.com [40.107.247.85]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A85E2364D7; Sun, 21 Jan 2024 10:18:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.247.85 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705832282; cv=fail; b=n+wgryy9SPpYBNK6yRyylhhVL0GCFbXYi1FuH7lvb8AftBxNLN/0ZQtaaUqPgXJGjnBfTD22G6NUfhffAj27ObqZ++3Xotxds74umE0yj2s4ABlvJEkw/2vlsonBfU6LqTNDI8C6uK7klPuYbtV4lRyPgab0qRhoTm3CslC95B0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705832282; c=relaxed/simple; bh=rftupbuukxM4bRu9poTXj2bVaFZHSw3rQwVgnjODt6w=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=KeSyxReR8VDzFEwbD5ta8YCf/MV6ZJjffhhK0qtummnsGrBYfw5figQXLLbQ2vV3yKDXXT9WO1kFSXuxKHQxgDbxNPDB5NF2wHkSNr3lyqqzlQTrQdS25P9tGoVxRMDwYTmNxgBaDRn9viKeFRmo9SQnnFZ+Xhpft8kesK6sv5Y= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com; spf=pass smtp.mailfrom=oss.nxp.com; dkim=pass (1024-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b=lrg3PusX; arc=fail smtp.client-ip=40.107.247.85 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="lrg3PusX" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AtcBvy22sxntk/zTVZqMlK3kJoCE9736aTD7V1jfVVhy/tm+T87lDSN5mA1LvLeLzh5eX42W29leuWEi0OPrAwZ7484SdbXi7EueDpVHWiQeSfAKD8iRFlfU4sisP/olafJ+XsrlYVk4O15uMav2Q1BuLZY/PgmWhuOBeamhZybxNY3eMcPrik+d+oDVmjAy9B62xCfcyicMJ5NhLHZyQs5LgnQ149rYDGetX7fdOZSepzR1bc95fQtl5gdaQUXHmvKR4nEG1+SgFncDrDjfTNNulphcBMj4F8QawZG4ORF1/779eT9idGL5BTPaf1uHx8WLFs+02W/yyG+w4TI/eQ== 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=c8Q4gYjUQC14yC5W6QW/OwqgmYc1DkZqkRCHzTcTI5o=; b=jS59t5NG8ju7WiQAhwmZDP3JN8VTTeHWBlOBX5Sl5ihrtFRnmFOSAKiKGHd8IMAyAd5Tkh1tC9lmFOcGxjwECNnOYA2SOZgdg6kisukZUEtuYU8aojSWG481ZdfHum4itu8Pe/b3LIYHFsnWlFUtLMAHx6fIBrsoW2C1bAaPQDQQvBNAIilhlsMBZMMmT0/I2KaNdPq8U+xijlEiz8uwiO7mebklgaXlSZ5H3o6tpDINTjlAKZmpqq275UBWKlv4EYY9OPqngiR5VL5uncPHtxrjv3/G5QVJs31hCfedvaTuHSBwlQ9y9+NjxxUagkb6dOeZxXqSOuBbwnejvlCniw== 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=c8Q4gYjUQC14yC5W6QW/OwqgmYc1DkZqkRCHzTcTI5o=; b=lrg3PusXGuEv049XusUsclDegkC0ypjn5DGJXa6oOtUKEIvQr63DU5H7sSJdOAqJ0stt7Tb9dx62Pgjy7vUGbMrglqYEzi7H1uLiHb89auZUULfkLP5136Nqw6d3RY2jm2WDDB18QlWAQ7iHErlupIUHNjUT8fLqee1iN09YexY= 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 PAXPR04MB9203.eurprd04.prod.outlook.com (2603:10a6:102:222::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.30; Sun, 21 Jan 2024 10:17:57 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::c499:8cef:9bb1:ced6]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::c499:8cef:9bb1:ced6%3]) with mapi id 15.20.7202.028; Sun, 21 Jan 2024 10:17:57 +0000 From: "Peng Fan (OSS)" Date: Sun, 21 Jan 2024 18:21:50 +0800 Subject: [PATCH v3 1/6] firmware: arm_scmi: introduce helper get_max_msg_size Message-Id: <20240121-pinctrl-scmi-v3-1-8d94ba79dca8@nxp.com> References: <20240121-pinctrl-scmi-v3-0-8d94ba79dca8@nxp.com> In-Reply-To: <20240121-pinctrl-scmi-v3-0-8d94ba79dca8@nxp.com> To: Sudeep Holla , Cristian Marussi , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Oleksii Moisieiev , Linus Walleij , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-gpio@vger.kernel.org, AKASHI Takahiro , Peng Fan X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1705832540; l=2660; i=peng.fan@nxp.com; s=20230812; h=from:subject:message-id; bh=woqhTHJgcBsnzMOI1imkT0MV1gtJZhQATiD3eryt0aA=; b=44Bqa0Gh/2j2bCArW6t+6hWOq7O44sZiawis/gzEXzu9KM0r8eM84Onj1pGmGeSbKNn9O32Re 4vIwpfWDDQBDZQROadB4ztVaXFt5gs0IYTeIrx4iFNsfuD115GKyJ2f X-Developer-Key: i=peng.fan@nxp.com; a=ed25519; pk=I4sJg7atIT1g63H7bb5lDRGR2gJW14RKDD0wFL8TT1g= X-ClientProxiedBy: SG2PR06CA0192.apcprd06.prod.outlook.com (2603:1096:4:1::24) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0PR04MB9417:EE_|PAXPR04MB9203:EE_ X-MS-Office365-Filtering-Correlation-Id: 63aa5b88-5262-43ae-a432-08dc1a6a3d08 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: F2o1C2G019wJByd53uekdNMfgU4LQ261IgzWolbK2IhTBZj0sSmK/CI7X1baDJjH+bhanyru0CRmXeJHAEHsGfoyq4YItfZdOEHCcCj56wt8kbXe0qnhNbMpRNx0e3NizDb7C5COFQWXWtwsXOz5cgAvMY6M4gUIabEWI4d1bncRUBwoC7i6n39UBdvQ4mGVcXCn+rHR6QdcDKnpZHhfDSxUdnlSTymNHycipnJPZlAHvk50FzuIaVKKBnsDoIxtwVLBWJYPlaqZORRTC/fQXI0PzT9vRMkEufH8hASZykWCJflv8t18SJPEfmb82jjfT/wEsvQ/BclseY4+ySWmJ3bzA9XrAjUTqSxJJP1iF6DKlNrjuhxoGPvpNng9t3Jxp8PjAzZFNwcrypH6JWeCHAtTkdn5U4yCLvkOswxf+heOL9UaSAUztGhgC+cmQAHVWuaTZQZbDSmsdhNocslCI69EgTMAnqHbzjy5MsaAnmAaA3T1mb9fdyaxcuXF9nKLfOrIrJrA7EYMUQB09gkHDEDCHmsnmTdbm5QJuxXkutR9ZOLHVSf0a8QTvdFeB2hT1LaZkbCgILr5d9ZkmKIYNuPqqssRHKKizUYrhQHZFZxwnicCiWFr8qDVqWMJpFos4K4H46dd2cQrZpUyK4GduQ== 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)(366004)(346002)(376002)(396003)(136003)(39860400002)(230922051799003)(1800799012)(64100799003)(451199024)(186009)(83380400001)(38100700002)(26005)(4326008)(8676002)(8936002)(2906002)(41300700001)(5660300002)(7416002)(478600001)(52116002)(6486002)(6512007)(6666004)(9686003)(66556008)(6506007)(54906003)(66946007)(316002)(66476007)(110136005)(921011)(38350700005)(36756003)(86362001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?uP+0jSB7QwxmMnbR8t1y48yf4rYb?= =?utf-8?q?ix+1oQCA3r7LQKRGa/oweFO5FpuwVla4WXuTMru7MLduW5mTZlL2t4RA6Aw/pcOrV?= =?utf-8?q?JdYpreX08vJm01/Ngdk87RYBoMhOz9cPz1+UQ90iyy96E5B/u7qUTzuy1pXs1umK5?= =?utf-8?q?3PasT7cJiaZ6sqzVsTzd9WVf6i6iPYBjn8ctuAFYjK1YduDhvh97yWKVlvnu/ZQY9?= =?utf-8?q?8FRgC2zumh0TvC0YqYuCXN2eJ847nOLp71M73YP4YNSrFm6/p3hP9mFDB8Oe1MNII?= =?utf-8?q?hCI5+GEoPbEdqFv3EXx6D+MAz40XnBQh0igZ3TpHjjCMavb/FHMQqM0n9M6LlFxBb?= =?utf-8?q?Uety2/InTmA16Z0Ab7qUSkiiGBnxJ6qxL3JPcm+zCIX9WAK6XQLoFo3Gz8X3ESMqL?= =?utf-8?q?lDHiKwEK3BdnIVl0R9+jiIEzydPbcWH2hXtFzLCgBqjnzhMgMI8vRiqSRg5bJGjrp?= =?utf-8?q?PqUaRPgKhGCm/GHYhY0GRvKJRhgd4vEAmObLA0WC1a+VpelVIk8up++I7dUyCssLW?= =?utf-8?q?YU9zWurrDUNplPO4cVX1g3Mv9xLuhL1l6ANtEP2m9pvU776EqnoaYBQz/2a8YNTMS?= =?utf-8?q?7JFR2kxj4o5IvpLrRmBIgqOUp4pkyUR+7NxPFvSqppKGaUVjaEcNy1PBhVAWO6Dka?= =?utf-8?q?ys4cRvGHKGhcmI4MtLCwSpO6iMpJSQNabsZxiuc+kIBW/Vq8uHKbHKZuYqSqeMfvy?= =?utf-8?q?md2NwF7UfqmxYosUgGAqjva1DCGYZ+62FqVakZ642oSDoIcYmHIO3+TkVQWxUPuOF?= =?utf-8?q?bz16YYgyjvEoy+zgaoKFjuX7bO2DAChNgHnzNccH+R063JUo9YcHYvrAbCfTYEXXi?= =?utf-8?q?EjAb911PrLcacuf66ex3OREi/2JiZe9lc5scmytYKBYqvm094DJASdCHdyLmrv8iO?= =?utf-8?q?wRraChI1WZYA3sRLloHr+I7YBn+tnmcRu8sIVzfxjeTca60uWpoxxMlI6tbjgEcY4?= =?utf-8?q?buoM2ije5UAfbcZxfo26dy9gcVlL0/AsjtT1VHkZ9v97nomnRvzRbL0HJZiSzod/w?= =?utf-8?q?Rp0Amvs9S3YoxeGiDu6vofIjSDOVHR56iaeRRlYP4N0ZdbyA1RpX4YquHVvVQTwqi?= =?utf-8?q?jKGxcun2xQDjkSZQMvbYtwnnZwjbeFYUQ7ImfbPVKBQLVFJ7GFp7BO0djTWIDYk0h?= =?utf-8?q?pBVsUzqkrdPBJgg9F0cCJlzd0l3canOMufYnWkFN9ltnAlGdV+Juv1ZaYlQfo4VVQ?= =?utf-8?q?7YKUMkMkrhYSAxv2aXEnsLpWNZF80QDtwOl9cZCE2JkBI4r9A5zmkRyk+19I3otqw?= =?utf-8?q?8MNHTxcHa8fDgwYPWF7gwTOpMa6A9N7nA3v9wJ3V5iuq/IC5sVjA8ZDF4ZC9oO4+S?= =?utf-8?q?QxVQBJLSvOR65Ubm/DxP12W8dzg/2byVb3WPjGNcEeagTB2BCtdeI5qsb+Btay+vJ?= =?utf-8?q?77meNE/QDynAaBcFBoCtEj7dLmBBaAYqDOSB8cDCXUn3US2MKAwP4r49dumfxngQA?= =?utf-8?q?X7gR1+CMn/cPcttDYrT4El3TPFOVhBklWELDbl/700G/1TRcFQKZCFPzDJ3NGJSkI?= =?utf-8?q?TlLzN056strt?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 63aa5b88-5262-43ae-a432-08dc1a6a3d08 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jan 2024 10:17:57.3855 (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: t95V2muBVciyrEx5M98njm5VlVlXUI62z3vTZ5uEyI26vP71P9QHLvfNS4Hfj2PFfkibPbBkazqfNAVvewS15Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9203 From: Peng Fan When Agent sending data to SCMI server, the Agent driver could check the size to avoid protocol buffer overflow. So introduce the helper get_max_msg_size. Reviewed-by: Cristian Marussi Signed-off-by: Peng Fan --- drivers/firmware/arm_scmi/driver.c | 15 +++++++++++++++ drivers/firmware/arm_scmi/protocols.h | 2 ++ 2 files changed, 17 insertions(+) diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c index 3ea64b22cf0d..a12afc254afa 100644 --- a/drivers/firmware/arm_scmi/driver.c +++ b/drivers/firmware/arm_scmi/driver.c @@ -1481,6 +1481,20 @@ static int scmi_common_extended_name_get(const struct scmi_protocol_handle *ph, return ret; } +/** + * scmi_common_get_max_msg_size - Get maximum message size + * @ph: A protocol handle reference. + * + * Return: Maximum message size for the current protocol. + */ +static int scmi_common_get_max_msg_size(const struct scmi_protocol_handle *ph) +{ + const struct scmi_protocol_instance *pi = ph_to_pi(ph); + struct scmi_info *info = handle_to_scmi_info(pi->handle); + + return info->desc->max_msg_size; +} + /** * struct scmi_iterator - Iterator descriptor * @msg: A reference to the message TX buffer; filled by @prepare_message with @@ -1756,6 +1770,7 @@ static void scmi_common_fastchannel_db_ring(struct scmi_fc_db_info *db) static const struct scmi_proto_helpers_ops helpers_ops = { .extended_name_get = scmi_common_extended_name_get, + .get_max_msg_size = scmi_common_get_max_msg_size, .iter_response_init = scmi_iterator_init, .iter_response_run = scmi_iterator_run, .fastchannel_init = scmi_common_fastchannel_init, diff --git a/drivers/firmware/arm_scmi/protocols.h b/drivers/firmware/arm_scmi/protocols.h index e683c26f24eb..b5c65f26207b 100644 --- a/drivers/firmware/arm_scmi/protocols.h +++ b/drivers/firmware/arm_scmi/protocols.h @@ -254,6 +254,7 @@ struct scmi_fc_info { * @fastchannel_init: A common helper used to initialize FC descriptors by * gathering FC descriptions from the SCMI platform server. * @fastchannel_db_ring: A common helper to ring a FC doorbell. + * @get_max_msg_size: A common helper to get the maximum message size. */ struct scmi_proto_helpers_ops { int (*extended_name_get)(const struct scmi_protocol_handle *ph, @@ -270,6 +271,7 @@ struct scmi_proto_helpers_ops { void __iomem **p_addr, struct scmi_fc_db_info **p_db); void (*fastchannel_db_ring)(struct scmi_fc_db_info *db); + int (*get_max_msg_size)(const struct scmi_protocol_handle *ph); }; /** From patchwork Sun Jan 21 10:21:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan \(OSS\)" X-Patchwork-Id: 764837 Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02on2041.outbound.protection.outlook.com [40.107.247.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D447E37152; Sun, 21 Jan 2024 10:18:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.247.41 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705832294; cv=fail; b=lPIgibnIP3DyEm+9WdKDwGU/zF2Wk7C4phrRSkswF5VQb4aAzGxrqH1yifnuRd63klW4hURXfXYOr7LLsvSSBjxiOwLZDJoScwcELiiOwPFCZ7kS1BOWdHmyi1JNICDPFvCeoil4qTxvW6/tPuxVyPSREO1G+y/v2c809pdOWmM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705832294; c=relaxed/simple; bh=4GSdgjpUs4gYvQ6CzehKjDpa4XONAN5ud9sp3EoMP24=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=m4aEfrf0XCrBCkvrBKbJjGHg7abn/PTaiKpGAHqwDyUf74VfhCdWMpmPOGXKHzYQ3qCixc+IXJUKo/jjry3BtwFKeqeLqlZRyQe6xdFxD4+DFlhlBIzJ0vV04DbVkZgWJwGgOlsinvM+JvABiC6ykhEs3j0RJjTcbA3ygdgP3s8= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com; spf=pass smtp.mailfrom=oss.nxp.com; dkim=pass (1024-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b=LbbIol+S; arc=fail smtp.client-ip=40.107.247.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="LbbIol+S" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KNEpf0k+FrOuiZ7bFuGVn1nUT6XVtuz59Ox4P2rSbOevwe/zLZw3y+F6wGeOj92EZ5CTdJW1msCHsamDWOn0yOO36X/7Dmcea0n+cSoQkMUfRp7CYP0YV318CUiV0grBPektC2l9N34HMI5DCNQAfRP4jD368VISJ1LxHMs5YvcY4PHCBckZp3XvrPmbCrD/LB1Nc5ikzxhBaldx2uL9W8OcPz/h4giu1nt50PKGeBmSz/gpTI/GobTYc/SmFr8+0C2Cor9RDITHbaddDL1QEQ0qs8qrf/YTk642KnjwKiis+VQkJoivl1NQwTJghZIS7IuZaug0jqhm3lCclY8mCQ== 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=sB5Aq8tMXkaA5mYIXwHdXC6auxN8cjUaZFt7b+xivqE=; b=Bw+Bwz89ciiQ+Ttlcr954xYbag0njDsEDLInOYBgT07x8mf/9YrVkYpA73DD/6vb4CAHNU2uqXyidyyu8d3AXHTJVy6knImHyTv0Yolg9Xh7wH+2GNGz829hL773gBA4GSjfeJ9dOTbZVNvlunDqAv0HzAEa9YNHcGKmTL4q4x/VEh+yUWTVUoGplCQoxbnTxOIrPMmO8zfTuH1LJwkAt9tb/ogeaIt4fZjRVkrYJUl29FTKmS1wYyXsVuIciL7xjnwxYGnWrU6m2pZPiPtERDoxAKPX2+h9emDaoSCwS0+azXlawYQ2/MNB9YVk4FaQtgRm9XRpJzGf//23E5wp+Q== 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=sB5Aq8tMXkaA5mYIXwHdXC6auxN8cjUaZFt7b+xivqE=; b=LbbIol+SkAJYQ85BvK2XRslAfKKcADByySk7ppVpiUu8ktbNVWvwISOklXug5PapEldsbNtU9LqgMKpskwl4eVlPCev/AAW7L2EcQR/K+WSk3aEGC6pFA1IS2KYydfFzedKaFNXG01CqT6u3JN4R9qOJ8xRVYQ8fgvv8CcbGxUE= 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 PAXPR04MB9203.eurprd04.prod.outlook.com (2603:10a6:102:222::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.30; Sun, 21 Jan 2024 10:18:08 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::c499:8cef:9bb1:ced6]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::c499:8cef:9bb1:ced6%3]) with mapi id 15.20.7202.028; Sun, 21 Jan 2024 10:18:08 +0000 From: "Peng Fan (OSS)" Date: Sun, 21 Jan 2024 18:21:52 +0800 Subject: [PATCH v3 3/6] firmware: arm_scmi: Add SCMI v3.2 pincontrol protocol basic support Message-Id: <20240121-pinctrl-scmi-v3-3-8d94ba79dca8@nxp.com> References: <20240121-pinctrl-scmi-v3-0-8d94ba79dca8@nxp.com> In-Reply-To: <20240121-pinctrl-scmi-v3-0-8d94ba79dca8@nxp.com> To: Sudeep Holla , Cristian Marussi , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Oleksii Moisieiev , Linus Walleij , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-gpio@vger.kernel.org, AKASHI Takahiro , Peng Fan X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1705832540; l=28631; i=peng.fan@nxp.com; s=20230812; h=from:subject:message-id; bh=FRedT4BlWmmRxCG2GYcsoYkjp4eIU6B1yi7wbQevb5A=; b=nAcxsMVCetoQ0CS0QDm5fFJC4HNzWViC+gWZ61axbS3BnUe0atxRdjVyvBu9sKNK/ZapDGXq2 Svs6A7eDOWRCdF3s8r9NtqL8DGwEXYh0ZbOiOZbRo9j3d8VOxi8r8eG X-Developer-Key: i=peng.fan@nxp.com; a=ed25519; pk=I4sJg7atIT1g63H7bb5lDRGR2gJW14RKDD0wFL8TT1g= X-ClientProxiedBy: SG2PR06CA0192.apcprd06.prod.outlook.com (2603:1096:4:1::24) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0PR04MB9417:EE_|PAXPR04MB9203:EE_ X-MS-Office365-Filtering-Correlation-Id: 771502ec-d2dc-4b04-88ff-08dc1a6a435b 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: swM9Q/tE5VWhcx/+JwfxZpWWWSi7+zKC4c+kxV2BA9M40a8NfRtyy9Aj7hRkGoYPlmcEdUhUj39DGuTXsLTkVdAvAwD385XGiOzWhM5elB0xyn2gB5iQ2wZp+2KCE39Hm810btejbp9Ve+Fi5DKPiqLUjYTEJTIntB5CSRaBFVNacJAZ13OHN/Mm3x1CsF0Ep9br8uyxAAIhwZXSjIJUKE8kLzgJBrRfkneqjnu81K6rk2ivUHgg1C2QHgXlZAERDroVo3+Z34rqqdNQ/z3oSTVbYr+WEpryoNyC83OWq0J9d2UaEyUBsZDuaEEJ8o0Wiyymno5hz3xkTJFTbN1ePJD1t3ZTxdrHHT7FP6O6n5Vpq1POfAWeTrFRgDsVUmar6yqYAsbjYWpujlHBdLt7w5X/JMIeoJnXPnwJzh/c3i92+xqUAMKmV/bdobKS8xZTmJpsc0WmjZmwTcDwj4Qk863G2vg2wEfgUnlH9HF2uqHEDWhKYzE7dgToq6GUGQuW8MonoNHBorRGrTZGfIFFuROTHAXiBVBYsXCOYyYxI6fMni3ObS/GFBGvy62l0h9QVqa2l08/tpBSnBWVdF2eTjpOucwt9yzBIBSC5nUl8hUuHiCvgA7w4H/5rZbmSQ6MIrbBAygafSNS9dU9mSB1KA== 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)(366004)(346002)(376002)(396003)(136003)(39860400002)(230922051799003)(1800799012)(64100799003)(451199024)(186009)(83380400001)(38100700002)(26005)(4326008)(8676002)(8936002)(2906002)(41300700001)(5660300002)(7416002)(30864003)(478600001)(52116002)(6486002)(6512007)(6666004)(9686003)(66556008)(6506007)(54906003)(66946007)(316002)(66476007)(110136005)(921011)(38350700005)(36756003)(86362001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?wlmARpMIYqc7q4j5MwPDSbNrLrmL?= =?utf-8?q?YqLXCsRFhtu+PBuJcpjIvnTvvImkwQNQUjqw8VNtargSQAqKarViGHUsEpT/QcNaQ?= =?utf-8?q?hZ2MfYOZW+rVBE+6UZ6pmhzDaQoqH53Qw565EXP5BASobVnrLb1eYSRXdIoVYJ5aW?= =?utf-8?q?Xw2maGMjgeILUVnp/XCRnP9NRpKrt0vmbod/W2g82hQqAesrr/jdtWJZPQdYo+hsF?= =?utf-8?q?agODV9UoHePoMJhTGNSnMFuKaGdpF2i8At4tLF49oiEa0v/KIDg6eVvFZvrfTTll0?= =?utf-8?q?rhCzrq2rWFtSyjlZgevGHI6mlflYTzhIfcCUUGaAxalV4i1bukQXRnOTzhvj7MgOs?= =?utf-8?q?9y4twb2CiNqYh4smnSC6/zMODpJhNvdXIFTX0/Jj5WEmBOZag2gzFkpB3SZg2ES0g?= =?utf-8?q?0JDDUfT925AWbLy32/kwwR++y8kmx2+zollto5AMA3vNJFi+0zafuB3yUVCiOSRoD?= =?utf-8?q?FQb7OCF+wbB5cLxgv4UoEcd3MD64tVpymrxkxMf2KmMTdeb/V2h6FkHCh/PS1De/9?= =?utf-8?q?VT/kF/bzoNmb7sfB2OqZEsRycaHquO4Mx7Hf/E28nwDsPH08eUm0sEkvYHfUb52aT?= =?utf-8?q?J464q1s2OyaAYfFMGmO/L5s36VCmkdEMZm0sRBu+BbLEe6fsKUsa1vzpV5ajezOkj?= =?utf-8?q?rBzxVjdWqwHz7iqAdPy86nQxZw5+XYJJZbAtAAmbvRwCmTaw/NhdM/yjnmUKwqvFo?= =?utf-8?q?KMLN6Zpsc2hTkzoqAGZ3Kk+hXoha8GEsb+JteRp9EKUjxCGaNzrP3pTylANIKnKoj?= =?utf-8?q?pqxEMcVIxxwgow3XDmNZ3hAwDZ/R2QYug73NB1RzhDEhHZ7PK8pWXEyC5/9gvcs4E?= =?utf-8?q?xTYIXBxE4yDb1kXx6bY9jZo+Lms55LDFkGNxyeoqCDlfR60e55kNwdPziVnpmV2H/?= =?utf-8?q?H2deqy5uch4U24X6QnnWf5bZHZ3tnPmWIlhvRZZHAmInW6euQwCQVT7DViZIfcf/v?= =?utf-8?q?NUSZumKbtzBtC930nlC+e2m6SpnA4j9RfesArZUJDM4n9pDUPJt9eV7pah72jFQ7Z?= =?utf-8?q?RgsrcsNYrxbW7RvBdTSMIezC8yiszbWp1CPa6qhUWxvsjvsamiRD64SmoRRdbutRb?= =?utf-8?q?Cd8RS5EwYBYZW/g6RrfWPM3KSIyOdeIY5ERVbi6Dg+r1OStIyvFHauhUmzJS018Sa?= =?utf-8?q?wtn89WjF6pceAId7qCX4iBgxfLq0jv+Ko3O25ms6BpVi+7mE4dBOufJaDhSm36JYM?= =?utf-8?q?Q815ocbr8brZIdDISgaTZ57ccjp4l8hPZWWXbB1olBNR4yKgHuetB6erXyFRMxmir?= =?utf-8?q?N8/zwQ5GVMM1b+2o56HE0/upuPyDV7IA/Nl034i943xI4XXzAg13kzbaEgc0l135p?= =?utf-8?q?G32TSBoth/2J4DbIoRzfjgZreYHnVlhZ+ySK5A+MPhJG59lKamUJf0gfoyfIdtMIw?= =?utf-8?q?MTv2N6eAq9qIVsLC3KsvbOp3PkYG8Y6R1Gk8bvw1GYVb6dVdxuI3ACLsHol8DuLOn?= =?utf-8?q?CSViw4kDnyitOKMY0KA8OLioP1wwMrooFwCwMCWJV66Lh7cDiE6m9LqCgXKlUWG6x?= =?utf-8?q?CVA7d6kwJHig?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 771502ec-d2dc-4b04-88ff-08dc1a6a435b X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jan 2024 10:18:07.9923 (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: 5WzWSiGKFFU37+A5hkd2PEtaqNeTv5TRqN9Rq1nt8ugZN8KtHyJ/BFrexmjQZmATJjLmh7Bhwuj1yTQSnYJfUg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9203 From: Oleksii Moisieiev Add basic implementation of the SCMI v3.2 pincontrol protocol. Signed-off-by: Oleksii Moisieiev Co-developed-by: Peng Fan Signed-off-by: Peng Fan --- drivers/firmware/arm_scmi/Makefile | 1 + drivers/firmware/arm_scmi/driver.c | 2 + drivers/firmware/arm_scmi/pinctrl.c | 908 ++++++++++++++++++++++++++++++++++ drivers/firmware/arm_scmi/protocols.h | 1 + include/linux/scmi_protocol.h | 75 +++ 5 files changed, 987 insertions(+) diff --git a/drivers/firmware/arm_scmi/Makefile b/drivers/firmware/arm_scmi/Makefile index a7bc4796519c..8e3874ff1544 100644 --- a/drivers/firmware/arm_scmi/Makefile +++ b/drivers/firmware/arm_scmi/Makefile @@ -11,6 +11,7 @@ scmi-transport-$(CONFIG_ARM_SCMI_HAVE_MSG) += msg.o scmi-transport-$(CONFIG_ARM_SCMI_TRANSPORT_VIRTIO) += virtio.o scmi-transport-$(CONFIG_ARM_SCMI_TRANSPORT_OPTEE) += optee.o scmi-protocols-y = base.o clock.o perf.o power.o reset.o sensors.o system.o voltage.o powercap.o +scmi-protocols-y += pinctrl.o scmi-module-objs := $(scmi-driver-y) $(scmi-protocols-y) $(scmi-transport-y) obj-$(CONFIG_ARM_SCMI_PROTOCOL) += scmi-core.o diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c index a12afc254afa..4c3752749105 100644 --- a/drivers/firmware/arm_scmi/driver.c +++ b/drivers/firmware/arm_scmi/driver.c @@ -3050,6 +3050,7 @@ static int __init scmi_driver_init(void) scmi_voltage_register(); scmi_system_register(); scmi_powercap_register(); + scmi_pinctrl_register(); return platform_driver_register(&scmi_driver); } @@ -3067,6 +3068,7 @@ static void __exit scmi_driver_exit(void) scmi_voltage_unregister(); scmi_system_unregister(); scmi_powercap_unregister(); + scmi_pinctrl_unregister(); scmi_transports_exit(); diff --git a/drivers/firmware/arm_scmi/pinctrl.c b/drivers/firmware/arm_scmi/pinctrl.c new file mode 100644 index 000000000000..0fcfa4269473 --- /dev/null +++ b/drivers/firmware/arm_scmi/pinctrl.c @@ -0,0 +1,908 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * System Control and Management Interface (SCMI) Pinctrl Protocol + * + * Copyright (C) 2024 EPAM + * Copyright 2024 NXP + */ + +#include +#include +#include + +#include "common.h" +#include "protocols.h" + +/* Updated only after ALL the mandatory features for that version are merged */ +#define SCMI_PROTOCOL_SUPPORTED_VERSION 0x0 + +#define REG_TYPE_BITS GENMASK(9, 8) +#define REG_CONFIG GENMASK(7, 0) + +#define GET_GROUPS_NR(x) le32_get_bits((x), GENMASK(31, 16)) +#define GET_PINS_NR(x) le32_get_bits((x), GENMASK(15, 0)) +#define GET_FUNCTIONS_NR(x) le32_get_bits((x), GENMASK(15, 0)) + +#define EXT_NAME_FLAG(x) le32_get_bits((x), BIT(31)) +#define NUM_ELEMS(x) le32_get_bits((x), GENMASK(15, 0)) + +#define REMAINING(x) le32_get_bits((x), GENMASK(31, 16)) +#define RETURNED(x) le32_get_bits((x), GENMASK(11, 0)) + +enum scmi_pinctrl_protocol_cmd { + PINCTRL_ATTRIBUTES = 0x3, + PINCTRL_LIST_ASSOCIATIONS = 0x4, + PINCTRL_CONFIG_GET = 0x5, + PINCTRL_CONFIG_SET = 0x6, + PINCTRL_FUNCTION_SELECT = 0x7, + PINCTRL_REQUEST = 0x8, + PINCTRL_RELEASE = 0x9, + PINCTRL_NAME_GET = 0xa, + PINCTRL_SET_PERMISSIONS = 0xb +}; + +struct scmi_msg_conf_set { + __le32 identifier; + __le32 attributes; + __le32 configs[]; +}; + +struct scmi_msg_conf_get { + __le32 identifier; + __le32 attributes; +}; + +struct scmi_resp_conf_get { + __le32 num_configs; + __le32 configs[]; +}; + +struct scmi_msg_pinctrl_protocol_attributes { + __le32 attributes_low; + __le32 attributes_high; +}; + +struct scmi_msg_pinctrl_attributes { + __le32 identifier; + __le32 flags; +}; + +struct scmi_resp_pinctrl_attributes { + __le32 attributes; + u8 name[SCMI_SHORT_NAME_MAX_SIZE]; +}; + +struct scmi_msg_pinctrl_list_assoc { + __le32 identifier; + __le32 flags; + __le32 index; +}; + +struct scmi_resp_pinctrl_list_assoc { + __le32 flags; + __le16 array[]; +}; + +struct scmi_msg_func_set { + __le32 identifier; + __le32 function_id; + __le32 flags; +}; + +struct scmi_msg_request { + __le32 identifier; + __le32 flags; +}; + +struct scmi_group_info { + char name[SCMI_MAX_STR_SIZE]; + bool present; + unsigned int *group_pins; + unsigned int nr_pins; +}; + +struct scmi_function_info { + char name[SCMI_MAX_STR_SIZE]; + bool present; + unsigned int *groups; + unsigned int nr_groups; +}; + +struct scmi_pin_info { + char name[SCMI_MAX_STR_SIZE]; + bool present; +}; + +struct scmi_pinctrl_info { + u32 version; + int nr_groups; + int nr_functions; + int nr_pins; + struct scmi_group_info *groups; + struct scmi_function_info *functions; + struct scmi_pin_info *pins; +}; + +static int scmi_pinctrl_attributes_get(const struct scmi_protocol_handle *ph, + struct scmi_pinctrl_info *pi) +{ + int ret; + struct scmi_xfer *t; + struct scmi_msg_pinctrl_protocol_attributes *attr; + + ret = ph->xops->xfer_get_init(ph, PROTOCOL_ATTRIBUTES, 0, sizeof(*attr), + &t); + if (ret) + return ret; + + attr = t->rx.buf; + + ret = ph->xops->do_xfer(ph, t); + if (!ret) { + pi->nr_functions = GET_FUNCTIONS_NR(attr->attributes_high); + pi->nr_groups = GET_GROUPS_NR(attr->attributes_low); + pi->nr_pins = GET_PINS_NR(attr->attributes_low); + } + + ph->xops->xfer_put(ph, t); + return ret; +} + +static int scmi_pinctrl_count_get(const struct scmi_protocol_handle *ph, + enum scmi_pinctrl_selector_type type) +{ + struct scmi_pinctrl_info *pi = ph->get_priv(ph); + + switch (type) { + case PIN_TYPE: + return pi->nr_pins; + case GROUP_TYPE: + return pi->nr_groups; + case FUNCTION_TYPE: + return pi->nr_functions; + default: + return -EINVAL; + } +} + +static int scmi_pinctrl_validate_id(const struct scmi_protocol_handle *ph, + u32 identifier, + enum scmi_pinctrl_selector_type type) +{ + int value; + + value = scmi_pinctrl_count_get(ph, type); + if (value < 0) + return value; + + if (identifier >= value) + return -EINVAL; + + return 0; +} + +static int scmi_pinctrl_attributes(const struct scmi_protocol_handle *ph, + enum scmi_pinctrl_selector_type type, + u32 selector, char *name, + unsigned int *n_elems) +{ + int ret; + struct scmi_xfer *t; + struct scmi_msg_pinctrl_attributes *tx; + struct scmi_resp_pinctrl_attributes *rx; + + if (!name) + return -EINVAL; + + ret = scmi_pinctrl_validate_id(ph, selector, type); + if (ret) + return ret; + + ret = ph->xops->xfer_get_init(ph, PINCTRL_ATTRIBUTES, sizeof(*tx), + sizeof(*rx), &t); + if (ret) + return ret; + + tx = t->tx.buf; + rx = t->rx.buf; + tx->identifier = cpu_to_le32(selector); + tx->flags = cpu_to_le32(type); + + ret = ph->xops->do_xfer(ph, t); + if (!ret) { + if (n_elems) + *n_elems = NUM_ELEMS(rx->attributes); + + strscpy(name, rx->name, SCMI_SHORT_NAME_MAX_SIZE); + } + + ph->xops->xfer_put(ph, t); + + /* + * If supported overwrite short name with the extended one; + * on error just carry on and use already provided short name. + */ + if (!ret && EXT_NAME_FLAG(rx->attributes)) + ph->hops->extended_name_get(ph, PINCTRL_NAME_GET, selector, + (u32 *)&type, name, + SCMI_MAX_STR_SIZE); + return ret; +} + +struct scmi_pinctrl_ipriv { + u32 selector; + enum scmi_pinctrl_selector_type type; + unsigned int *array; +}; + +static void iter_pinctrl_assoc_prepare_message(void *message, + unsigned int desc_index, + const void *priv) +{ + struct scmi_msg_pinctrl_list_assoc *msg = message; + const struct scmi_pinctrl_ipriv *p = priv; + + msg->identifier = cpu_to_le32(p->selector); + msg->flags = cpu_to_le32(p->type); + /* Set the number of OPPs to be skipped/already read */ + msg->index = cpu_to_le32(desc_index); +} + +static int iter_pinctrl_assoc_update_state(struct scmi_iterator_state *st, + const void *response, void *priv) +{ + const struct scmi_resp_pinctrl_list_assoc *r = response; + + st->num_returned = RETURNED(r->flags); + st->num_remaining = REMAINING(r->flags); + + return 0; +} + +static int +iter_pinctrl_assoc_process_response(const struct scmi_protocol_handle *ph, + const void *response, + struct scmi_iterator_state *st, void *priv) +{ + const struct scmi_resp_pinctrl_list_assoc *r = response; + struct scmi_pinctrl_ipriv *p = priv; + + p->array[st->desc_index + st->loop_idx] = + le16_to_cpu(r->array[st->loop_idx]); + + return 0; +} + +static int scmi_pinctrl_list_associations(const struct scmi_protocol_handle *ph, + u32 selector, + enum scmi_pinctrl_selector_type type, + u16 size, unsigned int *array) +{ + int ret; + void *iter; + struct scmi_iterator_ops ops = { + .prepare_message = iter_pinctrl_assoc_prepare_message, + .update_state = iter_pinctrl_assoc_update_state, + .process_response = iter_pinctrl_assoc_process_response, + }; + struct scmi_pinctrl_ipriv ipriv = { + .selector = selector, + .type = type, + .array = array, + }; + + if (!array || !size || type == PIN_TYPE) + return -EINVAL; + + ret = scmi_pinctrl_validate_id(ph, selector, type); + if (ret) + return ret; + + iter = ph->hops->iter_response_init(ph, &ops, size, + PINCTRL_LIST_ASSOCIATIONS, + sizeof(struct scmi_msg_pinctrl_list_assoc), + &ipriv); + + if (IS_ERR(iter)) + return PTR_ERR(iter); + + return ph->hops->iter_response_run(iter); +} + +struct scmi_conf_get_ipriv { + u32 selector; + enum scmi_pinctrl_selector_type type; + u8 all; + enum scmi_pinctrl_conf_type *config_types; + u32 *config_values; +}; + +static void iter_pinctrl_conf_get_prepare_message(void *message, + unsigned int desc_index, + const void *priv) +{ + struct scmi_msg_conf_get *msg = message; + const struct scmi_conf_get_ipriv *p = priv; + u32 attributes; + + attributes = FIELD_PREP(BIT(18), p->all) | + FIELD_PREP(GENMASK(17, 16), p->type); + + if (p->all) + attributes |= FIELD_PREP(GENMASK(15, 8), desc_index); + else + attributes |= FIELD_PREP(GENMASK(7, 0), p->config_types[0]); + + msg->attributes = cpu_to_le32(attributes); + msg->identifier = cpu_to_le32(p->selector); +} + +static int iter_pinctrl_conf_get_update_state(struct scmi_iterator_state *st, + const void *response, void *priv) +{ + const struct scmi_resp_conf_get *r = response; + struct scmi_conf_get_ipriv *p = priv; + + if (!p->all) { + st->num_returned = 1; + st->num_remaining = 0; + } else { + st->num_returned = le32_get_bits(r->num_configs, GENMASK(7, 0)); + st->num_remaining = le32_get_bits(r->num_configs, + GENMASK(31, 24)); + } + + return 0; +} + +static int +iter_pinctrl_conf_get_process_response(const struct scmi_protocol_handle *ph, + const void *response, + struct scmi_iterator_state *st, + void *priv) +{ + const struct scmi_resp_conf_get *r = response; + struct scmi_conf_get_ipriv *p = priv; + + if (!p->all) { + if (p->config_types[0] != + le32_get_bits(r->configs[st->loop_idx * 2], GENMASK(7, 0))) + return -EINVAL; + } else { + p->config_types[st->desc_index + st->loop_idx] = + le32_get_bits(r->configs[st->loop_idx * 2], + GENMASK(7, 0)); + } + + p->config_values[st->desc_index + st->loop_idx] = + le32_to_cpu(r->configs[st->loop_idx * 2 + 1]); + + return 0; +} + +static int +scmi_pinctrl_config_get(const struct scmi_protocol_handle *ph, u32 selector, + enum scmi_pinctrl_selector_type type, + enum scmi_pinctrl_conf_type config_type, + u32 *config_value) +{ + int ret; + void *iter; + struct scmi_iterator_ops ops = { + .prepare_message = iter_pinctrl_conf_get_prepare_message, + .update_state = iter_pinctrl_conf_get_update_state, + .process_response = iter_pinctrl_conf_get_process_response, + }; + struct scmi_conf_get_ipriv ipriv = { + .selector = selector, + .type = type, + .all = 0, + .config_types = &config_type, + .config_values = config_value, + }; + + if (!config_value || type == FUNCTION_TYPE) + return -EINVAL; + + ret = scmi_pinctrl_validate_id(ph, selector, type); + if (ret) + return ret; + + iter = ph->hops->iter_response_init(ph, &ops, 1, PINCTRL_CONFIG_GET, + sizeof(struct scmi_msg_conf_get), + &ipriv); + + if (IS_ERR(iter)) + return PTR_ERR(iter); + + return ph->hops->iter_response_run(iter); +} + +static int +scmi_pinctrl_config_set(const struct scmi_protocol_handle *ph, u32 selector, + enum scmi_pinctrl_selector_type type, + unsigned int nr_configs, + enum scmi_pinctrl_conf_type *config_type, + u32 *config_value) +{ + struct scmi_xfer *t; + struct scmi_msg_conf_set *tx; + u32 attributes; + int ret, i; + unsigned int configs_in_chunk, conf_num = 0; + unsigned int chunk; + int max_msg_size = ph->hops->get_max_msg_size(ph); + + if (!config_type || !config_value || type == FUNCTION_TYPE) + return -EINVAL; + + ret = scmi_pinctrl_validate_id(ph, selector, type); + if (ret) + return ret; + + configs_in_chunk = (max_msg_size - sizeof(*tx)) / (sizeof(__le32) * 2); + while (conf_num < nr_configs) { + chunk = (nr_configs - conf_num > configs_in_chunk) ? + configs_in_chunk : nr_configs - conf_num; + + ret = ph->xops->xfer_get_init(ph, PINCTRL_CONFIG_SET, + sizeof(*tx) + + chunk * 2 * sizeof(__le32), + 0, &t); + if (ret) + return ret; + + tx = t->tx.buf; + tx->identifier = cpu_to_le32(selector); + attributes = FIELD_PREP(GENMASK(1, 0), type) | + FIELD_PREP(GENMASK(9, 2), chunk); + tx->attributes = cpu_to_le32(attributes); + + for (i = 0; i < chunk; i++) { + tx->configs[i * 2] = + cpu_to_le32(config_type[conf_num + i]); + tx->configs[i * 2 + 1] = + cpu_to_le32(config_value[conf_num + i]); + } + + ret = ph->xops->do_xfer(ph, t); + + ph->xops->xfer_put(ph, t); + + if (ret) + break; + + conf_num += chunk; + } + + return ret; +} + +static int scmi_pinctrl_function_select(const struct scmi_protocol_handle *ph, + u32 identifier, + enum scmi_pinctrl_selector_type type, + u32 function_id) +{ + int ret; + struct scmi_xfer *t; + struct scmi_msg_func_set *tx; + + if (type == FUNCTION_TYPE) + return -EINVAL; + + ret = scmi_pinctrl_validate_id(ph, identifier, type); + if (ret) + return ret; + + ret = ph->xops->xfer_get_init(ph, PINCTRL_FUNCTION_SELECT, sizeof(*tx), + 0, &t); + if (ret) + return ret; + + tx = t->tx.buf; + tx->identifier = cpu_to_le32(identifier); + tx->function_id = cpu_to_le32(function_id); + tx->flags = cpu_to_le32(type); + + ret = ph->xops->do_xfer(ph, t); + ph->xops->xfer_put(ph, t); + + return ret; +} + +static int scmi_pinctrl_request(const struct scmi_protocol_handle *ph, + u32 identifier, + enum scmi_pinctrl_selector_type type) +{ + int ret; + struct scmi_xfer *t; + struct scmi_msg_request *tx; + + if (type == FUNCTION_TYPE) + return -EINVAL; + + ret = scmi_pinctrl_validate_id(ph, identifier, type); + if (ret) + return ret; + + ret = ph->xops->xfer_get_init(ph, PINCTRL_REQUEST, sizeof(*tx), 0, &t); + + tx = t->tx.buf; + tx->identifier = cpu_to_le32(identifier); + tx->flags = cpu_to_le32(type); + + ret = ph->xops->do_xfer(ph, t); + ph->xops->xfer_put(ph, t); + + return ret; +} + +static int scmi_pinctrl_pin_request(const struct scmi_protocol_handle *ph, + u32 pin) +{ + return scmi_pinctrl_request(ph, pin, PIN_TYPE); +} + +static int scmi_pinctrl_free(const struct scmi_protocol_handle *ph, + u32 identifier, + enum scmi_pinctrl_selector_type type) +{ + int ret; + struct scmi_xfer *t; + struct scmi_msg_request *tx; + + if (type == FUNCTION_TYPE) + return -EINVAL; + + ret = scmi_pinctrl_validate_id(ph, identifier, type); + if (ret) + return ret; + + ret = ph->xops->xfer_get_init(ph, PINCTRL_RELEASE, sizeof(*tx), 0, &t); + + tx = t->tx.buf; + tx->identifier = cpu_to_le32(identifier); + tx->flags = cpu_to_le32(type); + + ret = ph->xops->do_xfer(ph, t); + ph->xops->xfer_put(ph, t); + + return ret; +} + +static int scmi_pinctrl_pin_free(const struct scmi_protocol_handle *ph, u32 pin) +{ + return scmi_pinctrl_free(ph, pin, PIN_TYPE); +} + +static int scmi_pinctrl_get_group_info(const struct scmi_protocol_handle *ph, + u32 selector, + struct scmi_group_info *group) +{ + int ret; + + if (!group) + return -EINVAL; + + ret = scmi_pinctrl_attributes(ph, GROUP_TYPE, selector, + group->name, + &group->nr_pins); + if (ret) + return ret; + + if (!group->nr_pins) { + dev_err(ph->dev, "Group %d has 0 elements", selector); + return -ENODATA; + } + + group->group_pins = kmalloc_array(group->nr_pins, + sizeof(*group->group_pins), + GFP_KERNEL); + if (!group->group_pins) + return -ENOMEM; + + ret = scmi_pinctrl_list_associations(ph, selector, GROUP_TYPE, + group->nr_pins, group->group_pins); + if (ret) { + kfree(group->group_pins); + return ret; + } + + group->present = true; + return 0; +} + +static int scmi_pinctrl_get_group_name(const struct scmi_protocol_handle *ph, + u32 selector, const char **name) +{ + struct scmi_pinctrl_info *pi = ph->get_priv(ph); + + if (!name) + return -EINVAL; + + if (selector >= pi->nr_groups) + return -EINVAL; + + if (!pi->groups[selector].present) { + int ret; + + ret = scmi_pinctrl_get_group_info(ph, selector, + &pi->groups[selector]); + if (ret) + return ret; + } + + *name = pi->groups[selector].name; + + return 0; +} + +static int scmi_pinctrl_group_pins_get(const struct scmi_protocol_handle *ph, + u32 selector, const unsigned int **pins, + unsigned int *nr_pins) +{ + struct scmi_pinctrl_info *pi = ph->get_priv(ph); + + if (!pins || !nr_pins) + return -EINVAL; + + if (selector >= pi->nr_groups) + return -EINVAL; + + if (!pi->groups[selector].present) { + int ret; + + ret = scmi_pinctrl_get_group_info(ph, selector, + &pi->groups[selector]); + if (ret) + return ret; + } + + *pins = pi->groups[selector].group_pins; + *nr_pins = pi->groups[selector].nr_pins; + + return 0; +} + +static int scmi_pinctrl_get_function_info(const struct scmi_protocol_handle *ph, + u32 selector, + struct scmi_function_info *func) +{ + int ret; + + if (!func) + return -EINVAL; + + ret = scmi_pinctrl_attributes(ph, FUNCTION_TYPE, selector, + func->name, + &func->nr_groups); + if (ret) + return ret; + + if (!func->nr_groups) { + dev_err(ph->dev, "Function %d has 0 elements", selector); + return -ENODATA; + } + + func->groups = kmalloc_array(func->nr_groups, sizeof(*func->groups), + GFP_KERNEL); + if (!func->groups) + return -ENOMEM; + + ret = scmi_pinctrl_list_associations(ph, selector, FUNCTION_TYPE, + func->nr_groups, func->groups); + if (ret) { + kfree(func->groups); + return ret; + } + + func->present = true; + return 0; +} + +static int scmi_pinctrl_get_function_name(const struct scmi_protocol_handle *ph, + u32 selector, const char **name) +{ + struct scmi_pinctrl_info *pi = ph->get_priv(ph); + + if (!name) + return -EINVAL; + + if (selector >= pi->nr_functions) + return -EINVAL; + + if (!pi->functions[selector].present) { + int ret; + + ret = scmi_pinctrl_get_function_info(ph, selector, + &pi->functions[selector]); + if (ret) + return ret; + } + + *name = pi->functions[selector].name; + return 0; +} + +static int +scmi_pinctrl_function_groups_get(const struct scmi_protocol_handle *ph, + u32 selector, unsigned int *nr_groups, + const unsigned int **groups) +{ + struct scmi_pinctrl_info *pi = ph->get_priv(ph); + + if (!groups || !nr_groups) + return -EINVAL; + + if (selector >= pi->nr_functions) + return -EINVAL; + + if (!pi->functions[selector].present) { + int ret; + + ret = scmi_pinctrl_get_function_info(ph, selector, + &pi->functions[selector]); + if (ret) + return ret; + } + + *groups = pi->functions[selector].groups; + *nr_groups = pi->functions[selector].nr_groups; + + return 0; +} + +static int scmi_pinctrl_mux_set(const struct scmi_protocol_handle *ph, + u32 selector, u32 group) +{ + return scmi_pinctrl_function_select(ph, group, GROUP_TYPE, + selector); +} + +static int scmi_pinctrl_get_pin_info(const struct scmi_protocol_handle *ph, + u32 selector, struct scmi_pin_info *pin) +{ + int ret; + + if (!pin) + return -EINVAL; + + ret = scmi_pinctrl_attributes(ph, PIN_TYPE, selector, + pin->name, NULL); + if (ret) + return ret; + + pin->present = true; + return 0; +} + +static int scmi_pinctrl_get_pin_name(const struct scmi_protocol_handle *ph, + u32 selector, const char **name) +{ + struct scmi_pinctrl_info *pi = ph->get_priv(ph); + + if (!name) + return -EINVAL; + + if (selector >= pi->nr_pins) + return -EINVAL; + + if (!pi->pins[selector].present) { + int ret; + + ret = scmi_pinctrl_get_pin_info(ph, selector, + &pi->pins[selector]); + if (ret) + return ret; + } + + *name = pi->pins[selector].name; + + return 0; +} + +static int scmi_pinctrl_name_get(const struct scmi_protocol_handle *ph, + u32 selector, + enum scmi_pinctrl_selector_type type, + const char **name) +{ + switch (type) { + case PIN_TYPE: + return scmi_pinctrl_get_pin_name(ph, selector, name); + case GROUP_TYPE: + return scmi_pinctrl_get_group_name(ph, selector, name); + case FUNCTION_TYPE: + return scmi_pinctrl_get_function_name(ph, selector, name); + default: + return -EINVAL; + } +} + +static const struct scmi_pinctrl_proto_ops pinctrl_proto_ops = { + .count_get = scmi_pinctrl_count_get, + .name_get = scmi_pinctrl_name_get, + .group_pins_get = scmi_pinctrl_group_pins_get, + .function_groups_get = scmi_pinctrl_function_groups_get, + .mux_set = scmi_pinctrl_mux_set, + .config_get = scmi_pinctrl_config_get, + .config_set = scmi_pinctrl_config_set, + .pin_request = scmi_pinctrl_pin_request, + .pin_free = scmi_pinctrl_pin_free, +}; + +static int scmi_pinctrl_protocol_init(const struct scmi_protocol_handle *ph) +{ + int ret; + u32 version; + struct scmi_pinctrl_info *pinfo; + + ret = ph->xops->version_get(ph, &version); + if (ret) + return ret; + + dev_dbg(ph->dev, "Pinctrl Version %d.%d\n", + PROTOCOL_REV_MAJOR(version), PROTOCOL_REV_MINOR(version)); + + pinfo = devm_kzalloc(ph->dev, sizeof(*pinfo), GFP_KERNEL); + if (!pinfo) + return -ENOMEM; + + ret = scmi_pinctrl_attributes_get(ph, pinfo); + if (ret) + return ret; + + pinfo->pins = devm_kcalloc(ph->dev, pinfo->nr_pins, + sizeof(*pinfo->pins), + GFP_KERNEL); + if (!pinfo->pins) + return -ENOMEM; + + pinfo->groups = devm_kcalloc(ph->dev, pinfo->nr_groups, + sizeof(*pinfo->groups), + GFP_KERNEL); + if (!pinfo->groups) + return -ENOMEM; + + pinfo->functions = devm_kcalloc(ph->dev, pinfo->nr_functions, + sizeof(*pinfo->functions), + GFP_KERNEL); + if (!pinfo->functions) + return -ENOMEM; + + pinfo->version = version; + + return ph->set_priv(ph, pinfo, version); +} + +static int scmi_pinctrl_protocol_deinit(const struct scmi_protocol_handle *ph) +{ + int i; + struct scmi_pinctrl_info *pi = ph->get_priv(ph); + + for (i = 0; i < pi->nr_groups; i++) { + if (pi->groups[i].present) { + kfree(pi->groups[i].group_pins); + pi->groups[i].present = false; + } + } + + for (i = 0; i < pi->nr_functions; i++) { + if (pi->functions[i].present) { + kfree(pi->functions[i].groups); + pi->functions[i].present = false; + } + } + + return 0; +} + +static const struct scmi_protocol scmi_pinctrl = { + .id = SCMI_PROTOCOL_PINCTRL, + .owner = THIS_MODULE, + .instance_init = &scmi_pinctrl_protocol_init, + .instance_deinit = &scmi_pinctrl_protocol_deinit, + .ops = &pinctrl_proto_ops, + .supported_version = SCMI_PROTOCOL_SUPPORTED_VERSION, +}; + +DEFINE_SCMI_PROTOCOL_REGISTER_UNREGISTER(pinctrl, scmi_pinctrl) diff --git a/drivers/firmware/arm_scmi/protocols.h b/drivers/firmware/arm_scmi/protocols.h index b5c65f26207b..996410962b91 100644 --- a/drivers/firmware/arm_scmi/protocols.h +++ b/drivers/firmware/arm_scmi/protocols.h @@ -348,6 +348,7 @@ void __exit scmi_##name##_unregister(void) \ DECLARE_SCMI_REGISTER_UNREGISTER(base); DECLARE_SCMI_REGISTER_UNREGISTER(clock); DECLARE_SCMI_REGISTER_UNREGISTER(perf); +DECLARE_SCMI_REGISTER_UNREGISTER(pinctrl); DECLARE_SCMI_REGISTER_UNREGISTER(power); DECLARE_SCMI_REGISTER_UNREGISTER(reset); DECLARE_SCMI_REGISTER_UNREGISTER(sensors); diff --git a/include/linux/scmi_protocol.h b/include/linux/scmi_protocol.h index f2f05fb42d28..32580a4fd724 100644 --- a/include/linux/scmi_protocol.h +++ b/include/linux/scmi_protocol.h @@ -717,6 +717,80 @@ struct scmi_powercap_proto_ops { u32 *power_thresh_high); }; +enum scmi_pinctrl_selector_type { + PIN_TYPE = 0, + GROUP_TYPE, + FUNCTION_TYPE, +}; + +enum scmi_pinctrl_conf_type { + SCMI_PIN_NONE = 0x0, + SCMI_PIN_BIAS_BUS_HOLD = 0x1, + SCMI_PIN_BIAS_DISABLE = 0x2, + SCMI_PIN_BIAS_HIGH_IMPEDANCE = 0x3, + SCMI_PIN_BIAS_PULL_UP = 0x4, + SCMI_PIN_BIAS_PULL_DEFAULT = 0x5, + SCMI_PIN_BIAS_PULL_DOWN = 0x6, + SCMI_PIN_DRIVE_OPEN_DRAIN = 0x7, + SCMI_PIN_DRIVE_OPEN_SOURCE = 0x8, + SCMI_PIN_DRIVE_PUSH_PULL = 0x9, + SCMI_PIN_DRIVE_STRENGTH = 0xA, + SCMI_PIN_INPUT_DEBOUNCE = 0xB, + SCMI_PIN_INPUT_MODE = 0xC, + SCMI_PIN_PULL_MODE = 0xD, + SCMI_PIN_INPUT_VALUE = 0xE, + SCMI_PIN_INPUT_SCHMITT = 0xF, + SCMI_PIN_LOW_POWER_MODE = 0x10, + SCMI_PIN_OUTPUT_MODE = 0x11, + SCMI_PIN_OUTPUT_VALUE = 0x12, + SCMI_PIN_POWER_SOURCE = 0x13, + SCMI_PIN_SLEW_RATE = 0x20, + SCMI_PIN_OEM_START = 0xC0, + SCMI_PIN_OEM_END = 0xFF, +}; + +/** + * struct scmi_pinctrl_proto_ops - represents the various operations provided + * by SCMI Pinctrl Protocol + * + * @count_get: returns count of the registered elements in given type + * @name_get: returns name by index of given type + * @group_pins_get: returns the set of pins, assigned to the specified group + * @function_groups_get: returns the set of groups, assigned to the specified + * function + * @mux_set: set muxing function for groups of pins + * @config_get: returns configuration parameter for pin or group + * @config_set: sets the configuration parameter for pin or group + * @pin_request: aquire pin before selecting mux setting + * @pin_free: frees pin, acquired by request_pin call + */ +struct scmi_pinctrl_proto_ops { + int (*count_get)(const struct scmi_protocol_handle *ph, + enum scmi_pinctrl_selector_type type); + int (*name_get)(const struct scmi_protocol_handle *ph, u32 selector, + enum scmi_pinctrl_selector_type type, + const char **name); + int (*group_pins_get)(const struct scmi_protocol_handle *ph, + u32 selector, const unsigned int **pins, + unsigned int *nr_pins); + int (*function_groups_get)(const struct scmi_protocol_handle *ph, + u32 selector, unsigned int *nr_groups, + const unsigned int **groups); + int (*mux_set)(const struct scmi_protocol_handle *ph, u32 selector, + u32 group); + int (*config_get)(const struct scmi_protocol_handle *ph, u32 selector, + enum scmi_pinctrl_selector_type type, + enum scmi_pinctrl_conf_type config_type, + u32 *config_value); + int (*config_set)(const struct scmi_protocol_handle *ph, u32 selector, + enum scmi_pinctrl_selector_type type, + unsigned int nr_configs, + enum scmi_pinctrl_conf_type *config_type, + u32 *config_value); + int (*pin_request)(const struct scmi_protocol_handle *ph, u32 pin); + int (*pin_free)(const struct scmi_protocol_handle *ph, u32 pin); +}; + /** * struct scmi_notify_ops - represents notifications' operations provided by * SCMI core @@ -824,6 +898,7 @@ enum scmi_std_protocol { SCMI_PROTOCOL_RESET = 0x16, SCMI_PROTOCOL_VOLTAGE = 0x17, SCMI_PROTOCOL_POWERCAP = 0x18, + SCMI_PROTOCOL_PINCTRL = 0x19, }; enum scmi_system_events { From patchwork Sun Jan 21 10:21:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan \(OSS\)" X-Patchwork-Id: 764836 Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02on2053.outbound.protection.outlook.com [40.107.247.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A83FA3717C; Sun, 21 Jan 2024 10:18:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.247.53 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705832303; cv=fail; b=A4cpZnlItMbrwqiBwiXpA8zytcPf0N2PXs0qefCxuFuUu7e93PcTr3h6yz2WZwkME6ji7cia+wnVAHwbBYGeUVhYtczmRs0Nhm5S2g8/qngJY7GsXO+huNqw6GWbx+GJnaqLsdXa5kfJ2rlaxbc6gxsO+3NIdCaOWpsQw4W2FPI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705832303; c=relaxed/simple; bh=CtAxHrOnauvNEXKRPnZhPz1iuf4Kwi9eN4TQrsy7Rjk=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=TbnoKf1OChC0XqefkOmTTbnAiFhYzuvGjzxe7LIAq4MjBXlhD1MzwSwVxRFX5QjKNVS9rq2pzFiU8YLU84o7EWK+z7mydgYoVY1KjHqP6k6dVY0iQnM0ERvSrAGNzeTuehzvAaubAgapTu3KB43huZXoDE8bt8MEMnImk/+62g4= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com; spf=pass smtp.mailfrom=oss.nxp.com; dkim=pass (1024-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b=dnO0ROuQ; arc=fail smtp.client-ip=40.107.247.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="dnO0ROuQ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kKFH3xOKEfxEPqKJH/tfk7dza7up21cGc0UCDSSwrFnbDBpAXwdAmUw2qJHbcHJWIepUQOeFksVEYx+o2aljQJn68KpVWsXqfPdmCOYFu/AweuzOQfEr1FuFMQQEeT3XNrRVVIbqNT9hLTSJcN9Dga/QnVFuokpjTnunleStwPqBParhjf3U6vq0e8cFW8LFV/LMP8B6nwROUb7WKMrKU6JI8bkGufFj4xcNrLu/INljOP/yTId/Dbip/ZAk4kNdL+6TFAuokuJvYOhgzGz68e3TKlolip62jVxPCN0yka2sj1PhobSKmJV6H3zs2E3wX7qzyorb4HWiW5h1xAr0Fw== 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=rT6Unqbl4epoaqFQxHa1b7kDdvy9IdeiekSFSbBjwdE=; b=DouMb60jFJ6OQTEznmHtNeyACPEKzlH9SAoisw4L1bivXLgNHx5L+B3RpAOA+Ee4Cfk1Wcy37jasuAw1cG8tkWcrA25MI36FPYaGi7D8J9jJmliNJnJOAvyu/xGLYoEuW+PUkcPEXQKkiy/SPE2Dc/FmC2HfNxHX3jL6JsMXP4iZSphAa831Bc2v6ZtMDYBhjuOb3kVZTRhYQI+e4CcgywQbRCF3pLzE1NiAIfxaoYjKSRUYSSjnsjy23H91Nt0Bim9R8WRk9zUnsMJYT4JF/yuUPLEcOwvTp5RfyMyBhdMX+4qJon9whARQWUpXol70e+3G63cjjBxZAD1QFe6GGA== 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=rT6Unqbl4epoaqFQxHa1b7kDdvy9IdeiekSFSbBjwdE=; b=dnO0ROuQagJmRAsztU726s+rDZEZWsrSIHr7TRVzC+pViflHr+JJGz28N3PuvXY2sa4izNJ8o/EWn7eal6gh2qRWNXztCaab8oGZxC7ljSGHn5StrDvI6W9Nd865m40PoN3A+Fi8W72WIDwPLskD9C5tQ3A4Pa8Svh9ZphAhzR0= 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 PAXPR04MB9203.eurprd04.prod.outlook.com (2603:10a6:102:222::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.30; Sun, 21 Jan 2024 10:18:18 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::c499:8cef:9bb1:ced6]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::c499:8cef:9bb1:ced6%3]) with mapi id 15.20.7202.028; Sun, 21 Jan 2024 10:18:18 +0000 From: "Peng Fan (OSS)" Date: Sun, 21 Jan 2024 18:21:54 +0800 Subject: [PATCH NOT APPLY v3 5/6] firmware: scmi: support compatible string Message-Id: <20240121-pinctrl-scmi-v3-5-8d94ba79dca8@nxp.com> References: <20240121-pinctrl-scmi-v3-0-8d94ba79dca8@nxp.com> In-Reply-To: <20240121-pinctrl-scmi-v3-0-8d94ba79dca8@nxp.com> To: Sudeep Holla , Cristian Marussi , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Oleksii Moisieiev , Linus Walleij , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-gpio@vger.kernel.org, AKASHI Takahiro , Peng Fan X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1705832540; l=8215; i=peng.fan@nxp.com; s=20230812; h=from:subject:message-id; bh=TViQlBYAhDtOG+ioNWB5ll8oU9TAN814RFWQxW74rTw=; b=rL2RBmgQC8pJl2rdiDbJ+7tlD3ovlMFj8jx/i/MofOVj/7PlwMFtyT5O4tPlgofE/Q/Qt71s7 aq9KafHdcL6C1qK496JvG4FIgMH2EX70G22dapLncUQwV3ftpNA3iN1 X-Developer-Key: i=peng.fan@nxp.com; a=ed25519; pk=I4sJg7atIT1g63H7bb5lDRGR2gJW14RKDD0wFL8TT1g= X-ClientProxiedBy: SG2PR06CA0192.apcprd06.prod.outlook.com (2603:1096:4:1::24) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0PR04MB9417:EE_|PAXPR04MB9203:EE_ X-MS-Office365-Filtering-Correlation-Id: 0e07ff1f-fe83-4e5d-47ff-08dc1a6a4988 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: 8FrS2cdhKObeQov5R2xdCFV3N3sPftMmBXKGDBhpDiyeeEeVGnGyvjlx+mA2Hb/LJI2cx0Xh/8v6vRjgmLSY2S7jcurWBAKnKtDfsLMQqwn6U0DDgfOvoT5GAwCi7mXR+N3QLCFToNypBGlEijCI6nXZf6f7qZqpglyG+iGESzExUJQfYW7v4t9pIKD9y9BG7HWJ8t2oLx1j1i7lj9b12FKQtOc4j+oqCwx3SnhvdpsvbB+r1t3SdmbetbLtP4vwNioChyvcL7SLqdbJVfhG5SPBhO9u0U0Ojapab9eCjFB+RPO+6WFnxUE3Tnesz4N7BqZnyk16RqIyvAStMX2iHA/tixUoOXsOMjv3bfrXkgkr8V6GndD+bFs/UCCymEQgyoOr8AHTyZU2b8Alw2CbjXpwT+m6jPk7eg9QA5FNGPYXwksScIz8Y6GiDKskGWwCfrmsC9gxk4/AFVmMlzxHJstYghTkvUHROjb1lht2T1wcN56gK/Kp+Vs7DRzjV9Nr0u5up3uau1QayolflZWoi/rDLcFOhNoAPO75k3MNR/o74IqX45gmo7pCWzZLxktCoAOKlGpz92/2jp5IFMZt0GEsHGUw0GQ6NuP8sJFU0M4MTCfYmQ7t9a3eF/fXJiLlF2DGjlSohdlx0RhVfMLyGw== 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)(366004)(346002)(376002)(396003)(136003)(39860400002)(230922051799003)(1800799012)(64100799003)(451199024)(186009)(83380400001)(38100700002)(26005)(4326008)(8676002)(8936002)(2906002)(41300700001)(5660300002)(7416002)(478600001)(52116002)(6486002)(6512007)(6666004)(9686003)(66556008)(6506007)(54906003)(66946007)(316002)(66476007)(110136005)(921011)(38350700005)(36756003)(86362001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?PjkdMiI7qOjrtvUnaXuXExRkbQkH?= =?utf-8?q?y1XroHUPjM3G9kdtfIiGxIT7UTVY0VLa5TDBfF5OqRVjw8seLGFRmf/oDCVgc09ZH?= =?utf-8?q?stkFTL2M87ued8K0SoG3ilsVS/ta0V8RDAjYrxqQmx8Y0Bl6V2ZV4ooRiXfrfoBm9?= =?utf-8?q?+Tz2W3cxP6tJBI4Dnw4KsxWJpbDJBz1bkKvbQpB5E2FLoNthZe3Kbaj5JTVTCRzbf?= =?utf-8?q?02UqI/K6XHPoaJfaaq8Yut3va4l5JgOK1+TuBEWgIyhXDchPN0IxzR0HDW1hx+vL/?= =?utf-8?q?ABDTpCe6rg54N4WOIZtQe8LLq/iHPtmos2VMP+ZGfvz52qhW2RgrGkDP1d+Cz2Fwp?= =?utf-8?q?3wjl3+3tuThw3OyzR17Wh2DO/Yd9dvzP+27D8X2SAe4H5CKDd+Eo1hhjQCIJ9HSGY?= =?utf-8?q?xzd19qdhPOYEn6lJJvqfLrjFxya76p8zUcNtw0sYWWm/k7rHdoztJzeq4uoR6afVd?= =?utf-8?q?qsgVLu8lGK7g+2ej9nHwrRgIAmtHQ+RGI4IPDs3MlKghgK1BDTlP8Bxdd5+eEL53r?= =?utf-8?q?y5L6QljXOPFAZp6XRJy+VDQCPzL13hZpAblAQdfed0C/midpBXEmMgFUM9By0/Qcq?= =?utf-8?q?AkE/HznLrZvC3r11PJqqUqLJ0GahCzrLmBpbKBmjg8liJC2Vhl0VDSo6fQi7fxMV6?= =?utf-8?q?ydu2wh8ziZpU9H9bSDPM02zKGqnqeTBXLo90QtUFrewjRw4tPJLGIuczumMyYuT4f?= =?utf-8?q?EUR+JS+0djwepWsfYAzQCehSFJDe85A2baHSmPLtXFcE78ORed7khNLEbIDS6+ooh?= =?utf-8?q?4LDQE1TKaDUf65Kb1cmQOPIyZLzHNI1sZP25ygNQHi0p16PxkdzKmMOtdDjJthUJH?= =?utf-8?q?d8HK2hLnggqql6OSTi8ZeLIAa9DXdmeMMnroKcxKmVJ3/VqXckJUXb32v0QOSR473?= =?utf-8?q?5S7brvaKtvkyEINJXbMTs9Fat69zbGmVsrEnIiiyuuIsSVJkVTb002quKB/CEusMH?= =?utf-8?q?4Go1n+g/O5koNMSoJcfOr9c0SfxvFV6Vd8juZ54pp8cvY/f23ua1Q7+fw31LhckEl?= =?utf-8?q?i0r2sS1MFWsrgyCaIPCshtrxk2KMj/V7ypVGPg4IiYtKQHgVaxE2EN0FxsVQqPipQ?= =?utf-8?q?q2XDQR2tpq3gHT/zpvG11GNMSudU4x4TRAEbiKG9ojA923MXYQ5vyrmSXofAfXh7i?= =?utf-8?q?3Tk4DX4NO6x4zNYdeMJqOzfEZA4sxNdWXzej3cTC66DJByaObk3AkU9PLnRtxM4L2?= =?utf-8?q?zH2zUNLGhr+IOfxU03j8/8dfT/SIfLboopIwA20CtShNBlsIbN1mS39nh9s4DVVLx?= =?utf-8?q?+QWCcjG3I0IHp9sgmKJqMImTWGWCL0jHEs54ney04HzXsljvevGvX8+sKYp1iUg+h?= =?utf-8?q?xywumHPB8m/GdZZ5Tr8LlgGTNgj45AR0AvL9T3RBReNRZR2/EG2kmK1xy8yOxRovt?= =?utf-8?q?i+x1LtD15BvHrhefY5qiXpXCOkOclFfGAYjMyYsTrQ91h23YVmsmRsUw1g38OSA0K?= =?utf-8?q?znYyGA+Fcu0uqh6+1odCpdPOrXGzJBqNHBQjqsCgfMnH5ijACu3lrEy71LdN8urON?= =?utf-8?q?Y8WOiab7OOkM?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0e07ff1f-fe83-4e5d-47ff-08dc1a6a4988 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jan 2024 10:18:18.3451 (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: IDcXWDSgGZlPZl9Ku4MATL1ukgLamtCnWWCQ8yY21WddppJ3KQlXqpgWgNftfZCGUn1rRf4gcd++OgPishV7ew== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9203 From: Peng Fan i.MX95 use SCMI PINCTRL OEM config type, so it could not reuse pinctrl-scmi.c which use generic pinconf. Then need introduce saying pinctrl-imx-scmi.c to support i.MX95, however both pinctrl-scmi and pinctrl-imx-scmi driver will register a pinctrl device with the same of_node(protocl@19). This will introduce an issue, because the pinctrl subsystem will use of_node to find the exact pinctrl device. But with two pinctrl devices registered by two drivers, it is unknown which pinctrl device will be chosen. So introduce compatible string to support cases that Vendor SCMI driver which does almost same thing as generic SCMI driver, but has some specific Vendor settings to do. Signed-off-by: Peng Fan --- drivers/firmware/arm_scmi/bus.c | 39 ++++++++++++++++++++++++++++++-------- drivers/firmware/arm_scmi/common.h | 2 +- drivers/firmware/arm_scmi/driver.c | 15 ++++++++++----- include/linux/scmi_protocol.h | 2 ++ 4 files changed, 44 insertions(+), 14 deletions(-) diff --git a/drivers/firmware/arm_scmi/bus.c b/drivers/firmware/arm_scmi/bus.c index 1f9735dbebec..9043f6366fa8 100644 --- a/drivers/firmware/arm_scmi/bus.c +++ b/drivers/firmware/arm_scmi/bus.c @@ -214,13 +214,21 @@ scmi_dev_match_id(struct scmi_device *scmi_dev, struct scmi_driver *scmi_drv) if (!id) return NULL; - for (; id->protocol_id; id++) - if (id->protocol_id == scmi_dev->protocol_id) { - if (!id->name) + for (; id->protocol_id; id++) { + if (id->protocol_id != scmi_dev->protocol_id) + continue; + if (!id->name) + return id; + + if (!strcmp(id->name, scmi_dev->name)) { + if (!id->compatible && + device_property_read_string(&scmi_dev->dev, "compatible", NULL)) return id; - else if (!strcmp(id->name, scmi_dev->name)) + + if (id->compatible && device_is_compatible(&scmi_dev->dev, id->compatible)) return id; } + } return NULL; } @@ -345,11 +353,14 @@ static void __scmi_device_destroy(struct scmi_device *scmi_dev) static struct scmi_device * __scmi_device_create(struct device_node *np, struct device *parent, - int protocol, const char *name) + int protocol, const char *name, const char *compatible) { int id, retval; struct scmi_device *scmi_dev; + if (compatible && !of_device_is_compatible(np, compatible)) + return NULL; + /* * If the same protocol/name device already exist under the same parent * (i.e. SCMI instance) just return the existent device. @@ -425,6 +436,7 @@ __scmi_device_create(struct device_node *np, struct device *parent, * @name: The requested-name of the device to be created; this is optional * and if no @name is provided, all the devices currently known to * be requested on the SCMI bus for @protocol will be created. + * @compatible: The compatible string * * This method can be invoked to create a single well-defined device (like * a transport device or a device requested by an SCMI driver loaded after @@ -441,14 +453,14 @@ __scmi_device_create(struct device_node *np, struct device *parent, */ struct scmi_device *scmi_device_create(struct device_node *np, struct device *parent, int protocol, - const char *name) + const char *name, const char *compatible) { struct list_head *phead; struct scmi_requested_dev *rdev; struct scmi_device *scmi_dev = NULL; if (name) - return __scmi_device_create(np, parent, protocol, name); + return __scmi_device_create(np, parent, protocol, name, compatible); mutex_lock(&scmi_requested_devices_mtx); phead = idr_find(&scmi_requested_devices, protocol); @@ -462,9 +474,20 @@ struct scmi_device *scmi_device_create(struct device_node *np, list_for_each_entry(rdev, phead, node) { struct scmi_device *sdev; + if (compatible) { + if (!rdev->id_table->compatible) + continue; + if (strcmp(compatible, rdev->id_table->compatible)) + continue; + } else { + if (rdev->id_table->compatible) + continue; + } + sdev = __scmi_device_create(np, parent, rdev->id_table->protocol_id, - rdev->id_table->name); + rdev->id_table->name, + rdev->id_table->compatible); /* Report errors and carry on... */ if (sdev) scmi_dev = sdev; diff --git a/drivers/firmware/arm_scmi/common.h b/drivers/firmware/arm_scmi/common.h index 00b165d1f502..ac0d83ed5803 100644 --- a/drivers/firmware/arm_scmi/common.h +++ b/drivers/firmware/arm_scmi/common.h @@ -149,7 +149,7 @@ extern struct blocking_notifier_head scmi_requested_devices_nh; struct scmi_device *scmi_device_create(struct device_node *np, struct device *parent, int protocol, - const char *name); + const char *name, const char *compatible); void scmi_device_destroy(struct device *parent, int protocol, const char *name); int scmi_protocol_acquire(const struct scmi_handle *handle, u8 protocol_id); diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c index 4c3752749105..b78fce62a0de 100644 --- a/drivers/firmware/arm_scmi/driver.c +++ b/drivers/firmware/arm_scmi/driver.c @@ -261,15 +261,17 @@ EXPORT_SYMBOL_GPL(scmi_protocol_unregister); * @name: The optional name of the device to be created: if not provided this * call will lead to the creation of all the devices currently requested * for the specified protocol. + * @compatible: optional, the compatible string */ static void scmi_create_protocol_devices(struct device_node *np, struct scmi_info *info, - int prot_id, const char *name) + int prot_id, const char *name, + const char *compatible) { struct scmi_device *sdev; mutex_lock(&info->devreq_mtx); - sdev = scmi_device_create(np, info->dev, prot_id, name); + sdev = scmi_device_create(np, info->dev, prot_id, name, compatible); if (name && !sdev) dev_err(info->dev, "failed to create device for protocol 0x%X (%s)\n", @@ -2354,7 +2356,7 @@ static int scmi_chan_setup(struct scmi_info *info, struct device_node *of_node, snprintf(name, 32, "__scmi_transport_device_%s_%02X", idx ? "rx" : "tx", prot_id); /* Create a uniquely named, dedicated transport device for this chan */ - tdev = scmi_device_create(of_node, info->dev, prot_id, name); + tdev = scmi_device_create(of_node, info->dev, prot_id, name, NULL); if (!tdev) { dev_err(info->dev, "failed to create transport device (%s)\n", name); @@ -2550,7 +2552,7 @@ static int scmi_device_request_notifier(struct notifier_block *nb, switch (action) { case SCMI_BUS_NOTIFY_DEVICE_REQUEST: scmi_create_protocol_devices(np, info, id_table->protocol_id, - id_table->name); + id_table->name, id_table->compatible); break; case SCMI_BUS_NOTIFY_DEVICE_UNREQUEST: scmi_destroy_protocol_devices(info, id_table->protocol_id, @@ -2802,10 +2804,13 @@ static int scmi_probe(struct platform_device *pdev) for_each_available_child_of_node(np, child) { u32 prot_id; + const char *s = NULL; if (of_property_read_u32(child, "reg", &prot_id)) continue; + of_property_read_string(child, "compatible", &s); + if (!FIELD_FIT(MSG_PROTOCOL_ID_MASK, prot_id)) dev_err(dev, "Out of range protocol %d\n", prot_id); @@ -2828,7 +2833,7 @@ static int scmi_probe(struct platform_device *pdev) } of_node_get(child); - scmi_create_protocol_devices(child, info, prot_id, NULL); + scmi_create_protocol_devices(child, info, prot_id, NULL, s); } return 0; diff --git a/include/linux/scmi_protocol.h b/include/linux/scmi_protocol.h index 32580a4fd724..659a8e910bfc 100644 --- a/include/linux/scmi_protocol.h +++ b/include/linux/scmi_protocol.h @@ -914,6 +914,7 @@ struct scmi_device { u32 id; u8 protocol_id; const char *name; + const char *compatible; /* Optional */ struct device dev; struct scmi_handle *handle; }; @@ -923,6 +924,7 @@ struct scmi_device { struct scmi_device_id { u8 protocol_id; const char *name; + const char *compatible; /* Optional */ }; struct scmi_driver {