From owner-svn-src-head@freebsd.org Sun Jun 10 19:42:46 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DC8ED101AFF0; Sun, 10 Jun 2018 19:42:45 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 843FE744BB; Sun, 10 Jun 2018 19:42:45 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 65563114D3; Sun, 10 Jun 2018 19:42:45 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5AJgj6C017867; Sun, 10 Jun 2018 19:42:45 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5AJgiGm017862; Sun, 10 Jun 2018 19:42:44 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201806101942.w5AJgiGm017862@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Sun, 10 Jun 2018 19:42:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r334932 - in head/sys: arm64/arm64 arm64/conf conf X-SVN-Group: head X-SVN-Commit-Author: andrew X-SVN-Commit-Paths: in head/sys: arm64/arm64 arm64/conf conf X-SVN-Commit-Revision: 334932 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jun 2018 19:42:46 -0000 Author: andrew Date: Sun Jun 10 19:42:44 2018 New Revision: 334932 URL: https://svnweb.freebsd.org/changeset/base/334932 Log: Remove the psci option from arm64. It is now a standard option as it is required to boot correctly. Sponsored by: DARPA, AFRL Modified: head/sys/arm64/arm64/cpu_errata.c head/sys/arm64/arm64/vm_machdep.c head/sys/arm64/conf/GENERIC head/sys/conf/files.arm64 head/sys/conf/options.arm64 Modified: head/sys/arm64/arm64/cpu_errata.c ============================================================================== --- head/sys/arm64/arm64/cpu_errata.c Sun Jun 10 19:15:38 2018 (r334931) +++ head/sys/arm64/arm64/cpu_errata.c Sun Jun 10 19:42:44 2018 (r334932) @@ -41,9 +41,7 @@ __FBSDID("$FreeBSD$"); #include -#ifdef DEV_PSCI #include -#endif typedef void (cpu_quirk_install)(void); struct cpu_quirks { @@ -81,9 +79,7 @@ static void install_psci_bp_hardening(void) { -#ifdef DEV_PSCI PCPU_SET(bp_harden, psci_get_version); -#endif } void Modified: head/sys/arm64/arm64/vm_machdep.c ============================================================================== --- head/sys/arm64/arm64/vm_machdep.c Sun Jun 10 19:15:38 2018 (r334931) +++ head/sys/arm64/arm64/vm_machdep.c Sun Jun 10 19:42:44 2018 (r334932) @@ -54,9 +54,7 @@ __FBSDID("$FreeBSD$"); #include #endif -#ifdef DEV_PSCI #include -#endif /* * Finish a fork operation, with process p2 nearly set up. @@ -119,9 +117,7 @@ void cpu_reset(void) { -#ifdef DEV_PSCI psci_reset(); -#endif printf("cpu_reset failed"); while(1) Modified: head/sys/arm64/conf/GENERIC ============================================================================== --- head/sys/arm64/conf/GENERIC Sun Jun 10 19:15:38 2018 (r334931) +++ head/sys/arm64/conf/GENERIC Sun Jun 10 19:42:44 2018 (r334932) @@ -239,7 +239,6 @@ device tun # Packet tunnel. device md # Memory "disks" device gif # IPv6 and IPv4 tunneling device firmware # firmware assist module -device psci # Support for ARM PSCI options EFIRT # EFI Runtime Services # EXT_RESOURCES pseudo devices Modified: head/sys/conf/files.arm64 ============================================================================== --- head/sys/conf/files.arm64 Sun Jun 10 19:15:38 2018 (r334931) +++ head/sys/conf/files.arm64 Sun Jun 10 19:42:44 2018 (r334932) @@ -206,8 +206,8 @@ dev/ofw/ofwpci.c optional fdt pci dev/pci/pci_host_generic.c optional pci dev/pci/pci_host_generic_acpi.c optional pci acpi dev/pci/pci_host_generic_fdt.c optional pci fdt -dev/psci/psci.c optional psci -dev/psci/psci_arm64.S optional psci +dev/psci/psci.c standard +dev/psci/psci_arm64.S standard dev/uart/uart_cpu_arm64.c optional uart dev/uart/uart_dev_pl011.c optional uart pl011 dev/usb/controller/dwc_otg_hisi.c optional dwcotg fdt soc_hisi_hi6220 Modified: head/sys/conf/options.arm64 ============================================================================== --- head/sys/conf/options.arm64 Sun Jun 10 19:15:38 2018 (r334931) +++ head/sys/conf/options.arm64 Sun Jun 10 19:42:44 2018 (r334932) @@ -13,9 +13,6 @@ COMPAT_FREEBSD32 opt_global.h # EFI Runtime services support EFIRT opt_efirt.h -# Devices -DEV_PSCI opt_platform.h - # SoC Support SOC_ALLWINNER_A64 opt_soc.h SOC_ALLWINNER_H5 opt_soc.h