From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 309AFC2D0E8 for ; Fri, 3 Apr 2020 07:51:33 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0522E2073B for ; Fri, 3 Apr 2020 07:51:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="GwAZPaz3" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0522E2073B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=OjOdYRblLREj2CBBPh6Da0x0JJfHskmUsMGLEzkB/W0=; b=GwAZPaz3LRzDoM HA8B6G8miAqH7HTQ6SI490JiiNGRyyyJu0Q3C5Bc7naDzzLcgHL6KMyyOTUh2P/PYkNpVtfcLp1B0 b7W9cap7JQPSfMRJFmrtMZHKJsMP24GzWA+oKhQ4+8d1bYi0bfnosAwbgL9R0pcH81fI3N6gBjIHz c0fw5m9PwpJpBu4Ys2TK0S8Bq20ub/t570lkWhyQVN5hWxExIhAjhUCLsRkmiBapaj+Vu35pmT+i3 1ATdjMDIG7olL4hqW9xHPXIhBo5+EZu0L/k4g2SxL24pksxpqo2Q3AOP87YjhyNQCx0bEmYxFeVnz iAYBU+1YelmGOrQ/c3EQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jKH6x-00046O-Tt; Fri, 03 Apr 2020 07:51:31 +0000 Received: from mail-ed1-f68.google.com ([209.85.208.68]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jKH6u-00045a-4o for linux-arm-kernel@lists.infradead.org; Fri, 03 Apr 2020 07:51:29 +0000 Received: by mail-ed1-f68.google.com with SMTP id i16so8157222edy.11 for ; Fri, 03 Apr 2020 00:51:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=FrbcHFj0dm8KrckD2b/yiBc/1g6Pf5o+uljHj8BaPN8=; b=hPt8xVr47HQWVbpcqMVTWcwtaN0tGCK3ZxyePnD2HuHgodWSv6L2TqdolrYFYWxClV NbUwVF8ok384e7Q72t1wJkRn3kTZnkRw8y+IrpcDP6NZz2bv/6LtVZFYI+eHLo8EwrnY bw2/CH0H/NRGC4RF2TRnIBBHrUNEWbn19dbDR6ZOyHJ7L2n36mqtUvlHBzYpq0WBRt59 0RtlnSCp0WOg8F2HpYYkT89bBRg3y4+VxwLl+NMBoQaNK9fZ6PBoC6XMoHGgG+AtiGfd OqUMpmRYNG0342GWguPiYPdrrCZlImzFGaoGMB6e0OuCx7bOXU/CHT80SQZg2dlWXpkq IrYA== X-Gm-Message-State: AGi0PuZ65EVL24i22K0PUJFKOam1O9PQxyCnsZLCwpwwp6ZClX4bXuru wUOUZdyeqyeGSBMqHcXctFo= X-Google-Smtp-Source: APiQypIrcHJYRv1WIrgNA9AiIhYtOM0atxCY3hVtPi2Fwodq0nL/GJ/YWXSy5trX555E50tOg/puaA== X-Received: by 2002:a17:906:64b:: with SMTP id t11mr6896556ejb.224.1585900285735; Fri, 03 Apr 2020 00:51:25 -0700 (PDT) Received: from kozik-lap ([194.230.155.125]) by smtp.googlemail.com with ESMTPSA id l24sm1425106ejx.81.2020.04.03.00.51.24 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 03 Apr 2020 00:51:24 -0700 (PDT) Date: Fri, 3 Apr 2020 09:51:22 +0200 From: 'Krzysztof Kozlowski' To: Hyunki Koo Subject: Re: [PATCH v2] tty: samsung_tty: 32-bit access for TX/RX hold registers Message-ID: <20200403075122.GA9358@kozik-lap> References: <20200401082721.19431-1-hyunki00.koo@samsung.com> <20200402110430.31156-1-hyunki00.koo@samsung.com> <20200402135903.GA14861@kozik-lap> <004c01d60989$c5923030$50b69090$@samsung.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <004c01d60989$c5923030$50b69090$@samsung.com> User-Agent: Mutt/1.9.4 (2018-02-28) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200403_005128_187439_6125A932 X-CRM114-Status: GOOD ( 21.09 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-samsung-soc@vger.kernel.org, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, 'Kukjin Kim' , linux-serial@vger.kernel.org, 'Jiri Slaby' , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Apr 03, 2020 at 04:30:38PM +0900, Hyunki Koo wrote: > On Thu, Apr 02, 2020 at 10:59:29PM +0900, Krzysztof Kozlowski > > On Thu, Apr 02, 2020 at 08:04:29PM +0900, Hyunki Koo wrote: > > > Support 32-bit access for the TX/RX hold registers UTXH and URXH. > > > > > > This is required for some newer SoCs. > > > > > > Signed-off-by: Hyunki Koo > > > --- > > > drivers/tty/serial/samsung_tty.c | 78 > > > +++++++++++++++++++++++++++++++++------- > > > 1 file changed, 66 insertions(+), 12 deletions(-) > > > > > > diff --git a/drivers/tty/serial/samsung_tty.c > > > b/drivers/tty/serial/samsung_tty.c > > > index 73f951d65b93..826d8c5846a6 100644 > > > --- a/drivers/tty/serial/samsung_tty.c > > > +++ b/drivers/tty/serial/samsung_tty.c > > > @@ -154,12 +154,47 @@ struct s3c24xx_uart_port { #define > > > portaddrl(port, reg) \ > > > ((unsigned long *)(unsigned long)((port)->membase + (reg))) > > > > > > -#define rd_regb(port, reg) (readb_relaxed(portaddr(port, reg))) > > > +static unsigned int rd_reg(struct uart_port *port, int reg) { > > > + switch (port->iotype) { > > > + case UPIO_MEM: > > > + return readb_relaxed(portaddr(port, reg)); > > > + case UPIO_MEM32: > > > + return readl_relaxed(portaddr(port, reg)); > > > + default: > > > + return 0; > > > + } > > > + return 0; > > > +} > > > + > > > #define rd_regl(port, reg) (readl_relaxed(portaddr(port, reg))) > > > > > > -#define wr_regb(port, reg, val) writeb_relaxed(val, portaddr(port, > > > reg)) > > > +static void wr_reg(struct uart_port *port, int reg, int val) { > > > + switch (port->iotype) { > > > + case UPIO_MEM: > > > + writeb_relaxed(val, portaddr(port, reg)); > > > + break; > > > + case UPIO_MEM32: > > > + writel_relaxed(val, portaddr(port, reg)); > > > + break; > > > + } > > > +} > > > + > > > #define wr_regl(port, reg, val) writel_relaxed(val, portaddr(port, > > > reg)) > > > > > > +static void write_buf(struct uart_port *port, int reg, int val) { > > > + switch (port->iotype) { > > > + case UPIO_MEM: > > > + writeb(val, portaddr(port, reg)); > > > + break; > > > + case UPIO_MEM32: > > > + writel(val, portaddr(port, reg)); > > > + break; > > > + } > > > +} > > > + > > > /* Byte-order aware bit setting/clearing functions. */ > > > > > > static inline void s3c24xx_set_bit(struct uart_port *port, int idx, > > > @@ -714,7 +749,7 @@ static void s3c24xx_serial_rx_drain_fifo(struct > > s3c24xx_uart_port *ourport) > > > fifocnt--; > > > > > > uerstat = rd_regl(port, S3C2410_UERSTAT); > > > - ch = rd_regb(port, S3C2410_URXH); > > > + ch = rd_reg(port, S3C2410_URXH); > > > > > > if (port->flags & UPF_CONS_FLOW) { > > > int txe = s3c24xx_serial_txempty_nofifo(port); > > > @@ -826,7 +861,7 @@ static irqreturn_t s3c24xx_serial_tx_chars(int > > irq, void *id) > > > } > > > > > > if (port->x_char) { > > > - wr_regb(port, S3C2410_UTXH, port->x_char); > > > + wr_reg(port, S3C2410_UTXH, port->x_char); > > > port->icount.tx++; > > > port->x_char = 0; > > > goto out; > > > @@ -852,7 +887,7 @@ static irqreturn_t s3c24xx_serial_tx_chars(int > > irq, void *id) > > > if (rd_regl(port, S3C2410_UFSTAT) & ourport->info- > > >tx_fifofull) > > > break; > > > > > > - wr_regb(port, S3C2410_UTXH, xmit->buf[xmit->tail]); > > > + wr_reg(port, S3C2410_UTXH, xmit->buf[xmit->tail]); > > > xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1); > > > port->icount.tx++; > > > count--; > > > @@ -916,7 +951,7 @@ static unsigned int > > s3c24xx_serial_tx_empty(struct > > > uart_port *port) > > > /* no modem control lines */ > > > static unsigned int s3c24xx_serial_get_mctrl(struct uart_port *port) > > > { > > > - unsigned int umstat = rd_regb(port, S3C2410_UMSTAT); > > > + unsigned int umstat = rd_reg(port, S3C2410_UMSTAT); > > > > > > if (umstat & S3C2410_UMSTAT_CTS) > > > return TIOCM_CAR | TIOCM_DSR | TIOCM_CTS; @@ - > > 1974,7 +2009,7 @@ > > > static int s3c24xx_serial_probe(struct platform_device *pdev) > > > struct device_node *np = pdev->dev.of_node; > > > struct s3c24xx_uart_port *ourport; > > > int index = probe_index; > > > - int ret; > > > + int ret, prop = 0; > > > > > > if (np) { > > > ret = of_alias_get_id(np, "serial"); @@ -2000,10 > > +2035,29 @@ static > > > int s3c24xx_serial_probe(struct platform_device *pdev) > > > dev_get_platdata(&pdev->dev) : > > > ourport->drv_data->def_cfg; > > > > > > - if (np) > > > + if (np) { > > > of_property_read_u32(np, > > > "samsung,uart-fifosize", &ourport->port.fifosize); > > > > > > + if (of_property_read_u32(np, "reg-io-width", &prop) == > > 0) { > > > + switch (prop) { > > > + case 1: > > > + ourport->port.iotype = UPIO_MEM; > > > + break; > > > + case 4: > > > + ourport->port.iotype = UPIO_MEM32; > > > + break; > > > + default: > > > + dev_warn(&pdev->dev, "unsupported > > reg-io-width (%d)\n", > > > + prop); > > > + ret = -EINVAL; > > > + break; > > > + } > > > + } else { > > > + ourport->port.iotype = UPIO_MEM; > > > + } > > > + } > > > > I think this still breaks all non-DT platforms (e.g. s3c). > > > > Best regards, > > Krzysztof > > Thank you for your comment. > I hope ourport->port.iotype is initialized by below table for non-DT platforms Indeed, you're right. In this case, this else() you added is not needed. The default value for non-DT and existing DT platforms will be the same (UPIO_MEM). Best regards, Krzysztof _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel