Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp3348191iob; Mon, 16 May 2022 20:16:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwv9FvyBZ8GL2vexqs4qevLvPxzjwIS/Sdx57S/6jVR3QSpq2NyqouqxswhHWhoJKLeS1s/ X-Received: by 2002:a17:90b:1a8a:b0:1dc:ea29:f6a9 with SMTP id ng10-20020a17090b1a8a00b001dcea29f6a9mr34610014pjb.108.1652757368307; Mon, 16 May 2022 20:16:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652757368; cv=none; d=google.com; s=arc-20160816; b=Xr1X887RjehaCbfnorAolkiHKzB2BQgckhVDykzOY+poqSr2TakqAFeY9OI7HdZrT6 4WbQmMvIb8CE0vukfhNwMVg3XFQ/MGNokCk4vBBLB8r6b/3UUP5jTNHPvxAX926WOl9t DoVVw0lw+sc3EhvTgOLAn/THk6oO+UAWhZuHMwVkTgwVn+w5K+2j6oXXFJjLhJtyBgcq q2L54uIU7ZneyXUpmPxmYUQ8t3wVqz5V5e1Pwzd26rW/+UWtguEnuiuIh2mnofkxJtBM GKT2jpimWtxAREFJW6AOsRMlKgecP9MUrFclR8UYOb8MofvF5RmqTtIlKbOC7Eu63QRA bIIA== 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=yIhDRGaBL0OkoYJxWgD2tUGp+US6AUzboc7Ly6eR0IU=; b=mLO26rJy7YlupZjh0HmOLWoa1RP2cvaZhR3k+RSr07vbI/XdgReq0brI00QSpQ77U8 Bc1KACMUv8KZaFSu1J34PpCdi7un5HKosbdueVfojwVEuWL7OI49USdWazVzeDpY6Ifi X/feN1bTEUqY2941YfsJBcJmmTCLkryhOvj4uweJtKKpU6M3tJy2zJu+4edrdC9zGwpO DNgrJBr1FogLFkUpLchVvAenSP0B2BQE/Ch+GIlI3P0KVvjqW+xujMSIl8ZsoyBFJaWK bXCQSgnFkLBnmKUt0e+XXQGT/wqSJ/dID0RQfjYJPkajleWfVbFKOrkx0ENgHO+FU4ta 493Q== 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 qa11-20020a17090b4fcb00b001dc62080a06si1182867pjb.74.2022.05.16.20.15.56; Mon, 16 May 2022 20:16:08 -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 S243949AbiEPNzA (ORCPT + 99 others); Mon, 16 May 2022 09:55:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50796 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240068AbiEPNyi (ORCPT ); Mon, 16 May 2022 09:54:38 -0400 Received: from mail.bitwise.fi (mail.bitwise.fi [109.204.228.163]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 31508240AF; Mon, 16 May 2022 06:54:35 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by mail.bitwise.fi (Postfix) with ESMTP id 1930246002D; Mon, 16 May 2022 16:49:02 +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 JZsIOvJJAriA; Mon, 16 May 2022 16:49:00 +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 40AE046002E; 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 07/12] can: kvaser_usb_leaf: Fix CAN state after restart Date: Mon, 16 May 2022 16:47:43 +0300 Message-Id: <20220516134748.3724796-8-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 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. Fixes: 080f40a6fa28 ("can: kvaser_usb: Add support for Kvaser CAN/USB devices") Signed-off-by: Anssi Hannula --- 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 2d30a662edb5..5f27c00179c1 100644 --- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c +++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c @@ -1411,6 +1411,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.34.1