* [PATCH] 64bit resources start end value fix
@ 2006-06-21 17:29 Vivek Goyal
2006-06-21 20:22 ` Andrew Morton
2006-06-24 2:45 ` Greg KH
0 siblings, 2 replies; 13+ messages in thread
From: Vivek Goyal @ 2006-06-21 17:29 UTC (permalink / raw)
To: Greg KH; +Cc: linux kernel mailing list, Morton Andrew Morton
Hi Greg,
While changing 64bit kconfig options to CONFIG_RESOURCES_64BIT, I forgot
to update the values of start and end fields in ioport_resource and
iomem_resource.
Following patch applies on top of your reworked 64 bit patches and
is based on Andrew Morton's patch. Please apply.
http://marc.theaimsgroup.com/?l=linux-mm-commits&m=115087406130723&w=2
Thanks
Vivek
o Update start and end fields for 32bit and 64bit resources.
Signed-off-by: Vivek Goyal <vgoyal@in.ibm.com>
---
linux-2.6.17-1M-vivek/kernel/resource.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff -puN kernel/resource.c~64bit-resources-start-end-value-fix kernel/resource.c
--- linux-2.6.17-1M/kernel/resource.c~64bit-resources-start-end-value-fix 2006-06-21 12:43:43.000000000 -0400
+++ linux-2.6.17-1M-vivek/kernel/resource.c 2006-06-21 12:44:59.000000000 -0400
@@ -23,7 +23,7 @@
struct resource ioport_resource = {
.name = "PCI IO",
- .start = 0x0000,
+ .start = 0,
.end = IO_SPACE_LIMIT,
.flags = IORESOURCE_IO,
};
@@ -32,8 +32,8 @@ EXPORT_SYMBOL(ioport_resource);
struct resource iomem_resource = {
.name = "PCI mem",
- .start = 0UL,
- .end = ~0UL,
+ .start = 0,
+ .end = -1,
.flags = IORESOURCE_MEM,
};
_
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH] 64bit resources start end value fix 2006-06-21 17:29 [PATCH] 64bit resources start end value fix Vivek Goyal @ 2006-06-21 20:22 ` Andrew Morton 2006-06-21 20:41 ` Vivek Goyal 2006-06-24 2:45 ` Greg KH 1 sibling, 1 reply; 13+ messages in thread From: Andrew Morton @ 2006-06-21 20:22 UTC (permalink / raw) To: vgoyal; +Cc: gregkh, linux-kernel On Wed, 21 Jun 2006 13:29:03 -0400 Vivek Goyal <vgoyal@in.ibm.com> wrote: > Hi Greg, > > While changing 64bit kconfig options to CONFIG_RESOURCES_64BIT, I forgot > to update the values of start and end fields in ioport_resource and > iomem_resource. > > Following patch applies on top of your reworked 64 bit patches and > is based on Andrew Morton's patch. Please apply. > > http://marc.theaimsgroup.com/?l=linux-mm-commits&m=115087406130723&w=2 > > Thanks > Vivek > > > > o Update start and end fields for 32bit and 64bit resources. > > Signed-off-by: Vivek Goyal <vgoyal@in.ibm.com> > --- > > linux-2.6.17-1M-vivek/kernel/resource.c | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) > > diff -puN kernel/resource.c~64bit-resources-start-end-value-fix kernel/resource.c > --- linux-2.6.17-1M/kernel/resource.c~64bit-resources-start-end-value-fix 2006-06-21 12:43:43.000000000 -0400 > +++ linux-2.6.17-1M-vivek/kernel/resource.c 2006-06-21 12:44:59.000000000 -0400 > @@ -23,7 +23,7 @@ > > struct resource ioport_resource = { > .name = "PCI IO", > - .start = 0x0000, > + .start = 0, > .end = IO_SPACE_LIMIT, > .flags = IORESOURCE_IO, > }; > @@ -32,8 +32,8 @@ EXPORT_SYMBOL(ioport_resource); > > struct resource iomem_resource = { > .name = "PCI mem", > - .start = 0UL, > - .end = ~0UL, > + .start = 0, > + .end = -1, > .flags = IORESOURCE_MEM, > }; > Confused. This patch won't apply. It will apply with `patch -R', and if you do that you'll break iomem_reosurce.end by setting it to 0x00000000ffffffff. I don't think any additional changes are needed here. ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] 64bit resources start end value fix 2006-06-21 20:22 ` Andrew Morton @ 2006-06-21 20:41 ` Vivek Goyal 2006-06-21 20:44 ` Greg KH 2006-06-21 20:58 ` Andrew Morton 0 siblings, 2 replies; 13+ messages in thread From: Vivek Goyal @ 2006-06-21 20:41 UTC (permalink / raw) To: Andrew Morton, greg; +Cc: gregkh, linux-kernel On Wed, Jun 21, 2006 at 01:22:27PM -0700, Andrew Morton wrote: > On Wed, 21 Jun 2006 13:29:03 -0400 > Vivek Goyal <vgoyal@in.ibm.com> wrote: > > > Hi Greg, > > > > While changing 64bit kconfig options to CONFIG_RESOURCES_64BIT, I forgot > > to update the values of start and end fields in ioport_resource and > > iomem_resource. > > > > Following patch applies on top of your reworked 64 bit patches and > > is based on Andrew Morton's patch. Please apply. > > > > http://marc.theaimsgroup.com/?l=linux-mm-commits&m=115087406130723&w=2 > > > > Thanks > > Vivek > > > > > > > > o Update start and end fields for 32bit and 64bit resources. > > > > Signed-off-by: Vivek Goyal <vgoyal@in.ibm.com> > > --- > > > > linux-2.6.17-1M-vivek/kernel/resource.c | 6 +++--- > > 1 files changed, 3 insertions(+), 3 deletions(-) > > > > diff -puN kernel/resource.c~64bit-resources-start-end-value-fix kernel/resource.c > > --- linux-2.6.17-1M/kernel/resource.c~64bit-resources-start-end-value-fix 2006-06-21 12:43:43.000000000 -0400 > > +++ linux-2.6.17-1M-vivek/kernel/resource.c 2006-06-21 12:44:59.000000000 -0400 > > @@ -23,7 +23,7 @@ > > > > struct resource ioport_resource = { > > .name = "PCI IO", > > - .start = 0x0000, > > + .start = 0, > > .end = IO_SPACE_LIMIT, > > .flags = IORESOURCE_IO, > > }; > > @@ -32,8 +32,8 @@ EXPORT_SYMBOL(ioport_resource); > > > > struct resource iomem_resource = { > > .name = "PCI mem", > > - .start = 0UL, > > - .end = ~0UL, > > + .start = 0, > > + .end = -1, > > .flags = IORESOURCE_MEM, > > }; > > > > Confused. This patch won't apply. It will apply with `patch -R', and if > you do that you'll break iomem_reosurce.end by setting it to > 0x00000000ffffffff. > > I don't think any additional changes are needed here. Andrew, you don't have to apply this patch. It is supposed to be picked by Greg. There seems to be some confusion. Just few days back Greg consolidated and re-organized all the 64bit resources patches and posted on LKML for review. http://marc.theaimsgroup.com/?l=linux-kernel&m=115015916118671&w=2 There were few review comments regarding kconfig options. I reworked the patch and CONFING_RESOURCES_32BIT was changed to CONFIG_RESOURCES_64BIT. http://marc.theaimsgroup.com/?l=linux-kernel&m=115072559700302&w=2 Now Greg's tree and your tree are not exact replica when it comes to 64bit resource patches. Hence this patch is supposed to be picked by Greg to make sure things are not broken in his tree. Thanks Vivek ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] 64bit resources start end value fix 2006-06-21 20:41 ` Vivek Goyal @ 2006-06-21 20:44 ` Greg KH 2006-06-21 20:56 ` Vivek Goyal 2006-06-21 21:01 ` Andrew Morton 2006-06-21 20:58 ` Andrew Morton 1 sibling, 2 replies; 13+ messages in thread From: Greg KH @ 2006-06-21 20:44 UTC (permalink / raw) To: Vivek Goyal; +Cc: Andrew Morton, greg, linux-kernel On Wed, Jun 21, 2006 at 04:41:21PM -0400, Vivek Goyal wrote: > On Wed, Jun 21, 2006 at 01:22:27PM -0700, Andrew Morton wrote: > > On Wed, 21 Jun 2006 13:29:03 -0400 > > Vivek Goyal <vgoyal@in.ibm.com> wrote: > > > > > Hi Greg, > > > > > > While changing 64bit kconfig options to CONFIG_RESOURCES_64BIT, I forgot > > > to update the values of start and end fields in ioport_resource and > > > iomem_resource. > > > > > > Following patch applies on top of your reworked 64 bit patches and > > > is based on Andrew Morton's patch. Please apply. > > > > > > http://marc.theaimsgroup.com/?l=linux-mm-commits&m=115087406130723&w=2 > > > > > > Thanks > > > Vivek > > > > > > > > > > > > o Update start and end fields for 32bit and 64bit resources. > > > > > > Signed-off-by: Vivek Goyal <vgoyal@in.ibm.com> > > > --- > > > > > > linux-2.6.17-1M-vivek/kernel/resource.c | 6 +++--- > > > 1 files changed, 3 insertions(+), 3 deletions(-) > > > > > > diff -puN kernel/resource.c~64bit-resources-start-end-value-fix kernel/resource.c > > > --- linux-2.6.17-1M/kernel/resource.c~64bit-resources-start-end-value-fix 2006-06-21 12:43:43.000000000 -0400 > > > +++ linux-2.6.17-1M-vivek/kernel/resource.c 2006-06-21 12:44:59.000000000 -0400 > > > @@ -23,7 +23,7 @@ > > > > > > struct resource ioport_resource = { > > > .name = "PCI IO", > > > - .start = 0x0000, > > > + .start = 0, > > > .end = IO_SPACE_LIMIT, > > > .flags = IORESOURCE_IO, > > > }; > > > @@ -32,8 +32,8 @@ EXPORT_SYMBOL(ioport_resource); > > > > > > struct resource iomem_resource = { > > > .name = "PCI mem", > > > - .start = 0UL, > > > - .end = ~0UL, > > > + .start = 0, > > > + .end = -1, > > > .flags = IORESOURCE_MEM, > > > }; > > > > > > > Confused. This patch won't apply. It will apply with `patch -R', and if > > you do that you'll break iomem_reosurce.end by setting it to > > 0x00000000ffffffff. > > > > I don't think any additional changes are needed here. > > Andrew, you don't have to apply this patch. It is supposed to be picked > by Greg. > > There seems to be some confusion. Just few days back Greg consolidated > and re-organized all the 64bit resources patches and posted on LKML for > review. > > http://marc.theaimsgroup.com/?l=linux-kernel&m=115015916118671&w=2 > > There were few review comments regarding kconfig options. > I reworked the patch and CONFING_RESOURCES_32BIT was changed to > CONFIG_RESOURCES_64BIT. > > http://marc.theaimsgroup.com/?l=linux-kernel&m=115072559700302&w=2 > > Now Greg's tree and your tree are not exact replica when it comes to > 64bit resource patches. Hence this patch is supposed to be picked by > Greg to make sure things are not broken in his tree. It still breaks things as Andrew pointed out. .end should not be set to -1. thanks, greg k-h ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] 64bit resources start end value fix 2006-06-21 20:44 ` Greg KH @ 2006-06-21 20:56 ` Vivek Goyal 2006-06-21 21:01 ` Andrew Morton 1 sibling, 0 replies; 13+ messages in thread From: Vivek Goyal @ 2006-06-21 20:56 UTC (permalink / raw) To: Greg KH; +Cc: Andrew Morton, greg, linux-kernel On Wed, Jun 21, 2006 at 01:44:15PM -0700, Greg KH wrote: > On Wed, Jun 21, 2006 at 04:41:21PM -0400, Vivek Goyal wrote: > > On Wed, Jun 21, 2006 at 01:22:27PM -0700, Andrew Morton wrote: > > > On Wed, 21 Jun 2006 13:29:03 -0400 > > > Vivek Goyal <vgoyal@in.ibm.com> wrote: > > > > > > > Hi Greg, > > > > > > > > While changing 64bit kconfig options to CONFIG_RESOURCES_64BIT, I forgot > > > > to update the values of start and end fields in ioport_resource and > > > > iomem_resource. > > > > > > > > Following patch applies on top of your reworked 64 bit patches and > > > > is based on Andrew Morton's patch. Please apply. > > > > > > > > http://marc.theaimsgroup.com/?l=linux-mm-commits&m=115087406130723&w=2 > > > > > > > > Thanks > > > > Vivek > > > > > > > > > > > > > > > > o Update start and end fields for 32bit and 64bit resources. > > > > > > > > Signed-off-by: Vivek Goyal <vgoyal@in.ibm.com> > > > > --- > > > > > > > > linux-2.6.17-1M-vivek/kernel/resource.c | 6 +++--- > > > > 1 files changed, 3 insertions(+), 3 deletions(-) > > > > > > > > diff -puN kernel/resource.c~64bit-resources-start-end-value-fix kernel/resource.c > > > > --- linux-2.6.17-1M/kernel/resource.c~64bit-resources-start-end-value-fix 2006-06-21 12:43:43.000000000 -0400 > > > > +++ linux-2.6.17-1M-vivek/kernel/resource.c 2006-06-21 12:44:59.000000000 -0400 > > > > @@ -23,7 +23,7 @@ > > > > > > > > struct resource ioport_resource = { > > > > .name = "PCI IO", > > > > - .start = 0x0000, > > > > + .start = 0, > > > > .end = IO_SPACE_LIMIT, > > > > .flags = IORESOURCE_IO, > > > > }; > > > > @@ -32,8 +32,8 @@ EXPORT_SYMBOL(ioport_resource); > > > > > > > > struct resource iomem_resource = { > > > > .name = "PCI mem", > > > > - .start = 0UL, > > > > - .end = ~0UL, > > > > + .start = 0, > > > > + .end = -1, > > > > .flags = IORESOURCE_MEM, > > > > }; > > > > > > > > > > Confused. This patch won't apply. It will apply with `patch -R', and if > > > you do that you'll break iomem_reosurce.end by setting it to > > > 0x00000000ffffffff. > > > > > > I don't think any additional changes are needed here. > > > > Andrew, you don't have to apply this patch. It is supposed to be picked > > by Greg. > > > > There seems to be some confusion. Just few days back Greg consolidated > > and re-organized all the 64bit resources patches and posted on LKML for > > review. > > > > http://marc.theaimsgroup.com/?l=linux-kernel&m=115015916118671&w=2 > > > > There were few review comments regarding kconfig options. > > I reworked the patch and CONFING_RESOURCES_32BIT was changed to > > CONFIG_RESOURCES_64BIT. > > > > http://marc.theaimsgroup.com/?l=linux-kernel&m=115072559700302&w=2 > > > > Now Greg's tree and your tree are not exact replica when it comes to > > 64bit resource patches. Hence this patch is supposed to be picked by > > Greg to make sure things are not broken in his tree. > > It still breaks things as Andrew pointed out. .end should not be set to > -1. I think Andrew mentioned that it breaks things if applied on -mm with -R. Because it will set .end to ~0UL instead of -1 Is .end = -1 wrong? Won't it effectively be .end = 0xffffffffffffffff for 64 bit resources? Thanks Vivek ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] 64bit resources start end value fix 2006-06-21 20:44 ` Greg KH 2006-06-21 20:56 ` Vivek Goyal @ 2006-06-21 21:01 ` Andrew Morton 1 sibling, 0 replies; 13+ messages in thread From: Andrew Morton @ 2006-06-21 21:01 UTC (permalink / raw) To: Greg KH; +Cc: vgoyal, greg, linux-kernel On Wed, 21 Jun 2006 13:44:15 -0700 Greg KH <gregkh@suse.de> wrote: > > > Confused. This patch won't apply. It will apply with `patch -R', and if > > > you do that you'll break iomem_reosurce.end by setting it to > > > 0x00000000ffffffff. > > > > > > I don't think any additional changes are needed here. > > > > Andrew, you don't have to apply this patch. It is supposed to be picked > > by Greg. > > > > There seems to be some confusion. Just few days back Greg consolidated > > and re-organized all the 64bit resources patches and posted on LKML for > > review. > > > > http://marc.theaimsgroup.com/?l=linux-kernel&m=115015916118671&w=2 > > > > There were few review comments regarding kconfig options. > > I reworked the patch and CONFING_RESOURCES_32BIT was changed to > > CONFIG_RESOURCES_64BIT. > > > > http://marc.theaimsgroup.com/?l=linux-kernel&m=115072559700302&w=2 > > > > Now Greg's tree and your tree are not exact replica when it comes to > > 64bit resource patches. Hence this patch is supposed to be picked by > > Greg to make sure things are not broken in his tree. > > It still breaks things as Andrew pointed out. .end should not be set to > -1. No, -1 is OK. As it turns out, unsigned long long x = ~0UL; sets `x' to 0xffffffffffffffff which was totally not what I expected. But -1 works, and the patch I have against your tree is OK. Could someone please fix Andy Isaacson <adi@hexapodia.org>'s bug, btw? ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] 64bit resources start end value fix 2006-06-21 20:41 ` Vivek Goyal 2006-06-21 20:44 ` Greg KH @ 2006-06-21 20:58 ` Andrew Morton 2006-06-21 23:15 ` Vivek Goyal 1 sibling, 1 reply; 13+ messages in thread From: Andrew Morton @ 2006-06-21 20:58 UTC (permalink / raw) To: vgoyal; +Cc: greg, gregkh, linux-kernel On Wed, 21 Jun 2006 16:41:21 -0400 Vivek Goyal <vgoyal@in.ibm.com> wrote: > > > @@ -32,8 +32,8 @@ EXPORT_SYMBOL(ioport_resource); > > > > > > struct resource iomem_resource = { > > > .name = "PCI mem", > > > - .start = 0UL, > > > - .end = ~0UL, > > > + .start = 0, > > > + .end = -1, > > > .flags = IORESOURCE_MEM, > > > }; > > > > > > > Confused. This patch won't apply. It will apply with `patch -R', and if > > you do that you'll break iomem_reosurce.end by setting it to > > 0x00000000ffffffff. > > > > I don't think any additional changes are needed here. > > Andrew, you don't have to apply this patch. It is supposed to be picked > by Greg. > > There seems to be some confusion. Just few days back Greg consolidated > and re-organized all the 64bit resources patches and posted on LKML for > review. > > http://marc.theaimsgroup.com/?l=linux-kernel&m=115015916118671&w=2 > > There were few review comments regarding kconfig options. > I reworked the patch and CONFING_RESOURCES_32BIT was changed to > CONFIG_RESOURCES_64BIT. > > http://marc.theaimsgroup.com/?l=linux-kernel&m=115072559700302&w=2 > > Now Greg's tree and your tree are not exact replica when it comes to > 64bit resource patches. Hence this patch is supposed to be picked by > Greg to make sure things are not broken in his tree. I'm working against Greg's tree, always... ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] 64bit resources start end value fix 2006-06-21 20:58 ` Andrew Morton @ 2006-06-21 23:15 ` Vivek Goyal 2006-06-21 23:27 ` Andrew Morton 0 siblings, 1 reply; 13+ messages in thread From: Vivek Goyal @ 2006-06-21 23:15 UTC (permalink / raw) To: Andrew Morton Cc: greg, gregkh, linux-kernel, Roman Zippel, Geert Uytterhoeven On Wed, Jun 21, 2006 at 01:58:55PM -0700, Andrew Morton wrote: > > > > Andrew, you don't have to apply this patch. It is supposed to be picked > > by Greg. > > > > There seems to be some confusion. Just few days back Greg consolidated > > and re-organized all the 64bit resources patches and posted on LKML for > > review. > > > > http://marc.theaimsgroup.com/?l=linux-kernel&m=115015916118671&w=2 > > > > There were few review comments regarding kconfig options. > > I reworked the patch and CONFING_RESOURCES_32BIT was changed to > > CONFIG_RESOURCES_64BIT. > > > > http://marc.theaimsgroup.com/?l=linux-kernel&m=115072559700302&w=2 > > > > Now Greg's tree and your tree are not exact replica when it comes to > > 64bit resource patches. Hence this patch is supposed to be picked by > > Greg to make sure things are not broken in his tree. > > I'm working against Greg's tree, always... I am sorry. That's a mistake on my part. I misunderstood it. Can you please include the attached patch. Now RESOURCES_32BIT has been dropped and RESOURCES_64BIT has been introduced based on the review feedback. By default RESOURCES_64BIT is not selected for 32bit platform and user has got the option to enable it. For 64BIT kernels, RESOURCES_64BIT is always set. Thanks Vivek o Based on review comments, removed CONFIG_RESOURCE_32BIT and added CONFIG_RESOURCE_64BIT in arch independent manner. Signed-off-by: Roman Zippel <zippel@linux-m68k.org> Signed-off-by: Vivek Goyal <vgoyal@in.ibm.com> --- arch/arm/Kconfig | 7 ------- arch/arm26/Kconfig | 7 ------- arch/cris/Kconfig | 7 ------- arch/frv/Kconfig | 7 ------- arch/i386/Kconfig | 8 +------- arch/i386/kernel/setup.c | 2 +- arch/m32r/Kconfig | 7 ------- arch/m68k/Kconfig | 7 ------- arch/m68knommu/Kconfig | 7 ------- arch/mips/Kconfig | 8 -------- arch/parisc/Kconfig | 8 -------- arch/powerpc/Kconfig | 8 -------- arch/ppc/Kconfig | 7 ------- arch/s390/Kconfig | 8 -------- arch/sh/Kconfig | 7 ------- arch/sparc/Kconfig | 7 ------- arch/v850/Kconfig | 7 ------- arch/xtensa/Kconfig | 7 ------- include/linux/types.h | 6 +++--- mm/Kconfig | 6 ++++++ 20 files changed, 11 insertions(+), 127 deletions(-) diff -puN mm/Kconfig~64bit-resources-modify-kconfig-options mm/Kconfig --- linux-2.6.17-mm1/mm/Kconfig~64bit-resources-modify-kconfig-options 2006-06-21 11:07:37.000000000 -0400 +++ linux-2.6.17-mm1-root/mm/Kconfig 2006-06-21 11:09:31.000000000 -0400 @@ -208,3 +208,9 @@ config READAHEAD_SMOOTH_AGING def_bool n if NUMA default y if !NUMA depends on ADAPTIVE_READAHEAD + +config RESOURCES_64BIT + bool "64 bit Memory and IO resources (EXPERIMENTAL)" if (!64BIT && EXPERIMENTAL) + default 64BIT + help + This option allows memory and IO resources to be 64 bit. diff -puN include/linux/types.h~64bit-resources-modify-kconfig-options include/linux/types.h --- linux-2.6.17-mm1/include/linux/types.h~64bit-resources-modify-kconfig-options 2006-06-21 11:10:21.000000000 -0400 +++ linux-2.6.17-mm1-root/include/linux/types.h 2006-06-21 11:11:33.000000000 -0400 @@ -178,10 +178,10 @@ typedef __u64 __bitwise __be64; #ifdef __KERNEL__ typedef unsigned __bitwise__ gfp_t; -#ifdef CONFIG_RESOURCES_32BIT -typedef __u32 resource_size_t; +#ifdef CONFIG_RESOURCES_64BIT +typedef u64 resource_size_t; #else -typedef __u64 resource_size_t; +typedef u32 resource_size_t; #endif #endif /* __KERNEL__ */ diff -puN arch/i386/Kconfig~64bit-resources-modify-kconfig-options arch/i386/Kconfig --- linux-2.6.17-mm1/arch/i386/Kconfig~64bit-resources-modify-kconfig-options 2006-06-21 11:12:37.000000000 -0400 +++ linux-2.6.17-mm1-root/arch/i386/Kconfig 2006-06-21 11:13:26.000000000 -0400 @@ -528,6 +528,7 @@ config X86_PAE bool depends on HIGHMEM64G default y + select RESOURCES_64BIT # Common NUMA Features config NUMA @@ -774,13 +775,6 @@ config PHYSICAL_START Don't change this unless you know what you are doing. -config RESOURCES_32BIT - bool "32 bit Memory and IO resources (EXPERIMENTAL)" - depends on EXPERIMENTAL && !X86_PAE - help - By default resources are 64 bit. This option allows memory and IO - resources to be 32 bit to optimize code size. - config HOTPLUG_CPU bool "Support for hot-pluggable CPUs (EXPERIMENTAL)" depends on SMP && HOTPLUG && EXPERIMENTAL && !X86_VOYAGER diff -puN arch/arm/Kconfig~64bit-resources-modify-kconfig-options arch/arm/Kconfig --- linux-2.6.17-mm1/arch/arm/Kconfig~64bit-resources-modify-kconfig-options 2006-06-21 11:18:37.000000000 -0400 +++ linux-2.6.17-mm1-root/arch/arm/Kconfig 2006-06-21 11:18:49.000000000 -0400 @@ -531,13 +531,6 @@ config NODES_SHIFT source "mm/Kconfig" -config RESOURCES_32BIT - bool "32 bit Memory and IO resources (EXPERIMENTAL)" - depends on EXPERIMENTAL - help - By default resources are 64 bit. This option allows memory and IO - resources to be 32 bit to optimize code size. - config LEDS bool "Timer and CPU usage LEDs" depends on ARCH_CDB89712 || ARCH_CO285 || ARCH_EBSA110 || \ diff -puN arch/arm26/Kconfig~64bit-resources-modify-kconfig-options arch/arm26/Kconfig --- linux-2.6.17-mm1/arch/arm26/Kconfig~64bit-resources-modify-kconfig-options 2006-06-21 11:19:03.000000000 -0400 +++ linux-2.6.17-mm1-root/arch/arm26/Kconfig 2006-06-21 11:19:16.000000000 -0400 @@ -187,13 +187,6 @@ config CMDLINE source "mm/Kconfig" -config RESOURCES_32BIT - bool "32 bit Memory and IO resources (EXPERIMENTAL)" - depends on EXPERIMENTAL - help - By default resources are 64 bit. This option allows memory and IO - resources to be 32 bit to optimize code size. - endmenu source "net/Kconfig" diff -puN arch/cris/Kconfig~64bit-resources-modify-kconfig-options arch/cris/Kconfig --- linux-2.6.17-mm1/arch/cris/Kconfig~64bit-resources-modify-kconfig-options 2006-06-21 11:19:32.000000000 -0400 +++ linux-2.6.17-mm1-root/arch/cris/Kconfig 2006-06-21 11:19:44.000000000 -0400 @@ -84,13 +84,6 @@ config PREEMPT source mm/Kconfig -config RESOURCES_32BIT - bool "32 bit Memory and IO resources (EXPERIMENTAL)" - depends on EXPERIMENTAL - help - By default resources are 64 bit. This option allows memory and IO - resources to be 32 bit to optimize code size. - endmenu menu "Hardware setup" diff -puN arch/frv/Kconfig~64bit-resources-modify-kconfig-options arch/frv/Kconfig --- linux-2.6.17-mm1/arch/frv/Kconfig~64bit-resources-modify-kconfig-options 2006-06-21 11:19:55.000000000 -0400 +++ linux-2.6.17-mm1-root/arch/frv/Kconfig 2006-06-21 11:20:05.000000000 -0400 @@ -80,13 +80,6 @@ config HIGHPTE source "mm/Kconfig" -config RESOURCES_32BIT - bool "32 bit Memory and IO resources (EXPERIMENTAL)" - depends on EXPERIMENTAL - help - By default resources are 64 bit. This option allows memory and IO - resources to be 32 bit to optimize code size. - choice prompt "uClinux kernel load address" depends on !MMU diff -puN arch/m32r/Kconfig~64bit-resources-modify-kconfig-options arch/m32r/Kconfig --- linux-2.6.17-mm1/arch/m32r/Kconfig~64bit-resources-modify-kconfig-options 2006-06-21 11:20:22.000000000 -0400 +++ linux-2.6.17-mm1-root/arch/m32r/Kconfig 2006-06-21 11:20:55.000000000 -0400 @@ -188,13 +188,6 @@ config ARCH_DISCONTIGMEM_ENABLE source "mm/Kconfig" -config RESOURCES_32BIT - bool "32 bit Memory and IO resources (EXPERIMENTAL)" - depends on EXPERIMENTAL - help - By default resources are 64 bit. This option allows memory and IO - resources to be 32 bit to optimize code size. - config IRAM_START hex "Internal memory start address (hex)" default "00f00000" if !CHIP_M32104 diff -puN arch/m68k/Kconfig~64bit-resources-modify-kconfig-options arch/m68k/Kconfig --- linux-2.6.17-mm1/arch/m68k/Kconfig~64bit-resources-modify-kconfig-options 2006-06-21 11:21:09.000000000 -0400 +++ linux-2.6.17-mm1-root/arch/m68k/Kconfig 2006-06-21 11:21:23.000000000 -0400 @@ -368,13 +368,6 @@ config 060_WRITETHROUGH source "mm/Kconfig" -config RESOURCES_32BIT - bool "32 bit Memory and IO resources (EXPERIMENTAL)" - depends on EXPERIMENTAL - help - By default resources are 64 bit. This option allows memory and IO - resources to be 32 bit to optimize code size. - endmenu menu "General setup" diff -puN arch/m68knommu/Kconfig~64bit-resources-modify-kconfig-options arch/m68knommu/Kconfig --- linux-2.6.17-mm1/arch/m68knommu/Kconfig~64bit-resources-modify-kconfig-options 2006-06-21 11:21:41.000000000 -0400 +++ linux-2.6.17-mm1-root/arch/m68knommu/Kconfig 2006-06-21 11:21:52.000000000 -0400 @@ -605,13 +605,6 @@ endchoice source "mm/Kconfig" -config RESOURCES_32BIT - bool "32 bit Memory and IO resources (EXPERIMENTAL)" - depends on EXPERIMENTAL - help - By default resources are 64 bit. This option allows memory and IO - resources to be 32 bit to optimize code size. - endmenu config ISA_DMA_API diff -puN arch/mips/Kconfig~64bit-resources-modify-kconfig-options arch/mips/Kconfig --- linux-2.6.17-mm1/arch/mips/Kconfig~64bit-resources-modify-kconfig-options 2006-06-21 11:22:05.000000000 -0400 +++ linux-2.6.17-mm1-root/arch/mips/Kconfig 2006-06-21 11:22:16.000000000 -0400 @@ -1789,14 +1789,6 @@ config HZ source "kernel/Kconfig.preempt" -config RESOURCES_32BIT - bool "32 bit Memory and IO resources (EXPERIMENTAL)" - depends on EXPERIMENTAL - depends on 32BIT - help - By default resources are 64 bit. This option allows memory and IO - resources to be 32 bit to optimize code size. - config RTC_DS1742 bool "DS1742 BRAM/RTC support" depends on TOSHIBA_JMR3927 || TOSHIBA_RBTX4927 diff -puN arch/parisc/Kconfig~64bit-resources-modify-kconfig-options arch/parisc/Kconfig --- linux-2.6.17-mm1/arch/parisc/Kconfig~64bit-resources-modify-kconfig-options 2006-06-21 11:22:33.000000000 -0400 +++ linux-2.6.17-mm1-root/arch/parisc/Kconfig 2006-06-21 11:22:43.000000000 -0400 @@ -221,14 +221,6 @@ source "kernel/Kconfig.preempt" source "kernel/Kconfig.hz" source "mm/Kconfig" -config RESOURCES_32BIT - bool "32 bit Memory and IO resources (EXPERIMENTAL)" - depends on EXPERIMENTAL - depends on !64BIT - help - By default resources are 64 bit. This option allows memory and IO - resources to be 32 bit to optimize code size. - config COMPAT def_bool y depends on 64BIT diff -puN arch/powerpc/Kconfig~64bit-resources-modify-kconfig-options arch/powerpc/Kconfig --- linux-2.6.17-mm1/arch/powerpc/Kconfig~64bit-resources-modify-kconfig-options 2006-06-21 11:22:58.000000000 -0400 +++ linux-2.6.17-mm1-root/arch/powerpc/Kconfig 2006-06-21 11:23:08.000000000 -0400 @@ -634,14 +634,6 @@ config CRASH_DUMP Don't change this unless you know what you are doing. -config RESOURCES_32BIT - bool "32 bit Memory and IO resources (EXPERIMENTAL)" - depends on EXPERIMENTAL - depends on PPC32 - help - By default resources are 64 bit. This option allows memory and IO - resources to be 32 bit to optimize code size. - config EMBEDDEDBOOT bool depends on 8xx || 8260 diff -puN arch/ppc/Kconfig~64bit-resources-modify-kconfig-options arch/ppc/Kconfig --- linux-2.6.17-mm1/arch/ppc/Kconfig~64bit-resources-modify-kconfig-options 2006-06-21 11:23:21.000000000 -0400 +++ linux-2.6.17-mm1-root/arch/ppc/Kconfig 2006-06-21 11:23:44.000000000 -0400 @@ -957,13 +957,6 @@ source kernel/Kconfig.hz source kernel/Kconfig.preempt source "mm/Kconfig" -config RESOURCES_32BIT - bool "32 bit Memory and IO resources (EXPERIMENTAL)" - depends on EXPERIMENTAL - help - By default resources are 64 bit. This option allows memory and IO - resources to be 32 bit to optimize code size. - source "fs/Kconfig.binfmt" config PREP_RESIDUAL diff -puN arch/s390/Kconfig~64bit-resources-modify-kconfig-options arch/s390/Kconfig --- linux-2.6.17-mm1/arch/s390/Kconfig~64bit-resources-modify-kconfig-options 2006-06-21 11:23:57.000000000 -0400 +++ linux-2.6.17-mm1-root/arch/s390/Kconfig 2006-06-21 11:24:10.000000000 -0400 @@ -218,14 +218,6 @@ config WARN_STACK_SIZE source "mm/Kconfig" -config RESOURCES_32BIT - bool "32 bit Memory and IO resources (EXPERIMENTAL)" - depends on EXPERIMENTAL - depends on !64BIT - help - By default resources are 64 bit. This option allows memory and IO - resources to be 32 bit to optimize code size. - comment "I/O subsystem configuration" config MACHCHK_WARNING diff -puN arch/sh/Kconfig~64bit-resources-modify-kconfig-options arch/sh/Kconfig --- linux-2.6.17-mm1/arch/sh/Kconfig~64bit-resources-modify-kconfig-options 2006-06-21 11:24:24.000000000 -0400 +++ linux-2.6.17-mm1-root/arch/sh/Kconfig 2006-06-21 11:24:36.000000000 -0400 @@ -532,13 +532,6 @@ config NODES_SHIFT default "1" depends on NEED_MULTIPLE_NODES -config RESOURCES_32BIT - bool "32 bit Memory and IO resources (EXPERIMENTAL)" - depends on EXPERIMENTAL - help - By default resources are 64 bit. This option allows memory and IO - resources to be 32 bit to optimize code size. - endmenu menu "Boot options" diff -puN arch/sparc/Kconfig~64bit-resources-modify-kconfig-options arch/sparc/Kconfig --- linux-2.6.17-mm1/arch/sparc/Kconfig~64bit-resources-modify-kconfig-options 2006-06-21 11:24:49.000000000 -0400 +++ linux-2.6.17-mm1-root/arch/sparc/Kconfig 2006-06-21 11:25:01.000000000 -0400 @@ -67,13 +67,6 @@ config SPARC32 maintains both the SPARC32 and SPARC64 ports; its web page is available at <http://www.ultralinux.org/>. -config RESOURCES_32BIT - bool "32 bit Memory and IO resources (EXPERIMENTAL)" - depends on EXPERIMENTAL - help - By default resources are 64 bit. This option allows memory and IO - resources to be 32 bit to optimize code size. - # Global things across all Sun machines. config ISA bool diff -puN arch/v850/Kconfig~64bit-resources-modify-kconfig-options arch/v850/Kconfig --- linux-2.6.17-mm1/arch/v850/Kconfig~64bit-resources-modify-kconfig-options 2006-06-21 11:25:19.000000000 -0400 +++ linux-2.6.17-mm1-root/arch/v850/Kconfig 2006-06-21 11:25:30.000000000 -0400 @@ -235,13 +235,6 @@ menu "Processor type and features" source "mm/Kconfig" -config RESOURCES_32BIT - bool "32 bit Memory and IO resources (EXPERIMENTAL)" - depends on EXPERIMENTAL - help - By default resources are 64 bit. This option allows memory and IO - resources to be 32 bit to optimize code size. - endmenu diff -puN arch/xtensa/Kconfig~64bit-resources-modify-kconfig-options arch/xtensa/Kconfig --- linux-2.6.17-mm1/arch/xtensa/Kconfig~64bit-resources-modify-kconfig-options 2006-06-21 11:25:40.000000000 -0400 +++ linux-2.6.17-mm1-root/arch/xtensa/Kconfig 2006-06-21 11:25:52.000000000 -0400 @@ -95,13 +95,6 @@ config MATH_EMULATION config HIGHMEM bool "High memory support" -config RESOURCES_32BIT - bool "32 bit Memory and IO resources (EXPERIMENTAL)" - depends on EXPERIMENTAL - help - By default resources are 64 bit. This option allows memory and IO - resources to be 32 bit to optimize code size. - endmenu menu "Platform options" diff -puN arch/i386/kernel/setup.c~64bit-resources-modify-kconfig-options arch/i386/kernel/setup.c --- linux-2.6.17-mm1/arch/i386/kernel/setup.c~64bit-resources-modify-kconfig-options 2006-06-21 11:37:17.000000000 -0400 +++ linux-2.6.17-mm1-root/arch/i386/kernel/setup.c 2006-06-21 11:37:57.000000000 -0400 @@ -1332,7 +1332,7 @@ legacy_init_iomem_resources(struct resou probe_roms(); for (i = 0; i < e820.nr_map; i++) { struct resource *res; -#ifdef CONFIG_RESOURCES_32BIT +#ifndef CONFIG_RESOURCES_64BIT if (e820.map[i].addr + e820.map[i].size > 0x100000000ULL) continue; #endif _ ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] 64bit resources start end value fix 2006-06-21 23:15 ` Vivek Goyal @ 2006-06-21 23:27 ` Andrew Morton 2006-06-22 6:09 ` Greg KH 0 siblings, 1 reply; 13+ messages in thread From: Andrew Morton @ 2006-06-21 23:27 UTC (permalink / raw) To: vgoyal; +Cc: greg, gregkh, linux-kernel, zippel, geert On Wed, 21 Jun 2006 19:15:52 -0400 Vivek Goyal <vgoyal@in.ibm.com> wrote: > On Wed, Jun 21, 2006 at 01:58:55PM -0700, Andrew Morton wrote: > > > > > > Andrew, you don't have to apply this patch. It is supposed to be picked > > > by Greg. > > > > > > There seems to be some confusion. Just few days back Greg consolidated > > > and re-organized all the 64bit resources patches and posted on LKML for > > > review. > > > > > > http://marc.theaimsgroup.com/?l=linux-kernel&m=115015916118671&w=2 > > > > > > There were few review comments regarding kconfig options. > > > I reworked the patch and CONFING_RESOURCES_32BIT was changed to > > > CONFIG_RESOURCES_64BIT. > > > > > > http://marc.theaimsgroup.com/?l=linux-kernel&m=115072559700302&w=2 > > > > > > Now Greg's tree and your tree are not exact replica when it comes to > > > 64bit resource patches. Hence this patch is supposed to be picked by > > > Greg to make sure things are not broken in his tree. > > > > I'm working against Greg's tree, always... > > I am sorry. That's a mistake on my part. I misunderstood it. Oh. > Can you please include the attached patch. Hopefully I'll pick it up from http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-03-pci later today? ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] 64bit resources start end value fix 2006-06-21 23:27 ` Andrew Morton @ 2006-06-22 6:09 ` Greg KH 0 siblings, 0 replies; 13+ messages in thread From: Greg KH @ 2006-06-22 6:09 UTC (permalink / raw) To: Andrew Morton; +Cc: vgoyal, gregkh, linux-kernel, zippel, geert On Wed, Jun 21, 2006 at 04:27:15PM -0700, Andrew Morton wrote: > On Wed, 21 Jun 2006 19:15:52 -0400 > Vivek Goyal <vgoyal@in.ibm.com> wrote: > > > On Wed, Jun 21, 2006 at 01:58:55PM -0700, Andrew Morton wrote: > > > > > > > > Andrew, you don't have to apply this patch. It is supposed to be picked > > > > by Greg. > > > > > > > > There seems to be some confusion. Just few days back Greg consolidated > > > > and re-organized all the 64bit resources patches and posted on LKML for > > > > review. > > > > > > > > http://marc.theaimsgroup.com/?l=linux-kernel&m=115015916118671&w=2 > > > > > > > > There were few review comments regarding kconfig options. > > > > I reworked the patch and CONFING_RESOURCES_32BIT was changed to > > > > CONFIG_RESOURCES_64BIT. > > > > > > > > http://marc.theaimsgroup.com/?l=linux-kernel&m=115072559700302&w=2 > > > > > > > > Now Greg's tree and your tree are not exact replica when it comes to > > > > 64bit resource patches. Hence this patch is supposed to be picked by > > > > Greg to make sure things are not broken in his tree. > > > > > > I'm working against Greg's tree, always... > > > > I am sorry. That's a mistake on my part. I misunderstood it. > > Oh. > > > Can you please include the attached patch. > > Hopefully I'll pick it up from > http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-03-pci > later today? It will be tomorrow, sorry, catching up on other merge stuff... thanks, greg k-h ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] 64bit resources start end value fix 2006-06-21 17:29 [PATCH] 64bit resources start end value fix Vivek Goyal 2006-06-21 20:22 ` Andrew Morton @ 2006-06-24 2:45 ` Greg KH 2006-06-24 13:15 ` Vivek Goyal 1 sibling, 1 reply; 13+ messages in thread From: Greg KH @ 2006-06-24 2:45 UTC (permalink / raw) To: Vivek Goyal; +Cc: Greg KH, linux kernel mailing list, Morton Andrew Morton On Wed, Jun 21, 2006 at 01:29:03PM -0400, Vivek Goyal wrote: > Hi Greg, > > While changing 64bit kconfig options to CONFIG_RESOURCES_64BIT, I forgot > to update the values of start and end fields in ioport_resource and > iomem_resource. > > Following patch applies on top of your reworked 64 bit patches and > is based on Andrew Morton's patch. Please apply. > > http://marc.theaimsgroup.com/?l=linux-mm-commits&m=115087406130723&w=2 Ok, I think I have this finally all straigned out. Can you look at my quilt tree to verify that I've tweaked everything properly based on this, and the other cleanup patches you and Andrew have been sending me recently? thanks, greg k-h ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] 64bit resources start end value fix 2006-06-24 2:45 ` Greg KH @ 2006-06-24 13:15 ` Vivek Goyal 2006-06-24 13:24 ` Andrew Morton 0 siblings, 1 reply; 13+ messages in thread From: Vivek Goyal @ 2006-06-24 13:15 UTC (permalink / raw) To: Greg KH; +Cc: Greg KH, linux kernel mailing list, Morton Andrew Morton On Fri, Jun 23, 2006 at 07:45:13PM -0700, Greg KH wrote: > On Wed, Jun 21, 2006 at 01:29:03PM -0400, Vivek Goyal wrote: > > Hi Greg, > > > > While changing 64bit kconfig options to CONFIG_RESOURCES_64BIT, I forgot > > to update the values of start and end fields in ioport_resource and > > iomem_resource. > > > > Following patch applies on top of your reworked 64 bit patches and > > is based on Andrew Morton's patch. Please apply. > > > > http://marc.theaimsgroup.com/?l=linux-mm-commits&m=115087406130723&w=2 > > Ok, I think I have this finally all straigned out. Can you look at my > quilt tree to verify that I've tweaked everything properly based on > this, and the other cleanup patches you and Andrew have been sending me > recently? > I looked into following tree. http://kernel.org/git/?p=linux/kernel/git/gregkh/patches.git;a=summary Everything seems to be fine except that following i2c patch from andrew seems to be missing. http://marc.theaimsgroup.com/?l=linux-mm-commits&m=115086650916817&w=2 Thanks Vivek ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] 64bit resources start end value fix 2006-06-24 13:15 ` Vivek Goyal @ 2006-06-24 13:24 ` Andrew Morton 0 siblings, 0 replies; 13+ messages in thread From: Andrew Morton @ 2006-06-24 13:24 UTC (permalink / raw) To: vgoyal; +Cc: greg, gregkh, linux-kernel On Sat, 24 Jun 2006 09:15:55 -0400 Vivek Goyal <vgoyal@in.ibm.com> wrote: > Everything seems to be fine except that following i2c patch from andrew > seems to be missing. > > http://marc.theaimsgroup.com/?l=linux-mm-commits&m=115086650916817&w=2 That's not altogether unusual. Thursday is supposed to be my send-patches-for-maintainers-to-ignore day but I didn't get onto it. Soon... ^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2006-06-24 13:24 UTC | newest] Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2006-06-21 17:29 [PATCH] 64bit resources start end value fix Vivek Goyal 2006-06-21 20:22 ` Andrew Morton 2006-06-21 20:41 ` Vivek Goyal 2006-06-21 20:44 ` Greg KH 2006-06-21 20:56 ` Vivek Goyal 2006-06-21 21:01 ` Andrew Morton 2006-06-21 20:58 ` Andrew Morton 2006-06-21 23:15 ` Vivek Goyal 2006-06-21 23:27 ` Andrew Morton 2006-06-22 6:09 ` Greg KH 2006-06-24 2:45 ` Greg KH 2006-06-24 13:15 ` Vivek Goyal 2006-06-24 13:24 ` Andrew Morton
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).