From 99bf8cf8fa9d8d58e6cda1567cca3a6918b0c6b6 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_crypto_variant_ops, and struct ufs_hba. Bug: 151154716 Signed-off-by: Greg Kroah-Hartman Change-Id: Ib881e531d87eae1f7a5ca312bd36086d62ccaf94 --- drivers/scsi/ufs/ufshcd.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h index d044ecbb06ad..6577dc68ec6e 100644 --- a/drivers/scsi/ufs/ufshcd.h +++ b/drivers/scsi/ufs/ufshcd.h @@ -43,6 +43,7 @@ #include #include #include +#include #include "ufs.h" #include "ufs_quirks.h" @@ -353,6 +354,11 @@ struct ufs_hba_variant_ops { const union ufs_crypto_cfg_entry *cfg, int slot); void (*event_notify)(struct ufs_hba *hba, 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 */ @@ -915,6 +921,11 @@ struct ufs_hba { #ifdef CONFIG_DEBUG_FS struct dentry *debugfs_root; #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 */