Commit d232b12 (asm-generic headers: add sizes.h, 2011-01-15)
introduced a generic sizes.h. Use that instead of the ARM specific
version.
Cc: Arnd Bergmann <[email protected]>
Signed-off-by: Stephen Boyd <[email protected]>
---
arch/arm/include/asm/sizes.h | 60 +-----------------------------------------
1 files changed, 1 insertions(+), 59 deletions(-)
diff --git a/arch/arm/include/asm/sizes.h b/arch/arm/include/asm/sizes.h
index 316bb2b..dd248c2 100644
--- a/arch/arm/include/asm/sizes.h
+++ b/arch/arm/include/asm/sizes.h
@@ -1,59 +1 @@
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-/* Size definitions
- * Copyright (C) ARM Limited 1998. All rights reserved.
- */
-
-#ifndef __sizes_h
-#define __sizes_h 1
-
-/* handy sizes */
-#define SZ_16 0x00000010
-#define SZ_32 0x00000020
-#define SZ_64 0x00000040
-#define SZ_128 0x00000080
-#define SZ_256 0x00000100
-#define SZ_512 0x00000200
-
-#define SZ_1K 0x00000400
-#define SZ_2K 0x00000800
-#define SZ_4K 0x00001000
-#define SZ_8K 0x00002000
-#define SZ_16K 0x00004000
-#define SZ_32K 0x00008000
-#define SZ_64K 0x00010000
-#define SZ_128K 0x00020000
-#define SZ_256K 0x00040000
-#define SZ_512K 0x00080000
-
-#define SZ_1M 0x00100000
-#define SZ_2M 0x00200000
-#define SZ_4M 0x00400000
-#define SZ_8M 0x00800000
-#define SZ_16M 0x01000000
-#define SZ_32M 0x02000000
-#define SZ_48M 0x03000000
-#define SZ_64M 0x04000000
-#define SZ_128M 0x08000000
-#define SZ_256M 0x10000000
-#define SZ_512M 0x20000000
-
-#define SZ_1G 0x40000000
-#define SZ_2G 0x80000000
-
-#endif
-
-/* END */
+#include <asm-generic/sizes.h>
--
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
On Tuesday 22 March 2011, Stephen Boyd wrote:
> Commit d232b12 (asm-generic headers: add sizes.h, 2011-01-15)
> introduced a generic sizes.h. Use that instead of the ARM specific
> version.
>
> Cc: Arnd Bergmann <[email protected]>
> Signed-off-by: Stephen Boyd <[email protected]>
Acked-by: Arnd Bergmann <[email protected]
On Tue, Mar 22, 2011 at 09:34:50AM +0100, Arnd Bergmann wrote:
> On Tuesday 22 March 2011, Stephen Boyd wrote:
> > Commit d232b12 (asm-generic headers: add sizes.h, 2011-01-15)
> > introduced a generic sizes.h. Use that instead of the ARM specific
> > version.
> >
> > Cc: Arnd Bergmann <[email protected]>
> > Signed-off-by: Stephen Boyd <[email protected]>
>
> Acked-by: Arnd Bergmann <[email protected]
I assume the generic version was derived from the ARM version. Is there
a reason why ARM Ltd's copyright was seemingly dropped?
On Tuesday 22 March 2011, Russell King - ARM Linux wrote:
> On Tue, Mar 22, 2011 at 09:34:50AM +0100, Arnd Bergmann wrote:
> > On Tuesday 22 March 2011, Stephen Boyd wrote:
> > > Commit d232b12 (asm-generic headers: add sizes.h, 2011-01-15)
> > > introduced a generic sizes.h. Use that instead of the ARM specific
> > > version.
> > >
> > > Cc: Arnd Bergmann <[email protected]>
> > > Signed-off-by: Stephen Boyd <[email protected]>
> >
> > Acked-by: Arnd Bergmann <[email protected]
>
> I assume the generic version was derived from the ARM version. Is there
> a reason why ARM Ltd's copyright was seemingly dropped?
I'll let Guan Xuetao answer that, he introduced the file along with the
unicore32 architecture.
I doubt that the contents of this file are copyrightable, but of course
that is normally no reason to remove the notice.
Arnd
Firstly, the sizes.h is do derived from arm version.
And I just complete the SZ_* definitions for 32-bit architecture,
and remove SZ_48M for not being power-of-2 size.
I am sorry for removing copyright information when cleaning-up the code.
However, the content of this file is so common sense for handy sizes.
So, I believe that GPLv2 license is enough.
Regards.
Guan Xuetao
> -----Original Message-----
> From: Arnd Bergmann [mailto:[email protected]]
> Sent: Tuesday, March 22, 2011 6:10 PM
> To: [email protected]; Guan Xuetao
> Cc: Russell King - ARM Linux; Stephen Boyd; [email protected]
> Subject: Re: [PATCH] ARM: Use asm-generic/sizes.h
>
> On Tuesday 22 March 2011, Russell King - ARM Linux wrote:
> > On Tue, Mar 22, 2011 at 09:34:50AM +0100, Arnd Bergmann wrote:
> > > On Tuesday 22 March 2011, Stephen Boyd wrote:
> > > > Commit d232b12 (asm-generic headers: add sizes.h, 2011-01-15)
> > > > introduced a generic sizes.h. Use that instead of the ARM specific
> > > > version.
> > > >
> > > > Cc: Arnd Bergmann <[email protected]>
> > > > Signed-off-by: Stephen Boyd <[email protected]>
> > >
> > > Acked-by: Arnd Bergmann <[email protected]
> >
> > I assume the generic version was derived from the ARM version. Is there
> > a reason why ARM Ltd's copyright was seemingly dropped?
>
> I'll let Guan Xuetao answer that, he introduced the file along with the
> unicore32 architecture.
>
> I doubt that the contents of this file are copyrightable, but of course
> that is normally no reason to remove the notice.
>
> Arnd
On 03/22/2011 06:43 AM, Guan Xuetao wrote:
> And I just complete the SZ_* definitions for 32-bit architecture,
> and remove SZ_48M for not being power-of-2 size.
Ah, I didn't notice this part. SZ_48M is actually used by ARM code so
that would need to be added to the generic header should we go with this
patch.
> -----Original Message-----
> From: Stephen Boyd [mailto:[email protected]]
> Sent: Wednesday, March 23, 2011 2:40 AM
> To: Guan Xuetao
> Cc: 'Arnd Bergmann'; [email protected]; 'Russell King - ARM Linux'; [email protected]
> Subject: Re: [PATCH] ARM: Use asm-generic/sizes.h
>
> On 03/22/2011 06:43 AM, Guan Xuetao wrote:
> > And I just complete the SZ_* definitions for 32-bit architecture,
> > and remove SZ_48M for not being power-of-2 size.
>
> Ah, I didn't notice this part. SZ_48M is actually used by ARM code so
> that would need to be added to the generic header should we go with this
> patch.
IMO, the content of asm-generic/sizes.h should only include power-of-2 sizes definitions.
And SZ_48M could be replaced by (SZ_32M | SZ_16M) or (SZ_32M + SZ_16M), or added to arch-specific headers.
Guan Xuetao
On 03/22/2011 06:29 PM, Guan Xuetao wrote:
>> -----Original Message-----
>> From: Stephen Boyd [mailto:[email protected]]
>> Sent: Wednesday, March 23, 2011 2:40 AM
>> To: Guan Xuetao
>> Cc: 'Arnd Bergmann'; [email protected]; 'Russell King - ARM Linux'; [email protected]
>> Subject: Re: [PATCH] ARM: Use asm-generic/sizes.h
>> Ah, I didn't notice this part. SZ_48M is actually used by ARM code so
>> that would need to be added to the generic header should we go with this
>> patch.
> IMO, the content of asm-generic/sizes.h should only include power-of-2 sizes definitions.
> And SZ_48M could be replaced by (SZ_32M | SZ_16M) or (SZ_32M + SZ_16M), or added to arch-specific headers.
>
>
I'm hoping that kbuild gets asm-generic support sometime soon so files
with only a "#include <asm-generic/*>" are generated instead of living
in the tree. In that case I'd rather have the non power of 2 constants
added to the generic sizes.h and be done with it. There isn't any strong
technical reason to deny power of 2 constants from the generic header,
right?
Note: SH could also move to this if SZ_26M is put in the generic header.
--
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
On Tue, Mar 22, 2011 at 08:16:38PM -0700, Stephen Boyd wrote:
> On 03/22/2011 06:29 PM, Guan Xuetao wrote:
> > IMO, the content of asm-generic/sizes.h should only include
> > power-of-2 sizes definitions. And SZ_48M could be replaced by
> > (SZ_32M | SZ_16M) or (SZ_32M + SZ_16M), or added to arch-specific
> > headers.
>
> I'm hoping that kbuild gets asm-generic support sometime soon so files
> with only a "#include <asm-generic/*>" are generated instead of living
> in the tree. In that case I'd rather have the non power of 2 constants
> added to the generic sizes.h and be done with it. There isn't any strong
> technical reason to deny power of 2 constants from the generic header,
> right?
>
> Note: SH could also move to this if SZ_26M is put in the generic header.
>
I since dropped it and just open-coded it in the one place it was being
used. If it had been used in more places I would have stubbed it in the
asm/ version after the asm-generic include.
I'd say the simplest is to stay with powers of 2 unless you have a size
that is used in more than one place. If ARM uses SZ_48M commonly then
there's certainly a good case for adding it generically.
> -----Original Message-----
> From: Stephen Boyd [mailto:[email protected]]
> Sent: Wednesday, March 23, 2011 11:17 AM
> To: Guan Xuetao
> Cc: 'Russell King - ARM Linux'; [email protected]; 'Arnd Bergmann'; [email protected]
> Subject: Re: [PATCH] ARM: Use asm-generic/sizes.h
>
> On 03/22/2011 06:29 PM, Guan Xuetao wrote:
> >> -----Original Message-----
> >> From: Stephen Boyd [mailto:[email protected]]
> >> Sent: Wednesday, March 23, 2011 2:40 AM
> >> To: Guan Xuetao
> >> Cc: 'Arnd Bergmann'; [email protected]; 'Russell King - ARM Linux'; [email protected]
> >> Subject: Re: [PATCH] ARM: Use asm-generic/sizes.h
> >> Ah, I didn't notice this part. SZ_48M is actually used by ARM code so
> >> that would need to be added to the generic header should we go with this
> >> patch.
> > IMO, the content of asm-generic/sizes.h should only include power-of-2 sizes definitions.
> > And SZ_48M could be replaced by (SZ_32M | SZ_16M) or (SZ_32M + SZ_16M), or added to arch-specific headers.
> >
> >
>
> I'm hoping that kbuild gets asm-generic support sometime soon so files
> with only a "#include <asm-generic/*>" are generated instead of living
> in the tree. In that case I'd rather have the non power of 2 constants
> added to the generic sizes.h and be done with it. There isn't any strong
> technical reason to deny power of 2 constants from the generic header,
> right?
No.
I just think that power-of-2 sizes are more generic, not compulsively of course.
Sam Ravnborg had introduced a patch set to provide generic support for
architectures that using one-line asm-generic headers.
CC: Sam Ravnborg <[email protected]>
>
> Note: SH could also move to this if SZ_26M is put in the generic header.
>
> --
> Sent by an employee of the Qualcomm Innovation Center, Inc.
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
> > I'm hoping that kbuild gets asm-generic support sometime soon so files
> > with only a "#include <asm-generic/*>" are generated instead of living
> > in the tree. In that case I'd rather have the non power of 2 constants
> > added to the generic sizes.h and be done with it. There isn't any strong
> > technical reason to deny power of 2 constants from the generic header,
> > right?
> No.
> I just think that power-of-2 sizes are more generic, not compulsively of course.
>
> Sam Ravnborg had introduced a patch set to provide generic support for
> architectures that using one-line asm-generic headers.
It almost ready - but my spare time has been spent on sparc lately.
Will try to take alook at it again soon.
Sam