phy: usb: Updates to Broadcom STB USB PHY driver
Subsystems (4)
Al Cooper
maintainerv4 cover phy: usb: Updates to Broadcom STB USB PHY driver
This patchset contains various updates to the Broadcom STB USB Driver. The updates include:
- Add support for 7216 and 7211 Broadcom SoCs which use the new Synopsys USB Controller.
- Add support for USB Wake
- Add various bug fixes.
v4 - Fix mispelling, change Synopsis to Synopsys. Also add
"Reviewed-by: Rob Herring" to bindings patch. There are no functional code changes in v4.
v3 - Rebase to v5.5-rc1
v2 - Changes based on review feedback
- Add vendor prefix to DT property "syscon-piarbctl"
- Use standard "wakeup" instead of "wake" for DT "interrupt-names"
Al Cooper (13):
phy: usb: EHCI DMA may lose a burst of DMA data for 7255xA0 family
phy: usb: Get all drivers that use USB clks using correct
enable/disable
phy: usb: Put USB phys into IDDQ on suspend to save power in S2 mode
phy: usb: Add "wake on" functionality
phy: usb: Restructure in preparation for adding 7216 USB support
dt-bindings: Add Broadcom STB USB PHY binding document
phy: usb: Add support for new Synopsys USB controller on the 7216
phy: usb: Add support for new Synopsys USB controller on the 7211b0
phy: usb: fix driver to defer on clk_get defer
phy: usb: PHY's MDIO registers not accessible without device installed
phy: usb: bdc: Fix occasional failure with BDC on 7211
phy: usb: USB driver is crashing during S3 resume on 7216
phy: usb: Add support for wake and USB low power mode for 7211 S2/S5
.../bindings/phy/brcm,brcmstb-usb-phy.txt | 69 ++- drivers/phy/broadcom/Makefile | 2 +- .../phy/broadcom/phy-brcm-usb-init-synopsys.c | 414 ++++++++++++++++++ drivers/phy/broadcom/phy-brcm-usb-init.c | 226 +++++----- drivers/phy/broadcom/phy-brcm-usb-init.h | 148 ++++++- drivers/phy/broadcom/phy-brcm-usb.c | 269 ++++++++++-- 6 files changed, 943 insertions(+), 185 deletions(-) create mode 100644 drivers/phy/broadcom/phy-brcm-usb-init-synopsys.c
Signature · 1 line
2.17.1
Al Cooper
maintainerPATCH v4 1/13 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.
--- drivers/phy/broadcom/phy-brcm-usb-init.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/phy/broadcom/phy-brcm-usb-init.c +13 -0
@@ -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_type_table[] = { { 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_init_params *params)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)
Signature · 1 line
2.17.1
Re: [PATCH v4 01/13] phy: usb: EHCI DMA may lose a burst of DMA data for 7255xA0 family
Quoted 12 lines · Al Cooper
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_SIZEfield in theUSB_CTRL_EBRIDGEregister 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 theEBR_SCB_SIZEto 512, which prevents breaking the EHCI USB packet (max size of 512 bytes) into bursts, fixed the problem.
Quoted 1 line
Signed-off-by Al Cooper <[email protected]>
Signature · 1 line
Florian
Al Cooper
maintainerPATCH v4 2/13 phy: usb: Get all drivers that use USB clks using correct enable/disable
In reply to Al CooperThe BRCM USB Phy, ohci, ehci and xhci drivers all use the USB clocks but not all drivers use the clk_prepare_enable/clk_disable_unprepare versions to enable/disable the clocks. This change gets all drivers using the prepare version.
--- drivers/phy/broadcom/phy-brcm-usb.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
drivers/phy/broadcom/phy-brcm-usb.c +14 -14
@@ -74,8 +74,8 @@ static int brcm_usb_phy_init(struct phy *gphy)*/ mutex_lock (&priv->mutex);if (priv->init_count++ ==0 ) { -clk_enable (priv->usb_20_clk); -clk_enable (priv->usb_30_clk); +clk_prepare_enable (priv->usb_20_clk); +clk_prepare_enable (priv->usb_30_clk);brcm_usb_init_common (&priv->ini); }mutex_unlock (&priv->mutex);
@@ -106,8 +106,8 @@ static int brcm_usb_phy_exit(struct phy *gphy)mutex_lock (&priv->mutex);if (--priv->init_count ==0 ) {brcm_usb_uninit_common (&priv->ini); -clk_disable (priv->usb_20_clk); -clk_disable (priv->usb_30_clk); +clk_disable_unprepare (priv->usb_20_clk); +clk_disable_unprepare (priv->usb_30_clk); }mutex_unlock (&priv->mutex); phy->inited = false;
@@ -360,8 +360,8 @@ static int brcm_usb_phy_probe(struct platform_device *pdev)if (priv->has_eohci)brcm_usb_uninit_eohci (&priv->ini);brcm_usb_uninit_common (&priv->ini); -clk_disable (priv->usb_20_clk); -clk_disable (priv->usb_30_clk); +clk_disable_unprepare (priv->usb_20_clk); +clk_disable_unprepare (priv->usb_30_clk); phy_provider =devm_of_phy_provider_register (dev, brcm_usb_phy_xlate);
@@ -381,8 +381,8 @@ static int brcm_usb_phy_suspend(struct device *dev)struct brcm_usb_phy_data *priv =dev_get_drvdata (dev);if (priv->init_count) { -clk_disable (priv->usb_20_clk); -clk_disable (priv->usb_30_clk); +clk_disable_unprepare (priv->usb_20_clk); +clk_disable_unprepare (priv->usb_30_clk); }return 0 ; }
@@ -391,8 +391,8 @@ static int brcm_usb_phy_resume(struct device *dev) {struct brcm_usb_phy_data *priv =dev_get_drvdata (dev); -clk_enable (priv->usb_20_clk); -clk_enable (priv->usb_30_clk); +clk_prepare_enable (priv->usb_20_clk); +clk_prepare_enable (priv->usb_30_clk);brcm_usb_init_ipp (&priv->ini);/*
@@ -405,13 +405,13 @@ static int brcm_usb_phy_resume(struct device *dev)brcm_usb_init_eohci (&priv->ini); }else if (priv->has_eohci) {brcm_usb_uninit_eohci (&priv->ini); -clk_disable (priv->usb_20_clk); +clk_disable_unprepare (priv->usb_20_clk); }if (priv->phys[BRCM_USB_PHY_3_0 ].inited) {brcm_usb_init_xhci (&priv->ini); }else if (priv->has_xhci) {brcm_usb_uninit_xhci (&priv->ini); -clk_disable (priv->usb_30_clk); +clk_disable_unprepare (priv->usb_30_clk); } }else {if (priv->has_xhci)
@@ -419,8 +419,8 @@ static int brcm_usb_phy_resume(struct device *dev)if (priv->has_eohci)brcm_usb_uninit_eohci (&priv->ini);brcm_usb_uninit_common (&priv->ini); -clk_disable (priv->usb_20_clk); -clk_disable (priv->usb_30_clk); +clk_disable_unprepare (priv->usb_20_clk); +clk_disable_unprepare (priv->usb_30_clk); }return 0 ;
Signature · 1 line
2.17.1
Re: [PATCH v4 02/13] phy: usb: Get all drivers that use USB clks using correct enable/disable
Quoted 6 lines · Al Cooper
The BRCM USB Phy, ohci, ehci and xhci drivers all use the USB clocks but not all drivers use the clk_prepare_enable/clk_disable_unprepare versions to enable/disable the clocks. This change gets all drivers using the prepare version.
Signed-off-by Al Cooper <[email protected]>
Signature · 1 line
Florian
Al Cooper
maintainerPATCH v4 3/13 phy: usb: Put USB phys into IDDQ on suspend to save power in S2 mode
In reply to Al CooperCurrently the Phy driver will put the USB phys into the max power saving mode (IDDQ) when there is no corresponding XHCI, EHCI or OHCI client (through rmmod, unbind or if the driver is not builtin). This change will also put the Phys into IDDQ mode on suspend so that S2 will get the additional power savings.
--- drivers/phy/broadcom/phy-brcm-usb-init.c | 2 -- drivers/phy/broadcom/phy-brcm-usb.c | 11 +++++++++-- 2 files changed, 9 insertions(+), 4 deletions(-)
drivers/phy/broadcom/phy-brcm-usb-init.c +0 -2
@@ -1002,8 +1002,6 @@ void brcm_usb_uninit_common(struct brcm_usb_init_params *params)void brcm_usb_uninit_eohci (struct brcm_usb_init_params *params) { -if (USB_CTRL_MASK_FAMILY (params,USB_PM ,USB20_HC_RESETB )) -USB_CTRL_UNSET_FAMILY (params,USB_PM ,USB20_HC_RESETB ); }void brcm_usb_uninit_xhci (struct brcm_usb_init_params *params)
drivers/phy/broadcom/phy-brcm-usb.c +9 -2
@@ -381,8 +381,15 @@ static int brcm_usb_phy_suspend(struct device *dev)struct brcm_usb_phy_data *priv =dev_get_drvdata (dev);if (priv->init_count) { -clk_disable_unprepare (priv->usb_20_clk); -clk_disable_unprepare (priv->usb_30_clk); +if (priv->phys[BRCM_USB_PHY_3_0 ].inited) +brcm_usb_uninit_xhci (&priv->ini); +if (priv->phys[BRCM_USB_PHY_2_0 ].inited) +brcm_usb_uninit_eohci (&priv->ini); +brcm_usb_uninit_common (&priv->ini); +if (priv->phys[BRCM_USB_PHY_3_0 ].inited) +clk_disable_unprepare (priv->usb_30_clk); +if (priv->phys[BRCM_USB_PHY_2_0 ].inited) +clk_disable_unprepare (priv->usb_20_clk); }return 0 ; }
Signature · 1 line
2.17.1
Re: [PATCH v4 03/13] phy: usb: Put USB phys into IDDQ on suspend to save power in S2 mode
Quoted 7 lines · Al Cooper
Currently the Phy driver will put the USB phys into the max power saving mode (IDDQ) when there is no corresponding XHCI, EHCI or OHCI client (through rmmod, unbind or if the driver is not builtin). This change will also put the Phys into IDDQ mode on suspend so that S2 will get the additional power savings.
Signed-off-by Al Cooper <[email protected]>
Signature · 1 line
Florian
Al Cooper
maintainerPATCH v4 4/13 phy: usb: Add "wake on" functionality
In reply to Al CooperAdd the ability to handle USB wake events from USB devices when in S2 mode. Typically there is some additional configuration needed to tell the USB device to generate the wake event when suspended but this varies with the different USB device classes. For example, on USB Ethernet dongles, ethtool should be used to enable the magic packet wake functionality in the dongle.
NOTE: This requires that the "power/wakeup" sysfs entry for the USB device generating the wakeup be set to "enabled".
This functionality requires a special hardware sideband path that will trigger the AON_PM_L2 interrupt needed to wake the system from S2 even though the USB host controllers are in IDDQ (low power state) and most USB related clocks are shut off. For the sideband signaling to work we need to leave the usbx_freerun clock running, but this clock consumes very little power by design. There's a bug in the XHCI wake hardware so only EHCI/OHCI wake is currently supported.
--- drivers/phy/broadcom/phy-brcm-usb-init.c | 17 +++++++++ drivers/phy/broadcom/phy-brcm-usb-init.h | 1 + drivers/phy/broadcom/phy-brcm-usb.c | 48 ++++++++++++++++++++++-- 3 files changed, 63 insertions(+), 3 deletions(-)
drivers/phy/broadcom/phy-brcm-usb-init.c +17 -0
@@ -58,6 +58,8 @@#define USB_CTRL_USB_PM_SOFT_RESET_MASK 0x40000000/* option */ #define USB_CTRL_USB_PM_USB20_HC_RESETB_MASK 0x30000000/* option */ #define USB_CTRL_USB_PM_USB20_HC_RESETB_VAR_MASK 0x00300000/* option */ +#define USB_CTRL_USB_PM_RMTWKUP_EN_MASK 0x00000001 +#define USB_CTRL_USB_PM_STATUS 0x38#define USB_CTRL_USB30_CTL1 0x60#define USB_CTRL_USB30_CTL1_PHY3_PLL_SEQ_START_MASK 0x00000010#define USB_CTRL_USB30_CTL1_PHY3_RESETB_MASK 0x00010000
@@ -855,6 +857,10 @@ void brcm_usb_init_common(struct brcm_usb_init_params *params)u32 reg;void __iomem *ctrl = params->ctrl_regs; +/* Clear any pending wake conditions */ + reg =brcmusb_readl (USB_CTRL_REG (ctrl,USB_PM_STATUS )); +brcmusb_writel (reg,USB_CTRL_REG (ctrl,USB_PM_STATUS )); +/* Take USB out of power down */ if (USB_CTRL_MASK_FAMILY (params,PLL_CTL ,PLL_IDDQ_PWRDN )) {USB_CTRL_UNSET_FAMILY (params,PLL_CTL ,PLL_IDDQ_PWRDN );
@@ -1010,6 +1016,17 @@ void brcm_usb_uninit_xhci(struct brcm_usb_init_params *params)USB_CTRL_SET (params->ctrl_regs,USB30_PCTL ,PHY3_IDDQ_OVERRIDE ); } +void brcm_usb_wake_enable (struct brcm_usb_init_params *params, +int enable) +{ +void __iomem *ctrl = params->ctrl_regs; + +if (enable) +USB_CTRL_SET (ctrl,USB_PM ,RMTWKUP_EN ); +else +USB_CTRL_UNSET (ctrl,USB_PM ,RMTWKUP_EN ); +} +void brcm_usb_set_family_map (struct brcm_usb_init_params *params) {int fam;
drivers/phy/broadcom/phy-brcm-usb-init.h +1 -0
@@ -38,5 +38,6 @@ void brcm_usb_init_xhci(struct brcm_usb_init_params *ini);void brcm_usb_uninit_common (struct brcm_usb_init_params *ini);void brcm_usb_uninit_eohci (struct brcm_usb_init_params *ini);void brcm_usb_uninit_xhci (struct brcm_usb_init_params *ini); +void brcm_usb_wake_enable (struct brcm_usb_init_params *params,int enable);#endif /* _USB_BRCM_COMMON_INIT_H */
drivers/phy/broadcom/phy-brcm-usb.c +45 -3
114 lines not on this page · raw message
Signature · 1 line
2.17.1
Re: [PATCH v4 04/13] phy: usb: Add "wake on" functionality
Quoted 17 lines · Al Cooper
Add the ability to handle USB wake events from USB devices when in S2 mode. Typically there is some additional configuration needed to tell the USB device to generate the wake event when suspended but this varies with the different USB device classes. For example, on USB Ethernet dongles, ethtool should be used to enable the magic packet wake functionality in the dongle.
NOTE: This requires that the "power/wakeup" sysfs entry for the USB device generating the wakeup be set to "enabled".This functionality requires a special hardware sideband path that will trigger the
AON_PM_L2interrupt needed to wake the system from S2 even though the USB host controllers are in IDDQ (low power state) and most USB related clocks are shut off. For the sideband signaling to work we need to leave theusbx_freerunclock running, but this clock consumes very little power by design. There's a bug in the XHCI wake hardware so only EHCI/OHCI wake is currently supported.
Quoted 1 line
Signed-off-by Al Cooper <[email protected]>
Signature · 1 line
Florian
Al Cooper
maintainerPATCH v4 5/13 phy: usb: Restructure in preparation for adding 7216 USB support
In reply to Al CooperThe driver is being restructured in preparation for adding support for the new Synopsys USB conroller on the 7216. Since all the bugs and work-arounds in previous STB chips are supposed to be fixed, most of the code in phy-brcm-usb-init.c is not needed. Instead of adding more complexity to the already complicated phy-brcm-usb-init.c module, the driver will be restructured to use a vector table to dispatch into different C modules for the different controllers.
There was also some general cleanup done including some ipp setup code that was incorrect.
--- drivers/phy/broadcom/phy-brcm-usb-init.c | 191 ++++++++++------------- drivers/phy/broadcom/phy-brcm-usb-init.h | 140 +++++++++++++++-- drivers/phy/broadcom/phy-brcm-usb.c | 6 +- 3 files changed, 214 insertions(+), 123 deletions(-)
drivers/phy/broadcom/phy-brcm-usb-init.c +84 -107
@@ -129,10 +129,6 @@ enum { USB_CTRL_SELECTOR_COUNT, }; -#define USB_CTRL_REG (base, reg) ((void __iomem *)base + USB_CTRL_##reg) -#define USB_XHCI_EC_REG (base, reg) ((void __iomem *)base + USB_XHCI_EC_##reg) -#define USB_CTRL_MASK (reg, field) \ - USB_CTRL_##reg##_##field##_MASK#define USB_CTRL_MASK_FAMILY (params, reg, field) \ (params->usb_reg_bits_map[USB_CTRL_##reg##_##field##_SELECTOR])
@@ -143,13 +139,6 @@ enum { usb_ctrl_unset_family(params, USB_CTRL_##reg, \ USB_CTRL_##reg##_##field##_SELECTOR) -#define USB_CTRL_SET (base, reg, field) \ - usb_ctrl_set(USB_CTRL_REG(base, reg), \ - USB_CTRL_##reg##_##field##_MASK) -#define USB_CTRL_UNSET (base, reg, field) \ - usb_ctrl_unset(USB_CTRL_REG(base, reg), \ - USB_CTRL_##reg##_##field##_MASK) -#define MDIO_USB2 0#define MDIO_USB3 BIT(31)
@@ -405,26 +394,14 @@ usb_reg_bits_map_table[BRCM_FAMILY_COUNT][USB_CTRL_SELECTOR_COUNT] = { }, }; -static inline u32 brcmusb_readl (void __iomem *addr) -{ -return readl (addr); -} - -static inline void brcmusb_writel (u32 val,void __iomem *addr) -{ -writel (val, addr); -} -static inline void usb_ctrl_unset_family (struct brcm_usb_init_params *params,u32 reg_offset,u32 field) {u32 mask; -void __iomem *reg; mask = params->usb_reg_bits_map[field]; - reg = params->ctrl_regs + reg_offset; -brcmusb_writel (brcmusb_readl (reg) & ~mask, reg); +brcm_usb_ctrl_unset (params->ctrl_regs + reg_offset, mask); }; static inline
@@ -432,45 +409,27 @@ void usb_ctrl_set_family(struct brcm_usb_init_params *params, u32 reg_offset, u32 field) {u32 mask; -void __iomem *reg; mask = params->usb_reg_bits_map[field]; - reg = params->ctrl_regs + reg_offset; -brcmusb_writel (brcmusb_readl (reg) | mask, reg); +brcm_usb_ctrl_set (params->ctrl_regs + reg_offset, mask); }; -static inline void usb_ctrl_set (void __iomem *reg,u32 field) -{ -u32 value; - - value =brcmusb_readl (reg); -brcmusb_writel (value | field, reg); -} - -static inline void usb_ctrl_unset (void __iomem *reg,u32 field) -{ -u32 value; - - value =brcmusb_readl (reg); -brcmusb_writel (value & ~field, reg); -} -static u32 brcmusb_usb_mdio_read (void __iomem *ctrl_base,u32 reg,int mode) {u32 data; data = (reg <<16 ) | mode; -brcmusb_writel (data,USB_CTRL_REG (ctrl_base,MDIO )); +brcm_usb_writel (data,USB_CTRL_REG (ctrl_base,MDIO )); data |= (1 <<24 ); -brcmusb_writel (data,USB_CTRL_REG (ctrl_base,MDIO )); +brcm_usb_writel (data,USB_CTRL_REG (ctrl_base,MDIO )); data &= ~(1 <<24 );/* wait for the 60MHz parallel to serial shifter */ usleep_range (10 ,20 ); -brcmusb_writel (data,USB_CTRL_REG (ctrl_base,MDIO )); +brcm_usb_writel (data,USB_CTRL_REG (ctrl_base,MDIO ));/* wait for the 60MHz parallel to serial shifter */ usleep_range (10 ,20 ); -return brcmusb_readl (USB_CTRL_REG (ctrl_base,MDIO2 )) &0xffff ; +return brcm_usb_readl (USB_CTRL_REG (ctrl_base,MDIO2 )) &0xffff ; } static void brcmusb_usb_mdio_write(void __iomem *ctrl_base, u32 reg,
@@ -479,14 +438,14 @@ static void brcmusb_usb_mdio_write(void __iomem *ctrl_base, u32 reg,u32 data; data = (reg <<16 ) | val | mode; -brcmusb_writel (data,USB_CTRL_REG (ctrl_base,MDIO )); +brcm_usb_writel (data,USB_CTRL_REG (ctrl_base,MDIO )); data |= (1 <<25 ); -brcmusb_writel (data,USB_CTRL_REG (ctrl_base,MDIO )); +brcm_usb_writel (data,USB_CTRL_REG (ctrl_base,MDIO )); data &= ~(1 <<25 );/* wait for the 60MHz parallel to serial shifter */ usleep_range (10 ,20 ); -brcmusb_writel (data,USB_CTRL_REG (ctrl_base,MDIO )); +brcm_usb_writel (data,USB_CTRL_REG (ctrl_base,MDIO ));/* wait for the 60MHz parallel to serial shifter */ usleep_range (10 ,20 ); }
@@ -713,12 +672,12 @@ static void brcmusb_usb3_otp_fix(struct brcm_usb_init_params *params)if (params->family_id !=0x74371000 || !xhci_ec_base)return ; -brcmusb_writel (0xa20c ,USB_XHCI_EC_REG (xhci_ec_base,IRAADR )); - val =brcmusb_readl (USB_XHCI_EC_REG (xhci_ec_base,IRADAT )); +brcm_usb_writel (0xa20c ,USB_XHCI_EC_REG (xhci_ec_base,IRAADR )); + val =brcm_usb_readl (USB_XHCI_EC_REG (xhci_ec_base,IRADAT ));/* set cfg_pick_ss_lock */ val |= (1 <<27 ); -brcmusb_writel (val,USB_XHCI_EC_REG (xhci_ec_base,IRADAT )); +brcm_usb_writel (val,USB_XHCI_EC_REG (xhci_ec_base,IRADAT ));/* Reset USB 3.0 PHY for workaround to take effect */ USB_CTRL_UNSET (params->ctrl_regs,USB30_CTL1 ,PHY3_RESETB );
@@ -751,7 +710,7 @@ static void brcmusb_xhci_soft_reset(struct brcm_usb_init_params *params,* - default chip/rev. * NOTE: The minor rev is always ignored. */ -static enum brcm_family_type brcmusb_get_family_type ( +static enum brcm_family_type get_family_type (struct brcm_usb_init_params *params) {int last_type =-1 ;
@@ -779,7 +738,7 @@ static enum brcm_family_type brcmusb_get_family_type(return last_type; } -void brcm_usb_init_ipp (struct brcm_usb_init_params *params) +static void usb_init_ipp (struct brcm_usb_init_params *params) {void __iomem *ctrl = params->ctrl_regs;u32 reg;
@@ -795,7 +754,7 @@ void brcm_usb_init_ipp(struct brcm_usb_init_params *params)USB_CTRL_SET_FAMILY (params,USB30_CTL1 ,USB3_IPP ); } - reg =brcmusb_readl (USB_CTRL_REG (ctrl,SETUP )); + reg =brcm_usb_readl (USB_CTRL_REG (ctrl,SETUP )); orig_reg = reg;if (USB_CTRL_MASK_FAMILY (params,SETUP ,STRAP_CC_DRD_MODE_ENABLE_SEL ))/* Never use the strap, it's going away. */
@@ -803,8 +762,8 @@ void brcm_usb_init_ipp(struct brcm_usb_init_params *params)SETUP , STRAP_CC_DRD_MODE_ENABLE_SEL));if (USB_CTRL_MASK_FAMILY (params,SETUP ,STRAP_IPP_SEL )) +/* override ipp strap pin (if it exits) */ if (params->ipp !=2 ) -/* override ipp strap pin (if it exits) */ reg &= ~(USB_CTRL_MASK_FAMILY (params,SETUP ,STRAP_IPP_SEL ));
@@ -812,54 +771,26 @@ void brcm_usb_init_ipp(struct brcm_usb_init_params *params) reg &= ~(USB_CTRL_MASK (SETUP ,IPP ) |USB_CTRL_MASK (SETUP ,IOC ));if (params->ioc) reg |=USB_CTRL_MASK (SETUP ,IOC ); -if (params->ipp ==1 && ((reg &USB_CTRL_MASK (SETUP ,IPP )) ==0 )) +if (params->ipp ==1 ) reg |=USB_CTRL_MASK (SETUP ,IPP ); -brcmusb_writel (reg,USB_CTRL_REG (ctrl,SETUP )); +brcm_usb_writel (reg,USB_CTRL_REG (ctrl,SETUP ));/* * If we're changing IPP, make sure power is off long enough * to turn off any connected devices. */ -if (reg != orig_reg) +if ((reg ^ orig_reg) &USB_CTRL_MASK (SETUP ,IPP ))msleep (50 ); } -int brcm_usb_init_get_dual_select (struct brcm_usb_init_params *params) -{ -void __iomem *ctrl = params->ctrl_regs; -u32 reg =0 ; - -if (USB_CTRL_MASK_FAMILY (params,USB_DEVICE_CTL1 ,PORT_MODE )) { - reg =brcmusb_readl (USB_CTRL_REG (ctrl,USB_DEVICE_CTL1 )); - reg &=USB_CTRL_MASK_FAMILY (params,USB_DEVICE_CTL1 , -PORT_MODE ); - } -return reg; -} - -void brcm_usb_init_set_dual_select (struct brcm_usb_init_params *params, -int mode) -{ -void __iomem *ctrl = params->ctrl_regs; -u32 reg; - -if (USB_CTRL_MASK_FAMILY (params,USB_DEVICE_CTL1 ,PORT_MODE )) { - reg =brcmusb_readl (USB_CTRL_REG (ctrl,USB_DEVICE_CTL1 )); - reg &= ~USB_CTRL_MASK_FAMILY (params,USB_DEVICE_CTL1 , -PORT_MODE ); - reg |= mode; -brcmusb_writel (reg,USB_CTRL_REG (ctrl,USB_DEVICE_CTL1 )); - } -} - -void brcm_usb_init_common (struct brcm_usb_init_params *params) +static void usb_init_common (struct brcm_usb_init_params *params) {u32 reg;void __iomem *ctrl = params->ctrl_regs;/* Clear any pending wake conditions */ - reg =brcmusb_readl (USB_CTRL_REG (ctrl,USB_PM_STATUS )); -brcmusb_writel (reg,USB_CTRL_REG (ctrl,USB_PM_STATUS )); + reg =brcm_usb_readl (USB_CTRL_REG (ctrl,USB_PM_STATUS )); +brcm_usb_writel (reg,USB_CTRL_REG (ctrl,USB_PM_STATUS ));/* Take USB out of power down */ if (USB_CTRL_MASK_FAMILY (params,PLL_CTL ,PLL_IDDQ_PWRDN )) {
@@ -885,7 +816,7 @@ void brcm_usb_init_common(struct brcm_usb_init_params *params)/* Block auto PLL suspend by USB2 PHY (Sasi) */ USB_CTRL_SET (ctrl,PLL_CTL ,PLL_SUSPEND_EN ); - reg =brcmusb_readl (USB_CTRL_REG (ctrl,SETUP )); + reg =brcm_usb_readl (USB_CTRL_REG (ctrl,SETUP ));if (params->selected_family ==BRCM_FAMILY_7364A0 )/* Suppress overcurrent indication from USB30 ports for A0 */ reg |=USB_CTRL_MASK_FAMILY (params,SETUP ,OC3_DISABLE );
@@ -901,16 +832,16 @@ void brcm_usb_init_common(struct brcm_usb_init_params *params) reg |=USB_CTRL_MASK_FAMILY (params,SETUP ,SCB1_EN );if (USB_CTRL_MASK_FAMILY (params,SETUP ,SCB2_EN )) reg |=USB_CTRL_MASK_FAMILY (params,SETUP ,SCB2_EN ); -brcmusb_writel (reg,USB_CTRL_REG (ctrl,SETUP )); +brcm_usb_writel (reg,USB_CTRL_REG (ctrl,SETUP ));brcmusb_memc_fix (params);if (USB_CTRL_MASK_FAMILY (params,USB_DEVICE_CTL1 ,PORT_MODE )) { - reg =brcmusb_readl (USB_CTRL_REG (ctrl,USB_DEVICE_CTL1 )); + reg =brcm_usb_readl (USB_CTRL_REG (ctrl,USB_DEVICE_CTL1 )); reg &= ~USB_CTRL_MASK_FAMILY (params,USB_DEVICE_CTL1 ,PORT_MODE ); reg |= params->mode; -brcmusb_writel (reg,USB_CTRL_REG (ctrl,USB_DEVICE_CTL1 )); +brcm_usb_writel (reg,USB_CTRL_REG (ctrl,USB_DEVICE_CTL1 )); }if (USB_CTRL_MASK_FAMILY (params,USB_PM ,BDC_SOFT_RESETB )) {switch (params->mode) {
@@ -932,7 +863,7 @@ void brcm_usb_init_common(struct brcm_usb_init_params *params) } } -void brcm_usb_init_eohci (struct brcm_usb_init_params *params) +static void usb_init_eohci (struct brcm_usb_init_params *params) {u32 reg;void __iomem *ctrl = params->ctrl_regs;
@@ -948,10 +879,10 @@ void brcm_usb_init_eohci(struct brcm_usb_init_params *params)USB_CTRL_SET (ctrl,EBRIDGE ,ESTOP_SCB_REQ );/* Setup the endian bits */ - reg =brcmusb_readl (USB_CTRL_REG (ctrl,SETUP )); + reg =brcm_usb_readl (USB_CTRL_REG (ctrl,SETUP )); reg &= ~USB_CTRL_SETUP_ENDIAN_BITS ; reg |=USB_CTRL_MASK_FAMILY (params,SETUP ,ENDIAN ); -brcmusb_writel (reg,USB_CTRL_REG (ctrl,SETUP )); +brcm_usb_writel (reg,USB_CTRL_REG (ctrl,SETUP ));if (params->selected_family ==BRCM_FAMILY_7271A0 )/* Enable LS keep alive fix for certain keyboards */
@@ -962,14 +893,14 @@ void brcm_usb_init_eohci(struct brcm_usb_init_params *params)* 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 =brcm_usb_readl (USB_CTRL_REG (ctrl,EBRIDGE )); reg &= ~USB_CTRL_MASK (EBRIDGE ,EBR_SCB_SIZE ); reg |=0x800 ; -brcmusb_writel (reg,USB_CTRL_REG (ctrl,EBRIDGE )); +brcm_usb_writel (reg,USB_CTRL_REG (ctrl,EBRIDGE )); } } -void brcm_usb_init_xhci (struct brcm_usb_init_params *params) +static void usb_init_xhci (struct brcm_usb_init_params *params) {void __iomem *ctrl = params->ctrl_regs;
@@ -997,7 +928,7 @@ void brcm_usb_init_xhci(struct brcm_usb_init_params *params)brcmusb_usb3_otp_fix (params); } -void brcm_usb_uninit_common (struct brcm_usb_init_params *params) +static void usb_uninit_common (struct brcm_usb_init_params *params) {if (USB_CTRL_MASK_FAMILY (params,USB_PM ,USB_PWRDN ))USB_CTRL_SET_FAMILY (params,USB_PM ,USB_PWRDN );
@@ -1006,17 +937,47 @@ void brcm_usb_uninit_common(struct brcm_usb_init_params *params)USB_CTRL_SET_FAMILY (params,PLL_CTL ,PLL_IDDQ_PWRDN ); } -void brcm_usb_uninit_eohci (struct brcm_usb_init_params *params) +static void usb_uninit_eohci (struct brcm_usb_init_params *params) { } -void brcm_usb_uninit_xhci (struct brcm_usb_init_params *params) +static void usb_uninit_xhci (struct brcm_usb_init_params *params) {brcmusb_xhci_soft_reset (params,1 );USB_CTRL_SET (params->ctrl_regs,USB30_PCTL ,PHY3_IDDQ_OVERRIDE ); } -void brcm_usb_wake_enable (struct brcm_usb_init_params *params, +static int usb_get_dual_select (struct brcm_usb_init_params *params) +{ +void __iomem *ctrl = params->ctrl_regs; +u32 reg =0 ; + +pr_debug ("%s\n" , __func__); +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 , +PORT_MODE ); + } +return reg; +} + +static void usb_set_dual_select (struct brcm_usb_init_params *params,int mode) +{ +void __iomem *ctrl = params->ctrl_regs; +u32 reg; + +pr_debug ("%s\n" , __func__); + +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 , +PORT_MODE ); + reg |= mode; +brcm_usb_writel (reg,USB_CTRL_REG (ctrl,USB_DEVICE_CTL1 )); + } +} + +static void usb_wake_enable (struct brcm_usb_init_params *params,int enable) {void __iomem *ctrl = params->ctrl_regs;
@@ -1027,13 +988,29 @@ void brcm_usb_wake_enable(struct brcm_usb_init_params *params,USB_CTRL_UNSET (ctrl,USB_PM ,RMTWKUP_EN ); } -void brcm_usb_set_family_map (struct brcm_usb_init_params *params) +static const struct brcm_usb_init_ops bcm7445_ops = { + .init_ipp = usb_init_ipp, + .init_common = usb_init_common, + .init_eohci = usb_init_eohci, + .init_xhci = usb_init_xhci, + .uninit_common = usb_uninit_common, + .uninit_eohci = usb_uninit_eohci, + .uninit_xhci = usb_uninit_xhci, + .get_dual_select = usb_get_dual_select, + .set_dual_select = usb_set_dual_select, + .wake_enable = usb_wake_enable, +}; + +void brcm_usb_dvr_init_7445 (struct brcm_usb_init_params *params) {int fam; - fam =brcmusb_get_family_type (params); +pr_debug ("%s\n" , __func__); + + fam =get_family_type (params); params->selected_family = fam; params->usb_reg_bits_map = &usb_reg_bits_map_table[fam][0 ]; params->family_name = family_names[fam]; + params->ops = &bcm7445_ops; }
drivers/phy/broadcom/phy-brcm-usb-init.h +127 -13
153 lines not on this page · raw message
drivers/phy/broadcom/phy-brcm-usb.c +3 -3
@@ -207,7 +207,7 @@ static ssize_t dual_select_store(struct device *dev, res =name_to_value (&brcm_dual_mode_to_name[0 ],ARRAY_SIZE (brcm_dual_mode_to_name), buf, &value);if (!res) { -brcm_usb_init_set_dual_select (&priv->ini, value); +brcm_usb_set_dual_select (&priv->ini, value); res = len; }mutex_unlock (&sysfs_lock);
@@ -222,7 +222,7 @@ static ssize_t dual_select_show(struct device *dev,int value;mutex_lock (&sysfs_lock); - value =brcm_usb_init_get_dual_select (&priv->ini); + value =brcm_usb_get_dual_select (&priv->ini);mutex_unlock (&sysfs_lock); return sprintf(buf, "%s\n", value_to_name(&brcm_dual_mode_to_name[0],
@@ -331,7 +331,7 @@ static int brcm_usb_phy_probe(struct platform_device *pdev) priv->ini.family_id =brcmstb_get_family_id (); priv->ini.product_id =brcmstb_get_product_id (); -brcm_usb_set_family_map (&priv->ini); +brcm_usb_dvr_init_7445 (&priv->ini);dev_dbg (dev,"Best mapping table is for %s\n" , priv->ini.family_name); res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );
Signature · 1 line
2.17.1
Re: [PATCH v4 05/13] phy: usb: Restructure in preparation for adding 7216 USB support
Quoted 8 lines · Al Cooper
The driver is being restructured in preparation for adding support for the new Synopsys USB conroller on the 7216. Since all the bugs and work-arounds in previous STB chips are supposed to be fixed, most of the code in
phy-brcm-usb-init.cis not needed. Instead of adding more complexity to the already complicatedphy-brcm-usb-init.cmodule, the driver will be restructured to use a vector table to dispatch into different C modules for the different controllers.
Quoted 4 lines
There was also some general cleanup done including some ipp setup code that was incorrect.
Signed-off-by Al Cooper <[email protected]>
Signature · 1 line
Florian
Al Cooper
maintainerPATCH v4 6/13 dt-bindings: Add Broadcom STB USB PHY binding document
In reply to Al CooperAdd support for bcm7216 and bcm7211
--- .../bindings/phy/brcm,brcmstb-usb-phy.txt | 69 +++++++++++++++---- 1 file changed, 56 insertions(+), 13 deletions(-)
Documentation/devicetree/bindings/phy/brcm,brcmstb-usb-phy.txt +56 -13
@@ -1,30 +1,49 @@ Broadcom STB USB PHY Required properties: - - compatible: brcm,brcmstb-usb-phy - - reg: two offset and length pairs. - The first pair specifies a manditory set of memory mapped - registers used for general control of the PHY. - The second pair specifies optional registers used by some of - the SoCs that support USB 3.x - - #phy-cells: Shall be 1 as it expects one argument for setting - the type of the PHY. Possible values are: - - PHY_TYPE_USB2 for USB1.1/2.0 PHY - - PHY_TYPE_USB3 for USB3.x PHY +- compatible: should be one of + "brcm,brcmstb-usb-phy" + "brcm,bcm7216-usb-phy" + "brcm,bcm7211-usb-phy" + +- reg and reg-names properties requirements are specific to the + compatible string. + "brcm,brcmstb-usb-phy": + - reg: 1 or 2 offset and length pairs. One for the base CTRL registers + and an optional pair for systems with USB 3.x support + - reg-names: not specified + "brcm,bcm7216-usb-phy": + - reg: 3 offset and length pairs for CTRL, XHCI_EC and XHCI_GBL + registers + - reg-names: "ctrl", "xhci_ec", "xhci_gbl" + "brcm,bcm7211-usb-phy": + - reg: 5 offset and length pairs for CTRL, XHCI_EC, XHCI_GBL, + USB_PHY and USB_MDIO registers and an optional pair + for the BDC registers + - reg-names: "ctrl", "xhci_ec", "xhci_gbl", "usb_phy", "usb_mdio", "bdc_ec" + +- #phy-cells: Shall be 1 as it expects one argument for setting + the type of the PHY. Possible values are: + - PHY_TYPE_USB2 for USB1.1/2.0 PHY + - PHY_TYPE_USB3 for USB3.x PHY Optional Properties: - clocks : clock phandles. - clock-names: String, clock name. +- interrupts: wakeup interrupt +- interrupt-names: "wakeup" - brcm,ipp: Boolean, Invert Port Power. Possible values are: 0 (Don't invert), 1 (Invert) - brcm,ioc: Boolean, Invert Over Current detection. Possible values are: 0 (Don't invert), 1 (Invert) -NOTE: one or both of the following two properties must be set -- brcm,has-xhci: Boolean indicating the phy has an XHCI phy. -- brcm,has-eohci: Boolean indicating the phy has an EHCI/OHCI phy. - dr_mode: String, PHY Device mode. Possible values are: "host", "peripheral ", "drd" or "typec-pd" If this property is not defined, the phy will default to "host" mode. +- brcm,syscon-piarbctl: phandle to syscon for handling config registers +NOTE: one or both of the following two properties must be set +- brcm,has-xhci: Boolean indicating the phy has an XHCI phy. +- brcm,has-eohci: Boolean indicating the phy has an EHCI/OHCI phy. + Example:
@@ -41,3 +60,27 @@ usbphy_0: usb-phy@f0470200 { clocks = <&usb20>, <&usb30>; clock-names = "sw_usb", "sw_usb3"; }; + +usb-phy@29f0200 { + reg = <0x29f0200 0x200>, + <0x29c0880 0x30>, + <0x29cc100 0x534>, + <0x2808000 0x24>, + <0x2980080 0x8>; + reg-names = "ctrl", + "xhci_ec", + "xhci_gbl", + "usb_phy", + "usb_mdio"; + brcm,ioc = <0x0>; + brcm,ipp = <0x0>; + compatible = "brcm,bcm7211-usb-phy"; + interrupts = <0x30>; + interrupt-parent = <&vpu_intr1_nosec_intc>; + interrupt-names = "wake"; + #phy-cells = <0x1>; + brcm,has-xhci; + syscon-piarbctl = <&syscon_piarbctl>; + clocks = <&scmi_clk 256>; + clock-names = "sw_usb"; +};
Signature · 1 line
2.17.1
Re: [PATCH v4 06/13] dt-bindings: Add Broadcom STB USB PHY binding document
Quoted 4 lines · Al Cooper
Add support for bcm7216 and bcm7211
Signed-off-by Al Cooper <[email protected]>Reviewed-by Rob Herring <[email protected]>
Signature · 1 line
Florian
Al Cooper
maintainerPATCH v4 7/13 phy: usb: Add support for new Synopsys USB controller on the 7216
In reply to Al CooperThe 7216 has the new USB XHCI controller from Synopsys. While this new controller and the PHY are similar to the STB versions, the major differences are:
- Many of the registers and fields in the CTRL block have been removed or changed.
- A new set of Synopsys control registers, BCHP_USB_XHCI_GBL, were added.
- MDIO functionality has been replaced with direct access registers in the BCHP_USB_XHCI_GBL block.
- Power up PHY defaults that had to be changed by MDIO in previous chips will now power up with the correct defaults.
A new init module was created for this new Synopsys USB controller. A new compatible string was added and the driver will dispatch into one of two init modules based on it. A "reg-names" field was added so the driver can more easily get optional registers. A DT bindings document was also added for this driver.
--- drivers/phy/broadcom/Makefile | 2 +- .../phy/broadcom/phy-brcm-usb-init-synopsys.c | 171 ++++++++++++++++++ drivers/phy/broadcom/phy-brcm-usb-init.h | 2 + drivers/phy/broadcom/phy-brcm-usb.c | 70 +++++-- 4 files changed, 227 insertions(+), 18 deletions(-) create mode 100644 drivers/phy/broadcom/phy-brcm-usb-init-synopsys.c
drivers/phy/broadcom/Makefile +1 -1
@@ -8,7 +8,7 @@ obj-$(CONFIG_PHY_NS2_USB_DRD) += phy-bcm-ns2-usbdrd.o obj-$(CONFIG_PHY_BRCM_SATA) += phy-brcm-sata.o obj-$(CONFIG_PHY_BRCM_USB) += phy-brcm-usb-dvr.o -phy-brcm-usb-dvr-objs := phy-brcm-usb.o phy-brcm-usb-init.o +phy-brcm-usb-dvr-objs := phy-brcm-usb.o phy-brcm-usb-init.o phy-brcm-usb-init-synopsys.o obj-$(CONFIG_PHY_BCM_SR_PCIE) += phy-bcm-sr-pcie.o obj-$(CONFIG_PHY_BCM_SR_USB) += phy-bcm-sr-usb.o
drivers/phy/broadcom/phy-brcm-usb-init-synopsys.c new file +171 -0
171 lines not on this page · raw message
drivers/phy/broadcom/phy-brcm-usb-init.h +2 -0
@@ -43,6 +43,7 @@ struct brcm_usb_init_ops {struct brcm_usb_init_params {void __iomem *ctrl_regs;void __iomem *xhci_ec_regs; +void __iomem *xhci_gbl_regs;int ioc;int ipp;int mode;
@@ -55,6 +56,7 @@ struct brcm_usb_init_params { };void brcm_usb_dvr_init_7445 (struct brcm_usb_init_params *params); +void brcm_usb_dvr_init_7216 (struct brcm_usb_init_params *params);static inline u32 brcm_usb_readl (void __iomem *addr) {
drivers/phy/broadcom/phy-brcm-usb.c +53 -17
113 lines not on this page · raw message
Signature · 1 line
2.17.1
Re: [PATCH v4 07/13] phy: usb: Add support for new Synopsys USB controller on the 7216
Quoted 13 lines · Al Cooper
The 7216 has the new USB XHCI controller from Synopsys. While this new controller and the PHY are similar to the STB versions, the major differences are:
- Many of the registers and fields in the CTRL block have been removed or changed.
- A new set of Synopsys control registers,BCHP_USB_XHCI_GBL, were added.
- MDIO functionality has been replaced with direct access registers in theBCHP_USB_XHCI_GBLblock.
- Power up PHY defaults that had to be changed by MDIO in previous chips will now power up with the correct defaults.
Quoted 7 lines
A new init module was created for this new Synopsys USB controller. A new compatible string was added and the driver will dispatch into one of two init modules based on it. A "reg-names" field was added so the driver can more easily get optional registers. A DT bindings document was also added for this driver.
Signed-off-by Al Cooper <[email protected]>
Signature · 1 line
Florian
Al Cooper
maintainerPATCH v4 8/13 phy: usb: Add support for new Synopsys USB controller on the 7211b0
In reply to Al CooperThe 7211b0 has added the STB XHCI Synopsys controller and it will be used instead of the RPi based DWC USB controller. The new Synopsys XHCI controller core is the same one that is used on the 7216, but because of the way the STB USB PHY is used on both the A0 and B0, some of the PHY control is different.
--- .../phy/broadcom/phy-brcm-usb-init-synopsys.c | 163 +++++++++++++++++- drivers/phy/broadcom/phy-brcm-usb-init.c | 31 ++-- drivers/phy/broadcom/phy-brcm-usb-init.h | 17 +- drivers/phy/broadcom/phy-brcm-usb.c | 162 +++++++++++------ 4 files changed, 295 insertions(+), 78 deletions(-)
drivers/phy/broadcom/phy-brcm-usb-init-synopsys.c +157 -6
@@ -12,10 +12,33 @@#include <linux/soc/brcmstb/brcmstb.h> #include "phy-brcm-usb-init.h" +#define PHY_LOCK_TIMEOUT_MS 200 + +/* Register definitions for syscon piarbctl registers */ +#define PIARBCTL_CAM 0x00 +#define PIARBCTL_SPLITTER 0x04 +#define PIARBCTL_MISC 0x08 +#define PIARBCTL_MISC_SECURE_MASK 0x80000000 +#define PIARBCTL_MISC_USB_SELECT_MASK 0x40000000 +#define PIARBCTL_MISC_USB_4G_SDRAM_MASK 0x20000000 +#define PIARBCTL_MISC_USB_PRIORITY_MASK 0x000f0000 +#define PIARBCTL_MISC_USB_MEM_PAGE_MASK 0x0000f000 +#define PIARBCTL_MISC_CAM1_MEM_PAGE_MASK 0x00000f00 +#define PIARBCTL_MISC_CAM0_MEM_PAGE_MASK 0x000000f0 +#define PIARBCTL_MISC_SATA_PRIORITY_MASK 0x0000000f +#define PIARBCTL_USB_M_ASB_CTRL 0x10 + +#define PIARBCTL_MISC_USB_ONLY_MASK \ + (PIARBCTL_MISC_USB_SELECT_MASK | \ + PIARBCTL_MISC_USB_4G_SDRAM_MASK | \ + PIARBCTL_MISC_USB_PRIORITY_MASK | \ + PIARBCTL_MISC_USB_MEM_PAGE_MASK) +/* Register definitions for the USB CTRL block */ #define USB_CTRL_SETUP 0x00#define USB_CTRL_SETUP_STRAP_IPP_SEL_MASK 0x02000000#define USB_CTRL_SETUP_SCB2_EN_MASK 0x00008000 +#define USB_CTRL_SETUP_tca_drv_sel_MASK 0x01000000#define USB_CTRL_SETUP_SCB1_EN_MASK 0x00004000#define USB_CTRL_SETUP_SOFT_SHUTDOWN_MASK 0x00000200#define USB_CTRL_SETUP_IPP_MASK 0x00000020
@@ -29,11 +52,73 @@#define USB_CTRL_USB_DEVICE_CTL1 0x10#define USB_CTRL_USB_DEVICE_CTL1_PORT_MODE_MASK 0x00000003 +/* Register definitions for the USB_PHY block in 7211b0 */ +#define USB_PHY_PLL_LDO_CTL 0x08 +#define USB_PHY_PLL_LDO_CTL_AFE_CORERDY_MASK 0x00000004 +#define USB_PHY_UTMI_CTL_1 0x04 +#define USB_PHY_UTMI_CTL_1_PHY_MODE_MASK 0x0000000c +#define USB_PHY_UTMI_CTL_1_PHY_MODE_SHIFT 2 +#define USB_PHY_STATUS 0x20 +#define USB_PHY_STATUS_pll_lock_MASK 0x00000001 + +/* Register definitions for the MDIO registers in the DWC2 block of +* the 7211b0. +* NOTE: The PHY's MDIO registers are only accessible through the +* legacy DesignWare USB controller even though it's not being used. +*/ +#define USB_GMDIOCSR 0 +#define USB_GMDIOGEN 4 + + +static void usb_mdio_write_7211b0 (struct brcm_usb_init_params *params, +uint8_t addr,uint16_t data) +{ +void __iomem *usb_mdio = params->regs[BRCM_REGS_USB_MDIO ]; + + addr &=0x1f ;/* 5-bit address */ +brcm_usb_writel (0xffffffff , usb_mdio +USB_GMDIOGEN ); +while (brcm_usb_readl (usb_mdio +USB_GMDIOCSR ) & (1 <<31 )) + ; +brcm_usb_writel (0x59020000 | (addr <<18 ) | data, + usb_mdio +USB_GMDIOGEN ); +while (brcm_usb_readl (usb_mdio +USB_GMDIOCSR ) & (1 <<31 )) + ; +brcm_usb_writel (0x00000000 , usb_mdio +USB_GMDIOGEN ); +while (brcm_usb_readl (usb_mdio +USB_GMDIOCSR ) & (1 <<31 )) + ; +} + +static uint16_t __maybe_unused usb_mdio_read_7211b0 ( +struct brcm_usb_init_params *params,uint8_t addr) +{ +void __iomem *usb_mdio = params->regs[BRCM_REGS_USB_MDIO ]; + + addr &=0x1f ;/* 5-bit address */ +brcm_usb_writel (0xffffffff , usb_mdio +USB_GMDIOGEN ); +while (brcm_usb_readl (usb_mdio +USB_GMDIOCSR ) & (1 <<31 )) + ; +brcm_usb_writel (0x69020000 | (addr <<18 ), usb_mdio +USB_GMDIOGEN ); +while (brcm_usb_readl (usb_mdio +USB_GMDIOCSR ) & (1 <<31 )) + ; +brcm_usb_writel (0x00000000 , usb_mdio +USB_GMDIOGEN ); +while (brcm_usb_readl (usb_mdio +USB_GMDIOCSR ) & (1 <<31 )) + ; +return brcm_usb_readl (usb_mdio +USB_GMDIOCSR ) &0xffff ; +} + +static void usb2_eye_fix_7211b0 (struct brcm_usb_init_params *params) +{ +/* select bank */ +usb_mdio_write_7211b0 (params,0x1f ,0x80a0 ); + +/* Set the eye */ +usb_mdio_write_7211b0 (params,0x0a ,0xc6a0 ); +}static void xhci_soft_reset (struct brcm_usb_init_params *params,int on_off) { -void __iomem *ctrl = params->ctrl_regs; +void __iomem *ctrl = params->regs[BRCM_REGS_CTRL ];/* Assert reset */ if (on_off)
@@ -45,7 +130,7 @@ static void xhci_soft_reset(struct brcm_usb_init_params *params,static void usb_init_ipp (struct brcm_usb_init_params *params) { -void __iomem *ctrl = params->ctrl_regs; +void __iomem *ctrl = params->regs[BRCM_REGS_CTRL ];u32 reg;u32 orig_reg;
@@ -72,10 +157,18 @@ static void usb_init_ipp(struct brcm_usb_init_params *params)msleep (50 ); } +static void syscon_piarbctl_init (struct regmap *rmap) +{ +/* Switch from legacy USB OTG controller to new STB USB controller */ +regmap_update_bits (rmap,PIARBCTL_MISC ,PIARBCTL_MISC_USB_ONLY_MASK , +PIARBCTL_MISC_USB_SELECT_MASK | +PIARBCTL_MISC_USB_4G_SDRAM_MASK ); +} +static void usb_init_common (struct brcm_usb_init_params *params) {u32 reg; -void __iomem *ctrl = params->ctrl_regs; +void __iomem *ctrl = params->regs[BRCM_REGS_CTRL ];pr_debug ("%s\n" , __func__);
@@ -100,6 +193,45 @@ static void usb_init_common(struct brcm_usb_init_params *params) } } +static void usb_init_common_7211b0 (struct brcm_usb_init_params *params) +{ +void __iomem *ctrl = params->regs[BRCM_REGS_CTRL ]; +void __iomem *usb_phy = params->regs[BRCM_REGS_USB_PHY ]; +int timeout_ms =PHY_LOCK_TIMEOUT_MS ; +u32 reg; + +if (params->syscon_piarbctl) +syscon_piarbctl_init (params->syscon_piarbctl); + +/* Init the PHY */ + reg =brcm_usb_readl (usb_phy +USB_PHY_PLL_LDO_CTL ); + reg |=USB_PHY_PLL_LDO_CTL_AFE_CORERDY_MASK ; +brcm_usb_writel (reg, usb_phy +USB_PHY_PLL_LDO_CTL ); + +/* wait for lock */ +while (timeout_ms-- >0 ) { + reg =brcm_usb_readl (usb_phy +USB_PHY_STATUS ); +if (reg & USB_PHY_STATUS_pll_lock_MASK) +break ; +usleep_range (1000 ,2000 ); + } + +/* Set the PHY_MODE */ + reg =brcm_usb_readl (usb_phy +USB_PHY_UTMI_CTL_1 ); + reg &= ~USB_PHY_UTMI_CTL_1_PHY_MODE_MASK ; + reg |= params->mode <<USB_PHY_UTMI_CTL_1_PHY_MODE_SHIFT ; +brcm_usb_writel (reg, usb_phy +USB_PHY_UTMI_CTL_1 ); + +/* Fix the incorrect default */ + reg =brcm_usb_readl (ctrl +USB_CTRL_SETUP ); + reg &= ~USB_CTRL_SETUP_tca_drv_sel_MASK; +brcm_usb_writel (reg, ctrl +USB_CTRL_SETUP ); + +usb_init_common (params); + +usb2_eye_fix_7211b0 (params); +} +static void usb_init_xhci (struct brcm_usb_init_params *params) {pr_debug ("%s\n" , __func__);
@@ -109,7 +241,7 @@ static void usb_init_xhci(struct brcm_usb_init_params *params)static void usb_uninit_common (struct brcm_usb_init_params *params) { -void __iomem *ctrl = params->ctrl_regs; +void __iomem *ctrl = params->regs[BRCM_REGS_CTRL ];pr_debug ("%s\n" , __func__);
@@ -127,7 +259,7 @@ static void usb_uninit_xhci(struct brcm_usb_init_params *params)static int usb_get_dual_select (struct brcm_usb_init_params *params) { -void __iomem *ctrl = params->ctrl_regs; +void __iomem *ctrl = params->regs[BRCM_REGS_CTRL ];u32 reg =0 ;pr_debug ("%s\n" , __func__);
@@ -139,7 +271,7 @@ static int usb_get_dual_select(struct brcm_usb_init_params *params)static void usb_set_dual_select (struct brcm_usb_init_params *params,int mode) { -void __iomem *ctrl = params->ctrl_regs; +void __iomem *ctrl = params->regs[BRCM_REGS_CTRL ];u32 reg;pr_debug ("%s\n" , __func__);
@@ -161,6 +293,16 @@ static const struct brcm_usb_init_ops bcm7216_ops = { .set_dual_select = usb_set_dual_select, }; +static const struct brcm_usb_init_ops bcm7211b0_ops = { + .init_ipp = usb_init_ipp, + .init_common = usb_init_common_7211b0, + .init_xhci = usb_init_xhci, + .uninit_common = usb_uninit_common, + .uninit_xhci = usb_uninit_xhci, + .get_dual_select = usb_get_dual_select, + .set_dual_select = usb_set_dual_select, +}; +void brcm_usb_dvr_init_7216 (struct brcm_usb_init_params *params) {
@@ -169,3 +311,12 @@ void brcm_usb_dvr_init_7216(struct brcm_usb_init_params *params) params->family_name ="7216" ; params->ops = &bcm7216_ops; } + +void brcm_usb_dvr_init_7211b0 (struct brcm_usb_init_params *params) +{ + +pr_debug ("%s\n" , __func__); + + params->family_name ="7211" ; + params->ops = &bcm7211b0_ops; +}
drivers/phy/broadcom/phy-brcm-usb-init.c +16 -15
@@ -401,7 +401,7 @@ void usb_ctrl_unset_family(struct brcm_usb_init_params *params,u32 mask; mask = params->usb_reg_bits_map[field]; -brcm_usb_ctrl_unset (params->ctrl_regs + reg_offset, mask); +brcm_usb_ctrl_unset (params->regs[BRCM_REGS_CTRL ] + reg_offset, mask); }; static inline
@@ -411,7 +411,7 @@ void usb_ctrl_set_family(struct brcm_usb_init_params *params,u32 mask; mask = params->usb_reg_bits_map[field]; -brcm_usb_ctrl_set (params->ctrl_regs + reg_offset, mask); +brcm_usb_ctrl_set (params->regs[BRCM_REGS_CTRL ] + reg_offset, mask); };static u32 brcmusb_usb_mdio_read (void __iomem *ctrl_base,u32 reg,int mode)
@@ -544,7 +544,7 @@ static void brcmusb_usb3_pll_54mhz(struct brcm_usb_init_params *params) {u32 ofs;int ii; -void __iomem *ctrl_base = params->ctrl_regs; +void __iomem *ctrl_base = params->regs[BRCM_REGS_CTRL ];/* * On newer B53 based SoC's, the reference clock for the
@@ -625,7 +625,7 @@ static void brcmusb_usb3_ssc_enable(void __iomem *ctrl_base)static void brcmusb_usb3_phy_workarounds (struct brcm_usb_init_params *params) { -void __iomem *ctrl_base = params->ctrl_regs; +void __iomem *ctrl_base = params->regs[BRCM_REGS_CTRL ];brcmusb_usb3_pll_fix (ctrl_base);brcmusb_usb3_pll_54mhz (params);
@@ -667,7 +667,7 @@ static void brcmusb_memc_fix(struct brcm_usb_init_params *params)static void brcmusb_usb3_otp_fix (struct brcm_usb_init_params *params) { -void __iomem *xhci_ec_base = params->xhci_ec_regs; +void __iomem *xhci_ec_base = params->regs[BRCM_REGS_XHCI_EC ];u32 val;if (params->family_id !=0x74371000 || !xhci_ec_base)
@@ -680,8 +680,8 @@ static void brcmusb_usb3_otp_fix(struct brcm_usb_init_params *params)brcm_usb_writel (val,USB_XHCI_EC_REG (xhci_ec_base,IRADAT ));/* Reset USB 3.0 PHY for workaround to take effect */ -USB_CTRL_UNSET (params->ctrl_regs,USB30_CTL1 ,PHY3_RESETB ); -USB_CTRL_SET (params->ctrl_regs,USB30_CTL1 ,PHY3_RESETB ); +USB_CTRL_UNSET (params->regs[BRCM_REGS_CTRL ],USB30_CTL1 ,PHY3_RESETB ); +USB_CTRL_SET (params->regs[BRCM_REGS_CTRL ],USB30_CTL1 ,PHY3_RESETB ); } static void brcmusb_xhci_soft_reset(struct brcm_usb_init_params *params,
@@ -740,7 +740,7 @@ static enum brcm_family_type get_family_type(static void usb_init_ipp (struct brcm_usb_init_params *params) { -void __iomem *ctrl = params->ctrl_regs; +void __iomem *ctrl = params->regs[BRCM_REGS_CTRL ];u32 reg;u32 orig_reg;
@@ -786,7 +786,7 @@ static void usb_init_ipp(struct brcm_usb_init_params *params)static void usb_init_common (struct brcm_usb_init_params *params) {u32 reg; -void __iomem *ctrl = params->ctrl_regs; +void __iomem *ctrl = params->regs[BRCM_REGS_CTRL ];/* Clear any pending wake conditions */ reg =brcm_usb_readl (USB_CTRL_REG (ctrl,USB_PM_STATUS ));
@@ -866,7 +866,7 @@ static void usb_init_common(struct brcm_usb_init_params *params)static void usb_init_eohci (struct brcm_usb_init_params *params) {u32 reg; -void __iomem *ctrl = params->ctrl_regs; +void __iomem *ctrl = params->regs[BRCM_REGS_CTRL ];if (USB_CTRL_MASK_FAMILY (params,USB_PM ,USB20_HC_RESETB ))USB_CTRL_SET_FAMILY (params,USB_PM ,USB20_HC_RESETB );
@@ -902,7 +902,7 @@ static void usb_init_eohci(struct brcm_usb_init_params *params)static void usb_init_xhci (struct brcm_usb_init_params *params) { -void __iomem *ctrl = params->ctrl_regs; +void __iomem *ctrl = params->regs[BRCM_REGS_CTRL ];USB_CTRL_UNSET (ctrl,USB30_PCTL ,PHY3_IDDQ_OVERRIDE );/* 1 millisecond - for USB clocks to settle down */
@@ -944,12 +944,13 @@ static void usb_uninit_eohci(struct brcm_usb_init_params *params)static void usb_uninit_xhci (struct brcm_usb_init_params *params) {brcmusb_xhci_soft_reset (params,1 ); -USB_CTRL_SET (params->ctrl_regs,USB30_PCTL ,PHY3_IDDQ_OVERRIDE ); +USB_CTRL_SET (params->regs[BRCM_REGS_CTRL ],USB30_PCTL , +PHY3_IDDQ_OVERRIDE ); }static int usb_get_dual_select (struct brcm_usb_init_params *params) { -void __iomem *ctrl = params->ctrl_regs; +void __iomem *ctrl = params->regs[BRCM_REGS_CTRL ];u32 reg =0 ;pr_debug ("%s\n" , __func__);
@@ -963,7 +964,7 @@ static int usb_get_dual_select(struct brcm_usb_init_params *params)static void usb_set_dual_select (struct brcm_usb_init_params *params,int mode) { -void __iomem *ctrl = params->ctrl_regs; +void __iomem *ctrl = params->regs[BRCM_REGS_CTRL ];u32 reg;pr_debug ("%s\n" , __func__);
@@ -980,7 +981,7 @@ static void usb_set_dual_select(struct brcm_usb_init_params *params, int mode)static void usb_wake_enable (struct brcm_usb_init_params *params,int enable) { -void __iomem *ctrl = params->ctrl_regs; +void __iomem *ctrl = params->regs[BRCM_REGS_CTRL ];if (enable)USB_CTRL_SET (ctrl,USB_PM ,RMTWKUP_EN );
drivers/phy/broadcom/phy-brcm-usb-init.h +13 -4
@@ -6,12 +6,21 @@#ifndef _USB_BRCM_COMMON_INIT_H#define _USB_BRCM_COMMON_INIT_H +#include <linux/regmap.h> +#define USB_CTLR_MODE_HOST 0#define USB_CTLR_MODE_DEVICE 1#define USB_CTLR_MODE_DRD 2#define USB_CTLR_MODE_TYPEC_PD 3 -struct brcm_usb_init_params ; +enum brcmusb_reg_sel { +BRCM_REGS_CTRL =0 , +BRCM_REGS_XHCI_EC , +BRCM_REGS_XHCI_GBL , +BRCM_REGS_USB_PHY , +BRCM_REGS_USB_MDIO , +BRCM_REGS_MAX +};#define USB_CTRL_REG (base, reg) ((void __iomem *)base + USB_CTRL_##reg)#define USB_XHCI_EC_REG (base, reg) ((void __iomem *)base + USB_XHCI_EC_##reg)
@@ -41,9 +50,7 @@ struct brcm_usb_init_ops { };struct brcm_usb_init_params { -void __iomem *ctrl_regs; -void __iomem *xhci_ec_regs; -void __iomem *xhci_gbl_regs; +void __iomem *regs[BRCM_REGS_MAX ];int ioc;int ipp;int mode;
@@ -53,10 +60,12 @@ struct brcm_usb_init_params {const char *family_name;const u32 *usb_reg_bits_map;const struct brcm_usb_init_ops *ops; +struct regmap *syscon_piarbctl; };void brcm_usb_dvr_init_7445 (struct brcm_usb_init_params *params);void brcm_usb_dvr_init_7216 (struct brcm_usb_init_params *params); +void brcm_usb_dvr_init_7211b0 (struct brcm_usb_init_params *params);static inline u32 brcm_usb_readl (void __iomem *addr) {
drivers/phy/broadcom/phy-brcm-usb.c +109 -53
227 lines not on this page · raw message
Signature · 1 line
2.17.1
Re: [PATCH v4 08/13] phy: usb: Add support for new Synopsys USB controller on the 7211b0
Quoted 7 lines · Al Cooper
The 7211b0 has added the STB XHCI Synopsys controller and it will be used instead of the RPi based DWC USB controller. The new Synopsys XHCI controller core is the same one that is used on the 7216, but because of the way the STB USB PHY is used on both the A0 and B0, some of the PHY control is different.
Signed-off-by Al Cooper <[email protected]>
Signature · 1 line
Florian
Al Cooper
maintainerPATCH v4 9/13 phy: usb: fix driver to defer on clk_get defer
In reply to Al CooperHandle defer on clk_get because the new SCMI clock driver comes up after this driver.
--- drivers/phy/broadcom/phy-brcm-usb.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/phy/broadcom/phy-brcm-usb.c +6 -0
@@ -341,6 +341,8 @@ static int brcm_usb_phy_dvr_init(struct platform_device *pdev, priv->usb_20_clk =of_clk_get_by_name (dn,"sw_usb" );if (IS_ERR (priv->usb_20_clk)) { +if (PTR_ERR (priv->usb_20_clk) == -EPROBE_DEFER ) +return -EPROBE_DEFER ;dev_info (dev,"Clock not found in Device Tree\n" ); priv->usb_20_clk =NULL ; }
@@ -371,6 +373,8 @@ static int brcm_usb_phy_dvr_init(struct platform_device *pdev, priv->usb_30_clk =of_clk_get_by_name (dn,"sw_usb3" );if (IS_ERR (priv->usb_30_clk)) { +if (PTR_ERR (priv->usb_30_clk) == -EPROBE_DEFER ) +return -EPROBE_DEFER ;dev_info (dev,"USB3.0 clock not found in Device Tree\n" ); priv->usb_30_clk =NULL ;
@@ -382,6 +386,8 @@ static int brcm_usb_phy_dvr_init(struct platform_device *pdev, priv->suspend_clk =clk_get (dev,"usb0_freerun" );if (IS_ERR (priv->suspend_clk)) { +if (PTR_ERR (priv->suspend_clk) == -EPROBE_DEFER ) +return -EPROBE_DEFER ;dev_err (dev,"Suspend Clock not found in Device Tree\n" ); priv->suspend_clk =NULL ; }
Signature · 1 line
2.17.1
Re: [PATCH v4 09/13] phy: usb: fix driver to defer on clk_get defer
Quoted 4 lines · Al Cooper
Handle defer on
clk_getbecause the new SCMI clock driver comes up after this driver.Signed-off-by Al Cooper <[email protected]>
Signature · 1 line
Florian
Al Cooper
maintainerPATCH v4 10/13 phy: usb: PHY's MDIO registers not accessible without device installed
In reply to Al CooperWhen there is no device connected and FSM is enabled, the XHCI puts the PHY into suspend mode. When the PHY is put into suspend mode the USB LDO powers down the PHY. This causes the MDIO to be inaccessible and its registers reset to default. The fix is to disable FSM.
--- drivers/phy/broadcom/phy-brcm-usb-init-synopsys.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/phy/broadcom/phy-brcm-usb-init-synopsys.c +9 -0
@@ -56,6 +56,7 @@#define USB_PHY_PLL_LDO_CTL 0x08#define USB_PHY_PLL_LDO_CTL_AFE_CORERDY_MASK 0x00000004#define USB_PHY_UTMI_CTL_1 0x04 +#define USB_PHY_UTMI_CTL_1_POWER_UP_FSM_EN_MASK 0x00000800#define USB_PHY_UTMI_CTL_1_PHY_MODE_MASK 0x0000000c#define USB_PHY_UTMI_CTL_1_PHY_MODE_SHIFT 2#define USB_PHY_STATUS 0x20
@@ -229,6 +230,14 @@ static void usb_init_common_7211b0(struct brcm_usb_init_params *params)usb_init_common (params); +/* +* Disable FSM, otherwise the PHY will auto suspend when no +* device is connected and will be reset on resume. +*/ + reg =brcm_usb_readl (usb_phy +USB_PHY_UTMI_CTL_1 ); + reg &= ~USB_PHY_UTMI_CTL_1_POWER_UP_FSM_EN_MASK ; +brcm_usb_writel (reg, usb_phy +USB_PHY_UTMI_CTL_1 ); +usb2_eye_fix_7211b0 (params); }
Signature · 1 line
2.17.1
Re: [PATCH v4 10/13] phy: usb: PHY's MDIO registers not accessible without device installed
Quoted 7 lines · Al Cooper
When there is no device connected and FSM is enabled, the XHCI puts the PHY into suspend mode. When the PHY is put into suspend mode the USB LDO powers down the PHY. This causes the MDIO to be inaccessible and its registers reset to default. The fix is to disable FSM.
Signed-off-by Al Cooper <[email protected]>
Signature · 1 line
Florian
Al Cooper
maintainerPATCH v4 11/13 phy: usb: bdc: Fix occasional failure with BDC on 7211
In reply to Al CooperThe BDC "Read Transaction Size" needs to be changed from 1024 bytes to 256 bytes to prevent occasional transaction failures.
--- .../phy/broadcom/phy-brcm-usb-init-synopsys.c | 18 +++++++++++++++ drivers/phy/broadcom/phy-brcm-usb-init.h | 1 + drivers/phy/broadcom/phy-brcm-usb.c | 23 +++++++++++++++---- 3 files changed, 38 insertions(+), 4 deletions(-)
drivers/phy/broadcom/phy-brcm-usb-init-synopsys.c +18 -0
@@ -70,6 +70,11 @@#define USB_GMDIOCSR 0#define USB_GMDIOGEN 4 +/* Register definitions for the BDC EC block in 7211b0 */ +#define BDC_EC_AXIRDA 0x0c +#define BDC_EC_AXIRDA_RTS_MASK 0xf0000000 +#define BDC_EC_AXIRDA_RTS_SHIFT 28 +static void usb_mdio_write_7211b0 (struct brcm_usb_init_params *params,uint8_t addr,uint16_t data)
@@ -198,6 +203,7 @@ static void usb_init_common_7211b0(struct brcm_usb_init_params *params) {void __iomem *ctrl = params->regs[BRCM_REGS_CTRL ];void __iomem *usb_phy = params->regs[BRCM_REGS_USB_PHY ]; +void __iomem *bdc_ec = params->regs[BRCM_REGS_BDC_EC ];int timeout_ms =PHY_LOCK_TIMEOUT_MS ;u32 reg;
@@ -230,6 +236,18 @@ static void usb_init_common_7211b0(struct brcm_usb_init_params *params)usb_init_common (params); +/* +* The BDC controller will get occasional failures with +* the default "Read Transaction Size" of 6 (1024 bytes). +* Set it to 4 (256 bytes). +*/ +if ((params->mode !=USB_CTLR_MODE_HOST ) && bdc_ec) { + reg =brcm_usb_readl (bdc_ec +BDC_EC_AXIRDA ); + reg &= ~BDC_EC_AXIRDA_RTS_MASK ; + reg |= (0x4 <<BDC_EC_AXIRDA_RTS_SHIFT ); +brcm_usb_writel (reg, bdc_ec +BDC_EC_AXIRDA ); + } +/* * Disable FSM, otherwise the PHY will auto suspend when no * device is connected and will be reset on resume.
drivers/phy/broadcom/phy-brcm-usb-init.h +1 -0
@@ -19,6 +19,7 @@ enum brcmusb_reg_sel {BRCM_REGS_XHCI_GBL ,BRCM_REGS_USB_PHY ,BRCM_REGS_USB_MDIO , +BRCM_REGS_BDC_EC , BRCM_REGS_MAX };
drivers/phy/broadcom/phy-brcm-usb.c +19 -4
@@ -36,6 +36,7 @@ struct value_to_name_map {struct match_chip_info {void *init_func;u8 required_regs[BRCM_REGS_MAX +1 ]; +u8 optional_reg; };static struct value_to_name_map brcm_dr_mode_to_name[] = {
@@ -71,7 +72,7 @@ struct brcm_usb_phy_data { };static s8 *node_reg_names[BRCM_REGS_MAX ] = { -"crtl" ,"xhci_ec" ,"xhci_gbl" ,"usb_phy" ,"usb_mdio" +"crtl" ,"xhci_ec" ,"xhci_gbl" ,"usb_phy" ,"usb_mdio" ,"bdc_ec" };static irqreturn_t brcm_usb_phy_wake_isr (int irq,void *dev_id)
@@ -271,6 +272,7 @@ static struct match_chip_info chip_info_7211b0 = {BRCM_REGS_USB_MDIO , -1, }, + .optional_reg = BRCM_REGS_BDC_EC, }; static struct match_chip_info chip_info_7445 = {
@@ -300,7 +302,8 @@ static const struct of_device_id brcm_usb_dt_ids[] = {static int brcm_usb_get_regs (struct platform_device *pdev,enum brcmusb_reg_sel regs, -struct brcm_usb_init_params *ini) +struct brcm_usb_init_params *ini, +bool optional) {struct resource *res;
@@ -317,7 +320,13 @@ static int brcm_usb_get_regs(struct platform_device *pdev,return 0 ; }if (res ==NULL ) { -dev_err (&pdev->dev,"can't get %s base address\n" , +if (optional) { +dev_dbg (&pdev->dev, +"Optional reg %s not found\n" , + node_reg_names[regs]); +return 0 ; + } +dev_err (&pdev->dev,"can't get %s base addr\n" , node_reg_names[regs]);return 1 ; }
@@ -460,7 +469,13 @@ static int brcm_usb_phy_probe(struct platform_device *pdev)break ; err =brcm_usb_get_regs (pdev, info->required_regs[x], - &priv->ini); + &priv->ini, false); +if (err) +return -EINVAL ; + } +if (info->optional_reg) { + err =brcm_usb_get_regs (pdev, info->optional_reg, + &priv->ini, true);if (err)return -EINVAL ; }
Signature · 1 line
2.17.1
Re: [PATCH v4 11/13] phy: usb: bdc: Fix occasional failure with BDC on 7211
Quoted 4 lines · Al Cooper
The BDC "Read Transaction Size" needs to be changed from 1024 bytes to 256 bytes to prevent occasional transaction failures.
Signed-off-by Al Cooper <[email protected]>
Signature · 1 line
Florian
Al Cooper
maintainerPATCH v4 12/13 phy: usb: USB driver is crashing during S3 resume on 7216
In reply to Al CooperThis is a result of the USB 2.0 clocks not being disabled/enabled during suspend/resume on XHCI only systems.
--- drivers/phy/broadcom/phy-brcm-usb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/phy/broadcom/phy-brcm-usb.c +1 -1
@@ -543,7 +543,7 @@ static int brcm_usb_phy_suspend(struct device *dev)brcm_usb_wake_enable (&priv->ini, true);if (priv->phys[BRCM_USB_PHY_3_0 ].inited)clk_disable_unprepare (priv->usb_30_clk); -if (priv->phys[BRCM_USB_PHY_2_0 ].inited) +if (priv->phys[BRCM_USB_PHY_2_0 ].inited || !priv->has_eohci)clk_disable_unprepare (priv->usb_20_clk);if (priv->wake_irq >=0 )enable_irq_wake (priv->wake_irq);
Signature · 1 line
2.17.1
Re: [PATCH v4 12/13] phy: usb: USB driver is crashing during S3 resume on 7216
Quoted 4 lines · Al Cooper
This is a result of the USB 2.0 clocks not being disabled/enabled during suspend/resume on XHCI only systems.
Signed-off-by Al Cooper <[email protected]>
Signature · 1 line
Florian
Al Cooper
maintainerPATCH v4 13/13 phy: usb: Add support for wake and USB low power mode for 7211 S2/S5
In reply to Al CooperAdd support for 7211 USB wake. Disable all possible 7211 USB logic for S2/S5 if USB wake is not enabled.
On the 7211, the XHCI wake signal was not connected properly and only goes to the USB1_USB1_CTRL_TP_DIAG1 diagonstic register. The workaround is to have VPU code running that polls for the proper bit in the DIAG register and to wake the system when the bit is asserted.
--- .../phy/broadcom/phy-brcm-usb-init-synopsys.c | 77 +++++++++++++++++-- drivers/phy/broadcom/phy-brcm-usb-init.c | 26 ++++--- drivers/phy/broadcom/phy-brcm-usb-init.h | 11 +-- drivers/phy/broadcom/phy-brcm-usb.c | 25 ++++-- 4 files changed, 105 insertions(+), 34 deletions(-)
drivers/phy/broadcom/phy-brcm-usb-init-synopsys.c +71 -6
@@ -26,7 +26,6 @@#define PIARBCTL_MISC_CAM1_MEM_PAGE_MASK 0x00000f00#define PIARBCTL_MISC_CAM0_MEM_PAGE_MASK 0x000000f0#define PIARBCTL_MISC_SATA_PRIORITY_MASK 0x0000000f -#define PIARBCTL_USB_M_ASB_CTRL 0x10#define PIARBCTL_MISC_USB_ONLY_MASK \ (PIARBCTL_MISC_USB_SELECT_MASK | \
@@ -51,14 +50,27 @@#define USB_CTRL_USB_PM_STATUS 0x08#define USB_CTRL_USB_DEVICE_CTL1 0x10#define USB_CTRL_USB_DEVICE_CTL1_PORT_MODE_MASK 0x00000003 +#define USB_CTRL_TEST_PORT_CTL 0x30 +#define USB_CTRL_TEST_PORT_CTL_TPOUT_SEL_MASK 0x000000ff +#define USB_CTRL_TEST_PORT_CTL_TPOUT_SEL_PME_GEN_MASK 0x0000002e +#define USB_CTRL_TP_DIAG1 0x34 +#define USB_CTLR_TP_DIAG1_wake_MASK 0x00000002 +#define USB_CTRL_CTLR_CSHCR 0x50 +#define USB_CTRL_CTLR_CSHCR_ctl_pme_en_MASK 0x00040000/* Register definitions for the USB_PHY block in 7211b0 */ +#define USB_PHY_PLL_CTL 0x00 +#define USB_PHY_PLL_CTL_PLL_RESETB_MASK 0x40000000#define USB_PHY_PLL_LDO_CTL 0x08#define USB_PHY_PLL_LDO_CTL_AFE_CORERDY_MASK 0x00000004 +#define USB_PHY_PLL_LDO_CTL_AFE_LDO_PWRDWNB_MASK 0x00000002 +#define USB_PHY_PLL_LDO_CTL_AFE_BG_PWRDWNB_MASK 0x00000001#define USB_PHY_UTMI_CTL_1 0x04#define USB_PHY_UTMI_CTL_1_POWER_UP_FSM_EN_MASK 0x00000800#define USB_PHY_UTMI_CTL_1_PHY_MODE_MASK 0x0000000c#define USB_PHY_UTMI_CTL_1_PHY_MODE_SHIFT 2 +#define USB_PHY_IDDQ 0x1c +#define USB_PHY_IDDQ_phy_iddq_MASK 0x00000001#define USB_PHY_STATUS 0x20#define USB_PHY_STATUS_pll_lock_MASK 0x00000001
@@ -199,6 +211,17 @@ static void usb_init_common(struct brcm_usb_init_params *params) } } +static void usb_wake_enable_7211b0 (struct brcm_usb_init_params *params, +bool enable) +{ +void __iomem *ctrl = params->regs[BRCM_REGS_CTRL ]; + +if (enable) +USB_CTRL_SET (ctrl,CTLR_CSHCR , ctl_pme_en); +else +USB_CTRL_UNSET (ctrl,CTLR_CSHCR , ctl_pme_en); +} +static void usb_init_common_7211b0 (struct brcm_usb_init_params *params) {void __iomem *ctrl = params->regs[BRCM_REGS_CTRL ];
@@ -210,9 +233,27 @@ static void usb_init_common_7211b0(struct brcm_usb_init_params *params)if (params->syscon_piarbctl)syscon_piarbctl_init (params->syscon_piarbctl); +USB_CTRL_UNSET (ctrl,USB_PM ,USB_PWRDN ); + +usb_wake_enable_7211b0 (params, false); +if (!params->wake_enabled) { + +/* undo possible suspend settings */ +brcm_usb_writel (0 , usb_phy +USB_PHY_IDDQ ); + reg =brcm_usb_readl (usb_phy +USB_PHY_PLL_CTL ); + reg |=USB_PHY_PLL_CTL_PLL_RESETB_MASK ; +brcm_usb_writel (reg, usb_phy +USB_PHY_PLL_CTL ); + +/* temporarily enable FSM so PHY comes up properly */ + reg =brcm_usb_readl (usb_phy +USB_PHY_UTMI_CTL_1 ); + reg |=USB_PHY_UTMI_CTL_1_POWER_UP_FSM_EN_MASK ; +brcm_usb_writel (reg, usb_phy +USB_PHY_UTMI_CTL_1 ); + } +/* Init the PHY */ - reg =brcm_usb_readl (usb_phy +USB_PHY_PLL_LDO_CTL ); - reg |=USB_PHY_PLL_LDO_CTL_AFE_CORERDY_MASK ; + reg =USB_PHY_PLL_LDO_CTL_AFE_CORERDY_MASK | +USB_PHY_PLL_LDO_CTL_AFE_LDO_PWRDWNB_MASK | +USB_PHY_PLL_LDO_CTL_AFE_BG_PWRDWNB_MASK ;brcm_usb_writel (reg, usb_phy +USB_PHY_PLL_LDO_CTL );/* wait for lock */
@@ -276,12 +317,36 @@ static void usb_uninit_common(struct brcm_usb_init_params *params) } +static void usb_uninit_common_7211b0 (struct brcm_usb_init_params *params) +{ +void __iomem *ctrl = params->regs[BRCM_REGS_CTRL ]; +void __iomem *usb_phy = params->regs[BRCM_REGS_USB_PHY ]; +u32 reg; + +pr_debug ("%s\n" , __func__); + +if (params->wake_enabled) { +USB_CTRL_SET (ctrl,TEST_PORT_CTL ,TPOUT_SEL_PME_GEN ); +usb_wake_enable_7211b0 (params, true); + }else { +USB_CTRL_SET (ctrl,USB_PM ,USB_PWRDN ); +brcm_usb_writel (0 , usb_phy +USB_PHY_PLL_LDO_CTL ); + reg =brcm_usb_readl (usb_phy +USB_PHY_PLL_CTL ); + reg &= ~USB_PHY_PLL_CTL_PLL_RESETB_MASK ; +brcm_usb_writel (reg, usb_phy +USB_PHY_PLL_CTL ); +brcm_usb_writel (USB_PHY_IDDQ_phy_iddq_MASK, + usb_phy +USB_PHY_IDDQ ); + } + +} +static void usb_uninit_xhci (struct brcm_usb_init_params *params) {pr_debug ("%s\n" , __func__); -xhci_soft_reset (params,1 ); +if (!params->wake_enabled) +xhci_soft_reset (params,1 ); }static int usb_get_dual_select (struct brcm_usb_init_params *params)
@@ -309,7 +374,6 @@ static void usb_set_dual_select(struct brcm_usb_init_params *params, int mode)brcm_usb_writel (reg,USB_CTRL_REG (ctrl,USB_DEVICE_CTL1 )); } -static const struct brcm_usb_init_ops bcm7216_ops = { .init_ipp = usb_init_ipp, .init_common = usb_init_common,
@@ -324,7 +388,7 @@ static const struct brcm_usb_init_ops bcm7211b0_ops = { .init_ipp = usb_init_ipp, .init_common = usb_init_common_7211b0, .init_xhci = usb_init_xhci, - .uninit_common = usb_uninit_common, + .uninit_common = usb_uninit_common_7211b0, .uninit_xhci = usb_uninit_xhci, .get_dual_select = usb_get_dual_select, .set_dual_select = usb_set_dual_select,
@@ -346,4 +410,5 @@ void brcm_usb_dvr_init_7211b0(struct brcm_usb_init_params *params) params->family_name ="7211" ; params->ops = &bcm7211b0_ops; + params->suspend_with_clocks = true; }
drivers/phy/broadcom/phy-brcm-usb-init.c +14 -12
@@ -783,12 +783,24 @@ static void usb_init_ipp(struct brcm_usb_init_params *params)msleep (50 ); } +static void usb_wake_enable (struct brcm_usb_init_params *params, +bool enable) +{ +void __iomem *ctrl = params->regs[BRCM_REGS_CTRL ]; + +if (enable) +USB_CTRL_SET (ctrl,USB_PM ,RMTWKUP_EN ); +else +USB_CTRL_UNSET (ctrl,USB_PM ,RMTWKUP_EN ); +} +static void usb_init_common (struct brcm_usb_init_params *params) {u32 reg;void __iomem *ctrl = params->regs[BRCM_REGS_CTRL ];/* Clear any pending wake conditions */ +usb_wake_enable (params, false); reg =brcm_usb_readl (USB_CTRL_REG (ctrl,USB_PM_STATUS ));brcm_usb_writel (reg,USB_CTRL_REG (ctrl,USB_PM_STATUS ));
@@ -935,6 +947,8 @@ static void usb_uninit_common(struct brcm_usb_init_params *params)if (USB_CTRL_MASK_FAMILY (params,PLL_CTL ,PLL_IDDQ_PWRDN ))USB_CTRL_SET_FAMILY (params,PLL_CTL ,PLL_IDDQ_PWRDN ); +if (params->wake_enabled) +usb_wake_enable (params, true); }static void usb_uninit_eohci (struct brcm_usb_init_params *params)
@@ -978,17 +992,6 @@ static void usb_set_dual_select(struct brcm_usb_init_params *params, int mode) } } -static void usb_wake_enable (struct brcm_usb_init_params *params, -int enable) -{ -void __iomem *ctrl = params->regs[BRCM_REGS_CTRL ]; - -if (enable) -USB_CTRL_SET (ctrl,USB_PM ,RMTWKUP_EN ); -else -USB_CTRL_UNSET (ctrl,USB_PM ,RMTWKUP_EN ); -} -static const struct brcm_usb_init_ops bcm7445_ops = { .init_ipp = usb_init_ipp, .init_common = usb_init_common,
@@ -999,7 +1002,6 @@ static const struct brcm_usb_init_ops bcm7445_ops = { .uninit_xhci = usb_uninit_xhci, .get_dual_select = usb_get_dual_select, .set_dual_select = usb_set_dual_select, - .wake_enable = usb_wake_enable, };void brcm_usb_dvr_init_7445 (struct brcm_usb_init_params *params)
drivers/phy/broadcom/phy-brcm-usb-init.h +2 -9
@@ -46,8 +46,6 @@ struct brcm_usb_init_ops {void (*uninit_xhci)(struct brcm_usb_init_params *params);int (*get_dual_select)(struct brcm_usb_init_params *params);void (*set_dual_select)(struct brcm_usb_init_params *params,int mode); -void (*wake_enable)(struct brcm_usb_init_params *params, -int enable); };struct brcm_usb_init_params {
@@ -62,6 +60,8 @@ struct brcm_usb_init_params {const u32 *usb_reg_bits_map;const struct brcm_usb_init_ops *ops;struct regmap *syscon_piarbctl; +bool wake_enabled; +bool suspend_with_clocks; };void brcm_usb_dvr_init_7445 (struct brcm_usb_init_params *params);
@@ -145,13 +145,6 @@ static inline void brcm_usb_uninit_xhci(struct brcm_usb_init_params *ini) ini->ops->uninit_xhci (ini); } -static inline void brcm_usb_wake_enable (struct brcm_usb_init_params *ini, -int enable) -{ -if (ini->ops->wake_enable) - ini->ops->wake_enable (ini, enable); -} -static inline int brcm_usb_get_dual_select (struct brcm_usb_init_params *ini) {if (ini->ops->get_dual_select)
drivers/phy/broadcom/phy-brcm-usb.c +18 -7
@@ -535,16 +535,26 @@ static int brcm_usb_phy_suspend(struct device *dev)struct brcm_usb_phy_data *priv =dev_get_drvdata (dev);if (priv->init_count) { + priv->ini.wake_enabled =device_may_wakeup (dev);if (priv->phys[BRCM_USB_PHY_3_0 ].inited)brcm_usb_uninit_xhci (&priv->ini);if (priv->phys[BRCM_USB_PHY_2_0 ].inited)brcm_usb_uninit_eohci (&priv->ini);brcm_usb_uninit_common (&priv->ini); -brcm_usb_wake_enable (&priv->ini, true); -if (priv->phys[BRCM_USB_PHY_3_0 ].inited) -clk_disable_unprepare (priv->usb_30_clk); -if (priv->phys[BRCM_USB_PHY_2_0 ].inited || !priv->has_eohci) -clk_disable_unprepare (priv->usb_20_clk); + +/* +* Handle the clocks unless needed for wake. This has +* to work for both older XHCI->3.0-clks, EOHCI->2.0-clks +* and newer XHCI->2.0-clks/3.0-clks. +*/ + +if (!priv->ini.suspend_with_clocks) { +if (priv->phys[BRCM_USB_PHY_3_0 ].inited) +clk_disable_unprepare (priv->usb_30_clk); +if (priv->phys[BRCM_USB_PHY_2_0 ].inited || + !priv->has_eohci) +clk_disable_unprepare (priv->usb_20_clk); + }if (priv->wake_irq >=0 )enable_irq_wake (priv->wake_irq); }
@@ -557,7 +567,6 @@ static int brcm_usb_phy_resume(struct device *dev)clk_prepare_enable (priv->usb_20_clk);clk_prepare_enable (priv->usb_30_clk); -brcm_usb_wake_enable (&priv->ini, false);brcm_usb_init_ipp (&priv->ini);/*
@@ -579,6 +588,8 @@ static int brcm_usb_phy_resume(struct device *dev) }else if (priv->has_xhci) {brcm_usb_uninit_xhci (&priv->ini);clk_disable_unprepare (priv->usb_30_clk); +if (!priv->has_eohci) +clk_disable_unprepare (priv->usb_20_clk); } }else {if (priv->has_xhci)
@@ -589,7 +600,7 @@ static int brcm_usb_phy_resume(struct device *dev)clk_disable_unprepare (priv->usb_20_clk); clk_disable_unprepare(priv->usb_30_clk); } - + priv->ini.wake_enabled = false;return 0 ; }#endif /* CONFIG_PM_SLEEP */
Signature · 1 line
2.17.1
Re: [PATCH v4 13/13] phy: usb: Add support for wake and USB low power mode for 7211 S2/S5
Quoted 10 lines · Al Cooper
Add support for 7211 USB wake. Disable all possible 7211 USB logic for S2/S5 if USB wake is not enabled.
On the 7211, the XHCI wake signal was not connected properly and only goes to the
USB1_USB1_CTRL_TP_DIAG1diagonstic register. The workaround is to have VPU code running that polls for the proper bit in the DIAG register and to wake the system when the bit is asserted.Signed-off-by Al Cooper <[email protected]>
Signature · 1 line
Florian
Kishon Vijay Abraham I
AppliedQuoted 6 lines · Al Cooper
This patchset contains various updates to the Broadcom STB USB Driver. The updates include:
- Add support for 7216 and 7211 Broadcom SoCs which use the new Synopsys USB Controller.
- Add support for USB Wake
- Add various bug fixes.
merged, thanks!
-Kishon
Quoted 28 lines
v4 - Fix mispelling, change Synopsis to Synopsys. Also add
"Reviewed-by: Rob Herring" to bindings patch. There are no functional code changes in v4.v3 - Rebase to v5.5-rc1
v2 - Changes based on review feedback
- Add vendor prefix to DT property "syscon-piarbctl"
- Use standard "wakeup" instead of "wake" for DT "interrupt-names"Al Cooper (13):
phy: usb: EHCI DMA may lose a burst of DMA data for 7255xA0 family
phy: usb: Get all drivers that use USB clks using correct
enable/disable
phy: usb: Put USB phys into IDDQ on suspend to save power in S2 mode
phy: usb: Add "wake on" functionality
phy: usb: Restructure in preparation for adding 7216 USB support
dt-bindings: Add Broadcom STB USB PHY binding document
phy: usb: Add support for new Synopsys USB controller on the 7216
phy: usb: Add support for new Synopsys USB controller on the 7211b0
phy: usb: fix driver to defer onclk_getdefer
phy: usb: PHY's MDIO registers not accessible without device installed
phy: usb: bdc: Fix occasional failure with BDC on 7211
phy: usb: USB driver is crashing during S3 resume on 7216
phy: usb: Add support for wake and USB low power mode for 7211 S2/S5
Quoted 9 lines
.../bindings/phy/brcm,brcmstb-usb-phy.txt | 69 ++- drivers/phy/broadcom/Makefile | 2 +- .../phy/broadcom/phy-brcm-usb-init-synopsys.c | 414 ++++++++++++++++++ drivers/phy/broadcom/phy-brcm-usb-init.c | 226 +++++----- drivers/phy/broadcom/phy-brcm-usb-init.h | 148 ++++++- drivers/phy/broadcom/phy-brcm-usb.c | 269 ++++++++++-- 6 files changed, 943 insertions(+), 185 deletions(-) create mode 100644 drivers/phy/broadcom/phy-brcm-usb-init-synopsys.c
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel