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.55601.1583757303525643712 for ; Mon, 09 Mar 2020 05:35:04 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@akeo-ie.20150623.gappssmtp.com header.s=20150623 header.b=lf+FOnQn; 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 r15so5829616wrx.6 for ; Mon, 09 Mar 2020 05:35:03 -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=iw7+NizuXTqngXzzyn0R3G9ktXaVf5iNt+8JzZ/19N0=; b=lf+FOnQnNa3tq9MOtyN8t5+bsWTbKQHSnn7+H4P/caS+te7dP7mg3sJbo/QCKHKhrk etgUSrotKU5B9fEac9SW3E4raO7aZKO7J2Q65K+iAQfVSna689p27RDvy+3sNRD2ul0i 8dDq1Ogk9mS6rng33AUjBUqTCBkRDfg/6pxMbBbmIPhrkho/oxtpd9xPc7Qturj0n4/u VZ8yQ1+d3wDPUreGq3kHJ5L/HZNGR36JLslDBU7trUFW04WIDE3kdcPpADKOOS66htip +ZceUylRJ9izcecInUiwkt/9RYjD8dYYBfZrrokGhDE1TDTd1u4q6JTO6fEE3LATRj/c H9BQ== 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=iw7+NizuXTqngXzzyn0R3G9ktXaVf5iNt+8JzZ/19N0=; b=KpjjynZSf4nt0Fr+PKBTyFIyxveCJ566XF2dhYvQXLchecY0YIdsBp8/ImJCrM97Ya XDS4tHieSCK7k77nw1+eChoTx8nlKm8yQESM5EYEGP2HzPQngtDieeYOnLPokLQMZU+8 aFlWgZHkfyk+eQQ1UCuZ3A2JAifvn8obNeW9OSIpmltQmK1euBBDglL+Vt0CXKIlRZL8 6KHey6QetBQjG0psfegDE1AyWa7pw+a5guzHqx3Iupf/ZEqUFKRYh1zEAC5Bei1lHh+k PehiWgN/KYN5gTdvvVT1CnzHiQ83J7IRYm8H2vWqMe2uVzThshX4nMncP5UwqDYa0egc gfvQ== X-Gm-Message-State: ANhLgQ0VWcydpkAUYbQweiZe7Mx5PbS/66mgWlWluJGbYDALlSNTB8Tx mqVPWlwAJDz9PwPm080Oy4Ywmg== X-Google-Smtp-Source: ADFU+vvL+vEu8ZTHbsED4c6CPWDSOLiz8yfxaKiBA6rVLz2OB2v5OKwylHnVlCMgNsMo7+eWaJddYQ== X-Received: by 2002:adf:d4ca:: with SMTP id w10mr20505525wrk.407.1583757301950; Mon, 09 Mar 2020 05:35:01 -0700 (PDT) Return-Path: Received: from [10.0.0.122] ([84.203.66.228]) by smtp.googlemail.com with ESMTPSA id c8sm440758wrt.33.2020.03.09.05.35.00 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 09 Mar 2020 05:35:01 -0700 (PDT) Subject: Re: [edk2-platforms][PATCH 1/1] Platform/RaspberryPi/Drivers/ConfigDxe: make CPU settings Pi-specific 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> From: "Pete Batard" Message-ID: <899ecb6b-ff1b-3eb5-663f-2ee02287b1a4@akeo.ie> Date: Mon, 9 Mar 2020 12:35:00 +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: <20200308053109.92438-1-andrey.warkentin@gmail.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 7bit 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; >