From patchwork Fri Jan 13 21:32:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Golle X-Patchwork-Id: 9516507 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.web.codeaurora.org (Postfix) with ESMTP id 601D260761 for ; Fri, 13 Jan 2017 21:32:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4F72528782 for ; Fri, 13 Jan 2017 21:32:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4262528794; Fri, 13 Jan 2017 21:32:19 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI 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 C322B28782 for ; Fri, 13 Jan 2017 21:32:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751347AbdAMVcR (ORCPT ); Fri, 13 Jan 2017 16:32:17 -0500 Received: from fudo.makrotopia.org ([185.142.180.71]:53777 "EHLO fudo.makrotopia.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750908AbdAMVcQ (ORCPT ); Fri, 13 Jan 2017 16:32:16 -0500 Received: from local by fudo.makrotopia.org with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.88) (envelope-from ) id 1cS9SI-0001Be-FT; Fri, 13 Jan 2017 22:32:14 +0100 Date: Fri, 13 Jan 2017 22:32:08 +0100 From: Daniel Golle To: linux-wireless@vger.kernel.org Cc: Johannes Berg , Stanislaw Gruszka , roman@advem.lv, michel.stempin@wanadoo.fr, c.mignanti@gmail.com, evaxige@qq.com, Kalle Valo , Felix Fietkau , John Crispin , Gabor Juhos Subject: [PATCH 34/40] rt2x00: rt2800mmio: add a workaround for spurious TX_FIFO_STATUS interrupts Message-ID: <20170113213203.GA3636@makrotopia.org> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.7.2 (2016-11-26) 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 From: Gabor Juhos Signed-off-by: Gabor Juhos [daniel@makrotopia.org: fixed indention] --- drivers/net/wireless/ralink/rt2x00/rt2800mmio.c | 72 ++++++++++++++++++++----- drivers/net/wireless/ralink/rt2x00/rt2x00.h | 5 ++ 2 files changed, 65 insertions(+), 12 deletions(-) diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800mmio.c b/drivers/net/wireless/ralink/rt2x00/rt2800mmio.c index 5f1936aa8fa7..750a9425b5be 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800mmio.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800mmio.c @@ -415,9 +415,9 @@ void rt2800mmio_autowake_tasklet(unsigned long data) } EXPORT_SYMBOL_GPL(rt2800mmio_autowake_tasklet); -static void rt2800mmio_txstatus_interrupt(struct rt2x00_dev *rt2x00dev) +static void rt2800mmio_txstatus_interrupt(struct rt2x00_dev *rt2x00dev, + u32 status) { - u32 status; int i; /* @@ -438,29 +438,77 @@ static void rt2800mmio_txstatus_interrupt(struct rt2x00_dev *rt2x00dev) * Since we have only one producer and one consumer we don't * need to lock the kfifo. */ - for (i = 0; i < rt2x00dev->tx->limit; i++) { - rt2x00mmio_register_read(rt2x00dev, TX_STA_FIFO, &status); - - if (!rt2x00_get_field32(status, TX_STA_FIFO_VALID)) - break; - + i = 0; + do { if (!kfifo_put(&rt2x00dev->txstatus_fifo, status)) { - rt2x00_warn(rt2x00dev, "TX status FIFO overrun, drop tx status report\n"); + rt2x00_warn(rt2x00dev, + "TX status FIFO overrun, drop TX status report\n"); break; } - } + + if (++i >= rt2x00dev->tx->limit) + break; + + rt2x00mmio_register_read(rt2x00dev, TX_STA_FIFO, &status); + } while (rt2x00_get_field32(status, TX_STA_FIFO_VALID)); /* Schedule the tasklet for processing the tx status. */ tasklet_schedule(&rt2x00dev->txstatus_tasklet); } +#define RT2800MMIO_TXSTATUS_IRQ_MAX_RETRIES 4 + +static bool rt2800mmio_txstatus_is_spurious(struct rt2x00_dev *rt2x00dev, + u32 txstatus) +{ + if (likely(rt2x00_get_field32(txstatus, TX_STA_FIFO_VALID))) { + rt2x00dev->txstatus_irq_retries = 0; + return false; + } + + rt2x00dev->txstatus_irq_retries++; + + /* Ensure that we don't go into an infinite IRQ loop. */ + if (rt2x00dev->txstatus_irq_retries >= + RT2800MMIO_TXSTATUS_IRQ_MAX_RETRIES) { + rt2x00_warn(rt2x00dev, + "%u spurious TX_FIFO_STATUS interrupt(s)\n", + rt2x00dev->txstatus_irq_retries); + rt2x00dev->txstatus_irq_retries = 0; + return false; + } + + return true; +} + irqreturn_t rt2800mmio_interrupt(int irq, void *dev_instance) { struct rt2x00_dev *rt2x00dev = dev_instance; u32 reg, mask; + u32 txstatus = 0; - /* Read status and ACK all interrupts */ + /* Read status */ rt2x00mmio_register_read(rt2x00dev, INT_SOURCE_CSR, ®); + + if (rt2x00_get_field32(reg, INT_SOURCE_CSR_TX_FIFO_STATUS)) { + /* Due to unknown reason the hardware generates a + * TX_FIFO_STATUS interrupt before the TX_STA_FIFO + * register contain valid data. Read the TX status + * here to see if we have to process the actual + * request. + */ + rt2x00mmio_register_read(rt2x00dev, TX_STA_FIFO, &txstatus); + if (rt2800mmio_txstatus_is_spurious(rt2x00dev, txstatus)) { + /* Remove the TX_FIFO_STATUS bit so it won't be + * processed in this turn. The hardware will + * generate another IRQ for us. + */ + rt2x00_set_field32(®, + INT_SOURCE_CSR_TX_FIFO_STATUS, 0); + } + } + + /* ACK interrupts */ rt2x00mmio_register_write(rt2x00dev, INT_SOURCE_CSR, reg); if (!reg) @@ -477,7 +525,7 @@ irqreturn_t rt2800mmio_interrupt(int irq, void *dev_instance) mask = ~reg; if (rt2x00_get_field32(reg, INT_SOURCE_CSR_TX_FIFO_STATUS)) { - rt2800mmio_txstatus_interrupt(rt2x00dev); + rt2800mmio_txstatus_interrupt(rt2x00dev, txstatus); /* * Never disable the TX_FIFO_STATUS interrupt. */ diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00.h b/drivers/net/wireless/ralink/rt2x00/rt2x00.h index 034a07273038..c27408b494ef 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h @@ -995,6 +995,11 @@ struct rt2x00_dev { int rf_channel; /* + * Counter for tx status irq retries (rt2800pci). + */ + unsigned int txstatus_irq_retries; + + /* * Protect the interrupt mask register. */ spinlock_t irqmask_lock;