[2/2] USB: dwc2: Add OTG support for Ingenic SoCs.

Commit Message

Zhou Yanjie July 24, 2021, 8:48 a.m. UTC

Add OTG support for the JZ4775 SoC, the JZ4780 SoC, the X1000
SoC, the X1600 SoC, the X1830 SoC, and the X2000 SoC. Introduce
support for disable Ingenic overcurrent detection, once selected
it enables GOTGCTL register bits VbvalidOvEn and VbvalidOvVal to
disable the VBUS overcurrent detection.

This patch is derived from Dragan Čečavac (in the kernel 3.18.3
tree of CI20). It is very useful for the MIPS Creator CI20 (r1).
Without this patch, OTG port of CI20 has a great probability to
face overcurrent warning, which breaks the OTG functionality.

Signed-off-by: Dragan Čečavac <[e-mail]>
Signed-off-by: 周琰杰 (Zhou Yanjie) <[e-mail]>
---
 drivers/usb/dwc2/core.c   |  9 +++++++++
 drivers/usb/dwc2/core.h   |  5 +++++
 drivers/usb/dwc2/params.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 62 insertions(+), 1 deletion(-)

Comments

Paul Cercueil July 24, 2021, 10:49 a.m. UTC | #1

Hi Zhou,

Le sam., juil. 24 2021 at 16:48:41 +0800, 周琰杰 (Zhou Yanjie) 
<[e-mail]> a écrit :
> Add OTG support for the JZ4775 SoC, the JZ4780 SoC, the X1000
> SoC, the X1600 SoC, the X1830 SoC, and the X2000 SoC. Introduce
> support for disable Ingenic overcurrent detection, once selected
> it enables GOTGCTL register bits VbvalidOvEn and VbvalidOvVal to
> disable the VBUS overcurrent detection.
> 
> This patch is derived from Dragan Čečavac (in the kernel 3.18.3
> tree of CI20). It is very useful for the MIPS Creator CI20 (r1).
> Without this patch, OTG port of CI20 has a great probability to
> face overcurrent warning, which breaks the OTG functionality.
> 
> Signed-off-by: Dragan Čečavac <[e-mail]>
> Signed-off-by: 周琰杰 (Zhou Yanjie) <[e-mail]>
> ---
>  drivers/usb/dwc2/core.c   |  9 +++++++++
>  drivers/usb/dwc2/core.h   |  5 +++++
>  drivers/usb/dwc2/params.c | 49 
> ++++++++++++++++++++++++++++++++++++++++++++++-
>  3 files changed, 62 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/usb/dwc2/core.c b/drivers/usb/dwc2/core.c
> index 272ae57..c35b2e2 100644
> --- a/drivers/usb/dwc2/core.c
> +++ b/drivers/usb/dwc2/core.c
> @@ -1153,6 +1153,7 @@ static void dwc2_set_turnaround_time(struct 
> dwc2_hsotg *hsotg)
>  int dwc2_phy_init(struct dwc2_hsotg *hsotg, bool select_phy)
>  {
>  	u32 usbcfg;
> +	u32 otgctl;
>  	int retval = 0;
> 
>  	if ((hsotg->params.speed == DWC2_SPEED_PARAM_FULL ||
> @@ -1187,6 +1188,14 @@ int dwc2_phy_init(struct dwc2_hsotg *hsotg, 
> bool select_phy)
>  		dwc2_writel(hsotg, usbcfg, GUSBCFG);
>  	}
> 
> +	if (hsotg->params.deactivate_ingenic_overcurrent_detection) {
> +		if (dwc2_is_host_mode(hsotg)) {
> +			otgctl = readl(hsotg->regs + GOTGCTL);
> +			otgctl |= GOTGCTL_VBVALOEN | GOTGCTL_VBVALOVAL;
> +			writel(otgctl, hsotg->regs + GOTGCTL);
> +		}
> +	}
> +
>  	return retval;
>  }
> 
> diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h
> index ab6b815..e026d13 100644
> --- a/drivers/usb/dwc2/core.h
> +++ b/drivers/usb/dwc2/core.h
> @@ -418,6 +418,10 @@ enum dwc2_ep0_state {
>   *			detection using GGPIO register.
>   *			0 - Deactivate the external level detection (default)
>   *			1 - Activate the external level detection
> + * @deactivate_ingenic_overcurrent_detection: Deactivate Ingenic 
> overcurrent
> + *			detection.
> + *			0 - Activate the overcurrent detection (default)
> + *			1 - Deactivate the overcurrent detection
>   * @g_dma:              Enables gadget dma usage (default: 
> autodetect).
>   * @g_dma_desc:         Enables gadget descriptor DMA (default: 
> autodetect).
>   * @g_rx_fifo_size:	The periodic rx fifo size for the device, in
> @@ -489,6 +493,7 @@ struct dwc2_core_params {
>  	u8 hird_threshold;
>  	bool activate_stm_fs_transceiver;
>  	bool activate_stm_id_vb_detection;
> +	bool deactivate_ingenic_overcurrent_detection;
>  	bool ipg_isoc_en;
>  	u16 max_packet_count;
>  	u32 max_transfer_size;
> diff --git a/drivers/usb/dwc2/params.c b/drivers/usb/dwc2/params.c
> index 67c5eb1..a7a1b50 100644
> --- a/drivers/usb/dwc2/params.c
> +++ b/drivers/usb/dwc2/params.c
> @@ -71,6 +71,47 @@ static void dwc2_set_his_params(struct dwc2_hsotg 
> *hsotg)
>  	p->power_down = DWC2_POWER_DOWN_PARAM_NONE;
>  }
> 
> +static void dwc2_set_jz4775_params(struct dwc2_hsotg *hsotg)
> +{
> +	struct dwc2_core_params *p = &hsotg->params;
> +
> +	p->otg_cap = DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE;
> +	p->speed = DWC2_SPEED_PARAM_HIGH;
> +	p->phy_type = DWC2_PHY_TYPE_PARAM_UTMI;
> +	p->phy_utmi_width = 16;
> +	p->deactivate_ingenic_overcurrent_detection =
> +		device_property_read_bool(hsotg->dev, "disable-over-current");

That device property was not documented in the previous patch. Also 
this probably should be "ingenic,disable-over-current".

Cheers,
-Paul

> +}
> +
> +static void dwc2_set_x1600_params(struct dwc2_hsotg *hsotg)
> +{
> +	struct dwc2_core_params *p = &hsotg->params;
> +
> +	p->otg_cap = DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE;
> +	p->speed = DWC2_SPEED_PARAM_HIGH;
> +	p->host_channels = 16;
> +	p->phy_type = DWC2_PHY_TYPE_PARAM_UTMI;
> +	p->phy_utmi_width = 16;
> +	p->deactivate_ingenic_overcurrent_detection =
> +		device_property_read_bool(hsotg->dev, "disable-over-current");
> +}
> +
> +static void dwc2_set_x2000_params(struct dwc2_hsotg *hsotg)
> +{
> +	struct dwc2_core_params *p = &hsotg->params;
> +
> +	p->otg_cap = DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE;
> +	p->speed = DWC2_SPEED_PARAM_HIGH;
> +	p->host_rx_fifo_size = 1024;
> +	p->host_nperio_tx_fifo_size = 1024;
> +	p->host_perio_tx_fifo_size = 1024;
> +	p->host_channels = 16;
> +	p->phy_type = DWC2_PHY_TYPE_PARAM_UTMI;
> +	p->phy_utmi_width = 16;
> +	p->deactivate_ingenic_overcurrent_detection =
> +		device_property_read_bool(hsotg->dev, "disable-over-current");
> +}
> +
>  static void dwc2_set_s3c6400_params(struct dwc2_hsotg *hsotg)
>  {
>  	struct dwc2_core_params *p = &hsotg->params;
> @@ -202,7 +243,13 @@ static void 
> dwc2_set_stm32mp15_hsotg_params(struct dwc2_hsotg *hsotg)
> 
>  const struct of_device_id dwc2_of_match_table[] = {
>  	{ .compatible = "brcm,bcm2835-usb", .data = dwc2_set_bcm_params },
> -	{ .compatible = "hisilicon,hi6220-usb", .data = dwc2_set_his_params 
>  },
> +	{ .compatible = "hisilicon,hi6220-usb", .data = dwc2_set_his_params 
> },
> +	{ .compatible = "ingenic,jz4775-otg", .data = 
> dwc2_set_jz4775_params },
> +	{ .compatible = "ingenic,jz4780-otg", .data = 
> dwc2_set_jz4775_params },
> +	{ .compatible = "ingenic,x1000-otg", .data = dwc2_set_jz4775_params 
> },
> +	{ .compatible = "ingenic,x1600-otg", .data = dwc2_set_x1600_params 
> },
> +	{ .compatible = "ingenic,x1830-otg", .data = dwc2_set_x1600_params 
> },
> +	{ .compatible = "ingenic,x2000-otg", .data = dwc2_set_x2000_params 
> },
>  	{ .compatible = "rockchip,rk3066-usb", .data = dwc2_set_rk_params },
>  	{ .compatible = "lantiq,arx100-usb", .data = dwc2_set_ltq_params },
>  	{ .compatible = "lantiq,xrx200-usb", .data = dwc2_set_ltq_params },
> --
> 2.7.4
>

Zhou Yanjie July 24, 2021, 1:05 p.m. UTC | #2

Hi Paul,

On 2021/7/24 下午6:49, Paul Cercueil wrote:
> Hi Zhou,
>
> Le sam., juil. 24 2021 at 16:48:41 +0800, 周琰杰 (Zhou Yanjie) 
> <[e-mail]> a écrit :
>> Add OTG support for the JZ4775 SoC, the JZ4780 SoC, the X1000
>> SoC, the X1600 SoC, the X1830 SoC, and the X2000 SoC. Introduce
>> support for disable Ingenic overcurrent detection, once selected
>> it enables GOTGCTL register bits VbvalidOvEn and VbvalidOvVal to
>> disable the VBUS overcurrent detection.
>>
>> This patch is derived from Dragan Čečavac (in the kernel 3.18.3
>> tree of CI20). It is very useful for the MIPS Creator CI20 (r1).
>> Without this patch, OTG port of CI20 has a great probability to
>> face overcurrent warning, which breaks the OTG functionality.
>>
>> Signed-off-by: Dragan Čečavac <[e-mail]>
>> Signed-off-by: 周琰杰 (Zhou Yanjie) <[e-mail]>
>> ---
>>  drivers/usb/dwc2/core.c   |  9 +++++++++
>>  drivers/usb/dwc2/core.h   |  5 +++++
>>  drivers/usb/dwc2/params.c | 49 
>> ++++++++++++++++++++++++++++++++++++++++++++++-
>>  3 files changed, 62 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/usb/dwc2/core.c b/drivers/usb/dwc2/core.c
>> index 272ae57..c35b2e2 100644
>> --- a/drivers/usb/dwc2/core.c
>> +++ b/drivers/usb/dwc2/core.c
>> @@ -1153,6 +1153,7 @@ static void dwc2_set_turnaround_time(struct 
>> dwc2_hsotg *hsotg)
>>  int dwc2_phy_init(struct dwc2_hsotg *hsotg, bool select_phy)
>>  {
>>      u32 usbcfg;
>> +    u32 otgctl;
>>      int retval = 0;
>>
>>      if ((hsotg->params.speed == DWC2_SPEED_PARAM_FULL ||
>> @@ -1187,6 +1188,14 @@ int dwc2_phy_init(struct dwc2_hsotg *hsotg, 
>> bool select_phy)
>>          dwc2_writel(hsotg, usbcfg, GUSBCFG);
>>      }
>>
>> +    if (hsotg->params.deactivate_ingenic_overcurrent_detection) {
>> +        if (dwc2_is_host_mode(hsotg)) {
>> +            otgctl = readl(hsotg->regs + GOTGCTL);
>> +            otgctl |= GOTGCTL_VBVALOEN | GOTGCTL_VBVALOVAL;
>> +            writel(otgctl, hsotg->regs + GOTGCTL);
>> +        }
>> +    }
>> +
>>      return retval;
>>  }
>>
>> diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h
>> index ab6b815..e026d13 100644
>> --- a/drivers/usb/dwc2/core.h
>> +++ b/drivers/usb/dwc2/core.h
>> @@ -418,6 +418,10 @@ enum dwc2_ep0_state {
>>   *            detection using GGPIO register.
>>   *            0 - Deactivate the external level detection (default)
>>   *            1 - Activate the external level detection
>> + * @deactivate_ingenic_overcurrent_detection: Deactivate Ingenic 
>> overcurrent
>> + *            detection.
>> + *            0 - Activate the overcurrent detection (default)
>> + *            1 - Deactivate the overcurrent detection
>>   * @g_dma:              Enables gadget dma usage (default: autodetect).
>>   * @g_dma_desc:         Enables gadget descriptor DMA (default: 
>> autodetect).
>>   * @g_rx_fifo_size:    The periodic rx fifo size for the device, in
>> @@ -489,6 +493,7 @@ struct dwc2_core_params {
>>      u8 hird_threshold;
>>      bool activate_stm_fs_transceiver;
>>      bool activate_stm_id_vb_detection;
>> +    bool deactivate_ingenic_overcurrent_detection;
>>      bool ipg_isoc_en;
>>      u16 max_packet_count;
>>      u32 max_transfer_size;
>> diff --git a/drivers/usb/dwc2/params.c b/drivers/usb/dwc2/params.c
>> index 67c5eb1..a7a1b50 100644
>> --- a/drivers/usb/dwc2/params.c
>> +++ b/drivers/usb/dwc2/params.c
>> @@ -71,6 +71,47 @@ static void dwc2_set_his_params(struct dwc2_hsotg 
>> *hsotg)
>>      p->power_down = DWC2_POWER_DOWN_PARAM_NONE;
>>  }
>>
>> +static void dwc2_set_jz4775_params(struct dwc2_hsotg *hsotg)
>> +{
>> +    struct dwc2_core_params *p = &hsotg->params;
>> +
>> +    p->otg_cap = DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE;
>> +    p->speed = DWC2_SPEED_PARAM_HIGH;
>> +    p->phy_type = DWC2_PHY_TYPE_PARAM_UTMI;
>> +    p->phy_utmi_width = 16;
>> +    p->deactivate_ingenic_overcurrent_detection =
>> +        device_property_read_bool(hsotg->dev, "disable-over-current");
>
> That device property was not documented in the previous patch. Also 
> this probably should be "ingenic,disable-over-current".
>

This device property already exists (it has been used in the 
"dwc2_get_device_properties()" function below).

Under normal circumstances, after using this device attribute, it should 
be possible to turn off the overcurrent

detection, but on the Ingenic processors, somehow it did not take effect 
normally, and we must operate the

"VBVALOEN" bit and "VBVALOVAL" bit of "GOTGCTL" register to make it normal.


Thanks and best regards!


> Cheers,
> -Paul
>
>> +}
>> +
>> +static void dwc2_set_x1600_params(struct dwc2_hsotg *hsotg)
>> +{
>> +    struct dwc2_core_params *p = &hsotg->params;
>> +
>> +    p->otg_cap = DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE;
>> +    p->speed = DWC2_SPEED_PARAM_HIGH;
>> +    p->host_channels = 16;
>> +    p->phy_type = DWC2_PHY_TYPE_PARAM_UTMI;
>> +    p->phy_utmi_width = 16;
>> +    p->deactivate_ingenic_overcurrent_detection =
>> +        device_property_read_bool(hsotg->dev, "disable-over-current");
>> +}
>> +
>> +static void dwc2_set_x2000_params(struct dwc2_hsotg *hsotg)
>> +{
>> +    struct dwc2_core_params *p = &hsotg->params;
>> +
>> +    p->otg_cap = DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE;
>> +    p->speed = DWC2_SPEED_PARAM_HIGH;
>> +    p->host_rx_fifo_size = 1024;
>> +    p->host_nperio_tx_fifo_size = 1024;
>> +    p->host_perio_tx_fifo_size = 1024;
>> +    p->host_channels = 16;
>> +    p->phy_type = DWC2_PHY_TYPE_PARAM_UTMI;
>> +    p->phy_utmi_width = 16;
>> +    p->deactivate_ingenic_overcurrent_detection =
>> +        device_property_read_bool(hsotg->dev, "disable-over-current");
>> +}
>> +
>>  static void dwc2_set_s3c6400_params(struct dwc2_hsotg *hsotg)
>>  {
>>      struct dwc2_core_params *p = &hsotg->params;
>> @@ -202,7 +243,13 @@ static void 
>> dwc2_set_stm32mp15_hsotg_params(struct dwc2_hsotg *hsotg)
>>
>>  const struct of_device_id dwc2_of_match_table[] = {
>>      { .compatible = "brcm,bcm2835-usb", .data = dwc2_set_bcm_params },
>> -    { .compatible = "hisilicon,hi6220-usb", .data = 
>> dwc2_set_his_params  },
>> +    { .compatible = "hisilicon,hi6220-usb", .data = 
>> dwc2_set_his_params },
>> +    { .compatible = "ingenic,jz4775-otg", .data = 
>> dwc2_set_jz4775_params },
>> +    { .compatible = "ingenic,jz4780-otg", .data = 
>> dwc2_set_jz4775_params },
>> +    { .compatible = "ingenic,x1000-otg", .data = 
>> dwc2_set_jz4775_params },
>> +    { .compatible = "ingenic,x1600-otg", .data = 
>> dwc2_set_x1600_params },
>> +    { .compatible = "ingenic,x1830-otg", .data = 
>> dwc2_set_x1600_params },
>> +    { .compatible = "ingenic,x2000-otg", .data = 
>> dwc2_set_x2000_params },
>>      { .compatible = "rockchip,rk3066-usb", .data = 
>> dwc2_set_rk_params },
>>      { .compatible = "lantiq,arx100-usb", .data = dwc2_set_ltq_params },
>>      { .compatible = "lantiq,xrx200-usb", .data = dwc2_set_ltq_params },
>> -- 
>> 2.7.4
>>
>

Felipe Balbi July 24, 2021, 1:24 p.m. UTC | #3

Hi Zhou,

Zhou Yanjie writes:
>>> diff --git a/drivers/usb/dwc2/params.c b/drivers/usb/dwc2/params.c
>>> index 67c5eb1..a7a1b50 100644
>>> --- a/drivers/usb/dwc2/params.c
>>> +++ b/drivers/usb/dwc2/params.c
>>> @@ -71,6 +71,47 @@ static void dwc2_set_his_params(struct
>>> dwc2_hsotg *hsotg)
>>>      p->power_down = DWC2_POWER_DOWN_PARAM_NONE;
>>>  }
>>>
>>> +static void dwc2_set_jz4775_params(struct dwc2_hsotg *hsotg)
>>> +{
>>> +    struct dwc2_core_params *p = &hsotg->params;
>>> +
>>> +    p->otg_cap = DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE;
>>> +    p->speed = DWC2_SPEED_PARAM_HIGH;
>>> +    p->phy_type = DWC2_PHY_TYPE_PARAM_UTMI;
>>> +    p->phy_utmi_width = 16;
>>> +    p->deactivate_ingenic_overcurrent_detection =
>>> +        device_property_read_bool(hsotg->dev, "disable-over-current");
>>
>> That device property was not documented in the previous patch. Also
>> this probably should be "ingenic,disable-over-current".
>>
>
> This device property already exists (it has been used in the
> "dwc2_get_device_properties()" function below).
>
> Under normal circumstances, after using this device attribute, it
> should be possible to turn off the overcurrent
>
> detection, but on the Ingenic processors, somehow it did not take
> effect normally, and we must operate the
>
> "VBVALOEN" bit and "VBVALOVAL" bit of "GOTGCTL" register to make it normal.

I believe what Paul is suggesting is that this property lacks
documentation under Documentation/devicetree/bindings/. If that's the
case, you could take the opportunity to document the property and,
perhaps, add the missing prefix.

Greg Kroah-Hartman July 27, 2021, 2:27 p.m. UTC | #4

On Sat, Jul 24, 2021 at 04:48:41PM +0800, 周琰杰 (Zhou Yanjie) wrote:
> Add OTG support for the JZ4775 SoC, the JZ4780 SoC, the X1000
> SoC, the X1600 SoC, the X1830 SoC, and the X2000 SoC. Introduce
> support for disable Ingenic overcurrent detection, once selected
> it enables GOTGCTL register bits VbvalidOvEn and VbvalidOvVal to
> disable the VBUS overcurrent detection.
> 
> This patch is derived from Dragan Čečavac (in the kernel 3.18.3
> tree of CI20). It is very useful for the MIPS Creator CI20 (r1).
> Without this patch, OTG port of CI20 has a great probability to
> face overcurrent warning, which breaks the OTG functionality.
> 
> Signed-off-by: Dragan Čečavac <[e-mail]>
> Signed-off-by: 周琰杰 (Zhou Yanjie) <[e-mail]>
> ---
>  drivers/usb/dwc2/core.c   |  9 +++++++++
>  drivers/usb/dwc2/core.h   |  5 +++++
>  drivers/usb/dwc2/params.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++-
>  3 files changed, 62 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/usb/dwc2/core.c b/drivers/usb/dwc2/core.c
> index 272ae57..c35b2e2 100644
> --- a/drivers/usb/dwc2/core.c
> +++ b/drivers/usb/dwc2/core.c
> @@ -1153,6 +1153,7 @@ static void dwc2_set_turnaround_time(struct dwc2_hsotg *hsotg)
>  int dwc2_phy_init(struct dwc2_hsotg *hsotg, bool select_phy)
>  {
>  	u32 usbcfg;
> +	u32 otgctl;
>  	int retval = 0;
>  
>  	if ((hsotg->params.speed == DWC2_SPEED_PARAM_FULL ||
> @@ -1187,6 +1188,14 @@ int dwc2_phy_init(struct dwc2_hsotg *hsotg, bool select_phy)
>  		dwc2_writel(hsotg, usbcfg, GUSBCFG);
>  	}
>  
> +	if (hsotg->params.deactivate_ingenic_overcurrent_detection) {
> +		if (dwc2_is_host_mode(hsotg)) {
> +			otgctl = readl(hsotg->regs + GOTGCTL);
> +			otgctl |= GOTGCTL_VBVALOEN | GOTGCTL_VBVALOVAL;
> +			writel(otgctl, hsotg->regs + GOTGCTL);
> +		}
> +	}
> +
>  	return retval;
>  }
>  
> diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h
> index ab6b815..e026d13 100644
> --- a/drivers/usb/dwc2/core.h
> +++ b/drivers/usb/dwc2/core.h
> @@ -418,6 +418,10 @@ enum dwc2_ep0_state {
>   *			detection using GGPIO register.
>   *			0 - Deactivate the external level detection (default)
>   *			1 - Activate the external level detection
> + * @deactivate_ingenic_overcurrent_detection: Deactivate Ingenic overcurrent
> + *			detection.
> + *			0 - Activate the overcurrent detection (default)

Having 0 as "active" is rough to handle over time.

All of the other options are "activate", so please, keep them the same
if at all possible.

thanks,

greg k-h

Minas Harutyunyan July 30, 2021, 6:33 a.m. UTC | #5

On 7/24/2021 12:48 PM, 周琰杰 (Zhou Yanjie) wrote:
> Add OTG support for the JZ4775 SoC, the JZ4780 SoC, the X1000
> SoC, the X1600 SoC, the X1830 SoC, and the X2000 SoC. Introduce
> support for disable Ingenic overcurrent detection, once selected
> it enables GOTGCTL register bits VbvalidOvEn and VbvalidOvVal to
> disable the VBUS overcurrent detection.
> 
> This patch is derived from Dragan Čečavac (in the kernel 3.18.3
> tree of CI20). It is very useful for the MIPS Creator CI20 (r1).
> Without this patch, OTG port of CI20 has a great probability to
> face overcurrent warning, which breaks the OTG functionality.
> 
> Signed-off-by: Dragan Čečavac <[e-mail]>
> Signed-off-by: 周琰杰 (Zhou Yanjie) <[e-mail]>

Acked-by: Minas Harutyunyan <[e-mail]>

> ---
>   drivers/usb/dwc2/core.c   |  9 +++++++++
>   drivers/usb/dwc2/core.h   |  5 +++++
>   drivers/usb/dwc2/params.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++-
>   3 files changed, 62 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/usb/dwc2/core.c b/drivers/usb/dwc2/core.c
> index 272ae57..c35b2e2 100644
> --- a/drivers/usb/dwc2/core.c
> +++ b/drivers/usb/dwc2/core.c
> @@ -1153,6 +1153,7 @@ static void dwc2_set_turnaround_time(struct dwc2_hsotg *hsotg)
>   int dwc2_phy_init(struct dwc2_hsotg *hsotg, bool select_phy)
>   {
>   	u32 usbcfg;
> +	u32 otgctl;
>   	int retval = 0;
>   
>   	if ((hsotg->params.speed == DWC2_SPEED_PARAM_FULL ||
> @@ -1187,6 +1188,14 @@ int dwc2_phy_init(struct dwc2_hsotg *hsotg, bool select_phy)
>   		dwc2_writel(hsotg, usbcfg, GUSBCFG);
>   	}
>   
> +	if (hsotg->params.deactivate_ingenic_overcurrent_detection) {
> +		if (dwc2_is_host_mode(hsotg)) {
> +			otgctl = readl(hsotg->regs + GOTGCTL);
> +			otgctl |= GOTGCTL_VBVALOEN | GOTGCTL_VBVALOVAL;
> +			writel(otgctl, hsotg->regs + GOTGCTL);
> +		}
> +	}
> +
>   	return retval;
>   }
>   
> diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h
> index ab6b815..e026d13 100644
> --- a/drivers/usb/dwc2/core.h
> +++ b/drivers/usb/dwc2/core.h
> @@ -418,6 +418,10 @@ enum dwc2_ep0_state {
>    *			detection using GGPIO register.
>    *			0 - Deactivate the external level detection (default)
>    *			1 - Activate the external level detection
> + * @deactivate_ingenic_overcurrent_detection: Deactivate Ingenic overcurrent
> + *			detection.
> + *			0 - Activate the overcurrent detection (default)
> + *			1 - Deactivate the overcurrent detection
>    * @g_dma:              Enables gadget dma usage (default: autodetect).
>    * @g_dma_desc:         Enables gadget descriptor DMA (default: autodetect).
>    * @g_rx_fifo_size:	The periodic rx fifo size for the device, in
> @@ -489,6 +493,7 @@ struct dwc2_core_params {
>   	u8 hird_threshold;
>   	bool activate_stm_fs_transceiver;
>   	bool activate_stm_id_vb_detection;
> +	bool deactivate_ingenic_overcurrent_detection;
>   	bool ipg_isoc_en;
>   	u16 max_packet_count;
>   	u32 max_transfer_size;
> diff --git a/drivers/usb/dwc2/params.c b/drivers/usb/dwc2/params.c
> index 67c5eb1..a7a1b50 100644
> --- a/drivers/usb/dwc2/params.c
> +++ b/drivers/usb/dwc2/params.c
> @@ -71,6 +71,47 @@ static void dwc2_set_his_params(struct dwc2_hsotg *hsotg)
>   	p->power_down = DWC2_POWER_DOWN_PARAM_NONE;
>   }
>   
> +static void dwc2_set_jz4775_params(struct dwc2_hsotg *hsotg)
> +{
> +	struct dwc2_core_params *p = &hsotg->params;
> +
> +	p->otg_cap = DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE;
> +	p->speed = DWC2_SPEED_PARAM_HIGH;
> +	p->phy_type = DWC2_PHY_TYPE_PARAM_UTMI;
> +	p->phy_utmi_width = 16;
> +	p->deactivate_ingenic_overcurrent_detection =
> +		device_property_read_bool(hsotg->dev, "disable-over-current");
> +}
> +
> +static void dwc2_set_x1600_params(struct dwc2_hsotg *hsotg)
> +{
> +	struct dwc2_core_params *p = &hsotg->params;
> +
> +	p->otg_cap = DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE;
> +	p->speed = DWC2_SPEED_PARAM_HIGH;
> +	p->host_channels = 16;
> +	p->phy_type = DWC2_PHY_TYPE_PARAM_UTMI;
> +	p->phy_utmi_width = 16;
> +	p->deactivate_ingenic_overcurrent_detection =
> +		device_property_read_bool(hsotg->dev, "disable-over-current");
> +}
> +
> +static void dwc2_set_x2000_params(struct dwc2_hsotg *hsotg)
> +{
> +	struct dwc2_core_params *p = &hsotg->params;
> +
> +	p->otg_cap = DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE;
> +	p->speed = DWC2_SPEED_PARAM_HIGH;
> +	p->host_rx_fifo_size = 1024;
> +	p->host_nperio_tx_fifo_size = 1024;
> +	p->host_perio_tx_fifo_size = 1024;
> +	p->host_channels = 16;
> +	p->phy_type = DWC2_PHY_TYPE_PARAM_UTMI;
> +	p->phy_utmi_width = 16;
> +	p->deactivate_ingenic_overcurrent_detection =
> +		device_property_read_bool(hsotg->dev, "disable-over-current");
> +}
> +
>   static void dwc2_set_s3c6400_params(struct dwc2_hsotg *hsotg)
>   {
>   	struct dwc2_core_params *p = &hsotg->params;
> @@ -202,7 +243,13 @@ static void dwc2_set_stm32mp15_hsotg_params(struct dwc2_hsotg *hsotg)
>   
>   const struct of_device_id dwc2_of_match_table[] = {
>   	{ .compatible = "brcm,bcm2835-usb", .data = dwc2_set_bcm_params },
> -	{ .compatible = "hisilicon,hi6220-usb", .data = dwc2_set_his_params  },
> +	{ .compatible = "hisilicon,hi6220-usb", .data = dwc2_set_his_params },
> +	{ .compatible = "ingenic,jz4775-otg", .data = dwc2_set_jz4775_params },
> +	{ .compatible = "ingenic,jz4780-otg", .data = dwc2_set_jz4775_params },
> +	{ .compatible = "ingenic,x1000-otg", .data = dwc2_set_jz4775_params },
> +	{ .compatible = "ingenic,x1600-otg", .data = dwc2_set_x1600_params },
> +	{ .compatible = "ingenic,x1830-otg", .data = dwc2_set_x1600_params },
> +	{ .compatible = "ingenic,x2000-otg", .data = dwc2_set_x2000_params },
>   	{ .compatible = "rockchip,rk3066-usb", .data = dwc2_set_rk_params },
>   	{ .compatible = "lantiq,arx100-usb", .data = dwc2_set_ltq_params },
>   	{ .compatible = "lantiq,xrx200-usb", .data = dwc2_set_ltq_params },
>

Zhou Yanjie July 30, 2021, 9:34 a.m. UTC | #6

Hi Greg,

On 2021/7/27 下午10:27, Greg KH wrote:
> On Sat, Jul 24, 2021 at 04:48:41PM +0800, 周琰杰 (Zhou Yanjie) wrote:
>> Add OTG support for the JZ4775 SoC, the JZ4780 SoC, the X1000
>> SoC, the X1600 SoC, the X1830 SoC, and the X2000 SoC. Introduce
>> support for disable Ingenic overcurrent detection, once selected
>> it enables GOTGCTL register bits VbvalidOvEn and VbvalidOvVal to
>> disable the VBUS overcurrent detection.
>>
>> This patch is derived from Dragan Čečavac (in the kernel 3.18.3
>> tree of CI20). It is very useful for the MIPS Creator CI20 (r1).
>> Without this patch, OTG port of CI20 has a great probability to
>> face overcurrent warning, which breaks the OTG functionality.
>>
>> Signed-off-by: Dragan Čečavac <[e-mail]>
>> Signed-off-by: 周琰杰 (Zhou Yanjie) <[e-mail]>
>> ---
>>   drivers/usb/dwc2/core.c   |  9 +++++++++
>>   drivers/usb/dwc2/core.h   |  5 +++++
>>   drivers/usb/dwc2/params.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++-
>>   3 files changed, 62 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/usb/dwc2/core.c b/drivers/usb/dwc2/core.c
>> index 272ae57..c35b2e2 100644
>> --- a/drivers/usb/dwc2/core.c
>> +++ b/drivers/usb/dwc2/core.c
>> @@ -1153,6 +1153,7 @@ static void dwc2_set_turnaround_time(struct dwc2_hsotg *hsotg)
>>   int dwc2_phy_init(struct dwc2_hsotg *hsotg, bool select_phy)
>>   {
>>   	u32 usbcfg;
>> +	u32 otgctl;
>>   	int retval = 0;
>>   
>>   	if ((hsotg->params.speed == DWC2_SPEED_PARAM_FULL ||
>> @@ -1187,6 +1188,14 @@ int dwc2_phy_init(struct dwc2_hsotg *hsotg, bool select_phy)
>>   		dwc2_writel(hsotg, usbcfg, GUSBCFG);
>>   	}
>>   
>> +	if (hsotg->params.deactivate_ingenic_overcurrent_detection) {
>> +		if (dwc2_is_host_mode(hsotg)) {
>> +			otgctl = readl(hsotg->regs + GOTGCTL);
>> +			otgctl |= GOTGCTL_VBVALOEN | GOTGCTL_VBVALOVAL;
>> +			writel(otgctl, hsotg->regs + GOTGCTL);
>> +		}
>> +	}
>> +
>>   	return retval;
>>   }
>>   
>> diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h
>> index ab6b815..e026d13 100644
>> --- a/drivers/usb/dwc2/core.h
>> +++ b/drivers/usb/dwc2/core.h
>> @@ -418,6 +418,10 @@ enum dwc2_ep0_state {
>>    *			detection using GGPIO register.
>>    *			0 - Deactivate the external level detection (default)
>>    *			1 - Activate the external level detection
>> + * @deactivate_ingenic_overcurrent_detection: Deactivate Ingenic overcurrent
>> + *			detection.
>> + *			0 - Activate the overcurrent detection (default)
> Having 0 as "active" is rough to handle over time.
>
> All of the other options are "activate", so please, keep them the same
> if at all possible.


Sure, I will try.


Thanks and best regards!


>
> thanks,
>
> greg k-h

Zhou Yanjie April 12, 2022, 4:45 p.m. UTC | #7

Hi Felipe,

On 2021/7/24 下午9:24, Felipe Balbi wrote:
> Hi Zhou,
>
> Zhou Yanjie writes:
>>>> diff --git a/drivers/usb/dwc2/params.c b/drivers/usb/dwc2/params.c
>>>> index 67c5eb1..a7a1b50 100644
>>>> --- a/drivers/usb/dwc2/params.c
>>>> +++ b/drivers/usb/dwc2/params.c
>>>> @@ -71,6 +71,47 @@ static void dwc2_set_his_params(struct
>>>> dwc2_hsotg *hsotg)
>>>>       p->power_down = DWC2_POWER_DOWN_PARAM_NONE;
>>>>   }
>>>>
>>>> +static void dwc2_set_jz4775_params(struct dwc2_hsotg *hsotg)
>>>> +{
>>>> +    struct dwc2_core_params *p = &hsotg->params;
>>>> +
>>>> +    p->otg_cap = DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE;
>>>> +    p->speed = DWC2_SPEED_PARAM_HIGH;
>>>> +    p->phy_type = DWC2_PHY_TYPE_PARAM_UTMI;
>>>> +    p->phy_utmi_width = 16;
>>>> +    p->deactivate_ingenic_overcurrent_detection =
>>>> +        device_property_read_bool(hsotg->dev, "disable-over-current");
>>> That device property was not documented in the previous patch. Also
>>> this probably should be "ingenic,disable-over-current".
>>>
>> This device property already exists (it has been used in the
>> "dwc2_get_device_properties()" function below).
>>
>> Under normal circumstances, after using this device attribute, it
>> should be possible to turn off the overcurrent
>>
>> detection, but on the Ingenic processors, somehow it did not take
>> effect normally, and we must operate the
>>
>> "VBVALOEN" bit and "VBVALOVAL" bit of "GOTGCTL" register to make it normal.
> I believe what Paul is suggesting is that this property lacks
> documentation under Documentation/devicetree/bindings/. If that's the
> case, you could take the opportunity to document the property and,
> perhaps, add the missing prefix.


Sorry for the long time delay.

Looks like Krzysztof has done the job, I will send v2 soon.


Thanks and best regards!

Patch

diff --git a/drivers/usb/dwc2/core.c b/drivers/usb/dwc2/core.c
index 272ae57..c35b2e2 100644
--- a/drivers/usb/dwc2/core.c
+++ b/drivers/usb/dwc2/core.c
@@ -1153,6 +1153,7 @@  static void dwc2_set_turnaround_time(struct dwc2_hsotg *hsotg)
 int dwc2_phy_init(struct dwc2_hsotg *hsotg, bool select_phy)
 {
 	u32 usbcfg;
+	u32 otgctl;
 	int retval = 0;
 
 	if ((hsotg->params.speed == DWC2_SPEED_PARAM_FULL ||
@@ -1187,6 +1188,14 @@  int dwc2_phy_init(struct dwc2_hsotg *hsotg, bool select_phy)
 		dwc2_writel(hsotg, usbcfg, GUSBCFG);
 	}
 
+	if (hsotg->params.deactivate_ingenic_overcurrent_detection) {
+		if (dwc2_is_host_mode(hsotg)) {
+			otgctl = readl(hsotg->regs + GOTGCTL);
+			otgctl |= GOTGCTL_VBVALOEN | GOTGCTL_VBVALOVAL;
+			writel(otgctl, hsotg->regs + GOTGCTL);
+		}
+	}
+
 	return retval;
 }
 
diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h
index ab6b815..e026d13 100644
--- a/drivers/usb/dwc2/core.h
+++ b/drivers/usb/dwc2/core.h
@@ -418,6 +418,10 @@  enum dwc2_ep0_state {
  *			detection using GGPIO register.
  *			0 - Deactivate the external level detection (default)
  *			1 - Activate the external level detection
+ * @deactivate_ingenic_overcurrent_detection: Deactivate Ingenic overcurrent
+ *			detection.
+ *			0 - Activate the overcurrent detection (default)
+ *			1 - Deactivate the overcurrent detection
  * @g_dma:              Enables gadget dma usage (default: autodetect).
  * @g_dma_desc:         Enables gadget descriptor DMA (default: autodetect).
  * @g_rx_fifo_size:	The periodic rx fifo size for the device, in
@@ -489,6 +493,7 @@  struct dwc2_core_params {
 	u8 hird_threshold;
 	bool activate_stm_fs_transceiver;
 	bool activate_stm_id_vb_detection;
+	bool deactivate_ingenic_overcurrent_detection;
 	bool ipg_isoc_en;
 	u16 max_packet_count;
 	u32 max_transfer_size;
diff --git a/drivers/usb/dwc2/params.c b/drivers/usb/dwc2/params.c
index 67c5eb1..a7a1b50 100644
--- a/drivers/usb/dwc2/params.c
+++ b/drivers/usb/dwc2/params.c
@@ -71,6 +71,47 @@  static void dwc2_set_his_params(struct dwc2_hsotg *hsotg)
 	p->power_down = DWC2_POWER_DOWN_PARAM_NONE;
 }
 
+static void dwc2_set_jz4775_params(struct dwc2_hsotg *hsotg)
+{
+	struct dwc2_core_params *p = &hsotg->params;
+
+	p->otg_cap = DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE;
+	p->speed = DWC2_SPEED_PARAM_HIGH;
+	p->phy_type = DWC2_PHY_TYPE_PARAM_UTMI;
+	p->phy_utmi_width = 16;
+	p->deactivate_ingenic_overcurrent_detection =
+		device_property_read_bool(hsotg->dev, "disable-over-current");
+}
+
+static void dwc2_set_x1600_params(struct dwc2_hsotg *hsotg)
+{
+	struct dwc2_core_params *p = &hsotg->params;
+
+	p->otg_cap = DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE;
+	p->speed = DWC2_SPEED_PARAM_HIGH;
+	p->host_channels = 16;
+	p->phy_type = DWC2_PHY_TYPE_PARAM_UTMI;
+	p->phy_utmi_width = 16;
+	p->deactivate_ingenic_overcurrent_detection =
+		device_property_read_bool(hsotg->dev, "disable-over-current");
+}
+
+static void dwc2_set_x2000_params(struct dwc2_hsotg *hsotg)
+{
+	struct dwc2_core_params *p = &hsotg->params;
+
+	p->otg_cap = DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE;
+	p->speed = DWC2_SPEED_PARAM_HIGH;
+	p->host_rx_fifo_size = 1024;
+	p->host_nperio_tx_fifo_size = 1024;
+	p->host_perio_tx_fifo_size = 1024;
+	p->host_channels = 16;
+	p->phy_type = DWC2_PHY_TYPE_PARAM_UTMI;
+	p->phy_utmi_width = 16;
+	p->deactivate_ingenic_overcurrent_detection =
+		device_property_read_bool(hsotg->dev, "disable-over-current");
+}
+
 static void dwc2_set_s3c6400_params(struct dwc2_hsotg *hsotg)
 {
 	struct dwc2_core_params *p = &hsotg->params;
@@ -202,7 +243,13 @@  static void dwc2_set_stm32mp15_hsotg_params(struct dwc2_hsotg *hsotg)
 
 const struct of_device_id dwc2_of_match_table[] = {
 	{ .compatible = "brcm,bcm2835-usb", .data = dwc2_set_bcm_params },
-	{ .compatible = "hisilicon,hi6220-usb", .data = dwc2_set_his_params  },
+	{ .compatible = "hisilicon,hi6220-usb", .data = dwc2_set_his_params },
+	{ .compatible = "ingenic,jz4775-otg", .data = dwc2_set_jz4775_params },
+	{ .compatible = "ingenic,jz4780-otg", .data = dwc2_set_jz4775_params },
+	{ .compatible = "ingenic,x1000-otg", .data = dwc2_set_jz4775_params },
+	{ .compatible = "ingenic,x1600-otg", .data = dwc2_set_x1600_params },
+	{ .compatible = "ingenic,x1830-otg", .data = dwc2_set_x1600_params },
+	{ .compatible = "ingenic,x2000-otg", .data = dwc2_set_x2000_params },
 	{ .compatible = "rockchip,rk3066-usb", .data = dwc2_set_rk_params },
 	{ .compatible = "lantiq,arx100-usb", .data = dwc2_set_ltq_params },
 	{ .compatible = "lantiq,xrx200-usb", .data = dwc2_set_ltq_params },