Received: by 2002:a05:7412:bbc7:b0:fc:a2b0:25d7 with SMTP id kh7csp519298rdb; Thu, 1 Feb 2024 16:06:48 -0800 (PST) X-Google-Smtp-Source: AGHT+IEoqR/jf64hb7T4T7nIUZNwJ+ZDtLly0aMuxlGiMCLdcq6es3mghO+9mn8GTakV0Dv0MUH9 X-Received: by 2002:a17:906:d10e:b0:a36:5924:77e0 with SMTP id b14-20020a170906d10e00b00a36592477e0mr417302ejz.10.1706832408316; Thu, 01 Feb 2024 16:06:48 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706832408; cv=pass; d=google.com; s=arc-20160816; b=qE6r0cCRmme7W/0OiWX/zp9ftkUD3atkf11EW8zv/DUEoWuArT/tuzlC6dihoiqeqT /SFHD8NuasUvKadwZCWk3es+HqvXCK4Y99d9+a4Dx0NR0rzVCtBkguse7EnwwgFwpbe2 jcAY12Xozy42OHen6Y5SxA3D/fjhQCTbxWtPn1LTsCL/YXfhEpN2DRG2uDPDNZ93ChtI GBVAL1UVK1NH7ZWeSmma/GdeeHKXqCI4KO4UMet1nyCmCyFNeIv7ybDE01RhSghnwL1s BBIe0jqkxS1tnLrc4CH2DJKj8QIRlHhG0NBMqbiulAxeMuxnsMlkmDj7+MtqmfvT+nEd Y1+A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:list-unsubscribe:list-subscribe:list-id:precedence :subject:date:from; bh=yTS9myaQ8BzyQCqVz7gfxskKYnPONiLbwn0xZWOQ1vA=; fh=SIkaNOPo5KBrvbsZjoAA+EKFos5GJtMrz77ep4EB4to=; b=MNwfeSCq0AngtboRdbt8YfcULSf9P1gvyK4LesPuqyX8w/s7OUg2o8OxKmPFbUolBB eXBFVntGeYkBSCCWsEDIzBQpz0atILGB7NDA7oXc0cxrcHR/vGVY77oxStES3+hbMveF SiK/QObu1pwK1GgOBxLd3JGsSp09QghhgUhUOS6GabvbzuKDbdSWd2UxKHClMg4tn7l+ 3cElerSoSrkOgp/ieafDFLKwJ4cdSi8cgJXNcjNjMbqx+rYDnaG3Ngbu2s0PYX0CxLk1 OvIfn9VZsMTPbzCQiXBEN39IViFZra28Q8ggBycWZZaFwcFDAoWUhRAJrXmrScsgkd8H 1z6Q==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=pengutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-49019-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-49019-linux.lists.archive=gmail.com@vger.kernel.org" X-Forwarded-Encrypted: i=1; AJvYcCXO5qpCLLVsUc3hK0O9iTjGvnscj8vWXBuHnWxxpy6wEU/57z/OkMFLjEntpAY27gXPJZPTwYO4aPBfPtj2A6VRdSTgWzbKYJSrCuQRWw== Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id v19-20020a17090606d300b00a36c24d6ab2si260753ejb.463.2024.02.01.16.06.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Feb 2024 16:06:48 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-49019-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=pengutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-49019-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-49019-linux.lists.archive=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id DFB351F23B85 for ; Fri, 2 Feb 2024 00:06:47 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 18DF663AD; Fri, 2 Feb 2024 00:05:40 +0000 (UTC) Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [185.203.201.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E3D3223BE for ; Fri, 2 Feb 2024 00:05:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.203.201.7 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706832339; cv=none; b=Du1YFgmyaAN3rPtIOlQudrGyipa5ZkTi5U2aKb2r1Qz+DMLSRrD4l1PC75YwLs2mBj/eIIe8ji/E+AfuDIty2DmmbtMZJmWb56j1IVs6CtOkBDH6ZP589fQWvrGW7wTfO3CZLIsv0LANtyiYJafEIoxW/R2ecYSxDQcZTQIjs2A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706832339; c=relaxed/simple; bh=pQ8iEzI0mZVqW/QE4zyhuKjpDmWku1rOoVZETXWXCjc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=W77/K8z8dojaqn6REYzRp0JTHe5aO1ePYmLXxbwhVPxpyx2L8uesdSejWaDx5953wctkDRHrruD8C2wlvirvIaKvz49cnjGr6XzoyPVReAmWFlWv6Be/+pkA1SJjt4O/rc4XW7DB1MzlmOXoNbQ3f5z01WqmLUU/ZTRsIg+1ukw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de; spf=pass smtp.mailfrom=pengutronix.de; arc=none smtp.client-ip=185.203.201.7 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pengutronix.de Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rVh3Z-0000d3-Rd; Fri, 02 Feb 2024 01:05:21 +0100 Received: from [2a0a:edc0:0:1101:1d::ac] (helo=dude04.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rVh3W-003xQ7-3R; Fri, 02 Feb 2024 01:05:18 +0100 Received: from localhost ([::1] helo=dude04.red.stw.pengutronix.de) by dude04.red.stw.pengutronix.de with esmtp (Exim 4.96) (envelope-from ) id 1rVh3V-00AFlM-1k; Fri, 02 Feb 2024 01:05:18 +0100 From: Michael Grzeschik Date: Fri, 02 Feb 2024 01:05:12 +0100 Subject: [PATCH v2 3/4] usb: gadget: legacy: add 9pfs multi gadget Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20240116-ml-topic-u9p-v2-3-b46cbf592962@pengutronix.de> References: <20240116-ml-topic-u9p-v2-0-b46cbf592962@pengutronix.de> In-Reply-To: <20240116-ml-topic-u9p-v2-0-b46cbf592962@pengutronix.de> To: Eric Van Hensbergen , Latchesar Ionkov , Dominique Martinet , Christian Schoenebeck , Jonathan Corbet , Greg Kroah-Hartman Cc: v9fs@lists.linux.dev, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, kernel@pengutronix.de, Michael Grzeschik X-Mailer: b4 0.12.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=9506; i=m.grzeschik@pengutronix.de; h=from:subject:message-id; bh=pQ8iEzI0mZVqW/QE4zyhuKjpDmWku1rOoVZETXWXCjc=; b=owEBbQKS/ZANAwAKAb9pWET5cfSrAcsmYgBlvDG9lhWM1oYY4PizxciHEo/0AGTTEVheR8YLX UeTmr8jpUaJAjMEAAEKAB0WIQQV2+2Fpbqd6fvv0Gi/aVhE+XH0qwUCZbwxvQAKCRC/aVhE+XH0 q7GhD/46EyUMeKE6PHCLM2CSwWS0e2Skvv2Zz6o1jmEsIQ5VogbJxpN3819WGk7zzIv6Iz8+e5d WFFXBbOoAU2mVo4PepFtemhJ4hLnsv0OXXCL2iITv7G2NTzeT/yT/8QstTmx+fjJu8qzie1EVx/ y7iOhvXDlmlhmY28Oiu47PustHI6Yyi3oyD4OXCSZzBHOmvhOfht22wiAN+LmvoHYD7ldfXG5Gs rGCEL8EML4PWKz6yMcrDp3AjiCI32vzcTtwzYcLOvoQnoT0rycf/jybFX3/zHs/uqVFG5wyW9mu yWh9c5eI6O0D/v/4e+MNmjH3O3S0kK6kXArGDMZ6cR7u4rgRREbw9beBuolZ1e1BXjXxo7XpAGx HG/jV9+JxL9NUOj41H6+AhrvhWTvYYUhv/E/u+/pdo1w/6YKvlIgy8N5qfGHGWPdjI5mjsdP8Eg GjZrx6aX1xEJIMnqlwwOArrh5nduc2qN6Sg1bcSlLf2x8L7XzHVKb4rFrFJ7oppEsKv5wUpRP/M lTwJfbAB0pZ90ei5ldrGHtVaETjvJJhOd4jj2b+6WuDAg+/TSDPCQKb6wWKdm/4sYomcXnQ6z1w tGEFcC0F+YCjQv/A7K6e5Zx2u9NkUZ0/l7MYK37FAE1KNoYHh7MwmAycTROvyp5Od5grfqZXGJi 4Tsl41nFKdQA5UA== X-Developer-Key: i=m.grzeschik@pengutronix.de; a=openpgp; fpr=957BC452CE953D7EA60CF4FC0BE9E3157A1E2C64 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: m.grzeschik@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Add the newly introduced 9pfs transport gadget interface with an new multi composed gadget together with acm and eem. When using this legacy module, it is also possible to mount the 9PFS usb dir as root filesystem. Just follow the instrucitons from Documentation/filesystems/9p.rst Signed-off-by: Michael Grzeschik --- v1 -> v2: - deleted the usbg 9pfs detailed instruction from commit message - added depends on net for NET_9P dependency --- drivers/usb/gadget/legacy/9pfs.c | 268 +++++++++++++++++++++++++++++++++++++ drivers/usb/gadget/legacy/Kconfig | 16 +++ drivers/usb/gadget/legacy/Makefile | 2 + 3 files changed, 286 insertions(+) diff --git a/drivers/usb/gadget/legacy/9pfs.c b/drivers/usb/gadget/legacy/9pfs.c new file mode 100644 index 0000000000000..3ac7f2e92c5a3 --- /dev/null +++ b/drivers/usb/gadget/legacy/9pfs.c @@ -0,0 +1,268 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * usb9pfs.c -- Gadget usb9pfs + * + * Copyright (C) 2023 Michael Grzeschik + */ + +/* + * Gadget usb9pfs only needs two bulk endpoints, and will use the usb9pfs usb + * transport to mount host filesystem via usb gadget. This driver will + * also add one ACM and NCM interface. + */ + +#include +#include +#include +#include +#include +#include +#include + +#include "u_eem.h" +#include "u_ether.h" + +/*-------------------------------------------------------------------------*/ +USB_GADGET_COMPOSITE_OPTIONS(); + +USB_ETHERNET_MODULE_PARAMETERS(); + +/* Defines */ + +#define DRIVER_VERSION_STR "v1.0" +#define DRIVER_VERSION_NUM 0x1000 + +#define DRIVER_DESC "Composite Gadget (9P + ACM + NCM)" + +/*-------------------------------------------------------------------------*/ + +#define DRIVER_VENDOR_NUM 0x1d6b /* Linux Foundation */ +#define DRIVER_PRODUCT_NUM 0x0109 /* Linux-USB 9PFS Gadget */ + +/*-------------------------------------------------------------------------*/ + +static struct usb_device_descriptor device_desc = { + .bLength = sizeof(device_desc), + .bDescriptorType = USB_DT_DEVICE, + + /* .bcdUSB = DYNAMIC */ + + .bDeviceClass = USB_CLASS_MISC, + .bDeviceSubClass = 2, + .bDeviceProtocol = 1, + + /* .bMaxPacketSize0 = f(hardware) */ + + /* Vendor and product id can be overridden by module parameters. */ + .idVendor = cpu_to_le16(DRIVER_VENDOR_NUM), + .idProduct = cpu_to_le16(DRIVER_PRODUCT_NUM), + /* .bcdDevice = f(hardware) */ + /* .iManufacturer = DYNAMIC */ + /* .iProduct = DYNAMIC */ + /* NO SERIAL NUMBER */ + /*.bNumConfigurations = DYNAMIC*/ +}; + +static const struct usb_descriptor_header *otg_desc[2]; + +static struct usb_string strings_dev[] = { + [USB_GADGET_MANUFACTURER_IDX].s = "", + [USB_GADGET_PRODUCT_IDX].s = DRIVER_DESC, + [USB_GADGET_SERIAL_IDX].s = "", + { } /* end of list */ +}; + +static struct usb_gadget_strings stringtab_dev = { + .language = 0x0409, /* en-us */ + .strings = strings_dev, +}; + +static struct usb_gadget_strings *dev_strings[] = { + &stringtab_dev, + NULL, +}; + +static struct usb_configuration cdc_driver_conf = { + .label = DRIVER_DESC, + .bConfigurationValue = 1, + /* .iConfiguration = DYNAMIC */ + .bmAttributes = USB_CONFIG_ATT_SELFPOWER, +}; + +static struct usb_function *f_9pfs; +static struct usb_function_instance *fi_9pfs; + +static struct usb_function *f_acm; +static struct usb_function_instance *fi_acm; + +static struct usb_function *f_eem; +static struct usb_function_instance *fi_eem; + +static int cdc_do_config(struct usb_configuration *c) +{ + int ret; + + if (gadget_is_otg(c->cdev->gadget)) { + c->descriptors = otg_desc; + c->bmAttributes |= USB_CONFIG_ATT_WAKEUP; + } + + f_9pfs = usb_get_function(fi_9pfs); + if (IS_ERR(f_9pfs)) + return PTR_ERR(f_9pfs); + + ret = usb_add_function(c, f_9pfs); + if (ret < 0) + goto err_func_9pfs; + + f_acm = usb_get_function(fi_acm); + if (IS_ERR(f_acm)) { + ret = PTR_ERR(f_acm); + goto err_func_acm; + } + + ret = usb_add_function(c, f_acm); + if (ret) + goto err_conf; + + f_eem = usb_get_function(fi_eem); + if (IS_ERR(f_eem)) { + ret = PTR_ERR(f_eem); + goto err_eem; + } + + ret = usb_add_function(c, f_eem); + if (ret) + goto err_run; + + return 0; +err_run: + usb_put_function(f_eem); +err_eem: + usb_remove_function(c, f_acm); +err_conf: + usb_put_function(f_acm); +err_func_acm: + usb_remove_function(c, f_9pfs); +err_func_9pfs: + usb_put_function(f_9pfs); + return ret; +} + +static int usb9pfs_bind(struct usb_composite_dev *cdev) +{ + struct f_eem_opts *eem_opts = NULL; + int status; + + fi_9pfs = usb_get_function_instance("usb9pfs"); + if (IS_ERR(fi_9pfs)) { + if (PTR_ERR(fi_9pfs) == -ENOENT) + return -EPROBE_DEFER; + return PTR_ERR(fi_9pfs); + } + + /* set up serial link layer */ + fi_acm = usb_get_function_instance("acm"); + if (IS_ERR(fi_acm)) { + if (PTR_ERR(fi_9pfs) == -ENOENT) + return -EPROBE_DEFER; + status = PTR_ERR(fi_acm); + goto err_conf_acm; + } + + fi_eem = usb_get_function_instance("eem"); + if (IS_ERR(fi_eem)) { + if (PTR_ERR(fi_9pfs) == -ENOENT) + return -EPROBE_DEFER; + status = PTR_ERR(fi_eem); + goto err_conf_eem; + } + + eem_opts = container_of(fi_eem, struct f_eem_opts, func_inst); + + gether_set_qmult(eem_opts->net, qmult); + if (!gether_set_host_addr(eem_opts->net, host_addr)) + pr_info("using host ethernet address: %s", host_addr); + if (!gether_set_dev_addr(eem_opts->net, dev_addr)) + pr_info("using self ethernet address: %s", dev_addr); + + /* Allocate string descriptor numbers ... note that string + * contents can be overridden by the composite_dev glue. + */ + status = usb_string_ids_tab(cdev, strings_dev); + if (status < 0) + return status; + + device_desc.iManufacturer = strings_dev[USB_GADGET_MANUFACTURER_IDX].id; + device_desc.iProduct = strings_dev[USB_GADGET_PRODUCT_IDX].id; + device_desc.iSerialNumber = strings_dev[USB_GADGET_SERIAL_IDX].id; + + /* support OTG systems */ + if (gadget_is_otg(cdev->gadget)) { + if (!otg_desc[0]) { + struct usb_descriptor_header *usb_desc; + + usb_desc = usb_otg_descriptor_alloc(cdev->gadget); + if (!usb_desc) { + status = -ENOMEM; + goto err_conf_otg; + } + usb_otg_descriptor_init(cdev->gadget, usb_desc); + otg_desc[0] = usb_desc; + otg_desc[1] = NULL; + } + } + + status = usb_add_config(cdev, &cdc_driver_conf, cdc_do_config); + if (status) + goto err_free_otg_desc; + + usb_ep_autoconfig_reset(cdev->gadget); + usb_composite_overwrite_options(cdev, &coverwrite); + + dev_info(&cdev->gadget->dev, DRIVER_DESC " version: " DRIVER_VERSION_STR "\n"); + + return 0; + +err_free_otg_desc: + kfree(otg_desc[0]); + otg_desc[0] = NULL; +err_conf_otg: + usb_put_function_instance(fi_eem); +err_conf_eem: + usb_put_function_instance(fi_acm); +err_conf_acm: + usb_put_function_instance(fi_9pfs); + return status; +} + +static int usb9pfs_unbind(struct usb_composite_dev *cdev) +{ + if (!IS_ERR_OR_NULL(f_eem)) + usb_put_function(f_eem); + usb_put_function_instance(fi_eem); + if (!IS_ERR_OR_NULL(f_acm)) + usb_put_function(f_acm); + usb_put_function_instance(fi_acm); + if (!IS_ERR_OR_NULL(f_9pfs)) + usb_put_function(f_9pfs); + usb_put_function_instance(fi_9pfs); + kfree(otg_desc[0]); + otg_desc[0] = NULL; + + return 0; +} + +static struct usb_composite_driver usb9pfs_driver = { + .name = "usb9pfs", + .dev = &device_desc, + .strings = dev_strings, + .max_speed = USB_SPEED_SUPER, + .bind = usb9pfs_bind, + .unbind = usb9pfs_unbind, +}; + +module_usb_composite_driver(usb9pfs_driver); + +MODULE_AUTHOR("Michael Grzeschik"); +MODULE_LICENSE("GPL"); diff --git a/drivers/usb/gadget/legacy/Kconfig b/drivers/usb/gadget/legacy/Kconfig index 0a7b382fbe27c..8b2aab155e0cf 100644 --- a/drivers/usb/gadget/legacy/Kconfig +++ b/drivers/usb/gadget/legacy/Kconfig @@ -62,6 +62,22 @@ config USB_ZERO Say "y" to link the driver statically, or "m" to build a dynamically linked module called "g_zero". +config USB_9PFS + tristate "Gadget 9PFS" + depends on NET + select USB_LIBCOMPOSITE + select USB_U_SERIAL + select USB_U_ETHER + select USB_F_ACM + select USB_F_EEM + select NET_9P_USBG + select NET_9P + help + 9PFS Transport Layer + + Say "y" to link the driver statically, or "m" to build a + dynamically linked module called "g_9pfs". + config USB_ZERO_HNPTEST bool "HNP Test Device" depends on USB_ZERO && USB_OTG diff --git a/drivers/usb/gadget/legacy/Makefile b/drivers/usb/gadget/legacy/Makefile index 4d864bf82799d..99c098800d898 100644 --- a/drivers/usb/gadget/legacy/Makefile +++ b/drivers/usb/gadget/legacy/Makefile @@ -8,6 +8,7 @@ ccflags-y += -I$(srctree)/drivers/usb/gadget/udc/ ccflags-y += -I$(srctree)/drivers/usb/gadget/function/ g_zero-y := zero.o +g_9pfs-y := 9pfs.o g_audio-y := audio.o g_ether-y := ether.o g_serial-y := serial.o @@ -26,6 +27,7 @@ g_acm_ms-y := acm_ms.o g_tcm_usb_gadget-y := tcm_usb_gadget.o obj-$(CONFIG_USB_ZERO) += g_zero.o +obj-$(CONFIG_USB_9PFS) += g_9pfs.o obj-$(CONFIG_USB_AUDIO) += g_audio.o obj-$(CONFIG_USB_ETH) += g_ether.o obj-$(CONFIG_USB_GADGETFS) += gadgetfs.o -- 2.39.2