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

Commit 41e2a489 authored by Philip Rakity's avatar Philip Rakity Committed by Chris Ball
Browse files

mmc: Ensure linux starts in eMMC user partition 



uBoot sometimes leaves eMMC pointing to the private boot partition.
Ensure we always start looking at the user partition.

Signed-off-by: default avatarPhilip Rakity <prakity@marvell.com>
Signed-off-by: default avatarBruce Clemens <bpclemens@marvell.com>
Signed-off-by: default avatarMark F. Brown <markb@marvell.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 7c21738e

drivers/mmc/core/mmc.c

+10 −0
Original line number Diff line number Diff line
@@ -288,6 +288,7 @@ static int mmc_read_ext_csd(struct mmc_card *card) 


	if (card->ext_csd.rev >= 3) {

		u8 sa_shift = ext_csd[EXT_CSD_S_A_TIMEOUT];

		card->ext_csd.bootconfig = ext_csd[EXT_CSD_BOOT_CONFIG];



		/* Sleep / awake timeout in 100ns units */

		if (sa_shift > 0 && sa_shift <= 0x17)
@@ -567,6 +568,15 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, 
		}

	}



	/*

	 * Ensure eMMC user default partition is enabled

	 */

	if (card->ext_csd.bootconfig & 0x7) {

		card->ext_csd.bootconfig &= ~0x7;

		mmc_switch(card, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_BOOT_CONFIG,

			   card->ext_csd.bootconfig);

	}



	/*

	 * Activate high speed (if supported)

	 */

include/linux/mmc/card.h

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ struct mmc_ext_csd { 
	u8			rev;

	u8			erase_group_def;

	u8			sec_feature_support;

	u8			bootconfig;

	unsigned int		sa_timeout;		/* Units: 100ns */

	unsigned int		hs_max_dtr;

	unsigned int		sectors;

include/linux/mmc/mmc.h

+1 −0
Original line number Diff line number Diff line
@@ -256,6 +256,7 @@ struct _mmc_csd { 
#define EXT_CSD_PARTITION_ATTRIBUTE	156	/* R/W */

#define EXT_CSD_PARTITION_SUPPORT	160	/* RO */

#define EXT_CSD_ERASE_GROUP_DEF		175	/* R/W */

#define EXT_CSD_BOOT_CONFIG		179	/* R/W */

#define EXT_CSD_ERASED_MEM_CONT		181	/* RO */

#define EXT_CSD_BUS_WIDTH		183	/* R/W */

#define EXT_CSD_HS_TIMING		185	/* R/W */