Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb0e5669 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: kona: Enable USB function drivers"

parents 42f866db ec127e55

arch/arm64/configs/vendor/kona-perf_defconfig

+9 −0
Original line number Original line Diff line number Diff line
@@ -403,11 +403,20 @@ CONFIG_USB_GADGET=y 
CONFIG_USB_GADGET_VBUS_DRAW=500

CONFIG_USB_GADGET_VBUS_DRAW=500

CONFIG_USB_CONFIGFS=y

CONFIG_USB_CONFIGFS=y

CONFIG_USB_CONFIGFS_UEVENT=y

CONFIG_USB_CONFIGFS_UEVENT=y

CONFIG_USB_CONFIGFS_NCM=y

CONFIG_USB_CONFIGFS_RNDIS=y

CONFIG_USB_CONFIGFS_MASS_STORAGE=y

CONFIG_USB_CONFIGFS_MASS_STORAGE=y

CONFIG_USB_CONFIGFS_F_FS=y

CONFIG_USB_CONFIGFS_F_FS=y

CONFIG_USB_CONFIGFS_F_ACC=y

CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y

CONFIG_USB_CONFIGFS_F_UAC2=y

CONFIG_USB_CONFIGFS_F_MIDI=y

CONFIG_USB_CONFIGFS_F_HID=y

CONFIG_USB_CONFIGFS_F_HID=y

CONFIG_USB_CONFIGFS_F_DIAG=y

CONFIG_USB_CONFIGFS_F_DIAG=y

CONFIG_USB_CONFIGFS_F_CDEV=y

CONFIG_USB_CONFIGFS_F_CCID=y

CONFIG_USB_CONFIGFS_F_QDSS=y

CONFIG_USB_CONFIGFS_F_QDSS=y

CONFIG_USB_CONFIGFS_F_GSI=y

CONFIG_TYPEC=y

CONFIG_TYPEC=y

CONFIG_USB_PD_POLICY=y

CONFIG_USB_PD_POLICY=y

CONFIG_QPNP_USB_PDPHY=y

CONFIG_QPNP_USB_PDPHY=y

arch/arm64/configs/vendor/kona_defconfig

+9 −0
Original line number Original line Diff line number Diff line
@@ -414,11 +414,20 @@ CONFIG_USB_GADGET=y 
CONFIG_USB_GADGET_VBUS_DRAW=500

CONFIG_USB_GADGET_VBUS_DRAW=500

CONFIG_USB_CONFIGFS=y

CONFIG_USB_CONFIGFS=y

CONFIG_USB_CONFIGFS_UEVENT=y

CONFIG_USB_CONFIGFS_UEVENT=y

CONFIG_USB_CONFIGFS_NCM=y

CONFIG_USB_CONFIGFS_RNDIS=y

CONFIG_USB_CONFIGFS_MASS_STORAGE=y

CONFIG_USB_CONFIGFS_MASS_STORAGE=y

CONFIG_USB_CONFIGFS_F_FS=y

CONFIG_USB_CONFIGFS_F_FS=y

CONFIG_USB_CONFIGFS_F_ACC=y

CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y

CONFIG_USB_CONFIGFS_F_UAC2=y

CONFIG_USB_CONFIGFS_F_MIDI=y

CONFIG_USB_CONFIGFS_F_HID=y

CONFIG_USB_CONFIGFS_F_HID=y

CONFIG_USB_CONFIGFS_F_DIAG=y

CONFIG_USB_CONFIGFS_F_DIAG=y

CONFIG_USB_CONFIGFS_F_CDEV=y

CONFIG_USB_CONFIGFS_F_CCID=y

CONFIG_USB_CONFIGFS_F_QDSS=y

CONFIG_USB_CONFIGFS_F_QDSS=y

CONFIG_USB_CONFIGFS_F_GSI=y

CONFIG_TYPEC=y

CONFIG_TYPEC=y

CONFIG_USB_PD_POLICY=y

CONFIG_USB_PD_POLICY=y

CONFIG_QPNP_USB_PDPHY=y

CONFIG_QPNP_USB_PDPHY=y

drivers/usb/gadget/function/rndis.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1134,7 +1134,7 @@ int rndis_rm_hdr(struct gether *port, 
		}

		}





		if (skb->len < sizeof(*hdr)) {

		if (skb->len < sizeof(*hdr)) {

			pr_err("invalid rndis pkt: skblen:%u hdr_len:%u\n",

			pr_err("invalid rndis pkt: skblen:%u hdr_len:%lu\n",

					skb->len, sizeof(*hdr));

					skb->len, sizeof(*hdr));

			dev_kfree_skb_any(skb);

			dev_kfree_skb_any(skb);

			return -EINVAL;

			return -EINVAL;

drivers/usb/gadget/function/u_ether.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -219,7 +219,7 @@ rx_submit(struct eth_dev *dev, struct usb_request *req, gfp_t gfp_flags) 
	if (dev->port_usb->is_fixed)

	if (dev->port_usb->is_fixed)

		size = max_t(size_t, size, dev->port_usb->fixed_out_len);

		size = max_t(size_t, size, dev->port_usb->fixed_out_len);





	DBG(dev, "%s: size: %d\n", __func__, size);

	DBG(dev, "%s: size: %zd\n", __func__, size);

	skb = __netdev_alloc_skb(dev->net, size + NET_IP_ALIGN, gfp_flags);

	skb = __netdev_alloc_skb(dev->net, size + NET_IP_ALIGN, gfp_flags);

	if (skb == NULL) {

	if (skb == NULL) {

		DBG(dev, "no rx skb\n");

		DBG(dev, "no rx skb\n");

drivers/usb/gadget/function/u_ether_configfs.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -196,7 +196,7 @@ out: \ 
		mutex_lock(&opts->lock);				\

		mutex_lock(&opts->lock);				\

		max = gether_get_ul_max_pkts_per_xfer(opts->net);	\

		max = gether_get_ul_max_pkts_per_xfer(opts->net);	\

		mutex_unlock(&opts->lock);				\

		mutex_unlock(&opts->lock);				\

		return scnprintf(page, "%d\n", max);			\

		return scnprintf(page, PAGE_SIZE, "%d\n", max);		\

	}								\

	}								\

									\

									\

	static ssize_t							\

	static ssize_t							\