sifiveu: copy patches from 5.15 to 6.1
[openwrt/staging/jow.git] / target / linux / sifiveu / patches-6.1 / 0006-riscv-sbi-srst-support.patch
1 From mboxrd@z Thu Jan 1 00:00:00 1970
2 Return-Path: <SRS0=S+R5=LD=lists.infradead.org=linux-riscv-bounces+linux-riscv=archiver.kernel.org@kernel.org>
3 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
4 aws-us-west-2-korg-lkml-1.web.codeaurora.org
5 X-Spam-Level:
6 X-Spam-Status: No, score=-21.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH,
7 DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,
8 INCLUDES_PATCH,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,MSGID_FROM_MTA_HEADER,
9 SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable
10 autolearn_force=no version=3.4.0
11 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
12 by smtp.lore.kernel.org (Postfix) with ESMTP id 9A34CC48BCD
13 for <linux-riscv@archiver.kernel.org>; Wed, 9 Jun 2021 12:50:08 +0000 (UTC)
14 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133])
15 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
16 (No client certificate requested)
17 by mail.kernel.org (Postfix) with ESMTPS id 69795611C9
18 for <linux-riscv@archiver.kernel.org>; Wed, 9 Jun 2021 12:50:08 +0000 (UTC)
19 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 69795611C9
20 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=wdc.com
21 Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org
22 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
23 d=lists.infradead.org; s=bombadil.20210309; h=Sender:
24 Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post:
25 List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:
26 Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:
27 Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:
28 List-Owner; bh=64gRxQ9bX8C6wjLq0KuJ2lv98bQdXijt0LPnNpch3NU=; b=rgeSpoSWQ+Nca2
29 9PLsgI7dOYVdTu48CyVJStiizsvIvVFN2rBAgELHF2nRCCtoSiPMxgcpCKtDcm7sh9lC8AblCoBjN
30 LXiPRHVYJAcRNiWiQ0qOTqHdTbezFdzSjNOs6drbaiI4B8AZtychw1hP+ubsb5czAaz6510OEVct/
31 h5M4Tlljcn/WIyulBd/tnuUOZPT0XL6rb2+TvRQvjXDBFHN+bWqP8OjXKnE1FTvy5MF8OTlUgI6wr
32 3f4t/eS/PPbtXRD5raJzEwEQLJ6XY6NJABs40tKpWZNuUaqTfmonNdbP9y1htWhByhsAk+fw5WK/C
33 /KocvM6IzPmqGIBWcTdQ==;
34 Received: from localhost ([::1] helo=bombadil.infradead.org)
35 by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux))
36 id 1lqxeS-00Do8i-Hj; Wed, 09 Jun 2021 12:49:44 +0000
37 Received: from esa4.hgst.iphmx.com ([216.71.154.42])
38 by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux))
39 id 1lqx5h-00DbCQ-K0
40 for linux-riscv@lists.infradead.org; Wed, 09 Jun 2021 12:13:51 +0000
41 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple;
42 d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com;
43 t=1623240829; x=1654776829;
44 h=from:to:cc:subject:date:message-id:in-reply-to:
45 references:content-transfer-encoding:mime-version;
46 bh=s4va/Owvq7MQI8rUsD/e02RmaYfJNzYNcxlXspGRY7g=;
47 b=G5GD9eN+rv669E7jyRnRAt0jw83CxhIrSiDIjXuPmhWyMhKeQGD7ACRm
48 ii6o0zmOREhGihtwB6X/xpY/2ZvK+cxcHmJXa+Ykyn8QN+/YKFtg3svfj
49 eiTN7U/mEozCoGNd1wXu59RQj11Xz60DN/qEUlYFaL6SjukUgifFVgbvG
50 uUj8AM8+xf1jKHi3Q/6nVPpJX8uiW/NPFHrwI8hxUwYr9viQwxXvc7FNr
51 fR8bH2c/HiGacGYEHosgP0WT//d9Huqn4JNINvjidK4ZSJ74cXlr8KwMG
52 8snmfx4UjEWMhK1lCYalJEU7nxXFfih/6DMuFRorETpWQ+424BAKUJdDH Q==;
53 IronPort-SDR: pYhRsIZkhfmi45K4HfnZj39kxfUGpxs1e+q+Wh8kDE+ySh35HkJaaUcpP04mb7VeIVtPRx/h6Q
54 imv6sn8fYo/V8ezHAq4jpd1QadqInKi1ubLnCE3Zy7GnhVBepoV6FbI14Y01V+5QIUwYdFNcGG
55 RsxDOTQyU5AljH0Rc6WkrpdVf5jsrXXMddmlDdi6QsfKGy7MwQ/NYojNIqyLhRSgu5w2uTIE7X
56 atSbjb8j2a+EJUY0WgYTGfNHKCdQLAhjcsWZgU7Iu0vSaBU6A7seCkqun24dvF/zYuzEj7wedD
57 TvE=
58 X-IronPort-AV: E=Sophos;i="5.83,260,1616428800"; d="scan'208";a="170575129"
59 Received: from mail-dm6nam12lp2169.outbound.protection.outlook.com (HELO
60 NAM12-DM6-obe.outbound.protection.outlook.com) ([104.47.59.169])
61 by ob1.hgst.iphmx.com with ESMTP; 09 Jun 2021 20:13:48 +0800
62 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
63 b=hrlr4Qi66FmbQW45zI7QeA9nEYSvxO+tR++vUyFHxjRqnr6WtjKgHM8hPpp8oHXaK82U0+KQUc2+WjLbe8LihexXFQs5zRwBDwuArmkKt85cL3utD3OBzTkr4A9ZhRS5mzztnn9kvTFNplPjSydXPetJQIZ9WKmihJrdeaGQ+zQ//6TdDWVpLyBbqiBVUbUwlKQbpbbfHvzQCHYQbIiUcGn4vaSXYp2Xp1Z5yYVtrfDK+TemKG/8fKQoJjg/tdmDtQ97Cgw7nX6Oc9kdmoTIxFilMy4XjPciPcNOPdLmboGCt6+TMBeftLc1VFNnr7PwuxOogv4I7eJ/P9UaK57k5A==
64 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;
65 s=arcselector9901;
66 h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
67 bh=Ibi36Vj2s7bu56DZaU1uSl4xNA3OB2FHlI/rBKn+8xo=;
68 b=CE3o+0GFLPMQuw0AK1IRf/vX00diXsjayn0MmpS7ntSVXgxXIAPT9aDtk7x0NovJBTk2LHI5Mtxvz6SwVnJzUqZmNsXUktEj5Iwdd8EPIIxgCOjugo/6WC0FqaFKNvJB4hQ0tjFxv+J5DexSJ8+mPx6Ucr4DwtUXrCWzOeXyF5YK68mU5FgttbyutW3CGsGkPgaPAdOxXOgJqyYu8X25unmzG12Jq2xC4oVKsbA+RfDiaMKm97q2Bhy+LcgJNS6/ktlFKSOVu1HQ0POYgba3mtldN3vg73wLbxrfsdoe4261aJpkM05GJFDzdTNp4t3rEGhNuLR1+8OmKfLlPeSU9w==
69 ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass
70 smtp.mailfrom=wdc.com; dmarc=pass action=none header.from=wdc.com; dkim=pass
71 header.d=wdc.com; arc=none
72 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
73 d=sharedspace.onmicrosoft.com; s=selector2-sharedspace-onmicrosoft-com;
74 h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
75 bh=Ibi36Vj2s7bu56DZaU1uSl4xNA3OB2FHlI/rBKn+8xo=;
76 b=Z76YsVxTHK6/ta19C5vwaBPYmtDa2GIM/ml4myQZfIaHFNzXPzZ+PFcYy/Xf1Ixd0GZHcuSZQYgs/SPHWATh+rOWBAislGv1zmSAG/g0tiDckB8WaCwh1e3qGW4ZmUTmAU7dxB0vn0pRSLTnc1hdCUZ73buM78qo9qwsQZv41d0=
77 Authentication-Results: dabbelt.com; dkim=none (message not signed)
78 header.d=none;dabbelt.com; dmarc=none action=none header.from=wdc.com;
79 Received: from CO6PR04MB7812.namprd04.prod.outlook.com (2603:10b6:303:138::6)
80 by CO6PR04MB7794.namprd04.prod.outlook.com (2603:10b6:303:13f::7)
81 with Microsoft SMTP Server (version=TLS1_2,
82 cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21; Wed, 9 Jun
83 2021 12:13:47 +0000
84 Received: from CO6PR04MB7812.namprd04.prod.outlook.com
85 ([fe80::a153:b7f8:c87f:89f8]) by CO6PR04MB7812.namprd04.prod.outlook.com
86 ([fe80::a153:b7f8:c87f:89f8%9]) with mapi id 15.20.4219.021; Wed, 9 Jun 2021
87 12:13:47 +0000
88 From: Anup Patel <anup.patel@wdc.com>
89 To: Palmer Dabbelt <palmer@dabbelt.com>,
90 Palmer Dabbelt <palmerdabbelt@google.com>,
91 Paul Walmsley <paul.walmsley@sifive.com>, Albert Ou <aou@eecs.berkeley.edu>
92 Cc: Atish Patra <atish.patra@wdc.com>,
93 Alistair Francis <Alistair.Francis@wdc.com>,
94 Anup Patel <anup@brainfault.org>, linux-riscv@lists.infradead.org,
95 linux-kernel@vger.kernel.org, Anup Patel <anup.patel@wdc.com>
96 Subject: [PATCH v7 1/1] RISC-V: Use SBI SRST extension when available
97 Date: Wed, 9 Jun 2021 17:43:22 +0530
98 Message-Id: <20210609121322.3058-2-anup.patel@wdc.com>
99 X-Mailer: git-send-email 2.25.1
100 In-Reply-To: <20210609121322.3058-1-anup.patel@wdc.com>
101 References: <20210609121322.3058-1-anup.patel@wdc.com>
102 X-Originating-IP: [122.172.176.125]
103 X-ClientProxiedBy: MA1PR0101CA0036.INDPRD01.PROD.OUTLOOK.COM
104 (2603:1096:a00:22::22) To CO6PR04MB7812.namprd04.prod.outlook.com
105 (2603:10b6:303:138::6)
106 MIME-Version: 1.0
107 X-MS-Exchange-MessageSentRepresentingType: 1
108 Received: from wdc.com (122.172.176.125) by
109 MA1PR0101CA0036.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:22::22) with
110 Microsoft SMTP Server (version=TLS1_2,
111 cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend
112 Transport; Wed, 9 Jun 2021 12:13:44 +0000
113 X-MS-PublicTrafficType: Email
114 X-MS-Office365-Filtering-Correlation-Id: 17406ef0-e8d7-4dc3-eee9-08d92b40085b
115 X-MS-TrafficTypeDiagnostic: CO6PR04MB7794:
116 X-MS-Exchange-Transport-Forked: True
117 X-Microsoft-Antispam-PRVS: <CO6PR04MB77945CDDD1538EFCA060925B8D369@CO6PR04MB7794.namprd04.prod.outlook.com>
118 WDCIPOUTBOUND: EOP-TRUE
119 X-MS-Oob-TLC-OOBClassifiers: OLM:2887;
120 X-MS-Exchange-SenderADCheck: 1
121 X-Microsoft-Antispam: BCL:0;
122 X-Microsoft-Antispam-Message-Info: IxB9oKL9LkeXCQ7mZ1A5qIcKlICr/TPZ/8V0ErM5hbqnvfK6Mf0mQL0tqqlJAOvLpCEVIyX7FllGqSlWsNG3ik/WbbDYQb9wAFCuFSAlGAeGppnJjJf0zfDAmp4NONB7kshKqtUYfGltTHTkV4ni+VEwWf/Q3T4vA0k3Jkt34iZFi9tOsSHkSWxPTsQyviBdCp3/36ZCVhYs6bXkf8sh0sA4Ql/l8t2zpcEUwjAm14ie3hOUBEp1W9qOz6StmR4xyl+zy49U38byeHu5XDF/qFT8FI4WclwFwxbDeTm8cU7MMg4D0xeR0Ytm2wVrgAdiapgQYLmxPIjIG96TRTbCupyuaJXmYcI6/x27PtiQYFwcpbRUjXDKRVX2WW74WHm88OOlTexD/OsbGHD6PVnc+InniK38yNcx06U9fIkDGSYWrJqLysALlO0V5gfkc35Fhttum638ES0S2sldGkFufM372EZeooczK7jeLMpoOTAnaLtPdTCGsHnnEDDbOK7NiptQlrLMhrNQ/70harAMmB6Vvdl+jvJi34DsuX+57WeQU8Ya1cyVxzFkWX2DwvPRsAnp/VNHzeQLc5MAIUYpwQvkJBcqihYMKrLMNOT94HmxBYmY2bcW/K9fXrPQ/whyJ5HoQuxydeiy7+QKg6FWnhguTACaaTKGKKIDIlfYA5FXYlZOaQ2iJFtiZP1GbxQnDEwz4SfGgCgBdiwqFm1NfGG7wRhqQa/Kgp3jBTHwaysCwcWu/Xdz/yiCV4lfQD/PTiOr5hmtld29G7WVDy9m6Q==
123 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;
124 IPV:NLI; SFV:NSPM; H:CO6PR04MB7812.namprd04.prod.outlook.com; PTR:; CAT:NONE;
125 SFS:(4636009)(396003)(39860400002)(136003)(346002)(366004)(376002)(8676002)(316002)(55236004)(38100700002)(38350700002)(110136005)(86362001)(54906003)(4326008)(956004)(966005)(478600001)(26005)(186003)(55016002)(8936002)(2616005)(7696005)(52116002)(16526019)(5660300002)(8886007)(6666004)(1076003)(66476007)(66556008)(36756003)(66946007)(83380400001)(2906002)(44832011);
126 DIR:OUT; SFP:1102;
127 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
128 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?2kfiFAcyFkAMcwkoCUqJGxdVnwsuTm5WWTXA4Pq0ZNAjWsfYI4MNugTA9f8C?=
129 =?us-ascii?Q?WaQrYEizTkvIlgRDqeKVRS0vaMaeU9XaSzO6UAJMnd0jY3BzkJgKUU9xj1aU?=
130 =?us-ascii?Q?vmwXKxCS+vZ2VKgLifaU1JCeemiJqV9aW+6AJEycq722bz9yXmcaJsaHWtX3?=
131 =?us-ascii?Q?4sSoLeVPvfzwzDZEEoGsZZi1G7inY2imGEgY/r3m5/qYvavJQ3An4e4sjEqZ?=
132 =?us-ascii?Q?Z4a4FAd/6c3X8cjmNwGvgWoAIM5WaJYFQe30MQ79alCUfZyiKB4tR0+5OGFd?=
133 =?us-ascii?Q?P/rQ169Z644JNKKcEabikpL7qZZJ6OMPTS7XR9x/7GzWOJ7soV3/3I2tfCdi?=
134 =?us-ascii?Q?xVsOK1DRF4y6gi5udvnb+Uu1U5wC1NlT0U/+TrnTSeY/IuLmMgFUysw+fQ+D?=
135 =?us-ascii?Q?DIVN44TKrMoEZKx9SKcx4jYpUGYvaCH4sVOAx3zWQC0Oz1Nz3/a/isywpQW9?=
136 =?us-ascii?Q?1I1kl/2N97K0EoWIPf6qPjyLVWXg1dOHfk6SjNW64JIIPUNnM3h7k2igDX3o?=
137 =?us-ascii?Q?d7lWyFfzoWhNC7opS71uzta+ti8aHxo+xzvYvf2wLb+fdyEP9t+oQVrEQYIW?=
138 =?us-ascii?Q?rAUKPqjEfAZOYBB28SaabfVt/QF6hFfV/0yJ/JV/Ie8ivC1t6iO+QZQscV7K?=
139 =?us-ascii?Q?d4Pg+xVSE+m+LsgNwO36cTTe6hSLBPnWU1NMOW2cxTRKGm0Lwd2HyjyKTBMD?=
140 =?us-ascii?Q?BcnKo9GXAVgOAGCG5cwEBN76q6sXxbWy0pjni3O2bLYBg4CIYCB/JNzOIfE0?=
141 =?us-ascii?Q?Toz6Qwc4aw5NxRLqz9IygGT6ZunRVUWUsgJrIt5U20elX+lRmtX1cqrQNTON?=
142 =?us-ascii?Q?ZHzuAI587pB0zK4EiS25hc9C8RtwjlY67heuMsYZDww5TU+NV3+0WN1/NrCX?=
143 =?us-ascii?Q?3kB7O188tvm1sWVhCaC6hk9s19nKGRgMS5OHXTMxhmyw1Dn/zorMYff3r9ZE?=
144 =?us-ascii?Q?sNiBI7fwru/Jsxt2/jNCpFaEYUa9JkrdSse76BXo/UxLALnxO3bzpym3Dq+T?=
145 =?us-ascii?Q?s4uEA8UncKM0e+Mhp9hW1c3DR61Qjj8wb+LV3XB0qYK/1rHs8IDdJ97tw1fp?=
146 =?us-ascii?Q?Ux9SlgS9YE2bEp6wxcX6TpA5DoYjqdlK50/4/DZ3YTXWlPTaQbt/j36TbEgZ?=
147 =?us-ascii?Q?hhIV08WX7EDjBz1QrFRppEtBghOJikHLdvPo6GnZkHNQ9cxaa8Jrk0iypK4d?=
148 =?us-ascii?Q?bMj47kiugWCGY+ZW2ioGV1GgH1aZEvAukQgTiAAiyGU83td11Q5Pv2N5ytvk?=
149 =?us-ascii?Q?i+Ux/DUoeU4VyqYnb69asjdyKI5RzIxQPdQAQ7x/TBlyPp/Yj2/v31b6lCYT?=
150 =?us-ascii?Q?b1iYdeIKK+6I6A+e/EUnPOKC?=
151 X-OriginatorOrg: wdc.com
152 X-MS-Exchange-CrossTenant-Network-Message-Id: 17406ef0-e8d7-4dc3-eee9-08d92b40085b
153 X-MS-Exchange-CrossTenant-AuthSource: CO6PR04MB7812.namprd04.prod.outlook.com
154 X-MS-Exchange-CrossTenant-AuthAs: Internal
155 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jun 2021 12:13:47.1304 (UTC)
156 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
157 X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86
158 X-MS-Exchange-CrossTenant-MailboxType: HOSTED
159 X-MS-Exchange-CrossTenant-UserPrincipalName: rHld9c5jovIZF30ZL04ehEJ81O0isWetsUM3vlp/0cN1LoJ5z8guKzUTANDGVGM0Eua+2cZ1jQGTC49NwWH4hA==
160 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR04MB7794
161 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3
162 X-CRM114-CacheID: sfid-20210609_051349_766689_30430D67
163 X-CRM114-Status: GOOD ( 15.29 )
164 X-BeenThere: linux-riscv@lists.infradead.org
165 X-Mailman-Version: 2.1.34
166 Precedence: list
167 List-Id: <linux-riscv.lists.infradead.org>
168 List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-riscv>,
169 <mailto:linux-riscv-request@lists.infradead.org?subject=unsubscribe>
170 List-Archive: <http://lists.infradead.org/pipermail/linux-riscv/>
171 List-Post: <mailto:linux-riscv@lists.infradead.org>
172 List-Help: <mailto:linux-riscv-request@lists.infradead.org?subject=help>
173 List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-riscv>,
174 <mailto:linux-riscv-request@lists.infradead.org?subject=subscribe>
175 Content-Type: text/plain; charset="us-ascii"
176 Content-Transfer-Encoding: 7bit
177 Sender: "linux-riscv" <linux-riscv-bounces@lists.infradead.org>
178 Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org
179
180 The SBI SRST extension provides a standard way to poweroff and
181 reboot the system irrespective to whether Linux RISC-V S-mode
182 is running natively (HS-mode) or inside Guest/VM (VS-mode).
183
184 The SBI SRST extension is available in the SBI v0.3 specification.
185 (Refer, https://github.com/riscv/riscv-sbi-doc/releases/tag/v0.3.0-rc1)
186
187 This patch extends Linux RISC-V SBI implementation to detect
188 and use SBI SRST extension.
189
190 Signed-off-by: Anup Patel <anup.patel@wdc.com>
191 Reviewed-by: Atish Patra <atish.patra@wdc.com>
192 ---
193 arch/riscv/include/asm/sbi.h | 24 ++++++++++++++++++++++++
194 arch/riscv/kernel/sbi.c | 35 +++++++++++++++++++++++++++++++++++
195 2 files changed, 59 insertions(+)
196
197 --- a/arch/riscv/include/asm/sbi.h
198 +++ b/arch/riscv/include/asm/sbi.h
199 @@ -27,6 +27,7 @@ enum sbi_ext_id {
200 SBI_EXT_IPI = 0x735049,
201 SBI_EXT_RFENCE = 0x52464E43,
202 SBI_EXT_HSM = 0x48534D,
203 + SBI_EXT_SRST = 0x53525354,
204 };
205
206 enum sbi_ext_base_fid {
207 @@ -70,6 +71,21 @@ enum sbi_hsm_hart_status {
208 SBI_HSM_HART_STATUS_STOP_PENDING,
209 };
210
211 +enum sbi_ext_srst_fid {
212 + SBI_EXT_SRST_RESET = 0,
213 +};
214 +
215 +enum sbi_srst_reset_type {
216 + SBI_SRST_RESET_TYPE_SHUTDOWN = 0,
217 + SBI_SRST_RESET_TYPE_COLD_REBOOT,
218 + SBI_SRST_RESET_TYPE_WARM_REBOOT,
219 +};
220 +
221 +enum sbi_srst_reset_reason {
222 + SBI_SRST_RESET_REASON_NONE = 0,
223 + SBI_SRST_RESET_REASON_SYS_FAILURE,
224 +};
225 +
226 #define SBI_SPEC_VERSION_DEFAULT 0x1
227 #define SBI_SPEC_VERSION_MAJOR_SHIFT 24
228 #define SBI_SPEC_VERSION_MAJOR_MASK 0x7f
229 @@ -148,6 +164,14 @@ static inline unsigned long sbi_minor_ve
230 return sbi_spec_version & SBI_SPEC_VERSION_MINOR_MASK;
231 }
232
233 +/* Make SBI version */
234 +static inline unsigned long sbi_mk_version(unsigned long major,
235 + unsigned long minor)
236 +{
237 + return ((major & SBI_SPEC_VERSION_MAJOR_MASK) <<
238 + SBI_SPEC_VERSION_MAJOR_SHIFT) | minor;
239 +}
240 +
241 int sbi_err_map_linux_errno(int err);
242 #else /* CONFIG_RISCV_SBI */
243 static inline int sbi_remote_fence_i(const unsigned long *hart_mask) { return -1; }
244 --- a/arch/riscv/kernel/sbi.c
245 +++ b/arch/riscv/kernel/sbi.c
246 @@ -7,6 +7,7 @@
247
248 #include <linux/init.h>
249 #include <linux/pm.h>
250 +#include <linux/reboot.h>
251 #include <asm/sbi.h>
252 #include <asm/smp.h>
253
254 @@ -501,6 +502,32 @@ int sbi_remote_hfence_vvma_asid(const un
255 }
256 EXPORT_SYMBOL(sbi_remote_hfence_vvma_asid);
257
258 +static void sbi_srst_reset(unsigned long type, unsigned long reason)
259 +{
260 + sbi_ecall(SBI_EXT_SRST, SBI_EXT_SRST_RESET, type, reason,
261 + 0, 0, 0, 0);
262 + pr_warn("%s: type=0x%lx reason=0x%lx failed\n",
263 + __func__, type, reason);
264 +}
265 +
266 +static int sbi_srst_reboot(struct notifier_block *this,
267 + unsigned long mode, void *cmd)
268 +{
269 + sbi_srst_reset((mode == REBOOT_WARM || mode == REBOOT_SOFT) ?
270 + SBI_SRST_RESET_TYPE_WARM_REBOOT :
271 + SBI_SRST_RESET_TYPE_COLD_REBOOT,
272 + SBI_SRST_RESET_REASON_NONE);
273 + return NOTIFY_DONE;
274 +}
275 +
276 +static struct notifier_block sbi_srst_reboot_nb;
277 +
278 +static void sbi_srst_power_off(void)
279 +{
280 + sbi_srst_reset(SBI_SRST_RESET_TYPE_SHUTDOWN,
281 + SBI_SRST_RESET_REASON_NONE);
282 +}
283 +
284 /**
285 * sbi_probe_extension() - Check if an SBI extension ID is supported or not.
286 * @extid: The extension ID to be probed.
287 @@ -608,6 +635,14 @@ void __init sbi_init(void)
288 } else {
289 __sbi_rfence = __sbi_rfence_v01;
290 }
291 + if ((sbi_spec_version >= sbi_mk_version(0, 3)) &&
292 + (sbi_probe_extension(SBI_EXT_SRST) > 0)) {
293 + pr_info("SBI SRST extension detected\n");
294 + pm_power_off = sbi_srst_power_off;
295 + sbi_srst_reboot_nb.notifier_call = sbi_srst_reboot;
296 + sbi_srst_reboot_nb.priority = 192;
297 + register_restart_handler(&sbi_srst_reboot_nb);
298 + }
299 } else {
300 __sbi_set_timer = __sbi_set_timer_v01;
301 __sbi_send_ipi = __sbi_send_ipi_v01;