| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Fri, 21 Aug 2020 07:52:55 +0200
From: Jan Kiszka <jan.kiszka@...mens.com>
To: Roger Quadros <rogerq@...com>, kishon@...com
Cc: nsekhar@...com, vigneshr@...com, linux-kernel@...r.kernel.org
Subject: Re: [PATCH v5] phy: omap-usb2-phy: disable PHY charger detect
On 20.08.20 15:39, Roger Quadros wrote:
> AM654x PG1.0 has a silicon bug that D+ is pulled high after POR, which
> could cause enumeration failure with some USB hubs. Disabling the
> USB2_PHY Charger Detect function will put D+ into the normal state.
>
> This addresses Silicon Errata:
> i2075 - "USB2PHY: USB2PHY Charger Detect is Enabled by Default Without VBUS
> Presence"
>
> Signed-off-by: Roger Quadros <rogerq@...com>
> ---
> Changelog:
> v5
> - don't use dt property to enable workaround. Use soc_device_match() instead.
>
> v4
> - fix example to fix dt_binding_check warnings
> - '#phy-cells' -> "#phy-cells"
> - Add 'oneOf' to compatible logic to allow just "ti,omap-usb2" as valid
>
> v3
> - Removed quotes from compatibles
> - changed property to "ti,disable-charger-det"
>
> v2
> - Address Rob's comments on YAML schema.
>
> drivers/phy/ti/phy-omap-usb2.c | 70 +++++++++++++++++++++++++---------
> 1 file changed, 51 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/phy/ti/phy-omap-usb2.c b/drivers/phy/ti/phy-omap-usb2.c
> index cb2dd3230fa7..65d73142d4ec 100644
> --- a/drivers/phy/ti/phy-omap-usb2.c
> +++ b/drivers/phy/ti/phy-omap-usb2.c
> @@ -6,26 +6,31 @@
> * Author: Kishon Vijay Abraham I <kishon@...com>
> */
>
> -#include <linux/module.h>
> -#include <linux/platform_device.h>
> -#include <linux/slab.h>
> -#include <linux/of.h>
> -#include <linux/io.h>
> -#include <linux/phy/omap_usb.h>
> -#include <linux/usb/phy_companion.h>
> #include <linux/clk.h>
> -#include <linux/err.h>
> -#include <linux/pm_runtime.h>
> #include <linux/delay.h>
> +#include <linux/err.h>
> +#include <linux/io.h>
> +#include <linux/mfd/syscon.h>
> +#include <linux/module.h>
> +#include <linux/of.h>
> +#include <linux/of_platform.h>
> #include <linux/phy/omap_control_phy.h>
> +#include <linux/phy/omap_usb.h>
> #include <linux/phy/phy.h>
> -#include <linux/mfd/syscon.h>
> +#include <linux/platform_device.h>
> +#include <linux/pm_runtime.h>
> #include <linux/regmap.h>
> -#include <linux/of_platform.h>
> +#include <linux/slab.h>
> +#include <linux/sys_soc.h>
> +#include <linux/usb/phy_companion.h>
>
> #define USB2PHY_ANA_CONFIG1 0x4c
> #define USB2PHY_DISCON_BYP_LATCH BIT(31)
>
> +#define USB2PHY_CHRG_DET 0x14
> +#define USB2PHY_CHRG_DET_USE_CHG_DET_REG BIT(29)
> +#define USB2PHY_CHRG_DET_DIS_CHG_DET BIT(28)
> +
> /* SoC Specific USB2_OTG register definitions */
> #define AM654_USB2_OTG_PD BIT(8)
> #define AM654_USB2_VBUS_DET_EN BIT(5)
> @@ -43,6 +48,7 @@
> #define OMAP_USB2_HAS_START_SRP BIT(0)
> #define OMAP_USB2_HAS_SET_VBUS BIT(1)
> #define OMAP_USB2_CALIBRATE_FALSE_DISCONNECT BIT(2)
> +#define OMAP_USB2_DISABLE_CHRG_DET BIT(3)
>
> struct omap_usb {
> struct usb_phy phy;
> @@ -236,6 +242,13 @@ static int omap_usb_init(struct phy *x)
> omap_usb_writel(phy->phy_base, USB2PHY_ANA_CONFIG1, val);
> }
>
> + if (phy->flags & OMAP_USB2_DISABLE_CHRG_DET) {
> + val = omap_usb_readl(phy->phy_base, USB2PHY_CHRG_DET);
> + val |= USB2PHY_CHRG_DET_USE_CHG_DET_REG |
> + USB2PHY_CHRG_DET_DIS_CHG_DET;
> + omap_usb_writel(phy->phy_base, USB2PHY_CHRG_DET, val);
> + }
> +
> return 0;
> }
>
> @@ -329,6 +342,26 @@ static const struct of_device_id omap_usb2_id_table[] = {
> };
> MODULE_DEVICE_TABLE(of, omap_usb2_id_table);
>
> +static void omap_usb2_init_errata(struct omap_usb *phy)
> +{
> + static const struct soc_device_attribute am65x_sr10_soc_devices[] = {
> + { .family = "AM65X", .revision = "SR1.0" },
> + { /* sentinel */ }
> + };
> +
> + /*
> + * Errata i2075: USB2PHY: USB2PHY Charger Detect is Enabled by
> + * Default Without VBUS Presence.
> + *
> + * AM654x SR1.0 has a silicon bug due to which D+ is pulled high after
> + * POR, which could cause enumeration failure with some USB hubs.
> + * Disabling the USB2_PHY Charger Detect function will put D+
> + * into the normal state.
> + */
> + if (soc_device_match(am65x_sr10_soc_devices))
> + phy->flags |= OMAP_USB2_DISABLE_CHRG_DET;
> +}
> +
> static int omap_usb2_probe(struct platform_device *pdev)
> {
> struct omap_usb *phy;
> @@ -366,14 +399,14 @@ static int omap_usb2_probe(struct platform_device *pdev)
> phy->mask = phy_data->mask;
> phy->power_on = phy_data->power_on;
> phy->power_off = phy_data->power_off;
> + phy->flags = phy_data->flags;
>
> - if (phy_data->flags & OMAP_USB2_CALIBRATE_FALSE_DISCONNECT) {
> - res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> - phy->phy_base = devm_ioremap_resource(&pdev->dev, res);
> - if (IS_ERR(phy->phy_base))
> - return PTR_ERR(phy->phy_base);
> - phy->flags |= OMAP_USB2_CALIBRATE_FALSE_DISCONNECT;
> - }
> + omap_usb2_init_errata(phy);
> +
> + res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> + phy->phy_base = devm_ioremap_resource(&pdev->dev, res);
> + if (IS_ERR(phy->phy_base))
> + return PTR_ERR(phy->phy_base);
>
> phy->syscon_phy_power = syscon_regmap_lookup_by_phandle(node,
> "syscon-phy-power");
> @@ -405,7 +438,6 @@ static int omap_usb2_probe(struct platform_device *pdev)
> }
> }
>
> -
> phy->wkupclk = devm_clk_get(phy->dev, "wkupclk");
> if (IS_ERR(phy->wkupclk)) {
> if (PTR_ERR(phy->wkupclk) == -EPROBE_DEFER)
>
Tested-by: Jan Kiszka <jan.kiszka@...mens.com>
Thanks!
Jan
--
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux
Powered by blists - more mailing lists