Page MenuHomeFreeBSD
Files F163236763

D53895.diff
No OneTemporary
Actions

D53895.diff
View Options

diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -3764,7 +3764,7 @@
if (res == NULL)
return;
- cparams = bus_read_4(res, XHCI_HCSPARAMS0);
+ cparams = bus_read_4(res, XHCI_HCCPARAMS1);
eec = -1;
diff --git a/sys/dev/usb/controller/xhci.c b/sys/dev/usb/controller/xhci.c
--- a/sys/dev/usb/controller/xhci.c
+++ b/sys/dev/usb/controller/xhci.c
@@ -549,7 +549,7 @@
return (ENXIO);
}
- temp = XREAD4(sc, capa, XHCI_HCSPARAMS0);
+ temp = XREAD4(sc, capa, XHCI_HCCPARAMS1);
DPRINTF("HCS0 = 0x%08x\n", temp);
@@ -665,7 +665,7 @@
uint32_t eecp;
bool first = true;
- hccp1 = XREAD4(sc, capa, XHCI_HCSPARAMS0);
+ hccp1 = XREAD4(sc, capa, XHCI_HCCPARAMS1);
if (XHCI_HCS0_XECP(hccp1) == 0) {
device_printf(sc->sc_bus.parent,
@@ -3511,7 +3511,7 @@
goto done;
}
- v = XREAD4(sc, capa, XHCI_HCSPARAMS0);
+ v = XREAD4(sc, capa, XHCI_HCCPARAMS1);
sc->sc_hub_desc.hubd = xhci_hubd;
diff --git a/sys/dev/usb/controller/xhci_pci.c b/sys/dev/usb/controller/xhci_pci.c
--- a/sys/dev/usb/controller/xhci_pci.c
+++ b/sys/dev/usb/controller/xhci_pci.c
@@ -524,7 +524,7 @@
uint16_t to;
uint8_t bios_sem;
- cparams = XREAD4(sc, capa, XHCI_HCSPARAMS0);
+ cparams = XREAD4(sc, capa, XHCI_HCCPARAMS1);
eec = -1;
diff --git a/sys/dev/usb/controller/xhcireg.h b/sys/dev/usb/controller/xhcireg.h
--- a/sys/dev/usb/controller/xhcireg.h
+++ b/sys/dev/usb/controller/xhcireg.h
@@ -58,7 +58,7 @@
#define XHCI_HCSPARAMS3 0x0C /* RO structural parameters 3 */
#define XHCI_HCS3_U1_DEL(x) ((x) & 0xFF)
#define XHCI_HCS3_U2_DEL(x) (((x) >> 16) & 0xFFFF)
-#define XHCI_HCSPARAMS0 0x10 /* RO capability parameters */
+#define XHCI_HCCPARAMS1 0x10 /* RO capability parameters */
#define XHCI_HCS0_AC64(x) ((x) & 0x1) /* 64-bit capable */
#define XHCI_HCS0_BNC(x) (((x) >> 1) & 0x1) /* BW negotiation */
#define XHCI_HCS0_CSZ(x) (((x) >> 2) & 0x1) /* context size */
diff --git a/usr.sbin/bhyve/pci_xhci.c b/usr.sbin/bhyve/pci_xhci.c
--- a/usr.sbin/bhyve/pci_xhci.c
+++ b/usr.sbin/bhyve/pci_xhci.c
@@ -2354,7 +2354,7 @@
value = sc->hcsparams3;
break;
- case XHCI_HCSPARAMS0: /* 0x10 */
+ case XHCI_HCCPARAMS1: /* 0x10 */
value = sc->hccparams1;
break;

File Metadata

Mime Type
text/plain
Expires
Wed, Jul 22, 7:45 AM (7 h, 27 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35354609
Default Alt Text
D53895.diff (2 KB)

Event Timeline