commit 090cdb710773587346a7f53573477617be2a52d0
author Klaus Heinrich Kiwi <klausk@br.ibm.com> Mon Mar 09 10:37:54 2020 -0300
committer GitHub Enterprise <noreply@github.ibm.com> Mon Mar 09 10:37:54 2020 -0300
tree 12b386328efe1264dda878e7c3e170e9be1f3c23
parent 4c87e77619eaaca3d83c4026d007bc2ce442e9cf
parent 4d21da14dd3f6f2704c6651d8b11cf8d1a622a38

Merge pull request #216 from klausk/master-p10-march06

Master p1Klaus Heinrich Kiwi (3):
      Revert "linux/defconfig: Set ipr.fast_reboot=1"
      Skiboot: Bump P10 Skiboot commit-id
      Skiboot: Build-time patch to fix p10 NMMU base address

Signed-off-by: Klaus Heinrich Kiwi <klaus@linux.vnet.ibm.com>0 march06

openpower/configs/linux/skiroot_defconfig

diff --git a/openpower/configs/linux/skiroot_defconfig b/openpower/configs/linux/skiroot_defconfig
index d0cda0e..2fb25a8 100644
--- a/openpower/configs/linux/skiroot_defconfig
+++ b/openpower/configs/linux/skiroot_defconfig
@@ -46,7 +46,7 @@
 CONFIG_PPC_64K_PAGES=y
 CONFIG_SCHED_SMT=y
 CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="console=tty0 console=hvc0 ipr.fast_reboot=1 quiet"
+CONFIG_CMDLINE="console=tty0 console=hvc0 quiet"
 # CONFIG_SECCOMP is not set
 # CONFIG_PPC_MEM_KEYS is not set
 CONFIG_JUMP_LABEL=y

openpower/configs/rainier_defconfig

diff --git a/openpower/configs/rainier_defconfig b/openpower/configs/rainier_defconfig
index 4fb9769..b6d607d 100644
--- a/openpower/configs/rainier_defconfig
+++ b/openpower/configs/rainier_defconfig
@@ -25,7 +25,7 @@
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_PACKAGE_SKIBOOT=y
 BR2_SKIBOOT_CUSTOM_VERSION=y
-BR2_SKIBOOT_CUSTOM_VERSION_VALUE="cfc0beee45990af43dfd17311c9aed4785a9f3d7"
+BR2_SKIBOOT_CUSTOM_VERSION_VALUE="1a5e7ba6e8ff10f6982773459616f013e73b59a0"
 BR2_SKIBOOT_CUSTOM_GIT=y
 BR2_SKIBOOT_CUSTOM_REPO_URL="git@github.ibm.com:p10/skiboot.git"
 BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/busybox.fragment"

openpower/package/skiboot/0001-hdata-spira-Add-p10-NMMU-base-address.patch

diff --git a/openpower/package/skiboot/0001-hdata-spira-Add-p10-NMMU-base-address.patch b/openpower/package/skiboot/0001-hdata-spira-Add-p10-NMMU-base-address.patch
new file mode 100644
index 0000000..03dbb4b
--- /dev/null
+++ b/openpower/package/skiboot/0001-hdata-spira-Add-p10-NMMU-base-address.patch
@@ -0,0 +1,43 @@
+From ab2bc5d0efcfb5f1a1122d9c85b9ea9e53908454 Mon Sep 17 00:00:00 2001
+From: Reza Arbab <arbab@linux.ibm.com>
+Date: Fri, 21 Feb 2020 14:45:23 -0600
+Subject: [PATCH] hdata/spira: Add p10 NMMU base address
+
+Signed-off-by: Reza Arbab <arbab@linux.ibm.com>
+---
+ hdata/spira.c | 13 ++++++++++---
+ 1 file changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/hdata/spira.c b/hdata/spira.c
+index db54a02..de6386a 100644
+--- a/hdata/spira.c
++++ b/hdata/spira.c
+@@ -919,15 +919,22 @@ static void add_nx(void)
+ static void add_nmmu(void)
+ {
+ 	struct dt_node *xscom, *nmmu;
++	u32 scom;
+ 
+-	/* Nest MMU only exists on POWER9 */
++	/* Nest MMU only exists on POWER9 or later */
+ 	if (proc_gen < proc_gen_p9)
+ 		return;
+ 
++	if (proc_gen == proc_gen_p9)
++		scom = 0x5012c40;
++	else
++		scom = 0x2010c40;
++
+ 	dt_for_each_compatible(dt_root, xscom, "ibm,xscom") {
+-		nmmu = dt_new_addr(xscom, "nmmu", 0x5012c40);
++		nmmu = dt_new_addr(xscom, "nmmu", scom);
++		/* XXX P10 */
+ 		dt_add_property_strings(nmmu, "compatible", "ibm,power9-nest-mmu");
+-		dt_add_property_cells(nmmu, "reg", 0x5012c40, 0x20);
++		dt_add_property_cells(nmmu, "reg", scom, 0x20);
+ 	}
+ }
+ 
+-- 
+1.8.3.1
+