From f45304d0919d8306870297826d342ca3f010823b Mon Sep 17 00:00:00 2001 From: Sahitya Tummala Date: Wed, 30 Jun 2021 11:04:47 +0530 Subject: [PATCH] ANDROID: GKI: mmc: add Android ABI padding to some structures Add ABI padding to some of the data structures to accommodate new eMMC features enablement later. Bug: 192337957 Change-Id: Ica3f96ea004fb89e4b46ef9734864c655cdcd277 Signed-off-by: Sahitya Tummala --- drivers/mmc/core/core.h | 2 ++ include/linux/mmc/card.h | 2 ++ include/linux/mmc/host.h | 1 + 3 files changed, 5 insertions(+) diff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h index db3c9c68875d..dbe7ee457bed 100644 --- a/drivers/mmc/core/core.h +++ b/drivers/mmc/core/core.h @@ -30,6 +30,8 @@ struct mmc_bus_ops { int (*hw_reset)(struct mmc_host *); int (*sw_reset)(struct mmc_host *); bool (*cache_enabled)(struct mmc_host *); + + ANDROID_VENDOR_DATA_ARRAY(1, 2); }; void mmc_attach_bus(struct mmc_host *host, const struct mmc_bus_ops *ops); diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h index 42df06c6b19c..6f13f15e95f0 100644 --- a/include/linux/mmc/card.h +++ b/include/linux/mmc/card.h @@ -313,6 +313,8 @@ struct mmc_card { unsigned int bouncesz; /* Bounce buffer size */ struct workqueue_struct *complete_wq; /* Private workqueue */ + + ANDROID_VENDOR_DATA(1); }; static inline bool mmc_large_sector(struct mmc_card *card) diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index 511b14d76b7c..7891e314599d 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -485,6 +485,7 @@ struct mmc_host { /* Host Software Queue support */ bool hsq_enabled; + ANDROID_VENDOR_DATA(1); ANDROID_OEM_DATA(1); unsigned long private[] ____cacheline_aligned;