| Message ID | 1360849767-1463135-2-git-send-email-arnd@arndb.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hello Arnd, El 14/02/13 10:49, Arnd Bergmann escribió: > 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> Small nitpick: Please have a look at the patch subject, I suppose you meant something like "virt_to_bus/bus_to_virt" instead of "virt_to_bus/virt_to_bus". Thanks, Emilio
On Saturday 16 February 2013, Emilio López wrote: > Small nitpick: Please have a look at the patch subject, I suppose you > meant something like "virt_to_bus/bus_to_virt" instead of > "virt_to_bus/virt_to_bus". Yes, absolutely right, thanks for your attention. The patch is already applied to a stable branch now, so I would prefer not to rebase it though. If there is an important reason to change the applied patches, I will fix this one as well. Arnd
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
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 + # Select ISA DMA interface config ISA_DMA_API bool diff --git a/arch/arm/configs/shark_defconfig b/arch/arm/configs/shark_defconfig index caa07db..e319b2c 100644 --- a/arch/arm/configs/shark_defconfig +++ b/arch/arm/configs/shark_defconfig @@ -73,7 +73,6 @@ CONFIG_PARTITION_ADVANCED=y CONFIG_NLS_CODEPAGE_437=m CONFIG_NLS_CODEPAGE_850=m CONFIG_NLS_ISO8859_1=m -# CONFIG_ENABLE_WARN_DEPRECATED is not set # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_DEBUG_KERNEL=y # CONFIG_SCHED_DEBUG is not set diff --git a/arch/arm/include/asm/dma.h b/arch/arm/include/asm/dma.h index 5694a0d..58b8c6a 100644 --- a/arch/arm/include/asm/dma.h +++ b/arch/arm/include/asm/dma.h @@ -105,7 +105,7 @@ extern void set_dma_sg(unsigned int chan, struct scatterlist *sg, int nr_sg); */ extern void __set_dma_addr(unsigned int chan, void *addr); #define set_dma_addr(chan, addr) \ - __set_dma_addr(chan, bus_to_virt(addr)) + __set_dma_addr(chan, (void *)__bus_to_virt(addr)) /* Set the DMA byte count for this channel * diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h index 1c4df27..474e2e6 100644 --- a/arch/arm/include/asm/memory.h +++ b/arch/arm/include/asm/memory.h @@ -245,6 +245,7 @@ static inline void *phys_to_virt(phys_addr_t x) #define __bus_to_pfn(x) __phys_to_pfn(x) #endif +#ifdef CONFIG_VIRT_TO_BUS static inline __deprecated unsigned long virt_to_bus(void *x) { return __virt_to_bus((unsigned long)x); @@ -254,6 +255,7 @@ static inline __deprecated void *bus_to_virt(unsigned long x) { return (void *)__bus_to_virt(x); } +#endif /* * Conversion between a struct page and a physical address.
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(-)