From patchwork Mon Nov 26 09:33:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Russkikh X-Patchwork-Id: 10697903 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A0B0416B1 for ; Mon, 26 Nov 2018 09:34:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8DA6D28763 for ; Mon, 26 Nov 2018 09:34:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 823D12879B; Mon, 26 Nov 2018 09:34:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 199B128763 for ; Mon, 26 Nov 2018 09:34:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726562AbeKZU1Z (ORCPT ); Mon, 26 Nov 2018 15:27:25 -0500 Received: from mail-eopbgr750049.outbound.protection.outlook.com ([40.107.75.49]:49408 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726266AbeKZU1Y (ORCPT ); Mon, 26 Nov 2018 15:27:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=AQUANTIA1COM.onmicrosoft.com; s=selector1-aquantia-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=iS4KGUZsJ4AvvDCIOMz9ZcdPx2KfYHm7mKlO7BIhq50=; b=S13REZBRTcFkRl9yh7h8MNKs3eD48Drw5gmxCkbqnZuNsXit0NqVfS1hjsqwBlZVJd108VniuZ+d2WmCVUHfYX7LD+tvLt2NvlYl6YX0oQCSI5hjTE7ume2R4NGYvbXZk6GV0dba41n9FdoSdYv61sSEuyuwBtkgUHppv9XtCBQ= Received: from BY1PR0701MB1660.namprd07.prod.outlook.com (10.162.110.22) by BY1PR0701MB1238.namprd07.prod.outlook.com (10.160.105.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1361.19; Mon, 26 Nov 2018 09:33:50 +0000 Received: from BY1PR0701MB1660.namprd07.prod.outlook.com ([fe80::f8ee:2260:e410:fffd]) by BY1PR0701MB1660.namprd07.prod.outlook.com ([fe80::f8ee:2260:e410:fffd%3]) with mapi id 15.20.1361.019; Mon, 26 Nov 2018 09:33:50 +0000 From: Igor Russkikh To: "linux-usb@vger.kernel.org" , "davem@davemloft.net" , "netdev@vger.kernel.org" CC: "andrew@lunn.ch" , Dmitry Bezrukov , Igor Russkikh Subject: [PATCH v4 net-next 21/21] net: usb: aqc111: Extend cdc_ether blacklist Thread-Topic: [PATCH v4 net-next 21/21] net: usb: aqc111: Extend cdc_ether blacklist Thread-Index: AQHUhWsj+Hew7yQfhk+3KEFG9Ej+8w== Date: Mon, 26 Nov 2018 09:33:50 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6PR03CA0024.eurprd03.prod.outlook.com (2603:10a6:20b::37) To BY1PR0701MB1660.namprd07.prod.outlook.com (2a01:111:e400:522a::22) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Igor.Russkikh@aquantia.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [95.79.108.179] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;BY1PR0701MB1238;6:bVAvq6Q4x0nDc/ZqZrQkbf8g9TP36niZHNYqZ87cPikanJJToREHrea2gPxxy0I56O5Qb4mx14xp8phODgtkS8bTBEKGZK3Y6ay3sW+LmC0JSGvDcdMqHa5lgUn8lf8TV4SMlce/X/2r060X3NuKBpYLMzy8n6D5TTW+5HXBuAB0SUHwDTHM6sqZMj5lSmXMsv+HeUGMB4etOYDESmKu/1HKMJz6Pwshe4YtP1yOHqObuiFto0fD4YewXSCBV+XYvCvYn8cIknrxTlUuSG9jfCDaIyb3IkV8QUNZXiG6iXSLhGnOFCtFJARdt9YQS/EQrSI2su2USAH4Ui+zhr3LJbcVNRreJ15THWGwN05trlcoPdMsNrO1Wou8ATvCQq0/8xc9Rhf/WVIM5BgdSxUBTgkW7L8tLrZ9HxhcrIXxSuYH36MPUIGfnFpzdHvrTJFPrBW9ptNSyAnvpMaHkv01qw==;5:iIGMHiPvEGA31TQz2ykpPfh7SyCavnKy/HEHuSTgeZSUBL9QSs6QLmzPhQ1E57X4N2CTbMqx86GNm7aXQdLSt94/NwnvpDlLd+RZ58Q4oxEprdTrwCf+MlBjhtdPFkwC6kqwoqhRXdMi71dxGaMqia8/3oOQTNvYKX/5z/7q2K8=;7:+RZTmCl3VHhMWNLHi9VWgZkfMb+rJYu/WWtlHs3MAc+vIsV8Lovu5D1R/rBp+eyi2g3bMnKzSZiY2YAL2xe4wNGaWw0o4gezn8TAG+Otl3MjbXkcWqd5Q5rEbVybQqs9whjjdmBY1lQ77qcg/zKLvg== x-ms-office365-filtering-correlation-id: 19eee80c-cc6e-431e-a31d-08d653824578 x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390098)(7020095)(4652040)(8989299)(5600074)(711020)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020);SRVR:BY1PR0701MB1238; x-ms-traffictypediagnostic: BY1PR0701MB1238: x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(6040522)(2401047)(5005006)(8121501046)(3002001)(10201501046)(3231443)(944501410)(52105112)(93006095)(93001095)(148016)(149066)(150057)(6041310)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123562045)(201708071742011)(7699051)(76991095);SRVR:BY1PR0701MB1238;BCL:0;PCL:0;RULEID:;SRVR:BY1PR0701MB1238; x-forefront-prvs: 086831DFB4 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(136003)(396003)(346002)(39840400004)(366004)(376002)(199004)(189003)(446003)(44832011)(71200400001)(71190400001)(476003)(11346002)(2616005)(486006)(305945005)(7736002)(3846002)(6116002)(5660300001)(2906002)(2501003)(97736004)(316002)(54906003)(36756003)(110136005)(68736007)(8936002)(81166006)(81156014)(118296001)(106356001)(8676002)(105586002)(6506007)(386003)(52116002)(102836004)(76176011)(186003)(26005)(72206003)(14454004)(25786009)(45080400002)(478600001)(256004)(66066001)(4326008)(107886003)(86362001)(575784001)(2201001)(6486002)(53936002)(6436002)(6512007)(99286004);DIR:OUT;SFP:1101;SCL:1;SRVR:BY1PR0701MB1238;H:BY1PR0701MB1660.namprd07.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: aquantia.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: oHjbKX+j0aXBKhfrfQykl2HQC/rJWqTVxbxZQHncQ2GRxVK9GZtfR7vYsg4w+g6+CH6v6kQ2/3WwDqcUTvrB6EmyB4gZ+jSXaQOar1atZlik/N5Y12cjFkMxkUPyhtSMLBuESE4d1UpzAKVi4hhvOot3dkZRp7GwuyuXT9ahs6C0bW+nApzwvVkAFxVMrEFvBhMlXyd3IA44F5OOtic7zQPz8egUIURbAh7DKh9LM4b1zDTgtOIMwrYPqBKMpWVg89fQwT6EvMlGCdOzGiMu06aWvnkyR/Pk/oNumt1g3o78r3+HbkwlelcGrr4TJHtgLVaXD/82hiNJlu+MyDfzttkZzc22NUlQ50tlIXNJHsM= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 19eee80c-cc6e-431e-a31d-08d653824578 X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Nov 2018 09:33:50.0423 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 83e2e134-991c-4ede-8ced-34d47e38e6b1 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR0701MB1238 Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Dmitry Bezrukov Added Aquantia and ASIX device IDs to prevent loading cdc_ether for these devices. Our firmware reports CDC configuration simultaneously with vendor specific. Signed-off-by: Dmitry Bezrukov Signed-off-by: Igor Russkikh --- drivers/net/usb/cdc_ether.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c index 5c42cf81a08b..b3b3c05903a1 100644 --- a/drivers/net/usb/cdc_ether.c +++ b/drivers/net/usb/cdc_ether.c @@ -562,6 +562,8 @@ static const struct driver_info wwan_info = { #define MICROSOFT_VENDOR_ID 0x045e #define UBLOX_VENDOR_ID 0x1546 #define TPLINK_VENDOR_ID 0x2357 +#define AQUANTIA_VENDOR_ID 0x2eca +#define ASIX_VENDOR_ID 0x0b95 static const struct usb_device_id products[] = { /* BLACKLIST !! @@ -821,6 +823,30 @@ static const struct usb_device_id products[] = { .driver_info = 0, }, +/* Aquantia AQtion USB to 5GbE Controller (based on AQC111U) */ +{ + USB_DEVICE_AND_INTERFACE_INFO(AQUANTIA_VENDOR_ID, 0xc101, + USB_CLASS_COMM, USB_CDC_SUBCLASS_ETHERNET, + USB_CDC_PROTO_NONE), + .driver_info = 0, +}, + +/* ASIX USB 3.1 Gen1 to 5G Multi-Gigabit Ethernet Adapter(based on AQC111U) */ +{ + USB_DEVICE_AND_INTERFACE_INFO(ASIX_VENDOR_ID, 0x2790, USB_CLASS_COMM, + USB_CDC_SUBCLASS_ETHERNET, + USB_CDC_PROTO_NONE), + .driver_info = 0, +}, + +/* ASIX USB 3.1 Gen1 to 2.5G Multi-Gigabit Ethernet Adapter(based on AQC112U) */ +{ + USB_DEVICE_AND_INTERFACE_INFO(ASIX_VENDOR_ID, 0x2791, USB_CLASS_COMM, + USB_CDC_SUBCLASS_ETHERNET, + USB_CDC_PROTO_NONE), + .driver_info = 0, +}, + /* WHITELIST!!! * * CDC Ether uses two interfaces, not necessarily consecutive.