From patchwork Mon Mar 15 08:34:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 402198 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E1CFBC433DB for ; Mon, 15 Mar 2021 08:35:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A41A564EB3 for ; Mon, 15 Mar 2021 08:35:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229641AbhCOIfK (ORCPT ); Mon, 15 Mar 2021 04:35:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59316 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229817AbhCOIfD (ORCPT ); Mon, 15 Mar 2021 04:35:03 -0400 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 A18A4C06175F for ; Mon, 15 Mar 2021 01:35:02 -0700 (PDT) Received: by mail-wm1-x334.google.com with SMTP id l19so7573918wmh.1 for ; Mon, 15 Mar 2021 01:35:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=h/Gkz5RJgx9sQ9b5NmpdOjRc9DJkyI918kN+6MDqa88=; b=pjzaBNJa/Cp5phiQwo5PRMNYoWo6/wuEFJl1pKg6/K5/G0qyxPc1TflAYa2B4876Aa 9W6uiziwIiAXf6WueesYR99qLSwPGeXltfm5YPSNtVQj+mTrFUfRWuJWF6Fsfwo0HeaZ ZjStNW543/Qg6svtOW8WV/o8CiHpsZp3lh/jAdmUJ2+98KDNiSfmWT0gVlqzbF5gxWE3 OC/n0slCAHgSC4T8SWBNcDHavvcoDLgH0RRx1+QaknM8ApANZw5SM0b5DOHMkXe1yGQD 0zCWQNarmtMLf+yfToY8IYbF84u13FaE+vKOVpJAJNHUeImSNoSmBr9GB48qzqDG/7M0 8R7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=h/Gkz5RJgx9sQ9b5NmpdOjRc9DJkyI918kN+6MDqa88=; b=heRVkmCe/3xMNha/pB3C1JjKQeT3MV/Ktcyik2nvncVAJ4dDTe7gVAzL5xn4AKHq6k WWOwv32e870nlhId/xPmzGnIGnqFi4tNniBMxgSCnRVZqJPcDZyily5p26RQEgMNBXaK fUDoZ38sSsXfUP7pKZYGfwRa8KsBEGKFFdgSCXU4hp4HST39vTdr9zb/5GnDdT7Bh/TW NBbZ5XcGSbQMR7/mNCAzQK9X18pOg3QWV7oKXTcmdLj6A7L0R8EaGD4ZuQvB0aI+qkRd gqsPnxKPe4T8ki6rsvXR8OnLjDdH/0r4SEdruZKK612RiTFdzO8gmSEL5cgHQTLcOGQS vmRQ== X-Gm-Message-State: AOAM530XXk9FhGSf1CwOi85n6lEHNujoqamufkcsXHnfBhQMgmKOUY/A DdTiDsokt2lGNFIKNpwsBwyMFw== X-Google-Smtp-Source: ABdhPJxkvfTQ4A0oqVxQTXvK6iCVYYqj/CHlIUOzPNQx4tTvdjm1Iu18EVe2v3EEEUNlrUPdl0x/hA== X-Received: by 2002:a7b:cdf7:: with SMTP id p23mr25061709wmj.26.1615797301209; Mon, 15 Mar 2021 01:35:01 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:90c:e290:708f:15aa:638c:22b7]) by smtp.gmail.com with ESMTPSA id o2sm8372028wmc.23.2021.03.15.01.35.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 01:35:00 -0700 (PDT) From: Neil Armstrong To: gregkh@linuxfoundation.org Cc: devicetree@vger.kernel.org, linux-serial@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, Neil Armstrong Subject: [PATCH 1/3] dt-bindings: serial: amlogic, meson-uart: add amlogic, uart-fifosize property Date: Mon, 15 Mar 2021 09:34:57 +0100 Message-Id: <20210315083459.359773-2-narmstrong@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210315083459.359773-1-narmstrong@baylibre.com> References: <20210315083459.359773-1-narmstrong@baylibre.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-serial@vger.kernel.org On most of the Amlogic SoCs, the first UART controller in the "Everything-Else" power domain has 128bytes of RX & TX FIFO, so add an optional property to describe a different FIFO size from the other ports (64bytes). Signed-off-by: Neil Armstrong Reviewed-by: Martin Blumenstingl --- .../devicetree/bindings/serial/amlogic,meson-uart.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml b/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml index 75ebc9952a99..e0a742112783 100644 --- a/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml +++ b/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml @@ -55,6 +55,12 @@ properties: - const: pclk - const: baud + + amlogic,uart-fifosize: + description: The fifo size supported by the UART channel. + $ref: /schemas/types.yaml#/definitions/uint32 + enum: [64, 128] + required: - compatible - reg From patchwork Mon Mar 15 08:34:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 400915 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ABB64C43332 for ; Mon, 15 Mar 2021 08:35:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 93C6C64EAE for ; Mon, 15 Mar 2021 08:35:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229686AbhCOIfL (ORCPT ); Mon, 15 Mar 2021 04:35:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59324 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229826AbhCOIfE (ORCPT ); Mon, 15 Mar 2021 04:35:04 -0400 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8F854C061574 for ; Mon, 15 Mar 2021 01:35:03 -0700 (PDT) Received: by mail-wm1-x32b.google.com with SMTP id w203-20020a1c49d40000b029010c706d0642so1875341wma.0 for ; Mon, 15 Mar 2021 01:35:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4O/Pa9QoYF77T5Q9QdbcadRQvPAdN3INVfdUHWaUtt8=; b=X+QUFVzKkQbG1ViUEZ3ss5XSu9heNtdx5TJHJrU1CiqtByufNS4VrOXAvqk+I5bdR2 em6RSTaKU9idqiQITHDzc/DtiLlLvKYg/uBLAmPPmR/IkaXePdP9iIX9HdsWNYFpEaVv 5dGrwHCoVJMiWt0PpoSUZH8sU4eNdWw2W/IqmLN96S4abciDPztuzn4k/buBj7xHJpRS cSvv4WbCBojzRz3STHiTyDwHgO6NrShwOGryzZ7HaEkv8mxpKJToLcx5avhbZcla8VTD uSmZAaVVomd281PQ00gMbDzr9ndev8s4cn7DzY+yfjMmDHs7ZLMKm0UC6kBDHSsefrtu Ea0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4O/Pa9QoYF77T5Q9QdbcadRQvPAdN3INVfdUHWaUtt8=; b=Qu8cSjPaOmCfyQK0X2FFvyFIKwlbCodXiZiO3w+Vo0jUjLyHwmtuSsv9vWD8NAWd9r b60iOMjitHshsr0m9L6cJCaqT/JuCkrZrrycnwmXBlZBvjAET2Leq+7ja2dtBt4/2kW2 40VAZNplj2WS5M7hPM03UEv50+PwTgTxvPppiAcCBqSrxxSKmtGXXbWuFPuJ18FjUHE0 uZwQ0K/6GWC1n5tJTB/tXgJOot7oXTN3zUs/Y7ztDHdFCyhD34j6Y72j2/xsniC/u2Wu SdlUy7j8yAvw8N+2MwxpVw7s7U0cb68cNsJo6JeAlbQQ+5ktoD3ORuDB/FmIr3T3Yulb toGA== X-Gm-Message-State: AOAM530/qBI7A3sID+/x7SvthTTgCPGCWe24M+g8wo8B1FcEwojmFuc0 chxGEQBNq3Cj9zXDgJunlVRx2Q== X-Google-Smtp-Source: ABdhPJy3UE503fgAhTS0RzBbZfuwhb5FPKRFm4Jpd51LGdchtrvmRVxO/iaQkDxynO+Xstf/56XjoQ== X-Received: by 2002:a05:600c:210a:: with SMTP id u10mr25166362wml.147.1615797302244; Mon, 15 Mar 2021 01:35:02 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:90c:e290:708f:15aa:638c:22b7]) by smtp.gmail.com with ESMTPSA id o2sm8372028wmc.23.2021.03.15.01.35.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 01:35:01 -0700 (PDT) From: Neil Armstrong To: gregkh@linuxfoundation.org Cc: devicetree@vger.kernel.org, linux-serial@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, Neil Armstrong Subject: [PATCH 2/3] tty: serial: meson: retrieve port FIFO size from DT Date: Mon, 15 Mar 2021 09:34:58 +0100 Message-Id: <20210315083459.359773-3-narmstrong@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210315083459.359773-1-narmstrong@baylibre.com> References: <20210315083459.359773-1-narmstrong@baylibre.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-serial@vger.kernel.org Now the DT bindings has a property to get the FIFO size for a particular port, retrieve it and use to setup the FIFO interrupts threshold. Signed-off-by: Neil Armstrong Reviewed-by: Kevin Hilman Reviewed-by: Martin Blumenstingl --- drivers/tty/serial/meson_uart.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/tty/serial/meson_uart.c b/drivers/tty/serial/meson_uart.c index 69eeef9edfa5..7244b12aefab 100644 --- a/drivers/tty/serial/meson_uart.c +++ b/drivers/tty/serial/meson_uart.c @@ -717,6 +717,7 @@ static int meson_uart_probe(struct platform_device *pdev) { struct resource *res_mem, *res_irq; struct uart_port *port; + u32 fifosize = 64; /* Default is 64, 128 for EE UART_0 */ int ret = 0; int id = -1; @@ -743,6 +744,8 @@ static int meson_uart_probe(struct platform_device *pdev) if (!res_irq) return -ENODEV; + of_property_read_u32(pdev->dev.of_node, "amlogic,uart-fifosize", &fifosize); + if (meson_ports[pdev->id]) { dev_err(&pdev->dev, "port %d already allocated\n", pdev->id); return -EBUSY; @@ -772,7 +775,7 @@ static int meson_uart_probe(struct platform_device *pdev) port->type = PORT_MESON; port->x_char = 0; port->ops = &meson_uart_ops; - port->fifosize = 64; + port->fifosize = fifosize; meson_ports[pdev->id] = port; platform_set_drvdata(pdev, port); From patchwork Mon Mar 15 08:34:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 400916 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 54BFEC43381 for ; Mon, 15 Mar 2021 08:35:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 31A3764EB2 for ; Mon, 15 Mar 2021 08:35:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229734AbhCOIfM (ORCPT ); Mon, 15 Mar 2021 04:35:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59334 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229830AbhCOIfF (ORCPT ); Mon, 15 Mar 2021 04:35:05 -0400 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 A06C8C061574 for ; Mon, 15 Mar 2021 01:35:04 -0700 (PDT) Received: by mail-wr1-x432.google.com with SMTP id j18so5226752wra.2 for ; Mon, 15 Mar 2021 01:35:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9BPZS3vnao73K9jUsX/fpglGU+kHtpTMPEIGEWnyDz8=; b=J9uOWfrfMEKrcqh0mxGSAXwSVI+6IRtLA1Ee9SL2Yecz8KhM/QA7z4AG6nM2dd1b8s r8iSEl10nAm1w/8dGrFgSHg7wUYfnjQeQfagGirxlXqcfHWA3SLFA7jVaPUrvYWHwOSg 6ZGSXcnKLDYIbnq0O92AdA5vGTqNH8J9Uj2+odsqoHvXc/PxBtSlG1BFqSVLe+mhSeHK KN7FeDUw2u0m/VDRT8dxah0TPqHBRGpH4ttZqpBp/w5EKYppPWKgURQr2ElSU3f8AdM3 E7RCTGE/tN+CMx+ArF6vzrjdmIk6cYtEQyYoj5jU5iyfyrGL5tKwH3ucPi2F6nANiaKR rlxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9BPZS3vnao73K9jUsX/fpglGU+kHtpTMPEIGEWnyDz8=; b=i9QrzCCe1kwkKuAN860Jcj3vUJCYQUjAqWdelv3LzvCr1OPW0AULYN6ppWcLL2Xlcf z86Uz76xTcAvLyOvoqslkcy5tGIFZ5LT6PGEEMvY8AOwI2sgOoOYNoQv9txdg8vBxqUO DnMKBWju5j34ZeYrBmcEuuXE7A2G5z3yV6KFciZptyb7fR6FCy9weRujRBVcsjlBMhn3 BC68pIL+fdVK9cwKfo+qSy3J3HyuHQtvessVGXiXHNs8S/spUZzbUHXRaabQQejAeA1R hpKm1ElIOLTc1CWTCdmVbQyrjVt/i/K+6DM/ieOhysPXRhZMVXnG7hHT4Fs+clZp/fgm fNvw== X-Gm-Message-State: AOAM530q5I3l5KrCj6YpaSTHxKzr/TUiTh40dp64HgSVi8i6sX+0KWX2 pwfY0dP7rn6zYvUJp/Ixfa/PEw== X-Google-Smtp-Source: ABdhPJyQqwyuDSuV0WHwVd7Shb+AlqgYBqd5R3uq6WnrB0yfoRjomq0j8TJhFdUjMTF9iMgreMZTXg== X-Received: by 2002:adf:f0c1:: with SMTP id x1mr25674841wro.7.1615797303277; Mon, 15 Mar 2021 01:35:03 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:90c:e290:708f:15aa:638c:22b7]) by smtp.gmail.com with ESMTPSA id o2sm8372028wmc.23.2021.03.15.01.35.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 01:35:02 -0700 (PDT) From: Neil Armstrong To: gregkh@linuxfoundation.org Cc: devicetree@vger.kernel.org, linux-serial@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, Neil Armstrong Subject: [PATCH 3/3] arm64: dts: meson: set 128bytes FIFO size on uart A Date: Mon, 15 Mar 2021 09:34:59 +0100 Message-Id: <20210315083459.359773-4-narmstrong@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210315083459.359773-1-narmstrong@baylibre.com> References: <20210315083459.359773-1-narmstrong@baylibre.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-serial@vger.kernel.org The first UART controller in "Everything-Else" power domain, usually used for Bluetooth HCI has 128bytes FIFO depth. Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 1 + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 1 + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 1 + 3 files changed, 3 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi index d945c84ab697..571383c12855 100644 --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi @@ -1872,6 +1872,7 @@ uart_A: serial@24000 { status = "disabled"; clocks = <&xtal>, <&clkc CLKID_UART0>, <&xtal>; clock-names = "xtal", "pclk", "baud"; + amlogic,uart-fifosize = <128>; }; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi index b858c5e43cc8..9e898479f118 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi @@ -2311,6 +2311,7 @@ uart_A: serial@24000 { clocks = <&xtal>, <&clkc CLKID_UART0>, <&xtal>; clock-names = "xtal", "pclk", "baud"; status = "disabled"; + amlogic,uart-fifosize = <128>; }; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi index 0edd137151f8..bd0b049787fd 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi @@ -295,6 +295,7 @@ uart_A: serial@84c0 { reg = <0x0 0x84c0 0x0 0x18>; interrupts = ; status = "disabled"; + amlogic,uart-fifosize = <128>; }; uart_B: serial@84dc {