From patchwork Tue Feb 24 03:46:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jorge Ramirez-Ortiz X-Patchwork-Id: 5869491 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 549189F169 for ; Tue, 24 Feb 2015 03:49:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5335920604 for ; Tue, 24 Feb 2015 03:49:31 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 49B8E205FC for ; Tue, 24 Feb 2015 03:49:30 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YQ6T3-0000Um-M4; Tue, 24 Feb 2015 03:47:29 +0000 Received: from mail-qg0-f51.google.com ([209.85.192.51]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YQ6Sy-0000Np-9h for linux-arm-kernel@lists.infradead.org; Tue, 24 Feb 2015 03:47:25 +0000 Received: by mail-qg0-f51.google.com with SMTP id z60so28061341qgd.10 for ; Mon, 23 Feb 2015 19:47:02 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=yn86HurjkiI90++K4EQLyRNeG4O7oPoOl/v2n37PLQQ=; b=KzmQ6wc0naMDJFW6WOVfPkuPevini5AL1WR4gPBKBbV34FC6D76aFfZxdLxg+3N0uD YnR9iQKa2QsMFLNKO3I2mzk7FMvWz6p1qzgPwSOJ7Q4jvQatZv5lwZn9if6awoq9QXvF feAyj4Ef7n2ct3rghTUC02FLhPsPdzoVWhPoWi5u+rbrYkfxEQ2XbRTMofVJFn2gerxy bYbxrzsKsLwNlS3d44wYilN9CiqORMs8Pdx/TOP5u4Q9a7YJVCeHhpIpgeLCOQlW4kal pxcicWXt39pYhKSsGcLyGRdYPIu0hKZ3L+X+uAK1hD2SGHvZeDlzhlskmsIIJSltXswb EH8Q== X-Gm-Message-State: ALoCoQluRCw+lKGaQOQ/6QIODy4a6Oe+atDwRm819WnKH8gKjj8IIva95J6K9csWeTftj6S6ZjhO X-Received: by 10.140.48.133 with SMTP id o5mr31468188qga.8.1424749622583; Mon, 23 Feb 2015 19:47:02 -0800 (PST) Received: from localhost.localdomain (cpe-67-247-86-207.rochester.res.rr.com. [67.247.86.207]) by mx.google.com with ESMTPSA id v76sm6869356qge.18.2015.02.23.19.47.01 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Feb 2015 19:47:02 -0800 (PST) From: Jorge Ramirez-Ortiz To: jorge.ramirez-ortiz@linaro.org, linux-arm-kernel@lists.infradead.org, robh@kernel.org, viresh.kumar@linaro.org, linux@arm.linux.org.uk Subject: [PATCH] drivers/tty: amba-pl011: defer driver probing if external dma is not ready. Date: Mon, 23 Feb 2015 22:46:53 -0500 Message-Id: <1424749613-24765-2-git-send-email-jorge.ramirez-ortiz@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1424749613-24765-1-git-send-email-jorge.ramirez-ortiz@linaro.org> References: <1424749613-24765-1-git-send-email-jorge.ramirez-ortiz@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150223_194724_453848_EB7E3714 X-CRM114-Status: GOOD ( 20.70 ) X-Spam-Score: -0.7 (/) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch addresses a race condition that happens when device_initcall(pl011_dma_initicall) is executed before all the devices have been probed - this issue was observed on an hisi_6220 SoC (HiKey board from Linaro). The proposed implementation for OF and ACPI uses deferred driver probing to wait for the DMA controller to be registered. It defaults to legacy behaviour when platform data is present. Signed-off-by: Jorge Ramirez-Ortiz --- drivers/tty/serial/amba-pl011.c | 67 ++++++++++++++++++++++++++--------------- 1 file changed, 43 insertions(+), 24 deletions(-) diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index 8d94c19..d631a0a 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -29,6 +29,7 @@ * and hooked into this driver. */ +#define pr_fmt(fmt) "amba-pl011: "fmt #if defined(CONFIG_SERIAL_AMBA_PL011_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) #define SUPPORT_SYSRQ @@ -261,7 +262,8 @@ static void pl011_sgbuf_free(struct dma_chan *chan, struct pl011_sgbuf *sg, } } -static void pl011_dma_probe_initcall(struct device *dev, struct uart_amba_port *uap) +static int pl011_dma_probe(struct device *dev, struct uart_amba_port *uap, + void (*queue_dma_probe)(struct device *, struct uart_amba_port *)) { /* DMA is the sole user of the platform data right now */ struct amba_pl011_data *plat = dev_get_platdata(uap->port.dev); @@ -275,15 +277,23 @@ static void pl011_dma_probe_initcall(struct device *dev, struct uart_amba_port * struct dma_chan *chan; dma_cap_mask_t mask; - chan = dma_request_slave_channel(dev, "tx"); + if (queue_dma_probe && plat && plat->dma_filter) { + (*queue_dma_probe)(dev, uap); + return 0; + } + + chan = dma_request_slave_channel_reason(dev, "tx"); + if (IS_ERR(chan)) { + + /* the dma driver has not been initialized yet */ + if (PTR_ERR(chan) == -EPROBE_DEFER) + return -EPROBE_DEFER; - if (!chan) { /* We need platform data */ if (!plat || !plat->dma_filter) { dev_info(uap->port.dev, "no DMA platform data\n"); - return; + return 0; } - /* Try to acquire a generic DMA engine slave TX channel */ dma_cap_zero(mask); dma_cap_set(DMA_SLAVE, mask); @@ -292,7 +302,7 @@ static void pl011_dma_probe_initcall(struct device *dev, struct uart_amba_port * plat->dma_tx_param); if (!chan) { dev_err(uap->port.dev, "no TX DMA channel!\n"); - return; + return 0; } } @@ -310,7 +320,7 @@ static void pl011_dma_probe_initcall(struct device *dev, struct uart_amba_port * if (!chan) { dev_err(uap->port.dev, "no RX DMA channel!\n"); - return; + return 0; } } @@ -383,14 +393,16 @@ static void pl011_dma_probe_initcall(struct device *dev, struct uart_amba_port * dev_info(uap->port.dev, "DMA channel RX %s\n", dma_chan_name(uap->dmarx.chan)); } + + return 0; } -#ifndef MODULE /* - * Stack up the UARTs and let the above initcall be done at device - * initcall time, because the serial driver is called as an arch - * initcall, and at this time the DMA subsystem is not yet registered. - * At this point the driver will switch over to using DMA where desired. + * On platforms with no OF or ACPI support, we stack up the UARTs and let the + * below initcall be done at late initcall time, because the serial driver is + * called as an arch * initcall, and at this time the DMA subsystem is not yet + * registered. At this point the driver will switch over to using DMA where + * desired. */ struct dma_uap { struct list_head node; @@ -400,22 +412,23 @@ struct dma_uap { static LIST_HEAD(pl011_dma_uarts); -static int __init pl011_dma_initcall(void) +static int __init pl011_dequeue_dma_probe_initcall(void) { struct list_head *node, *tmp; list_for_each_safe(node, tmp, &pl011_dma_uarts) { struct dma_uap *dmau = list_entry(node, struct dma_uap, node); - pl011_dma_probe_initcall(dmau->dev, dmau->uap); + pl011_dma_probe(dmau->dev, dmau->uap, NULL); list_del(node); kfree(dmau); } return 0; } -device_initcall(pl011_dma_initcall); +late_initcall_sync(pl011_dequeue_dma_probe_initcall); -static void pl011_dma_probe(struct device *dev, struct uart_amba_port *uap) +static void pl011_queue_dma_probe(struct device *dev, + struct uart_amba_port *uap) { struct dma_uap *dmau = kzalloc(sizeof(struct dma_uap), GFP_KERNEL); if (dmau) { @@ -424,12 +437,6 @@ static void pl011_dma_probe(struct device *dev, struct uart_amba_port *uap) list_add_tail(&dmau->node, &pl011_dma_uarts); } } -#else -static void pl011_dma_probe(struct device *dev, struct uart_amba_port *uap) -{ - pl011_dma_probe_initcall(dev, uap); -} -#endif static void pl011_dma_remove(struct uart_amba_port *uap) { @@ -1142,7 +1149,14 @@ static inline bool pl011_dma_rx_running(struct uart_amba_port *uap) #else /* Blank functions if the DMA engine is not available */ -static inline void pl011_dma_probe(struct device *dev, struct uart_amba_port *uap) +static int pl011_dma_probe(struct device *dev, struct uart_amba_port *uap, + void (*queue_dma_probe)(struct device *, struct uart_amba_port *)) +{ + return 0; +} + +static void pl011_queue_dma_probe(struct device *dev, + struct uart_amba_port *uap) { } @@ -2218,7 +2232,12 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id) uap->port.ops = &amba_pl011_pops; uap->port.flags = UPF_BOOT_AUTOCONF; uap->port.line = i; - pl011_dma_probe(&dev->dev, uap); + + ret = pl011_dma_probe(&dev->dev, uap, &pl011_queue_dma_probe); + if (ret == -EPROBE_DEFER) { + devm_kfree(&dev->dev, uap); + return ret; + } /* Ensure interrupts from this UART are masked and cleared */ writew(0, uap->port.membase + UART011_IMSC);