git: 9front

Info  •  Files  •  Log  •  Branches

usbxhci: delay after reset, preserve reserved bits in legacy status control register in handoff()

when clering smi enable bits in the legacy control/status register,
preserve the reserved bits. clear the RW1C bits.

linux code claims intel xhci controller needs a 1ms delay before
accessing any register after reset.

--- a/sys/src/9/pc/usbxhci.c

+++ b/sys/src/9/pc/usbxhci.c

@@ -397,9 +397,12 @@

 		r[0] |= 1<<24;		/* request ownership */

 		for(i = 0; (r[0] & (1<<16)) != 0 && i<100; i++)

 			tsleep(&up->sleep, return0, nil, 10);

-		r[0] &= ~(1<<16);	/* in case of timeout */

 	}

-	r[1] = 0;		/* disable SMI interrupts */

+	/* disable SMI interrupts */

+	r[1] = (r[1] & (7<<1 | 255<<5 | 7<<17)) | 7<<29;

+

+	/* clear BIOS ownership in case of timeout */

+	r[0] &= ~(1<<16);

 }

 static void

@@ -462,6 +465,7 @@

 		tsleep(&up->sleep, return0, nil, 10);

 	ctlr->opr[USBCMD] = HCRST;

+	delay(1);

 	for(i=0; (ctlr->opr[USBSTS] & (CNR|HCH)) != HCH && i<100; i++)

 		tsleep(&up->sleep, return0, nil, 10);

-- 

⑨