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

Commit ba2a945b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mmc: card: read the firmware version from ext_csd"

parents 000ec057 6c4fa132

drivers/mmc/core/mmc.c

+4 −0
Original line number Diff line number Diff line
@@ -670,6 +670,10 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd) 
		 */

		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_FW_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

+1 −0
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ struct mmc_ext_csd { 
	u8			barrier_support;	/* 486 */

	u8			barrier_en;



	u8			fw_version;		/* 254 */

	unsigned int            feature_support;

#define MMC_DISCARD_FEATURE	BIT(0)                  /* CMD38 feature */

};

include/linux/mmc/mmc.h

+1 −0
Original line number Diff line number Diff line
@@ -283,6 +283,7 @@ struct _mmc_csd { 
#define EXT_CSD_GENERIC_CMD6_TIME	248	/* RO */

#define EXT_CSD_CACHE_SIZE		249	/* RO, 4 bytes */

#define EXT_CSD_PWR_CL_DDR_200_360	253	/* RO */

#define EXT_CSD_FW_VERSION		254	/* RO */

#define EXT_CSD_CMDQ_DEPTH		307	/* RO */

#define EXT_CSD_CMDQ_SUPPORT		308	/* RO */

#define EXT_CSD_BARRIER_SUPPORT		486	/* RO */