From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by mx.groups.io with SMTP id smtpd.web09.3648.1578390487093651689 for ; Tue, 07 Jan 2020 01:48:07 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=T9MhOEKL; spf=pass (domain: linaro.org, ip: 209.85.128.66, mailfrom: ard.biesheuvel@linaro.org) Received: by mail-wm1-f66.google.com with SMTP id 20so18578798wmj.4 for ; Tue, 07 Jan 2020 01:48:06 -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 :mime-version:content-transfer-encoding; bh=/PfD98jGNfEm3igDsPx4zuDBDBPw7pdp30YdkS1SV6g=; b=T9MhOEKLdd/KQaBOHiDgHJetxqj7GYNJJSRql110d3Dlg39l3v6eoaucXImsAGZQRL QV20qrVlW1opYhzO1j1pTPgp22/D8z45QgEpvlHgTfWow+ABOJOKjwYI2zRVmF+LyTH5 FvQn2A86a9g/r2zAjj4oYmF/pfZjuVVy+qFaqvi8uZtxOVNL+Xc5YWR4vZl1aimoeEf0 EIKFDqEJur//R/IoHu/KCRvAF2bW0E7biQwr3HRKMiKOn7XwsXQVHw2ebnMcYM0AC7Sq 3/BADv4nNz7AeNLlGVJjO7XLOrLaWJKAfd/D5uFlb9vQ25VdBYRUyWHG77o716psby/h Btug== 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:mime-version:content-transfer-encoding; bh=/PfD98jGNfEm3igDsPx4zuDBDBPw7pdp30YdkS1SV6g=; b=GhtMYscMZDv3JF5nQlwooLOiQZDhNHRj86qGpIYJbHWCIZ8sUVvbl132SmDFgJidGd /hEJEWAeRLAtrb4Qtxhg1Pa6I/ADdpssMTmbfeyRYNOeNDmGeLuam831Gpkplh44nVZR JOSAhdNxVIGglV4cr5n4L/D0wKoRX6dU80OtyIvTAP3Uz2HQgtwvZ9SolVD4bRtrTIMU fwvJ6oeql3Z2Gg7F1ssCKtcrJYPtLomR+kCjjAoMOAofeFczotK5Hb+Ck5SVdKAymEls gqkNrYU3hLsta07zr2qE/V8kS0LzrvYfqGONsi6Gm/lt9B25n1FSMsc/e+G6IJWR3t+a DP9A== X-Gm-Message-State: APjAAAUN96MjmpuNwX0oohMtbQ/hLEudbYhu9NIJWR9cwpMscKLI1dSE aUkU39cpVUiw9mruPpt65uIwgHpfKgKU8Q== X-Google-Smtp-Source: APXvYqyBQJkcBAcL5nubEIq7Lu6jM1gpWWbAPVfU1JyPlibBAFNESRmM8SHt1fhUbr/dk2Ra47vlKQ== X-Received: by 2002:a05:600c:21ce:: with SMTP id x14mr37306533wmj.120.1578390485436; Tue, 07 Jan 2020 01:48:05 -0800 (PST) Return-Path: Received: from localhost.localdomain ([2a01:cb1d:112:6f00:cc7e:d2b6:8b0c:cb36]) by smtp.gmail.com with ESMTPSA id u1sm25870210wmc.5.2020.01.07.01.48.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 01:48:04 -0800 (PST) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: lersek@redhat.com, Ard Biesheuvel Subject: [PATCH 1/4] OvmfPkg/Tcg2ConfigPei: introduce a signalling PPI to depex on Date: Tue, 7 Jan 2020 10:47:57 +0100 Message-Id: <20200107094800.4488-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200107094800.4488-1-ard.biesheuvel@linaro.org> References: <20200107094800.4488-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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. Signed-off-by: Ard Biesheuvel --- OvmfPkg/OvmfPkg.dec | 4 ++++ OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/OvmfPkg/OvmfPkg.dec b/OvmfPkg/OvmfPkg.dec index d5fee805ef4a..10a2b714c1b4 100644 --- a/OvmfPkg/OvmfPkg.dec +++ b/OvmfPkg/OvmfPkg.dec @@ -101,6 +101,10 @@ [Protocols] gEfiLegacyInterruptProtocolGuid = {0x31ce593d, 0x108a, 0x485d, {0xad, 0xb2, 0x78, 0xf2, 0x1f, 0x29, 0x66, 0xbe}} gEfiVgaMiniPortProtocolGuid = {0xc7735a2f, 0x88f5, 0x4882, {0xae, 0x63, 0xfa, 0xac, 0x8c, 0x8b, 0x86, 0xb3}} +[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}} + [PcdsFixedAtBuild] gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvBase|0x0|UINT32|0 gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvSize|0x0|UINT32|1 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.20.1