From: Heikki Krogerus <heikki.krogerus@linux.intel.com>
To: Ondrej Jirman <megous@megous.com>
Cc: Guenter Roeck <linux@roeck-us.net>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Badhri Jagan Sridharan <badhri@google.com>,
Hans de Goede <hdegoede@redhat.com>,
"open list:USB TYPEC PORT CONTROLLER DRIVERS"
<linux-usb@vger.kernel.org>,
open list <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v2] usb: typec: fusb302: Fix masking of comparator and bc_lvl interrupts
Date: Mon, 15 Nov 2021 09:11:42 +0200 [thread overview]
Message-ID: <YZIILh++KIEK/ZA5@kuha.fi.intel.com> (raw)
In-Reply-To: <20211108102833.2793803-1-megous@megous.com>
On Mon, Nov 08, 2021 at 11:28:32AM +0100, Ondrej Jirman wrote:
> The code that enables either BC_LVL or COMP_CHNG interrupt in tcpm_set_cc
> wrongly assumes that the interrupt is unmasked by writing 1 to the apropriate
> bit in the mask register. In fact, interrupts are enabled when the mask
> is 0, so the tcpm_set_cc enables interrupt for COMP_CHNG when it expects
> BC_LVL interrupt to be enabled.
>
> This causes inability of the driver to recognize cable unplug events
> in host mode (unplug is recognized only via a COMP_CHNG interrupt).
>
> In device mode this bug was masked by simultaneous triggering of the VBUS
> change interrupt, because of loss of VBUS when the port peer is providing
> power.
>
> Fixes: 48242e30532b ("usb: typec: fusb302: Revert "Resolve fixed power role contract setup"")
> Signed-off-by: Ondrej Jirman <megous@megous.com>
> Cc: Hans de Goede <hdegoede@redhat.com>
Should this go to stable?
Acked-by: Heikki Krogerus@linux.intel.com
> ---
> drivers/usb/typec/tcpm/fusb302.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/usb/typec/tcpm/fusb302.c b/drivers/usb/typec/tcpm/fusb302.c
> index 7a2a17866a823..72f9001b07921 100644
> --- a/drivers/usb/typec/tcpm/fusb302.c
> +++ b/drivers/usb/typec/tcpm/fusb302.c
> @@ -669,25 +669,27 @@ static int tcpm_set_cc(struct tcpc_dev *dev, enum typec_cc_status cc)
> ret = fusb302_i2c_mask_write(chip, FUSB_REG_MASK,
> FUSB_REG_MASK_BC_LVL |
> FUSB_REG_MASK_COMP_CHNG,
> - FUSB_REG_MASK_COMP_CHNG);
> + FUSB_REG_MASK_BC_LVL);
> if (ret < 0) {
> fusb302_log(chip, "cannot set SRC interrupt, ret=%d",
> ret);
> goto done;
> }
> chip->intr_comp_chng = true;
> + chip->intr_bc_lvl = false;
> break;
> case TYPEC_CC_RD:
> ret = fusb302_i2c_mask_write(chip, FUSB_REG_MASK,
> FUSB_REG_MASK_BC_LVL |
> FUSB_REG_MASK_COMP_CHNG,
> - FUSB_REG_MASK_BC_LVL);
> + FUSB_REG_MASK_COMP_CHNG);
> if (ret < 0) {
> fusb302_log(chip, "cannot set SRC interrupt, ret=%d",
> ret);
> goto done;
> }
> chip->intr_bc_lvl = true;
> + chip->intr_comp_chng = false;
> break;
> default:
> break;
thanks,
--
heikki
next prev parent reply other threads:[~2021-11-15 7:12 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-08 10:28 [PATCH v2] usb: typec: fusb302: Fix masking of comparator and bc_lvl interrupts Ondrej Jirman
2021-11-08 11:24 ` Hans de Goede
2021-11-15 7:11 ` Heikki Krogerus [this message]
2021-11-15 7:15 ` Heikki Krogerus
2021-11-15 8:55 ` Ondřej Jirman
2021-11-15 9:21 ` Heikki Krogerus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YZIILh++KIEK/ZA5@kuha.fi.intel.com \
--to=heikki.krogerus@linux.intel.com \
--cc=badhri@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=hdegoede@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=megous@megous.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).