From patchwork Fri Apr 30 10:16:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Loic Poulain X-Patchwork-Id: 429761 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp285470jao; Fri, 30 Apr 2021 03:07:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyCESKMFz2mjpUycEKD38L4p/U3ALaL/0U6n9Ylur1a/5S7Rn+kVdk/t9e5RFweQz+OljQL X-Received: by 2002:a63:5322:: with SMTP id h34mr4045257pgb.182.1619777235281; Fri, 30 Apr 2021 03:07:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619777235; cv=none; d=google.com; s=arc-20160816; b=aExPbhSB7LU6N8AwuDy4P6aFxuTTrgmWCNItx6aeIC9eoJTqup3GejK78oWli7bZTS SOLMTIJZLp8WYzwbT8yJp03oGI1bZLlytXsxZg4j6rpIrk5pGneGckm4i+67sP9zZpv5 m3/mATRktjycitKXSWug/CvIR9Zca9fPmR/c7adS+WTnVo6XbUwju2ZOagzflygQLVZV ee0rC1fadHGIyCFRtEQS95SBgW2td5iBYgd04hr3U9ZP3XmSIahtupnrb+UYlLTDbjzQ xy56ao6jNA0GRBXKpliNwfHMgnYqClVquL/fJ0JGSIk18Efk2h7Wk2sOGb1sb5Fg5sMf rsPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from :dkim-signature; bh=wAAGefM9sm57xiN8JQJSPXwevk+dd6E4rB1SsM48CbU=; b=ervJ+ux+Yh1BqefDPjStDVGj5u8nm3qWLrM6y69Qg/cX4H5O/9pXdwdhUMuMLN06WG h8M8KlvVp4W7dGsDgozGR2MEQKS3HUV+UG7Olb/7YfnnWNvOCHtUdSv12pgX6zPPyPWV I760FteJjqCvu6fldqWnXm/W6qgOTPT445NYgzpjNB9ro6fl+93RHUlYOMscGlMA+82W vM4EBABP6yUzGMnx2gkZNDndi7YrzKERwzp0s5C2E80hhYA33f+PEYa2FCHG7FCrOGVu 9frxmXF3zp7S0jHcgzr3AUPXjSpdJeNDkAeppqdsn7uoZ43XubYJE4oE0oxZUssxc/7V JxgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Llp3Dr74; spf=pass (google.com: domain of linux-usb-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-usb-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g139si1809968pfb.98.2021.04.30.03.07.15; Fri, 30 Apr 2021 03:07:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-usb-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Llp3Dr74; spf=pass (google.com: domain of linux-usb-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-usb-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229927AbhD3KIB (ORCPT + 4 others); Fri, 30 Apr 2021 06:08:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45294 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229559AbhD3KIB (ORCPT ); Fri, 30 Apr 2021 06:08:01 -0400 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B4EAC06138B for ; Fri, 30 Apr 2021 03:07:13 -0700 (PDT) Received: by mail-wm1-x331.google.com with SMTP id y124-20020a1c32820000b029010c93864955so1386485wmy.5 for ; Fri, 30 Apr 2021 03:07:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=wAAGefM9sm57xiN8JQJSPXwevk+dd6E4rB1SsM48CbU=; b=Llp3Dr743bzV60MTDHCrO3FxpemA4WuzUbDP+bvDBtekrEk5qOnHD2iBnyVRdA1V33 ENaPaiDhf63nPz3+zSXhwxXQeJd+tlN1CJ9gg98ucDHuWWoDqc7LhP6+TBg20U2b3pNG 25dLavMX1/FeWqvCqol6GS8HH5rqv4qv6H2R3Fjnhg9xo0IIA23pohHF8TyAm97FwED3 Gu9/m828PIRwe3jfASUwXayMoTIQ9nNgP813lOFK/Xoo4HSXdIqBzHje4OUvQjo/Ux3t rmQJO42RloFFA/bHJJTlYeT0BDeskx0pC4ksgRF5oR2MHn/m4q+ydpGK8gDnhZhr/J+i NBbA== 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=wAAGefM9sm57xiN8JQJSPXwevk+dd6E4rB1SsM48CbU=; b=cCia0WkgKoQNh9HgYaIMcoJgLaEtgoHWmj6JdYsgXz7Rhwyaitun+TYZDarqHBhNL9 XMPJRBltkYJZBGMXiV9goTvX/QcAx9lNeemfmZYgrcaDLeAGAWMKVkkYe2FCYouGq+bw ZrxqNsQGA4/ehX6OjpXHtW5BSI8aPh9Fxy8aCOMKkeOg9WyBiYMFWSHVz8lGGDSfNSgy 5ded+19lZpti0TZ287xlAxAzZ3ss2LNPsStKFt+5NQH+PrNEOqekokJPx2Q03qIrXXg7 Efef9A657KknNfPXaXpXyr4m5E7oPPM25ubtb+vwUwyUUsXsJPthx/dVHezi91Ou1gWj tpxw== X-Gm-Message-State: AOAM530P0UfRKnbDH/tSkJTt00GPux3MGBO88VncD83MOl6pr71b3ZfR tPwwSFKMApqC8o1X32Ryb1RcvA== X-Received: by 2002:a1c:540b:: with SMTP id i11mr15822473wmb.40.1619777231980; Fri, 30 Apr 2021 03:07:11 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:82c:5f0:f8f5:7ac7:d0f:4a85]) by smtp.gmail.com with ESMTPSA id a15sm2192069wrx.9.2021.04.30.03.07.11 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Apr 2021 03:07:11 -0700 (PDT) From: Loic Poulain To: oliver@neukum.org Cc: netdev@vger.kernel.org, linux-usb@vger.kernel.org, kuba@kernel.org, bjorn@mork.no, Loic Poulain Subject: [RFC net-next 1/2] usb: class: cdc-wdm: add control type Date: Fri, 30 Apr 2021 12:16:22 +0200 Message-Id: <1619777783-24116-1-git-send-email-loic.poulain@linaro.org> X-Mailer: git-send-email 2.7.4 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Add type parameter to usb_cdc_wdm_register function in order to specify which control protocol the cdc-wdm channel is transporting. It will be required for exposing the channel(s) through WWAN framework. Signed-off-by: Loic Poulain --- drivers/net/usb/cdc_mbim.c | 1 + drivers/net/usb/huawei_cdc_ncm.c | 1 + drivers/net/usb/qmi_wwan.c | 3 ++- drivers/usb/class/cdc-wdm.c | 13 +++++++++---- include/linux/usb/cdc-wdm.h | 16 +++++++++++++++- 5 files changed, 28 insertions(+), 6 deletions(-) -- 2.7.4 diff --git a/drivers/net/usb/cdc_mbim.c b/drivers/net/usb/cdc_mbim.c index 5db6627..63b134b 100644 --- a/drivers/net/usb/cdc_mbim.c +++ b/drivers/net/usb/cdc_mbim.c @@ -168,6 +168,7 @@ static int cdc_mbim_bind(struct usbnet *dev, struct usb_interface *intf) subdriver = usb_cdc_wdm_register(ctx->control, &dev->status->desc, le16_to_cpu(ctx->mbim_desc->wMaxControlMessage), + USB_CDC_WDM_MBIM, cdc_mbim_wdm_manage_power); if (IS_ERR(subdriver)) { ret = PTR_ERR(subdriver); diff --git a/drivers/net/usb/huawei_cdc_ncm.c b/drivers/net/usb/huawei_cdc_ncm.c index a87f0da..388a46b 100644 --- a/drivers/net/usb/huawei_cdc_ncm.c +++ b/drivers/net/usb/huawei_cdc_ncm.c @@ -96,6 +96,7 @@ static int huawei_cdc_ncm_bind(struct usbnet *usbnet_dev, subdriver = usb_cdc_wdm_register(ctx->control, &usbnet_dev->status->desc, 1024, /* wMaxCommand */ + USB_CDC_WDM_AT, huawei_cdc_ncm_wdm_manage_power); if (IS_ERR(subdriver)) { ret = PTR_ERR(subdriver); diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c index 17a0505..fa38471 100644 --- a/drivers/net/usb/qmi_wwan.c +++ b/drivers/net/usb/qmi_wwan.c @@ -724,7 +724,8 @@ static int qmi_wwan_register_subdriver(struct usbnet *dev) /* register subdriver */ subdriver = usb_cdc_wdm_register(info->control, &dev->status->desc, - 4096, &qmi_wwan_cdc_wdm_manage_power); + 4096, USB_CDC_WDM_QMI, + &qmi_wwan_cdc_wdm_manage_power); if (IS_ERR(subdriver)) { dev_err(&info->control->dev, "subdriver registration failed\n"); rv = PTR_ERR(subdriver); diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c index 508b1c3..b59f146 100644 --- a/drivers/usb/class/cdc-wdm.c +++ b/drivers/usb/class/cdc-wdm.c @@ -106,6 +106,8 @@ struct wdm_device { struct list_head device_list; int (*manage_power)(struct usb_interface *, int); + + enum usb_cdc_wdm_type type; }; static struct usb_driver wdm_driver; @@ -836,7 +838,8 @@ static void service_interrupt_work(struct work_struct *work) /* --- hotplug --- */ static int wdm_create(struct usb_interface *intf, struct usb_endpoint_descriptor *ep, - u16 bufsize, int (*manage_power)(struct usb_interface *, int)) + u16 bufsize, enum usb_cdc_wdm_type type, + int (*manage_power)(struct usb_interface *, int)) { int rv = -ENOMEM; struct wdm_device *desc; @@ -853,6 +856,7 @@ static int wdm_create(struct usb_interface *intf, struct usb_endpoint_descriptor /* this will be expanded and needed in hardware endianness */ desc->inum = cpu_to_le16((u16)intf->cur_altsetting->desc.bInterfaceNumber); desc->intf = intf; + desc->type = type; INIT_WORK(&desc->rxwork, wdm_rxwork); INIT_WORK(&desc->service_outs_intr, service_interrupt_work); @@ -977,7 +981,7 @@ static int wdm_probe(struct usb_interface *intf, const struct usb_device_id *id) goto err; ep = &iface->endpoint[0].desc; - rv = wdm_create(intf, ep, maxcom, &wdm_manage_power); + rv = wdm_create(intf, ep, maxcom, USB_CDC_WDM_UNKNOWN, &wdm_manage_power); err: return rv; @@ -988,6 +992,7 @@ static int wdm_probe(struct usb_interface *intf, const struct usb_device_id *id) * @intf: usb interface the subdriver will associate with * @ep: interrupt endpoint to monitor for notifications * @bufsize: maximum message size to support for read/write + * @type: Type/protocol of the transported data (MBIM, QMI...) * @manage_power: call-back invoked during open and release to * manage the device's power * Create WDM usb class character device and associate it with intf @@ -1005,12 +1010,12 @@ static int wdm_probe(struct usb_interface *intf, const struct usb_device_id *id) */ struct usb_driver *usb_cdc_wdm_register(struct usb_interface *intf, struct usb_endpoint_descriptor *ep, - int bufsize, + int bufsize, enum usb_cdc_wdm_type type, int (*manage_power)(struct usb_interface *, int)) { int rv; - rv = wdm_create(intf, ep, bufsize, manage_power); + rv = wdm_create(intf, ep, bufsize, type, manage_power); if (rv < 0) goto err; diff --git a/include/linux/usb/cdc-wdm.h b/include/linux/usb/cdc-wdm.h index 9b895f9..ba9702d 100644 --- a/include/linux/usb/cdc-wdm.h +++ b/include/linux/usb/cdc-wdm.h @@ -14,9 +14,23 @@ #include +/** + * enum usb_cdc_wdm_type - CDC WDM endpoint type + * @USB_CDC_WDM_UNKNOWN: Unknown type + * @USB_CDC_WDM_MBIM: Mobile Broadband Interface Model control + * @USB_CDC_WDM_QMI: Qualcomm Modem Interface for modem control + * @USB_CDC_WDM_AT: AT commands interface + */ +enum usb_cdc_wdm_type { + USB_CDC_WDM_UNKNOWN, + USB_CDC_WDM_MBIM, + USB_CDC_WDM_QMI, + USB_CDC_WDM_AT +}; + extern struct usb_driver *usb_cdc_wdm_register(struct usb_interface *intf, struct usb_endpoint_descriptor *ep, - int bufsize, + int bufsize, enum usb_cdc_wdm_type type, int (*manage_power)(struct usb_interface *, int)); #endif /* __LINUX_USB_CDC_WDM_H */ From patchwork Fri Apr 30 10:16:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Loic Poulain X-Patchwork-Id: 430130 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, 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 40420C433B4 for ; Fri, 30 Apr 2021 10:07:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 066F36143B for ; Fri, 30 Apr 2021 10:07:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231476AbhD3KIF (ORCPT ); Fri, 30 Apr 2021 06:08:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45304 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230087AbhD3KIE (ORCPT ); Fri, 30 Apr 2021 06:08:04 -0400 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 54BBCC06138B for ; Fri, 30 Apr 2021 03:07:15 -0700 (PDT) Received: by mail-wr1-x434.google.com with SMTP id m9so57171480wrx.3 for ; Fri, 30 Apr 2021 03:07:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=PDnfVuA/JjrNJVnGCOpMCSMgyBp4BBB6tbf0UxNJ/kE=; b=LoTVZ8D7BEz3yq3hBHaLdUYIjRe2HkhxmZZQtVf+Ljobzl3EEYoWXht3ninBE0plDI VlYk2FX/dDzdVy7mbHRueAA0xXYIQYHtmdZxe1Ljr7YhZfWJQqAIclUwmMECDN8v0uei iItyCxk5saOW0GvKFl77pYGDEIVtKDCyHVCGHPKR2OrCYfFUz61i0nGJ8MeHI8hVqVO0 dNeNVPUODgbXmGVIEWfvLDDSs891AlteEMQpWYSlgE0nZ10kz3yHlhz21EJobpFJGFHh lf3Afffy22hXGxFHxoXpOwCEU/3P/KE7BotnAy14t9w9+vZH0a8Zo5CicY7Cd5c2Dc1e vCuQ== 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:in-reply-to :references; bh=PDnfVuA/JjrNJVnGCOpMCSMgyBp4BBB6tbf0UxNJ/kE=; b=SAr3ArX8uGcwZfoKR6ETjc6PjyHF4dOQ1QoS9GpBJlhqimGXdgjB3uCD4Ws/n49dli G1hMTTMzzCgKaoXDnVuRKkDcRk7dvAvurdp1a5lE3cBD6W9piJXhgQBrjEVRtNju5tbX fL7XNcPl2nbC/NG9bw0vDM2yBk4WifQkFHr9F0QlCcfY4oxDuJPKnNsPEyIMnozWPKPO lRg6WTm+rlr2U0U4JzaY69FC2sCpUoPPvLS3TgPx2RAt1PkyOmenehkgh9R4CewrCDeK noJYt3w73LLf+rgCMVOtW1zJvdUWgzwN2HM4dtHT6kSoLyxi38uhWCLbqE3U6ksLm4t8 hRNA== X-Gm-Message-State: AOAM531l4B6fafG6F3hC7TBYfWYmkcRT1lViBihgEv2V4YElLZj4GlXz cmy/3g7LzjK4bZZg32U8Qz63vQ== X-Google-Smtp-Source: ABdhPJxTdVoNcnHiBB1W/YXmHOtVq0J77k7fIQNm7fMRvBR1p4eVCejkZpOK9DNhdNO6ivtt54NIfg== X-Received: by 2002:a5d:674c:: with SMTP id l12mr5619361wrw.357.1619777233992; Fri, 30 Apr 2021 03:07:13 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:82c:5f0:f8f5:7ac7:d0f:4a85]) by smtp.gmail.com with ESMTPSA id a15sm2192069wrx.9.2021.04.30.03.07.13 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Apr 2021 03:07:13 -0700 (PDT) From: Loic Poulain To: oliver@neukum.org Cc: netdev@vger.kernel.org, linux-usb@vger.kernel.org, kuba@kernel.org, bjorn@mork.no, Loic Poulain Subject: [RFC net-next 2/2] usb: class: cdc-wdm: WWAN framework integration Date: Fri, 30 Apr 2021 12:16:23 +0200 Message-Id: <1619777783-24116-2-git-send-email-loic.poulain@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1619777783-24116-1-git-send-email-loic.poulain@linaro.org> References: <1619777783-24116-1-git-send-email-loic.poulain@linaro.org> Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org The WWAN framework provides a unified way to handle WWAN/modems and control port(s). It has initially been introduced to support MHI/PCI modems, offering the same control protocols as the USB variants, such as MBIM, QMI, AT... The WWAN framework exposes these control protocols as character devices, similarly to cdc-wdm, but in a bus agnostic fashion. It would then make sense to migrate cdc-wdm to this unified framework and register the USB modem control endpoints as standard WWAN control ports. Exposing cdc-wdm through WWAN framework normally maintains backward compatibility, e.g: $ qmicli --device-open-qmi -d /dev/wwan0p1QMI --dms-get-ids instead of $ qmicli --device-open-qmi -d /dev/cdc-wdm0 --dms-get-ids However, some tools may rely on cdc-wdm driver/device name for device detection. It is then safer to keep the 'legacy' cdc-wdm character device to prevent any breakage. This is handled in this change by API mutual exclusion, only one access method can be used at a time, either cdc-wdm chardev or WWAN API. Note that unknown channel types (other than MBIM, AT or MBIM) are not registered to the WWAN framework. Signed-off-by: Loic Poulain --- drivers/usb/class/cdc-wdm.c | 171 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 170 insertions(+), 1 deletion(-) diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c index b59f146..7b798b5 100644 --- a/drivers/usb/class/cdc-wdm.c +++ b/drivers/usb/class/cdc-wdm.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -55,6 +56,7 @@ MODULE_DEVICE_TABLE (usb, wdm_ids); #define WDM_SUSPENDING 8 #define WDM_RESETTING 9 #define WDM_OVERFLOW 10 +#define WDM_WWAN_IN_USE 11 #define WDM_MAX 16 @@ -108,6 +110,7 @@ struct wdm_device { int (*manage_power)(struct usb_interface *, int); enum usb_cdc_wdm_type type; + struct wwan_port *wwanp; }; static struct usb_driver wdm_driver; @@ -203,7 +206,23 @@ static void wdm_in_callback(struct urb *urb) if (desc->rerr == 0 && status != -EPIPE) desc->rerr = status; - if (length + desc->length > desc->wMaxCommand) { + if (test_bit(WDM_WWAN_IN_USE, &desc->flags)) { + struct wwan_port *port = desc->wwanp; + struct sk_buff *skb; + + /* Forward data to WWAN port */ + skb = alloc_skb(length, GFP_ATOMIC); + if (skb) { + memcpy(skb_put(skb, length), desc->inbuf, length); + wwan_port_rx(port, skb); + } else { + dev_err(&desc->intf->dev, + "Unable to alloc skb, response discarded\n"); + } + + /* inbuf has been copied, it is safe to check for outstanding data */ + schedule_work(&desc->service_outs_intr); + } else if (length + desc->length > desc->wMaxCommand) { /* The buffer would overflow */ set_bit(WDM_OVERFLOW, &desc->flags); } else { @@ -699,6 +718,11 @@ static int wdm_open(struct inode *inode, struct file *file) goto out; file->private_data = desc; + if (test_bit(WDM_WWAN_IN_USE, &desc->flags)) { + rv = -EBUSY; + goto out; + } + rv = usb_autopm_get_interface(desc->intf); if (rv < 0) { dev_err(&desc->intf->dev, "Error autopm - %d\n", rv); @@ -794,6 +818,146 @@ static struct usb_class_driver wdm_class = { .minor_base = WDM_MINOR_BASE, }; +/* --- WWAN framework integration --- */ +#ifdef CONFIG_WWAN +static int wdm_wwan_port_start(struct wwan_port *port) +{ + struct wdm_device *desc = wwan_port_get_drvdata(port); + + /* The interface is both exposed via the WWAN framework and as a + * legacy usbmisc chardev. If chardev is already open, just fail + * to prevent concurrent usage. Otherwise, switch to WWAN mode. + */ + mutex_lock(&wdm_mutex); + if (desc->count) { + mutex_unlock(&wdm_mutex); + return -EBUSY; + } + set_bit(WDM_WWAN_IN_USE, &desc->flags); + mutex_unlock(&wdm_mutex); + + desc->manage_power(desc->intf, 1); + + /* Start getting events */ + usb_submit_urb(desc->validity, GFP_KERNEL); + + /* tx is allowed */ + wwan_port_txon(port); + + return 0; +} + +static void wdm_wwan_port_stop(struct wwan_port *port) +{ + struct wdm_device *desc = wwan_port_get_drvdata(port); + + /* Stop all transfers and disable WWAN mode */ + kill_urbs(desc); + desc->manage_power(desc->intf, 0); + clear_bit(WDM_READ, &desc->flags); + clear_bit(WDM_WWAN_IN_USE, &desc->flags); +} + +static void wdm_wwan_port_tx_complete(struct urb *urb) +{ + struct sk_buff *skb = urb->context; + struct wwan_port *port = skb_shinfo(skb)->destructor_arg; + + /* Allow new command transfer */ + wwan_port_txon(port); + kfree_skb(skb); +} + +static int wdm_wwan_port_tx(struct wwan_port *port, struct sk_buff *skb) +{ + struct wdm_device *desc = wwan_port_get_drvdata(port); + struct usb_interface *intf = desc->intf; + struct usb_ctrlrequest *req = desc->orq; + int rv; + + rv = usb_autopm_get_interface(intf); + if (rv) + return rv; + + usb_fill_control_urb( + desc->command, + interface_to_usbdev(intf), + usb_sndctrlpipe(interface_to_usbdev(intf), 0), + (unsigned char *)req, + skb->data, + skb->len, + wdm_wwan_port_tx_complete, + skb + ); + + req->bRequestType = (USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE); + req->bRequest = USB_CDC_SEND_ENCAPSULATED_COMMAND; + req->wValue = 0; + req->wIndex = desc->inum; + req->wLength = cpu_to_le16(skb->len); + + skb_shinfo(skb)->destructor_arg = port; + + rv = usb_submit_urb(desc->command, GFP_KERNEL); + if (!rv) /* One transfer at a time, stop TX until URB completion */ + wwan_port_txoff(port); + + usb_autopm_put_interface(intf); + + return rv; +} + +static struct wwan_port_ops wdm_wwan_port_ops = { + .start = wdm_wwan_port_start, + .stop = wdm_wwan_port_stop, + .tx = wdm_wwan_port_tx, +}; + +static void wdm_wwan_init(struct wdm_device *desc) +{ + struct usb_interface *intf = desc->intf; + struct wwan_port *port; + + switch (desc->type) { + case USB_CDC_WDM_MBIM: + port = wwan_create_port(&intf->dev, WWAN_PORT_MBIM, + &wdm_wwan_port_ops, desc); + break; + case USB_CDC_WDM_QMI: + port = wwan_create_port(&intf->dev, WWAN_PORT_QMI, + &wdm_wwan_port_ops, desc); + break; + case USB_CDC_WDM_AT: + port = wwan_create_port(&intf->dev, WWAN_PORT_AT, + &wdm_wwan_port_ops, desc); + break; + default: + dev_info(&intf->dev, "Unknown control protocol\n"); + return; + } + + if (IS_ERR(port)) { + dev_err(&intf->dev, "%s: Unable to create WWAN port\n", + dev_name(intf->usb_dev)); + return; + } + + desc->wwanp = port; +} + +static void wdm_wwan_deinit(struct wdm_device *desc) +{ + if (!desc->wwanp) + return; + + wwan_remove_port(desc->wwanp); + desc->wwanp = NULL; +} +#else /* CONFIG_WWAN */ +static void wdm_wwan_init(struct wdm_device *desc) {} +static void wdm_wwan_deinit(struct wdm_device *desc) {} +#endif /* CONFIG_WWAN */ + /* --- error handling --- */ static void wdm_rxwork(struct work_struct *work) { @@ -937,6 +1101,9 @@ static int wdm_create(struct usb_interface *intf, struct usb_endpoint_descriptor goto err; else dev_info(&intf->dev, "%s: USB WDM device\n", dev_name(intf->usb_dev)); + + wdm_wwan_init(desc); + out: return rv; err: @@ -1034,6 +1201,8 @@ static void wdm_disconnect(struct usb_interface *intf) desc = wdm_find_device(intf); mutex_lock(&wdm_mutex); + wdm_wwan_deinit(desc); + /* the spinlock makes sure no new urbs are generated in the callbacks */ spin_lock_irqsave(&desc->iuspin, flags); set_bit(WDM_DISCONNECTING, &desc->flags);