> -----Original Message----- > From: Jaehoon Chung [mailto:jh80.chung@xxxxxxxxxxx] > Sent: Monday, August 08, 2011 3:22 PM > To: Dong, Chuanxiao > Cc: Jaehoon Chung; linux-mmc@xxxxxxxxxxxxxxx; Chris Ball; Kyungmin Park; > Hanumath Prasad; svenkatr@xxxxxx > Subject: Re: [PATCH] mmc: support HPI send command > > Hi Chuanxiao. > > Sorry, i couldn't see the below your comment. :) > > Dong, Chuanxiao wrote: > > Hi Chung, > > Glad to see HPI command is useful in our MMC stack. :) > > If this patch can also include a case which uses mmc_interrupt_hpi function, that > would be better. > > > >> -----Original Message----- > >> From: linux-mmc-owner@xxxxxxxxxxxxxxx > >> [mailto:linux-mmc-owner@xxxxxxxxxxxxxxx] On Behalf Of Jaehoon Chung > >> Sent: Monday, August 08, 2011 2:29 PM > >> To: linux-mmc@xxxxxxxxxxxxxxx > >> Cc: Chris Ball; Dong, Chuanxiao; Kyungmin Park; Hanumath Prasad; > >> svenkatr@xxxxxx > >> Subject: [PATCH] mmc: support HPI send command > >> > >> HPI command is defined in eMMC4.41. > >> We didn't use this command. > >> But maybe we need to use HPI command for using eMMC4.5 feature. > >> > >> Many patches related with HPI sent to mailing. > >> (This patch is based on Chuanxiao's patch.) > >> But this patch is added sending function for HPI command. > >> > >> Signed-off-by: Jaehoon Chung <jh80.chung@xxxxxxxxxxx> > >> Signed-off-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx> > >> Signed-off-by: Chuanxiao Dong <chuanxiao.dong@xxxxxxxxx> > >> CC: Hanumath Prasad <hanumath.prasad@xxxxxxxxxxxxxx> > >> > >> --- > >> drivers/mmc/core/core.c | 28 ++++++++++++++++++++++++++++ > >> drivers/mmc/core/mmc.c | 37 > >> ++++++++++++++++++++++++++++++++++++- > >> drivers/mmc/core/mmc_ops.c | 31 +++++++++++++++++++++++++++++++ > >> drivers/mmc/core/mmc_ops.h | 1 + > >> include/linux/mmc/card.h | 4 ++++ > >> include/linux/mmc/core.h | 1 + > >> include/linux/mmc/mmc.h | 3 +++ > >> 7 files changed, 104 insertions(+), 1 deletions(-) > >> > >> diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c > >> index f091b43..a20ff75 100644 > >> --- a/drivers/mmc/core/core.c > >> +++ b/drivers/mmc/core/core.c > >> @@ -346,6 +346,34 @@ int mmc_wait_for_cmd(struct mmc_host *host, struct > >> mmc_command *cmd, int retries > >> > >> EXPORT_SYMBOL(mmc_wait_for_cmd); > >> > >> +int mmc_interrupt_hpi(struct mmc_card *card) > >> +{ > >> + int err; > >> + u32 status; > >> + > >> + BUG_ON(!card); > >> + > >> + if (!card->ext_csd.hpi_en) { > >> + printk(KERN_INFO "Didn't set HPI enable bit!\n"); > >> + return 0; > >> + } > >> + > >> + err = mmc_send_status(card, &status); > >> + if (err) > >> + return err; > >> + > >> + /* If Card status is prg-state, can send HPI command */ > > Yes, this is right. Before sending HPI command, the card should be in prg-state. > But, > > > >> + if (R1_CURRENT_STATE(status) == 7) { > >> + err = mmc_send_hpi_cmd(card, &status); > >> + if (err) > >> + return err; > > When sending HPI command to card, maybe the card is already out of prg-state. > This implementation cannot make sure when sending HPI command, card is > actually in prg-state. > > So if card is already not in prg-state, then you will get some error. For sdhci host > controller, response timeout error will be returned back. So here driver may return > with error. > > Suggest to add some error handling in mmc_send_hpi_cmd to avoid this. If the > error is caused by improper scenario of sending HPI command, then we can ignore > this. > > What do you think? > > Right. maybe at that time, if card is already out of prg-state, we need to control > error. > (this patch initialized just HPI send command, so i think maybe we should fix this > patch in future) > And I will add the code for error-control. The error control should be part of the "HPI send command". If the return value of mmc_send_hpi_cmd() can show user which kind of errors they met, that would be friendly. So suggest to add in mmc_send_hpi_cmd() function. > > i wonder the improper scenario..? interruptible command? The improper scenario I mean is that, the card is not in prg-state but driver still sends out a HPI command to card. Thanks Chuanxiao > > Regards, > Jaehoon chung > > > > >> + } > >> + > >> + return 0; > >> + > >> +} > >> +EXPORT_SYMBOL(mmc_interrupt_hpi); > >> + > >> /** > >> * mmc_set_data_timeout - set the timeout for a data command > >> * @data: data phase for command > >> diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c > >> index 5700b1c..c51ae8c 100644 > >> --- a/drivers/mmc/core/mmc.c > >> +++ b/drivers/mmc/core/mmc.c > >> @@ -402,8 +402,26 @@ static int mmc_read_ext_csd(struct mmc_card *card, > u8 > >> *ext_csd) > >> ext_csd[EXT_CSD_TRIM_MULT]; > >> } > >> > >> - if (card->ext_csd.rev >= 5) > >> + if (card->ext_csd.rev >= 5) { > >> + /* check whether the eMMC card support HPI */ > >> + if (ext_csd[EXT_CSD_HPI_FEATURES] & 0x1) { > >> + card->ext_csd.hpi = 1; > >> + if (ext_csd[EXT_CSD_HPI_FEATURES] & 0x2) > >> + card->ext_csd.hpi_cmd = > >> + MMC_STOP_TRANSMISSION; > >> + else > >> + card->ext_csd.hpi_cmd = > >> + MMC_SEND_STATUS; > >> + > >> + /* > >> + * Indicate the maximum timeout to close > >> + * a command interrupted by HPI > >> + */ > >> + card->ext_csd.out_of_int_time = > >> + ext_csd[EXT_CSD_OUT_OF_INTERRUPT_TIME] * 10; > >> + } > >> card->ext_csd.rel_param = ext_csd[EXT_CSD_WR_REL_PARAM]; > >> +} > >> > >> if (ext_csd[EXT_CSD_ERASED_MEM_CONT]) > >> card->erased_byte = 0xFF; > >> @@ -726,6 +744,23 @@ static int mmc_init_card(struct mmc_host *host, u32 > ocr, > >> } > >> > >> /* > >> + * Enable HPI feature (if supported) > >> + */ > >> + if (card->ext_csd.hpi) { > >> + err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL, > >> + EXT_CSD_HPI_MGMT, 1, 0); > >> + if (err && err != -EBADMSG) > >> + goto free_card; > >> + > >> + if (err) { > >> + printk(KERN_WARNING "%s: Enabling HPI failed\n", > >> + mmc_hostname(card->host)); > >> + err = 0; > >> + } else > >> + card->ext_csd.hpi_en = 1; > >> + } > >> + > >> + /* > >> * Compute bus speed. > >> */ > >> max_dtr = (unsigned int)-1; > >> diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c > >> index 845ce7c..f111907 100644 > >> --- a/drivers/mmc/core/mmc_ops.c > >> +++ b/drivers/mmc/core/mmc_ops.c > >> @@ -547,3 +547,34 @@ int mmc_bus_test(struct mmc_card *card, u8 > bus_width) > >> err = mmc_send_bus_test(card, card->host, MMC_BUS_TEST_R, width); > >> return err; > >> } > >> + > >> +int mmc_send_hpi_cmd(struct mmc_card *card, u32 *status) > >> +{ > >> + struct mmc_command cmd; > >> + unsigned int opcode; > >> + unsigned int flags; > >> + int err; > >> + > >> + opcode = card->ext_csd.hpi_cmd; > >> + if (opcode == MMC_STOP_TRANSMISSION) > >> + flags = MMC_RSP_R1B | MMC_CMD_AC; > >> + else if (opcode == MMC_SEND_STATUS) > >> + flags = MMC_RSP_R1 | MMC_CMD_AC; > >> + > >> + memset(&cmd, 0, sizeof(struct mmc_command)); > >> + cmd.opcode = opcode; > >> + cmd.arg = card->rca << 16 | 1; > >> + cmd.flags = flags; > >> + cmd.cmd_timeout_ms = card->ext_csd.out_of_int_time; > >> + > >> + err = mmc_wait_for_cmd(card->host, &cmd, 0); > >> + if (err) { > > This error may caused by improper scenario of sending HPI command. But not > some response or data error. > > > > Thanks > > Chuanxiao > > > >> + printk(KERN_ERR "error %d interrupting operation" > >> + "HPI command response %#x\n", > >> + err, cmd.resp[0]); > >> + return err; > >> + } > >> + if (status) > >> + *status = cmd.resp[0]; > >> + return 0; > >> +} > >> diff --git a/drivers/mmc/core/mmc_ops.h b/drivers/mmc/core/mmc_ops.h > >> index 9276946..2a6e0db 100644 > >> --- a/drivers/mmc/core/mmc_ops.h > >> +++ b/drivers/mmc/core/mmc_ops.h > >> @@ -17,6 +17,7 @@ int mmc_deselect_cards(struct mmc_host *host); > >> int mmc_go_idle(struct mmc_host *host); > >> int mmc_send_op_cond(struct mmc_host *host, u32 ocr, u32 *rocr); > >> int mmc_all_send_cid(struct mmc_host *host, u32 *cid); > >> +int mmc_send_hpi_cmd(struct mmc_card *card, u32 *status); > >> int mmc_set_relative_addr(struct mmc_card *card); > >> int mmc_send_csd(struct mmc_card *card, u32 *csd); > >> int mmc_send_ext_csd(struct mmc_card *card, u8 *ext_csd); > >> diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h > >> index b460fc2..411054d 100644 > >> --- a/include/linux/mmc/card.h > >> +++ b/include/linux/mmc/card.h > >> @@ -64,10 +64,14 @@ struct mmc_ext_csd { > >> unsigned long long enhanced_area_offset; /* Units: Byte */ > >> unsigned int enhanced_area_size; /* Units: KB */ > >> unsigned int boot_size; /* in bytes */ > >> + bool hpi_en; /* HPI enablebit */ > >> + bool hpi; /* HPI support bit */ > >> + unsigned int hpi_cmd; /* cmd used as HPI */ > >> u8 raw_partition_support; /* 160 */ > >> u8 raw_erased_mem_count; /* 181 */ > >> u8 raw_ext_csd_structure; /* 194 */ > >> u8 raw_card_type; /* 196 */ > >> + u8 out_of_int_time; /* 198 */ > >> u8 raw_s_a_timeout; /* 217 */ > >> u8 raw_hc_erase_gap_size; /* 221 */ > >> u8 raw_erase_timeout_mult; /* 223 */ > >> diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h > >> index b8b1b7a..dca3c08 100644 > >> --- a/include/linux/mmc/core.h > >> +++ b/include/linux/mmc/core.h > >> @@ -136,6 +136,7 @@ struct mmc_async_req; > >> > >> extern struct mmc_async_req *mmc_start_req(struct mmc_host *, > >> struct mmc_async_req *, int *); > >> +extern int mmc_interrupt_hpi(struct mmc_card *); > >> extern void mmc_wait_for_req(struct mmc_host *, struct mmc_request *); > >> extern int mmc_wait_for_cmd(struct mmc_host *, struct mmc_command *, > int); > >> extern int mmc_app_cmd(struct mmc_host *, struct mmc_card *); > >> diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/mmc.h > >> index 5a794cb..e16c776 100644 > >> --- a/include/linux/mmc/mmc.h > >> +++ b/include/linux/mmc/mmc.h > >> @@ -272,6 +272,7 @@ struct _mmc_csd { > >> > >> #define EXT_CSD_PARTITION_ATTRIBUTE 156 /* R/W */ > >> #define EXT_CSD_PARTITION_SUPPORT 160 /* RO */ > >> +#define EXT_CSD_HPI_MGMT 161 /* R/W */ > >> #define EXT_CSD_WR_REL_PARAM 166 /* RO */ > >> #define EXT_CSD_ERASE_GROUP_DEF 175 /* R/W */ > >> #define EXT_CSD_PART_CONFIG 179 /* R/W */ > >> @@ -281,6 +282,7 @@ struct _mmc_csd { > >> #define EXT_CSD_REV 192 /* RO */ > >> #define EXT_CSD_STRUCTURE 194 /* RO */ > >> #define EXT_CSD_CARD_TYPE 196 /* RO */ > >> +#define EXT_CSD_OUT_OF_INTERRUPT_TIME 198 /* RO */ > >> #define EXT_CSD_PART_SWITCH_TIME 199 /* RO */ > >> #define EXT_CSD_SEC_CNT 212 /* RO, 4 bytes */ > >> #define EXT_CSD_S_A_TIMEOUT 217 /* RO */ > >> @@ -293,6 +295,7 @@ struct _mmc_csd { > >> #define EXT_CSD_SEC_ERASE_MULT 230 /* RO */ > >> #define EXT_CSD_SEC_FEATURE_SUPPORT 231 /* RO */ > >> #define EXT_CSD_TRIM_MULT 232 /* RO */ > >> +#define EXT_CSD_HPI_FEATURES 503 /* RO */ > >> > >> /* > >> * EXT_CSD field definitions > >> -- > >> To unsubscribe from this list: send the line "unsubscribe linux-mmc" in > >> the body of a message to majordomo@xxxxxxxxxxxxxxx > >> More majordomo info at http://vger.kernel.org/majordomo-info.html > > -- > > To unsubscribe from this list: send the line "unsubscribe linux-mmc" in > > the body of a message to majordomo@xxxxxxxxxxxxxxx > > More majordomo info at http://vger.kernel.org/majordomo-info.html > > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
