From patchwork Wed Nov 21 10:14:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Russkikh X-Patchwork-Id: 10692265 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 170B91751 for ; Wed, 21 Nov 2018 10:14:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 055D72B8C6 for ; Wed, 21 Nov 2018 10:14:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ED6672B8CA; Wed, 21 Nov 2018 10:14:13 +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 420712B8C6 for ; Wed, 21 Nov 2018 10:14:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729619AbeKUUr7 (ORCPT ); Wed, 21 Nov 2018 15:47:59 -0500 Received: from mail-eopbgr740078.outbound.protection.outlook.com ([40.107.74.78]:56935 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728367AbeKUUr7 (ORCPT ); Wed, 21 Nov 2018 15:47:59 -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=bjtpnBhTr5LPshEPg4+k7lb9kxXoP26p1zqePqTPgyLef5BBuF5mRNsGVCPb8GG4fiQ9WDomkYGGegox72wZWOnBYgo6l00zK8lyLUqdAThrLCe5X+R0YbFXiamYwzXeFM655uRihqvcFxYYosnfmFwEoxOOf9FkgM76NYSyEoc= Received: from BY1PR0701MB1660.namprd07.prod.outlook.com (10.162.110.22) by BY1PR0701MB1287.namprd07.prod.outlook.com (10.160.108.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1339.26; Wed, 21 Nov 2018 10:14:07 +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.015; Wed, 21 Nov 2018 10:14:07 +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 v3 net-next 21/21] net: usb: aqc111: Extend cdc_ether blacklist Thread-Topic: [PATCH v3 net-next 21/21] net: usb: aqc111: Extend cdc_ether blacklist Thread-Index: AQHUgYLv1U/Ovse3uk+YwYlUASeT1g== Date: Wed, 21 Nov 2018 10:14:07 +0000 Message-ID: <159d33cfeda02a2593f642f972ec8621a58d4aa6.1542794577.git.igor.russkikh@aquantia.com> References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6PR0402CA0007.eurprd04.prod.outlook.com (2603:10a6:209::20) 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;BY1PR0701MB1287;6:CrneyAPdtgz6w1i2V5TLN2O5Z1PxYQraHii2F3BXCJXSzzC5bIEAXiJoocDK2cKBxLxg0GDb0hv0NmFySGtqiG8xevegYlD0zh382ojtUldbqv5PQlMFQENkdzPR3z50pEmGH7UHmQOFFAkoGpHtpYZzNiEzC0GmKOi+dKG2duRrY5lHeWXJej4A90+5zWeO37FoRMnhIJ2nmqRxeuolOPXkciMzDnrtpMeBrtjgb5bq64+2slK8ap1ZofbV5rvM3J1Cm9F74eX/sq6yP/6nQ6j9vr9QdT65Ep2P2qFaZZl57kKhI7Utor97/kOAE2ht4uQBzPCcHYv6U1kynHeO5xZ0wSP3DCQWQLGIrs6uHPZGuZblV3Eh6ykYlcEzzPkxyCK4HfG5qxJ5PjusG2L8P8G9lK52ZFh9CKDXmODKoYho7nH5S1jubS8tP9400d9pkOiroUVNFs3n5cSX4yCpew==;5:qew2LakhodpVdGGXQ7O1WJQChBjwM3kb5cPUR/rosrP0CfTvXWjs6DTaLHT27hyjt4bh7eqptP7dTyFVnE5vqRR/P4OvIZjTyTDPhdb9pS6Ij1SObKcJM0ROZGvWamzbR3GCWBdnbhwZI+LudOvhUzXJ/cz1Zk6vvR0AYOEoRnA=;7:dBqdp9I9X+QRMXWSpEA8SaHaEHlKdHA4ofClH/Gha7nCFeD/Ezm7axqPXrDgndAhoSIQa2IUnu8/+AbQiK+vBxlPLlzHUT1BUQeHHDLj9wiZ46eXuW4kGXiRjVS8kUtcCDQ4sDnpbRevTzpCCBbe6g== x-ms-office365-filtering-correlation-id: 29025e50-ace0-4523-779a-08d64f9a123d x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390098)(7020095)(4652040)(8989299)(5600074)(711020)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020);SRVR:BY1PR0701MB1287; x-ms-traffictypediagnostic: BY1PR0701MB1287: x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(6040522)(2401047)(8121501046)(5005006)(3002001)(10201501046)(93006095)(93001095)(3231442)(944501410)(52105112)(148016)(149066)(150057)(6041310)(20161123560045)(20161123562045)(20161123558120)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699051)(76991095);SRVR:BY1PR0701MB1287;BCL:0;PCL:0;RULEID:;SRVR:BY1PR0701MB1287; x-forefront-prvs: 08635C03D4 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(39850400004)(396003)(346002)(136003)(366004)(376002)(189003)(199004)(106356001)(25786009)(66066001)(5660300001)(2906002)(7736002)(305945005)(97736004)(6512007)(2900100001)(2501003)(110136005)(2201001)(478600001)(36756003)(68736007)(54906003)(316002)(6436002)(45080400002)(14454004)(575784001)(105586002)(72206003)(81156014)(386003)(6506007)(102836004)(4326008)(76176011)(81166006)(71200400001)(186003)(26005)(8676002)(8936002)(71190400001)(107886003)(99286004)(256004)(118296001)(52116002)(86362001)(44832011)(53936002)(6486002)(3846002)(6116002)(476003)(11346002)(486006)(2616005)(446003);DIR:OUT;SFP:1101;SCL:1;SRVR:BY1PR0701MB1287;H:BY1PR0701MB1660.namprd07.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: aquantia.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: zC4VkWvNRjiSPcplRogzOnU1F8Fe0jUFkHrscJW8z0W0HVp2JycEAe7Nw5ywbhe6bTSvVS205gh8FdnhuV9vkj4gTPDLjENn6KTcCbLWlaad1ooc+QdOaEsJrbJMVqwRcTdBMbDsG1v6/hIf3JkU/RIbHmFI/Txgctk1esY5EwuxrofeOU5R37uk7tNqXMOOQXNbLsCl7oQTMVcUWbPEu782Sb3CHAz3PkzM6vwU/jkJQVOw8Il98mAmFL3IbzKatGUa7ej8WtG+qB5ZeD+oHIlA2McPZoLgrCwwhhkm+gSdHVHQjgqBohpj23jvF6pjHJOCnR8g8tnT7bf05oMj1ypQXBL39kzLtCjgcbPEOjI= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 29025e50-ace0-4523-779a-08d64f9a123d X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Nov 2018 10:14:07.2986 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 83e2e134-991c-4ede-8ced-34d47e38e6b1 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR0701MB1287 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.