From 764e461badf7d45b59c6b984d28c8a6c5f8d809c Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 22 Apr 2020 15:35:41 +0200 Subject: [PATCH] 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_variant_ops, struct ufs_hba_crypto_variant_ops, and struct ufs_hba. Bug: 151154716 Signed-off-by: Greg Kroah-Hartman Change-Id: Ib881e531d87eae1f7a5ca312bd36086d62ccaf94 --- drivers/scsi/ufs/ufshcd.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h index 60fa076834f1..8babb0f91ef9 100644 --- a/drivers/scsi/ufs/ufshcd.h +++ b/drivers/scsi/ufs/ufshcd.h @@ -67,6 +67,7 @@ #include #include #include +#include #include "ufs.h" #include "ufshci.h" @@ -359,6 +360,11 @@ struct ufs_hba_variant_ops { void (*config_scaling_param)(struct ufs_hba *hba, struct devfreq_dev_profile *profile, void *data); + + ANDROID_KABI_RESERVE(1); + ANDROID_KABI_RESERVE(2); + ANDROID_KABI_RESERVE(3); + ANDROID_KABI_RESERVE(4); }; struct keyslot_mgmt_ll_ops; @@ -382,6 +388,11 @@ struct ufs_hba_crypto_variant_ops { struct scsi_cmnd *cmd, struct ufshcd_lrb *lrbp); void *priv; + + ANDROID_KABI_RESERVE(1); + ANDROID_KABI_RESERVE(2); + ANDROID_KABI_RESERVE(3); + ANDROID_KABI_RESERVE(4); }; /* clock gating state */ @@ -812,6 +823,11 @@ struct ufs_hba { u32 crypto_cfg_register; struct keyslot_manager *ksm; #endif /* CONFIG_SCSI_UFS_CRYPTO */ + + 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 */