Received: by 2002:a05:6a10:c604:0:0:0:0 with SMTP id y4csp3777484pxt; Tue, 10 Aug 2021 11:05:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx9s8wb8c16oooBqlvVZf5vRyW8+0eOG58wultJbh2fJ8K4jgzxh/9ycEDY0ezQ1xLxDiOg X-Received: by 2002:a17:906:4d14:: with SMTP id r20mr13697424eju.473.1628618730188; Tue, 10 Aug 2021 11:05:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628618730; cv=none; d=google.com; s=arc-20160816; b=o6sf1fzfvRKSqh2Z8W/RwoVDvK+ByioBq7RFa/fesQVeYRjcdaAvk/LZi/Q8AAkdhc KFS0nx6rq0PcdQHyqQ120M9UlnduQnArmadXWuhzvuXGI2VtRt5hM5e7WeX3rquSYrPW 3/MnxrciW/81K0SG+pV4UAFjkM4jWQ2wY09onSbq87S9tK03dqPrGO1yQP+yvTzydxK6 4MFuuyd2DV9a7P5gw36I2eLt7RcYhQDdUkQ9rIha+e1kGS8SfLVFRSzxKwjXFv6nBvO2 WwgUmhjy++Pgx4fNdcVOo5uxTs5BApV+odOyXXgS8bAAJzXPPuNABHJQTL1p3WdiDcQs T6rA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=GDC9FsrGxJInymgTBWwDaOndPkgaW4GpDK4OeNXQ/CM=; b=A2tMJf5lq9+ot7hXqAUtavaRisrCNIbhJa4OZ6QDNdx3iMqoPh/lqXrdV6qGxmKLh4 N4J4wrDf+fzmHTW92FdsxWzdDwFsyHLjLKAmdIsEZC7J75Lf8W+imyKE7KAoTc4NY/Xk /B7Fj+WVJLrkWdLX9wl/y6uSz1Wu5IJ3XZ8CYe6ELCyG91v8rL0g70bhmLKySy8YBSkw CQZwrzOkBtQ7BULIMTRpjOXCZ60MZsHKQpawHImX+5QnbKob8njsRdUiHDL+w9xhGEYU yv86jnfoGxqq7waA5UMFgI+YkU8i7m56Y98MYP7Wf9z7536oK3pKs2AfH2o1cVqgxKnZ 0Z8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=orx1cwCW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bm26si1113243edb.367.2021.08.10.11.05.06; Tue, 10 Aug 2021 11:05:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=orx1cwCW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236524AbhHJSDS (ORCPT + 99 others); Tue, 10 Aug 2021 14:03:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:59580 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236497AbhHJR67 (ORCPT ); Tue, 10 Aug 2021 13:58:59 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9950F6113A; Tue, 10 Aug 2021 17:46:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1628617567; bh=rWzar62zifTqpmMCntjMbUBKnJw/jGeZW1B59B3H2EA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=orx1cwCWLwy8QC+1oxKv2cEZns6e0BDG83OyO6Fk2ufdECfDo19FritI4RcsXFMmg l4EEZzs6ck5F/AhenEqRBbRGBCqkZ3kZqbKWtyAMVTG2ePM58AhglV9HbvTaUJNwTz htaWVleCl3HKcTMu1p3vCKrAQB07f0OAaWEB2jCY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Badhri Jagan Sridharan , Guenter Roeck , Kyle Tso Subject: [PATCH 5.13 098/175] usb: typec: tcpm: Keep other events when receiving FRS and Sourcing_vbus events Date: Tue, 10 Aug 2021 19:30:06 +0200 Message-Id: <20210810173004.184959769@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810173000.928681411@linuxfoundation.org> References: <20210810173000.928681411@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kyle Tso commit 43ad944cd73f2360ec8ff31d29ea44830b3119af upstream. When receiving FRS and Sourcing_Vbus events from low-level drivers, keep other events which come a bit earlier so that they will not be ignored in the event handler. Fixes: 8dc4bd073663 ("usb: typec: tcpm: Add support for Sink Fast Role SWAP(FRS)") Cc: stable Cc: Badhri Jagan Sridharan Reviewed-by: Guenter Roeck Reviewed-by: Badhri Jagan Sridharan Signed-off-by: Kyle Tso Link: https://lore.kernel.org/r/20210803091314.3051302-1-kyletso@google.com Signed-off-by: Greg Kroah-Hartman --- drivers/usb/typec/tcpm/tcpm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/usb/typec/tcpm/tcpm.c +++ b/drivers/usb/typec/tcpm/tcpm.c @@ -5355,7 +5355,7 @@ EXPORT_SYMBOL_GPL(tcpm_pd_hard_reset); void tcpm_sink_frs(struct tcpm_port *port) { spin_lock(&port->pd_event_lock); - port->pd_events = TCPM_FRS_EVENT; + port->pd_events |= TCPM_FRS_EVENT; spin_unlock(&port->pd_event_lock); kthread_queue_work(port->wq, &port->event_work); } @@ -5364,7 +5364,7 @@ EXPORT_SYMBOL_GPL(tcpm_sink_frs); void tcpm_sourcing_vbus(struct tcpm_port *port) { spin_lock(&port->pd_event_lock); - port->pd_events = TCPM_SOURCING_VBUS; + port->pd_events |= TCPM_SOURCING_VBUS; spin_unlock(&port->pd_event_lock); kthread_queue_work(port->wq, &port->event_work); }