From patchwork Wed Jan 5 15:14:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Ma X-Patchwork-Id: 12704484 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 D44BDC433F5 for ; Wed, 5 Jan 2022 15:14:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236804AbiAEPOu (ORCPT ); Wed, 5 Jan 2022 10:14:50 -0500 Received: from smtp-relay-canonical-0.canonical.com ([185.125.188.120]:55740 "EHLO smtp-relay-canonical-0.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230064AbiAEPOt (ORCPT ); Wed, 5 Jan 2022 10:14:49 -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-0.canonical.com (Postfix) with ESMTPSA id 1D37B40037; Wed, 5 Jan 2022 15:14:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1641395687; bh=0ahgBxDMV/FnSQcDRoTIL2XGBuHehdIW2pip+BQAyX4=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=Z6PVJZY7dhgs+tApSi3JC4Wp0iCANL67jSngJvDD0RUunWYkhaOhr0II0D5nBXOCo SZD9yvSVszfnPyZfptbdovyx4UvpWTqYTyI82m2nlbwdphu7kKoVZbZVopzMHsmkyZ bMPTArT23NQvv8BXKwqCmu9yHxKdOTp9DcGSSfd/75HAQZ/Cw0D7cqCp2uIcPYmrN9 cp8xP2kLXbQcDyDUSaj4CblUczhcvSxcek3yMXXdonAc8QfRrH2gwrh4eRECiSikji TUoDrXDm3vOvw7p3EEqncgFjCc0sG/nIvtDEvX/32Bkl7r94sVoUhlAy2kchQfvGv0 /+gVQhzbYNG6w== 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 v3] net: usb: r8152: Check used MAC passthrough address Date: Wed, 5 Jan 2022 23:14:25 +0800 Message-Id: <20220105151427.8373-1-aaron.ma@canonical.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.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. Currently builtin r8152 on Dock still can't be identified. First detected r8152 will use the MAC passthrough address. v2: Skip builtin PCI MAC address which is share MAC address with passthrough MAC. Check thunderbolt based ethernet. v3: Add return value. Fixes: f77b83b5bbab ("net: usb: r8152: Add MAC passthrough support for more Lenovo Docks") Signed-off-by: Aaron Ma --- drivers/net/usb/r8152.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index f9877a3e83ac..2483dc421dff 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,19 @@ 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) { + ret = -EINVAL; + 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 15:14:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Ma X-Patchwork-Id: 12704485 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 EF57EC4332F for ; Wed, 5 Jan 2022 15:15:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241220AbiAEPPB (ORCPT ); Wed, 5 Jan 2022 10:15:01 -0500 Received: from smtp-relay-canonical-0.canonical.com ([185.125.188.120]:55758 "EHLO smtp-relay-canonical-0.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236895AbiAEPO7 (ORCPT ); Wed, 5 Jan 2022 10:14:59 -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-0.canonical.com (Postfix) with ESMTPSA id 567A141956; Wed, 5 Jan 2022 15:14:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1641395692; bh=jEhTx+5dXw4m5tKE7W3cRqAYGHANY0YdE7tGhPAYpTs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ccu6+Sqo5rVd24pj4A7He5epkO3TTKbMIBEo4gLaM8kMPOM/Vz7vXFPyzxYAhANB/ cq6TdpYGglXmz12T5aLuJ6RM6ETwZjqV8qh9nB0gtmAV8H2D67AHboYQPlFGyfTUWc wt+12ZBYb3Xr+0Ea+5IJBa+qFxFwEHCiiPdcVYW2Oddc/xP8Refq67Yn8iyuPHIkU0 vKAOYRy6rQzb3CN9cJDZZaskxWSca3fWb6Y9/Ng9LjUB/LLihLW5NIfYjGjxieUlqH EM+k4GdBa/VfF/H9uBQ3piaBbIb6EBF/jG4j51w2Ugiv5+v/CxmhzE413zUaT1vFXO aPEgbjbd8RJOQ== 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 23:14:26 +0800 Message-Id: <20220105151427.8373-2-aaron.ma@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220105151427.8373-1-aaron.ma@canonical.com> References: <20220105151427.8373-1-aaron.ma@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.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 2483dc421dff..7cf2faf8d088 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" @@ -9546,6 +9548,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 15:14:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Ma X-Patchwork-Id: 12704486 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 53A0DC433EF for ; Wed, 5 Jan 2022 15:15:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241234AbiAEPPG (ORCPT ); Wed, 5 Jan 2022 10:15:06 -0500 Received: from smtp-relay-canonical-0.canonical.com ([185.125.188.120]:55782 "EHLO smtp-relay-canonical-0.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241195AbiAEPPD (ORCPT ); Wed, 5 Jan 2022 10:15:03 -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-0.canonical.com (Postfix) with ESMTPSA id A0CD740037; Wed, 5 Jan 2022 15:14:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1641395699; bh=krm5g8tFpp7LgpQcwpESkXdJo63TQKvHZazL6m/HHi0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Eu/gnRUzGwknoS3eYlS1bO6b/zqTyAs9NXMyHFl9D7/UjGzyk+v/MI5LKqEswOBKq zamxYSxusaj42Dc4K4FrVOIGYaTqLJ+oigqPqdoxmw66vHD0s+P3BF8SFTMsbTUKys etj2jt4Wn0lyF9HSThyhKEJkB9iAn+kkio/Sth3A1OEpaYxcqMAIgAfhQf+lLvQode Qb46fGGwuBq+4wqMFt/do0u9cdwdk7OJNjZ08PaQDJgc0RouFWcxe8l8ailNee017K wmXZCt+RaZwAKTw3GcyMn5rxR67gJUiBxE3LxnWxxnYOA3C9FeA4iOE+sBxH9+JjEF f2w0A0E8YbPHw== 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 23:14:27 +0800 Message-Id: <20220105151427.8373-3-aaron.ma@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220105151427.8373-1-aaron.ma@canonical.com> References: <20220105151427.8373-1-aaron.ma@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.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 7cf2faf8d088..7cd3b1db062a 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;