From patchwork Tue Nov 13 14:45:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Russkikh X-Patchwork-Id: 10680887 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 8A1261759 for ; Tue, 13 Nov 2018 14:45:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 789942842B for ; Tue, 13 Nov 2018 14:45:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6D48F29208; Tue, 13 Nov 2018 14:45:40 +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 13A9E2842B for ; Tue, 13 Nov 2018 14:45:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387982AbeKNAoG (ORCPT ); Tue, 13 Nov 2018 19:44:06 -0500 Received: from mail-eopbgr710051.outbound.protection.outlook.com ([40.107.71.51]:49377 "EHLO NAM05-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2387650AbeKNAoF (ORCPT ); Tue, 13 Nov 2018 19:44:05 -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=BfJKiL8+z9XG0ZAw2ElsaRQWc5rninfAoH+0KKaP3z4=; b=iRznp9HUUgJeqWVg7SCrevr02DiV9zlHgyrjyVbO023Bnuekok2H+KjiBfFTwFvUWOVE1VI+550bLTIBQr3yv9ndfqG+shDc1wMWgfJgOmrdT1hXoCGkAAMVMzAvFFPIPM1y61CVbTuz/HRsRnkmEpRrTAAtOQPxpiVqKhuN2vc= Received: from BY1PR0701MB1660.namprd07.prod.outlook.com (10.162.110.22) by BY1PR0701MB1349.namprd07.prod.outlook.com (10.160.109.141) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1294.25; Tue, 13 Nov 2018 14:45:21 +0000 Received: from BY1PR0701MB1660.namprd07.prod.outlook.com ([fe80::c031:16d9:9580:3d11]) by BY1PR0701MB1660.namprd07.prod.outlook.com ([fe80::c031:16d9:9580:3d11%6]) with mapi id 15.20.1294.045; Tue, 13 Nov 2018 14:45:21 +0000 From: Igor Russkikh To: "David S . Miller" CC: "linux-usb@vger.kernel.org" , "netdev@vger.kernel.org" , Dmitry Bezrukov , Igor Russkikh Subject: [PATCH v2 net-next 21/21] net: usb: aqc111: Extend cdc_ether blacklist Thread-Topic: [PATCH v2 net-next 21/21] net: usb: aqc111: Extend cdc_ether blacklist Thread-Index: AQHUe1+A+7nkZlXDOU6Z0Adna64iAQ== Date: Tue, 13 Nov 2018 14:45:21 +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: AM5P189CA0013.EURP189.PROD.OUTLOOK.COM (2603:10a6:206:15::26) 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;BY1PR0701MB1349;6:uhGsI+CvTgqReuloBttO2cqjNwwdyFpKt1gTgKkgmt8ITnB68dBeUP+InnVOKbLP6GOChljReSAzAHHgOSJMyCMGNGAtktL1Hi378j1QCGWspRxmHfN9PsIFRb+IQ/DR0ApLkGIICTEsvBrEgPgqKwTKFF0IPvkavQQWqnbhDmfJy9vywuRTf/GaRKnB1CEubU6j7MZiyoJ/atpvly2Mm3DX5wo42beyWdqVdRM8Z1nStj4xglsQmHcdcux/Hhs3li6spVxi9l08wzAgBByf3W3GlT8obAfkJ6tawkt2znGQiyLsQjA4t9kS8ghKZWOFi8wIVuCCVPv9vRiKCouSzyyPh0ZXAZw3cBZoLucCanrUcDGjBBME8Hp08zRgJxi+/CbKDAfU7Qj7cXoWmT6rNJdb7dKdKoxM84zrDHQvh2V+PA8qNdZeEDd0hy3CNjO8z3jvgVd7NzoG0S4F+7e4mw==;5:X4vvUlj3UHC7Lbz0ey2JTKgvN67ZaEDCHd4hjXSFsIcIynu+WfRe5KbZR992t6b6C4WSMEtYjhrx3qIsCPR2mXb8x5+Uf4Xz8Qe/hG3pyXweT++nPGOcGBiP9RVB52FQAgQn5IaZjUENLIZx7enXp26QAkzZFGq+6INF56x850k=;7:QHkjYOI/tKfIBbAz5YS4zUJagzUK7LttsdHsIUphF9csgc7ogN+/TTFfInZtKv1RIBnyN7c2WADmNoK3eUNtjBELMKEbWhm4bDCOziuc1sAepawhU5NksdIc5fIAWW6y55KBzWPvgYJeWIGdfQqP9Q== x-ms-office365-filtering-correlation-id: 5cba34d9-5465-4dfb-0cb8-08d64976a2e9 x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390060)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(2017052603328)(7153060)(7193020);SRVR:BY1PR0701MB1349; x-ms-traffictypediagnostic: BY1PR0701MB1349: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(20558992708506); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(6040522)(2401047)(5005006)(8121501046)(10201501046)(3002001)(3231382)(944501410)(52105112)(93006095)(93001095)(148016)(149066)(150057)(6041310)(20161123562045)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(201708071742011)(7699051)(76991095);SRVR:BY1PR0701MB1349;BCL:0;PCL:0;RULEID:;SRVR:BY1PR0701MB1349; x-forefront-prvs: 085551F5A8 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(39850400004)(376002)(346002)(396003)(366004)(136003)(199004)(189003)(5660300001)(478600001)(54906003)(71200400001)(14454004)(71190400001)(45080400002)(6436002)(105586002)(76176011)(52116002)(36756003)(4326008)(68736007)(99286004)(97736004)(81166006)(81156014)(8676002)(2906002)(86362001)(7736002)(316002)(575784001)(72206003)(305945005)(107886003)(2616005)(66066001)(6512007)(8936002)(2900100001)(256004)(25786009)(6916009)(106356001)(11346002)(44832011)(3846002)(6116002)(6486002)(53936002)(486006)(186003)(118296001)(6506007)(386003)(446003)(476003)(102836004)(26005);DIR:OUT;SFP:1101;SCL:1;SRVR:BY1PR0701MB1349;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: HDS2AiRWZVKYsqUYOikwY9Vp+V5a4xY9TDlpym8tgN0MmK/25ZvMyoNquyobbOxGU3N1XLMZoWxPD2W4ZRw+ashRV03+w/GRuUqHWUX+aLTA8NOOmKvk/A1T8hMWWDJYdXBLvwAfrbQJR0Gm/Rbg4O7C4WPkzYB8G7ZgdgJmaP15XJY9veO7LWmHMvsSeODfTj+8OSdoHhWTY2gWJn8OAVKwaC+A2gJaE0x1DQTjMt10JHKKnvbvIZ1Tcrh3N1gh0Ok1RKRpZlGAnMNfpaBHEWmSIE+AyRWzrPrAqam5UBc4huxjWGBaClit3X0l/ptJTblPbpuX35aoBkPyls4qwrKV2BOhSlhtojiEvDb6lAA= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5cba34d9-5465-4dfb-0cb8-08d64976a2e9 X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Nov 2018 14:45:21.0857 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 83e2e134-991c-4ede-8ced-34d47e38e6b1 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR0701MB1349 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 | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c index 5c42cf81a08b..22527baa8467 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,27 @@ 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.