From 7285da7914a46cef04e2fc9011a05d7715127c9f Mon Sep 17 00:00:00 2001 From: Mayank Rana Date: Thu, 31 Jan 2019 10:48:09 -0800 Subject: [PATCH] USB: Move MBIM interface related IOCTLs definition to uapi directory USB GSI driver has set of IOCTLS supported specific for MBIM interface. QBI daemon is duplicating those IOCTLs definitions. Hence move those IOCTLs definition into uapi based .h file. So QBI and QMUX bridge daemon can use it and doesn't need to duplicate it. This change also adds new IOCTL which allows both daemon to query USB cable status when USB MBIM and USB GPS interfaces are part of USB composition. Change-Id: I4b392db7877b78ca21465a463aa5fb3c74087fc3 Signed-off-by: Mayank Rana Signed-off-by: Elson Roy Serrao --- drivers/usb/gadget/function/f_gsi.h | 10 +++------- include/uapi/linux/usb/usb_ctrl_qti.h | 6 ++++++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/usb/gadget/function/f_gsi.h b/drivers/usb/gadget/function/f_gsi.h index 8d367c228e2d..8bb589d29b59 100644 --- a/drivers/usb/gadget/function/f_gsi.h +++ b/drivers/usb/gadget/function/f_gsi.h @@ -59,10 +59,6 @@ /* default pkt alignment factor */ #define DEFAULT_PKT_ALIGNMENT_FACTOR 4 -#define GSI_MBIM_IOCTL_MAGIC 'o' -#define GSI_MBIM_GET_NTB_SIZE _IOR(GSI_MBIM_IOCTL_MAGIC, 2, u32) -#define GSI_MBIM_GET_DATAGRAM_COUNT _IOR(GSI_MBIM_IOCTL_MAGIC, 3, u16) -#define GSI_MBIM_EP_LOOKUP _IOR(GSI_MBIM_IOCTL_MAGIC, 4, struct ep_info) #define GSI_MBIM_DATA_EP_TYPE_HSUSB 0x2 /* ID for Microsoft OS String */ #define GSI_MBIM_OS_STRING_ID 0xEE @@ -142,9 +138,9 @@ struct event_queue { }; struct gsi_ntb_info { - u32 ntb_input_size; - u16 ntb_max_datagrams; - u16 reserved; + __u32 ntb_input_size; + __u16 ntb_max_datagrams; + __u16 reserved; }; struct gsi_ctrl_pkt { diff --git a/include/uapi/linux/usb/usb_ctrl_qti.h b/include/uapi/linux/usb/usb_ctrl_qti.h index 91c163316b31..40efc597719c 100644 --- a/include/uapi/linux/usb/usb_ctrl_qti.h +++ b/include/uapi/linux/usb/usb_ctrl_qti.h @@ -15,6 +15,12 @@ #define QTI_CTRL_DATA_BUF_INFO \ _IOR(QTI_CTRL_IOCTL_MAGIC, 6, struct data_buf_info) +#define GSI_MBIM_IOCTL_MAGIC 'o' +#define GSI_MBIM_GET_NTB_SIZE _IOR(GSI_MBIM_IOCTL_MAGIC, 2, __u32) +#define GSI_MBIM_GET_DATAGRAM_COUNT _IOR(GSI_MBIM_IOCTL_MAGIC, 3, __u16) +#define GSI_MBIM_EP_LOOKUP _IOR(GSI_MBIM_IOCTL_MAGIC, 4, struct ep_info) +#define GSI_MBIM_GPS_USB_STATUS _IOR(GSI_MBIM_IOCTL_MAGIC, 5, int) + enum peripheral_ep_type { DATA_EP_TYPE_RESERVED = 0x0, DATA_EP_TYPE_HSIC = 0x1,