From patchwork Mon Mar 15 11:04:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 12138931 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=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, 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,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 1F56EC433E0 for ; Mon, 15 Mar 2021 11:06:53 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 933FC64E77 for ; Mon, 15 Mar 2021 11:06:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 933FC64E77 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=zAGJVqiOkcuy7zz9ZAiefuT68M0Fw1vU//UB+hJuvFQ=; b=qI0P8+Qy6/615UfLwhs+Zj+oM Tj39idteY9mcLrKivLHSTR+69ssj8LJEsc3U95z/MJvF6+rhUJVNJK+WOZWXg2RUX5nSn+rZ2fc6A 35v++IwJgU2sMh5qUSspFrbqTBYhhxuiUFywr2n4Jm6spqq0jZK8qhSLl+l+md0JOecivts9FCKTY achyDUqGOEbfPCHZ9zQ9tgcy0YmFMVi3ytx9rOGCgXW7eZBVt3Ieq4DT+2MmLWq1Avn6FWTBR0ck9 bu2UMY2QRL8yOROFKaNb0Pz2b98D/Y7kwimzVI53jDtqIlPdT1dD1/Yk0bQW83zIlwlDjKtVzbXj1 OwlR4z1mw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lLl3P-00FcBO-TY; Mon, 15 Mar 2021 11:06:32 +0000 Received: from esa5.hgst.iphmx.com ([216.71.153.144]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lLl2j-00Fc1V-5k for linux-riscv@lists.infradead.org; Mon, 15 Mar 2021 11:06:02 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1615806349; x=1647342349; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=kTz65dXJEj+9htZ8c+7p8tdsqRWsoDmQvV/nAB/vatI=; b=aYftIZkaWgUtQ4PT7OgYaePy1g3d7u1Ea32tdclc1ierr2bmdp30AciZ hKNRFfL4wEmie1boCrtcpgycfeKT/S45P/rTo6vS4firAH7NlVtYTXDxb 1ieGpbL6NMiJIdU1jeNdy9iQEIuoCWoh9tvgLFTaIjUQCPAw+O7M+0Q2C n+IJYygzy/uOPNnI/MnbEoao+LDxfuwxOLPFIsBxwtYjEK33KUTH3Gp5Z P4pVmKex/E9V+dSSKTNJM0KH+2lx1J+7kasPIQZ4h4HVFL0gLqGr53Eci tEgTNUPLTVviLlhPq/8ILuGmHRy6hdqlihzYIGrSY9SY5ar51wB9Z7joD Q==; IronPort-SDR: Jq6tnqfLSwh17UYcfJOGEKr3YKH01nK7/YgtxrgtQrCEaCKp57o3ryv4OV4PiYvUIMHS3X5RGK oIuNU0S2EYGQZuDoGImEfa8JR7VTS5fSvtG/va3pQRR8ED60H9gl2YLiqReAcFT/TruoZmEhog H9HS7vIlI/os5J2dG5l5vX3RIdFGGrpKflh0nTmkOJC5nP7k5d0KHiE7IRM88dcvtkWF16S9TI 4/3tanqJ/1OWABWizzzP/sUPf9kGXTI5pIAW2LyUivCpGA+1Hg6VD20hA+ax5Ko1ROzrs6NOzk bM8= X-IronPort-AV: E=Sophos;i="5.81,249,1610380800"; d="scan'208";a="162172826" Received: from mail-dm6nam10lp2104.outbound.protection.outlook.com (HELO NAM10-DM6-obe.outbound.protection.outlook.com) ([104.47.58.104]) by ob1.hgst.iphmx.com with ESMTP; 15 Mar 2021 19:05:37 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cH04RCchABeFdT8UbNcNGjW6i0y5x8RUNfG/gclsmN/7B6yPblT/bc+fPITpt4zytIWRz0VYJ5Yv9AColwEPksgmsMJivT94dqOBB66wCdMZ/FbNc5uSe5xoQrKhLHv8AFEl/e+CBwXKasodSj/dKxZNiWNIHgYdqI6GLdxbe6Zz4fPqbGjSmoKV9QhHhQYfJF5bDzoHa6n2T2yfHwlHqLUkaMEQVZPfH9Cz3vdDpR5Cs2XeX/Zb/fdTVxzUm3LitIR38fxqexGPtKO/kR+L6TCoWgIRp+0A4zCK6qfkR3NkKFINexRAHaKL7ibM5bdJiHmPAz8GfNQeiQOydmrjSA== 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=LBNtY1iWybFvnC1RPj74pXBDFxBhB6+zIHg/7rjTJTA=; b=If2YfDBDkMeNr1ajYcY/N1ouxe3+sCTxbbV532m8Aw60s0OiCbNK8bV0TpcBVHCB8AYpI5DepXr8Kn+Hw5Xc/LtOB5+73+2Y8aGGqzEVn+VUf42tmA520Z2VrNggeexYFnxfrHipcPLC9vX0ov2Hjrxg6Mt8TekfGprd7DNALwkSal4taTtGfa7kU1wXTGEVDQGxZT7Ua95olsbb+YsyRLQoO0cUOBOv40UBsAUelsE0TK3RpDujqXgjO9wsMw3BPIfQPHn7GTzxaJcPqL8mU78ii9YAsQVGKlPeOeQURL7Ym6351qwpsL7S1qH3UGg6qF1N4dE/nCD/FH+/8d6aQQ== 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=LBNtY1iWybFvnC1RPj74pXBDFxBhB6+zIHg/7rjTJTA=; b=I8Km08uDV5h2FjBzgyplRku2HWSe8i4X8ok3cUn2h3tA7eTH1GAcWs2dMyPvrimiHjCq9qzG2PN2a26Cw7AaTDQv7XDOq47SmGkiHbgqHWmK6Kk/zeFJ+k9bM2UzArERYTF81I5EfndwYfj1RGHRkfTIFvGtBS3ekzpAE9sGWxo= Authentication-Results: dabbelt.com; dkim=none (message not signed) header.d=none;dabbelt.com; dmarc=none action=none header.from=wdc.com; Received: from DM6PR04MB6201.namprd04.prod.outlook.com (2603:10b6:5:127::32) by DM6PR04MB5547.namprd04.prod.outlook.com (2603:10b6:5:121::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.32; Mon, 15 Mar 2021 11:05:36 +0000 Received: from DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::38c0:cc46:192b:1868]) by DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::38c0:cc46:192b:1868%7]) with mapi id 15.20.3933.032; Mon, 15 Mar 2021 11:05:36 +0000 From: Anup Patel To: Palmer Dabbelt , Palmer Dabbelt , Paul Walmsley , Albert Ou Cc: Atish Patra , Alistair Francis , Anup Patel , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Anup Patel Subject: [PATCH v6 1/2] RISC-V: Don't print SBI version for all detected extensions Date: Mon, 15 Mar 2021 16:34:59 +0530 Message-Id: <20210315110500.802897-2-anup.patel@wdc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210315110500.802897-1-anup.patel@wdc.com> References: <20210315110500.802897-1-anup.patel@wdc.com> X-Originating-IP: [122.167.33.244] X-ClientProxiedBy: MAXPR01CA0097.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:5d::15) To DM6PR04MB6201.namprd04.prod.outlook.com (2603:10b6:5:127::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from wdc.com (122.167.33.244) by MAXPR01CA0097.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:5d::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.31 via Frontend Transport; Mon, 15 Mar 2021 11:05:32 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 6b9c3ccd-da4f-470a-600d-08d8e7a24282 X-MS-TrafficTypeDiagnostic: DM6PR04MB5547: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: WDCIPOUTBOUND: EOP-TRUE X-MS-Oob-TLC-OOBClassifiers: OLM:3044; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aVvzab03OdnSuLUy9DBPb50Hys8Zp1CMLZK1bO4t/xrfmDYQgRenMBqJvfd0jec1C6Mot0E98AClmCo3TzHALLu0rGwY3L5Rb4i2vZh+jUq2xGhj6NjfpoQMuZzGLZZKLRksp7w8z6wg3kecdG54rZZSXMx/hR8ViwKqvYjte73xNpcA4Pu4OA6f+6/scHXVZCHHVzdcF5rkp0VNemhfPIXNou4gno+FHPLD4xbGLTQlndX2TAQadgyV4mNbfRJ3mZuzOj7ervtse2yQUm+GpJ7Rb9JMp77Ev5caG1FewtDP9QEU3AeOXj4d0pH/8PEVRYtZKrB+ZGvvYxOpt9/bCxNXfR7C6IIPRHa1I/EPXXr8TC/AyVsVUugMWMakA1C0M3Yprjyx5+uWBLnajK0IRUEcyVJXlcSSDTyGbZBsli7iGuei05Knkzpr7AHtYUm+3L3eGFYSs6+KapZ5x2DKCQc6cxYQV/146FztSX6YlzSATIqlztQQ5TtcpquIOuc8lfPWsF4BT+r3A5MSTJ0Te+BvJLMyrVrZrQj6hIhWLyJu49CXbzuudUmrXdfSRnE7 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM6PR04MB6201.namprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(39860400002)(136003)(376002)(346002)(396003)(52116002)(4326008)(5660300002)(2906002)(8886007)(83380400001)(66556008)(66476007)(86362001)(54906003)(956004)(478600001)(2616005)(316002)(110136005)(26005)(16526019)(186003)(1076003)(8676002)(7696005)(8936002)(6666004)(55016002)(44832011)(66946007)(36756003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: /si83BIab9aP/tC3v4FLtIwreDcrBRPoaMLKMBTFcPjmRuh580K/spkfgSw0emQq/2SGM09I+BKUNkNsXfq68jAmHil/Nb4JeTykK7LAUGeTZY/MkODb2q+cU4S6PJ6MNZHyQJHpdaelFWP3fuKWmthl0gNVYPePAey/9R1hwSrB0u7aEWKe+MR5HZQjYyIpxOLaSpk07Af/ZDC8dF/TLD91K8wGrPKRGBLOEbqc4Es8eE/nGHPyuOV+9iCvBND1zpVYPlLDSRI12BpC/D6jngO3G4FuJGml7oYq9t0YTSsx5lUWPtQRfKcmdMy+fB2mUXB4pZ9Ityb7z+x1J/8UDgwUZg43XtovKis/p7tqVwohcqJiSomonzUuTRAIFErpXOYr97KmWZmgtIDU2XOL1QuEk0+Ku8fuT7+sR1l0WzIKTlhgt7KCbRjH5Dy8azWjcIqFAUYApOPkbm+pd9V+yY2Frlwe9L7eLDwX5s6fuZtae9rMnZ0C8Ndnkhq6Gr/mqxz0o4nCH4X3WW5C5VNYR/GZXQO/iQXZFGLuTd5yNFZnLLOMNpSrXZzwObCk5QPQ6g/rMTPXsrqAvfnKs4nNrW/mZt62aW1izZynuJj3FkqXbHH73D4zMfOVUhGl8s7kD3Ns7cG9vQBez+CbUpSDg2ki8T3Snaez0JXezgTcFPpcN7T4GDCt3xD/sdiMKORV/AHxRN9bDXW00ixF3oyj9heQE9Cm9d1PnacZvqVZagkR1pIilT07ACOAmN+JSPK++cQlqAWb5jSjV3dL05tCFW4IhnY/PkvhnlDr6Rpai6JqYY/Y8ZCDXiW/FTwQ8xzKqUn9nV3heVfzKB7WGfAEedwobVsSZxwSCwN+5ot2XgE1V3RoheWnGTJ4hmfzrKhhI5zdHxFAn9v1P55ZwRQDqCBk5tkdJZK4hshSG42pI1XF5XUyVaJO/jDkCExf+T7+oNruDIgVwNeyqTFP4my6l73Fwf3dIO9Oh++JY37E3gkOWRrCeFchC4jHh5JM7I380Jj3VIQmF1oA34lfLeA0qZHJTHBV0QJXpfv1+ptVU2Ksyx9sYtPkYY12oXJW5ePT4hf6RJWnKYb+X0H9q0nHXv/OkLw0dAaawhSg0FTNzfhdplwfvzN7pG/slFxOz6hHchavpkYoeOKWUlMyjQf0P8Cn0El//JqAnrLPiakc+DElSd02gdEmyduc1M2rdP08wGelql0PdfQSNTATWvxrXAtS2nI18t0X5dBEbeDslr+v70/3rXLxByPKhE3yPdr6+k4jCc18oAjDeq1q6ADo00Se6Bzz9G12LcEULivvuepFHhAALfilGYb5qGEQy906 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6b9c3ccd-da4f-470a-600d-08d8e7a24282 X-MS-Exchange-CrossTenant-AuthSource: DM6PR04MB6201.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Mar 2021 11:05:36.3101 (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: F7redtTkG0jqeYtfX/jCEkVRbcX+/cqOoWtnN11M7XFagajSpsdj8EVGAsHwX4m7fQVYjKN1f5Fm9BpdOZXjlg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR04MB5547 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210315_110550_319233_AD66B64F X-CRM114-Status: GOOD ( 11.90 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org The sbi_init() already prints SBI version before detecting various SBI extensions so we don't need to print SBI version for all detected SBI extensions. Signed-off-by: Anup Patel Reviewed-by: Atish Patra --- arch/riscv/kernel/sbi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/riscv/kernel/sbi.c b/arch/riscv/kernel/sbi.c index f4a7db3d309e..c0dcebdd30ec 100644 --- a/arch/riscv/kernel/sbi.c +++ b/arch/riscv/kernel/sbi.c @@ -577,19 +577,19 @@ void __init sbi_init(void) sbi_get_firmware_id(), sbi_get_firmware_version()); if (sbi_probe_extension(SBI_EXT_TIME) > 0) { __sbi_set_timer = __sbi_set_timer_v02; - pr_info("SBI v0.2 TIME extension detected\n"); + pr_info("SBI TIME extension detected\n"); } else { __sbi_set_timer = __sbi_set_timer_v01; } if (sbi_probe_extension(SBI_EXT_IPI) > 0) { __sbi_send_ipi = __sbi_send_ipi_v02; - pr_info("SBI v0.2 IPI extension detected\n"); + pr_info("SBI IPI extension detected\n"); } else { __sbi_send_ipi = __sbi_send_ipi_v01; } if (sbi_probe_extension(SBI_EXT_RFENCE) > 0) { __sbi_rfence = __sbi_rfence_v02; - pr_info("SBI v0.2 RFENCE extension detected\n"); + pr_info("SBI RFENCE extension detected\n"); } else { __sbi_rfence = __sbi_rfence_v01; } From patchwork Mon Mar 15 11:05:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 12138929 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=-22.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,MSGID_FROM_MTA_HEADER, SPF_HELO_NONE,SPF_PASS,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 71ACBC433E0 for ; Mon, 15 Mar 2021 11:06:37 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E8F6064E83 for ; Mon, 15 Mar 2021 11:06:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E8F6064E83 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=oi/BC9ltZtFZiUnvp4Jl3LJAxpwCORO/USWZxsv4gnQ=; b=XJLHAlyZ2PWOFZ+4DzwROvOSh NDYosu1wgSM/RAaWaz/GMoF4XZi2kQrfWO1yhOsX/AhbhgsIhxIRTjv5ifLUWS5oWLy/+wFcTR4YU 3/2Cm9yXBPFKwn5gOeUBa2n8tWvUjmfwUxtgbsQF2BjtvudSjV3qt6Ggjj4JtSBa+YRVowMYqKyuu uN3M70NrEYI6KYSIVOYOrTMCkhW94sDCynfNg9ULGPb7touIDXXjuLN30s4Oxv+WBjXAY3Rgf6/Bd Lwxp/1YqJmuHHMZ0/KhKxTMM10q3SQHuYxDKeBHxHK3JRdoLpI3KJDbwx+6NrCEy6vy3Olh17YONo I70blsafw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lLl3B-00Fc8Q-AM; Mon, 15 Mar 2021 11:06:17 +0000 Received: from esa1.hgst.iphmx.com ([68.232.141.245]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lLl2j-00Fc1f-G3 for linux-riscv@lists.infradead.org; Mon, 15 Mar 2021 11:06:02 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1615806349; x=1647342349; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=VZDGJHELxc/n0w1YeJQb8xI0tWC1a0JU7XIaRnsnBE0=; b=mXNsMXLDD7DYkXBX4kstLo+pq1v644Nzp/WXZ6DIvLsEP//Pr5xMIMmv h8bLOgXi1gBaF9UNAulQb+3g+UZQynRKg1MbAy0kN/tadSU41hCDe/Lyd CHM8T10E63nrLrtvksGB6byIxGLEjx9RFgl1mIjhwkLGkw0TeAIARPuYR 8fznHokUKn5fRzxxYCaDHmk0kmjjWYmSDgk0hTBxhOKZCtDNxwu9DTazb MkM1UFA+oqfK5UaJqaBzQwEuN2/7A1SsTPEgPEv0U4YCrqc/F2E0m3TNd buW4w6AJW9QA0KkAMYvdT8Avcnwlari2XocmSI8dexAUpOWSViFYdyY7E A==; IronPort-SDR: 1riDs+MmEhEF8cpADASo5HQVptE/ZQSREWy/jLxM0u95G5xkHD2DmuDsmzYgDJHaDaALUL70C1 psnvYOUo3nwPtbuzlOQZLKOXI900VI5ZV+VvdGWumAXimlC2kLRBioFL+eOsTiFLYlfw4Smf/9 w5PmgzDmsbRRBCmqJ2eW5TUGAWBdYzzEjISuPRLk2Jx1sNZ1PObmBOMcoZj4qx07Brn+hcTyzP 8m9RvuL+96tN598SoRljAJyMATaj6kk20qy0UBoLIERvzrO1YQ6abQ+H5GxKnh4W2x7cAAL3dQ PoU= X-IronPort-AV: E=Sophos;i="5.81,249,1610380800"; d="scan'208";a="272873360" Received: from mail-dm6nam10lp2101.outbound.protection.outlook.com (HELO NAM10-DM6-obe.outbound.protection.outlook.com) ([104.47.58.101]) by ob1.hgst.iphmx.com with ESMTP; 15 Mar 2021 19:05:40 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O7QcwKAqXAUu07apqrPnb+NkZYaSPgHYmRbtS8t2Ves2/pmHB5JSzNN+toUHLfsBAbevMDQPLWpNn2rn0/hT0qwGm0fveSRDwD6BknwNR+EL2Or28BVXgOTYl7bTWOtyO/EYUDRHDb0crgsOnPab//gVaqWgUtdtKNEHHFj7JqLsw0xWtw2uoiQy1cfWmLcJVF3Utrq7EP+EbDNIJT4t2DrlnUqjXc6wCZRa+5fgPyTeS4hpuh3+3lngXGkYg8g2s9mmHMfA1G3k5bUqKX/2nN7W7FzwesEXJqQwbUZL4y/aaUxYzmq6lQshGdnJfRQz6uFe/BfH16tkl1UIAym7bg== 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=KNZcfE0XdA5Ur+OaLCYm8cL6uqQSxV4+/W10Q491sQA=; b=VN16JMAKqLY4mCDrZmpWcwUROzPaVjHgmdwoCT7r/4GgbIYWxefI5me7Wo+n7GXHx62oB9hVIQKRiYe60yDKfkcwIsVYAPLgadJRFzRo2X3LcLcK2AO/mjeCfMqVm8udmHDH0zvMQiuLTwHYVmvIC5E4tCdBJs4lWW3t+c+nk+pMhyjaoOuGVbRkzJnnjPPVzP+vK4QXCbAN0PXpn4SdLYWy7TUkkdRGWUVZeNCig+lz0pzu7aMR4h2yneybV64fRi6uhTpwkUsoTitRbplKo0GoFo19T9J/FnxeJXtuee+4W0wHzxf6jeNLC4SOiBQMqIZ5ZXTkXa/EmJaI9R7Pfg== 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=KNZcfE0XdA5Ur+OaLCYm8cL6uqQSxV4+/W10Q491sQA=; b=fUVsdz05grz7Bp/suGRaKYC+vWVZYHfmxAnE5TGif+YvmPsmeK7dM1S7UErohCpLSnXmaJp2FFD/lsk+CCv0zsCH9uXxxf3Ozm/sCI7veyWyLr6kIvc6bJh33QK8NK08lHrRfOxlXc1brYH+c1ahP4UGET4sqn2JtKckwsd1u0U= Authentication-Results: dabbelt.com; dkim=none (message not signed) header.d=none;dabbelt.com; dmarc=none action=none header.from=wdc.com; Received: from DM6PR04MB6201.namprd04.prod.outlook.com (2603:10b6:5:127::32) by DM6PR04MB5547.namprd04.prod.outlook.com (2603:10b6:5:121::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.32; Mon, 15 Mar 2021 11:05:40 +0000 Received: from DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::38c0:cc46:192b:1868]) by DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::38c0:cc46:192b:1868%7]) with mapi id 15.20.3933.032; Mon, 15 Mar 2021 11:05:40 +0000 From: Anup Patel To: Palmer Dabbelt , Palmer Dabbelt , Paul Walmsley , Albert Ou Cc: Atish Patra , Alistair Francis , Anup Patel , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Anup Patel Subject: [PATCH v6 2/2] RISC-V: Use SBI SRST extension when available Date: Mon, 15 Mar 2021 16:35:00 +0530 Message-Id: <20210315110500.802897-3-anup.patel@wdc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210315110500.802897-1-anup.patel@wdc.com> References: <20210315110500.802897-1-anup.patel@wdc.com> X-Originating-IP: [122.167.33.244] X-ClientProxiedBy: MAXPR01CA0097.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:5d::15) To DM6PR04MB6201.namprd04.prod.outlook.com (2603:10b6:5:127::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from wdc.com (122.167.33.244) by MAXPR01CA0097.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:5d::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.31 via Frontend Transport; Mon, 15 Mar 2021 11:05:36 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 0cf8705a-079e-487c-482a-08d8e7a244ea X-MS-TrafficTypeDiagnostic: DM6PR04MB5547: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: WDCIPOUTBOUND: EOP-TRUE X-MS-Oob-TLC-OOBClassifiers: OLM:2887; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KMi0gkjLZuSodfwKqNZdlJWgkgkiiT9VcBRT820h8h6dDegq9JrGP+hhbca7lixrzNpsLbE3dBfbmErRGI71kshMdD60Zs3aMBV97HUFXyN4FbBSeDLW6JekJ3S4YhG8Xg3gIGAhSjiB6QNevv4ZAhoQdd+woJWThJJQ2Jn003ouQp1oMECIuZ+J6cfgjbzT2wWX6AZ2db99apaRbuxJxpsBvkoGrDDJcf6qvoDf9Q0rhtPpZfcicWoTJf2we8JutTP71cfzS2d33qcsJTm9vyb+lJJPwk/J2H8ug4SHav77zwbha7u5N595ECP3k8WOwzYdxTS0heOxf/JM3VxMUjnV7YEBzyUqUpEWzCeyhCD9qHI1hk8W33cAYgg/CErMIbWCE+jOi2DgJYD9IWmcIIYXLsnB0sDz9+n5o9aA10JlvzhH4aqnyRoPrtxKcwYT7zaaIylpucoCM/A1E5mgVaNpLWIYZIIcB91hpX6rJeHDMholXconwuV7Ddq/RSouLYmZLOAT9KDQrRIo/oodzypql3JFocbh7b96COKFhioQ7IQHPAJYkrbZ6xepmP1Vuc/dyQqncLwvBxB5wG/uHMjYTVmTNVI/lE5e7Hb1dA22Y12kvvRnJobPY3ul+TPAI7wvHIPbytSvldryGl3swQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM6PR04MB6201.namprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(39860400002)(136003)(376002)(346002)(396003)(52116002)(4326008)(5660300002)(2906002)(8886007)(83380400001)(66556008)(966005)(66476007)(86362001)(54906003)(956004)(478600001)(2616005)(316002)(110136005)(26005)(16526019)(186003)(1076003)(8676002)(7696005)(8936002)(6666004)(55016002)(44832011)(66946007)(36756003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: KsobzXqER6fDih9ho7sGjT0o4qaeLkByV6RzoM56n0OFZPcbno0Vphc4WmnJilJpPx8/Hs9xCgrvnFUiT/ssx8DdaCIimIBNo2itK8PL6EXQDkwd76vcHhZp4cTv2PFBcO+YfnMnVGQRIsLQPbH7WQuqvz3D3NU5uQC2IvRiFX/ne++QOxVxKja5H6yfYZcPC9Yle5bY5RKcW+IW5Q333SKussjiPuE6Wc/6wr9MXEb/FjVMPdsQ/zZ9Dg7PUbhOkip7r2PI4F+Xs5zqqn9OmCHzG8tyN6dbe0c8r1yvm/lJRwUh7rzEJp4XhQuaGP4axsz8/gjqVcQWLmlzi/8/1wwu2p+oXVKL1wPLq+wX+vbXE0qWDH0OSMYTu4ccjuj0BzfJ5HL/ewp/YdY0dMNHYuxRvBHuU0BZprVXQDo7KqFcc7t0bJ7Kogp4dcI1CWuEWVjfId+PIsY70LEri7gEgDi6JiY6s+YyFhIzW2RbRp3YllOb8whmL4khQUH3lKRoTOXz+uXEpXLBUdADi7/sCiQUQ29qkq+pgCJ0uveMScgfXY0csMw9C115Y4BnAVfCXGCbPLlmycMpbDtBsWU3+AGcMAOa5Ik0jAPrVfsNf3S2zQWMuQaxJmNMBWc+eBqvCFpQJpe8yhoUDM165IehKMP/3tcfQS8Ze9NSQ5CjlFXYixgH1Ew7NC3+gewe50WTUHg8YT+A6oUqFiEUN7LYup3dIIEb3FLrcvH569ykiJrEpSId3gXE6Hiuw5LJLzij3luEl/BVI+FjcshPzOhIAOR8vW+XrsmpapzVdIYlEfdzMk9Uvh5laVPZnN96YYGQGKh2btzdB+0xHeYmQ3cdBGS0NTnxYmpUJXWr4F+gt7bh/3i6DuvO8e8yRjH+3t/ueSEGy73tk7GI5IOVQbA0oEwWS94yANr0m5rgvwx0+Df78VhdU4EohmP2OBKvW+17WVH++i0dQo9+7sZm4rxkd5C3gOzUXo97rWOVlTsYi2rFiPK9cidg+gF4OK12wKyLAqtrZEMcLz6ZUP769IEWtJ1qxqeMNklWo6ICT7psVhbwTYTPMCrEfq010niCkjYdn7cN0ecP7ss9w4ABrZSQgelRL/rzM7jGDOI79l/sMdVJLxTkr1HpkVU2ztAroEvnPE2a1hV+LCdzUVl0qLr+yUzaxEBDPFCrNk69TRO/nCeL3jBYHuqTVM0MIpiAllJRnV2O+lcwA002UlXoYVx8MZpkSH1r9tBt/ba5AGrF6NU0vl6EhLEr++jqePQQG4dnYZfd3iQMhB7TdlMOxVkVRRqG5YLTq2rE3OwakUwCVHjt4ORgbGpoeV9MaLO8qyYO X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0cf8705a-079e-487c-482a-08d8e7a244ea X-MS-Exchange-CrossTenant-AuthSource: DM6PR04MB6201.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Mar 2021 11:05:40.1866 (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: xhyQPNgM7eeCVCZeyeRRHwUD3L2lyFflyUKc/AOaneYBN8KNeiFMvuyM2EnbMVHsCVBcmfgTvl8VfpVrpMgJaQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR04MB5547 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210315_110550_487475_AACFB5C2 X-CRM114-Status: GOOD ( 14.94 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org The SBI SRST extension provides a standard way to poweroff and reboot the system irrespective to whether Linux RISC-V S-mode is running natively (HS-mode) or inside Guest/VM (VS-mode). The SBI SRST extension is available in latest SBI v0.3-draft specification at: https://github.com/riscv/riscv-sbi-doc. This patch extends Linux RISC-V SBI implementation to detect and use SBI SRST extension. Signed-off-by: Anup Patel Reviewed-by: Atish Patra --- arch/riscv/include/asm/sbi.h | 24 ++++++++++++++++++++++++ arch/riscv/kernel/sbi.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/arch/riscv/include/asm/sbi.h b/arch/riscv/include/asm/sbi.h index 99895d9c3bdd..79fa9f28b786 100644 --- a/arch/riscv/include/asm/sbi.h +++ b/arch/riscv/include/asm/sbi.h @@ -27,6 +27,7 @@ enum sbi_ext_id { SBI_EXT_IPI = 0x735049, SBI_EXT_RFENCE = 0x52464E43, SBI_EXT_HSM = 0x48534D, + SBI_EXT_SRST = 0x53525354, }; enum sbi_ext_base_fid { @@ -70,6 +71,21 @@ enum sbi_hsm_hart_status { SBI_HSM_HART_STATUS_STOP_PENDING, }; +enum sbi_ext_srst_fid { + SBI_EXT_SRST_RESET = 0, +}; + +enum sbi_srst_reset_type { + SBI_SRST_RESET_TYPE_SHUTDOWN = 0, + SBI_SRST_RESET_TYPE_COLD_REBOOT, + SBI_SRST_RESET_TYPE_WARM_REBOOT, +}; + +enum sbi_srst_reset_reason { + SBI_SRST_RESET_REASON_NONE = 0, + SBI_SRST_RESET_REASON_SYS_FAILURE, +}; + #define SBI_SPEC_VERSION_DEFAULT 0x1 #define SBI_SPEC_VERSION_MAJOR_SHIFT 24 #define SBI_SPEC_VERSION_MAJOR_MASK 0x7f @@ -145,6 +161,14 @@ static inline unsigned long sbi_minor_version(void) return sbi_spec_version & SBI_SPEC_VERSION_MINOR_MASK; } +/* Make SBI version */ +static inline unsigned long sbi_mk_version(unsigned long major, + unsigned long minor) +{ + return ((major & SBI_SPEC_VERSION_MAJOR_MASK) << + SBI_SPEC_VERSION_MAJOR_SHIFT) | minor; +} + int sbi_err_map_linux_errno(int err); #else /* CONFIG_RISCV_SBI */ static inline int sbi_remote_fence_i(const unsigned long *hart_mask) { return -1; } diff --git a/arch/riscv/kernel/sbi.c b/arch/riscv/kernel/sbi.c index c0dcebdd30ec..e94ea8053984 100644 --- a/arch/riscv/kernel/sbi.c +++ b/arch/riscv/kernel/sbi.c @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -501,6 +502,32 @@ int sbi_remote_hfence_vvma_asid(const unsigned long *hart_mask, } EXPORT_SYMBOL(sbi_remote_hfence_vvma_asid); +static void sbi_srst_reset(unsigned long type, unsigned long reason) +{ + sbi_ecall(SBI_EXT_SRST, SBI_EXT_SRST_RESET, type, reason, + 0, 0, 0, 0); + pr_warn("%s: type=0x%lx reason=0x%lx failed\n", + __func__, type, reason); +} + +static int sbi_srst_reboot(struct notifier_block *this, + unsigned long mode, void *cmd) +{ + sbi_srst_reset((mode == REBOOT_WARM || mode == REBOOT_SOFT) ? + SBI_SRST_RESET_TYPE_WARM_REBOOT : + SBI_SRST_RESET_TYPE_COLD_REBOOT, + SBI_SRST_RESET_REASON_NONE); + return NOTIFY_DONE; +} + +static struct notifier_block sbi_srst_reboot_nb; + +static void sbi_srst_power_off(void) +{ + sbi_srst_reset(SBI_SRST_RESET_TYPE_SHUTDOWN, + SBI_SRST_RESET_REASON_NONE); +} + /** * sbi_probe_extension() - Check if an SBI extension ID is supported or not. * @extid: The extension ID to be probed. @@ -593,6 +620,14 @@ void __init sbi_init(void) } else { __sbi_rfence = __sbi_rfence_v01; } + if ((sbi_spec_version >= sbi_mk_version(0, 3)) && + (sbi_probe_extension(SBI_EXT_SRST) > 0)) { + pr_info("SBI SRST extension detected\n"); + pm_power_off = sbi_srst_power_off; + sbi_srst_reboot_nb.notifier_call = sbi_srst_reboot; + sbi_srst_reboot_nb.priority = 192; + register_restart_handler(&sbi_srst_reboot_nb); + } } else { __sbi_set_timer = __sbi_set_timer_v01; __sbi_send_ipi = __sbi_send_ipi_v01;