From patchwork Tue Oct 12 09:58:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 12551895 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 99BC8C433F5 for ; Tue, 12 Oct 2021 10:02:02 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 62D0961040 for ; Tue, 12 Oct 2021 10:02:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 62D0961040 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; 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=nBWpcBNVIzhiANCOwutmsagzw1Gg0bgSDj4oMIL1c4c=; b=Jy0AOF1opAtdVl YyTRO/0H10E3nZtmdq5qU5qgeupZVgxETMX6SPL5tt+bxIIVlJQSI/b7vA6o8bI8Gw2zMxA01CCFq 3JqMBZ26VwhP9njnTYypqOsm/wafWbr+a/8UQBX5CoQGJtcLa9zhxxUjWsUL0Ix4jQdNOCRWK2p4o Su679R2dAhU+HegZB03cOxWt/Oi5IAH7b1em1iGeVmZmn++TRPTL92/nvqXws5rN5KZSjcioFJvy6 CR1tIoRYXWbAwFmeO61yaR7lj+KCVTTsVR6ipzQ6eWfaN8+bgyM8/QpM0jAPaVEeiPaHYNbrx8UBN Rms4+kv0Vg608dWwrFww==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1maEbZ-00CKt2-9Q; Tue, 12 Oct 2021 10:01:53 +0000 Received: from esa4.hgst.iphmx.com ([216.71.154.42]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1maEZZ-00CK6T-8v; Tue, 12 Oct 2021 09:59:50 +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=1634032789; x=1665568789; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=UeD+FgLO9aIjFzdKrHDcrkqDgbjr4ljOtP7t6+n6Irg=; b=FuEcxMrF3gaA/TCgmljGQ7h4EBos84Y5hNAtsOXH7CLb6/xGReb3iBcs MknL1QrMs/QVWL3TyujoBAL16VwWvJ4x6Ca0camOJe/gg2glXBX4oz3pb 7H3lJAdWzaOPIirfu5EYuNiGzVa3RpkfHpiGseASX+yNmZOPZZu+5WUvp 4gocTCGcr2dxrYYoStb5XGdLo6CNufBoQHoIwXtDdetKKKLgFLqCoWX16 l/zIZKMWBUZf5YC/BhE2SB9sK5QU/5E1gHVa9JDWAgw1mGN5pR5JeVSvP ILy01TVz4oKngncw4lWcZwnD4unpXDifNenj+9QIvdVe6vIG9QglFuQzi A==; X-IronPort-AV: E=Sophos;i="5.85,367,1624291200"; d="scan'208";a="181612328" Received: from mail-co1nam11lp2171.outbound.protection.outlook.com (HELO NAM11-CO1-obe.outbound.protection.outlook.com) ([104.47.56.171]) by ob1.hgst.iphmx.com with ESMTP; 12 Oct 2021 17:59:48 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BkUX7hyLXdjMn+AHgD3M70Iquvyredsf3Hhv/kpUwt4Mnrt3TsCR4xvFYm+pSJGvtSHUIUWw98LwzvkoTHB1n6WQcOoSXZbnssTwzQ2p+wSKy4VozTIgzTjZr+Vhkjv7nED8cXVmP0XWDoFI2EI4VjeMCmDkufzJDPIilIBqVNDn+nUcLOK4edRwW4I4fL3D9HL/S64nZtitMYVYTQHXGkix25pztUshi2uQlUXTQ5tuRQ/363N8IyNRiV+tMIv+HnLYXm+JmR/z0WUmfqS/kwSXcqkLFbpG/lV9OhRofv/bzQe3CzlyUC4kGl2l55lgCwpEAJcZpB9tGvDfwHfV5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=4QXaNsRGTyDgz2Sn7I2zPdXMtXIGlsEhVecpbL/TqiQ=; b=SrdrGgHHgs5EvUIi19rlQ9xZXL5Q/EeMmT7BtkaDMy2OMzZY+id6o+S6MBaLwyVF3bpZhSHZPFpx8APiOnX+eIso86w1GUk5PVGHpV/qRA6X1u8cFaWStzJuXKxFBHrnA6P90u/PSP97NaRNCsq80XRIZbanPlDoGBIG5Tcx75wP7a/co/WIJ0DwT5UBWREcUUuiANz0xHRh7wpLlI84j1UWgs7arGw+KjZu4SjFjWIqy0R9Q4dP/DeoxnKMqJk3pH2GznG0F9R0b+TXm6yPe9DV0vIFZAHba6d/cjPSuxTsDUVj6PBqeF+2A+iIGnFqCrJ0wA+OPE3WKo4pJJQKVg== 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=G70XHiCOnzbDwhf2UUqkTcCOROlDfUzuqgQ58nnfL2RB3DvXdYqPRbnRwkeKaD1mZ+UOqlwY3I15wmihTI7RMZCRhtnKBXMK2sM64NvIlq1WFgww2v9p9nBcjJEHVZx36F+uk5EybdT1fBXxlJV156NpGfv/ylbycABqAuD7gW4= 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 CO6PR04MB8348.namprd04.prod.outlook.com (2603:10b6:303:137::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.18; Tue, 12 Oct 2021 09:59:47 +0000 Received: from CO6PR04MB7812.namprd04.prod.outlook.com ([fe80::8100:4308:5b21:8d97]) by CO6PR04MB7812.namprd04.prod.outlook.com ([fe80::8100:4308:5b21:8d97%9]) with mapi id 15.20.4587.026; Tue, 12 Oct 2021 09:59:47 +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 v9 4/8] RISC-V: Add SBI HSM suspend related defines Date: Tue, 12 Oct 2021 15:28:53 +0530 Message-Id: <20211012095857.1314214-5-anup.patel@wdc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211012095857.1314214-1-anup.patel@wdc.com> References: <20211012095857.1314214-1-anup.patel@wdc.com> X-ClientProxiedBy: MAXPR01CA0106.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:5d::24) To CO6PR04MB7812.namprd04.prod.outlook.com (2603:10b6:303:138::6) MIME-Version: 1.0 Received: from wdc.com (122.179.114.63) by MAXPR01CA0106.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:5d::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.24 via Frontend Transport; Tue, 12 Oct 2021 09:59:42 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5f893829-c263-4573-72de-08d98d6705d3 X-MS-TrafficTypeDiagnostic: CO6PR04MB8348: 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-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EQ1f04OA+Q6bmL3PPdwfvPZlvOv4oAoI7xO+HPksNdBTwJinG9UolV2bYdldg4TxALwGB34za4Nj0SlPtDCoDkaylF/l6cYRyqruxCQULzZ3FHO//rxRzymIGVYuTYCM5/XsgFXcqlvo8GXkOGcUNB7dW+8+3fA2fAgCCEHAj9kl3jY9U1xN/I6P0a5JI6uF30Gpy+6xj3frhf1r2bxEqRXgNIn73GEGfrqxGz9CQbJWpIjqK/rRwnctFltFcO9fk3WkhLeWEhAgeItZvRKJPhvqtaIVdm+R2ARd+RFVT9C9lbP+DYW5afXVfxhTIAXTWonyVM6tzPhGZVaRn92y3HBxgggwyH5PipmT0EAnKTyHPPqCENjkWOFrh08EfSnSqcKdIiQbVpfxW6l2RivI+KqFAfr2d2qPk3YTwtwxI/u3/Gqvdj4qe2AHypGjz5//5daq9uBLRmVeACJ66NRBseLexpkbFaA9il2Z87gSt9U7B5phM7WYXhhqz6bFaGi1cGx7Q0Tn0CKdmQsDhaXUmVGl5hH6C0ojTpETUy22iVQG7pq6Xkfqj8ELhcmx8gJhaZUfRiVnwa29bbTEh/coHi6OUPzf7aCiHTkDlq7s16e1sIixEug3/CmRHLRO7642Lv2BfwRf5yj/NQ3inWtUIaG3IzWfq3i/Jt/6ICZcJddu3If/82kHOPAgc3bmxnj16ZUNs17BKBhPaR5AlXH4OA== 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)(366004)(8936002)(6666004)(1076003)(8676002)(316002)(110136005)(44832011)(7416002)(508600001)(8886007)(54906003)(4326008)(2906002)(956004)(2616005)(38100700002)(55016002)(26005)(7696005)(83380400001)(36756003)(52116002)(186003)(38350700002)(66946007)(86362001)(66556008)(66476007)(15650500001)(5660300002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AanbN/TOTcAjn5JnAoAGLMlVzJbi08QMUVRD+MQj7rGaH81QNncbcqfsmfAErueOHiJYoyv0ESv4TNHI8FbgQV5K67iSkEX0fuZ7MEvVRqoGKD1v2x9b2R3hfXm/ckrbW/PWDZKg06ktW+YwUJRc9TidLgXSeSN0kQ1ADGMrzkSsDXIA4gML31wx3gA3gMFvALfkis9ZchOLP6hnz9Mkh+PM+1ZIK1Ia0jSUnA5uhG5q29D6Ti7cdNpnLRIwEBqlSydTj5YhI3xcbn18QekdU2jrMlBz+8rmyG8PBNxu0iQP3vipBBO9xKfV5yZgAmbm2kjoEdq82Uk9s9niZLtqGwBBsCaIADLdA3c3pi7OcYo2JGHC8s2XRO+YUyFoKXeZmOtc9KBJdvx/Ge4XiO37BvGwDVsrDE1BgMftrOilD5YEFEdw6m0hbN26E30u2hc26mQgvhlFcGM1RcwvkLuCZMYMwLA5/jeWw6hAYrNGA37VnbuCedMHlG1YXq2zNE9JqB0s4Esx95LF2rmOXc5YIqI4fCqSHnjeqjnyb4xLwyaRbtQEIu0neRjoc/RxRfy8Q4ZbJGSxjnoiSRnF49jNIBmo3W/aIBhSVjTq8OksHfvJOCgEwcCx4tWBLgVACwIFHFKsVokl1AcbO1GvlDI/OIByorykCpBhi/qfrV0KcTG/ZN2/Xpf+phrJzBO/cGykCziKXni68ShgCWambPKl40/JmSwxPehmjees61YkUM53Yz9QA/e3Kyp/e2bHO9VH7Uv5SEMRBq09zDVQP7kx8O9c1qhAne7h30/0Zh8zF/QJX6MqgozGsUDYPzMWNdlHZHBg1xOufKu2AamX3uDN38keR5VIavU5mLEaeWmFTE0IEIusPbTF1bktdreApJnExkYYv55EGD2NX93M5Ltzib7BizNPByJvYjFNHgUrYNSoQaSRyiE6zmvgh3n5n0gdosN0WC4/nHofGOABIcAUXAZ6u8pM5XIl12aVmMTabxYsUHl/BV4pUQh+FJD5WHVZ6fRUo7+ZECjDEbADrybkM6X6lwzDPXZZSakVOCvyT3yIzUNn2pq7i5rqJ+F36Cvia7qG6772J5DCgI3OH56veVInB62LK7ktifBByeJBDF6EyN4n51bc8db4qNktv6d7YCaMUZG2hik4+spP36d75keeLQfcEkWqcQNqagrLanrjHAm0LuhLo5UAN3m5Eu1vhSWz45RklqA8Xv9QKTbZ4tmPG3VuYDTLdMB+Ad+IXcfLwBsqkD068mw9bTLbbLtjeKcjge8s0YNqOCoCGWIjOIzyz9xEuf0jblxn+tQxNHHpP5ic/g96cR2XZt06e4mx X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5f893829-c263-4573-72de-08d98d6705d3 X-MS-Exchange-CrossTenant-AuthSource: CO6PR04MB7812.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2021 09:59:46.9443 (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: sDtEJFhnlu1Al7/Vtl63Pq9UygQddmcg9LLcqY5R+F86N9XU1agOTImHK/zYFqh1uctSfFrGCMIN+plUB1IjYw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR04MB8348 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211012_025949_455097_D8E1A5F2 X-CRM114-Status: GOOD ( 14.57 ) 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 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; }