* fsl_upm compile failure. @ 2008-10-08 22:28 Dave Jones 2008-10-08 23:02 ` Anton Vorontsov 0 siblings, 1 reply; 6+ messages in thread From: Dave Jones @ 2008-10-08 22:28 UTC (permalink / raw) To: Anton Vorontsov; +Cc: Linux Kernel Hi Anton, I tried reenabling CONFIG_MTD_NAND_FSL_UPM in the Fedora kernel today (currently on 2.6.27-rc9-git1), and got the error below. ERROR: "fsl_lbc_lock" [drivers/mtd/nand/fsl_upm.ko] undefined! It seems that this isn't exported to modules. diff below fixes this. (Not tested yet, the Fedora ppc builders are a little slow). Dave --- CONFIG_MTD_NAND_FSL_UPM can be built modular, but needs to use fsl_lbc_lock, which isn't currently exported. Signed-off-by: Dave Jones <davej@redhat.com> diff --git a/arch/powerpc/sysdev/fsl_lbc.c b/arch/powerpc/sysdev/fsl_lbc.c index 422c8fa..1c6c522 100644 --- a/arch/powerpc/sysdev/fsl_lbc.c +++ b/arch/powerpc/sysdev/fsl_lbc.c @@ -16,6 +16,7 @@ #include <asm/fsl_lbc.h> spinlock_t fsl_lbc_lock = __SPIN_LOCK_UNLOCKED(fsl_lbc_lock); +EXPORT_SYMBOL(fsl_lbc_lock); struct fsl_lbc_regs __iomem *fsl_lbc_regs; EXPORT_SYMBOL(fsl_lbc_regs); ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: fsl_upm compile failure. 2008-10-08 22:28 fsl_upm compile failure Dave Jones @ 2008-10-08 23:02 ` Anton Vorontsov 2008-10-08 23:17 ` Anton Vorontsov 2008-10-08 23:33 ` Dave Jones 0 siblings, 2 replies; 6+ messages in thread From: Anton Vorontsov @ 2008-10-08 23:02 UTC (permalink / raw) To: Dave Jones, Linux Kernel; +Cc: Kumar Gala, linuxppc-dev Hi, On Wed, Oct 08, 2008 at 06:28:15PM -0400, Dave Jones wrote: > Hi Anton, > I tried reenabling CONFIG_MTD_NAND_FSL_UPM in the Fedora kernel > today (currently on 2.6.27-rc9-git1), and got the error below. > > ERROR: "fsl_lbc_lock" [drivers/mtd/nand/fsl_upm.ko] undefined! Weird. It works for me with mpc836x_rdk_defconfig and MTD_NAND_FSL_UPM=m... Hm.. CC drivers/mtd/nand/fsl_upm.mod.o LD [M] drivers/mtd/nand/fsl_upm.ko Can you send me the .config file you use? > It seems that this isn't exported to modules. > diff below fixes this. (Not tested yet, the Fedora ppc > builders are a little slow). > > Dave > > --- > > CONFIG_MTD_NAND_FSL_UPM can be built modular, but needs to > use fsl_lbc_lock, which isn't currently exported. > > Signed-off-by: Dave Jones <davej@redhat.com> > > diff --git a/arch/powerpc/sysdev/fsl_lbc.c b/arch/powerpc/sysdev/fsl_lbc.c > index 422c8fa..1c6c522 100644 > --- a/arch/powerpc/sysdev/fsl_lbc.c > +++ b/arch/powerpc/sysdev/fsl_lbc.c > @@ -16,6 +16,7 @@ > #include <asm/fsl_lbc.h> > > spinlock_t fsl_lbc_lock = __SPIN_LOCK_UNLOCKED(fsl_lbc_lock); > +EXPORT_SYMBOL(fsl_lbc_lock); > > struct fsl_lbc_regs __iomem *fsl_lbc_regs; > EXPORT_SYMBOL(fsl_lbc_regs); But the patch looks obviously correct. Much thanks for catching this. Though better option would be to uninline the fsl_upm_run_pattern().. it is quite big anyway... Something like this: diff --git a/arch/powerpc/include/asm/fsl_lbc.h b/arch/powerpc/include/asm/fsl_lbc.h index 303f548..af2b535 100644 --- a/arch/powerpc/include/asm/fsl_lbc.h +++ b/arch/powerpc/include/asm/fsl_lbc.h @@ -24,7 +24,6 @@ #define __ASM_FSL_LBC_H #include <linux/types.h> -#include <linux/spinlock.h> #include <asm/io.h> struct fsl_lbc_bank { @@ -228,7 +227,6 @@ struct fsl_lbc_regs { }; extern struct fsl_lbc_regs __iomem *fsl_lbc_regs; -extern spinlock_t fsl_lbc_lock; /* * FSL UPM routines @@ -268,44 +266,7 @@ static inline void fsl_upm_end_pattern(struct fsl_upm *upm) cpu_relax(); } -/** - * fsl_upm_run_pattern - actually run an UPM pattern - * @upm: pointer to the fsl_upm structure obtained via fsl_upm_find - * @io_base: remapped pointer to where memory access should happen - * @mar: MAR register content during pattern execution - * - * This function triggers dummy write to the memory specified by the io_base, - * thus UPM pattern actually executed. Note that mar usage depends on the - * pre-programmed AMX bits in the UPM RAM. - */ -static inline int fsl_upm_run_pattern(struct fsl_upm *upm, - void __iomem *io_base, u32 mar) -{ - int ret = 0; - unsigned long flags; - - spin_lock_irqsave(&fsl_lbc_lock, flags); - - out_be32(&fsl_lbc_regs->mar, mar << (32 - upm->width)); - - switch (upm->width) { - case 8: - out_8(io_base, 0x0); - break; - case 16: - out_be16(io_base, 0x0); - break; - case 32: - out_be32(io_base, 0x0); - break; - default: - ret = -EINVAL; - break; - } - - spin_unlock_irqrestore(&fsl_lbc_lock, flags); - - return ret; -} +extern int fsl_upm_run_pattern(struct fsl_upm *upm, void __iomem *io_base, + u32 mar); #endif /* __ASM_FSL_LBC_H */ diff --git a/arch/powerpc/sysdev/fsl_lbc.c b/arch/powerpc/sysdev/fsl_lbc.c index 422c8fa..d81297c 100644 --- a/arch/powerpc/sysdev/fsl_lbc.c +++ b/arch/powerpc/sysdev/fsl_lbc.c @@ -13,6 +13,7 @@ #include <linux/kernel.h> #include <linux/of.h> +#include <linux/spinlock.h> #include <asm/fsl_lbc.h> spinlock_t fsl_lbc_lock = __SPIN_LOCK_UNLOCKED(fsl_lbc_lock); @@ -127,3 +128,43 @@ int fsl_upm_find(phys_addr_t addr_base, struct fsl_upm *upm) return 0; } EXPORT_SYMBOL(fsl_upm_find); + +/** + * fsl_upm_run_pattern - actually run an UPM pattern + * @upm: pointer to the fsl_upm structure obtained via fsl_upm_find + * @io_base: remapped pointer to where memory access should happen + * @mar: MAR register content during pattern execution + * + * This function triggers dummy write to the memory specified by the io_base, + * thus UPM pattern actually executed. Note that mar usage depends on the + * pre-programmed AMX bits in the UPM RAM. + */ +int fsl_upm_run_pattern(struct fsl_upm *upm, void __iomem *io_base, u32 mar) +{ + int ret = 0; + unsigned long flags; + + spin_lock_irqsave(&fsl_lbc_lock, flags); + + out_be32(&fsl_lbc_regs->mar, mar << (32 - upm->width)); + + switch (upm->width) { + case 8: + out_8(io_base, 0x0); + break; + case 16: + out_be16(io_base, 0x0); + break; + case 32: + out_be32(io_base, 0x0); + break; + default: + ret = -EINVAL; + break; + } + + spin_unlock_irqrestore(&fsl_lbc_lock, flags); + + return ret; +} +EXPORT_SYMBOL(fsl_upm_run_pattern); (This also adds missing linux/spinlock.h include to the fsl_lbc.c) Anyhow, whatever approach you chose, feel free to add my: Acked-by: Anton Vorontsov <avorontsov@ru.mvista.com> Then please resend the patch with added Cc: Kumar Gala <galak@kernel.crashing.org>, linuxppc-dev@ozlabs.org ^^ Kumar would apply the patch to his powerpc.git tree, powerpc-next branch. -- Anton Vorontsov email: cbouatmailru@gmail.com irc://irc.freenode.net/bd2 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: fsl_upm compile failure. 2008-10-08 23:02 ` Anton Vorontsov @ 2008-10-08 23:17 ` Anton Vorontsov 2008-10-08 23:33 ` Dave Jones 1 sibling, 0 replies; 6+ messages in thread From: Anton Vorontsov @ 2008-10-08 23:17 UTC (permalink / raw) To: Dave Jones, Linux Kernel; +Cc: Kumar Gala, linuxppc-dev On Thu, Oct 09, 2008 at 03:02:19AM +0400, Anton Vorontsov wrote: > Though better option would be to uninline the fsl_upm_run_pattern().. > it is quite big anyway... Something like this: Even better. We don't need exported fsl_lbc_regs too. And also we can mark the lock and regs as static. Yeah, w/o inline things look much better. diff --git a/arch/powerpc/include/asm/fsl_lbc.h b/arch/powerpc/include/asm/fsl_lbc.h index 303f548..375f46c 100644 --- a/arch/powerpc/include/asm/fsl_lbc.h +++ b/arch/powerpc/include/asm/fsl_lbc.h @@ -24,7 +24,6 @@ #define __ASM_FSL_LBC_H #include <linux/types.h> -#include <linux/spinlock.h> #include <asm/io.h> struct fsl_lbc_bank { @@ -227,9 +226,6 @@ struct fsl_lbc_regs { u8 res8[0xF00]; }; -extern struct fsl_lbc_regs __iomem *fsl_lbc_regs; -extern spinlock_t fsl_lbc_lock; - /* * FSL UPM routines */ @@ -268,44 +264,7 @@ static inline void fsl_upm_end_pattern(struct fsl_upm *upm) cpu_relax(); } -/** - * fsl_upm_run_pattern - actually run an UPM pattern - * @upm: pointer to the fsl_upm structure obtained via fsl_upm_find - * @io_base: remapped pointer to where memory access should happen - * @mar: MAR register content during pattern execution - * - * This function triggers dummy write to the memory specified by the io_base, - * thus UPM pattern actually executed. Note that mar usage depends on the - * pre-programmed AMX bits in the UPM RAM. - */ -static inline int fsl_upm_run_pattern(struct fsl_upm *upm, - void __iomem *io_base, u32 mar) -{ - int ret = 0; - unsigned long flags; - - spin_lock_irqsave(&fsl_lbc_lock, flags); - - out_be32(&fsl_lbc_regs->mar, mar << (32 - upm->width)); - - switch (upm->width) { - case 8: - out_8(io_base, 0x0); - break; - case 16: - out_be16(io_base, 0x0); - break; - case 32: - out_be32(io_base, 0x0); - break; - default: - ret = -EINVAL; - break; - } - - spin_unlock_irqrestore(&fsl_lbc_lock, flags); - - return ret; -} +extern int fsl_upm_run_pattern(struct fsl_upm *upm, void __iomem *io_base, + u32 mar); #endif /* __ASM_FSL_LBC_H */ diff --git a/arch/powerpc/sysdev/fsl_lbc.c b/arch/powerpc/sysdev/fsl_lbc.c index 422c8fa..cb4f570 100644 --- a/arch/powerpc/sysdev/fsl_lbc.c +++ b/arch/powerpc/sysdev/fsl_lbc.c @@ -13,12 +13,12 @@ #include <linux/kernel.h> #include <linux/of.h> +#include <linux/spinlock.h> #include <asm/fsl_lbc.h> -spinlock_t fsl_lbc_lock = __SPIN_LOCK_UNLOCKED(fsl_lbc_lock); +static spinlock_t fsl_lbc_lock = __SPIN_LOCK_UNLOCKED(fsl_lbc_lock); -struct fsl_lbc_regs __iomem *fsl_lbc_regs; -EXPORT_SYMBOL(fsl_lbc_regs); +static struct fsl_lbc_regs __iomem *fsl_lbc_regs; static char __initdata *compat_lbc[] = { "fsl,pq2-localbus", @@ -127,3 +127,43 @@ int fsl_upm_find(phys_addr_t addr_base, struct fsl_upm *upm) return 0; } EXPORT_SYMBOL(fsl_upm_find); + +/** + * fsl_upm_run_pattern - actually run an UPM pattern + * @upm: pointer to the fsl_upm structure obtained via fsl_upm_find + * @io_base: remapped pointer to where memory access should happen + * @mar: MAR register content during pattern execution + * + * This function triggers dummy write to the memory specified by the io_base, + * thus UPM pattern actually executed. Note that mar usage depends on the + * pre-programmed AMX bits in the UPM RAM. + */ +int fsl_upm_run_pattern(struct fsl_upm *upm, void __iomem *io_base, u32 mar) +{ + int ret = 0; + unsigned long flags; + + spin_lock_irqsave(&fsl_lbc_lock, flags); + + out_be32(&fsl_lbc_regs->mar, mar << (32 - upm->width)); + + switch (upm->width) { + case 8: + out_8(io_base, 0x0); + break; + case 16: + out_be16(io_base, 0x0); + break; + case 32: + out_be32(io_base, 0x0); + break; + default: + ret = -EINVAL; + break; + } + + spin_unlock_irqrestore(&fsl_lbc_lock, flags); + + return ret; +} +EXPORT_SYMBOL(fsl_upm_run_pattern); ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: fsl_upm compile failure. 2008-10-08 23:02 ` Anton Vorontsov 2008-10-08 23:17 ` Anton Vorontsov @ 2008-10-08 23:33 ` Dave Jones 2008-10-09 0:32 ` [PATCH] powerpc: fix fsl_upm nand driver modular build Anton Vorontsov 1 sibling, 1 reply; 6+ messages in thread From: Dave Jones @ 2008-10-08 23:33 UTC (permalink / raw) To: Anton Vorontsov; +Cc: Linux Kernel, Kumar Gala, linuxppc-dev On Thu, Oct 09, 2008 at 03:02:19AM +0400, Anton Vorontsov wrote: > Hi, > > On Wed, Oct 08, 2008 at 06:28:15PM -0400, Dave Jones wrote: > > Hi Anton, > > I tried reenabling CONFIG_MTD_NAND_FSL_UPM in the Fedora kernel > > today (currently on 2.6.27-rc9-git1), and got the error below. > > > > ERROR: "fsl_lbc_lock" [drivers/mtd/nand/fsl_upm.ko] undefined! > > Weird. It works for me with mpc836x_rdk_defconfig and > MTD_NAND_FSL_UPM=m... > > Hm.. > > CC drivers/mtd/nand/fsl_upm.mod.o > LD [M] drivers/mtd/nand/fsl_upm.ko > > Can you send me the .config file you use? http://davej.fedorapeople.org/ppc.config > But the patch looks obviously correct. Much thanks for catching this. > > Though better option would be to uninline the fsl_upm_run_pattern().. > it is quite big anyway... Something like this: I'll leave it to you to decide what to push to Linus Dave -- http://www.codemonkey.org.uk ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] powerpc: fix fsl_upm nand driver modular build 2008-10-08 23:33 ` Dave Jones @ 2008-10-09 0:32 ` Anton Vorontsov 2008-10-13 16:48 ` Kumar Gala 0 siblings, 1 reply; 6+ messages in thread From: Anton Vorontsov @ 2008-10-09 0:32 UTC (permalink / raw) To: Dave Jones, Linux Kernel, Kumar Gala, linuxppc-dev The fsl_upm nand driver fails to build because fsl_lbc_lock isn't exported, the lock is needed by the inlined fsl_upm_run_pattern() function: ERROR: "fsl_lbc_lock" [drivers/mtd/nand/fsl_upm.ko] undefined! Dave Jones purposed to export the lock, but it is better to just uninline the fsl_upm_run_pattern(). When uninlined we also no longer need the exported fsl_lbc_regs, and both fsl_lbc_lock and fsl_lbc_regs could be marked static. While at it, also add some missing includes that we should have included explicitly. Reported-by: Dave Jones <davej@redhat.com> Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com> --- On Wed, Oct 08, 2008 at 07:33:06PM -0400, Dave Jones wrote: [...] > > > ERROR: "fsl_lbc_lock" [drivers/mtd/nand/fsl_upm.ko] undefined! > > > > Weird. It works for me with mpc836x_rdk_defconfig and > > MTD_NAND_FSL_UPM=m... > > > > Hm.. > > > > CC drivers/mtd/nand/fsl_upm.mod.o > > LD [M] drivers/mtd/nand/fsl_upm.ko > > > > Can you send me the .config file you use? > > http://davej.fedorapeople.org/ppc.config Still works here. :-/ I'm using latest Linus' git tree, pulled few minutes ago just in case. gcc version 4.2.0 (MontaVista 4.2.0-16.0.20.0800760 2008-04-05) GNU ld (GNU Binutils) 2.17.50.20070611 Most probably something on my side, maybe need to update the toolchain. > > But the patch looks obviously correct. Much thanks for catching this. > > > > Though better option would be to uninline the fsl_upm_run_pattern().. > > it is quite big anyway... Something like this: > > I'll leave it to you to decide what to push to Linus Ok, here it is. Since I'm unable to reproduce the error, I'd appreciate Tested-by: tag if you could find time to build-test the patch. It works for me though... Thanks again, arch/powerpc/include/asm/fsl_lbc.h | 48 +++----------------------------- arch/powerpc/sysdev/fsl_lbc.c | 53 +++++++++++++++++++++++++++++++++--- 2 files changed, 53 insertions(+), 48 deletions(-) diff --git a/arch/powerpc/include/asm/fsl_lbc.h b/arch/powerpc/include/asm/fsl_lbc.h index 303f548..63a4f77 100644 --- a/arch/powerpc/include/asm/fsl_lbc.h +++ b/arch/powerpc/include/asm/fsl_lbc.h @@ -23,9 +23,9 @@ #ifndef __ASM_FSL_LBC_H #define __ASM_FSL_LBC_H +#include <linux/compiler.h> #include <linux/types.h> -#include <linux/spinlock.h> -#include <asm/io.h> +#include <linux/io.h> struct fsl_lbc_bank { __be32 br; /**< Base Register */ @@ -227,9 +227,6 @@ struct fsl_lbc_regs { u8 res8[0xF00]; }; -extern struct fsl_lbc_regs __iomem *fsl_lbc_regs; -extern spinlock_t fsl_lbc_lock; - /* * FSL UPM routines */ @@ -268,44 +265,7 @@ static inline void fsl_upm_end_pattern(struct fsl_upm *upm) cpu_relax(); } -/** - * fsl_upm_run_pattern - actually run an UPM pattern - * @upm: pointer to the fsl_upm structure obtained via fsl_upm_find - * @io_base: remapped pointer to where memory access should happen - * @mar: MAR register content during pattern execution - * - * This function triggers dummy write to the memory specified by the io_base, - * thus UPM pattern actually executed. Note that mar usage depends on the - * pre-programmed AMX bits in the UPM RAM. - */ -static inline int fsl_upm_run_pattern(struct fsl_upm *upm, - void __iomem *io_base, u32 mar) -{ - int ret = 0; - unsigned long flags; - - spin_lock_irqsave(&fsl_lbc_lock, flags); - - out_be32(&fsl_lbc_regs->mar, mar << (32 - upm->width)); - - switch (upm->width) { - case 8: - out_8(io_base, 0x0); - break; - case 16: - out_be16(io_base, 0x0); - break; - case 32: - out_be32(io_base, 0x0); - break; - default: - ret = -EINVAL; - break; - } - - spin_unlock_irqrestore(&fsl_lbc_lock, flags); - - return ret; -} +extern int fsl_upm_run_pattern(struct fsl_upm *upm, void __iomem *io_base, + u32 mar); #endif /* __ASM_FSL_LBC_H */ diff --git a/arch/powerpc/sysdev/fsl_lbc.c b/arch/powerpc/sysdev/fsl_lbc.c index 422c8fa..0494ee5 100644 --- a/arch/powerpc/sysdev/fsl_lbc.c +++ b/arch/powerpc/sysdev/fsl_lbc.c @@ -11,14 +11,19 @@ * (at your option) any later version. */ +#include <linux/init.h> +#include <linux/module.h> #include <linux/kernel.h> +#include <linux/compiler.h> +#include <linux/spinlock.h> +#include <linux/types.h> +#include <linux/io.h> #include <linux/of.h> +#include <asm/prom.h> #include <asm/fsl_lbc.h> -spinlock_t fsl_lbc_lock = __SPIN_LOCK_UNLOCKED(fsl_lbc_lock); - -struct fsl_lbc_regs __iomem *fsl_lbc_regs; -EXPORT_SYMBOL(fsl_lbc_regs); +static spinlock_t fsl_lbc_lock = __SPIN_LOCK_UNLOCKED(fsl_lbc_lock); +static struct fsl_lbc_regs __iomem *fsl_lbc_regs; static char __initdata *compat_lbc[] = { "fsl,pq2-localbus", @@ -127,3 +132,43 @@ int fsl_upm_find(phys_addr_t addr_base, struct fsl_upm *upm) return 0; } EXPORT_SYMBOL(fsl_upm_find); + +/** + * fsl_upm_run_pattern - actually run an UPM pattern + * @upm: pointer to the fsl_upm structure obtained via fsl_upm_find + * @io_base: remapped pointer to where memory access should happen + * @mar: MAR register content during pattern execution + * + * This function triggers dummy write to the memory specified by the io_base, + * thus UPM pattern actually executed. Note that mar usage depends on the + * pre-programmed AMX bits in the UPM RAM. + */ +int fsl_upm_run_pattern(struct fsl_upm *upm, void __iomem *io_base, u32 mar) +{ + int ret = 0; + unsigned long flags; + + spin_lock_irqsave(&fsl_lbc_lock, flags); + + out_be32(&fsl_lbc_regs->mar, mar << (32 - upm->width)); + + switch (upm->width) { + case 8: + out_8(io_base, 0x0); + break; + case 16: + out_be16(io_base, 0x0); + break; + case 32: + out_be32(io_base, 0x0); + break; + default: + ret = -EINVAL; + break; + } + + spin_unlock_irqrestore(&fsl_lbc_lock, flags); + + return ret; +} +EXPORT_SYMBOL(fsl_upm_run_pattern); -- 1.5.6.3 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] powerpc: fix fsl_upm nand driver modular build 2008-10-09 0:32 ` [PATCH] powerpc: fix fsl_upm nand driver modular build Anton Vorontsov @ 2008-10-13 16:48 ` Kumar Gala 0 siblings, 0 replies; 6+ messages in thread From: Kumar Gala @ 2008-10-13 16:48 UTC (permalink / raw) To: avorontsov; +Cc: Dave Jones, Linux Kernel, linuxppc-dev On Oct 8, 2008, at 7:32 PM, Anton Vorontsov wrote: > The fsl_upm nand driver fails to build because fsl_lbc_lock isn't > exported, the lock is needed by the inlined fsl_upm_run_pattern() > function: > > ERROR: "fsl_lbc_lock" [drivers/mtd/nand/fsl_upm.ko] undefined! > > Dave Jones purposed to export the lock, but it is better to just > uninline > the fsl_upm_run_pattern(). > > When uninlined we also no longer need the exported fsl_lbc_regs, and > both fsl_lbc_lock and fsl_lbc_regs could be marked static. > > While at it, also add some missing includes that we should have > included > explicitly. > > Reported-by: Dave Jones <davej@redhat.com> > Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com> > --- applied. - k ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2008-10-13 16:49 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2008-10-08 22:28 fsl_upm compile failure Dave Jones 2008-10-08 23:02 ` Anton Vorontsov 2008-10-08 23:17 ` Anton Vorontsov 2008-10-08 23:33 ` Dave Jones 2008-10-09 0:32 ` [PATCH] powerpc: fix fsl_upm nand driver modular build Anton Vorontsov 2008-10-13 16:48 ` Kumar Gala
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox