From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: suse.com, ip: 15.124.64.66, mailfrom: glin@suse.com) Received: from m9a0001g.houston.softwaregrp.com (m9a0001g.houston.softwaregrp.com [15.124.64.66]) by groups.io with SMTP; Tue, 30 Jul 2019 01:21:35 -0700 Received: FROM m9a0001g.houston.softwaregrp.com (15.121.0.190) BY m9a0001g.houston.softwaregrp.com WITH ESMTP; Tue, 30 Jul 2019 08:21:34 +0000 Received: from M9W0067.microfocus.com (2002:f79:be::f79:be) by M9W0067.microfocus.com (2002:f79:be::f79:be) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1591.10; Tue, 30 Jul 2019 08:16:11 +0000 Received: from NAM03-CO1-obe.outbound.protection.outlook.com (15.124.72.12) by M9W0067.microfocus.com (15.121.0.190) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1591.10 via Frontend Transport; Tue, 30 Jul 2019 08:16:11 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Lj2oORN1o8RtQPR7XmzpcB9SxoEp7TvGE9CwuiqI61nxpTUnE95elsoCvv97q2YjwabOOpMoN452ZiGHVHS2QVVpyabYoSlfJcmzpUxeiKspGmYdA41PsO7XYuQwYMCRpt27ilMDJqbvBswhMN5haWgK04r23qDtGEAXl9XNn+PiQAUOwjr/OoJhj6WOdQutISh1UmdtKH/dgiDeE2SCjK2b/Qtx9jj973sn+9SWg8xq3RcusIsNSs7RzgA3DhinsJvxLJNJciPhGE9RNK725IEfMGiErpIkAfuusKF14VatTqbi2p4se5xF3YJhTupAjDWAwjKlU6rVMYdeK+jnxg== 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=G8KPBhmywrCPdQQwXd7iFQeWVdVI8ufXm8Q1M8qroXc=; b=Sq5uWSdnQefLf6p51Iva0Q+OOiUwDIc9REbiUz7Rr9ZF9fvfffrV9Flqt9w93AukEjTFcSwFM+kO7kkzTecn8H3vecnrfeXw3DNvFPfJoi1TXVddo8oMWK9X+QuOqWaxfdFem8BBCA36OCIvFIqkRvmWaW0ksld4eOIYoTAsZwD8QFzkTTVk6qY2CPGje2EBqwaWUTpIpqezpjaXOwouA5nmbIpl02m5QY0IZVe6Apb4D8C5F2MZPMjg9O6FhZohn2+nud9xkoDiAJuTsXFzJqwVdUzoaV9Q0CPwK31nqi4iks7ycn9+6BerKQU8Mja114KR1Xg4cNEYJQKGnG1IMQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass smtp.mailfrom=suse.com;dmarc=pass action=none header.from=suse.com;dkim=pass header.d=suse.com;arc=none Received: from DM6PR18MB2489.namprd18.prod.outlook.com (20.179.105.16) by DM6PR18MB3068.namprd18.prod.outlook.com (20.179.48.77) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2115.14; Tue, 30 Jul 2019 08:16:08 +0000 Received: from DM6PR18MB2489.namprd18.prod.outlook.com ([fe80::ac83:47c9:cebd:9f0]) by DM6PR18MB2489.namprd18.prod.outlook.com ([fe80::ac83:47c9:cebd:9f0%7]) with mapi id 15.20.2115.005; Tue, 30 Jul 2019 08:16:08 +0000 From: "Gary Lin" To: "devel@edk2.groups.io" CC: Zailiang Sun , Yi Qian , Michael D Kinney Subject: [edk2-platforms] [PATCH v2 1/6] Vlv2TbltDevicePkg: Adjust the device priority Thread-Topic: [edk2-platforms] [PATCH v2 1/6] Vlv2TbltDevicePkg: Adjust the device priority Thread-Index: AQHVRq8Kzu9/+EvJ50K2bsOyAK/gsg== Date: Tue, 30 Jul 2019 08:16:08 +0000 Message-ID: <20190730081518.16349-2-glin@suse.com> References: <20190730081518.16349-1-glin@suse.com> In-Reply-To: <20190730081518.16349-1-glin@suse.com> Accept-Language: zh-TW, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: DB6PR1001CA0031.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:4:55::17) To DM6PR18MB2489.namprd18.prod.outlook.com (2603:10b6:5:184::16) authentication-results: spf=none (sender IP is ) smtp.mailfrom=GLin@suse.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.22.0 x-originating-ip: [202.47.205.198] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 578478c0-1a2d-47c3-a2b3-08d714c62cba x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(2017052603328)(7193020);SRVR:DM6PR18MB3068; x-ms-traffictypediagnostic: DM6PR18MB3068: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:193; x-forefront-prvs: 0114FF88F6 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(4636009)(376002)(136003)(346002)(39860400002)(396003)(366004)(189003)(199004)(5660300002)(6436002)(76176011)(52116002)(25786009)(2351001)(3846002)(53936002)(71200400001)(26005)(6916009)(486006)(476003)(71190400001)(446003)(11346002)(4326008)(6486002)(68736007)(8676002)(5640700003)(186003)(2616005)(2501003)(316002)(86362001)(66446008)(66066001)(478600001)(50226002)(81156014)(14454004)(1730700003)(256004)(6116002)(64756008)(36756003)(66556008)(81166006)(54906003)(102836004)(6512007)(66946007)(2906002)(80792005)(7736002)(99286004)(6506007)(386003)(305945005)(1076003)(8936002)(66476007);DIR:OUT;SFP:1102;SCL:1;SRVR:DM6PR18MB3068;H:DM6PR18MB2489.namprd18.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: suse.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: fhj+aPrYt2ZlrXyJWmUdXAzpF1RZQmkSdJN1eVqDvs1npRGbeS+FhIhxpuik0jdnE/tunPL2GQU305fBPwePM9gadONACaE1iVcQVqDIMl05CorBAGcApEqokWG+cOc7bMCwcb25NSLeWVMqnqTnDZ4018DDrW4TUo9n8Z5n90P7l+DE9AhHyVR2//2IJPZNbRokwsV2QPSoFPwr347BtffagrCfyHx6gPi/91bO38yhikzQrmblgC1laN87Ze8lJ9wj3B8JUF6fJP8qSHBXwy57p8HlijeCCrXNtCSsmQWTxvnuff2gcpoD3kRTY2NL/sRV+I67AATu2jMmlu72vi7FuLgPwo6XgxArbg4fS9W10gY1xA+x7NI39zXTeHtistgdB5ZoRDw735W9p7n54X2KsUKRmYEquH2SKoERU6I= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 578478c0-1a2d-47c3-a2b3-08d714c62cba X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Jul 2019 08:16:08.6721 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 856b813c-16e5-49a5-85ec-6f081e13b527 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: GLin@suse.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR18MB3068 Return-Path: GLin@suse.com X-OriginatorOrg: suse.com Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable In BootOptionPriority(), the higher number implies the lower boot priority. This commit lowers the priority of network booting and raises the priority of the local devices. Besides, SD and EMMC are also added to BootOptionPriority() since Minnowboard comes with a SD card slot. v2: Also match MSG_URI_DP to sort HTTP Boot options Cc: Zailiang Sun Cc: Yi Qian Cc: Michael D Kinney Signed-off-by: Gary Lin --- Platform/Intel/Vlv2TbltDevicePkg/Library/DxePlatformBootManagerLib/Platfor= mBootOption.c | 29 ++++++++++---------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Library/DxePlatformBootManage= rLib/PlatformBootOption.c b/Platform/Intel/Vlv2TbltDevicePkg/Library/DxePla= tformBootManagerLib/PlatformBootOption.c index 84aa097d58..195b3f3097 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/Library/DxePlatformBootManagerLib/Pl= atformBootOption.c +++ b/Platform/Intel/Vlv2TbltDevicePkg/Library/DxePlatformBootManagerLib/Pl= atformBootOption.c @@ -499,11 +499,10 @@ BootOptionType ( Returns the priority number. OptionType EFI ------------------------------------ - PXE 2 - DVD 4 - USB 6 - NVME 7 - HDD 8 + HDD 2 + USB 4 + SATA/NVME/SD 6 + PXE/HTTP 8 EFI Shell 9 Others 100 =20 @@ -518,21 +517,23 @@ BootOptionPriority ( // EFI boot options // switch (BootOptionType (BootOption->FilePath)) { - case MSG_MAC_ADDR_DP: - case MSG_VLAN_DP: - case MSG_IPv4_DP: - case MSG_IPv6_DP: - return 2; + case MSG_USB_DP: + return 4; =20 case MSG_SATA_DP: case MSG_ATAPI_DP: case MSG_UFS_DP: case MSG_NVME_NAMESPACE_DP: - return 4; - - case MSG_USB_DP: + case MSG_SD_DP: + case MSG_EMMC_DP: return 6; =20 + case MSG_MAC_ADDR_DP: + case MSG_VLAN_DP: + case MSG_IPv4_DP: + case MSG_IPv6_DP: + case MSG_URI_DP: + return 8; } if (StrCmp (BootOption->Description, INTERNAL_UEFI_SHELL_NAME) =3D=3D = 0) { if (PcdGetBool (PcdBootToShellOnly)) { @@ -541,7 +542,7 @@ BootOptionPriority ( return 9; } if (StrCmp (BootOption->Description, UEFI_HARD_DRIVE_NAME) =3D=3D 0) { - return 8; + return 2; } return 100; } --=20 2.22.0