Commit 2de8a325 authored by Johan Hovold's avatar Johan Hovold Committed by Vinod Koul
Browse files

phy: qcom-qmp-combo: fix memleak on probe deferral 



Switch to using the device-managed of_iomap helper to avoid leaking
memory on probe deferral and driver unbind.

Note that this helper checks for already reserved regions and may fail
if there are multiple devices claiming the same memory.

Fixes: e78f3d15 ("phy: qcom-qmp: new qmp phy driver for qcom-chipsets")
Signed-off-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Link: https://lore.kernel.org/r/20220916102340.11520-5-johan+linaro@kernel.org


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 1f69eded

drivers/phy/qualcomm/phy-qcom-qmp-combo.c

+17 −15
Original line number Diff line number Diff line
@@ -2714,17 +2714,17 @@ static int qmp_combo_create(struct device *dev, struct device_node *np, int id, 
	 * For dual lane PHYs: tx2 -> 3, rx2 -> 4, pcs_misc (optional) -> 5

	 * For single lane PHYs: pcs_misc (optional) -> 3.

	 */

	qphy->tx = of_iomap(np, 0);

	if (!qphy->tx)

		return -ENOMEM;

	qphy->tx = devm_of_iomap(dev, np, 0, NULL);

	if (IS_ERR(qphy->tx))

		return PTR_ERR(qphy->tx);



	qphy->rx = of_iomap(np, 1);

	if (!qphy->rx)

		return -ENOMEM;

	qphy->rx = devm_of_iomap(dev, np, 1, NULL);

	if (IS_ERR(qphy->rx))

		return PTR_ERR(qphy->rx);



	qphy->pcs = of_iomap(np, 2);

	if (!qphy->pcs)

		return -ENOMEM;

	qphy->pcs = devm_of_iomap(dev, np, 2, NULL);

	if (IS_ERR(qphy->pcs))

		return PTR_ERR(qphy->pcs);



	if (cfg->pcs_usb_offset)

		qphy->pcs_usb = qphy->pcs + cfg->pcs_usb_offset;
@@ -2736,9 +2736,9 @@ static int qmp_combo_create(struct device *dev, struct device_node *np, int id, 
	 * offset from the first lane.

	 */

	if (cfg->is_dual_lane_phy) {

		qphy->tx2 = of_iomap(np, 3);

		qphy->rx2 = of_iomap(np, 4);

		if (!qphy->tx2 || !qphy->rx2) {

		qphy->tx2 = devm_of_iomap(dev, np, 3, NULL);

		qphy->rx2 = devm_of_iomap(dev, np, 4, NULL);

		if (IS_ERR(qphy->tx2) || IS_ERR(qphy->rx2)) {

			dev_warn(dev,

				 "Underspecified device tree, falling back to legacy register regions\n");
@@ -2748,15 +2748,17 @@ static int qmp_combo_create(struct device *dev, struct device_node *np, int id, 
			qphy->rx2 = qphy->rx + QMP_PHY_LEGACY_LANE_STRIDE;



		} else {

			qphy->pcs_misc = of_iomap(np, 5);

			qphy->pcs_misc = devm_of_iomap(dev, np, 5, NULL);

		}



	} else {

		qphy->pcs_misc = of_iomap(np, 3);

		qphy->pcs_misc = devm_of_iomap(dev, np, 3, NULL);

	}



	if (!qphy->pcs_misc)

	if (IS_ERR(qphy->pcs_misc)) {

		dev_vdbg(dev, "PHY pcs_misc-reg not used\n");

		qphy->pcs_misc = NULL;

	}



	/*

	 * Get PHY's Pipe clock, if any. USB3 and PCIe are PIPE3