From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (NAM10-BN7-obe.outbound.protection.outlook.com [40.107.92.41]) by mx.groups.io with SMTP id smtpd.web11.6451.1583252453487345039 for ; Tue, 03 Mar 2020 08:20:53 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@vmware.com header.s=selector2 header.b=bQulpfyL; spf=pass (domain: vmware.com, ip: 40.107.92.41, mailfrom: awarkentin@vmware.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VJ+ASSX7XxfAmve0CRnLhRbhOrRisy7u6f9nAw8keVPVBRa60E5AsSZoKoF2wLzDdBzCsmPBUqVZ0JI59728xSyCoaObRFNIjycXAFV8irJwvJtbex2YoODojv3Lx82ckzP/DbmIQMN+F8+sxDDzbLZqzASJj1tmXq3kqO/5ru4VU+pBwMikUBDE3G7WjIncyB8E1u2fyayL8Hcj8pfdAvGRHuBmnqYimBh9iBwSeNpMdV8rqkmn3QKCzuHggbICzBKW0ma2Rrn4SycRSDju67hJA7cM75DPKDw3ta2WOKjSq+/bGMTrIrfnQi+Xp85ENv7NRlna2uErBvMukOiF2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1lAkab9Oa63yIWSrGNE++5Em4bqg6praPeROLkVFzWY=; b=EvDb4cxYg+h7VZty34yPkh4Sd/EzSoP1gN4y8dAxE5BCTCmGc/RrpNzbBWzKw+1duXRx6rU8K8y9YDJXBuWxTXYaNv6rxSbVfoIh+HsLbIc3yg3ZZ4ZLSAKxlZzKUfQFk3G7QuXCXCtIKiXHhMtyPYaDnFgSIDeEiIQHkdnWKo57Gbdp7oY/FVdcqlavT72LqHb8/8LdBvYZcO7MlTTWNqG5kQWWAoGNMpek/DRuHrSSIjFJcIv6RBQGtjNFizsLozcpgUA5DmFdGMYrWICa+uJH47BDemIOHyzdA4s9m4764/OMER+EP9x7jfli0x/RasLURebkfln0NmpDrJDFQQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vmware.com; dmarc=pass action=none header.from=vmware.com; dkim=pass header.d=vmware.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vmware.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1lAkab9Oa63yIWSrGNE++5Em4bqg6praPeROLkVFzWY=; b=bQulpfyLv1I5iLYspxbt6q2MeZTlYUGtI51bqT+nIsKJ2XrVO2DV9P65vLTcC77bSSXqRNoNI6OhxP1ckjOlEvcYeMDXvDrHalzONRabiUaMcIDhlhhmUHLo2lUYJVIBN5er49/wgs4yNGeMvDkMbwczD98e/1u9QhwOjIDz1gY= Received: from BN6PR05MB3411.namprd05.prod.outlook.com (2603:10b6:405:43::23) by BN6PR05MB3219.namprd05.prod.outlook.com (2603:10b6:404:bd::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2793.9; Tue, 3 Mar 2020 16:20:52 +0000 Received: from BN6PR05MB3411.namprd05.prod.outlook.com ([fe80::5df3:40e3:521a:7f84]) by BN6PR05MB3411.namprd05.prod.outlook.com ([fe80::5df3:40e3:521a:7f84%5]) with mapi id 15.20.2793.011; Tue, 3 Mar 2020 16:20:52 +0000 From: "Andrei Warkentin" To: "devel@edk2.groups.io" Subject: Re: [edk2-devel][PATCH v2 6/6] Platform/RPi/ConfigDxe: Improve RPi configuration form Thread-Topic: [edk2-devel][PATCH v2 6/6] Platform/RPi/ConfigDxe: Improve RPi configuration form Thread-Index: AQHV8Vzb9zB/QXs/qEiLlP1O+nYp6ag3C2SzgAABBXo= Date: Tue, 3 Mar 2020 16:20:51 +0000 Message-ID: References: <20200303130814.3092-1-pete@akeo.ie>,<20200303130814.3092-7-pete@akeo.ie>,<15F8D78E42129034.31276@groups.io> In-Reply-To: <15F8D78E42129034.31276@groups.io> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=awarkentin@vmware.com; x-originating-ip: [24.147.160.127] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 6bacccf4-08b5-4bf5-b5ae-08d7bf8ed7ae x-ms-traffictypediagnostic: BN6PR05MB3219: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:1728; x-forefront-prvs: 03319F6FEF x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(4636009)(39860400002)(366004)(346002)(396003)(376002)(136003)(199004)(189003)(66556008)(64756008)(6916009)(53546011)(6506007)(33656002)(966005)(71200400001)(478600001)(66476007)(66446008)(2906002)(52536014)(66946007)(8936002)(9686003)(81156014)(55016002)(7696005)(76116006)(8676002)(81166006)(26005)(5660300002)(86362001)(186003)(316002)(45080400002);DIR:OUT;SFP:1101;SCL:1;SRVR:BN6PR05MB3219;H:BN6PR05MB3411.namprd05.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: vmware.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: y1TLdZnJahYMwxfmJjZbdhX7ZVz4Qn3Sq16zTmRNDt+WQGAfHruygU7ZOPYU8MdiUr4oCLs/Nh0nEnmy26Ys4fFMUzitmFIlxpzb9Bbw8fKYiPvE/vji4KF7Xg42O3YwCtComj55HhUsL21N+EMguGZzaPhTu/j/iIErwX4lZU2ZREVmpO/LSTcL/3Nje7vI5CddFPvpCDs9xmHYeDt6ZU+JxA5KQYO/ChTclIV78gGjo/AoOkPHG9PQj+OgNEq9ecBvhQ6jG+z+EC/yXcSFWFBvHNC3lpcsUUQ1MJafncn8DR/EsfTtBTPWcya75kFYpItp1jSO/Augj1LeTsklke9jJFTMqI7LXsbHjmRZPoGf5dQO2M5TQkSQT28Wi0HdeVAhOINBcFUfnWTkpOxo5R+fzBP7MQaqM7flce59My46hmZY9Tq1cGzQojMNnIDh1N8jYrvgZOJ6zhSLnJnAMQihv5fI4/5CpSPxIXFyrNSXQrJjXxaBWZUPdhiptbZy8KuI0sjLnlZ6EUHGNm9ZNw== x-ms-exchange-antispam-messagedata: cEaQ+1/0xVvpWAZl14mP6ef9zyow/gBhsuXgGG2f11eDwTvu0XY5JRGHx8CX4G0iH/nnGEJ/+bgW7YuLhehfs0k3l8SXAYEpAQooz9i1hvgaJHpobK86NKd0sEvaw+dDvXfJHccHXD8nskCfD7LO+Q== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: vmware.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6bacccf4-08b5-4bf5-b5ae-08d7bf8ed7ae X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Mar 2020 16:20:51.8808 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: lJcR4tHmEEwJkAKo+VeauyKz1deIA1Hqo/vP01V9PZ4y/BvUoPOmxHd7It7w3mtpP7BBsitfa0QTAG+N1J8tfQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR05MB3219 Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Nevermind, I missed all the current reviews and the code is already in. A ________________________________________ From: devel@edk2.groups.io on behalf of Andrei Wark= entin via Groups.Io Sent: Tuesday, March 3, 2020 11:17 AM To: Pete Batard; devel@edk2.groups.io Cc: ard.biesheuvel@linaro.org; leif@nuviainc.com; philmd@redhat.com Subject: Re: [edk2-devel][PATCH v2 6/6] Platform/RPi/ConfigDxe: Improve RP= i configuration form Reviewed-by: Andrei Warkentin ________________________________________ From: Pete Batard Sent: Tuesday, March 3, 2020 8:08 AM To: devel@edk2.groups.io Cc: ard.biesheuvel@linaro.org; leif@nuviainc.com; philmd@redhat.com; Andre= i Warkentin Subject: [edk2-devel][PATCH v2 6/6] Platform/RPi/ConfigDxe: Improve RPi co= nfiguration form Group all SD/MMC settings under the SD/MMC form. Make CPU settings more prominent. Harmonise form titles and text content. Reorder forms in the order they are most likely to be queried. Signed-off-by: Pete Batard --- Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.uni | 24 +++++----- Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.vfr | 50 ++++++++++--= -------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.uni b/Pla= tform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.uni index 2e79e322e558..77eda96d8136 100644 --- a/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.uni +++ b/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.uni @@ -14,11 +14,11 @@ #string STR_FORM_SET_TITLE_HELP #language en-US "Press to config= ure system settings." /* - * Chipset config. + * Chipset configuration. */ -#string STR_CHIPSET_FORM_TITLE #language en-US "Chipset Configuratio= n" -#string STR_CHIPSET_FORM_SUBTITLE #language en-US "Note: OS may overrid= e settings when booted." +#string STR_CHIPSET_FORM_TITLE #language en-US "CPU Configuration" +#string STR_CHIPSET_FORM_SUBTITLE #language en-US "Note: OS may overrid= e settings." #string STR_CHIPSET_CLOCK_CPU_PROMPT #language en-US "CPU Clock" #string STR_CHIPSET_CLOCK_CPU_HELP #language en-US "CPU Speed" @@ -30,11 +30,6 @@ #string STR_CHIPSET_CUSTOM_CPU_CLOCK_PROMPT #language en-US "CPU Clock Ra= te (MHz)" #string STR_CHIPSET_CUSTOM_CPU_CLOCK_HELP #language en-US "Adjust the C= PU 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 control= ler to drive uSD slot" -#string STR_CHIPSET_SD_SDHOST #language en-US "Broadcom SDHOST" -#string STR_CHIPSET_SD_ARASAN #language en-US "Arasan SDHCI" - /* * Advanced configuration. */ @@ -55,8 +50,13 @@ * MMC/SD configuration. */ -#string STR_MMC_FORM_TITLE #language en-US "SD/MMC Tweaks" -#string STR_MMC_FORM_SUBTITLE #language en-US "Note: UEFI only, OS wil= l override settings when booted." +#string STR_MMC_FORM_TITLE #language en-US "SD/MMC Configuration" +#string STR_MMC_FORM_SUBTITLE #language en-US "Note: UEFI only, OS may= override settings." + +#string STR_MMC_SD_PROMPT #language en-US "uSD Routing" +#string STR_MMC_SD_HELP #language en-US "Choose host controller = to drive uSD slot" +#string STR_MMC_SD_SDHOST #language en-US "Broadcom SDHOST" +#string STR_MMC_SD_ARASAN #language en-US "Arasan SDHCI" #string STR_MMC_DISMULTI_PROMPT #language en-US "Multi-Block Support" #string STR_MMC_DISMULTI_HELP #language en-US "Use CMD18/CMD25 for tra= nsfers when possible" @@ -84,7 +84,7 @@ * Display settings. */ -#string STR_DISPLAY_FORM_TITLE #language en-US "Display" +#string STR_DISPLAY_FORM_TITLE #language en-US "Display Configuratio= n" #string STR_DISPLAY_FORM_SUBTITLE #language en-US "UEFI video driver se= ttings" #string STR_DISPLAY_VMODES_640_PROMPT #language en-US "Virtual 640x480" @@ -109,7 +109,7 @@ /* * Debugging settings go here. */ -#string STR_DEBUG_FORM_TITLE #language en-US "Debugging" +#string STR_DEBUG_FORM_TITLE #language en-US "Debugging Configurat= ion" #string STR_DEBUG_FORM_SUBTITLE #language en-US "For UEFI/OS Develope= rs" #string STR_DEBUG_JTAG_PROMPT #language en-US "JTAG Routing" diff --git a/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.vfr b/Pla= tform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.vfr index d16058da4926..9c2fd64a8e27 100644 --- a/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.vfr +++ b/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.vfr @@ -65,14 +65,6 @@ typedef struct { UINT32 Clock; } CHIPSET_CUSTOM_CPU_CLOCK_VARSTORE_DATA; -typedef struct { - /* - * 0 - uSD slot routed to Broadcom SDHOST. - * 1 - uSD slot routed to Arasan SDHCI. - */ - UINT32 Routing; -} CHIPSET_SD_VARSTORE_DATA; - typedef struct { /* * Always set by ConfigDxe prior to HII init to reflect @@ -93,6 +85,14 @@ typedef struct { UINT32 Enabled; } ADVANCED_DEVICE_TREE_VARSTORE_DATA; +typedef struct { + /* + * 0 - uSD slot routed to Broadcom SDHOST. + * 1 - uSD slot routed to Arasan SDHCI. + */ + UINT32 Routing; +} MMC_SD_VARSTORE_DATA; + typedef struct { /* * 0 - Don't disable multi-block. @@ -155,11 +155,6 @@ formset name =3D CustomCpuClock, guid =3D CONFIGDXE_FORM_SET_GUID; - efivarstore CHIPSET_SD_VARSTORE_DATA, - attribute =3D EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIM= E_ACCESS | EFI_VARIABLE_NON_VOLATILE, - name =3D SdIsArasan, - guid =3D CONFIGDXE_FORM_SET_GUID; - efivarstore ADVANCED_RAM_MORE_THAN_3GB_VARSTORE_DATA, attribute =3D EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIM= E_ACCESS | EFI_VARIABLE_NON_VOLATILE, name =3D RamMoreThan3GB, @@ -175,6 +170,11 @@ formset name =3D OptDeviceTree, guid =3D CONFIGDXE_FORM_SET_GUID; + efivarstore MMC_SD_VARSTORE_DATA, + attribute =3D EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIM= E_ACCESS | EFI_VARIABLE_NON_VOLATILE, + name =3D SdIsArasan, + guid =3D CONFIGDXE_FORM_SET_GUID; + efivarstore MMC_DISMULTI_VARSTORE_DATA, attribute =3D EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIM= E_ACCESS | EFI_VARIABLE_NON_VOLATILE, name =3D MmcDisableMulti, @@ -228,6 +228,10 @@ formset prompt =3D STRING_TOKEN(STR_CHIPSET_FORM_TITLE), help =3D STRING_TOKEN(STR_NULL_STRING); + goto 0x1004, + prompt =3D STRING_TOKEN(STR_DISPLAY_FORM_TITLE), + help =3D STRING_TOKEN(STR_NULL_STRING); + goto 0x1006, prompt =3D STRING_TOKEN(STR_ADVANCED_FORM_TITLE), help =3D STRING_TOKEN(STR_NULL_STRING); @@ -236,10 +240,6 @@ formset prompt =3D STRING_TOKEN(STR_MMC_FORM_TITLE), help =3D STRING_TOKEN(STR_NULL_STRING); - goto 0x1004, - prompt =3D STRING_TOKEN(STR_DISPLAY_FORM_TITLE), - help =3D STRING_TOKEN(STR_NULL_STRING); - goto 0x1005, prompt =3D STRING_TOKEN(STR_DEBUG_FORM_TITLE), help =3D STRING_TOKEN(STR_NULL_STRING); @@ -269,14 +269,6 @@ formset default =3D 600, endnumeric; endif; - - oneof varid =3D SdIsArasan.Routing, - prompt =3D STRING_TOKEN(STR_CHIPSET_SD_PROMPT), - help =3D STRING_TOKEN(STR_CHIPSET_SD_HELP), - flags =3D NUMERIC_SIZE_4 | INTERACTIVE | RESET_REQUIRED= , - option text =3D STRING_TOKEN(STR_CHIPSET_SD_ARASAN), value = =3D 1, flags =3D 0; - option text =3D STRING_TOKEN(STR_CHIPSET_SD_SDHOST), value = =3D 0, flags =3D DEFAULT; - endoneof; endform; form formid =3D 0x1006, @@ -306,6 +298,14 @@ formset title =3D STRING_TOKEN(STR_MMC_FORM_TITLE); subtitle text =3D STRING_TOKEN(STR_MMC_FORM_SUBTITLE); + oneof varid =3D SdIsArasan.Routing, + prompt =3D STRING_TOKEN(STR_MMC_SD_PROMPT), + help =3D STRING_TOKEN(STR_MMC_SD_HELP), + flags =3D NUMERIC_SIZE_4 | INTERACTIVE | RESET_REQUIRED= , + option text =3D STRING_TOKEN(STR_MMC_SD_ARASAN), value =3D 1,= flags =3D 0; + option text =3D STRING_TOKEN(STR_MMC_SD_SDHOST), value =3D 0,= flags =3D DEFAULT; + endoneof; + oneof varid =3D MmcDisableMulti.DisableMulti, prompt =3D STRING_TOKEN(STR_MMC_DISMULTI_PROMPT), help =3D STRING_TOKEN(STR_MMC_DISMULTI_HELP), -- 2.21.0.windows.1