From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A4B1BC433EF for ; Wed, 29 Jun 2022 13:19:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233617AbiF2NTE (ORCPT ); Wed, 29 Jun 2022 09:19:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52428 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231658AbiF2NTD (ORCPT ); Wed, 29 Jun 2022 09:19:03 -0400 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5418E205C9; Wed, 29 Jun 2022 06:19:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656508742; x=1688044742; h=message-id:date:mime-version:subject:to:references:from: in-reply-to:content-transfer-encoding; bh=CQ3A9GaBdJXDZqSlJ5aTJtxYUWa+6jdkJd0vjc9gowg=; b=Bx7wAwgvYWLlV6Gn77Fdu3OWzCwdQDFHJVOYznphfnOlTcNI+KNu5sY6 TvB3vaCI0q39h+lFv9kumK155+/LlX8ciqGnMas4quiFFh+kgnliiSl52 fe7i+OeV0OnsGGGu5ZIbgpMSxukmNmt9v97sN38HbiSlPdvjaBrqP2dqD 3lPD28hW7GCwkf3EVNuu0LUF9NdmPMdoR7hj4Llv01oVLURT86V2lGxui oLLdgMq2+X0OCfHl4Q4LgMnZDMZWw4ufvL+Hpll5zkmXLm/P8LMvPghLV ekPDJb5JPHBE/Oci/4ZOrgPDF74cKYonrgw1hsNAzaBT5rqCc44L5Ejgq w==; X-IronPort-AV: E=McAfee;i="6400,9594,10392"; a="261828270" X-IronPort-AV: E=Sophos;i="5.92,231,1650956400"; d="scan'208";a="261828270" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jun 2022 06:19:01 -0700 X-IronPort-AV: E=Sophos;i="5.92,231,1650956400"; d="scan'208";a="647391167" Received: from ahunter6-mobl1.ger.corp.intel.com (HELO [10.0.2.15]) ([10.252.49.39]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jun 2022 06:19:00 -0700 Message-ID: <23a08ba1-c211-583b-0001-238b44fd6936@intel.com> Date: Wed, 29 Jun 2022 16:18:55 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Firefox/91.0 Thunderbird/91.9.1 Subject: Re: [PATCHv3] mmc: block: Add single read for 4k sector cards Content-Language: en-US To: Christian Loehle , Avri Altman , "ulf.hansson@linaro.org" , "linux-mmc@vger.kernel.org" , "linux-kernel@vger.kernel.org" References: From: Adrian Hunter Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 28/06/22 16:30, Christian Loehle wrote: > Cards with 4k native sector size may only be read 4k-aligned, > accommodate for this in the single read recovery and use it. > > Fixes: 81196976ed946 (mmc: block: Add blk-mq support) > Signed-off-by: Christian Loehle > --- > drivers/mmc/core/block.c | 27 +++++++++++++-------------- > 1 file changed, 13 insertions(+), 14 deletions(-) > > diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c > index f4a1281658db..7b73d77687b1 100644 > --- a/drivers/mmc/core/block.c > +++ b/drivers/mmc/core/block.c > @@ -176,7 +176,7 @@ static inline int mmc_blk_part_switch(struct mmc_card *card, > unsigned int part_type); > static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq, > struct mmc_card *card, > - int disable_multi, > + int recovery_mode, > struct mmc_queue *mq); > static void mmc_blk_hsq_req_done(struct mmc_request *mrq); > > @@ -1302,7 +1302,7 @@ static void mmc_blk_eval_resp_error(struct mmc_blk_request *brq) > } > > static void mmc_blk_data_prep(struct mmc_queue *mq, struct mmc_queue_req *mqrq, > - int disable_multi, bool *do_rel_wr_p, > + int recovery_mode, bool *do_rel_wr_p, > bool *do_data_tag_p) > { > struct mmc_blk_data *md = mq->blkdata; > @@ -1368,12 +1368,12 @@ static void mmc_blk_data_prep(struct mmc_queue *mq, struct mmc_queue_req *mqrq, > brq->data.blocks--; > > /* > - * After a read error, we redo the request one sector > + * After a read error, we redo the request one (native) sector > * at a time in order to accurately determine which > * sectors can be read successfully. > */ > - if (disable_multi) > - brq->data.blocks = 1; > + if (recovery_mode) > + brq->data.blocks = queue_physical_block_size(mq->queue) >> 9; > > /* > * Some controllers have HW issues while operating > @@ -1590,7 +1590,7 @@ static int mmc_blk_cqe_issue_rw_rq(struct mmc_queue *mq, struct request *req) > > static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq, > struct mmc_card *card, > - int disable_multi, > + int recovery_mode, > struct mmc_queue *mq) > { > u32 readcmd, writecmd; > @@ -1599,7 +1599,7 @@ static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq, > struct mmc_blk_data *md = mq->blkdata; > bool do_rel_wr, do_data_tag; > > - mmc_blk_data_prep(mq, mqrq, disable_multi, &do_rel_wr, &do_data_tag); > + mmc_blk_data_prep(mq, mqrq, recovery_mode, &do_rel_wr, &do_data_tag); > > brq->mrq.cmd = &brq->cmd; > > @@ -1690,7 +1690,7 @@ static int mmc_blk_fix_state(struct mmc_card *card, struct request *req) > > #define MMC_READ_SINGLE_RETRIES 2 > > -/* Single sector read during recovery */ > +/* Single (native) sector read during recovery */ > static void mmc_blk_read_single(struct mmc_queue *mq, struct request *req) > { > struct mmc_queue_req *mqrq = req_to_mmc_queue_req(req); > @@ -1698,6 +1698,7 @@ static void mmc_blk_read_single(struct mmc_queue *mq, struct request *req) > struct mmc_card *card = mq->card; > struct mmc_host *host = card->host; > blk_status_t error = BLK_STS_OK; > + size_t bytes_per_read = queue_physical_block_size(mq->queue); > > do { > u32 status; > @@ -1732,13 +1733,13 @@ static void mmc_blk_read_single(struct mmc_queue *mq, struct request *req) > else > error = BLK_STS_OK; > > - } while (blk_update_request(req, error, 512)); > + } while (blk_update_request(req, error, bytes_per_read)); > > return; > > error_exit: > mrq->data->bytes_xfered = 0; > - blk_update_request(req, BLK_STS_IOERR, 512); > + blk_update_request(req, BLK_STS_IOERR, bytes_per_read); > /* Let it try the remaining request again */ > if (mqrq->retries > MMC_MAX_RETRIES - 1) > mqrq->retries = MMC_MAX_RETRIES - 1; > @@ -1879,10 +1880,8 @@ static void mmc_blk_mq_rw_recovery(struct mmc_queue *mq, struct request *req) > return; > } > > - /* FIXME: Missing single sector read for large sector size */ > - if (!mmc_large_sector(card) && rq_data_dir(req) == READ && > - brq->data.blocks > 1) { > - /* Read one sector at a time */ > + if (rq_data_dir(req) == READ && brq->data.blocks > 1) { brq->data.blocks > 1 would be brq->data.blocks > 8 for mmc_large_sector, right? I guess it doesn't matter much. > + /* Read one (native) sector at a time */ > mmc_blk_read_single(mq, req); > return; > }