Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72857892 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ib881e531d87eae1f7a5ca312bd36086d62ccaf94
parent b8539473

drivers/scsi/ufs/ufshcd.h

+16 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ 
#include <scsi/scsi_tcq.h>

#include <scsi/scsi_dbg.h>

#include <scsi/scsi_eh.h>

#include <linux/android_kabi.h>



#include "ufs.h"

#include "ufshci.h"
@@ -339,6 +340,11 @@ struct ufs_hba_variant_ops { 
	int	(*phy_initialization)(struct ufs_hba *);

	int	(*program_key)(struct ufs_hba *hba,

			       const union ufs_crypto_cfg_entry *cfg, int slot);



	ANDROID_KABI_RESERVE(1);

	ANDROID_KABI_RESERVE(2);

	ANDROID_KABI_RESERVE(3);

	ANDROID_KABI_RESERVE(4);

};



struct keyslot_mgmt_ll_ops;
@@ -362,6 +368,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  */
@@ -773,6 +784,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 */