A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-11 23:24:22 -04:00
Code Issues Projects Releases Packages Wiki Activity

usb: pd: Allow Status Data Block payloads up to 6 bytes

Browse source 
The PD 3.0 V1.2 spec updated the length of the Status Data Block
to 6 bytes from 5 bytes. Current handling is checking for the
payload length to be exactly 5 bytes and discards it otherwise.
Change this to allow reading up to 6 bytes. This also allows
the possibility to retrieve a 2-byte Status DB over SOP'/SOP''
from a cable e-marker if needed in the future.

Change-Id: I3a78e61b4821c1fd57887276f27be03f73ce5f0f
Signed-off-by: Jack Pham <jackp@codeaurora.org>
This commit is contained in:
Jack Pham 2020-06-05 17:18:27 -07:00 • committed by Gerrit - the friendly Code Review server
commit a74d29a417
1 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
drivers/usb/pd/policy_engine.c
View file

@ -275,7 +275,7 @@ static void *usbpd_ipc_log;
#define PD_MAX_DATA_OBJ 7
#define PD_SRC_CAP_EXT_DB_LEN 24
#define PD_STATUS_DB_LEN 5
#define PD_STATUS_DB_LEN 6
#define PD_BATTERY_CAP_DB_LEN 9
#define PD_MAX_EXT_MSG_LEN 260
@ -3012,13 +3012,15 @@ static bool handle_ext_snk_ready(struct usbpd *pd, struct rx_msg *rx_msg)
complete(&pd->is_ready);
break;
case MSG_STATUS:
if (rx_msg->data_len != PD_STATUS_DB_LEN) {
usbpd_err(&pd->dev, "Invalid status db\n");
break;
}
if (rx_msg->data_len > PD_STATUS_DB_LEN)
usbpd_err(&pd->dev, "Invalid status db length:%d\n",
rx_msg->data_len);
memset(&pd->status_db, 0, sizeof(pd->status_db));
memcpy(&pd->status_db, rx_msg->payload,
sizeof(pd->status_db));
min((size_t)rx_msg->data_len, sizeof(pd->status_db)));
kobject_uevent(&pd->dev.kobj, KOBJ_CHANGE);
complete(&pd->is_ready);
break;
case MSG_BATTERY_CAPABILITIES:
if (rx_msg->data_len != PD_BATTERY_CAP_DB_LEN) {
@ -4009,9 +4011,9 @@ static int usbpd_uevent(struct device *dev, struct kobj_uevent_env *env)
"explicit" : "implicit");
add_uevent_var(env, "ALT_MODE=%d", pd->vdm_state == MODE_ENTERED);
add_uevent_var(env, "SDB=%02x %02x %02x %02x %02x", pd->status_db[0],
pd->status_db[1], pd->status_db[2], pd->status_db[3],
pd->status_db[4]);
add_uevent_var(env, "SDB=%02x %02x %02x %02x %02x %02x",
pd->status_db[0], pd->status_db[1], pd->status_db[2],
pd->status_db[3], pd->status_db[4], pd->status_db[5]);
return 0;
}