From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161201AbcFAJTy (ORCPT ); Wed, 1 Jun 2016 05:19:54 -0400 Received: from mout.perfora.net ([74.208.4.196]:59144 "EHLO mout.perfora.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161044AbcFAJTv convert rfc822-to-8bit (ORCPT ); Wed, 1 Jun 2016 05:19:51 -0400 Message-ID: <1464772746.3079.4.camel@ziswiler.com> Subject: Re: [PATCH 1/3] mmc: fix mmc mode selection for HS-DDR and higher From: Marcel Ziswiler To: Chen-Yu Tsai , Ulf Hansson , Maxime Ripard Cc: Hans de Goede , linux-mmc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Arnd Bergmann , linux-tegra@vger.kernel.org Date: Wed, 01 Jun 2016 11:19:06 +0200 In-Reply-To: <1464505484-3661-2-git-send-email-wens@csie.org> References: <1464505484-3661-1-git-send-email-wens@csie.org> <1464505484-3661-2-git-send-email-wens@csie.org> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.18.5.2 (3.18.5.2-1.fc23) Mime-Version: 1.0 Content-Transfer-Encoding: 8BIT X-Provags-ID: V03:K0:8jVpgUJnkF5aJu5Li+7o74c0gpCwESU9PUjCRKClaqnozD6QUqb M4DfAODDXZffxJXENXXmCal/9RoPDij4e48qRhb0bHWW34swOqTh7CnueHZuTiijOeGu5ZM xw/8sheU24L0QD6KHRv1/FtiXXKqHHIto1oIACQr/gUNLwuTcdyh4/aHdV+GQPua2bhQGEt jmjaHDs3c//SLZQN+KZkw== X-UI-Out-Filterresults: notjunk:1;V01:K0:UMCxVXbEASw=:xhEbci4RtjWGpI7+vFLhii O9IFngqTrESJhJ5FJs8vczzWTh6/Fy3p7RgZSK+7FRjO0DW2sJeuev6eMosqhMVWOwOs8Gl62 UayMjThx98hR51IiHJw3UdDvyNtqTB25MGY8CGyqE3wg4tur5yYKZvSvdwws5uYPEb4JlbKlL SFSqB1XddSUYwD6wFRmexMMLyocTMtORUoZ83X823XnSSmGKacwCxKg982Q4AfrjmzB2XvUhQ GN/Emi3hxn4gnSVX9eZRd0wZtHdPNMRu0jcWI/9nTumWUOwHBN9hfhVgfDAan3NePY5hiIaVc SzIAMDkdSHIrdSPyvgY05JTdzrJhxnmLXKDnOGrAQM3oYzFCvLNghFDAcWzGGpy7RgIfLq/08 kW1aklqXxShJy6BKVgUtF3eaqkK/cRI1xJRVNfnL5/LHGOrKpJmHE94ypc9UUPoC2tm+jr2+n 3AyXa4CJNiu8MhCMZ02uYKJWhID40K00MMA+5FP7KSO5ZOQ5/uW3MNhbu/uJRobTOk66B7jvN cPnkUwOCWWJ6/f2kOTHlikgkmFQUpHV+RGlruqQg1Cuz3yx73HhnqG/yv0qOGL1/xODUbOGr5 fKQ8q7Jjx2GJ5Dv/RGMB/RlPfZ9EyV1UV401Fzap0Obb2pkpFN9ZmTnH94PS2D07UHJnHFW+d 5FM+ZA4ooDAUSifSZOatm2yf+ll2sxrKS/kDsZ7YwUkA1vFwnyjfPvARhgE65DRWsms8cVg1W YK3GcZ3T4C8IAreR Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, 2016-05-29 at 15:04 +0800, Chen-Yu Tsai wrote: > When IS_ERR_VALUE was removed from the mmc core code, it was replaced > with a simple not-zero check. This does not work, as the value > checked > is the return value for mmc_select_bus_width, which returns the set > bit width on success. This made eMMC modes higher than HS-DDR > unusable. > > Fix this by checking for a positive return value instead. > > Fixes: 287980e49ffc ("remove lots of IS_ERR_VALUE abuses") > Cc: Arnd Bergmann > Signed-off-by: Chen-Yu Tsai This fixes the following eMMC issue as experienced on Apalis T30 as well: [    7.194625] mmc1: mmc_select_hs200 failed, error 3 [    7.201549] mmc1: error 3 whilst initialising MMC card Tested-by: Marcel Ziswiler > --- >  drivers/mmc/core/mmc.c | 4 ++-- >  1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c > index c984321d1881..aafb73d080ca 100644 > --- a/drivers/mmc/core/mmc.c > +++ b/drivers/mmc/core/mmc.c > @@ -1276,7 +1276,7 @@ static int mmc_select_hs200(struct mmc_card > *card) >    * switch to HS200 mode if bus width is set successfully. >    */ >   err = mmc_select_bus_width(card); > - if (!err) { > + if (err > 0) { >   val = EXT_CSD_TIMING_HS200 | >         card->drive_strength << EXT_CSD_DRV_STR_SHIFT; >   err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL, > @@ -1583,7 +1583,7 @@ static int mmc_init_card(struct mmc_host *host, > u32 ocr, >   } else if (mmc_card_hs(card)) { >   /* Select the desired bus width optionally */ >   err = mmc_select_bus_width(card); > - if (!err) { > + if (err > 0) { >   err = mmc_select_hs_ddr(card); >   if (err) >   goto free_card;