From patchwork Mon Nov 7 11:07:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ilpo_J=C3=A4rvinen?= X-Patchwork-Id: 16375 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1980992wru; Mon, 7 Nov 2022 03:08:37 -0800 (PST) X-Google-Smtp-Source: AMsMyM6kUW+jjAWHVVNAteoXXR3dp9HrPECbadQSORBAp/xqnURSPOO5Lgsw4Fiq0wVeVJ8WaEdE X-Received: by 2002:a65:6148:0:b0:458:88cd:f46 with SMTP id o8-20020a656148000000b0045888cd0f46mr41917250pgv.303.1667819316721; Mon, 07 Nov 2022 03:08:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667819316; cv=none; d=google.com; s=arc-20160816; b=WRx9gtwe9QfaL2eLHiNSaDg1GkS+pdtqQIo5QdVOA4ROjozPKrEY1k8/EhFdMOLeu5 cf+PS82J0373wZPnfWzM7hBqYuD+Bo9fD29W4aWTA38kCTf+sHqJev9cIr1CwZCDsV4h IJFkazZTk7xVzzK6HQFCAyzGyN+Mxfq6yw++H43CyDAx4ndu8o4kBcXyl6aDPQIAocK/ 9dxnaAnAsrMWoZp1wfVPi13qlSs2MMm0vN5I+tHl2p1vMMbW2MOkgO5bghiUFD9i4FuS 5iAnqMF/VHY6IAZajSIP3+fwLoIO7U3iOB2yKg51tZjyU3p292GRJazt4bhi7CLHDmIm 5fgQ== 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 :dkim-signature; bh=5Y9CZQXR4SvLOfq2CZqnarubg1lnMp759V6jQvtdAMU=; b=ORc8HTm9kplZHpRIeLVoJlLZdtxywDVyqjBsF+bWMzNNHroIyD1ISxm+HSdbVi9lVp 6brYPVBcW8OUvTMlhQPHnx7VeQfZ8h1YY1ox9/Tax4ngNJOtFPao5B/4rmUG7pFkBdwv w6hcP6a8qoLMK97Hjr7d8SkWWdGvckwJn6R/1FUMp8N5OTIb6pxM6Kcx+8PsuCg8qoqT 1iPtlJ98sbzwmxzYhKTc/mn2Uh6itz+Ya+dm4Lq1mMciyuKUtwq236QDdIMyJog25Dye Ww+54egH0sSm75iaJ71fqkAjgHofP0gar5xZ48cDtH3oMoC/D3r9M2Qa6besSIIEugyt xPBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=klRtpQ4b; 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=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g5-20020a63dd45000000b0045a07a7c790si9884568pgj.740.2022.11.07.03.08.24; Mon, 07 Nov 2022 03:08:36 -0800 (PST) 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; dkim=pass header.i=@intel.com header.s=Intel header.b=klRtpQ4b; 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=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231546AbiKGLHf (ORCPT + 99 others); Mon, 7 Nov 2022 06:07:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59428 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231158AbiKGLHX (ORCPT ); Mon, 7 Nov 2022 06:07:23 -0500 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 110F918374; Mon, 7 Nov 2022 03:07:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1667819243; x=1699355243; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=kwbVN41tr92ZOfdbCaPY/Bzq8aetPvpbAPbc0F2INvo=; b=klRtpQ4bOaQK/8VI5XINYox9qNZZ/XQVh2K8M871OOweASlAInlHhMO2 nYy4qqh1XRLM9D7M9fZ2BdlPG4BPamrwpn5mgLSPp9Z1g7726EUaiWgql U82Am7JIQkC+CyS4w1of2G412nlq9c6SEHC/Se9wvcMy5IzDYL2Fxp7fb 6UQasb5daX/nqtSaYIb/zrO53/0j1+CWACc6jpziC/R/14Rw/SyLSb3vy jtPNh0OQ3DGW8mvFknt2o6dKdyH1315jnhmbVF2pcykXI/NAEwJLMYJf/ kWuRBIrPLEN0d7UnqE4wlEFrB/F8IjO9KPcRbC8vFmyamfXR20ZlhPcGz A==; X-IronPort-AV: E=McAfee;i="6500,9779,10523"; a="290773009" X-IronPort-AV: E=Sophos;i="5.96,143,1665471600"; d="scan'208";a="290773009" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Nov 2022 03:07:22 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10523"; a="586932338" X-IronPort-AV: E=Sophos;i="5.96,143,1665471600"; d="scan'208";a="586932338" Received: from gschoede-mobl1.ger.corp.intel.com (HELO ijarvine-MOBL2.ger.corp.intel.com) ([10.252.46.211]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Nov 2022 03:07:19 -0800 From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= To: Andy Shevchenko , Greg Kroah-Hartman , Jiri Slaby , linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, Heikki Krogerus Cc: =?utf-8?q?Ilpo_J=C3=A4rvinen?= , stable@vger.kernel.org, Srikanth Thokala , Aman Kumar Subject: [PATCH 1/4] serial: 8250: Fall back to non-DMA Rx if IIR_RDI occurs Date: Mon, 7 Nov 2022 13:07:05 +0200 Message-Id: <20221107110708.58223-2-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221107110708.58223-1-ilpo.jarvinen@linux.intel.com> References: <20221107110708.58223-1-ilpo.jarvinen@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748835307421713152?= X-GMAIL-MSGID: =?utf-8?q?1748835307421713152?= DW UART sometimes triggers IIR_RDI during DMA Rx when IIR_RX_TIMEOUT should have been triggered instead. Since IIR_RDI has higher priority than IIR_RX_TIMEOUT, this causes the Rx to hang into interrupt loop. The problem seems to occur at least with some combinations of small-sized transfers (I've reproduced the problem on Elkhart Lake PSE UARTs). If there's already an on-going Rx DMA and IIR_RDI triggers, fall graciously back to non-DMA Rx. That is, behave as if IIR_RX_TIMEOUT had occurred. 8250_omap already considers IIR_RDI similar to this change so its nothing unheard of. Fixes: 75df022b5f89 ("serial: 8250_dma: Fix RX handling") Cc: Co-developed-by: Srikanth Thokala Signed-off-by: Srikanth Thokala Co-developed-by: Aman Kumar Signed-off-by: Aman Kumar Signed-off-by: Ilpo Järvinen --- drivers/tty/serial/8250/8250_port.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c index fe8662cd9402..92dd18716169 100644 --- a/drivers/tty/serial/8250/8250_port.c +++ b/drivers/tty/serial/8250/8250_port.c @@ -1897,6 +1897,10 @@ EXPORT_SYMBOL_GPL(serial8250_modem_status); static bool handle_rx_dma(struct uart_8250_port *up, unsigned int iir) { switch (iir & 0x3f) { + case UART_IIR_RDI: + if (!up->dma->rx_running) + break; + fallthrough; case UART_IIR_RX_TIMEOUT: serial8250_rx_dma_flush(up); fallthrough; From patchwork Mon Nov 7 11:07:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ilpo_J=C3=A4rvinen?= X-Patchwork-Id: 16374 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1980965wru; Mon, 7 Nov 2022 03:08:34 -0800 (PST) X-Google-Smtp-Source: AMsMyM4qA08TEgauHGob+ckfIV55lxjEQ5AEQDwzx895+Kber981Mlg/7LXfMH6/BKSKKNuZ5I4O X-Received: by 2002:a05:6a00:1706:b0:56d:3028:23f0 with SMTP id h6-20020a056a00170600b0056d302823f0mr46310790pfc.59.1667819314481; Mon, 07 Nov 2022 03:08:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667819314; cv=none; d=google.com; s=arc-20160816; b=KTDk6KaN4koErmmFMLoZZOp0opaREoFk2Y36gMDFgcwB7szybUQniMLmW1D3w2acx9 SPuph8GLMkF0t7+85WWhH+4F1s/COppCFcWOkbWavMikKdTUaQpHzIuQ0yRSZ71Gt3jd s7px+5EE25ncPn5fhKFi52zUfmtQv1AvAhUYlEf14He7xoPExkNIr4CODaJLCNg95sR5 ii47vgHAqLyriX+BonQhWtmEV7IbkN5pPzS8LwlRlJzIXfb91nxCdkytTP5a0/aXkYbL EfQpVwPzhU5iCyTYV++L/4x7jNfusw61ylFWVenYbIVrIe7euYkvvx9Ygxgv7SvT12Un JiIA== 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 :dkim-signature; bh=tSbai1gH47eMbSOefXHM9C1PU/UoNbx/jVVzqPHywEM=; b=psqJ3Z6fDvE+jwl2RO5VlCEKUXhsC9hGuXe/xFIewcLJxRYc9V6+GDzy45Ma7ADHM4 xq0CASbMPNc6+cV1eKLYPy6JUGl91M+QWrb1g418P3GI9FStN9f2Eg6YtLQ+A7tq8F60 fXJKJ1BUrKiQ4L696VNfIyzEGl1uyufL9+y2HpsOK9SOi/pgYfjVlkXk5DvhTDQM2jDD HW/ttD37zLwM1FDYiHb2wmSRao9R1F6WzDfhgyRYiN6OyyMNQn8oj7RZbcNIhmmA2ifE Ydmqq2K+ZXWmU3Z6QNOBuR97Gz1dc+1wzZ1Gw3af4LKP/r6VMuJaXC6iJkft3MF6r1tY 8mWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=n28fkNWL; 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=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i2-20020a17090acf8200b00212fe4afc73si12241762pju.24.2022.11.07.03.08.21; Mon, 07 Nov 2022 03:08:34 -0800 (PST) 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; dkim=pass header.i=@intel.com header.s=Intel header.b=n28fkNWL; 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=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231590AbiKGLHl (ORCPT + 99 others); Mon, 7 Nov 2022 06:07:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60040 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231400AbiKGLH0 (ORCPT ); Mon, 7 Nov 2022 06:07:26 -0500 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 316AA18386; Mon, 7 Nov 2022 03:07:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1667819246; x=1699355246; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=UtD5WjXlvt+YGgcDoYJMysEl6WyGK5Ld+p1WXJ0fxvY=; b=n28fkNWLHfIASasA6zjuz0HHBIObVZ3prF4BeJY27HUS16Jl5gXbKbeW G/sn44dMeIPapAxm/pxzVB3aUgiUkywnrj3VzMjPo+lckKfvb+hh0LzM3 xakZdCJad2TZQ/vV1LD0URjhAwO/SeVn7GqVXyx9yw04dS3bQTQC9d+j1 UFIDxhzPbAVPIJSbO5U7HSpbePdJGrBdTqquedKMK9lTL3NXw+KbLK0Gm 8YCbD3CAKpmEv9qZcQJVx5DrRXujjF/SHwVQ/bVfrfRITkJsuqTkyP8Wn BpIqCNghusdhthPp9jkRxMXlBIxeRmmj06ca5mgPGwZx7hMZGZZZD7QIY Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10523"; a="290773022" X-IronPort-AV: E=Sophos;i="5.96,143,1665471600"; d="scan'208";a="290773022" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Nov 2022 03:07:25 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10523"; a="586932344" X-IronPort-AV: E=Sophos;i="5.96,143,1665471600"; d="scan'208";a="586932344" Received: from gschoede-mobl1.ger.corp.intel.com (HELO ijarvine-MOBL2.ger.corp.intel.com) ([10.252.46.211]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Nov 2022 03:07:23 -0800 From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= To: Andy Shevchenko , Greg Kroah-Hartman , Jiri Slaby , linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Ilpo_J=C3=A4rvinen?= Cc: stable Subject: [PATCH 2/4] serial: 8250_lpss: Configure DMA also w/o DMA filter Date: Mon, 7 Nov 2022 13:07:06 +0200 Message-Id: <20221107110708.58223-3-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221107110708.58223-1-ilpo.jarvinen@linux.intel.com> References: <20221107110708.58223-1-ilpo.jarvinen@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748835305257680179?= X-GMAIL-MSGID: =?utf-8?q?1748835305257680179?= If the platform doesn't use DMA device filter (as is the case with Elkhart Lake), whole lpss8250_dma_setup() setup is skipped. This results in skipping also *_maxburst setup which is undesirable. Refactor lpss8250_dma_setup() to configure DMA even if filter is not setup. Cc: stable Signed-off-by: Ilpo Järvinen --- drivers/tty/serial/8250/8250_lpss.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/tty/serial/8250/8250_lpss.c b/drivers/tty/serial/8250/8250_lpss.c index 44cc755b1a29..ed281445a97d 100644 --- a/drivers/tty/serial/8250/8250_lpss.c +++ b/drivers/tty/serial/8250/8250_lpss.c @@ -277,8 +277,10 @@ static int lpss8250_dma_setup(struct lpss8250 *lpss, struct uart_8250_port *port struct dw_dma_slave *rx_param, *tx_param; struct device *dev = port->port.dev; - if (!lpss->dma_param.dma_dev) - return 0; + if (!lpss->dma_param.dma_dev) { + dma = port->dma; + goto confonly; + } rx_param = devm_kzalloc(dev, sizeof(*rx_param), GFP_KERNEL); if (!rx_param) @@ -289,16 +291,20 @@ static int lpss8250_dma_setup(struct lpss8250 *lpss, struct uart_8250_port *port return -ENOMEM; *rx_param = lpss->dma_param; - dma->rxconf.src_maxburst = lpss->dma_maxburst; - *tx_param = lpss->dma_param; - dma->txconf.dst_maxburst = lpss->dma_maxburst; dma->fn = lpss8250_dma_filter; dma->rx_param = rx_param; dma->tx_param = tx_param; port->dma = dma; + +confonly: + if (dma) { + dma->rxconf.src_maxburst = lpss->dma_maxburst; + dma->txconf.dst_maxburst = lpss->dma_maxburst; + } + return 0; } From patchwork Mon Nov 7 11:07:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ilpo_J=C3=A4rvinen?= X-Patchwork-Id: 16377 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1981263wru; Mon, 7 Nov 2022 03:09:12 -0800 (PST) X-Google-Smtp-Source: AMsMyM7tiKWn229F++VRz+x6MfpieLDy3YmNaNuukQ/4kJn5eNopLIqw+Vjd0xOcpslcVUFBzB4T X-Received: by 2002:a17:906:36d1:b0:76c:a723:9445 with SMTP id b17-20020a17090636d100b0076ca7239445mr45943455ejc.548.1667819351902; Mon, 07 Nov 2022 03:09:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667819351; cv=none; d=google.com; s=arc-20160816; b=RMyLSP1ki+g///yZyH2apfl18VkQhiLc6wL6cJBZh8J5ydoeNC6uoBH6ew9ps8xuoy HmpDvwcXB5sUd6xsmfo1R/ekLpkhIUB35nm+Ud0qZUK8Co2C82TUPgDN1Lf2mqpQzTm4 JLuY8DsDWqWf2OI/jt6kgt2pxhn0YZYMOdldyEIEwOn8pEHcAA5//WCG40uaqe2P0nXf FwsU2y8uRXi9wt5zT9hbnU+qaLz1M1ddcNzt+ZkuEbtt5KaZ9x1wgDS1IIFPPTV9XUjU 3ylwyQvgHI6WDwz1mKvTCPzFZzSr/ZCmD+Ij5Nvz10df7HDu48Skhct0Q2KF3cFZC6e0 FD/A== 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 :dkim-signature; bh=PSaGqW9gEnZs/9wLO7orAKhg8krkDtqz2tq9lRVKgdU=; b=csR1d4hcINbTJSh2gCpZ22pWobHXpURpZDGDNTIdzDygONNBUCrcaPxUIp4XDl7nW9 Hz9zqyqB31JxXGZdFgEwQZY+tmlPzokqbGSb2oh1REbDpNKhMtpHSF6Y2RqEC9NlBSWm 9HHvsYAT44GMZQ/kWI9VWd3L65s7woY59IXZHNN7AYBsbBTwQKHOLvZFznZ9fz9ViBpz r3h5uIy0gG5rDq5L+6tEbMqrpEcRTZA/yVeAZKQWkuqmKOqdoHM3kU5GU4s/5DytY75E aUwgfkQsGtgJbAzeejSf3YFmh/2x3JsQXvhR/RGy2VZJ+iJ3pSEHXd/WqvSGB2gMECK2 q7Gg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=TKH12svC; 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=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gn17-20020a1709070d1100b007824786a7easi10168763ejc.724.2022.11.07.03.08.46; Mon, 07 Nov 2022 03:09:11 -0800 (PST) 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; dkim=pass header.i=@intel.com header.s=Intel header.b=TKH12svC; 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=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231653AbiKGLHp (ORCPT + 99 others); Mon, 7 Nov 2022 06:07:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59984 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231356AbiKGLHc (ORCPT ); Mon, 7 Nov 2022 06:07:32 -0500 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7256218364; Mon, 7 Nov 2022 03:07:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1667819251; x=1699355251; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=gbTRCkxxLdOZW1y6aGgrb7XRmU8BTA5iNZdcQ5OXGmE=; b=TKH12svCttUpMooVWeFxd0W2LsXEOWYvyXaD0JViSkjlGlTvo4q/CgO0 kLPRU1255lpL/Kiqa7ZtfLvRNtX/yCwjHF5simTlPezMC9hmC25W9QF0h z+KDN7btn4j5mZnJ02w7AgftCYk+YJr/RHnhHil78tlUUXbGsOPQoEiOw efwkvLeX/se+ZwYSN7HN3TCkGvTHLOpETc2pKmYFHPsnQzuka21YLNHah QZiv72y2wEJlAIEJM8Y27as5KA4mQgmeog4/RyiqpVc6yR0hUeqsthT/x vZ4B0g57V1tsWq9zHYtGzb6M05z+w8OoIQzX+qxabG/5MJeYP0Q82jVZr A==; X-IronPort-AV: E=McAfee;i="6500,9779,10523"; a="290773035" X-IronPort-AV: E=Sophos;i="5.96,143,1665471600"; d="scan'208";a="290773035" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Nov 2022 03:07:29 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10523"; a="586932376" X-IronPort-AV: E=Sophos;i="5.96,143,1665471600"; d="scan'208";a="586932376" Received: from gschoede-mobl1.ger.corp.intel.com (HELO ijarvine-MOBL2.ger.corp.intel.com) ([10.252.46.211]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Nov 2022 03:07:26 -0800 From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= To: Andy Shevchenko , Greg Kroah-Hartman , Jiri Slaby , linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Ilpo_J=C3=A4rvinen?= Cc: stable@vger.kernel.org, Wentong Wu , Srikanth Thokala , Aman Kumar Subject: [PATCH 3/4] serial: 8250_lpss: Use 16B DMA burst with Elkhart Lake Date: Mon, 7 Nov 2022 13:07:07 +0200 Message-Id: <20221107110708.58223-4-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221107110708.58223-1-ilpo.jarvinen@linux.intel.com> References: <20221107110708.58223-1-ilpo.jarvinen@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748835344626194708?= X-GMAIL-MSGID: =?utf-8?q?1748835344626194708?= Configure DMA to use 16B burst size with Elkhart Lake. This makes the bus use more efficient and works around an issue which occurs with the previously used 1B. Fixes: 0a9410b981e9 ("serial: 8250_lpss: Enable DMA on Intel Elkhart Lake") Cc: # serial: 8250_lpss: Configure DMA also w/o DMA filter Reported-by: Wentong Wu Co-developed-by: Srikanth Thokala Signed-off-by: Srikanth Thokala Co-developed-by: Aman Kumar Signed-off-by: Aman Kumar Signed-off-by: Ilpo Järvinen --- I know the list of Co-dev-bys & Sob seems a bit odd for a oneliner. The reason is that I cleaned up this from a more complex patch using the earlier change that I authored myself so only this oneliner remained in this patch. --- drivers/tty/serial/8250/8250_lpss.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/tty/serial/8250/8250_lpss.c b/drivers/tty/serial/8250/8250_lpss.c index ed281445a97d..e0b4e1446eac 100644 --- a/drivers/tty/serial/8250/8250_lpss.c +++ b/drivers/tty/serial/8250/8250_lpss.c @@ -174,6 +174,8 @@ static int ehl_serial_setup(struct lpss8250 *lpss, struct uart_port *port) */ up->dma = dma; + lpss->dma_maxburst = 16; + port->set_termios = dw8250_do_set_termios; return 0; From patchwork Mon Nov 7 11:07:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ilpo_J=C3=A4rvinen?= X-Patchwork-Id: 16376 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1981257wru; Mon, 7 Nov 2022 03:09:11 -0800 (PST) X-Google-Smtp-Source: AMsMyM6wBmiVjC+/EKGQayxU1fX9qwEKPWQJXuNncr++Ch7o8iN7unOZkX89IDYgt5PUHFgt0eZI X-Received: by 2002:a17:90b:1e08:b0:212:ee11:7b09 with SMTP id pg8-20020a17090b1e0800b00212ee117b09mr67380814pjb.60.1667819351550; Mon, 07 Nov 2022 03:09:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667819351; cv=none; d=google.com; s=arc-20160816; b=Ac6UMmz5zSYTOIgv4KVEwwgoL0aTQoOJtrlU9sj+zKZTaEUiKXtNRFOSdFcF0g7X7T xs9sJiMd2SSE8Op4bvWPZwPa/oa+NDpbYRrUb41W5k+R5zKdqKbnWdYrV86rZ6FprQEe jnw0kAu9ymWfpXGFo3TaQyZUSUXmvHX7mecKQQOkiDuWx2sCNir99OEy5AHFRaZcK29X Pd/JAeEZX6s0oEpVE/eOyQL/Y5jvbytgJKna50gRjYXQANgJihi/46C7po7TdLI6g0tu 5vYMV6dbf3zNt0VaQqemAag5suophG41za/I9DJCIm2d3MgePzPNau7yxot1MCBLzNc/ USeQ== 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 :dkim-signature; bh=kPXkYWnfxt+7K3+yHadfSSkUCTIxXdAY8xvp8YbtPiY=; b=ZwbM+6EN7mv74KW8vDzrHbAR3wOfzAgPtvocUyWcQH+aZPAune0Xm12kO7RKsje5S3 mAQ/zWb4soD3cpqm/QNC55fVcaX4VH2Y9CD+ZZXfq+KmPePRrGMrCKR4rH0Egwks8+Ys 5XT4/Z0jbO+m2jyeDaedqgcEvBA+HZQSDT1DkalOY75cbw47TzFV36q5k8xQ3Ajf9IQ6 KYBtO+G/exlWgs/IQnizvuoJH/jhCkaucyj/yRT/MWJJcrXlVn0gv8Cvc4XK9dUt3A/q VPaufy9TbYvWwBa/zRZM32WP1nKmJXbkHme+hBU+9tVLnNoU5zRaLlXpQnGVPwtcDcEX lJJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=iBAai1hL; 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=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y4-20020a170902cac400b00186a3bc939esi8358952pld.211.2022.11.07.03.08.57; Mon, 07 Nov 2022 03:09:11 -0800 (PST) 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; dkim=pass header.i=@intel.com header.s=Intel header.b=iBAai1hL; 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=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231540AbiKGLHr (ORCPT + 99 others); Mon, 7 Nov 2022 06:07:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60356 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231518AbiKGLHe (ORCPT ); Mon, 7 Nov 2022 06:07:34 -0500 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0239618386; Mon, 7 Nov 2022 03:07:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1667819253; x=1699355253; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=GX897nypwCJ78jjUOfdNotVKqeArdhyavQ6h8PsVU8c=; b=iBAai1hLFbwA3ysMoxykDt0hyJZiRbCzyzWNyAomHd9iwAdfPIpenazq DAJ4xRaUCowz/bCuNKsj+ayqCsQPHwU5eLHsdLPI4J12fu/Cm1tlh0ztK QSDAkQgYXb7v9lj6SuDozCuXagovBnDlqEwUPXqpGTcwy4BKcBwD46JEK ecZuik8nyNhIB2JLA/og0EDA1NXsDBOLadHV8GEycOEf3eXBscNamUU/k 08zrALZsJb3jXpCG6dZaXL0JtegYjufovr9mxUvOgeRtxf50Wm5wUR+zx /sEK8i7wpdDIzcNZl0u6GumAdST+Qhj6EMcRalvEEz+p3wnkKlR6KJG1J A==; X-IronPort-AV: E=McAfee;i="6500,9779,10523"; a="290773043" X-IronPort-AV: E=Sophos;i="5.96,143,1665471600"; d="scan'208";a="290773043" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Nov 2022 03:07:33 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10523"; a="586932381" X-IronPort-AV: E=Sophos;i="5.96,143,1665471600"; d="scan'208";a="586932381" Received: from gschoede-mobl1.ger.corp.intel.com (HELO ijarvine-MOBL2.ger.corp.intel.com) ([10.252.46.211]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Nov 2022 03:07:31 -0800 From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= To: Andy Shevchenko , Greg Kroah-Hartman , Jiri Slaby , linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, Heikki Krogerus Cc: =?utf-8?q?Ilpo_J=C3=A4rvinen?= , stable@vger.kernel.org, Gilles BULOZ Subject: [PATCH 4/4] serial: 8250: Flush DMA Rx on RLSI Date: Mon, 7 Nov 2022 13:07:08 +0200 Message-Id: <20221107110708.58223-5-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221107110708.58223-1-ilpo.jarvinen@linux.intel.com> References: <20221107110708.58223-1-ilpo.jarvinen@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748835343996356109?= X-GMAIL-MSGID: =?utf-8?q?1748835343996356109?= Returning true from handle_rx_dma() without flushing DMA first creates a data ordering hazard. If DMA Rx has handled any character at the point when RLSI occurs, the non-DMA path handles any pending characters jumping them ahead of those characters that are pending under DMA. Fixes: 75df022b5f89 ("serial: 8250_dma: Fix RX handling") Cc: Signed-off-by: Ilpo Järvinen --- Cc: Gilles BULOZ drivers/tty/serial/8250/8250_port.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c index 92dd18716169..388172289627 100644 --- a/drivers/tty/serial/8250/8250_port.c +++ b/drivers/tty/serial/8250/8250_port.c @@ -1901,10 +1901,9 @@ static bool handle_rx_dma(struct uart_8250_port *up, unsigned int iir) if (!up->dma->rx_running) break; fallthrough; + case UART_IIR_RLSI: case UART_IIR_RX_TIMEOUT: serial8250_rx_dma_flush(up); - fallthrough; - case UART_IIR_RLSI: return true; } return up->dma->rx_dma(up);