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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EEA58C4167B for ; Tue, 28 Nov 2023 07:59:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343946AbjK1H7V (ORCPT ); Tue, 28 Nov 2023 02:59:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44080 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230353AbjK1H7S (ORCPT ); Tue, 28 Nov 2023 02:59:18 -0500 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7DC3210A; Mon, 27 Nov 2023 23:59:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1701158364; x=1732694364; h=date:from:to:cc:subject:message-id:references: mime-version:in-reply-to; bh=eH8K0Rq16QUjtscu5lkGKQW6/VMHMllPbrirgbRjrcQ=; b=e/wc1yI3NoRwywNF6JsynvxzgN0vyGBHzNqZYjlP0wbA5iTJjO/4Lg69 HZTf0C7fscIh56Jx5tN2m0+ssIObaJExv6M8y2zY/9Ny6x64SEXmnTQHT yX00eZJlfww5T93WO2FvVUhiaFUQOQwj9/a92T0IYy2Mld5krB4P96Ubx 0nc34o/odqAUnhJY9evAxewcY2S+HpQphy0ulc5YQ3krh/mFrpeJRJ/z6 RifJIeVq14HnQBSbTAxLTm1bT94KeSNKfKLAnOVO12+SmMInlvJC2KXGh eyRumbv4lCvpkWyosLd23UC5LPbzV7AoZoCaTuH7CayO7Hl3V6qBZOWwM w==; X-IronPort-AV: E=McAfee;i="6600,9927,10907"; a="391745240" X-IronPort-AV: E=Sophos;i="6.04,233,1695711600"; d="scan'208";a="391745240" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Nov 2023 23:59:24 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10907"; a="768441744" X-IronPort-AV: E=Sophos;i="6.04,233,1695711600"; d="scan'208";a="768441744" Received: from kuha.fi.intel.com ([10.237.72.185]) by orsmga002.jf.intel.com with SMTP; 27 Nov 2023 23:59:21 -0800 Received: by kuha.fi.intel.com (sSMTP sendmail emulation); Tue, 28 Nov 2023 09:59:20 +0200 Date: Tue, 28 Nov 2023 09:59:20 +0200 From: Heikki Krogerus To: RD Babiera Cc: linux@roeck-us.net, gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, badhri@google.com Subject: Re: [PATCH v1 2/2] usb: typec: tcpci: add vconn over current fault handling to maxim_core Message-ID: References: <20231121203845.170234-4-rdbabiera@google.com> <20231121203845.170234-6-rdbabiera@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231121203845.170234-6-rdbabiera@google.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Nov 21, 2023 at 08:38:48PM +0000, RD Babiera wrote: > Add TCPC_FAULT_STATUS_VCONN_OC constant and corresponding mask definition. > Maxim TCPC is capable of detecting VConn over current faults, so add > fault to alert mask. When a Vconn over current fault is triggered, put the > port in an error recovery state via tcpm_port_error_recovery. > > Signed-off-by: RD Babiera Reviewed-by: Heikki Krogerus > --- > drivers/usb/typec/tcpm/tcpci_maxim_core.c | 20 +++++++++++++++++++- > include/linux/usb/tcpci.h | 5 ++++- > 2 files changed, 23 insertions(+), 2 deletions(-) > > diff --git a/drivers/usb/typec/tcpm/tcpci_maxim_core.c b/drivers/usb/typec/tcpm/tcpci_maxim_core.c > index 9454b12a073c..7fb966fd639b 100644 > --- a/drivers/usb/typec/tcpm/tcpci_maxim_core.c > +++ b/drivers/usb/typec/tcpm/tcpci_maxim_core.c > @@ -92,11 +92,16 @@ static void max_tcpci_init_regs(struct max_tcpci_chip *chip) > return; > } > > + /* Vconn Over Current Protection */ > + ret = max_tcpci_write8(chip, TCPC_FAULT_STATUS_MASK, TCPC_FAULT_STATUS_MASK_VCONN_OC); > + if (ret < 0) > + return; > + > alert_mask = TCPC_ALERT_TX_SUCCESS | TCPC_ALERT_TX_DISCARDED | TCPC_ALERT_TX_FAILED | > TCPC_ALERT_RX_HARD_RST | TCPC_ALERT_RX_STATUS | TCPC_ALERT_CC_STATUS | > TCPC_ALERT_VBUS_DISCNCT | TCPC_ALERT_RX_BUF_OVF | TCPC_ALERT_POWER_STATUS | > /* Enable Extended alert for detecting Fast Role Swap Signal */ > - TCPC_ALERT_EXTND | TCPC_ALERT_EXTENDED_STATUS; > + TCPC_ALERT_EXTND | TCPC_ALERT_EXTENDED_STATUS | TCPC_ALERT_FAULT; > > ret = max_tcpci_write16(chip, TCPC_ALERT_MASK, alert_mask); > if (ret < 0) { > @@ -295,6 +300,19 @@ static irqreturn_t _max_tcpci_irq(struct max_tcpci_chip *chip, u16 status) > } > } > > + if (status & TCPC_ALERT_FAULT) { > + ret = max_tcpci_read8(chip, TCPC_FAULT_STATUS, ®_status); > + if (ret < 0) > + return ret; > + > + ret = max_tcpci_write8(chip, TCPC_FAULT_STATUS, reg_status); > + if (ret < 0) > + return ret; > + > + if (reg_status & TCPC_FAULT_STATUS_VCONN_OC) > + tcpm_port_error_recovery(chip->port); > + } > + > if (status & TCPC_ALERT_EXTND) { > ret = max_tcpci_read8(chip, TCPC_ALERT_EXTENDED, ®_status); > if (ret < 0) > diff --git a/include/linux/usb/tcpci.h b/include/linux/usb/tcpci.h > index 83376473ac76..467e8045e9f8 100644 > --- a/include/linux/usb/tcpci.h > +++ b/include/linux/usb/tcpci.h > @@ -36,7 +36,9 @@ > > #define TCPC_ALERT_MASK 0x12 > #define TCPC_POWER_STATUS_MASK 0x14 > -#define TCPC_FAULT_STATUS_MASK 0x15 > + > +#define TCPC_FAULT_STATUS_MASK 0x15 > +#define TCPC_FAULT_STATUS_MASK_VCONN_OC BIT(1) > > #define TCPC_EXTENDED_STATUS_MASK 0x16 > #define TCPC_EXTENDED_STATUS_MASK_VSAFE0V BIT(0) > @@ -104,6 +106,7 @@ > > #define TCPC_FAULT_STATUS 0x1f > #define TCPC_FAULT_STATUS_ALL_REG_RST_TO_DEFAULT BIT(7) > +#define TCPC_FAULT_STATUS_VCONN_OC BIT(1) > > #define TCPC_ALERT_EXTENDED 0x21 > > -- > 2.43.0.rc1.413.gea7ed67945-goog -- heikki