Received: by 2002:ac2:51c9:0:0:0:0:0 with SMTP id u9csp1831696lfm; Wed, 19 May 2021 13:29:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxfXFecbaZus2gqH/v4hVqUOh7eohXq4xQ1M3z5Xhr5SBTf1GEUjEztdguS7Q+yv6Ra4kWz X-Received: by 2002:a92:ad07:: with SMTP id w7mr892855ilh.98.1621456188844; Wed, 19 May 2021 13:29:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621456188; cv=none; d=google.com; s=arc-20160816; b=EYNvw53OdvhkGWh5nOFdQ/ztUgHO8YilfAEBljocXd+nJHRPhBhb6oWBQ6zLhwxjht VCsH3d4O9syIIuAuTwqBu75Pd8YfBgq9UlVgd8W4lHYY5vVWmIFbe3HkZr3gFlqZzfXw A7RMwZLze+AIkcDjdzCVOkBKa9SJlEa0KWSz7DkWIJluMJa9TD7p070+fL8nRfo3XUW/ BcmBhsMvHwiaTXC4JIF2n2gelNwbfQ0KDKpNwALsBR26tYP8yZwY7f9ARHaxsSJY1H31 +CFoLssbWL9BmButz0neDiUs1Q0PWEWNZ2ajlydahrZtkYG/UqgAtHnik6y0bDx5+5Ud YadA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from; bh=wCwHaPOCPxq39+Pnecgtsjf9Jszd3Ea9Om4doUckkMw=; b=AFJ4/LziCY8GxGX+pvOzkgbZd4EmpDiyvIcEBs5Oa2mak/FvKvrXDvIQq02WLG/DsE j/fRpYl+HUEr6Y4CEr+yOwUYV59mwCysTm7VQzlT3IGpbSFMeO3dk3+IUeB5m83sQfXz 9EI3GgH+QU/lJ1E+8BIIqaI/nuppfkKCBqEYedGl5ELVxQCG/PiEmXTIgZxMi07gWe38 MwpdNIokiyeHyZe0/4TGRcoCJEpItMLuVNIeTWNNHJuAymkqMIBNJhfCN36scLe03Wtk ciPV5DrsLIzVMzexSFf8ofMYO011pn8cRe4r6D+CwiF0FQm2F0wUxMiwykZk52Me0bmR TO0Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id l23si316076jas.94.2021.05.19.13.29.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 19 May 2021 13:29:48 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org" Received: from localhost ([::1]:43508 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ljSpA-0002m4-5f for alex.bennee@linaro.org; Wed, 19 May 2021 16:29:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53574) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljSjQ-0005Y8-K0; Wed, 19 May 2021 16:23:54 -0400 Received: from mail.csgraf.de ([85.25.223.15]:48290 helo=zulu616.server4you.de) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ljSjM-0003Qw-4u; Wed, 19 May 2021 16:23:52 -0400 Received: from localhost.localdomain (dynamic-095-114-039-201.95.114.pool.telefonica.de [95.114.39.201]) by csgraf.de (Postfix) with ESMTPSA id 9F1FC60807A6; Wed, 19 May 2021 22:23:06 +0200 (CEST) From: Alexander Graf To: QEMU Developers Subject: [PATCH v8 18/19] arm: Enable Windows 10 trusted SMCCC boot call Date: Wed, 19 May 2021 22:22:52 +0200 Message-Id: <20210519202253.76782-19-agraf@csgraf.de> X-Mailer: git-send-email 2.30.1 (Apple Git-130) In-Reply-To: <20210519202253.76782-1-agraf@csgraf.de> References: <20210519202253.76782-1-agraf@csgraf.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=85.25.223.15; envelope-from=agraf@csgraf.de; helo=zulu616.server4you.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Cameron Esfahani , Roman Bolshakov , qemu-arm , Marcel Apfelbaum , Frank Yang , Paolo Bonzini , Peter Collingbourne Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: rSIucPtgKmPI Windows 10 calls an SMCCC call via SMC unconditionally on boot. It lives in the trusted application call number space, but its purpose is unknown. In our current SMC implementation, we inject a UDEF for unknown SMC calls, including this one. However, Windows breaks on boot when we do this. Instead, let's return an error code. With this and -M virt,virtualization=on I can successfully boot the current Windows 10 Insider Preview in TCG. Signed-off-by: Alexander Graf --- target/arm/kvm-consts.h | 2 ++ target/arm/psci.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/target/arm/kvm-consts.h b/target/arm/kvm-consts.h index 580f1c1fee..4b64f98117 100644 --- a/target/arm/kvm-consts.h +++ b/target/arm/kvm-consts.h @@ -85,6 +85,8 @@ MISMATCH_CHECK(QEMU_PSCI_0_2_FN64_CPU_SUSPEND, PSCI_0_2_FN64_CPU_SUSPEND); MISMATCH_CHECK(QEMU_PSCI_0_2_FN64_CPU_ON, PSCI_0_2_FN64_CPU_ON); MISMATCH_CHECK(QEMU_PSCI_0_2_FN64_MIGRATE, PSCI_0_2_FN64_MIGRATE); +#define QEMU_SMCCC_TC_WINDOWS10_BOOT 0xc3000001 + /* PSCI v0.2 return values used by TCG emulation of PSCI */ /* No Trusted OS migration to worry about when offlining CPUs */ diff --git a/target/arm/psci.c b/target/arm/psci.c index 6709e28013..4d11dd59c4 100644 --- a/target/arm/psci.c +++ b/target/arm/psci.c @@ -69,6 +69,7 @@ bool arm_is_psci_call(ARMCPU *cpu, int excp_type) case QEMU_PSCI_0_2_FN64_CPU_SUSPEND: case QEMU_PSCI_0_1_FN_MIGRATE: case QEMU_PSCI_0_2_FN_MIGRATE: + case QEMU_SMCCC_TC_WINDOWS10_BOOT: return true; default: return false; @@ -194,6 +195,7 @@ void arm_handle_psci_call(ARMCPU *cpu) break; case QEMU_PSCI_0_1_FN_MIGRATE: case QEMU_PSCI_0_2_FN_MIGRATE: + case QEMU_SMCCC_TC_WINDOWS10_BOOT: ret = QEMU_PSCI_RET_NOT_SUPPORTED; break; default: -- 2.30.1 (Apple Git-130)