Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-20 02:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

s390/pci: no msleep in potential IRQ context

Browse Source 
The PCI instructions may be used in IRQ context so scheduling is forbidden.
Use udelay and shorten the delay since we are now polling.

Signed-off-by: Jan Glauber <jang@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Jan Glauber 2012-12-05 14:43:25 +01:00 committed by Martin Schwidefsky
parent bafff1743f
commit c59b9f9265
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/s390/include/asm/pci_insn.h
View File

@ -3,7 +3,7 @@
#include <linux/delay.h>
#define ZPCI_INSN_BUSY_DELAY 1 /* 1 millisecond */
#define ZPCI_INSN_BUSY_DELAY 1 /* 1 microsecond */
/* Load/Store status codes */
#define ZPCI_PCI_ST_FUNC_NOT_ENABLED 4
@ -138,7 +138,7 @@ static inline int rpcit_instr(u64 fn, u64 addr, u64 range)
do {
cc = __rpcit(fn, addr, range, &status);
if (cc == 2)
msleep(ZPCI_INSN_BUSY_DELAY);
udelay(ZPCI_INSN_BUSY_DELAY);
} while (cc == 2);
if (cc)
@ -198,7 +198,7 @@ static inline int pcilg_instr(u64 *data, u64 req, u64 offset)
do {
cc = __pcilg(data, req, offset, &status);
if (cc == 2)
msleep(ZPCI_INSN_BUSY_DELAY);
udelay(ZPCI_INSN_BUSY_DELAY);
} while (cc == 2);
if (cc) {
@ -236,7 +236,7 @@ static inline int pcistg_instr(u64 data, u64 req, u64 offset)
do {
cc = __pcistg(data, req, offset, &status);
if (cc == 2)
msleep(ZPCI_INSN_BUSY_DELAY);
udelay(ZPCI_INSN_BUSY_DELAY);
} while (cc == 2);
if (cc)
@ -268,7 +268,7 @@ static inline int pcistb_instr(const u64 *data, u64 req, u64 offset)
do {
cc = __pcistb(data, req, offset, &status);
if (cc == 2)
msleep(ZPCI_INSN_BUSY_DELAY);
udelay(ZPCI_INSN_BUSY_DELAY);
} while (cc == 2);
if (cc)