Received: by 2002:a05:6a10:c604:0:0:0:0 with SMTP id y4csp3774970pxt; Tue, 10 Aug 2021 11:02:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwmaenJaAXU6hEhritbVrjfZVcKhUjEHoTo1rWvzBie6+S+TDdMQhbUlEIBrxr1UY+kF+zk X-Received: by 2002:a92:2911:: with SMTP id l17mr303910ilg.263.1628618559929; Tue, 10 Aug 2021 11:02:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628618559; cv=none; d=google.com; s=arc-20160816; b=eKF0MK3CWKmMyjd+PmRlG4mb2TFVmY1821eLlkjVdndc5Q02Lsa4+pHg2ZtFJxQRIy 5ByNcMDlbGPtQp7M0BNHhfEtrW4OxgPN0PbodZvde3FeCS8Fj3izJI0UVHQoO4yUKoNz baFvx3qs8e3yCAbt64By3UoIcSL+RGSNvBOsaJYYMBTJIMo/AKVG5KRIOJb4x+r8iW8t 7F2IA0wHZDawCO4H/5IKYfu28mhLGU+K9SNxpwROhnPg2tDx6ummz0e9VZK13Fxz7v1I KJn7NE8Xmhsj4ComCVyUZctP2wl8zIJ3Pn+j8fEsGtdQQQ5nV0WVTdVPfOmFwW7EiOPc 9abA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=RgcuuKvL4KxCO36mCKtkj8zH5AMflpGATp+WcXdn5SI=; b=SncuIQxsLa/ODQyLEG+dqLjgxw52a00SzZFa4GKh98xlG/aVUF75fbggA7J/Vtd5EH wE6N1XV3Gl7vqQkoHdLtgqwfgRL5MB3JZMLCgmD9S1n/TCyhKZjtdLB9MvSeO5wPZSQm Rpi8tN2yRwpjQiY09GIPdFjnoMpRFbQWQqtSCFaVgob+HaKWSZEq/i8YuYOkJ8jG+fwt d+gueJ6cTNK4Mh5zthavvRPM4Aoyx+3Y6mWGumDgTtlhgHw19BS3GEZCGwXvcsBJtQD4 9uHIexApvX0wFV8qd9JDDoP3KSqDlg0R5Wyj7JfHqY925yCMKqgALaRYKlDeESEz0ycH 43vA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ZSgVEohq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n25si9662824ioz.84.2021.08.10.11.02.28; Tue, 10 Aug 2021 11:02:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ZSgVEohq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238227AbhHJR7Y (ORCPT + 99 others); Tue, 10 Aug 2021 13:59:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:47786 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237800AbhHJRy4 (ORCPT ); Tue, 10 Aug 2021 13:54:56 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C4A2B61051; Tue, 10 Aug 2021 17:44:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1628617478; bh=QZCKsrutDYD/xHxMxm/pYSbdmmE2ELG/mHw1a7U2EO4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZSgVEohqHseCqLAA2dGKG4nFsz8Ab8SqVwZnTnesAjsSU76zx1K80W6aR/L54+/pw OIuC6lpHCv6064gHfV6EzpMgmIwJj1u/vgkby7aihgjRic4V61R79avkb2nxlYLS9t //BK5TV6P+rmmr/Oo3j4gyPqt9ZAUdMRVKMrwRpY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chris , Johan Hovold Subject: [PATCH 5.13 077/175] USB: serial: pl2303: fix HX type detection Date: Tue, 10 Aug 2021 19:29:45 +0200 Message-Id: <20210810173003.476450744@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810173000.928681411@linuxfoundation.org> References: <20210810173000.928681411@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Johan Hovold commit 1e9faef4d26de33bd6b5018695996e7394119e5b upstream. The device release number for HX-type devices is configurable in EEPROM/OTPROM and cannot be used reliably for type detection. Assume all (non-H) devices with bcdUSB 1.1 and unknown bcdDevice to be of HX type while adding a bcdDevice check for HXD and TB (1.1 and 2.0, respectively). Reported-by: Chris Fixes: 8a7bf7510d1f ("USB: serial: pl2303: amend and tighten type detection") Cc: stable@vger.kernel.org # 5.13 Link: https://lore.kernel.org/r/20210730122156.718-1-johan@kernel.org Reviewed-by: Greg Kroah-Hartman Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman --- drivers/usb/serial/pl2303.c | 41 +++++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 16 deletions(-) --- a/drivers/usb/serial/pl2303.c +++ b/drivers/usb/serial/pl2303.c @@ -418,24 +418,33 @@ static int pl2303_detect_type(struct usb bcdDevice = le16_to_cpu(desc->bcdDevice); bcdUSB = le16_to_cpu(desc->bcdUSB); - switch (bcdDevice) { - case 0x100: - /* - * Assume it's an HXN-type if the device doesn't support the old read - * request value. - */ - if (bcdUSB == 0x200 && !pl2303_supports_hx_status(serial)) - return TYPE_HXN; + switch (bcdUSB) { + case 0x110: + switch (bcdDevice) { + case 0x300: + return TYPE_HX; + case 0x400: + return TYPE_HXD; + default: + return TYPE_HX; + } break; - case 0x300: - if (bcdUSB == 0x200) + case 0x200: + switch (bcdDevice) { + case 0x100: + /* + * Assume it's an HXN-type if the device doesn't + * support the old read request value. + */ + if (!pl2303_supports_hx_status(serial)) + return TYPE_HXN; + break; + case 0x300: return TYPE_TA; - - return TYPE_HX; - case 0x400: - return TYPE_HXD; - case 0x500: - return TYPE_TB; + case 0x500: + return TYPE_TB; + } + break; } dev_err(&serial->interface->dev,