Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp3091633iob; Mon, 16 May 2022 12:53:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzuZQ5gwz9CL3aB5N3RGsF3RM8RBxmwc/a3pAnXs7xCodvFM+FdzTeeQ1xqIziSx6LUuGkI X-Received: by 2002:a17:902:a9cc:b0:161:3bf4:9047 with SMTP id b12-20020a170902a9cc00b001613bf49047mr15531208plr.137.1652730838436; Mon, 16 May 2022 12:53:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652730838; cv=none; d=google.com; s=arc-20160816; b=iuDGVLOFIadKNArzzPenNz5U8vg+GmRZWAHRK3FBB5zgekNPm6dqm2QdcZyQQwi/M5 XN0/C/kgaWJtQopluUen6n09ZPfcqqkGmCkj4FQ/InvDZLqsydPjg7SDAlN87YvStEAM aodRslJIt41fJySQkgU1iV+lhs0cOX71ViseQFkI9XJBGuzKhUZy166FZsBNoHc/5Zze 92rxnhPLyQs231+7jNf/qD7Hnc0x/f40tgMLL0dY6G//sYgCZDgdWuQhbOBQtj37f/6D bstk1N3d0Q2122QbDZLMySBC8Gzy3knI38aOVDBOfKfIjH08Engd4rt7p9vWm9ogasap VRHg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=efsL+m7iMyu+3XxKKVIUdtyuzNAaPpzD03wKxnAACd4=; b=MHbj+vzg+L/by9hrELGEfvHc5GzSR7S27hoRgmV+N8lF4dhRYn65mVvRgCpGMMf67w x+/8gLtLC7CQiz+mY29gTid9KbHy9eyBRwQg7RzpvCztAPqnGueA9OyyWbZOjVVpTaFJ hnNyD4TpZrv90gLtlehQuO7ZHgt2ALhlZAZf2OLxoaH7DIbeJjtwdHI+5RO/cT7V87nt 1RgZx/+kvKNDBWifM9uYVHh3P+i3OZlDwWZb6YH74GWdlCrcROaE+aiRwVynq3RR6PKH N3hjlr1KOBEkAYJKS/y5MfElEfu71/eYWCSDn0DRcO5qy/n3xZOXTrTjSf3m1KSVbba7 lCBw== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bitwise.fi Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g14-20020a056a000b8e00b0050edb7d9e22si14615738pfj.261.2022.05.16.12.53.47; Mon, 16 May 2022 12:53:58 -0700 (PDT) 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; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bitwise.fi Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239953AbiEPN50 (ORCPT + 99 others); Mon, 16 May 2022 09:57:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51228 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243931AbiEPNy7 (ORCPT ); Mon, 16 May 2022 09:54:59 -0400 Received: from mail.bitwise.fi (mail.bitwise.fi [109.204.228.163]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1D53D39170; Mon, 16 May 2022 06:54:40 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by mail.bitwise.fi (Postfix) with ESMTP id BB5CA46002B; Mon, 16 May 2022 16:49:01 +0300 (EEST) X-Virus-Scanned: Debian amavisd-new at Received: from mail.bitwise.fi ([127.0.0.1]) by localhost (mustetatti.dmz.bitwise.fi [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RXJB4ho_p1Zw; Mon, 16 May 2022 16:48:59 +0300 (EEST) Received: from localhost.net (fw1.dmz.bitwise.fi [192.168.69.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: anssiha) by mail.bitwise.fi (Postfix) with ESMTPSA id 2D4A746002C; Mon, 16 May 2022 16:48:57 +0300 (EEST) From: Anssi Hannula To: Jimmy Assarsson Cc: linux-can@vger.kernel.org, Marc Kleine-Budde , linux-kernel@vger.kernel.org Subject: [PATCH 05/12] can: kvaser_usb_leaf: Set Warning state even without bus errors Date: Mon, 16 May 2022 16:47:41 +0300 Message-Id: <20220516134748.3724796-6-anssi.hannula@bitwise.fi> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220516134748.3724796-1-anssi.hannula@bitwise.fi> References: <20220516134748.3724796-1-anssi.hannula@bitwise.fi> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_PASS, SPF_PASS,T_SCC_BODY_TEXT_LINE 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 kvaser_usb_leaf_rx_error_update_can_state() sets error state according to error counters when the hardware does not indicate a specific state directly. However, this is currently gated behind a check for M16C_STATE_BUS_ERROR which does not always seem to be set when error counters are increasing, and may not be set when error counters are decreasing. This causes the CAN_STATE_ERROR_WARNING state to not be set in some cases even when appropriate. Change the code to set error state from counters even without M16C_STATE_BUS_ERROR. The Error-Passive case seems superfluous as it is already set via M16C_STATE_BUS_PASSIVE flag above, but it is kept for now. Tested with 0bfd:0124 Kvaser Mini PCI Express 2xHS FW 4.18.778. Fixes: 080f40a6fa28 ("can: kvaser_usb: Add support for Kvaser CAN/USB devices") Signed-off-by: Anssi Hannula --- .../net/can/usb/kvaser_usb/kvaser_usb_leaf.c | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c b/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c index 09ade66256b2..d7f2d64a8083 100644 --- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c +++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c @@ -775,20 +775,16 @@ kvaser_usb_leaf_rx_error_update_can_state(struct kvaser_usb_net_priv *priv, new_state = CAN_STATE_BUS_OFF; } else if (es->status & M16C_STATE_BUS_PASSIVE) { new_state = CAN_STATE_ERROR_PASSIVE; - } else if (es->status & M16C_STATE_BUS_ERROR) { + } else if ((es->status & M16C_STATE_BUS_ERROR) && + cur_state >= CAN_STATE_BUS_OFF) { /* Guard against spurious error events after a busoff */ - if (cur_state < CAN_STATE_BUS_OFF) { - if (es->txerr >= 128 || es->rxerr >= 128) - new_state = CAN_STATE_ERROR_PASSIVE; - else if (es->txerr >= 96 || es->rxerr >= 96) - new_state = CAN_STATE_ERROR_WARNING; - else if (cur_state > CAN_STATE_ERROR_ACTIVE) - new_state = CAN_STATE_ERROR_ACTIVE; - } - } - - if (!es->status) + } else if (es->txerr >= 128 || es->rxerr >= 128) { + new_state = CAN_STATE_ERROR_PASSIVE; + } else if (es->txerr >= 96 || es->rxerr >= 96) { + new_state = CAN_STATE_ERROR_WARNING; + } else { new_state = CAN_STATE_ERROR_ACTIVE; + } if (new_state != cur_state) { tx_state = (es->txerr >= es->rxerr) ? new_state : 0; -- 2.34.1