Commit c4d936ef authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "usb: early: convert to readl_poll_timeout_atomic()" 



This reverts commit 796eed4b.

This change causes boot lockups when using "arlyprintk=xdbc" because
ktime can not be used at this point in time in the boot process.  Also,
it is not needed for very small delays like this.

Reported-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Reported-by: default avatarPeter Zijlstra <peterz@infradead.org>
Cc: Jann Horn <jannh@google.com>
Cc: Chunfeng Yun <chunfeng.yun@mediatek.com>
Fixes: 796eed4b ("usb: early: convert to readl_poll_timeout_atomic()")
Link: https://lore.kernel.org/r/c2b5c9bb-1b75-bf56-3754-b5b18812d65e@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a0b24a56

drivers/usb/early/xhci-dbc.c

+11 −4
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
#include <linux/pci_ids.h>

#include <linux/memblock.h>

#include <linux/io.h>

#include <linux/iopoll.h>

#include <asm/pci-direct.h>

#include <asm/fixmap.h>

#include <linux/bcd.h>
@@ -136,9 +135,17 @@ static int handshake(void __iomem *ptr, u32 mask, u32 done, int wait, int delay) 
{

	u32 result;



	return readl_poll_timeout_atomic(ptr, result,

					 ((result & mask) == done),

					 delay, wait);

	/* Can not use readl_poll_timeout_atomic() for early boot things */

	do {

		result = readl(ptr);

		result &= mask;

		if (result == done)

			return 0;

		udelay(delay);

		wait -= delay;

	} while (wait > 0);



	return -ETIMEDOUT;

}



static void __init xdbc_bios_handoff(void)