From patchwork Mon Dec 4 07:10:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 844143 X-Patchwork-Delegate: agraf@suse.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3yqx0p6lj2z9s7g for ; Mon, 4 Dec 2017 18:12:58 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 8CEDCC2202C; Mon, 4 Dec 2017 07:11:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 755FEC22043; Mon, 4 Dec 2017 07:11:49 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 0D379C22047; Mon, 4 Dec 2017 07:11:23 +0000 (UTC) Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) by lists.denx.de (Postfix) with ESMTPS id 89798C2206E for ; Mon, 4 Dec 2017 07:11:19 +0000 (UTC) Received: from LT01.fritz.box ([94.114.42.150]) by mail.gmx.com (mrgmx002 [212.227.17.184]) with ESMTPSA (Nemesis) id 0M9b03-1eEqtL38oB-00CvXy; Mon, 04 Dec 2017 08:11:04 +0100 From: Heinrich Schuchardt To: Alexander Graf Date: Mon, 4 Dec 2017 08:10:57 +0100 Message-Id: <20171204071057.9520-4-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171204071057.9520-1-xypron.glpk@gmx.de> References: <20171204071057.9520-1-xypron.glpk@gmx.de> X-Provags-ID: V03:K0:Mejo8pG4HJB4JXsjl6dqCi+CjvVKL7XbJ946FLZ8vOqpQ2rVEoy U5+mG9pjhmsY3ICsv1YbIk2FbEFZNn1uegiTl/IXKmLpibn3nHGsA3XDvSdnpOvEbPZKrOW Dl0kbh7WEBd5UI9R7tqFlHcPjeTQ8EWt2MmlNvR3msQ710goDOi5t4zcasAjdZ11EwX/kVB 1FRdzOuKZw3TS0hvYyN6w== X-UI-Out-Filterresults: notjunk:1; V01:K0:u5a5S5Cj8bY=:wuiLz6lqmAFTq5cdfHkFYv iNpDYh4shwTjuaaPAWJEwAlO5FbG0LStYHypMUYDuySwIIhQhzvdNrNpsYnVgZI3SaYwXUD2s 6ENmqEbRe278RrhE8N7pL3BdR1lGlrVXxj858y6xxLTtcHAJ3MwVSQ5PuO6BwUaud3LzSvmWU awk8QQCI7rjOkD29wp7Ulq2RI9V1vcBlSa+cUGRVKE0ArNgNXkqOqcn57HyIR6u5QbW9DxfCZ lJI0NFEkhS5dDgJbe681AF0GX6L2huNpcDcNCe3xX16IRx+T9JZA3oXn/l0bGQAveBYJuf7uZ KaxL5NuBMaaolR4Z2lxxbj1Zo/HBc/ps7tViMcc2OfJlGkOZOUIwtUB4a0DSuQBuqySKSKSSp SUisNnyc3PldiHFKJS95ZVGbZdSwSUHWb54Kov6jHVAtdhZvmo+H9TZ5F6AMwot6y/fNRyebi ccZk5haKJkNvYwRIm2idfnwH9uJb5HVNNXWNFSVz3c+BedX7sG1pTWJpaHZ5BrHn+i0Hpa17Q y3uk96uy3DPSVpGGTEmZUB2KoBJFgNEIIsvcoEfmFLBb86NU6nAaXYnP2crvkl0+LKJC1Ql8J Ud+qI+tCF6ITHPtDY0O0yLL0nctcp3SU/8UKcux/DtLew2VHmz7j2iaDtr7Jo8mAle/Urth1N WmYJU/QLV77d5xm+dkq4yOe0/Lt4KGLmRLRkY8r18FQp7uhf0GU5TSTkoS/oSAZg1f15eoVeS 1yiA9XB7F6M96o0YFaBJbKKG2UcOcyemcXY2SvE70SLAkatrhGFajO1/9uBsgrLAaUYGUmspQ WF1wBikN/cu7JX5Qz/+TK5y6vhEsw== Cc: u-boot@lists.denx.de, Heinrich Schuchardt Subject: [U-Boot] [PATCH v2 3/3] efi_loader: correct DeviceNodeToText for media types X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" When converting device nodes and paths to text we should stick to the UEFI spec. Signed-off-by: Heinrich Schuchardt --- v2 no change --- lib/efi_loader/efi_device_path_to_text.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/lib/efi_loader/efi_device_path_to_text.c b/lib/efi_loader/efi_device_path_to_text.c index 7159c974d4..21c5678d20 100644 --- a/lib/efi_loader/efi_device_path_to_text.c +++ b/lib/efi_loader/efi_device_path_to_text.c @@ -90,7 +90,7 @@ static char *dp_msging(char *s, struct efi_device_path *dp) case DEVICE_PATH_SUB_TYPE_MSG_USB: { struct efi_device_path_usb *udp = (struct efi_device_path_usb *)dp; - s += sprintf(s, "Usb(0x%x,0x%x)", udp->parent_port_number, + s += sprintf(s, "USB(0x%x,0x%x)", udp->parent_port_number, udp->usb_interface); break; } @@ -124,10 +124,10 @@ static char *dp_msging(char *s, struct efi_device_path *dp) case DEVICE_PATH_SUB_TYPE_MSG_MMC: { const char *typename = (dp->sub_type == DEVICE_PATH_SUB_TYPE_MSG_SD) ? - "SDCard" : "MMC"; + "SD" : "eMMC"; struct efi_device_path_sd_mmc_path *sddp = (struct efi_device_path_sd_mmc_path *)dp; - s += sprintf(s, "%s(Slot%u)", typename, sddp->slot_number); + s += sprintf(s, "%s(%u)", typename, sddp->slot_number); break; } default: @@ -147,18 +147,26 @@ static char *dp_media(char *s, struct efi_device_path *dp) switch (hddp->signature_type) { case SIG_TYPE_MBR: - s += sprintf(s, "HD(Part%d,Sig%08x)", - hddp->partition_number, - *(uint32_t *)sig); + s += sprintf( + s, "HD(%d,MBR,0x%08x,0x%llx,0x%llx)", + hddp->partition_number, + *(uint32_t *)sig, + (unsigned long long int)hddp->partition_start, + (unsigned long long int)hddp->partition_end); break; case SIG_TYPE_GUID: - s += sprintf(s, "HD(Part%d,Sig%pUl)", - hddp->partition_number, sig); + s += sprintf( + s, "HD(%d,GPT,%pUl,0x%llx,0x%llx)", + hddp->partition_number, sig, + (unsigned long long int)hddp->partition_start, + (unsigned long long int)hddp->partition_end); break; default: - s += sprintf(s, "HD(Part%d,MBRType=%02x,SigType=%02x)", - hddp->partition_number, hddp->partmap_type, - hddp->signature_type); + s += sprintf( + s, "HD(%d,0x%02x,0,0x%llx,0x%llx)", + hddp->partition_number, hddp->partmap_type, + (unsigned long long int)hddp->partition_start, + (unsigned long long int)hddp->partition_end); break; }