ohci reset improvements
cover ohci reset improvements
Hi,
This small patchset adds different reset levels to OHCI USB controller. The idea is from Benjamin Herrenschmidt.
Most significant change is that MacOS 9 doesn't try anymore to do some DMA transfer to address 0, and boots a little bit further.
Hervé
Hervé Poussineau (3):
ohci: split reset method in 3 parts
ohci: fix Host Controller USBRESET
ohci: fix command HostControllerReset
hw/usb/hcd-ohci.c | 64 ++++++++++++++++++++++++++++++++----------------------- 1 file changed, 37 insertions(+), 27 deletions(-)
Signature · 1 line
2.1.4
PATCH 1/3 ohci: split reset method in 3 parts
The three parts are:
- root hub reset (ohci_roothub_reset)
- host controller soft reset (ohci_soft_reset)
- host controller hard reset (ohci_hard_reset)
--- hw/usb/hcd-ohci.c | 64 ++++++++++++++++++++++++++++++++----------------------- 1 file changed, 37 insertions(+), 27 deletions(-)
hw/usb/hcd-ohci.c +37 -27
@@ -439,15 +439,37 @@ static void ohci_stop_endpoints(OHCIState *ohci) } } -/* Reset the controller */ -static void ohci_reset (void *opaque) +static void ohci_roothub_reset (OHCIState *ohci) { -OHCIState *ohci = opaque;OHCIPort *port;int i;ohci_bus_stop (ohci); - ohci->ctl =0 ; + ohci->rhdesc_a =OHCI_RHA_NPS | ohci->num_ports; + ohci->rhdesc_b =0x0 ;/* Impl. specific */ + ohci->rhstatus =0 ; + +for (i =0 ; i < ohci->num_ports; i++) { + port = &ohci->rhport[i]; + port->ctrl =0 ; +if (port->port.dev && port->port.dev->attached) { +usb_port_reset (&port->port); + } + } +if (ohci->async_td) { +usb_cancel_packet (&ohci->usb_packet); + ohci->async_td =0 ; + } +ohci_stop_endpoints (ohci); +} + +/* Reset the controller */ +static void ohci_soft_reset (OHCIState *ohci) +{ +trace_usb_ohci_reset (ohci->name); + +ohci_bus_stop (ohci); + ohci->ctl = (ohci->ctl &OHCI_CTL_IR ) |OHCI_USB_SUSPEND ; ohci->old_ctl =0 ; ohci->status =0 ; ohci->intr_status =0 ;
@@ -470,25 +492,13 @@ static void ohci_reset(void *opaque) ohci->frame_number =0 ; ohci->pstart =0 ; ohci->lst =OHCI_LS_THRESH ; +} - ohci->rhdesc_a =OHCI_RHA_NPS | ohci->num_ports; - ohci->rhdesc_b =0x0 ;/* Impl. specific */ - ohci->rhstatus =0 ; - -for (i =0 ; i < ohci->num_ports; i++) - { - port = &ohci->rhport[i]; - port->ctrl =0 ; -if (port->port.dev && port->port.dev->attached) { -usb_port_reset (&port->port); - } - } -if (ohci->async_td) { -usb_cancel_packet (&ohci->usb_packet); - ohci->async_td =0 ; - } -ohci_stop_endpoints (ohci); -trace_usb_ohci_reset (ohci->name); +static void ohci_hard_reset (OHCIState *ohci) +{ +ohci_soft_reset (ohci); + ohci->ctl =0 ; +ohci_roothub_reset (ohci); }/* Get an array of dwords from main memory */
@@ -1441,7 +1451,7 @@ static void ohci_set_ctl(OHCIState *ohci, uint32_t val)trace_usb_ohci_resume (ohci->name);break ;case OHCI_USB_RESET : -ohci_reset (ohci); +ohci_hard_reset (ohci);break ; } }
@@ -1704,7 +1714,7 @@ static void ohci_mem_write(void *opaque, ohci->status |= val;if (ohci->status &OHCI_STATUS_HCR ) -ohci_reset (ohci); +ohci_hard_reset (ohci);break ;case 3 :/* HcInterruptStatus */
@@ -1783,7 +1793,7 @@ static void ohci_mem_write(void *opaque,case 25 :/* HcHReset */ ohci->hreset = val & ~OHCI_HRESET_FSBIR ;if (val &OHCI_HRESET_FSBIR ) -ohci_reset (ohci); +ohci_hard_reset (ohci);break ;case 26 :/* HcHInterruptEnable */
@@ -1960,7 +1970,7 @@ static void usb_ohci_reset_pci(DeviceState *d)OHCIPCIState *ohci =PCI_OHCI (dev);OHCIState *s = &ohci->state; -ohci_reset (s); +ohci_hard_reset (s); }#define TYPE_SYSBUS_OHCI "sysbus-ohci"
@@ -1993,7 +2003,7 @@ static void usb_ohci_reset_sysbus(DeviceState *dev)OHCISysBusState *s =SYSBUS_OHCI (dev);OHCIState *ohci = &s->ohci; -ohci_reset (ohci); +ohci_hard_reset (ohci); }static Property ohci_pci_properties[] = {
Signature · 1 line
2.1.4
PATCH 2/3 ohci: fix Host Controller USBRESET
In reply to Hervé PoussineauSpecification says that, when entering this state, "the contents of the registers (except Root Hub registers) are preserved by the HC. [...] The Root Hub is being reset, which causes the Root Hub's downstream ports to be reset and possibly powered off."
--- hw/usb/hcd-ohci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/usb/hcd-ohci.c +1 -1
@@ -1451,7 +1451,7 @@ static void ohci_set_ctl(OHCIState *ohci, uint32_t val)trace_usb_ohci_resume (ohci->name);break ;case OHCI_USB_RESET : -ohci_hard_reset (ohci); +ohci_roothub_reset (ohci);break ; } }
Signature · 1 line
2.1.4
PATCH 3/3 ohci: fix command HostControllerReset
In reply to Hervé PoussineauSpecification says that: "This bit is set by HCD to initiate a software reset of HC."
--- hw/usb/hcd-ohci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/usb/hcd-ohci.c +1 -1
@@ -1714,7 +1714,7 @@ static void ohci_mem_write(void *opaque, ohci->status |= val;if (ohci->status &OHCI_STATUS_HCR ) -ohci_hard_reset (ohci); +ohci_soft_reset (ohci);break ;case 3 :/* HcInterruptStatus */
Signature · 1 line
2.1.4
Quoted 9 lines · Hervé Poussineau
Hi,
This small patchset adds different reset levels to OHCI USB controller. The idea is from Benjamin Herrenschmidt.
Most significant change is that MacOS 9 doesn't try anymore to do some DMA transfer to address 0, and boots a little bit further.Hervé
Quoted 7 lines
Hervé Poussineau (3):
ohci: split reset method in 3 parts
ohci: fix Host Controller USBRESET
ohci: fix command HostControllerResethw/usb/hcd-ohci.c | 64 ++++++++++++++++++++++++++++++++----------------------- 1 file changed, 37 insertions(+), 27 deletions(-)
I've given this patchset a test against my GSOC OS 9 images and it seems to help against USB crashes (although there are still other extensions that crash on boot) while not regressing my other images, so:
ATB,
Mark.
Quoted 9 lines · Hervé Poussineau
Hi,
This small patchset adds different reset levels to OHCI USB controller. The idea is from Benjamin Herrenschmidt.
Most significant change is that MacOS 9 doesn't try anymore to do some DMA transfer to address 0, and boots a little bit further.Hervé
Quoted 7 lines
Hervé Poussineau (3):
ohci: split reset method in 3 parts
ohci: fix Host Controller USBRESET
ohci: fix command HostControllerResethw/usb/hcd-ohci.c | 64 ++++++++++++++++++++++++++++++++----------------------- 1 file changed, 37 insertions(+), 27 deletions(-)
Added to usb patch queue.
thanks,
Gerd