From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by mx.groups.io with SMTP id smtpd.web11.2255.1582627505979969979 for ; Tue, 25 Feb 2020 02:45:06 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=cTE1I+0D; spf=pass (domain: linaro.org, ip: 209.85.128.68, mailfrom: ard.biesheuvel@linaro.org) Received: by mail-wm1-f68.google.com with SMTP id m3so2439622wmi.0 for ; Tue, 25 Feb 2020 02:45:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Omf08FnHclUU7EPvbRVyhwY2bgizB7ghWs4z1iWI6yI=; b=cTE1I+0DARy46fYENVY9by1vpC/pS+F8oQiW8dK0H8fseUuqpF7YEiL2QTOwstLSUj l9fSJGBNBqIJgWBsDJiIfcgXRfh/3oDAqEAZV+pp8yj9Wrybya9vHLhOxjgUCH0x2Dm1 tsoehpZXwUgNt9CEvdGoSCv1P3cPx5iXmDlIvLGHSo7Cj5RgBhB17j5KNKDVQKW4H4ak wgE2YWVPz4K3xxuTX/wajdRDOcBXytrBE3F8x9fLr+nmOv+xdI++EfCsw7o3kfcgqsDe Dfyv7qSNZy0jsi3M81VFyqDIRySmtLINVhem4B/UscJhsq//HOv9lD3R/21AKDw4ZE3Z vYyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Omf08FnHclUU7EPvbRVyhwY2bgizB7ghWs4z1iWI6yI=; b=Zx739lNwtcaTvNZInfLUTe9llaVGNknS4Tl09KoVDy5PI7G3P6mVknq8vX051i2BM4 Hp4DTcEqu2LcE526SWvrtRwVrgt1FRVXWG1PwfLRcnWbSOti/GXmbzt46kbFAzNIQlLI kFBmqT23x1Ska82Pl1DO9sHMNLUHYksAku89vvO93N24FSqM6mHIE7j4P5FG5sxbIJF7 y1yUK25zTkCStWGTGaP6/v3dprArm8U/lJ5nirAzGF/FIfvkfYUE53huq428polwH28U 4d0Jfkip/j8Se6lUhz2CCwf5ifkzN/AJaruFq3j3sUV9JSkn9/wX3j8l2CdlB4J943RD f+QQ== X-Gm-Message-State: APjAAAXQRUJgMUUZ+oyPI/5RS9mTfHP+KpQqRpXl9XudAnCznuJyUTxw YxxNlkk0+pyhtxZajXUaVDrnZJfoh1diKg== X-Google-Smtp-Source: APXvYqzJehEpgLdIDCqM4WDC2kjMzpyKpS6gSazcFAajnQv6WX2OG2/vBBhij3NWZjwxkUuanqw7ZA== X-Received: by 2002:a05:600c:2942:: with SMTP id n2mr4475858wmd.87.1582627504256; Tue, 25 Feb 2020 02:45:04 -0800 (PST) Return-Path: Received: from e123331-lin.home ([2a01:cb1d:112:6f00:816e:ff0d:fb69:f613]) by smtp.gmail.com with ESMTPSA id g14sm13218913wrv.58.2020.02.25.02.45.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2020 02:45:03 -0800 (PST) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: Ard Biesheuvel , lersek@redhat.com, eric.auger@redhat.com, philmd@redhat.com, marcandre.lureau@redhat.com, stefanb@linux.ibm.com, leif@nuviainc.com Subject: [PATCH v2 1/5] OvmfPkg/Tcg2ConfigPei: introduce a signalling PPI to depex on Date: Tue, 25 Feb 2020 11:44:45 +0100 Message-Id: <20200225104449.22453-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200225104449.22453-1-ard.biesheuvel@linaro.org> References: <20200225104449.22453-1-ard.biesheuvel@linaro.org> On ARM systems, the TPM does not live at a fixed address, and so we need the platform to discover it first. So introduce a PPI that signals that the TPM address has been discovered and recorded in the appropriate PCD, and make Tcg2ConfigPei depex on it when built for ARM or AARCH64. Reviewed-by: Laszlo Ersek Signed-off-by: Ard Biesheuvel --- OvmfPkg/OvmfPkg.dec | 5 +++++ OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/OvmfPkg/OvmfPkg.dec b/OvmfPkg/OvmfPkg.dec index 4c5b6511cb97..30faecb7a5c8 100644 --- a/OvmfPkg/OvmfPkg.dec +++ b/OvmfPkg/OvmfPkg.dec @@ -87,6 +87,11 @@ [Guids] gEfiLegacyBiosGuid = {0x2E3044AC, 0x879F, 0x490F, {0x97, 0x60, 0xBB, 0xDF, 0xAF, 0x69, 0x5F, 0x50}} gEfiLegacyDevOrderVariableGuid = {0xa56074db, 0x65fe, 0x45f7, {0xbd, 0x21, 0x2d, 0x2b, 0xdd, 0x8e, 0x96, 0x52}} +[Ppis] + # PPI whose presence in the PPI database signals that the TPM base address + # has been discovered and recorded + gOvmfTpmDiscoveredPpiGuid = {0xb9a61ad0, 0x2802, 0x41f3, {0xb5, 0x13, 0x96, 0x51, 0xce, 0x6b, 0xd5, 0x75}} + [Protocols] gVirtioDeviceProtocolGuid = {0xfa920010, 0x6785, 0x4941, {0xb6, 0xec, 0x49, 0x8c, 0x57, 0x9f, 0x16, 0x0a}} gXenBusProtocolGuid = {0x3d3ca290, 0xb9a5, 0x11e3, {0xb7, 0x5d, 0xb8, 0xac, 0x6f, 0x7d, 0x65, 0xe6}} diff --git a/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf b/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf index e34cd6210611..55684ba045b3 100644 --- a/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf +++ b/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf @@ -25,6 +25,7 @@ [Sources] [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec + OvmfPkg/OvmfPkg.dec SecurityPkg/SecurityPkg.dec [LibraryClasses] @@ -43,5 +44,8 @@ [Ppis] [Pcd] gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid ## PRODUCES -[Depex] +[Depex.IA32, Depex.X64] TRUE + +[Depex.ARM, Depex.AARCH64] + gOvmfTpmDiscoveredPpiGuid -- 2.17.1