From patchwork Sat Oct 12 07:19:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Moon X-Patchwork-Id: 13833301 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 765C7D1A442 for ; Sat, 12 Oct 2024 07:22:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=vy1aQ9cVsWlsDlEVkyvwwiKmsgMi7Fb9AnccHGs8hTE=; b=LDWA7c8/btStW2 1GIfDH/G5CfvJwGSK7XgwLAbc//hnQ2hG/isV459NlFPwBWoQA4ji3kF0abaBF8H5A42feCd8r7KO 0LaT8gHUGH/lwRPV4b7hpPI+10WlE4HNEHOymzm/RXXxCD9xIo1v5rs7EYTHVVpthWky7riZoEk4u OQl2F33tMJnxxi3SpdefDl4/I1dqfwg2HTIri0cuYMPa86pb1HMYk2HoIs/6aDsKgfBm6WC3cAZLY CJZ7BxM6a4bwjn5s9Myb6zr+QMzVFr0OlBjm1m4RQzYxH5Py/ks9AayyO5pSFU6yLDvxeS+aM6Ln0 bULoY+hVl+4nOYBsFJtg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1szWSG-00000000hR5-35fe; Sat, 12 Oct 2024 07:22:24 +0000 Received: from mail-pf1-x42e.google.com ([2607:f8b0:4864:20::42e]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1szWPc-00000000gyw-0img; Sat, 12 Oct 2024 07:19:41 +0000 Received: by mail-pf1-x42e.google.com with SMTP id d2e1a72fcca58-71e053cf1f3so2486029b3a.2; Sat, 12 Oct 2024 00:19:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728717579; x=1729322379; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YRnaRhdgkUaUMlLRJLvxIED2m3y6s8utZfCC8ysa670=; b=MW3uTo2Xi2ocPqUsjqwx64jZqlN/WEjwimK2Pue41LMKBs2S2aeoxXFN7/CVEt9HCZ QBf+MaRv/pge3ibqoQR7E9ViNMcniiYqK8ptrAHOebDL2/W5Cu2hBZf5WaskzBWld4dL XXfsE7gssErAcDsUIH6zN02o1v3b380lXNNNwxC5QAhGDAW6YEOeUw+728YBrlSsJkyz qYngoEDHBaoxuZFL6KV1dOsJRnmNvIWwb2i6v5LAxMHhlYRhb5HQwTjuqR1WEXPg2aF0 BX5ETSXXo9askNwhX8epZDm5rgZsy8jGWxyrcEBDi9+iorwwcs49IZyRkIXRtWewzTk6 93zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728717579; x=1729322379; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YRnaRhdgkUaUMlLRJLvxIED2m3y6s8utZfCC8ysa670=; b=bAHaPllIVGUgjan+p1cKcyA11MBOCqf2NnOMTDGtRHa6hKcnjzgxHIn6y6K2vJm3CV W3qSZk+2oG2lIj/6yxAtoCk5ILxazjbO0W2Bcgn2FykCEsdxTxLVwtu2c7ibMzYG/JF4 eH2xRw/oW2Ij/puoEAm/T5QQ6iyzpzAkC6+Dnqfz6qRG4uJg0jXtl4KTLr5IGsxy1Rap /uAGsWpy9+52Lol7Jinje7ax4DAcM/FlTnLquQ1HcGYXqptOhBG/c9RkcYyqzUNKjhfc PMNK+8WCx4PWZiBtuhyPiW8sGFELS8mr4hsO2tCmJaMGYY5KgihAVvraIWjwFsrEZT1U ChUg== X-Forwarded-Encrypted: i=1; AJvYcCVOiqvxHn/Ms1EsqqUK6ZLxQr8dkmGbOv20rfkY+2bCza1alUI4hoRL4yLWVnT9jtpFmH5Vnd9Mrtlq@lists.infradead.org, AJvYcCVr7eh55tC8Hbjx/dwPPCf3RxOylB+Ks6uYeEQunH2ymFJDc7ZHx+JZ0eE8JQ/22dUa2KHcLwaBlSXzTI70dkLf@lists.infradead.org, AJvYcCXSqbPXba5wESXjSJ9/l9u3vtWIOpghiGe8OYfe/1qPEzCmJAv+cX/oZf3pXLyx1gnAG7pTXt5tRlhZiplA1Aw=@lists.infradead.org X-Gm-Message-State: AOJu0Yy3XlyLlOQGFKtV74BRTNCeeHwk+KyJDOaj6pkEd2Ee0oIhkUbY mFMz54tKZ084K6Blda5aaOb4ZjnlPRxQA3DgdxmdHt8zUEu1URsD X-Google-Smtp-Source: AGHT+IFBdUwCJYRaP9uIilAhxIH8b2VIJABfgd2ZHHwiTppROC77o42YtpLJtRJ3UBXTnvVl99LC5w== X-Received: by 2002:a05:6a00:228f:b0:714:2198:26bd with SMTP id d2e1a72fcca58-71e37e4a7b6mr8409189b3a.11.1728717579344; Sat, 12 Oct 2024 00:19:39 -0700 (PDT) Received: from localhost.localdomain ([113.30.217.221]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71e2aaba171sm3664620b3a.161.2024.10.12.00.19.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Oct 2024 00:19:39 -0700 (PDT) From: Anand Moon To: Vinod Koul , Kishon Vijay Abraham I , Heiko Stuebner , Philipp Zabel , linux-phy@lists.infradead.org (open list:GENERIC PHY FRAMEWORK), linux-arm-kernel@lists.infradead.org (moderated list:ARM/Rockchip SoC support), linux-rockchip@lists.infradead.org (open list:ARM/Rockchip SoC support), linux-kernel@vger.kernel.org (open list) Cc: Anand Moon , Dan Carpenter Subject: [PATCH v3 1/6] phy: rockchip-pcie: Simplify error handling with dev_err_probe() Date: Sat, 12 Oct 2024 12:49:03 +0530 Message-ID: <20241012071919.3726-2-linux.amoon@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20241012071919.3726-1-linux.amoon@gmail.com> References: <20241012071919.3726-1-linux.amoon@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241012_001940_231821_DA1E4D2D X-CRM114-Status: GOOD ( 13.15 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Use the dev_err_probe() helper to simplify error handling during probe. This also handle scenario, when -EDEFER is returned and useless error is printed. Signed-off-by: Anand Moon --- v3: None v3: None --- drivers/phy/rockchip/phy-rockchip-pcie.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/phy/rockchip/phy-rockchip-pcie.c b/drivers/phy/rockchip/phy-rockchip-pcie.c index 51cc5ece0e63..51e636a1ce33 100644 --- a/drivers/phy/rockchip/phy-rockchip-pcie.c +++ b/drivers/phy/rockchip/phy-rockchip-pcie.c @@ -371,12 +371,9 @@ static int rockchip_pcie_phy_probe(struct platform_device *pdev) mutex_init(&rk_phy->pcie_mutex); rk_phy->phy_rst = devm_reset_control_get(dev, "phy"); - if (IS_ERR(rk_phy->phy_rst)) { - if (PTR_ERR(rk_phy->phy_rst) != -EPROBE_DEFER) - dev_err(dev, - "missing phy property for reset controller\n"); - return PTR_ERR(rk_phy->phy_rst); - } + if (IS_ERR(rk_phy->phy_rst)) + return dev_err_probe(&pdev->dev, PTR_ERR(rk_phy->phy_rst), + "missing phy property for reset controller\n"); rk_phy->clk_pciephy_ref = devm_clk_get(dev, "refclk"); if (IS_ERR(rk_phy->clk_pciephy_ref)) { From patchwork Sat Oct 12 07:19:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Moon X-Patchwork-Id: 13833302 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2D9F0D1A442 for ; Sat, 12 Oct 2024 07:23:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=uKTIGicqZ60U830ZSqy353lUU3RxO9FZd8uxCD6eUxA=; b=Zu4nLtTBu/s+5i koqIocgUBHSGMaNUISrfqDXDQRtuTu/eSjygukc4opQmXgFVqPaR3KntqQULtgQuwYqbJ4L0sc+Dv GwHJTCFuO1c9Aj3Okyve4Oouc1zo6uq4qrJBeEvhYMMY+3CsAAS9S2nxdjLyHFD72fb9o6RtwGEPX trsngDDpmO5qnfywKsdgHlK8hDXP3vK87xf8NNPYHUI/aVzSiSmCgAMZ+5NKGyw1qsQRpQ41ZUtbc j2HKw/gv8bGfIt7OMjE9mbMtnWgCK43UeoZ53FO5V14M0pbsT02iliRo/YkSRYM1eD6v4u6WKwZgx RVADeVVaKnZZwphmnZtA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1szWTb-00000000hXt-13Ij; Sat, 12 Oct 2024 07:23:47 +0000 Received: from mail-pf1-x432.google.com ([2607:f8b0:4864:20::432]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1szWPh-00000000gzh-1GRC; Sat, 12 Oct 2024 07:19:46 +0000 Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-71e4244fdc6so856724b3a.0; Sat, 12 Oct 2024 00:19:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728717584; x=1729322384; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UDPgjk5EMnq9O3TXdBLuoizjZD+u/zLo9dMYOLZW6Gs=; b=WmTE2AGV5H6slHWMnRxT2CHmEy+nyn2HCew+O7TLy+gLX3+QLfFOU6lIisX8lYbXz/ ZImmkdq/N1dYJJIre8IriK+A4qlfbDzj/bCG+nmcs65tPTzVp6WjKhHpSg4X5jyDhJNF 3Ju5cx1fkjUhXSJDBVx9bEfUrHkj0vLnWo5HLtyjj/UU4VMGMOlBq7U6a28isyv/KOW2 lpkwaIRGi0DUtemVrSk52SAsH6CTZhEbjD6Nwy5KGDpQZcaC3wXv0hr8So1BH6urUmoL LpX5vxfyZaWNL2lfm+2wI4EPR9k9VIJuFWOKhpZTBaGGjwCho5P1vMjb+cC7ZKDuE93A hS4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728717584; x=1729322384; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UDPgjk5EMnq9O3TXdBLuoizjZD+u/zLo9dMYOLZW6Gs=; b=B+gUM3eLdPWj7Lxql1hZGOx5sHUnNBpJLzNRXF63SbCBo0aFAoqVfYs8FWPRphYPHx Hr9k7gtpFy5eEujokO184p7mX3bVFrrAZDYJ+RaPgSyeVybPT8M/sZxrIumktAR4wM4p iSZ8DDTNv7I72G30JEOCCBkKJ/B3Y/7jBJjrjZRSI1gnc95GPqG92TYryikP2aUS9+SA bJPGZjJfbcy0ZEi1ohFq4mOLQ+0lFXCssRwkBhVWrHDCEZYuWM82nftjR0ztZDujc4Vp w31+lmQWOC0Mv2rksXqwJpZctzvHs0sWrcio/T1RemZX/+YjSSLuyWFallNnZgkyB/6K 517Q== X-Forwarded-Encrypted: i=1; AJvYcCUPylTiwTeLwnLbGYoPbmIt0mB0vhacsyM0oHzs0v34k/z406ngFnZscnPpSYZpK6Plu3ahJqGormm4@lists.infradead.org, AJvYcCUzxcxMXNiJHXRjF57VpZqIfOXSh6kBdiTgCi/T5U0htXOortK/t/90k5ayVSYyl5+Ch3JFDAJ60zyUXvXvZh8=@lists.infradead.org, AJvYcCVbxECGeZpoXpNwjlv+rQ3oWogHunK9koGjP3V3Rsxw6XA7jSS44WPlIBsFqRtG4qNdVP6StYkJbK9uC+5nfhaD@lists.infradead.org X-Gm-Message-State: AOJu0Yz0WFROoi5CqLezhIhdkpdQg6Qfumf+yd/7urTpghvUbYeRZMsY uATyaAi8YIGowPA1vkRGy6VqaDGM0ZslJivr2upZRkcjEzBUOhIr X-Google-Smtp-Source: AGHT+IHOKv/G3fft8lrCLPkbfUGY4VYY1XzqY3QsgC+ZnNRSYHKjHGuKluxzX8c+5kAFExIe9iS23w== X-Received: by 2002:a05:6a00:2288:b0:71e:ed6:1cab with SMTP id d2e1a72fcca58-71e4c1cfc19mr2588966b3a.26.1728717584316; Sat, 12 Oct 2024 00:19:44 -0700 (PDT) Received: from localhost.localdomain ([113.30.217.221]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71e2aaba171sm3664620b3a.161.2024.10.12.00.19.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Oct 2024 00:19:44 -0700 (PDT) From: Anand Moon To: Vinod Koul , Kishon Vijay Abraham I , Heiko Stuebner , Philipp Zabel , linux-phy@lists.infradead.org (open list:GENERIC PHY FRAMEWORK), linux-arm-kernel@lists.infradead.org (moderated list:ARM/Rockchip SoC support), linux-rockchip@lists.infradead.org (open list:ARM/Rockchip SoC support), linux-kernel@vger.kernel.org (open list) Cc: Anand Moon , Dan Carpenter Subject: [PATCH v3 2/6] phy: rockchip-pcie: Use devm_clk_get_enabled() helper Date: Sat, 12 Oct 2024 12:49:04 +0530 Message-ID: <20241012071919.3726-3-linux.amoon@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20241012071919.3726-1-linux.amoon@gmail.com> References: <20241012071919.3726-1-linux.amoon@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241012_001945_362873_AE532D20 X-CRM114-Status: GOOD ( 16.79 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Use devm_clk_get_enabled() instead of devm_clk_get() to make the code cleaner and avoid calling clk_disable_unprepare(), as this is exactly what this function does. Use the dev_err_probe() helper to simplify error handling during probe. Refactor the mutex handling in the rockchip_pcie_phy_init() function to improve code readability and maintainability. The goto statement has been removed, and the mutex_unlock call is now directly within the conditional block. Return the result of reset_control_assert() function, with 0 indicating success and an error code indicating failure Signed-off-by: Anand Moon --- v3: Dan Carpenter: Reported below warning. smatch warnings: drivers/phy/rockchip/phy-rockchip-pcie.c:278 rockchip_pcie_phy_init() warn: missing error code 'err' So refactor the mutex_lock/mutex_unlock and return the err code. v2: Change the subject drop: Change to use/Use v1: New patch in this series --- drivers/phy/rockchip/phy-rockchip-pcie.c | 34 +++++++----------------- 1 file changed, 10 insertions(+), 24 deletions(-) diff --git a/drivers/phy/rockchip/phy-rockchip-pcie.c b/drivers/phy/rockchip/phy-rockchip-pcie.c index 51e636a1ce33..b5b1b1a667b2 100644 --- a/drivers/phy/rockchip/phy-rockchip-pcie.c +++ b/drivers/phy/rockchip/phy-rockchip-pcie.c @@ -274,30 +274,19 @@ static int rockchip_pcie_phy_init(struct phy *phy) mutex_lock(&rk_phy->pcie_mutex); - if (rk_phy->init_cnt++) - goto err_out; - - err = clk_prepare_enable(rk_phy->clk_pciephy_ref); - if (err) { - dev_err(&phy->dev, "Fail to enable pcie ref clock.\n"); - goto err_refclk; + if (rk_phy->init_cnt++) { + mutex_unlock(&rk_phy->pcie_mutex); + return 0; } err = reset_control_assert(rk_phy->phy_rst); if (err) { dev_err(&phy->dev, "assert phy_rst err %d\n", err); - goto err_reset; + rk_phy->init_cnt--; + mutex_unlock(&rk_phy->pcie_mutex); + return err; } -err_out: - mutex_unlock(&rk_phy->pcie_mutex); - return 0; - -err_reset: - - clk_disable_unprepare(rk_phy->clk_pciephy_ref); -err_refclk: - rk_phy->init_cnt--; mutex_unlock(&rk_phy->pcie_mutex); return err; } @@ -312,8 +301,6 @@ static int rockchip_pcie_phy_exit(struct phy *phy) if (--rk_phy->init_cnt) goto err_init_cnt; - clk_disable_unprepare(rk_phy->clk_pciephy_ref); - err_init_cnt: mutex_unlock(&rk_phy->pcie_mutex); return 0; @@ -375,11 +362,10 @@ static int rockchip_pcie_phy_probe(struct platform_device *pdev) return dev_err_probe(&pdev->dev, PTR_ERR(rk_phy->phy_rst), "missing phy property for reset controller\n"); - rk_phy->clk_pciephy_ref = devm_clk_get(dev, "refclk"); - if (IS_ERR(rk_phy->clk_pciephy_ref)) { - dev_err(dev, "refclk not found.\n"); - return PTR_ERR(rk_phy->clk_pciephy_ref); - } + rk_phy->clk_pciephy_ref = devm_clk_get_enabled(dev, "refclk"); + if (IS_ERR(rk_phy->clk_pciephy_ref)) + return dev_err_probe(&pdev->dev, PTR_ERR(rk_phy->clk_pciephy_ref), + "failed to get phyclk\n"); /* parse #phy-cells to see if it's legacy PHY model */ if (of_property_read_u32(dev->of_node, "#phy-cells", &phy_num)) From patchwork Sat Oct 12 07:19:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Moon X-Patchwork-Id: 13833303 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8DA3FD1A442 for ; Sat, 12 Oct 2024 07:25:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=SkcaWozzpj9MG4GmN3ugDXMc5NZgOdfnoW38SB++jZM=; b=i+fkI5ZjmWszgu 3zambFqHVzF2LPg/TvxoIDDPtArNhQRdrbquqSV/0ZT07yjr5F6H2t7XuSBKMwxhhh+s87syHcRMR 2mnjZ/k47CCw32oQDXixiy7AcLC8fkF/CGRMg1YUFQsHaI8AwMQ23Foy32IWhlroxpBThCiRVjhNJ 3nKCn1U8QxSxcXIL587hdcMxujYhjylv4S0BcreSFLBoBZkiRHSah/OVQ388G8wF69bZxmN51FRjT ehxCxsGnbKbnM7oj2wUsXJVRu4KGAyMxUh0MtDrCMMpMyWKkIqhc/0SIYdUPcUwrsKXa8MD28mblI XKxrktDz1dj0X4uPuxew==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1szWUx-00000000hfE-1RW9; Sat, 12 Oct 2024 07:25:11 +0000 Received: from mail-pf1-x430.google.com ([2607:f8b0:4864:20::430]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1szWPm-00000000h1U-1RxX; Sat, 12 Oct 2024 07:19:51 +0000 Received: by mail-pf1-x430.google.com with SMTP id d2e1a72fcca58-71df2de4ed4so1851965b3a.0; Sat, 12 Oct 2024 00:19:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728717589; x=1729322389; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ei1bnltRJdZvKwzxVRf43H9d7hPRtvBawiK2S1vBv6g=; b=Ykftc77yXuS9c4xpL75/HtNYgN5KQZ5IKTJi6pbO2QKtPKaUC7sCXXNDJqbx8kpg9p KyacdC0hH5FBj7flJH0yTFllvzg1JhwQNYsLcYWevZ7cCrrPD4BCNwTjxdpNfPf3vGhE Axo8Kg6DPgskjL1rV7ipW/0ZApNvREGj7vdlmFOqz6Pcqiq9MZz01a5cXmet/G/+D/Mw SrWwPby7pF9xrWgSTcJQhtjVnAGYCMJnLEZpbvTLkwd18ji9WJsG0SXTxah08CPRN2rW LLxVcRMjjdFLS2owT6INcQv0denoWTYtlKv7Oh4OcM6x5kg/B34X83t+AvbGI56IZiYe q9Uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728717589; x=1729322389; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ei1bnltRJdZvKwzxVRf43H9d7hPRtvBawiK2S1vBv6g=; b=qzzfH/iW10yyYFljQe27EtkwG+jGf47fskB8C9u2LaDiGkp5NJwWc8u1Iiz3HkXcED 75G4Cdv8frQgef7bBDGSgMM/pBa2UDf5wzBdUisKM3KTJ4ptBhdEjKOMXkic4KXRuHs7 ATIGz/FA9Tl2glfsg7QCDOVA3qbbx+g24mcaK0avRZ5IvMro66suKVgVDxRq2LI3B0d7 C6pu4KcMBJwVTfIKsaeRi5cnJODhS3HAqhM3X7l3PN35rxWsaPiJ/HWbaAxLsjBH/H2t c/V+OOygORQGLN8cW98y4UZgkTshKQOqDee7NkUqocQglda3bWrDEcbPVDvixq/756UZ 0SgA== X-Forwarded-Encrypted: i=1; AJvYcCV2jYB6obWs7ya/PPhKvvewgfRRJVmRYsqOL1RSsb1dB5qc+ZKrctwrnA8LPzfMh9hVZJpklBumQOP0@lists.infradead.org, AJvYcCWRpyXeyMHAo7LRfsAQxWVdQ3QdBldSkycbZ/d0e90aflH+/P0jTMyhh37VCTT7rlr2P1CQ+koECjhqnWqhAZxm@lists.infradead.org, AJvYcCXSa9JgVLuccvGCcnQ57YBS8m91eiy66e31vLQBCdRNg9Qw7YyaKJHZcckfyvpttG1S8tfa50hfjLebQRnXRCg=@lists.infradead.org X-Gm-Message-State: AOJu0YwiqH8qoxTSuvO3qWS49fc3UGHJKnTyi3IJhsC7FvAC1+bZQ76U JnRAERCom8m5ffD45x/aQkLwtEuKoE3pYAXS/vKDVuu9L0el/cZ9 X-Google-Smtp-Source: AGHT+IGHNnL0hR5nCBDTCirZJfQbJMU9jdSi821rPi96/CgZugLrK7sJ+5WJuuelZIParpqlLGUGPw== X-Received: by 2002:aa7:8e5a:0:b0:71d:f240:ec5 with SMTP id d2e1a72fcca58-71e26effbf5mr14046534b3a.14.1728717589354; Sat, 12 Oct 2024 00:19:49 -0700 (PDT) Received: from localhost.localdomain ([113.30.217.221]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71e2aaba171sm3664620b3a.161.2024.10.12.00.19.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Oct 2024 00:19:49 -0700 (PDT) From: Anand Moon To: Vinod Koul , Kishon Vijay Abraham I , Heiko Stuebner , Philipp Zabel , linux-phy@lists.infradead.org (open list:GENERIC PHY FRAMEWORK), linux-arm-kernel@lists.infradead.org (moderated list:ARM/Rockchip SoC support), linux-rockchip@lists.infradead.org (open list:ARM/Rockchip SoC support), linux-kernel@vger.kernel.org (open list) Cc: Anand Moon , Dan Carpenter Subject: [PATCH v3 3/6] phy: rockchip-pcie: Use regmap_read_poll_timeout() for PCIe reference clk PLL status Date: Sat, 12 Oct 2024 12:49:05 +0530 Message-ID: <20241012071919.3726-4-linux.amoon@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20241012071919.3726-1-linux.amoon@gmail.com> References: <20241012071919.3726-1-linux.amoon@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241012_001950_405757_1C8DCAC0 X-CRM114-Status: GOOD ( 12.61 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Replace open-coded phy PCIe reference clk PLL status polling with regmap_read_poll_timeout API. This change simplifies the code without altering functionality. Signed-off-by: Anand Moon --- v3: None. v2: Fix the subject, add the missing () in the function name, Fix the typo reference v1: None. --- drivers/phy/rockchip/phy-rockchip-pcie.c | 56 +++++++----------------- 1 file changed, 15 insertions(+), 41 deletions(-) diff --git a/drivers/phy/rockchip/phy-rockchip-pcie.c b/drivers/phy/rockchip/phy-rockchip-pcie.c index b5b1b1a667b2..e60f24b0b363 100644 --- a/drivers/phy/rockchip/phy-rockchip-pcie.c +++ b/drivers/phy/rockchip/phy-rockchip-pcie.c @@ -162,7 +162,6 @@ static int rockchip_pcie_phy_power_on(struct phy *phy) struct rockchip_pcie_phy *rk_phy = to_pcie_phy(inst); int err = 0; u32 status; - unsigned long timeout; mutex_lock(&rk_phy->pcie_mutex); @@ -191,21 +190,11 @@ static int rockchip_pcie_phy_power_on(struct phy *phy) * so we make it large enough here. And we use loop-break * method which should not be harmful. */ - timeout = jiffies + msecs_to_jiffies(1000); - - err = -EINVAL; - while (time_before(jiffies, timeout)) { - regmap_read(rk_phy->reg_base, - rk_phy->phy_data->pcie_status, - &status); - if (status & PHY_PLL_LOCKED) { - dev_dbg(&phy->dev, "pll locked!\n"); - err = 0; - break; - } - msleep(20); - } - + err = regmap_read_poll_timeout(rk_phy->reg_base, + rk_phy->phy_data->pcie_status, + status, + status & PHY_PLL_LOCKED, + 200, 100000); if (err) { dev_err(&phy->dev, "pll lock timeout!\n"); goto err_pll_lock; @@ -214,19 +203,11 @@ static int rockchip_pcie_phy_power_on(struct phy *phy) phy_wr_cfg(rk_phy, PHY_CFG_CLK_TEST, PHY_CFG_SEPE_RATE); phy_wr_cfg(rk_phy, PHY_CFG_CLK_SCC, PHY_CFG_PLL_100M); - err = -ETIMEDOUT; - while (time_before(jiffies, timeout)) { - regmap_read(rk_phy->reg_base, - rk_phy->phy_data->pcie_status, - &status); - if (!(status & PHY_PLL_OUTPUT)) { - dev_dbg(&phy->dev, "pll output enable done!\n"); - err = 0; - break; - } - msleep(20); - } - + err = regmap_read_poll_timeout(rk_phy->reg_base, + rk_phy->phy_data->pcie_status, + status, + !(status & PHY_PLL_OUTPUT), + 200, 100000); if (err) { dev_err(&phy->dev, "pll output enable timeout!\n"); goto err_pll_lock; @@ -236,19 +217,12 @@ static int rockchip_pcie_phy_power_on(struct phy *phy) HIWORD_UPDATE(PHY_CFG_PLL_LOCK, PHY_CFG_ADDR_MASK, PHY_CFG_ADDR_SHIFT)); - err = -EINVAL; - while (time_before(jiffies, timeout)) { - regmap_read(rk_phy->reg_base, - rk_phy->phy_data->pcie_status, - &status); - if (status & PHY_PLL_LOCKED) { - dev_dbg(&phy->dev, "pll relocked!\n"); - err = 0; - break; - } - msleep(20); - } + err = regmap_read_poll_timeout(rk_phy->reg_base, + rk_phy->phy_data->pcie_status, + status, + status & PHY_PLL_LOCKED, + 200, 100000); if (err) { dev_err(&phy->dev, "pll relock timeout!\n"); goto err_pll_lock; From patchwork Sat Oct 12 07:19:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Moon X-Patchwork-Id: 13833304 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2BD2DD1A442 for ; Sat, 12 Oct 2024 07:26:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=durKsc+n0i8ULUm31keJ8jocer/xxYx9t0cnKMI/IWc=; b=NAZq21XVaqTa46 BNhCFOzhh5qUVO/YiYbjWYJu/z0l/gqIhFLFnnBjeh+O6v3ytEZSpCmeqDVNNRWCdrhghxCLNkBx1 2kkyTa1QJ+QCUCojr9FMyQWNIKsFOCrsCCSzky88j8EJBOt7QJfGJ933Pim/I5S2bq8JaFb20qeBH +nx/tPI2+FnuhkI6VzWtjZuI7lLZiUyNZJmLSbBT0gitH9YxmFoITx1eUK6sMaX6QTU9VccKTDbo7 feWReT7PdOnMyND8Xfj4wzL1y2+JzDUtLnIeC5mL9rfsAYGMa0VBKkmc5sEABKNpAjmzCxKXIXIya D31sAmFWC0iHGe3dEWJA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1szWWH-00000000hvb-3koq; Sat, 12 Oct 2024 07:26:33 +0000 Received: from mail-pf1-x42b.google.com ([2607:f8b0:4864:20::42b]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1szWPr-00000000h2k-1CuC; Sat, 12 Oct 2024 07:19:56 +0000 Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-71e52582d0bso84203b3a.3; Sat, 12 Oct 2024 00:19:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728717594; x=1729322394; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=97G2TijBo7TJKDwdLKVOfvTHrYI49lDUOlitVvXkVUE=; b=PvWM4nLRksmA2KKeYRmejHQW8hLmAlX0Pt2t2KugITsaR25vWhql0t8/OZcDTzEpzK RUskU9O8hY/qt5+Mv9XZlUuwqMz5xbDEiP3zReYFrJoXMM4Qq14VMM2A9VmWSnWqdrOV SfNoimGh22gpxLJV4v3h/EhSXX+PDshrgUOcM/3yW9JSUR3EXbBaNKAaDR3EHffYWFxV 1cmzs25OOQhbXIkd/VI67LJuBCANsGfMjkQyPZB7kNvoK8A3+RYCVA4ooEUiJ1khjV9V Qpy05UXea4E6tDvGVcx3xxKC1eQmt3yTRw/zU4Mebt/gYVMhQh3/9q5N6ISHe6iqRsq8 6A7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728717594; x=1729322394; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=97G2TijBo7TJKDwdLKVOfvTHrYI49lDUOlitVvXkVUE=; b=gd7P8j3I7XdtB13DCUAb8xHHcKj2/oKNHQGnPqWsD6BW/NOtjwb4o73RmeJTRYQs1N K9yY7FtayOzyGZ2g+wX6wyGMUmkVlwjBV7cg7b2y6wDJGNF7L7Fn52FDmHzEu6WmmN6V sjt1niup/CTIMzIPMhqol+lT8H5YtDuounp1vkVSha0hEask29F0xLjW6mmEtQzXygBg n3eprKPy1H1MpR49vl5iM2ihAHBTZS0BgIMl/g6axry573YRBgveviVh/hfqo2gotexj 4LhUVN8HPuME6pvmzabDQdZfUGFSqno/x6Ii8DJ9ldYLDa/scfg3NDe5ddi4pVSZaH0s 47sQ== X-Forwarded-Encrypted: i=1; AJvYcCV4QDVpITZafXHuU06xuzX0VGCflYC4YI71Q4W2JR5kiSl0HCZRPqStzTovX/ARF9m3VD8xfLC12Oc2iiAD6/k=@lists.infradead.org, AJvYcCW1ZhCw+fdr4PCL8yMIeXt0Tx/KHqjFllhvfqawCHsJYHdFFkH8pc9L+RBAmQt7W7VwlJNU9psAf6Dera03jp6i@lists.infradead.org, AJvYcCXER+oaPEpR7HUC616RLiyXe+Zecbz0kRA5dc5B1ndK5Xj0iNw6soWd7GRp/OKvNcDNnlpot2GCDNiz@lists.infradead.org X-Gm-Message-State: AOJu0YzLGbPXGlDI2+t2lZR4ueF5MmsPs9PKxXDMy3GzA0hdRYOzYqgg BJ2rYdQ9DMYJBJZxelIHKIQq2bHh3G32mX+IxvUQu7E9isu3Alv+ X-Google-Smtp-Source: AGHT+IGQCNKpLK6KUs8VSkaJ0d7emmgc4XI8SJDHYeYoaej9YcBG4bftnc4g9GOFwvVQAzJ0Rkljkw== X-Received: by 2002:a05:6a00:189a:b0:71e:4655:59ce with SMTP id d2e1a72fcca58-71e4c03044cmr3762274b3a.0.1728717594320; Sat, 12 Oct 2024 00:19:54 -0700 (PDT) Received: from localhost.localdomain ([113.30.217.221]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71e2aaba171sm3664620b3a.161.2024.10.12.00.19.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Oct 2024 00:19:54 -0700 (PDT) From: Anand Moon To: Vinod Koul , Kishon Vijay Abraham I , Heiko Stuebner , Philipp Zabel , linux-phy@lists.infradead.org (open list:GENERIC PHY FRAMEWORK), linux-arm-kernel@lists.infradead.org (moderated list:ARM/Rockchip SoC support), linux-rockchip@lists.infradead.org (open list:ARM/Rockchip SoC support), linux-kernel@vger.kernel.org (open list) Cc: Anand Moon , Dan Carpenter Subject: [PATCH v3 4/6] phy: rockchip-pcie: Refactor mutex handling in rockchip_pcie_phy_power_off() Date: Sat, 12 Oct 2024 12:49:06 +0530 Message-ID: <20241012071919.3726-5-linux.amoon@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20241012071919.3726-1-linux.amoon@gmail.com> References: <20241012071919.3726-1-linux.amoon@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241012_001955_346263_FADB36A6 X-CRM114-Status: GOOD ( 12.78 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Refactor the mutex handling in the rockchip_pcie_phy_power_off() function to improve code readability and maintainability. The goto statement has been removed, and the mutex_unlock call is now directly within the conditional block. Return the result of reset_control_assert() function, with 0 indicating success and an error code indicating failure Signed-off-by: Anand Moon --- v3: New patch. --- drivers/phy/rockchip/phy-rockchip-pcie.c | 26 +++++++++++------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/drivers/phy/rockchip/phy-rockchip-pcie.c b/drivers/phy/rockchip/phy-rockchip-pcie.c index e60f24b0b363..c84a3c209315 100644 --- a/drivers/phy/rockchip/phy-rockchip-pcie.c +++ b/drivers/phy/rockchip/phy-rockchip-pcie.c @@ -132,26 +132,24 @@ static int rockchip_pcie_phy_power_off(struct phy *phy) PHY_LANE_IDLE_MASK, PHY_LANE_IDLE_A_SHIFT + inst->index)); - if (--rk_phy->pwr_cnt) - goto err_out; + if (--rk_phy->pwr_cnt) { + mutex_unlock(&rk_phy->pcie_mutex); + return 0; + } err = reset_control_assert(rk_phy->phy_rst); if (err) { dev_err(&phy->dev, "assert phy_rst err %d\n", err); - goto err_restore; + rk_phy->pwr_cnt++; + regmap_write(rk_phy->reg_base, + rk_phy->phy_data->pcie_laneoff, + HIWORD_UPDATE(!PHY_LANE_IDLE_OFF, + PHY_LANE_IDLE_MASK, + PHY_LANE_IDLE_A_SHIFT + inst->index)); + mutex_unlock(&rk_phy->pcie_mutex); + return err; } -err_out: - mutex_unlock(&rk_phy->pcie_mutex); - return 0; - -err_restore: - rk_phy->pwr_cnt++; - regmap_write(rk_phy->reg_base, - rk_phy->phy_data->pcie_laneoff, - HIWORD_UPDATE(!PHY_LANE_IDLE_OFF, - PHY_LANE_IDLE_MASK, - PHY_LANE_IDLE_A_SHIFT + inst->index)); mutex_unlock(&rk_phy->pcie_mutex); return err; } From patchwork Sat Oct 12 07:19:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Moon X-Patchwork-Id: 13833305 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B6EC4D1A431 for ; Sat, 12 Oct 2024 07:28:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=AX2FVbVSbLeDOMH9fAvpDpGuPW+93x8t0WzOVQrzh90=; b=IsJuw/iFc2xts6 TgTJhZbQ/ls13ZrFDf65A5yfWnyzfa0dmndLJREScokRLxOjrFe13aOlKpFCK2DDiK8DgjUolE0EI Rk2TRDFRn+/StBD9xjH8kofwbZF9JM8KQzaW1gWiaTnD2Hngo/JiEF8sNyZoHeG5DC/QuLKaNCMqX pvDr/gkNxiE4+a7hFTk4t4ar4ihw+EM8SlyFIpmlWkYEp0eQeE2NdUfMf/vU4e6+LmMghmRNWoWOk vBuPbyzyctOZdL5cJXxZ6X1SQBAlUINCK+b2wY5jV4QNQVVJJ4wwq9mZ1iHMn/lJfd+62EtDM+Cex sSDeIipZ8wirctHJXh/w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1szWXd-00000000i8d-1ca0; Sat, 12 Oct 2024 07:27:57 +0000 Received: from mail-pg1-x535.google.com ([2607:f8b0:4864:20::535]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1szWPw-00000000h4L-1GyT; Sat, 12 Oct 2024 07:20:01 +0000 Received: by mail-pg1-x535.google.com with SMTP id 41be03b00d2f7-7e9f8d67df9so1984272a12.1; Sat, 12 Oct 2024 00:19:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728717599; x=1729322399; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tveNarpSwjlEhM4Qolz0xMrvg/75/UUwTA0pqhWJ0Mw=; b=LL+pxCrE3cbplR7VNUitWXvjXinjz/BK7sryIsEwxJaYrLoE+Oqy+8R4jsM/RnFhX8 876vWcieSUpDj6X8Sld4UbiU7igO+EVNwG2ZFWHS7gj4yhDKSuWQwwJe3rn8a93+J3V6 pQDicXljzwh5+NAdiINjv05mzitBuf6xRyNUV+FGcH0tjXn/94DoOgIj8ogM44q7JqJJ xi9OT+CvxJARV7hKid5S+ok0cAdx/ksrUibx0zEz/IG8T1g7Lbu80twTxZSJSmjczBko Jq9Qjv6RiweR5fmZVgNG0DYF6+afFDZwh59GXDF45QqEuMgLHiTOZ5jpMjQ45gceCZcz a6Gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728717599; x=1729322399; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tveNarpSwjlEhM4Qolz0xMrvg/75/UUwTA0pqhWJ0Mw=; b=LafPU5hMoDTvXpQJcmMITA+Rkv/pqqj55/0TO07FccE0rJ8BocJ7ym/xq+TjHy1WKv nn+VJJGb5LrcraUAWVIkaghgR0IJtbPkS6na7lKcnJ+hqZQWpedo+GIzEJQU/Ou9VHQG /1jnbm6hXUHo8elqDL0nA+OghqqF0BTLjzLaDN9HOOQ8K31Rvoc9qlxF/zIA5MNpCwI4 GXjvHZLEiPZKwx/ER1YZSpjpwf7+OSvOLIPRHGD3lEtTzkxDF4aeKTcZekStM9tMq6eL kXZMeMdANDk+h2Fo0W3K50TMu9RwjvlLUyIoQwL887aklObUMns6h5rqIYlUeUPkTFni 9+kw== X-Forwarded-Encrypted: i=1; AJvYcCUretZNbHZDB79wgmszjX0+t6tBaUqRJu32FgYkiavrxZw5bLb/h+g7oNBgj90YDJlKpngW+Q8dd+Zk@lists.infradead.org, AJvYcCVmYoQnPOdBHrsgS8+ThBfGP95O6MiOVoTDYKqh/NYRCpLZ9Jbeh10SfDwdV3PIz+3BIkgnEGelF7w2QHlQr0xF@lists.infradead.org, AJvYcCXi1oHv4ClapYRjPZtxMdMBmkjEUllKcFt6MQxG8Ak64FBNDwBk9X1214NQaQFXoBy6vUHQO9VyJ2OpViAXb+4=@lists.infradead.org X-Gm-Message-State: AOJu0YxD77bPNQbgVMtLO9HPlRIMsfCfTTKfMLG37w5UvB5GGw8PA895 tpmoOR2WfhDq8+rRMVSXKEJLr3RI0hIHR8yjETZH0q4lKmHCG4Uq X-Google-Smtp-Source: AGHT+IHa+OOul8kkfcVe5xb551ye568I+GFpxdHlOz9EhP0OrqwzuVKv5lNmoyUlXuqKze6HkNM1TQ== X-Received: by 2002:a05:6a21:6e4b:b0:1cf:e5e4:d225 with SMTP id adf61e73a8af0-1d8bcfaa171mr6538150637.37.1728717599290; Sat, 12 Oct 2024 00:19:59 -0700 (PDT) Received: from localhost.localdomain ([113.30.217.221]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71e2aaba171sm3664620b3a.161.2024.10.12.00.19.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Oct 2024 00:19:59 -0700 (PDT) From: Anand Moon To: Vinod Koul , Kishon Vijay Abraham I , Heiko Stuebner , Philipp Zabel , linux-phy@lists.infradead.org (open list:GENERIC PHY FRAMEWORK), linux-arm-kernel@lists.infradead.org (moderated list:ARM/Rockchip SoC support), linux-rockchip@lists.infradead.org (open list:ARM/Rockchip SoC support), linux-kernel@vger.kernel.org (open list) Cc: Anand Moon , Dan Carpenter Subject: [PATCH v3 5/6] phy: rockchip-pcie: Refactor mutex handling in rockchip_pcie_phy_power_on() Date: Sat, 12 Oct 2024 12:49:07 +0530 Message-ID: <20241012071919.3726-6-linux.amoon@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20241012071919.3726-1-linux.amoon@gmail.com> References: <20241012071919.3726-1-linux.amoon@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241012_002000_362622_DE4A4C32 X-CRM114-Status: GOOD ( 13.26 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Refactor the mutex handling in the rockchip_pcie_phy_power_on() function to improve code readability and maintainability. The goto statement has been removed, and the mutex_unlock call is now directly within the conditional block. Return the result of reset_control_deassert() or regmap_read_poll_timeout() function, with 0 indicating success and an error code indicating failure. Signed-off-by: Anand Moon --- v3: New patch. --- drivers/phy/rockchip/phy-rockchip-pcie.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/phy/rockchip/phy-rockchip-pcie.c b/drivers/phy/rockchip/phy-rockchip-pcie.c index c84a3c209315..6dd014625226 100644 --- a/drivers/phy/rockchip/phy-rockchip-pcie.c +++ b/drivers/phy/rockchip/phy-rockchip-pcie.c @@ -163,13 +163,17 @@ static int rockchip_pcie_phy_power_on(struct phy *phy) mutex_lock(&rk_phy->pcie_mutex); - if (rk_phy->pwr_cnt++) - goto err_out; + if (rk_phy->pwr_cnt++) { + mutex_unlock(&rk_phy->pcie_mutex); + return 0; + } err = reset_control_deassert(rk_phy->phy_rst); if (err) { dev_err(&phy->dev, "deassert phy_rst err %d\n", err); - goto err_pwr_cnt; + rk_phy->pwr_cnt--; + mutex_unlock(&rk_phy->pcie_mutex); + return err; } regmap_write(rk_phy->reg_base, rk_phy->phy_data->pcie_conf, @@ -226,13 +230,11 @@ static int rockchip_pcie_phy_power_on(struct phy *phy) goto err_pll_lock; } -err_out: mutex_unlock(&rk_phy->pcie_mutex); - return 0; + return err; err_pll_lock: reset_control_assert(rk_phy->phy_rst); -err_pwr_cnt: rk_phy->pwr_cnt--; mutex_unlock(&rk_phy->pcie_mutex); return err; From patchwork Sat Oct 12 07:19:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Moon X-Patchwork-Id: 13833306 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6CB81D1A443 for ; Sat, 12 Oct 2024 07:29:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=E9zPr+2q/pL/uVATcuQGL92ZJDLT4pt6X6ouoeRWq/U=; b=xxuYSPP+QPNRKL S8+fbEZGLPK4DnR4+CB18GSelmDnYt8DNW55jOkWkDCrM7wWeX0Gnt4Z4QTbFwMcyJgIz/wemqNEt qEXhaNQdK6czs7/abxwRcQk2lCCIrGLxqwGzupoQoyqGq/nFynmQZ6nVCGhbpG+xJTUqpkltHVkIs blqVxpZDoKlEyn0fU+DehXpjWRANYsP3jwRgX3WjtT+xT8bLL1ZcaGX3s0LZ04ujHTA2mw4DHxxWf YtRsy3vuQGPQcuFmrLl3xlu52XNu28Hhlq6qcPN3tQaFLHn96Tto6qayTJ6GAnvS3/kL6PTjHuy7F VpdoA7neMsKdoiS0XG/g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1szWYx-00000000iFm-3sU3; Sat, 12 Oct 2024 07:29:19 +0000 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1szWQ1-00000000h68-03Gp; Sat, 12 Oct 2024 07:20:06 +0000 Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-71e1a715c72so2056822b3a.1; Sat, 12 Oct 2024 00:20:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728717604; x=1729322404; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9ApDa1aMFJqfOVoyoGKBNzlcDrQSgxcYXTomesTpCDA=; b=NwHSCNATDgnMXCuoh6bkFuj5HCm6KdGmGOWpAvqZI4ujzEy0oLsOE+npqgLOw6GAgr wIvoG+vMIM0KuZQyZe1UGR6r6ByX6LBXfRJvuJBuPmnwWFcWIgC2Eb+KfIGPx26K/dn9 ZO6G7gocEIwpLfS5m0rejfhUKUgIP1qTYfj2LWkBbAzTshC+BRxB3XEBV3xQzNBz69Yz jhosZtbNKRQmJ7mXR7l3QkTYc2duoUuNITfT5X9I2kjul0x4hzqKwbrQl42NalIVIAXL aX/4haDj48RDXYVIbR1CR0ZLoHF4/DJg1eNmyoPPfYNh3xqPWXWX8nGbIr+JDMg5GvBe Xtug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728717604; x=1729322404; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9ApDa1aMFJqfOVoyoGKBNzlcDrQSgxcYXTomesTpCDA=; b=ZjpkMDnuf8h0UvhAYoVFmUHqkAlOVl1Vl8p6WMB6gkGUhmIWN0CsuA5g0vxEzBA//S ucQRhzHXbKku/a/Wh5kdXYLuxCWwkR/HW7IBfxUgK7jBlZh8r+U2lNKvU7sDtllSv7pj N257Eg/6XEGjqSVREa7y7I76vT5T/QiSTY2gskErGWQbZGSzqwYKebNW1vWDkzV06DYF M5pw5nSO/hkteYh9LmA9HC9NxseqcRx8g7yS6EQvzcivo6LUmIN9RwoZhXACspU+Qgxe r7HHEq7Ep5H1BV4bQgZWL+64f/vlguQn+tbQ5FVmGwa/sDcyrGFLCe29FkNSt5I50LT2 L/uw== X-Forwarded-Encrypted: i=1; AJvYcCU0OE9XqapsNr9ts2s7fbz8YxGRgSQRlcIpoVtyC4kxxNdl4OPtB7S+SUy5A0syGLETw3Mlc6uvw7r8Qgj5ExA2@lists.infradead.org, AJvYcCVgSEZQSa7K2ZNOWPs+CnHQFhUyzLuUTnFSev9y+5YQ8mr7slBgPL5zydw6jiXaor9pdTs7Dgizf67ZZ8MKeQ0=@lists.infradead.org, AJvYcCWT2ojJibTPhGXkT43MsGmTRgExM7CS6sBpB1YdyUyZ5uktp2EUCKoQCiLNthMa+ostEZ+jbyn582uh@lists.infradead.org X-Gm-Message-State: AOJu0YzBvZ3RQZ9fwnR4B5cEsHuQU31egeeqQ5tjwtj4e0cbMY7HvYn+ b4ynDKau1T+D1tgmukpbCqjR4BszMSCPpHB7dN76WF/MN0t3daP/lNiG5Q== X-Google-Smtp-Source: AGHT+IFsw1Y6x7x4B49Cs5Sitm7AtWn/o4JBeTJPuqe7CDeq3DvEnDZYXFgGluNUXLU0iuQXhCPlsA== X-Received: by 2002:a05:6a00:1390:b0:71e:ba5:821b with SMTP id d2e1a72fcca58-71e3806bfefmr7441120b3a.27.1728717604256; Sat, 12 Oct 2024 00:20:04 -0700 (PDT) Received: from localhost.localdomain ([113.30.217.221]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71e2aaba171sm3664620b3a.161.2024.10.12.00.20.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Oct 2024 00:20:03 -0700 (PDT) From: Anand Moon To: Vinod Koul , Kishon Vijay Abraham I , Heiko Stuebner , Philipp Zabel , linux-phy@lists.infradead.org (open list:GENERIC PHY FRAMEWORK), linux-arm-kernel@lists.infradead.org (moderated list:ARM/Rockchip SoC support), linux-rockchip@lists.infradead.org (open list:ARM/Rockchip SoC support), linux-kernel@vger.kernel.org (open list) Cc: Anand Moon , Dan Carpenter Subject: [PATCH v3 6/6] phy: rockchip-pcie: Use guard notation when acquiring mutex Date: Sat, 12 Oct 2024 12:49:08 +0530 Message-ID: <20241012071919.3726-7-linux.amoon@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20241012071919.3726-1-linux.amoon@gmail.com> References: <20241012071919.3726-1-linux.amoon@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241012_002005_084465_2E3DA878 X-CRM114-Status: GOOD ( 11.46 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Using guard notation makes the code more compact and error handling more robust by ensuring that mutexes are released in all code paths when control leaves critical section. Signed-off-by: Anand Moon --- v3: New patch --- drivers/phy/rockchip/phy-rockchip-pcie.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/drivers/phy/rockchip/phy-rockchip-pcie.c b/drivers/phy/rockchip/phy-rockchip-pcie.c index 6dd014625226..bd44af36c67a 100644 --- a/drivers/phy/rockchip/phy-rockchip-pcie.c +++ b/drivers/phy/rockchip/phy-rockchip-pcie.c @@ -124,7 +124,7 @@ static int rockchip_pcie_phy_power_off(struct phy *phy) struct rockchip_pcie_phy *rk_phy = to_pcie_phy(inst); int err = 0; - mutex_lock(&rk_phy->pcie_mutex); + guard(mutex)(&rk_phy->pcie_mutex); regmap_write(rk_phy->reg_base, rk_phy->phy_data->pcie_laneoff, @@ -133,7 +133,6 @@ static int rockchip_pcie_phy_power_off(struct phy *phy) PHY_LANE_IDLE_A_SHIFT + inst->index)); if (--rk_phy->pwr_cnt) { - mutex_unlock(&rk_phy->pcie_mutex); return 0; } @@ -146,11 +145,9 @@ static int rockchip_pcie_phy_power_off(struct phy *phy) HIWORD_UPDATE(!PHY_LANE_IDLE_OFF, PHY_LANE_IDLE_MASK, PHY_LANE_IDLE_A_SHIFT + inst->index)); - mutex_unlock(&rk_phy->pcie_mutex); return err; } - mutex_unlock(&rk_phy->pcie_mutex); return err; } @@ -161,10 +158,9 @@ static int rockchip_pcie_phy_power_on(struct phy *phy) int err = 0; u32 status; - mutex_lock(&rk_phy->pcie_mutex); + guard(mutex)(&rk_phy->pcie_mutex); if (rk_phy->pwr_cnt++) { - mutex_unlock(&rk_phy->pcie_mutex); return 0; } @@ -172,7 +168,6 @@ static int rockchip_pcie_phy_power_on(struct phy *phy) if (err) { dev_err(&phy->dev, "deassert phy_rst err %d\n", err); rk_phy->pwr_cnt--; - mutex_unlock(&rk_phy->pcie_mutex); return err; } @@ -230,13 +225,11 @@ static int rockchip_pcie_phy_power_on(struct phy *phy) goto err_pll_lock; } - mutex_unlock(&rk_phy->pcie_mutex); return err; err_pll_lock: reset_control_assert(rk_phy->phy_rst); rk_phy->pwr_cnt--; - mutex_unlock(&rk_phy->pcie_mutex); return err; } @@ -246,10 +239,9 @@ static int rockchip_pcie_phy_init(struct phy *phy) struct rockchip_pcie_phy *rk_phy = to_pcie_phy(inst); int err = 0; - mutex_lock(&rk_phy->pcie_mutex); + guard(mutex)(&rk_phy->pcie_mutex); if (rk_phy->init_cnt++) { - mutex_unlock(&rk_phy->pcie_mutex); return 0; } @@ -257,11 +249,9 @@ static int rockchip_pcie_phy_init(struct phy *phy) if (err) { dev_err(&phy->dev, "assert phy_rst err %d\n", err); rk_phy->init_cnt--; - mutex_unlock(&rk_phy->pcie_mutex); return err; } - mutex_unlock(&rk_phy->pcie_mutex); return err; } @@ -270,13 +260,12 @@ static int rockchip_pcie_phy_exit(struct phy *phy) struct phy_pcie_instance *inst = phy_get_drvdata(phy); struct rockchip_pcie_phy *rk_phy = to_pcie_phy(inst); - mutex_lock(&rk_phy->pcie_mutex); + guard(mutex)(&rk_phy->pcie_mutex); if (--rk_phy->init_cnt) goto err_init_cnt; err_init_cnt: - mutex_unlock(&rk_phy->pcie_mutex); return 0; }