From patchwork Mon Aug 27 15:34:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 10577379 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A88B814E1 for ; Mon, 27 Aug 2018 15:34:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9575C29CEF for ; Mon, 27 Aug 2018 15:34:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 894F029CF6; Mon, 27 Aug 2018 15:34:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ADE4E29CEF for ; Mon, 27 Aug 2018 15:34:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727179AbeH0TVY (ORCPT ); Mon, 27 Aug 2018 15:21:24 -0400 Received: from mail-oi0-f65.google.com ([209.85.218.65]:43609 "EHLO mail-oi0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727005AbeH0TVY (ORCPT ); Mon, 27 Aug 2018 15:21:24 -0400 Received: by mail-oi0-f65.google.com with SMTP id b15-v6so27993169oib.10; Mon, 27 Aug 2018 08:34:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=c6HfLVlZpYYjZwK4U8u03dSFgVP+mxfzCIfTzbmVKV8=; b=p4WcFBlSV6rr0erEqejcM8VO1pXONS4peq4Vsl7Q7S43IgrvQdku03h3GSdY0otOT1 6/2nIiD9+6I18tlFcpiPG5Z6nvzx1Hk2m44BwZGzts0qTJ6L3kNCqk2lZxjiA4lf3BHP qhmHLwKE7ydGRJwskvWE2PxOFIcnie58M5Iy6HfXudF5em3Jhk4S7j5qzxadFkMM73ap NteEajaxhRQ5Sw5H7rSmljdhceZL2bTV1qxlS7UA0nCgnnu/2KyXZls4Q+PAxqh1t5YM d0m6Xy8Hwwo8AUiKXrMds9UkykpN/1Bkf7isxPK+oJOeG6Nnebwm2Slohq3t+mywPTcg WPhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=c6HfLVlZpYYjZwK4U8u03dSFgVP+mxfzCIfTzbmVKV8=; b=dHHE8mG2o8Vjkig10gw5P2jm1JhN4aWd1fDFg9y6WWPIbledg3Jx3fuXvwnJdBGw9H S8VjgFapZ9Mi/Nw5bKIz+IWNvaxjCU8c7IhFq4qonZyWpJyaYXX0hD6XMmIxaHENjKCL WrKUu9jSMmNQd1vwcEZDZ8Mqx7uiRqGYnDlkFfx8sjqO62TIt1PH7jAIgej1Vn9trwy2 k0FYzNZ1XA8Ae3S4enw0i0A17v1RbDjK11Ha7TU0X4V1TedXWHdCLCOaldXlT9RLe8dH 5YxYXBlA7frXKDFx/A12ha0KTAXgGUR8jmZxZ/tR2OEjqSXmwX0xzvSyipYfYHfjWBMS mSig== X-Gm-Message-State: APzg51A4SHNpwEN29j3bZuc1R8OETi30LifwMywjzk+DtWdRoOpUbsyr BVRwUq8Cm//UOHaDvtIZltQ= X-Google-Smtp-Source: ANB0VdZ8jSLSzXl9N57u1RuiEUev7DPjwAUleMcoyinzw+Nj+KdzO0V1vVgo3c1sYpZFA8yf6KzZHg== X-Received: by 2002:aca:5e42:: with SMTP id s63-v6mr11865741oib.134.1535384057551; Mon, 27 Aug 2018 08:34:17 -0700 (PDT) Received: from localhost.localdomain (cpe-24-31-245-230.kc.res.rr.com. [24.31.245.230]) by smtp.gmail.com with ESMTPSA id j125-v6sm19575306oih.53.2018.08.27.08.34.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Aug 2018 08:34:16 -0700 (PDT) From: Larry Finger To: kvalo@codeaurora.org Cc: linux-wireless@vger.kernel.org, Larry Finger , Stable , Taketo Kabe Subject: [PATCH] b43: Fix regression in kernel 4.18 Date: Mon, 27 Aug 2018 10:34:07 -0500 Message-Id: <20180827153407.5612-1-Larry.Finger@lwfinger.net> X-Mailer: git-send-email 2.18.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In commit 66cffd6daab7 ("b43: fix transmit failure when VT is switched"), a condition is noted where the network controller needs to be reset. Note that this situation happens when running the open-source firmware (http://netweb.ing.unibs.it/~openfwwf/), plus a number of other special conditions. for a different card model, it is reported that this change breaks operation running the proprietary firmware (https://marc.info/?l=linux-wireless&m=153504546924558&w=2). Rather than reverting the previous patch, the code is tweaked to avoid the reset unless the open-source firmware is being used. Fixes: 66cffd6daab7 ("b43: fix transmit failure when VT is switched") Cc: Stable # 4.18+ Cc: Taketo Kabe Reported-and-tested-by: D. Prabhu Signed-off-by: Larry Finger --- drivers/net/wireless/broadcom/b43/dma.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/broadcom/b43/dma.c b/drivers/net/wireless/broadcom/b43/dma.c index 6b0e1ec346cb..d46d57b989ae 100644 --- a/drivers/net/wireless/broadcom/b43/dma.c +++ b/drivers/net/wireless/broadcom/b43/dma.c @@ -1518,13 +1518,15 @@ void b43_dma_handle_txstatus(struct b43_wldev *dev, } } else { /* More than a single header/data pair were missed. - * Report this error, and reset the controller to + * Report this error. If running with open-source + * firmware, then reset the controller to * revive operation. */ b43dbg(dev->wl, "Out of order TX status report on DMA ring %d. Expected %d, but got %d\n", ring->index, firstused, slot); - b43_controller_restart(dev, "Out of order TX"); + if (dev->fw.opensource) + b43_controller_restart(dev, "Out of order TX"); return; } }