From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755179AbcIEIRd (ORCPT ); Mon, 5 Sep 2016 04:17:33 -0400 Received: from mail-yw0-f180.google.com ([209.85.161.180]:34620 "EHLO mail-yw0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754802AbcIEIR3 (ORCPT ); Mon, 5 Sep 2016 04:17:29 -0400 MIME-Version: 1.0 In-Reply-To: <363fc241-8220-2706-778c-706aec076d49@rock-chips.com> References: <9de99671750430d7d80a8f351c0ec7a7088c9b00.1472635587.git.baolin.wang@linaro.org> <363fc241-8220-2706-778c-706aec076d49@rock-chips.com> From: Baolin Wang Date: Mon, 5 Sep 2016 16:17:19 +0800 Message-ID: Subject: Re: [PATCH v3] mmc: core: Optimize the mmc erase size alignment To: Shawn Lin Cc: Ulf Hansson , Adrian Hunter , Russell King , Douglas Anderson , =?UTF-8?Q?Heiko_St=C3=BCbner?= , David Jander , Hans de Goede , linux-mmc , LKML , Mark Brown , Linus Walleij Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Shawn, On 2 September 2016 at 16:34, Shawn Lin wrote: > Hi Baolin, > > On 2016/8/31 17:32, Baolin Wang wrote: >> >> Before issuing mmc_erase() function, users always have checked if it can >> erase with mmc_can_erase/trim/discard() function, thus remove the >> redundant >> erase checking in mmc_erase() function. >> >> This patch also optimizes the erase start/end sector alignment with > > > It implies you could split this patch into two for dealing with diff > things. :) Otherwise, you could add my test tag, Yes, I will split it into two separate patches and thanks for your testing. > > Tested-by: Shawn Lin > > >> round_up()/round_down() function, when erase command is MMC_ERASE_ARG. >> >> Signed-off-by: Baolin Wang >> --- >> Changes since v2: >> - Add nr checking and other optimization in mmc_erase() function. >> >> Changes since v1: >> - Add the alignment if card->erase_size is not power of 2. >> --- >> drivers/mmc/core/core.c | 82 >> ++++++++++++++++++++++++++++++----------------- >> 1 file changed, 53 insertions(+), 29 deletions(-) >> >> diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c >> index e55cde6..52156d4 100644 >> --- a/drivers/mmc/core/core.c >> +++ b/drivers/mmc/core/core.c >> @@ -2202,6 +2202,51 @@ out: >> return err; >> } >> >> +static unsigned int mmc_align_erase_size(struct mmc_card *card, >> + unsigned int *from, >> + unsigned int *to, >> + unsigned int nr) >> +{ >> + unsigned int from_new = *from, nr_new = nr, rem; >> + >> + if (is_power_of_2(card->erase_size)) { >> + unsigned int temp = from_new; >> + >> + from_new = round_up(temp, card->erase_size); >> + rem = from_new - temp; >> + >> + if (nr_new > rem) >> + nr_new -= rem; >> + else >> + return 0; >> + >> + nr_new = round_down(nr_new, card->erase_size); >> + } else { >> + rem = from_new % card->erase_size; >> + if (rem) { >> + rem = card->erase_size - rem; >> + from_new += rem; >> + if (nr_new > rem) >> + nr_new -= rem; >> + else >> + return 0; >> + } >> + >> + rem = nr_new % card->erase_size; >> + if (rem) >> + nr_new -= rem; >> + } >> + >> + if (nr_new == 0) >> + return 0; >> + >> + /* 'from' and 'to' are inclusive */ >> + *to = from_new + nr_new - 1; >> + *from = from_new; >> + >> + return nr_new; >> +} >> + >> /** >> * mmc_erase - erase sectors. >> * @card: card to erase >> @@ -2217,13 +2262,6 @@ int mmc_erase(struct mmc_card *card, unsigned int >> from, unsigned int nr, >> unsigned int rem, to = from + nr; >> int err; >> >> - if (!(card->host->caps & MMC_CAP_ERASE) || >> - !(card->csd.cmdclass & CCC_ERASE)) >> - return -EOPNOTSUPP; >> - >> - if (!card->erase_size) >> - return -EOPNOTSUPP; >> - >> if (mmc_card_sd(card) && arg != MMC_ERASE_ARG) >> return -EOPNOTSUPP; >> >> @@ -2240,31 +2278,17 @@ int mmc_erase(struct mmc_card *card, unsigned int >> from, unsigned int nr, >> return -EINVAL; >> } >> >> - if (arg == MMC_ERASE_ARG) { >> - rem = from % card->erase_size; >> - if (rem) { >> - rem = card->erase_size - rem; >> - from += rem; >> - if (nr > rem) >> - nr -= rem; >> - else >> - return 0; >> - } >> - rem = nr % card->erase_size; >> - if (rem) >> - nr -= rem; >> - } >> - >> if (nr == 0) >> return 0; >> >> - to = from + nr; >> - >> - if (to <= from) >> - return -EINVAL; >> - >> - /* 'from' and 'to' are inclusive */ >> - to -= 1; >> + if (arg == MMC_ERASE_ARG) { >> + nr = mmc_align_erase_size(card, &from, &to, nr); >> + if (nr == 0) >> + return 0; >> + } else { >> + /* 'from' and 'to' are inclusive */ >> + to -= 1; >> + } >> >> /* >> * Special case where only one erase-group fits in the timeout >> budget: >> > > > -- > Best Regards > Shawn Lin > -- Baolin.wang Best Regards