From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by mx.groups.io with SMTP id smtpd.web08.13898.1644339340076840612 for ; Tue, 08 Feb 2022 08:55:40 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=eUiNIG1U; spf=pass (domain: kernel.org, ip: 145.40.68.75, 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 ams.source.kernel.org (Postfix) with ESMTPS id D9EA4B819AB for ; Tue, 8 Feb 2022 16:55:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 22B42C340F2 for ; Tue, 8 Feb 2022 16:55:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1644339336; bh=9bnHINJAlpjNHzN4lxn9bK47HaYyIo/hySRcGlm+bHA=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=eUiNIG1UomCj79I+jU5i+V8XO3WbXmh4I1qPnCb5mRaebuSWHbpncroOHGI5r7WwK 2fcqN+QKjyJ26cngdBOgzt48pVW1sNYL0+GRhLRqcLFi5ZbCg+3iLjwahqkohZvUdz nkrHhCk2LHJhcX5gIT6VC2qJtKzlNx/lIAQuXVtl/PUxy9VIPErfuBQ27RErx/kqCQ TfsE9erBklZHvLnLphWo0CcNGj6yJalWcKLEN3cZHmKnZWl87kBf8dwEoCBTlqQY29 DetUdAufSXwc8Wk3wY8pua4zWmLYzm0PTw+QY7oTP445UUHQHi4lRtn6rv2H00qoz/ Ocif9WR4yTa4w== Received: by mail-wr1-f44.google.com with SMTP id k1so15374314wrd.8 for ; Tue, 08 Feb 2022 08:55:36 -0800 (PST) X-Gm-Message-State: AOAM5338zXWklmM+34xC/796b4FGnljaQCAnf/QcvLzR/PB+6ZEL1jMX rMhWHRMSMxGvq5G92AcO7is7X9xVgK47r0Jg6bU= X-Google-Smtp-Source: ABdhPJw5I76f0GUg01rfOtTYMtgXi6uGInzbk7zmo9Vphj0gl+t34ijD6oCSi1wZhTkIaxze0ZL6lWlSVSoMn1SxcFM= X-Received: by 2002:adf:9123:: with SMTP id j32mr4200936wrj.189.1644339334237; Tue, 08 Feb 2022 08:55:34 -0800 (PST) MIME-Version: 1.0 References: <20220208154527.36689-1-athierry@redhat.com> In-Reply-To: <20220208154527.36689-1-athierry@redhat.com> From: "Ard Biesheuvel" Date: Tue, 8 Feb 2022 17:55:22 +0100 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [edk2-platforms PATCH v2] Platform/RaspberryPi: Add 'clock-frequency' property for miniuart To: Adrien Thierry Cc: edk2-devel-groups-io , Ard Biesheuvel , Leif Lindholm , Pete Batard , Jeremy Linton Content-Type: text/plain; charset="UTF-8" On Tue, 8 Feb 2022 at 16:45, Adrien Thierry wrote: > > Describe the miniuart clock frequency in a _DSD property, so that it can > be read from the Linux driver [1] > > 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. > > [1] https://lore.kernel.org/all/20220207232129.402882-1-athierry@redhat.com/ > > Signed-off-by: Adrien Thierry Reviewed-by: Ard Biesheuvel Pushed as 824f19153f9d..b0f3f903720e Thanks, Ard. > --- > V1 -> V2: added link to the Linux patch > > The Linux patch [1] has been merged into Greg Kroah-Hartman's tty tree > https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git/commit/?h=tty-testing&id=fcc446c8aa6303b247b0d88f460167b731265282 > > 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 > -- > 2.17.1 >