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=OtSb+wm/; spf=none, err=permanent DNS error (domain: akeo.ie, ip: 209.85.208.53, mailfrom: pete@akeo.ie) Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.53]) by groups.io with SMTP; Thu, 04 Jul 2019 09:51:38 -0700 Received: by mail-ed1-f53.google.com with SMTP id d4so5932784edr.13 for ; Thu, 04 Jul 2019 09:51:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akeo-ie.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=J9i3HJXMW3rzg+UhUODvslMgASlydkboQDaml7AduAU=; b=OtSb+wm/DEnrCtnzk66U7JJa1k+bOFt3xcn0FEJNIEhnw8SxIu2WGMWiv/PUonYDmv WH8k5ho+7vjKUTTjTSkuzFgwrsYXHjZbbJRlsbOc67Dw6Q0IBKjpadVfDyd7PQUOmEMy w6KCspnSzpMU6iX3uS/SeUSE1Ez2ROSVzqQkAtkcUeqRixtu3KwGS1YA/TViP+Ce833j R6eKRDwZDoeXRoKVZvBLQ6k1IVBIbUoZcyHL36Em4MGaKBbBUJh41/JMaNzMTZ6XcKne XxTrPGLlHbaMZWVejg13rpNqvZ2Nk93QjYc/vbXiZ+KokKqeE/wqdEJ+kqoIWKd491Xs XEfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=J9i3HJXMW3rzg+UhUODvslMgASlydkboQDaml7AduAU=; b=RrMsXlDl5lbQVoiRG7T4MVXi8g5VbOKCJI5SBjhyITxJA2qfkmMUgTRjm9dEReCoH4 g3AA/7C1AdYWH7tZBUcvp37+B/6ysHzvcSciyaf5xSxWYjyepEf0M5I2F/auUoJMBSAe Cb5Qy9HTSRVckbpP2rdh5D9UXVcXaT4z6eKz7XJnysK6MEzZfEW07u0+pch+Rl30nM0x BvnijU04rE/2XFUAy3NupmbSnnx4xSzEW6DWy2bcHBorW+tYiArAGjevr/L7/z3eoKyM vo5D5pTUaKZa/RTt5nAlb9wI/OOFfqOQXwxeQq3c+aQupATUreVBy8J/IAgwRVMD19fZ mBog== X-Gm-Message-State: APjAAAWA4T+jF2i5KTNRN7pJ6fsEJZRUluFaotqKCjA+G3M9wfjl2QFc IoXmV5JiO3J1ybQlW6Hd8QdpjWEDu84= X-Google-Smtp-Source: APXvYqx/zmGIuZuDfqECX/sr3IwTbVVck9vb5rDR/YZ4yHRlhR1qEacT5Bbfx6vV2v9atbKnZfG6EA== X-Received: by 2002:a17:906:7243:: with SMTP id n3mr4044917ejk.112.1562259096035; Thu, 04 Jul 2019 09:51:36 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([84.203.93.8]) by smtp.gmail.com with ESMTPSA id i18sm1838063ede.65.2019.07.04.09.51.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Jul 2019 09:51:35 -0700 (PDT) From: "Pete Batard" To: devel@edk2.groups.io Cc: ard.biesheuvel@linaro.org, leif.lindholm@linaro.org Subject: [edk2-platforms: PATCH v2 2/2] Platform/Rpi3: Add custom CPU frequency support Date: Thu, 4 Jul 2019 17:51:20 +0100 Message-Id: <20190704165120.8800-3-pete@akeo.ie> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190704165120.8800-1-pete@akeo.ie> References: <20190704165120.8800-1-pete@akeo.ie> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 | 6 ++++-- Platform/RaspberryPi/RPi3/Include/Protocol/RpiFirmware.h | 3 ++- Platform/RaspberryPi/RPi3/RPi3.dec | 1 + Platform/RaspberryPi/RPi3/RPi3.dsc | 1 + 8 files changed, 47 insertions(+), 4 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..65b45f3e6496 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, + 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..9b5ee1946279 100644 --- a/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.c +++ b/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.c @@ -799,8 +799,9 @@ STATIC EFI_STATUS EFIAPI RpiFirmwareSetClockRate ( - IN UINT32 ClockId, - IN UINT32 ClockRate + IN UINT32 ClockId, + IN UINT32 ClockRate, + IN BOOLEAN 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 ? 1 : 0; 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..ec70f28efe1a 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 BOOLEAN SkipTurbo ); typedef diff --git a/Platform/RaspberryPi/RPi3/RPi3.dec b/Platform/RaspberryPi/RPi3/RPi3.dec index ab3788237861..22de439fde8f 100644 --- a/Platform/RaspberryPi/RPi3/RPi3.dec +++ b/Platform/RaspberryPi/RPi3/RPi3.dec @@ -47,5 +47,6 @@ [PcdsFixedAtBuild, PcdsPatchableInModule, PcdsDynamic, PcdsDynamicEx] gRaspberryPiTokenSpaceGuid.PcdMmcDisableMulti|0|UINT32|0x00000013 gRaspberryPiTokenSpaceGuid.PcdDebugEnableJTAG|0|UINT32|0x00000014 gRaspberryPiTokenSpaceGuid.PcdDebugShowUEFIExit|0|UINT32|0x00000015 + gRaspberryPiTokenSpaceGuid.PcdCustomCpuClock|0|UINT32|0x00000016 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