From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smarthost01c.sbp.mail.zen.net.uk (smarthost01c.sbp.mail.zen.net.uk [212.23.1.5]) by mx.groups.io with SMTP id smtpd.web09.8182.1645169037241489739 for ; Thu, 17 Feb 2022 23:23:57 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=permerror, err=parse error for token &{10 18 sdn.klaviyomail.com}: permanent DNS error (domain: starlabs.systems, ip: 212.23.1.5, mailfrom: sean@starlabs.systems) Received: from [51.148.147.4] (helo=sean-StarBook.lan) by smarthost01c.sbp.mail.zen.net.uk with esmtp (Exim 4.90_1) (envelope-from ) id 1nKxcO-0005Ai-Ed; Fri, 18 Feb 2022 07:23:52 +0000 From: "Sean Rhodes" To: devel@edk2.groups.io Cc: guo.dong@intel.com, Matt DeVillier , Hao A Wu , Ray Ni , Jian J Wang , Liming Gao , Sean Rhodes Subject: [PATCH 1/2] MdeModulePkg/SdMmcPciHcDxe: Make timeout for SD card configurable Date: Fri, 18 Feb 2022 07:23:47 +0000 Message-Id: X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-Originating-smarthost01c-IP: [51.148.147.4] Feedback-ID: 51.148.147.4 Content-Transfer-Encoding: quoted-printable From: Matt DeVillier The default 1s timeout can delay boot splash on some hardware with no benefit. Cc: Hao A Wu Cc: Ray Ni Cc: Jian J Wang Cc: Liming Gao Signed-off-by: Matt DeVillier Signed-off-by: Sean Rhodes --- MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.h | 3 ++- MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf | 4 ++++ MdeModulePkg/Library/BrotliCustomDecompressLib/brotli | 2 +- MdeModulePkg/MdeModulePkg.dec | 4 ++++ MdeModulePkg/MdeModulePkg.uni | 4 ++++ 5 files changed, 15 insertions(+), 2 deletions(-) diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.h b/MdeModule= Pkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.h index 85e09cf114..b76c7cffa2 100644 --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.h +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.h @@ -24,6 +24,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include =0D #include =0D #include =0D +#include =0D =0D #include =0D #include =0D @@ -49,7 +50,7 @@ extern EDKII_SD_MMC_OVERRIDE *mOverride; //=0D // Generic time out value, 1 microsecond as unit.=0D //=0D -#define SD_MMC_HC_GENERIC_TIMEOUT 1 * 1000 * 1000=0D +#define SD_MMC_HC_GENERIC_TIMEOUT (PcdGet32 (PcdSdMmcGenericTimeoutValue)= )=0D =0D //=0D // SD/MMC async transfer timer interval, set by experience.=0D diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf b/MdeModu= lePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf index 453ecde7fd..a9d05736d7 100644 --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf @@ -56,6 +56,7 @@ BaseLib=0D UefiDriverEntryPoint=0D DebugLib=0D + PcdLib=0D =0D [Protocols]=0D gEdkiiSdMmcOverrideProtocolGuid ## SOMETIMES_CONSUMES=0D @@ -68,3 +69,6 @@ =0D [UserExtensions.TianoCore."ExtraFiles"]=0D SdMmcPciHcDxeExtra.uni=0D +=0D +[Pcd.IA32,Pcd.X64]=0D + gEfiMdeModulePkgTokenSpaceGuid.PcdSdMmcGenericTimeoutValue ## CONSUMES= =0D diff --git a/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli b/MdeMod= ulePkg/Library/BrotliCustomDecompressLib/brotli index f4153a09f8..666c3280cc 160000 --- a/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli +++ b/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli @@ -1 +1 @@ -Subproject commit f4153a09f87cbb9c826d8fc12c74642bb2d879ea +Subproject commit 666c3280cc11dc433c303d79a83d4ffbdd12cc8d diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec index 463e889e9a..40601c9583 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec @@ -1559,6 +1559,10 @@ # @Prompt Maximum permitted FwVol section nesting depth (exclusive).=0D gEfiMdeModulePkgTokenSpaceGuid.PcdFwVolDxeMaxEncapsulationDepth|0x10|UIN= T32|0x00000030=0D =0D + ## Indicates the default timeout value for SD/MMC Host Controller operat= ions in microseconds.=0D + # @Prompt SD/MMC Host Controller Operations Timeout (us).=0D + gEfiMdeModulePkgTokenSpaceGuid.PcdSdMmcGenericTimeoutValue|1000000|UINT3= 2|0x00000031=0D +=0D [PcdsPatchableInModule, PcdsDynamic, PcdsDynamicEx]=0D ## This PCD defines the Console output row. The default value is 25 acco= rding to UEFI spec.=0D # This PCD could be set to 0 then console output would be at max column= and max row.=0D diff --git a/MdeModulePkg/MdeModulePkg.uni b/MdeModulePkg/MdeModulePkg.uni index 27889a7280..b070f15ff2 100644 --- a/MdeModulePkg/MdeModulePkg.uni +++ b/MdeModulePkg/MdeModulePkg.uni @@ -1173,6 +1173,10 @@ = " TRUE - Capsule In Ram is supported.
"=0D = " FALSE - Capsule In Ram is not supported."=0D =0D +#string STR_gEfiMdeModulePkgTokenSpaceGuid_PcdSdMmcGenericTimeoutValue_PRO= MPT #language en-US "SD/MMC Host Controller Operations Timeout (us)."=0D +=0D +#string STR_gEfiMdeModulePkgTokenSpaceGuid_PcdSdMmcGenericTimeoutValue_HEL= P #language en-US "Indicates the default timeout value for SD/MMC Host Co= ntroller operations in microseconds."=0D +=0D #string STR_gEfiMdeModulePkgTokenSpaceGuid_PcdCodRelocationDevPath_PROMPT = #language en-US "Capsule On Disk relocation device path."=0D =0D #string STR_gEfiMdeModulePkgTokenSpaceGuid_PcdCodRelocationDevPath_HELP #= language en-US "Full device path of platform specific device to store Cap= sule On Disk temp relocation file.
"=0D --=20 2.32.0