* [PATCH 1/2] USB:ehci:Add a whitelist for EHCI controllers
2021-04-08 9:09 [PATCH 0/2] USB:ehci:fix the no SRBN register problem Longfang Liu
@ 2021-04-08 9:09 ` Longfang Liu
2021-04-08 9:09 ` [PATCH 2/2] USB:ehci:fix Kunpeng920 ehci hardware problem Longfang Liu
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Longfang Liu @ 2021-04-08 9:09 UTC (permalink / raw)
To: gregkh, mathias.nyman, stern, liudongdong3
Cc: linux-usb, linux-kernel, liulongfang, kong.kongxinwei, yisen.zhuang
Some types of EHCI controllers do not have SBRN registers.
By comparing the white list, the operation of reading the SBRN
registers is skipped.
Subsequent EHCI controller types without SBRN registers can be
directly added to the white list.
The current patch does not affect the drive function.
Signed-off-by: Longfang Liu <liulongfang@huawei.com>
---
drivers/usb/host/ehci-pci.c | 27 +++++++++++++++++++++++----
1 file changed, 23 insertions(+), 4 deletions(-)
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index 3c3820a..6a30afa 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -47,6 +47,28 @@ static inline bool is_bypassed_id(struct pci_dev *pdev)
return !!pci_match_id(bypass_pci_id_table, pdev);
}
+static const struct usb_nosbrn_whitelist_entry {
+ unsigned short vendor;
+ unsigned short device;
+} usb_nosbrn_whitelist[] = {
+ /* STMICRO ConneXT has no sbrn register */
+ {PCI_VENDOR_ID_STMICRO, PCI_DEVICE_ID_STMICRO_USB_HOST},
+ {}
+};
+
+static bool usb_nosbrn_whitelist_check(struct pci_dev *pdev)
+{
+ const struct usb_nosbrn_whitelist_entry *entry;
+
+ for (entry = usb_nosbrn_whitelist; entry->vendor; entry++) {
+ if (pdev->vendor == entry->vendor &&
+ pdev->device == entry->device)
+ return true;
+ }
+
+ return false;
+}
+
/*
* 0x84 is the offset of in/out threshold register,
* and it is the same offset as the register of 'hostpc'.
@@ -288,10 +310,7 @@ static int ehci_pci_setup(struct usb_hcd *hcd)
}
/* Serial Bus Release Number is at PCI 0x60 offset */
- if (pdev->vendor == PCI_VENDOR_ID_STMICRO
- && pdev->device == PCI_DEVICE_ID_STMICRO_USB_HOST)
- ; /* ConneXT has no sbrn register */
- else
+ if (!usb_nosbrn_whitelist_check(pdev))
pci_read_config_byte(pdev, 0x60, &ehci->sbrn);
/* Keep this around for a while just in case some EHCI
--
2.8.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/2] USB:ehci:fix Kunpeng920 ehci hardware problem
2021-04-08 9:09 [PATCH 0/2] USB:ehci:fix the no SRBN register problem Longfang Liu
2021-04-08 9:09 ` [PATCH 1/2] USB:ehci:Add a whitelist for EHCI controllers Longfang Liu
@ 2021-04-08 9:09 ` Longfang Liu
2021-04-08 9:09 ` [PATCH] USB:ehci:fix " Longfang Liu
2021-04-08 9:14 ` [PATCH 0/2] USB:ehci:fix the no SRBN register problem liulongfang
3 siblings, 0 replies; 6+ messages in thread
From: Longfang Liu @ 2021-04-08 9:09 UTC (permalink / raw)
To: gregkh, mathias.nyman, stern, liudongdong3
Cc: linux-usb, linux-kernel, liulongfang, kong.kongxinwei, yisen.zhuang
Kunpeng920's EHCI controller does not have SBRN register.
Reading the SBRN register when the controller driver is
initialized will get 0.
When rebooting the EHCI driver, ehci_shutdown() will be called.
if the sbrn flag is 0, ehci_shutdown() will return directly.
The sbrn flag being 0 will cause the EHCI interrupt signal to
not be turned off after reboot. this interrupt that is not closed
will cause an exception to the device sharing the interrupt.
Therefore, the EHCI controller of kunpeng920 needs to be added
to the whitelist without SBRN register.
Signed-off-by: Longfang Liu <liulongfang@huawei.com>
---
drivers/usb/host/ehci-pci.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index 6a30afa..c392a26 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -53,6 +53,8 @@ static const struct usb_nosbrn_whitelist_entry {
} usb_nosbrn_whitelist[] = {
/* STMICRO ConneXT has no sbrn register */
{PCI_VENDOR_ID_STMICRO, PCI_DEVICE_ID_STMICRO_USB_HOST},
+ /* HUAWEI Kunpeng920 HiSilicon USB EHCI has no sbrn register */
+ {PCI_VENDOR_ID_HUAWEI, 0xa239},
{}
};
--
2.8.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH] USB:ehci:fix ehci hardware problem
2021-04-08 9:09 [PATCH 0/2] USB:ehci:fix the no SRBN register problem Longfang Liu
2021-04-08 9:09 ` [PATCH 1/2] USB:ehci:Add a whitelist for EHCI controllers Longfang Liu
2021-04-08 9:09 ` [PATCH 2/2] USB:ehci:fix Kunpeng920 ehci hardware problem Longfang Liu
@ 2021-04-08 9:09 ` Longfang Liu
2021-04-08 9:14 ` [PATCH 0/2] USB:ehci:fix the no SRBN register problem liulongfang
3 siblings, 0 replies; 6+ messages in thread
From: Longfang Liu @ 2021-04-08 9:09 UTC (permalink / raw)
To: gregkh, mathias.nyman, stern, liudongdong3
Cc: linux-usb, linux-kernel, liulongfang, kong.kongxinwei, yisen.zhuang
When rebooting the EHCI driver, ehci_shutdown() will be called.
if the sbrn flag is 0, ehci_shutdown() will return directly.
Kunpeng920's EHCI hardware does not define the SBRN register, which cause
its value to default to 0. The sbrn flag being 0 will cause the
EHCI interrupt signal to not be turned off after reboot. An interrupt
that is not closed will cause an exception to the device sharing
the interrupt.
Currently, Kunpeng920's EHCI hardware has this problem. We hope to
solve this problem by skipping reading the sbrn register value.
On the EHCI hardware of the next-generation Kunpeng930, we will define
this SBRN register in accordance with the controller standard.
Signed-off-by: Longfang Liu <liulongfang@huawei.com>
---
drivers/usb/host/ehci-pci.c | 30 ++++++++++++++++++++++++++----
1 file changed, 26 insertions(+), 4 deletions(-)
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index 3c3820a..738d773 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -47,6 +47,31 @@ static inline bool is_bypassed_id(struct pci_dev *pdev)
return !!pci_match_id(bypass_pci_id_table, pdev);
}
+static const struct usb_sbrn_whitelist_entry {
+ unsigned short vendor;
+ unsigned short device;
+} usb_sbrn_whitelist[] = {
+ /* STMICRO ConneXT has no sbrn register */
+ {PCI_VENDOR_ID_STMICRO, PCI_DEVICE_ID_STMICRO_USB_HOST},
+ /* HUAWEI sbrn register is undefined */
+ {PCI_VENDOR_ID_HUAWEI, 0xa239},
+ {}
+};
+
+static bool usb_sbrn_whitelist_check(struct pci_dev *pdev)
+{
+ const struct usb_sbrn_whitelist_entry *entry;
+ unsigned short vendor = pdev->vendor;
+ unsigned short device = pdev->device;
+
+ for (entry = usb_sbrn_whitelist; entry->vendor; entry++) {
+ if (vendor == entry->vendor && device == entry->device)
+ return true;
+ }
+
+ return false;
+}
+
/*
* 0x84 is the offset of in/out threshold register,
* and it is the same offset as the register of 'hostpc'.
@@ -288,10 +313,7 @@ static int ehci_pci_setup(struct usb_hcd *hcd)
}
/* Serial Bus Release Number is at PCI 0x60 offset */
- if (pdev->vendor == PCI_VENDOR_ID_STMICRO
- && pdev->device == PCI_DEVICE_ID_STMICRO_USB_HOST)
- ; /* ConneXT has no sbrn register */
- else
+ if (!usb_sbrn_whitelist_check(pdev))
pci_read_config_byte(pdev, 0x60, &ehci->sbrn);
/* Keep this around for a while just in case some EHCI
--
2.8.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 0/2] USB:ehci:fix the no SRBN register problem
2021-04-08 9:09 [PATCH 0/2] USB:ehci:fix the no SRBN register problem Longfang Liu
` (2 preceding siblings ...)
2021-04-08 9:09 ` [PATCH] USB:ehci:fix " Longfang Liu
@ 2021-04-08 9:14 ` liulongfang
3 siblings, 0 replies; 6+ messages in thread
From: liulongfang @ 2021-04-08 9:14 UTC (permalink / raw)
To: gregkh, mathias.nyman, stern, liudongdong3
Cc: linux-usb, linux-kernel, kong.kongxinwei, yisen.zhuang
On 2021/4/8 17:09, Longfang Liu wrote:
> (1) Add a whitelist for EHCI devices without SBRN registers.
> (2) Add Kunpeng920's EHCI device to the whitelist.
>
> Longfang Liu (2):
> USB:ehci:Add a whitelist for EHCI controllers
> USB:ehci:fix Kunpeng920 ehci hardware problem
>
> drivers/usb/host/ehci-pci.c | 29 +++++++++++++++++++++++++----
> 1 file changed, 25 insertions(+), 4 deletions(-)
>
Sorry, please ignore this patch.
Thanks.
Longfang.
^ permalink raw reply [flat|nested] 6+ messages in thread