From patchwork Wed Aug 2 00:11:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Anastasio X-Patchwork-Id: 13337407 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 9C1A2EB64DD for ; Wed, 2 Aug 2023 00:11:50 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.574613.900065 (Exim 4.92) (envelope-from ) id 1qQzSl-0003kg-7D; Wed, 02 Aug 2023 00:11:39 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 574613.900065; Wed, 02 Aug 2023 00:11:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qQzSk-0003iW-VB; Wed, 02 Aug 2023 00:11:38 +0000 Received: by outflank-mailman (input) for mailman id 574613; Wed, 02 Aug 2023 00:11:37 +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 1qQzSj-0003Fo-P8 for xen-devel@lists.xenproject.org; Wed, 02 Aug 2023 00:11:37 +0000 Received: from raptorengineering.com (mail.raptorengineering.com [23.155.224.40]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 24068f59-30c9-11ee-8613-37d641c3527e; Wed, 02 Aug 2023 02:11:35 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail.rptsys.com (Postfix) with ESMTP id 54EA182860C6; Tue, 1 Aug 2023 19:11:34 -0500 (CDT) Received: from mail.rptsys.com ([127.0.0.1]) by localhost (vali.starlink.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id GKvhWNa3NfSJ; Tue, 1 Aug 2023 19:11:33 -0500 (CDT) Received: from localhost (localhost [127.0.0.1]) by mail.rptsys.com (Postfix) with ESMTP id 3B72F8285BEB; Tue, 1 Aug 2023 19:11:33 -0500 (CDT) Received: from mail.rptsys.com ([127.0.0.1]) by localhost (vali.starlink.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id BCZX--nrtIun; Tue, 1 Aug 2023 19:11:33 -0500 (CDT) Received: from raptor-ewks-026.lan (5.edge.rptsys.com [23.155.224.38]) by mail.rptsys.com (Postfix) with ESMTPSA id 97F828285393; Tue, 1 Aug 2023 19:11:32 -0500 (CDT) 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: 24068f59-30c9-11ee-8613-37d641c3527e DKIM-Filter: OpenDKIM Filter v2.10.3 mail.rptsys.com 3B72F8285BEB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raptorengineering.com; s=B8E824E6-0BE2-11E6-931D-288C65937AAD; t=1690935093; bh=p+DRgSuWZDmGJuetNvOOlJpomr6S/4OpH3mhhUD04Oc=; h=From:To:Date:Message-Id:MIME-Version; b=hLhwH/nuDNpwfiyDhZcTAm0Rx0PElf7t3DcFyDabxTjHA/oDjkia+tbjrJt+zcC77 vsd6dLUJX2PxCYZFFWIHCSgxGtCFAHhw0P86vBOHkfO+vsYEHeo2rxdzFhNwYaKgPi tB3cWgcs/ZPtmNHgDrBiBo+1AU7XaxNH7ollBkaA= X-Virus-Scanned: amavisd-new at rptsys.com From: Shawn Anastasio To: xen-devel@lists.xenproject.org Cc: Timothy Pearson , Andrew Cooper , Jan Beulich , Shawn Anastasio Subject: [PATCH 4/4] xen/ppc: Implement early serial console on PowerNV Date: Tue, 1 Aug 2023 19:11:06 -0500 Message-Id: <3176762c2eb09d01d65a348e296a94cf0356ff46.1690934409.git.sanastasio@raptorengineering.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Implement the OPAL firmware calls required to write to the serial console on PowerNV systems. Unlike pseries/Open Firmware, the OPAL firmware interface can be used past early boot and as such the relevant functions are not marked as __init. Signed-off-by: Shawn Anastasio Acked-by: Jan Beulich --- Changed in v2: - Include asm-offsets in asm-defns.h - Clean up assembly formatting in asm-defns.h - Clean up formatting of opal.c - Clean up stray semicolon in OPAL_CALL macro in opal-calls.S xen/arch/ppc/include/asm/asm-defns.h | 18 ++++++- xen/arch/ppc/opal.c | 28 +++++++++- xen/arch/ppc/ppc64/Makefile | 1 + xen/arch/ppc/ppc64/asm-offsets.c | 4 ++ xen/arch/ppc/ppc64/opal-calls.S | 81 ++++++++++++++++++++++++++++ 5 files changed, 129 insertions(+), 3 deletions(-) create mode 100644 xen/arch/ppc/ppc64/opal-calls.S -- 2.30.2 diff --git a/xen/arch/ppc/include/asm/asm-defns.h b/xen/arch/ppc/include/asm/asm-defns.h index 5821f9024d..f1c49808bd 100644 --- a/xen/arch/ppc/include/asm/asm-defns.h +++ b/xen/arch/ppc/include/asm/asm-defns.h @@ -2,6 +2,8 @@ #ifndef _ASM_PPC_ASM_DEFNS_H #define _ASM_PPC_ASM_DEFNS_H +#include + /* * Load a 64-bit immediate value into the specified GPR. */ @@ -20,8 +22,20 @@ * Load the address of a symbol from the TOC into the specified GPR. */ #define LOAD_REG_ADDR(reg,name) \ - addis reg,%r2,name@toc@ha; \ - addi reg,reg,name@toc@l + addis reg, %r2, name@toc@ha; \ + addi reg, reg, name@toc@l + +/* + * Declare a global assembly function with a proper TOC setup prologue + */ +#define _GLOBAL_TOC(name) \ + .balign 4; \ + .type name, @function; \ + .globl name; \ +name: \ +0: addis %r2, %r12, (.TOC.-0b)@ha; \ + addi %r2, %r2, (.TOC.-0b)@l; \ + .localentry name, .-name /* * Depending on how we were booted, the CPU could be running in either diff --git a/xen/arch/ppc/opal.c b/xen/arch/ppc/opal.c index 251de8ac23..1183b7d5ef 100644 --- a/xen/arch/ppc/opal.c +++ b/xen/arch/ppc/opal.c @@ -8,9 +8,29 @@ #include #include -/* Global OPAL struct containing entrypoint and base */ +/* Global OPAL struct containing entrypoint and base used by opal-calls.S */ struct opal opal; +int64_t opal_console_write(int64_t term_number, uint64_t *length, + const void *buffer); +int64_t opal_console_flush(int64_t term_number); +int64_t opal_reinit_cpus(uint64_t flags); + +static void opal_putchar(char c) +{ + uint64_t len; + + if ( c == '\n' ) + { + char buf = '\r'; + len = cpu_to_be64(1); + opal_console_write(0, &len, &buf); + } + len = cpu_to_be64(1); + opal_console_write(0, &len, &c); + opal_console_flush(0); +} + void __init boot_opal_init(const void *fdt) { int opal_node; @@ -45,4 +65,10 @@ void __init boot_opal_init(const void *fdt) opal.base = be64_to_cpu(*opal_base); opal.entry = be64_to_cpu(*opal_entry); + + early_printk_init(opal_putchar); + + /* Ask OPAL to set HID0 for Little Endian interrupts + Radix TLB support */ + opal_reinit_cpus(OPAL_REINIT_CPUS_HILE_LE | OPAL_REINIT_CPUS_MMU_RADIX | + OPAL_REINIT_CPUS_MMU_HASH); } diff --git a/xen/arch/ppc/ppc64/Makefile b/xen/arch/ppc/ppc64/Makefile index f4956daaa9..b9a91dc15f 100644 --- a/xen/arch/ppc/ppc64/Makefile +++ b/xen/arch/ppc/ppc64/Makefile @@ -1,2 +1,3 @@ obj-y += head.o obj-y += of-call.o +obj-y += opal-calls.o diff --git a/xen/arch/ppc/ppc64/asm-offsets.c b/xen/arch/ppc/ppc64/asm-offsets.c index e1129cb0f4..c15c1bf136 100644 --- a/xen/arch/ppc/ppc64/asm-offsets.c +++ b/xen/arch/ppc/ppc64/asm-offsets.c @@ -6,6 +6,7 @@ #include #include +#include #define DEFINE(_sym, _val) \ asm volatile ( "\n.ascii\"==>#define " #_sym " %0 /* " #_val " */<==\"" \ @@ -46,6 +47,9 @@ void __dummy__(void) OFFSET(UREGS_cr, struct cpu_user_regs, cr); OFFSET(UREGS_fpscr, struct cpu_user_regs, fpscr); DEFINE(UREGS_sizeof, sizeof(struct cpu_user_regs)); + + OFFSET(OPAL_base, struct opal, base); + OFFSET(OPAL_entry, struct opal, entry); } /* diff --git a/xen/arch/ppc/ppc64/opal-calls.S b/xen/arch/ppc/ppc64/opal-calls.S new file mode 100644 index 0000000000..cc5de75c8a --- /dev/null +++ b/xen/arch/ppc/ppc64/opal-calls.S @@ -0,0 +1,81 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Adapted from Linux's arch/powerpc/boot/opal-calls.S + * + * Copyright (c) 2016 IBM Corporation. + * Copyright Raptor Engineering, LLC + */ + +#include +#include +#include + + .text + +#define OPAL_CALL(name, token) \ + .globl name; \ +name: \ + li %r0, token; \ + b opal_call + + _GLOBAL_TOC(opal_call) + /* Back up LR, CR, r2 in caller's stack frame */ + mflr %r11 + mfcr %r12 + std %r2, 24(%r1) + std %r11, 16(%r1) + stw %r12, 8(%r1) + + /* Use r14 (non-volatile) to store the virtual address of opal_return_mmu */ + std %r14, -8(%r1) + stdu %r1, -48(%r1) + LOAD_REG_ADDR(%r14, opal_return_mmu) + + /* + * Setup new MSR without LE or MMU. Original MSR will be preserved across + * opal call in r13 + */ + mfmsr %r13 + li %r11, MSR_LE | MSR_IR | MSR_DR + andc %r12, %r13, %r11 + mthsrr1 %r12 + + LOAD_REG_ADDR(%r11, opal_return_real) + mtlr %r11 + + /* Load the opal call entry point and base */ + LOAD_REG_ADDR(%r11, opal) + ld %r12, OPAL_entry(%r11) + ld %r2, OPAL_base(%r11) + mthsrr0 %r12 + hrfid + +opal_return_real: + /* + * OPAL will always return to us in Big Endian mode. Since we are going + * to restore the old MSR with the correct endianness and MMU status set, we + * can avoid an unnecessary FIXUP_ENDIAN trampoline by just encoding the + * required Big Endian instructions to restore the old MSR direclty. + */ + .long 0xa64bbb7d /* mthsrr1 %r13 (Old MSR) */ + .long 0xa64bda7d /* mthsrr0 %r14 (Virtual address of opal_return_mmu) */ + .long 0x2402004c /* hrfid */ + +opal_return_mmu: + /* + * We're back in the correct endianness and MMU mode, restore registers + * and return + */ + addi %r1, %r1, 48 + ld %r14, -8(%r1) + lwz %r11, 8(%r1) + ld %r12, 16(%r1) + ld %r2, 24(%r1) + mtcr %r11 + mtlr %r12 + + blr + +OPAL_CALL(opal_console_write, OPAL_CONSOLE_WRITE) +OPAL_CALL(opal_console_flush, OPAL_CONSOLE_FLUSH) +OPAL_CALL(opal_reinit_cpus, OPAL_REINIT_CPUS)