| Message ID | 20220218172459.10431-1-zajec5@gmail.com |
|---|---|
| State | Accepted |
| Commit | 32942d33d63d27714ed16a4176e5a99547adb6e0 |
| Headers | show |
| Series | phy: phy-brcm-usb: fixup BCM4908 support | expand |
On 2/18/2022 9:24 AM, Rafał Miłecki wrote: > From: Rafał Miłecki <rafal@milecki.pl> > > Just like every other family BCM4908 should get its own enum value. That > is required to properly handle it in chipset conditional code. > > The real change is excluding BCM4908 from the PLL reprogramming code > (see brcmusb_usb3_pll_54mhz()). I'm not sure what's the BCM4908 > reference clock frequency but: > 1. BCM4908 custom driver from Broadcom's SDK doesn't reprogram PLL > 2. Doing that in Linux driver stopped PHY handling some USB 3.0 devices > > This change makes USB 3.0 PHY recognize e.g.: > 1. 04e8:6860 - Samsung Electronics Co., Ltd Galaxy series, misc. (MTP mode) > 2. 1058:259f - Western Digital My Passport 259F > > Broadcom's STB SoCs come with a set of SUN_TOP_CTRL_* registers that > allow reading chip family and product ids. Such a block & register is > missing on BCM4908 so this commit introduces "compatible" string > specific binding. > > Fixes: 4b402fa8e0b7 ("phy: phy-brcm-usb: support PHY on the BCM4908") > Signed-off-by: Rafał Miłecki <rafal@milecki.pl> > --- > Regarding the (STB's) SUN_TOP_CTRL_CHIP_FAMILY_ID: I tried reading 4 > extra PHY block registers: > #define USB_CTRL_USB20_ID 0xf0 > #define USB_CTRL_USB30_ID 0xf4 > #define USB_CTRL_BDC_COREID 0xf8 > #define USB_CTRL_USB_REVID 0xfc > > but didn't get anything interesting: > 0xd054298a > 0xc2300201 > 0x00003012 > 0x00000001 > > I also tried PERF's block RevID register (0xff800000) and actually found > chipset number there: > 0x490801a0 > but it uses different format and seems to contain different info than > what we know from STB. You could consider implementing a soc_device driver for BCM63xx/4908 SoCs and use the PERF RevID register. Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
On 18-02-22, 18:24, Rafał Miłecki wrote: > From: Rafał Miłecki <rafal@milecki.pl> > > Just like every other family BCM4908 should get its own enum value. That > is required to properly handle it in chipset conditional code. > > The real change is excluding BCM4908 from the PLL reprogramming code > (see brcmusb_usb3_pll_54mhz()). I'm not sure what's the BCM4908 > reference clock frequency but: > 1. BCM4908 custom driver from Broadcom's SDK doesn't reprogram PLL > 2. Doing that in Linux driver stopped PHY handling some USB 3.0 devices > > This change makes USB 3.0 PHY recognize e.g.: > 1. 04e8:6860 - Samsung Electronics Co., Ltd Galaxy series, misc. (MTP mode) > 2. 1058:259f - Western Digital My Passport 259F > > Broadcom's STB SoCs come with a set of SUN_TOP_CTRL_* registers that > allow reading chip family and product ids. Such a block & register is > missing on BCM4908 so this commit introduces "compatible" string > specific binding. Applied, thanks
diff --git a/drivers/phy/broadcom/phy-brcm-usb-init.c b/drivers/phy/broadcom/phy-brcm-usb-init.c index 9391ab42a12b..dd0f66288fbd 100644 --- a/drivers/phy/broadcom/phy-brcm-usb-init.c +++ b/drivers/phy/broadcom/phy-brcm-usb-init.c @@ -79,6 +79,7 @@ enum brcm_family_type { BRCM_FAMILY_3390A0, + BRCM_FAMILY_4908, BRCM_FAMILY_7250B0, BRCM_FAMILY_7271A0, BRCM_FAMILY_7364A0, @@ -96,6 +97,7 @@ enum brcm_family_type { static const char *family_names[BRCM_FAMILY_COUNT] = { USB_BRCM_FAMILY(3390A0), + USB_BRCM_FAMILY(4908), USB_BRCM_FAMILY(7250B0), USB_BRCM_FAMILY(7271A0), USB_BRCM_FAMILY(7364A0), @@ -203,6 +205,27 @@ usb_reg_bits_map_table[BRCM_FAMILY_COUNT][USB_CTRL_SELECTOR_COUNT] = { USB_CTRL_USB_PM_USB20_HC_RESETB_VAR_MASK, ENDIAN_SETTINGS, /* USB_CTRL_SETUP ENDIAN bits */ }, + /* 4908 */ + [BRCM_FAMILY_4908] = { + 0, /* USB_CTRL_SETUP_SCB1_EN_MASK */ + 0, /* USB_CTRL_SETUP_SCB2_EN_MASK */ + 0, /* USB_CTRL_SETUP_SS_EHCI64BIT_EN_MASK */ + 0, /* USB_CTRL_SETUP_STRAP_IPP_SEL_MASK */ + 0, /* USB_CTRL_SETUP_OC3_DISABLE_MASK */ + 0, /* USB_CTRL_PLL_CTL_PLL_IDDQ_PWRDN_MASK */ + 0, /* USB_CTRL_USB_PM_BDC_SOFT_RESETB_MASK */ + USB_CTRL_USB_PM_XHC_SOFT_RESETB_MASK, + USB_CTRL_USB_PM_USB_PWRDN_MASK, + 0, /* USB_CTRL_USB30_CTL1_XHC_SOFT_RESETB_MASK */ + 0, /* USB_CTRL_USB30_CTL1_USB3_IOC_MASK */ + 0, /* USB_CTRL_USB30_CTL1_USB3_IPP_MASK */ + 0, /* USB_CTRL_USB_DEVICE_CTL1_PORT_MODE_MASK */ + 0, /* USB_CTRL_USB_PM_SOFT_RESET_MASK */ + 0, /* USB_CTRL_SETUP_CC_DRD_MODE_ENABLE_MASK */ + 0, /* USB_CTRL_SETUP_STRAP_CC_DRD_MODE_ENABLE_SEL_MASK */ + 0, /* USB_CTRL_USB_PM_USB20_HC_RESETB_VAR_MASK */ + 0, /* USB_CTRL_SETUP ENDIAN bits */ + }, /* 7250b0 */ [BRCM_FAMILY_7250B0] = { USB_CTRL_SETUP_SCB1_EN_MASK, @@ -559,6 +582,7 @@ static void brcmusb_usb3_pll_54mhz(struct brcm_usb_init_params *params) */ switch (params->selected_family) { case BRCM_FAMILY_3390A0: + case BRCM_FAMILY_4908: case BRCM_FAMILY_7250B0: case BRCM_FAMILY_7366C0: case BRCM_FAMILY_74371A0: @@ -1004,6 +1028,18 @@ static const struct brcm_usb_init_ops bcm7445_ops = { .set_dual_select = usb_set_dual_select, }; +void brcm_usb_dvr_init_4908(struct brcm_usb_init_params *params) +{ + int fam; + + fam = BRCM_FAMILY_4908; + 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; +} + void brcm_usb_dvr_init_7445(struct brcm_usb_init_params *params) { int fam; diff --git a/drivers/phy/broadcom/phy-brcm-usb-init.h b/drivers/phy/broadcom/phy-brcm-usb-init.h index a39f30fa2e99..1ccb5ddab865 100644 --- a/drivers/phy/broadcom/phy-brcm-usb-init.h +++ b/drivers/phy/broadcom/phy-brcm-usb-init.h @@ -64,6 +64,7 @@ struct brcm_usb_init_params { bool suspend_with_clocks; }; +void brcm_usb_dvr_init_4908(struct brcm_usb_init_params *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); void brcm_usb_dvr_init_7211b0(struct brcm_usb_init_params *params); diff --git a/drivers/phy/broadcom/phy-brcm-usb.c b/drivers/phy/broadcom/phy-brcm-usb.c index 0f1deb6e0eab..2cb3779fcdf8 100644 --- a/drivers/phy/broadcom/phy-brcm-usb.c +++ b/drivers/phy/broadcom/phy-brcm-usb.c @@ -283,6 +283,15 @@ static const struct attribute_group brcm_usb_phy_group = { .attrs = brcm_usb_phy_attrs, }; +static const struct match_chip_info chip_info_4908 = { + .init_func = &brcm_usb_dvr_init_4908, + .required_regs = { + BRCM_REGS_CTRL, + BRCM_REGS_XHCI_EC, + -1, + }, +}; + static const struct match_chip_info chip_info_7216 = { .init_func = &brcm_usb_dvr_init_7216, .required_regs = { @@ -318,7 +327,7 @@ static const struct match_chip_info chip_info_7445 = { static const struct of_device_id brcm_usb_dt_ids[] = { { .compatible = "brcm,bcm4908-usb-phy", - .data = &chip_info_7445, + .data = &chip_info_4908, }, { .compatible = "brcm,bcm7216-usb-phy",