From: Andre Przywara <andre.przywara@arm.com> To: linux@arm.linux.org.uk, gregkh@linuxfoundation.org, jslaby@suse.cz Cc: linux-arm-kernel@lists.infradead.org, rob.herring@linaro.org, arnd@arndb.de, linux-serial@vger.kernel.org, Dave.Martin@arm.com Subject: [PATCH v2 05/10] drivers: PL011: refactor pl011_probe() Date: Wed, 4 Mar 2015 17:59:49 +0000 [thread overview] Message-ID: <1425491994-23913-6-git-send-email-andre.przywara@arm.com> (raw) In-Reply-To: <1425491994-23913-1-git-send-email-andre.przywara@arm.com> Currently the pl011_probe() function is relying on some AMBA IDs and a device tree node to initialize the driver and a port. Both features are not necessarily required for the driver: - we lack AMBA IDs in the ARM SBSA generic UART and - we lack a DT node in ACPI systems. So lets refactor the function to ease later reuse. Signed-off-by: Andre Przywara <andre.przywara@arm.com> --- drivers/tty/serial/amba-pl011.c | 89 ++++++++++++++++++++++++++------------- 1 file changed, 60 insertions(+), 29 deletions(-) diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index 37b55ee..4fe0a0a 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -2274,13 +2274,10 @@ static void pl011_unregister_port(struct uart_amba_port *uap) uart_unregister_driver(&amba_reg); } - -static int pl011_probe(struct amba_device *dev, const struct amba_id *id) +static int pl011_allocate_port(struct device *dev, struct uart_amba_port **_uap) { struct uart_amba_port *uap; - struct vendor_data *vendor = id->data; - void __iomem *base; - int i, ret; + int i; for (i = 0; i < ARRAY_SIZE(amba_ports); i++) if (amba_ports[i] == NULL) @@ -2289,48 +2286,50 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id) if (i == ARRAY_SIZE(amba_ports)) return -EBUSY; - uap = devm_kzalloc(&dev->dev, sizeof(struct uart_amba_port), - GFP_KERNEL); + uap = devm_kzalloc(dev, sizeof(struct uart_amba_port), GFP_KERNEL); if (uap == NULL) return -ENOMEM; - i = pl011_probe_dt_alias(i, &dev->dev); + if (_uap) + *_uap = uap; + + return i; +} - base = devm_ioremap(&dev->dev, dev->res.start, - resource_size(&dev->res)); +static int pl011_setup_port(struct device *dev, struct uart_amba_port *uap, + struct resource *mmiobase, int index) +{ + void __iomem *base; + + base = devm_ioremap_resource(dev, mmiobase); if (!base) return -ENOMEM; - uap->clk = devm_clk_get(&dev->dev, NULL); - if (IS_ERR(uap->clk)) - return PTR_ERR(uap->clk); + index = pl011_probe_dt_alias(index, dev); - uap->vendor = vendor; - uap->lcrh_rx = vendor->lcrh_rx; - uap->lcrh_tx = vendor->lcrh_tx; uap->old_cr = 0; - uap->fifosize = vendor->get_fifosize(dev); - uap->port.dev = &dev->dev; - uap->port.mapbase = dev->res.start; + uap->port.dev = dev; + uap->port.mapbase = mmiobase->start; uap->port.membase = base; uap->port.iotype = UPIO_MEM; - uap->port.irq = dev->irq[0]; uap->port.fifosize = uap->fifosize; - uap->port.ops = &amba_pl011_pops; uap->port.flags = UPF_BOOT_AUTOCONF; - uap->port.line = i; + uap->port.line = index; INIT_DELAYED_WORK(&uap->tx_softirq_work, pl011_tx_softirq); - pl011_dma_probe(&dev->dev, uap); + pl011_dma_probe(dev, uap); - /* Ensure interrupts from this UART are masked and cleared */ - writew(0, uap->port.membase + UART011_IMSC); - writew(0xffff, uap->port.membase + UART011_ICR); + amba_ports[index] = uap; - snprintf(uap->type, sizeof(uap->type), "PL011 rev%u", amba_rev(dev)); + return 0; +} - amba_ports[i] = uap; +static int pl011_register_port(struct uart_amba_port *uap) +{ + int ret; - amba_set_drvdata(dev, uap); + /* Ensure interrupts from this UART are masked and cleared */ + writew(0, uap->port.membase + UART011_IMSC); + writew(0xffff, uap->port.membase + UART011_ICR); if (!amba_reg.state) { ret = uart_register_driver(&amba_reg); @@ -2347,6 +2346,38 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id) return ret; } +static int pl011_probe(struct amba_device *dev, const struct amba_id *id) +{ + struct uart_amba_port *uap; + struct vendor_data *vendor = id->data; + int portnr, ret; + + portnr = pl011_allocate_port(&dev->dev, &uap); + if (portnr < 0) + return portnr; + + uap->clk = devm_clk_get(&dev->dev, NULL); + if (IS_ERR(uap->clk)) + return PTR_ERR(uap->clk); + + uap->vendor = vendor; + uap->lcrh_rx = vendor->lcrh_rx; + uap->lcrh_tx = vendor->lcrh_tx; + uap->fifosize = vendor->get_fifosize(dev); + uap->port.irq = dev->irq[0]; + uap->port.ops = &amba_pl011_pops; + + snprintf(uap->type, sizeof(uap->type), "PL011 rev%u", amba_rev(dev)); + + ret = pl011_setup_port(&dev->dev, uap, &dev->res, portnr); + if (ret) + return ret; + + amba_set_drvdata(dev, uap); + + return pl011_register_port(uap); +} + static int pl011_remove(struct amba_device *dev) { struct uart_amba_port *uap = amba_get_drvdata(dev); -- 1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: andre.przywara@arm.com (Andre Przywara) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 05/10] drivers: PL011: refactor pl011_probe() Date: Wed, 4 Mar 2015 17:59:49 +0000 [thread overview] Message-ID: <1425491994-23913-6-git-send-email-andre.przywara@arm.com> (raw) In-Reply-To: <1425491994-23913-1-git-send-email-andre.przywara@arm.com> Currently the pl011_probe() function is relying on some AMBA IDs and a device tree node to initialize the driver and a port. Both features are not necessarily required for the driver: - we lack AMBA IDs in the ARM SBSA generic UART and - we lack a DT node in ACPI systems. So lets refactor the function to ease later reuse. Signed-off-by: Andre Przywara <andre.przywara@arm.com> --- drivers/tty/serial/amba-pl011.c | 89 ++++++++++++++++++++++++++------------- 1 file changed, 60 insertions(+), 29 deletions(-) diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index 37b55ee..4fe0a0a 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -2274,13 +2274,10 @@ static void pl011_unregister_port(struct uart_amba_port *uap) uart_unregister_driver(&amba_reg); } - -static int pl011_probe(struct amba_device *dev, const struct amba_id *id) +static int pl011_allocate_port(struct device *dev, struct uart_amba_port **_uap) { struct uart_amba_port *uap; - struct vendor_data *vendor = id->data; - void __iomem *base; - int i, ret; + int i; for (i = 0; i < ARRAY_SIZE(amba_ports); i++) if (amba_ports[i] == NULL) @@ -2289,48 +2286,50 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id) if (i == ARRAY_SIZE(amba_ports)) return -EBUSY; - uap = devm_kzalloc(&dev->dev, sizeof(struct uart_amba_port), - GFP_KERNEL); + uap = devm_kzalloc(dev, sizeof(struct uart_amba_port), GFP_KERNEL); if (uap == NULL) return -ENOMEM; - i = pl011_probe_dt_alias(i, &dev->dev); + if (_uap) + *_uap = uap; + + return i; +} - base = devm_ioremap(&dev->dev, dev->res.start, - resource_size(&dev->res)); +static int pl011_setup_port(struct device *dev, struct uart_amba_port *uap, + struct resource *mmiobase, int index) +{ + void __iomem *base; + + base = devm_ioremap_resource(dev, mmiobase); if (!base) return -ENOMEM; - uap->clk = devm_clk_get(&dev->dev, NULL); - if (IS_ERR(uap->clk)) - return PTR_ERR(uap->clk); + index = pl011_probe_dt_alias(index, dev); - uap->vendor = vendor; - uap->lcrh_rx = vendor->lcrh_rx; - uap->lcrh_tx = vendor->lcrh_tx; uap->old_cr = 0; - uap->fifosize = vendor->get_fifosize(dev); - uap->port.dev = &dev->dev; - uap->port.mapbase = dev->res.start; + uap->port.dev = dev; + uap->port.mapbase = mmiobase->start; uap->port.membase = base; uap->port.iotype = UPIO_MEM; - uap->port.irq = dev->irq[0]; uap->port.fifosize = uap->fifosize; - uap->port.ops = &amba_pl011_pops; uap->port.flags = UPF_BOOT_AUTOCONF; - uap->port.line = i; + uap->port.line = index; INIT_DELAYED_WORK(&uap->tx_softirq_work, pl011_tx_softirq); - pl011_dma_probe(&dev->dev, uap); + pl011_dma_probe(dev, uap); - /* Ensure interrupts from this UART are masked and cleared */ - writew(0, uap->port.membase + UART011_IMSC); - writew(0xffff, uap->port.membase + UART011_ICR); + amba_ports[index] = uap; - snprintf(uap->type, sizeof(uap->type), "PL011 rev%u", amba_rev(dev)); + return 0; +} - amba_ports[i] = uap; +static int pl011_register_port(struct uart_amba_port *uap) +{ + int ret; - amba_set_drvdata(dev, uap); + /* Ensure interrupts from this UART are masked and cleared */ + writew(0, uap->port.membase + UART011_IMSC); + writew(0xffff, uap->port.membase + UART011_ICR); if (!amba_reg.state) { ret = uart_register_driver(&amba_reg); @@ -2347,6 +2346,38 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id) return ret; } +static int pl011_probe(struct amba_device *dev, const struct amba_id *id) +{ + struct uart_amba_port *uap; + struct vendor_data *vendor = id->data; + int portnr, ret; + + portnr = pl011_allocate_port(&dev->dev, &uap); + if (portnr < 0) + return portnr; + + uap->clk = devm_clk_get(&dev->dev, NULL); + if (IS_ERR(uap->clk)) + return PTR_ERR(uap->clk); + + uap->vendor = vendor; + uap->lcrh_rx = vendor->lcrh_rx; + uap->lcrh_tx = vendor->lcrh_tx; + uap->fifosize = vendor->get_fifosize(dev); + uap->port.irq = dev->irq[0]; + uap->port.ops = &amba_pl011_pops; + + snprintf(uap->type, sizeof(uap->type), "PL011 rev%u", amba_rev(dev)); + + ret = pl011_setup_port(&dev->dev, uap, &dev->res, portnr); + if (ret) + return ret; + + amba_set_drvdata(dev, uap); + + return pl011_register_port(uap); +} + static int pl011_remove(struct amba_device *dev) { struct uart_amba_port *uap = amba_get_drvdata(dev); -- 1.7.9.5
next prev parent reply other threads:[~2015-03-04 17:59 UTC|newest] Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-03-04 17:59 [PATCH v2 00/10] drivers: PL011: add ARM SBSA Generic UART support Andre Przywara 2015-03-04 17:59 ` Andre Przywara 2015-03-04 17:59 ` [PATCH v2 01/10] drivers: PL011: avoid potential unregister_driver call Andre Przywara 2015-03-04 17:59 ` Andre Przywara 2015-03-12 10:42 ` Russell King - ARM Linux 2015-03-12 10:42 ` Russell King - ARM Linux 2015-04-08 15:39 ` Andre Przywara 2015-04-08 15:39 ` Andre Przywara 2015-04-08 18:14 ` Russell King - ARM Linux 2015-04-08 18:14 ` Russell King - ARM Linux 2015-03-04 17:59 ` [PATCH v2 02/10] drivers: PL011: refactor pl011_startup() Andre Przywara 2015-03-04 17:59 ` Andre Przywara 2015-03-04 17:59 ` [PATCH v2 03/10] drivers: PL011: refactor pl011_shutdown() Andre Przywara 2015-03-04 17:59 ` Andre Przywara 2015-03-04 17:59 ` [PATCH v2 04/10] drivers: PL011: refactor pl011_set_termios() Andre Przywara 2015-03-04 17:59 ` Andre Przywara 2015-03-04 17:59 ` Andre Przywara [this message] 2015-03-04 17:59 ` [PATCH v2 05/10] drivers: PL011: refactor pl011_probe() Andre Przywara 2015-03-04 17:59 ` [PATCH v2 06/10] drivers: PL011: replace UART_MIS reading with _RIS & _IMSC Andre Przywara 2015-03-04 17:59 ` Andre Przywara 2015-03-12 10:46 ` Russell King - ARM Linux 2015-03-12 10:46 ` Russell King - ARM Linux 2015-03-04 17:59 ` [PATCH v2 07/10] drivers: PL011: move cts_event workaround into separate function Andre Przywara 2015-03-04 17:59 ` Andre Przywara 2015-03-07 3:00 ` Greg KH 2015-03-07 3:00 ` Greg KH 2015-03-04 17:59 ` [PATCH v2 08/10] drivers: PL011: allow avoiding UART enabling/disabling Andre Przywara 2015-03-04 17:59 ` Andre Przywara 2015-03-04 17:59 ` [PATCH v2 09/10] drivers: PL011: allow to supply fixed option string Andre Przywara 2015-03-04 17:59 ` Andre Przywara 2015-03-04 17:59 ` [PATCH v2 10/10] drivers: PL011: add support for the ARM SBSA generic UART Andre Przywara 2015-03-04 17:59 ` Andre Przywara 2015-03-09 15:59 ` Dave Martin 2015-03-09 15:59 ` Dave Martin 2015-03-12 10:52 ` Russell King - ARM Linux 2015-03-12 10:52 ` Russell King - ARM Linux 2015-03-12 13:43 ` Andre Przywara 2015-03-12 13:43 ` Andre Przywara 2015-03-12 13:49 ` Russell King - ARM Linux 2015-03-12 13:49 ` Russell King - ARM Linux 2015-03-12 13:58 ` Andre Przywara 2015-03-12 13:58 ` Andre Przywara 2015-03-07 3:01 ` [PATCH v2 00/10] drivers: PL011: add ARM SBSA Generic UART support Greg KH 2015-03-07 3:01 ` Greg KH
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1425491994-23913-6-git-send-email-andre.przywara@arm.com \ --to=andre.przywara@arm.com \ --cc=Dave.Martin@arm.com \ --cc=arnd@arndb.de \ --cc=gregkh@linuxfoundation.org \ --cc=jslaby@suse.cz \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-serial@vger.kernel.org \ --cc=linux@arm.linux.org.uk \ --cc=rob.herring@linaro.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.