shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 10:58:48 +09:00
Code Issues Packages Projects Releases Wiki Activity

ANDROID: GKI: dwc3: add Android ABI padding to some structures

Browse Source 
Try to mitigate potential future driver core api changes by adding
padding to a number of dwc3 structures.

Bug: 151154716
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I1826d885e3acf1f378d0e30b1ca2ddc56b16a9e4
This commit is contained in:
Greg Kroah-Hartman
2021-04-23 13:36:07 +02:00
committed by Carlos Llamas
parent faf9904e25
commit 807752459e
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/usb/dwc3/core.h
View File

@@ -22,6 +22,7 @@
#include <linux/debugfs.h> #include <linux/debugfs.h>
#include <linux/wait.h> #include <linux/wait.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <linux/android_kabi.h>
#include <linux/usb/ch9.h> #include <linux/usb/ch9.h>
#include <linux/usb/gadget.h> #include <linux/usb/gadget.h>
@@ -678,6 +679,8 @@ struct dwc3_event_buffer {
dma_addr_t dma; dma_addr_t dma;
struct dwc3 *dwc; struct dwc3 *dwc;
ANDROID_KABI_RESERVE(1);
}; };
#define DWC3_EP_FLAG_STALLED BIT(0) #define DWC3_EP_FLAG_STALLED BIT(0)
@@ -773,6 +776,7 @@ struct dwc3_ep {
/* For isochronous START TRANSFER workaround only */ /* For isochronous START TRANSFER workaround only */
u8 combo_num; u8 combo_num;
int start_cmd_status; int start_cmd_status;
ANDROID_KABI_RESERVE(1); ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2); ANDROID_KABI_RESERVE(2);
}; };
@@ -886,6 +890,9 @@ struct dwc3_hwparams {
u32 hwparams7; u32 hwparams7;
u32 hwparams8; u32 hwparams8;
u32 hwparams9; u32 hwparams9;
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
}; };
/* HWPARAMS0 */ /* HWPARAMS0 */
@@ -958,7 +965,9 @@ struct dwc3_request {
unsigned int needs_extra_trb:1; unsigned int needs_extra_trb:1;
unsigned int direction:1; unsigned int direction:1;
unsigned int mapped:1; unsigned int mapped:1;
ANDROID_KABI_RESERVE(1); ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
}; };
/* /*
@@ -1341,6 +1350,7 @@ struct dwc3 {
int last_fifo_depth; int last_fifo_depth;
int num_ep_resized; int num_ep_resized;
struct dentry *debug_root; struct dentry *debug_root;
ANDROID_KABI_RESERVE(1); ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2); ANDROID_KABI_RESERVE(2);
ANDROID_KABI_RESERVE(3); ANDROID_KABI_RESERVE(3);