Skip to content

Dev #27

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

Open
beanhuo wants to merge 5 commits into
base: dev
Choose a base branch
from
Open

Dev #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0122615
ufs-utils: fix configuration file size overflow issue
beanhuo Dec 2, 2020
90e7860
ufs-utils: fix unknow IDE issue while reading attribute descriptor
beanhuo Dec 2, 2020
a0546c6
ufs-utils: Fix invalid flag idn error
beanhuo Dec 4, 2020
8eb983a
ufs-utils: Fix Invalid Index error for Flags access
beanhuo Dec 4, 2020
9293f36
ufs-utils: Fix Invalid Index error for Attributes access
beanhuo Dec 4, 2020
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
2 changes: 1 addition & 1 deletion options.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ static int verify_and_set_idn(struct tool_options *options)
}
break;
case FLAG_TYPE:
if (idn > QUERY_FLAG_IDN_PERMANENTLYDISABLEFW) {
if (idn > QUERY_FLAG_IDN_MAX) {

@arthur-simchaev-sndk arthur-simchaev-sndk Jan 25, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct

print_error("Invalid flag idn %d", idn);
goto out;
}
Expand Down
29 changes: 18 additions & 11 deletions ufs_cmds.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,15 +244,15 @@ struct query_err_res {

struct attr_fields ufs_attrs[] = {
{"bBootLunEn", BYTE, (URD|UWRT), (READ_ONLY|WRITE_PRSIST), DEV},
{"bMAX_DATA_SIZE_FOR_HPB_SINGLE_CMD", BYTE, URD, READ_ONLY, DEV},
{ATTR_RSRV()},

@arthur-simchaev-sndk arthur-simchaev-sndk Jan 25, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct

{"bCurrentPowerMode", BYTE, URD, READ_ONLY, DEV},
{"bActiveICCLevel", BYTE, (URD|UWRT), (READ_NRML|WRITE_PRSIST), DEV},
{"bOutOfOrderDataEn", BYTE, (URD|UWRT), (READ_NRML|WRITE_ONCE), DEV},
{"bBackgroundOpStatus", BYTE, URD, READ_ONLY, DEV},
{"bPurgeStatus", BYTE, URD, READ_ONLY, DEV},
{"bMaxDataInSize", BYTE, (URD|UWRT), (READ_NRML|WRITE_PRSIST), DEV},
{"bMaxDataOutSize", BYTE, (URD|UWRT), (READ_NRML|WRITE_PRSIST), DEV},
{"dDynCapNeeded", WORD, URD, READ_ONLY, DEV},
{"dDynCapNeeded", WORD, URD, READ_ONLY, ARRAY},
{"bRefClkFreq", BYTE, (URD|UWRT), (READ_NRML|WRITE_PRSIST), DEV},
{"bConfigDescrLock", BYTE, (URD|UWRT), (READ_NRML|WRITE_ONCE), DEV},
{"bMaxNumOfRTT", BYTE, (URD|UWRT), (READ_NRML|WRITE_PRSIST), DEV},
Expand All @@ -271,10 +271,10 @@ struct attr_fields ufs_attrs[] = {
{"bDeviceTooHighTempBoundary", BYTE, URD, READ_ONLY, DEV},
/*1A*/ {"bDeviceTooLowTempBoundary", BYTE, URD, READ_ONLY, DEV},
/*1B*/ {"bThrottlingStatus", BYTE, URD, READ_ONLY, DEV},
/*1C*/ {"bWBBufFlushStatus", BYTE, URD, READ_ONLY, DEV},
/*1D*/ {"bAvailableWBBufSize", BYTE, URD, READ_ONLY, DEV},
/*1E*/ {"bWBBufLifeTimeEst", BYTE, URD, READ_ONLY, DEV},
/*1F*/ {"bCurrentWBBufSize", DWORD, URD, READ_ONLY, DEV},
/*1C*/ {"bWBBufFlushStatus", BYTE, URD, READ_ONLY, DEV | ARRAY},
/*1D*/ {"bAvailableWBBufSize", BYTE, URD, READ_ONLY, DEV | ARRAY},
/*1E*/ {"bWBBufLifeTimeEst", BYTE, URD, READ_ONLY, DEV | ARRAY},
/*1F*/ {"bCurrentWBBufSize", DWORD, URD, READ_ONLY, DEV | ARRAY},
{ATTR_RSRV()},
{ATTR_RSRV()},
{ATTR_RSRV()},
Expand Down Expand Up @@ -308,10 +308,10 @@ struct flag_fields ufs_flags[] = {
{"fPermanentlyDisableFw", (URD|UWRT), (READ_NRML|WRITE_ONCE), DEV},
{"Reserved", ACC_INVALID, MODE_INVALID, LEVEL_INVALID},
/*D*/ {"Reserved", ACC_INVALID, MODE_INVALID, LEVEL_INVALID},
/*E*/ {"fWriteBoosterEn", (URD|UWRT), (READ_NRML|WRITE_VLT), DEV},
/*F*/ {"fWBFlushEn", (URD|UWRT), (READ_NRML|WRITE_VLT), DEV},
/*E*/ {"fWriteBoosterEn", (URD|UWRT), (READ_NRML|WRITE_VLT), DEV | ARRAY},
/*F*/ {"fWBFlushEn", (URD|UWRT), (READ_NRML|WRITE_VLT), DEV | ARRAY},
/*10h*/ {"fWBFlushDuringHibernate", (URD|UWRT),
(READ_NRML|WRITE_VLT), DEV},
(READ_NRML|WRITE_VLT), DEV | ARRAY},
/*11h*/ {"fHPBReset", (URD|UWRT), (READ_NRML|SET_ONLY), DEV}
};

Expand Down Expand Up @@ -806,6 +806,9 @@ static int do_conf_desc(int fd, __u8 opt, __u8 index, char *data_file)
}
lseek(data_fd, 0, SEEK_SET);

if (file_size > QUERY_DESC_CONFIGURAION_MAX_SIZE)
file_size = QUERY_DESC_CONFIGURAION_MAX_SIZE;

@arthur-simchaev-sndk arthur-simchaev-sndk Jan 25, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In case an user create the wrong config file. I don't think the tool shall try fix it. Better if the user will receive Invalid length Query error and fix it.

rc = read(data_fd, conf_desc_buf, file_size);
if (rc <= 0) {
print_error("Cannot config file");
Expand Down Expand Up @@ -1096,7 +1099,9 @@ int do_attributes(struct tool_options *opt)
rc = do_query_rq(fd, &bsg_req, &bsg_rsp,
UPIU_QUERY_FUNC_STANDARD_READ_REQUEST,
UPIU_QUERY_OPCODE_READ_ATTR, att_idn,
opt->index, opt->selector, 0, 0, 0);
tmp->device_level & ARRAY ?
opt->index : 0,
opt->selector, 0, 0, 0);

@arthur-simchaev-sndk arthur-simchaev-sndk Jan 25, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is redundant fix, By default in case and user didn't set index, selector the values are 0.
See verify_arg_and_set_default function

if (rc == OK) {
attr_value = be32toh(bsg_rsp.upiu_rsp.qr.value);
print_attribute(tmp, (__u8 *)&attr_value);
Expand Down Expand Up @@ -1204,7 +1209,9 @@ int do_flags(struct tool_options *opt)
rc = do_query_rq(fd, &bsg_req, &bsg_rsp,
UPIU_QUERY_FUNC_STANDARD_READ_REQUEST,
UPIU_QUERY_OPCODE_READ_FLAG, flag_idn,
opt->index, opt->selector, 0, 0, 0);
(tmp->device_level & ARRAY) ?
opt->index : 0,
opt->selector, 0, 0, 0);

@arthur-simchaev-sndk arthur-simchaev-sndk Jan 25, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as previous one

if (rc == OK) {
printf("%-26s := 0x%01x\n", tmp->name,
be32toh(bsg_rsp.upiu_rsp.qr.value) &
Expand Down