On Thu, Apr 19, 2012 at 7:22 AM, Jaehoon Chung <jh80.chung@xxxxxxxxxxx> wrote:
> Acked-by: Jaehoon Chung <jh80.chung@xxxxxxxxxxx>
>
Thanks Jaehoon Chung.
BTW, would you consider looking into the foreground HPI series ?
Chris,
Can you please take this too for 3.5 ?
> On 04/18/2012 11:45 PM, Venkatraman S wrote:
>
>> mmc_execute_hpi should send the HPI command only
>> once, only if the card is in PRG state.
>>
>> According to eMMC spec, the command's completion time is
>> not dependent on OUT_OF_INTERRUPT_TIME. Only the transition
>> out of PRG STATE is guarded by OUT_OF_INTERRUPT_TIME - which is
>> defined to begin at the end of sending the command itself.
>>
>> Specify the default timeout for the actual sending of HPI
>> command, and then use OUT_OF_INTERRUPT_TIME to wait for
>> the transition out of PRG state.
>>
>> Reported-by: Alex Lemberg <Alex.Lemberg@xxxxxxxxxxx>
>> Signed-off-by: Venkatraman S <svenkatr@xxxxxx>
>> ---
>> drivers/mmc/core/core.c | 44 ++++++++++++++++++++++++--------------------
>> drivers/mmc/core/mmc_ops.c | 1 -
>> 2 files changed, 24 insertions(+), 21 deletions(-)
>>
>> diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
>> index e541efb..4e696e6 100644
>> --- a/drivers/mmc/core/core.c
>> +++ b/drivers/mmc/core/core.c
>> @@ -403,6 +403,7 @@ int mmc_interrupt_hpi(struct mmc_card *card)
>> {
>> int err;
>> u32 status;
>> + unsigned long starttime;
>>
>> BUG_ON(!card);
>>
>> @@ -421,27 +422,30 @@ int mmc_interrupt_hpi(struct mmc_card *card)
>> /*
>> * If the card status is in PRG-state, we can send the HPI command.
>> */
>> - if (R1_CURRENT_STATE(status) == R1_STATE_PRG) {
>> - do {
>> - /*
>> - * We don't know when the HPI command will finish
>> - * processing, so we need to resend HPI until out
>> - * of prg-state, and keep checking the card status
>> - * with SEND_STATUS. If a timeout error occurs when
>> - * sending the HPI command, we are already out of
>> - * prg-state.
>> - */
>> - err = mmc_send_hpi_cmd(card, &status);
>> - if (err)
>> - pr_debug("%s: abort HPI (%d error)\n",
>> - mmc_hostname(card->host), err);
>> + if (R1_CURRENT_STATE(status) != R1_STATE_PRG) {
>> + pr_debug("%s: Can't send HPI: Card state=%d\n",
>> + mmc_hostname(card->host), R1_CURRENT_STATE(status));
>> + err = -EINVAL;
>> + goto out;
>> + }
>>
>> - err = mmc_send_status(card, &status);
>> - if (err)
>> - break;
>> - } while (R1_CURRENT_STATE(status) == R1_STATE_PRG);
>> - } else
>> - pr_debug("%s: Left prg-state\n", mmc_hostname(card->host));
>> + starttime = jiffies;
>> + err = mmc_send_hpi_cmd(card, &status);
>> + if (err) {
>> + pr_debug("%s:HPI could not be sent.err=%d)\n",
>> + mmc_hostname(card->host), err);
>> + goto out;
>> + }
>> +
>> + do {
>> + err = mmc_send_status(card, &status);
>> +
>> + if (!err && R1_CURRENT_STATE(status) == R1_STATE_TRAN)
>> + break;
>> + if (jiffies_to_msecs(jiffies - starttime) >=
>> + card->ext_csd.out_of_int_time)
>> + err = -ETIMEDOUT;
>> + } while (!err);
>>
>> out:
>> mmc_release_host(card->host);
>> diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
>> index 69370f4..0ed2cc5 100644
>> --- a/drivers/mmc/core/mmc_ops.c
>> +++ b/drivers/mmc/core/mmc_ops.c
>> @@ -569,7 +569,6 @@ int mmc_send_hpi_cmd(struct mmc_card *card, u32 *status)
>>
>> cmd.opcode = opcode;
>> cmd.arg = card->rca << 16 | 1;
>> - cmd.cmd_timeout_ms = card->ext_csd.out_of_int_time;
>>
>> err = mmc_wait_for_cmd(card->host, &cmd, 0);
>> if (err) {
>
>
--
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
