Merge "USB: f_diag: Report Max request size as 16k for ChipIdea" (10211d38) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/usb/gadget/function/f_diag.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		* Diag Function Device - Route ARM9 and ARM11 DIAG messages
		* between HOST and DEVICE.
		* Copyright (C) 2007 Google, Inc.
		* Copyright (c) 2008-2017, The Linux Foundation. All rights reserved.
		* Copyright (c) 2008-2018, The Linux Foundation. All rights reserved.
		* Author: Brian Swetland <swetland@google.com>
		* This software is licensed under the terms of the GNU General Public
		* License version 2, as published by the Free Software Foundation, and
		@@ -492,6 +492,7 @@ int usb_diag_alloc_req(struct usb_diag_ch *ch, int n_write, int n_read)
		}
		EXPORT_SYMBOL(usb_diag_alloc_req);
		#define DWC3_MAX_REQUEST_SIZE (16 * 1024 * 1024)
		#define CI_MAX_REQUEST_SIZE (16 * 1024)
		/**
		* usb_diag_request_size - Max request size for controller
		* @ch: Channel handler
		@@ -501,6 +502,12 @@ EXPORT_SYMBOL(usb_diag_alloc_req);
		*/
		int usb_diag_request_size(struct usb_diag_ch *ch)
		{
		struct diag_context *ctxt = ch->priv_usb;
		struct usb_composite_dev *cdev = ctxt->cdev;

		if (cdev->gadget->is_chipidea)
		return CI_MAX_REQUEST_SIZE;

		return DWC3_MAX_REQUEST_SIZE;
		}
		EXPORT_SYMBOL(usb_diag_request_size);