ANDROID: Add padding for crypto related structs in UFS and MMC

Add padding to ufshcd_host and ufshcd_hba_variant_ops UFS, and mmc_host
in MMC to allow expansions in future if necessary, while keeping the
ABI stable. These fields are only for the purposes of keeping the ABI
stable, and in particular are *NOT* for vendor use.

Bug: 153512828
Bug: 144046242
Bug: 137270441
Change-Id: I7b780680bf3e8a3121c6f77b35a2a16d41f3bea6
Signed-off-by: Satya Tangirala <satyat@google.com>
This commit is contained in:
Satya Tangirala 2020-04-23 07:15:03 +00:00
commit 5dfea78d00
2 changed files with 3 additions and 0 deletions

View file

@ -388,6 +388,7 @@ struct ufs_hba_crypto_variant_ops {
struct scsi_cmnd *cmd,
struct ufshcd_lrb *lrbp);
void *priv;
void *crypto_DO_NOT_USE[8];
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
@ -822,6 +823,7 @@ struct ufs_hba {
union ufs_crypto_cap_entry *crypto_cap_array;
u32 crypto_cfg_register;
struct keyslot_manager *ksm;
void *crypto_DO_NOT_USE[8];
#endif /* CONFIG_SCSI_UFS_CRYPTO */
ANDROID_KABI_RESERVE(1);

View file

@ -465,6 +465,7 @@ struct mmc_host {
bool cqe_on;
#ifdef CONFIG_MMC_CRYPTO
struct keyslot_manager *ksm;
void *crypto_DO_NOT_USE[7];
#endif /* CONFIG_MMC_CRYPTO */
/* Host Software Queue support */