1
0
Fork 0

Merging upstream version 2.11.

Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-16 12:28:30 +01:00
parent 6f6d3e85f8
commit 0f2367f2fa
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
533 changed files with 9033 additions and 4835 deletions

View file

@ -179,6 +179,8 @@ static const char *pel_event_to_string(int type)
return "Set Telemetry CRT Event";
case NVME_PEL_THERMAL_EXCURSION_EVENT:
return "Thermal Excursion Event";
case NVME_PEL_SANITIZE_MEDIA_VERIF_EVENT:
return "Sanitize Media Verification Event";
case NVME_PEL_VENDOR_SPECIFIC_EVENT:
return "Vendor Specific Event";
case NVME_PEL_TCG_DEFINED_EVENT:
@ -406,7 +408,18 @@ bool nvme_is_fabrics_reg(int offset)
case NVME_REG_CC:
case NVME_REG_CSTS:
case NVME_REG_NSSR:
case NVME_REG_CRTO:
return true;
default:
break;
}
return false;
}
bool nvme_is_fabrics_optional_reg(int offset)
{
switch (offset) {
case NVME_REG_NSSR:
return true;
default:
break;
@ -678,11 +691,11 @@ const char *nvme_trtype_to_string(__u8 trtype)
{
switch (trtype) {
case 0: return "The transport type is not indicated or the error "\
"is not transport related.";
case 1: return "RDMA Transport error.";
case 2: return "Fibre Channel Transport error.";
case 3: return "TCP Transport error.";
case 254: return "Intra-host Transport error.";
"is not transport related";
case 1: return "RDMA Transport error";
case 2: return "Fibre Channel Transport error";
case 3: return "TCP Transport error";
case 254: return "Intra-host Transport error";
default: return "Reserved";
};
}
@ -789,8 +802,8 @@ static bool is_temperature_fahrenheit(void)
const char *locale, *underscore;
char country[3] = { 0 };
setlocale(LC_ALL, "");
locale = setlocale(LC_ALL, NULL);
setlocale(LC_MEASUREMENT, "");
locale = setlocale(LC_MEASUREMENT, NULL);
if (!locale || strlen(locale) < 2)
return false;
@ -962,13 +975,18 @@ const char *nvme_register_to_string(int reg)
const char *nvme_select_to_string(int sel)
{
switch (sel) {
case 0: return "Current";
case 1: return "Default";
case 2: return "Saved";
case 3: return "Supported capabilities";
case 8: return "Changed";
default: return "Reserved";
case NVME_GET_FEATURES_SEL_CURRENT:
return "Current";
case NVME_GET_FEATURES_SEL_DEFAULT:
return "Default";
case NVME_GET_FEATURES_SEL_SAVED:
return "Saved";
case NVME_GET_FEATURES_SEL_SUPPORTED:
return "Supported capabilities";
default:
break;
}
return "Reserved";
}
void nvme_show_select_result(enum nvme_features_id fid, __u32 result)
@ -1057,7 +1075,7 @@ void nvme_directive_show(__u8 type, __u8 oper, __u16 spec, __u32 nsid, __u32 res
const char *nvme_plm_window_to_string(__u32 plm)
{
switch (plm & 0x7) {
switch (NVME_FEAT_PLMW_WS(plm)) {
case 1:
return "Deterministic Window (DTWIN)";
case 2: