From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [1/2] usb: gadget: f_ncm: Fix NTP-32 support From: Romain Izard Message-Id: <20190416140732.21941-1-romain.izard.pro@gmail.com> Date: Tue, 16 Apr 2019 16:07:31 +0200 To: Felipe Balbi , Greg Kroah-Hartman , Andrzej Pietrasiewicz Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Romain Izard List-ID: V2hlbiBjb25uZWN0aW5nIGEgQ0RDLU5DTSBnYWRnZXQgdG8gYW4gaG9zdCB0aGF0IHVzZXMgdGhl IE5UUC0zMiBtb2RlLApvciB0aGF0IHJlbGllcyBvbiB0aGUgZGVmYXVsdCBDUkMgc2V0dGluZywg dGhlIGN1cnJlbnQgaW1wbGVtZW50YXRpb24gZ2V0cwpjb25mdXNlZCwgYW5kIGRvZXMgbm90IGV4 cGVjdCB0aGUgY29ycmVjdCBzaWduYXR1cmUgZm9yIGl0cyBwYWNrZXRzLgoKRml4IHRoaXMsIGJ5 IGVuc3VyaW5nIHRoYXQgdGhlIG5kcF9zaWduIG1lbWJlciBpbiB0aGUgZl9uY20gc3RydWN0dXJl CmFsd2F5cyBjb250YWluIGEgdmFsaWQgdmFsdWUuCgpTaWduZWQtb2ZmLWJ5OiBSb21haW4gSXph cmQgPHJvbWFpbi5pemFyZC5wcm9AZ21haWwuY29tPgotLS0KIGRyaXZlcnMvdXNiL2dhZGdldC9m dW5jdGlvbi9mX25jbS5jIHwgMTAgKysrLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDMgaW5zZXJ0 aW9ucygrKSwgNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL3VzYi9nYWRnZXQv ZnVuY3Rpb24vZl9uY20uYyBiL2RyaXZlcnMvdXNiL2dhZGdldC9mdW5jdGlvbi9mX25jbS5jCmlu ZGV4IDU3ODBmYmE2MjBhYi4uZDVjNDdlN2E3ZjYxIDEwMDY0NAotLS0gYS9kcml2ZXJzL3VzYi9n YWRnZXQvZnVuY3Rpb24vZl9uY20uYworKysgYi9kcml2ZXJzL3VzYi9nYWRnZXQvZnVuY3Rpb24v Zl9uY20uYwpAQCAtMzUsOSArMzUsNyBAQAogCiAvKiB0byB0cmlnZ2VyIGNyYy9ub24tY3JjIG5k cCBzaWduYXR1cmUgKi8KIAotI2RlZmluZSBOQ01fTkRQX0hEUl9DUkNfTUFTSwkweDAxMDAwMDAw CiAjZGVmaW5lIE5DTV9ORFBfSERSX0NSQwkJMHgwMTAwMDAwMAotI2RlZmluZSBOQ01fTkRQX0hE Ul9OT0NSQwkweDAwMDAwMDAwCiAKIGVudW0gbmNtX25vdGlmeV9zdGF0ZSB7CiAJTkNNX05PVElG WV9OT05FLAkJLyogZG9uJ3Qgbm90aWZ5ICovCkBAIC01MjYsNiArNTI0LDcgQEAgc3RhdGljIGlu bGluZSB2b2lkIG5jbV9yZXNldF92YWx1ZXMoc3RydWN0IGZfbmNtICpuY20pCiB7CiAJbmNtLT5w YXJzZXJfb3B0cyA9ICZuZHAxNl9vcHRzOwogCW5jbS0+aXNfY3JjID0gZmFsc2U7CisJbmNtLT5u ZHBfc2lnbiA9IG5jbS0+cGFyc2VyX29wdHMtPm5kcF9zaWduOwogCW5jbS0+cG9ydC5jZGNfZmls dGVyID0gREVGQVVMVF9GSUxURVI7CiAKIAkvKiBkb2Vzbid0IG1ha2Ugc2Vuc2UgZm9yIG5jbSwg Zml4ZWQgc2l6ZSB1c2VkICovCkBAIC04MDUsMjUgKzgwNCwyMCBAQCBzdGF0aWMgaW50IG5jbV9z ZXR1cChzdHJ1Y3QgdXNiX2Z1bmN0aW9uICpmLCBjb25zdCBzdHJ1Y3QgdXNiX2N0cmxyZXF1ZXN0 ICpjdHJsKQogCWNhc2UgKChVU0JfRElSX09VVCB8IFVTQl9UWVBFX0NMQVNTIHwgVVNCX1JFQ0lQ X0lOVEVSRkFDRSkgPDwgOCkKIAkJfCBVU0JfQ0RDX1NFVF9DUkNfTU9ERToKIAl7Ci0JCWludCBu ZHBfaGRyX2NyYyA9IDA7Ci0KIAkJaWYgKHdfbGVuZ3RoICE9IDAgfHwgd19pbmRleCAhPSBuY20t PmN0cmxfaWQpCiAJCQlnb3RvIGludmFsaWQ7CiAJCXN3aXRjaCAod192YWx1ZSkgewogCQljYXNl IDB4MDAwMDoKIAkJCW5jbS0+aXNfY3JjID0gZmFsc2U7Ci0JCQluZHBfaGRyX2NyYyA9IE5DTV9O RFBfSERSX05PQ1JDOwogCQkJREJHKGNkZXYsICJub24tQ1JDIG1vZGUgc2VsZWN0ZWRcbiIpOwog CQkJYnJlYWs7CiAJCWNhc2UgMHgwMDAxOgogCQkJbmNtLT5pc19jcmMgPSB0cnVlOwotCQkJbmRw X2hkcl9jcmMgPSBOQ01fTkRQX0hEUl9DUkM7CiAJCQlEQkcoY2RldiwgIkNSQyBtb2RlIHNlbGVj dGVkXG4iKTsKIAkJCWJyZWFrOwogCQlkZWZhdWx0OgogCQkJZ290byBpbnZhbGlkOwogCQl9Ci0J CW5jbS0+bmRwX3NpZ24gPSBuY20tPnBhcnNlcl9vcHRzLT5uZHBfc2lnbiB8IG5kcF9oZHJfY3Jj OwogCQl2YWx1ZSA9IDA7CiAJCWJyZWFrOwogCX0KQEAgLTg0MCw2ICs4MzQsOCBAQCBzdGF0aWMg aW50IG5jbV9zZXR1cChzdHJ1Y3QgdXNiX2Z1bmN0aW9uICpmLCBjb25zdCBzdHJ1Y3QgdXNiX2N0 cmxyZXF1ZXN0ICpjdHJsKQogCQkJY3RybC0+YlJlcXVlc3RUeXBlLCBjdHJsLT5iUmVxdWVzdCwK IAkJCXdfdmFsdWUsIHdfaW5kZXgsIHdfbGVuZ3RoKTsKIAl9CisJbmNtLT5uZHBfc2lnbiA9IG5j bS0+cGFyc2VyX29wdHMtPm5kcF9zaWduIHwKKwkJKG5jbS0+aXNfY3JjID8gTkNNX05EUF9IRFJf Q1JDIDogMCk7CiAKIAkvKiByZXNwb25kIHdpdGggZGF0YSB0cmFuc2ZlciBvciBzdGF0dXMgcGhh c2U/ICovCiAJaWYgKHZhbHVlID49IDApIHsK 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=-8.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 8B0EAC10F13 for ; Tue, 16 Apr 2019 14:07:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5B5DD223C0 for ; Tue, 16 Apr 2019 14:07:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Ikd0o67Z" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727326AbfDPOHr (ORCPT ); Tue, 16 Apr 2019 10:07:47 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:44402 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726713AbfDPOHr (ORCPT ); Tue, 16 Apr 2019 10:07:47 -0400 Received: by mail-wr1-f65.google.com with SMTP id y7so27232809wrn.11; Tue, 16 Apr 2019 07:07:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=2+D4bewqFy4nGLicEOZn/Id12fvAtNwEFAcyOEIgm4I=; b=Ikd0o67ZrKxOaHpUssQg/OnYxGqylkllsNPGtrxJcnLkit4UW56jW+4/EbOSUKwKQH dS8NsY3nLTC+oAModX+id5nPXiuxtVNWmbXFA4o4LhP1xsTND+/EdAoYuRReX8DsKQ+7 HJGChT42xfQwZFBgdkUHYD3zgcKVylkTp0ubKpp8BHl6ZJs9SRe0oN1/05XmgDOarRnF def1zr018F8pYwKaEdlUJR7V403ZLpsDclfIjpv0141MLBdOlJxo/rUp+xehxozjm3Pq XQU84t3teNr/8xeu3GRtJ74afsG4VNDqSsmD2BD2Cppa2kWI5r++czp1eO2l90yT6v/x PiZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=2+D4bewqFy4nGLicEOZn/Id12fvAtNwEFAcyOEIgm4I=; b=VPNVvMKaeSE2kXHUxlGxamAch5DJWwey91eVzoHku88QWovXPt6HfHxlRkyytZWZ3Q Og0th2aUYDh5Tv8GLGIQnJ4dIwrpU/TSVk31KaO8PAZZSqLlOmOByuFys5G7+fMqDQug cYZ1O26rNY5i6DZKr98mG49KsdXm0hrC/UH+93m0ZPlXsUcOj00Ha8RQ8y8Vyr2skGal K0quxLaO2pFgMVH3j91p/1L4Z0u9ttCvWpHXDOZAwMFH5hX+4qsbhYLex+D5Z14tuUEi ZSXMpYTCsdHZefLaPmIthPkJAZL6jkQOitW01ZcOP7Wdl/wxpQ9igWiR7OeIqYnJza0V 9fMA== X-Gm-Message-State: APjAAAXm0a/76DPjgnEi94Di3lwl1n7Qh3UmNwZ0xc0al4dCnkxjENTW Q8vACSJzRNYcE/QfRNd3OcQ= X-Google-Smtp-Source: APXvYqwu2QX5QEz/JV3kPKI8dNHgOVqeHbvceTAs9Qx1OK5IqI+3fzyTpfshEBPokoK0R7pQAJHS1Q== X-Received: by 2002:a5d:424b:: with SMTP id s11mr43565750wrr.158.1555423666052; Tue, 16 Apr 2019 07:07:46 -0700 (PDT) Received: from 5WDYG62.mdi (static-css-cqn-143221.business.bouyguestelecom.com. [176.149.143.221]) by smtp.gmail.com with ESMTPSA id v192sm24008494wme.24.2019.04.16.07.07.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Apr 2019 07:07:45 -0700 (PDT) From: Romain Izard To: Felipe Balbi , Greg Kroah-Hartman , Andrzej Pietrasiewicz Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Romain Izard Subject: [PATCH 1/2] usb: gadget: f_ncm: Fix NTP-32 support Date: Tue, 16 Apr 2019 16:07:31 +0200 Message-Id: <20190416140732.21941-1-romain.izard.pro@gmail.com> X-Mailer: git-send-email 2.17.1 Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Message-ID: <20190416140731.OrpuoZXIUfnLzvgqYbOH9eMcht6IX3hLtTpMBss4AEc@z> When connecting a CDC-NCM gadget to an host that uses the NTP-32 mode, or that relies on the default CRC setting, the current implementation gets confused, and does not expect the correct signature for its packets. Fix this, by ensuring that the ndp_sign member in the f_ncm structure always contain a valid value. Signed-off-by: Romain Izard --- drivers/usb/gadget/function/f_ncm.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/usb/gadget/function/f_ncm.c b/drivers/usb/gadget/function/f_ncm.c index 5780fba620ab..d5c47e7a7f61 100644 --- a/drivers/usb/gadget/function/f_ncm.c +++ b/drivers/usb/gadget/function/f_ncm.c @@ -35,9 +35,7 @@ /* to trigger crc/non-crc ndp signature */ -#define NCM_NDP_HDR_CRC_MASK 0x01000000 #define NCM_NDP_HDR_CRC 0x01000000 -#define NCM_NDP_HDR_NOCRC 0x00000000 enum ncm_notify_state { NCM_NOTIFY_NONE, /* don't notify */ @@ -526,6 +524,7 @@ static inline void ncm_reset_values(struct f_ncm *ncm) { ncm->parser_opts = &ndp16_opts; ncm->is_crc = false; + ncm->ndp_sign = ncm->parser_opts->ndp_sign; ncm->port.cdc_filter = DEFAULT_FILTER; /* doesn't make sense for ncm, fixed size used */ @@ -805,25 +804,20 @@ static int ncm_setup(struct usb_function *f, const struct usb_ctrlrequest *ctrl) case ((USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE) << 8) | USB_CDC_SET_CRC_MODE: { - int ndp_hdr_crc = 0; - if (w_length != 0 || w_index != ncm->ctrl_id) goto invalid; switch (w_value) { case 0x0000: ncm->is_crc = false; - ndp_hdr_crc = NCM_NDP_HDR_NOCRC; DBG(cdev, "non-CRC mode selected\n"); break; case 0x0001: ncm->is_crc = true; - ndp_hdr_crc = NCM_NDP_HDR_CRC; DBG(cdev, "CRC mode selected\n"); break; default: goto invalid; } - ncm->ndp_sign = ncm->parser_opts->ndp_sign | ndp_hdr_crc; value = 0; break; } @@ -840,6 +834,8 @@ static int ncm_setup(struct usb_function *f, const struct usb_ctrlrequest *ctrl) ctrl->bRequestType, ctrl->bRequest, w_value, w_index, w_length); } + ncm->ndp_sign = ncm->parser_opts->ndp_sign | + (ncm->is_crc ? NCM_NDP_HDR_CRC : 0); /* respond with data transfer or status phase? */ if (value >= 0) { -- 2.17.1