[v5,2/2] mmc: core: Optimize the mmc erase size alignment
diff mbox

Message ID bc52ccbc0c22e2d2f795d75faf748e4e68900e51.1473215578.git.baolin.wang@linaro.org
State New
Headers show

Commit Message

(Exiting) Baolin Wang Sept. 7, 2016, 2:38 a.m. UTC
In most cases the 'card->erase_size' is power of 2, then the round_up/down()
function is more efficient than '%' operation when the 'card->erase_size' is
power of 2.

Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
Tested-by: Shawn Lin <shawn.lin@rock-chips.com>
---
 drivers/mmc/core/core.c |   34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

Comments

Ulf Hansson Sept. 9, 2016, 9:46 a.m. UTC | #1
On 7 September 2016 at 04:38, Baolin Wang <baolin.wang@linaro.org> wrote:
> In most cases the 'card->erase_size' is power of 2, then the round_up/down()
> function is more efficient than '%' operation when the 'card->erase_size' is
> power of 2.
>
> Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
> Tested-by: Shawn Lin <shawn.lin@rock-chips.com>

Thanks, applied for next!

Kind regards
Uffe

> ---
>  drivers/mmc/core/core.c |   34 ++++++++++++++++++++++++++--------
>  1 file changed, 26 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
> index 11b4897..4264ac6 100644
> --- a/drivers/mmc/core/core.c
> +++ b/drivers/mmc/core/core.c
> @@ -2209,19 +2209,37 @@ static unsigned int mmc_align_erase_size(struct mmc_card *card,
>  {
>         unsigned int from_new = *from, nr_new = nr, rem;
>
> -       rem = from_new % card->erase_size;
> -       if (rem) {
> -               rem = card->erase_size - rem;
> -               from_new += rem;
> +       /*
> +        * When the 'card->erase_size' is power of 2, we can use round_up/down()
> +        * to align the erase size efficiently.
> +        */
> +       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;
> -       }
>
> -       rem = nr_new % card->erase_size;
> -       if (rem)
> -               nr_new -= rem;
> +               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;
> --
> 1.7.9.5
>
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch
diff mbox

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 11b4897..4264ac6 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -2209,19 +2209,37 @@  static unsigned int mmc_align_erase_size(struct mmc_card *card,
 {
 	unsigned int from_new = *from, nr_new = nr, rem;
 
-	rem = from_new % card->erase_size;
-	if (rem) {
-		rem = card->erase_size - rem;
-		from_new += rem;
+	/*
+	 * When the 'card->erase_size' is power of 2, we can use round_up/down()
+	 * to align the erase size efficiently.
+	 */
+	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;
-	}
 
-	rem = nr_new % card->erase_size;
-	if (rem)
-		nr_new -= rem;
+		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;