From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by mx.groups.io with SMTP id smtpd.web10.4282.1583883178955547465 for ; Tue, 10 Mar 2020 16:32:59 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@akeo-ie.20150623.gappssmtp.com header.s=20150623 header.b=grg9XJYD; spf=none, err=permanent DNS error (domain: akeo.ie, ip: 209.85.221.65, mailfrom: pete@akeo.ie) Received: by mail-wr1-f65.google.com with SMTP id z15so251207wrl.1 for ; Tue, 10 Mar 2020 16:32:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akeo-ie.20150623.gappssmtp.com; s=20150623; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=p9gcluIbMx4xEkFJc3UQzAFXUXjTiwoeJBanSg2EuLY=; b=grg9XJYDjGTDlXmjk0+rQxkTu6t9prg27OfhKH6yJTo7wFu8zSYi1dR8lFZhZ1xidB AEMcFF4VpM6l2Zfkibk9QoJODMnw3335+FYd2JlAutMwxJWD8pvpjgf+pbxtRs6EBgLW 9ixMAyxeCdEmqGLHlXl/5urZ/iu34TF5uigZqJftKPQ9fPV3mT7CZ18YK2j60WM/PwT+ J6OjbKKaslVKdkk0sbh0bGW9iFsnnN+wMNw7m2awQjSs+qXRYtkymy+Tghd99F5k37xV CgFw3yIiRySwprWMockp77w5+siNvMRvIM0FylWf6dDeVpeM7ijmmxI0E63sD6XzLhpa ZENw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=p9gcluIbMx4xEkFJc3UQzAFXUXjTiwoeJBanSg2EuLY=; b=oJYtzdYmoqlc2HHAy8nWvdq5gMJTdQLalr50dTdRiRvlzjHOM2HNtexoPxBaJZsMcW IVLCqMGIdUaHpbi6loEqOkWRGouEHX5ZEm9NDClbljeY0x2SbmBrbtarg1UHLuNnvJov hCuBQIBPd/nmVKngoC10EY2w0HLWYpHhjMqziX+NtWsrf8oGrWbswF8uFQRNCL94xEaC KdwwvruP7lMeXg46Tad7IPy2w+U1S2u8xr1bLFgUpVek1TaFPr7nDy8J/WakGQYlTRGD Ljr2QDhwzIldIYORVSshnKkM3iN9WauuhskvpnE4JKKtPrBGWfYE8zcFpp1J1mQK+5d1 sOPw== X-Gm-Message-State: ANhLgQ2Izk6gwwL9muyJubS7AV+lOcTsInLwtahYCs4qUjyHNBtYXb8O Zubnt0M//vW4ZTntWYMtrePi3w== X-Google-Smtp-Source: ADFU+vuqyKENSSz6phGn76PG2XpQ498B+gZdQk5Sltl33d2M47cMOlLEoMm9qAD19oy2bmlDAIVnEg== X-Received: by 2002:adf:91e3:: with SMTP id 90mr271123wri.416.1583883177564; Tue, 10 Mar 2020 16:32:57 -0700 (PDT) Return-Path: Received: from [10.0.0.122] ([84.203.66.228]) by smtp.googlemail.com with ESMTPSA id c5sm5683907wma.3.2020.03.10.16.32.56 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 10 Mar 2020 16:32:56 -0700 (PDT) Subject: Re: [edk2-platforms][PATCH 1/1] Platform/RaspberryPi/Drivers/ConfigDxe: make CPU settings Pi-specific From: "Pete Batard" To: Andrei Warkentin , devel@edk2.groups.io Cc: ard.biesheuvel@linaro.org, leif@nuviainc.com, philmd@redhat.com References: <20200308053109.92438-1-andrey.warkentin@gmail.com> <899ecb6b-ff1b-3eb5-663f-2ee02287b1a4@akeo.ie> Message-ID: <9227d69f-3b75-63ec-b5b3-76263d1711a5@akeo.ie> Date: Tue, 10 Mar 2020 23:32:55 +0000 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: <899ecb6b-ff1b-3eb5-663f-2ee02287b1a4@akeo.ie> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 8bit Note: This patch is being superseded by: https://edk2.groups.io/g/devel/message/55734 On 2020.03.09 12:35, Pete Batard wrote: > On 2020.03.08 05:31, Andrei Warkentin wrote: >> For Pi 4, the custom CPU frequency range goes all the way up to 2.2GHz. >> >> The acrobatics with CHIPSET_CUSTOM_CPU_CLOCK_HELP_TOKEN in the VFR >> are required as the preprocessor is not run on the UNI (strings) file. >> >> Testing: Pi 4 (saw correct help message, could change Hz to 2000). >> >> Signed-off-by: Andrei Warkentin > > Reviewed-by: Pete Batard > Tested-by: Pete Batard > >> --- >>   Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.uni |  5 +++-- >>   Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.vfr | 12 >> ++++++++++-- >>   2 files changed, 13 insertions(+), 4 deletions(-) >> >> diff --git a/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.uni >> b/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.uni >> index 77eda96d..fc19ce40 100644 >> --- a/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.uni >> +++ b/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.uni >> @@ -21,14 +21,15 @@ >>   #string STR_CHIPSET_FORM_SUBTITLE   #language en-US "Note: OS may >> override settings." >>   #string STR_CHIPSET_CLOCK_CPU_PROMPT #language en-US "CPU Clock" >> -#string STR_CHIPSET_CLOCK_CPU_HELP   #language en-US "CPU Speed" >> +#string STR_CHIPSET_CLOCK_CPU_HELP   #language en-US "CPU >> Speed\n\nWarning: Overclocking can make the system unbootable!" >>   #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_CUSTOM_CPU_CLOCK_HELP_PI4 #language en-US "Adjust >> the CPU speed.\nMin value: 100 MHz\nMax value: 2200 MHz" >> +#string STR_CHIPSET_CUSTOM_CPU_CLOCK_HELP_PI3 #language en-US "Adjust >> the CPU speed.\nMin value: 100 MHz\nMax value: 1600 MHz" >>   /* >>    * Advanced configuration. >> diff --git a/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.vfr >> b/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.vfr >> index 9c2fd64a..2a15e0f5 100644 >> --- a/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.vfr >> +++ b/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.vfr >> @@ -9,6 +9,14 @@ >>   #include >>   #include "ConfigDxeFormSetGuid.h" >> +#if (RPI_MODEL == 4) >> +#define CHIPSET_CUSTOM_CPU_CLOCK_MAX 2200 >> +#define CHIPSET_CUSTOM_CPU_CLOCK_HELP_TOKEN >> STRING_TOKEN(STR_CHIPSET_CUSTOM_CPU_CLOCK_HELP_PI4) >> +#else >> +#define CHIPSET_CUSTOM_CPU_CLOCK_MAX 1600 >> +#define CHIPSET_CUSTOM_CPU_CLOCK_HELP_TOKEN >> STRING_TOKEN(STR_CHIPSET_CUSTOM_CPU_CLOCK_HELP_PI3) >> +#endif /* (RPI_MODEL == 4) */ >> + >>   #pragma pack(1) >>   typedef struct { >>     /* >> @@ -262,10 +270,10 @@ formset >>           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), >> +              help    = CHIPSET_CUSTOM_CPU_CLOCK_HELP_TOKEN, >>                 flags   = DISPLAY_UINT_DEC | NUMERIC_SIZE_4 | >> INTERACTIVE | RESET_REQUIRED, >>                 minimum = 100, >> -              maximum = 1600, >> +              maximum = CHIPSET_CUSTOM_CPU_CLOCK_MAX, >>                 default = 600, >>             endnumeric; >>           endif; >> >