From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.88; helo=mga01.intel.com; envelope-from=david.wei@intel.com; receiver=edk2-devel@lists.01.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 1EB5321F7D4EF for ; Thu, 12 Oct 2017 22:36:28 -0700 (PDT) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Oct 2017 22:39:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.43,369,1503385200"; d="scan'208";a="909520055" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by FMSMGA003.fm.intel.com with ESMTP; 12 Oct 2017 22:39:59 -0700 Received: from fmsmsx157.amr.corp.intel.com (10.18.116.73) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.319.2; Thu, 12 Oct 2017 22:39:58 -0700 Received: from shsmsx104.ccr.corp.intel.com (10.239.4.70) by FMSMSX157.amr.corp.intel.com (10.18.116.73) with Microsoft SMTP Server (TLS) id 14.3.319.2; Thu, 12 Oct 2017 22:39:58 -0700 Received: from shsmsx151.ccr.corp.intel.com ([169.254.3.98]) by SHSMSX104.ccr.corp.intel.com ([169.254.5.152]) with mapi id 14.03.0319.002; Fri, 13 Oct 2017 13:39:56 +0800 From: "Wei, David" To: "Lu, ShifeiX A" , "edk2-devel@lists.01.org" Thread-Topic: [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Blue tooth device. Thread-Index: AQHTQ+Vxj0RoQnvBEkuehz339Vu0VaLhQ33g Date: Fri, 13 Oct 2017 05:39:55 +0000 Message-ID: <89954A0B46707A448411A627AD4EEE3468FA43AA@SHSMSX151.ccr.corp.intel.com> References: <8cc2e618-3c74-41af-bd36-41650e408f5a@SHWDEOPENPSI011.local> In-Reply-To: <8cc2e618-3c74-41af-bd36-41650e408f5a@SHWDEOPENPSI011.local> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.0.0.116 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Blue tooth device. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Oct 2017 05:36:28 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: zwei4 Thanks, David Wei Intel SSG/STO/UEFI BIOS =20 > -----Original Message----- > From: Lu, ShifeiX A > Sent: Friday, October 13, 2017 1:38 PM > To: edk2-devel@lists.01.org > Cc: Wei, David > Subject: [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Blue tooth > device. >=20 > Use Pcd to select blue tooth device. >=20 > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: lushifex > --- > .../Board/MinnowBoard3/BoardInitPostMem/BoardInit.c | 7 > +++++++ > .../Board/MinnowBoard3/BoardInitPostMem/BoardInitMiscs.h | 7 > +++++++ > .../Board/MinnowBoard3/BoardInitPostMem/BoardInitPostMem.inf | 1 + > .../BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatform.c | 2 > +- > .../Common/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf | 1 + > .../PlatformSettings/PlatformSetupDxe/SouthClusterConfig.vfi | 2 += + > Platform/BroxtonPlatformPkg/PlatformPkg.dec | 2 += + > 7 files changed, 21 insertions(+), 1 deletion(-) >=20 > diff --git > a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/ > BoardInit.c > b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/ > BoardInit.c > index 0aa9246..60a9d5b 100644 > --- > a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/ > BoardInit.c > +++ > b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/ > BoardInit.c > @@ -57,6 +57,7 @@ MinnowBoard3PostMemInitCallback ( > UINT8 BoardId; > UINT8 FabId; > UINT8 ResetType; > + UINT8 BtDevice; > UINTN BufferSize; >=20 > Status =3D PeiServicesLocatePpi ( > @@ -92,6 +93,12 @@ MinnowBoard3PostMemInitCallback ( > PcdSet8 (PcdResetType, (UINT8) ResetType); >=20 > // > + // Select bluetooth device. > + // > + BtDevice =3D SELECT_BLUE_TOOTH_BCM2E40; > + PcdSet8 (PcdBtDevice, (UINT8) BtDevice); > + > + // > // Board specific VBT table. > // > BufferSize =3D sizeof (EFI_GUID); > diff --git > a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/ > BoardInitMiscs.h > b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/ > BoardInitMiscs.h > index 2c8c7eb..37faf87 100644 > --- > a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/ > BoardInitMiscs.h > +++ > b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/ > BoardInitMiscs.h > @@ -23,6 +23,13 @@ > // > #define RES_MEM32_MIN_LEN 0x38000000 >=20 > +// > +// Bluetooth device identifier. > +// > +#define SELECT_BLUE_TOOTH_DISABLE 0x00 > +#define SELECT_BLUE_TOOTH_BCM2E40 0x01 > +#define SELECT_BLUE_TOOTH_BCM2EA1 0x02 > + > #define RES_IO_BASE 0x0D00 > #define RES_IO_LIMIT 0xFFFF >=20 > diff --git > a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/ > BoardInitPostMem.inf > b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/ > BoardInitPostMem.inf > index 8fa5ffa..9b42a9f 100644 > --- > a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/ > BoardInitPostMem.inf > +++ > b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/ > BoardInitPostMem.inf > @@ -60,6 +60,7 @@ > gPlatformModuleTokenSpaceGuid.PcdResetType > gPlatformModuleTokenSpaceGuid.PcdBoardVbtFileGuid > gPlatformModuleTokenSpaceGuid.PcdSueCreek > + gPlatformModuleTokenSpaceGuid.PcdBtDevice >=20 > [Guids] > gEfiPlatformInfoGuid > diff --git > a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatfo > rm.c > b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatfo > rm.c > index f0a77d1..d0c668e 100644 > --- > a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatfo > rm.c > +++ > b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatfo > rm.c > @@ -1456,7 +1456,7 @@ AcpiPlatformEntryPoint ( > mGlobalNvsArea.Area->Rtd3Support =3D > mSystemConfiguration.Rtd3Support; > mGlobalNvsArea.Area->RTD3Config0 =3D > mSystemConfiguration.RTD3ZPODD; > mGlobalNvsArea.Area->EnableModernStandby =3D > mSystemConfiguration.ConsolidatedPR; > - mGlobalNvsArea.Area->SelectBtDevice =3D > mSystemConfiguration.SelectBtDevice; > + mGlobalNvsArea.Area->SelectBtDevice =3D (UINT8) PcdGet= 8 > (PcdBtDevice); > mGlobalNvsArea.Area->ScHdAudioIoBufferOwnership =3D > mSystemConfiguration.ScHdAudioIoBufferOwnership; > mGlobalNvsArea.Area->XdciEnable =3D > mSystemConfiguration.ScUsbOtg; > mGlobalNvsArea.Area->PciDelayOptimizationEcr =3D > mSystemConfiguration.PciDelayOptimizationEcr; > diff --git > a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatfo > rmDxe.inf > b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatfo > rmDxe.inf > index be047c1..9d451f5 100644 > --- > a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatfo > rmDxe.inf > +++ > b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatfo > rmDxe.inf > @@ -87,6 +87,7 @@ > gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress > gPlatformModuleTokenSpaceGuid.PcdResetType > gPlatformModuleTokenSpaceGuid.PcdSueCreek > + gPlatformModuleTokenSpaceGuid.PcdBtDevice >=20 > [Depex] > gEfiAcpiSupportProtocolGuid AND > diff --git > a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupD > xe/SouthClusterConfig.vfi > b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetup > Dxe/SouthClusterConfig.vfi > index 1b0e93d..448105c 100644 > --- > a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupD > xe/SouthClusterConfig.vfi > +++ > b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetup > Dxe/SouthClusterConfig.vfi > @@ -186,6 +186,7 @@ form formid =3D MISC_OPTIONS_FORM_ID, > subtitle text =3D STRING_TOKEN(STR_NULL_STRING); > subtitle text =3D STRING_TOKEN(STR_LPSS_DEVICE_SETTING_SUBTITLE); >=20 > +suppressif TRUE; > oneof varid =3D SETUP_DATA.SelectBtDevice, > prompt =3D STRING_TOKEN(STR_PCH_SERIAL_IO_BLUETOOTH_DEVICE), > help =3D STRING_TOKEN(STR_PCH_SERIAL_IO_BLUETOOTH_HELP), > @@ -193,6 +194,7 @@ form formid =3D MISC_OPTIONS_FORM_ID, > option text =3D STRING_TOKEN(STR_BT_BCM2E40), value =3D 1, flags = =3D > RESET_REQUIRED; > // option text =3D STRING_TOKEN(STR_BT_BCM2EA1), value =3D 2, flags= =3D > RESET_REQUIRED; > endoneof; > +endif; >=20 > oneof varid =3D Setup.I2s343A, > prompt =3D STRING_TOKEN(STR_I2C_DEVICE_CODEC_INT343A_PROMPT), > diff --git a/Platform/BroxtonPlatformPkg/PlatformPkg.dec > b/Platform/BroxtonPlatformPkg/PlatformPkg.dec > index f37ceaf..3945b66 100644 > --- a/Platform/BroxtonPlatformPkg/PlatformPkg.dec > +++ b/Platform/BroxtonPlatformPkg/PlatformPkg.dec > @@ -184,6 +184,8 @@ > gPlatformModuleTokenSpaceGuid.PcdBoardVbtFileGuid|{ 0x00, 0x00, 0x00, > 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > 0x00 }|VOID*|0x80000014 > ## This PCD used to enable or disable SueCreek >=20 > gPlatformModuleTokenSpaceGuid.PcdSueCreek|FALSE|BOOLEAN|0x800000 > 15 > + ## This PCD used to select bluetooth device > + gPlatformModuleTokenSpaceGuid.PcdBtDevice|0x00|UINT8|0x80000016 >=20 > ## MemoryCheck value for checking memory before boot OS. > ## To save the boot performance, the default MemoryCheck is set to 0. > -- > 2.7.0.windows.1 >=20