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 0677CC433F5 for ; Mon, 10 Oct 2022 18:53:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229755AbiJJSxM (ORCPT ); Mon, 10 Oct 2022 14:53:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36664 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229800AbiJJSxL (ORCPT ); Mon, 10 Oct 2022 14:53:11 -0400 Received: from mail-lj1-x235.google.com (mail-lj1-x235.google.com [IPv6:2a00:1450:4864:20::235]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4D219786D7 for ; Mon, 10 Oct 2022 11:53:10 -0700 (PDT) Received: by mail-lj1-x235.google.com with SMTP id f9so14242601ljk.12 for ; Mon, 10 Oct 2022 11:53:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kvaser.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=f7lr2LVSpdtsURyvPlIe1EkOIsDxyBr8jZf/eaHglqQ=; b=I/d59i7K4mkZpZCDORN4fnbyGZjOD3KRq7UKLP93TNor+liiEvx3RhBQd51PKV6H2u vR7djEe7FG0dWM/GBzrcu2iyzVtBZVezV9yipQLIu1V0axC/uD9OZArmK0qKJSAaxJK3 kx3dG6HNqxXk0jjg5QCVmZuHuGC1OrbvAMIkWuuITNL71Dzg74+cKRCOjofQjuA9Y0Dw yNCq7F5NX34ovuwqWdYD0gDkHQPisF27Mace+LbTNQHqbJXOWcrhJ6DROt54FMefeEX0 Z2v/GNNZaW6ei0ufa16yl0nCpaA896btCJq5aditBYN3u1qz+1OykqKAWsmHIr+/nq19 OffA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=f7lr2LVSpdtsURyvPlIe1EkOIsDxyBr8jZf/eaHglqQ=; b=3NUQLpoKALD0VxM+9UrL6/5KBFtE5l07deyfROZ5abBENN1rBXHllENpaAJ5gPAJIc gMkSD5zAMfIDmv4S//1KvsJjD1LZgYUGrd6/hHuhYFL7zKqMC36aVuj8IWUtMVo9ynFl GmxaJot/7rI+ePKep6kIrcXaC0PxsPFUjQti4NdwMhM0QQxGxUV9Gri/6muais72udog FSUkUPBxGQM359i4cjKqVMUxzHkR4vjTZdtPacV35sLDrX8LicOido77u6Rbion+94+7 zhkmnS8rsCRYMHvgaVRh9IWkS8wEEO/nOA4ybhZc3WtEcnalD5aL79vZQ8Y+pYFPo5dF X1kA== X-Gm-Message-State: ACrzQf02WFgh6wfkGT354TcHS1rSB+5j4kOyniG0tgLDwVFyxPwcuCkC erdr1hJREmTgSlsvkuZj35ecYIaJcpzL/g== X-Google-Smtp-Source: AMsMyM6SoBEYqOpRNzXZ5uK0KMHkyd0peothmtyOdc7ZOEQgG/kDPxdX30WufhNXL0/mpY4jmQScAw== X-Received: by 2002:a2e:bf1f:0:b0:26d:8d0f:4f9a with SMTP id c31-20020a2ebf1f000000b0026d8d0f4f9amr7756316ljr.473.1665427988718; Mon, 10 Oct 2022 11:53:08 -0700 (PDT) Received: from archyz.. (h-155-4-68-234.A785.priv.bahnhof.se. [155.4.68.234]) by smtp.gmail.com with ESMTPSA id b4-20020a056512070400b004a2386b8ce6sm1517769lfs.207.2022.10.10.11.53.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Oct 2022 11:53:08 -0700 (PDT) From: Jimmy Assarsson To: linux-can@vger.kernel.org, Marc Kleine-Budde , Anssi Hannula Cc: Jimmy Assarsson , Jimmy Assarsson Subject: [PATCH can-next v5 05/11] can: kvaser_usb_leaf: Set Warning state even without bus errors Date: Mon, 10 Oct 2022 20:52:31 +0200 Message-Id: <20221010185237.319219-6-extja@kvaser.com> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221010185237.319219-1-extja@kvaser.com> References: <20221010185237.319219-1-extja@kvaser.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-can@vger.kernel.org From: Anssi Hannula 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") Tested-by: Jimmy Assarsson Signed-off-by: Anssi Hannula Signed-off-by: Jimmy Assarsson --- Changes in v5: - Split series and rebased on linux-can-next - Remove stable from CC Changes in v4: - No changes Changes in v3: - Rebased on 1d5eeda23f36 ("can: kvaser_usb: advertise timestamping capabilities and add ioctl support") - Add stable to CC - Add S-o-b Changes in v2: - Rebased on b3b6df2c56d8 ("can: kvaser_usb: kvaser_usb_leaf: fix bittiming limits") .../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 5d96ab85d04c..a6a26085bc15 100644 --- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c +++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c @@ -961,20 +961,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.38.0