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

Commit 7a3e0cb3 authored by Satya Tangirala's avatar Satya Tangirala
Browse files

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: default avatarSatya Tangirala <satyat@google.com>
parent 86556e67

drivers/scsi/ufs/ufshcd.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -359,6 +359,7 @@ struct ufs_hba_crypto_variant_ops { 
				    struct scsi_cmnd *cmd,

				    struct scsi_cmnd *cmd,

				    struct ufshcd_lrb *lrbp);

				    struct ufshcd_lrb *lrbp);

	void *priv;

	void *priv;

	void *crypto_DO_NOT_USE[8];

};

};





/* clock gating state  */

/* clock gating state  */
@@ -740,6 +741,7 @@ struct ufs_hba { 
	union ufs_crypto_cap_entry *crypto_cap_array;

	union ufs_crypto_cap_entry *crypto_cap_array;

	u32 crypto_cfg_register;

	u32 crypto_cfg_register;

	struct keyslot_manager *ksm;

	struct keyslot_manager *ksm;

	void *crypto_DO_NOT_USE[8];

#endif /* CONFIG_SCSI_UFS_CRYPTO */

#endif /* CONFIG_SCSI_UFS_CRYPTO */

};

};

include/linux/mmc/host.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -441,6 +441,7 @@ struct mmc_host { 
	bool			cqe_on;

	bool			cqe_on;

#ifdef CONFIG_MMC_CRYPTO

#ifdef CONFIG_MMC_CRYPTO

	struct keyslot_manager	*ksm;

	struct keyslot_manager	*ksm;

	void *crypto_DO_NOT_USE[7];

#endif /* CONFIG_MMC_CRYPTO */

#endif /* CONFIG_MMC_CRYPTO */





#ifdef CONFIG_MMC_EMBEDDED_SDIO

#ifdef CONFIG_MMC_EMBEDDED_SDIO