From nobody Wed Apr 15 23:28:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2B3EEC433FE for ; Tue, 22 Nov 2022 10:22:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233453AbiKVKWY (ORCPT ); Tue, 22 Nov 2022 05:22:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43732 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233461AbiKVKVt (ORCPT ); Tue, 22 Nov 2022 05:21:49 -0500 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 688FB192A3 for ; Tue, 22 Nov 2022 02:21:43 -0800 (PST) Received: by mail-wr1-x42e.google.com with SMTP id e11so11061094wru.8 for ; Tue, 22 Nov 2022 02:21:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=x1c6aXOWkMzrvJWb4ybDXSFS8VHGCMiU8NIu3wtX2eo=; b=qWHugDNcVkjomPaQsfZ4/isqFWLeE3ZO/OmoCsuLTZO3YjlJe0rgcmRkDPz38GRpQb BT5LgOv9c/2zm/E2YPXjCbHb6c0zgLcQRZdBejuZgdEhMI2TeWYOhhldRlysQ1pHgLz8 vPSjakesx33UiH3YXSHLwtxkFZPKsV4YIEVbHXDrl/DEHeAb1ugeuL/wyd12Y0mP3CJx GpV+1RHWqIgiov2fwlBTv8Hy2pB3la15XvgcCLelo2RlxY4kVZ7zy0mSxHEJUFrY6tSD 5vDuwio1lssYSChU6p4RPf+rUYpfcg+WHJoD0SwK8AFvsaj7X9rNu179BLgo7A3MQMuL uStw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=x1c6aXOWkMzrvJWb4ybDXSFS8VHGCMiU8NIu3wtX2eo=; b=LcsLZSpDSlawD9LHq5ztBiZ7LaKG6zH8h9lJPuKJlbRMcVhlgMYD6jLi9S1pYUEizO SBDvpE0wtBSJX0niI5ZZjXt26IjiiAuINMnv24SgZocRXbvXgNs4V3T/WDG6ocj8vfT/ hejJ3PcCydhVgVqLPDjSmlCRN0C0RtME0GY8FqXxi5JmlKoU/s2kAIZfWjcJ3/9ck+Jp GAWLaQhWQ04PyQnnDc3BvT485uRtoe3zfvTVOUuTzUKzhKlteZp3SwyMAk5Qln9/UYw4 OsHTlGC7rwfYaOd79Pil04OPWsP0xhPBL8ZqLcbQSYR86LimLZX0vIvgTyxHNRSWwUhL atOA== X-Gm-Message-State: ANoB5pnlcLG8+5RrzzafbDtQzv+heRY5tROEMrVsJYaTrYB59pBHPl6X K1SmOkzjHLXhG72zlerW035LJA== X-Google-Smtp-Source: AA0mqf6I9HzW74pGIU7imlc2UarQOe9VU1MHYuemI3la9HGnQg7np/WNBNgu5QHIi2MU/Y4IPLtQrA== X-Received: by 2002:adf:e84f:0:b0:22e:37c1:b225 with SMTP id d15-20020adfe84f000000b0022e37c1b225mr12954282wrn.428.1669112501851; Tue, 22 Nov 2022 02:21:41 -0800 (PST) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:e011:9e81:66f1:3415]) by smtp.gmail.com with ESMTPSA id o3-20020a5d4083000000b002366e8eee11sm13432873wrp.101.2022.11.22.02.21.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 02:21:41 -0800 (PST) From: Bartosz Golaszewski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Greg Kroah-Hartman , Jiri Slaby , Srinivas Kandagatla , Vinod Koul , Alex Elder , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-serial@vger.kernel.org, Bartosz Golaszewski , Konrad Dybcio Subject: [PATCH v2 01/15] tty: serial: qcom-geni-serial: drop unneeded forward definitions Date: Tue, 22 Nov 2022 11:21:11 +0100 Message-Id: <20221122102125.142075-2-brgl@bgdev.pl> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221122102125.142075-1-brgl@bgdev.pl> References: <20221122102125.142075-1-brgl@bgdev.pl> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Bartosz Golaszewski If we shuffle the code a bit, we can drop all forward definitions of various static functions. Signed-off-by: Bartosz Golaszewski Reviewed-by: Konrad Dybcio --- drivers/tty/serial/qcom_geni_serial.c | 79 +++++++++++++-------------- 1 file changed, 37 insertions(+), 42 deletions(-) diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qco= m_geni_serial.c index 83b66b73303a..9f2212e7b5ec 100644 --- a/drivers/tty/serial/qcom_geni_serial.c +++ b/drivers/tty/serial/qcom_geni_serial.c @@ -147,11 +147,6 @@ static const struct uart_ops qcom_geni_console_pops; static const struct uart_ops qcom_geni_uart_pops; static struct uart_driver qcom_geni_console_driver; static struct uart_driver qcom_geni_uart_driver; -static int handle_rx_console(struct uart_port *uport, u32 bytes, bool drop= ); -static int handle_rx_uart(struct uart_port *uport, u32 bytes, bool drop); -static unsigned int qcom_geni_serial_tx_empty(struct uart_port *port); -static void qcom_geni_serial_stop_rx(struct uart_port *uport); -static void qcom_geni_serial_handle_rx(struct uart_port *uport, bool drop); =20 #define to_dev_port(ptr, member) \ container_of(ptr, struct qcom_geni_serial_port, member) @@ -590,6 +585,11 @@ static int handle_rx_uart(struct uart_port *uport, u32= bytes, bool drop) return ret; } =20 +static unsigned int qcom_geni_serial_tx_empty(struct uart_port *uport) +{ + return !readl(uport->membase + SE_GENI_TX_FIFO_STATUS); +} + static void qcom_geni_serial_start_tx(struct uart_port *uport) { u32 irq_en; @@ -635,25 +635,29 @@ static void qcom_geni_serial_stop_tx(struct uart_port= *uport) writel(M_CMD_CANCEL_EN, uport->membase + SE_GENI_M_IRQ_CLEAR); } =20 -static void qcom_geni_serial_start_rx(struct uart_port *uport) +static void qcom_geni_serial_handle_rx(struct uart_port *uport, bool drop) { - u32 irq_en; u32 status; + u32 word_cnt; + u32 last_word_byte_cnt; + u32 last_word_partial; + u32 total_bytes; struct qcom_geni_serial_port *port =3D to_dev_port(uport, uport); =20 - status =3D readl(uport->membase + SE_GENI_STATUS); - if (status & S_GENI_CMD_ACTIVE) - qcom_geni_serial_stop_rx(uport); - - geni_se_setup_s_cmd(&port->se, UART_START_READ, 0); - - irq_en =3D readl(uport->membase + SE_GENI_S_IRQ_EN); - irq_en |=3D S_RX_FIFO_WATERMARK_EN | S_RX_FIFO_LAST_EN; - writel(irq_en, uport->membase + SE_GENI_S_IRQ_EN); + status =3D readl(uport->membase + SE_GENI_RX_FIFO_STATUS); + word_cnt =3D status & RX_FIFO_WC_MSK; + last_word_partial =3D status & RX_LAST; + last_word_byte_cnt =3D (status & RX_LAST_BYTE_VALID_MSK) >> + RX_LAST_BYTE_VALID_SHFT; =20 - irq_en =3D readl(uport->membase + SE_GENI_M_IRQ_EN); - irq_en |=3D M_RX_FIFO_WATERMARK_EN | M_RX_FIFO_LAST_EN; - writel(irq_en, uport->membase + SE_GENI_M_IRQ_EN); + if (!word_cnt) + return; + total_bytes =3D BYTES_PER_FIFO_WORD * (word_cnt - 1); + if (last_word_partial && last_word_byte_cnt) + total_bytes +=3D last_word_byte_cnt; + else + total_bytes +=3D BYTES_PER_FIFO_WORD; + port->handle_rx(uport, total_bytes, drop); } =20 static void qcom_geni_serial_stop_rx(struct uart_port *uport) @@ -694,29 +698,25 @@ static void qcom_geni_serial_stop_rx(struct uart_port= *uport) qcom_geni_serial_abort_rx(uport); } =20 -static void qcom_geni_serial_handle_rx(struct uart_port *uport, bool drop) +static void qcom_geni_serial_start_rx(struct uart_port *uport) { + u32 irq_en; u32 status; - u32 word_cnt; - u32 last_word_byte_cnt; - u32 last_word_partial; - u32 total_bytes; struct qcom_geni_serial_port *port =3D to_dev_port(uport, uport); =20 - status =3D readl(uport->membase + SE_GENI_RX_FIFO_STATUS); - word_cnt =3D status & RX_FIFO_WC_MSK; - last_word_partial =3D status & RX_LAST; - last_word_byte_cnt =3D (status & RX_LAST_BYTE_VALID_MSK) >> - RX_LAST_BYTE_VALID_SHFT; + status =3D readl(uport->membase + SE_GENI_STATUS); + if (status & S_GENI_CMD_ACTIVE) + qcom_geni_serial_stop_rx(uport); =20 - if (!word_cnt) - return; - total_bytes =3D BYTES_PER_FIFO_WORD * (word_cnt - 1); - if (last_word_partial && last_word_byte_cnt) - total_bytes +=3D last_word_byte_cnt; - else - total_bytes +=3D BYTES_PER_FIFO_WORD; - port->handle_rx(uport, total_bytes, drop); + geni_se_setup_s_cmd(&port->se, UART_START_READ, 0); + + irq_en =3D readl(uport->membase + SE_GENI_S_IRQ_EN); + irq_en |=3D S_RX_FIFO_WATERMARK_EN | S_RX_FIFO_LAST_EN; + writel(irq_en, uport->membase + SE_GENI_S_IRQ_EN); + + irq_en =3D readl(uport->membase + SE_GENI_M_IRQ_EN); + irq_en |=3D M_RX_FIFO_WATERMARK_EN | M_RX_FIFO_LAST_EN; + writel(irq_en, uport->membase + SE_GENI_M_IRQ_EN); } =20 static void qcom_geni_serial_handle_tx(struct uart_port *uport, bool done, @@ -1122,11 +1122,6 @@ static void qcom_geni_serial_set_termios(struct uart= _port *uport, qcom_geni_serial_start_rx(uport); } =20 -static unsigned int qcom_geni_serial_tx_empty(struct uart_port *uport) -{ - return !readl(uport->membase + SE_GENI_TX_FIFO_STATUS); -} - #ifdef CONFIG_SERIAL_QCOM_GENI_CONSOLE static int qcom_geni_console_setup(struct console *co, char *options) { --=20 2.37.2 From nobody Wed Apr 15 23:28:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8E9F3C433FE for ; Tue, 22 Nov 2022 10:22:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233477AbiKVKW2 (ORCPT ); Tue, 22 Nov 2022 05:22:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43782 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233016AbiKVKVw (ORCPT ); Tue, 22 Nov 2022 05:21:52 -0500 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4968C1E705 for ; Tue, 22 Nov 2022 02:21:44 -0800 (PST) Received: by mail-wr1-x432.google.com with SMTP id bs21so23993234wrb.4 for ; Tue, 22 Nov 2022 02:21:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=S89n9QHiQI/y9x3/RBBeD2hc63bXZL5TZ/yxbLwZvtk=; b=lXri/kjkjF6wgMkUC9670NWTNkvUagyJHjO/mp/WQk9YIFgBxvqgeKuTRyPtSwv4Ys 0szCZxbswm8NB260ozpnUy5hd4bw0SwWXRuMyRpv9+Z+IUAGnw0oDT2tCAvXZWihBSUd 3dH/qKcJm9mNyi5V5uhQw1B2Io4JszwFJA934peEDCI7VUOGCjp735xlfETSwowadnC6 DPCPzzA0U7P0nQIVUfBmjCJnFYl6145znTct8ToidcomhW/VQR+1J9R+GnIuSmT38urb mEbloh9iU4FT3uTLqf2i97w2jpnakU2HJv9w7vXSIkIgfbrNmLyhA1WkDHS0YtEL4PKU f5Gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=S89n9QHiQI/y9x3/RBBeD2hc63bXZL5TZ/yxbLwZvtk=; b=fg+cxSqSwTaJPrb6LUxFBFznZa+2nukO4yhBK6fZdLjI5gzlCZQe0H3uT6n7FEKgcx UMCEGz13s9vsvVBGihX4jMfxwxUWFsxzbrQuS/ZUlab/foPlVQvtXeFPmf9tIDG9JWMS YX7ivzaIy8eddQ+TkGJWzBcNSlc8xakX+N37GQsJNnzXrZ+2YzR2lQYjI27RrLmQzp22 G6a9YoF4aR5duFkmdcTvJp+zYvvCuYbFuSBm9vsxKwuw/9hmkvsDt0ppY28nAuLsMvSX qMSAB7VlNpZ1d+Hhdxi5p9FqBjUAeK79vn2JTRsBXHhpfh7f69SmOQqFrSl1SEVAFXsD Kitw== X-Gm-Message-State: ANoB5pk6hF/q3YUnyc4QXMxjsU9WGQ5qQrTqDL6jO4WZFR0THZumBZsO /Lj/aUfXhuA9f3T3AZ01bDSEBA== X-Google-Smtp-Source: AA0mqf7T/UGTI8PICc6/eFUx/UjF4InHLPn+jrCX3I6f0b9GOgRStPUmk5A0bgznjN0NqS1sK3yUpg== X-Received: by 2002:adf:cd82:0:b0:238:b29e:4919 with SMTP id q2-20020adfcd82000000b00238b29e4919mr13769717wrj.583.1669112502874; Tue, 22 Nov 2022 02:21:42 -0800 (PST) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:e011:9e81:66f1:3415]) by smtp.gmail.com with ESMTPSA id o3-20020a5d4083000000b002366e8eee11sm13432873wrp.101.2022.11.22.02.21.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 02:21:42 -0800 (PST) From: Bartosz Golaszewski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Greg Kroah-Hartman , Jiri Slaby , Srinivas Kandagatla , Vinod Koul , Alex Elder , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-serial@vger.kernel.org, Bartosz Golaszewski , Konrad Dybcio Subject: [PATCH v2 02/15] tty: serial: qcom-geni-serial: remove unused symbols Date: Tue, 22 Nov 2022 11:21:12 +0100 Message-Id: <20221122102125.142075-3-brgl@bgdev.pl> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221122102125.142075-1-brgl@bgdev.pl> References: <20221122102125.142075-1-brgl@bgdev.pl> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Bartosz Golaszewski Drop all unused symbols from the driver. Signed-off-by: Bartosz Golaszewski Reviewed-by: Konrad Dybcio --- drivers/tty/serial/qcom_geni_serial.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qco= m_geni_serial.c index 9f2212e7b5ec..7af5df6833c7 100644 --- a/drivers/tty/serial/qcom_geni_serial.c +++ b/drivers/tty/serial/qcom_geni_serial.c @@ -42,20 +42,11 @@ #define UART_TX_PAR_EN BIT(0) #define UART_CTS_MASK BIT(1) =20 -/* SE_UART_TX_WORD_LEN */ -#define TX_WORD_LEN_MSK GENMASK(9, 0) - /* SE_UART_TX_STOP_BIT_LEN */ -#define TX_STOP_BIT_LEN_MSK GENMASK(23, 0) #define TX_STOP_BIT_LEN_1 0 -#define TX_STOP_BIT_LEN_1_5 1 #define TX_STOP_BIT_LEN_2 2 =20 -/* SE_UART_TX_TRANS_LEN */ -#define TX_TRANS_LEN_MSK GENMASK(23, 0) - /* SE_UART_RX_TRANS_CFG */ -#define UART_RX_INS_STATUS_BIT BIT(2) #define UART_RX_PAR_EN BIT(3) =20 /* SE_UART_RX_WORD_LEN */ @@ -66,12 +57,9 @@ =20 /* SE_UART_TX_PARITY_CFG/RX_PARITY_CFG */ #define PAR_CALC_EN BIT(0) -#define PAR_MODE_MSK GENMASK(2, 1) -#define PAR_MODE_SHFT 1 #define PAR_EVEN 0x00 #define PAR_ODD 0x01 #define PAR_SPACE 0x10 -#define PAR_MARK 0x11 =20 /* SE_UART_MANUAL_RFR register fields */ #define UART_MANUAL_RFR_EN BIT(31) @@ -80,11 +68,8 @@ =20 /* UART M_CMD OP codes */ #define UART_START_TX 0x1 -#define UART_START_BREAK 0x4 -#define UART_STOP_BREAK 0x5 /* UART S_CMD OP codes */ #define UART_START_READ 0x1 -#define UART_PARAM 0x1 =20 #define UART_OVERSAMPLING 32 #define STALE_TIMEOUT 16 --=20 2.37.2 From nobody Wed Apr 15 23:28:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DE810C4332F for ; Tue, 22 Nov 2022 10:22:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233491AbiKVKWa (ORCPT ); Tue, 22 Nov 2022 05:22:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43756 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230468AbiKVKVw (ORCPT ); Tue, 22 Nov 2022 05:21:52 -0500 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 67A9C20367 for ; Tue, 22 Nov 2022 02:21:45 -0800 (PST) Received: by mail-wr1-x42c.google.com with SMTP id i12so20113319wrb.0 for ; Tue, 22 Nov 2022 02:21:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7EJrTQIS5zIHcJVe/CbMMVgFbpImlTtQ6/Fo8uf0cQs=; b=FYfzwS4CBrRcXV5ZFnLGwjwIz55YZzRUisru4kJviiTfhx0Xb7YABMkuRTXPsZQtuZ Tgl+WByJ+uyYYK4OhOAotaGNnq5eawB9MQ7SzTc2PqanALdWpXM5uvw+U++3rjvruaVc UnlpPICZ2pLTyb/GWYXsKowF2O7698PNkDgCMiX0yrA3+NmSajm7YgRohZgmIcbm4t7p RjFFyr5yBvekdoQgybn0OQzdPNlp+ilYm2ahefYR5hDjRqQZxrk4O2hwQpWv1ka+jbAA leihr0Z3RpKbmLuhIaXy3omF+C1kWJ0KQoyFpTNy+508uT0DJKmuxpUKQfFjHwmJW/x/ eGXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7EJrTQIS5zIHcJVe/CbMMVgFbpImlTtQ6/Fo8uf0cQs=; b=OH3jJwyE6pVIUgiofY3PcfxGsrsma6f30TZW8qfHp5J3HzvY+TG1lSwh9jEmFBbwNu hKHufSa1h5W5sUiWyODDMuli/w+RDVzK8LLq79uhcft7LtK3nVn/vX3QvKTlo3g9XTYj 8Ds6vCUKQk7/v8VuKuNR1BA2Ut05bZfrYNShineM0kldTgLoonAzoEi0EtDp26Hzx6LU 5vYkaV8AOmfgzVVAGNNf5mwmtRZZ8ZQGOA6tSp2HVeOaPJvlqOxNn9rHTN+9/z3Ul8i5 PPVc1usMhkZklX4Xi5cJjlU7dPsTlKF9SaZEL3vX0QQj+RiZrJ6KVEgDlbMlMC3HuDt2 Le1A== X-Gm-Message-State: ANoB5pltRhseUcAIGnMsPD3Hv3+Qm0kfqQxnzP12keQ52jKa0YnCdMCG n1WsDCFPIvPZAQQHLqPJZ5K+aw== X-Google-Smtp-Source: AA0mqf67QEyEJPYa/qS7uOsPGrGtvHyweo/xX/z+5S9QkzWHxxr4eJ+2ayueoMezsRbkHG6APMIBUQ== X-Received: by 2002:adf:e190:0:b0:241:d451:7fc9 with SMTP id az16-20020adfe190000000b00241d4517fc9mr3861780wrb.223.1669112503975; Tue, 22 Nov 2022 02:21:43 -0800 (PST) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:e011:9e81:66f1:3415]) by smtp.gmail.com with ESMTPSA id o3-20020a5d4083000000b002366e8eee11sm13432873wrp.101.2022.11.22.02.21.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 02:21:43 -0800 (PST) From: Bartosz Golaszewski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Greg Kroah-Hartman , Jiri Slaby , Srinivas Kandagatla , Vinod Koul , Alex Elder , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-serial@vger.kernel.org, Bartosz Golaszewski , Konrad Dybcio Subject: [PATCH v2 03/15] tty: serial: qcom-geni-serial: align #define values Date: Tue, 22 Nov 2022 11:21:13 +0100 Message-Id: <20221122102125.142075-4-brgl@bgdev.pl> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221122102125.142075-1-brgl@bgdev.pl> References: <20221122102125.142075-1-brgl@bgdev.pl> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Bartosz Golaszewski Keep the #define symbols aligned for better readability. Signed-off-by: Bartosz Golaszewski Reviewed-by: Konrad Dybcio --- drivers/tty/serial/qcom_geni_serial.c | 62 +++++++++++++-------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qco= m_geni_serial.c index 7af5df6833c7..97ee7c074b79 100644 --- a/drivers/tty/serial/qcom_geni_serial.c +++ b/drivers/tty/serial/qcom_geni_serial.c @@ -39,57 +39,57 @@ #define SE_UART_MANUAL_RFR 0x2ac =20 /* SE_UART_TRANS_CFG */ -#define UART_TX_PAR_EN BIT(0) -#define UART_CTS_MASK BIT(1) +#define UART_TX_PAR_EN BIT(0) +#define UART_CTS_MASK BIT(1) =20 /* SE_UART_TX_STOP_BIT_LEN */ -#define TX_STOP_BIT_LEN_1 0 -#define TX_STOP_BIT_LEN_2 2 +#define TX_STOP_BIT_LEN_1 0 +#define TX_STOP_BIT_LEN_2 2 =20 /* SE_UART_RX_TRANS_CFG */ -#define UART_RX_PAR_EN BIT(3) +#define UART_RX_PAR_EN BIT(3) =20 /* SE_UART_RX_WORD_LEN */ -#define RX_WORD_LEN_MASK GENMASK(9, 0) +#define RX_WORD_LEN_MASK GENMASK(9, 0) =20 /* SE_UART_RX_STALE_CNT */ -#define RX_STALE_CNT GENMASK(23, 0) +#define RX_STALE_CNT GENMASK(23, 0) =20 /* SE_UART_TX_PARITY_CFG/RX_PARITY_CFG */ -#define PAR_CALC_EN BIT(0) -#define PAR_EVEN 0x00 -#define PAR_ODD 0x01 -#define PAR_SPACE 0x10 +#define PAR_CALC_EN BIT(0) +#define PAR_EVEN 0x00 +#define PAR_ODD 0x01 +#define PAR_SPACE 0x10 =20 /* SE_UART_MANUAL_RFR register fields */ -#define UART_MANUAL_RFR_EN BIT(31) -#define UART_RFR_NOT_READY BIT(1) -#define UART_RFR_READY BIT(0) +#define UART_MANUAL_RFR_EN BIT(31) +#define UART_RFR_NOT_READY BIT(1) +#define UART_RFR_READY BIT(0) =20 /* UART M_CMD OP codes */ -#define UART_START_TX 0x1 +#define UART_START_TX 0x1 /* UART S_CMD OP codes */ -#define UART_START_READ 0x1 - -#define UART_OVERSAMPLING 32 -#define STALE_TIMEOUT 16 -#define DEFAULT_BITS_PER_CHAR 10 -#define GENI_UART_CONS_PORTS 1 -#define GENI_UART_PORTS 3 -#define DEF_FIFO_DEPTH_WORDS 16 -#define DEF_TX_WM 2 -#define DEF_FIFO_WIDTH_BITS 32 -#define UART_RX_WM 2 +#define UART_START_READ 0x1 + +#define UART_OVERSAMPLING 32 +#define STALE_TIMEOUT 16 +#define DEFAULT_BITS_PER_CHAR 10 +#define GENI_UART_CONS_PORTS 1 +#define GENI_UART_PORTS 3 +#define DEF_FIFO_DEPTH_WORDS 16 +#define DEF_TX_WM 2 +#define DEF_FIFO_WIDTH_BITS 32 +#define UART_RX_WM 2 =20 /* SE_UART_LOOPBACK_CFG */ -#define RX_TX_SORTED BIT(0) -#define CTS_RTS_SORTED BIT(1) -#define RX_TX_CTS_RTS_SORTED (RX_TX_SORTED | CTS_RTS_SORTED) +#define RX_TX_SORTED BIT(0) +#define CTS_RTS_SORTED BIT(1) +#define RX_TX_CTS_RTS_SORTED (RX_TX_SORTED | CTS_RTS_SORTED) =20 /* UART pin swap value */ -#define DEFAULT_IO_MACRO_IO0_IO1_MASK GENMASK(3, 0) +#define DEFAULT_IO_MACRO_IO0_IO1_MASK GENMASK(3, 0) #define IO_MACRO_IO0_SEL 0x3 -#define DEFAULT_IO_MACRO_IO2_IO3_MASK GENMASK(15, 4) +#define DEFAULT_IO_MACRO_IO2_IO3_MASK GENMASK(15, 4) #define IO_MACRO_IO2_IO3_SWAP 0x4640 =20 /* We always configure 4 bytes per FIFO word */ --=20 2.37.2 From nobody Wed Apr 15 23:28:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8B667C4332F for ; Tue, 22 Nov 2022 10:22:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233511AbiKVKWh (ORCPT ); Tue, 22 Nov 2022 05:22:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48744 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232894AbiKVKVy (ORCPT ); Tue, 22 Nov 2022 05:21:54 -0500 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 74B8D205FC for ; Tue, 22 Nov 2022 02:21:46 -0800 (PST) Received: by mail-wr1-x42f.google.com with SMTP id e11so11061306wru.8 for ; Tue, 22 Nov 2022 02:21:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DkZacf9TX3zvyVeUrL+nHxYirMYsPuTeW+Zo+lEbcT0=; b=n46/Bzxpis8t8nDSvP5/hO7IKMa4gViNFmxoDwApmrQQ6Ykxt19O5+rHwlaAUQAqZk iuYeqvWzkokkzx6wJYg6HzRUZ897kPhbw2m5ptzMlfGq7urRU5jxt+psRLdHW1a231Rf XycpjPPCw2gIksQVYCZQ0xIiAXy+LIdCiWrDzIIIeXSOtaNa8+10/itmrVumwmBRNAqd SqKulZuEBarl6TGWAMSGdR6U1PmVk0svLGKx71c3mCkJnIwjsW7HIDLd7q0q740QUMfL OmZOuRsoM3GixuE9AEMvYBY1YxJLXGcstJMLvOqFRY8U65iry7NJ3dg8h58d1D3CbI9q 9/Ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DkZacf9TX3zvyVeUrL+nHxYirMYsPuTeW+Zo+lEbcT0=; b=fiBbgkZgwjtQaCHYnC/yclpz5lyEurAfyLWBok2QS1S99Bx29sVI0u84nRS9hqRZLq KmsnF1an4hhPIba/cUz/IXJSoxWokz846aQGJ9LrvBErwxSUHlTjHqzlUqlMwxZPghq1 G2myaRyVpru0ZKDy2LCxHpy7ejNif/3enNXOVyi9VrZ5va1dWegTgnL6GxrQqc2TDp+l 87bBZk2XJlF1Gx2TrRweLMOaPicoK5I9aHo5TnBpjqXQcRzj+rIDGgoly6nVM81ZjIJI SiydQRvLa5kUbudsXY0YY6vfcAYuBMtt9yR0psFrJCDv+TjZ6d/EATjDfmNjfZbvFS2V 9/qg== X-Gm-Message-State: ANoB5plhlg+g9vGphT1ulziWvh/SmXYzFfU6jv95EhVwJv8DUSb4TmSB U5pSWpGNl4ODiJFPfwtB7huRtw== X-Google-Smtp-Source: AA0mqf79F6mX4CkVqrYCXZQP8pXylPsPd3TBFWNdCA10kLpH21KcxpRq8wxFJEhVQSNwXsNadYHyBQ== X-Received: by 2002:a5d:4484:0:b0:241:9b26:d18e with SMTP id j4-20020a5d4484000000b002419b26d18emr13311986wrq.548.1669112504996; Tue, 22 Nov 2022 02:21:44 -0800 (PST) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:e011:9e81:66f1:3415]) by smtp.gmail.com with ESMTPSA id o3-20020a5d4083000000b002366e8eee11sm13432873wrp.101.2022.11.22.02.21.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 02:21:44 -0800 (PST) From: Bartosz Golaszewski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Greg Kroah-Hartman , Jiri Slaby , Srinivas Kandagatla , Vinod Koul , Alex Elder , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-serial@vger.kernel.org, Bartosz Golaszewski , Konrad Dybcio Subject: [PATCH v2 04/15] tty: serial: qcom-geni-serial: improve the to_dev_port() macro Date: Tue, 22 Nov 2022 11:21:14 +0100 Message-Id: <20221122102125.142075-5-brgl@bgdev.pl> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221122102125.142075-1-brgl@bgdev.pl> References: <20221122102125.142075-1-brgl@bgdev.pl> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Bartosz Golaszewski The member we want to resolve in struct qcom_geni_serial_port is called uport so we don't need an additional redundant parameter in this macro. While at it: turn the macro into a static inline function. Signed-off-by: Bartosz Golaszewski Reviewed-by: Konrad Dybcio --- drivers/tty/serial/qcom_geni_serial.c | 36 ++++++++++++++------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qco= m_geni_serial.c index 97ee7c074b79..e4139718e084 100644 --- a/drivers/tty/serial/qcom_geni_serial.c +++ b/drivers/tty/serial/qcom_geni_serial.c @@ -133,8 +133,10 @@ static const struct uart_ops qcom_geni_uart_pops; static struct uart_driver qcom_geni_console_driver; static struct uart_driver qcom_geni_uart_driver; =20 -#define to_dev_port(ptr, member) \ - container_of(ptr, struct qcom_geni_serial_port, member) +static inline struct qcom_geni_serial_port *to_dev_port(struct uart_port *= uport) +{ + return container_of(uport, struct qcom_geni_serial_port, uport); +} =20 static struct qcom_geni_serial_port qcom_geni_uart_ports[GENI_UART_PORTS] = =3D { [0] =3D { @@ -175,7 +177,7 @@ static struct qcom_geni_serial_port qcom_geni_console_p= ort =3D { static int qcom_geni_serial_request_port(struct uart_port *uport) { struct platform_device *pdev =3D to_platform_device(uport->dev); - struct qcom_geni_serial_port *port =3D to_dev_port(uport, uport); + struct qcom_geni_serial_port *port =3D to_dev_port(uport); =20 uport->membase =3D devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(uport->membase)) @@ -212,7 +214,7 @@ static void qcom_geni_serial_set_mctrl(struct uart_port= *uport, unsigned int mctrl) { u32 uart_manual_rfr =3D 0; - struct qcom_geni_serial_port *port =3D to_dev_port(uport, uport); + struct qcom_geni_serial_port *port =3D to_dev_port(uport); =20 if (uart_console(uport)) return; @@ -253,7 +255,7 @@ static bool qcom_geni_serial_poll_bit(struct uart_port = *uport, struct qcom_geni_private_data *private_data =3D uport->private_data; =20 if (private_data->drv) { - port =3D to_dev_port(uport, uport); + port =3D to_dev_port(uport); baud =3D port->baud; if (!baud) baud =3D 115200; @@ -506,7 +508,7 @@ static int handle_rx_console(struct uart_port *uport, u= 32 bytes, bool drop) u32 i; unsigned char buf[sizeof(u32)]; struct tty_port *tport; - struct qcom_geni_serial_port *port =3D to_dev_port(uport, uport); + struct qcom_geni_serial_port *port =3D to_dev_port(uport); =20 tport =3D &uport->state->port; for (i =3D 0; i < bytes; ) { @@ -549,7 +551,7 @@ static int handle_rx_console(struct uart_port *uport, u= 32 bytes, bool drop) static int handle_rx_uart(struct uart_port *uport, u32 bytes, bool drop) { struct tty_port *tport; - struct qcom_geni_serial_port *port =3D to_dev_port(uport, uport); + struct qcom_geni_serial_port *port =3D to_dev_port(uport); u32 num_bytes_pw =3D port->tx_fifo_width / BITS_PER_BYTE; u32 words =3D ALIGN(bytes, num_bytes_pw) / num_bytes_pw; int ret; @@ -598,7 +600,7 @@ static void qcom_geni_serial_stop_tx(struct uart_port *= uport) { u32 irq_en; u32 status; - struct qcom_geni_serial_port *port =3D to_dev_port(uport, uport); + struct qcom_geni_serial_port *port =3D to_dev_port(uport); =20 irq_en =3D readl(uport->membase + SE_GENI_M_IRQ_EN); irq_en &=3D ~(M_CMD_DONE_EN | M_TX_FIFO_WATERMARK_EN); @@ -627,7 +629,7 @@ static void qcom_geni_serial_handle_rx(struct uart_port= *uport, bool drop) u32 last_word_byte_cnt; u32 last_word_partial; u32 total_bytes; - struct qcom_geni_serial_port *port =3D to_dev_port(uport, uport); + struct qcom_geni_serial_port *port =3D to_dev_port(uport); =20 status =3D readl(uport->membase + SE_GENI_RX_FIFO_STATUS); word_cnt =3D status & RX_FIFO_WC_MSK; @@ -649,7 +651,7 @@ static void qcom_geni_serial_stop_rx(struct uart_port *= uport) { u32 irq_en; u32 status; - struct qcom_geni_serial_port *port =3D to_dev_port(uport, uport); + struct qcom_geni_serial_port *port =3D to_dev_port(uport); u32 s_irq_status; =20 irq_en =3D readl(uport->membase + SE_GENI_S_IRQ_EN); @@ -687,7 +689,7 @@ static void qcom_geni_serial_start_rx(struct uart_port = *uport) { u32 irq_en; u32 status; - struct qcom_geni_serial_port *port =3D to_dev_port(uport, uport); + struct qcom_geni_serial_port *port =3D to_dev_port(uport); =20 status =3D readl(uport->membase + SE_GENI_STATUS); if (status & S_GENI_CMD_ACTIVE) @@ -707,7 +709,7 @@ static void qcom_geni_serial_start_rx(struct uart_port = *uport) static void qcom_geni_serial_handle_tx(struct uart_port *uport, bool done, bool active) { - struct qcom_geni_serial_port *port =3D to_dev_port(uport, uport); + struct qcom_geni_serial_port *port =3D to_dev_port(uport); struct circ_buf *xmit =3D &uport->state->xmit; size_t avail; size_t remaining; @@ -803,7 +805,7 @@ static irqreturn_t qcom_geni_serial_isr(int isr, void *= dev) struct uart_port *uport =3D dev; bool drop_rx =3D false; struct tty_port *tport =3D &uport->state->port; - struct qcom_geni_serial_port *port =3D to_dev_port(uport, uport); + struct qcom_geni_serial_port *port =3D to_dev_port(uport); =20 if (uport->suspended) return IRQ_NONE; @@ -869,7 +871,7 @@ static void qcom_geni_serial_shutdown(struct uart_port = *uport) =20 static int qcom_geni_serial_port_setup(struct uart_port *uport) { - struct qcom_geni_serial_port *port =3D to_dev_port(uport, uport); + struct qcom_geni_serial_port *port =3D to_dev_port(uport); u32 rxstale =3D DEFAULT_BITS_PER_CHAR * STALE_TIMEOUT; u32 proto; u32 pin_swap; @@ -917,7 +919,7 @@ static int qcom_geni_serial_port_setup(struct uart_port= *uport) static int qcom_geni_serial_startup(struct uart_port *uport) { int ret; - struct qcom_geni_serial_port *port =3D to_dev_port(uport, uport); + struct qcom_geni_serial_port *port =3D to_dev_port(uport); =20 if (!port->setup) { ret =3D qcom_geni_serial_port_setup(uport); @@ -1003,7 +1005,7 @@ static void qcom_geni_serial_set_termios(struct uart_= port *uport, u32 stop_bit_len; unsigned int clk_div; u32 ser_clk_cfg; - struct qcom_geni_serial_port *port =3D to_dev_port(uport, uport); + struct qcom_geni_serial_port *port =3D to_dev_port(uport); unsigned long clk_rate; u32 ver, sampling_rate; unsigned int avg_bw_core; @@ -1288,7 +1290,7 @@ static struct uart_driver qcom_geni_uart_driver =3D { static void qcom_geni_serial_pm(struct uart_port *uport, unsigned int new_state, unsigned int old_state) { - struct qcom_geni_serial_port *port =3D to_dev_port(uport, uport); + struct qcom_geni_serial_port *port =3D to_dev_port(uport); =20 /* If we've never been called, treat it as off */ if (old_state =3D=3D UART_PM_STATE_UNDEFINED) --=20 2.37.2 From nobody Wed Apr 15 23:28:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8A170C4332F for ; Tue, 22 Nov 2022 10:22:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233555AbiKVKWz (ORCPT ); Tue, 22 Nov 2022 05:22:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48750 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233508AbiKVKV7 (ORCPT ); Tue, 22 Nov 2022 05:21:59 -0500 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6F22B2B63E for ; Tue, 22 Nov 2022 02:21:47 -0800 (PST) Received: by mail-wm1-x32f.google.com with SMTP id p13-20020a05600c468d00b003cf8859ed1bso10949900wmo.1 for ; Tue, 22 Nov 2022 02:21:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=EonL2PwB0Makj2JepNmLczYfWSZatIPogqShuTJezMI=; b=R6ndji7+Z7eIGI+xSLKlf1o4GusY5/a6I5ZysX39NUiu7KpKfdXWgeXYc+71C0WmTH jVkqWnAB4XPTlrikOJiwnfswZOD1AEVX9BALyKNi0eXQLb2hu++iL6obIRd63rOpi31p VysrjF1RhgWa7jfLrPlUUS42wlrvWBD2tqcOKo0U7LI7tqhHJQjx2lF53YbONT9oABvI jheecx0OTkOSLhwTATg1kneO3685gDluzpuqQeE6nTD10t0ioc3J3Q3WX7qLCX9HNmow H3qB0hyXuw16p0W9EJo4sDEEll4R+J1SeUJxC7y3E9nsZGYedXsgu1TX/C/LYIjyeVI7 u4iA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EonL2PwB0Makj2JepNmLczYfWSZatIPogqShuTJezMI=; b=BnOMZOPiTTzCCKc6+46Og0jNAndHmnHZMT7K7DuaIQYePsXY0itpjR4VRPhs1yno1d iKyx9xnzqw/mghVHedx6DnqvvYBpeOYBA+uHCWqOM6x54mQ+1gmDUjVK/5ILuoGmcaKE R4WuWZlUkW3J4cFksiPvg1KfcWeI9V+y2ZSvEFOuyRYeGomw4htgLVE+7r3gYBYHtt2B +MmI7ikS8W4750JaO+jFtyiVe9EG9suFlUvhvqUozaRCZC39QvwWXldiL+6BZXlrtoF1 TO905EwijO1rLvdFNpOJeXMxgEubq5IsqTaU206PS7qplOs3W6Z3fW11zZfdFV5oF5+9 jrFw== X-Gm-Message-State: ANoB5pk8+98N5hvspk+uPja6XdQI7lY/ih5v0XabhGOA+1+PK1RKdQMO rFs0anlNZie5S3LtlNpvNJ105w== X-Google-Smtp-Source: AA0mqf7cRrXhN9arwVRnH24U7LCs3wdGp0G6juccAYxDgpazIFKTojBbdSMahG5er82LNH9gGuxg3Q== X-Received: by 2002:a05:600c:4e8d:b0:3c7:6e1:b5c9 with SMTP id f13-20020a05600c4e8d00b003c706e1b5c9mr9520274wmq.154.1669112506011; Tue, 22 Nov 2022 02:21:46 -0800 (PST) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:e011:9e81:66f1:3415]) by smtp.gmail.com with ESMTPSA id o3-20020a5d4083000000b002366e8eee11sm13432873wrp.101.2022.11.22.02.21.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 02:21:45 -0800 (PST) From: Bartosz Golaszewski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Greg Kroah-Hartman , Jiri Slaby , Srinivas Kandagatla , Vinod Koul , Alex Elder , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-serial@vger.kernel.org, Bartosz Golaszewski , Konrad Dybcio Subject: [PATCH v2 05/15] tty: serial: qcom-geni-serial: remove stray newlines Date: Tue, 22 Nov 2022 11:21:15 +0100 Message-Id: <20221122102125.142075-6-brgl@bgdev.pl> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221122102125.142075-1-brgl@bgdev.pl> References: <20221122102125.142075-1-brgl@bgdev.pl> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Bartosz Golaszewski Remove stray newlines around #ifdefs for consistency with the rest of the driver code. Signed-off-by: Bartosz Golaszewski Reviewed-by: Konrad Dybcio --- drivers/tty/serial/qcom_geni_serial.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qco= m_geni_serial.c index e4139718e084..ec2523736e99 100644 --- a/drivers/tty/serial/qcom_geni_serial.c +++ b/drivers/tty/serial/qcom_geni_serial.c @@ -320,7 +320,6 @@ static void qcom_geni_serial_abort_rx(struct uart_port = *uport) } =20 #ifdef CONFIG_CONSOLE_POLL - static int qcom_geni_serial_get_char(struct uart_port *uport) { struct qcom_geni_private_data *private_data =3D uport->private_data; @@ -545,7 +544,6 @@ static int handle_rx_console(struct uart_port *uport, u= 32 bytes, bool drop) { return -EPERM; } - #endif /* CONFIG_SERIAL_QCOM_GENI_CONSOLE */ =20 static int handle_rx_uart(struct uart_port *uport, u32 bytes, bool drop) --=20 2.37.2 From nobody Wed Apr 15 23:28:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E0549C4332F for ; Tue, 22 Nov 2022 10:23:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233585AbiKVKXJ (ORCPT ); Tue, 22 Nov 2022 05:23:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44480 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233525AbiKVKWB (ORCPT ); Tue, 22 Nov 2022 05:22:01 -0500 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7B8F631FBD for ; Tue, 22 Nov 2022 02:21:48 -0800 (PST) Received: by mail-wr1-x429.google.com with SMTP id d1so11863102wrs.12 for ; Tue, 22 Nov 2022 02:21:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hrodxjE3++JzSf9Q5uxlAVuutjj+cagca/Bct4wXLdY=; b=ndwSmtL+kAnfwuKf91FC6UZir/RZb1ZDDCnNFXt0T4Lq8cS85ReAD+6SX5v0lqE++L 0445vCIfJJSnQYou686J4MPxo4mqcXUpWrqHwqPlb2QfhZ5KVxoWZujCf1AUG9lJo2EW Tc+j/Vk3YdG2GdTGHKQM/rEFn3XFE1fFnYs4fUwBQC8Rkf5RbUA5xNDQzaTFDKFboDNR jo7kngEVk8S3VnBahuzZPCvBhBY2mHiuJkOpv2PYV/ykJjhq/sPhw7jR4gQUYudXVJ8H odrTvG+8/1snCWxy6gR9x9FEMaFWyt/53O0Vm2lZkBqm5SaP4G2D4pnG0xnaWab09IMi CSKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hrodxjE3++JzSf9Q5uxlAVuutjj+cagca/Bct4wXLdY=; b=XQzL/q3djbVndscV3BKI/dlcZ7lDLJQFcjHbv9vohm5fjzoW+xqJJpZKQj/2OHKBWh g3r+NpRCswCeUp2zbkZb4gLKPrwD8P5X45+pOEqK7YPDipFmwUhJLcD6T43DeBk4YcWN NxjA3cV3+LZ9/Zc4ugaiNnBrkcW9C+9Z3g4lYedNppKwphbnbRS1I3sm1XbH92xE7nEb baaOeTKuMU4fr8W+uCF96DB1d1meKO/42W0IhUCuZFJO3cKjPMv1i8j6oR5D0AmVxBrN 4HwvJIDtFnLfHCCwrknN9q8tnmoXqOqXo/ufjROxvPSciCZwqzxx/1TkZ92B5Y4Geuur dEYQ== X-Gm-Message-State: ANoB5pneYY8LN29Y7s4T6zInvWQdHB0lqj2h6BkPif8sauQgUVAV8LHB qKs3xgTE0llNSwC9Hjv7sXQsqw== X-Google-Smtp-Source: AA0mqf5xuv1AmUgpzLsqRaOMYIcXA6pTY60wDLqH7jl0HFNAeGjtRx0Gzxn3UOiKZEKaAZwH4k713g== X-Received: by 2002:a05:6000:16c2:b0:241:c56c:b485 with SMTP id h2-20020a05600016c200b00241c56cb485mr10018000wrf.566.1669112507036; Tue, 22 Nov 2022 02:21:47 -0800 (PST) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:e011:9e81:66f1:3415]) by smtp.gmail.com with ESMTPSA id o3-20020a5d4083000000b002366e8eee11sm13432873wrp.101.2022.11.22.02.21.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 02:21:46 -0800 (PST) From: Bartosz Golaszewski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Greg Kroah-Hartman , Jiri Slaby , Srinivas Kandagatla , Vinod Koul , Alex Elder , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-serial@vger.kernel.org, Bartosz Golaszewski , Konrad Dybcio Subject: [PATCH v2 06/15] tty: serial: qcom-geni-serial: refactor qcom_geni_serial_isr() Date: Tue, 22 Nov 2022 11:21:16 +0100 Message-Id: <20221122102125.142075-7-brgl@bgdev.pl> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221122102125.142075-1-brgl@bgdev.pl> References: <20221122102125.142075-1-brgl@bgdev.pl> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bartosz Golaszewski Simplify the conditions in qcom_geni_serial_isr() and fix indentation. Signed-off-by: Bartosz Golaszewski Reviewed-by: Konrad Dybcio Reviewed-by: Ilpo J=C3=A4rvinen --- drivers/tty/serial/qcom_geni_serial.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qco= m_geni_serial.c index ec2523736e99..fba02f71a874 100644 --- a/drivers/tty/serial/qcom_geni_serial.c +++ b/drivers/tty/serial/qcom_geni_serial.c @@ -827,20 +827,18 @@ static irqreturn_t qcom_geni_serial_isr(int isr, void= *dev) =20 if (m_irq_status & m_irq_en & (M_TX_FIFO_WATERMARK_EN | M_CMD_DONE_EN)) qcom_geni_serial_handle_tx(uport, m_irq_status & M_CMD_DONE_EN, - geni_status & M_GENI_CMD_ACTIVE); + geni_status & M_GENI_CMD_ACTIVE); =20 - if (s_irq_status & S_GP_IRQ_0_EN || s_irq_status & S_GP_IRQ_1_EN) { + if (s_irq_status & (S_GP_IRQ_0_EN | S_GP_IRQ_1_EN)) { if (s_irq_status & S_GP_IRQ_0_EN) uport->icount.parity++; drop_rx =3D true; - } else if (s_irq_status & S_GP_IRQ_2_EN || - s_irq_status & S_GP_IRQ_3_EN) { + } else if (s_irq_status & (S_GP_IRQ_2_EN | S_GP_IRQ_3_EN)) { uport->icount.brk++; port->brk =3D true; } =20 - if (s_irq_status & S_RX_FIFO_WATERMARK_EN || - s_irq_status & S_RX_FIFO_LAST_EN) + if (s_irq_status & (S_RX_FIFO_WATERMARK_EN | S_RX_FIFO_LAST_EN)) qcom_geni_serial_handle_rx(uport, drop_rx); =20 out_unlock: --=20 2.37.2 From nobody Wed Apr 15 23:28:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A5083C4332F for ; Tue, 22 Nov 2022 10:23:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233604AbiKVKXS (ORCPT ); Tue, 22 Nov 2022 05:23:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44540 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233551AbiKVKWD (ORCPT ); Tue, 22 Nov 2022 05:22:03 -0500 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 64A423C6C9 for ; Tue, 22 Nov 2022 02:21:49 -0800 (PST) Received: by mail-wr1-x430.google.com with SMTP id x5so19908817wrt.7 for ; Tue, 22 Nov 2022 02:21:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zbfRkHz4/aW9Ej0X8Fhaj4Le2T1GhSly/B7XfhIOtq0=; b=badEK2WdoytxqPHQQJ2dTGNsZ/Ug5vkC26Nuou2trL0/6fuUZ+KxcNaBjzdiIxCemR 6wUkqx0R09h98Z/pHx3QSQ8r5ikWtPMk4EOuf/jxEn6k9SKtlNh8Mslt8UertvXt8JYn R4Revq2bFvBZlbdEQEqXL4hkr2J1SiL1C9rdjSaauNFB7c+omPi1EabF+Kt1k1c1tRip W8Lsxn1gIt8Z7e3u8Frq0XEd1WyY1EFig365eTh26oYz7TZFAc3KAZW5Nj9vMHs3fb3N MOuLD/3+PHqya6638adyVVlXaISFVZ+cxrPqzijS76PciKbT7LzKbyc1BNf/uj4iJTmw dxzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zbfRkHz4/aW9Ej0X8Fhaj4Le2T1GhSly/B7XfhIOtq0=; b=hIWCTS7e9EXAg2eXSQ8Ls+Ah2n7XZ73kI2bv7T+ocpJcv9t1vL4Z4iC1CgCWnTyOva 2qvw3L+Z6yG1FdgsItTlwPXpEhz4qF5axDWBQh9erkpr2SWrseojTNyQz6KaZzgBMCob 3KK1G7rSjh3hy23+5sMlGi5C3T8as+rD1nsdu94um9g30KI6Gse6rIwOE175IE4zzr8i HgrZoQHfIyaksWDxiMIynEwvfVxFTta0ECf+FwcUTdFtqEBq4jEKOBKYvZ438N3OcV0l HYYraaukc5dOYzugQGEsQtRiIbuSBG5dnxpuQI3sEl7LnglgrG4CV3dCiuTwMnZpycFU HTFw== X-Gm-Message-State: ANoB5plWq4RD1AQw0y7AtWxP1Eu1LO6zFA7ZsQ1HbzB9yvPtsBISWha5 vJpgprXX9NTMXd9dcErur+e0aw== X-Google-Smtp-Source: AA0mqf5ZisxDZOYZShoBLE3WJna9NP2GLBaYluJa7DSKYMkB13kdH9DiyZBHO5vRifYM0dJqpr6FrQ== X-Received: by 2002:adf:fdcb:0:b0:22e:386f:4088 with SMTP id i11-20020adffdcb000000b0022e386f4088mr13828460wrs.526.1669112507986; Tue, 22 Nov 2022 02:21:47 -0800 (PST) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:e011:9e81:66f1:3415]) by smtp.gmail.com with ESMTPSA id o3-20020a5d4083000000b002366e8eee11sm13432873wrp.101.2022.11.22.02.21.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 02:21:47 -0800 (PST) From: Bartosz Golaszewski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Greg Kroah-Hartman , Jiri Slaby , Srinivas Kandagatla , Vinod Koul , Alex Elder , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-serial@vger.kernel.org, Bartosz Golaszewski , Konrad Dybcio Subject: [PATCH v2 07/15] tty: serial: qcom-geni-serial: remove unneeded tabs Date: Tue, 22 Nov 2022 11:21:17 +0100 Message-Id: <20221122102125.142075-8-brgl@bgdev.pl> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221122102125.142075-1-brgl@bgdev.pl> References: <20221122102125.142075-1-brgl@bgdev.pl> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Bartosz Golaszewski Remove redundant indentation in struct member assignment. Signed-off-by: Bartosz Golaszewski Reviewed-by: Konrad Dybcio --- drivers/tty/serial/qcom_geni_serial.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qco= m_geni_serial.c index fba02f71a874..68a1402fbe58 100644 --- a/drivers/tty/serial/qcom_geni_serial.c +++ b/drivers/tty/serial/qcom_geni_serial.c @@ -141,26 +141,26 @@ static inline struct qcom_geni_serial_port *to_dev_po= rt(struct uart_port *uport) static struct qcom_geni_serial_port qcom_geni_uart_ports[GENI_UART_PORTS] = =3D { [0] =3D { .uport =3D { - .iotype =3D UPIO_MEM, - .ops =3D &qcom_geni_uart_pops, - .flags =3D UPF_BOOT_AUTOCONF, - .line =3D 0, + .iotype =3D UPIO_MEM, + .ops =3D &qcom_geni_uart_pops, + .flags =3D UPF_BOOT_AUTOCONF, + .line =3D 0, }, }, [1] =3D { .uport =3D { - .iotype =3D UPIO_MEM, - .ops =3D &qcom_geni_uart_pops, - .flags =3D UPF_BOOT_AUTOCONF, - .line =3D 1, + .iotype =3D UPIO_MEM, + .ops =3D &qcom_geni_uart_pops, + .flags =3D UPF_BOOT_AUTOCONF, + .line =3D 1, }, }, [2] =3D { .uport =3D { - .iotype =3D UPIO_MEM, - .ops =3D &qcom_geni_uart_pops, - .flags =3D UPF_BOOT_AUTOCONF, - .line =3D 2, + .iotype =3D UPIO_MEM, + .ops =3D &qcom_geni_uart_pops, + .flags =3D UPF_BOOT_AUTOCONF, + .line =3D 2, }, }, }; --=20 2.37.2 From nobody Wed Apr 15 23:28:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D2380C4332F for ; Tue, 22 Nov 2022 10:23:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233608AbiKVKXV (ORCPT ); Tue, 22 Nov 2022 05:23:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44638 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233570AbiKVKWH (ORCPT ); Tue, 22 Nov 2022 05:22:07 -0500 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6174D41985 for ; Tue, 22 Nov 2022 02:21:50 -0800 (PST) Received: by mail-wr1-x435.google.com with SMTP id x5so19908877wrt.7 for ; Tue, 22 Nov 2022 02:21:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kzY04K9GyuBHm3usH7zJK0sqLLvwAU6csJcimfdY1bo=; b=fG9KF9TCboacMHM4Lqbb4TbFZF3dpm25PBc8vtuxLKqjWm2KdBep1qPauzfPaAQoMO mfTspLuptF7SrzxQUD0ssz88qQP+ZLWM8tZEOl+114Sz7P3w3u2fcYEATIm6hLKNfW/X 6lbJamPubM3iNHZTxD8jJG2u5ww1gi736U2gECXWH32Wkib5t+Q0Y2aJ7rvil3jBPS0B Uk3hCb9QMljrmnyrGogyhtGLtZqY/H4MHsHM0FsFUPipFMhONjqBvodWfWdnpFcRmkY3 O/kDhz12jkBIKsvb954rbJpx10BI9iPI2sbR7z02ELm02grGCxrpyNmerPxTOjF9au2X +UhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kzY04K9GyuBHm3usH7zJK0sqLLvwAU6csJcimfdY1bo=; b=pUbZZDeyi9zYNN11VtMP66t99VSF0BF5uzOYKl5bVXsOJOHlxr4WRb2dRoRfd6jmEJ 0BV5qa3AITwHHGFIGXVsPAJj1n5Zxmav0jDBDgFgQe3wUfBPmrm8n9GrozBfaobJyjhL B6Yh4ChuEyhiIhYxc/0SIQPf6DIfKOGv5Bg1rOD7sw/c7ril4SnOe2RapBwurQwUy5/F VV7NCDQcnwwYjSN5vNEVBcdA/hfswqOoXkQ/KwrYGqQ5Gye96b7h/Mg/lJEtuT05rgOx ytdj3fPiMZ7UMeRXWgFDCQ/LdKNlIwF+LEY5pms6o2HxP8g89tGLzfO7t7wtvS4YvkAr h8OQ== X-Gm-Message-State: ANoB5pllB/wO5TOaW+38vPAz+EuS9rRPumyvv2ffRA1x55EhRDLXkQmK 9ccyOLHJuTuHXz08glWYGbyDRQ== X-Google-Smtp-Source: AA0mqf7M2SmijE0E3HGE39y4HvsVFKOmgJCiQ+hJcQmPzBn8cSrAu16BCHw4XfKa6tJDBbn1kc7w6g== X-Received: by 2002:adf:e8cc:0:b0:236:7a1c:c437 with SMTP id k12-20020adfe8cc000000b002367a1cc437mr13408424wrn.124.1669112508869; Tue, 22 Nov 2022 02:21:48 -0800 (PST) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:e011:9e81:66f1:3415]) by smtp.gmail.com with ESMTPSA id o3-20020a5d4083000000b002366e8eee11sm13432873wrp.101.2022.11.22.02.21.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 02:21:48 -0800 (PST) From: Bartosz Golaszewski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Greg Kroah-Hartman , Jiri Slaby , Srinivas Kandagatla , Vinod Koul , Alex Elder , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-serial@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH v2 08/15] tty: serial: qcom-geni-serial: refactor qcom_geni_serial_handle_tx() Date: Tue, 22 Nov 2022 11:21:18 +0100 Message-Id: <20221122102125.142075-9-brgl@bgdev.pl> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221122102125.142075-1-brgl@bgdev.pl> References: <20221122102125.142075-1-brgl@bgdev.pl> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Bartosz Golaszewski qcom_geni_serial_handle_tx() is pretty big, let's move the code that handles the actual writing of data to a separate function which makes sense in preparation for introducing a dma variant of handle_tx(). Let's also shuffle the code a bit, drop unneeded variables and use uart_xmit_advance() instead of handling tail->xmit manually. Signed-off-by: Bartosz Golaszewski --- drivers/tty/serial/qcom_geni_serial.c | 54 +++++++++++++-------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qco= m_geni_serial.c index 68a1402fbe58..658b6d596f58 100644 --- a/drivers/tty/serial/qcom_geni_serial.c +++ b/drivers/tty/serial/qcom_geni_serial.c @@ -704,19 +704,42 @@ static void qcom_geni_serial_start_rx(struct uart_por= t *uport) writel(irq_en, uport->membase + SE_GENI_M_IRQ_EN); } =20 +static void qcom_geni_serial_send_chunk_fifo(struct uart_port *uport, + unsigned int chunk) +{ + struct qcom_geni_serial_port *port =3D to_dev_port(uport); + struct circ_buf *xmit =3D &uport->state->xmit; + u8 buf[BYTES_PER_FIFO_WORD]; + size_t remaining =3D chunk; + unsigned int tx_bytes; + int c; + + while (remaining) { + memset(buf, 0, sizeof(buf)); + tx_bytes =3D min_t(size_t, remaining, BYTES_PER_FIFO_WORD); + + for (c =3D 0; c < tx_bytes ; c++) { + buf[c] =3D xmit->buf[xmit->tail]; + uart_xmit_advance(uport, 1); + } + + iowrite32_rep(uport->membase + SE_GENI_TX_FIFOn, buf, 1); + + remaining -=3D tx_bytes; + port->tx_remaining -=3D tx_bytes; + } +} + static void qcom_geni_serial_handle_tx(struct uart_port *uport, bool done, bool active) { struct qcom_geni_serial_port *port =3D to_dev_port(uport); struct circ_buf *xmit =3D &uport->state->xmit; size_t avail; - size_t remaining; size_t pending; - int i; u32 status; u32 irq_en; unsigned int chunk; - int tail; =20 status =3D readl(uport->membase + SE_GENI_TX_FIFO_STATUS); =20 @@ -735,7 +758,6 @@ static void qcom_geni_serial_handle_tx(struct uart_port= *uport, bool done, avail =3D port->tx_fifo_depth - (status & TX_FIFO_WC); avail *=3D BYTES_PER_FIFO_WORD; =20 - tail =3D xmit->tail; chunk =3D min(avail, pending); if (!chunk) goto out_write_wakeup; @@ -750,29 +772,7 @@ static void qcom_geni_serial_handle_tx(struct uart_por= t *uport, bool done, uport->membase + SE_GENI_M_IRQ_EN); } =20 - remaining =3D chunk; - for (i =3D 0; i < chunk; ) { - unsigned int tx_bytes; - u8 buf[sizeof(u32)]; - int c; - - memset(buf, 0, sizeof(buf)); - tx_bytes =3D min_t(size_t, remaining, BYTES_PER_FIFO_WORD); - - for (c =3D 0; c < tx_bytes ; c++) { - buf[c] =3D xmit->buf[tail++]; - tail &=3D UART_XMIT_SIZE - 1; - } - - iowrite32_rep(uport->membase + SE_GENI_TX_FIFOn, buf, 1); - - i +=3D tx_bytes; - uport->icount.tx +=3D tx_bytes; - remaining -=3D tx_bytes; - port->tx_remaining -=3D tx_bytes; - } - - xmit->tail =3D tail; + qcom_geni_serial_send_chunk_fifo(uport, chunk); =20 /* * The tx fifo watermark is level triggered and latched. Though we had --=20 2.37.2 From nobody Wed Apr 15 23:28:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A387AC4332F for ; Tue, 22 Nov 2022 10:23:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233396AbiKVKX3 (ORCPT ); Tue, 22 Nov 2022 05:23:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44646 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233569AbiKVKWH (ORCPT ); Tue, 22 Nov 2022 05:22:07 -0500 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3B2933C6D6 for ; Tue, 22 Nov 2022 02:21:50 -0800 (PST) Received: by mail-wr1-x434.google.com with SMTP id x17so10515736wrn.6 for ; Tue, 22 Nov 2022 02:21:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=27Y/3dF94+Cm6VsgYrXb3WffaYznVRIrRKIsZki0OWQ=; b=p5tYf/k5kFhRazIIzD8o3PSLNCLLkbhWf5IpnTaCYOf/WP+9EuBZSo7s69h6Q94ChN n/Bcik7yUYAGKPWoJ4gyb9y2JHOlm3rrWIxUWSL2aRiRj/r9ibSL7T5LvAEYeCsBcvDi fDOZ7IovrDkq+U3UltW4+skli0Xy4Wvtq/2mQXSVLzzr4rE9w6hp3lWvXXY5FhSZRm1+ 0qepDYOH9luRPwTNWjBo4zd9Jn7KCbBeBfcyieczJvodOM4r9Yuv17uNRfq2vPNNGAcj wvg1H/UYaxTKbxkIrby6WlMu4PWFgRD6GAtUzbXn3rmnV43/htX16BeMvTP/XPlmjH6F XnEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=27Y/3dF94+Cm6VsgYrXb3WffaYznVRIrRKIsZki0OWQ=; b=6gOw/W1RbSaIbh5VuaWxN6eY87pCHRU8DtvqTpR7kl5EaVTUGZnOwIaAnxU1zJL8PH XH3XBb+fLJsGFa5eQt+TbHLavJEZo04YewrkyHzeQH+XtKyoTmaDyi/qjwwVYCFOTVie 9U5hXrxPDPLXXvCNkLW56ECFKerV8yjg9TeCcGvPT1vEVif6fSTl9NbdtRvbLS52mY5d 6keHVIsQe8HHrXxf4d2lBIunmqbykjcNhZDyQo3dkz9frGXQWbc8S/KPMCcWAe3y/fqe UnyXTK/Y+5B/oNCz4MqSFeREQMJfG+vjybTas8x4gTUnxESP0SUqz4mSJWLhlUJgT/Q9 VhxA== X-Gm-Message-State: ANoB5pnoHiMaMD3AEnyiMkluVHQt1+o0Na8yCJUJbgi716wIAF/qPmFH pOqSH5PU41fOwoYHTbo5nOTOGw== X-Google-Smtp-Source: AA0mqf69CXjewIeRpNzNev2em/khtbWChfmHSS0jstlGQT/jsPxEEfH6FaoJCa9gp8/qvh1dU5m5yQ== X-Received: by 2002:adf:f352:0:b0:236:7cdb:3c8b with SMTP id e18-20020adff352000000b002367cdb3c8bmr13444835wrp.280.1669112509815; Tue, 22 Nov 2022 02:21:49 -0800 (PST) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:e011:9e81:66f1:3415]) by smtp.gmail.com with ESMTPSA id o3-20020a5d4083000000b002366e8eee11sm13432873wrp.101.2022.11.22.02.21.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 02:21:49 -0800 (PST) From: Bartosz Golaszewski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Greg Kroah-Hartman , Jiri Slaby , Srinivas Kandagatla , Vinod Koul , Alex Elder , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-serial@vger.kernel.org, Bartosz Golaszewski , Konrad Dybcio Subject: [PATCH v2 09/15] tty: serial: qcom-geni-serial: drop the return value from handle_rx Date: Tue, 22 Nov 2022 11:21:19 +0100 Message-Id: <20221122102125.142075-10-brgl@bgdev.pl> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221122102125.142075-1-brgl@bgdev.pl> References: <20221122102125.142075-1-brgl@bgdev.pl> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Bartosz Golaszewski The return value of the handle_rx() callback is never checked. Drop it. Signed-off-by: Bartosz Golaszewski Reviewed-by: Konrad Dybcio --- drivers/tty/serial/qcom_geni_serial.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qco= m_geni_serial.c index 658b6d596f58..d5c343b06c23 100644 --- a/drivers/tty/serial/qcom_geni_serial.c +++ b/drivers/tty/serial/qcom_geni_serial.c @@ -114,7 +114,7 @@ struct qcom_geni_serial_port { u32 tx_fifo_width; u32 rx_fifo_depth; bool setup; - int (*handle_rx)(struct uart_port *uport, u32 bytes, bool drop); + void (*handle_rx)(struct uart_port *uport, u32 bytes, bool drop); unsigned int baud; void *rx_fifo; u32 loopback; @@ -502,7 +502,7 @@ static void qcom_geni_serial_console_write(struct conso= le *co, const char *s, spin_unlock_irqrestore(&uport->lock, flags); } =20 -static int handle_rx_console(struct uart_port *uport, u32 bytes, bool drop) +static void handle_rx_console(struct uart_port *uport, u32 bytes, bool dro= p) { u32 i; unsigned char buf[sizeof(u32)]; @@ -537,16 +537,15 @@ static int handle_rx_console(struct uart_port *uport,= u32 bytes, bool drop) } if (!drop) tty_flip_buffer_push(tport); - return 0; } #else -static int handle_rx_console(struct uart_port *uport, u32 bytes, bool drop) +static void handle_rx_console(struct uart_port *uport, u32 bytes, bool dro= p) { - return -EPERM; + } #endif /* CONFIG_SERIAL_QCOM_GENI_CONSOLE */ =20 -static int handle_rx_uart(struct uart_port *uport, u32 bytes, bool drop) +static void handle_rx_uart(struct uart_port *uport, u32 bytes, bool drop) { struct tty_port *tport; struct qcom_geni_serial_port *port =3D to_dev_port(uport); @@ -557,7 +556,7 @@ static int handle_rx_uart(struct uart_port *uport, u32 = bytes, bool drop) tport =3D &uport->state->port; ioread32_rep(uport->membase + SE_GENI_RX_FIFOn, port->rx_fifo, words); if (drop) - return 0; + return; =20 ret =3D tty_insert_flip_string(tport, port->rx_fifo, bytes); if (ret !=3D bytes) { @@ -567,7 +566,6 @@ static int handle_rx_uart(struct uart_port *uport, u32 = bytes, bool drop) } uport->icount.rx +=3D ret; tty_flip_buffer_push(tport); - return ret; } =20 static unsigned int qcom_geni_serial_tx_empty(struct uart_port *uport) --=20 2.37.2 From nobody Wed Apr 15 23:28:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C64AFC433FE for ; Tue, 22 Nov 2022 10:23:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233622AbiKVKXd (ORCPT ); Tue, 22 Nov 2022 05:23:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44826 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233586AbiKVKWJ (ORCPT ); Tue, 22 Nov 2022 05:22:09 -0500 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3377F42F4B for ; Tue, 22 Nov 2022 02:21:51 -0800 (PST) Received: by mail-wr1-x432.google.com with SMTP id bs21so23993768wrb.4 for ; Tue, 22 Nov 2022 02:21:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=npWHp37Z5aqJft0VcgEPQBxH0XaK5lUmiP+By6Idpv0=; b=PkQHJpHo/PEa66JrHtMHcptcmHQfpK7HwPkPNE24wY3a/XCrj17CjVss7i5bbt6kyC 7W1r7T0SFnCud9TzH5mKebgp/dRZd2z5xrC7cOalTRfWEs8j4RtFZv0SNk1rkir/BQez Bydjel/MgzF1mtqhilcLeTOvFDmAQHST3q2YRgemF/miuWseiY7Rk4Usaf1WNPnjm4NT CM/Cf5QRApqvvTjX1bq93yRSX9dtnaMrKtWm06NSKbmHrcNZ4MLR/8WDIR0oPWNfN8EL N8LX2QCvaIQh4jDKFtoeBIEDd/2sROpQx8qwxcasIgpL/t5QXjQG1fe6EeVKLV1JnbzW wNkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=npWHp37Z5aqJft0VcgEPQBxH0XaK5lUmiP+By6Idpv0=; b=MdwsJNyV/KxLX8Qomo6EGn2goo0W0vJm+HoAOruKd39Gaehh7+6h6DfgH0Mvsmczpy VUIfaxu4hC49qpYUub0lPJJ5P/XrY5zZtWk4BtlKEHIanPzVXttmJ//qqlOaW1ESISnG ZNNDnwoI3pBpIcuOJHxyF05BE3sMTSr6V+VQko3FCWk94ApVvwBN5oIYuorGdHTMD/ts A8UrELxUvWeOzchliltDMFnpswlXmiAMxcOtMcAYfP0aE5de85xFkY1Px5OUaBll0erl ZVCk+1Fsyh0I2TQ062wbVs0tlruyaueVUoC94yFLzpoIHjCi9ipWOqvH1c29IbpzJ7Rn GUng== X-Gm-Message-State: ANoB5pnmuzK8WQ0rF2NoKjDTzHNwER7v6cOLrtgTquogjhXTVn+K3JD3 59zMOzq2mBfzrCdeUFwBgmrmZQ== X-Google-Smtp-Source: AA0mqf7j7MOXfbZUHp4otP5DiM9zxSjSO2/aZXJN+LIrwH72A0P+6gmJaaaEqrFJsRBkYdA8fpRP+g== X-Received: by 2002:adf:fc8e:0:b0:241:855e:34d6 with SMTP id g14-20020adffc8e000000b00241855e34d6mr13084119wrr.189.1669112510761; Tue, 22 Nov 2022 02:21:50 -0800 (PST) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:e011:9e81:66f1:3415]) by smtp.gmail.com with ESMTPSA id o3-20020a5d4083000000b002366e8eee11sm13432873wrp.101.2022.11.22.02.21.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 02:21:50 -0800 (PST) From: Bartosz Golaszewski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Greg Kroah-Hartman , Jiri Slaby , Srinivas Kandagatla , Vinod Koul , Alex Elder , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-serial@vger.kernel.org, Bartosz Golaszewski , Konrad Dybcio Subject: [PATCH v2 10/15] tty: serial: qcom-geni-serial: use of_device_id data Date: Tue, 22 Nov 2022 11:21:20 +0100 Message-Id: <20221122102125.142075-11-brgl@bgdev.pl> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221122102125.142075-1-brgl@bgdev.pl> References: <20221122102125.142075-1-brgl@bgdev.pl> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Bartosz Golaszewski Instead of checking the device compatible in probe(), assign the device-specific data to struct of_device_id. We'll use it later when providing SE DMA support. Signed-off-by: Bartosz Golaszewski Reviewed-by: Konrad Dybcio --- drivers/tty/serial/qcom_geni_serial.c | 46 ++++++++++++++++++++------- 1 file changed, 34 insertions(+), 12 deletions(-) diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qco= m_geni_serial.c index d5c343b06c23..036231106321 100644 --- a/drivers/tty/serial/qcom_geni_serial.c +++ b/drivers/tty/serial/qcom_geni_serial.c @@ -95,6 +95,11 @@ /* We always configure 4 bytes per FIFO word */ #define BYTES_PER_FIFO_WORD 4 =20 +struct qcom_geni_device_data { + bool console; + void (*handle_rx)(struct uart_port *uport, u32 bytes, bool drop); +}; + struct qcom_geni_private_data { /* NOTE: earlycon port will have NULL here */ struct uart_driver *drv; @@ -114,7 +119,6 @@ struct qcom_geni_serial_port { u32 tx_fifo_width; u32 rx_fifo_depth; bool setup; - void (*handle_rx)(struct uart_port *uport, u32 bytes, bool drop); unsigned int baud; void *rx_fifo; u32 loopback; @@ -126,6 +130,7 @@ struct qcom_geni_serial_port { bool cts_rts_swap; =20 struct qcom_geni_private_data private_data; + const struct qcom_geni_device_data *dev_data; }; =20 static const struct uart_ops qcom_geni_console_pops; @@ -640,7 +645,7 @@ static void qcom_geni_serial_handle_rx(struct uart_port= *uport, bool drop) total_bytes +=3D last_word_byte_cnt; else total_bytes +=3D BYTES_PER_FIFO_WORD; - port->handle_rx(uport, total_bytes, drop); + port->dev_data->handle_rx(uport, total_bytes, drop); } =20 static void qcom_geni_serial_stop_rx(struct uart_port *uport) @@ -1345,13 +1350,14 @@ static int qcom_geni_serial_probe(struct platform_d= evice *pdev) struct uart_port *uport; struct resource *res; int irq; - bool console =3D false; struct uart_driver *drv; + const struct qcom_geni_device_data *data; =20 - if (of_device_is_compatible(pdev->dev.of_node, "qcom,geni-debug-uart")) - console =3D true; + data =3D of_device_get_match_data(&pdev->dev); + if (!data) + return -EINVAL; =20 - if (console) { + if (data->console) { drv =3D &qcom_geni_console_driver; line =3D of_alias_get_id(pdev->dev.of_node, "serial"); } else { @@ -1361,7 +1367,7 @@ static int qcom_geni_serial_probe(struct platform_dev= ice *pdev) line =3D of_alias_get_id(pdev->dev.of_node, "hsuart"); } =20 - port =3D get_port_from_line(line, console); + port =3D get_port_from_line(line, data->console); if (IS_ERR(port)) { dev_err(&pdev->dev, "Invalid line %d\n", line); return PTR_ERR(port); @@ -1373,6 +1379,7 @@ static int qcom_geni_serial_probe(struct platform_dev= ice *pdev) return -ENODEV; =20 uport->dev =3D &pdev->dev; + port->dev_data =3D data; port->se.dev =3D &pdev->dev; port->se.wrapper =3D dev_get_drvdata(pdev->dev.parent); port->se.clk =3D devm_clk_get(&pdev->dev, "se"); @@ -1391,7 +1398,7 @@ static int qcom_geni_serial_probe(struct platform_dev= ice *pdev) port->rx_fifo_depth =3D DEF_FIFO_DEPTH_WORDS; port->tx_fifo_width =3D DEF_FIFO_WIDTH_BITS; =20 - if (!console) { + if (!data->console) { port->rx_fifo =3D devm_kcalloc(uport->dev, port->rx_fifo_depth, sizeof(u32), GFP_KERNEL); if (!port->rx_fifo) @@ -1421,7 +1428,7 @@ static int qcom_geni_serial_probe(struct platform_dev= ice *pdev) uport->irq =3D irq; uport->has_sysrq =3D IS_ENABLED(CONFIG_SERIAL_QCOM_GENI_CONSOLE); =20 - if (!console) + if (!data->console) port->wakeup_irq =3D platform_get_irq_optional(pdev, 1); =20 if (of_property_read_bool(pdev->dev.of_node, "rx-tx-swap")) @@ -1443,7 +1450,6 @@ static int qcom_geni_serial_probe(struct platform_dev= ice *pdev) port->private_data.drv =3D drv; uport->private_data =3D &port->private_data; platform_set_drvdata(pdev, port); - port->handle_rx =3D console ? handle_rx_console : handle_rx_uart; =20 ret =3D uart_add_one_port(drv, uport); if (ret) @@ -1523,14 +1529,30 @@ static int __maybe_unused qcom_geni_serial_sys_resu= me(struct device *dev) return ret; } =20 +static const struct qcom_geni_device_data qcom_geni_console_data =3D { + .console =3D true, + .handle_rx =3D handle_rx_console, +}; + +static const struct qcom_geni_device_data qcom_geni_uart_data =3D { + .console =3D false, + .handle_rx =3D handle_rx_uart, +}; + static const struct dev_pm_ops qcom_geni_serial_pm_ops =3D { SET_SYSTEM_SLEEP_PM_OPS(qcom_geni_serial_sys_suspend, qcom_geni_serial_sys_resume) }; =20 static const struct of_device_id qcom_geni_serial_match_table[] =3D { - { .compatible =3D "qcom,geni-debug-uart", }, - { .compatible =3D "qcom,geni-uart", }, + { + .compatible =3D "qcom,geni-debug-uart", + .data =3D &qcom_geni_console_data, + }, + { + .compatible =3D "qcom,geni-uart", + .data =3D &qcom_geni_uart_data, + }, {} }; MODULE_DEVICE_TABLE(of, qcom_geni_serial_match_table); --=20 2.37.2 From nobody Wed Apr 15 23:28:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6CC0EC433FE for ; Tue, 22 Nov 2022 10:23:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233628AbiKVKXi (ORCPT ); Tue, 22 Nov 2022 05:23:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44818 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232154AbiKVKWJ (ORCPT ); Tue, 22 Nov 2022 05:22:09 -0500 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3B68943867 for ; Tue, 22 Nov 2022 02:21:52 -0800 (PST) Received: by mail-wm1-x335.google.com with SMTP id ja4-20020a05600c556400b003cf6e77f89cso925936wmb.0 for ; Tue, 22 Nov 2022 02:21:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yBSJ9X9pr9Z0i2+NFcnle+eN9VzlxNW46WoYTtGtQAo=; b=cNOOrBVDDBxp8Mc+etJ2bnstzSg1Lzp5SAUFfR5Ck/B28wVrN1R9+kJTGe4UPeXN20 Zu1NxMwctssO70t4AhcPojH9Lpd/OtIVYxCP/o9t4g/osQ4RmxjOUk8kIaLIBQF2LTGI DzyLxy/b76Ry0jdaUUPWKo3Nfe1MipiYEfkSOr7cffF2StDF4vuszG4StaL+rdKN7ywA ltZaddUhWCDNpCdOEbMKnGmEWn6OQRtY2/yxSTsppKMnfHg3nLC+8DDm6ndI2qqMhwwL xEmt7dQflPtTlvn2Rhwr3DlFu+HeFd9HeWUU16GLiORzmPYaUnclQePBH3oRJ6LrsvBj OVPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yBSJ9X9pr9Z0i2+NFcnle+eN9VzlxNW46WoYTtGtQAo=; b=jaW4ph6Ng3V1kRpkUbnIdnInVxvlwea/hAU0B1nfAbisHxMPvfAvXZbeZmJZYhAOid 6ECmmFBFqcs8f8mA400CCBGejtcPNBA1Pidr0ZA16qsSnCMILeH0u4RStFxf8jNQ1rMl igORs5gavNUnlUhX1UIrly0Zs0nC/TLdy7e8FVLKbQCXfjBe2oU6AjshUtTENbmWr28C eaBnHziUvL9x3l3JzfBw8FWlzYBpFMtYpV9k4IJ2E6BJzYQO4FXP87LazqI6gcp+A8H6 oKLAStg+vTV9/99A49KlLZSha7Z+PGtQ/qI7pVSRAMGG5P6PSIMbRKOpMluzPboTRrDS Ng3w== X-Gm-Message-State: ANoB5plON4Tr8f4/SwpTGGUTujTAaQ34qtZdoWNJHlgR1ayBYNLDiXYM vernXCuxelKh6JZN6Ocq13WnRLmEdvdScA== X-Google-Smtp-Source: AA0mqf6hZkdlXyqPZJiyPnxJlhWvw7hy1el3QF7vnCcy3ErQ04FPrEZZTgfw8fLc6lEPvbo9gfIwxg== X-Received: by 2002:a05:600c:384f:b0:3cf:9377:c76f with SMTP id s15-20020a05600c384f00b003cf9377c76fmr3817135wmr.189.1669112511702; Tue, 22 Nov 2022 02:21:51 -0800 (PST) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:e011:9e81:66f1:3415]) by smtp.gmail.com with ESMTPSA id o3-20020a5d4083000000b002366e8eee11sm13432873wrp.101.2022.11.22.02.21.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 02:21:51 -0800 (PST) From: Bartosz Golaszewski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Greg Kroah-Hartman , Jiri Slaby , Srinivas Kandagatla , Vinod Koul , Alex Elder , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-serial@vger.kernel.org, Bartosz Golaszewski , Konrad Dybcio Subject: [PATCH v2 11/15] tty: serial: qcom-geni-serial: stop operations in progress at shutdown Date: Tue, 22 Nov 2022 11:21:21 +0100 Message-Id: <20221122102125.142075-12-brgl@bgdev.pl> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221122102125.142075-1-brgl@bgdev.pl> References: <20221122102125.142075-1-brgl@bgdev.pl> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Bartosz Golaszewski We don't stop transmissions in progress at shutdown. This is fine with FIFO SE mode but with DMA it causes trouble so fix it now. Signed-off-by: Bartosz Golaszewski Reviewed-by: Konrad Dybcio --- drivers/tty/serial/qcom_geni_serial.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qco= m_geni_serial.c index 036231106321..82242a40a95a 100644 --- a/drivers/tty/serial/qcom_geni_serial.c +++ b/drivers/tty/serial/qcom_geni_serial.c @@ -865,6 +865,9 @@ static void get_tx_fifo_size(struct qcom_geni_serial_po= rt *port) =20 static void qcom_geni_serial_shutdown(struct uart_port *uport) { + qcom_geni_serial_stop_tx(uport); + qcom_geni_serial_stop_rx(uport); + disable_irq(uport->irq); } =20 --=20 2.37.2 From nobody Wed Apr 15 23:28:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 24604C433FE for ; Tue, 22 Nov 2022 10:23:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233641AbiKVKXz (ORCPT ); Tue, 22 Nov 2022 05:23:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44942 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232934AbiKVKWL (ORCPT ); Tue, 22 Nov 2022 05:22:11 -0500 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 395F111818 for ; Tue, 22 Nov 2022 02:21:54 -0800 (PST) Received: by mail-wm1-x32d.google.com with SMTP id o30so10380017wms.2 for ; Tue, 22 Nov 2022 02:21:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=j23hZnphv0jcgZfiOY9qWXNDpMCFFj9PRM3bEUKGmc4=; b=fDNYsQ3j2gLDbZskMdzxyTjl8yIPfTyD01yYPRdSjW+X6zPNqK3ztySziZezPu419E suCJQuvywgERUuFjcEnHi4Z1QQWUyfFO4bjGUFByDMTU2ML1XaBgAmunf8cy0bjbUiW6 daoPwkNXiRew7YerkscSIQfCA1vTfCA/zQEJYA+Gy88c/te+ILvMNZbT6x+k+h8ZXa58 AhXsEKNQkEnyM1McFXynLRGACGVnivDCet0jtDLXhYTpNVJlBqHoZ63GGUSki5MbqFCA mruZWz6KtrRz2f/+SjzX2D9ZkEppU8HB1XaTcih4ryJpVJ1rEiWyU2v/OrqDDX3QhTzV PjKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=j23hZnphv0jcgZfiOY9qWXNDpMCFFj9PRM3bEUKGmc4=; b=YcWTIjHau2Mjo9oB97NqOOTh/2B0GRXDlUThKzLKv/4yuZK7wW+9i6IQ9Lbpt3X1R1 osCEEx8biL/APMawGHHzg4LJgmZeNGtf9QUamPiFo0V43zOfpW1GuUrMvWo8cWHq4l/M /Tum0zNajEGc+2xAtrx8ryq+7u8H8LHgzaw4HxBcbdr2JQqofRbZQX83EGuv9Ux1IS6a gfSEvkiFsz6aw4EBX1rCLvlEE+W3wgNbwFEnh5gpVYDDpMVDgxP8IeeNda9z1JYaLMju Q3fq4WWzWZajmDN1FEdsGuK+F7n4M5DEfBAK2q5ukuYuocehpY+DPCVsPgdeRSMGh7WI ryOQ== X-Gm-Message-State: ANoB5plNkW20CLauyUooJewrC1uBSUyDapxh02YpgVxGFNfFNa46+Bn/ 89bLpePT817KK8VZ3UOZtIB7eQ== X-Google-Smtp-Source: AA0mqf6F5CKYp1cj3ICGkEzObFA7z8uPbsQFkopSwvQDdKVO4tzZn/XDhXCeCyEy5WVeeswdbWEjag== X-Received: by 2002:a7b:cb98:0:b0:3cf:9a12:e645 with SMTP id m24-20020a7bcb98000000b003cf9a12e645mr8714322wmi.59.1669112512755; Tue, 22 Nov 2022 02:21:52 -0800 (PST) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:e011:9e81:66f1:3415]) by smtp.gmail.com with ESMTPSA id o3-20020a5d4083000000b002366e8eee11sm13432873wrp.101.2022.11.22.02.21.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 02:21:52 -0800 (PST) From: Bartosz Golaszewski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Greg Kroah-Hartman , Jiri Slaby , Srinivas Kandagatla , Vinod Koul , Alex Elder , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-serial@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH v2 12/15] tty: serial: provide devm_uart_add_one_port() Date: Tue, 22 Nov 2022 11:21:22 +0100 Message-Id: <20221122102125.142075-13-brgl@bgdev.pl> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221122102125.142075-1-brgl@bgdev.pl> References: <20221122102125.142075-1-brgl@bgdev.pl> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Bartosz Golaszewski Provide a devres variant of uart_add_one_port() that removes the managed port at device detach. Signed-off-by: Bartosz Golaszewski --- .../driver-api/driver-model/devres.rst | 3 ++ drivers/tty/serial/serial_core.c | 36 +++++++++++++++++++ include/linux/serial_core.h | 6 ++++ 3 files changed, 45 insertions(+) diff --git a/Documentation/driver-api/driver-model/devres.rst b/Documentati= on/driver-api/driver-model/devres.rst index 56082265e8e5..5d07a8c1eadb 100644 --- a/Documentation/driver-api/driver-model/devres.rst +++ b/Documentation/driver-api/driver-model/devres.rst @@ -436,6 +436,9 @@ RTC SERDEV devm_serdev_device_open() =20 +SERIAL + devm_uart_add_one_port() + SLAVE DMA ENGINE devm_acpi_dma_controller_register() =20 diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_c= ore.c index 179ee199df34..005190b279b3 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -3217,6 +3217,42 @@ int uart_remove_one_port(struct uart_driver *drv, st= ruct uart_port *uport) } EXPORT_SYMBOL(uart_remove_one_port); =20 +struct uart_port_devres { + struct uart_driver *drv; + struct uart_port *port; +}; + +static void devm_uart_remove_one_port(struct device *dev, void *data) +{ + struct uart_port_devres *res =3D data; + + uart_remove_one_port(res->drv, res->port); +} + +int devm_uart_add_one_port(struct device *dev, + struct uart_driver *drv, struct uart_port *port) +{ + struct uart_port_devres *res; + int ret; + + res =3D devres_alloc(devm_uart_remove_one_port, sizeof(*res), GFP_KERNEL); + if (!res) + return -1; + + ret =3D uart_add_one_port(drv, port); + if (ret) { + devres_free(res); + return -1; + } + + res->drv =3D drv; + res->port =3D port; + devres_add(dev, res); + + return 0; +} +EXPORT_SYMBOL(devm_uart_add_one_port); + /** * uart_match_port - are the two ports equivalent? * @port1: first port diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index d657f2a42a7b..d0911f04706e 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -771,6 +771,12 @@ int uart_remove_one_port(struct uart_driver *reg, stru= ct uart_port *port); bool uart_match_port(const struct uart_port *port1, const struct uart_port *port2); =20 +/* + * UART devres + */ +int devm_uart_add_one_port(struct device *dev, + struct uart_driver *drv, struct uart_port *port); + /* * Power Management */ --=20 2.37.2 From nobody Wed Apr 15 23:28:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5113AC433FE for ; Tue, 22 Nov 2022 10:24:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233651AbiKVKYJ (ORCPT ); Tue, 22 Nov 2022 05:24:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49246 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233080AbiKVKWM (ORCPT ); Tue, 22 Nov 2022 05:22:12 -0500 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 24757E03B for ; Tue, 22 Nov 2022 02:21:55 -0800 (PST) Received: by mail-wm1-x32e.google.com with SMTP id p16so10366745wmc.3 for ; Tue, 22 Nov 2022 02:21:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=M3G5fO4wTgQLmAcQSoo34y5bVfGZW9g4LW34a2D3VvA=; b=KJyK8MfSWfrc4rC2Zkedu9dXmu7sCfaGzpAr/Fb2RwQf+OEOysG8VS/C1CdLRuu8oU FkjQ5bQiMByI94zbTMKQB6WG3DPe93S7NyYzXMES+UPGNu+8CS4bnqSQhoZqJO8Cu2UF l6z0ay3iLonF8ILw4uB6Qbs3owHDZ6547HxsQUrHmYxicToSx5IJ/IzHlZIxHog2JtCD A/dkTVnlWljJHmXfF2oPAGqnKoijFOV/Kd2dfhM2JeA4YphuJ57UGQaL7sWREcKmc/yr /byQ+DSr1pfCMqfdWOMPUonOp6AJIn2MZB6WAFPLrq2vUOUaQuDhlEQgcVy2Q3081PL1 A6dA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=M3G5fO4wTgQLmAcQSoo34y5bVfGZW9g4LW34a2D3VvA=; b=FVtuf2Gl+y2oKXexLEFAox2xZfmd+MUtD5i/F1QrnipTgzDHqnWgnF6pfyWe7KarmP YJmr2JNC/o5xZEyYuz2lI90ORsFM9dXeFYN10hyDi3llvWMCd8mBeLyup6kpdVtptgxf 7ysk2t819l+CBQw+aZP6TfX36L97kfvO2UVUZ+xtnedxlZNntQpUnY4j3DOjkoItHr7q NzGkfgXarzbqA+2iF6QT71YIZ8r/FGqk3hdg+STJzWqmwK7gPHmeY+Av2DxzOgRXyWSr NpOiSP89HekxlxAB/R8uZ66ALNL4RqmKUVMs2txNS1SN36aSqxUNhr3hOI4THLYUfWHC yQow== X-Gm-Message-State: ANoB5pmKtQw/Wi270hlWpkOxTlGa6P/2rnWdgfnaGS1SC3dDqIIyX3RV e4nH6LTkYMIKzIPB3JQG8T0cGg== X-Google-Smtp-Source: AA0mqf7UtJVhOpuxEfqOmfdJ7uiz6mBk4TYK5xLxPVNQC24s+U4cvUEeWY4TYjct7XiOmHDXomcxgg== X-Received: by 2002:a1c:f616:0:b0:3cf:b1c2:c911 with SMTP id w22-20020a1cf616000000b003cfb1c2c911mr8610482wmc.16.1669112513688; Tue, 22 Nov 2022 02:21:53 -0800 (PST) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:e011:9e81:66f1:3415]) by smtp.gmail.com with ESMTPSA id o3-20020a5d4083000000b002366e8eee11sm13432873wrp.101.2022.11.22.02.21.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 02:21:53 -0800 (PST) From: Bartosz Golaszewski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Greg Kroah-Hartman , Jiri Slaby , Srinivas Kandagatla , Vinod Koul , Alex Elder , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-serial@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH v2 13/15] tty: serial: qcom-geni-serial: use devres for uart port management Date: Tue, 22 Nov 2022 11:21:23 +0100 Message-Id: <20221122102125.142075-14-brgl@bgdev.pl> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221122102125.142075-1-brgl@bgdev.pl> References: <20221122102125.142075-1-brgl@bgdev.pl> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Bartosz Golaszewski Shrink and simplify the probe() and remove() code by using the managed variant of uart_add_one_port. Signed-off-by: Bartosz Golaszewski --- drivers/tty/serial/qcom_geni_serial.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qco= m_geni_serial.c index 82242a40a95a..53d09da0854a 100644 --- a/drivers/tty/serial/qcom_geni_serial.c +++ b/drivers/tty/serial/qcom_geni_serial.c @@ -1454,7 +1454,7 @@ static int qcom_geni_serial_probe(struct platform_dev= ice *pdev) uport->private_data =3D &port->private_data; platform_set_drvdata(pdev, port); =20 - ret =3D uart_add_one_port(drv, uport); + ret =3D devm_uart_add_one_port(&pdev->dev, drv, uport); if (ret) return ret; =20 @@ -1463,7 +1463,6 @@ static int qcom_geni_serial_probe(struct platform_dev= ice *pdev) IRQF_TRIGGER_HIGH, port->name, uport); if (ret) { dev_err(uport->dev, "Failed to get IRQ ret %d\n", ret); - uart_remove_one_port(drv, uport); return ret; } =20 @@ -1480,7 +1479,6 @@ static int qcom_geni_serial_probe(struct platform_dev= ice *pdev) port->wakeup_irq); if (ret) { device_init_wakeup(&pdev->dev, false); - uart_remove_one_port(drv, uport); return ret; } } @@ -1490,12 +1488,8 @@ static int qcom_geni_serial_probe(struct platform_de= vice *pdev) =20 static int qcom_geni_serial_remove(struct platform_device *pdev) { - struct qcom_geni_serial_port *port =3D platform_get_drvdata(pdev); - struct uart_driver *drv =3D port->private_data.drv; - dev_pm_clear_wake_irq(&pdev->dev); device_init_wakeup(&pdev->dev, false); - uart_remove_one_port(drv, &port->uport); =20 return 0; } --=20 2.37.2 From nobody Wed Apr 15 23:28:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2F210C43219 for ; Tue, 22 Nov 2022 10:24:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233656AbiKVKYN (ORCPT ); Tue, 22 Nov 2022 05:24:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49672 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232704AbiKVKWM (ORCPT ); Tue, 22 Nov 2022 05:22:12 -0500 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 14CCA53EE1 for ; Tue, 22 Nov 2022 02:21:56 -0800 (PST) Received: by mail-wm1-x330.google.com with SMTP id v124-20020a1cac82000000b003cf7a4ea2caso14847335wme.5 for ; Tue, 22 Nov 2022 02:21:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LuwEN90AtgG+bvIlYhOJ4Y3TdxahsORXGOntfwKDvGM=; b=pm9vorLOyiaAwAF9/TjFi6cTTneYhVQ8PReaGylh7jses9Q/PQ5Qikf4ZNkOz9hlA5 a975HkDG5AptKCKGw9b8S3098WCFv2s8Fpq4jCQYoLjeUYWnHlPaqUWV2FBkTMKu2Wkz 6P4TN0lJRCmeV5evy/dYN6Xh1aV4AEQwWCTNeUHFrfpFdI3RTPA1a8aEDToX7j1oGoAM Z/i68/Fw8qdfDRAeBXQSTgh7THtF4pP/NFvVWGicV0NmFanAmsyvfDT8a5Nojowbx9LG AB65Agk/Osr8EM7o5Lc2fgBjTVCwiHOhw81p/sNSRowWrXmJ/V1Dx6TM0z0boDe7+sZs VOfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LuwEN90AtgG+bvIlYhOJ4Y3TdxahsORXGOntfwKDvGM=; b=NpONLLEWvAbT4b3l7nnjM88DbrLKUQrKZGgBetKYhPpVZn+SWL5jeFvfHHR6he24UE 0eG+fvy7BDwnfISm10h1rOM82/mXpfiB2U0GoQOr11AkKDMkls4xR9C4uDH3X7RgB8mW 8JZGanktgUbN7mxk6tj2GQEUyix7hhse6A/U1/zF9WvWcR7cqjWF1aaQlaOvkaFo4PkB bQP/aMJiarFcIUA0BzV51J06oThn4fWtSqFT/0cWgzq5cwpE4Uin0db4sFGkaJjCdb/U ziCqZbXa5gWk5zb7Gxy8o9EWFzCHejlhiduHsV+zQxQawdPuvcInEnK7xdXKiJ1qS7Vl pvwQ== X-Gm-Message-State: ANoB5pmQeSbZtUTc1ouEMVFMwtR/gqkADclwdnMfywkvCF9lFT5F5AM6 yMc2xUz9/RlA5mGbHLYFI3xWvg== X-Google-Smtp-Source: AA0mqf4fbw+zj5HmCYuWJqReW81MxMlkjzTRgI8oCuDDWAaFqqnSPYk0ZMW4h5zIQrbfLRA5jXD15w== X-Received: by 2002:a05:600c:42d2:b0:3cf:c907:a05a with SMTP id j18-20020a05600c42d200b003cfc907a05amr18855098wme.177.1669112514599; Tue, 22 Nov 2022 02:21:54 -0800 (PST) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:e011:9e81:66f1:3415]) by smtp.gmail.com with ESMTPSA id o3-20020a5d4083000000b002366e8eee11sm13432873wrp.101.2022.11.22.02.21.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 02:21:54 -0800 (PST) From: Bartosz Golaszewski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Greg Kroah-Hartman , Jiri Slaby , Srinivas Kandagatla , Vinod Koul , Alex Elder , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-serial@vger.kernel.org, Bartosz Golaszewski , Konrad Dybcio Subject: [PATCH v2 14/15] soc: qcom-geni-se: add more symbol definitions Date: Tue, 22 Nov 2022 11:21:24 +0100 Message-Id: <20221122102125.142075-15-brgl@bgdev.pl> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221122102125.142075-1-brgl@bgdev.pl> References: <20221122102125.142075-1-brgl@bgdev.pl> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Bartosz Golaszewski The following symbols will be used when adding support for SE DMA in the qcom geni serial driver. Signed-off-by: Bartosz Golaszewski Reviewed-by: Konrad Dybcio --- include/linux/qcom-geni-se.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/linux/qcom-geni-se.h b/include/linux/qcom-geni-se.h index f5672785c0c4..400213daa461 100644 --- a/include/linux/qcom-geni-se.h +++ b/include/linux/qcom-geni-se.h @@ -103,6 +103,7 @@ struct geni_se { #define SE_DMA_TX_FSM_RST 0xc58 #define SE_DMA_RX_IRQ_STAT 0xd40 #define SE_DMA_RX_IRQ_CLR 0xd44 +#define SE_DMA_RX_LEN_IN 0xd54 #define SE_DMA_RX_FSM_RST 0xd58 #define SE_HW_PARAM_0 0xe24 #define SE_HW_PARAM_1 0xe28 @@ -235,6 +236,8 @@ struct geni_se { #define RX_SBE BIT(2) #define RX_RESET_DONE BIT(3) #define RX_FLUSH_DONE BIT(4) +#define RX_DMA_PARITY_ERR BIT(5) +#define RX_DMA_BREAK GENMASK(8, 7) #define RX_GENI_GP_IRQ GENMASK(10, 5) #define RX_GENI_CANCEL_IRQ BIT(11) #define RX_GENI_GP_IRQ_EXT GENMASK(13, 12) --=20 2.37.2 From nobody Wed Apr 15 23:28:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0EAD2C4332F for ; Tue, 22 Nov 2022 10:24:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233661AbiKVKYR (ORCPT ); Tue, 22 Nov 2022 05:24:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49684 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233185AbiKVKWN (ORCPT ); Tue, 22 Nov 2022 05:22:13 -0500 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2BEFE554CA for ; Tue, 22 Nov 2022 02:21:57 -0800 (PST) Received: by mail-wm1-x334.google.com with SMTP id v7so10386762wmn.0 for ; Tue, 22 Nov 2022 02:21:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1cKmwRbcC37IAbnz7M7SlkDz5+VEQeviHk5lKnbsJEc=; b=TbzCniFWB0LcTKR7BzxUOKZ35vi+gbx2yN7v5Mip4oDw/SMa45EDIFW9B8VgWdD1jh m+HzQ24FXOwL//rogeA/Kbx3Duj9S6O8KZA/hlMOjo+0ubzGiI6A3i6lvJbiogeeVP5W 1YmzmCh4sO/fmzyOpAfFwSGqyrqsOuBlBhC3xkew1IrK0DaxAG0ZS7uFlU+TQlQSbhAZ kglF7XZ5ZTev4mX43N+8wPYLqcMF3oZG4SOoiu/zoXU+eArYB/cu4BwTw9qQLr1Sm5km OORWbYxICU6IFFqnf77vaW2PzTqjqx7g/Y1MZ2f7sd4pMbRuCvfsGxk4aqzUggg5b3tz JHLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1cKmwRbcC37IAbnz7M7SlkDz5+VEQeviHk5lKnbsJEc=; b=OyJlxcE56j68xUykgOruW6uhWJtIXVPYIyA8r8gcZMGwnReX/DhJMtjiEeORWBOVpm hvq/KKGpnYL60jbyr1sFdQEjuKb+fe9etfyN/d5n1Qm+UHjIShbAbE66XcAjgRliINt9 eUtgEnzy/Zvcqopwg3W0QXLavoFgNq2h2kti6rQ9fvj0ZvoTHrIBaGIIBw85pC5A8JlL Ea/PME8KYUIfRoFFFyvRnVnielEUx9ToEEXyNUyF9a+I8Q6VGK20hRERNL2kqqCIDZFe PjREGK7tXpNuYH+wmG3OFYsQ5QCblUJEM/yvKdiXHy7peBufon3eZHvhK7rROUfc0Sav Y0tg== X-Gm-Message-State: ANoB5pn9m/bDfCoWi94AJFJ7EDeBwn5VgLLMow94Q7fe2cYl5OAPw0L4 wy77mvUzSurXqnu9kn6HrEbgog== X-Google-Smtp-Source: AA0mqf7LgQ/m3atXA7Kx0syyMPclcSqrFWoUkW43/Sdsfz+ssLxbYDwb3G9bUoXfnJpPK504KbRHkQ== X-Received: by 2002:a05:600c:4194:b0:3cf:5080:412c with SMTP id p20-20020a05600c419400b003cf5080412cmr18522772wmh.99.1669112515666; Tue, 22 Nov 2022 02:21:55 -0800 (PST) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:e011:9e81:66f1:3415]) by smtp.gmail.com with ESMTPSA id o3-20020a5d4083000000b002366e8eee11sm13432873wrp.101.2022.11.22.02.21.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 02:21:55 -0800 (PST) From: Bartosz Golaszewski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Greg Kroah-Hartman , Jiri Slaby , Srinivas Kandagatla , Vinod Koul , Alex Elder , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-serial@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH v2 15/15] tty: serial: qcom-geni-serial: add support for serial engine DMA Date: Tue, 22 Nov 2022 11:21:25 +0100 Message-Id: <20221122102125.142075-16-brgl@bgdev.pl> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221122102125.142075-1-brgl@bgdev.pl> References: <20221122102125.142075-1-brgl@bgdev.pl> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Bartosz Golaszewski The qcom-geni-serial driver currently only works in SE FIFO mode. This limits the UART speed to around 180 kB/s. In order to achieve higher speeds we need to use SE DMA mode. Keep the console port working in FIFO mode but extend the code to use DMA for the high-speed port. Signed-off-by: Bartosz Golaszewski --- drivers/tty/serial/qcom_geni_serial.c | 289 ++++++++++++++++++++++---- 1 file changed, 247 insertions(+), 42 deletions(-) diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qco= m_geni_serial.c index 53d09da0854a..4aab92be162b 100644 --- a/drivers/tty/serial/qcom_geni_serial.c +++ b/drivers/tty/serial/qcom_geni_serial.c @@ -70,6 +70,8 @@ #define UART_START_TX 0x1 /* UART S_CMD OP codes */ #define UART_START_READ 0x1 +#define UART_PARAM 0x1 +#define UART_PARAM_RFR_OPEN BIT(7) =20 #define UART_OVERSAMPLING 32 #define STALE_TIMEOUT 16 @@ -95,9 +97,11 @@ /* We always configure 4 bytes per FIFO word */ #define BYTES_PER_FIFO_WORD 4 =20 +#define DMA_RX_BUF_SIZE 2048 + struct qcom_geni_device_data { bool console; - void (*handle_rx)(struct uart_port *uport, u32 bytes, bool drop); + enum geni_se_xfer_mode mode; }; =20 struct qcom_geni_private_data { @@ -118,9 +122,11 @@ struct qcom_geni_serial_port { u32 tx_fifo_depth; u32 tx_fifo_width; u32 rx_fifo_depth; + dma_addr_t tx_dma_addr; + dma_addr_t rx_dma_addr; bool setup; unsigned int baud; - void *rx_fifo; + void *rx_buf; u32 loopback; bool brk; =20 @@ -552,18 +558,11 @@ static void handle_rx_console(struct uart_port *uport= , u32 bytes, bool drop) =20 static void handle_rx_uart(struct uart_port *uport, u32 bytes, bool drop) { - struct tty_port *tport; struct qcom_geni_serial_port *port =3D to_dev_port(uport); - u32 num_bytes_pw =3D port->tx_fifo_width / BITS_PER_BYTE; - u32 words =3D ALIGN(bytes, num_bytes_pw) / num_bytes_pw; + struct tty_port *tport =3D &uport->state->port; int ret; =20 - tport =3D &uport->state->port; - ioread32_rep(uport->membase + SE_GENI_RX_FIFOn, port->rx_fifo, words); - if (drop) - return; - - ret =3D tty_insert_flip_string(tport, port->rx_fifo, bytes); + ret =3D tty_insert_flip_string(tport, port->rx_buf, bytes); if (ret !=3D bytes) { dev_err(uport->dev, "%s:Unable to push data ret %d_bytes %d\n", __func__, ret, bytes); @@ -578,7 +577,70 @@ static unsigned int qcom_geni_serial_tx_empty(struct u= art_port *uport) return !readl(uport->membase + SE_GENI_TX_FIFO_STATUS); } =20 -static void qcom_geni_serial_start_tx(struct uart_port *uport) +static void qcom_geni_serial_stop_tx_dma(struct uart_port *uport) +{ + struct qcom_geni_serial_port *port =3D to_dev_port(uport); + bool done; + u32 status; + u32 m_irq_en; + + status =3D readl(uport->membase + SE_GENI_STATUS); + if (!(status & M_GENI_CMD_ACTIVE)) + return; + + if (port->rx_dma_addr) { + geni_se_tx_dma_unprep(&port->se, port->tx_dma_addr, + port->tx_remaining); + port->tx_dma_addr =3D (dma_addr_t)NULL; + port->tx_remaining =3D 0; + } + + m_irq_en =3D readl(uport->membase + SE_GENI_M_IRQ_EN); + writel(m_irq_en, uport->membase + SE_GENI_M_IRQ_EN); + geni_se_cancel_m_cmd(&port->se); + + done =3D qcom_geni_serial_poll_bit(uport, SE_GENI_S_IRQ_STATUS, + S_CMD_CANCEL_EN, true); + if (!done) { + geni_se_abort_m_cmd(&port->se); + qcom_geni_serial_poll_bit(uport, SE_GENI_M_IRQ_STATUS, + M_CMD_ABORT_EN, true); + writel(M_CMD_ABORT_EN, uport->membase + SE_GENI_M_IRQ_CLEAR); + } + + writel(M_CMD_CANCEL_EN, uport->membase + SE_GENI_M_IRQ_CLEAR); +} + +static void qcom_geni_serial_start_tx_dma(struct uart_port *uport) +{ + struct qcom_geni_serial_port *port =3D to_dev_port(uport); + struct circ_buf *xmit =3D &uport->state->xmit; + unsigned int xmit_size; + int ret; + + if (port->tx_dma_addr) + return; + + xmit_size =3D uart_circ_chars_pending(xmit); + if (xmit_size < WAKEUP_CHARS) + uart_write_wakeup(uport); + + xmit_size =3D CIRC_CNT_TO_END(xmit->head, xmit->tail, UART_XMIT_SIZE); + + qcom_geni_serial_setup_tx(uport, xmit_size); + + ret =3D geni_se_tx_dma_prep(&port->se, &xmit->buf[xmit->tail], + xmit_size, &port->tx_dma_addr); + if (ret) { + dev_err(uport->dev, "unable to start TX SE DMA: %d\n", ret); + qcom_geni_serial_stop_tx_dma(uport); + return; + } + + port->tx_remaining =3D xmit_size; +} + +static void qcom_geni_serial_start_tx_fifo(struct uart_port *uport) { u32 irq_en; u32 status; @@ -597,7 +659,7 @@ static void qcom_geni_serial_start_tx(struct uart_port = *uport) writel(irq_en, uport->membase + SE_GENI_M_IRQ_EN); } =20 -static void qcom_geni_serial_stop_tx(struct uart_port *uport) +static void qcom_geni_serial_stop_tx_fifo(struct uart_port *uport) { u32 irq_en; u32 status; @@ -623,14 +685,13 @@ static void qcom_geni_serial_stop_tx(struct uart_port= *uport) writel(M_CMD_CANCEL_EN, uport->membase + SE_GENI_M_IRQ_CLEAR); } =20 -static void qcom_geni_serial_handle_rx(struct uart_port *uport, bool drop) +static void qcom_geni_serial_handle_rx_fifo(struct uart_port *uport, bool = drop) { u32 status; u32 word_cnt; u32 last_word_byte_cnt; u32 last_word_partial; u32 total_bytes; - struct qcom_geni_serial_port *port =3D to_dev_port(uport); =20 status =3D readl(uport->membase + SE_GENI_RX_FIFO_STATUS); word_cnt =3D status & RX_FIFO_WC_MSK; @@ -645,10 +706,10 @@ static void qcom_geni_serial_handle_rx(struct uart_po= rt *uport, bool drop) total_bytes +=3D last_word_byte_cnt; else total_bytes +=3D BYTES_PER_FIFO_WORD; - port->dev_data->handle_rx(uport, total_bytes, drop); + handle_rx_console(uport, total_bytes, drop); } =20 -static void qcom_geni_serial_stop_rx(struct uart_port *uport) +static void qcom_geni_serial_stop_rx_fifo(struct uart_port *uport) { u32 irq_en; u32 status; @@ -678,7 +739,7 @@ static void qcom_geni_serial_stop_rx(struct uart_port *= uport) s_irq_status =3D readl(uport->membase + SE_GENI_S_IRQ_STATUS); /* Flush the Rx buffer */ if (s_irq_status & S_RX_FIFO_LAST_EN) - qcom_geni_serial_handle_rx(uport, true); + qcom_geni_serial_handle_rx_fifo(uport, true); writel(s_irq_status, uport->membase + SE_GENI_S_IRQ_CLEAR); =20 status =3D readl(uport->membase + SE_GENI_STATUS); @@ -686,7 +747,7 @@ static void qcom_geni_serial_stop_rx(struct uart_port *= uport) qcom_geni_serial_abort_rx(uport); } =20 -static void qcom_geni_serial_start_rx(struct uart_port *uport) +static void qcom_geni_serial_start_rx_fifo(struct uart_port *uport) { u32 irq_en; u32 status; @@ -694,7 +755,7 @@ static void qcom_geni_serial_start_rx(struct uart_port = *uport) =20 status =3D readl(uport->membase + SE_GENI_STATUS); if (status & S_GENI_CMD_ACTIVE) - qcom_geni_serial_stop_rx(uport); + qcom_geni_serial_stop_rx_fifo(uport); =20 geni_se_setup_s_cmd(&port->se, UART_START_READ, 0); =20 @@ -707,6 +768,101 @@ static void qcom_geni_serial_start_rx(struct uart_por= t *uport) writel(irq_en, uport->membase + SE_GENI_M_IRQ_EN); } =20 +static void qcom_geni_serial_stop_rx_dma(struct uart_port *uport) +{ + struct qcom_geni_serial_port *port =3D to_dev_port(uport); + u32 status; + + status =3D readl(uport->membase + SE_GENI_STATUS); + if (!(status & S_GENI_CMD_ACTIVE)) + return; + + geni_se_cancel_s_cmd(&port->se); + qcom_geni_serial_poll_bit(uport, SE_GENI_S_IRQ_STATUS, + S_CMD_CANCEL_EN, true); + + status =3D readl(uport->membase + SE_GENI_STATUS); + if (status & S_GENI_CMD_ACTIVE) + qcom_geni_serial_abort_rx(uport); + + if (port->rx_dma_addr) { + geni_se_rx_dma_unprep(&port->se, port->rx_dma_addr, + DMA_RX_BUF_SIZE); + port->rx_dma_addr =3D (dma_addr_t)NULL; + } +} + +static void qcom_geni_serial_start_rx_dma(struct uart_port *uport) +{ + struct qcom_geni_serial_port *port =3D to_dev_port(uport); + u32 status; + int ret; + + status =3D readl(uport->membase + SE_GENI_STATUS); + if (status & S_GENI_CMD_ACTIVE) + qcom_geni_serial_stop_rx_dma(uport); + + geni_se_setup_s_cmd(&port->se, UART_START_READ, UART_PARAM_RFR_OPEN); + + ret =3D geni_se_rx_dma_prep(&port->se, port->rx_buf, + DMA_RX_BUF_SIZE, + &port->rx_dma_addr); + if (ret) { + dev_err(uport->dev, "unable to start RX SE DMA: %d\n", ret); + qcom_geni_serial_stop_rx_dma(uport); + } +} + +static void qcom_geni_serial_handle_rx_dma(struct uart_port *uport, bool d= rop) +{ + struct qcom_geni_serial_port *port =3D to_dev_port(uport); + u32 status; + u32 rx_in; + int ret; + + status =3D readl(uport->membase + SE_GENI_STATUS); + if (!(status & S_GENI_CMD_ACTIVE)) + return; + + if (!port->rx_dma_addr) + return; + + geni_se_rx_dma_unprep(&port->se, port->rx_dma_addr, DMA_RX_BUF_SIZE); + port->rx_dma_addr =3D (dma_addr_t)NULL; + + rx_in =3D readl(uport->membase + SE_DMA_RX_LEN_IN); + if (!rx_in) { + dev_warn(uport->dev, "serial engine reports 0 RX bytes in!\n"); + return; + } + + if (!drop) + handle_rx_uart(uport, rx_in, drop); + + ret =3D geni_se_rx_dma_prep(&port->se, port->rx_buf, + DMA_RX_BUF_SIZE, + &port->rx_dma_addr); + if (ret) { + dev_err(uport->dev, "unable to start RX SE DMA: %d\n", ret); + qcom_geni_serial_stop_rx_dma(uport); + } +} + +static void qcom_geni_serial_start_rx(struct uart_port *uport) +{ + uport->ops->start_rx(uport); +} + +static void qcom_geni_serial_stop_rx(struct uart_port *uport) +{ + uport->ops->stop_rx(uport); +} + +static void qcom_geni_serial_stop_tx(struct uart_port *uport) +{ + uport->ops->stop_tx(uport); +} + static void qcom_geni_serial_send_chunk_fifo(struct uart_port *uport, unsigned int chunk) { @@ -733,8 +889,8 @@ static void qcom_geni_serial_send_chunk_fifo(struct uar= t_port *uport, } } =20 -static void qcom_geni_serial_handle_tx(struct uart_port *uport, bool done, - bool active) +static void qcom_geni_serial_handle_tx_fifo(struct uart_port *uport, + bool done, bool active) { struct qcom_geni_serial_port *port =3D to_dev_port(uport); struct circ_buf *xmit =3D &uport->state->xmit; @@ -754,7 +910,7 @@ static void qcom_geni_serial_handle_tx(struct uart_port= *uport, bool done, =20 /* All data has been transmitted and acknowledged as received */ if (!pending && !status && done) { - qcom_geni_serial_stop_tx(uport); + qcom_geni_serial_stop_tx_fifo(uport); goto out_write_wakeup; } =20 @@ -797,12 +953,32 @@ static void qcom_geni_serial_handle_tx(struct uart_po= rt *uport, bool done, uart_write_wakeup(uport); } =20 +static void qcom_geni_serial_handle_tx_dma(struct uart_port *uport) +{ + struct qcom_geni_serial_port *port =3D to_dev_port(uport); + struct circ_buf *xmit =3D &uport->state->xmit; + + uart_xmit_advance(uport, port->tx_remaining); + geni_se_tx_dma_unprep(&port->se, port->tx_dma_addr, port->tx_remaining); + port->tx_dma_addr =3D (dma_addr_t)NULL; + port->tx_remaining =3D 0; + + if (!uart_circ_empty(xmit)) + qcom_geni_serial_start_tx_dma(uport); + + if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) + uart_write_wakeup(uport); +} + static irqreturn_t qcom_geni_serial_isr(int isr, void *dev) { u32 m_irq_en; u32 m_irq_status; u32 s_irq_status; u32 geni_status; + u32 dma; + u32 dma_tx_status; + u32 dma_rx_status; struct uart_port *uport =3D dev; bool drop_rx =3D false; struct tty_port *tport =3D &uport->state->port; @@ -815,10 +991,15 @@ static irqreturn_t qcom_geni_serial_isr(int isr, void= *dev) =20 m_irq_status =3D readl(uport->membase + SE_GENI_M_IRQ_STATUS); s_irq_status =3D readl(uport->membase + SE_GENI_S_IRQ_STATUS); + dma_tx_status =3D readl(uport->membase + SE_DMA_TX_IRQ_STAT); + dma_rx_status =3D readl(uport->membase + SE_DMA_RX_IRQ_STAT); geni_status =3D readl(uport->membase + SE_GENI_STATUS); + dma =3D readl(uport->membase + SE_GENI_DMA_MODE_EN); m_irq_en =3D readl(uport->membase + SE_GENI_M_IRQ_EN); writel(m_irq_status, uport->membase + SE_GENI_M_IRQ_CLEAR); writel(s_irq_status, uport->membase + SE_GENI_S_IRQ_CLEAR); + writel(dma_tx_status, uport->membase + SE_DMA_TX_IRQ_CLR); + writel(dma_rx_status, uport->membase + SE_DMA_RX_IRQ_CLR); =20 if (WARN_ON(m_irq_status & M_ILLEGAL_CMD_EN)) goto out_unlock; @@ -828,10 +1009,6 @@ static irqreturn_t qcom_geni_serial_isr(int isr, void= *dev) tty_insert_flip_char(tport, 0, TTY_OVERRUN); } =20 - if (m_irq_status & m_irq_en & (M_TX_FIFO_WATERMARK_EN | M_CMD_DONE_EN)) - qcom_geni_serial_handle_tx(uport, m_irq_status & M_CMD_DONE_EN, - geni_status & M_GENI_CMD_ACTIVE); - if (s_irq_status & (S_GP_IRQ_0_EN | S_GP_IRQ_1_EN)) { if (s_irq_status & S_GP_IRQ_0_EN) uport->icount.parity++; @@ -841,8 +1018,35 @@ static irqreturn_t qcom_geni_serial_isr(int isr, void= *dev) port->brk =3D true; } =20 - if (s_irq_status & (S_RX_FIFO_WATERMARK_EN | S_RX_FIFO_LAST_EN)) - qcom_geni_serial_handle_rx(uport, drop_rx); + if (dma) { + if (dma_tx_status & TX_DMA_DONE) + qcom_geni_serial_handle_tx_dma(uport); + + if (dma_rx_status) { + if (dma_rx_status & RX_RESET_DONE) + goto out_unlock; + + if (dma_rx_status & RX_DMA_PARITY_ERR) { + uport->icount.parity++; + drop_rx =3D true; + } + + if (dma_rx_status & RX_DMA_BREAK) + uport->icount.brk++; + + if (dma_rx_status & (RX_DMA_DONE | RX_EOT)) + qcom_geni_serial_handle_rx_dma(uport, drop_rx); + } + } else { + if (m_irq_status & m_irq_en & + (M_TX_FIFO_WATERMARK_EN | M_CMD_DONE_EN)) + qcom_geni_serial_handle_tx_fifo(uport, + m_irq_status & M_CMD_DONE_EN, + geni_status & M_GENI_CMD_ACTIVE); + + if (s_irq_status & (S_RX_FIFO_WATERMARK_EN | S_RX_FIFO_LAST_EN)) + qcom_geni_serial_handle_rx_fifo(uport, drop_rx); + } =20 out_unlock: uart_unlock_and_check_sysrq(uport); @@ -912,7 +1116,7 @@ static int qcom_geni_serial_port_setup(struct uart_por= t *uport) geni_se_config_packing(&port->se, BITS_PER_BYTE, BYTES_PER_FIFO_WORD, false, true, true); geni_se_init(&port->se, UART_RX_WM, port->rx_fifo_depth - 2); - geni_se_select_mode(&port->se, GENI_SE_FIFO); + geni_se_select_mode(&port->se, port->dev_data->mode); port->setup =3D true; =20 return 0; @@ -1310,10 +1514,10 @@ static void qcom_geni_serial_pm(struct uart_port *u= port, =20 static const struct uart_ops qcom_geni_console_pops =3D { .tx_empty =3D qcom_geni_serial_tx_empty, - .stop_tx =3D qcom_geni_serial_stop_tx, - .start_tx =3D qcom_geni_serial_start_tx, - .stop_rx =3D qcom_geni_serial_stop_rx, - .start_rx =3D qcom_geni_serial_start_rx, + .stop_tx =3D qcom_geni_serial_stop_tx_fifo, + .start_tx =3D qcom_geni_serial_start_tx_fifo, + .stop_rx =3D qcom_geni_serial_stop_rx_fifo, + .start_rx =3D qcom_geni_serial_start_rx_fifo, .set_termios =3D qcom_geni_serial_set_termios, .startup =3D qcom_geni_serial_startup, .request_port =3D qcom_geni_serial_request_port, @@ -1331,9 +1535,10 @@ static const struct uart_ops qcom_geni_console_pops = =3D { =20 static const struct uart_ops qcom_geni_uart_pops =3D { .tx_empty =3D qcom_geni_serial_tx_empty, - .stop_tx =3D qcom_geni_serial_stop_tx, - .start_tx =3D qcom_geni_serial_start_tx, - .stop_rx =3D qcom_geni_serial_stop_rx, + .stop_tx =3D qcom_geni_serial_stop_tx_dma, + .start_tx =3D qcom_geni_serial_start_tx_dma, + .start_rx =3D qcom_geni_serial_start_rx_dma, + .stop_rx =3D qcom_geni_serial_stop_rx_dma, .set_termios =3D qcom_geni_serial_set_termios, .startup =3D qcom_geni_serial_startup, .request_port =3D qcom_geni_serial_request_port, @@ -1402,9 +1607,9 @@ static int qcom_geni_serial_probe(struct platform_dev= ice *pdev) port->tx_fifo_width =3D DEF_FIFO_WIDTH_BITS; =20 if (!data->console) { - port->rx_fifo =3D devm_kcalloc(uport->dev, - port->rx_fifo_depth, sizeof(u32), GFP_KERNEL); - if (!port->rx_fifo) + port->rx_buf =3D devm_kzalloc(uport->dev, + DMA_RX_BUF_SIZE, GFP_KERNEL); + if (!port->rx_buf) return -ENOMEM; } =20 @@ -1528,12 +1733,12 @@ static int __maybe_unused qcom_geni_serial_sys_resu= me(struct device *dev) =20 static const struct qcom_geni_device_data qcom_geni_console_data =3D { .console =3D true, - .handle_rx =3D handle_rx_console, + .mode =3D GENI_SE_FIFO, }; =20 static const struct qcom_geni_device_data qcom_geni_uart_data =3D { .console =3D false, - .handle_rx =3D handle_rx_uart, + .mode =3D GENI_SE_DMA, }; =20 static const struct dev_pm_ops qcom_geni_serial_pm_ops =3D { --=20 2.37.2