From patchwork Wed Nov 27 06:09:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Hu X-Patchwork-Id: 294492 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 5D8FD2C009F for ; Wed, 27 Nov 2013 17:09:13 +1100 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1VlYJD-0008Hf-9V; Wed, 27 Nov 2013 06:09:11 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1VlYJ8-0008HR-IN for fwts-devel@lists.ubuntu.com; Wed, 27 Nov 2013 06:09:06 +0000 Received: from [175.41.48.77] (helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1VlYJ8-0000y6-0R; Wed, 27 Nov 2013 06:09:06 +0000 From: Ivan Hu To: fwts-devel@lists.ubuntu.com Subject: [PATCH 1/4] uefi: uefidump: add the Fibre Channel Ex subtype-21 support on messaging device path type for uefidump(LP#:1255387) Date: Wed, 27 Nov 2013 14:09:00 +0800 Message-Id: <1385532540-30879-1-git-send-email-ivan.hu@canonical.com> X-Mailer: git-send-email 1.7.9.5 X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: fwts-devel-bounces@lists.ubuntu.com Sender: fwts-devel-bounces@lists.ubuntu.com Add the Fibre Channel Ex subtype 21 support on messaging device path follow the section 9.3.5.3 on UEFI spec2.4. Signed-off-by: Ivan Hu Acked-by: Colin Ian King Acked-by: Keng-Yu Lin --- src/lib/include/fwts_uefi.h | 11 ++++++++++- src/uefi/uefidump/uefidump.c | 6 ++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/lib/include/fwts_uefi.h b/src/lib/include/fwts_uefi.h index f21d2c7..40a171a 100644 --- a/src/lib/include/fwts_uefi.h +++ b/src/lib/include/fwts_uefi.h @@ -203,7 +203,9 @@ typedef enum { FWTS_UEFI_IPV4_DEVICE_PATH_SUBTYPE = (0x0c), FWTS_UEFI_IPV6_DEVICE_PATH_SUBTYPE = (0x0d), FWTS_UEFI_UART_DEVICE_PATH_SUBTYPE = (0x0e), - FWTS_UEFI_USB_CLASS_DEVICE_PATH_SUBTYPE = (0x0f) + FWTS_UEFI_USB_CLASS_DEVICE_PATH_SUBTYPE = (0x0f), + FWTS_UEFI_FIBRE_CHANNEL_EX_DEVICE_PATH_SUBTYPE = (0x15) + } messaging_dev_path_subtypes; typedef enum { @@ -372,6 +374,13 @@ typedef struct { typedef struct { fwts_uefi_dev_path dev_path; + uint32_t reserved; + uint64_t wwn; + uint64_t lun; +} fwts_uefi_fibre_channel_ex_dev_path; + +typedef struct { + fwts_uefi_dev_path dev_path; uint32_t partition_number; uint64_t partition_start; uint64_t partition_size; diff --git a/src/uefi/uefidump/uefidump.c b/src/uefi/uefidump/uefidump.c index 50a08b4..93b47dd 100644 --- a/src/uefi/uefidump/uefidump.c +++ b/src/uefi/uefidump/uefidump.c @@ -336,6 +336,12 @@ static char *uefidump_build_dev_path(char *path, fwts_uefi_dev_path *dev_path, c v->guid.info4[4], v->guid.info4[5], v->guid.info4[6], v->guid.info4[7]); } break; + case FWTS_UEFI_FIBRE_CHANNEL_EX_DEVICE_PATH_SUBTYPE: + if (dev_path_len >= sizeof(fwts_uefi_fibre_channel_ex_dev_path)) { + fwts_uefi_fibre_channel_ex_dev_path *f = (fwts_uefi_fibre_channel_ex_dev_path *)dev_path; + path = uefidump_vprintf(path, "\\FIBREEX(0x%" PRIx64 ",0x%" PRIx64 ")", f->wwn, f->lun); + } + break; default: path = uefidump_vprintf(path, "\\Unknown-MESSAGING-DEV-PATH(0x%" PRIx8 ")", dev_path->subtype); break;