From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web09.32995.1623052489921755513 for ; Mon, 07 Jun 2021 00:54:50 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: sunny.wang@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 8D8D031B; Mon, 7 Jun 2021 00:54:49 -0700 (PDT) Received: from localhost.localdomain (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 7F6943F719; Mon, 7 Jun 2021 00:54:47 -0700 (PDT) From: "Sunny Wang" To: devel@edk2.groups.io Cc: Sunny Wang , Samer El-Haj-Mahmoud , Sami Mujawar , Jeremy Linton , Pete Batard , Ard Biesheuvel , =?UTF-8?q?Mario=20B=C4=83l=C4=83nic=C4=83?= , Sunny Wang Subject: [PATCH v4 3/3] Platform/RaspberryPi: Enable Bluetooth and UART in Windows OS Date: Mon, 7 Jun 2021 15:53:39 +0800 Message-Id: <20210607075339.342-4-Sunny.Wang@arm.com> X-Mailer: git-send-email 2.31.0.windows.1 In-Reply-To: <20210607075339.342-1-Sunny.Wang@arm.com> References: <20210607075339.342-1-Sunny.Wang@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable This change is based on edk2-platforms-raspberrypi-pl011-bth-noflow.diff in https://github.com/worproject/RPi-Bluetooth-Testing/ with the modifications and additional changes below for enabling Bluetooth and serial port (Mini UART) in Windows IOT. - Remove RPIQ connection for BT_ON/OFF in Uart.asl because it is useless. The firmware already turns on the Bluetooth by default. - Move the GPIO pin muxing stuff from Uart.asl to ConfigDxe driver. Testing Done: - Successfully booted Windows Windows 10 IOT (20279.1) on SD (made by WOR) with the RPi-Windows-Drivers release ver 0.5 downloaded from https://github.com/worproject/RPi-Windows-Drivers/releases and checked that both Bluetooth and serial port (Mini UART) can work fine. - Successfully booted VMware ESXi-Arm Fling v1.3 with only serial console connection (PL011 UART). Cc: Samer El-Haj-Mahmoud Cc: Sami Mujawar Cc: Jeremy Linton Cc: Pete Batard Cc: Ard Biesheuvel Cc: Mario B=C4=83l=C4=83nic=C4=83 Signed-off-by: Sunny Wang --- Platform/RaspberryPi/AcpiTables/Uart.asl | 16 -------------- .../RaspberryPi/Drivers/ConfigDxe/ConfigDxe.c | 22 +++++++++++++++++++ 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/Platform/RaspberryPi/AcpiTables/Uart.asl b/Platform/Raspberr= yPi/AcpiTables/Uart.asl index bac9d791eb..167f94e889 100644 --- a/Platform/RaspberryPi/AcpiTables/Uart.asl +++ b/Platform/RaspberryPi/AcpiTables/Uart.asl @@ -71,14 +71,6 @@ Device (URTM) MEMORY32FIXED (ReadWrite, 0, BCM2836_MINI_UART_LENGTH, RMEM) Interrupt(ResourceConsumer, Level, ActiveHigh, Shared) { BCM2836_MIN= I_UART_INTERRUPT } =20 - // NTRAID#MSFT-7141401-2016/04/7-jordanrh - disable UART muxing - // until a proper solution can be created for the dmap conflict. - // When muxing is enabled, must consider DBG2 table conflict. - // The alternate function resource needs to be reserved when - // the kernel debugger is enabled to prevent another client - // from muxing the pins away. - - // PinFunction (Exclusive, PullDown, BCM_ALT5, "\\_SB.GPI0", 0, Reso= urceConsumer, , ) { 14, 15 } }) Method (_CRS, 0x0, Serialized) { @@ -143,10 +135,6 @@ Device(BTH0) UAR0, // DescriptorName: creates name // for offset of resource descriptor ) // Vendor data - // - // RPIQ connection for BT_ON/OFF - // - GpioIO (Shared, PullUp, 0, 0, IoRestrictionNone, "\\_SB.GDV0.RPIQ", = 0, ResourceConsumer, , ) { 128 } }) =20 // @@ -190,10 +178,6 @@ Device(BTH0) UARM, // DescriptorName: creates name // for offset of resource descriptor ) // Vendor data - // - // RPIQ connection for BT_ON/OFF - // - GpioIO (Shared, PullUp, 0, 0, IoRestrictionNone, "\\_SB.GDV0.RPIQ", = 0, ResourceConsumer, , ) { 128 } }) =20 Method (_CRS, 0x0, Serialized) diff --git a/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.c b/Platfor= m/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.c index d6efb59793..cf9880bd20 100644 --- a/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.c +++ b/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.c @@ -618,6 +618,28 @@ ApplyVariables ( DEBUG ((DEBUG_INFO, "Fan enabled on GPIO %d\n", FanOnGpio)); GpioPinFuncSet (FanOnGpio, GPIO_FSEL_OUTPUT); } + + // + // Fake the CTS signal as we don't support HW flow control yet. + // Pin 31 must be held LOW so that we can talk to the BT chip + // without flow control + // + GpioPinFuncSet (31, GPIO_FSEL_OUTPUT); + GpioPinConfigure (31, CLEAR_GPIO); + + // + // Bluetooth pin muxing + // + if ((PcdGet32 (PcdUartInUse) =3D=3D PL011_UART_IN_USE)) { + DEBUG ((DEBUG_INFO, "Enable Bluetooth over MiniUART\n")); + GpioPinFuncSet (32, GPIO_FSEL_ALT5); + GpioPinFuncSet (33, GPIO_FSEL_ALT5); + } else { + DEBUG ((DEBUG_INFO, "Enable Bluetooth over PL011 UART\n")); + GpioPinFuncSet (32, GPIO_FSEL_ALT3); + GpioPinFuncSet (33, GPIO_FSEL_ALT3); + } + } =20 =20 --=20 2.31.0.windows.1