From nobody Sun May 19 01:15:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=raptorengineering.com ARC-Seal: i=1; a=rsa-sha256; t=1694115704; cv=none; d=zohomail.com; s=zohoarc; b=U9Wchnk40OIqKYmeKZO8qk6bj0yLhiivuAkc4wJfuX8Qj2PdBt39BUzuPSnnmtjfPOO+l9f+4KKceRQZyDJIHuKLHh+nRLtBsPYy4nJVmq18CDtGWfCLA4GPbvl5Xe4Hv+bm1jIBn5xJvBZjD2s5/sB2reZ8FYCsrl86AaIOVfo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694115704; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=FpEWN5XzyDSaed6RXWHy2kOL1gO53wPDtA/kU7OLogE=; b=hUjxJUG4jSCU/QwEY1zM45uuMZqfaPlwL/nmMKlEKilbY44xQIPAIOKTru3Pb9AKJ69Hz0vKH2t3tfifjeAd/ZP3gC7enISziNYQQPYugVt3WoSPIm3cPDu03GRmgbXA/fqTpnUmhNgBFhUu+xN1axD4faRiey4hVYr31bvHvuU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1694115704386163.15919064522313; Thu, 7 Sep 2023 12:41:44 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.597596.931834 (Exim 4.92) (envelope-from ) id 1qeKsJ-0000mX-CC; Thu, 07 Sep 2023 19:41:11 +0000 Received: by outflank-mailman (output) from mailman id 597596.931834; Thu, 07 Sep 2023 19:41: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 1qeKsJ-0000jC-6t; Thu, 07 Sep 2023 19:41:11 +0000 Received: by outflank-mailman (input) for mailman id 597596; Thu, 07 Sep 2023 19:41:09 +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 1qeKsH-0000X6-QO for xen-devel@lists.xenproject.org; Thu, 07 Sep 2023 19:41:09 +0000 Received: from raptorengineering.com (mail.raptorengineering.com [23.155.224.40]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 79cb891d-4db6-11ee-9b0d-b553b5be7939; Thu, 07 Sep 2023 21:41:03 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail.rptsys.com (Postfix) with ESMTP id 7EDD982857DA; Thu, 7 Sep 2023 14:41:01 -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 qgNY59Xnq-Qg; Thu, 7 Sep 2023 14:41:00 -0500 (CDT) Received: from localhost (localhost [127.0.0.1]) by mail.rptsys.com (Postfix) with ESMTP id 12933828574A; Thu, 7 Sep 2023 14:41:00 -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 tGxJ1Orr3EZ4; Thu, 7 Sep 2023 14:40:59 -0500 (CDT) Received: from raptor-ewks-026.rptsys.com (5.edge.rptsys.com [23.155.224.38]) by mail.rptsys.com (Postfix) with ESMTPSA id AF40F82857F8; Thu, 7 Sep 2023 14:40:59 -0500 (CDT) X-Outflank-Mailman: Message body and most headers restored to incoming version 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: 79cb891d-4db6-11ee-9b0d-b553b5be7939 DKIM-Filter: OpenDKIM Filter v2.10.3 mail.rptsys.com 12933828574A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raptorengineering.com; s=B8E824E6-0BE2-11E6-931D-288C65937AAD; t=1694115660; bh=FpEWN5XzyDSaed6RXWHy2kOL1gO53wPDtA/kU7OLogE=; h=From:To:Date:Message-Id:MIME-Version; b=jfPvwmQNm2R8I7BrXbHb5DhEe5qOdLrck0exjfxMKN0beH7T1pLLP5UdVAuhTKeB1 7c78G2NqxpwY78AiczfHBWtyMHLGuFROCkrjx7KZwZnLN2jXONG/ig+b8EAOjsYmAk DB0tv/phczgHNJh2AKjgSPnZXxpzKA8kI2FFIegg= X-Virus-Scanned: amavisd-new at rptsys.com From: Shawn Anastasio To: xen-devel@lists.xenproject.org Cc: Timothy Pearson , Jan Beulich , Andrew Cooper , Shawn Anastasio , Doug Goldstein , Stefano Stabellini Subject: [PATCH v3 1/2] automation: Switch ppc64le tests to PowerNV machine type Date: Thu, 7 Sep 2023 14:40:47 -0500 Message-Id: <2cfc81f4538d83e822a9410f94fdacac2c1b0ed7.1694114837.git.sanastasio@raptorengineering.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @raptorengineering.com) X-ZM-MESSAGEID: 1694115706662100005 Content-Type: text/plain; charset="utf-8" Run ppc64le tests with the PowerNV machine type (bare metal) instead of the paravirtualized pseries machine. This requires a more modern version of QEMU than is present in debian bullseye's repository, so update the dockerfile to build QEMU from source. Support for booting on pseries was broken by 74b725a64d80 ('xen/ppc: Implement initial Radix MMU support') which resulted in CI failures. In preparation for removing pseries support entirely, switch the CI infrastructure to the PowerNV machine type. Signed-off-by: Shawn Anastasio --- v3: Use test-artifact for custom QEMU build .../build/debian/bullseye-ppc64le.dockerfile | 5 ++- automation/gitlab-ci/build.yaml | 14 +++++++ automation/gitlab-ci/test.yaml | 5 ++- automation/scripts/qemu-smoke-ppc64le.sh | 3 +- .../qemu-system-ppc64/8.1.0-ppc64.dockerfile | 37 +++++++++++++++++++ 5 files changed, 59 insertions(+), 5 deletions(-) create mode 100644 automation/tests-artifacts/qemu-system-ppc64/8.1.0-ppc6= 4.dockerfile diff --git a/automation/build/debian/bullseye-ppc64le.dockerfile b/automati= on/build/debian/bullseye-ppc64le.dockerfile index 8fad26e903..4de8458445 100644 --- a/automation/build/debian/bullseye-ppc64le.dockerfile +++ b/automation/build/debian/bullseye-ppc64le.dockerfile @@ -22,8 +22,9 @@ RUN apt-get update && \ gcc-powerpc64le-linux-gnu \ make \ python3-minimal \ - # for test phase - qemu-system-ppc \ + # QEMU runtime dependencies for test phase + libglib2.0-0 \ + libpixman-1-0 \ && \ apt-get autoremove -y && \ apt-get clean && \ diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.y= aml index b633facff4..1619e9a558 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -306,6 +306,20 @@ qemu-system-aarch64-6.0.0-arm32-export: tags: - arm64 +# ppc64 test artifacts + +qemu-system-ppc64-8.1.0-ppc64-export: + extends: .test-jobs-artifact-common + image: registry.gitlab.com/xen-project/xen/tests-artifacts/qemu-system-p= pc64:8.1.0-ppc64 + script: + - mkdir binaries && cp /qemu-system-ppc64 /skiboot.lid binaries/ + artifacts: + paths: + - binaries/qemu-system-ppc64 + - binaries/skiboot.lid + tags: + - x86_64 + # x86_64 test artifacts alpine-3.18-rootfs-export: diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 9aa8deabea..4b836bf047 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -454,9 +454,10 @@ qemu-smoke-riscv64-gcc: needs: - archlinux-current-gcc-riscv64-debug -qemu-smoke-ppc64le-pseries-gcc: +qemu-smoke-ppc64le-powernv9-gcc: extends: .qemu-ppc64le script: - - ./automation/scripts/qemu-smoke-ppc64le.sh pseries-5.2 2>&1 | tee ${= LOGFILE} + - ./automation/scripts/qemu-smoke-ppc64le.sh powernv9 2>&1 | tee ${LOG= FILE} needs: + - qemu-system-ppc64-8.1.0-ppc64-export - debian-bullseye-gcc-ppc64le-debug diff --git a/automation/scripts/qemu-smoke-ppc64le.sh b/automation/scripts/= qemu-smoke-ppc64le.sh index eb55221221..2adbdac87e 100755 --- a/automation/scripts/qemu-smoke-ppc64le.sh +++ b/automation/scripts/qemu-smoke-ppc64le.sh @@ -12,7 +12,8 @@ set +e touch smoke.serial timeout -k 1 20 \ -qemu-system-ppc64 \ +binaries/qemu-system-ppc64 \ + -bios binaries/skiboot.lid \ -M $machine \ -m 2g \ -smp 1 \ diff --git a/automation/tests-artifacts/qemu-system-ppc64/8.1.0-ppc64.docke= rfile b/automation/tests-artifacts/qemu-system-ppc64/8.1.0-ppc64.dockerfile new file mode 100644 index 0000000000..7376ca46ff --- /dev/null +++ b/automation/tests-artifacts/qemu-system-ppc64/8.1.0-ppc64.dockerfile @@ -0,0 +1,37 @@ +FROM debian:bullseye-slim +LABEL maintainer.name=3D"The Xen Project" \ + maintainer.email=3D"xen-devel@lists.xenproject.org" + +ENV DEBIAN_FRONTEND=3Dnoninteractive +ENV QEMU_VERSION=3D8.1.0 +ENV USER root + +RUN mkdir /build +WORKDIR /build + +# build depends +RUN apt-get update && \ + apt-get --quiet --yes install \ + build-essential \ + curl \ + python3 \ + python3-pip \ + python3-elementpath \ + ninja-build \ + pkg-config \ + libglib2.0-dev \ + libpixman-1-dev \ + && \ + \ + curl -fsSLO https://download.qemu.org/qemu-"$QEMU_VERSION".tar.xz && \ + tar xvJf qemu-"$QEMU_VERSION".tar.xz && \ + cd qemu-"$QEMU_VERSION" && \ + ./configure --target-list=3Dppc64-softmmu && \ + make -j$(nproc) && \ + cp ./build/qemu-system-ppc64 / && \ + cp ./build/qemu-bundle/usr/local/share/qemu/skiboot.lid / && \ + cd /build && \ + rm -rf qemu-"$QEMU_VERSION"* && \ + apt-get autoremove -y && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* -- 2.30.2 From nobody Sun May 19 01:15:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=raptorengineering.com ARC-Seal: i=1; a=rsa-sha256; t=1694115704; cv=none; d=zohomail.com; s=zohoarc; b=ec5pqO+kkTJfQP24b/NvMzdWWVDLdbBehJVAoAeZt9CAjnWw8AtZ5Yyu1PZVsqt+akIm4K0pDTLg0HBV4RtWrbT6/F7L27PdXoqtvlGWxoPtrtxvzPDC/jfWsuGLDPwQmo6DFhwwf0Xx+Ln6GTgSs7Z9i7nyuPN6LuJ66kpIPSs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694115704; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZddRoCQy9wva99e7szlKRNGTsxCR4BnXNupCx5YetZI=; b=MuKE+yY9kqbFBXAT8Xc4lseUyyo0HdVF7rQud2ExRLNkL0NFpivmttEH08EbNTnV1SRPbO/aTSZWKt8p02viNfjX7dpo4MYyE5kOKx4ThJ+poomQY8sy3/leYder/MeLY8szDWbJHFLAp37dphaRrjv91J4gwLiJktcWDouINNk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1694115703894621.0259892271672; Thu, 7 Sep 2023 12:41:43 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.597595.931825 (Exim 4.92) (envelope-from ) id 1qeKsI-0000ad-Tm; Thu, 07 Sep 2023 19:41:10 +0000 Received: by outflank-mailman (output) from mailman id 597595.931825; Thu, 07 Sep 2023 19:41:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qeKsI-0000ZD-PS; Thu, 07 Sep 2023 19:41:10 +0000 Received: by outflank-mailman (input) for mailman id 597595; Thu, 07 Sep 2023 19:41:09 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qeKsH-0000X5-4F for xen-devel@lists.xenproject.org; Thu, 07 Sep 2023 19:41:09 +0000 Received: from raptorengineering.com (mail.raptorengineering.com [23.155.224.40]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 79efca6a-4db6-11ee-8783-cb3800f73035; Thu, 07 Sep 2023 21:41:02 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail.rptsys.com (Postfix) with ESMTP id C4F9082859ED; Thu, 7 Sep 2023 14:41:01 -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 QNGLP11fAkNX; Thu, 7 Sep 2023 14:41:00 -0500 (CDT) Received: from localhost (localhost [127.0.0.1]) by mail.rptsys.com (Postfix) with ESMTP id 6689382857F8; Thu, 7 Sep 2023 14:41:00 -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 GFKUhbma4seh; Thu, 7 Sep 2023 14:41:00 -0500 (CDT) Received: from raptor-ewks-026.rptsys.com (5.edge.rptsys.com [23.155.224.38]) by mail.rptsys.com (Postfix) with ESMTPSA id 14F4E828596F; Thu, 7 Sep 2023 14:41:00 -0500 (CDT) X-Outflank-Mailman: Message body and most headers restored to incoming version 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: 79efca6a-4db6-11ee-8783-cb3800f73035 DKIM-Filter: OpenDKIM Filter v2.10.3 mail.rptsys.com 6689382857F8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raptorengineering.com; s=B8E824E6-0BE2-11E6-931D-288C65937AAD; t=1694115660; bh=ZddRoCQy9wva99e7szlKRNGTsxCR4BnXNupCx5YetZI=; h=From:To:Date:Message-Id:MIME-Version; b=SeJJOkQxrEkGPX5tTzmdi+g5dcXmbTkBM69tfp4SljfrS1CII2T1Lq6CEpxhpW8Yt k1o0GNUz07zacDIf0TcvjwTJqH28RQZVOj83lH/pKJAwhJu1HpNVRvJrnC9MGC+VWo dfounjEboE5lo4p9y7SoGx74whoZB7IM+hqWYI4E= X-Virus-Scanned: amavisd-new at rptsys.com From: Shawn Anastasio To: xen-devel@lists.xenproject.org Cc: Timothy Pearson , Jan Beulich , Andrew Cooper , Shawn Anastasio Subject: [PATCH v3 2/2] xen/ppc: Drop support for pseries/OpenFirmware Date: Thu, 7 Sep 2023 14:40:48 -0500 Message-Id: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @raptorengineering.com) X-ZM-MESSAGEID: 1694115705759100003 Content-Type: text/plain; charset="utf-8" Since QEMU's PowerNV support has matured to the point where it is now suitable for development, drop support for booting on the paravirtualized pseries machine type and its associated interfaces. Support for booting on pseries was broken by 74b725a64d80 ('xen/ppc: Implement initial Radix MMU support'), and since there is little practical value in continuing to support pseries as a target, just drop support for it entirely. Fixes: 74b725a64d80 ('xen/ppc: Implement initial Radix MMU support') Signed-off-by: Shawn Anastasio Acked-by: Jan Beulich --- xen/arch/ppc/Makefile | 1 - xen/arch/ppc/boot-of.c | 113 -------------------------------- xen/arch/ppc/include/asm/boot.h | 19 ------ xen/arch/ppc/ppc64/Makefile | 1 - xen/arch/ppc/ppc64/of-call.S | 83 ----------------------- xen/arch/ppc/setup.c | 11 +--- 6 files changed, 3 insertions(+), 225 deletions(-) delete mode 100644 xen/arch/ppc/boot-of.c delete mode 100644 xen/arch/ppc/ppc64/of-call.S diff --git a/xen/arch/ppc/Makefile b/xen/arch/ppc/Makefile index a059ac4c0a..b3205b8f7a 100644 --- a/xen/arch/ppc/Makefile +++ b/xen/arch/ppc/Makefile @@ -1,6 +1,5 @@ obj-$(CONFIG_PPC64) +=3D ppc64/ -obj-y +=3D boot-of.init.o obj-$(CONFIG_EARLY_PRINTK) +=3D early_printk.init.o obj-y +=3D mm-radix.o obj-y +=3D opal.o diff --git a/xen/arch/ppc/boot-of.c b/xen/arch/ppc/boot-of.c deleted file mode 100644 index d6755ccc8e..0000000000 --- a/xen/arch/ppc/boot-of.c +++ /dev/null @@ -1,113 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ -/* - * This file was derived from Xen 3.2's xen/arch/powerpc/boot_of.c, - * originally licensed under GPL version 2 or later. - * - * Copyright IBM Corp. 2005, 2006, 2007 - * Copyright Raptor Engineering, LLC - * - * Authors: Jimi Xenidis - * Hollis Blanchard - * Shawn Anastasio - */ - -#include -#include -#include -#include -#include -#include -#include - -/* - * The Open Firmware client interface is called in 32-bit mode with the MM= U off, - * so any addresses passed to it must be physical addresses under 4GB. - * - * Since the client interface is only used during early boot before the MM= U is on - * and Xen itself was loaded by Open Firmware (and therefore resides below= 4GB), - * we can achieve the desired result with a simple cast to uint32_t. - */ -#define ADDR(x) ((uint32_t)(unsigned long)(x)) - -/* OF entrypoint*/ -static unsigned long __initdata of_vec; - -static int __initdata of_out; - -static int __init of_call(const char *service, uint32_t nargs, uint32_t nr= ets, - int32_t rets[], ...) -{ - int rc; - va_list args; - unsigned int i; - struct of_service s; - - s.ofs_service =3D cpu_to_be32(ADDR(service)); - s.ofs_nargs =3D cpu_to_be32(nargs); - s.ofs_nrets =3D cpu_to_be32(nrets); - - /* Copy all the params into the args array */ - va_start(args, rets); - - for ( i =3D 0; i < nargs; i++ ) - s.ofs_args[i] =3D cpu_to_be32(va_arg(args, uint32_t)); - - va_end(args); - - rc =3D enter_of(&s, of_vec); - - /* Copy all return values to the output rets array */ - for ( i =3D 0; i < nrets; i++ ) - rets[i] =3D be32_to_cpu(s.ofs_args[i + nargs]); - - return rc; -} - -static int __init of_finddevice(const char *devspec) -{ - int32_t rets[1] =3D { OF_FAILURE }; - - of_call("finddevice", 1, ARRAY_SIZE(rets), rets, ADDR(devspec)); - return rets[0]; -} - -static int __init of_getprop(int ph, const char *name, void *buf, uint32_t= buflen) -{ - int32_t rets[1] =3D { OF_FAILURE }; - - of_call("getprop", 4, ARRAY_SIZE(rets), rets, ph, ADDR(name), ADDR(buf= ), - buflen); - return rets[0]; -} - -int __init of_write(int ih, const char *addr, uint32_t len) -{ - int32_t rets[1] =3D { OF_FAILURE }; - - of_call("write", 3, ARRAY_SIZE(rets), rets, ih, ADDR(addr), len); - return rets[0]; -} - -static void __init of_putchar(char c) -{ - if ( c =3D=3D '\n' ) - { - char buf =3D '\r'; - of_write(of_out, &buf, 1); - } - of_write(of_out, &c, 1); -} - -void __init boot_of_init(unsigned long vec) -{ - int bof_chosen; - - of_vec =3D vec; - - /* Get a handle to the default console */ - bof_chosen =3D of_finddevice("/chosen"); - of_getprop(bof_chosen, "stdout", &of_out, sizeof(of_out)); - of_out =3D be32_to_cpu(of_out); - - early_printk_init(of_putchar); -} diff --git a/xen/arch/ppc/include/asm/boot.h b/xen/arch/ppc/include/asm/boo= t.h index 296539cd9e..d62c3ff6e0 100644 --- a/xen/arch/ppc/include/asm/boot.h +++ b/xen/arch/ppc/include/asm/boot.h @@ -4,25 +4,6 @@ #include -/* - * OpenFirmware boot interfaces - */ - -enum { - OF_FAILURE =3D -1, - OF_SUCCESS =3D 0, -}; - -struct of_service { - __be32 ofs_service; - __be32 ofs_nargs; - __be32 ofs_nrets; - __be32 ofs_args[10]; -}; - -int enter_of(struct of_service *args, unsigned long entry); -void boot_of_init(unsigned long vec); - /* * OPAL boot interfaces */ diff --git a/xen/arch/ppc/ppc64/Makefile b/xen/arch/ppc/ppc64/Makefile index b9a91dc15f..5b88355bb2 100644 --- a/xen/arch/ppc/ppc64/Makefile +++ b/xen/arch/ppc/ppc64/Makefile @@ -1,3 +1,2 @@ obj-y +=3D head.o -obj-y +=3D of-call.o obj-y +=3D opal-calls.o diff --git a/xen/arch/ppc/ppc64/of-call.S b/xen/arch/ppc/ppc64/of-call.S deleted file mode 100644 index 2a2e308f6b..0000000000 --- a/xen/arch/ppc/ppc64/of-call.S +++ /dev/null @@ -1,83 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ -/* - * Adapted from Linux's arch/powerpc/kernel/entry_64.S, with the - * following copyright notice: - * - * PowerPC version - * Copyright (C) 1995-1996 Gary Thomas (gdt@linuxppc.org) - * Rewritten by Cort Dougan (cort@cs.nmt.edu) for PReP - * Copyright (C) 1996 Cort Dougan - * Adapted for Power Macintosh by Paul Mackerras. - * Low-level exception handlers and MMU support - * rewritten by Paul Mackerras. - * Copyright (C) 1996 Paul Mackerras. - * MPC8xx modifications Copyright (C) 1997 Dan Malek (dmalek@jlc.net). - */ - -#include -#include -#include - -/* size of minimum stack frame that can hold an entire cpu_user_regs struc= t */ -#define STACK_SWITCH_FRAME_SIZE UREGS_sizeof - - .section .init.text, "ax", @progbits - -ENTRY(enter_of) - mflr %r0 - std %r0, 16(%r1) - stdu %r1, -STACK_SWITCH_FRAME_SIZE(%r1) /* Save SP and create stack= space */ - - /* - * Because PROM is running in 32b mode, it clobbers the high order half - * of all registers that it saves. We therefore save those registers - * PROM might touch to the stack. (%r0, %r3-%r13 are caller saved) - */ - SAVE_GPR(2, %r1) - SAVE_GPR(13, %r1) - SAVE_NVGPRS(%r1) - mfcr %r10 - mfmsr %r11 - std %r10, UREGS_cr(%r1) - std %r11, UREGS_msr(%r1) - - /* Put PROM address in SRR0 */ - mtsrr0 %r4 - - /* Setup our trampoline return addr in LR */ - bcl 20, 31, .+4 -0: mflr %r4 - addi %r4, %r4, 1f - 0b - mtlr %r4 - - /* Prepare a 32-bit mode big endian MSR */ - LOAD_IMM64(%r12, MSR_SF | MSR_LE) - andc %r11, %r11, %r12 - mtsrr1 %r11 - rfid - -1: /* Return from OF */ - FIXUP_ENDIAN - - /* Just make sure that %r1 top 32 bits didn't get corrupt by OF */ - rldicl %r1, %r1, 0, 32 - - /* Restore the MSR (back to 64 bits) */ - ld %r0, UREGS_msr(%r1) - mtmsrd %r0 - isync - - /* Restore other registers */ - REST_GPR(2, %r1) - REST_GPR(13, %r1) - REST_NVGPRS(%r1) - ld %r4, UREGS_cr(%r1) - mtcr %r4 - - addi %r1, %r1, STACK_SWITCH_FRAME_SIZE - ld %r0, 16(%r1) - mtlr %r0 - blr - - .size enter_of, . - enter_of - .type enter_of, %function diff --git a/xen/arch/ppc/setup.c b/xen/arch/ppc/setup.c index 0106e9c9da..3fc7705d9b 100644 --- a/xen/arch/ppc/setup.c +++ b/xen/arch/ppc/setup.c @@ -14,17 +14,12 @@ void __init noreturn start_xen(unsigned long r3, unsign= ed long r4, { if ( r5 ) { - /* OpenFirmware boot protocol */ - boot_of_init(r5); + /* Unsupported OpenFirmware boot protocol */ + __builtin_trap(); } else { - /* - * kexec boot protocol - * - * TODO: This currently assumes an OPAL/PowerNV system, but it's a= lso - * possible to be kexec'd on an OF system. - */ + /* kexec boot protocol */ boot_opal_init((void *)r3); } -- 2.30.2