GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

driver/intel/pmc_mux/conn: Move typec_orientation enum to coreboot_tables.h 

Move the locally declared typec_orientation enum from chip.h to
coreboot_tables.h.

Change enum typec_orientation name to type_c_orientation for consistency
with contents of coreboot_tables.h.

Rename TYPEC_ORIENTATION_FOLLOW_CC to TYPEC_ORIENTATION_NONE.

BUG=b:149830546
TEST="emerge-volteer coreboot" and make sure it compiles successfully.

Change-Id: I24c9177be72b0c9831791aa7d1f7b1236309c9cd
Signed-off-by: Nick Vaccaro <nvaccaro@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/58084
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Furquan Shaikh <furquan@google.com>
This commit is contained in:
Nick Vaccaro 2021-10-01 13:15:26 -07:00
parent a62b41819c
commit 15066ba8d4
4 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
payloads/libpayload/include/coreboot_tables.h
View File

@ -143,6 +143,12 @@ struct cb_mainboard {
u8 strings[0]; u8 strings[0];
}; };
enum type_c_orientation {
TYPEC_ORIENTATION_NONE,
TYPEC_ORIENTATION_NORMAL,
TYPEC_ORIENTATION_REVERSE,
};
struct type_c_port_info { struct type_c_port_info {
/* /*
* usb2_port_number and usb3_port_number are expected to be * usb2_port_number and usb3_port_number are expected to be

10
src/commonlib/include/commonlib/coreboot_tables.h
View File

@ -426,7 +426,17 @@ struct lb_mmc_info {
* USB Type-C Port Information * USB Type-C Port Information
* This record contains board-specific type-c port information. * This record contains board-specific type-c port information.
* There will be one record per type-C port. * There will be one record per type-C port.
* Orientation fields should be of type enum type_c_orientation.
*/ */
enum type_c_orientation {
/* The orientation of the signal follows the orientation of the CC lines. */
TYPEC_ORIENTATION_NONE,
/* The orientation of the signal is fixed to follow CC1 */
TYPEC_ORIENTATION_NORMAL,
/* The orientation of the signal is fixed to follow CC2 */
TYPEC_ORIENTATION_REVERSE,
};
struct type_c_port_info { struct type_c_port_info {
uint8_t usb2_port_number; uint8_t usb2_port_number;
uint8_t usb3_port_number; uint8_t usb3_port_number;

13
src/drivers/intel/pmc_mux/conn/chip.h
View File

@ -3,14 +3,7 @@
#ifndef __DRIVERS_INTEL_PMC_MUX_CONN_H__ #ifndef __DRIVERS_INTEL_PMC_MUX_CONN_H__
#define __DRIVERS_INTEL_PMC_MUX_CONN_H__ #define __DRIVERS_INTEL_PMC_MUX_CONN_H__
enum typec_orientation { #include <boot/coreboot_tables.h>
/* The orientation of the signal follows the orientation of the CC lines. */
TYPEC_ORIENTATION_FOLLOW_CC = 0,
/* The orientation of the signal is fixed to follow CC1 */
TYPEC_ORIENTATION_NORMAL,
/* The orientation of the signal is fixed to follow CC2 */
TYPEC_ORIENTATION_REVERSE,
};
struct drivers_intel_pmc_mux_conn_config { struct drivers_intel_pmc_mux_conn_config {
/* 1-based port numbers (from SoC point of view) */ /* 1-based port numbers (from SoC point of view) */
@ -18,9 +11,9 @@ struct drivers_intel_pmc_mux_conn_config {
/* 1-based port numbers (from SoC point of view) */ /* 1-based port numbers (from SoC point of view) */
int usb3_port_number; int usb3_port_number;
/* Orientation of the sideband signals (SBU) */ /* Orientation of the sideband signals (SBU) */
enum typec_orientation sbu_orientation; enum type_c_orientation sbu_orientation;
/* Orientation of the High Speed lines */ /* Orientation of the High Speed lines */
enum typec_orientation hsl_orientation; enum type_c_orientation hsl_orientation;
}; };
/* /*

10
src/drivers/intel/pmc_mux/conn/conn.c
View File

@ -1,8 +1,10 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */ /* SPDX-License-Identifier: GPL-2.0-or-later */
#include <acpi/acpigen.h> #include <acpi/acpigen.h>
#include <boot/coreboot_tables.h>
#include <console/console.h> #include <console/console.h>
#include <intelblocks/acpi.h> #include <intelblocks/acpi.h>
#include "chip.h" #include "chip.h"
static const char *conn_acpi_name(const struct device *dev) static const char *conn_acpi_name(const struct device *dev)
@ -12,14 +14,14 @@ static const char *conn_acpi_name(const struct device *dev)
return name; return name;
} }
static const char *orientation_to_str(enum typec_orientation ori) static const char *orientation_to_str(enum type_c_orientation ori)
{ {
switch (ori) { switch (ori) {
case TYPEC_ORIENTATION_NORMAL: case TYPEC_ORIENTATION_NORMAL:
return "normal"; return "normal";
case TYPEC_ORIENTATION_REVERSE: case TYPEC_ORIENTATION_REVERSE:
return "reverse"; return "reverse";
case TYPEC_ORIENTATION_FOLLOW_CC: /* Intentional fallthrough */ case TYPEC_ORIENTATION_NONE: /* Intentional fallthrough */
default: default:
return ""; return "";
} }
@ -52,11 +54,11 @@ static void conn_fill_ssdt(const struct device *dev)
* The kernel assumes that these Type-C signals (SBUs and HSLs) follow the CC lines, * The kernel assumes that these Type-C signals (SBUs and HSLs) follow the CC lines,
* unless they are explicitly called out otherwise. * unless they are explicitly called out otherwise.
*/ */
if (config->sbu_orientation != TYPEC_ORIENTATION_FOLLOW_CC) if (config->sbu_orientation != TYPEC_ORIENTATION_NONE)
acpi_dp_add_string(dsd, "sbu-orientation", acpi_dp_add_string(dsd, "sbu-orientation",
orientation_to_str(config->sbu_orientation)); orientation_to_str(config->sbu_orientation));
if (config->hsl_orientation != TYPEC_ORIENTATION_FOLLOW_CC) if (config->hsl_orientation != TYPEC_ORIENTATION_NONE)
acpi_dp_add_string(dsd, "hsl-orientation", acpi_dp_add_string(dsd, "hsl-orientation",
orientation_to_str(config->hsl_orientation)); orientation_to_str(config->hsl_orientation));