* Re: [PATCH] mmc, sh: Move MMCIF_PROGRESS_* into sh_mmcif.h
2011-01-10 23:05 [PATCH] mmc, sh: Move MMCIF_PROGRESS_* into sh_mmcif.h Simon Horman
@ 2011-01-11 2:07 ` Paul Mundt
2011-01-11 2:51 ` Simon Horman
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Paul Mundt @ 2011-01-11 2:07 UTC (permalink / raw)
To: linux-sh
On Tue, Jan 11, 2011 at 08:05:49AM +0900, Simon Horman wrote:
> Allow MMCIF_PROGRESS_* to be shared.
>
> Cc: Magnus Damm <magnus.damm@gmail.com>
> Signed-off-by: Simon Horman <horms@verge.net.au>
> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
> ---
> arch/sh/boot/romimage/mmcif-sh7724.c | 3 ---
> include/linux/mmc/sh_mmcif.h | 3 +++
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> Hi Paul,
>
> this change didn't seem to make it into your
> rc1 pull request, although it is present in
> remotes/sh-2.6/common/mmcif.
>
Blast. I thought I had all of the common/mmcif stuff rolled in via
rmobile/mmcif, but it seems this one slipped by. I'll make sure it gets
merged this time around.
> It is needed by "[patch v5] mmc, ARM: Add zboot from MMC support for SuperH
> Mobile ARM", which I was hoping to get Russell to merge post 2.6.38-rc1.
> Perhaps I should just add the enums directly to
> arch/arm/boot/compressed/mmcif-sh7372.c in that patch for now?
>
Optionally you can just push it out without the enums resolved also, the
build target will just fail until the other patch catches up.
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] mmc, sh: Move MMCIF_PROGRESS_* into sh_mmcif.h
2011-01-10 23:05 [PATCH] mmc, sh: Move MMCIF_PROGRESS_* into sh_mmcif.h Simon Horman
2011-01-11 2:07 ` Paul Mundt
@ 2011-01-11 2:51 ` Simon Horman
2011-01-11 3:51 ` Simon Horman
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Simon Horman @ 2011-01-11 2:51 UTC (permalink / raw)
To: linux-sh
On Tue, Jan 11, 2011 at 11:07:51AM +0900, Paul Mundt wrote:
> On Tue, Jan 11, 2011 at 08:05:49AM +0900, Simon Horman wrote:
> > Allow MMCIF_PROGRESS_* to be shared.
> >
> > Cc: Magnus Damm <magnus.damm@gmail.com>
> > Signed-off-by: Simon Horman <horms@verge.net.au>
> > Signed-off-by: Paul Mundt <lethal@linux-sh.org>
> > ---
> > arch/sh/boot/romimage/mmcif-sh7724.c | 3 ---
> > include/linux/mmc/sh_mmcif.h | 3 +++
> > 2 files changed, 3 insertions(+), 3 deletions(-)
> >
> > Hi Paul,
> >
> > this change didn't seem to make it into your
> > rc1 pull request, although it is present in
> > remotes/sh-2.6/common/mmcif.
> >
> Blast. I thought I had all of the common/mmcif stuff rolled in via
> rmobile/mmcif, but it seems this one slipped by. I'll make sure it gets
> merged this time around.
>
> > It is needed by "[patch v5] mmc, ARM: Add zboot from MMC support for SuperH
> > Mobile ARM", which I was hoping to get Russell to merge post 2.6.38-rc1.
> > Perhaps I should just add the enums directly to
> > arch/arm/boot/compressed/mmcif-sh7372.c in that patch for now?
> >
> Optionally you can just push it out without the enums resolved also, the
> build target will just fail until the other patch catches up.
Ok, I guess that sounds reasonable. Its not like many people/anyone will have
the config option enabled while the merge is shaking itself out.
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] mmc, sh: Move MMCIF_PROGRESS_* into sh_mmcif.h
2011-01-10 23:05 [PATCH] mmc, sh: Move MMCIF_PROGRESS_* into sh_mmcif.h Simon Horman
2011-01-11 2:07 ` Paul Mundt
2011-01-11 2:51 ` Simon Horman
@ 2011-01-11 3:51 ` Simon Horman
2011-01-13 21:12 ` Paul Mundt
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Simon Horman @ 2011-01-11 3:51 UTC (permalink / raw)
To: linux-sh
On Tue, Jan 11, 2011 at 11:51:50AM +0900, Simon Horman wrote:
> On Tue, Jan 11, 2011 at 11:07:51AM +0900, Paul Mundt wrote:
> > On Tue, Jan 11, 2011 at 08:05:49AM +0900, Simon Horman wrote:
> > > Allow MMCIF_PROGRESS_* to be shared.
> > >
> > > Cc: Magnus Damm <magnus.damm@gmail.com>
> > > Signed-off-by: Simon Horman <horms@verge.net.au>
> > > Signed-off-by: Paul Mundt <lethal@linux-sh.org>
> > > ---
> > > arch/sh/boot/romimage/mmcif-sh7724.c | 3 ---
> > > include/linux/mmc/sh_mmcif.h | 3 +++
> > > 2 files changed, 3 insertions(+), 3 deletions(-)
> > >
> > > Hi Paul,
> > >
> > > this change didn't seem to make it into your
> > > rc1 pull request, although it is present in
> > > remotes/sh-2.6/common/mmcif.
> > >
> > Blast. I thought I had all of the common/mmcif stuff rolled in via
> > rmobile/mmcif, but it seems this one slipped by. I'll make sure it gets
> > merged this time around.
> >
> > > It is needed by "[patch v5] mmc, ARM: Add zboot from MMC support for SuperH
> > > Mobile ARM", which I was hoping to get Russell to merge post 2.6.38-rc1.
> > > Perhaps I should just add the enums directly to
> > > arch/arm/boot/compressed/mmcif-sh7372.c in that patch for now?
> > >
> > Optionally you can just push it out without the enums resolved also, the
> > build target will just fail until the other patch catches up.
>
> Ok, I guess that sounds reasonable. Its not like many people/anyone will have
> the config option enabled while the merge is shaking itself out.
Submitted to Russell's patch tracker
http://www.arm.linux.org.uk/developer/patches/viewpatch.php?idf17/1
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] mmc, sh: Move MMCIF_PROGRESS_* into sh_mmcif.h
2011-01-10 23:05 [PATCH] mmc, sh: Move MMCIF_PROGRESS_* into sh_mmcif.h Simon Horman
` (2 preceding siblings ...)
2011-01-11 3:51 ` Simon Horman
@ 2011-01-13 21:12 ` Paul Mundt
2011-01-14 1:29 ` Simon Horman
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Paul Mundt @ 2011-01-13 21:12 UTC (permalink / raw)
To: linux-sh
On Tue, Jan 11, 2011 at 12:51:05PM +0900, Simon Horman wrote:
> On Tue, Jan 11, 2011 at 11:51:50AM +0900, Simon Horman wrote:
> > On Tue, Jan 11, 2011 at 11:07:51AM +0900, Paul Mundt wrote:
> > > Blast. I thought I had all of the common/mmcif stuff rolled in via
> > > rmobile/mmcif, but it seems this one slipped by. I'll make sure it gets
> > > merged this time around.
> > >
> > > Optionally you can just push it out without the enums resolved also, the
> > > build target will just fail until the other patch catches up.
> >
> > Ok, I guess that sounds reasonable. Its not like many people/anyone will have
> > the config option enabled while the merge is shaking itself out.
>
> Submitted to Russell's patch tracker
> http://www.arm.linux.org.uk/developer/patches/viewpatch.php?idf17/1
Everything has been pulled by Linus now, so it's just this patch in
the patch tracker that should be outstanding. You may wish to double
check to make sure I got it all this time around :-)
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] mmc, sh: Move MMCIF_PROGRESS_* into sh_mmcif.h
2011-01-10 23:05 [PATCH] mmc, sh: Move MMCIF_PROGRESS_* into sh_mmcif.h Simon Horman
` (3 preceding siblings ...)
2011-01-13 21:12 ` Paul Mundt
@ 2011-01-14 1:29 ` Simon Horman
2011-01-14 6:49 ` Paul Mundt
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Simon Horman @ 2011-01-14 1:29 UTC (permalink / raw)
To: linux-sh
On Fri, Jan 14, 2011 at 06:12:28AM +0900, Paul Mundt wrote:
> On Tue, Jan 11, 2011 at 12:51:05PM +0900, Simon Horman wrote:
> > On Tue, Jan 11, 2011 at 11:51:50AM +0900, Simon Horman wrote:
> > > On Tue, Jan 11, 2011 at 11:07:51AM +0900, Paul Mundt wrote:
> > > > Blast. I thought I had all of the common/mmcif stuff rolled in via
> > > > rmobile/mmcif, but it seems this one slipped by. I'll make sure it gets
> > > > merged this time around.
> > > >
> > > > Optionally you can just push it out without the enums resolved also, the
> > > > build target will just fail until the other patch catches up.
> > >
> > > Ok, I guess that sounds reasonable. Its not like many people/anyone will have
> > > the config option enabled while the merge is shaking itself out.
> >
> > Submitted to Russell's patch tracker
> > http://www.arm.linux.org.uk/developer/patches/viewpatch.php?idf17/1
>
> Everything has been pulled by Linus now, so it's just this patch in
> the patch tracker that should be outstanding. You may wish to double
> check to make sure I got it all this time around :-)
Drat. There seems to be a new problem.
I'm pretty sure it wasn't there when I checked against
Linus's tree a few days ago. But in any case it is there now.
arch/arm/boot/compressed/mmcif-sh7372.o: In function `mmcif_loader':
mmcif-sh7372.c:(.text+0x9e8): undefined reference to `outer_cache
As per
http://www.arm.linux.org.uk/developer/patches/viewpatch.php?idb75/1,
my suggested fix is:
diff --git a/include/linux/mmc/sh_mmcif.h b/include/linux/mmc/sh_mmcif.h
index bf17350..1a6eb3f 100644
--- a/include/linux/mmc/sh_mmcif.h
+++ b/include/linux/mmc/sh_mmcif.h
@@ -99,7 +99,7 @@ static inline u32 sh_mmcif_readl(void __iomem *addr, int reg)
static inline void sh_mmcif_writel(void __iomem *addr, int reg, u32 val)
{
- writel(val, addr + reg);
+ __raw_writel(val, addr + reg);
}
#define SH_MMCIF_BBS 512 /* boot block size */
This code is also used by SH. So I'd value an opinion on weather this
change is valid for sh. Also on a suggested merge strategy. Paul,
I guess this should also go through your tree.
Lastly, I don't have access to my board today, so I will have to verify
the change tomorrow.
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH] mmc, sh: Move MMCIF_PROGRESS_* into sh_mmcif.h
2011-01-10 23:05 [PATCH] mmc, sh: Move MMCIF_PROGRESS_* into sh_mmcif.h Simon Horman
` (4 preceding siblings ...)
2011-01-14 1:29 ` Simon Horman
@ 2011-01-14 6:49 ` Paul Mundt
2011-01-14 7:06 ` Magnus Damm
2011-01-14 7:08 ` Paul Mundt
7 siblings, 0 replies; 9+ messages in thread
From: Paul Mundt @ 2011-01-14 6:49 UTC (permalink / raw)
To: linux-sh
On Fri, Jan 14, 2011 at 10:29:16AM +0900, Simon Horman wrote:
> Drat. There seems to be a new problem.
> I'm pretty sure it wasn't there when I checked against
> Linus's tree a few days ago. But in any case it is there now.
>
> arch/arm/boot/compressed/mmcif-sh7372.o: In function `mmcif_loader':
> mmcif-sh7372.c:(.text+0x9e8): undefined reference to `outer_cache
>
This would be because some of the L2 cache handling rework that came in
from the ARM tree.
> As per
> http://www.arm.linux.org.uk/developer/patches/viewpatch.php?idb75/1,
> my suggested fix is:
>
> diff --git a/include/linux/mmc/sh_mmcif.h b/include/linux/mmc/sh_mmcif.h
> index bf17350..1a6eb3f 100644
> --- a/include/linux/mmc/sh_mmcif.h
> +++ b/include/linux/mmc/sh_mmcif.h
> @@ -99,7 +99,7 @@ static inline u32 sh_mmcif_readl(void __iomem *addr, int reg)
>
> static inline void sh_mmcif_writel(void __iomem *addr, int reg, u32 val)
> {
> - writel(val, addr + reg);
> + __raw_writel(val, addr + reg);
> }
>
> #define SH_MMCIF_BBS 512 /* boot block size */
>
> This code is also used by SH. So I'd value an opinion on weather this
> change is valid for sh. Also on a suggested merge strategy. Paul,
> I guess this should also go through your tree.
>
> Lastly, I don't have access to my board today, so I will have to verify
> the change tomorrow.
>
We don't worry about writes being reordered, so that's fine for SH as
well. It doesn't particularly matter which tree the change goes through,
as I already have fixes pending in both the SH and R-Mobile branches.
I'll probably just do this through the R-Mobile branch since that's where
the breakage invariably manifests itself.
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] mmc, sh: Move MMCIF_PROGRESS_* into sh_mmcif.h
2011-01-10 23:05 [PATCH] mmc, sh: Move MMCIF_PROGRESS_* into sh_mmcif.h Simon Horman
` (5 preceding siblings ...)
2011-01-14 6:49 ` Paul Mundt
@ 2011-01-14 7:06 ` Magnus Damm
2011-01-14 7:08 ` Paul Mundt
7 siblings, 0 replies; 9+ messages in thread
From: Magnus Damm @ 2011-01-14 7:06 UTC (permalink / raw)
To: linux-sh
On Fri, Jan 14, 2011 at 10:29 AM, Simon Horman <horms@verge.net.au> wrote:
> Drat. There seems to be a new problem.
> I'm pretty sure it wasn't there when I checked against
> Linus's tree a few days ago. But in any case it is there now.
>
> arch/arm/boot/compressed/mmcif-sh7372.o: In function `mmcif_loader':
> mmcif-sh7372.c:(.text+0x9e8): undefined reference to `outer_cache
>
> As per
> http://www.arm.linux.org.uk/developer/patches/viewpatch.php?idb75/1,
> my suggested fix is:
>
> diff --git a/include/linux/mmc/sh_mmcif.h b/include/linux/mmc/sh_mmcif.h
> index bf17350..1a6eb3f 100644
> --- a/include/linux/mmc/sh_mmcif.h
> +++ b/include/linux/mmc/sh_mmcif.h
> @@ -99,7 +99,7 @@ static inline u32 sh_mmcif_readl(void __iomem *addr, int reg)
>
> static inline void sh_mmcif_writel(void __iomem *addr, int reg, u32 val)
> {
> - writel(val, addr + reg);
> + __raw_writel(val, addr + reg);
> }
You probably want to update sh_mmcif_read() as well for code consistency!
/ magnus
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] mmc, sh: Move MMCIF_PROGRESS_* into sh_mmcif.h
2011-01-10 23:05 [PATCH] mmc, sh: Move MMCIF_PROGRESS_* into sh_mmcif.h Simon Horman
` (6 preceding siblings ...)
2011-01-14 7:06 ` Magnus Damm
@ 2011-01-14 7:08 ` Paul Mundt
7 siblings, 0 replies; 9+ messages in thread
From: Paul Mundt @ 2011-01-14 7:08 UTC (permalink / raw)
To: linux-sh
On Fri, Jan 14, 2011 at 04:06:55PM +0900, Magnus Damm wrote:
> On Fri, Jan 14, 2011 at 10:29 AM, Simon Horman <horms@verge.net.au> wrote:
> > Drat. There seems to be a new problem.
> > I'm pretty sure it wasn't there when I checked against
> > Linus's tree a few days ago. But in any case it is there now.
> >
> > arch/arm/boot/compressed/mmcif-sh7372.o: In function `mmcif_loader':
> > mmcif-sh7372.c:(.text+0x9e8): undefined reference to `outer_cache
> >
> > As per
> > http://www.arm.linux.org.uk/developer/patches/viewpatch.php?idb75/1,
> > my suggested fix is:
> >
> > diff --git a/include/linux/mmc/sh_mmcif.h b/include/linux/mmc/sh_mmcif.h
> > index bf17350..1a6eb3f 100644
> > --- a/include/linux/mmc/sh_mmcif.h
> > +++ b/include/linux/mmc/sh_mmcif.h
> > @@ -99,7 +99,7 @@ static inline u32 sh_mmcif_readl(void __iomem *addr, int reg)
> >
> > ?static inline void sh_mmcif_writel(void __iomem *addr, int reg, u32 val)
> > ?{
> > - ? ? ? writel(val, addr + reg);
> > + ? ? ? __raw_writel(val, addr + reg);
> > ?}
>
> You probably want to update sh_mmcif_read() as well for code consistency!
>
I've already taken care of it.
^ permalink raw reply [flat|nested] 9+ messages in thread