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

Commit 5f6384c5 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

alpha: Fix fallout from locking changes 



spin_* functions are mostly static inline now. That causes the alpha
compile to fail:

CC      arch/alpha/kernel/sys_sable.o
cc1: warnings being treated as errors
In file included from arch/alpha/kernel/sys_sable.c:25:
arch/alpha/include/asm/core_t2.h: In function 't2_readb':
arch/alpha/include/asm/core_t2.h:451: error: 'spinlock_check' is static but \
	used in inline function 't2_readb' which is not static
arch/alpha/include/asm/core_t2.h:456: error: 'spin_unlock_irqrestore' is \
	static but used in inline function 't2_readb' which is not static

That's caused by the "extern inline" magic which is used for the
subarch specific read/write[bwl] functions. I tried to distangle the
uncountable macro onion layers, but failed miserably.

Last resort solution: switch the t2_hae_lock to raw_spinlock_t so the
lock functions are pure macros and function calls again.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarPeter Zijlstra <peterz@infradead.org>
Acked-by: default avatarIngo Molnar <mingo@elte.hu>
Cc: Richard Henderson <rth@twiddle.net>
Cc: linux-alpha@vger.kernel.org
parent c2f21ce2

arch/alpha/include/asm/core_t2.h

+17 −17
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ extern inline void t2_outl(u32 b, unsigned long addr) 
	set_hae(msb); \

}



extern spinlock_t t2_hae_lock;

extern raw_spinlock_t t2_hae_lock;



/*

 * NOTE: take T2_DENSE_MEM off in each readX/writeX routine, since
@@ -448,12 +448,12 @@ __EXTERN_INLINE u8 t2_readb(const volatile void __iomem *xaddr) 
	unsigned long addr = (unsigned long) xaddr - T2_DENSE_MEM;

	unsigned long result, msb;

	unsigned long flags;

	spin_lock_irqsave(&t2_hae_lock, flags);

	raw_spin_lock_irqsave(&t2_hae_lock, flags);



	t2_set_hae;



	result = *(vip) ((addr << 5) + T2_SPARSE_MEM + 0x00);

	spin_unlock_irqrestore(&t2_hae_lock, flags);

	raw_spin_unlock_irqrestore(&t2_hae_lock, flags);

	return __kernel_extbl(result, addr & 3);

}
@@ -462,12 +462,12 @@ __EXTERN_INLINE u16 t2_readw(const volatile void __iomem *xaddr) 
	unsigned long addr = (unsigned long) xaddr - T2_DENSE_MEM;

	unsigned long result, msb;

	unsigned long flags;

	spin_lock_irqsave(&t2_hae_lock, flags);

	raw_spin_lock_irqsave(&t2_hae_lock, flags);



	t2_set_hae;



	result = *(vuip) ((addr << 5) + T2_SPARSE_MEM + 0x08);

	spin_unlock_irqrestore(&t2_hae_lock, flags);

	raw_spin_unlock_irqrestore(&t2_hae_lock, flags);

	return __kernel_extwl(result, addr & 3);

}
@@ -480,12 +480,12 @@ __EXTERN_INLINE u32 t2_readl(const volatile void __iomem *xaddr) 
	unsigned long addr = (unsigned long) xaddr - T2_DENSE_MEM;

	unsigned long result, msb;

	unsigned long flags;

	spin_lock_irqsave(&t2_hae_lock, flags);

	raw_spin_lock_irqsave(&t2_hae_lock, flags);



	t2_set_hae;



	result = *(vuip) ((addr << 5) + T2_SPARSE_MEM + 0x18);

	spin_unlock_irqrestore(&t2_hae_lock, flags);

	raw_spin_unlock_irqrestore(&t2_hae_lock, flags);

	return result & 0xffffffffUL;

}
@@ -494,14 +494,14 @@ __EXTERN_INLINE u64 t2_readq(const volatile void __iomem *xaddr) 
	unsigned long addr = (unsigned long) xaddr - T2_DENSE_MEM;

	unsigned long r0, r1, work, msb;

	unsigned long flags;

	spin_lock_irqsave(&t2_hae_lock, flags);

	raw_spin_lock_irqsave(&t2_hae_lock, flags);



	t2_set_hae;



	work = (addr << 5) + T2_SPARSE_MEM + 0x18;

	r0 = *(vuip)(work);

	r1 = *(vuip)(work + (4 << 5));

	spin_unlock_irqrestore(&t2_hae_lock, flags);

	raw_spin_unlock_irqrestore(&t2_hae_lock, flags);

	return r1 << 32 | r0;

}
@@ -510,13 +510,13 @@ __EXTERN_INLINE void t2_writeb(u8 b, volatile void __iomem *xaddr) 
	unsigned long addr = (unsigned long) xaddr - T2_DENSE_MEM;

	unsigned long msb, w;

	unsigned long flags;

	spin_lock_irqsave(&t2_hae_lock, flags);

	raw_spin_lock_irqsave(&t2_hae_lock, flags);



	t2_set_hae;



	w = __kernel_insbl(b, addr & 3);

	*(vuip) ((addr << 5) + T2_SPARSE_MEM + 0x00) = w;

	spin_unlock_irqrestore(&t2_hae_lock, flags);

	raw_spin_unlock_irqrestore(&t2_hae_lock, flags);

}



__EXTERN_INLINE void t2_writew(u16 b, volatile void __iomem *xaddr)
@@ -524,13 +524,13 @@ __EXTERN_INLINE void t2_writew(u16 b, volatile void __iomem *xaddr) 
	unsigned long addr = (unsigned long) xaddr - T2_DENSE_MEM;

	unsigned long msb, w;

	unsigned long flags;

	spin_lock_irqsave(&t2_hae_lock, flags);

	raw_spin_lock_irqsave(&t2_hae_lock, flags);



	t2_set_hae;



	w = __kernel_inswl(b, addr & 3);

	*(vuip) ((addr << 5) + T2_SPARSE_MEM + 0x08) = w;

	spin_unlock_irqrestore(&t2_hae_lock, flags);

	raw_spin_unlock_irqrestore(&t2_hae_lock, flags);

}



/*
@@ -542,12 +542,12 @@ __EXTERN_INLINE void t2_writel(u32 b, volatile void __iomem *xaddr) 
	unsigned long addr = (unsigned long) xaddr - T2_DENSE_MEM;

	unsigned long msb;

	unsigned long flags;

	spin_lock_irqsave(&t2_hae_lock, flags);

	raw_spin_lock_irqsave(&t2_hae_lock, flags);



	t2_set_hae;



	*(vuip) ((addr << 5) + T2_SPARSE_MEM + 0x18) = b;

	spin_unlock_irqrestore(&t2_hae_lock, flags);

	raw_spin_unlock_irqrestore(&t2_hae_lock, flags);

}



__EXTERN_INLINE void t2_writeq(u64 b, volatile void __iomem *xaddr)
@@ -555,14 +555,14 @@ __EXTERN_INLINE void t2_writeq(u64 b, volatile void __iomem *xaddr) 
	unsigned long addr = (unsigned long) xaddr - T2_DENSE_MEM;

	unsigned long msb, work;

	unsigned long flags;

	spin_lock_irqsave(&t2_hae_lock, flags);

	raw_spin_lock_irqsave(&t2_hae_lock, flags);



	t2_set_hae;



	work = (addr << 5) + T2_SPARSE_MEM + 0x18;

	*(vuip)work = b;

	*(vuip)(work + (4 << 5)) = b >> 32;

	spin_unlock_irqrestore(&t2_hae_lock, flags);

	raw_spin_unlock_irqrestore(&t2_hae_lock, flags);

}



__EXTERN_INLINE void __iomem *t2_ioportmap(unsigned long addr)

arch/alpha/kernel/core_t2.c

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ 
# define DBG(args)

#endif



DEFINE_SPINLOCK(t2_hae_lock);

DEFINE_RAW_SPINLOCK(t2_hae_lock);



static volatile unsigned int t2_mcheck_any_expected;

static volatile unsigned int t2_mcheck_last_taken;