phy: usb: brcmstb bug fix and improvements
Justin Chen
maintainercover phy: usb: brcmstb bug fix and improvements
Work around false positive overcurrent condition due to HW bug.
Improvement power management.
Justin Chen (2):
phy: usb: Turn off phy when port is in suspend
phy: usb: suppress OC condition for 7439b2
drivers/phy/broadcom/phy-brcm-usb-init-synopsys.c | 15 ++++++++-- drivers/phy/broadcom/phy-brcm-usb-init.c | 34 +++++++++++++++++++++++ drivers/phy/broadcom/phy-brcm-usb-init.h | 8 ++++++ 3 files changed, 55 insertions(+), 2 deletions(-)
Signature · 1 line
2.7.4
Signature · 3 lines
linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
Justin Chen
maintainerPATCH 1/2 phy: usb: Turn off phy when port is in suspend
The COMMONONN bit turns off the PHY when the host controller puts it into suspend state. This can happen during the following...
- Nothing is connected to the port
- The host controller goes into low power mode whatever due to auto suspend or system suspend.
With COMMONONN we also must unset U2_FREECLK_EXISTS since the UTMI clock is fed by the PHY.
With these changes we see a power savings of ~12mW when port is in suspend.
--- drivers/phy/broadcom/phy-brcm-usb-init-synopsys.c | 15 +++++++++++++-- drivers/phy/broadcom/phy-brcm-usb-init.h | 8 ++++++++ 2 files changed, 21 insertions(+), 2 deletions(-)
drivers/phy/broadcom/phy-brcm-usb-init-synopsys.c +13 -2
@@ -59,6 +59,8 @@#define USB_CTLR_TP_DIAG1_wake_MASK BIT(1)#define USB_CTRL_CTLR_CSHCR 0x50#define USB_CTRL_CTLR_CSHCR_ctl_pme_en_MASK BIT(18) +#define USB_CTRL_P0_U2PHY_CFG1 0x68 +#define USB_CTRL_P0_U2PHY_CFG1_COMMONONN_MASK BIT(10)/* Register definitions for the USB_PHY block in 7211b0 */ #define USB_PHY_PLL_CTL 0x00
@@ -90,6 +92,8 @@#define BDC_EC_AXIRDA_RTS_MASK GENMASK(31, 28)#define BDC_EC_AXIRDA_RTS_SHIFT 28 +#define USB_XHCI_GBL_GUSB2PHYCFG 0x100 +#define USB_XHCI_GBL_GUSB2PHYCFG_U2_FREECLK_EXISTS_MASK BIT(30)static void usb_mdio_write_7211b0 (struct brcm_usb_init_params *params,uint8_t addr,uint16_t data)
@@ -140,13 +144,17 @@ static void xhci_soft_reset(struct brcm_usb_init_params *params, int on_off) {void __iomem *ctrl = params->regs[BRCM_REGS_CTRL ]; +void __iomem *xhci_gbl = params->regs[BRCM_REGS_XHCI_GBL ];/* Assert reset */ -if (on_off) +if (on_off) {USB_CTRL_UNSET (ctrl,USB_PM ,XHC_SOFT_RESETB );/* De-assert reset */ -else + }else {USB_CTRL_SET (ctrl,USB_PM ,XHC_SOFT_RESETB ); +/* Required for COMMONONN to be set */ +USB_XHCI_GBL_UNSET (xhci_gbl,GUSB2PHYCFG ,U2_FREECLK_EXISTS ); + } }static void usb_init_ipp (struct brcm_usb_init_params *params)
@@ -320,6 +328,9 @@ static void usb_init_common_7216(struct brcm_usb_init_params *params)/* 1 millisecond - for USB clocks to settle down */ usleep_range (1000 ,2000 ); +/* Disable PHY when port is suspended */ +USB_CTRL_SET (ctrl,P0_U2PHY_CFG1 ,COMMONONN ); +usb_wake_enable_7216 (params, false);usb_init_common (params); }
drivers/phy/broadcom/phy-brcm-usb-init.h +8 -0
@@ -34,6 +34,14 @@ enum brcmusb_reg_sel {brcm_usb_ctrl_unset (USB_CTRL_REG (base, reg), \ USB_CTRL_##reg##_##field##_MASK) +#define USB_XHCI_GBL_REG (base, reg) ((void __iomem *)base + USB_XHCI_GBL_##reg) +#define USB_XHCI_GBL_SET (base, reg, field) \ + brcm_usb_ctrl_set(USB_XHCI_GBL_REG(base, reg), \ + USB_XHCI_GBL_##reg##_##field##_MASK) +#define USB_XHCI_GBL_UNSET (base, reg, field) \ + brcm_usb_ctrl_unset(USB_XHCI_GBL_REG(base, reg), \ + USB_XHCI_GBL_##reg##_##field##_MASK) +struct brcm_usb_init_params ;struct brcm_usb_init_ops {
Signature · 1 line
2.7.4
Justin Chen
maintainerPATCH 2/2 phy: usb: suppress OC condition for 7439b2
In reply to Justin ChenWe hit a false positive OC for 7439b2 in DRD/device mode for the second port. So disable the OC check for this use case. Add capability to suppress OC condition for specific ports.
--- drivers/phy/broadcom/phy-brcm-usb-init.c | 34 ++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)
drivers/phy/broadcom/phy-brcm-usb-init.c +34 -0
@@ -35,6 +35,11 @@#define USB_CTRL_SETUP_STRAP_IPP_SEL_MASK BIT(25)/* option */ #define USB_CTRL_SETUP_CC_DRD_MODE_ENABLE_MASK BIT(26)/* option */ #define USB_CTRL_SETUP_STRAP_CC_DRD_MODE_ENABLE_SEL_MASK BIT(27)/* opt */ +#define USB_CTRL_SETUP_OC_DISABLE_PORT0_MASK BIT(28) +#define USB_CTRL_SETUP_OC_DISABLE_PORT1_MASK BIT(29) +#define USB_CTRL_SETUP_OC_DISABLE_MASK GENMASK(29, 28)/* option */ +#define USB_CTRL_SETUP_OC3_DISABLE_PORT0_MASK BIT(30) +#define USB_CTRL_SETUP_OC3_DISABLE_PORT1_MASK BIT(31)#define USB_CTRL_SETUP_OC3_DISABLE_MASK GENMASK(31, 30)/* option */ #define USB_CTRL_PLL_CTL 0x04#define USB_CTRL_PLL_CTL_PLL_SUSPEND_EN_MASK BIT(27)
@@ -114,6 +119,8 @@ enum {USB_CTRL_SETUP_SCB2_EN_SELECTOR ,USB_CTRL_SETUP_SS_EHCI64BIT_EN_SELECTOR ,USB_CTRL_SETUP_STRAP_IPP_SEL_SELECTOR , +USB_CTRL_SETUP_OC3_DISABLE_PORT0_SELECTOR , +USB_CTRL_SETUP_OC3_DISABLE_PORT1_SELECTOR ,USB_CTRL_SETUP_OC3_DISABLE_SELECTOR ,USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_SELECTOR , USB_CTRL_USB_PM_BDC_SOFT_RESETB_SELECTOR,
@@ -190,6 +197,8 @@ usb_reg_bits_map_table[BRCM_FAMILY_COUNT][USB_CTRL_SELECTOR_COUNT] = {USB_CTRL_SETUP_SCB2_EN_MASK ,USB_CTRL_SETUP_SS_EHCI64BIT_EN_MASK ,USB_CTRL_SETUP_STRAP_IPP_SEL_MASK , +USB_CTRL_SETUP_OC3_DISABLE_PORT0_MASK , +USB_CTRL_SETUP_OC3_DISABLE_PORT1_MASK ,USB_CTRL_SETUP_OC3_DISABLE_MASK ,0 ,/* USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_MASK */ 0, /* USB_CTRL_USB_PM_BDC_SOFT_RESETB_MASK */
@@ -232,6 +241,8 @@ usb_reg_bits_map_table[BRCM_FAMILY_COUNT][USB_CTRL_SELECTOR_COUNT] = {USB_CTRL_SETUP_SCB2_EN_MASK ,USB_CTRL_SETUP_SS_EHCI64BIT_EN_MASK ,0 ,/* USB_CTRL_SETUP_STRAP_IPP_SEL_MASK */ +USB_CTRL_SETUP_OC3_DISABLE_PORT0_MASK , +USB_CTRL_SETUP_OC3_DISABLE_PORT1_MASK ,USB_CTRL_SETUP_OC3_DISABLE_MASK ,USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_MASK , 0, /* USB_CTRL_USB_PM_BDC_SOFT_RESETB_MASK */
@@ -253,6 +264,8 @@ usb_reg_bits_map_table[BRCM_FAMILY_COUNT][USB_CTRL_SELECTOR_COUNT] = {0 ,/* USB_CTRL_SETUP_SCB2_EN_MASK */ USB_CTRL_SETUP_SS_EHCI64BIT_EN_MASK ,USB_CTRL_SETUP_STRAP_IPP_SEL_MASK , +USB_CTRL_SETUP_OC3_DISABLE_PORT0_MASK , +USB_CTRL_SETUP_OC3_DISABLE_PORT1_MASK ,USB_CTRL_SETUP_OC3_DISABLE_MASK ,0 ,/* USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_MASK */ USB_CTRL_USB_PM_BDC_SOFT_RESETB_MASK,
@@ -274,6 +287,8 @@ usb_reg_bits_map_table[BRCM_FAMILY_COUNT][USB_CTRL_SELECTOR_COUNT] = {USB_CTRL_SETUP_SCB2_EN_MASK ,USB_CTRL_SETUP_SS_EHCI64BIT_EN_MASK ,0 ,/* USB_CTRL_SETUP_STRAP_IPP_SEL_MASK */ +USB_CTRL_SETUP_OC3_DISABLE_PORT0_MASK , +USB_CTRL_SETUP_OC3_DISABLE_PORT1_MASK ,USB_CTRL_SETUP_OC3_DISABLE_MASK ,USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_MASK , 0, /* USB_CTRL_USB_PM_BDC_SOFT_RESETB_MASK */
@@ -295,6 +310,8 @@ usb_reg_bits_map_table[BRCM_FAMILY_COUNT][USB_CTRL_SELECTOR_COUNT] = {USB_CTRL_SETUP_SCB2_EN_MASK ,USB_CTRL_SETUP_SS_EHCI64BIT_EN_MASK ,0 ,/* USB_CTRL_SETUP_STRAP_IPP_SEL_MASK */ +USB_CTRL_SETUP_OC3_DISABLE_PORT0_MASK , +USB_CTRL_SETUP_OC3_DISABLE_PORT1_MASK ,USB_CTRL_SETUP_OC3_DISABLE_MASK ,0 ,/* USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_MASK */ 0, /* USB_CTRL_USB_PM_BDC_SOFT_RESETB_MASK */
@@ -316,6 +333,8 @@ usb_reg_bits_map_table[BRCM_FAMILY_COUNT][USB_CTRL_SELECTOR_COUNT] = {USB_CTRL_SETUP_SCB2_EN_MASK ,USB_CTRL_SETUP_SS_EHCI64BIT_EN_VAR_MASK ,0 ,/* USB_CTRL_SETUP_STRAP_IPP_SEL_MASK */ +0 ,/* USB_CTRL_SETUP_OC3_DISABLE_PORT0_MASK */ +0 ,/* USB_CTRL_SETUP_OC3_DISABLE_PORT1_MASK */ 0 ,/* USB_CTRL_SETUP_OC3_DISABLE_MASK */ USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_MASK , 0, /* USB_CTRL_USB_PM_BDC_SOFT_RESETB_MASK */
@@ -337,6 +356,8 @@ usb_reg_bits_map_table[BRCM_FAMILY_COUNT][USB_CTRL_SELECTOR_COUNT] = {USB_CTRL_SETUP_SCB2_EN_MASK ,USB_CTRL_SETUP_SS_EHCI64BIT_EN_MASK ,USB_CTRL_SETUP_STRAP_IPP_SEL_MASK , +USB_CTRL_SETUP_OC3_DISABLE_PORT0_MASK , +USB_CTRL_SETUP_OC3_DISABLE_PORT1_MASK ,USB_CTRL_SETUP_OC3_DISABLE_MASK ,0 ,/* USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_MASK */ USB_CTRL_USB_PM_BDC_SOFT_RESETB_MASK,
@@ -358,6 +379,8 @@ usb_reg_bits_map_table[BRCM_FAMILY_COUNT][USB_CTRL_SELECTOR_COUNT] = {USB_CTRL_SETUP_SCB2_EN_MASK ,USB_CTRL_SETUP_SS_EHCI64BIT_EN_VAR_MASK ,0 ,/* USB_CTRL_SETUP_STRAP_IPP_SEL_MASK */ +USB_CTRL_SETUP_OC3_DISABLE_PORT0_MASK , +USB_CTRL_SETUP_OC3_DISABLE_PORT1_MASK ,USB_CTRL_SETUP_OC3_DISABLE_MASK ,USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_MASK , 0, /* USB_CTRL_USB_PM_BDC_SOFT_RESETB_MASK */
@@ -379,6 +402,8 @@ usb_reg_bits_map_table[BRCM_FAMILY_COUNT][USB_CTRL_SELECTOR_COUNT] = {0 ,/* USB_CTRL_SETUP_SCB2_EN_MASK */ USB_CTRL_SETUP_SS_EHCI64BIT_EN_MASK ,USB_CTRL_SETUP_STRAP_IPP_SEL_MASK , +USB_CTRL_SETUP_OC3_DISABLE_PORT0_MASK , +USB_CTRL_SETUP_OC3_DISABLE_PORT1_MASK ,USB_CTRL_SETUP_OC3_DISABLE_MASK ,0 ,/* USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_MASK */ USB_CTRL_USB_PM_BDC_SOFT_RESETB_MASK,
@@ -400,6 +425,8 @@ usb_reg_bits_map_table[BRCM_FAMILY_COUNT][USB_CTRL_SELECTOR_COUNT] = {0 ,/* USB_CTRL_SETUP_SCB2_EN_MASK */ 0 ,/*USB_CTRL_SETUP_SS_EHCI64BIT_EN_MASK */ USB_CTRL_SETUP_STRAP_IPP_SEL_MASK , +USB_CTRL_SETUP_OC3_DISABLE_PORT0_MASK , +USB_CTRL_SETUP_OC3_DISABLE_PORT1_MASK ,USB_CTRL_SETUP_OC3_DISABLE_MASK ,0 ,/* USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_MASK */ USB_CTRL_USB_PM_BDC_SOFT_RESETB_MASK,
@@ -872,6 +899,13 @@ static void usb_init_common(struct brcm_usb_init_params *params)brcmusb_memc_fix (params); +/* Workaround for false positive OC for 7439b2 in DRD/Device mode */ +if ((params->family_id ==0x74390012 ) && + (params->supported_port_modes !=USB_CTLR_MODE_HOST )) { +USB_CTRL_SET (ctrl,SETUP ,OC_DISABLE_PORT1 ); +USB_CTRL_SET_FAMILY (params,SETUP ,OC3_DISABLE_PORT1 ); + } +if (USB_CTRL_MASK_FAMILY (params,USB_DEVICE_CTL1 ,PORT_MODE )) { reg =brcm_usb_readl (USB_CTRL_REG (ctrl,USB_DEVICE_CTL1 )); reg &= ~USB_CTRL_MASK_FAMILY(params, USB_DEVICE_CTL1,
Signature · 1 line
2.7.4
Signature · 3 lines
linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
Re: [PATCH 2/2] phy: usb: suppress OC condition for 7439b2
Quoted 5 lines · Justin Chen
We hit a false positive OC for 7439b2 in DRD/device mode for the second port. So disable the OC check for this use case. Add capability to suppress OC condition for specific ports.
Signed-off-by Justin Chen <[email protected]>
Signature · 1 line
Florian
Signature · 3 lines
linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
Quoted 3 lines · Justin Chen
Work around false positive overcurrent condition due to HW bug.
Improvement power management.
Applied, thanks
Signature · 6 lines
~Vinod -- linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy