From patchwork Wed Jun 2 11:23:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 452725 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=-16.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT 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 85E81C47083 for ; Wed, 2 Jun 2021 11:24:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6182C60FE5 for ; Wed, 2 Jun 2021 11:24:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231909AbhFBLZr (ORCPT ); Wed, 2 Jun 2021 07:25:47 -0400 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:11637 "EHLO esa6.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231617AbhFBLZo (ORCPT ); Wed, 2 Jun 2021 07:25:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1622633043; x=1654169043; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=qMoC26aE1t/imsmMoQjUxEhGnzi1b1hiqgTM5NyeOBU=; b=cc6EM8mhEetf2kZx0Q5Z5knGyhlEG5mANVyT5nS8ARRPQcbkFp7axQBi ScOkUdXHXtj6C4DDVG1WGSbAH3YXkX5N5dbFDmw+1HccxENTI2O8czhrE rxjDOdHnCUzc5ij6Y1X8eaqVE2hqXiYGSuoIzJ9smVzDwUfOuIV5DVO8i XRdjJsmDcd73IG++6HA5pCx6zjS37v3G5ux2ifW7Jv9SRaGNXeFvjtc3I ye9p4cfqLDLd19yxWiCPYtr6LEVYF+SLQEmyqi2aRpYWIfKj3NURCIpqY X/o/FZ4qhhXqhOx6foKg8q28597uIFHMaZ7NIdvuAGzJenYFgc1LtvVKe Q==; IronPort-SDR: MDV/m7P8xo/A/1bZWoB/tzyzw0RStxB0OO0HaCygc1UVbyONPF9hOYifz7jsGlD9Gm78RFD3L9 JAfLP1TMzcTu54eBMHM3lYIyHecD8ZtrSgaz8H6VhqDvMb1FbiQ/tQzRkpeRKT5cwj/0AW2Y76 GijT6wOprdDyUHGqSU5n7SMavcoeoyiv917zKhCmUC+o4eIptCdfe/MASSoEYhrRgX4Lnrls+m g6IZYHD0cjkBxN1q2SoYmoJuDo252jxcUfJNanxtaBKSpIAs1T0LIqfEFOkK1MRXNeLqkpB2tp 7oY= X-IronPort-AV: E=Sophos;i="5.83,242,1616428800"; d="scan'208";a="170932564" Received: from mail-co1nam11lp2174.outbound.protection.outlook.com (HELO NAM11-CO1-obe.outbound.protection.outlook.com) ([104.47.56.174]) by ob1.hgst.iphmx.com with ESMTP; 02 Jun 2021 19:24:01 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZeGpWjkkmstD1LMKv1jh7gp3YHeQlMSyw7wH5tMpVvHj4fDLJF97REs++EI05xN/1a6k7pTDG07bdikun41w28YXjhqI3gbTs0YCsxOaF7Nrz89sJkWo98Q4F+2vpsmYcOscHNIla+LgJ7lzH9inJ0EvrGHSZ7zVcqrK6JX/E8LsbfTFzUPiVxbVZIgFzpEiMkKrlSpDBDnK+B9uqjWIPLbe075yoyIYfMXwKJRL4VkYPwpG/6RSNpD7Wk39q32oWss0wM0pkzYODH/spm7pEQ2OV7UTL562f3ZrAGP66zsc0S9NOghwTDDtHsPPxTxLgbesJFRGXquKo+bs1zt0pw== 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=GdFS0rAEtKE6yd9Zx3nNwSnuIUcrKnIom98JvQmaI1w=; b=DoFVKPV3D2GYkpX1kMdP/epbifdsw3s70MXga1niS6F6VxyUSwfGkLKNqkt7fvP2oilifWONPCynsRQf3W1Wh1Sk3j/5ZrAHU/xZcE4Q97TnwZLvQBFpfMnNbjMj+3qJqy2Nodpl7iWMsOl0g8iSZQ54EzF891ZGLNoNtDXNrGclZMjfCuKHbRGNrHo/1sF26aOkEo4RsQIeId2BM0yIM7ZI44PRvXicdi5CwkS7jZgvQR1rOO6h6WqUSu0fsjaa1Vrtrybj2MKvv/QMWypV32T0uVATrRILEM7FaYa14GrGBBYtEtoNv4cmtTLpR09mw6EGd+TpkESFiFJSt16DGg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wdc.com; dmarc=pass action=none header.from=wdc.com; dkim=pass header.d=wdc.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector2-sharedspace-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=GdFS0rAEtKE6yd9Zx3nNwSnuIUcrKnIom98JvQmaI1w=; b=A3x7MWGgSSCj59XXjhtvsjDXzVWvlJBPiplC97EtReEvLcKwhUFrHkFRAK56Q4C33PUfL2Pewx0/7ifUEETTtadwcKywIpAc6dOtawD5NKCI8FB9gePMi5OtNhURHl4PFmRmYiFukwKRvqUbigi3LmrvyOMl7mWukQpavd+ma2s= Authentication-Results: dabbelt.com; dkim=none (message not signed) header.d=none; dabbelt.com; dmarc=none action=none header.from=wdc.com; Received: from CO6PR04MB7812.namprd04.prod.outlook.com (2603:10b6:303:138::6) by CO6PR04MB7810.namprd04.prod.outlook.com (2603:10b6:5:358::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.20; Wed, 2 Jun 2021 11:23:59 +0000 Received: from CO6PR04MB7812.namprd04.prod.outlook.com ([fe80::a153:b7f8:c87f:89f8]) by CO6PR04MB7812.namprd04.prod.outlook.com ([fe80::a153:b7f8:c87f:89f8%8]) with mapi id 15.20.4195.021; Wed, 2 Jun 2021 11:23:59 +0000 From: Anup Patel To: Palmer Dabbelt , Palmer Dabbelt , Paul Walmsley , Albert Ou , Daniel Lezcano , Ulf Hansson , "Rafael J . Wysocki" , Pavel Machek , Rob Herring Cc: Sandeep Tripathy , Atish Patra , Alistair Francis , Liush , Anup Patel , devicetree@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Anup Patel Subject: [PATCH v5 2/8] RISC-V: Rename relocate() and make it global Date: Wed, 2 Jun 2021 16:53:15 +0530 Message-Id: <20210602112321.2241566-3-anup.patel@wdc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210602112321.2241566-1-anup.patel@wdc.com> References: <20210602112321.2241566-1-anup.patel@wdc.com> X-Originating-IP: [122.179.70.115] X-ClientProxiedBy: MAXPR01CA0098.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:5d::16) To CO6PR04MB7812.namprd04.prod.outlook.com (2603:10b6:303:138::6) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from wdc.com (122.179.70.115) by MAXPR01CA0098.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:5d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4173.20 via Frontend Transport; Wed, 2 Jun 2021 11:23:54 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5115730b-b324-4e0f-1f52-08d925b8eace X-MS-TrafficTypeDiagnostic: CO6PR04MB7810: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: WDCIPOUTBOUND: EOP-TRUE X-MS-Oob-TLC-OOBClassifiers: OLM:3276; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0nL4dnsIAFhO7XemKy0TEB9O9/mwydpWCdpxamnoS025Jc42U7NZ2/ol2vp+sa+7a02nDuZ0wnGq9slwRi4RmiY9mRZSR44AkHY9LRk+HqP8Z5K5cLaWP5AkebwNrXJrJay4+shEmrY0+PtpNov0mX0n+qsSQ8Abfb8PKFEIOQq9TlmkDX+VJxePYVuxWjmxpFltT7NyTNqDc3UVJ9+OPRt6/sF/G/bKfF+IiVSye7XQAcVDiQVlzz047vlFGsHeprlY5yzUjSkgR5XuJmzE0EBu3JocNoZaf8y8YED+ZSY/WvEcLcsRqB0yvwveBQOl6eTW7FEA9Rw+iH7YdrWr7I9h0FreJADu5xd3Yu8BVBmqJishtaaMRtaAV00EFtZxJ/25Rj3dfG2IdhwWBO4d0CmPxkDwBGP1Bk0P1lMCER4ahvMGBJtFhV9Wcz0ZGeIdgTzVgtiInTsH73pnU2wMIgyWg1J9Ql3Wejj4uPy4cjA5CeHfoxxX0b/DpXBWmxUlf2gCXL+U+C0sOIXXpPeYWKIPY/RJMZ9Kp75pZqKU/GZS4/1BsT2wF1eQRi6IQbaiLfIdlnnJgY0uZMC2gYc+TPZIwMcm9RLghrvQ1D2XBeEG5XCrImMDm5fU8NBxL/EuquOL6PuEkCJifzNLhWa64g== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:CO6PR04MB7812.namprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(136003)(366004)(346002)(39860400002)(396003)(376002)(186003)(16526019)(7416002)(8676002)(6666004)(86362001)(44832011)(4326008)(8886007)(2616005)(478600001)(956004)(38350700002)(38100700002)(8936002)(26005)(110136005)(316002)(1076003)(5660300002)(36756003)(2906002)(54906003)(83380400001)(7696005)(52116002)(66946007)(55016002)(66556008)(66476007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: pF+HheLrh7kNnBYEsWJE3tnyVte5Yzsi2G3pa23s0TQfvXFdPZ1LzzkVzHp/vBEWkNYHFSMYD/oGZu+azEA+f/kuBASdH4WJty3//LRz1YmGhIwTY8vDE4i3URq3ngPcfS7bxAOmfdViUT+goGgWwpRnaroB7galntkeXFdI+hJuwnRE13LYbSDGMaQWEWyL/GLiLSsjxmUo0pJ38GwHrNmar+7XoaUHd45GZZ/ag7DysV0yhOPMTxd+M5tsQMM2cGmGZm2OeNYYd+FPC1/9zuS6uid3XyP1x+0Ra+hV/wQqIATFh59mb47+rX3CUIo2KL08iOm0j6FdoAR8DcfsnnLUIgzl/k8QAzKxET9KDlv/IiQ0TIgoWqnccOVDD+aNFdp03+iyX7JoHwoy6EgHE76ZGZg3/Amivf7MTnsxhIVa5X8LckFp1gCnPMRJP09ivPRaZhoatp2Ys88ikrM8RE6rzKUX/aolDE4drZ3COIfodrMWGCoZyKg/tZJQLhUob5US0FtU1rf3yal+OGRa9e1Rxa8IBm5OPPcgUJpduWuL1hE+Zd+ispLrOtAvf4BOjlDMPDeiOb8g2cBoNFnPNOcgH1VDFvCE7OIPu0IPq6ZwJ4E5bhANdv2mPnTgtI1xO8OtU9rFitbqCAvQRQOcCMygcG6dvq7PhNrnN6nUe0Ohq8P9+M5/cyOjohncvqUKe+ZL9LcVn2J7QJbtJWF0AfsAcsjk/DgqTLKCxFfXBSmgarkhDm+djAgisoO3BYTLtM9mAPLEwbJksz43J1HqUP85cHo/POALxPdY86U2HT1w6vE9svgU39Zdvr8qGfW5KPRbA4R+G9oH8WBYNuVwcL0yq29r1bip8ATDAruOWYIrECzMqy+Cc2GQcI1Rz7TWtWcRW6nskPsSCuOJRoyUExd0zHsL/LuO0uM4W9ijE8Gxfq7/IWb2KdKHO3oRvAzsF3E2sGdlUsvwiBfiHFTslR00hyA/7vxMrIhJHxiW+3xMk1j90FRJp+JaA37U1E3NgBRFiV7vJvbRV3RtiAsAkjGg8Cfb+Ty5u6wXbThoDfxzWIXVud4hxFwwO9OftdOVnWh4UFj10Er8+6gg5YnjcQbIEamg30ZuL6SljO5ngCGfjBK3gDt8a1mtWlZkRNjWN6AT1UWuQwoTfTmdNhRv9/PcsYxtZlw75UZY5snqjnKUd6XK1Xx0CLZK0/T+NqzNgnD5pmg1a9mLq7fybK7CYTGRiUi0rtiWaVMFxvAg+d+WnJL+T4p5BzXSNfTWmMtl7uZFh/jGSQMKYnELTXblV162VMyS2oJLDe1ouy8n2XTvnOMj5q5GBQhCsY+P+IsI X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5115730b-b324-4e0f-1f52-08d925b8eace X-MS-Exchange-CrossTenant-AuthSource: CO6PR04MB7812.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2021 11:23:59.7155 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 59Qn+IebNwNLMH3NxHU76u+eFx3s52SQr6j1SGxe2/0Sv5mLB5Ezx4PnrX7GmbGqhrkfR5YlNB4RqV19zq/KjQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR04MB7810 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The low-level relocate() function enables mmu and relocates execution to link-time addresses. We rename relocate() function to relocate_enable_mmu() function which is more informative. Also, the relocate_enable_mmu() function will be used in the resume path when a CPU wakes-up from a non-retentive suspend so we make it global symbol. Signed-off-by: Anup Patel --- arch/riscv/kernel/head.S | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/riscv/kernel/head.S b/arch/riscv/kernel/head.S index 89cc58ab52b4..a44c0bc9c2f3 100644 --- a/arch/riscv/kernel/head.S +++ b/arch/riscv/kernel/head.S @@ -79,7 +79,8 @@ pe_head_start: .align 2 #ifdef CONFIG_MMU -relocate: + .global relocate_enable_mmu +relocate_enable_mmu: /* Relocate return address */ la a1, kernel_virt_addr XIP_FIXUP_OFFSET a1 @@ -174,7 +175,7 @@ secondary_start_common: /* Enable virtual memory and relocate to virtual address */ la a0, swapper_pg_dir XIP_FIXUP_OFFSET a0 - call relocate + call relocate_enable_mmu #endif call setup_trap_vector tail smp_callin @@ -311,7 +312,7 @@ clear_bss_done: #ifdef CONFIG_MMU la a0, early_pg_dir XIP_FIXUP_OFFSET a0 - call relocate + call relocate_enable_mmu #endif /* CONFIG_MMU */ call setup_trap_vector From patchwork Wed Jun 2 11:23:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 452724 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=-16.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable 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 A14CDC47083 for ; Wed, 2 Jun 2021 11:24:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8B54F613B1 for ; Wed, 2 Jun 2021 11:24:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231991AbhFBLZ7 (ORCPT ); Wed, 2 Jun 2021 07:25:59 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:27602 "EHLO esa1.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232068AbhFBLZ4 (ORCPT ); Wed, 2 Jun 2021 07:25:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1622633053; x=1654169053; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=UeD+FgLO9aIjFzdKrHDcrkqDgbjr4ljOtP7t6+n6Irg=; b=KncaxD2uVqPBCWQz38nTJZPAgwqjlNe4IpXG4zXHOCQqYHsTxP0tudeA b9dXszD158hE+4TWmcBUIOpMRj4aQWsSIwm11KNasisqL42kkLSUEMraK 8trJPg3e6fuHxji+gAHlg45qXQ/bQ3mttGusA3BJ3vjCr2YZpcP+urPw4 aVdq3ULLjq1yNblY5moBd0Rjs21UJwoPqmsjhjkKF6TXJZluWgWQfQmDJ I9r5nEnHs94to0Jv0H+g79UypCzv14cGPbEv/6yLzyr25ZrjEVTlMncRY eqPLtURVCa0s3/ZUTkConmBqHix9LnVgvR654nIivn0IN5A0FTl4HqtUk Q==; IronPort-SDR: G+CJHrmZB5vJf7zPcqoGAwWpSO7qpZr//jiBHZoZP0bQw79ljtnGcZQn7Smh/gZpeVejqffv46 AIWnBzM08kn886T+S7gCoqGQYJdrWk2NxMwa1cGxICB0lyyPyf8BeBjM1pWiu3nbUcR208NsR4 cPipyGquUNbCuqeofMF+QVzO+cyQzr0KRXUKuXD2ARC7hLaoTMU9oF6emztOI7jPn778ulR1GX 7Tw0qUJu14tnYAX7WY3s9Eobp8a5C65cB9YKftT/gSi0FCeEx2M829QNktMgOXFomjMqulCghZ vWU= X-IronPort-AV: E=Sophos;i="5.83,242,1616428800"; d="scan'208";a="281803668" Received: from mail-dm6nam10lp2100.outbound.protection.outlook.com (HELO NAM10-DM6-obe.outbound.protection.outlook.com) ([104.47.58.100]) by ob1.hgst.iphmx.com with ESMTP; 02 Jun 2021 19:24:11 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kY2kMPvQOJGK/vEjulqgxYhioWAEgvdAWzWb55HKhrSlBuuchyOQOY9BUXq+GydSOWCeBb7xKQCR8k+wVAwgxofW5YguWhGvoSysNM4WJFIc0hr0q0XMDpRpcLbyhrQ2Odez+hvMsJmd+iH/kMa+/4X7OrV/hAxLWYNokJwjIIa+Gc5zcacZ7H6TAcQcdSZEwHyk8ekTr+vv7Ym6aK2BWcJ510lR/tp3sFZQ3BdOu0ETZUA76e2sZK+UFDRaNHnEeS2qdCQGVjBLtRJdHcpbifAhyZeZNNVyzDEcpYvXQjERFlPUAWWJ0m67cUtSvy+5SgwqLRnNGZrb89UCyqkveA== 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=4QXaNsRGTyDgz2Sn7I2zPdXMtXIGlsEhVecpbL/TqiQ=; b=YDaA5oVrcAZZLkOsfLwqOrT7iotgEL8VFistD0jUkFefhIDl4sQQqIAsIVa8w63xMjJeiptDvTSZzHil7m/2J4oHNpIItlC+EWlycPJqjFG4y8JIMYENdUnv338xkr+eYMvCWEYX/ZlhSkYApKLwatdNGb1SZoj7XSkDGFTsHWibCg+d0VADaedOKuTGDQbQpa1hwLpKEJ3BzFt2+PujapHjNxqJYi85UiH62kngqITMlK4wR1+/zrl1lDSSm7OGiJUer7LTSgshgHzbFaJ5s52cQaDHrfNBbNBj5kwgsUVlYZZ7OK3g3N0bRRx9HUjWJH3/rQ8YiAO/0w+qaTO+Rg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wdc.com; dmarc=pass action=none header.from=wdc.com; dkim=pass header.d=wdc.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector2-sharedspace-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4QXaNsRGTyDgz2Sn7I2zPdXMtXIGlsEhVecpbL/TqiQ=; b=mSKSvLX/zBndIfX7M6aEH/Vp3qJTFn2s0SxT5zImZGnxQiBewZA8quO0tF6bK4eLM9roYGdza4YJ13PXe7kk+oxz7Xski7JTMP0W94sTQz58segKWQvM/ecgj+gFO6poU92BegD/92m0paN2MGAE9kyJmxZPvuSntmHGaeCCmKE= Authentication-Results: dabbelt.com; dkim=none (message not signed) header.d=none; dabbelt.com; dmarc=none action=none header.from=wdc.com; Received: from CO6PR04MB7812.namprd04.prod.outlook.com (2603:10b6:303:138::6) by CO6PR04MB7810.namprd04.prod.outlook.com (2603:10b6:5:358::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.20; Wed, 2 Jun 2021 11:24:11 +0000 Received: from CO6PR04MB7812.namprd04.prod.outlook.com ([fe80::a153:b7f8:c87f:89f8]) by CO6PR04MB7812.namprd04.prod.outlook.com ([fe80::a153:b7f8:c87f:89f8%8]) with mapi id 15.20.4195.021; Wed, 2 Jun 2021 11:24:11 +0000 From: Anup Patel To: Palmer Dabbelt , Palmer Dabbelt , Paul Walmsley , Albert Ou , Daniel Lezcano , Ulf Hansson , "Rafael J . Wysocki" , Pavel Machek , Rob Herring Cc: Sandeep Tripathy , Atish Patra , Alistair Francis , Liush , Anup Patel , devicetree@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Anup Patel Subject: [PATCH v5 4/8] RISC-V: Add SBI HSM suspend related defines Date: Wed, 2 Jun 2021 16:53:17 +0530 Message-Id: <20210602112321.2241566-5-anup.patel@wdc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210602112321.2241566-1-anup.patel@wdc.com> References: <20210602112321.2241566-1-anup.patel@wdc.com> X-Originating-IP: [122.179.70.115] X-ClientProxiedBy: MAXPR01CA0098.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:5d::16) To CO6PR04MB7812.namprd04.prod.outlook.com (2603:10b6:303:138::6) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from wdc.com (122.179.70.115) by MAXPR01CA0098.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:5d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4173.20 via Frontend Transport; Wed, 2 Jun 2021 11:24:05 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cc11eafd-2c6c-4af4-0e49-08d925b8f187 X-MS-TrafficTypeDiagnostic: CO6PR04MB7810: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: WDCIPOUTBOUND: EOP-TRUE X-MS-Oob-TLC-OOBClassifiers: OLM:220; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ogWrtfxecAqvTYKcVyfOWma9+ZR5JwVuQPVfioUBxVds99Q4m7i3Bma8pXGyPsDmmH7PQdQ9nocLKriQOIDLDKkZN/RKEzXqucPNobCZ/zwpkCdHre9J9Ghyds7NHo+EiA0i5ZJcx+/2ttQ0m6gmLbFi3HZb2DLUXwMZbgj5i/6I0HWPVkJXy/kHkakCEkyYKo7AZdOfM0TGCuBo2+9H4SyDH0eujcfFMYPedSZ/h8/TyAFfJDLpCnrEJ9knHU89gFm3ok4pMouGKyjld5MAOZxUMPBjLbB9T9Tup72H979iJCNrVZ2JO9fDDd/tVRKOvU0qrjfwAAm6fOI8k1htKYYbzVLDvQYQbEWd+tVDVYq9Y5BN4myCNlMaxbEjPmpiRfSKKn/szZobnEFNc1acJYWXfgpr3xZ+DCj3epgazisdgKqJdZ2Bgp/86+DMmCV6u7xqJvFdrHOeNoKAXaRtEFGgnB/St+ypXoOFONnGqqkqxLHS5nfgQqct92VcZoUSOcnfdZKuDkUMVZ9F1Xn0BOH7PfwOgzuGkcFMLXlnJWtlEtbOpF4Cbj9HaCEDYISL18SzAP5owqAEkUnmcyLsczC8AUZPnbnbPEpAGOqI+bO0gFEhmQm/uZXE5frXNQTIepp5n0+e10vuy8KVnmTzEg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:CO6PR04MB7812.namprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(136003)(366004)(346002)(39860400002)(396003)(376002)(186003)(16526019)(15650500001)(7416002)(8676002)(6666004)(86362001)(44832011)(4326008)(8886007)(2616005)(478600001)(956004)(38350700002)(38100700002)(8936002)(26005)(110136005)(316002)(1076003)(5660300002)(36756003)(2906002)(54906003)(83380400001)(7696005)(52116002)(66946007)(55016002)(66556008)(66476007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: 0zJk6mhigDG0Z+Be+jjEmJ3Yuj/b90/v/CS3zkAQnvI5DERVsqLmv9NnE2SqkyKJlXojuS6+oDxOPlJudWKjrWOflhi+BNmp+WBhxDfnCBbeARenGQnk5iT6fbFXkfsDRqzsG6mzpKdds1Ca0ROQJO31hjBm06SKFWHNWJASZd0rA5ZjNUczlWTbhvIsXB7iWr1cheYZ6R8UPNxTyz1vou1pbp8RtWjvsvkzoTFYxh3YtHAIGM4frTVTNNXdx/GeFxsk5jjDnF+aUDCDk1ybWq6iWA3Y04uiQfhpUCYlwH0O59Dzcegd89wgvsK7OwWa7T6I6SDfjROigZAuXJ4P9f9q1f2MsP9Y33Xpx9AJCU88BWSIPLlyf6O+HELyuv4w0b8Tu6OZkMmSzNkar3Foxt2B5v4m3Htf5l4mrYP19fOuffEucp6cJJIiGimqerKy1/9GMpJdQbgqw66etpNsWO+HPmx4HYlrZun8rfxQyxL0HE8agmb75m/2APkLAge14WiAAkk6TOCmjaMp71x3gzjJyCopW5zdcSC7LYhG+wqn9VJln+WWMfKbcNOjHHgCZLjgIb+k68Gdy67UT7pHj2du0P2dIYit7mopFa6Sg8esVzRadRNuqQFI8l22um2WAzBJuDcOQzYdPSTpYhm73u6M1dWuPrft9GMWrukxFqpfKlnjQjl4DelFev7pL2SgDL+YVcuiRGO6vvVJIzDtBVNcWrIqvg/zXptlSjeA+6cXVAXcTBWvgEVf1HVnsR9MQB7g98LwqR+BJKmw3dk7gWoHSJCxi1jZOaV/g7uaLCAD+ZMNxK7bxGIdfSNpxv6msmaR2JC1VpvTrndya+YDrLD/25dC37d8QjImUpZ9Q8Kh5xkqvNDXWeKwOlVZ7UoIdA3im7Gx+2w/nysOuZDaKixNrK4biqtjHWSjBrVjskweZhwqd1RZu2TQ68gBL5iVhu/4htp6sKwQMkZ1pgzwQC7gMEDIuo9zAq5axt9Fsn/3maY65x6iCJjG2AzStMJHgsOOHzhTJmw7oAKLyGAlh2FYex3yZgQp3zMTx2KAV+IMR5kX8K8VjiS0UJWQTEimnViDrxiDQUEehfYb14UMDAhAmdKY0FMZCN8Yab/u0j/O58XjToLStME3j7/HfSe2euAJAIMM4QyoEB2oYTqL0PPeeB65gFl2wcI0aC3ObjaL8sh/I0bHLjph0dYWbEDdbxqrf0bm/OjR7fxODahpPWUHzV6e8445pTw2sLdc0CrR36wQdVPW7p6ZqYb7EPeEcopTAYqDrCL8XjWtm2rQSLWxi0U3lu+c9rLZ9IE2k/R75aOok7295jdXiuTV5DPa X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: cc11eafd-2c6c-4af4-0e49-08d925b8f187 X-MS-Exchange-CrossTenant-AuthSource: CO6PR04MB7812.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2021 11:24:10.9490 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 7fZf8rg1C2oP1YFWCydLe5WO0VpDM9iu+p4iwS3IPJ56qeL3XI7qlmpI2GXGSgPyQ5OTDAJ1L2y1x4MJgeSaTg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR04MB7810 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org We add defines related to SBI HSM suspend call and also update HSM states naming as-per latest SBI specification. Signed-off-by: Anup Patel --- arch/riscv/include/asm/sbi.h | 27 ++++++++++++++++++++++----- arch/riscv/kernel/cpu_ops_sbi.c | 2 +- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/arch/riscv/include/asm/sbi.h b/arch/riscv/include/asm/sbi.h index 289621da4a2a..ab9782f8da52 100644 --- a/arch/riscv/include/asm/sbi.h +++ b/arch/riscv/include/asm/sbi.h @@ -62,15 +62,32 @@ enum sbi_ext_hsm_fid { SBI_EXT_HSM_HART_START = 0, SBI_EXT_HSM_HART_STOP, SBI_EXT_HSM_HART_STATUS, + SBI_EXT_HSM_HART_SUSPEND, }; -enum sbi_hsm_hart_status { - SBI_HSM_HART_STATUS_STARTED = 0, - SBI_HSM_HART_STATUS_STOPPED, - SBI_HSM_HART_STATUS_START_PENDING, - SBI_HSM_HART_STATUS_STOP_PENDING, +enum sbi_hsm_hart_state { + SBI_HSM_STATE_STARTED = 0, + SBI_HSM_STATE_STOPPED, + SBI_HSM_STATE_START_PENDING, + SBI_HSM_STATE_STOP_PENDING, + SBI_HSM_STATE_SUSPENDED, + SBI_HSM_STATE_SUSPEND_PENDING, + SBI_HSM_STATE_RESUME_PENDING, }; +#define SBI_HSM_SUSP_BASE_MASK 0x7fffffff +#define SBI_HSM_SUSP_NON_RET_BIT 0x80000000 +#define SBI_HSM_SUSP_PLAT_BASE 0x10000000 + +#define SBI_HSM_SUSPEND_RET_DEFAULT 0x00000000 +#define SBI_HSM_SUSPEND_RET_PLATFORM SBI_HSM_SUSP_PLAT_BASE +#define SBI_HSM_SUSPEND_RET_LAST SBI_HSM_SUSP_BASE_MASK +#define SBI_HSM_SUSPEND_NON_RET_DEFAULT SBI_HSM_SUSP_NON_RET_BIT +#define SBI_HSM_SUSPEND_NON_RET_PLATFORM (SBI_HSM_SUSP_NON_RET_BIT | \ + SBI_HSM_SUSP_PLAT_BASE) +#define SBI_HSM_SUSPEND_NON_RET_LAST (SBI_HSM_SUSP_NON_RET_BIT | \ + SBI_HSM_SUSP_BASE_MASK) + enum sbi_ext_srst_fid { SBI_EXT_SRST_RESET = 0, }; diff --git a/arch/riscv/kernel/cpu_ops_sbi.c b/arch/riscv/kernel/cpu_ops_sbi.c index 685fae72b7f5..5fd90f03a3e9 100644 --- a/arch/riscv/kernel/cpu_ops_sbi.c +++ b/arch/riscv/kernel/cpu_ops_sbi.c @@ -97,7 +97,7 @@ static int sbi_cpu_is_stopped(unsigned int cpuid) rc = sbi_hsm_hart_get_status(hartid); - if (rc == SBI_HSM_HART_STATUS_STOPPED) + if (rc == SBI_HSM_STATE_STOPPED) return 0; return rc; } From patchwork Wed Jun 2 11:23:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 452723 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=-13.9 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable 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 07834C4708F for ; Wed, 2 Jun 2021 11:24:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E79F4613D8 for ; Wed, 2 Jun 2021 11:24:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232229AbhFBL0I (ORCPT ); Wed, 2 Jun 2021 07:26:08 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:27614 "EHLO esa1.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232057AbhFBL0G (ORCPT ); Wed, 2 Jun 2021 07:26:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1622633064; x=1654169064; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=17vf1DRJhsFJsGqgZNTJlVplkmAQvsSFXxgGbfcQWrI=; b=nUZTu3o8MsQHrgOxHhdO6YXD1EAvkvoxuEILEdUHe74Xkg1TvFV0cdCf h+rO/X6W9SNXAB9jXby9D/C5WHoRj9tnqC1zTUD8uZVsPq+eL8Ut7sAm2 jgeIBDF3UKx8h6ljgbsiqjHVma1YTOLq+zwOQI8Qk9HNJinweTFR0k8kS hjk667JrLWIslM8Ylb5+4bfdyMZCM0XJHageo371FbARRQH3fsF2CigG8 uLC6+FvPd+thBj9OaAUAavbV8ifspHXchXdlI9rg1y+4Bpan6vLgjYQVw HOsYMzF3ol+2BNuLMCSnbqkdmqxRf3LjGnBZ60dnd1UoA7SILXWcedqfo A==; IronPort-SDR: xvn0o02AOaVRpb0Yl0heZTTz1vANsIo+6OIxFsJDt5dcYUGU/TfU6wg3bo+t7j+MZNCsU0YrGp 9xodfusxeViQJT3G0JhjFJ9XCywkHvBHZItFfbCY6TxYVO/2l10C5XhSZ9KIDUn6MjdaRJs5fy U8IXUlT20IIsa0cT8/XwEZ/hmmHf/cte4u47MgwVTlvDumyPFbG1KLa9lnUK8Vp8/UydtJakrL 6r89n8Fq7/DSMd1Xg269+GTcVaT3JRnJBe/GNwiLXZmdEoO3KQMVu1++J2h5z6pyXfr2ihIq0u 86M= X-IronPort-AV: E=Sophos;i="5.83,242,1616428800"; d="scan'208";a="281803682" Received: from mail-mw2nam10lp2100.outbound.protection.outlook.com (HELO NAM10-MW2-obe.outbound.protection.outlook.com) ([104.47.55.100]) by ob1.hgst.iphmx.com with ESMTP; 02 Jun 2021 19:24:23 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=f5fCT40p7edaIrPk8qxokWY1MSUhaczy/7W9GhiIqT+TOEiAVxF1f8e7ermFHsBtFgfPnDgQPpS4ziY1ebNNV10nA3yNJcD8v97+3HSjXgfwGeHC2ItGbqu2sIr6LOpPQQ+JmHeOcNIkbw+0R4ltnk0b+kb68/o8KNTYLN92BJ96LF4rJN33K19NiQYULuyVB3OIG1Z9ekpFNXCRtW2vd2mCQ8s6A/uEjCnhFErAZ7SZqxFM0O1XKnQ3FXHOsPFuKDXRybQLP+taXru1HZpg5Jr9Z7CEICFjETFBJkNCvKXNS61aD3NxFwSTDIddMEbDFEVF5DI502auzMrM19p2Ww== 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=bjLmUz75445HyNBinzbk5M8o3LLpMojsQc2E52o+xMM=; b=iTZsoE4jXp+v7avHneCEJCCW8WIMk00Jf2z9d8exYFM2ugSFgPGX2g0soA2i7BsKPrZH+hAhX6HkKKBFELZ9Uvy06NKz2SqR+afLLl+Oy6zTUHvsunKpwY9oX/Q2MsU9FEEnyNZM9zamIVAT2z/Ja64xXebzcc7ioUN5r6Ebn9HRBUiK5pkbRPxQ+3ewspqUE0GEVhWekvB9oeHWFNGU5sFk/qDqjvE/RbTmcKZ1Ey+pTxjyaHNhu5K1Tfa9DWewAtws2K9LatA6h3wBWGj+h1HzIdOnzwW2Bhji1QyDwSY6klu5biLd2Cfh+yskHpPjPCtZ3ZGV0QgBS2BCYq0jLw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wdc.com; dmarc=pass action=none header.from=wdc.com; dkim=pass header.d=wdc.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector2-sharedspace-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bjLmUz75445HyNBinzbk5M8o3LLpMojsQc2E52o+xMM=; b=yz5E7h12I0U7kqAm49SIP6zmMs7SWNHBx2LhaTrJh7Ni1+jzFLxupKWB1ZG8ctOfeiIeLE9pZpx9FQLBBkRwEIZIlQ13sLqHLWc3K5yC+6QKRWlaZAuDoeYCD2PjtuUtI60ocDPpz4gCi7qUTsb8nIfywuwVmIljc4lTljFjDnU= Authentication-Results: dabbelt.com; dkim=none (message not signed) header.d=none; dabbelt.com; dmarc=none action=none header.from=wdc.com; Received: from CO6PR04MB7812.namprd04.prod.outlook.com (2603:10b6:303:138::6) by CO6PR04MB7747.namprd04.prod.outlook.com (2603:10b6:5:35b::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4173.20; Wed, 2 Jun 2021 11:24:22 +0000 Received: from CO6PR04MB7812.namprd04.prod.outlook.com ([fe80::a153:b7f8:c87f:89f8]) by CO6PR04MB7812.namprd04.prod.outlook.com ([fe80::a153:b7f8:c87f:89f8%8]) with mapi id 15.20.4195.021; Wed, 2 Jun 2021 11:24:22 +0000 From: Anup Patel To: Palmer Dabbelt , Palmer Dabbelt , Paul Walmsley , Albert Ou , Daniel Lezcano , Ulf Hansson , "Rafael J . Wysocki" , Pavel Machek , Rob Herring Cc: Sandeep Tripathy , Atish Patra , Alistair Francis , Liush , Anup Patel , devicetree@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Anup Patel Subject: [PATCH v5 6/8] cpuidle: Add RISC-V SBI CPU idle driver Date: Wed, 2 Jun 2021 16:53:19 +0530 Message-Id: <20210602112321.2241566-7-anup.patel@wdc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210602112321.2241566-1-anup.patel@wdc.com> References: <20210602112321.2241566-1-anup.patel@wdc.com> X-Originating-IP: [122.179.70.115] X-ClientProxiedBy: MAXPR01CA0098.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:5d::16) To CO6PR04MB7812.namprd04.prod.outlook.com (2603:10b6:303:138::6) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from wdc.com (122.179.70.115) by MAXPR01CA0098.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:5d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4173.20 via Frontend Transport; Wed, 2 Jun 2021 11:24:16 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c6ddc924-8f8b-4cba-ac03-08d925b8f83a X-MS-TrafficTypeDiagnostic: CO6PR04MB7747: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: WDCIPOUTBOUND: EOP-TRUE X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CEikm16zMw2pd7Pq3zs87VprnU7PC4DlNuYaqfh6+hoZ2anEx8VLWvh0Zjdx4xsLdmambMX/mYjsuEG6WORvGeIVpYyS91CyS+CNiWqjd4OvYphVsI3Trxvo87BsJtfxgEULTuMCgGk4RMUFQevqjJKqtuD8MVJCXs0rVvkdaZe1bbCZXPmjTyfKdKGUIU3zAa8EvCs5cS770cKQxQF/1YvhZMcU2h35GMkprB6jY24D9lj2L963ohO5U3Bb8BD/NHcX19AqrNJtzsdHTKK/k46X/tNC/HfYmP1ftmYlOpMHTLX92e6MhIqg3lw1xkvPAuFgJwDX7tXy0nCyBph/tk5/0++xIRQse7NmHychU1r3J14fgnQNrmid8XxJJz5+rc6M3lwDgFRA+O46EOn/xB6enY8I/mbgpFC2qxMSLzVPTwYXPUscrCbi7pEjPkij3vy8yKUta7NJYUNbFavrV8Nat8ybOrT5QcSxKC85fXoWGYsApmsWUi4AY25S4UvXdPIM+Vs+yCPrR9saU+fzG4uP3rtEZpRmBdbqiSqVrIMNrp9wTDClel5Lxi1ULgk6/ftszXB/6HJAkQsB6hTMOqBwXklHqfqhp1YWHuDsqOLr1OKuth/slrbetffrpmJF9MfTUO2TX/siJGP2g8Fjzg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:CO6PR04MB7812.namprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(136003)(346002)(39860400002)(396003)(376002)(366004)(52116002)(7696005)(36756003)(8936002)(86362001)(38100700002)(83380400001)(66476007)(30864003)(55016002)(110136005)(316002)(54906003)(26005)(4326008)(956004)(44832011)(1076003)(2616005)(8886007)(478600001)(186003)(16526019)(7416002)(66946007)(5660300002)(8676002)(38350700002)(2906002)(66556008); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: BSbgTeW0AVMP1H+Nd5UWK5St1tuwCUP0VVP8DB5Ty2YZwWLfubD6Bh2SwT9EVEFwtRS926+YiomBzNvNINolUYUyFnWwpOqLZGrdnSKsdpcTFT0cIuHMo/dPg1VaLJf2+adgV2VwMgCdBBIk6xnjWPXPiuYY/4N+5XJfJhHJLGRyTdKsulJy4wXA34PQlvVBEBjjXexi3JRY/vM3AaoJXZWwIkRIdYDXatmNiI+QbGn+FnbbCI9UarjLs7oPwWt9GGazu3CFiiqEd/xBqTmumpbUNLLQrAvb5BS50Sd/U0gL2k7Ko8wh/pB0kfFstUzkbOjmTf9LirAgItD6zvg0AjXNz8+kya4VcnfD87BdSSTp4nBsVrXz+rdaNJQqNgyxW25FZR3HjhTwKZhqT0vKMYVYkMJDK2a6A4QdDvqu7Lm5ZCIcZE/zG8MtwjwVGcsVteh1/RUNVW7rmXRc5vDGF14rgZNKIX1idL42fmdCSBpaOLDp2fDDM7/pQrDCg8cL7bG5NlXhYsMjW5/nPzHm74K6oZ3/cJEwKdgnfKeZtfFvJunSxnddz0SZcCbvUOMZpva3sAIjfWgBcg1E3Nvihi5TTDyDusRavv2n0YMjMZWQmcZRJCChwAph8LlL18ujLmNziSdEgqLzHFjc0r5FWCcRZM0a2GKC9hKdc5qYybFs0BYXQGBNOq8+Px6oLnHO8F+/GmndScIxWz95yUWwRKOhZkKaZe9wPCFc27fG20fDCWQkEDpWutH3oABC9TOiPgY1ug/DQpEDXXASMV1CMtNXtap5DF1hi05NjuIzimXpILeJRObUS1LpVXYg22/VZXdl3G7U7KOfWqptkAy2Qcxq9OALlPAG0rsKOfL2TrD0DhV4Z5YCI4u5sLgDCZMKsXAlF0BQp3ELgor6rqJvvGOa7J6AzFFX5RHAc8zzLFYTRHKSAS4lAZ0ZMHwNzhzRDjEezJr212srOiHMuoDWYjgqZaaDJnTHszIsXDLb09IExXSO3ODNvbafhk+XUa062vNDt4O1wj/zuaxga+JuK7DJ+QWVXcNaCY+uPSSKrFNAxhNsQVyMC+8M3hRPfdGQ4M2KoPwPHIsQnZxZrXmozCFyVeSiZopgQkWk7HNyUVo/W8t6//ioOXlC648bIZWr6+xqtdKnFhelmv2WScrkKrrKT3o/5avT/6pyf30oXN8HTRI8p6LVQhKDJyJeDvjKVi/0DK+ovH4h4XMvNL2AxyOEkLU/MJjAJYj3wZIZRWfAwVTkq10S09asgc/T0TpNPeDoKk3eWm8z6UA9DNKsIcjpffLVrPagDdP+TscunFo6MjW+XAu/3xic3r0qqvnr X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: c6ddc924-8f8b-4cba-ac03-08d925b8f83a X-MS-Exchange-CrossTenant-AuthSource: CO6PR04MB7812.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2021 11:24:22.2084 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 53f4kNH9ey0Q1Q7hSAqhUDZqdNmOpaPUE56TTOmZy8fofrRWXFvun2AYh3jU4JBNrFjdYuiuRV/32jF0VTB9bQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR04MB7747 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The RISC-V SBI HSM extension provides HSM suspend call which can be used by Linux RISC-V to enter platform specific low-power state. This patch adds a CPU idle driver based on RISC-V SBI calls which will populate idle states from device tree and use SBI calls to entry these idle states. Signed-off-by: Anup Patel --- MAINTAINERS | 7 + drivers/cpuidle/Kconfig | 5 + drivers/cpuidle/Kconfig.riscv | 15 + drivers/cpuidle/Makefile | 4 + drivers/cpuidle/cpuidle-sbi.c | 626 ++++++++++++++++++++++++++++++++++ 5 files changed, 657 insertions(+) create mode 100644 drivers/cpuidle/Kconfig.riscv create mode 100644 drivers/cpuidle/cpuidle-sbi.c diff --git a/MAINTAINERS b/MAINTAINERS index aa4bed38b790..64af5e4be6ec 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4795,6 +4795,13 @@ S: Supported F: drivers/cpuidle/dt_idle_genpd.c F: drivers/cpuidle/dt_idle_genpd.h +CPUIDLE DRIVER - RISC-V SBI +M: Anup Patel +L: linux-pm@vger.kernel.org +L: linux-riscv@lists.infradead.org +S: Supported +F: drivers/cpuidle/cpuidle-sbi.c + CRAMFS FILESYSTEM M: Nicolas Pitre S: Maintained diff --git a/drivers/cpuidle/Kconfig b/drivers/cpuidle/Kconfig index f1afe7ab6b54..ff71dd662880 100644 --- a/drivers/cpuidle/Kconfig +++ b/drivers/cpuidle/Kconfig @@ -66,6 +66,11 @@ depends on PPC source "drivers/cpuidle/Kconfig.powerpc" endmenu +menu "RISC-V CPU Idle Drivers" +depends on RISCV +source "drivers/cpuidle/Kconfig.riscv" +endmenu + config HALTPOLL_CPUIDLE tristate "Halt poll cpuidle driver" depends on X86 && KVM_GUEST diff --git a/drivers/cpuidle/Kconfig.riscv b/drivers/cpuidle/Kconfig.riscv new file mode 100644 index 000000000000..78518c26af74 --- /dev/null +++ b/drivers/cpuidle/Kconfig.riscv @@ -0,0 +1,15 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +# RISC-V CPU Idle drivers +# + +config RISCV_SBI_CPUIDLE + bool "RISC-V SBI CPU idle Driver" + depends on RISCV_SBI + select DT_IDLE_STATES + select CPU_IDLE_MULTIPLE_DRIVERS + select DT_IDLE_GENPD if PM_GENERIC_DOMAINS_OF + help + Select this option to enable RISC-V SBI firmware based CPU idle + driver for RISC-V systems. This drivers also supports hierarchical + DT based layout of the idle state. diff --git a/drivers/cpuidle/Makefile b/drivers/cpuidle/Makefile index 11a26cef279f..a36922c18510 100644 --- a/drivers/cpuidle/Makefile +++ b/drivers/cpuidle/Makefile @@ -35,3 +35,7 @@ obj-$(CONFIG_MIPS_CPS_CPUIDLE) += cpuidle-cps.o # POWERPC drivers obj-$(CONFIG_PSERIES_CPUIDLE) += cpuidle-pseries.o obj-$(CONFIG_POWERNV_CPUIDLE) += cpuidle-powernv.o + +############################################################################### +# RISC-V drivers +obj-$(CONFIG_RISCV_SBI_CPUIDLE) += cpuidle-sbi.o diff --git a/drivers/cpuidle/cpuidle-sbi.c b/drivers/cpuidle/cpuidle-sbi.c new file mode 100644 index 000000000000..f743684d07de --- /dev/null +++ b/drivers/cpuidle/cpuidle-sbi.c @@ -0,0 +1,626 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * RISC-V SBI CPU idle driver. + * + * Copyright (c) 2021 Western Digital Corporation or its affiliates. + */ + +#define pr_fmt(fmt) "cpuidle-sbi: " fmt + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "dt_idle_states.h" +#include "dt_idle_genpd.h" + +struct sbi_cpuidle_data { + u32 *states; + struct device *dev; +}; + +struct sbi_domain_state { + bool available; + u32 state; +}; + +static DEFINE_PER_CPU_READ_MOSTLY(struct sbi_cpuidle_data, sbi_cpuidle_data); +static DEFINE_PER_CPU(struct sbi_domain_state, domain_state); +static bool sbi_cpuidle_use_osi; +static bool sbi_cpuidle_use_cpuhp; +static bool sbi_cpuidle_pd_allow_domain_state; + +static inline void sbi_set_domain_state(u32 state) +{ + struct sbi_domain_state *data = this_cpu_ptr(&domain_state); + + data->available = true; + data->state = state; +} + +static inline u32 sbi_get_domain_state(void) +{ + struct sbi_domain_state *data = this_cpu_ptr(&domain_state); + + return data->state; +} + +static inline void sbi_clear_domain_state(void) +{ + struct sbi_domain_state *data = this_cpu_ptr(&domain_state); + + data->available = false; +} + +static inline bool sbi_is_domain_state_available(void) +{ + struct sbi_domain_state *data = this_cpu_ptr(&domain_state); + + return data->available; +} + +static int sbi_suspend_finisher(unsigned long suspend_type, + unsigned long resume_addr, + unsigned long opaque) +{ + struct sbiret ret; + + ret = sbi_ecall(SBI_EXT_HSM, SBI_EXT_HSM_HART_SUSPEND, + suspend_type, resume_addr, opaque, 0, 0, 0); + + return (ret.error) ? sbi_err_map_linux_errno(ret.error) : 0; +} + +static int sbi_suspend(u32 state) +{ + if (state & SBI_HSM_SUSP_NON_RET_BIT) + return cpu_suspend(state, sbi_suspend_finisher); + else + return sbi_suspend_finisher(state, 0, 0); +} + +static int sbi_cpuidle_enter_state(struct cpuidle_device *dev, + struct cpuidle_driver *drv, int idx) +{ + u32 *states = __this_cpu_read(sbi_cpuidle_data.states); + + return CPU_PM_CPU_IDLE_ENTER_PARAM(sbi_suspend, idx, states[idx]); +} + +static int __sbi_enter_domain_idle_state(struct cpuidle_device *dev, + struct cpuidle_driver *drv, int idx, + bool s2idle) +{ + struct sbi_cpuidle_data *data = this_cpu_ptr(&sbi_cpuidle_data); + u32 *states = data->states; + struct device *pd_dev = data->dev; + u32 state; + int ret; + + ret = cpu_pm_enter(); + if (ret) + return -1; + + /* Do runtime PM to manage a hierarchical CPU toplogy. */ + rcu_irq_enter_irqson(); + if (s2idle) + dev_pm_genpd_suspend(pd_dev); + else + pm_runtime_put_sync_suspend(pd_dev); + rcu_irq_exit_irqson(); + + if (sbi_is_domain_state_available()) + state = sbi_get_domain_state(); + else + state = states[idx]; + + ret = sbi_suspend(state) ? -1 : idx; + + rcu_irq_enter_irqson(); + if (s2idle) + dev_pm_genpd_resume(pd_dev); + else + pm_runtime_get_sync(pd_dev); + rcu_irq_exit_irqson(); + + cpu_pm_exit(); + + /* Clear the domain state to start fresh when back from idle. */ + sbi_clear_domain_state(); + return ret; +} + +static int sbi_enter_domain_idle_state(struct cpuidle_device *dev, + struct cpuidle_driver *drv, int idx) +{ + return __sbi_enter_domain_idle_state(dev, drv, idx, false); +} + +static int sbi_enter_s2idle_domain_idle_state(struct cpuidle_device *dev, + struct cpuidle_driver *drv, + int idx) +{ + return __sbi_enter_domain_idle_state(dev, drv, idx, true); +} + +static int sbi_cpuidle_cpuhp_up(unsigned int cpu) +{ + struct device *pd_dev = __this_cpu_read(sbi_cpuidle_data.dev); + + if (pd_dev) + pm_runtime_get_sync(pd_dev); + + return 0; +} + +static int sbi_cpuidle_cpuhp_down(unsigned int cpu) +{ + struct device *pd_dev = __this_cpu_read(sbi_cpuidle_data.dev); + + if (pd_dev) { + pm_runtime_put_sync(pd_dev); + /* Clear domain state to start fresh at next online. */ + sbi_clear_domain_state(); + } + + return 0; +} + +static void sbi_idle_init_cpuhp(void) +{ + int err; + + if (!sbi_cpuidle_use_cpuhp) + return; + + err = cpuhp_setup_state_nocalls(CPUHP_AP_CPU_PM_STARTING, + "cpuidle/sbi:online", + sbi_cpuidle_cpuhp_up, + sbi_cpuidle_cpuhp_down); + if (err) + pr_warn("Failed %d while setup cpuhp state\n", err); +} + +static const struct of_device_id sbi_cpuidle_state_match[] = { + { .compatible = "riscv,idle-state", + .data = sbi_cpuidle_enter_state }, + { }, +}; + +static bool sbi_suspend_state_is_valid(u32 state) +{ + if (state > SBI_HSM_SUSPEND_RET_DEFAULT && + state < SBI_HSM_SUSPEND_RET_PLATFORM) + return false; + if (state > SBI_HSM_SUSPEND_NON_RET_DEFAULT && + state < SBI_HSM_SUSPEND_NON_RET_PLATFORM) + return false; + return true; +} + +static int sbi_dt_parse_state_node(struct device_node *np, u32 *state) +{ + int err = of_property_read_u32(np, "riscv,sbi-suspend-param", state); + + if (err) { + pr_warn("%pOF missing riscv,sbi-suspend-param property\n", np); + return err; + } + + if (!sbi_suspend_state_is_valid(*state)) { + pr_warn("Invalid SBI suspend state %#x\n", *state); + return -EINVAL; + } + + return 0; +} + +static int sbi_dt_cpu_init_topology(struct cpuidle_driver *drv, + struct sbi_cpuidle_data *data, + unsigned int state_count, int cpu) +{ + /* Currently limit the hierarchical topology to be used in OSI mode. */ + if (!sbi_cpuidle_use_osi) + return 0; + + data->dev = dt_idle_attach_cpu(cpu, "sbi"); + if (IS_ERR_OR_NULL(data->dev)) + return PTR_ERR_OR_ZERO(data->dev); + + /* + * Using the deepest state for the CPU to trigger a potential selection + * of a shared state for the domain, assumes the domain states are all + * deeper states. + */ + drv->states[state_count - 1].enter = sbi_enter_domain_idle_state; + drv->states[state_count - 1].enter_s2idle = + sbi_enter_s2idle_domain_idle_state; + sbi_cpuidle_use_cpuhp = true; + + return 0; +} + +static int sbi_cpuidle_dt_init_states(struct device *dev, + struct cpuidle_driver *drv, + unsigned int cpu, + unsigned int state_count) +{ + struct sbi_cpuidle_data *data = per_cpu_ptr(&sbi_cpuidle_data, cpu); + struct device_node *state_node; + struct device_node *cpu_node; + u32 *states; + int i, ret; + + cpu_node = of_cpu_device_node_get(cpu); + if (!cpu_node) + return -ENODEV; + + states = devm_kcalloc(dev, state_count, sizeof(*states), GFP_KERNEL); + if (!states) { + ret = -ENOMEM; + goto fail; + } + + /* Parse SBI specific details from state DT nodes */ + for (i = 1; i < state_count; i++) { + state_node = of_get_cpu_state_node(cpu_node, i - 1); + if (!state_node) + break; + + ret = sbi_dt_parse_state_node(state_node, &states[i]); + of_node_put(state_node); + + if (ret) + return ret; + + pr_debug("sbi-state %#x index %d\n", states[i], i); + } + if (i != state_count) { + ret = -ENODEV; + goto fail; + } + + /* Initialize optional data, used for the hierarchical topology. */ + ret = sbi_dt_cpu_init_topology(drv, data, state_count, cpu); + if (ret < 0) + return ret; + + /* Store states in the per-cpu struct. */ + data->states = states; + +fail: + of_node_put(cpu_node); + + return ret; +} + +static void sbi_cpuidle_deinit_cpu(int cpu) +{ + struct sbi_cpuidle_data *data = per_cpu_ptr(&sbi_cpuidle_data, cpu); + + dt_idle_detach_cpu(data->dev); + sbi_cpuidle_use_cpuhp = false; +} + +static int sbi_cpuidle_init_cpu(struct device *dev, int cpu) +{ + struct cpuidle_driver *drv; + unsigned int state_count = 0; + int ret = 0; + + drv = devm_kzalloc(dev, sizeof(*drv), GFP_KERNEL); + if (!drv) + return -ENOMEM; + + drv->name = "sbi_cpuidle"; + drv->owner = THIS_MODULE; + drv->cpumask = (struct cpumask *)cpumask_of(cpu); + + /* RISC-V architectural WFI to be represented as state index 0. */ + drv->states[0].enter = sbi_cpuidle_enter_state; + drv->states[0].exit_latency = 1; + drv->states[0].target_residency = 1; + drv->states[0].power_usage = UINT_MAX; + strcpy(drv->states[0].name, "WFI"); + strcpy(drv->states[0].desc, "RISC-V WFI"); + + /* + * If no DT idle states are detected (ret == 0) let the driver + * initialization fail accordingly since there is no reason to + * initialize the idle driver if only wfi is supported, the + * default archictectural back-end already executes wfi + * on idle entry. + */ + ret = dt_init_idle_driver(drv, sbi_cpuidle_state_match, 1); + if (ret <= 0) { + pr_debug("HART%ld: failed to parse DT idle states\n", + cpuid_to_hartid_map(cpu)); + return ret ? : -ENODEV; + } + state_count = ret + 1; /* Include WFI state as well */ + + /* Initialize idle states from DT. */ + ret = sbi_cpuidle_dt_init_states(dev, drv, cpu, state_count); + if (ret) { + pr_err("HART%ld: failed to init idle states\n", + cpuid_to_hartid_map(cpu)); + return ret; + } + + ret = cpuidle_register(drv, NULL); + if (ret) + goto deinit; + + cpuidle_cooling_register(drv); + + return 0; +deinit: + sbi_cpuidle_deinit_cpu(cpu); + return ret; +} + +static int sbi_cpuidle_pd_power_off(struct generic_pm_domain *pd) +{ + struct genpd_power_state *state = &pd->states[pd->state_idx]; + u32 *pd_state; + + if (!state->data) + return 0; + + if (!sbi_cpuidle_pd_allow_domain_state) + return -EBUSY; + + /* OSI mode is enabled, set the corresponding domain state. */ + pd_state = state->data; + sbi_set_domain_state(*pd_state); + + return 0; +} + +static void sbi_cpuidle_domain_sync_state(struct device *dev) +{ + /* + * All devices have now been attached/probed to the PM domain + * topology, hence it's fine to allow domain states to be picked. + */ + sbi_cpuidle_pd_allow_domain_state = true; +} + +#ifdef CONFIG_DT_IDLE_GENPD + +struct sbi_pd_provider { + struct list_head link; + struct device_node *node; +}; + +static LIST_HEAD(sbi_pd_providers); + +static int sbi_pd_init(struct device_node *np) +{ + struct generic_pm_domain *pd; + struct sbi_pd_provider *pd_provider; + struct dev_power_governor *pd_gov; + int ret = -ENOMEM, state_count = 0; + + pd = dt_idle_pd_alloc(np, sbi_dt_parse_state_node); + if (!pd) + goto out; + + pd_provider = kzalloc(sizeof(*pd_provider), GFP_KERNEL); + if (!pd_provider) + goto free_pd; + + pd->flags |= GENPD_FLAG_IRQ_SAFE | GENPD_FLAG_CPU_DOMAIN; + + /* Allow power off when OSI is available. */ + if (sbi_cpuidle_use_osi) + pd->power_off = sbi_cpuidle_pd_power_off; + else + pd->flags |= GENPD_FLAG_ALWAYS_ON; + + /* Use governor for CPU PM domains if it has some states to manage. */ + pd_gov = state_count > 0 ? &pm_domain_cpu_gov : NULL; + + ret = pm_genpd_init(pd, pd_gov, false); + if (ret) + goto free_pd_prov; + + ret = of_genpd_add_provider_simple(np, pd); + if (ret) + goto remove_pd; + + pd_provider->node = of_node_get(np); + list_add(&pd_provider->link, &sbi_pd_providers); + + pr_debug("init PM domain %s\n", pd->name); + return 0; + +remove_pd: + pm_genpd_remove(pd); +free_pd_prov: + kfree(pd_provider); +free_pd: + dt_idle_pd_free(pd); +out: + pr_err("failed to init PM domain ret=%d %pOF\n", ret, np); + return ret; +} + +static void sbi_pd_remove(void) +{ + struct sbi_pd_provider *pd_provider, *it; + struct generic_pm_domain *genpd; + + list_for_each_entry_safe(pd_provider, it, &sbi_pd_providers, link) { + of_genpd_del_provider(pd_provider->node); + + genpd = of_genpd_remove_last(pd_provider->node); + if (!IS_ERR(genpd)) + kfree(genpd); + + of_node_put(pd_provider->node); + list_del(&pd_provider->link); + kfree(pd_provider); + } +} + +static int sbi_genpd_probe(struct device_node *np) +{ + struct device_node *node; + int ret = 0, pd_count = 0; + + if (!np) + return -ENODEV; + + /* + * Parse child nodes for the "#power-domain-cells" property and + * initialize a genpd/genpd-of-provider pair when it's found. + */ + for_each_child_of_node(np, node) { + if (!of_find_property(node, "#power-domain-cells", NULL)) + continue; + + ret = sbi_pd_init(node); + if (ret) + goto put_node; + + pd_count++; + } + + /* Bail out if not using the hierarchical CPU topology. */ + if (!pd_count) + goto no_pd; + + /* Link genpd masters/subdomains to model the CPU topology. */ + ret = dt_idle_pd_init_topology(np); + if (ret) + goto remove_pd; + + return 0; + +put_node: + of_node_put(node); +remove_pd: + sbi_pd_remove(); + pr_err("failed to create CPU PM domains ret=%d\n", ret); +no_pd: + return ret; +} + +#else + +static inline int sbi_genpd_probe(struct device_node *np) +{ + return 0; +} + +#endif + +static int sbi_cpuidle_probe(struct platform_device *pdev) +{ + int cpu, ret; + struct cpuidle_driver *drv; + struct cpuidle_device *dev; + struct device_node *np, *pds_node; + + /* Detect OSI support based on CPU DT nodes */ + sbi_cpuidle_use_osi = true; + for_each_possible_cpu(cpu) { + np = of_cpu_device_node_get(cpu); + if (np && + of_find_property(np, "power-domains", NULL) && + of_find_property(np, "power-domain-names", NULL)) { + continue; + } else { + sbi_cpuidle_use_osi = false; + break; + } + } + + /* Populate generic power domains from DT nodes */ + pds_node = of_find_node_by_path("/cpus/power-domains"); + if (pds_node) { + ret = sbi_genpd_probe(pds_node); + of_node_put(pds_node); + if (ret) + return ret; + } + + /* Initialize CPU idle driver for each CPU */ + for_each_possible_cpu(cpu) { + ret = sbi_cpuidle_init_cpu(&pdev->dev, cpu); + if (ret) { + pr_debug("HART%ld: idle driver init failed\n", + cpuid_to_hartid_map(cpu)); + goto out_fail; + } + } + + /* Setup CPU hotplut notifiers */ + sbi_idle_init_cpuhp(); + + pr_info("idle driver registered for all CPUs\n"); + + return 0; + +out_fail: + while (--cpu >= 0) { + dev = per_cpu(cpuidle_devices, cpu); + drv = cpuidle_get_cpu_driver(dev); + cpuidle_unregister(drv); + sbi_cpuidle_deinit_cpu(cpu); + } + + return ret; +} + +static struct platform_driver sbi_cpuidle_driver = { + .probe = sbi_cpuidle_probe, + .driver = { + .name = "sbi-cpuidle", + .sync_state = sbi_cpuidle_domain_sync_state, + }, +}; + +static int __init sbi_cpuidle_init(void) +{ + int ret; + struct platform_device *pdev; + + /* + * The SBI HSM suspend function is only available when: + * 1) SBI version is 0.3 or higher + * 2) SBI HSM extension is available + */ + if ((sbi_spec_version < sbi_mk_version(0, 3)) || + sbi_probe_extension(SBI_EXT_HSM) <= 0) { + pr_info("HSM suspend not available\n"); + return 0; + } + + ret = platform_driver_register(&sbi_cpuidle_driver); + if (ret) + return ret; + + pdev = platform_device_register_simple("sbi-cpuidle", + -1, NULL, 0); + if (IS_ERR(pdev)) { + platform_driver_unregister(&sbi_cpuidle_driver); + return PTR_ERR(pdev); + } + + return 0; +} +device_initcall(sbi_cpuidle_init); From patchwork Wed Jun 2 11:23:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 452722 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=-16.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT 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 0C718C47096 for ; Wed, 2 Jun 2021 11:24:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ECD9F6100B for ; Wed, 2 Jun 2021 11:24:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232144AbhFBL0X (ORCPT ); Wed, 2 Jun 2021 07:26:23 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:27647 "EHLO esa1.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232169AbhFBL0T (ORCPT ); Wed, 2 Jun 2021 07:26:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1622633077; x=1654169077; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=1uLrgPfppmFH2vM6/L/JqMHBvAu4tkt7ZHOK+EuhRKU=; b=mITV/XyaSq6O4a9XOCrBn/mw9mlKiwBEdWqJcghCy2tu2WWGmw6qITtG Z6fY8+W7ZRd0L7cKxIIQKi6njZuv5zwnEwGpySOWv1FvVcgYf+gD1ISEH NKxMxabvZHecGwZQfWrlgmuKCELlbCX3Lg9PmtMVnzSD53UtfRQe+v8ra dGJFh0gO5bks/KzO/StT3DG2xAfhuIU8WdEbGc94xvsYStP9sonKb6OJG 43ib6+3l9ClGjFdjRnVmN/i3wpQ7F+xKre3LoSf4y/gH3AznoOP8g01U9 38tC6OB2M/zvqGLjg0RXLTgNuVQ0y1Vpfc8L09O7H+ymDuTcrCsGVKGM3 g==; IronPort-SDR: etfxiaSgzIO/DfEo1H3PVrltS0flITHztoPp4IZMr0lb5B1cqPP6k/ZX4wr6DWfU6EvG+Dm7II JUAxL5WirOYHNANYhH5r9G0ZnaxdKab55iZR+Cj1kM33gAulD1tPRDfIeBm14UDe3kwh0nZbDf NfkCh9bIuSDS8Dj4xlqwkKBO0FDNoic78D3XJEIkqiZeNaXP1CQwF+JinIo3Vod1wPZWBj1iyf YN2scG3VHKAQwytd31ASKXecNtiOpwrms2WrXjMO9Luipq+z25UrkA3kjKpKsx525eaosgvNcm vxk= X-IronPort-AV: E=Sophos;i="5.83,242,1616428800"; d="scan'208";a="281803690" Received: from mail-bn8nam08lp2046.outbound.protection.outlook.com (HELO NAM04-BN8-obe.outbound.protection.outlook.com) ([104.47.74.46]) by ob1.hgst.iphmx.com with ESMTP; 02 Jun 2021 19:24:34 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fgTi4cQncSvrxs4rzFpnYuFKwvl9lNBc+V8+HXn2RXLSpCFsR2dbBFUO4ROC6RllwfTLTiDviA0/57hXoxxnJs6SWullqLOlPx3M6O2HocRRxQ9Qrke3W17RZWdXgCEJEindgGfF7Wtk4CndzD72IZnjd1+UrnjorobR9vpDDfPRXvh653K1AocfShrj1XDNx7oM7mVxF4nMbdVirbdPeM2CuUBbe6y3ww7QH1bwQ5NeOsOrijCKy37uaw6g23GzS2fMtVOI1VgX8W/3500HYsJLfW049oJMpS2dfXbu1e54cCT+Itz8R+X3T0YrWoTShRPBl6/tcrWrmSl+wywK/g== 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=rip7XFR0BFk/jcVrblzy2OjHhUZycRZYHU6/NmyDcb8=; b=MuQuxOECPdfY9y9cEIv3MUDLtAcHj6TC+1f4D2ZYIW6xUjzHD8FXHW+ELXgWwDgxnHK3uzUO+7hC+c72//+mgfyMGLCgjoYi9zegIHOWW0tjK2IRHBMkSzQNNUAaVcMQw4PKK5tJfyZk4/6asAZjAE7RqduRxx1a8JBxR0WOBmJSDaWKGkiVWTAyI11c4f6xmZQwXhgD1MmIx8f3wK2EM23CrJJOVyS9pssNO6bSkjm/bz5X2fJdPNlJtz5t+wbw3UGLMG4YQDkFErjNw1moU6fHW3e5HH0fJwDeaUuaTE+EzP7ungDoUP2Fy3A1VJIf278+fccWKXgb/8p65aiEKw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wdc.com; dmarc=pass action=none header.from=wdc.com; dkim=pass header.d=wdc.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector2-sharedspace-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rip7XFR0BFk/jcVrblzy2OjHhUZycRZYHU6/NmyDcb8=; b=bv2ykx495AZ6Tl/Zq9h125bTIQ6N0rA3sX4S/hLs9oWW6n7D6dHA76+mBsN1R2/OP+tvG9PutarIL1rsPeupIYIhPm5WmDsMIXF7mJUFf2I1SLJlxg6C+EGblo6kxdxV5249li6JewSKHG/5neIe78uNPh0BOYhVw683KZPFmrU= Authentication-Results: dabbelt.com; dkim=none (message not signed) header.d=none; dabbelt.com; dmarc=none action=none header.from=wdc.com; Received: from CO6PR04MB7812.namprd04.prod.outlook.com (2603:10b6:303:138::6) by CO6PR04MB7747.namprd04.prod.outlook.com (2603:10b6:5:35b::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4173.20; Wed, 2 Jun 2021 11:24:33 +0000 Received: from CO6PR04MB7812.namprd04.prod.outlook.com ([fe80::a153:b7f8:c87f:89f8]) by CO6PR04MB7812.namprd04.prod.outlook.com ([fe80::a153:b7f8:c87f:89f8%8]) with mapi id 15.20.4195.021; Wed, 2 Jun 2021 11:24:33 +0000 From: Anup Patel To: Palmer Dabbelt , Palmer Dabbelt , Paul Walmsley , Albert Ou , Daniel Lezcano , Ulf Hansson , "Rafael J . Wysocki" , Pavel Machek , Rob Herring Cc: Sandeep Tripathy , Atish Patra , Alistair Francis , Liush , Anup Patel , devicetree@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Anup Patel Subject: [PATCH v5 8/8] RISC-V: Enable RISC-V SBI CPU Idle driver for QEMU virt machine Date: Wed, 2 Jun 2021 16:53:21 +0530 Message-Id: <20210602112321.2241566-9-anup.patel@wdc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210602112321.2241566-1-anup.patel@wdc.com> References: <20210602112321.2241566-1-anup.patel@wdc.com> X-Originating-IP: [122.179.70.115] X-ClientProxiedBy: MAXPR01CA0098.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:5d::16) To CO6PR04MB7812.namprd04.prod.outlook.com (2603:10b6:303:138::6) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from wdc.com (122.179.70.115) by MAXPR01CA0098.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:5d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4173.20 via Frontend Transport; Wed, 2 Jun 2021 11:24:28 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 860ad3d8-7a80-4f86-eb4d-08d925b8fee0 X-MS-TrafficTypeDiagnostic: CO6PR04MB7747: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: WDCIPOUTBOUND: EOP-TRUE X-MS-Oob-TLC-OOBClassifiers: OLM:849; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cFWz8SXSTrDXa4sO9fqiZ7xX9bONDemirVBedKj0QT1SG2F4pl8O9cfce/Op0E33vr4UBbp0PH+asSCVP68WMyxT9g2PxU0Y1F+Trm+2euG1lpy5L+OVADoP+JWudU87WBBdwDkxMp40feKochAcv27WPsmzasT62YCkv6qVzGduEIhr86ZdlHFJ8SF7WZwAfS6nlXfp+8UVChQ+3mzOlZwgzg9i2VdTQ/K9wbxTvn+HRHbxcPhGagi//9cS7UQ+XFZYU4FPaXAatrOsr47VMN2N1vtnnrnz7rqpM3EcbW38ad6tP518Pw2Yw88RumgRSv+tpPS+tnbfHd/h4qxk9zDTlzzSy/JISk8uDzRADOUOn6mK/k7TfAWO8YEH8fY8q7aRBfv9NdE7aNZdwABQ1VLN5BClmKUMLIxahQJmHAx2zC75BQ8Kpkq+py9GS7PFBlRNWy/6y0inb4EMa1q1SWHKShRc/1JYD+5YzonZ9uzTwZsCzMYEqSo8//HEZZHrGFPxrXgDdq9yoN7gnNDPTAXtOp9GXytj0Zi0dXopbTHJcrx1blxp0sm0kvPvHHFsmxXfqRqrbjj934ayzAqoLcEhDGcxP3KX6S3gDrxR1uIhNmtAEiLHfOkpCDFiey7v9ECWYsxwodcJjE4M2ONGhQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:CO6PR04MB7812.namprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(136003)(346002)(39860400002)(396003)(376002)(366004)(52116002)(7696005)(36756003)(8936002)(86362001)(38100700002)(6666004)(66476007)(55016002)(110136005)(316002)(54906003)(26005)(4326008)(956004)(44832011)(1076003)(2616005)(8886007)(478600001)(186003)(16526019)(7416002)(66946007)(5660300002)(8676002)(38350700002)(2906002)(66556008); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: Z6m+GNnltHP2hMIdwnULQAVEa41+FlZhQVhoZ1VLsIVvcY6HpdF6KhtFdB/Cm+/1tXbZYzknbhsSGemwD3wxBsGuT3uUzN7bbnNQG5RLkynOvCGajNeyUchS23fUKE1Qbbl5JnYOCEf6shzP7xTuqFyw2pJQ7pEHk4dlqmaChJj+dh2a2GdMP5YHOQAw6qyghXGt4hCCgrGp6ZV5+R9bNOAyEaG/qTanjIZQYIrpRVQ0lpEiffOuJSNJNyUJZf95l+6+y3sA5REsfkOYjJw+UFpYUHu9Mwm0fE2hcCLoAskhXskaAvnYZlyxPOrjSl9UxXdBYmYlYf96xCCxntT5OJ5dQZssiYFqxbEADO2Iw4UM61AyPNDNvfh3L1kqRH6qqY3UBvSY5zDVbiCJZ3MqXh0iRxlfznRuHI/RnNV9O8Rogai3H1QXixwY0lE9ZthUA5dFDtuiOlpDFCI794BM4HyXANV9h0OZq3pdKTMMaD2xE6LSuTd97+oxn0HphcxT0XMEHEGO0Jb08sQ3xwdPvLTYGEC0YBvquE+qyMyQO4V2mYKcVd5XhNgObCmJnStaT8EAxFnDbDMgiMGVS46vnEkjhsWhitI6WSZ452x8Vb/Xdmtk9Xp3Z3BWjE1MtijwgaU8l7OjQtNNMWowQU2jRN5MUWgHGreqs7eWxX2EWAUY8FDmjP5LH+FT+daAE1+Yy7L7T8hgneoyqlrzOxY+zh4o24HamlYH4TTXZcQk1dphKLdwjWZV4tmigvlljlEudyBpgKAiv/FsXLl+ctzzHhi96cZXzPoJH83PlwAGRvOPWu+XzK1emGSX2viJnpO4qeMFDftBlAWNWMU0mzNEKkjeBLXJ0zbxJYdIeq4lbfcZMdfyrzL0KV6v+dKHKpATsEPQze3DpjFJmzVyFSZMMXOElhqU00WIAGSRWQSZwJmayRprc8zBJvptTB7PY8Be9XR2l3B9djFvuRTDJIetB3fw59/NWto+m8HzbvY2hj/vl0KunXVqTOrKnHk5gXn8HdIvMa+v4eVl+acl9zPRgtj3pUblPrRoAP+7shr4YYunJ5xd6YX60HaGd2ZKvjkkqkVFAP3kVJSVmTnwKzfIHZOdN/fhy5bN/1eIVQzuwHocLVoz5GenbVn66XUaqYkJUukgTGhe+1wYSBwuYEOGFhrq77EnSwE7ChdRToCdH8iul169vC22KhFfoB+xKmXuC0IAxF5QfT8HbkBqmJSA3iSXACyNPMNLXTV+hPvOjALH4XyLfvEWYb23F87CfdLVs6X3h6g9xhuDaN/EuKjklBsRP2DupuVCMvJgBX3wZSy8ETNQBfVTc0QUdaQ8chAN X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 860ad3d8-7a80-4f86-eb4d-08d925b8fee0 X-MS-Exchange-CrossTenant-AuthSource: CO6PR04MB7812.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2021 11:24:33.1373 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: pgM7tQR/WhvJHE99shpyySM+rYGA2d/3Fw5QU/NWCAqRbyoZ1efOFOx17jXAO0Si0NvceLtziZPgfsmc+gE7Fg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR04MB7747 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org We enable RISC-V SBI CPU Idle driver for QEMU virt machine to test SBI HSM Supend on QEMU. Signed-off-by: Anup Patel --- arch/riscv/Kconfig.socs | 3 +++ arch/riscv/configs/defconfig | 1 + arch/riscv/configs/rv32_defconfig | 1 + 3 files changed, 5 insertions(+) diff --git a/arch/riscv/Kconfig.socs b/arch/riscv/Kconfig.socs index ed963761fbd2..3ae937121a77 100644 --- a/arch/riscv/Kconfig.socs +++ b/arch/riscv/Kconfig.socs @@ -27,6 +27,9 @@ config SOC_VIRT select GOLDFISH select RTC_DRV_GOLDFISH if RTC_CLASS select SIFIVE_PLIC + select PM_GENERIC_DOMAINS if PM + select PM_GENERIC_DOMAINS_OF if PM && OF + select RISCV_SBI_CPUIDLE if CPU_IDLE help This enables support for QEMU Virt Machine. diff --git a/arch/riscv/configs/defconfig b/arch/riscv/configs/defconfig index 57a24d40d43f..ed71f125cbc9 100644 --- a/arch/riscv/configs/defconfig +++ b/arch/riscv/configs/defconfig @@ -20,6 +20,7 @@ CONFIG_SOC_SIFIVE=y CONFIG_SOC_VIRT=y CONFIG_SMP=y CONFIG_HOTPLUG_CPU=y +CONFIG_PM=y CONFIG_CPU_IDLE=y CONFIG_JUMP_LABEL=y CONFIG_MODULES=y diff --git a/arch/riscv/configs/rv32_defconfig b/arch/riscv/configs/rv32_defconfig index 97d899df2445..0088d6989332 100644 --- a/arch/riscv/configs/rv32_defconfig +++ b/arch/riscv/configs/rv32_defconfig @@ -20,6 +20,7 @@ CONFIG_SOC_VIRT=y CONFIG_ARCH_RV32I=y CONFIG_SMP=y CONFIG_HOTPLUG_CPU=y +CONFIG_PM=y CONFIG_CPU_IDLE=y CONFIG_JUMP_LABEL=y CONFIG_MODULES=y