From nobody Sun Apr 19 20:38:18 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4641FC43334 for ; Tue, 28 Jun 2022 01:53:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243297AbiF1Bxd (ORCPT ); Mon, 27 Jun 2022 21:53:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39350 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243289AbiF1Bxa (ORCPT ); Mon, 27 Jun 2022 21:53:30 -0400 Received: from mail-pf1-x443.google.com (mail-pf1-x443.google.com [IPv6:2607:f8b0:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E804CB860 for ; Mon, 27 Jun 2022 18:53:28 -0700 (PDT) Received: by mail-pf1-x443.google.com with SMTP id t21so10666459pfq.1 for ; Mon, 27 Jun 2022 18:53:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wistron-corp-partner-google-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=qmNe/0N3fselmjXx6WkFjhVxkRMv0d5IBKx3lO9MXkg=; b=UNsaSKXvhyPVTm2DEwZmNzWe7Vo+++Awnh+gFpClAhy8HlwHpzG+Z7zhxPZUfRnGd1 HIhvVUFI2ADEGsu/vdM3ow/HGbzT39WdDv889cAipONE3vkMNNvNbM575X6paPnFIdiz uNT6eoVqGOWH4FFCft2z+0fMfknGqU8mzrsuaCRH41kNFt1oz4DY2SemNRfnJzGfXK8v 0cUIcuoIiB7UMXfk3o3ULwjBAzGxSBPrmGLLSR2Np2KAsfCEVI278jMtfMrxuQvxPHLf 5r0keiF+noXuTUWL6DdZt4O7DWkG8hQsPhi3PzsYSBaV8shxUwQgle1zidnE2kuL56PN lhQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=qmNe/0N3fselmjXx6WkFjhVxkRMv0d5IBKx3lO9MXkg=; b=hbBu9l0NlzIHtmT+NFXDc5olVYGwyIQAqijcczTsCAEEZUlqRLyPj3keviMBeLaYvK Bgp1P3vdkEfb1wXXKXpxLXRpBtRZmRp+tYHQxAsrZGV732isEYubpPKh+ft/FNc/zGeK DoPFCMEee/peeflkHR+eqNjQrAfqsHWb6bIK5MGdYSS9qIKktOxJgKs4QGsiC0cQtM5a OPzUlgSohyYa8szfGgxJuwf8oDF8//MWu8jJi4IZCFd8ezxYO+ig+oQnGF5/qwzEAbn1 1q+1nKREgzeX46DZDpNc53XDOz3rps9Gghk+Rhq3QHVTPaXr2Nw1sW/SkyAjlZXK4vD9 OM7A== X-Gm-Message-State: AJIora87AZ9KfU/PuIIsbiTcsFEjyv5EYdjvV5tvrv58seHn4YllfsKu oU4jcKncEOlrlYkgPKazif/xSw== X-Google-Smtp-Source: AGRyM1sEdmmSKiRug0JES0Mnz8bDifIHsM4ASO0PiDH35MxEPibvVHpL9D6WFZFnmA3BbqsrIvSibA== X-Received: by 2002:a63:ae48:0:b0:40c:3775:8b49 with SMTP id e8-20020a63ae48000000b0040c37758b49mr15259472pgp.268.1656381208345; Mon, 27 Jun 2022 18:53:28 -0700 (PDT) Received: from localhost (1-164-249-67.dynamic-ip.hinet.net. [1.164.249.67]) by smtp.gmail.com with ESMTPSA id 11-20020a63164b000000b0040d4c8e335csm7722004pgw.75.2022.06.27.18.53.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jun 2022 18:53:28 -0700 (PDT) From: Franklin Lin To: edumazet@google.com Cc: kuba@kernel.org, pabeni@redhat.com, linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, davem@davemloft.net, franklin_lin@wistron.com, franklin_lin Subject: [PATCH] drivers/net/usb/r8152: Enable MAC address passthru support Date: Tue, 28 Jun 2022 09:53:25 +0800 Message-Id: <20220628015325.1204234-1-franklin_lin@wistron.corp-partner.google.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: franklin_lin Enable the support for providing a MAC address for a dock to use based on the VPD values set in the platform. Signed-off-by: franklin_lin --- drivers/net/usb/r8152.c | 49 ++++++++++++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 13 deletions(-) diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index 7389d6ef8..732e48d99 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -3,6 +3,7 @@ * Copyright (c) 2014 Realtek Semiconductor Corp. All rights reserved. */ =20 +#include #include #include #include @@ -1608,6 +1609,11 @@ static int vendor_mac_passthru_addr_read(struct r815= 2 *tp, struct sockaddr *sa) acpi_object_type mac_obj_type; int mac_strlen; =20 + struct file *fp; + unsigned char read_buf[32]; + loff_t f_pos =3D 0; + int i, j, len; + if (tp->lenovo_macpassthru) { mac_obj_name =3D "\\MACA"; mac_obj_type =3D ACPI_TYPE_STRING; @@ -1641,22 +1647,39 @@ static int vendor_mac_passthru_addr_read(struct r81= 52 *tp, struct sockaddr *sa) /* returns _AUXMAC_#AABBCCDDEEFF# */ status =3D acpi_evaluate_object(NULL, mac_obj_name, NULL, &buffer); obj =3D (union acpi_object *)buffer.pointer; - if (!ACPI_SUCCESS(status)) - return -ENODEV; - if (obj->type !=3D mac_obj_type || obj->string.length !=3D mac_strlen) { - netif_warn(tp, probe, tp->netdev, + if (ACPI_SUCCESS(status)) { + if (obj->type !=3D mac_obj_type || obj->string.length !=3D mac_strlen) { + netif_warn(tp, probe, tp->netdev, "Invalid buffer for pass-thru MAC addr: (%d, %d)\n", obj->type, obj->string.length); - goto amacout; - } - - if (strncmp(obj->string.pointer, "_AUXMAC_#", 9) !=3D 0 || - strncmp(obj->string.pointer + 0x15, "#", 1) !=3D 0) { - netif_warn(tp, probe, tp->netdev, - "Invalid header when reading pass-thru MAC addr\n"); - goto amacout; + goto amacout; + } + if (strncmp(obj->string.pointer, "_AUXMAC_#", 9) !=3D 0 || + strncmp(obj->string.pointer + 0x15, "#", 1) !=3D 0) { + netif_warn(tp, probe, tp->netdev, + "Invalid header when reading pass-thru MAC addr\n"); + goto amacout; + } + ret =3D hex2bin(buf, obj->string.pointer + 9, 6); + } else { + /* read from "/sys/firmware/vpd/ro/dock_mac" */ + fp =3D filp_open("/sys/firmware/vpd/ro/dock_mac", O_RDONLY, 0); + if (IS_ERR(fp)) + return -ENOENT; + kernel_read(fp, read_buf, 32, &f_pos); + len =3D strlen(read_buf); + /* remove ':' form mac address string */ + for (i =3D 0; i < len; i++) { + if (read_buf[i] =3D=3D ':') { + for (j =3D i; j < len; j++) + read_buf[j] =3D read_buf[j+1]; + len--; + i--; + } + } + filp_close(fp, NULL); + ret =3D hex2bin(buf, read_buf, 6); } - ret =3D hex2bin(buf, obj->string.pointer + 9, 6); if (!(ret =3D=3D 0 && is_valid_ether_addr(buf))) { netif_warn(tp, probe, tp->netdev, "Invalid MAC for pass-thru MAC addr: %d, %pM\n", --=20 2.34.1