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

Commit ed16f58d authored by Adrian Hunter's avatar Adrian Hunter Committed by Ulf Hansson
Browse files

mmc: core: Separate out the mmc_switch status check so it can be re-used 



Make a separate function to do the mmc_switch status check
so it can be re-used. This is preparation for adding support
for HS400 re-tuning.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 436f8daa

drivers/mmc/core/mmc_ops.c

+16 −14
Original line number Diff line number Diff line
@@ -450,6 +450,21 @@ int mmc_spi_set_crc(struct mmc_host *host, int use_crc) 
	return err;

}



int mmc_switch_status_error(struct mmc_host *host, u32 status)

{

	if (mmc_host_is_spi(host)) {

		if (status & R1_SPI_ILLEGAL_COMMAND)

			return -EBADMSG;

	} else {

		if (status & 0xFDFFA000)

			pr_warn("%s: unexpected status %#x after switch\n",

				mmc_hostname(host), status);

		if (status & R1_SWITCH_ERROR)

			return -EBADMSG;

	}

	return 0;

}



/**

 *	__mmc_switch - modify EXT_CSD register

 *	@card: the MMC card associated with the data transfer
@@ -558,20 +573,7 @@ int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value, 
		}

	} while (R1_CURRENT_STATE(status) == R1_STATE_PRG);



	if (mmc_host_is_spi(host)) {

		if (status & R1_SPI_ILLEGAL_COMMAND) {

			err = -EBADMSG;

			goto out;

		}

	} else {

		if (status & 0xFDFFA000)

			pr_warn("%s: unexpected status %#x after switch\n",

				mmc_hostname(host), status);

		if (status & R1_SWITCH_ERROR) {

			err = -EBADMSG;

			goto out;

		}

	}

	err = mmc_switch_status_error(host, status);

out:

	mmc_retune_release(host);

drivers/mmc/core/mmc_ops.h

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ int mmc_spi_set_crc(struct mmc_host *host, int use_crc); 
int mmc_bus_test(struct mmc_card *card, u8 bus_width);

int mmc_send_hpi_cmd(struct mmc_card *card, u32 *status);

int mmc_can_ext_csd(struct mmc_card *card);

int mmc_switch_status_error(struct mmc_host *host, u32 status);



#endif