diff options
| author | Alec Berg <alecaberg@chromium.org> | 2014-11-04 13:00:22 -0800 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-11-10 20:43:00 +0000 |
| commit | 8a9d0cae28c77be4ce1013802ea6f8713b3e5033 (patch) | |
| tree | 5798d5bd56dda7b6a263910536b216fe955f766b /board/host | |
| parent | e35494e4acaaf0d33d237fbfcedfc9ecbb87fd13 (diff) | |
| download | chrome-ec-8a9d0cae28c77be4ce1013802ea6f8713b3e5033.tar.gz | |
pd: for request message, add operational and max current
For request message, add the operational and max current for each
board. If the requested power is less than the operational power
required, then set mismatch bit.
BUG=none
BRANCH=samus
TEST=make buildall. load onto samus, plug in zinger and see
that request 20V, operational current 3000mA and max
current of 3000mA.
Change-Id: I4df45d88b7e060f66ff5b806f6fe30803f1afcf7
Signed-off-by: Alec Berg <alecaberg@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/227393
Reviewed-by: Todd Broch <tbroch@chromium.org>
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Diffstat (limited to 'board/host')
| -rw-r--r-- | board/host/usb_pd_policy.c | 37 |
1 files changed, 28 insertions, 9 deletions
diff --git a/board/host/usb_pd_policy.c b/board/host/usb_pd_policy.c index 782f3ab34c..b61b0a4349 100644 --- a/board/host/usb_pd_policy.c +++ b/board/host/usb_pd_policy.c @@ -11,6 +11,11 @@ #define CPRINTF(format, args...) cprintf(CC_USBPD, format, ## args) #define CPRINTS(format, args...) cprints(CC_USBPD, format, ## args) +/* Define typical operating power and max power */ +#define OPERATING_POWER_MW 15000 +#define MAX_POWER_MW 60000 +#define MAX_CURRENT_MA 3000 + const uint32_t pd_src_pdo[] = { PDO_FIXED(5000, 900, PDO_FIXED_EXTERNAL), }; @@ -32,7 +37,10 @@ int pd_choose_voltage(int cnt, uint32_t *src_caps, uint32_t *rdo, int i; int sel_mv; int max_uw = 0; + int max_ma; int max_i = -1; + int max; + uint32_t flags; /* Get max power */ for (i = 0; i < cnt; i++) { @@ -53,20 +61,31 @@ int pd_choose_voltage(int cnt, uint32_t *src_caps, uint32_t *rdo, if (max_i < 0) return -EC_ERROR_UNKNOWN; - /* request all the power ... */ + /* build rdo for desired power */ if ((src_caps[max_i] & PDO_TYPE_MASK) == PDO_TYPE_BATTERY) { int uw = 250000 * (src_caps[max_i] & 0x3FF); - *rdo = RDO_BATT(max_i + 1, uw/2, uw, 0); - *curr_limit = uw/sel_mv; - CPRINTF("Request [%d] %dV %dmW\n", - max_i, sel_mv/1000, uw/1000); + max = MIN(1000 * uw, MAX_POWER_MW); + flags = (max < OPERATING_POWER_MW) ? RDO_CAP_MISMATCH : 0; + max_ma = 1000 * max / sel_mv; + *rdo = RDO_BATT(max_i + 1, max, max, flags); + CPRINTF("Request [%d] %dV %dmW", + max_i, sel_mv/1000, max); } else { int ma = 10 * (src_caps[max_i] & 0x3FF); - *rdo = RDO_FIXED(max_i + 1, ma / 2, ma, 0); - *curr_limit = ma; - CPRINTF("Request [%d] %dV %dmA\n", - max_i, sel_mv/1000, ma); + max = MIN(ma, MAX_CURRENT_MA); + flags = (max * sel_mv) < (1000 * OPERATING_POWER_MW) ? + RDO_CAP_MISMATCH : 0; + max_ma = max; + *rdo = RDO_FIXED(max_i + 1, max, max, flags); + CPRINTF("Request [%d] %dV %dmA", + max_i, sel_mv/1000, max); } + /* Mismatch bit set if less power offered than the operating power */ + if (flags & RDO_CAP_MISMATCH) + CPRINTF(" Mismatch"); + CPRINTF("\n"); + + *curr_limit = max_ma; *supply_voltage = sel_mv; return EC_SUCCESS; } |