Skip to content

Pull 2 #2

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

Closed
chrfranke wants to merge 2 commits into from
Closed

Pull 2 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d63cb4d
jmb93x: prevent change of input buffer if a DATA OUT command is used
chrfranke Jun 28, 2026
a31a8d1
smartctl: add informal strings to Device Statistics values
chrfranke Jun 28, 2026
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
21 changes: 10 additions & 11 deletions lib/dev_jmb39x_raid.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -755,22 +755,21 @@ bool jmb39x_device::ata_pass_through(const ata_cmd_in & in, ata_cmd_out & /* out
return set_err(EIO, "ATA command failed (status=0x%02x)", status);

// Copy data (only for DATA IN commands)
if (!is_no_data) {
if (in.direction == ata_cmd_in::data_in) {
jmbassert(in.size == sizeof(response));
memset(in.buffer, 0, in.size);
memcpy(in.buffer, response + 32, in.size - 32 - 16);
}

// Prevent checksum warning (only for DATA IN commands)
if (!is_no_data && supported > 1)
((uint8_t *)in.buffer)[512-1] -= checksum(in.buffer);

// JMB39x truncates data to 464 bytes (512 - 32 header - 16 footer).
// Prevent checksum warning
if (supported > 1)
((uint8_t *)in.buffer)[512-1] -= checksum(in.buffer);
Comment thread
coderabbitai[bot] marked this conversation as resolved.

// JMB39x truncates data to 464 bytes (512 - 32 header - 16 footer).
// For self-test log (lba_low 0x06), fix the mostrecenttest index at byte 508.
if (!is_no_data && in.in_regs.command == ATA_SMART_CMD
&& in.in_regs.features == ATA_SMART_READ_LOG_SECTOR && in.in_regs.lba_low == 0x06) {
jmb_fix_selftest_log_index(in.buffer);
// For self-test log (lba_low 0x06), fix the mostrecenttest index at byte 508.
if ( in.in_regs.command == ATA_SMART_CMD
&& in.in_regs.features == ATA_SMART_READ_LOG_SECTOR
&& in.in_regs.lba_low == 0x06 )
jmb_fix_selftest_log_index(in.buffer);
}

return true;
Expand Down
37 changes: 35 additions & 2 deletions src/ataprint.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1800,6 +1800,29 @@ static const char * get_device_statistics_page_name(int page)
return "Unknown Statistics";
}

static void get_device_statistics_extra_info(char (& buf)[32], int page, int offset,
int64_t val, unsigned log_sector_size, const char * decimal_point = nullptr)
{
switch (page) {
case 1:
switch (offset) {
case 0x018: case 0x028:
format_capacity(buf, sizeof(buf), val * log_sector_size, decimal_point);
break;
case 0x038:
// Date and Time Stamp: value set by most recent SET DATE & TIME EXT
// command plus number of milliseconds elapsed since then, or
// a copy of Power-on Hours statistics converted to milliseconds.
// Some devices reset this field to zero if Power-on Hours increases.
snprintf(buf, sizeof(buf), "%u:%02u:%02u.%03u",
(unsigned)(val / (60 * 60 * 1000)), (unsigned)((val / (60 * 1000)) % 60),
(unsigned)((val / 1000) % 60), (unsigned)(val % 1000));
break;
}
break;
}
}

static void set_json_globals_from_device_statistics(int page, int offset, int64_t val,
unsigned log_sector_size)
{
Expand Down Expand Up @@ -1927,8 +1950,13 @@ static void print_device_statistics_page(const json::ref & jref, const unsigned
0
};

jout("0x%02x 0x%03x %d %15s %s %s\n",
page, offset, abs(size), valstr, flagstr+1, valname);
char infostr[32]; infostr[0] = 0;
if (valid)
get_device_statistics_extra_info(infostr, page, offset, val, log_sector_size);

jout("0x%02x 0x%03x %d %15s %s %s%s%s%s\n",
page, offset, abs(size), valstr, flagstr+1, valname,
(infostr[0] ? " [" : ""), infostr, (infostr[0] ? "]" : ""));

if (!jglb.is_enabled())
continue;
Expand All @@ -1939,6 +1967,11 @@ static void print_device_statistics_page(const json::ref & jref, const unsigned
jrefi["size"] = abs(size);
if (valid)
jrefi["value"] = val; // TODO: May be unsafe JSON int if size > 6
if (infostr[0]) {
// Reformat with non-localized decimal point
get_device_statistics_extra_info(infostr, page, offset, val, log_sector_size, ".");
jrefi["string"] = infostr;
}

json::ref jreff = jrefi["flags"];
jreff["value"] = flags;
Expand Down