diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-10-23 13:30:47 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-10-23 13:30:47 +0200 |
| commit | f95b23a112f1a31ea042483540cd907b58d23a5f (patch) | |
| tree | 3d41d2f8cf1d66ed593deb12f25a30d2905eb077 /arch/powerpc/sysdev/fsl_rmu.c | |
| parent | da20ab35180780e4a6eadc804544f1fa967f3567 (diff) | |
| parent | 58c3862b521ead4f69a24ef009a679cb3c519620 (diff) | |
| download | op-kernel-dev-f95b23a112f1a31ea042483540cd907b58d23a5f.zip op-kernel-dev-f95b23a112f1a31ea042483540cd907b58d23a5f.tar.gz | |
Merge branch 'x86/urgent' into x86/asm, to pick up dependent fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/powerpc/sysdev/fsl_rmu.c')
| -rw-r--r-- | arch/powerpc/sysdev/fsl_rmu.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/powerpc/sysdev/fsl_rmu.c b/arch/powerpc/sysdev/fsl_rmu.c index ab7a74c..88b35a3d 100644 --- a/arch/powerpc/sysdev/fsl_rmu.c +++ b/arch/powerpc/sysdev/fsl_rmu.c @@ -104,6 +104,8 @@ #define DOORBELL_MESSAGE_SIZE 0x08 +static DEFINE_SPINLOCK(fsl_rio_doorbell_lock); + struct rio_msg_regs { u32 omr; u32 osr; @@ -626,9 +628,13 @@ err_out: int fsl_rio_doorbell_send(struct rio_mport *mport, int index, u16 destid, u16 data) { + unsigned long flags; + pr_debug("fsl_doorbell_send: index %d destid %4.4x data %4.4x\n", index, destid, data); + spin_lock_irqsave(&fsl_rio_doorbell_lock, flags); + /* In the serial version silicons, such as MPC8548, MPC8641, * below operations is must be. */ @@ -638,6 +644,8 @@ int fsl_rio_doorbell_send(struct rio_mport *mport, out_be32(&dbell->dbell_regs->oddatr, (index << 20) | data); out_be32(&dbell->dbell_regs->odmr, 0x00000001); + spin_unlock_irqrestore(&fsl_rio_doorbell_lock, flags); + return 0; } |
