[Patch 1/2] BaseTools: Fix bug when converting iSCSI node

[Patch 1/2] BaseTools: Fix bug when converting iSCSI node

[Yonghong Zhu]

If protocol string is not specified, default TCP(0) should be used.
Today's implementation wrongly sets to 1 for this case.
Copy the fix solution from MdePkg.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
---
 BaseTools/Source/C/DevicePath/DevicePathFromText.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BaseTools/Source/C/DevicePath/DevicePathFromText.c b/BaseTools/Source/C/DevicePath/DevicePathFromText.c
index 776cf05..06482ae 100644
--- a/BaseTools/Source/C/DevicePath/DevicePathFromText.c
+++ b/BaseTools/Source/C/DevicePath/DevicePathFromText.c
@@ -2424,11 +2424,11 @@ DevPathFromTextiSCSI (
     Options |= 0x1000;
   }
 
   ISCSIDevPath->LoginOption      = (UINT16) Options;
 
-  if (StrCmp (ProtocolStr, L"TCP") == 0) {
+  if (IS_NULL (*ProtocolStr) || (StrCmp (ProtocolStr, L"TCP") == 0)) {
     ISCSIDevPath->NetworkProtocol = 0;
   } else {
     //
     // Undefined and reserved.
     //
-- 
2.6.1.windows.1

[Patch 2/2] BaseTools: Fix byte orders when handling 8-byte array

[Yonghong Zhu]

Per UEFI spec, FibreEx.WWN, FibreEx.Lun, SasEx.Address, SasEx.Lun
and iSCSI.Lun are all 8-byte array with byte #0 in the left.
It means "0102030405060708" should be converted to:
    UINT8[8] = {01, 02, 03, 04, 05, 06, 07, 08}
or  UINT64 = {0807060504030201}

Today's implementation wrongly uses the reversed order.
The patch fixes this issue by using StrHexToBytes().
Copy this solution from MdePkg.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
---
 BaseTools/Source/C/DevicePath/DevicePathFromText.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/BaseTools/Source/C/DevicePath/DevicePathFromText.c b/BaseTools/Source/C/DevicePath/DevicePathFromText.c
index 776cf05..f2c0b3c 100644
--- a/BaseTools/Source/C/DevicePath/DevicePathFromText.c
+++ b/BaseTools/Source/C/DevicePath/DevicePathFromText.c
@@ -2385,10 +2385,11 @@ DevPathFromTextiSCSI (
   CHAR16                      *DataDigestStr;
   CHAR16                      *AuthenticationStr;
   CHAR16                      *ProtocolStr;
   CHAR8                       *AsciiStr;
   ISCSI_DEVICE_PATH_WITH_NAME *ISCSIDevPath;
+  UINT64                      Lun;
 
   NameStr           = GetNextParamStr (&TextDeviceNode);
   PortalGroupStr    = GetNextParamStr (&TextDeviceNode);
   LunStr            = GetNextParamStr (&TextDeviceNode);
   HeaderDigestStr   = GetNextParamStr (&TextDeviceNode);
@@ -2403,11 +2404,12 @@ DevPathFromTextiSCSI (
 
   AsciiStr = ISCSIDevPath->TargetName;
   StrToAscii (NameStr, &AsciiStr);
 
   ISCSIDevPath->TargetPortalGroupTag = (UINT16) Strtoi (PortalGroupStr);
-  Strtoi64 (LunStr, &ISCSIDevPath->Lun);
+  Strtoi64 (LunStr, &Lun);
+  WriteUnaligned64 ((UINT64 *) &ISCSIDevPath->Lun, SwapBytes64 (Lun));
 
   Options = 0x0000;
   if (StrCmp (HeaderDigestStr, L"CRC32C") == 0) {
     Options |= 0x0002;
   }
-- 
2.6.1.windows.1

Re: [Patch 1/2] BaseTools: Fix bug when converting iSCSI node

[Gao, Liming]

Reviewed-by: Liming Gao <liming.gao@intel.com>

Please update commit message with MdePkg Fix hash value.

> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Yonghong Zhu
> Sent: Saturday, March 3, 2018 3:36 PM
> To: edk2-devel@lists.01.org
> Subject: [edk2] [Patch 1/2] BaseTools: Fix bug when converting iSCSI node
> 
> If protocol string is not specified, default TCP(0) should be used.
> Today's implementation wrongly sets to 1 for this case.
> Copy the fix solution from MdePkg.
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
> ---
>  BaseTools/Source/C/DevicePath/DevicePathFromText.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/BaseTools/Source/C/DevicePath/DevicePathFromText.c b/BaseTools/Source/C/DevicePath/DevicePathFromText.c
> index 776cf05..06482ae 100644
> --- a/BaseTools/Source/C/DevicePath/DevicePathFromText.c
> +++ b/BaseTools/Source/C/DevicePath/DevicePathFromText.c
> @@ -2424,11 +2424,11 @@ DevPathFromTextiSCSI (
>      Options |= 0x1000;
>    }
> 
>    ISCSIDevPath->LoginOption      = (UINT16) Options;
> 
> -  if (StrCmp (ProtocolStr, L"TCP") == 0) {
> +  if (IS_NULL (*ProtocolStr) || (StrCmp (ProtocolStr, L"TCP") == 0)) {
>      ISCSIDevPath->NetworkProtocol = 0;
>    } else {
>      //
>      // Undefined and reserved.
>      //
> --
> 2.6.1.windows.1
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel

Re: [Patch 2/2] BaseTools: Fix byte orders when handling 8-byte array

[Ni, Ruiyu]

On 3/3/2018 3:35 PM, Yonghong Zhu wrote:
> Per UEFI spec, FibreEx.WWN, FibreEx.Lun, SasEx.Address, SasEx.Lun
The commit message is wrong.

> and iSCSI.Lun are all 8-byte array with byte #0 in the left.
> It means "0102030405060708" should be converted to:
>      UINT8[8] = {01, 02, 03, 04, 05, 06, 07, 08}
> or  UINT64 = {0807060504030201}
> 
> Today's implementation wrongly uses the reversed order.
> The patch fixes this issue by using StrHexToBytes().
> Copy this solution from MdePkg.
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
> ---
>   BaseTools/Source/C/DevicePath/DevicePathFromText.c | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/BaseTools/Source/C/DevicePath/DevicePathFromText.c b/BaseTools/Source/C/DevicePath/DevicePathFromText.c
> index 776cf05..f2c0b3c 100644
> --- a/BaseTools/Source/C/DevicePath/DevicePathFromText.c
> +++ b/BaseTools/Source/C/DevicePath/DevicePathFromText.c
> @@ -2385,10 +2385,11 @@ DevPathFromTextiSCSI (
>     CHAR16                      *DataDigestStr;
>     CHAR16                      *AuthenticationStr;
>     CHAR16                      *ProtocolStr;
>     CHAR8                       *AsciiStr;
>     ISCSI_DEVICE_PATH_WITH_NAME *ISCSIDevPath;
> +  UINT64                      Lun;
>   
>     NameStr           = GetNextParamStr (&TextDeviceNode);
>     PortalGroupStr    = GetNextParamStr (&TextDeviceNode);
>     LunStr            = GetNextParamStr (&TextDeviceNode);
>     HeaderDigestStr   = GetNextParamStr (&TextDeviceNode);
> @@ -2403,11 +2404,12 @@ DevPathFromTextiSCSI (
>   
>     AsciiStr = ISCSIDevPath->TargetName;
>     StrToAscii (NameStr, &AsciiStr);
>   
>     ISCSIDevPath->TargetPortalGroupTag = (UINT16) Strtoi (PortalGroupStr);
> -  Strtoi64 (LunStr, &ISCSIDevPath->Lun);
> +  Strtoi64 (LunStr, &Lun);
> +  WriteUnaligned64 ((UINT64 *) &ISCSIDevPath->Lun, SwapBytes64 (Lun));
>   
>     Options = 0x0000;
>     if (StrCmp (HeaderDigestStr, L"CRC32C") == 0) {
>       Options |= 0x0002;
>     }
> 


-- 
Thanks,
Ray