Message ID | 20230127113932.166089-24-suzuki.poulose@arm.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp787783wrn; Fri, 27 Jan 2023 03:45:21 -0800 (PST) X-Google-Smtp-Source: AMrXdXtRSGpxwPaeIz1o3VGjr7DUfzlnEWi5k7AGt7PRQ6YfmQi6bmCTw0HTu05HbVcvw1b5vEbr X-Received: by 2002:a05:6402:3906:b0:49e:f5d5:c264 with SMTP id fe6-20020a056402390600b0049ef5d5c264mr28934134edb.27.1674819921628; Fri, 27 Jan 2023 03:45:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674819921; cv=none; d=google.com; s=arc-20160816; b=sDE0+tUpauUPjwuJhobTVl8eBTOqmJ5fDfz7S1UZq9d5o0c9q+KXjUYLyeJyF3+kVT IksTHV8RG2SP6RSpltUcUd2dmQNjrsiCPPjPK4xOaRxkNQZYK0Hr+WrNw2O2iSVaeaFT GdHCMumrMoyUguOkH9EhxFzanW0wOcezRPu5A96d0vr60p7SJ3pooyKbASNU/n1+9D4E 8hPQCxH6nFjGISh7TVbn/F19PrgwKuvvbWtkqu6IDxvWHQPD/TM4BQkz20OVXX12TRSI dxX5HL8o4FNhZ5izatYchyQkpruW4LsLmz5CSYDhWh22cIHPRjuK5eIXn1N9MzfxlDox G2jg== 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=wAZSgheIzZt3iJX48AmDi5YRv0cAc1RwUuRkKSWEA38=; b=FOCACd0UvU8xL9eiHHqEraws2ZtuHMFGtnY6PGumCxiF3PBfbE4QPBTGYXbJ1f3ZGc fdqGGl5fmqfG1nYTWAZWjeZMiyQGcL2F2MGf/opdDzGO6gI5cHd1PqkhcmI/un+bXPD7 uwb8EokWd3oZB3YYaypMuWJZ7/qdItcNpkPaASHjA/8dUnxTCFZCu/d7XoIFukEkP/g/ /IvVUjW7b0fwg+Gpa0OTJHgisbD2YZNzH2ie35WbTILiRPT/eawORlEA2b5Rx7c45JqJ RAq2wtOUM+3DKdcowxwK9i4nAeFnFtuRUhXzNQWhSv/ISR/SyKZImZoi6/c7DR5aQ9lQ yI9A== 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 d4-20020a056402078400b004a0e2b93456si4327762edy.456.2023.01.27.03.44.57; Fri, 27 Jan 2023 03:45:21 -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 S232281AbjA0LmW (ORCPT <rfc822;lekhanya01809@gmail.com> + 99 others); Fri, 27 Jan 2023 06:42:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32820 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233870AbjA0Llo (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Fri, 27 Jan 2023 06:41:44 -0500 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id DFAFA7264A; Fri, 27 Jan 2023 03:41:10 -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 68CBE1595; Fri, 27 Jan 2023 03:41:36 -0800 (PST) Received: from ewhatever.cambridge.arm.com (ewhatever.cambridge.arm.com [10.1.197.1]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id D6C173F64C; Fri, 27 Jan 2023 03:40:51 -0800 (PST) From: Suzuki K Poulose <suzuki.poulose@arm.com> To: kvm@vger.kernel.org, kvmarm@lists.linux.dev Cc: suzuki.poulose@arm.com, Alexandru Elisei <alexandru.elisei@arm.com>, Andrew Jones <andrew.jones@linux.dev>, Christoffer Dall <christoffer.dall@arm.com>, Fuad Tabba <tabba@google.com>, Jean-Philippe Brucker <jean-philippe@linaro.org>, Joey Gouly <Joey.Gouly@arm.com>, Marc Zyngier <maz@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Oliver Upton <oliver.upton@linux.dev>, Paolo Bonzini <pbonzini@redhat.com>, Quentin Perret <qperret@google.com>, Steven Price <steven.price@arm.com>, Thomas Huth <thuth@redhat.com>, Will Deacon <will@kernel.org>, Zenghui Yu <yuzenghui@huawei.com>, linux-coco@lists.linux.dev, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [RFC kvmtool 23/31] arm64: Specify SMC as the PSCI conduits for realms Date: Fri, 27 Jan 2023 11:39:24 +0000 Message-Id: <20230127113932.166089-24-suzuki.poulose@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230127113932.166089-1-suzuki.poulose@arm.com> References: <20230127112248.136810-1-suzuki.poulose@arm.com> <20230127113932.166089-1-suzuki.poulose@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756175973944885515?= X-GMAIL-MSGID: =?utf-8?q?1756175973944885515?= |
Series |
arm64: Support for Arm Confidential Compute Architecture
|
|
Commit Message
Suzuki K Poulose
Jan. 27, 2023, 11:39 a.m. UTC
From: Christoffer Dall <christoffer.dall@arm.com> This lets the VM use the RMM implementation for PSCI. Signed-off-by: Christoffer Dall <christoffer.dall@arm.com> Signed-off-by: Alexandru Elisei <alexandru.elisei@arm.com> Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com> --- arm/fdt.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/arm/fdt.c b/arm/fdt.c index 762a604d..c46ff410 100644 --- a/arm/fdt.c +++ b/arm/fdt.c @@ -208,7 +208,14 @@ static int setup_fdt(struct kvm *kvm) _FDT(fdt_property_string(fdt, "compatible", "arm,psci")); fns = &psci_0_1_fns; } - _FDT(fdt_property_string(fdt, "method", "hvc")); + + + if (kvm->cfg.arch.is_realm) { + _FDT(fdt_property_string(fdt, "method", "smc")); + } else { + _FDT(fdt_property_string(fdt, "method", "hvc")); + } + _FDT(fdt_property_cell(fdt, "cpu_suspend", fns->cpu_suspend)); _FDT(fdt_property_cell(fdt, "cpu_off", fns->cpu_off)); _FDT(fdt_property_cell(fdt, "cpu_on", fns->cpu_on));