From patchwork Thu Nov 28 09:41:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 21830 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f71.google.com (mail-oa0-f71.google.com [209.85.219.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3EBDA23FCB for ; Thu, 28 Nov 2013 09:41:19 +0000 (UTC) Received: by mail-oa0-f71.google.com with SMTP id i4sf27500004oah.6 for ; Thu, 28 Nov 2013 01:41:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=0POTxyPmjGG+feUPmbeKlRLASBwJtc2BsEDkeI4vkdI=; b=kTLGxF+EWktkLJlW5hcw4AZRnMQRmsVilmWTUGOhJ5y+hmKkUniAzeSubfKVtYKk1K q5YTrwIMxVsX2TWthKdhFil2NLPQzzD6EID48I/O13CEX+4xXRnYZvVPgxyZXrz8yxB6 odx8sXy+k3+TPdsvNJjRE+XnyP2X+SoDnnMnj8qg7Jl4CyPb1ljcsPqjiXQbrRqNtnvW uF4ZNonaXdW4G9FfEesjrNaMOJuTMWmBEJKqWYkUprSuVSeT9cTIxekCa74diLqWxC8S ixQJez0X39pKN25/PwIUPKvf+0jyjRsNmirrBQJKm3vGiui6ygZNhUAOVl6q8HW5Qqxj HtFQ== X-Gm-Message-State: ALoCoQmOuahM39k6fUqxd7PLsZX3R8hJZXrmJ8Q1HeW+vFhsKq16EGCWsAUPpkTzRTVptiqm/ZNJ X-Received: by 10.50.3.40 with SMTP id 8mr630233igz.1.1385631679086; Thu, 28 Nov 2013 01:41:19 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.64.231 with SMTP id r7ls1442487qes.78.gmail; Thu, 28 Nov 2013 01:41:19 -0800 (PST) X-Received: by 10.58.143.17 with SMTP id sa17mr38380673veb.14.1385631678974; Thu, 28 Nov 2013 01:41:18 -0800 (PST) Received: from mail-vb0-f44.google.com (mail-vb0-f44.google.com [209.85.212.44]) by mx.google.com with ESMTPS id g4si22598487vch.73.2013.11.28.01.41.18 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 28 Nov 2013 01:41:18 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.44 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.44; Received: by mail-vb0-f44.google.com with SMTP id w20so5678448vbb.17 for ; Thu, 28 Nov 2013 01:41:18 -0800 (PST) X-Received: by 10.220.64.69 with SMTP id d5mr38274508vci.11.1385631678876; Thu, 28 Nov 2013 01:41:18 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp1896vcz; Thu, 28 Nov 2013 01:41:18 -0800 (PST) X-Received: by 10.112.158.231 with SMTP id wx7mr11236501lbb.27.1385631677849; Thu, 28 Nov 2013 01:41:17 -0800 (PST) Received: from mail-la0-f49.google.com (mail-la0-f49.google.com [209.85.215.49]) by mx.google.com with ESMTPS id dm10si20494590lbc.99.2013.11.28.01.41.17 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 28 Nov 2013 01:41:17 -0800 (PST) Received-SPF: neutral (google.com: 209.85.215.49 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=209.85.215.49; Received: by mail-la0-f49.google.com with SMTP id er20so5738564lab.22 for ; Thu, 28 Nov 2013 01:41:17 -0800 (PST) X-Received: by 10.152.6.232 with SMTP id e8mr82laa.82.1385631677049; Thu, 28 Nov 2013 01:41:17 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id dv8sm38281096lbc.15.2013.11.28.01.41.14 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Nov 2013 01:41:16 -0800 (PST) From: Linus Walleij To: Greg Kroah-Hartman , linux-serial@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Linus Walleij , Jongsung Kim , Chanho Min , Russell King Subject: [PATCH] serial: pl011: use DMA RX polling by default Date: Thu, 28 Nov 2013 10:41:04 +0100 Message-Id: <1385631664-32607-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.3.1 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.44 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Making DMA RX polling optional when DMA is on was just over-cautious: there is one single system in the kernel tree using this facility, Ux500 and after some testing I turned this on also for Ux500, which means it should simply be on by default if DMA is enabled. Cc: Jongsung Kim Cc: Chanho Min Cc: Russell King Signed-off-by: Linus Walleij --- drivers/tty/serial/amba-pl011.c | 2 +- include/linux/amba/serial.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index 7203864992a5..501d96453466 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -327,7 +327,7 @@ static void pl011_dma_probe_initcall(struct device *dev, struct uart_amba_port * dmaengine_slave_config(chan, &rx_conf); uap->dmarx.chan = chan; - if (plat && plat->dma_rx_poll_enable) { + if (plat) { /* Set poll rate if specified. */ if (plat->dma_rx_poll_rate) { uap->dmarx.auto_poll_rate = false; diff --git a/include/linux/amba/serial.h b/include/linux/amba/serial.h index 0ddb5c02ad8b..0891ea0458f6 100644 --- a/include/linux/amba/serial.h +++ b/include/linux/amba/serial.h @@ -203,7 +203,6 @@ struct amba_pl011_data { bool (*dma_filter)(struct dma_chan *chan, void *filter_param); void *dma_rx_param; void *dma_tx_param; - bool dma_rx_poll_enable; unsigned int dma_rx_poll_rate; unsigned int dma_rx_poll_timeout; void (*init) (void);