From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by mx.groups.io with SMTP id smtpd.web10.36227.1643650628086783706 for ; Mon, 31 Jan 2022 09:37:08 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=tnNImyAk; spf=pass (domain: kernel.org, ip: 139.178.84.217, mailfrom: ardb@kernel.org) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 3EE7060FDD for ; Mon, 31 Jan 2022 17:37:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9B467C340F1 for ; Mon, 31 Jan 2022 17:37:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1643650626; bh=bJTzKzju4XEEAA7mCEyi31Js9sFGuEFwJpYdT75teVM=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=tnNImyAkUZWsWemRSqULETV15bRIfCO/NHm/0yNyPAZUcm53FAxXK6d8nqz83m/67 lopLOCocXhMSOIe8nEYM+8F7WtfKV9LReXEwhGAzjyBsWXfDt0gtwagAeY2b2UYVpW 1Bx0HGEorWyvhQn03/ZigIJ7oWBlPChF/W0ODswaWLcUy/Ktv86OaIb4AZLmAKlPla DgxpB8kroN3Upb+LTEHCtHD60Jw+M1I6ojVHlWpE9D1VXC2AqvDI5aAvebXGGxbcVQ 9kN8/czv/m1hMVH3KJX7tCEJeCMAfQ67sc0/nhPx95ktqMMAC2rBvyu3UdDBZ66R7G flbIjliFUeZqg== Received: by mail-wr1-f41.google.com with SMTP id e8so26964779wrc.0 for ; Mon, 31 Jan 2022 09:37:06 -0800 (PST) X-Gm-Message-State: AOAM530Bej8SHLrLe0XccXkUwYTft/Zj0vcFc7G1Eb42lh+mURxl9cY8 9x2PmzrremtfzGj5QIC979enxVtMw4FzcKPqOHU= X-Google-Smtp-Source: ABdhPJzMa28REHolrHvHcSIX4Efx+YQuMdMQ7Znj0zz4BHl02chT3OiywlxvKnfm+3zalcp76kRD2Hxu2nSE4YBTbL0= X-Received: by 2002:a05:6000:1c9:: with SMTP id t9mr18728281wrx.550.1643650624873; Mon, 31 Jan 2022 09:37:04 -0800 (PST) MIME-Version: 1.0 References: <20220128153818.29890-1-athierry@redhat.com> <977a518c-f2ab-ee70-e63a-f7f01846d80b@arm.com> In-Reply-To: <977a518c-f2ab-ee70-e63a-f7f01846d80b@arm.com> From: "Ard Biesheuvel" Date: Mon, 31 Jan 2022 18:36:52 +0100 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [edk2-devel] [edk2-platforms PATCH] Platform/RaspberryPi: Add 'clock-frequency' property for miniuart To: Jeremy Linton Cc: edk2-devel-groups-io , Adrien Thierry , Ard Biesheuvel , Leif Lindholm , Pete Batard Content-Type: text/plain; charset="UTF-8" On Mon, 31 Jan 2022 at 17:13, Jeremy Linton wrote: > > Hi, > > On 1/28/22 09:38, Adrien Thierry via groups.io wrote: > > Describe the miniuart clock frequency in a _DSD property, so that it can > > be read from the Linux driver. > > > > The miniuart clock frequency is the core clock frequency on the > > Raspberry Pi. It can be modified by the user using the 'core_freq' > > property in the config.txt file. So, we fetch it from the underlying > > Raspberry Pi firmware. > > Sorry about the delay, I've been out a bit. > > So, this all looks good to me, and it passes the patch checker, the > trick now will be landing the linux patch. > > > Thanks, > > Reviewed-by: Jeremy Linton > Thanks. Could this be resent without whitespace damage please? Also, a link the to Linux patch would be helpful. > > > > > > Signed-off-by: Adrien Thierry > > --- > > Platform/RaspberryPi/AcpiTables/Uart.asl | 14 ++++++++++++++ > > Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.c | 9 +++++++++ > > .../RaspberryPi/Drivers/ConfigDxe/ConfigDxe.inf | 1 + > > Platform/RaspberryPi/RPi3/RPi3.dsc | 5 +++++ > > Platform/RaspberryPi/RPi4/RPi4.dsc | 5 +++++ > > Platform/RaspberryPi/RaspberryPi.dec | 1 + > > 6 files changed, 35 insertions(+) > > > > diff --git a/Platform/RaspberryPi/AcpiTables/Uart.asl b/Platform/RaspberryPi/AcpiTables/Uart.asl > > index 974f06d3bc..ef5165be98 100644 > > --- a/Platform/RaspberryPi/AcpiTables/Uart.asl > > +++ b/Platform/RaspberryPi/AcpiTables/Uart.asl > > @@ -77,6 +77,20 @@ Device (URTM) > > MEMORY32SETBASE (RBUF, RMEM, RBAS, BCM2836_MINI_UART_OFFSET) > > > > Return (^RBUF) > > > > } > > > > + > > > > + // > > > > + // Mini Uart Clock Rate will be dynamically updated during boot > > > > + // 0x4D 0x55 0x43 0x52 0xC 0x1000000 (Value must be > 16777215) > > > > + // > > > > + Name (MUCR, 0x1000000) > > > > + > > > > + Name (_DSD, Package () > > > > + { > > > > + ToUUID ("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), Package () > > > > + { > > > > + Package (2) { "clock-frequency", MUCR }, > > > > + } > > > > + }) > > > > } > > > > > > > > // > > > > diff --git a/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.c b/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.c > > index 415d99fadb..3dcf2bac0d 100644 > > --- a/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.c > > +++ b/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.c > > @@ -44,6 +44,7 @@ STATIC RASPBERRY_PI_FIRMWARE_PROTOCOL *mFwProtocol; > > STATIC UINT32 mModelFamily = 0; > > > > STATIC UINT32 mModelInstalledMB = 0; > > > > STATIC UINT32 mModelRevision = 0; > > > > +STATIC UINT32 mCoreClockRate = 0; > > > > > > > > STATIC EFI_MAC_ADDRESS mMacAddress; > > > > > > > > @@ -798,6 +799,7 @@ STATIC CONST AML_NAME_OP_REPLACE SsdtEmmcNameOpReplace[] = { > > > > > > STATIC CONST AML_NAME_OP_REPLACE DsdtNameOpReplace[] = { > > > > { "URIU", PcdToken (PcdUartInUse) }, > > > > + { "MUCR", PcdToken (PcdMiniUartClockRate) }, > > > > { } > > > > }; > > > > > > > > @@ -944,6 +946,13 @@ ConfigInitialize ( > > DEBUG ((DEBUG_INFO, "Current Raspberry Pi revision %x\n", mModelRevision)); > > > > } > > > > > > > > + Status = mFwProtocol->GetClockRate (RPI_MBOX_CLOCK_RATE_CORE, &mCoreClockRate); > > > > + if (Status != EFI_SUCCESS) { > > > > + DEBUG ((DEBUG_ERROR, "Couldn't get the Raspberry Pi core clock rate: %r\n", Status)); > > > > + } else { > > > > + PcdSet32S (PcdMiniUartClockRate, mCoreClockRate); > > > > + } > > > > + > > > > Status = SetupVariables (); > > > > if (Status != EFI_SUCCESS) { > > > > DEBUG ((DEBUG_ERROR, "Couldn't not setup NV vars: %r\n", Status)); > > > > diff --git a/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.inf b/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.inf > > index e6e22ad82e..6f6e8f42ac 100644 > > --- a/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.inf > > +++ b/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.inf > > @@ -95,6 +95,7 @@ > > gRaspberryPiTokenSpaceGuid.PcdFanTemp > > > > gRaspberryPiTokenSpaceGuid.PcdUartInUse > > > > gRaspberryPiTokenSpaceGuid.PcdXhciPci > > > > + gRaspberryPiTokenSpaceGuid.PcdMiniUartClockRate > > > > > > > > [Depex] > > > > gPcdProtocolGuid AND gRaspberryPiFirmwareProtocolGuid > > > > diff --git a/Platform/RaspberryPi/RPi3/RPi3.dsc b/Platform/RaspberryPi/RPi3/RPi3.dsc > > index 6ab5d1ae6d..6dc48dc233 100644 > > --- a/Platform/RaspberryPi/RPi3/RPi3.dsc > > +++ b/Platform/RaspberryPi/RPi3/RPi3.dsc > > @@ -561,6 +561,11 @@ > > # > > > > gRaspberryPiTokenSpaceGuid.PcdUartInUse|1 > > > > > > > > + # > > > > + # Mini-UART clock rate > > > > + # > > > > + gRaspberryPiTokenSpaceGuid.PcdMiniUartClockRate|250000000 > > > > + > > > > ################################################################################ > > > > # > > > > # Components Section - list of all EDK II Modules needed by this Platform > > > > diff --git a/Platform/RaspberryPi/RPi4/RPi4.dsc b/Platform/RaspberryPi/RPi4/RPi4.dsc > > index 44ed60ab2f..a9c0c36bb1 100644 > > --- a/Platform/RaspberryPi/RPi4/RPi4.dsc > > +++ b/Platform/RaspberryPi/RPi4/RPi4.dsc > > @@ -580,6 +580,11 @@ > > # > > > > gRaspberryPiTokenSpaceGuid.PcdUartInUse|0 > > > > > > > > + # > > > > + # Mini-UART clock rate > > > > + # > > > > + gRaspberryPiTokenSpaceGuid.PcdMiniUartClockRate|500000000 > > > > + > > > > ################################################################################ > > > > # > > > > # Components Section - list of all EDK II Modules needed by this Platform > > > > diff --git a/Platform/RaspberryPi/RaspberryPi.dec b/Platform/RaspberryPi/RaspberryPi.dec > > index 797be59274..17b6061a05 100644 > > --- a/Platform/RaspberryPi/RaspberryPi.dec > > +++ b/Platform/RaspberryPi/RaspberryPi.dec > > @@ -72,3 +72,4 @@ > > gRaspberryPiTokenSpaceGuid.PcdMmcEnableDma|0|UINT32|0x0000001F > > > > gRaspberryPiTokenSpaceGuid.PcdUartInUse|1|UINT32|0x00000021 > > > > gRaspberryPiTokenSpaceGuid.PcdXhciPci|0|UINT32|0x00000022 > > > > + gRaspberryPiTokenSpaceGuid.PcdMiniUartClockRate|0|UINT32|0x00000023 > > >