From patchwork Wed Jan 5 14:23:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Ma X-Patchwork-Id: 12704373 X-Patchwork-Delegate: kuba@kernel.org 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 52898C433EF for ; Wed, 5 Jan 2022 14:24:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240649AbiAEOYX (ORCPT ); Wed, 5 Jan 2022 09:24:23 -0500 Received: from smtp-relay-canonical-1.canonical.com ([185.125.188.121]:38698 "EHLO smtp-relay-canonical-1.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237053AbiAEOYW (ORCPT ); Wed, 5 Jan 2022 09:24:22 -0500 Received: from localhost.localdomain (unknown [222.129.35.96]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPSA id 7531F3F128; Wed, 5 Jan 2022 14:24:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1641392657; bh=dJNzo6SiEX3Gi2Px27mlhp0zXbiR0HYOw7Oc0LeGGYk=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=BS+cqfzePlG5R2ww5lIIQJG+/eqlqmS2rkXQduVdDXRSObQBbMm9EdFWmec764uN9 1xg2bpmr+SanyRiZkeqkWnTQak6n29A9miGhJtvGMoj87R+5v361H/O68S+QF5rWvp DEfOmpaChmKC/fnKMn1zNQTlz6slEhlPSGNo0/RpKTnwPHg6hyXAl1aSwFkXKWrhs0 bQCt5akOENIh1HlxwSRqeCaEioYeWBxv1H9GzyjAfGe9hAyRtY3BfDLoMJgANKBbGJ EZfJU+2ii4Cv1m9djlXa7FB1OjwcoluS7ILF75iWHlVs2Ju4Qkkj4bL1f7OP5KYXh+ Zxxwr8yyxaeCQ== From: Aaron Ma To: aaron.ma@canonical.com, kuba@kernel.org, henning.schild@siemens.com, linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: davem@davemloft.net, hayeswang@realtek.com, tiwai@suse.de Subject: [PATCH 1/3] net: usb: r8152: Check used MAC passthrough address Date: Wed, 5 Jan 2022 22:23:49 +0800 Message-Id: <20220105142351.8026-1-aaron.ma@canonical.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org When plugin multiple r8152 ethernet dongles to Lenovo Docks or USB hub, MAC passthrough address from BIOS should be checked if it had been used to avoid using on other dongles. Skip builtin PCI MAC address which is share MAC address with passthrough MAC. Check thunderbolt based ethernet. Currently builtin r8152 on Dock still can't be identified. First detected r8152 will use the MAC passthrough address. Signed-off-by: Aaron Ma --- drivers/net/usb/r8152.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index f9877a3e83ac..91f4b2761f8e 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -1605,6 +1606,7 @@ static int vendor_mac_passthru_addr_read(struct r8152 *tp, struct sockaddr *sa) char *mac_obj_name; acpi_object_type mac_obj_type; int mac_strlen; + struct net_device *ndev; if (tp->lenovo_macpassthru) { mac_obj_name = "\\MACA"; @@ -1662,6 +1664,18 @@ static int vendor_mac_passthru_addr_read(struct r8152 *tp, struct sockaddr *sa) ret = -EINVAL; goto amacout; } + rcu_read_lock(); + for_each_netdev_rcu(&init_net, ndev) { + if (ndev->dev.parent && dev_is_pci(ndev->dev.parent) && + !pci_is_thunderbolt_attached(to_pci_dev(ndev->dev.parent))) + continue; + if (strncmp(buf, ndev->dev_addr, 6) == 0) { + rcu_read_unlock(); + goto amacout; + } + } + rcu_read_unlock(); + memcpy(sa->sa_data, buf, 6); netif_info(tp, probe, tp->netdev, "Using pass-thru MAC addr %pM\n", sa->sa_data); From patchwork Wed Jan 5 14:23:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Ma X-Patchwork-Id: 12704374 X-Patchwork-Delegate: kuba@kernel.org 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 3BEAAC433F5 for ; Wed, 5 Jan 2022 14:24:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240657AbiAEOYb (ORCPT ); Wed, 5 Jan 2022 09:24:31 -0500 Received: from smtp-relay-canonical-1.canonical.com ([185.125.188.121]:38716 "EHLO smtp-relay-canonical-1.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237053AbiAEOYZ (ORCPT ); Wed, 5 Jan 2022 09:24:25 -0500 Received: from localhost.localdomain (unknown [222.129.35.96]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPSA id 7E3F53F129; Wed, 5 Jan 2022 14:24:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1641392663; bh=kpiR3hGZ1YMl+duakY0dudCeJayHgZbwxzG9jKIogcE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=WkTmsM4/Pymb/UGBegpUrHjrv07RqBTsBJHiMG+zUfJjMOU8Wk7Z2vC//OoA1K7fG n3byh/a3wadCMD7Cez59o9Cgdgnf/FgyQ/uGWoSZiJDQNHxZyPikhi6wv2G0DJAC7Y mRW9LOW80159v+EOPHjd/kc/95T3kGsPke9cR+dVc3lLjkAHygLweREUb3H3MYC+1d qHade1jFnsp4L7N3Zn8mQX2njE92bBGnrwJZqQJYFvd+MWZjzr0aWFQEmtjrzvRij7 e2LqGESQrVqur7x0bDmlZgdFhUpshm540/cNgxKdn84ZGKY+L98j0s9rgVjg/outwb 9Bi0DiTgjkI8g== From: Aaron Ma To: aaron.ma@canonical.com, kuba@kernel.org, henning.schild@siemens.com, linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: davem@davemloft.net, hayeswang@realtek.com, tiwai@suse.de Subject: [PATCH 2/3] net: usb: r8152: Set probe mode to sync Date: Wed, 5 Jan 2022 22:23:50 +0800 Message-Id: <20220105142351.8026-2-aaron.ma@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220105142351.8026-1-aaron.ma@canonical.com> References: <20220105142351.8026-1-aaron.ma@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org To avoid the race of get passthrough MAC, set probe mode to sync to check the used MAC address. Signed-off-by: Aaron Ma --- drivers/net/usb/r8152.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index 91f4b2761f8e..3fbce3dbc04d 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -29,6 +29,8 @@ #include #include +static struct usb_driver rtl8152_driver; + /* Information for net-next */ #define NETNEXT_VERSION "12" @@ -9545,6 +9547,9 @@ static int rtl8152_probe(struct usb_interface *intf, struct r8152 *tp; struct net_device *netdev; int ret; + struct device_driver *rtl8152_drv = &rtl8152_driver.drvwrap.driver; + + rtl8152_drv->probe_type = PROBE_FORCE_SYNCHRONOUS; if (version == RTL_VER_UNKNOWN) return -ENODEV; From patchwork Wed Jan 5 14:23:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Ma X-Patchwork-Id: 12704375 X-Patchwork-Delegate: kuba@kernel.org 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 2130CC433EF for ; Wed, 5 Jan 2022 14:24:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240701AbiAEOYk (ORCPT ); Wed, 5 Jan 2022 09:24:40 -0500 Received: from smtp-relay-canonical-1.canonical.com ([185.125.188.121]:38730 "EHLO smtp-relay-canonical-1.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240665AbiAEOYa (ORCPT ); Wed, 5 Jan 2022 09:24:30 -0500 Received: from localhost.localdomain (unknown [222.129.35.96]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPSA id A345A3F130; Wed, 5 Jan 2022 14:24:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1641392668; bh=quJFW/G6Pk/dF+baBRmWRZZ5XMkT3idjESzLbFJlnNk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=AyK/9W79ic4JMKbe/3cJgQHb9uplm15cXkTVw3U/JA6Gu/C05l4O6Gsd6T7L53iR4 BL8wfqW0k+Vc0nzra8q/ovlD9JtCdWM/1LXlme7zwNlXwUADk6x5aW05ra01PZR+rq 5s9cuBQsRZhGYwIUWl+iJqzFY74dYcc6Kj3QC5P80ZXSaZKTw3ac+ojLoj7dRpeEtq WWw0hktDWalICQOWzZvzFNmfFC7ldfKvyj4r8tgK5TpvPptqpe8Kpp7f0OOe696Bfw Jp3+yWBvEXHbpeZ/3w+PifC32HpCBLJaUUi1H/tPgVu5CDvFhu8V+sb2vRg3VyXS9/ ACl0RWujdVexQ== From: Aaron Ma To: aaron.ma@canonical.com, kuba@kernel.org, henning.schild@siemens.com, linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: davem@davemloft.net, hayeswang@realtek.com, tiwai@suse.de Subject: [PATCH 3/3] net: usb: r8152: remove unused definition Date: Wed, 5 Jan 2022 22:23:51 +0800 Message-Id: <20220105142351.8026-3-aaron.ma@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220105142351.8026-1-aaron.ma@canonical.com> References: <20220105142351.8026-1-aaron.ma@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Signed-off-by: Aaron Ma --- drivers/net/usb/r8152.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index 3fbce3dbc04d..be2a6a2c2445 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -773,9 +773,6 @@ enum rtl8152_flags { RX_EPROTO, }; -#define DEVICE_ID_THINKPAD_THUNDERBOLT3_DOCK_GEN2 0x3082 -#define DEVICE_ID_THINKPAD_USB_C_DOCK_GEN2 0xa387 - struct tally_counter { __le64 tx_packets; __le64 rx_packets;