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 4448FC64991 for ; Thu, 1 Sep 2022 12:29:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233580AbiIAM3o (ORCPT ); Thu, 1 Sep 2022 08:29:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44970 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233591AbiIAM30 (ORCPT ); Thu, 1 Sep 2022 08:29:26 -0400 Received: from mail-lf1-x12b.google.com (mail-lf1-x12b.google.com [IPv6:2a00:1450:4864:20::12b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C2EA612D52F for ; Thu, 1 Sep 2022 05:28:31 -0700 (PDT) Received: by mail-lf1-x12b.google.com with SMTP id br21so18392037lfb.0 for ; Thu, 01 Sep 2022 05:28:31 -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; bh=k4NBR6s9gWn7dVHGD+znnsmpwT2y4F68Ss9fdXBxSN0=; b=JXbvSYm6hW7OclPyOCC6Lvv74gd97mzKXVEIVnr7I8fbeT3u23yVe9exIUvfPaSY34 dbrJb80O2ZT1KJ5Z+akKS6ID9MqLkYMzUCFDYkPHy8q7CDPE6TOYvwVaKFxJJR1xIHug MWOjeHLp20jtq8q4JswdZVye9+jD7w0rpRM+tW9e5g9s/hT02F+VbfCckZPi/k5QgF6o 7ws+EfQYkJ1ydvpzr4OL0kOJXjB8n8koRIjrmqG4cGfpb5fq9Xud8AVVbyUEoKnTPGkK l1KDMAzCtAFMq9K8pQNxHif/+qOrZtubQ9vm+3ke/1kACjmfGwXfcyz3w/KMhHdsn9IE oFkA== 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; bh=k4NBR6s9gWn7dVHGD+znnsmpwT2y4F68Ss9fdXBxSN0=; b=PGvZ17o32QVxajZ/3fNiTdLo/48k1scM4VVirZQTrRnm+4WEiOPIL8RSwtDx3hrNCs cjpw3i+xUrhZXItckQQGjjOwzkWjYG7deVTfrvwLESR6tYYToSaN9L2o+y8a8Jzt4nUZ VngshDSDgMmF8mCXI4X82P659gjs9OCerrsHL2TZzuD3mVrU+nol3ZzSWlMgYb4s71ay x2Qipb14unqtxgqQH/j4Kl6aVgGE7kEQMa9sKHTkNL5rnDzWWrxdJOdClfPpGmw8kqAr +wr/k/ELouZMSAICts//jx0QtkH64/d4LfCpFBNzYSh7qQBE2a8JuLy7aTPmMReqtjRX d7Dw== X-Gm-Message-State: ACgBeo1g1czTTPi4E/dk+LX9n3uJefRpvExrvMVc9KlpCfMemjK4YKn9 A/4rb7uiVgukAM1UiFE9Mesq9siu027DQg== X-Google-Smtp-Source: AA6agR6spPoMcyADvCfHmkwpyymiB0LdSx2oKeqwb9peYsAI3Jf38KXKiXzVqZkqqg+79VaMU7sxPw== X-Received: by 2002:a05:6512:3b2a:b0:494:72a8:bbeb with SMTP id f42-20020a0565123b2a00b0049472a8bbebmr5553381lfv.372.1662035308062; Thu, 01 Sep 2022 05:28:28 -0700 (PDT) Received: from fb10a0c5d590.. (h-155-4-68-234.A785.priv.bahnhof.se. [155.4.68.234]) by smtp.gmail.com with ESMTPSA id s12-20020a056512202c00b00492c2394ea5sm125935lfs.165.2022.09.01.05.28.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Sep 2022 05:28:27 -0700 (PDT) From: Jimmy Assarsson To: linux-can@vger.kernel.org, Marc Kleine-Budde , Anssi Hannula Cc: Jimmy Assarsson , stable@vger.kernel.org, Jimmy Assarsson Subject: [PATCH v3 09/15] can: kvaser_usb_leaf: Fix CAN state after restart Date: Thu, 1 Sep 2022 14:27:23 +0200 Message-Id: <20220901122729.271-10-extja@kvaser.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220901122729.271-1-extja@kvaser.com> References: <20220901122729.271-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 can_restart() expects CMD_START_CHIP to set the error state to ERROR_ACTIVE as it calls netif_carrier_on() immediately afterwards. Otherwise the user may immediately trigger restart again and hit a BUG_ON() in can_restart(). Fix kvaser_usb_leaf set_mode(CMD_START_CHIP) to set the expected state. Cc: stable@vger.kernel.org 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 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") drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c | 2 ++ 1 file changed, 2 insertions(+) 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 48b8a0f0b362..a6a26085bc15 100644 --- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c +++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c @@ -1668,6 +1668,8 @@ static int kvaser_usb_leaf_set_mode(struct net_device *netdev, err = kvaser_usb_leaf_simple_cmd_async(priv, CMD_START_CHIP); if (err) return err; + + priv->can.state = CAN_STATE_ERROR_ACTIVE; break; default: return -EOPNOTSUPP; -- 2.37.3