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

drm: xlnx: zynqmp: release reset to DP controller before accessing DP registers

When insmod zynqmp-dpsub.ko after rmmod it, system will hang with the
error log as below:

root@xilinx-zynqmp:~# insmod zynqmp-dpsub.ko
[ 88.391289] [drm] Initialized zynqmp-dpsub 1.0.0 20130509 for fd4a0000.display on minor 0
[ 88.529906] Console: switching to colour frame buffer device 128x48
[ 88.549402] zynqmp-dpsub fd4a0000.display: [drm] fb0: zynqmp-dpsubdrm frame buffer device
[ 88.571624] zynqmp-dpsub fd4a0000.display: ZynqMP DisplayPort Subsystem driver probed
root@xilinx-zynqmp:~# rmmod zynqmp_dpsub
[ 94.023404] Console: switching to colour dummy device 80x25
root@xilinx-zynqmp:~# insmod zynqmp-dpsub.ko
<hang here>

This is because that in zynqmp_dp_probe it tries to access some DP
registers while the DP controller is still in the reset state. When
running "rmmod zynqmp_dpsub", zynqmp_dp_reset(dp, true) in
zynqmp_dp_phy_exit is called to force the DP controller into the reset
state. Then insmod will call zynqmp_dp_probe to program the DP registers,
but at this moment the DP controller hasn't been brought out of the reset
state yet since the function zynqmp_dp_reset(dp, false) is called later and
this will result the system hang.

Releasing the reset to DP controller before any read/write operation to it
will fix this issue. And for symmetry, move zynqmp_dp_reset() call from
zynqmp_dp_phy_exit() to zynqmp_dp_remove().

Signed-off-by: Quanyang Wang <quanyang.wang@windriver.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

authored by

Quanyang Wang and committed by
Laurent Pinchart
a338619b 97271c7e

+12 -10
+12 -10
drivers/gpu/drm/xlnx/zynqmp_dp.c
··· 402 402 } 403 403 } 404 404 405 - ret = zynqmp_dp_reset(dp, false); 406 - if (ret < 0) 407 - return ret; 408 - 409 405 zynqmp_dp_clr(dp, ZYNQMP_DP_PHY_RESET, ZYNQMP_DP_PHY_RESET_ALL_RESET); 410 406 411 407 /* ··· 436 440 dev_err(dp->dev, "failed to power off phy(%d) %d\n", i, 437 441 ret); 438 442 } 439 - 440 - zynqmp_dp_reset(dp, true); 441 443 442 444 for (i = 0; i < dp->num_lanes; i++) { 443 445 ret = phy_exit(dp->phy[i]); ··· 1677 1683 return PTR_ERR(dp->reset); 1678 1684 } 1679 1685 1686 + ret = zynqmp_dp_reset(dp, false); 1687 + if (ret < 0) 1688 + return ret; 1689 + 1680 1690 ret = zynqmp_dp_phy_probe(dp); 1681 1691 if (ret) 1682 - return ret; 1692 + goto err_reset; 1683 1693 1684 1694 /* Initialize the hardware. */ 1685 1695 zynqmp_dp_write(dp, ZYNQMP_DP_TX_PHY_POWER_DOWN, ··· 1695 1697 1696 1698 ret = zynqmp_dp_phy_init(dp); 1697 1699 if (ret) 1698 - return ret; 1700 + goto err_reset; 1699 1701 1700 1702 zynqmp_dp_write(dp, ZYNQMP_DP_TRANSMITTER_ENABLE, 1); 1701 1703 ··· 1707 1709 zynqmp_dp_irq_handler, IRQF_ONESHOT, 1708 1710 dev_name(dp->dev), dp); 1709 1711 if (ret < 0) 1710 - goto error; 1712 + goto err_phy_exit; 1711 1713 1712 1714 dev_dbg(dp->dev, "ZynqMP DisplayPort Tx probed with %u lanes\n", 1713 1715 dp->num_lanes); 1714 1716 1715 1717 return 0; 1716 1718 1717 - error: 1719 + err_phy_exit: 1718 1720 zynqmp_dp_phy_exit(dp); 1721 + err_reset: 1722 + zynqmp_dp_reset(dp, true); 1723 + 1719 1724 return ret; 1720 1725 } 1721 1726 ··· 1736 1735 zynqmp_dp_write(dp, ZYNQMP_DP_INT_DS, 0xffffffff); 1737 1736 1738 1737 zynqmp_dp_phy_exit(dp); 1738 + zynqmp_dp_reset(dp, true); 1739 1739 }