Duncan Laurie merged this change.

View Change

Approvals: build bot (Jenkins): Verified Furquan Shaikh: Looks good to me, approved
vendorcode/google/chromeos: Fix AMAC return type

The r8152 kernel driver is expecting the AMAC() method to return
a raw buffer, not a string. To fix this simply remove the
ToString() in the return statement that was converting the buffer
to a string.

BUG=b:123925776

Change-Id: I7cd4244a1ccc7397d5969b817a52ea48867b4d17
Signed-off-by: Duncan Laurie <dlaurie@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/31807
Reviewed-by: Furquan Shaikh <furquan@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
M src/vendorcode/google/chromeos/acpi/amac.asl
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vendorcode/google/chromeos/acpi/amac.asl b/src/vendorcode/google/chromeos/acpi/amac.asl
index 838506a..51159f5 100644
--- a/src/vendorcode/google/chromeos/acpi/amac.asl
+++ b/src/vendorcode/google/chromeos/acpi/amac.asl
@@ -19,7 +19,7 @@
* passthru feature which can result in the dock ethernet port using the
* same MAC address that is assigned to the internal NIC. This is done
* by calling an ACPI method at \_SB.AMAC() which returns a formatted
- * string containing the MAC address for the dock to use.
+ * string (as a buffer) containing the MAC address for the dock to use.
*
* The Linux kernel implementation can be found at
* drivers/net/usb/r8152.c:vendor_mac_passthru_addr_read()
@@ -80,6 +80,6 @@
}

Printf ("AMAC = %o", ToString (Local2))
- Return (ToString (Local2))
+ Return (Local2)
}
}

To view, visit change 31807. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I7cd4244a1ccc7397d5969b817a52ea48867b4d17
Gerrit-Change-Number: 31807
Gerrit-PatchSet: 3
Gerrit-Owner: Duncan Laurie <dlaurie@chromium.org>
Gerrit-Reviewer: Duncan Laurie <dlaurie@chromium.org>
Gerrit-Reviewer: Furquan Shaikh <furquan@google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-CC: Duncan Laurie <dlaurie@gmail.com>
Gerrit-MessageType: merged