Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0da99d5 authored by Anton Vorontsov's avatar Anton Vorontsov Committed by Kumar Gala
Browse files

powerpc: fix fsl_upm nand driver modular build 



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: default avatarDave Jones <davej@redhat.com>
Signed-off-by: default avatarAnton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 1fb25be1

arch/powerpc/include/asm/fsl_lbc.h

+4 −44
Original line number Diff line number Diff line
@@ -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 */

arch/powerpc/sysdev/fsl_lbc.c

+49 −4
Original line number Diff line number Diff line
@@ -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);