Message ID | 1446779805-29844-1-git-send-email-ivan.hu@canonical.com |
---|---|
State | Accepted |
Headers | show |
On 11/06/2015 11:16 AM, Ivan Hu wrote: > Sync up with uefi spec. 2.5 for new messaging device path, UFS device path. > And also fix some typos. > > Signed-off-by: Ivan Hu <ivan.hu@canonical.com> > --- > src/uefi/uefibootpath/uefibootpath.c | 35 ++++++++++++++++++++++++++++------- > 1 file changed, 28 insertions(+), 7 deletions(-) > > diff --git a/src/uefi/uefibootpath/uefibootpath.c b/src/uefi/uefibootpath/uefibootpath.c > index 3232bd1..fc75594 100644 > --- a/src/uefi/uefibootpath/uefibootpath.c > +++ b/src/uefi/uefibootpath/uefibootpath.c > @@ -62,7 +62,7 @@ static int uefibootpath_check_dev_path(fwts_framework *fw, fwts_uefi_dev_path *d > } > break; > default: > - fwts_log_info_verbatum(fw, "Unknow subtype of End of Hardware Device Path."); > + fwts_log_info_verbatum(fw, "Unknown subtype of End of Hardware Device Path."); > break; > } > break; > @@ -138,7 +138,7 @@ static int uefibootpath_check_dev_path(fwts_framework *fw, fwts_uefi_dev_path *d > } > break; > default: > - fwts_log_info_verbatum(fw, "Unknow subtype of Hardware Device Path."); > + fwts_log_info_verbatum(fw, "Unknown subtype of Hardware Device Path."); > break; > } > break; > @@ -202,7 +202,7 @@ static int uefibootpath_check_dev_path(fwts_framework *fw, fwts_uefi_dev_path *d > } > break; > default: > - fwts_log_info_verbatum(fw, "Unknow subtype of ACPI Device Path."); > + fwts_log_info_verbatum(fw, "Unknown subtype of ACPI Device Path."); > break; > } > break; > @@ -563,8 +563,29 @@ static int uefibootpath_check_dev_path(fwts_framework *fw, fwts_uefi_dev_path *d > errors++; > } > break; > + case FWTS_UEFI_UFS_DEVICE_PATH_SUBTYPE: > + if (len != sizeof(fwts_uefi_ufs_dev_path)) { > + fwts_failed(fw, LOG_LEVEL_MEDIUM, "UEFIUFSDevPathLength", > + "The length of UFS(Universal Flash Storage) is %" PRIu16 " bytes " > + "and differs from UEFI specification defined %" PRIu16 " bytes.", > + len, > + (uint16_t)sizeof(fwts_uefi_ufs_dev_path)); > + errors++; > + } > + > + fwts_uefi_ufs_dev_path *ufs = (fwts_uefi_ufs_dev_path *)dev_path; > + if (ufs->target_id != 0) { > + fwts_failed(fw, LOG_LEVEL_MEDIUM, "UEFIPUNFieldInvalid", > + "The Target ID on the UFS interface(PUN) is %" PRIu8 " ." > + "This value should be 0 for current UFS2.0 spec compliance " > + "and reserve/introduce this field to support multiple devices " > + "per UFS port.", > + ufs->target_id); > + errors++; > + } > + break; > default: > - fwts_log_info_verbatum(fw, "Unknow subtype of Messaging Device PaERRORth."); > + fwts_log_info_verbatum(fw, "Unknown subtype of Messaging Device Path."); > break; > } > break; > @@ -670,7 +691,7 @@ static int uefibootpath_check_dev_path(fwts_framework *fw, fwts_uefi_dev_path *d > } > break; > default: > - fwts_log_info_verbatum(fw, "Unknow subtype of Media Device Path."); > + fwts_log_info_verbatum(fw, "Unknown subtype of Media Device Path."); > break; > } > break; > @@ -698,12 +719,12 @@ static int uefibootpath_check_dev_path(fwts_framework *fw, fwts_uefi_dev_path *d > } > break; > default: > - fwts_log_info_verbatum(fw, "Unknow subtype of BIOS Boot Specification Device Path."); > + fwts_log_info_verbatum(fw, "Unknown subtype of BIOS Boot Specification Device Path."); > break; > } > break; > default: > - fwts_log_info_verbatum(fw, "Unknow Type of Device Path."); > + fwts_log_info_verbatum(fw, "Unknown Type of Device Path."); > break; > > } > Acked-by: Alex Hung <alex.hung@canonical.com>
On 06/11/15 03:16, Ivan Hu wrote: > Sync up with uefi spec. 2.5 for new messaging device path, UFS device path. > And also fix some typos. > > Signed-off-by: Ivan Hu <ivan.hu@canonical.com> > --- > src/uefi/uefibootpath/uefibootpath.c | 35 ++++++++++++++++++++++++++++------- > 1 file changed, 28 insertions(+), 7 deletions(-) > > diff --git a/src/uefi/uefibootpath/uefibootpath.c b/src/uefi/uefibootpath/uefibootpath.c > index 3232bd1..fc75594 100644 > --- a/src/uefi/uefibootpath/uefibootpath.c > +++ b/src/uefi/uefibootpath/uefibootpath.c > @@ -62,7 +62,7 @@ static int uefibootpath_check_dev_path(fwts_framework *fw, fwts_uefi_dev_path *d > } > break; > default: > - fwts_log_info_verbatum(fw, "Unknow subtype of End of Hardware Device Path."); > + fwts_log_info_verbatum(fw, "Unknown subtype of End of Hardware Device Path."); > break; > } > break; > @@ -138,7 +138,7 @@ static int uefibootpath_check_dev_path(fwts_framework *fw, fwts_uefi_dev_path *d > } > break; > default: > - fwts_log_info_verbatum(fw, "Unknow subtype of Hardware Device Path."); > + fwts_log_info_verbatum(fw, "Unknown subtype of Hardware Device Path."); > break; > } > break; > @@ -202,7 +202,7 @@ static int uefibootpath_check_dev_path(fwts_framework *fw, fwts_uefi_dev_path *d > } > break; > default: > - fwts_log_info_verbatum(fw, "Unknow subtype of ACPI Device Path."); > + fwts_log_info_verbatum(fw, "Unknown subtype of ACPI Device Path."); > break; > } > break; > @@ -563,8 +563,29 @@ static int uefibootpath_check_dev_path(fwts_framework *fw, fwts_uefi_dev_path *d > errors++; > } > break; > + case FWTS_UEFI_UFS_DEVICE_PATH_SUBTYPE: > + if (len != sizeof(fwts_uefi_ufs_dev_path)) { > + fwts_failed(fw, LOG_LEVEL_MEDIUM, "UEFIUFSDevPathLength", > + "The length of UFS(Universal Flash Storage) is %" PRIu16 " bytes " > + "and differs from UEFI specification defined %" PRIu16 " bytes.", > + len, > + (uint16_t)sizeof(fwts_uefi_ufs_dev_path)); > + errors++; > + } > + > + fwts_uefi_ufs_dev_path *ufs = (fwts_uefi_ufs_dev_path *)dev_path; > + if (ufs->target_id != 0) { > + fwts_failed(fw, LOG_LEVEL_MEDIUM, "UEFIPUNFieldInvalid", > + "The Target ID on the UFS interface(PUN) is %" PRIu8 " ." > + "This value should be 0 for current UFS2.0 spec compliance " > + "and reserve/introduce this field to support multiple devices " > + "per UFS port.", > + ufs->target_id); > + errors++; > + } > + break; > default: > - fwts_log_info_verbatum(fw, "Unknow subtype of Messaging Device PaERRORth."); > + fwts_log_info_verbatum(fw, "Unknown subtype of Messaging Device Path."); > break; > } > break; > @@ -670,7 +691,7 @@ static int uefibootpath_check_dev_path(fwts_framework *fw, fwts_uefi_dev_path *d > } > break; > default: > - fwts_log_info_verbatum(fw, "Unknow subtype of Media Device Path."); > + fwts_log_info_verbatum(fw, "Unknown subtype of Media Device Path."); > break; > } > break; > @@ -698,12 +719,12 @@ static int uefibootpath_check_dev_path(fwts_framework *fw, fwts_uefi_dev_path *d > } > break; > default: > - fwts_log_info_verbatum(fw, "Unknow subtype of BIOS Boot Specification Device Path."); > + fwts_log_info_verbatum(fw, "Unknown subtype of BIOS Boot Specification Device Path."); > break; > } > break; > default: > - fwts_log_info_verbatum(fw, "Unknow Type of Device Path."); > + fwts_log_info_verbatum(fw, "Unknown Type of Device Path."); > break; > > } > Thanks Acked-by: Colin Ian King <colin.king@canonical.com>
diff --git a/src/uefi/uefibootpath/uefibootpath.c b/src/uefi/uefibootpath/uefibootpath.c index 3232bd1..fc75594 100644 --- a/src/uefi/uefibootpath/uefibootpath.c +++ b/src/uefi/uefibootpath/uefibootpath.c @@ -62,7 +62,7 @@ static int uefibootpath_check_dev_path(fwts_framework *fw, fwts_uefi_dev_path *d } break; default: - fwts_log_info_verbatum(fw, "Unknow subtype of End of Hardware Device Path."); + fwts_log_info_verbatum(fw, "Unknown subtype of End of Hardware Device Path."); break; } break; @@ -138,7 +138,7 @@ static int uefibootpath_check_dev_path(fwts_framework *fw, fwts_uefi_dev_path *d } break; default: - fwts_log_info_verbatum(fw, "Unknow subtype of Hardware Device Path."); + fwts_log_info_verbatum(fw, "Unknown subtype of Hardware Device Path."); break; } break; @@ -202,7 +202,7 @@ static int uefibootpath_check_dev_path(fwts_framework *fw, fwts_uefi_dev_path *d } break; default: - fwts_log_info_verbatum(fw, "Unknow subtype of ACPI Device Path."); + fwts_log_info_verbatum(fw, "Unknown subtype of ACPI Device Path."); break; } break; @@ -563,8 +563,29 @@ static int uefibootpath_check_dev_path(fwts_framework *fw, fwts_uefi_dev_path *d errors++; } break; + case FWTS_UEFI_UFS_DEVICE_PATH_SUBTYPE: + if (len != sizeof(fwts_uefi_ufs_dev_path)) { + fwts_failed(fw, LOG_LEVEL_MEDIUM, "UEFIUFSDevPathLength", + "The length of UFS(Universal Flash Storage) is %" PRIu16 " bytes " + "and differs from UEFI specification defined %" PRIu16 " bytes.", + len, + (uint16_t)sizeof(fwts_uefi_ufs_dev_path)); + errors++; + } + + fwts_uefi_ufs_dev_path *ufs = (fwts_uefi_ufs_dev_path *)dev_path; + if (ufs->target_id != 0) { + fwts_failed(fw, LOG_LEVEL_MEDIUM, "UEFIPUNFieldInvalid", + "The Target ID on the UFS interface(PUN) is %" PRIu8 " ." + "This value should be 0 for current UFS2.0 spec compliance " + "and reserve/introduce this field to support multiple devices " + "per UFS port.", + ufs->target_id); + errors++; + } + break; default: - fwts_log_info_verbatum(fw, "Unknow subtype of Messaging Device PaERRORth."); + fwts_log_info_verbatum(fw, "Unknown subtype of Messaging Device Path."); break; } break; @@ -670,7 +691,7 @@ static int uefibootpath_check_dev_path(fwts_framework *fw, fwts_uefi_dev_path *d } break; default: - fwts_log_info_verbatum(fw, "Unknow subtype of Media Device Path."); + fwts_log_info_verbatum(fw, "Unknown subtype of Media Device Path."); break; } break; @@ -698,12 +719,12 @@ static int uefibootpath_check_dev_path(fwts_framework *fw, fwts_uefi_dev_path *d } break; default: - fwts_log_info_verbatum(fw, "Unknow subtype of BIOS Boot Specification Device Path."); + fwts_log_info_verbatum(fw, "Unknown subtype of BIOS Boot Specification Device Path."); break; } break; default: - fwts_log_info_verbatum(fw, "Unknow Type of Device Path."); + fwts_log_info_verbatum(fw, "Unknown Type of Device Path."); break; }
Sync up with uefi spec. 2.5 for new messaging device path, UFS device path. And also fix some typos. Signed-off-by: Ivan Hu <ivan.hu@canonical.com> --- src/uefi/uefibootpath/uefibootpath.c | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-)