* Re: [PATCH 01/11] ARM: disable virt_to_bus/virt_to_bus almost everywhere [not found] ` <1360849767-1463135-2-git-send-email-arnd@arndb.de> @ 2013-02-20 15:14 ` James Hogan 2013-02-20 16:00 ` Arnd Bergmann 0 siblings, 1 reply; 7+ messages in thread From: James Hogan @ 2013-02-20 15:14 UTC (permalink / raw) To: Arnd Bergmann Cc: arm, linux-kernel, linux-arm-kernel, Russell King, Stephen Rothwell, linux-next On 14 February 2013 13:49, Arnd Bergmann <arnd@arndb.de> wrote: > We are getting a number of warnings about the use of the deprecated > bus_to_virt function in drivers using the ARM ISA DMA API: > > drivers/parport/parport_pc.c: In function 'parport_pc_fifo_write_block_dma': > drivers/parport/parport_pc.c:622:3: warning: 'bus_to_virt' is deprecated > (declared at arch/arm/include/asm/memory.h:253) [-Wdeprecated-declarations] > > This is only because that function gets used by the inline > set_dma_addr() helper. We know that any driver for the ISA DMA API > is correctly using the DMA addresses, so we can change this > to use the __bus_to_virt() function instead, which does not warn. > > After this, there are no remaining drivers that are used on > any defconfigs on ARM using virt_to_bus or bus_to_virt, with > the exception of the OSS sound driver. That driver is only used > on RiscPC, NetWinder and Shark, so we can set ARCH_NO_VIRT_TO_BUS > on all other platforms and hide the deprecated functions, which > is far more effective than marking them as deprecated, in order > to avoid any new users of that code. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > Cc: Russell King <linux@arm.linux.org.uk> > --- > arch/arm/Kconfig | 4 ++++ > arch/arm/configs/shark_defconfig | 1 - > arch/arm/include/asm/dma.h | 2 +- > arch/arm/include/asm/memory.h | 2 ++ > 4 files changed, 7 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > index 67874b8..91d4aea 100644 > --- a/arch/arm/Kconfig > +++ b/arch/arm/Kconfig > @@ -1450,6 +1450,10 @@ config ISA_DMA > bool > select ISA_DMA_API > > +config ARCH_NO_VIRT_TO_BUS > + def_bool y > + depends on !ARCH_RPC && !ARCH_NETWINDER && !ARCH_SHARK Hi Arnd, There's a patch in linux-next by Stephen Rothwell "Centralise CONFIG_ARCH_NO_VIRT_TO_BUS" that removes this Kconfig symbol, inverting/replacing it with "select HAVE_VIRT_TO_BUS" (including for arch/arm) which will undo the effects of this. Cheers James ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 01/11] ARM: disable virt_to_bus/virt_to_bus almost everywhere 2013-02-20 15:14 ` [PATCH 01/11] ARM: disable virt_to_bus/virt_to_bus almost everywhere James Hogan @ 2013-02-20 16:00 ` Arnd Bergmann 2013-02-20 16:32 ` James Hogan 0 siblings, 1 reply; 7+ messages in thread From: Arnd Bergmann @ 2013-02-20 16:00 UTC (permalink / raw) To: James Hogan, Andrew Morton Cc: arm, linux-kernel, linux-arm-kernel, Russell King, Stephen Rothwell, linux-next On Wednesday 20 February 2013, James Hogan wrote: > There's a patch in linux-next by Stephen Rothwell "Centralise > CONFIG_ARCH_NO_VIRT_TO_BUS" that removes this Kconfig symbol, > inverting/replacing it with "select HAVE_VIRT_TO_BUS" (including for > arch/arm) which will undo the effects of this. Ah, thanks for pointing that out. At least my patch is harmless then although also useless. I'll leave it in for now so I don't have to rebase all the other bug fixes that are queued for 3.9, but I'm making a note that I'll have to replace this with a proper one. I also don't think that anything breaks if we apply both patches for a while, it will just make my patch useless. I guess you'll have to do something similar for arch/metag, and Vineet will do it for arch/arc. Stephen's patch is currently in Andrew's tree, and I don't see an easy way to coordinate this. The patch we will need once both are merged is below. Signed-off-by: Arnd Bergmann <arnd@arndb.de> diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig index 4fef29f..5829b67 100644 --- a/arch/arc/Kconfig +++ b/arch/arc/Kconfig @@ -76,9 +76,6 @@ config HAVE_LATENCYTOP_SUPPORT config NO_DMA def_bool n -config ARCH_NO_VIRT_TO_BUS - def_bool y - source "init/Kconfig" source "kernel/Kconfig.freezer" diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index dedf02b..7b35b39 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -49,7 +49,6 @@ config ARM select HAVE_REGS_AND_STACK_ACCESS_API select HAVE_SYSCALL_TRACEPOINTS select HAVE_UID16 - select HAVE_VIRT_TO_BUS select KTIME_SCALAR select PERF_USE_VMALLOC select RTC_LIB @@ -744,6 +743,7 @@ config ARCH_RPC select NEED_MACH_IO_H select NEED_MACH_MEMORY_H select NO_IOPORT + select HAVE_VIRT_TO_BUS help On the Acorn Risc-PC, Linux can support the internal IDE disk and CD-ROM interface, serial and parallel port, and the floppy drive. @@ -880,6 +880,7 @@ config ARCH_SHARK select NEED_MACH_MEMORY_H select PCI select ZONE_DMA + select HAVE_VIRT_TO_BUS help Support for the StrongARM based Digital DNARD machine, also known as "Shark" (<http://www.shark-linux.de/shark.html>). @@ -1462,10 +1463,6 @@ config ISA_DMA bool select ISA_DMA_API -config ARCH_NO_VIRT_TO_BUS - def_bool y - depends on !ARCH_RPC && !ARCH_NETWINDER && !ARCH_SHARK - # Select ISA DMA interface config ISA_DMA_API bool diff --git a/arch/arm/mach-footbridge/Kconfig b/arch/arm/mach-footbridge/Kconfig index abda5a1..42bf587 100644 --- a/arch/arm/mach-footbridge/Kconfig +++ b/arch/arm/mach-footbridge/Kconfig @@ -67,6 +67,7 @@ config ARCH_NETWINDER select ISA select ISA_DMA select PCI + select HAVE_VIRT_TO_BUS help Say Y here if you intend to run this kernel on the Rebel.COM NetWinder. Information about this machine can be found at: diff --git a/arch/metag/Kconfig b/arch/metag/Kconfig index 30adc78..03e216e 100644 --- a/arch/metag/Kconfig +++ b/arch/metag/Kconfig @@ -35,9 +35,6 @@ config METAG select OF_EARLY_FLATTREE select SPARSE_IRQ -config ARCH_NO_VIRT_TO_BUS - def_bool y - config STACKTRACE_SUPPORT def_bool y ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 01/11] ARM: disable virt_to_bus/virt_to_bus almost everywhere 2013-02-20 16:00 ` Arnd Bergmann @ 2013-02-20 16:32 ` James Hogan 2013-02-21 7:37 ` Vineet Gupta 0 siblings, 1 reply; 7+ messages in thread From: James Hogan @ 2013-02-20 16:32 UTC (permalink / raw) To: Arnd Bergmann Cc: Andrew Morton, arm, linux-kernel, linux-arm-kernel, Russell King, Stephen Rothwell, linux-next, Vineet Gupta On 20/02/13 16:00, Arnd Bergmann wrote: > On Wednesday 20 February 2013, James Hogan wrote: >> There's a patch in linux-next by Stephen Rothwell "Centralise >> CONFIG_ARCH_NO_VIRT_TO_BUS" that removes this Kconfig symbol, >> inverting/replacing it with "select HAVE_VIRT_TO_BUS" (including for >> arch/arm) which will undo the effects of this. > > Ah, thanks for pointing that out. At least my patch is harmless then > although also useless. I'll leave it in for now so I don't have to > rebase all the other bug fixes that are queued for 3.9, but I'm making > a note that I'll have to replace this with a proper one. I also > don't think that anything breaks if we apply both patches for a while, > it will just make my patch useless. Agreed. > I guess you'll have to do something similar for arch/metag, and Vineet > will do it for arch/arc. Yes, I have a little series of patches to fix this sort of harmless thing in arch/metag, removing GENERIC_SIGALTSTACK, HAVE_IRQ_WORK, ARCH_NO_VIRT_TO_BUS, and CONFIG_EXPERIMENTAL from defconfigs. I wasn't sure how it's normally handled though, so I was just going to wait until the other things go in before requesting a second pull. > > Stephen's patch is currently in Andrew's tree, and I don't see an easy > way to coordinate this. The patch we will need once both are merged > is below. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> FWIW: Acked-by: James Hogan <james.hogan@imgtec.com> (for arch/metag) Cheers James > > diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig > index 4fef29f..5829b67 100644 > --- a/arch/arc/Kconfig > +++ b/arch/arc/Kconfig > @@ -76,9 +76,6 @@ config HAVE_LATENCYTOP_SUPPORT > config NO_DMA > def_bool n > > -config ARCH_NO_VIRT_TO_BUS > - def_bool y > - > source "init/Kconfig" > source "kernel/Kconfig.freezer" > > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > index dedf02b..7b35b39 100644 > --- a/arch/arm/Kconfig > +++ b/arch/arm/Kconfig > @@ -49,7 +49,6 @@ config ARM > select HAVE_REGS_AND_STACK_ACCESS_API > select HAVE_SYSCALL_TRACEPOINTS > select HAVE_UID16 > - select HAVE_VIRT_TO_BUS > select KTIME_SCALAR > select PERF_USE_VMALLOC > select RTC_LIB > @@ -744,6 +743,7 @@ config ARCH_RPC > select NEED_MACH_IO_H > select NEED_MACH_MEMORY_H > select NO_IOPORT > + select HAVE_VIRT_TO_BUS > help > On the Acorn Risc-PC, Linux can support the internal IDE disk and > CD-ROM interface, serial and parallel port, and the floppy drive. > @@ -880,6 +880,7 @@ config ARCH_SHARK > select NEED_MACH_MEMORY_H > select PCI > select ZONE_DMA > + select HAVE_VIRT_TO_BUS > help > Support for the StrongARM based Digital DNARD machine, also known > as "Shark" (<http://www.shark-linux.de/shark.html>). > @@ -1462,10 +1463,6 @@ config ISA_DMA > bool > select ISA_DMA_API > > -config ARCH_NO_VIRT_TO_BUS > - def_bool y > - depends on !ARCH_RPC && !ARCH_NETWINDER && !ARCH_SHARK > - > # Select ISA DMA interface > config ISA_DMA_API > bool > diff --git a/arch/arm/mach-footbridge/Kconfig b/arch/arm/mach-footbridge/Kconfig > index abda5a1..42bf587 100644 > --- a/arch/arm/mach-footbridge/Kconfig > +++ b/arch/arm/mach-footbridge/Kconfig > @@ -67,6 +67,7 @@ config ARCH_NETWINDER > select ISA > select ISA_DMA > select PCI > + select HAVE_VIRT_TO_BUS > help > Say Y here if you intend to run this kernel on the Rebel.COM > NetWinder. Information about this machine can be found at: > diff --git a/arch/metag/Kconfig b/arch/metag/Kconfig > index 30adc78..03e216e 100644 > --- a/arch/metag/Kconfig > +++ b/arch/metag/Kconfig > @@ -35,9 +35,6 @@ config METAG > select OF_EARLY_FLATTREE > select SPARSE_IRQ > > -config ARCH_NO_VIRT_TO_BUS > - def_bool y > - > config STACKTRACE_SUPPORT > def_bool y > > ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 01/11] ARM: disable virt_to_bus/virt_to_bus almost everywhere 2013-02-20 16:32 ` James Hogan @ 2013-02-21 7:37 ` Vineet Gupta 2013-02-21 23:13 ` Stephen Rothwell 0 siblings, 1 reply; 7+ messages in thread From: Vineet Gupta @ 2013-02-21 7:37 UTC (permalink / raw) To: James Hogan Cc: Arnd Bergmann, Andrew Morton, arm, linux-kernel, linux-arm-kernel, Russell King, Stephen Rothwell, linux-next >> I guess you'll have to do something similar for arch/metag, and Vineet >> will do it for arch/arc. After getting the tip-bot msg about Stephen's patch for -mm, I never saw it in -next and thus was not sure how when it will start showing up in -next. > > Yes, I have a little series of patches to fix this sort of harmless > thing in arch/metag, removing GENERIC_SIGALTSTACK, HAVE_IRQ_WORK, > ARCH_NO_VIRT_TO_BUS, and CONFIG_EXPERIMENTAL from defconfigs. I wasn't > sure how it's normally handled though, so I was just going to wait until > the other things go in before requesting a second pull. Yes I also have a TODO list which certainly had most of those - but thanks for the complete list James :-) >> Stephen's patch is currently in Andrew's tree, and I don't see an easy >> way to coordinate this. The patch we will need once both are merged >> is below. >> >> Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > FWIW: > Acked-by: James Hogan <james.hogan@imgtec.com> (for arch/metag) > > Cheers > James Acked-by: Vineet Gupta <vgupta@synopsys.com> (for arch/arc) So this means Stephen's patch - once merged will take care of existing in-tree arches and your's will take care of metag/arc. Thx, -Vineet ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 01/11] ARM: disable virt_to_bus/virt_to_bus almost everywhere 2013-02-21 7:37 ` Vineet Gupta @ 2013-02-21 23:13 ` Stephen Rothwell 2013-02-25 14:18 ` Vineet Gupta 0 siblings, 1 reply; 7+ messages in thread From: Stephen Rothwell @ 2013-02-21 23:13 UTC (permalink / raw) To: Vineet Gupta Cc: James Hogan, Arnd Bergmann, Andrew Morton, arm, linux-kernel, linux-arm-kernel, Russell King, linux-next [-- Attachment #1: Type: text/plain, Size: 1266 bytes --] Hi, On Thu, 21 Feb 2013 13:07:56 +0530 Vineet Gupta <Vineet.Gupta1@synopsys.com> wrote: > > >> I guess you'll have to do something similar for arch/metag, and Vineet > >> will do it for arch/arc. > > After getting the tip-bot msg about Stephen's patch for -mm, I never saw it in > -next and thus was not sure how when it will start showing up in -next. It arrived in next-21030220. > >> Stephen's patch is currently in Andrew's tree, and I don't see an easy > >> way to coordinate this. The patch we will need once both are merged > >> is below. > >> > >> Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > > > FWIW: > > Acked-by: James Hogan <james.hogan@imgtec.com> (for arch/metag) > > > Acked-by: Vineet Gupta <vgupta@synopsys.com> (for arch/arc) > > So this means Stephen's patch - once merged will take care of existing in-tree > arches and your's will take care of metag/arc. The easiest way would be to put the follow up patches in Andrew's patch set (since it is still based on top of linux-next). It usually is merged pretty late, so I would get your own trees merged ASAP and this can be taken care of when Andrew sends his patch set to Linus. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au [-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 01/11] ARM: disable virt_to_bus/virt_to_bus almost everywhere 2013-02-21 23:13 ` Stephen Rothwell @ 2013-02-25 14:18 ` Vineet Gupta 2013-02-25 14:54 ` Arnd Bergmann 0 siblings, 1 reply; 7+ messages in thread From: Vineet Gupta @ 2013-02-25 14:18 UTC (permalink / raw) To: Stephen Rothwell Cc: James Hogan, Arnd Bergmann, Andrew Morton, arm, linux-kernel, linux-arm-kernel, Russell King, linux-next Hi Arnd, On Friday 22 February 2013 04:43 AM, Stephen Rothwell wrote: > Hi, > > On Thu, 21 Feb 2013 13:07:56 +0530 Vineet Gupta <Vineet.Gupta1@synopsys.com> wrote: >> >>>> I guess you'll have to do something similar for arch/metag, and Vineet >>>> will do it for arch/arc. >> >> After getting the tip-bot msg about Stephen's patch for -mm, I never saw it in >> -next and thus was not sure how when it will start showing up in -next. > > It arrived in next-21030220. > >>>> Stephen's patch is currently in Andrew's tree, and I don't see an easy >>>> way to coordinate this. The patch we will need once both are merged >>>> is below. >>>> >>>> Signed-off-by: Arnd Bergmann <arnd@arndb.de> >>> >>> FWIW: >>> Acked-by: James Hogan <james.hogan@imgtec.com> (for arch/metag) >>> >> Acked-by: Vineet Gupta <vgupta@synopsys.com> (for arch/arc) >> >> So this means Stephen's patch - once merged will take care of existing in-tree >> arches and your's will take care of metag/arc. > > The easiest way would be to put the follow up patches in Andrew's patch > set (since it is still based on top of linux-next). It usually is merged > pretty late, so I would get your own trees merged ASAP and this can be > taken care of when Andrew sends his patch set to Linus. > Have you queued up this change via one of your trees already for 3.9-rcX ? If not, I can fold it in with a bunch of Kconfig cleanups for ARC (GENERIC_SIGALTSTACK, HAVE_IRQ_WORK), given that those bits are already in linus' tree. Thx, -Vineet ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 01/11] ARM: disable virt_to_bus/virt_to_bus almost everywhere 2013-02-25 14:18 ` Vineet Gupta @ 2013-02-25 14:54 ` Arnd Bergmann 0 siblings, 0 replies; 7+ messages in thread From: Arnd Bergmann @ 2013-02-25 14:54 UTC (permalink / raw) To: Vineet Gupta Cc: Stephen Rothwell, James Hogan, Andrew Morton, arm, linux-kernel, linux-arm-kernel, Russell King, linux-next On Monday 25 February 2013, Vineet Gupta wrote: > Have you queued up this change via one of your trees already for 3.9-rcX ? > If not, I can fold it in with a bunch of Kconfig cleanups for ARC > (GENERIC_SIGALTSTACK, HAVE_IRQ_WORK), given that those bits are already in linus' > tree. > I haven't put it in my tree yet, not. Please put it in yours. Arnd ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-02-25 14:55 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1360849767-1463135-1-git-send-email-arnd@arndb.de>
[not found] ` <1360849767-1463135-2-git-send-email-arnd@arndb.de>
2013-02-20 15:14 ` [PATCH 01/11] ARM: disable virt_to_bus/virt_to_bus almost everywhere James Hogan
2013-02-20 16:00 ` Arnd Bergmann
2013-02-20 16:32 ` James Hogan
2013-02-21 7:37 ` Vineet Gupta
2013-02-21 23:13 ` Stephen Rothwell
2013-02-25 14:18 ` Vineet Gupta
2013-02-25 14:54 ` Arnd Bergmann
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox