From patchwork Wed Nov 16 15:59:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Davide Tronchin X-Patchwork-Id: 625422 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BED50C4332F for ; Wed, 16 Nov 2022 16:00:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233672AbiKPQAi (ORCPT ); Wed, 16 Nov 2022 11:00:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40804 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233066AbiKPQAh (ORCPT ); Wed, 16 Nov 2022 11:00:37 -0500 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0BA234D5CC for ; Wed, 16 Nov 2022 08:00:36 -0800 (PST) Received: by mail-wm1-x32e.google.com with SMTP id i186-20020a1c3bc3000000b003cfe29a5733so1943862wma.3 for ; Wed, 16 Nov 2022 08:00:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cqnN+HwKF3yOXWIqEca3FS0DaVbgfsnsprqsCj3gozc=; b=YIYmnvgJhpkA9r73b4Nkt81d0RElDCRyIxF22hnQM+rdc+1XtoCcUlQ/bgLvURbWuQ dXzYwY16FkCruarThfxqo5ZCgF+iXHP/R/pwXCdpLuDFfVmLYR7qwXzjUd68fHi44xor I8EF+12gM7Pu4mPW87chWKg/RU2ViCgxV2TefyzvlOcrM1lzU7LI/0/3R2Hx/3/GCUFw oczpT4hBAqX/6xjiOk3fihh6yFhr/PTp/a33+G6KshNKSPyNao8f4RecPvS9wgWfVUXQ 5TvPJr/poZjU2m/zTljhS1Ktz7zyxk4FzWvYkK+eAE7mcwNBmZwZWgnvImZntK/DN5En EacA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cqnN+HwKF3yOXWIqEca3FS0DaVbgfsnsprqsCj3gozc=; b=Tpk3aldICc/ujyknRutMtd+Us6mxMzJF2I7zhVEj7XEtciW2Ti/2jVfna+Ze+6+xNb MkGtq+sDVCHIm1NGowoDP4ZXLVu4GEunXESc6/IMdDkmTy6XL3zw9AzIb2bpr+MqeVV3 rRK9BLo4ZtHI8jtKfUTiT1ZnAuvORbjr3Cq5nu4nHhYtbAoJs4K6sR/kSDynunA4jY0+ xbceO+5o0pJa35i1zZHDE3KluRGDQPfR1xPloojsUBAD52xeuFP9IJ87vqH7LK5AET78 Rw5fo+WjzZNDFudD73sEU+myu3V52sK3Ykk4Ppd2pUlhPyQrnsVm2lgOh/WcLRbQwOGd tqGA== X-Gm-Message-State: ANoB5pmDu1zkye4PPYdzgg0H17XSklpGRbr615V24A50iqaU0NLRBQS/ sO496SX1dLGrwpRWA9KS9no= X-Google-Smtp-Source: AA0mqf5xuOQClU2F712+h3aoy8rhP9aPbqLUlapJLmZhzhzOmkXrDeZweMeSmgqkvSLD1SmP+tXqAQ== X-Received: by 2002:a05:600c:6890:b0:3c5:dbf4:baaf with SMTP id fn16-20020a05600c689000b003c5dbf4baafmr2489369wmb.105.1668614434426; Wed, 16 Nov 2022 08:00:34 -0800 (PST) Received: from testvm.. ([185.215.195.243]) by smtp.googlemail.com with ESMTPSA id z4-20020a5d4c84000000b00236733f0f98sm15298795wrs.107.2022.11.16.08.00.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Nov 2022 08:00:33 -0800 (PST) From: Davide Tronchin To: johan@kernel.org Cc: cesare.marzano@gmail.com, davide.tronchin.94@gmail.com, gregkh@linuxfoundation.org, larsm17@gmail.com, linux-usb@vger.kernel.org, marco.demarco@posteo.net Subject: [PATCH v6 1/3] USB: serial: option: remove old LARA-R6 PID Date: Wed, 16 Nov 2022 16:59:48 +0100 Message-Id: <20221116155950.59609-1-davide.tronchin.94@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Remove the UBLOX_PRODUCT_R6XX 0x90fa association since LARA-R6 00B final product uses a new USB composition with different PID. 0x90fa PID used only by LARA-R6 internal prototypes. Move 0x90fa PID directly in the option_ids array since used by other Qualcomm based modem vendors as pointed in: https://lore.kernel.org/all/6572c4e6-d8bc-b8d3-4396-d879e4e76338@gmail.com Signed-off-by: Davide Tronchin --- V5 -> V6: change the commit message and text wrapped correctly. V4 -> V5: kept PID 0x90fa to maintain the support for other products which use VID:PID 0x05c6:0x90fa. Remove interface 4 from blacklist for LARA-L6 default mode since it is not needed. V3 -> V4: as requested, the patch has been split to 3 sub-patches. Fix comment format. V2 -> V3: added this section to tracking changes with previous versions. Added some explanations about the RSVD(4) in the description session. Added reservation to port 4 of VID:PID 0x05C6:0x908B to meet other companies QMI net interface implementation. V1 -> V2: define UBLOX_PRODUCT_LARA_R6 0x908b has been deleted together with the previosly provided definition of USB_DEVICE since the PID is used by another vendor. The LARA-L6 patch part is the same of the previosly provided one. drivers/usb/serial/option.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index 697683e3fbff..b93285b5175b 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c @@ -240,7 +240,6 @@ static void option_instat_callback(struct urb *urb); #define QUECTEL_PRODUCT_UC15 0x9090 /* These u-blox products use Qualcomm's vendor ID */ #define UBLOX_PRODUCT_R410M 0x90b2 -#define UBLOX_PRODUCT_R6XX 0x90fa /* These Yuga products use Qualcomm's vendor ID */ #define YUGA_PRODUCT_CLM920_NC5 0x9625 @@ -1124,7 +1123,7 @@ static const struct usb_device_id option_ids[] = { /* u-blox products using Qualcomm vendor ID */ { USB_DEVICE(QUALCOMM_VENDOR_ID, UBLOX_PRODUCT_R410M), .driver_info = RSVD(1) | RSVD(3) }, - { USB_DEVICE(QUALCOMM_VENDOR_ID, UBLOX_PRODUCT_R6XX), + { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x90fa), .driver_info = RSVD(3) }, /* Quectel products using Quectel vendor ID */ { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC21, 0xff, 0xff, 0xff), From patchwork Wed Nov 16 15:59:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Davide Tronchin X-Patchwork-Id: 625421 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 43792C433FE for ; Wed, 16 Nov 2022 16:00:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233694AbiKPQAm (ORCPT ); Wed, 16 Nov 2022 11:00:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40852 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233678AbiKPQAl (ORCPT ); Wed, 16 Nov 2022 11:00:41 -0500 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E7D453EF0 for ; Wed, 16 Nov 2022 08:00:38 -0800 (PST) Received: by mail-wm1-x336.google.com with SMTP id t25-20020a1c7719000000b003cfa34ea516so3087713wmi.1 for ; Wed, 16 Nov 2022 08:00:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=s/BF5PL3tMarYSladvLAUAdbHJa8XKRhmvy0pGOiheE=; b=pIbGRIzB8p/7/nDoZK1kLmPdHHEq4sGNav0hy8MMoy7BL/oJZyaUDrZuLv9n0fT57/ ZcknoQvMB9Bc755z8jSt/CTlc7yC+PZjqN/bdWF27nXdYGhI4Uh76pqmmcL4bls4Fuad nzfReHBGFjWS0+mMqYdY12MSi8Je+b42V5fslZXAgGEtsBATSRcmnnCruBirEz+mscvA 4PIc25pmmS0ZFTvuku6SjCZrP4ljF4fT/y6EOE3OdGE/rPLoONmgopK3aNecBAKMlOty qbmp+jS/IwQSwMdewmHQJIQVSwaly1ql1+wd1B9r+xWRpcynXdLIFTXmmI8oIConMNRy 9XBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=s/BF5PL3tMarYSladvLAUAdbHJa8XKRhmvy0pGOiheE=; b=LXkkZwCMl4OHQynf0NCQYy7nk3pgOoNJ5S8chEzpNGhe4RfAPptd5/Q0hYWFN/VGY5 9mKZfZ301Sc3LK77CRSDBp98G2BYJXSMxb4VzpsPDO9Pwc8Sd/g1CcrE0oqrdNLvZ86X v8NUdnxzDaSbjzNHJK0Fx+brYZW01TAYijYk3g8EHAar8YF/8K5KMucc9SzBa3Lp+JLx BHIZVOh0yx1p1qNER3YkLZUMka+jgS0xTIZid4emDHB56G9dPV9hK7eTdvtqS/anLu0I ETWfVHUONwgyQLkdf5BMLLjzqoJ4KjMdBDa9nHqZPTSDrnaQmKtQE+Ssknf5cHQ8IUaf Gffg== X-Gm-Message-State: ANoB5plytEEQz+F4DVD5hK36bLceT2WjdTXln7FaQ+l1gQRIJ7WUlOX/ kxt+6/jVoOalbtHS5XAa2mI= X-Google-Smtp-Source: AA0mqf6jOWDWzJmsMevH6gQar0VFxBFMmNAN4WLvzYO2VoFTZ7hjG1S9uCHtnzEeSOGdoF+LDB87Kg== X-Received: by 2002:a05:600c:3110:b0:3cf:b07a:cd56 with SMTP id g16-20020a05600c311000b003cfb07acd56mr2474350wmo.143.1668614436899; Wed, 16 Nov 2022 08:00:36 -0800 (PST) Received: from testvm.. ([185.215.195.243]) by smtp.googlemail.com with ESMTPSA id z4-20020a5d4c84000000b00236733f0f98sm15298795wrs.107.2022.11.16.08.00.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Nov 2022 08:00:36 -0800 (PST) From: Davide Tronchin To: johan@kernel.org Cc: cesare.marzano@gmail.com, davide.tronchin.94@gmail.com, gregkh@linuxfoundation.org, larsm17@gmail.com, linux-usb@vger.kernel.org, marco.demarco@posteo.net Subject: [PATCH v6 3/3] USB: serial: option: add u-blox LARA-L6 modem Date: Wed, 16 Nov 2022 16:59:50 +0100 Message-Id: <20221116155950.59609-3-davide.tronchin.94@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221116155950.59609-1-davide.tronchin.94@gmail.com> References: <20221116155950.59609-1-davide.tronchin.94@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Add LARA-L6 PIDs for three different USB compositions. LARA-L6 module can be configured (by AT interface) in three different USB modes: * Default mode (Vendor ID: 0x1546 Product ID: 0x1341) with 4 serial interfaces * RmNet mode (Vendor ID: 0x1546 Product ID: 0x1342) with 4 serial interfaces and 1 RmNet virtual network interface * CDC-ECM mode (Vendor ID: 0x1546 Product ID: 0x1343) with 4 serial interface and 1 CDC-ECM virtual network interface In default mode LARA-L6 exposes the following interfaces: If 0: Diagnostic If 1: AT parser If 2: AT parser If 3: AT parser/alternative functions In RmNet mode LARA-L6 exposes the following interfaces: If 0: Diagnostic If 1: AT parser If 2: AT parser If 3: AT parset/alternative functions If 4: RMNET interface In CDC-ECM mode LARA-L6 exposes the following interfaces: If 0: Diagnostic If 1: AT parser If 2: AT parser If 3: AT parset/alternative functions If 4: CDC-ECM interface Signed-off-by: Davide Tronchin --- V5 -> V6: no changes. V4 -> V5: kept PID 0x90fa to maintain the support for other products which use VID:PID 0x05c6:0x90fa. Remove interface 4 from blacklist for LARA-L6 default mode since it is not needed. V3 -> V4: as requested, the patch has been split to 3 sub-patches. Fix comment format. V2 -> V3: added this section to tracking changes with previous versions. Added some explanations about the RSVD(4) in the description session. Added reservation to port 4 of VID:PID 0x05C6:0x908B to meet other companies QMI net interface implementation. V1 -> V2: define UBLOX_PRODUCT_LARA_R6 0x908b has been deleted together with the previosly provided definition of USB_DEVICE since the PID is used by another vendor. The LARA-L6 patch part is the same of the previosly provided one. drivers/usb/serial/option.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index 011b9a3b7571..f892a3c80cf1 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c @@ -580,6 +580,11 @@ static void option_instat_callback(struct urb *urb); #define OPPO_VENDOR_ID 0x22d9 #define OPPO_PRODUCT_R11 0x276c +/* These u-blox products use u-blox's vendor ID */ +#define UBLOX_VENDOR_ID 0x1546 +#define UBLOX_PRODUCT_LARA_L6 0x1341 +#define UBLOX_PRODUCT_LARA_L6_RMNET 0x1342 +#define UBLOX_PRODUCT_LARA_L6_ECM 0x1343 /* Device flags */ @@ -1127,6 +1132,12 @@ static const struct usb_device_id option_ids[] = { .driver_info = RSVD(3) }, { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x908b), /* u-blox LARA-R6 00B */ .driver_info = RSVD(4) }, + /* u-blox products using u-blox vendor ID */ + { USB_DEVICE(UBLOX_VENDOR_ID, UBLOX_PRODUCT_LARA_L6) }, + { USB_DEVICE(UBLOX_VENDOR_ID, UBLOX_PRODUCT_LARA_L6_RMNET), + .driver_info = RSVD(4) }, + { USB_DEVICE(UBLOX_VENDOR_ID, UBLOX_PRODUCT_LARA_L6_ECM), + .driver_info = RSVD(4) }, /* Quectel products using Quectel vendor ID */ { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC21, 0xff, 0xff, 0xff), .driver_info = NUMEP2 },