From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 691ACC2BA19 for ; Tue, 14 Apr 2020 14:08:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4F45920578 for ; Tue, 14 Apr 2020 14:08:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389188AbgDNOIt (ORCPT ); Tue, 14 Apr 2020 10:08:49 -0400 Received: from bhuna.collabora.co.uk ([46.235.227.227]:44010 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389175AbgDNOIi (ORCPT ); Tue, 14 Apr 2020 10:08:38 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: eballetbo) with ESMTPSA id 0E9FB2A18CF Subject: Re: [PATCH v3 3/3] platform/chrome: typec: Register port partner To: Prashant Malani , linux-kernel@vger.kernel.org Cc: heikki.krogerus@linux.intel.com, Jon Flatley , Benson Leung , Guenter Roeck References: <20200410002316.202107-1-pmalani@chromium.org> <20200410002316.202107-4-pmalani@chromium.org> From: Enric Balletbo i Serra Message-ID: <025802e6-207c-305a-8146-3c07a3f36bb4@collabora.com> Date: Tue, 14 Apr 2020 16:08:32 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: <20200410002316.202107-4-pmalani@chromium.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Prashant, Thank you for your patch. On 10/4/20 2:23, Prashant Malani wrote: > Register (and unregister) the port partner when a connect (and > disconnect) is detected. > > Co-developed-by: Jon Flatley > Signed-off-by: Prashant Malani > --- > > Changes in v3: > - No changes. > > Changes in v2: > - Fixed error pointer return value. > > drivers/platform/chrome/cros_ec_typec.c | 48 +++++++++++++++++++++++++ > 1 file changed, 48 insertions(+) > > diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chrome/cros_ec_typec.c > index 56ded09a60ffb..304e0b20f279b 100644 > --- a/drivers/platform/chrome/cros_ec_typec.c > +++ b/drivers/platform/chrome/cros_ec_typec.c > @@ -22,6 +22,9 @@ struct cros_typec_port { > struct typec_port *port; > /* Initial capabilities for the port. */ > struct typec_capability caps; > + struct typec_partner *partner; > + /* Port partner PD identity info. */ > + struct usb_pd_identity p_identity; > }; > > /* Platform-specific data for the Chrome OS EC Type C controller. */ > @@ -190,6 +193,30 @@ static int cros_typec_ec_command(struct cros_typec_data *typec, > return ret; > } > > +static int cros_typec_add_partner(struct cros_typec_data *typec, int port_num, > + bool pd_en) > +{ > + struct cros_typec_port *port = typec->ports[port_num]; > + struct typec_partner_desc p_desc = { > + .usb_pd = pd_en, > + }; > + int ret = 0; > + > + /* > + * Fill an initial PD identity, which will then be updated with info > + * from the EC. > + */ > + p_desc.identity = &port->p_identity; > + > + port->partner = typec_register_partner(port->port, &p_desc); > + if (IS_ERR_OR_NULL(port->partner)) { > + ret = PTR_ERR(port->partner); If you're checking for IS_ERR_OR_NULL that means that port->partner can be NULL, so PTR_ERR(NULL) is 0 returning something that you don't really want. But looking at the typec_register_partner, NULL is not an option as returns a handle to the partner on success or ERR_PTR on failure. So, the code should just do: if (IS_ERR(port->partner)) return PTR_ERR(port->partner); And AFAICS you don't need to set port->partner to NULL. Can you double check this? Thanks, Enric > + port->partner = NULL; > + } > + > + return ret; > +} > + > static void cros_typec_set_port_params_v0(struct cros_typec_data *typec, > int port_num, struct ec_response_usb_pd_control *resp) > { > @@ -212,6 +239,8 @@ static void cros_typec_set_port_params_v1(struct cros_typec_data *typec, > { > struct typec_port *port = typec->ports[port_num]->port; > enum typec_orientation polarity; > + bool pd_en; > + int ret; > > if (!(resp->enabled & PD_CTRL_RESP_ENABLED_CONNECTED)) > polarity = TYPEC_ORIENTATION_NONE; > @@ -226,6 +255,25 @@ static void cros_typec_set_port_params_v1(struct cros_typec_data *typec, > TYPEC_SOURCE : TYPEC_SINK); > typec_set_vconn_role(port, resp->role & PD_CTRL_RESP_ROLE_VCONN ? > TYPEC_SOURCE : TYPEC_SINK); > + > + /* Register/remove partners when a connect/disconnect occurs. */ > + if (resp->enabled & PD_CTRL_RESP_ENABLED_CONNECTED) { > + if (typec->ports[port_num]->partner) > + return; > + > + pd_en = resp->enabled & PD_CTRL_RESP_ENABLED_PD_CAPABLE; > + ret = cros_typec_add_partner(typec, port_num, pd_en); > + if (!ret) > + dev_warn(typec->dev, > + "Failed to register partner on port: %d\n", > + port_num); > + } else { > + if (!typec->ports[port_num]->partner) > + return; > + > + typec_unregister_partner(typec->ports[port_num]->partner); > + typec->ports[port_num]->partner = NULL; > + } > } > > static int cros_typec_port_update(struct cros_typec_data *typec, int port_num) >