commit 60d648877d1812fdc46b6b912f6e8e6bb9079c98
author Linux Build Service Account <lnxbuild@localhost> Fri Apr 14 14:33:22 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Apr 14 14:33:22 2017 -0700
tree c46d28946e8b276d19407087c90785894e774768
parent 9569cc2e4d55e0fe833f2086796b031f9c67e65e
parent c0c7c9802b05ee53c2eb0375390c8f68e7ea8535

Merge "mmc: card: read the firmware version from ext_csd" into msm-4.9

drivers/mmc/core/mmc.c

diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 91b6001..8060dfd 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -664,6 +664,10 @@
 		 */
 		card->ext_csd.strobe_support = ext_csd[EXT_CSD_STROBE_SUPPORT];
 		card->ext_csd.cmdq_support = ext_csd[EXT_CSD_CMDQ_SUPPORT];
+		card->ext_csd.fw_version = ext_csd[EXT_CSD_FIRMWARE_VERSION];
+		pr_info("%s: eMMC FW version: 0x%02x\n",
+			mmc_hostname(card->host),
+			card->ext_csd.fw_version);
 		if (card->ext_csd.cmdq_support) {
 			/*
 			 * Queue Depth = N + 1,

include/linux/mmc/card.h

diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
index f4d76f0..d9518fb 100644
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
@@ -138,6 +138,7 @@
 	u8			barrier_support;	/* 486 */
 	u8			barrier_en;
 
+	u8			fw_version;		/* 254 */
 	unsigned int            feature_support;
 #define MMC_DISCARD_FEATURE	BIT(0)                  /* CMD38 feature */
 };