From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B85B3C43603 for ; Thu, 12 Dec 2019 14:48:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 81DF221655 for ; Thu, 12 Dec 2019 14:48:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=xilinx.onmicrosoft.com header.i=@xilinx.onmicrosoft.com header.b="VOAsVCjy" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729799AbfLLOsW (ORCPT ); Thu, 12 Dec 2019 09:48:22 -0500 Received: from mail-eopbgr700077.outbound.protection.outlook.com ([40.107.70.77]:8851 "EHLO NAM04-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729603AbfLLOsV (ORCPT ); Thu, 12 Dec 2019 09:48:21 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IExOKWh8WVqn1vAlf+cxhdqlE0ergSMStnHJ+LwdVed5ypQghBzjlRdfXw00xmBIVsqQ/QLnh8YKPKZvR9jLzOo+zK2MOycMF99tVWcnQvhDuGI9Y7/s5qgoYYPmRD2sFZWABLMTep7Ka0kqjSYtC9c1NfB3zA+nvt7Ds36Ypq1a9p/h3o8qxgAr4w2N0BpuZOcGg65BuVX/zAJqi/DGO72jiJDAXyGg9UWTZbMZeEv0PuYkmH22SiGB2qNH4VyIde5gzUQ2nDy2Ivvt3G/gcwdOKkJMs8pNLSa4HytXfcTaKAXMXU71uDXumoVwt7zYyv4iMIivu43Py/JQJdF9EQ== 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-SenderADCheck; bh=gvVrog+wMb1sRP+Fa+HMIDvcHtPSER5O7VDicflThd8=; b=Uuf+z0lUTre5urbcHlpZn0fzEBbVDBwfbw7mF/2WkuN7Pj5aKNppnlUlTAQj/i8p4sux0NNCxF5ybWFbe1pBXy2kExn7JjGtM4+hnSfz9mZ4ke426ZG2AD69EkAOV4xjrukSOf6m+ZTCglrqxTX4I8vZcI8K+kEsmqrFBnfHJYYLsS5gZsK11Kadba7TH/NvgoKE3zNpYm0XsPLZplodpDjw/IxXSuKoxgZoGdfoVdBRqWVxZHFQYh6BWlN41NoT2L603K+KLq/tn+u2U3uK9vu7/qupnqdku9WfZYcvTOJl2hdnn0mGxCPy9hY5QxaYO5gDnQDhrk4A5QjHYSzvpQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 149.199.60.83) smtp.rcpttodomain=lists.infradead.org smtp.mailfrom=xilinx.com; dmarc=bestguesspass action=none header.from=xilinx.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector2-xilinx-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gvVrog+wMb1sRP+Fa+HMIDvcHtPSER5O7VDicflThd8=; b=VOAsVCjy6xYthZkGX1HxKD0tGcOgxE2g2PqDFpJOPHK9Rc2EcxWK5GApjoGYEs4K2MKXPvmx9452DPrwiJVzIt92xMH8XuqMw0hvMgr1q1qBDFVbhayzgortZbLh20AIe4vQJj2Zl8ho8h5xAFUNHyW22pqZERBX2pww7TZW0n8= Received: from BL0PR02CA0031.namprd02.prod.outlook.com (2603:10b6:207:3c::44) by BN8PR02MB5793.namprd02.prod.outlook.com (2603:10b6:408:bb::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2538.18; Thu, 12 Dec 2019 14:48:16 +0000 Received: from BL2NAM02FT038.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::208) by BL0PR02CA0031.outlook.office365.com (2603:10b6:207:3c::44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2538.15 via Frontend Transport; Thu, 12 Dec 2019 14:48:16 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.83) smtp.mailfrom=xilinx.com; lists.infradead.org; dkim=none (message not signed) header.d=none;lists.infradead.org; dmarc=bestguesspass action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.83 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.83; helo=xsj-pvapsmtpgw01; Received: from xsj-pvapsmtpgw01 (149.199.60.83) by BL2NAM02FT038.mail.protection.outlook.com (10.152.77.25) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.2538.14 via Frontend Transport; Thu, 12 Dec 2019 14:48:16 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66] helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1ifPlH-000857-FV; Thu, 12 Dec 2019 06:48:15 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1ifPlC-0001oh-Dx; Thu, 12 Dec 2019 06:48:10 -0800 Received: from xsj-pvapsmtp01 (xsj-smtp.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id xBCEm5fF027749; Thu, 12 Dec 2019 06:48:05 -0800 Received: from [172.30.17.107] by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1ifPl7-0001nx-KY; Thu, 12 Dec 2019 06:48:05 -0800 Subject: Re: [PATCH] drivers: firmware: xilinx: Add support for feature check To: Rajan Vaja , michal.simek@xilinx.com, jolly.shah@xilinx.com, nava.manne@xilinx.com, ravi.patel@xilinx.com, tejas.patel@xilinx.com Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org References: <1573547755-4779-1-git-send-email-rajan.vaja@xilinx.com> From: Michal Simek Message-ID: Date: Thu, 12 Dec 2019 15:48:02 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 In-Reply-To: <1573547755-4779-1-git-send-email-rajan.vaja@xilinx.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.2.0.1013-23620.005 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.83;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(4636009)(199004)(189003)(2906002)(498600001)(70206006)(36756003)(70586007)(356004)(6666004)(2616005)(31686004)(186003)(9786002)(4326008)(6636002)(5660300002)(8676002)(336012)(426003)(44832011)(31696002)(81156014)(81166006)(26005)(8936002);DIR:OUT;SFP:1101;SCL:1;SRVR:BN8PR02MB5793;H:xsj-pvapsmtpgw01;FPR:;SPF:Pass;LANG:en;PTR:unknown-60-83.xilinx.com;A:1;MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8accfcd1-4e45-41b4-8bf2-08d77f125246 X-MS-TrafficTypeDiagnostic: BN8PR02MB5793: X-Microsoft-Antispam-PRVS: X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-MS-Oob-TLC-OOBClassifiers: OLM:6790; X-Forefront-PRVS: 0249EFCB0B X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4JYoJTe99+ge+Y7r6/V+I6Sx2QUnwvD8VpgFIfFB/2v5uhX0ygkS+fKHzlFWctX/+OE5HDScvJKGxzG8SPIVkZWbbf4JNoLSFqxSxx4+MLodrXEoo2TqIXtxnY1qOaKjsKyFwz8fb2OMoI9fC+83O7lrWvT+ygZhP6WgBvNtuiT17CSPUH/VRo1zr75YFXYPaNxDC65NgwLuUadDvCeXmbHIBsSHFcmFhWS4r2VrnFLOBSk1CnBAPcfbh9vkzdQiZS3SJj3XiFs12eJMqs5o4dR480xMfKCrI8bR4/rYuorXamsby7XMOvkxv6d+tS4EaVeMutnHtdc0H9fzU9UF67Z2jeVl+lx4Qws3wo75f11wrC7KVwHnUnQUkOLH849H01kv9Zdq1dDznv7gQTezfiTC+cS6RrRXJZiY+QIW9McL8CZOiRkg0UmhTvahi5J+ X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Dec 2019 14:48:16.0286 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8accfcd1-4e45-41b4-8bf2-08d77f125246 X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c;Ip=[149.199.60.83];Helo=[xsj-pvapsmtpgw01] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR02MB5793 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 12. 11. 19 9:35, Rajan Vaja wrote: > From: Ravi Patel > > Query for corresponding feature before calling EEMI API > from the driver. > > Signed-off-by: Ravi Patel > Signed-off-by: Michal Simek > Signed-off-by: Rajan Vaja > --- > drivers/firmware/xilinx/zynqmp.c | 43 ++++++++++++++++++++++++++++++++++++ > include/linux/firmware/xlnx-zynqmp.h | 7 ++++++ > 2 files changed, 50 insertions(+) > > diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zynqmp.c > index 74d9f13..ecc339d 100644 > --- a/drivers/firmware/xilinx/zynqmp.c > +++ b/drivers/firmware/xilinx/zynqmp.c > @@ -26,6 +26,9 @@ > > static const struct zynqmp_eemi_ops *eemi_ops_tbl; > > +static bool feature_check_enabled; > +static u32 zynqmp_pm_features[PM_API_MAX]; > + > static const struct mfd_cell firmware_devs[] = { > { > .name = "zynqmp_power_controller", > @@ -44,6 +47,8 @@ static int zynqmp_pm_ret_code(u32 ret_status) > case XST_PM_SUCCESS: > case XST_PM_DOUBLE_REQ: > return 0; > + case XST_PM_NO_FEATURE: > + return -ENOTSUPP; > case XST_PM_NO_ACCESS: > return -EACCES; > case XST_PM_ABORT_SUSPEND: > @@ -129,6 +134,39 @@ static noinline int do_fw_call_hvc(u64 arg0, u64 arg1, u64 arg2, > } > > /** > + * zynqmp_pm_feature() - Check weather given feature is supported or not > + * @api_id: API ID to check > + * > + * Return: Returns status, either success or error+reason > + */ > +static int zynqmp_pm_feature(u32 api_id) > +{ > + int ret; > + u32 ret_payload[PAYLOAD_ARG_CNT]; > + u64 smc_arg[2]; > + > + if (!feature_check_enabled) > + return 0; > + > + /* Return value if feature is already checked */ > + if (zynqmp_pm_features[api_id] != PM_FEATURE_UNCHECKED) > + return zynqmp_pm_features[api_id]; > + > + smc_arg[0] = PM_SIP_SVC | PM_FEATURE_CHECK; > + smc_arg[1] = api_id; > + > + ret = do_fw_call(smc_arg[0], smc_arg[1], 0, ret_payload); > + if (ret) { > + zynqmp_pm_features[api_id] = PM_FEATURE_INVALID; > + return PM_FEATURE_INVALID; > + } > + > + zynqmp_pm_features[api_id] = ret_payload[1]; > + > + return zynqmp_pm_features[api_id]; > +} > + > +/** > * zynqmp_pm_invoke_fn() - Invoke the system-level platform management layer > * caller function depending on the configuration > * @pm_api_id: Requested PM-API call > @@ -162,6 +200,9 @@ int zynqmp_pm_invoke_fn(u32 pm_api_id, u32 arg0, u32 arg1, > */ > u64 smc_arg[4]; > > + if (zynqmp_pm_feature(pm_api_id) == PM_FEATURE_INVALID) > + return -ENOTSUPP; > + > smc_arg[0] = PM_SIP_SVC | pm_api_id; > smc_arg[1] = ((u64)arg1 << 32) | arg0; > smc_arg[2] = ((u64)arg3 << 32) | arg2; > @@ -717,6 +758,8 @@ static int zynqmp_firmware_probe(struct platform_device *pdev) > np = of_find_compatible_node(NULL, NULL, "xlnx,versal"); > if (!np) > return 0; > + > + feature_check_enabled = true; > } > of_node_put(np); > > diff --git a/include/linux/firmware/xlnx-zynqmp.h b/include/linux/firmware/xlnx-zynqmp.h > index 74d710d..f0d4558 100644 > --- a/include/linux/firmware/xlnx-zynqmp.h > +++ b/include/linux/firmware/xlnx-zynqmp.h > @@ -48,6 +48,10 @@ > #define ZYNQMP_PM_CAPABILITY_WAKEUP 0x4U > #define ZYNQMP_PM_CAPABILITY_UNUSABLE 0x8U > > +/* Feature check status */ > +#define PM_FEATURE_INVALID -1 > +#define PM_FEATURE_UNCHECKED 0 > + > /* > * Firmware FPGA Manager flags > * XILINX_ZYNQMP_PM_FPGA_FULL: FPGA full reconfiguration > @@ -78,11 +82,14 @@ enum pm_api_id { > PM_CLOCK_GETRATE, > PM_CLOCK_SETPARENT, > PM_CLOCK_GETPARENT, > + PM_FEATURE_CHECK = 63, > + PM_API_MAX, > }; > > /* PMU-FW return status codes */ > enum pm_ret_status { > XST_PM_SUCCESS = 0, > + XST_PM_NO_FEATURE = 19, > XST_PM_INTERNAL = 2000, > XST_PM_CONFLICT, > XST_PM_NO_ACCESS, > Applied to zynqmp/soc branch and queue to v5.6. Thanks, Michal