From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lj1-f181.google.com (mail-lj1-f181.google.com [209.85.208.181]) by mx.groups.io with SMTP id smtpd.web11.5973.1626265859990057797 for ; Wed, 14 Jul 2021 05:31:00 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@semihalf-com.20150623.gappssmtp.com header.s=20150623 header.b=iGFGlayL; spf=none, err=SPF record not found (domain: semihalf.com, ip: 209.85.208.181, mailfrom: gjb@semihalf.com) Received: by mail-lj1-f181.google.com with SMTP id y7so2702839ljm.1 for ; Wed, 14 Jul 2021 05:30:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fYo1cHOnudbjXhkxeXCB724ZaZ86x8LufJYX5IKRwwA=; b=iGFGlayL+E32l499G6IOSip8mrtXCLl1KQTiCkEyn9lDOXE0pqz2ilZ9YZ2Eg2YWMv gSGr15QcBdfuoF38USaqaPSagRV0RNQURTv3yiPC0GLbFQt9mvkGra7aRcsKWfvCV1jV DHci2PjhWeLPWkGv9sROiZFmWESc0UZLCw40vmX1SaT9637dxWzm0XLpClIc2aN4uMtS mmf5vRrEocfcC0VOwaJviuHpradWnRluFX1ahjzaNvyrIr11Eedo0lmGt5HdG2BW5jxO CgtGMMhbXiZCVUsRJSOfZiFEog0m4rB9+8HueqmOfyy9FEPk/qAaJv0KN9KLLEj7zPQm yAbQ== 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=fYo1cHOnudbjXhkxeXCB724ZaZ86x8LufJYX5IKRwwA=; b=ECI/FNZWoisim//Uiws2AupdgDJqPr3sscNwSM6sP38eqR8C61EbkDmjxlwCo+o+ig OYJRa1iO7z/h2X+vnCEyG5qXOCuPwufnPOLjhpaTydxqycLGlFuwVxm4BEonByPNiKrk mX/r2BVyreh5bDZ8tzCFMEn8tVRj+/Y1SSD8IedZzakagJcuPG6ieG6blwUv7TNm5gpn YjFBfk1Mi0plaXeFOj0w1YohFfbzRxwGuTbPRjTSCWX4KbDOR6bgPidk/4XaVT9r2NZj U7vrdXn0ce7v3MfRbEz9uuveC3aec6F4Ph59wjpokOLq8mC+pNepwGNzEj9cPlzgU0a3 dBUA== X-Gm-Message-State: AOAM533mfqumDf9PYxFyRlh7rJI38V07Y6JyT2x0N923UsEEuWAjiqaO llCe5mk4kyYQt/V5ZJDPqa2h6NdiK6zFr5gd X-Google-Smtp-Source: ABdhPJya7H4QExc3eozSQKdMikjFWNA9NaUTxVa7MFRJRHKlK4AP5eUnK6lqhGfl9v/Xc/fcl7nbpg== X-Received: by 2002:a2e:94cf:: with SMTP id r15mr8989855ljh.362.1626265858128; Wed, 14 Jul 2021 05:30:58 -0700 (PDT) Return-Path: Received: from gilgamesh.lab.semihalf.net ([83.142.187.85]) by smtp.gmail.com with ESMTPSA id d24sm155525lfa.243.2021.07.14.05.30.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 05:30:57 -0700 (PDT) From: "Grzegorz Bernacki" To: devel@edk2.groups.io Cc: leif@nuviainc.com, ardb+tianocore@kernel.org, Samer.El-Haj-Mahmoud@arm.com, sunny.Wang@arm.com, mw@semihalf.com, upstream@semihalf.com, jiewen.yao@intel.com, jian.j.wang@intel.com, min.m.xu@intel.com, lersek@redhat.com, sami.mujawar@arm.com, afish@apple.com, ray.ni@intel.com, jordan.l.justen@intel.com, rebecca@bsdio.com, grehan@freebsd.org, thomas.abraham@arm.com, chasel.chiu@intel.com, nathaniel.l.desimone@intel.com, gaoliming@byosoft.com.cn, eric.dong@intel.com, michael.d.kinney@intel.com, zailiang.sun@intel.com, yi.qian@intel.com, graeme@nuviainc.com, rad@semihalf.com, pete@akeo.ie, Grzegorz Bernacki Subject: [edk2-platforms PATCH v6 2/4] ARM Silicon and Platforms: add SecureBootVariableLib class resolution Date: Wed, 14 Jul 2021 14:30:43 +0200 Message-Id: <20210714123045.1340940-3-gjb@semihalf.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20210714123045.1340940-1-gjb@semihalf.com> References: <20210714123045.1340940-1-gjb@semihalf.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The edk2 patch SecurityPkg: Create library for setting Secure Boot variables. removes generic functions from SecureBootConfigDxe and places them into SecureBootVariableLib. This patch adds SecureBootVariableLib mapping for each ARM platform which uses SecureBootConfigDxe. Signed-off-by: Grzegorz Bernacki Reviewed-by: Graeme Gregory #SbsaQemu Reviewed by: Sami Mujawar #ArmVExpress --- Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 2 ++ Platform/Qemu/SbsaQemu/SbsaQemu.dsc | 2 ++ Platform/RaspberryPi/RPi3/RPi3.dsc | 2 ++ Platform/RaspberryPi/RPi4/RPi4.dsc | 2 ++ Platform/Socionext/DeveloperBox/DeveloperBox.dsc | 5 +++++ 5 files changed, 13 insertions(+) diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc index fee7cfcc2d..d6f31ecda4 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc +++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc @@ -129,6 +129,8 @@ !if $(SECURE_BOOT_ENABLE) == TRUE TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf + SecureBootVariableLib|SecurityPkg/Library/SecureBootVariableLib/SecureBootVariableLib.inf + SecureBootVariableProvisionLib|SecurityPkg/Library/SecureBootVariableProvisionLib/SecureBootVariableProvisionLib.inf # re-use the UserPhysicalPresent() dummy implementation from the ovmf tree PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf diff --git a/Platform/Qemu/SbsaQemu/SbsaQemu.dsc b/Platform/Qemu/SbsaQemu/SbsaQemu.dsc index 11ce361cdb..063a45b3ce 100644 --- a/Platform/Qemu/SbsaQemu/SbsaQemu.dsc +++ b/Platform/Qemu/SbsaQemu/SbsaQemu.dsc @@ -156,6 +156,8 @@ DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE # TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf + SecureBootVariableLib|SecurityPkg/Library/SecureBootVariableLib/SecureBootVariableLib.inf + SecureBootVariableProvisionLib|SecurityPkg/Library/SecureBootVariableProvisionLib/SecureBootVariableProvisionLib.inf # re-use the UserPhysicalPresent() dummy implementation from the ovmf tree PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf diff --git a/Platform/RaspberryPi/RPi3/RPi3.dsc b/Platform/RaspberryPi/RPi3/RPi3.dsc index 53825bcf62..a47069cc39 100644 --- a/Platform/RaspberryPi/RPi3/RPi3.dsc +++ b/Platform/RaspberryPi/RPi3/RPi3.dsc @@ -167,6 +167,8 @@ # re-use the UserPhysicalPresent() dummy implementation from the ovmf tree PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf + SecureBootVariableLib|SecurityPkg/Library/SecureBootVariableLib/SecureBootVariableLib.inf + SecureBootVariableProvisionLib|SecurityPkg/Library/SecureBootVariableProvisionLib/SecureBootVariableProvisionLib.inf !else TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf diff --git a/Platform/RaspberryPi/RPi4/RPi4.dsc b/Platform/RaspberryPi/RPi4/RPi4.dsc index fd73c4d14b..79e2571d62 100644 --- a/Platform/RaspberryPi/RPi4/RPi4.dsc +++ b/Platform/RaspberryPi/RPi4/RPi4.dsc @@ -164,6 +164,8 @@ !if $(SECURE_BOOT_ENABLE) == TRUE TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf + SecureBootVariableLib|SecurityPkg/Library/SecureBootVariableLib/SecureBootVariableLib.inf + SecureBootVariableProvisionLib|SecurityPkg/Library/SecureBootVariableProvisionLib/SecureBootVariableProvisionLib.inf # re-use the UserPhysicalPresent() dummy implementation from the ovmf tree PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc index 88454c1f90..9af262a2d1 100644 --- a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc +++ b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc @@ -52,6 +52,11 @@ MmUnblockMemoryLib|MdePkg/Library/MmUnblockMemoryLib/MmUnblockMemoryLibNull.inf +!if $(SECURE_BOOT_ENABLE) == TRUE + SecureBootVariableLib|SecurityPkg/Library/SecureBootVariableLib/SecureBootVariableLib.inf + SecureBootVariableProvisionLib|SecurityPkg/Library/SecureBootVariableProvisionLib/SecureBootVariableProvisionLib.inf +!endif + [LibraryClasses.common.SEC] PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf -- 2.25.1