From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.2 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E44EFC433E0 for ; Thu, 4 Mar 2021 00:18:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BE4A16146D for ; Thu, 4 Mar 2021 00:18:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355000AbhCDASD (ORCPT ); Wed, 3 Mar 2021 19:18:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45658 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356756AbhCDAHP (ORCPT ); Wed, 3 Mar 2021 19:07:15 -0500 Received: from mail-lf1-x133.google.com (mail-lf1-x133.google.com [IPv6:2a00:1450:4864:20::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A098EC0613B0; Wed, 3 Mar 2021 16:01:24 -0800 (PST) Received: by mail-lf1-x133.google.com with SMTP id e7so40146717lft.2; Wed, 03 Mar 2021 16:01:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding:content-language; bh=g/OcEy4clPJqJ0GLE5L/CUTZlwFjMw7YwB9WXsh71Lk=; b=M0+pMYVu14fpv91pSJ0fcoor2wL284cItWBYDc5j9EsKHu1brIOilveMkLSCCM9rBH 32MXXuRo/w4H2NtkIKxMVrfyrAl6NiMsD7FxZhzD42jM8rg/pjNiOyuwLbel/Aqu2pK+ MevnvQRWv5VZVVilR1t/5HMxbaWYqHgYfZ4GP3jBt7buW8zp4uRsu6/MKQil21wXPE5X vT2mx3C7ZFsIe4l1HlvHrlJl76vuAdDrq1NyH+QvWGgmTV0BqUA3nE8VAd1yvZ9YfQhM hOgOCZlY3muCK9ouDE20BQMOBMDt39WqX+sCPMlE72kzXyDHkZPKw2/E8fqlc/tGXcVT WfIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding :content-language; bh=g/OcEy4clPJqJ0GLE5L/CUTZlwFjMw7YwB9WXsh71Lk=; b=jcHl3GcIysz2ZeK31Jz4F5zulne+3joaxNnXkEYlXm9epaG84y6fzyzvASf/vanhA8 vOqdWBjvxgr0GkpnoLQmk1pqSGbmUqV/imNcK55banRcy/iyOEdv4sStwbAYAneM9mTA DKtti5omBoDruCY/ajFgQm47GpHLPpp3axuG/ghysFog39hWLQpE4F7/DlArTu0jkMu3 jsj1ozkrL/tgyViSMm4giidtlI9sOG+y6Ok7A77btD2uOBudWcxzbAyo/Ji1vUFtZKUr 9uqrqP+UPqclEFJI0p54zLRuenJmZDgeZd70cR9GaK3IqU0SbP9Q2xtb7n7g0WyvjSR8 sbbQ== X-Gm-Message-State: AOAM530kDfyGb4IP6mCRiE05e1vRbQIyHa3oCCR8Qp25DQdQ140laIbJ nCaRk1QkANunNufxahaUIzs= X-Google-Smtp-Source: ABdhPJz82OYsJPcyPBkJLf5BNmiuIw325gGtb5++sIlk0E2qZTsKObgTsniWSmTvFRmQ9xBO8cRIgQ== X-Received: by 2002:a05:6512:3202:: with SMTP id d2mr652899lfe.484.1614816083143; Wed, 03 Mar 2021 16:01:23 -0800 (PST) Received: from [10.0.0.11] (user-5-173-242-247.play-internet.pl. [5.173.242.247]) by smtp.googlemail.com with ESMTPSA id 3sm2274312lfq.1.2021.03.03.16.01.22 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 03 Mar 2021 16:01:22 -0800 (PST) Subject: Re: [PATCH 5.10 491/663] USB: serial: option: update interface mapping for ZTE P685M To: Greg Kroah-Hartman , linux-kernel@vger.kernel.org Cc: stable@vger.kernel.org, Johan Hovold , =?UTF-8?Q?Bj=c3=b8rn_Mork?= References: <20210301161141.760350206@linuxfoundation.org> <20210301161206.139213430@linuxfoundation.org> From: Lech Perczak Message-ID: Date: Thu, 4 Mar 2021 01:01:17 +0100 User-Agent: Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 In-Reply-To: <20210301161206.139213430@linuxfoundation.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-GB Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On 2021-03-01 at 17:12, Greg Kroah-Hartman wrote: > From: Lech Perczak > > commit 6420a569504e212d618d4a4736e2c59ed80a8478 upstream. > > This patch prepares for qmi_wwan driver support for the device. > Previously "option" driver mapped itself to interfaces 0 and 3 (matching > ff/ff/ff), while interface 3 is in fact a QMI port. > Interfaces 1 and 2 (matching ff/00/00) expose AT commands, > and weren't supported previously at all. > Without this patch, a possible conflict would exist if device ID was > added to qmi_wwan driver for interface 3. > > Update and simplify device ID to match interfaces 0-2 directly, > to expose QCDM (0), PCUI (1), and modem (2) ports and avoid conflict > with QMI (3), and ADB (4). > > The modem is used inside ZTE MF283+ router and carriers identify it as > such. > Interface mapping is: > 0: QCDM, 1: AT (PCUI), 2: AT (Modem), 3: QMI, 4: ADB > > T: Bus=02 Lev=02 Prnt=02 Port=05 Cnt=01 Dev#= 3 Spd=480 MxCh= 0 > D: Ver= 2.01 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 > P: Vendor=19d2 ProdID=1275 Rev=f0.00 > S: Manufacturer=ZTE,Incorporated > S: Product=ZTE Technologies MSM > S: SerialNumber=P685M510ZTED0000CP&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&0 > C:* #Ifs= 5 Cfg#= 1 Atr=a0 MxPwr=500mA > I:* If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option > E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms > E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms > I:* If#= 1 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option > E: Ad=83(I) Atr=03(Int.) MxPS= 10 Ivl=32ms > E: Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms > E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms > I:* If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option > E: Ad=85(I) Atr=03(Int.) MxPS= 10 Ivl=32ms > E: Ad=84(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms > E: Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms > I:* If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan > E: Ad=87(I) Atr=03(Int.) MxPS= 8 Ivl=32ms > E: Ad=86(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms > E: Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms > I:* If#= 4 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=42 Prot=01 Driver=(none) > E: Ad=88(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms > E: Ad=05(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms > > Cc: Johan Hovold > Cc: Bjørn Mork > Signed-off-by: Lech Perczak > Link: https://lore.kernel.org/r/20210207005443.12936-1-lech.perczak@gmail.com > Cc: stable@vger.kernel.org > Signed-off-by: Johan Hovold > Signed-off-by: Greg Kroah-Hartman > --- > drivers/usb/serial/option.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > --- a/drivers/usb/serial/option.c > +++ b/drivers/usb/serial/option.c > @@ -1569,7 +1569,8 @@ static const struct usb_device_id option > { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1272, 0xff, 0xff, 0xff) }, > { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1273, 0xff, 0xff, 0xff) }, > { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1274, 0xff, 0xff, 0xff) }, > - { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1275, 0xff, 0xff, 0xff) }, > + { USB_DEVICE(ZTE_VENDOR_ID, 0x1275), /* ZTE P685M */ > + .driver_info = RSVD(3) | RSVD(4) }, > { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1276, 0xff, 0xff, 0xff) }, > { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1277, 0xff, 0xff, 0xff) }, > { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1278, 0xff, 0xff, 0xff) }, > > If this patch is selected, then 88eee9b7b42e69fb622ddb3ff6f37e8e4347f5b2 ("net: usb: qmi_wwan: support ZTE P685M modem") should probably be selected, too, or both be dropped. This patch frees up an interface to be claimed by qmi_wwan driver by the mentioned patch. The mentioned patch only adds a device ID to qmi_wwan driver. Regarding version, I think that backporting to 5.4.y and later is enough, as OpenWrt, from which both patches originate, is currently on 5.4.y on the target requiring them, and will move to 5.10.y soon. Backporting this would certainly make OpenWrt folks happy for two backports fewer, however I don't insist on it. -- With kind regards, Lech Perczak