From patchwork Wed Nov 4 05:24:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 1393663 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=l+unhg/j; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CQw9C4q1Fz9sPB for ; Wed, 4 Nov 2020 16:25:39 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 914BE82242; Wed, 4 Nov 2020 06:25:25 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="l+unhg/j"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4B20282249; Wed, 4 Nov 2020 06:25:24 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pg1-x544.google.com (mail-pg1-x544.google.com [IPv6:2607:f8b0:4864:20::544]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 65916821A4 for ; Wed, 4 Nov 2020 06:25:20 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=takahiro.akashi@linaro.org Received: by mail-pg1-x544.google.com with SMTP id g12so15577580pgm.8 for ; Tue, 03 Nov 2020 21:25:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=F1NLUJ0dkyxIpxC/LRuggiw/wzyVFS3ELmWwF/4//+s=; b=l+unhg/jMpCqdBFgZFNAUSP3SzBZjYUISnzjcr2yRA5GJiOGPId2Xc61Glk76stQUZ V3tIJHedNw3/6q3k84QIUiDFfP/Gk0qEpKGJa4EOg7jxZHKh5fr06XT8Pa6xHdQKk9gJ zZTyUwa7S2yOA7St1D0zDTIfd/39WNATFrFHGqjcUucd0G2Wtkxvsp00XrmXSfU2kMcg ZSH/uK7RRYEtEjKyD8TNjbTozSy0vM+783X3GuJ8b4Yzc92GOigKB8U7+RthLGcmn18M dclFobte4Jk7zvbW0sywhHiNZoDUaq4TJc92yEqdhGXQAt1I7hFJMfgogRHglAlRaN2b quMA== 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:mime-version :content-transfer-encoding; bh=F1NLUJ0dkyxIpxC/LRuggiw/wzyVFS3ELmWwF/4//+s=; b=rDNoBbkRQ3M7kvZLTUUTMG1pNGbYx1CnEc57ILLcPVPkxIy61gGzmTQpYuKqIzIcdg CQ5zKh6TaGJu9XI8nG6r7AElTDL+g3ZjnNzUmCenHkf8SyYEkBbT27EZag4JPxy1hclJ RosO1TTxQiPgPAXWlHjj/yzuV1Nxs1j2FhjXZIK+JIYVK+7OrTPMVxf+IznUhWJJLAPH hxdtp0whucjDl/8sl5qHZqU0OmmhCSGT9j1cSEpZYCS2rcx+Ljq2mDiU1QYFCGHzRtLW yy5eZbSCadK76deNamRI5PPrF92O4BMVzkBX3HeAv7zDS9Lrt7jnxbjn9P+ikCvIugTU Qt4A== X-Gm-Message-State: AOAM530+/5F5jWpiZAdK+SydoHIF6crY48tHTR2DxCvgT/kvFsc4P2Wp hyEOTG2sndhIEjmjZx8mA/C+lw== X-Google-Smtp-Source: ABdhPJzjJeNVxHBBHqLW2WhTyy9GgxG2agSVK0Y+Dnk0CJcJyRsw6Fk9I3Ysz7egyKddUfpDIzqqHw== X-Received: by 2002:aa7:950b:0:b029:18a:df47:ef90 with SMTP id b11-20020aa7950b0000b029018adf47ef90mr14455922pfp.74.1604467518339; Tue, 03 Nov 2020 21:25:18 -0800 (PST) Received: from localhost.localdomain (p784a66b9.tkyea130.ap.so-net.ne.jp. [120.74.102.185]) by smtp.gmail.com with ESMTPSA id j20sm725643pgk.59.2020.11.03.21.25.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Nov 2020 21:25:17 -0800 (PST) From: AKASHI Takahiro To: trini@konsulko.com Cc: anastasiia_lukianenko@epam.com, oleksandr_andrushchenko@epam.com, u-boot@lists.denx.de, AKASHI Takahiro Subject: [RFC] serial: pl01x: add sbsa-uart favor Date: Wed, 4 Nov 2020 14:24:46 +0900 Message-Id: <20201104052446.52555-1-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean sbsa-uart is a virtual UART device with a sub-set of PL011 functionality which is described in SBSA (Server Base System Architecture)[1]. It mainly targets for server use, but sbsa-uart itself is useful in any para-virtualized use cases, including Xen. At present, this patch is submitted as RFC because: * for some reason, data cache must be turned off (in initr_dcache()) * there is a prerequisite patch for Xen[2] The patch with xenguest_arm64_defconfig was tested on upstream Xen and qemu-arm64. (To work with xenguest_arm64_defconfig, minor and non-essential tweaks are needed.) The output looks like: U-Boot 2021.01-rc1-00005-g3b8e3cde5345 (Nov 04 2020 - 13:54:44 +0900) xenguest Xen virtual CPU Model: XENVM-4.15 DRAM: 128 MiB PVBLOCK: Failed to read device/vbd directory: ENOENT In: sbsa-pl011 Out: sbsa-pl011 Err: sbsa-pl011 xenguest# dm tree Class Index Probed Driver Name ----------------------------------------------------------- root 0 [ + ] root_driver root_driver firmware 0 [ ] psci |-- psci serial 0 [ + ] serial_pl01x |-- sbsa-pl011 pvblock 0 [ ] pvblock `-- pvblock [1] https://developer.arm.com/architectures/platform-design/server-systems [2] https://lists.xenproject.org/archives/html/xen-devel/2020-10/msg02122.html Signed-off-by: AKASHI Takahiro --- drivers/serial/Kconfig | 13 +++++++++++-- drivers/serial/serial_pl01x.c | 16 +++++++++++++--- include/dm/platform_data/serial_pl01x.h | 1 + 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index b4805a2e4ea4..fb570174c577 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -332,6 +332,15 @@ config DEBUG_UART_PL011 work. The driver will be available until the real driver model serial is running. +config DEBUG_UART_SBSA + bool "sbsa-uart" + depends on PL01X_SERIAL + help + Select this to enable a debug UART using the pl01x driver with the + SBSA_UART type. You will need to provide parameters to make this + work. The driver will be available until the real driver model + serial is running. + config DEBUG_UART_PIC32 bool "Microchip PIC32" depends on PIC32_SERIAL @@ -415,7 +424,7 @@ config DEBUG_UART_BASE config DEBUG_UART_CLOCK int "UART input clock" - depends on DEBUG_UART + depends on DEBUG_UART && !DEBUG_UART_SBSA default 0 if DEBUG_UART_SANDBOX help The UART input clock determines the speed of the internal UART @@ -427,7 +436,7 @@ config DEBUG_UART_CLOCK config DEBUG_UART_SHIFT int "UART register shift" - depends on DEBUG_UART + depends on DEBUG_UART && !DEBUG_UART_SBSA default 0 if DEBUG_UART help Some UARTs (notably ns16550) support different register layouts diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c index 2772c25f1d2d..5ef4ae0c6a65 100644 --- a/drivers/serial/serial_pl01x.c +++ b/drivers/serial/serial_pl01x.c @@ -84,6 +84,8 @@ static int pl01x_generic_serial_init(struct pl01x_regs *regs, /* disable everything */ writel(0, ®s->pl011_cr); break; + case TYPE_SBSA_UART: + break; default: return -EINVAL; } @@ -146,7 +148,8 @@ static int pl01x_generic_setbrg(struct pl01x_regs *regs, enum pl01x_type type, writel(UART_PL010_CR_UARTEN, ®s->pl010_cr); break; } - case TYPE_PL011: { + case TYPE_PL011: + case TYPE_SBSA_UART: { unsigned int temp; unsigned int divider; unsigned int remainder; @@ -171,6 +174,9 @@ static int pl01x_generic_setbrg(struct pl01x_regs *regs, enum pl01x_type type, writel(fraction, ®s->pl011_fbrd); } + if (type == TYPE_SBSA_UART) + break; + pl011_set_line_control(regs); /* Finally, enable the UART */ writel(UART_PL011_CR_UARTEN | UART_PL011_CR_TXE | @@ -340,6 +346,7 @@ static const struct dm_serial_ops pl01x_serial_ops = { static const struct udevice_id pl01x_serial_id[] ={ {.compatible = "arm,pl011", .data = TYPE_PL011}, {.compatible = "arm,pl010", .data = TYPE_PL010}, + {.compatible = "arm,sbsa-uart", .data = TYPE_SBSA_UART}, {} }; @@ -386,7 +393,8 @@ U_BOOT_DRIVER(serial_pl01x) = { #endif -#if defined(CONFIG_DEBUG_UART_PL010) || defined(CONFIG_DEBUG_UART_PL011) +#if defined(CONFIG_DEBUG_UART_PL010) || defined(CONFIG_DEBUG_UART_PL011) || \ + defined(CONFIG_DEBUG_UART_SBSA) #include @@ -395,7 +403,9 @@ static void _debug_uart_init(void) #ifndef CONFIG_DEBUG_UART_SKIP_INIT struct pl01x_regs *regs = (struct pl01x_regs *)CONFIG_DEBUG_UART_BASE; enum pl01x_type type = CONFIG_IS_ENABLED(DEBUG_UART_PL011) ? - TYPE_PL011 : TYPE_PL010; + TYPE_PL011 : + (CONFIG_IS_ENABLED(DEBUG_UART_PL010) ? + TYPE_PL010 : TYPE_SBSA_UART); pl01x_generic_serial_init(regs, type); pl01x_generic_setbrg(regs, type, diff --git a/include/dm/platform_data/serial_pl01x.h b/include/dm/platform_data/serial_pl01x.h index 77d96c49f03a..4bacbd512400 100644 --- a/include/dm/platform_data/serial_pl01x.h +++ b/include/dm/platform_data/serial_pl01x.h @@ -9,6 +9,7 @@ enum pl01x_type { TYPE_PL010, TYPE_PL011, + TYPE_SBSA_UART, }; /*