Received: by 2002:a05:7412:b10a:b0:f3:1519:9f41 with SMTP id az10csp1079782rdb; Fri, 1 Dec 2023 06:37:55 -0800 (PST) X-Google-Smtp-Source: AGHT+IGaZ42GrYRakjrx6MJj5+9ITdoGGDlFnLXjSquwMVT0mmFYFXmHUPlJKMBvwJCsbxe11iLb X-Received: by 2002:a17:90b:3504:b0:280:5b33:d30 with SMTP id ls4-20020a17090b350400b002805b330d30mr26976456pjb.44.1701441475158; Fri, 01 Dec 2023 06:37:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701441475; cv=none; d=google.com; s=arc-20160816; b=u7ZiHPy9YSOGljRV1qlRjoC/FqvZmT8fOZ3Zghuv4u62JHFr5jotVjBhcfs6HuIZay uOzjx3nta2iNGQEA7nkbN3n/LK4jsXld7AYra8y1n0Yp3YfOyo/JvqehZC+e7A+LupaQ I+CEYEaSdR1+1YZnkpcRi91/auuZ7kNY/TK26bOat4JrmxSDQOEQJ9rDbSm30ooUhmS5 NUaW5uct63MYx8KHyMZxDRynzoAGbCFpaRHEAI6KUGoS6dIadUMO1LgBIKyAjjaAwm6J IKlN1aOLE2R6lXvfTrmjZyhe6B1TPpHvztKoOnPMlxo5sWT0mPRSre2NB04d6PcWmJo4 0VKQ== 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=ULShdjIDeqpUlLxCn5qrOX2KN0/GS8ynHfDdWhz4bo0=; fh=FkJESjcbgeWdr+oRVE2Cavm0+YoJ79pbrqZJ+AdDSrE=; b=WQgDZef7RSmwtnmxOarNa8SFyygiJd97fryGWwKQ+gVL7AzcwDKCBGlOpuFr68/2LF 2xJ4PVWwCdGLNHNAtWu/NJ+uplv5DeMDe2GONiXbiT4qy6C3H4h4R2Hw7g2+bMJ4U3KR q388I+y2Oe+uw55r+rZY6cb0O4uuzB9bjMG5sP8pdiHQE0yzUhMYiXppyq1gltM7rGct +OF2BXzeG/sP8n869REdzjWDJTj1QXny3X5D6qHQvdOg+e36BLRZTNWzBysSNc+T7z55 oJcP0OdlyzsvMpr2TVX5Lxmbij0LT/n7OncxHGp44NTxKd+z5xkxcrd3eJrWw35dgn1h JHhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=S3eyAArY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id oo1-20020a17090b1c8100b00285ca776886si3632141pjb.171.2023.12.01.06.37.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Dec 2023 06:37:55 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=S3eyAArY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 72B408087267; Fri, 1 Dec 2023 06:37:13 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1379172AbjLAOgx (ORCPT + 99 others); Fri, 1 Dec 2023 09:36:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58652 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1379175AbjLAOgv (ORCPT ); Fri, 1 Dec 2023 09:36:51 -0500 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.13]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7AFA8170F; Fri, 1 Dec 2023 06:36:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1701441417; x=1732977417; h=date:from:to:cc:subject:message-id:references: mime-version:in-reply-to; bh=afYA1AgoCILBjnHXIm7ec+NWr7RitXHY+QgbaI2KsOI=; b=S3eyAArYPuG/Q5qoeFse/vYwVaLGKRilglgFYOMH0+10n2mdd4tHxFHo 94olqBPVSUbmqivTglCjx+WciahU5Vd9/uJiWBIXPYgN7QLtR1E4nbqO5 Ub2CUPAKVZfh4ximjKUA5AEIkV9Hx92S9pPB3L+WOQnabW56FwaWsww/B qRX9Wn5raQLkIVGidrPOjNhMOEVNg1RaVZrtO4DUa1ye84PFPZcYSX9WU Dshhw/gXEiklYdp/RqYIuWzKZhW0uPQ6FFJ9yP51Jo+/lR0jLZG1qP4ZD m0MtxcxqYaYexcZvKqNGpgm6cLyGeoc1fhxRA10FcmPE8pVmZxhIHGi8O g==; X-IronPort-AV: E=McAfee;i="6600,9927,10911"; a="512247" X-IronPort-AV: E=Sophos;i="6.04,241,1695711600"; d="scan'208";a="512247" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orvoesa105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Dec 2023 06:36:46 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10911"; a="1017049950" X-IronPort-AV: E=Sophos;i="6.04,241,1695711600"; d="scan'208";a="1017049950" Received: from kuha.fi.intel.com ([10.237.72.185]) by fmsmga006.fm.intel.com with SMTP; 01 Dec 2023 06:36:43 -0800 Received: by kuha.fi.intel.com (sSMTP sendmail emulation); Fri, 01 Dec 2023 16:36:41 +0200 Date: Fri, 1 Dec 2023 16:36:41 +0200 From: Heikki Krogerus To: RD Babiera Cc: gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, badhri@google.com, stable@vger.kernel.org Subject: Re: [PATCH v3] usb: typec: class: fix typec_altmode_put_partner to put plugs Message-ID: References: <20231129192349.1773623-2-rdbabiera@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231129192349.1773623-2-rdbabiera@google.com> X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Fri, 01 Dec 2023 06:37:13 -0800 (PST) On Wed, Nov 29, 2023 at 07:23:50PM +0000, RD Babiera wrote: > When typec_altmode_put_partner is called by a plug altmode upon release, > the port altmode the plug belongs to will not remove its reference to the > plug. The check to see if the altmode being released evaluates against the > released altmode's partner instead of the calling altmode itself, so change > adev in typec_altmode_put_partner to properly refer to the altmode being > released. > > typec_altmode_set_partner is not run for port altmodes, so also add a check > in typec_altmode_release to prevent typec_altmode_put_partner() calls on > port altmode release. > > Fixes: 8a37d87d72f0 ("usb: typec: Bus type for alternate modes") > Cc: stable@vger.kernel.org > Signed-off-by: RD Babiera Reviewed-by: Heikki Krogerus > --- > Changes since v2: > * Moved changelog under "Signed-off-by" tag > > Changes since v1: > * Changed commit message for clarity > * Added check to typec_altmode_release to only call put_partner if altmode > belongs to port partner or plug > --- > drivers/usb/typec/class.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/usb/typec/class.c b/drivers/usb/typec/class.c > index 2e0451bd336e..16a670828dde 100644 > --- a/drivers/usb/typec/class.c > +++ b/drivers/usb/typec/class.c > @@ -267,7 +267,7 @@ static void typec_altmode_put_partner(struct altmode *altmode) > if (!partner) > return; > > - adev = &partner->adev; > + adev = &altmode->adev; > > if (is_typec_plug(adev->dev.parent)) { > struct typec_plug *plug = to_typec_plug(adev->dev.parent); > @@ -497,7 +497,8 @@ static void typec_altmode_release(struct device *dev) > { > struct altmode *alt = to_altmode(to_typec_altmode(dev)); > > - typec_altmode_put_partner(alt); > + if (!is_typec_port(dev->parent)) > + typec_altmode_put_partner(alt); > > altmode_id_remove(alt->adev.dev.parent, alt->id); > kfree(alt); > > base-commit: 24af68a0ed53629bdde7b53ef8c2be72580d293b > -- > 2.43.0.rc1.413.gea7ed67945-goog -- heikki