On Wed, Jan 05, 2022 at 11:14:25PM +0800, Aaron Ma wrote:
> 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.
All of this goes below the --- line.
You have read the kernel documentation for how to do all of this, right?
If not, please re-read it.
>
> Fixes: f77b83b5bbab ("net: usb: r8152: Add MAC passthrough support for
> more Lenovo Docks")
This line should not be wrapped.
> Signed-off-by: Aaron Ma <aaron.ma@xxxxxxxxxxxxx>
> ---
> 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 <linux/atomic.h>
> #include <linux/acpi.h>
> #include <linux/firmware.h>
> +#include <linux/pci.h>
Why does a USB driver care about PCI stuff?
> #include <crypto/hash.h>
> #include <linux/usb/r8152.h>
>
> @@ -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) &&
Ick ick ick.
No, don't go poking around in random parent devices of a USB device,
that is a sure way to break things.
> + !pci_is_thunderbolt_attached(to_pci_dev(ndev->dev.parent)))
So thunderbolt USB hubs are a problem here?
No, this is not the correct way to handle this at all. There should be
some sort of identifier on the USB device itself to say that it is in a
docking station and needs to have special handling. If not, then the
docking station is broken and needs to be returned.
Can you please revert the offending patch first so that people's systems
go back to working properly first? Then worry about trying to uniquely
identify these crazy devices.
Again, this is not a way to do it, sorry.
greg k-h
