svn commit: r334932 - in head/sys: arm64/arm64 arm64/conf conf

[Andrew Turner]

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 <machine/cpu.h>
 
-#ifdef DEV_PSCI
 #include <dev/psci/psci.h>
-#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 <machine/vfp.h>
 #endif
 
-#ifdef DEV_PSCI
 #include <dev/psci/psci.h>
-#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