Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

usb: dwc3-meson-g12a: fix usb2 PHY glue init when phy0 is disabled

When only PHY1 is used (for example on Odroid-HC4), the regmap init code
uses the usb2 ports when doesn't initialize the PHY1 regmap entry.

This fixes:
Unable to handle kernel NULL pointer dereference at virtual address 0000000000000020
...
pc : regmap_update_bits_base+0x40/0xa0
lr : dwc3_meson_g12a_usb2_init_phy+0x4c/0xf8
...
Call trace:
regmap_update_bits_base+0x40/0xa0
dwc3_meson_g12a_usb2_init_phy+0x4c/0xf8
dwc3_meson_g12a_usb2_init+0x7c/0xc8
dwc3_meson_g12a_usb_init+0x28/0x48
dwc3_meson_g12a_probe+0x298/0x540
platform_probe+0x70/0xe0
really_probe+0xf0/0x4d8
driver_probe_device+0xfc/0x168
...

Fixes: 013af227f58a97 ("usb: dwc3: meson-g12a: handle the phy and glue registers separately")
Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Cc: stable <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20210601084830.260196-1-narmstrong@baylibre.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Neil Armstrong and committed by
Greg Kroah-Hartman
4d2aa178 1d0d3d81

+4 -1
+4 -1
drivers/usb/dwc3/dwc3-meson-g12a.c
··· 651 651 return PTR_ERR(priv->usb_glue_regmap); 652 652 653 653 /* Create a regmap for each USB2 PHY control register set */ 654 - for (i = 0; i < priv->usb2_ports; i++) { 654 + for (i = 0; i < priv->drvdata->num_phys; i++) { 655 655 struct regmap_config u2p_regmap_config = { 656 656 .reg_bits = 8, 657 657 .val_bits = 32, 658 658 .reg_stride = 4, 659 659 .max_register = U2P_R1, 660 660 }; 661 + 662 + if (!strstr(priv->drvdata->phy_names[i], "usb2")) 663 + continue; 661 664 662 665 u2p_regmap_config.name = devm_kasprintf(priv->dev, GFP_KERNEL, 663 666 "u2p-%d", i);