From patchwork Fri Jan 27 11:27:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Price X-Patchwork-Id: 49248 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp782642wrn; Fri, 27 Jan 2023 03:31:59 -0800 (PST) X-Google-Smtp-Source: AK7set8NVS3IGlAGZnrlo0YzknYOzrxQyrhmC84lQi7UmFK3EUcZOQaDUif4ikEA9VriRo0Ut9k/ X-Received: by 2002:a05:6a20:6693:b0:b8:7735:bed0 with SMTP id o19-20020a056a20669300b000b87735bed0mr5378212pzh.56.1674819119583; Fri, 27 Jan 2023 03:31:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674819119; cv=none; d=google.com; s=arc-20160816; b=sMkeeaMIwoE9KluYXgWH8ry9EWPrzrxpPcVQPESroXlER7m0Kc2HXVmA90gRaL+ALV Q9vKOp89fSsZEfpwvwC7EowgzfYn08LKMYADijk6InD8LJlD7LAmpKSc5kP56rIUbMne SSPrCQ6rcXjmh0DhtwohHwjSqskK0lYOc0jXoYAdygWFtYjO5eStBlsdIF/GQX2u3lQ4 DrS6/7ni2nHw8c8OrM13RoIHPOP2K4ZZvsPoS9CzBeBzZdrzhvX5ZTDS1KIMiC10NlhM sVuXW7Ylbj4/xssovXIYW/gP5QMdIfnlw98wPwTmdPnMOUBv5A3PTOtOTUa+00f9WW/y Lz8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=I1neizKZciYipiMeE+rTAd8m4x8aaZxqX80BbCAGv9c=; b=NrU3kycWmzbAPBv6PMaBNoh32lO0UT22mkaN/govc1HJMYfoPg5Eb+D1Knf4sF2TDr 3MNDImzIG7UfdpmmbWt+aI9gVZf6SAJTU1cci7F0BXlWuxPtCg7uF+62VQDXjD8trvs3 qF33ulkC8+IhPzc0KgaWRSjI9/3+/JHzBbaZVxTbU7zet8OJHsqvwmVGVljgNaS5rTwX /Kjywae82JwLAL35DYnTWLWv81vmKSHIOc0R0vBBjDfEO6ELJHhbZBULhyCvyY3YNcDw JLdTxIyV9tt7tbQtBYLtQI2UNpGEeTJpRQ0+t01vtoKew0DhpiFXarS2jcd6ydVGAsEL rppA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p1-20020a63b801000000b004da2c9dcc75si3895725pge.869.2023.01.27.03.31.46; Fri, 27 Jan 2023 03:31:59 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233507AbjA0Lav (ORCPT + 99 others); Fri, 27 Jan 2023 06:30:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42102 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233514AbjA0L37 (ORCPT ); Fri, 27 Jan 2023 06:29:59 -0500 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 7479E7AE40 for ; Fri, 27 Jan 2023 03:29:07 -0800 (PST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 649FC1692; Fri, 27 Jan 2023 03:29:29 -0800 (PST) Received: from e122027.cambridge.arm.com (e122027.cambridge.arm.com [10.1.35.16]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 265293F64C; Fri, 27 Jan 2023 03:28:45 -0800 (PST) From: Steven Price To: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org Cc: Steven Price , Catalin Marinas , Ard Biesheuvel , Marc Zyngier , Will Deacon , Suzuki K Poulose , James Morse , Oliver Upton , Zenghui Yu , linux-kernel@vger.kernel.org, Joey Gouly , Alexandru Elisei , Christoffer Dall , Fuad Tabba , linux-coco@lists.linux.dev Subject: [RFC PATCH 14/14] HACK: Accept prototype RSI version Date: Fri, 27 Jan 2023 11:27:58 +0000 Message-Id: <20230127112758.37891-15-steven.price@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230127112758.37891-1-steven.price@arm.com> References: <20230127112248.136810-1-suzuki.poulose@arm.com> <20230127112758.37891-1-steven.price@arm.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756175132773231674?= X-GMAIL-MSGID: =?utf-8?q?1756175132773231674?= The upstream RMM currently advertises the major version of an internal prototype (v12.0) rather than the expected version from the RMM architecture specification (v1.0). Add a config option to enable support for the prototype RSI v12.0. Signed-off-by: Steven Price --- arch/arm64/include/asm/rsi_smc.h | 2 ++ arch/arm64/kernel/rsi.c | 5 +++++ arch/arm64/kvm/Kconfig | 8 ++++++++ 3 files changed, 15 insertions(+) diff --git a/arch/arm64/include/asm/rsi_smc.h b/arch/arm64/include/asm/rsi_smc.h index bc0cdd83f164..baf07f905353 100644 --- a/arch/arm64/include/asm/rsi_smc.h +++ b/arch/arm64/include/asm/rsi_smc.h @@ -29,6 +29,8 @@ #define RSI_ABI_VERSION ((RSI_ABI_VERSION_MAJOR << 16) | \ RSI_ABI_VERSION_MINOR) +#define RSI_LEGACY_ABI_VERSION 0xc0000 + #define RSI_ABI_VERSION_GET_MAJOR(_version) ((_version) >> 16) #define RSI_ABI_VERSION_GET_MINOR(_version) ((_version) & 0xFFFF) diff --git a/arch/arm64/kernel/rsi.c b/arch/arm64/kernel/rsi.c index 1cc292826f2b..45b26f23e706 100644 --- a/arch/arm64/kernel/rsi.c +++ b/arch/arm64/kernel/rsi.c @@ -41,6 +41,11 @@ static bool rsi_version_matches(void) RSI_ABI_VERSION_GET_MAJOR(ver), RSI_ABI_VERSION_GET_MINOR(ver)); +#ifdef CONFIG_RME_USE_PROTOTYPE_HACKS + if (ver == RSI_LEGACY_ABI_VERSION) + return true; +#endif + return (ver >= RSI_ABI_VERSION && RSI_ABI_VERSION_GET_MAJOR(ver) == RSI_ABI_VERSION_MAJOR); } diff --git a/arch/arm64/kvm/Kconfig b/arch/arm64/kvm/Kconfig index 05da3c8f7e88..13858a5047fd 100644 --- a/arch/arm64/kvm/Kconfig +++ b/arch/arm64/kvm/Kconfig @@ -58,6 +58,14 @@ config NVHE_EL2_DEBUG If unsure, say N. +config RME_USE_PROTOTYPE_HACKS + bool "Allow RMM prototype version numbers" + default y + help + For compatibility with the the current RMM code allow versions + numbers from a prototype implementation as well as the expected + version number from the RMM specification. + config PROTECTED_NVHE_STACKTRACE bool "Protected KVM hypervisor stacktraces" depends on NVHE_EL2_DEBUG