From 6c90999e2e0dee6e5e0322b89e8e6fb6f76aecc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Thu, 14 Jan 2021 12:13:49 +0100 Subject: bcm4908: backport brcmstb USB PHY driver changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This includes BCM4908 support Signed-off-by: Rafał Miłecki --- ...I-DMA-may-lose-a-burst-of-DMA-data-for-72.patch | 61 ++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 target/linux/bcm4908/patches-5.4/084-v5.6-0001-phy-usb-EHCI-DMA-may-lose-a-burst-of-DMA-data-for-72.patch (limited to 'target/linux/bcm4908/patches-5.4/084-v5.6-0001-phy-usb-EHCI-DMA-may-lose-a-burst-of-DMA-data-for-72.patch') diff --git a/target/linux/bcm4908/patches-5.4/084-v5.6-0001-phy-usb-EHCI-DMA-may-lose-a-burst-of-DMA-data-for-72.patch b/target/linux/bcm4908/patches-5.4/084-v5.6-0001-phy-usb-EHCI-DMA-may-lose-a-burst-of-DMA-data-for-72.patch new file mode 100644 index 0000000000..ac368d5dd1 --- /dev/null +++ b/target/linux/bcm4908/patches-5.4/084-v5.6-0001-phy-usb-EHCI-DMA-may-lose-a-burst-of-DMA-data-for-72.patch @@ -0,0 +1,61 @@ +From dc9aa43c43668481089c48135707ec3f8f5b2e19 Mon Sep 17 00:00:00 2001 +From: Al Cooper +Date: Fri, 3 Jan 2020 13:17:59 -0500 +Subject: [PATCH] phy: usb: EHCI DMA may lose a burst of DMA data for 7255xA0 + family + +When the EHCI controller received a 512 byte USB packet that +had to be broken into 2 256 byte bursts across the SCB bus AND +there was a following 512 byte USB packet, the second burst of +data from the first packet was sometimes being lost. If the +burst size was changed to 128 bytes via the EBR_SCB_SIZE field +in the USB_CTRL_EBRIDGE register we'd see the 4th 128 byte burst +of the first packet being lost. This problem became much worse +if other threads were running that accessed memory, like a memcpy +test. Setting the EBR_SCB_SIZE to 512, which prevents breaking +the EHCI USB packet (max size of 512 bytes) into bursts, fixed +the problem. + +Signed-off-by: Al Cooper +Reviewed-by: Florian Fainelli +Signed-off-by: Kishon Vijay Abraham I +--- + drivers/phy/broadcom/phy-brcm-usb-init.c | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +--- a/drivers/phy/broadcom/phy-brcm-usb-init.c ++++ b/drivers/phy/broadcom/phy-brcm-usb-init.c +@@ -42,6 +42,7 @@ + #define USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_MASK 0x80000000 /* option */ + #define USB_CTRL_EBRIDGE 0x0c + #define USB_CTRL_EBRIDGE_ESTOP_SCB_REQ_MASK 0x00020000 /* option */ ++#define USB_CTRL_EBRIDGE_EBR_SCB_SIZE_MASK 0x00000f80 /* option */ + #define USB_CTRL_OBRIDGE 0x10 + #define USB_CTRL_OBRIDGE_LS_KEEP_ALIVE_MASK 0x08000000 + #define USB_CTRL_MDIO 0x14 +@@ -176,6 +177,7 @@ static const struct id_to_type id_to_typ + { 0x33900000, BRCM_FAMILY_3390A0 }, + { 0x72500010, BRCM_FAMILY_7250B0 }, + { 0x72600000, BRCM_FAMILY_7260A0 }, ++ { 0x72550000, BRCM_FAMILY_7260A0 }, + { 0x72680000, BRCM_FAMILY_7271A0 }, + { 0x72710000, BRCM_FAMILY_7271A0 }, + { 0x73640000, BRCM_FAMILY_7364A0 }, +@@ -948,6 +950,17 @@ void brcm_usb_init_eohci(struct brcm_usb + if (params->selected_family == BRCM_FAMILY_7271A0) + /* Enable LS keep alive fix for certain keyboards */ + USB_CTRL_SET(ctrl, OBRIDGE, LS_KEEP_ALIVE); ++ ++ if (params->family_id == 0x72550000) { ++ /* ++ * Make the burst size 512 bytes to fix a hardware bug ++ * on the 7255a0. See HW7255-24. ++ */ ++ reg = brcmusb_readl(USB_CTRL_REG(ctrl, EBRIDGE)); ++ reg &= ~USB_CTRL_MASK(EBRIDGE, EBR_SCB_SIZE); ++ reg |= 0x800; ++ brcmusb_writel(reg, USB_CTRL_REG(ctrl, EBRIDGE)); ++ } + } + + void brcm_usb_init_xhci(struct brcm_usb_init_params *params) -- cgit v1.2.3