sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

google/fizz: Set PL2 value based on sku id/charge max power

Browse Source 
Set PL2 based on either 90% of usb c charger's max power or sku id if
using a barrel jack.

BUG=b:37473486
BRANCH=None
TEST=output debug info for different skus and make sure
     PL2 set correctly.

Change-Id: I487fce4a5d0825a26488e71dee02400dbebbffb3
Signed-off-by: Shelley Chen <shchen@chromium.org>
Reviewed-on: https://review.coreboot.org/21772
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Shelley Chen
2017-09-28 10:26:26 -07:00
committed by Aaron Durbin
parent ebd533065f
commit bdfc5f5790
2 changed files with 45 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mainboard/google/fizz/gpio.h
View File

@@ -31,6 +31,12 @@
/* eSPI virtual wire reporting */ /* eSPI virtual wire reporting */
#define EC_SCI_GPI GPE0_ESPI #define EC_SCI_GPI GPE0_ESPI
/* SKU_ID GPIOs */
#define GPIO_SKU_ID0 GPP_C12
#define GPIO_SKU_ID1 GPP_C13
#define GPIO_SKU_ID2 GPP_C14
#define GPIO_SKU_ID3 GPP_C15
#ifndef __ACPI__ #ifndef __ACPI__
/* Pad configuration in ramstage */ /* Pad configuration in ramstage */
/* Leave eSPI pins untouched from default settings */ /* Leave eSPI pins untouched from default settings */

52
src/mainboard/google/fizz/mainboard.c
View File

@@ -18,34 +18,60 @@
#include <chip.h> #include <chip.h>
#include <device/device.h> #include <device/device.h>
#include <ec/ec.h> #include <ec/ec.h>
#include <intelblocks/mp_init.h> #include <ec/google/chromeec/ec.h>
#include <gpio.h>
#include <mainboard/google/fizz/gpio.h>
#include <soc/gpio.h>
#include <soc/pci_devs.h> #include <soc/pci_devs.h>
#include <soc/nhlt.h> #include <soc/nhlt.h>
#include <vendorcode/google/chromeos/chromeos.h> #include <vendorcode/google/chromeos/chromeos.h>
#define FIZZ_SKU_ID_I7_U42 0x4
#define FIZZ_PL2_I7_U42 44
#define FIZZ_PL2_OTHERS 29
/*
* For type-C chargers, set PL2 to 90% of max power to account for
* cable loss and FET Rdson loss in the path from the source.
*/
#define GET_TYPEC_PL2(w) (9 * (w) / 10)
static const char *oem_id = "GOOGLE"; static const char *oem_id = "GOOGLE";
static const char *oem_table_id = "FIZZ"; static const char *oem_table_id = "FIZZ";
/* /*
* mainboard_get_pl2 * mainboard_get_pl2
* *
* @return value Pl2 should be set to based on cpu id * @return value Pl2 should be set to
* *
* TODO: This is purely based on cpu id, which only works for the * Check if charger is USB C. If so, set to 90% of the max value.
* current build because we have a different cpu id per sku. However, * Otherwise, set PL2 based on sku id.
* on the next build, we'll have distinct board ids per sku. We'll
* need to modify that at this point.
*/ */
static u32 mainboard_get_pl2(void) static u32 mainboard_get_pl2(void)
{ {
struct cpuid_result cpuidr; const gpio_t sku_id_gpios[] = {
GPIO_SKU_ID0,
GPIO_SKU_ID1,
GPIO_SKU_ID2,
GPIO_SKU_ID3,
};
enum usb_chg_type type;
u32 watts;
cpuidr = cpuid(1); int rv = google_chromeec_get_usb_pd_power_info(&type, &watts);
if (cpuidr.eax == CPUID_KABYLAKE_Y0) { int sku_id;
/* i7 needs higher pl2 */
return 44; /* If we can't get charger info or not PD charger, assume barrel jack */
} if (rv != 0 || type != USB_CHG_TYPE_PD) {
return 29; /* using the barrel jack, get PL2 based on sku id */
watts = FIZZ_PL2_OTHERS;
sku_id = gpio_base2_value(sku_id_gpios,
ARRAY_SIZE(sku_id_gpios));
if (sku_id == FIZZ_SKU_ID_I7_U42)
watts = FIZZ_PL2_I7_U42;
} else
watts = GET_TYPEC_PL2(watts);
return watts;
} }
static void mainboard_init(device_t dev) static void mainboard_init(device_t dev)