From patchwork Mon Jun 13 06:11:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Po-Hsu Lin X-Patchwork-Id: 1642665 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=daC4QwHC; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LM1Rn6FXvz9sFk for ; Mon, 13 Jun 2022 16:11:48 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1o0dIX-0002FT-44; Mon, 13 Jun 2022 06:11:37 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1o0dIV-0002F3-0P for kernel-team@lists.ubuntu.com; Mon, 13 Jun 2022 06:11:35 +0000 Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) (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-1.canonical.com (Postfix) with ESMTPS id 52AB83F1AE for ; Mon, 13 Jun 2022 06:11:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1655100694; bh=JGPUySDr8K293ItKCbp781VuAZfSvJmOZE2KFb5AVlY=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=daC4QwHC3JUKDSRF8lf3KhIm9DxcfctHAg5aGrMYjQk8qMT5La7ArIRuN4RWoeCoj Ocv7sctnaFzX9aMzyPiANed3Gfos9Lg0USgXJ9ZrKdlQSDSkqKrL/8Vd6nbXIxC4lj 5WT9UCka5y0Lo6VhOvM/Km6FMmq4IbT6NStiyW9nVlmOy1u4N6V/6qBqjN39Fg8WJ/ C3bmCcUxVIXIy0NMwlSRglDxA66K9YKUbru938FP7E0AVuarhd6FcvMjCRkEErdt3b gyLrsLYyZG+7CI5k2R1NOJZxWs970kJy/evhfRqz1awPvqvWcqUXF6hJWPCPTzS12K lr6xTGZ2Grmfw== Received: by mail-pg1-f197.google.com with SMTP id f9-20020a636a09000000b00401b6bc63beso2910543pgc.23 for ; Sun, 12 Jun 2022 23:11:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JGPUySDr8K293ItKCbp781VuAZfSvJmOZE2KFb5AVlY=; b=JROnEOUH06T7JGFFMv0QWJDNTzy5bCO94GNi6tFV7VVTHYAuEUEhEviTZw5sE1jADw bfUDe8Rw8C8/fWtVqYkir0375vzCtXkpb7cK24qTHrIYQYaaZ5MCCH73Mp4zCIqbxj1V tOyc4K9rCjDnt46QeXjAPb32DDuuESSj0L038u5scm8+u0D2UBzcNgw/4ZMEQctBP3ka OhP7D4E46hQSUJS1BXNmC/Ij73WQyKOoffhmvvyDPqAVrpqktPQy+uyG84iFhGSHDBBh w13zyj7x9VooiVPTY2lbL2EKOWpE/+dTABZNVA6uqbyDLzIs+nR7UP/i0oL0UEvmFt0n TxrA== X-Gm-Message-State: AOAM5339rM7oMeCS3SJWyArqBZ4YoV+bD6kWxQWH//Cpx9fg/UR3eMdi z6t/9lxVxxnMAkky4ss9f5KAUQf6NjxZOwjGf/U+QkqOF0LMUfg/pHcKgJoOjLdx8rNETtgOf4j mEAwcmDu7l+seDmy2Jk3dKeaBnaC8iX8n0v4MdL+V X-Received: by 2002:a65:6d1a:0:b0:3fb:2109:7b87 with SMTP id bf26-20020a656d1a000000b003fb21097b87mr50991535pgb.127.1655100692920; Sun, 12 Jun 2022 23:11:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyLVbTiA7tn3XRbdD7ivDJ10Q6kPcM8ccaaVEW+NpHBjzzNzRh1Y4dWzvkdj6VIrKbzIXTXOA== X-Received: by 2002:a65:6d1a:0:b0:3fb:2109:7b87 with SMTP id bf26-20020a656d1a000000b003fb21097b87mr50991514pgb.127.1655100692584; Sun, 12 Jun 2022 23:11:32 -0700 (PDT) Received: from localhost.localdomain (114-136-173-96.emome-ip.hinet.net. [114.136.173.96]) by smtp.gmail.com with ESMTPSA id 12-20020a170902c10c00b00168aed83c63sm4099110pli.237.2022.06.12.23.11.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Jun 2022 23:11:31 -0700 (PDT) From: Po-Hsu Lin To: kernel-team@lists.ubuntu.com Subject: [I/J][K/Unstable][OEM-5.14/OEM-5.17][SRU][PATCH 1/1] USB: serial: pl2303: fix type detection for odd device Date: Mon, 13 Jun 2022 14:11:05 +0800 Message-Id: <20220613061105.38683-2-po-hsu.lin@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220613061105.38683-1-po-hsu.lin@canonical.com> References: <20220613061105.38683-1-po-hsu.lin@canonical.com> 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" From: Johan Hovold BugLink: https://bugs.launchpad.net/bugs/1967493 At least one pl2303 device has a bcdUSB of 1.0.1 which most likely was was intended as 1.1. Allow bcdDevice 1.0.1 but interpret it as 1.1. Fixes: 1e9faef4d26d ("USB: serial: pl2303: fix HX type detection") Cc: stable@vger.kernel.org # 5.13 Link: https://lore.kernel.org/linux-usb/CAJixRzqf4a9-ZKZDgWxicc_BpfdZVE9qqGmkiO7xEstOXUbGvQ@mail.gmail.com Reported-by: Gary van der Merwe Link: https://lore.kernel.org/r/20220517161736.13313-1-johan@kernel.org Signed-off-by: Johan Hovold (cherry picked from commit beeb68a71edc41648b6948d027b810c5acc7a2aa) Signed-off-by: Po-Hsu Lin --- drivers/usb/serial/pl2303.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c index 257422b..94a3509 100644 --- a/drivers/usb/serial/pl2303.c +++ b/drivers/usb/serial/pl2303.c @@ -419,6 +419,9 @@ static int pl2303_detect_type(struct usb_serial *serial) bcdUSB = le16_to_cpu(desc->bcdUSB); switch (bcdUSB) { + case 0x101: + /* USB 1.0.1? Let's assume they meant 1.1... */ + fallthrough; case 0x110: switch (bcdDevice) { case 0x300: