From patchwork Tue Feb 7 12:41:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksii Kurochko X-Patchwork-Id: 13131466 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 lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B1CB5C636CD for ; Tue, 7 Feb 2023 12:42:35 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.491071.760037 (Exim 4.92) (envelope-from ) id 1pPNIZ-00017W-Hh; Tue, 07 Feb 2023 12:42:11 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 491071.760037; Tue, 07 Feb 2023 12:42:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pPNIZ-00016y-Ax; Tue, 07 Feb 2023 12:42:11 +0000 Received: by outflank-mailman (input) for mailman id 491071; Tue, 07 Feb 2023 12:42:10 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pPNIY-0000om-Co for xen-devel@lists.xenproject.org; Tue, 07 Feb 2023 12:42:10 +0000 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [2a00:1450:4864:20::32c]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id d3288455-a6e4-11ed-93b5-47a8fe42b414; Tue, 07 Feb 2023 13:42:04 +0100 (CET) Received: by mail-wm1-x32c.google.com with SMTP id bg13-20020a05600c3c8d00b003d9712b29d2so13083590wmb.2 for ; Tue, 07 Feb 2023 04:42:04 -0800 (PST) Received: from 34-6F-24-FC-D2-65.. (46.204.109.85.nat.umts.dynamic.t-mobile.pl. [46.204.109.85]) by smtp.gmail.com with ESMTPSA id d3-20020a056000114300b002c3f9404c45sm19632wrx.7.2023.02.07.04.42.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Feb 2023 04:42:03 -0800 (PST) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: d3288455-a6e4-11ed-93b5-47a8fe42b414 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.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=rviyH505nsbYK2ozmVytpLFJQlUNOXPwSYuCd3kmF7A=; b=ZbZcaBRqoKsBUHy+yBzw6A7IpcZoHc11piFNhJxND8DTmVn8up8S5sS7e9Oz958NJ5 C0Mdm6Ah//0tNwSH7l4B7u3s6qzhTU3CwtT2ZEdxGyldffM0irGPQ0PQwZXa+bzHg7Rl sdCMeVrV4pzXX2v7jJ7592Ve6TGr5HgHUqX3WrofTgr9PzJd/myOD/5SpcqWU9Jw1xS4 wtE7o8xWYT8XmKnK3YWF/R554SYMgPxk4FCOjuzitIwob4mL1aRzt/G2zgVo0Nk434mn OJS64KwMLHwuasw3/C4bx8pILsmP57blSrtFG8BdNdo73AF9doeTqCsWEDvfhzsKr6UN WQ/g== 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=rviyH505nsbYK2ozmVytpLFJQlUNOXPwSYuCd3kmF7A=; b=DNW76a1V1b4eEa/mWbD6fQSGPiohYYy+pgTZlo3ufPUaXxcJxpNhGtbkRzN0BarCV2 EKNOjzM31lzK7KG5Is9ai4jhcZzW4uPUiCBHOQ7Alf7PA2rlOumORnLXbJzst302wPGr RAo5T540m0ApU23nG02OVVYqzpN/X5TkbL/lkDGxdev36Iz5NvYPRnfWNCH7KGyHgtDj U8cmtYvjqFpKTWPKAisemqwLgKqkvSW8hAIuH63yNqrMBfRB1tCybi3AJLPePOMbxhAu qNfVS9Aw3lNPMqNPmQekrJy6FvlYnUliiSe5Ztyir7YaoH0S+n6BM0QM0iJ8uGZvfiqE DEmQ== X-Gm-Message-State: AO0yUKVaUVeNfNSHhN+O2naE5BAzoLmv7bqh8cYc4yD2czxgUAxiHV15 ulIh9Rhi6oZv/yAeC0xIRlhp/NCnjy8= X-Google-Smtp-Source: AK7set8zdSCBTXeP8zqZSORJdmDP/4UE3Fy1x6QxZBzmptqONrAoC2Dlln7oY75Qh8V1nEU8NWO8/w== X-Received: by 2002:a05:600c:3596:b0:3df:d431:cf64 with SMTP id p22-20020a05600c359600b003dfd431cf64mr2909266wmq.39.1675773723875; Tue, 07 Feb 2023 04:42:03 -0800 (PST) From: Oleksii Kurochko To: xen-devel@lists.xenproject.org Cc: Jan Beulich , Julien Grall , Andrew Cooper , Stefano Stabellini , Gianluca Guida , Oleksii Kurochko , Bob Eshleman , Alistair Francis , Connor Davis , Bobby Eshleman Subject: [PATCH v9 1/2] xen/riscv: introduce early_printk basic stuff Date: Tue, 7 Feb 2023 14:41:52 +0200 Message-Id: <06c2c36bd68b2534c757dc4087476e855253680a.1675772422.git.oleksii.kurochko@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: References: MIME-Version: 1.0 Because printk() relies on a serial driver (like the ns16550 driver) and drivers require working virtual memory (ioremap()) there is not print functionality early in Xen boot. The patch introduces the basic stuff of early_printk functionality which will be enough to print 'hello from C environment". Originally early_printk.{c,h} was introduced by Bobby Eshleman (https://github.com/glg-rv/xen/commit/a3c9916bbdff7ad6030055bbee7e53d1aab71384) but some functionality was changed: early_printk() function was changed in comparison with the original as common isn't being built now so there is no vscnprintf. This commit adds early printk implementation built on the putc SBI call. As sbi_console_putchar() is already being planned for deprecation it is used temporarily now and will be removed or reworked after real uart will be ready. Signed-off-by: Bobby Eshleman Signed-off-by: Oleksii Kurochko Reviewed-by: Bobby Eshleman --- Changes in V9: - Bring "cmodel=medany" check back to be sure that C function is safe to be called in early boot when MMU is off ( e.g. VA != PA ) --- Changes in V8: - Nothing was changed --- Changes in V7: - Nothing was changed --- Changes in V6: - Remove __riscv_cmodel_medany check from early_printk.c --- Changes in V5: - Code style fixes - Change an error message of #error in case of __riscv_cmodel_medany isn't defined --- Changes in V4: - Remove "depends on RISCV*" from Kconfig.debug as it is located in arch specific folder so by default RISCV configs should be ebabled. - Add "ifdef __riscv_cmodel_medany" to be sure that PC-relative addressing is used as early_*() functions can be called from head.S with MMU-off and before relocation (if it would be needed at all for RISC-V) - fix code style --- Changes in V3: - reorder headers in alphabetical order - merge changes related to start_xen() function from "[PATCH v2 7/8] xen/riscv: print hello message from C env" to this patch - remove unneeded parentheses in definition of STACK_SIZE --- Changes in V2: - introduce STACK_SIZE define. - use consistent padding between instruction mnemonic and operand(s) --- --- xen/arch/riscv/Kconfig.debug | 5 ++++ xen/arch/riscv/Makefile | 1 + xen/arch/riscv/early_printk.c | 33 +++++++++++++++++++++++ xen/arch/riscv/include/asm/early_printk.h | 12 +++++++++ xen/arch/riscv/setup.c | 4 +++ 5 files changed, 55 insertions(+) create mode 100644 xen/arch/riscv/early_printk.c create mode 100644 xen/arch/riscv/include/asm/early_printk.h diff --git a/xen/arch/riscv/Kconfig.debug b/xen/arch/riscv/Kconfig.debug index e69de29bb2..608c9ff832 100644 --- a/xen/arch/riscv/Kconfig.debug +++ b/xen/arch/riscv/Kconfig.debug @@ -0,0 +1,5 @@ +config EARLY_PRINTK + bool "Enable early printk" + default DEBUG + help + Enables early printk debug messages diff --git a/xen/arch/riscv/Makefile b/xen/arch/riscv/Makefile index fd916e1004..1a4f1a6015 100644 --- a/xen/arch/riscv/Makefile +++ b/xen/arch/riscv/Makefile @@ -1,3 +1,4 @@ +obj-$(CONFIG_EARLY_PRINTK) += early_printk.o obj-$(CONFIG_RISCV_64) += riscv64/ obj-y += sbi.o obj-y += setup.o diff --git a/xen/arch/riscv/early_printk.c b/xen/arch/riscv/early_printk.c new file mode 100644 index 0000000000..b66a11f1bc --- /dev/null +++ b/xen/arch/riscv/early_printk.c @@ -0,0 +1,33 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * RISC-V early printk using SBI + * + * Copyright (C) 2021 Bobby Eshleman + */ +#include +#include + +/* + * TODO: + * sbi_console_putchar is already planned for deprecation + * so it should be reworked to use UART directly. +*/ +void early_puts(const char *s, size_t nr) +{ + while ( nr-- > 0 ) + { + if ( *s == '\n' ) + sbi_console_putchar('\r'); + sbi_console_putchar(*s); + s++; + } +} + +void early_printk(const char *str) +{ + while ( *str ) + { + early_puts(str, 1); + str++; + } +} diff --git a/xen/arch/riscv/include/asm/early_printk.h b/xen/arch/riscv/include/asm/early_printk.h new file mode 100644 index 0000000000..05106e160d --- /dev/null +++ b/xen/arch/riscv/include/asm/early_printk.h @@ -0,0 +1,12 @@ +#ifndef __EARLY_PRINTK_H__ +#define __EARLY_PRINTK_H__ + +#include + +#ifdef CONFIG_EARLY_PRINTK +void early_printk(const char *str); +#else +static inline void early_printk(const char *s) {}; +#endif + +#endif /* __EARLY_PRINTK_H__ */ diff --git a/xen/arch/riscv/setup.c b/xen/arch/riscv/setup.c index 13e24e2fe1..d09ffe1454 100644 --- a/xen/arch/riscv/setup.c +++ b/xen/arch/riscv/setup.c @@ -1,12 +1,16 @@ #include #include +#include + /* Xen stack for bringing up the first CPU. */ unsigned char __initdata cpu0_boot_stack[STACK_SIZE] __aligned(STACK_SIZE); void __init noreturn start_xen(void) { + early_printk("Hello from C env\n"); + for ( ;; ) asm volatile ("wfi"); From patchwork Tue Feb 7 12:41:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksii Kurochko X-Patchwork-Id: 13131467 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 lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 74101C636CC for ; Tue, 7 Feb 2023 12:42:36 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.491069.760020 (Exim 4.92) (envelope-from ) id 1pPNIX-0000p4-U8; Tue, 07 Feb 2023 12:42:09 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 491069.760020; Tue, 07 Feb 2023 12:42:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pPNIX-0000ox-Q9; Tue, 07 Feb 2023 12:42:09 +0000 Received: by outflank-mailman (input) for mailman id 491069; Tue, 07 Feb 2023 12:42:08 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pPNIW-0000om-OQ for xen-devel@lists.xenproject.org; Tue, 07 Feb 2023 12:42:08 +0000 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [2a00:1450:4864:20::42d]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id d4073d75-a6e4-11ed-93b5-47a8fe42b414; Tue, 07 Feb 2023 13:42:06 +0100 (CET) Received: by mail-wr1-x42d.google.com with SMTP id h16so13391659wrz.12 for ; Tue, 07 Feb 2023 04:42:06 -0800 (PST) Received: from 34-6F-24-FC-D2-65.. (46.204.109.85.nat.umts.dynamic.t-mobile.pl. [46.204.109.85]) by smtp.gmail.com with ESMTPSA id d3-20020a056000114300b002c3f9404c45sm19632wrx.7.2023.02.07.04.42.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Feb 2023 04:42:05 -0800 (PST) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: d4073d75-a6e4-11ed-93b5-47a8fe42b414 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.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=j+hH6wb1ILPFhWUIsB/OxGXEs5Kwqur8kDwatlBPrCk=; b=bPheiZnEhiQ1peBLgDKE1aPxYbZYirgBqnhur2Zkb0RnWjshA5wNwe0OumdN50yKOo PDR5r7JOGCQiKG7m/yrkKDRm+z2X6raWrneJHiljUEqu3bRpUNvx9kEtbaLYHdCECEvi pEG+mri63PtEVeIde7uXjsgJhRzL8ZA15g03kzFQ1WsvWAVLY/9bBO5xgS+tRpvz3r89 zK9a0tF7oQUtFXfKKskjm9BBqxQTccOr8sxzWPuacdx9fOziLLxKAvsd3y8nOpEOZvzp x03hYtnME61Fy1QmPoD9ImVCzTx6+G00I9Zc08uHAy/kLcRnLQX/CNTPHGhDCQ2BizLF irHw== 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=j+hH6wb1ILPFhWUIsB/OxGXEs5Kwqur8kDwatlBPrCk=; b=vCqwcZCl1zX66yunuYvTdJgoIu1EdFNr69wHxE21KKcgxHTOIn0uLA3wgH4KrdmK1Q e+5U3OrIYbRk7l3gKlJiisFsxl+UsTen3FKlq3Xu/EHda3exYvTRyL6a+SxkAxFIgMef 5vViUBAOjvD5brKwpJoE4MYScYPScMeZyNbx8wTGPIAVEM1c9SgjVAzj3l1IQ7klGr1U DuyLig0HdRW9zjS1nzwDA+4w4TnMFi/fnC8vsYFgrXJa4XohDCEgwb+r+7W3SYSqSEw6 9ACvWrlwTTWfnbaQjiUg9JoupjW2PfccI39nkGU/K5dBJVvoigJ7Bmhoa+V3suKo7BYI WYFQ== X-Gm-Message-State: AO0yUKXNWwZD4xXJ/pWrFROg01HQTK+bQ1OWrLG4L1KDPu4R43gN47Rd PeThl6KoMbrw5BntoSCKkCGmvzgDUic= X-Google-Smtp-Source: AK7set/akf552p7QtPIKA+1v4oAevc72tE5v1TZ3UtKYfvcXZJwMZnyWufHvjepVkFncB3w6Jn6RTg== X-Received: by 2002:adf:ef84:0:b0:2bf:bac7:30d4 with SMTP id d4-20020adfef84000000b002bfbac730d4mr2717681wro.53.1675773725317; Tue, 07 Feb 2023 04:42:05 -0800 (PST) From: Oleksii Kurochko To: xen-devel@lists.xenproject.org Cc: Jan Beulich , Julien Grall , Andrew Cooper , Stefano Stabellini , Gianluca Guida , Oleksii Kurochko , Doug Goldstein , Alistair Francis Subject: [PATCH v9 2/2] automation: add RISC-V smoke test Date: Tue, 7 Feb 2023 14:41:53 +0200 Message-Id: <2ff69540fffe67880bb13a468295c593d0db8604.1675772422.git.oleksii.kurochko@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: References: MIME-Version: 1.0 Add check if there is a message 'Hello from C env' presents in log file to be sure that stack is set and C part of early printk is working. Signed-off-by: Oleksii Kurochko Acked-by: Stefano Stabellini Reviewed-by: Alistair Francis --- Changes in V9: - Nothing changed --- Changes in V8: - Set "needs: archlinux-current-gcc-riscv64-debug" in test.yaml for RISCV job as CONFIG_EARLY_PRINTK is available only when CONFIG_DEBUG is available. --- Changes in V7: - Fix dependecy for qemu-smoke-riscv64-gcc job --- Changes in V6: - Rename container name in test.yaml for .qemu-riscv64. --- Changes in V5: - Nothing changed --- Changes in V4: - Nothing changed --- Changes in V3: - Nothing changed - All mentioned comments by Stefano in Xen mailing list will be fixed as a separate patch out of this patch series. --- automation/gitlab-ci/test.yaml | 20 ++++++++++++++++++++ automation/scripts/qemu-smoke-riscv64.sh | 20 ++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100755 automation/scripts/qemu-smoke-riscv64.sh diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index afd80adfe1..ce543ef5c0 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -54,6 +54,19 @@ tags: - x86_64 +.qemu-riscv64: + extends: .test-jobs-common + variables: + CONTAINER: archlinux:current-riscv64 + LOGFILE: qemu-smoke-riscv64.log + artifacts: + paths: + - smoke.serial + - '*.log' + when: always + tags: + - x86_64 + .yocto-test: extends: .test-jobs-common script: @@ -234,6 +247,13 @@ qemu-smoke-x86-64-clang-pvh: needs: - debian-unstable-clang-debug +qemu-smoke-riscv64-gcc: + extends: .qemu-riscv64 + script: + - ./automation/scripts/qemu-smoke-riscv64.sh 2>&1 | tee ${LOGFILE} + needs: + - archlinux-current-gcc-riscv64-debug + # Yocto test jobs yocto-qemuarm64: extends: .yocto-test-arm64 diff --git a/automation/scripts/qemu-smoke-riscv64.sh b/automation/scripts/qemu-smoke-riscv64.sh new file mode 100755 index 0000000000..e0f06360bc --- /dev/null +++ b/automation/scripts/qemu-smoke-riscv64.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +set -ex + +# Run the test +rm -f smoke.serial +set +e + +timeout -k 1 2 \ +qemu-system-riscv64 \ + -M virt \ + -smp 1 \ + -nographic \ + -m 2g \ + -kernel binaries/xen \ + |& tee smoke.serial + +set -e +(grep -q "Hello from C env" smoke.serial) || exit 1 +exit 0