| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1209591750.18023.233.camel@pasglop>
Date: Thu, 01 May 2008 07:42:30 +1000
From: Benjamin Herrenschmidt <benh@...nel.crashing.org>
To: Kumar Gala <galak@...nel.crashing.org>
Cc: Greg KH <greg@...ah.com>, Andrew Morton <akpm@...l.org>,
htejun@...il.com, Jeff Garzik <jeff@...zik.org>,
linux-kernel@...r.kernel.org, Emilian.Medve@...escale.com,
linuxppc-dev@...abs.org
Subject: Re: [PATCH v2] [POWERPC] devres: Add devm_ioremap_flags()
On Wed, 2008-04-30 at 11:08 -0500, Kumar Gala wrote:
> From: Emil Medve <Emilian.Medve@...escale.com>
>
> We provide an ioremap_flags so provide a coresphonding devm_ioremap_flags.
>
> Signed-off-by: Emil Medve <Emilian.Medve@...escale.com>
> Signed-off-by: Kumar Gala <galak@...nel.crashing.org>
> ---
>
> Forgot to commit the actual implemtation in arch/powerpc/lib/devres.c
>
> Which tree should this go through, powerpc.git?
Let's call it ioremap_prot instead please. I'm about to change
ioremap_flags to ioremap_prot anyways. Keep the flags/prot argument
unsigned long for now (it can be argued it should be a pgprot but that
hasn't been sorted out completely).
Cheers,
Ben.
> - k
>
> arch/powerpc/lib/Makefile | 1 +
> arch/powerpc/lib/devres.c | 33 +++++++++++++++++++++++++++++++++
> include/asm-powerpc/io.h | 8 +++++++-
> include/linux/io.h | 1 +
> lib/devres.c | 2 +-
> 5 files changed, 43 insertions(+), 2 deletions(-)
> create mode 100644 arch/powerpc/lib/devres.c
>
> diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
> index 4bb023f..f1d2cdc 100644
> --- a/arch/powerpc/lib/Makefile
> +++ b/arch/powerpc/lib/Makefile
> @@ -23,3 +23,4 @@ obj-$(CONFIG_SMP) += locks.o
> endif
>
> obj-$(CONFIG_PPC_LIB_RHEAP) += rheap.o
> +obj-$(CONFIG_HAS_IOMEM) += devres.o
> diff --git a/arch/powerpc/lib/devres.c b/arch/powerpc/lib/devres.c
> new file mode 100644
> index 0000000..b73c64b
> --- /dev/null
> +++ b/arch/powerpc/lib/devres.c
> @@ -0,0 +1,33 @@
> +#include <linux/device.h> /* devres_*(), devm_ioremap_release() */
> +#include <linux/io.h> /* ioremap_flags() */
> +#include <linux/module.h> /* EXPORT_SYMBOL() */
> +
> +/**
> + * devm_ioremap_flags - Managed ioremap_flags()
> + * @dev: Generic device to remap IO address for
> + * @offset: BUS offset to map
> + * @size: Size of map
> + * @flags: Page flags
> + *
> + * Managed ioremap_flags(). Map is automatically unmapped on driver
> + * detach.
> + */
> +void __iomem *devm_ioremap_flags(struct device *dev, resource_size_t offset,
> + size_t size, unsigned long flags)
> +{
> + void __iomem **ptr, *addr;
> +
> + ptr = devres_alloc(devm_ioremap_release, sizeof(*ptr), GFP_KERNEL);
> + if (!ptr)
> + return NULL;
> +
> + addr = ioremap_flags(offset, size, flags);
> + if (addr) {
> + *ptr = addr;
> + devres_add(dev, ptr);
> + } else
> + devres_free(ptr);
> +
> + return addr;
> +}
> +EXPORT_SYMBOL(devm_ioremap_flags);
> diff --git a/include/asm-powerpc/io.h b/include/asm-powerpc/io.h
> index afae069..3b8c334 100644
> --- a/include/asm-powerpc/io.h
> +++ b/include/asm-powerpc/io.h
> @@ -2,7 +2,7 @@
> #define _ASM_POWERPC_IO_H
> #ifdef __KERNEL__
>
> -/*
> +/*
> * 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
> @@ -18,6 +18,9 @@ extern int check_legacy_ioport(unsigned long base_port);
> #define _PNPWRP 0xa79
> #define PNPBIOS_BASE 0xf000
>
> +#include <linux/device.h>
> +#include <linux/io.h>
> +
> #include <linux/compiler.h>
> #include <asm/page.h>
> #include <asm/byteorder.h>
> @@ -744,6 +747,9 @@ static inline void * bus_to_virt(unsigned long address)
>
> #define clrsetbits_8(addr, clear, set) clrsetbits(8, addr, clear, set)
>
> +void __iomem *devm_ioremap_flags(struct device *dev, resource_size_t offset,
> + size_t size, unsigned long flags);
> +
> #endif /* __KERNEL__ */
>
> #endif /* _ASM_POWERPC_IO_H */
> diff --git a/include/linux/io.h b/include/linux/io.h
> index 831f57c..7a390cf 100644
> --- a/include/linux/io.h
> +++ b/include/linux/io.h
> @@ -58,6 +58,7 @@ static inline void devm_ioport_unmap(struct device *dev, void __iomem *addr)
> }
> #endif
>
> +void devm_ioremap_release(struct device *dev, void *res);
> void __iomem * devm_ioremap(struct device *dev, resource_size_t offset,
> unsigned long size);
> void __iomem * devm_ioremap_nocache(struct device *dev, resource_size_t offset,
> diff --git a/lib/devres.c b/lib/devres.c
> index 26c87c4..72c8909 100644
> --- a/lib/devres.c
> +++ b/lib/devres.c
> @@ -2,7 +2,7 @@
> #include <linux/io.h>
> #include <linux/module.h>
>
> -static void devm_ioremap_release(struct device *dev, void *res)
> +void devm_ioremap_release(struct device *dev, void *res)
> {
> iounmap(*(void __iomem **)res);
> }
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists