forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

usb: gadget: transfer_type depends on CONFIG_NO_GKI

Browse source 
'struct dwc3_ep at core.h:704:1' changed (indirectly):
  type size changed from 1792 to 1856 (in bits)
  there are data member changes:
    type 'struct usb_ep' of 'dwc3_ep::endpoint' changed:
      type size changed from 576 to 640 (in bits)
      1 data member insertion:
        'u8 transfer_type', at offset 576 (in bits) at gadget.h:246:1
      93 impacted interfaces
    21 ('list_head cancelled_list' .. 'u64 android_kabi_reserved2') offsets changed (by +64 bits)
  2 impacted interfaces

Fixes: bcf7606d61 ("usb: gadget: add transfer_type in struct usb_ep for rockchip")
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: If7b276a054a18e6f49e59def6a4edf5ce4f3b694
This commit is contained in:
Tao Huang 2021-07-19 19:57:22 +08:00
commit 866525fd9f
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/usb/gadget/epautoconf.c
View file

@ -67,7 +67,7 @@ struct usb_ep *usb_ep_autoconfig_ss(
)
{
struct usb_ep *ep;
#ifdef CONFIG_ARCH_ROCKCHIP
#if defined(CONFIG_ARCH_ROCKCHIP) && defined(CONFIG_NO_GKI)
u8 type = desc->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK;
#endif
@ -113,7 +113,7 @@ found_ep:
ep->desc = NULL;
ep->comp_desc = NULL;
ep->claimed = true;
#ifdef CONFIG_ARCH_ROCKCHIP
#if defined(CONFIG_ARCH_ROCKCHIP) && defined(CONFIG_NO_GKI)
ep->transfer_type = type;
if (gadget_is_superspeed(gadget) && ep_comp) {
switch (type) {

2
include/linux/usb/gadget.h
View file

@ -242,7 +242,7 @@ struct usb_ep {
u8 address;
const struct usb_endpoint_descriptor *desc;
const struct usb_ss_ep_comp_descriptor *comp_desc;
#ifdef CONFIG_ARCH_ROCKCHIP
#if defined(CONFIG_ARCH_ROCKCHIP) && defined(CONFIG_NO_GKI)
u8 transfer_type;
#endif
};