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

ec/google/chromeec: Add PLD to EC conn in ACPI table

Browse Source 
Given EC CON and associated USB port objects, custom_pld or pld_group
information is retrieved from port and added to ACPI table as _PLD field
for typec connector.

BUG=b:202446737
TEST=emerge-brya coreboot & SSDT dump in Brya test device

Signed-off-by: Won Chung <wonchung@google.com>
Change-Id: Ibc56ecd4e8954ffaace3acd9528a064b5fa2cf6f
Reviewed-on: https://review.coreboot.org/c/coreboot/+/59401
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
This commit is contained in:
Won Chung
2021-11-15 21:19:51 +00:00
committed by Felix Held
parent c47beec2d3
commit 667471b8d8
3 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/acpi/acpigen_usb.c
View File

@@ -2,6 +2,7 @@
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/acpi_device.h> #include <acpi/acpi_device.h>
#include <acpi/acpi_pld.h>
#include <acpi/acpigen.h> #include <acpi/acpigen.h>
#include <acpi/acpigen_usb.h> #include <acpi/acpigen_usb.h>
@@ -132,5 +133,8 @@ void acpigen_write_typec_connector(const struct typec_connector_class_config *co
add_custom_dsd_property(dsd, port_number); add_custom_dsd_property(dsd, port_number);
acpi_dp_write(dsd); acpi_dp_write(dsd);
/* Add PLD */
acpigen_write_pld(config->pld);
acpigen_pop_len(); /* Device */ acpigen_pop_len(); /* Device */
} }

26
src/ec/google/chromeec/ec_acpi.c
View File

@@ -2,6 +2,7 @@
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/acpi_device.h> #include <acpi/acpi_device.h>
#include <acpi/acpi_pld.h>
#include <acpi/acpigen.h> #include <acpi/acpigen.h>
#include <acpi/acpigen_ps2_keybd.h> #include <acpi/acpigen_ps2_keybd.h>
#include <acpi/acpigen_usb.h> #include <acpi/acpigen_usb.h>
@@ -117,6 +118,27 @@ static void add_port_location(struct acpi_dp *dsd, int port_number)
acpi_dp_add_string(dsd, "port-location", port_location_to_str(port_caps.port_location)); acpi_dp_add_string(dsd, "port-location", port_location_to_str(port_caps.port_location));
} }
static void get_pld_from_usb_ports(struct acpi_pld *pld,
struct device *usb2_port, struct device *usb3_port,
struct device *usb4_port)
{
struct drivers_usb_acpi_config *config = NULL;
if (usb4_port)
config = usb4_port->chip_info;
else if (usb3_port)
config = usb3_port->chip_info;
else if (usb2_port)
config = usb2_port->chip_info;
if (config) {
if (config->use_custom_pld)
*pld = config->custom_pld;
else
acpi_pld_fill_usb(pld, config->type, &config->group);
}
}
static void fill_ssdt_typec_device(const struct device *dev) static void fill_ssdt_typec_device(const struct device *dev)
{ {
struct ec_google_chromeec_config *config = dev->chip_info; struct ec_google_chromeec_config *config = dev->chip_info;
@@ -126,6 +148,7 @@ static void fill_ssdt_typec_device(const struct device *dev)
struct device *usb2_port; struct device *usb2_port;
struct device *usb3_port; struct device *usb3_port;
struct device *usb4_port; struct device *usb4_port;
struct acpi_pld pld = {0};
if (google_chromeec_get_num_pd_ports(&num_ports)) if (google_chromeec_get_num_pd_ports(&num_ports))
return; return;
@@ -146,6 +169,8 @@ static void fill_ssdt_typec_device(const struct device *dev)
usb4_port = NULL; usb4_port = NULL;
get_usb_port_references(i, &usb2_port, &usb3_port, &usb4_port); get_usb_port_references(i, &usb2_port, &usb3_port, &usb4_port);
get_pld_from_usb_ports(&pld, usb2_port, usb3_port, usb4_port);
struct typec_connector_class_config typec_config = { struct typec_connector_class_config typec_config = {
.power_role = port_caps.power_role_cap, .power_role = port_caps.power_role_cap,
.try_power_role = port_caps.try_power_role_cap, .try_power_role = port_caps.try_power_role_cap,
@@ -156,6 +181,7 @@ static void fill_ssdt_typec_device(const struct device *dev)
.orientation_switch = config->mux_conn[i], .orientation_switch = config->mux_conn[i],
.usb_role_switch = config->mux_conn[i], .usb_role_switch = config->mux_conn[i],
.mode_switch = config->mux_conn[i], .mode_switch = config->mux_conn[i],
.pld = &pld,
}; };
acpigen_write_typec_connector(&typec_config, i, add_port_location); acpigen_write_typec_connector(&typec_config, i, add_port_location);

4
src/include/acpi/acpigen_usb.h
View File

@@ -3,6 +3,8 @@
#ifndef ACPI_ACPIGEN_USB_H #ifndef ACPI_ACPIGEN_USB_H
#define ACPI_ACPIGEN_USB_H #define ACPI_ACPIGEN_USB_H
#include <acpi/acpi_pld.h>
enum usb_typec_power_role { enum usb_typec_power_role {
TYPEC_POWER_ROLE_SOURCE, TYPEC_POWER_ROLE_SOURCE,
TYPEC_POWER_ROLE_SINK, TYPEC_POWER_ROLE_SINK,
@@ -39,6 +41,7 @@ enum usb_typec_data_role {
* host or device, for the USB port * host or device, for the USB port
* @mode_switch: Reference to the ACPI device that controls routing of data lines to * @mode_switch: Reference to the ACPI device that controls routing of data lines to
* various endpoints (xHCI, DP, etc.) on the SoC. * various endpoints (xHCI, DP, etc.) on the SoC.
* @pld: Reference to PLD information.
*/ */
struct typec_connector_class_config { struct typec_connector_class_config {
enum usb_typec_power_role power_role; enum usb_typec_power_role power_role;
@@ -50,6 +53,7 @@ struct typec_connector_class_config {
const struct device *orientation_switch; const struct device *orientation_switch;
const struct device *usb_role_switch; const struct device *usb_role_switch;
const struct device *mode_switch; const struct device *mode_switch;
const struct acpi_pld *pld;
}; };
typedef void (*add_custom_dsd_property_cb)(struct acpi_dp *dsd, int port_number); typedef void (*add_custom_dsd_property_cb)(struct acpi_dp *dsd, int port_number);