Received: by 2002:a05:6358:16cc:b0:ea:6187:17c9 with SMTP id r12csp8745573rwl; Tue, 10 Jan 2023 18:48:55 -0800 (PST) X-Google-Smtp-Source: AMrXdXsq4LpaNiqlpk5mxzKkZLl1WZCT4wb4Dz2xWC2PdGJ+w/IMp3gYWoxkt5ltyBm9UlX0++BV X-Received: by 2002:a05:6402:35b:b0:488:e7ae:5cc4 with SMTP id r27-20020a056402035b00b00488e7ae5cc4mr38132603edw.41.1673405335641; Tue, 10 Jan 2023 18:48:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673405335; cv=none; d=google.com; s=arc-20160816; b=IY6yVV+bMI8sOSj/h1HeWeZll0uNwt+jKNeNabUKMlflWwPe/diWqdE3vsAfr/5Aow Iaz6ihdH77DBKm3Rjuj1tXgA0WFHfailJH/2DMExqNB7jcFnR0uoQ4JXiSyEUQ+HaGgq V+M+DeQXx0AlUbeMJ/ByyWIKA8BTgIRtZGWMwHU234W5Cb9qvLwy0NCuyD167oaHb7LA KFMxTulv/1goG/ZFnXqTbGgrS6NokKiKNqOsie2I1YH2DawrDal8ur3tHPLD8GdMOZC4 lz6/Q2/6n2osRN9yMZEspvsOqkh+SWyrbznXrOVwiroYkMJqUiPL2HORGd0LN5fvz6jL lU7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=0cwyEc6KQYmQnChy+BikWZp8lFg76+cm/UHIItp73H0=; b=ARjNENbtmwjAiM+pOEZtMIvQ9lq+PNeAuKA6lulGwYFz4U9c6WLBEainJl6617jk0u QjDsyIudysaeUjTOv1YRf9i7YRthT6yo5XJBqpJ/I7REYRCp/cp/YuqS/8RT66d9cCKc b8Ts7b/ZCh60NG8EajwISgps+NlgNMtwWNl+MY2VzkbFuQsI+N3Q0gZijrWjsKaYbkHd 2ZX4tzgxZCoXhi3Uxpf6R52YPd20cbURLiGBx+XzEflyti3Ift/SmLjZlhzcT/pPv825 5Fiy5YTweiR/ycgy3X1jG0lCPYkwJVEMvli4REUrAJORfxEjrjelQDW/zw+WMM0KDalE UGvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=Fdbdt5jP; 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=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m6-20020a056402430600b0048a9be914edsi16372826edc.248.2023.01.10.18.48.43; Tue, 10 Jan 2023 18:48:55 -0800 (PST) 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=@google.com header.s=20210112 header.b=Fdbdt5jP; 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=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233839AbjAKCME (ORCPT + 53 others); Tue, 10 Jan 2023 21:12:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56766 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232021AbjAKCMB (ORCPT ); Tue, 10 Jan 2023 21:12:01 -0500 Received: from mail-pg1-x52c.google.com (mail-pg1-x52c.google.com [IPv6:2607:f8b0:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 52C6C64C7 for ; Tue, 10 Jan 2023 18:11:59 -0800 (PST) Received: by mail-pg1-x52c.google.com with SMTP id s67so9561608pgs.3 for ; Tue, 10 Jan 2023 18:11:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=0cwyEc6KQYmQnChy+BikWZp8lFg76+cm/UHIItp73H0=; b=Fdbdt5jP7KyPgvW4FZTiLdDjkV4nJa2aeCGEKY/q4hT1iS67KiEisH/90DxltiO5xa pu+3Vssbv+0WrkUm3+zirN1u3RkcbNYulzgvsV7pmmE8+YFVfIVQxWcRXGJln/cgHa+M UTeWx7l735ZmdRMksrya1PjnX6fa05mtxEow47JN35hBMlnQDV+YWlU2QBkvtugl+Irj NXvR8xjzaogFA2iJceuoyOYQL3T6EQBPGhsYlLZMcQVIM+SxOiFKVpqMIhN1iljOpD+V kVGrZMEZOERXAxHI+GNpkEe4MQEt7LMTH383fd6hX8yKQ4+Zse6cQG6szVct++bp8rV9 fAJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=0cwyEc6KQYmQnChy+BikWZp8lFg76+cm/UHIItp73H0=; b=BbQyEtN9PMP6drho7yNL3Te/w3FiOnmJrB1BFukYiVPCy6eeQgNZlTs2W5hsDe+mu4 FftwRXbG+wTlFeRteOhXGXqxOQn4hIigrgGWMVbeJb4/tB3iSffYhBsADaXf1n1PWafK +QYF0NluIPZ84h1sCq2EKM1QkCfEXD5KAkTY5To3VOJH5VQt3ESFWswVCA0v03nWst0P DXOu78O8mXsxh0yed8SVB5SK0jdQ3FgOrr3YOXEL9O99x79EaWiIpU5fThb4UdqHTd8a aILLNpDs9NakWBFU2We6jjwcnJYrU53+b0hHn4Ae8ydsDWfjkITfNPCpI//mbLiGFv3S Azdg== X-Gm-Message-State: AFqh2koaDZtYQag9RauszTwcHpaeRD2qYqaf2g1kWzcnI50mhgdi7wyv 4oqKP/corUtmHa4R13PRwFeKFstaCRn9M959 X-Received: by 2002:a05:6a00:368a:b0:581:bfac:7a52 with SMTP id dw10-20020a056a00368a00b00581bfac7a52mr169277pfb.1.1673403118438; Tue, 10 Jan 2023 18:11:58 -0800 (PST) Received: from google.com ([2620:15c:9d:2:6a48:569f:20c1:dc8]) by smtp.gmail.com with ESMTPSA id r5-20020aa79ec5000000b00589605fb0a1sm4145795pfq.96.2023.01.10.18.11.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 18:11:56 -0800 (PST) Date: Tue, 10 Jan 2023 18:11:51 -0800 From: Benson Leung To: Prashant Malani Cc: linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, bleung@chromium.org, stable@vger.kernel.org, Heikki Krogerus , Greg Kroah-Hartman , Guillaume Ranquet , Macpaul Lin , Pablo Sun Subject: Re: [PATCH 1/3] usb: typec: altmodes/displayport: Add pin assignment helper Message-ID: References: <20230111020546.3384569-1-pmalani@chromium.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="i4a3Me6WxQZxPfMJ" Content-Disposition: inline In-Reply-To: <20230111020546.3384569-1-pmalani@chromium.org> X-Spam-Status: No, score=-17.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS, USER_IN_DEF_DKIM_WL,USER_IN_DEF_SPF_WL 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 --i4a3Me6WxQZxPfMJ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Jan 11, 2023 at 02:05:41AM +0000, Prashant Malani wrote: > The code to extract a peripheral's currently supported Pin Assignments > is repeated in a couple of locations. Factor it out into a separate > function. >=20 > This will also make it easier to add fixes (we only need to update 1 > location instead of 2). >=20 > Fixes: c1e5c2f0cb8a ("usb: typec: altmodes/displayport: correct pin assig= nment for UFP receptacles") > Cc: stable@vger.kernel.org > Cc: Heikki Krogerus > Signed-off-by: Prashant Malani Reviewed-by: Benson Leung > --- >=20 > While this patch doesn't fix anything, it is required by the actual > fix (which is Patch 2/3 in this series). So, I've add the "Fixes" tag > and "Cc stable" tag to ensure that both patches are picked. >=20 > If this is the incorrect approach and there is a better way, my > apologies, and please let me know the appropriate process. >=20 > drivers/usb/typec/altmodes/displayport.c | 22 ++++++++++++++-------- > 1 file changed, 14 insertions(+), 8 deletions(-) >=20 > diff --git a/drivers/usb/typec/altmodes/displayport.c b/drivers/usb/typec= /altmodes/displayport.c > index 06fb4732f8cd..f9d4a7648bc9 100644 > --- a/drivers/usb/typec/altmodes/displayport.c > +++ b/drivers/usb/typec/altmodes/displayport.c > @@ -420,6 +420,18 @@ static const char * const pin_assignments[] =3D { > [DP_PIN_ASSIGN_F] =3D "F", > }; > =20 > +/* > + * Helper function to extract a peripheral's currently supported > + * Pin Assignments from its DisplayPort alternate mode state. > + */ > +static u8 get_current_pin_assignments(struct dp_altmode *dp) > +{ > + if (DP_CONF_CURRENTLY(dp->data.conf) =3D=3D DP_CONF_DFP_D) > + return DP_CAP_UFP_D_PIN_ASSIGN(dp->alt->vdo); > + else > + return DP_CAP_DFP_D_PIN_ASSIGN(dp->alt->vdo); > +} > + > static ssize_t > pin_assignment_store(struct device *dev, struct device_attribute *attr, > const char *buf, size_t size) > @@ -446,10 +458,7 @@ pin_assignment_store(struct device *dev, struct devi= ce_attribute *attr, > goto out_unlock; > } > =20 > - if (DP_CONF_CURRENTLY(dp->data.conf) =3D=3D DP_CONF_DFP_D) > - assignments =3D DP_CAP_UFP_D_PIN_ASSIGN(dp->alt->vdo); > - else > - assignments =3D DP_CAP_DFP_D_PIN_ASSIGN(dp->alt->vdo); > + assignments =3D get_current_pin_assignments(dp); > =20 > if (!(DP_CONF_GET_PIN_ASSIGN(conf) & assignments)) { > ret =3D -EINVAL; > @@ -486,10 +495,7 @@ static ssize_t pin_assignment_show(struct device *de= v, > =20 > cur =3D get_count_order(DP_CONF_GET_PIN_ASSIGN(dp->data.conf)); > =20 > - if (DP_CONF_CURRENTLY(dp->data.conf) =3D=3D DP_CONF_DFP_D) > - assignments =3D DP_CAP_UFP_D_PIN_ASSIGN(dp->alt->vdo); > - else > - assignments =3D DP_CAP_DFP_D_PIN_ASSIGN(dp->alt->vdo); > + assignments =3D get_current_pin_assignments(dp); > =20 > for (i =3D 0; assignments; assignments >>=3D 1, i++) { > if (assignments & 1) { > --=20 > 2.39.0.314.g84b9a713c41-goog >=20 --=20 Benson Leung Staff Software Engineer Chrome OS Kernel Google Inc. bleung@google.com Chromium OS Project bleung@chromium.org --i4a3Me6WxQZxPfMJ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQQCtZK6p/AktxXfkOlzbaomhzOwwgUCY74a5wAKCRBzbaomhzOw wq6cAP4jo9IaJb1NAWY9AIAvx8SZWPbNPw0K6Dg+oEggzndGzQD+ODFeM45PMrtK MQlrDSGenORZzmeqrJzQvANdlDmQNwg= =r9k1 -----END PGP SIGNATURE----- --i4a3Me6WxQZxPfMJ--