usb: ehci-pci: Clarify and cleanup the EHCI controller detection
Subsystems (2)
PATCH 1/3 usb: ehci-pci: Clarify and cleanup the EHCI controller detection
The detection function of the EHCI PCI controller was really cryptic, add a beefy comment and clean the portion of the code up a bit. No change in the logic of the code.
--- drivers/usb/host/ehci-pci.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-)
drivers/usb/host/ehci-pci.c +25 -3
@@ -54,9 +54,31 @@ static pci_dev_t ehci_find_class(int index) bdf += PCI_BDF(0, 0, 1)) {pci_read_config_dword (bdf,PCI_CLASS_REVISION , &class); -if ((class >>8 ==PCI_CLASS_SERIAL_USB_EHCI ) - && !index--) -return bdf; + class >>=8 ; +/* +* Here be dragons! In case we have multiple +* PCI EHCI controllers, this function will +* be called multiple times as well. This +* function will scan the PCI busses, always +* starting from bus 0, device 0, function 0, +* until it finds an USB controller. The USB +* stack gives us an 'index' of a controller +* that is currently being registered, which +* is a number, starting from 0 and growing +* in ascending order as controllers are added. +* To avoid probing the same controller in tne +* subsequent runs of this function, we will +* skip 'index - 1' detected controllers and +* report the index'th controller. +*/ +if (class !=PCI_CLASS_SERIAL_USB_EHCI ) +continue ; +if (index) { + index--; +continue ; + } +/* Return index'th controller. */ +return bdf; } } }
Signature · 1 line
1.8.4.3
PATCH 2/3 usb: ehci: Do not de-init uninited controllers
In case the controller is not initialized, we shall not de-initialize it. As the control structure will not be filled, we will produce a null ptr dereference if the controller is not inited.
--- drivers/usb/host/ehci-hcd.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/host/ehci-hcd.c +3 -0
@@ -201,6 +201,9 @@ static int ehci_shutdown(struct ehci_ctrl *ctrl)int i, ret =0 ;uint32_t cmd, reg; +if (!ctrl || !ctrl->hcor) +return -EINVAL ; + cmd =ehci_readl (&ctrl->hcor->or_usbcmd); cmd &= ~(CMD_PSE |CMD_ASE );ehci_writel (&ctrl->hcor->or_usbcmd, cmd);
Signature · 1 line
1.8.4.3
PATCH 2/3 usb: ehci: Do not de-init uninited controllers
Quoted 7 lines · Marek Vasut
In case the controller is not initialized, we shall not de-initialize it. As the control structure will not be filled, we will produce a null ptr dereference if the controller is not inited.
Signed-off-by Marek Vasut <[email protected]>Cc Simon Glass <[email protected]>
Quoted 22 lines
--- drivers/usb/host/ehci-hcd.c | 3 +++ 1 file changed, 3 insertions(+)drivers/usb/host/ehci-hcd.c +3
-1@@ -201,6 +201,9 @@ static int ehci_shutdown(struct ehci_ctrl *ctrl)int i, ret =0 ;uint32_t cmd, reg; +if (!ctrl || !ctrl->hcor) +return -EINVAL ; + cmd =ehci_readl (&ctrl->hcor->or_usbcmd); cmd &= ~(CMD_PSE |CMD_ASE );ehci_writel (&ctrl->hcor->or_usbcmd, cmd); --1.8.4.3
PATCH 3/3 usb: ehci: Fix register access
In reply to Marek VasutFix the register access in EHCI HCD. We need to use address of the register as an ehci_writel() argument.
--- drivers/usb/host/ehci-hcd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/host/ehci-hcd.c +1 -1
@@ -948,7 +948,7 @@ int usb_lowlevel_init(int index, enum usb_init_type init, void **controller)#endif /* Set the high address word (aka segment) for 64-bit controller */ if (ehci_readl (&ehcic[index].hccr->cr_hccparams) &1 ) -ehci_writel (ehcic[index].hcor->or_ctrldssegment,0 ); +ehci_writel (&ehcic[index].hcor->or_ctrldssegment,0 ); qh_list = &ehcic[index].qh_list;
Signature · 1 line
1.8.4.3
PATCH 3/3 usb: ehci: Fix register access
Quoted 6 lines · Marek Vasut
Fix the register access in EHCI HCD. We need to use address of the register as an
ehci_writel()argument.Signed-off-by Marek Vasut <[email protected]>Cc Simon Glass <[email protected]>
Quoted 20 lines
--- drivers/usb/host/ehci-hcd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/usb/host/ehci-hcd.c +1
-2@@ -948,7 +948,7 @@ int usb_lowlevel_init(int index, enum usb_init_type init, void **controller)#endif /* Set the high address word (aka segment) for 64-bit controller */ if (ehci_readl (&ehcic[index].hccr->cr_hccparams) &1 ) -ehci_writel (ehcic[index].hcor->or_ctrldssegment,0 ); +ehci_writel (&ehcic[index].hcor->or_ctrldssegment,0 ); qh_list = &ehcic[index].qh_list; --1.8.4.3
PATCH 1/3 usb: ehci-pci: Clarify and cleanup the EHCI controller detection
In reply to Marek VasutQuoted 6 lines · Marek Vasut
The detection function of the EHCI PCI controller was really cryptic, add a beefy comment and clean the portion of the code up a bit. No change in the logic of the code.
Signed-off-by Marek Vasut <[email protected]>Cc Simon Glass <[email protected]>
Quoted 46 lines
--- drivers/usb/host/ehci-pci.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-)drivers/usb/host/ehci-pci.c +25
-4@@ -54,9 +54,31 @@ static pci_dev_t ehci_find_class(int index) bdf += PCI_BDF(0, 0, 1)) {pci_read_config_dword (bdf,PCI_CLASS_REVISION , &class); -if ((class >>8 ==PCI_CLASS_SERIAL_USB_EHCI ) - && !index--) -return bdf; + class >>=8 ; +/* +* Here be dragons! In case we have multiple +* PCI EHCI controllers, this function will +* be called multiple times as well. This +* function will scan the PCI busses, always +* starting from bus 0, device 0, function 0, +* until it finds an USB controller. The USB +* stack gives us an 'index' of a controller +* that is currently being registered, which +* is a number, starting from 0 and growing +* in ascending order as controllers are added. +* To avoid probing the same controller in tne +* subsequent runs of this function, we will +* skip 'index - 1' detected controllers and +* report the index'th controller. +*/ +if (class !=PCI_CLASS_SERIAL_USB_EHCI ) +continue ; +if (index) { + index--; +continue ; + } +/* Return index'th controller. */ +return bdf; } } } --1.8.4.3