<p>Duncan Laurie has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/c/coreboot/+/29998">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">acpi_pld: Make it easier to define the ACPI USB device groups<br><br>The Linux kernel can use the ACPI _PLD group information to<br>determine peer ports. Currently to define the group information<br>the devicetree must provide a complete _PLD structure. This<br>change pulls the group information into a separate structure that<br>can be defined in devicetree. This makes it easier to set for<br>USB devices in devicetree that do not need a full custom PLD.<br><br>This was tested on a sarien board with the USB devices defined<br>by verifying that the USB 2/3 ports are correctly identified<br>with their peer in sysfs.<br><br>Change-Id: Ifd4cadf0f6c901eb3832ad4e1395904f99c2f5a0<br>Signed-off-by: Duncan Laurie <dlaurie@google.com><br>---<br>M src/arch/x86/acpi_pld.c<br>M src/arch/x86/include/arch/acpi_pld.h<br>M src/drivers/usb/acpi/chip.h<br>M src/drivers/usb/acpi/usb_acpi.c<br>4 files changed, 34 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/98/29998/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/arch/x86/acpi_pld.c b/src/arch/x86/acpi_pld.c</span><br><span>index d399ea6..d20bdf2 100644</span><br><span>--- a/src/arch/x86/acpi_pld.c</span><br><span>+++ b/src/arch/x86/acpi_pld.c</span><br><span>@@ -18,7 +18,8 @@</span><br><span> #include <arch/acpi.h></span><br><span> #include <arch/acpi_pld.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int acpi_pld_fill_usb(struct acpi_pld *pld, enum acpi_upc_type type)</span><br><span style="color: hsl(120, 100%, 40%);">+int acpi_pld_fill_usb(struct acpi_pld *pld, enum acpi_upc_type type,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct acpi_pld_group *group)</span><br><span> {</span><br><span> if (!pld)</span><br><span> return -1;</span><br><span>@@ -33,6 +34,9 @@</span><br><span> pld->rotation = PLD_ROTATE_0;</span><br><span> pld->visible = 1;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Fill the group information */</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(&pld->group, group, sizeof(*group));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Set the shape based on port type */</span><br><span> switch (type) {</span><br><span> case UPC_TYPE_A:</span><br><span>@@ -114,16 +118,16 @@</span><br><span> /* [77:74] Shape */</span><br><span> buf[9] |= (pld->shape & 0xf) << 2;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* [78] Group Orientation */</span><br><span style="color: hsl(0, 100%, 40%);">- buf[9] |= (pld->group_orientation & 0x1) << 6;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* [78] Orientation */</span><br><span style="color: hsl(120, 100%, 40%);">+ buf[9] |= (pld->orientation & 0x1) << 6;</span><br><span> </span><br><span> /* [86:79] Group Token (incorrectly defined as 1 bit in ACPI 6.2A) */</span><br><span style="color: hsl(0, 100%, 40%);">- buf[9] |= (pld->group_token & 0x1) << 7;</span><br><span style="color: hsl(0, 100%, 40%);">- buf[10] |= (pld->group_token >> 0x1) & 0x7f;</span><br><span style="color: hsl(120, 100%, 40%);">+ buf[9] |= (pld->group.token & 0x1) << 7;</span><br><span style="color: hsl(120, 100%, 40%);">+ buf[10] |= (pld->group.token >> 0x1) & 0x7f;</span><br><span> </span><br><span> /* [94:87] Group Position */</span><br><span style="color: hsl(0, 100%, 40%);">- buf[10] |= (pld->group_position & 0x1) << 7;</span><br><span style="color: hsl(0, 100%, 40%);">- buf[11] |= (pld->group_position >> 0x1) & 0x7f;</span><br><span style="color: hsl(120, 100%, 40%);">+ buf[10] |= (pld->group.position & 0x1) << 7;</span><br><span style="color: hsl(120, 100%, 40%);">+ buf[11] |= (pld->group.position >> 0x1) & 0x7f;</span><br><span> </span><br><span> /* [95] Bay */</span><br><span> buf[11] |= (pld->bay & 0x1) << 7;</span><br><span>diff --git a/src/arch/x86/include/arch/acpi_pld.h b/src/arch/x86/include/arch/acpi_pld.h</span><br><span>index ce279a0..1b4417d 100644</span><br><span>--- a/src/arch/x86/include/arch/acpi_pld.h</span><br><span>+++ b/src/arch/x86/include/arch/acpi_pld.h</span><br><span>@@ -75,6 +75,17 @@</span><br><span> PLD_ROTATE_315</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define ACPI_PLD_GROUP(__token, __position) \</span><br><span style="color: hsl(120, 100%, 40%);">+ { \</span><br><span style="color: hsl(120, 100%, 40%);">+ .token = __token, \</span><br><span style="color: hsl(120, 100%, 40%);">+ .position = __position, \</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct acpi_pld_group {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t token;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t position;</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct acpi_pld {</span><br><span> /* Color field can be explicitly ignored */</span><br><span> bool ignore_color;</span><br><span>@@ -100,9 +111,8 @@</span><br><span> enum acpi_pld_rotate rotation;</span><br><span> </span><br><span> /* Port grouping */</span><br><span style="color: hsl(0, 100%, 40%);">- enum acpi_pld_orientation group_orientation;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t group_token;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t group_position;</span><br><span style="color: hsl(120, 100%, 40%);">+ enum acpi_pld_orientation orientation;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct acpi_pld_group group;</span><br><span> uint8_t draw_order;</span><br><span> uint8_t cabinet_number;</span><br><span> uint8_t card_cage_number;</span><br><span>@@ -112,7 +122,8 @@</span><br><span> };</span><br><span> </span><br><span> /* Fill out PLD structure with defaults based on USB port type */</span><br><span style="color: hsl(0, 100%, 40%);">-int acpi_pld_fill_usb(struct acpi_pld *pld, enum acpi_upc_type type);</span><br><span style="color: hsl(120, 100%, 40%);">+int acpi_pld_fill_usb(struct acpi_pld *pld, enum acpi_upc_type type,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct acpi_pld_group *group);</span><br><span> </span><br><span> /* Turn PLD structure into a 20 byte ACPI buffer */</span><br><span> int acpi_pld_to_buffer(const struct acpi_pld *pld, uint8_t *buf, int buf_len);</span><br><span>diff --git a/src/drivers/usb/acpi/chip.h b/src/drivers/usb/acpi/chip.h</span><br><span>index 6429f13..512893d 100644</span><br><span>--- a/src/drivers/usb/acpi/chip.h</span><br><span>+++ b/src/drivers/usb/acpi/chip.h</span><br><span>@@ -46,7 +46,13 @@</span><br><span> */</span><br><span> enum acpi_upc_type type;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Define a custom physical location for the port */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Group peer ports */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct acpi_pld_group group;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /*</span><br><span style="color: hsl(120, 100%, 40%);">+ * Define a custom physical location for the port.</span><br><span style="color: hsl(120, 100%, 40%);">+ * If enabled, this takes precedence over the 'group' field.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span> bool use_custom_pld;</span><br><span> struct acpi_pld custom_pld;</span><br><span> </span><br><span>diff --git a/src/drivers/usb/acpi/usb_acpi.c b/src/drivers/usb/acpi/usb_acpi.c</span><br><span>index f049e68..abc1718 100644</span><br><span>--- a/src/drivers/usb/acpi/usb_acpi.c</span><br><span>+++ b/src/drivers/usb/acpi/usb_acpi.c</span><br><span>@@ -57,7 +57,7 @@</span><br><span> } else {</span><br><span> /* Fill PLD strucutre based on port type */</span><br><span> struct acpi_pld pld;</span><br><span style="color: hsl(0, 100%, 40%);">- acpi_pld_fill_usb(&pld, config->type);</span><br><span style="color: hsl(120, 100%, 40%);">+ acpi_pld_fill_usb(&pld, config->type, &config->group);</span><br><span> acpigen_write_pld(&pld);</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/c/coreboot/+/29998">change 29998</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/c/coreboot/+/29998"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ifd4cadf0f6c901eb3832ad4e1395904f99c2f5a0 </div>
<div style="display:none"> Gerrit-Change-Number: 29998 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Duncan Laurie <dlaurie@chromium.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>