From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1752783AbdI3KiV (ORCPT <rfc822;w@1wt.eu>);
        Sat, 30 Sep 2017 06:38:21 -0400
Received: from mail-yw0-f176.google.com ([209.85.161.176]:53593 "EHLO
        mail-yw0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1750933AbdI3KiU (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Sat, 30 Sep 2017 06:38:20 -0400
X-Google-Smtp-Source: AOwi7QBwhI7obnhSMq+XfHBfZZ9ZCLLn0kARuloePae85ipfKW3NHFaWonAoMyPE75m6MaNFWtYJOPOIK2Uo49nV+A4=
MIME-Version: 1.0
In-Reply-To: <20170929235846.1913-1-dianders@chromium.org>
References: <20170929235846.1913-1-dianders@chromium.org>
From: Guenter Roeck <groeck@google.com>
Date: Sat, 30 Sep 2017 03:38:18 -0700
Message-ID: <CABXOdTdukST-8tRh6Z2mRTFYwseiknEzB7FL+uiz_PxYrYYjgw@mail.gmail.com>
Subject: Re: [PATCH] phy: rockchip-typec: Check for errors from tcphy_phy_init()
To: Douglas Anderson <dianders@chromium.org>
Cc: Kishon Vijay Abraham I <kishon@ti.com>,
        Guenter Roeck <groeck@chromium.org>, Chris <zyw@rock-chips.com>,
        wulf <wulf@rock-chips.com>,
        "open list:ARM/Rockchip SoC..." <linux-rockchip@lists.infradead.org>,
        linux-kernel <linux-kernel@vger.kernel.org>,
        Heiko Stuebner <heiko@sntech.de>, linux-arm-kernel@lists.infradead.org
Content-Type: text/plain; charset="UTF-8"
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Fri, Sep 29, 2017 at 4:58 PM, Douglas Anderson <dianders@chromium.org> wrote:
> The function tcphy_phy_init() could return an error but the callers
> weren't checking the return value.  They should.  In at least one case
> while testing I saw the message "wait pma ready timeout" which
> indicates that tcphy_phy_init() really could return an error and we
> should account for it.
>
> Signed-off-by: Douglas Anderson <dianders@chromium.org>

Reviewed-by: Guenter Roeck <groeck@chromium.org>

> ---
>
>  drivers/phy/rockchip/phy-rockchip-typec.c | 13 +++++++++----
>  1 file changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/phy/rockchip/phy-rockchip-typec.c b/drivers/phy/rockchip/phy-rockchip-typec.c
> index 4d2c57f21d76..38831eebc934 100644
> --- a/drivers/phy/rockchip/phy-rockchip-typec.c
> +++ b/drivers/phy/rockchip/phy-rockchip-typec.c
> @@ -685,8 +685,11 @@ static int rockchip_usb3_phy_power_on(struct phy *phy)
>         if (tcphy->mode == new_mode)
>                 goto unlock_ret;
>
> -       if (tcphy->mode == MODE_DISCONNECT)
> -               tcphy_phy_init(tcphy, new_mode);
> +       if (tcphy->mode == MODE_DISCONNECT) {
> +               ret = tcphy_phy_init(tcphy, new_mode);
> +               if (ret)
> +                       goto unlock_ret;
> +       }
>
>         /* wait TCPHY for pipe ready */
>         for (timeout = 0; timeout < 100; timeout++) {
> @@ -760,10 +763,12 @@ static int rockchip_dp_phy_power_on(struct phy *phy)
>          */
>         if (new_mode == MODE_DFP_DP && tcphy->mode != MODE_DISCONNECT) {
>                 tcphy_phy_deinit(tcphy);
> -               tcphy_phy_init(tcphy, new_mode);
> +               ret = tcphy_phy_init(tcphy, new_mode);
>         } else if (tcphy->mode == MODE_DISCONNECT) {
> -               tcphy_phy_init(tcphy, new_mode);
> +               ret = tcphy_phy_init(tcphy, new_mode);
>         }
> +       if (ret)
> +               goto unlock_ret;
>
>         ret = readx_poll_timeout(readl, tcphy->base + DP_MODE_CTL,
>                                  val, val & DP_MODE_A2, 1000,
> --
> 2.14.2.822.g60be5d43e6-goog
>