From patchwork Fri Nov 17 09:18:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1865002 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SWrtC1jvgz1yRM for ; Fri, 17 Nov 2023 20:18:27 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1r3uzP-0003EG-0m; Fri, 17 Nov 2023 09:18:15 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1r3uzL-0003E1-Fk for kernel-team@lists.ubuntu.com; Fri, 17 Nov 2023 09:18:11 +0000 Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (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-internal-0.canonical.com (Postfix) with ESMTPS id 5A5133F880 for ; Fri, 17 Nov 2023 09:18:10 +0000 (UTC) Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-540150414efso1271800a12.3 for ; Fri, 17 Nov 2023 01:18:10 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700212690; x=1700817490; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=L+vavnp1JrMsXAt7wtlQv1NI9Rl3xscMWWDrAQFIo34=; b=xELcZS7nghDNCL9Cu8SheMnLYKOucDInsN0ZNTyHzv58Nz+4ej8CDWIKTD5fJgHhKg HLygodvHCFUm1w3fbR4iPbWjtspC0567hJEgyWo/8ydD7KfLa3X0k6+YG0kH6hQaejBd 6Y+2VpXWNGLJMKEgCLwjnRqFj6kP0G7+x06sQik89Ex5INLyQmY1uxrWvNGHe+t+T6ls eEJfvUA3w/cVv9dsJeVgrszGqKJL0/Rwm7G4qXuihOdfu5B4obOpF5thtyxW+JHywmz6 l2SnsaEtUubhganhtB7la6G/ASe4n2ZQ6UJmsLgoHwFkZ5UDCI8CnkifbY6dEYuiA5eD 16kw== X-Gm-Message-State: AOJu0YyX5JWquBn5eo8rkDFHU2Z/vNUkuPBMhxY/yMaWqpYL6lRh4Jx6 Q/PbFZvJyyIlnWy3Uxv2MNHHVR1BzyL1bffg41SO+Ef8v7VY2iAuxqLhYsIhKLKLVY5LFVegMaM JpEz02fEm5JKhJ5Zg182vhUiLIIU+2IBhmGr2vL+vA8w98X/vmQ== X-Received: by 2002:a17:907:72ca:b0:9e8:b694:3312 with SMTP id du10-20020a17090772ca00b009e8b6943312mr4483292ejc.14.1700212689892; Fri, 17 Nov 2023 01:18:09 -0800 (PST) X-Google-Smtp-Source: AGHT+IGOMZRMu9kPWEWEMnuXIg2IYlMANQ2abNOwSPSIhfwEDdDiV7kJ+vVsHB5nhFa6gmZnZjeVnA== X-Received: by 2002:a17:907:72ca:b0:9e8:b694:3312 with SMTP id du10-20020a17090772ca00b009e8b6943312mr4483274ejc.14.1700212689529; Fri, 17 Nov 2023 01:18:09 -0800 (PST) Received: from localhost ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id j18-20020a170906255200b009ae05f9eab3sm575523ejb.65.2023.11.17.01.18.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Nov 2023 01:18:09 -0800 (PST) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][M:raspi][PATCH v2] UBUNTU: SAUCE: Revert "usb: misc: onboard-hub: add support for Microchip USB2514B USB 2.0 hub" Date: Fri, 17 Nov 2023 10:18:08 +0100 Message-Id: <20231117091808.534882-1-juerg.haefliger@canonical.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/2039786 This reverts commit 43993626de00f8faea2cf4d54aaea8f607331fcf. When the driver loads, all attached USB devices are reconnected, which breaks boot from USB. Temporarily revert support for this hub until a proper fix is available, it's not needed on Pi anyways. [juergh: Keep #define VENDOR_ID_MICROCHIP, it's used by a later commit.] Signed-off-by: Juerg Haefliger Acked-by: Tim Gardner Acked-by: Jacob Martin --- v2: - Keep #define VENDOR_ID_MICROCHIP, it's used by a later commit. --- drivers/usb/misc/onboard_usb_hub.c | 1 - drivers/usb/misc/onboard_usb_hub.h | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/usb/misc/onboard_usb_hub.c b/drivers/usb/misc/onboard_usb_hub.c index 83f14ca1d38e..ff15302e0f43 100644 --- a/drivers/usb/misc/onboard_usb_hub.c +++ b/drivers/usb/misc/onboard_usb_hub.c @@ -409,7 +409,6 @@ static void onboard_hub_usbdev_disconnect(struct usb_device *udev) static const struct usb_device_id onboard_hub_id_table[] = { { USB_DEVICE(VENDOR_ID_GENESYS, 0x0608) }, /* Genesys Logic GL850G USB 2.0 */ { USB_DEVICE(VENDOR_ID_GENESYS, 0x0610) }, /* Genesys Logic GL852G USB 2.0 */ - { USB_DEVICE(VENDOR_ID_MICROCHIP, 0x2514) }, /* USB2514B USB 2.0 */ { USB_DEVICE(VENDOR_ID_MICROCHIP, 0x2517) }, /* USB2517 USB 2.0 */ { USB_DEVICE(VENDOR_ID_REALTEK, 0x0411) }, /* RTS5411 USB 3.1 */ { USB_DEVICE(VENDOR_ID_REALTEK, 0x5411) }, /* RTS5411 USB 2.1 */ diff --git a/drivers/usb/misc/onboard_usb_hub.h b/drivers/usb/misc/onboard_usb_hub.h index aca5f50eb0da..b96a26a9f746 100644 --- a/drivers/usb/misc/onboard_usb_hub.h +++ b/drivers/usb/misc/onboard_usb_hub.h @@ -35,7 +35,6 @@ static const struct onboard_hub_pdata vialab_vl817_data = { }; static const struct of_device_id onboard_hub_match[] = { - { .compatible = "usb424,2514", .data = µchip_usb424_data, }, { .compatible = "usb424,2517", .data = µchip_usb424_data, }, { .compatible = "usb451,8140", .data = &ti_tusb8041_data, }, { .compatible = "usb451,8142", .data = &ti_tusb8041_data, },