mmc: core: sd: implement proper support for sd3.0 au sizes

Commit Message

Wolfram Sang Jan. 13, 2014, 6:46 p.m. UTC

On Mon, Jan 13, 2014 at 06:04:32PM +0000, Chris Ball wrote:
> Hi Wolfram,
> 
> On Mon, Jan 13 2014, Wolfram Sang wrote:
> > On Tue, Nov 26, 2013 at 02:16:25AM +0100, Wolfram Sang wrote:
> >> This reverts and updates commit 77776fd0a4cc541b9a528eacc1d31ca47eb1ae7a
> >> ("mmc: sd: fix the maximum au_size for SD3.0"). The au_size for SD3.0
> >> cannot be achieved by a simple bit shift, so this needs to be
> >> implemented differently. Also, don't print the warning in case of 0
> >> since 'not defined' is different from 'invalid'.
> >
> > Ping! Chris are you there? This got reviewed and acked, and I'd even
> > think this could be suitable for stable.
> 
> Sorry about that!  I agree, pushed to mmc-next for 3.14 with stable@ tag.

Thanks. As buildbot reports, this will probably need another patch for
blackfin :/ Sorry about that!

From: Wolfram Sang <[e-mail]>
Subject: [PATCH] mmc: core: add #include to support size defintions

Fixes an error found by buildbot on blackfin after adding the fix for
sd3.0 au sizes:

>> drivers/mmc/core/sd.c:49:5: error: 'SZ_16K' undeclared here (not in a function)

Signed-off-by: Wolfram Sang <[e-mail]>
---
 drivers/mmc/core/sd.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Chris Ball Jan. 13, 2014, 7:14 p.m. UTC | #1

Hi,

On Mon, Jan 13 2014, Wolfram Sang wrote:
> diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
> index 6f42050..585d44d 100644
> --- a/drivers/mmc/core/sd.c
> +++ b/drivers/mmc/core/sd.c
> @@ -11,6 +11,7 @@
>   */
>  
>  #include <linux/err.h>
> +#include <linux/sizes.h>
>  #include <linux/slab.h>
>  #include <linux/stat.h>
>  #include <linux/pm_runtime.h>

Thanks, already rebased this change into your original patch, I'll
push the amended version out to mmc-next shortly.

- Chris.

Patch

diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index 6f42050..585d44d 100644
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -11,6 +11,7 @@ 
  */
 
 #include <linux/err.h>
+#include <linux/sizes.h>
 #include <linux/slab.h>
 #include <linux/stat.h>
 #include <linux/pm_runtime.h>