Commit 41e84fe1 authored by Ulf Hansson's avatar Ulf Hansson
Browse files

mmc: core: Drop open coding in mmc_sd_switch() 



The SD_SWITCH (CMD6) is an ADTC type of command with an R1 response, which
can be sent by using the mmc_send_adtc_data(). Let's do that and drop the
open coding in mmc_sd_switch().

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Reviewed-by: default avatarShawn Lin <shawn.lin@rock-chips.com>
Acked-by: default avatarAvri Altman <avri.altman@wdc.com>
Link: https://lore.kernel.org/r/20210504161222.101536-8-ulf.hansson@linaro.org
parent cec18ad9

drivers/mmc/core/sd_ops.c

+7 −31
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 


#include "core.h"

#include "sd_ops.h"

#include "mmc_ops.h"



int mmc_app_cmd(struct mmc_host *host, struct mmc_card *card)

{
@@ -309,43 +310,18 @@ int mmc_app_send_scr(struct mmc_card *card) 
int mmc_sd_switch(struct mmc_card *card, int mode, int group,

	u8 value, u8 *resp)

{

	struct mmc_request mrq = {};

	struct mmc_command cmd = {};

	struct mmc_data data = {};

	struct scatterlist sg;

	u32 cmd_args;



	/* NOTE: caller guarantees resp is heap-allocated */



	mode = !!mode;

	value &= 0xF;

	cmd_args = mode << 31 | 0x00FFFFFF;

	cmd_args &= ~(0xF << (group * 4));

	cmd_args |= value << (group * 4);



	mrq.cmd = &cmd;

	mrq.data = &data;



	cmd.opcode = SD_SWITCH;

	cmd.arg = mode << 31 | 0x00FFFFFF;

	cmd.arg &= ~(0xF << (group * 4));

	cmd.arg |= value << (group * 4);

	cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_ADTC;



	data.blksz = 64;

	data.blocks = 1;

	data.flags = MMC_DATA_READ;

	data.sg = &sg;

	data.sg_len = 1;



	sg_init_one(&sg, resp, 64);



	mmc_set_data_timeout(&data, card);



	mmc_wait_for_req(card->host, &mrq);



	if (cmd.error)

		return cmd.error;

	if (data.error)

		return data.error;



	return 0;

	return mmc_send_adtc_data(card, card->host, SD_SWITCH, cmd_args, resp,

				  64);

}



int mmc_app_sd_status(struct mmc_card *card, void *ssr)