Re: [Xen-devel] [PATCH 3/5] xen: arm: head.S PT_DEV is unused, drop and rename PT_DEV_L3

[Tim Deegan <tim@xxxxxxx>]

At 10:20 +0000 on 19 Dec (1355912423), Ian Campbell wrote:
> On Tue, 2012-12-18 at 18:33 +0000, Stefano Stabellini wrote:
> > On Tue, 18 Dec 2012, Ian Campbell wrote:
> > > This shortens an overly long line.
> > > 
> > > Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
> > 
> > honestly I would rather keep it because it has been quite useful for
> > debugging in the past once all the bugs have been fixed (TM) then we can
> > remove it ;-)
> 
> Can you not just re-add it for debug?
> 
> I mostly just want to get rid of the overlong line, I could nuke the
> spaces from the comment (in all of them, not just this one) instead?

Could you just remove the 'lev3: ' from the comment, pulling it in to
exactly 80 chars?  Your' added 'second level' and 'third level' make it
redundant, and I'd rather not lose the spaces in the comments.

Tim.

> > 
> > >  xen/arch/arm/head.S |   11 +++++++----
> > >  1 files changed, 7 insertions(+), 4 deletions(-)
> > > 
> > > diff --git a/xen/arch/arm/head.S b/xen/arch/arm/head.S
> > > index 0d9a799..eb54925 100644
> > > --- a/xen/arch/arm/head.S
> > > +++ b/xen/arch/arm/head.S
> > > @@ -25,9 +25,12 @@
> > >  #define ZIMAGE_MAGIC_NUMBER 0x016f2818
> > >  
> > >  #define PT_PT  0xe7f /* nG=1, AF=1, SH=10, AP=01, NS=1, ATTR=111, T=1, 
> > > P=1 */
> > > +
> > > +/* Second Level */
> > >  #define PT_MEM 0xe7d /* nG=1, AF=1, SH=10, AP=01, NS=1, ATTR=111, T=0, 
> > > P=1 */
> > > -#define PT_DEV 0xe71 /* nG=1, AF=1, SH=10, AP=01, NS=1, ATTR=100, T=0, 
> > > P=1 */
> > > -#define PT_DEV_L3 0xe73 /* lev3: nG=1, AF=1, SH=10, AP=01, NS=1, 
> > > ATTR=100, T=1, P=1 */
> > > +
> > > +/* Third Level */
> > > +#define PT_DEV 0xe73 /* nG=1, AF=1, SH=10, AP=01, NS=1, ATTR=100, T=1, 
> > > P=1 */
> > >  
> > >  #define PT_UPPER(x) (PT_##x & 0xf00)
> > >  #define PT_LOWER(x) (PT_##x & 0x0ff)
> > > @@ -222,8 +225,8 @@ skip_bss:
> > >          mov   r3, #0
> > >          lsr   r2, r11, #12
> > >          lsl   r2, r2, #12            /* 4K aligned paddr of UART */
> > > -        orr   r2, r2, #PT_UPPER(DEV_L3)
> > > -        orr   r2, r2, #PT_LOWER(DEV_L3) /* r2:r3 := 4K dev map including 
> > > UART */
> > > +        orr   r2, r2, #PT_UPPER(DEV)
> > > +        orr   r2, r2, #PT_LOWER(DEV) /* r2:r3 := 4K dev map including 
> > > UART */
> > >          strd  r2, r3, [r1, #(FIXMAP_CONSOLE*8)] /* Map it in the first 
> > > fixmap's slot */
> > >  #endif
> > >  
> > > -- 
> > > 1.7.2.5
> > > 
> 
> 

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel