[POWERPC] 4xx: Add dcri_clrset() for locked read/modify/write functionality
This adds dcri_clrset() macro which does read/modify/write on indirect dcr registers while holding indirect dcr lock. Signed-off-by: Valentine Barshak <vbarshak@ru.mvista.com> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
This commit is contained in:
parent
d0a48c9f4c
commit
266d028acb
|
@ -82,6 +82,19 @@ static inline void __mtdcri(int base_addr, int base_data, int reg,
|
||||||
spin_unlock_irqrestore(&dcr_ind_lock, flags);
|
spin_unlock_irqrestore(&dcr_ind_lock, flags);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline void __dcri_clrset(int base_addr, int base_data, int reg,
|
||||||
|
unsigned clr, unsigned set)
|
||||||
|
{
|
||||||
|
unsigned long flags;
|
||||||
|
unsigned int val;
|
||||||
|
|
||||||
|
spin_lock_irqsave(&dcr_ind_lock, flags);
|
||||||
|
__mtdcr(base_addr, reg);
|
||||||
|
val = (__mfdcr(base_data) & ~clr) | set;
|
||||||
|
__mtdcr(base_data, val);
|
||||||
|
spin_unlock_irqrestore(&dcr_ind_lock, flags);
|
||||||
|
}
|
||||||
|
|
||||||
#define mfdcri(base, reg) __mfdcri(DCRN_ ## base ## _CONFIG_ADDR, \
|
#define mfdcri(base, reg) __mfdcri(DCRN_ ## base ## _CONFIG_ADDR, \
|
||||||
DCRN_ ## base ## _CONFIG_DATA, \
|
DCRN_ ## base ## _CONFIG_DATA, \
|
||||||
reg)
|
reg)
|
||||||
|
@ -90,6 +103,10 @@ static inline void __mtdcri(int base_addr, int base_data, int reg,
|
||||||
DCRN_ ## base ## _CONFIG_DATA, \
|
DCRN_ ## base ## _CONFIG_DATA, \
|
||||||
reg, data)
|
reg, data)
|
||||||
|
|
||||||
|
#define dcri_clrset(base, reg, clr, set) __dcri_clrset(DCRN_ ## base ## _CONFIG_ADDR, \
|
||||||
|
DCRN_ ## base ## _CONFIG_DATA, \
|
||||||
|
reg, clr, set)
|
||||||
|
|
||||||
#endif /* __ASSEMBLY__ */
|
#endif /* __ASSEMBLY__ */
|
||||||
#endif /* __KERNEL__ */
|
#endif /* __KERNEL__ */
|
||||||
#endif /* _ASM_POWERPC_DCR_NATIVE_H */
|
#endif /* _ASM_POWERPC_DCR_NATIVE_H */
|
||||||
|
|
Loading…
Reference in a new issue