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

Try to mitigate potential future driver core api changes by adding
padding to struct ufs_hba_crypto_variant_ops, and struct ufs_hba.

Bug: 151154716
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ib881e531d87eae1f7a5ca312bd36086d62ccaf94
This commit is contained in:
Greg Kroah-Hartman
2020-04-22 15:35:41 +02:00
committed by Todd Kjos
parent 9df147298f
commit 99bf8cf8fa

View File

@@ -43,6 +43,7 @@
#include <scsi/scsi_tcq.h> #include <scsi/scsi_tcq.h>
#include <scsi/scsi_dbg.h> #include <scsi/scsi_dbg.h>
#include <scsi/scsi_eh.h> #include <scsi/scsi_eh.h>
#include <linux/android_kabi.h>
#include "ufs.h" #include "ufs.h"
#include "ufs_quirks.h" #include "ufs_quirks.h"
@@ -353,6 +354,11 @@ struct ufs_hba_variant_ops {
const union ufs_crypto_cfg_entry *cfg, int slot); const union ufs_crypto_cfg_entry *cfg, int slot);
void (*event_notify)(struct ufs_hba *hba, void (*event_notify)(struct ufs_hba *hba,
enum ufs_event_type evt, void *data); enum ufs_event_type evt, void *data);
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
ANDROID_KABI_RESERVE(3);
ANDROID_KABI_RESERVE(4);
}; };
/* clock gating state */ /* clock gating state */
@@ -915,6 +921,11 @@ struct ufs_hba {
#ifdef CONFIG_DEBUG_FS #ifdef CONFIG_DEBUG_FS
struct dentry *debugfs_root; struct dentry *debugfs_root;
#endif #endif
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
ANDROID_KABI_RESERVE(3);
ANDROID_KABI_RESERVE(4);
}; };
/* Returns true if clocks can be gated. Otherwise false */ /* Returns true if clocks can be gated. Otherwise false */