Skip to content

wdc: Fix uuid-index setting for WD 0xC2 log page #2842

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
igaw merged 1 commit into from
Jun 30, 2025
Merged

wdc: Fix uuid-index setting for WD 0xC2 log page #2842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions plugins/wdc/wdc-nvme.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1576,6 +1576,14 @@ static bool wdc_is_sn650_e1l(__u32 device_id)
return false;
}

static bool wdc_is_sn655(__u32 device_id)
{
if (device_id == WDC_NVME_SN655_DEV_ID)
return true;
else
return false;
}

static bool wdc_is_zn350(__u32 device_id)
{
return (device_id == WDC_NVME_ZN350_DEV_ID ||
Expand Down Expand Up @@ -2682,7 +2690,8 @@ static bool get_dev_mgment_data(nvme_root_t r, struct nvme_dev *dev,
memset(&uuid_list, 0, sizeof(struct nvme_id_uuid_list));
if (wdc_CheckUuidListSupport(dev, &uuid_list)) {
uuid_index = nvme_uuid_find(&uuid_list, WDC_UUID);
if (uuid_index < 0 && wdc_is_sn640_3(device_id))
if (uuid_index < 0 &&
(wdc_is_sn640_3(device_id) || wdc_is_sn655(device_id)))
uuid_index = nvme_uuid_find(&uuid_list, WDC_UUID_SN640_3);

if (uuid_index > 0)
Expand Down Expand Up @@ -2734,10 +2743,12 @@ static bool get_dev_mgment_cbs_data(nvme_root_t r, struct nvme_dev *dev,
memset(&uuid_list, 0, sizeof(struct nvme_id_uuid_list));
if (wdc_CheckUuidListSupport(dev, &uuid_list)) {
uuid_index = nvme_uuid_find(&uuid_list, WDC_UUID);
if (uuid_index < 0 && wdc_is_sn640_3(device_id))
if (uuid_index < 0 &&
(wdc_is_sn640_3(device_id) || wdc_is_sn655(device_id))) {
uuid_index = nvme_uuid_find(&uuid_list, WDC_UUID_SN640_3);
}

if (uuid_index < 0)
if (uuid_index > 0)
found = get_dev_mgmt_log_page_lid_data(dev, cbs_data, lid,
log_id, uuid_index);

Expand Down
2 changes: 1 addition & 1 deletion plugins/wdc/wdc-nvme.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#if !defined(WDC_NVME) || defined(CMD_HEADER_MULTI_READ)
#define WDC_NVME

#define WDC_PLUGIN_VERSION "2.14.2"
#define WDC_PLUGIN_VERSION "2.14.3"
#include "cmd.h"

PLUGIN(NAME("wdc", "Western Digital vendor specific extensions", WDC_PLUGIN_VERSION),
Expand Down