evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "usb: pd: Always request maximum available current from PDO"

Browse source
This commit is contained in:
Linux Build Service Account 2016-08-16 16:35:15 -07:00 • committed by Gerrit - the friendly Code Review server
commit 008f057bba
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -240,9 +240,6 @@ static void *usbpd_ipc_log;
static int min_sink_current = 900; static int min_sink_current = 900;
module_param(min_sink_current, int, S_IRUSR | S_IWUSR); module_param(min_sink_current, int, S_IRUSR | S_IWUSR);
static int max_sink_current = 3000;
module_param(max_sink_current, int, S_IRUSR | S_IWUSR);
static const u32 default_src_caps[] = { 0x36019096 }; /* VSafe5V @ 1.5A */ static const u32 default_src_caps[] = { 0x36019096 }; /* VSafe5V @ 1.5A */
static const u32 default_snk_caps[] = { 0x2601905A, /* 5V @ 900mA */ static const u32 default_snk_caps[] = { 0x2601905A, /* 5V @ 900mA */
@ -406,8 +403,8 @@ static int pd_send_msg(struct usbpd *pd, u8 hdr_type, const u32 *data,
static int pd_select_pdo(struct usbpd *pd, int pdo_pos) static int pd_select_pdo(struct usbpd *pd, int pdo_pos)
{ {
int curr = min_sink_current; int curr;
int max_current = max_sink_current; int max_current;
bool mismatch = false; bool mismatch = false;
u32 pdo = pd->received_pdos[pdo_pos - 1]; u32 pdo = pd->received_pdos[pdo_pos - 1];
@ -417,18 +414,19 @@ static int pd_select_pdo(struct usbpd *pd, int pdo_pos)
return -ENOTSUPP; return -ENOTSUPP;
} }
curr = max_current = PD_SRC_PDO_FIXED_MAX_CURR(pdo) * 10;
/* /*
* Check if the PDO has enough current, otherwise set the * Check if the PDO has enough current, otherwise set the
* Capability Mismatch flag * Capability Mismatch flag
*/ */
if ((PD_SRC_PDO_FIXED_MAX_CURR(pdo) * 10) < curr) { if (curr < min_sink_current) {
mismatch = true; mismatch = true;
max_current = curr; max_current = min_sink_current;
curr = PD_SRC_PDO_FIXED_MAX_CURR(pdo) * 10;
} }
pd->requested_voltage = PD_SRC_PDO_FIXED_VOLTAGE(pdo) * 50 * 1000; pd->requested_voltage = PD_SRC_PDO_FIXED_VOLTAGE(pdo) * 50 * 1000;
pd->requested_current = max_current; pd->requested_current = curr;
pd->requested_pdo = pdo_pos; pd->requested_pdo = pdo_pos;
pd->rdo = PD_RDO_FIXED(pdo_pos, 0, mismatch, 1, 1, curr / 10, pd->rdo = PD_RDO_FIXED(pdo_pos, 0, mismatch, 1, 1, curr / 10,
max_current / 10); max_current / 10);