From 5dfea78d006a683dd5ac939ff13b23f5b0c656b5 Mon Sep 17 00:00:00 2001 From: Satya Tangirala Date: Thu, 23 Apr 2020 07:15:03 +0000 Subject: [PATCH] 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 --- drivers/scsi/ufs/ufshcd.h | 2 ++ include/linux/mmc/host.h | 1 + 2 files changed, 3 insertions(+) diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h index 8babb0f91ef9..7772ef07d348 100644 --- a/drivers/scsi/ufs/ufshcd.h +++ b/drivers/scsi/ufs/ufshcd.h @@ -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); diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index ea4996b0ac64..b6e7b42e4665 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -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 */