Received: by 2002:ac0:98c7:0:0:0:0:0 with SMTP id g7-v6csp1594016imd; Sun, 4 Nov 2018 06:01:35 -0800 (PST) X-Google-Smtp-Source: AJdET5cUWW9x309wv/zMxKh8Awzlka3Jf+Dtt/B8PbSBYK1AJuR1CXQ37fY6wRnZWjP+RF0lqXX7 X-Received: by 2002:a17:902:6b46:: with SMTP id g6-v6mr18442618plt.33.1541340095363; Sun, 04 Nov 2018 06:01:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541340095; cv=none; d=google.com; s=arc-20160816; b=ut6t6ncgTvDUdC1IudNw/CTVH9gRObX5iqptOohQr+s2iyBmKX1zKMx00+pHM35BqD 52LexGeUSk0ETQPvs03+wSPUDvVvqa1qDKljsDp3FsbdQ2i6UnkqE5+nWzc0OS7/fLqv LA9JoScSsYiXkTTJ2KOXjRlt4rzLIKRhkuzRbLkHCkZ6E/yYYlfU0Lu01NP3yYEoD5Vx VPKpKprfxVE7radAyO0/wh+36MTDgIPxiSSNJYADZOP3p7Kr1ImJtv5Wj+DHctErKOJm FlaVWvxe0Ti6f7TrEcisAsaMxIAKRgm9eQP7oVCT884w1YU8Nn34gL7Dut+2cmMIOC3T oHLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=Wklu2njd72rlV26G6pju83osUmXnklWuci3z9gtdRlE=; b=TB6OJdo5WMSqQYY+2Ovet63PFvE88M6fv3pZDPFNPhBeNS4OrsWS4Op09Lo2WaJ6Eo kql5NQgY/68k0DsvMfPRYnvSJpdoXzAhC8QmaU0U+mxFnXH5TWQSEvM3GEn069cCZXAD ZehEAfR1Lew5WCgxPcCKlE5FMwD1w4mj4xFl2OJEXp25vNiozeZf8lgw+7KW2aBHIxOI dNwndakgWGjkzBN5ypqD5PI4YpgNoWXhI2zKTUqDngogF79GeLhrAuby4JncU2kwM2Ot 5edIlbBrlcWLFRnHumEAc6bryK0vCMMdh0H8Q3oqo/1Hi+FtHq3a5AoQXXTE66emEad0 /meQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Y22nETE9; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n61-v6si32154387plb.283.2018.11.04.06.01.20; Sun, 04 Nov 2018 06:01:35 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Y22nETE9; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731648AbeKDXOX (ORCPT + 99 others); Sun, 4 Nov 2018 18:14:23 -0500 Received: from mail.kernel.org ([198.145.29.99]:48176 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728896AbeKDXIz (ORCPT ); Sun, 4 Nov 2018 18:08:55 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A020C20862; Sun, 4 Nov 2018 13:53:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1541339631; bh=Of6047mrZR+hnRVx0LcWe8U/odsQRrVLTwYTTyYrRek=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y22nETE9jM6QpsBX0fmSrvK1FKb0YKcuuJIq0qaDgrAMEOtrLo1vu4FZOFeWKu/uP A+bR8k8BqDzLVSNWaPMJ4hrsYUZLb1AWZS0yKJDboinDne3/XwWbZKdaxLxaNoSUea oXJCTCWpmNPYi3/CGoT29MN2Nb96nQsTXm6NEnX8= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Phil Elwell , Greg Kroah-Hartman , Sasha Levin Subject: [PATCH AUTOSEL 4.14 25/30] sc16is7xx: Fix for multi-channel stall Date: Sun, 4 Nov 2018 08:53:20 -0500 Message-Id: <20181104135325.88524-25-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181104135325.88524-1-sashal@kernel.org> References: <20181104135325.88524-1-sashal@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Phil Elwell [ Upstream commit 8344498721059754e09d30fe255a12dab8fb03ef ] The SC16IS752 is a dual-channel device. The two channels are largely independent, but the IRQ signals are wired together as an open-drain, active low signal which will be driven low while either of the channels requires attention, which can be for significant periods of time until operations complete and the interrupt can be acknowledged. In that respect it is should be treated as a true level-sensitive IRQ. The kernel, however, needs to be able to exit interrupt context in order to use I2C or SPI to access the device registers (which may involve sleeping). Therefore the interrupt needs to be masked out or paused in some way. The usual way to manage sleeping from within an interrupt handler is to use a threaded interrupt handler - a regular interrupt routine does the minimum amount of work needed to triage the interrupt before waking the interrupt service thread. If the threaded IRQ is marked as IRQF_ONESHOT the kernel will automatically mask out the interrupt until the thread runs to completion. The sc16is7xx driver used to use a threaded IRQ, but a patch switched to using a kthread_worker in order to set realtime priorities on the handler thread and for other optimisations. The end result is non-threaded IRQ that schedules some work then returns IRQ_HANDLED, making the kernel think that all IRQ processing has completed. The work-around to prevent a constant stream of interrupts is to mark the interrupt as edge-sensitive rather than level-sensitive, but interpreting an active-low source as a falling-edge source requires care to prevent a total cessation of interrupts. Whereas an edge-triggering source will generate a new edge for every interrupt condition a level-triggering source will keep the signal at the interrupting level until it no longer requires attention; in other words, the host won't see another edge until all interrupt conditions are cleared. It is therefore vital that the interrupt handler does not exit with an outstanding interrupt condition, otherwise the kernel will not receive another interrupt unless some other operation causes the interrupt state on the device to be cleared. The existing sc16is7xx driver has a very simple interrupt "thread" (kthread_work job) that processes interrupts on each channel in turn until there are no more. If both channels are active and the first channel starts interrupting while the handler for the second channel is running then it will not be detected and an IRQ stall ensues. This could be handled easily if there was a shared IRQ status register, or a convenient way to determine if the IRQ had been deasserted for any length of time, but both appear to be lacking. Avoid this problem (or at least make it much less likely to happen) by reducing the granularity of per-channel interrupt processing to one condition per iteration, only exiting the overall loop when both channels are no longer interrupting. Signed-off-by: Phil Elwell Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/tty/serial/sc16is7xx.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c index ca54ce074a5f..a79f18edf2bd 100644 --- a/drivers/tty/serial/sc16is7xx.c +++ b/drivers/tty/serial/sc16is7xx.c @@ -662,7 +662,7 @@ static void sc16is7xx_handle_tx(struct uart_port *port) uart_write_wakeup(port); } -static void sc16is7xx_port_irq(struct sc16is7xx_port *s, int portno) +static bool sc16is7xx_port_irq(struct sc16is7xx_port *s, int portno) { struct uart_port *port = &s->p[portno].port; @@ -671,7 +671,7 @@ static void sc16is7xx_port_irq(struct sc16is7xx_port *s, int portno) iir = sc16is7xx_port_read(port, SC16IS7XX_IIR_REG); if (iir & SC16IS7XX_IIR_NO_INT_BIT) - break; + return false; iir &= SC16IS7XX_IIR_ID_MASK; @@ -693,16 +693,23 @@ static void sc16is7xx_port_irq(struct sc16is7xx_port *s, int portno) port->line, iir); break; } - } while (1); + } while (0); + return true; } static void sc16is7xx_ist(struct kthread_work *ws) { struct sc16is7xx_port *s = to_sc16is7xx_port(ws, irq_work); - int i; - for (i = 0; i < s->devtype->nr_uart; ++i) - sc16is7xx_port_irq(s, i); + while (1) { + bool keep_polling = false; + int i; + + for (i = 0; i < s->devtype->nr_uart; ++i) + keep_polling |= sc16is7xx_port_irq(s, i); + if (!keep_polling) + break; + } } static irqreturn_t sc16is7xx_irq(int irq, void *dev_id) -- 2.17.1