From patchwork Wed Oct 19 08:30:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 5445 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp327913wrs; Wed, 19 Oct 2022 06:30:00 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5KjjJAAfiY7WpQgkL0VhzR89gGqJHoGgjjupRycKKAL5+JDGpA9T5p+XoBB8TiG+QnDY1B X-Received: by 2002:a63:f47:0:b0:46a:e00c:24c7 with SMTP id 7-20020a630f47000000b0046ae00c24c7mr7371029pgp.239.1666186200115; Wed, 19 Oct 2022 06:30:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666186200; cv=none; d=google.com; s=arc-20160816; b=zJQLrwCC7xX1b12INsp4udov3IDVElnItMRfsAekhRsjWBf+375SFn2gJ3Fu7FuuDo IKbj9DgUkzKSMQaVV28dqlB6YTGzlKbDDlwhXZEjCooKVI4/3bNBTZFlQvS4CxCko8wv Ezt22EwEVUCmR5ayyPqvYAIZQKR1jruu8G9aksZPoJbbYsQCW2dQLQ4zXJc3LgUjaE9R urg2qDayrV7E0dVzBnEq/sTGpHhsfQIZs/swMYhoY7Oy3oXwR8lB84O+whQDEPD8ibfW 5DUPlnEs9bG8VBeppisSd5sTSB6sld/kNLYI+C9q8RGBbSygn37eF+Bs9STsRT3s4HdT JKFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=E3otRfKb5HElaw3EAbmXmiy9WKOpuByLAO/mJJYdhQk=; b=sUEt//2I3Y6Uw/KrXMevXlLzQUmFn69C1iKPjyKlz0bS3gE73IFu0jSiTPhsbXSSkN SoOOaEXzNrgN7FFIIEOBvAAfolbwGe9ntoRYnuY9jy6/7wbO8mgbss/w/tbK5O5bv1t2 Oaz72isZQ/8qsTaK+gIeWsTd+//I87fRctRc7uYj9OXV+kUoQNXflmNW8ehJ454tfkpt U0wfDzzDZa398emrps892WDAsjyN5x5Chnpgk6NzPNi1Q9TRq3Zihr7mCXTM0Xoai1gM Yak0QA4WYnApB6L5NreCp+XyrN3pU987jcpCOp695HbamRPvylDw7+KaB44+5EKmrwIx cIbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=lpS+LnDj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ay12-20020a1709028b8c00b00178072335cbsi16928891plb.132.2022.10.19.06.29.46; Wed, 19 Oct 2022 06:30:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=lpS+LnDj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229920AbiJSNQ3 (ORCPT + 99 others); Wed, 19 Oct 2022 09:16:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55720 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232657AbiJSNPt (ORCPT ); Wed, 19 Oct 2022 09:15:49 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E782DEA3; Wed, 19 Oct 2022 06:01:44 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 9BB6AB82473; Wed, 19 Oct 2022 09:03:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1D34EC433C1; Wed, 19 Oct 2022 09:03:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666170196; bh=yOd+dCvGotr+0Lam7OWssr1UOPUUFI+5pHMnw++qGTk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lpS+LnDjnD8eMAdF4d69aALCqV+NpjE4O+1F4qEjpAeLB2FCl6LLCJtI1VRoNZApr ltQgN3+KDN4I8uwp88Z8Be9HK/sXnrXoDkQO+B6jnade0R5CMGXox6peSM7SzFV/aL 4FBvV3U4g2QsJwZnGGyXg6EQhZXMM+U7axVuhykc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johan Hovold , Vinod Koul , Sasha Levin Subject: [PATCH 6.0 527/862] phy: qcom-qmp-ufs: fix memleak on probe deferral Date: Wed, 19 Oct 2022 10:30:14 +0200 Message-Id: <20221019083313.259607297@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221019083249.951566199@linuxfoundation.org> References: <20221019083249.951566199@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747122861262059788?= X-GMAIL-MSGID: =?utf-8?q?1747122861262059788?= From: Johan Hovold [ Upstream commit ef74a97f0df8758efe4476b4645961286aa86f0d ] 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: e78f3d15e115 ("phy: qcom-qmp: new qmp phy driver for qcom-chipsets") Signed-off-by: Johan Hovold Link: https://lore.kernel.org/r/20220916102340.11520-6-johan+linaro@kernel.org Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/phy/qualcomm/phy-qcom-qmp-ufs.c | 30 ++++++++++++------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c b/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c index c8583f5a54bd..f586e5260856 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c @@ -1188,17 +1188,17 @@ int qcom_qmp_phy_ufs_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 this is a dual-lane PHY, then there should be registers for the @@ -1207,9 +1207,9 @@ int qcom_qmp_phy_ufs_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"); @@ -1219,14 +1219,14 @@ int qcom_qmp_phy_ufs_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"); generic_phy = devm_phy_create(dev, np, &qcom_qmp_ufs_ops);