From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=pass header.i=@akeo-ie.20150623.gappssmtp.com header.s=20150623 header.b=hqeowKPT; spf=none, err=permanent DNS error (domain: akeo.ie, ip: 209.85.208.68, mailfrom: pete@akeo.ie) Received: from mail-ed1-f68.google.com (mail-ed1-f68.google.com [209.85.208.68]) by groups.io with SMTP; Wed, 03 Jul 2019 05:09:04 -0700 Received: by mail-ed1-f68.google.com with SMTP id k8so1830779eds.7 for ; Wed, 03 Jul 2019 05:09:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akeo-ie.20150623.gappssmtp.com; s=20150623; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=Xs7AD5ZtHO8D25J+mF6J0maqekp1B1CTaRmAf3PL/BI=; b=hqeowKPTFSWdblzQKfIDF9Dl6y79bINMiS1GobgjmcHw2GTOuMcOcd2VOdgwbj4iyT 7nPFIZdqtKQ/S7thg4nEKE2OozF22de5OwNmNYU9/Qgf92S3uXkMsicIgCz/tmCZD6oi k60eBVsTGlOyFgDHEm1I7/7uO58TvUEIu678d1PMI/cYyMP5WkWbA38PEWu3GzaIkOnV QHp5ZLCdAzEKXoSMU1YnhmkH365X3XUl45eK5JSu/UquPy4KySL9uAFgwYVG4xDKLDpp 1sFpoAaeix91erAj7p/FVPwJna/wpwjxQw5Z9BWViTQ3+ClKy+kJnkbTPxUv4ZW9SiZG Wofg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=Xs7AD5ZtHO8D25J+mF6J0maqekp1B1CTaRmAf3PL/BI=; b=m5tGUFPq6/HpmUTzyMx5XQKXlLcZXBxowBlSUMmS+fQZHkP28pNeK6ILAqZIE3+MKt gnvqVvYlfGifI2F3mfVMlhNlhpFnfoe37HAJxCQpqbf+6G2xJKFXGTWplAMKbBsQZT5i dkB/6/uawUUBU79KxchTU4Dew2Dn69HXIhkotNo8wkawLUx6xjHaeiIpAL1gkYCxSZQo gdohN11FRJIqCPkTGu2Guz/jGIaUaTxhsI2J5aQULUlpQdSlaRdUs6q/UKyU0DcxmQQy t0jy0z5WdNNv0xKpllOhoGoKmaJVlKT7RTW4f3K5eMclCUaMHavShzMEkHW/0lNmtbmf WmvA== X-Gm-Message-State: APjAAAUZ2K7T5vTr6OWYGDQWi8v5iTu9ZsmG1QNgUrQ7/bebNlv9SE/z ihImDEwSafgMOhwnEdNx/+WCTg== X-Google-Smtp-Source: APXvYqy4mAkBNNLfwhbcpEPO50rwPletALgjx5Q6TrUGtGeU6r3A4NU7HdxqrYHZ6WvcjXPXhSo4Gg== X-Received: by 2002:a50:9729:: with SMTP id c38mr43360628edb.283.1562155742694; Wed, 03 Jul 2019 05:09:02 -0700 (PDT) Return-Path: Received: from [10.0.0.122] ([84.203.93.8]) by smtp.googlemail.com with ESMTPSA id l38sm639082eda.1.2019.07.03.05.09.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jul 2019 05:09:01 -0700 (PDT) Subject: Re: [edk2-platforms: PATCH 2/2] Platform/Rpi3: Add custom CPU frequency support To: Leif Lindholm Cc: devel@edk2.groups.io, ard.biesheuvel@linaro.org References: <20190702161341.2652-1-pete@akeo.ie> <20190702161341.2652-3-pete@akeo.ie> <20190703114216.mnrxtvuyplnzrvng@bivouac.eciton.net> From: "Pete Batard" Message-ID: <0650feb0-c30a-b28f-a679-767aab328903@akeo.ie> Date: Wed, 3 Jul 2019 13:09:00 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.7.2 MIME-Version: 1.0 In-Reply-To: <20190703114216.mnrxtvuyplnzrvng@bivouac.eciton.net> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 7bit Hi Leif, On 2019.07.03 12:42, Leif Lindholm wrote: > On Tue, Jul 02, 2019 at 05:13:41PM +0100, Pete Batard wrote: >> Allow users to set a custom CPU frequency [100 - 1600 MHz] >> in 'Device Manager' -> 'Raspberry Pi Configuration'. >> >> Signed-off-by: Pete Batard >> --- >> Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.c | 13 +++++++++++- >> Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.inf | 1 + >> Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.uni | 4 ++++ >> Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.vfr | 22 ++++++++++++++++++++ >> Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.c | 4 +++- >> Platform/RaspberryPi/RPi3/Include/Protocol/RpiFirmware.h | 3 ++- >> Platform/RaspberryPi/RPi3/RPi3.dec | 17 ++++++++------- >> Platform/RaspberryPi/RPi3/RPi3.dsc | 1 + >> 8 files changed, 54 insertions(+), 11 deletions(-) >> >> diff --git a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.c b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.c >> index d64e70adce36..fcb4ce6935b6 100644 >> --- a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.c >> +++ b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.c >> @@ -108,6 +108,14 @@ SetupVariables ( >> PcdSet32 (PcdCpuClock, PcdGet32 (PcdCpuClock)); >> } >> >> + Size = sizeof (UINT32); >> + Status = gRT->GetVariable(L"CustomCpuClock", >> + &gConfigDxeFormSetGuid, >> + NULL, &Size, &Var32); >> + if (EFI_ERROR (Status)) { >> + PcdSet32 (PcdCustomCpuClock, PcdGet32 (PcdCustomCpuClock)); >> + } >> + >> Size = sizeof (UINT32); >> Status = gRT->GetVariable (L"SdIsArasan", >> &gConfigDxeFormSetGuid, >> @@ -201,6 +209,7 @@ ApplyVariables ( >> UINTN Gpio48Group; >> EFI_STATUS Status; >> UINT32 CpuClock = PcdGet32 (PcdCpuClock); >> + UINT32 CustomCpuClock = PcdGet32 (PcdCustomCpuClock); >> UINT32 Rate = 0; >> >> if (CpuClock != 0) { >> @@ -213,6 +222,8 @@ ApplyVariables ( >> if (Status != EFI_SUCCESS) { >> DEBUG ((DEBUG_ERROR, "Couldn't get the max CPU speed, leaving as is: %r\n", Status)); >> } >> + } else if (CpuClock == 3) { >> + Rate = CustomCpuClock * 1000000; >> } else { >> Rate = 600 * 1000000; >> } >> @@ -220,7 +231,7 @@ ApplyVariables ( >> >> if (Rate != 0) { >> DEBUG ((DEBUG_INFO, "Setting CPU speed to %uHz\n", Rate)); >> - Status = mFwProtocol->SetClockRate (RPI_MBOX_CLOCK_RATE_ARM, Rate); >> + Status = mFwProtocol->SetClockRate (RPI_MBOX_CLOCK_RATE_ARM, Rate, 1); >> if (Status != EFI_SUCCESS) { >> DEBUG ((DEBUG_ERROR, "Couldn't set the CPU speed: %r\n", Status)); >> } >> diff --git a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.inf b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.inf >> index 3fee190ac41b..6d6c90b78408 100644 >> --- a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.inf >> +++ b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.inf >> @@ -54,6 +54,7 @@ [Protocols] >> >> [Pcd] >> gRaspberryPiTokenSpaceGuid.PcdCpuClock >> + gRaspberryPiTokenSpaceGuid.PcdCustomCpuClock >> gRaspberryPiTokenSpaceGuid.PcdSdIsArasan >> gRaspberryPiTokenSpaceGuid.PcdMmcForce1Bit >> gRaspberryPiTokenSpaceGuid.PcdMmcForceDefaultSpeed >> diff --git a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.uni b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.uni >> index a9c101433008..04f735949ba5 100644 >> --- a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.uni >> +++ b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.uni >> @@ -25,6 +25,10 @@ >> #string STR_CHIPSET_CLOCK_CPU_NA #language en-US "Don't Override" >> #string STR_CHIPSET_CLOCK_CPU_600MHZ #language en-US "Min (600MHz)" >> #string STR_CHIPSET_CLOCK_CPU_MAX #language en-US "Max" >> +#string STR_CHIPSET_CLOCK_CPU_CUSTOM #language en-US "Custom" >> + >> +#string STR_CHIPSET_CUSTOM_CPU_CLOCK_PROMPT #language en-US "CPU Clock Rate (MHz)" >> +#string STR_CHIPSET_CUSTOM_CPU_CLOCK_HELP #language en-US "Adjust the CPU speed.\nMin value: 100 MHz\nMax value: 1600 MHz\n\nWarning: Overclocking can make the system unbootable!" >> >> #string STR_CHIPSET_SD_PROMPT #language en-US "uSD Routing" >> #string STR_CHIPSET_SD_HELP #language en-US "Choose host controller to drive uSD slot" >> diff --git a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.vfr b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.vfr >> index 7a1824525892..217a285b5a1f 100644 >> --- a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.vfr >> +++ b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.vfr >> @@ -47,10 +47,15 @@ typedef struct { >> * 0 - don't change the clock rate. >> * 1 - 600MHz. >> * 2 - maximum. >> + * 3 - custom. >> */ >> UINT32 Clock; >> } CHIPSET_CPU_CLOCK_VARSTORE_DATA; >> >> +typedef struct { >> + UINT32 Clock; >> +} CHIPSET_CUSTOM_CPU_CLOCK_VARSTORE_DATA; >> + >> typedef struct { >> /* >> * 0 - uSD slot routed to Broadcom SDHOST. >> @@ -116,6 +121,11 @@ formset >> name = CpuClock, >> guid = CONFIGDXE_FORM_SET_GUID; >> >> + efivarstore CHIPSET_CUSTOM_CPU_CLOCK_VARSTORE_DATA, >> + attribute = EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE, > > Is the runtime access intentional? Are we expecting users to change > the (post reboot) frequency from within the operating system? You're right, I don't think having EFI_VARIABLE_RUNTIME_ACCESS makes sense. Or at least, I'm not aware of any OS that would provide the functionality to alter this custom frequency. Let me remove it. > >> + name = CustomCpuClock, >> + guid = CONFIGDXE_FORM_SET_GUID; >> + >> efivarstore CHIPSET_SD_VARSTORE_DATA, >> attribute = EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE, >> name = SdIsArasan, >> @@ -198,8 +208,20 @@ formset >> option text = STRING_TOKEN(STR_CHIPSET_CLOCK_CPU_NA), value = 0, flags = DEFAULT; >> option text = STRING_TOKEN(STR_CHIPSET_CLOCK_CPU_600MHZ), value = 1, flags = 0; >> option text = STRING_TOKEN(STR_CHIPSET_CLOCK_CPU_MAX), value = 2, flags = 0; >> + option text = STRING_TOKEN(STR_CHIPSET_CLOCK_CPU_CUSTOM), value = 3, flags = 0; >> endoneof; >> >> + grayoutif NOT ideqval CpuClock.Clock == 3; >> + numeric varid = CustomCpuClock.Clock, >> + prompt = STRING_TOKEN(STR_CHIPSET_CUSTOM_CPU_CLOCK_PROMPT), >> + help = STRING_TOKEN(STR_CHIPSET_CUSTOM_CPU_CLOCK_HELP), >> + flags = DISPLAY_UINT_DEC | NUMERIC_SIZE_4 | INTERACTIVE | RESET_REQUIRED, >> + minimum = 100, >> + maximum = 1600, >> + default = 600, >> + endnumeric; >> + endif; >> + >> oneof varid = SdIsArasan.Routing, >> prompt = STRING_TOKEN(STR_CHIPSET_SD_PROMPT), >> help = STRING_TOKEN(STR_CHIPSET_SD_HELP), >> diff --git a/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.c b/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.c >> index 925f5a921290..5d96c0d84181 100644 >> --- a/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.c >> +++ b/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.c >> @@ -800,7 +800,8 @@ EFI_STATUS >> EFIAPI >> RpiFirmwareSetClockRate ( >> IN UINT32 ClockId, >> - IN UINT32 ClockRate >> + IN UINT32 ClockRate, >> + IN UINT32 SkipTurbo >> ) >> { >> RPI_FW_SET_CLOCK_RATE_CMD *Cmd; >> @@ -822,6 +823,7 @@ RpiFirmwareSetClockRate ( >> Cmd->TagHead.TagValueSize = 0; >> Cmd->TagBody.ClockId = ClockId; >> Cmd->TagBody.ClockRate = ClockRate; >> + Cmd->TagBody.SkipTurbo = SkipTurbo; > > I guess this is defined in some protocol defined somewhere to be a > 32-bit value, since the struct is already defined before this set. > > However, from the EDK2 API side, it doesn't really make sense - could > you change the function parameter to BOOL and the callers to use > TRUE/FALSE instead of 1/0? I'll switch to using a BOOL. > >> Cmd->EndTag = 0; >> >> Status = MailboxTransaction (Cmd->BufferHead.BufferSize, RPI_MBOX_VC_CHANNEL, &Result); >> diff --git a/Platform/RaspberryPi/RPi3/Include/Protocol/RpiFirmware.h b/Platform/RaspberryPi/RPi3/Include/Protocol/RpiFirmware.h >> index f3e3d1e99eba..cc4e2786e653 100644 >> --- a/Platform/RaspberryPi/RPi3/Include/Protocol/RpiFirmware.h >> +++ b/Platform/RaspberryPi/RPi3/Include/Protocol/RpiFirmware.h >> @@ -44,7 +44,8 @@ typedef >> EFI_STATUS >> (EFIAPI *SET_CLOCK_RATE) ( >> IN UINT32 ClockId, >> - OUT UINT32 ClockRate >> + OUT UINT32 ClockRate, >> + IN UINT32 SkipTurbo >> ); >> >> typedef >> diff --git a/Platform/RaspberryPi/RPi3/RPi3.dec b/Platform/RaspberryPi/RPi3/RPi3.dec >> index ab3788237861..56eac262502e 100644 >> --- a/Platform/RaspberryPi/RPi3/RPi3.dec >> +++ b/Platform/RaspberryPi/RPi3/RPi3.dec >> @@ -39,13 +39,14 @@ [PcdsFixedAtBuild.common] >> >> [PcdsFixedAtBuild, PcdsPatchableInModule, PcdsDynamic, PcdsDynamicEx] >> gRaspberryPiTokenSpaceGuid.PcdCpuClock|0|UINT32|0x0000000d >> - gRaspberryPiTokenSpaceGuid.PcdSdIsArasan|0|UINT32|0x0000000e >> - gRaspberryPiTokenSpaceGuid.PcdMmcForce1Bit|0|UINT32|0x0000000f >> - gRaspberryPiTokenSpaceGuid.PcdMmcForceDefaultSpeed|0|UINT32|0x00000010 >> - gRaspberryPiTokenSpaceGuid.PcdMmcSdDefaultSpeedMHz|0|UINT32|0x00000011 >> - gRaspberryPiTokenSpaceGuid.PcdMmcSdHighSpeedMHz|0|UINT32|0x00000012 >> - gRaspberryPiTokenSpaceGuid.PcdMmcDisableMulti|0|UINT32|0x00000013 >> - gRaspberryPiTokenSpaceGuid.PcdDebugEnableJTAG|0|UINT32|0x00000014 >> - gRaspberryPiTokenSpaceGuid.PcdDebugShowUEFIExit|0|UINT32|0x00000015 >> + gRaspberryPiTokenSpaceGuid.PcdCustomCpuClock|0|UINT32|0x0000000e >> + gRaspberryPiTokenSpaceGuid.PcdSdIsArasan|0|UINT32|0x0000000f >> + gRaspberryPiTokenSpaceGuid.PcdMmcForce1Bit|0|UINT32|0x00000010 >> + gRaspberryPiTokenSpaceGuid.PcdMmcForceDefaultSpeed|0|UINT32|0x00000011 >> + gRaspberryPiTokenSpaceGuid.PcdMmcSdDefaultSpeedMHz|0|UINT32|0x00000012 >> + gRaspberryPiTokenSpaceGuid.PcdMmcSdHighSpeedMHz|0|UINT32|0x00000013 >> + gRaspberryPiTokenSpaceGuid.PcdMmcDisableMulti|0|UINT32|0x00000014 >> + gRaspberryPiTokenSpaceGuid.PcdDebugEnableJTAG|0|UINT32|0x00000015 >> + gRaspberryPiTokenSpaceGuid.PcdDebugShowUEFIExit|0|UINT32|0x00000016 > > Ouch. > I think I would rather have the token ids, or the Pcds, out of order than > reindexing them when we add a new one. The tool will warn you about duplicates. Alright then. I'll leave the existing values and only add the one we need. I will send a v2 later that also takes into account the breaking of the line you requested for the other patch. Regards, /Pete > > / > Leif > >> gRaspberryPiTokenSpaceGuid.PcdDisplayEnableVModes|0|UINT32|0x00000017 >> gRaspberryPiTokenSpaceGuid.PcdDisplayEnableSShot|0|UINT32|0x00000018 >> diff --git a/Platform/RaspberryPi/RPi3/RPi3.dsc b/Platform/RaspberryPi/RPi3/RPi3.dsc >> index ad8fb03ab305..2b9e619ad55c 100644 >> --- a/Platform/RaspberryPi/RPi3/RPi3.dsc >> +++ b/Platform/RaspberryPi/RPi3/RPi3.dsc >> @@ -393,6 +393,7 @@ [PcdsDynamicHii.common.DEFAULT] >> # >> >> gRaspberryPiTokenSpaceGuid.PcdCpuClock|L"CpuClock"|gConfigDxeFormSetGuid|0x0|0 >> + gRaspberryPiTokenSpaceGuid.PcdCustomCpuClock|L"CustomCpuClock"|gConfigDxeFormSetGuid|0x0|600 >> >> # >> # SD-related. >> -- >> 2.21.0.windows.1 >>