diff options
author | Raptor Engineering Development Team <support@raptorengineering.com> | 2018-03-18 03:31:08 -0500 |
---|---|---|
committer | Raptor Engineering Development Team <support@raptorengineering.com> | 2018-04-15 15:48:12 -0500 |
commit | 162a712e41d1842e1ce230132729df51039d2697 (patch) | |
tree | c15f2718d171909afe64aa57438d56dc43968c7d | |
parent | a640ba95e8ed25c67392d989715e72abfae0885d (diff) | |
download | talos-op-build-162a712e41d1842e1ce230132729df51039d2697.tar.gz talos-op-build-162a712e41d1842e1ce230132729df51039d2697.zip |
Large update for DD2.2
m--------- | buildroot | 0 | ||||
-rwxr-xr-x | openpower/configs/hostboot/talos.config | 19 | ||||
-rw-r--r-- | openpower/configs/talos_defconfig | 4 | ||||
-rw-r--r-- | openpower/linux/0001-xhci-Reset-controller-on-xhci-shutdown.patch | 5 | ||||
-rw-r--r-- | openpower/linux/0002-powerpc-64s-Add-workaround-for-P9-vector-CI-load-iss.patch | 438 | ||||
-rw-r--r-- | openpower/linux/0002-tg3-APE-heartbeat-changes.patch | 163 | ||||
-rw-r--r-- | openpower/linux/0003-Release-OpenPower-kernel.patch | 11 | ||||
-rw-r--r-- | openpower/package/hostboot/hostboot.mk | 4 | ||||
-rw-r--r-- | openpower/package/openpower-pnor/openpower-pnor.mk | 2 | ||||
-rw-r--r-- | openpower/package/sbe/sbe.mk | 2 | ||||
-rw-r--r-- | openpower/package/skiboot/Config.in | 2 |
11 files changed, 191 insertions, 459 deletions
diff --git a/buildroot b/buildroot -Subproject 65679be193a6981e3ac65bdda2fc3efbd62d85e +Subproject 4b6188e0f2397a013b91105828437c90a3b1dfb diff --git a/openpower/configs/hostboot/talos.config b/openpower/configs/hostboot/talos.config index f41ec163..f08e7807 100755 --- a/openpower/configs/hostboot/talos.config +++ b/openpower/configs/hostboot/talos.config @@ -48,21 +48,26 @@ set DISABLE_HOSTBOOT_RUNTIME # Compile in hostboot runtime PRD set HBRT_PRD + +# Compile in hb rt HTMGT : Load/Start OCC set HTMGT set START_OCC_DURING_BOOT +unset CONSOLE_OUTPUT_OCC_COMM -#PNOR flags +# PNOR flags unset PNOR_TWO_SIDE_SUPPORT set BMC_BT_LPC_IPMI -# Enable Checktop Analysis -unset ENABLE_CHECKSTOP_ANALYSIS -unset IPLTIME_CHECKSTOP_ANALYSIS +# Enable IPLtime + Runtime Checktop Analysis +set ENABLE_CHECKSTOP_ANALYSIS +set IPLTIME_CHECKSTOP_ANALYSIS # set for trace debug to console unset CONSOLE_OUTPUT_TRACE +set CONSOLE_OUTPUT_FFDCDISPLAY -unset CONFIG_SECUREBOOT -unset CONFIG_TPMDD -unset CONFIG_TPM_NUVOTON +# Disable secure boot and TPM support +unset SECUREBOOT +unset TPMDD +unset TPM_NUVOTON diff --git a/openpower/configs/talos_defconfig b/openpower/configs/talos_defconfig index a96a1e83..a8811623 100644 --- a/openpower/configs/talos_defconfig +++ b/openpower/configs/talos_defconfig @@ -15,7 +15,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://scm.raptorcs.com/scm/git/talos-op-linux" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v4.14.8" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v4.15.9" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_p9_defconfig" @@ -42,7 +42,7 @@ BR2_OPENPOWER_PLATFORM=y BR2_OPENPOWER_POWER9=y BR2_HOSTBOOT_CONFIG_FILE="talos.config" BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="talos-xml" -BR2_OPENPOWER_MACHINE_XML_VERSION="59ff7033e26db628daeaf49c9a866a4376924aad" +BR2_OPENPOWER_MACHINE_XML_VERSION="f65c2a1b496db5a2405a6e215dff622992c8c742" BR2_OPENPOWER_MACHINE_XML_FILENAME="talos.xml" BR2_OPENPOWER_SYSTEM_XML_FILENAME="TALOS_hb.system.xml" BR2_OPENPOWER_MRW_XML_FILENAME="TALOS_hb.mrw.xml" diff --git a/openpower/linux/0001-xhci-Reset-controller-on-xhci-shutdown.patch b/openpower/linux/0001-xhci-Reset-controller-on-xhci-shutdown.patch index a0724db8..b675ccc5 100644 --- a/openpower/linux/0001-xhci-Reset-controller-on-xhci-shutdown.patch +++ b/openpower/linux/0001-xhci-Reset-controller-on-xhci-shutdown.patch @@ -14,10 +14,10 @@ Signed-off-by: Joel Stanley <joel@jms.id.au> 1 file changed, 1 insertion(+) diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c -index e5677700dea4..bde3e3e30d3b 100644 +index 5c1326154e66..894f1879df53 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -729,6 +729,7 @@ static void xhci_shutdown(struct usb_hcd *hcd) +@@ -722,6 +722,7 @@ static void xhci_shutdown(struct usb_hcd *hcd) /* Yet another workaround for spurious wakeups at shutdown with HSW */ if (xhci->quirks & XHCI_SPURIOUS_WAKEUP) pci_set_power_state(to_pci_dev(hcd->self.sysdev), PCI_D3hot); @@ -25,3 +25,4 @@ index e5677700dea4..bde3e3e30d3b 100644 } #ifdef CONFIG_PM + diff --git a/openpower/linux/0002-powerpc-64s-Add-workaround-for-P9-vector-CI-load-iss.patch b/openpower/linux/0002-powerpc-64s-Add-workaround-for-P9-vector-CI-load-iss.patch deleted file mode 100644 index a0d90697..00000000 --- a/openpower/linux/0002-powerpc-64s-Add-workaround-for-P9-vector-CI-load-iss.patch +++ /dev/null @@ -1,438 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Michael Neuling <mikey@neuling.org> -Date: Fri, 15 Sep 2017 15:25:48 +1000 -Subject: [PATCH 2/3] powerpc/64s: Add workaround for P9 vector CI load issue - -POWER9 DD2.1 and earlier has an issue where some cache inhibited -vector load will return bad data. The workaround is two part, one -firmware/microcode part triggers HMI interrupts when hitting such -loads, the other part is this patch which then emulates the -instructions in Linux. - -The affected instructions are limited to lxvd2x, lxvw4x, lxvb16x and -lxvh8x. - -When an instruction triggers the HMI, all threads in the core will be -sent to the HMI handler, not just the one running the vector load. - -In general, these spurious HMIs are detected by the emulation code and -we just return back to the running process. Unfortunately, if a -spurious interrupt occurs on a vector load that's to normal memory we -have no way to detect that it's spurious (unless we walk the page -tables, which is very expensive). In this case we emulate the load but -we need do so using a vector load itself to ensure 128bit atomicity is -preserved. - -Some additional debugfs emulated instruction counters are added also. - -Signed-off-by: Michael Neuling <mikey@neuling.org> -Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> -[mpe: Switch CONFIG_PPC_BOOK3S_64 to CONFIG_VSX to unbreak the build] -Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> -(cherry picked from commit 5080332c2c893118dbc18755f35c8b0131cf0fc4) -Signed-off-by: Joel Stanley <joel@jms.id.au> ---- - arch/powerpc/include/asm/emulated_ops.h | 4 + - arch/powerpc/include/asm/paca.h | 1 + - arch/powerpc/include/asm/uaccess.h | 17 +++ - arch/powerpc/kernel/exceptions-64s.S | 16 ++- - arch/powerpc/kernel/mce.c | 30 ++++- - arch/powerpc/kernel/traps.c | 201 ++++++++++++++++++++++++++++++++ - arch/powerpc/platforms/powernv/smp.c | 7 ++ - 7 files changed, 271 insertions(+), 5 deletions(-) - -diff --git a/arch/powerpc/include/asm/emulated_ops.h b/arch/powerpc/include/asm/emulated_ops.h -index f00e10e2a335..651e1354498e 100644 ---- a/arch/powerpc/include/asm/emulated_ops.h -+++ b/arch/powerpc/include/asm/emulated_ops.h -@@ -55,6 +55,10 @@ extern struct ppc_emulated { - struct ppc_emulated_entry mfdscr; - struct ppc_emulated_entry mtdscr; - struct ppc_emulated_entry lq_stq; -+ struct ppc_emulated_entry lxvw4x; -+ struct ppc_emulated_entry lxvh8x; -+ struct ppc_emulated_entry lxvd2x; -+ struct ppc_emulated_entry lxvb16x; - #endif - } ppc_emulated; - -diff --git a/arch/powerpc/include/asm/paca.h b/arch/powerpc/include/asm/paca.h -index 04b60af027ae..1e06310ccc09 100644 ---- a/arch/powerpc/include/asm/paca.h -+++ b/arch/powerpc/include/asm/paca.h -@@ -210,6 +210,7 @@ struct paca_struct { - */ - u16 in_mce; - u8 hmi_event_available; /* HMI event is available */ -+ u8 hmi_p9_special_emu; /* HMI P9 special emulation */ - #endif - - /* Stuff for accurate time accounting */ -diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h -index 11f4bd07cce0..1e6ead577459 100644 ---- a/arch/powerpc/include/asm/uaccess.h -+++ b/arch/powerpc/include/asm/uaccess.h -@@ -174,6 +174,23 @@ do { \ - - extern long __get_user_bad(void); - -+/* -+ * This does an atomic 128 byte aligned load from userspace. -+ * Upto caller to do enable_kernel_vmx() before calling! -+ */ -+#define __get_user_atomic_128_aligned(kaddr, uaddr, err) \ -+ __asm__ __volatile__( \ -+ "1: lvx 0,0,%1 # get user\n" \ -+ " stvx 0,0,%2 # put kernel\n" \ -+ "2:\n" \ -+ ".section .fixup,\"ax\"\n" \ -+ "3: li %0,%3\n" \ -+ " b 2b\n" \ -+ ".previous\n" \ -+ EX_TABLE(1b, 3b) \ -+ : "=r" (err) \ -+ : "b" (uaddr), "b" (kaddr), "i" (-EFAULT), "0" (err)) -+ - #define __get_user_asm(x, addr, err, op) \ - __asm__ __volatile__( \ - "1: "op" %1,0(%2) # get_user\n" \ -diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S -index 06598142d755..7ac85fde9ece 100644 ---- a/arch/powerpc/kernel/exceptions-64s.S -+++ b/arch/powerpc/kernel/exceptions-64s.S -@@ -1033,6 +1033,8 @@ TRAMP_REAL_BEGIN(hmi_exception_early) - EXCEPTION_PROLOG_COMMON_3(0xe60) - addi r3,r1,STACK_FRAME_OVERHEAD - BRANCH_LINK_TO_FAR(hmi_exception_realmode) /* Function call ABI */ -+ cmpdi cr0,r3,0 -+ - /* Windup the stack. */ - /* Move original HSRR0 and HSRR1 into the respective regs */ - ld r9,_MSR(r1) -@@ -1049,10 +1051,15 @@ TRAMP_REAL_BEGIN(hmi_exception_early) - REST_8GPRS(2, r1) - REST_GPR(10, r1) - ld r11,_CCR(r1) -+ REST_2GPRS(12, r1) -+ bne 1f - mtcr r11 - REST_GPR(11, r1) -- REST_2GPRS(12, r1) -- /* restore original r1. */ -+ ld r1,GPR1(r1) -+ hrfid -+ -+1: mtcr r11 -+ REST_GPR(11, r1) - ld r1,GPR1(r1) - - /* -@@ -1065,8 +1072,9 @@ hmi_exception_after_realmode: - EXCEPTION_PROLOG_0(PACA_EXGEN) - b tramp_real_hmi_exception - --EXC_COMMON_ASYNC(hmi_exception_common, 0xe60, handle_hmi_exception) -- -+EXC_COMMON_BEGIN(hmi_exception_common) -+EXCEPTION_COMMON(PACA_EXGEN, 0xe60, hmi_exception_common, handle_hmi_exception, -+ ret_from_except, FINISH_NAP;ADD_NVGPRS;ADD_RECONCILE;RUNLATCH_ON) - - EXC_REAL_OOL_MASKABLE_HV(h_doorbell, 0xe80, 0x20) - EXC_VIRT_OOL_MASKABLE_HV(h_doorbell, 0x4e80, 0x20, 0xe80) -diff --git a/arch/powerpc/kernel/mce.c b/arch/powerpc/kernel/mce.c -index 9b2ea7e71c06..f588951b171d 100644 ---- a/arch/powerpc/kernel/mce.c -+++ b/arch/powerpc/kernel/mce.c -@@ -470,6 +470,34 @@ long hmi_exception_realmode(struct pt_regs *regs) - { - __this_cpu_inc(irq_stat.hmi_exceptions); - -+#ifdef CONFIG_PPC_BOOK3S_64 -+ /* Workaround for P9 vector CI loads (see p9_hmi_special_emu) */ -+ if (pvr_version_is(PVR_POWER9)) { -+ unsigned long hmer = mfspr(SPRN_HMER); -+ -+ /* Do we have the debug bit set */ -+ if (hmer & PPC_BIT(17)) { -+ hmer &= ~PPC_BIT(17); -+ mtspr(SPRN_HMER, hmer); -+ -+ /* -+ * Now to avoid problems with soft-disable we -+ * only do the emulation if we are coming from -+ * user space -+ */ -+ if (user_mode(regs)) -+ local_paca->hmi_p9_special_emu = 1; -+ -+ /* -+ * Don't bother going to OPAL if that's the -+ * only relevant bit. -+ */ -+ if (!(hmer & mfspr(SPRN_HMEER))) -+ return local_paca->hmi_p9_special_emu; -+ } -+ } -+#endif /* CONFIG_PPC_BOOK3S_64 */ -+ - wait_for_subcore_guest_exit(); - - if (ppc_md.hmi_exception_early) -@@ -477,5 +505,5 @@ long hmi_exception_realmode(struct pt_regs *regs) - - wait_for_tb_resync(); - -- return 0; -+ return 1; - } -diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c -index 13c9dcdcba69..9ae1924c7d1a 100644 ---- a/arch/powerpc/kernel/traps.c -+++ b/arch/powerpc/kernel/traps.c -@@ -37,6 +37,7 @@ - #include <linux/kdebug.h> - #include <linux/ratelimit.h> - #include <linux/context_tracking.h> -+#include <linux/smp.h> - - #include <asm/emulated_ops.h> - #include <asm/pgtable.h> -@@ -699,6 +700,187 @@ void SMIException(struct pt_regs *regs) - die("System Management Interrupt", regs, SIGABRT); - } - -+#ifdef CONFIG_VSX -+static void p9_hmi_special_emu(struct pt_regs *regs) -+{ -+ unsigned int ra, rb, t, i, sel, instr, rc; -+ const void __user *addr; -+ u8 vbuf[16], *vdst; -+ unsigned long ea, msr, msr_mask; -+ bool swap; -+ -+ if (__get_user_inatomic(instr, (unsigned int __user *)regs->nip)) -+ return; -+ -+ /* -+ * lxvb16x opcode: 0x7c0006d8 -+ * lxvd2x opcode: 0x7c000698 -+ * lxvh8x opcode: 0x7c000658 -+ * lxvw4x opcode: 0x7c000618 -+ */ -+ if ((instr & 0xfc00073e) != 0x7c000618) { -+ pr_devel("HMI vec emu: not vector CI %i:%s[%d] nip=%016lx" -+ " instr=%08x\n", -+ smp_processor_id(), current->comm, current->pid, -+ regs->nip, instr); -+ return; -+ } -+ -+ /* Grab vector registers into the task struct */ -+ msr = regs->msr; /* Grab msr before we flush the bits */ -+ flush_vsx_to_thread(current); -+ enable_kernel_altivec(); -+ -+ /* -+ * Is userspace running with a different endian (this is rare but -+ * not impossible) -+ */ -+ swap = (msr & MSR_LE) != (MSR_KERNEL & MSR_LE); -+ -+ /* Decode the instruction */ -+ ra = (instr >> 16) & 0x1f; -+ rb = (instr >> 11) & 0x1f; -+ t = (instr >> 21) & 0x1f; -+ if (instr & 1) -+ vdst = (u8 *)¤t->thread.vr_state.vr[t]; -+ else -+ vdst = (u8 *)¤t->thread.fp_state.fpr[t][0]; -+ -+ /* Grab the vector address */ -+ ea = regs->gpr[rb] + (ra ? regs->gpr[ra] : 0); -+ if (is_32bit_task()) -+ ea &= 0xfffffffful; -+ addr = (__force const void __user *)ea; -+ -+ /* Check it */ -+ if (!access_ok(VERIFY_READ, addr, 16)) { -+ pr_devel("HMI vec emu: bad access %i:%s[%d] nip=%016lx" -+ " instr=%08x addr=%016lx\n", -+ smp_processor_id(), current->comm, current->pid, -+ regs->nip, instr, (unsigned long)addr); -+ return; -+ } -+ -+ /* Read the vector */ -+ rc = 0; -+ if ((unsigned long)addr & 0xfUL) -+ /* unaligned case */ -+ rc = __copy_from_user_inatomic(vbuf, addr, 16); -+ else -+ __get_user_atomic_128_aligned(vbuf, addr, rc); -+ if (rc) { -+ pr_devel("HMI vec emu: page fault %i:%s[%d] nip=%016lx" -+ " instr=%08x addr=%016lx\n", -+ smp_processor_id(), current->comm, current->pid, -+ regs->nip, instr, (unsigned long)addr); -+ return; -+ } -+ -+ pr_devel("HMI vec emu: emulated vector CI %i:%s[%d] nip=%016lx" -+ " instr=%08x addr=%016lx\n", -+ smp_processor_id(), current->comm, current->pid, regs->nip, -+ instr, (unsigned long) addr); -+ -+ /* Grab instruction "selector" */ -+ sel = (instr >> 6) & 3; -+ -+ /* -+ * Check to make sure the facility is actually enabled. This -+ * could happen if we get a false positive hit. -+ * -+ * lxvd2x/lxvw4x always check MSR VSX sel = 0,2 -+ * lxvh8x/lxvb16x check MSR VSX or VEC depending on VSR used sel = 1,3 -+ */ -+ msr_mask = MSR_VSX; -+ if ((sel & 1) && (instr & 1)) /* lxvh8x & lxvb16x + VSR >= 32 */ -+ msr_mask = MSR_VEC; -+ if (!(msr & msr_mask)) { -+ pr_devel("HMI vec emu: MSR fac clear %i:%s[%d] nip=%016lx" -+ " instr=%08x msr:%016lx\n", -+ smp_processor_id(), current->comm, current->pid, -+ regs->nip, instr, msr); -+ return; -+ } -+ -+ /* Do logging here before we modify sel based on endian */ -+ switch (sel) { -+ case 0: /* lxvw4x */ -+ PPC_WARN_EMULATED(lxvw4x, regs); -+ break; -+ case 1: /* lxvh8x */ -+ PPC_WARN_EMULATED(lxvh8x, regs); -+ break; -+ case 2: /* lxvd2x */ -+ PPC_WARN_EMULATED(lxvd2x, regs); -+ break; -+ case 3: /* lxvb16x */ -+ PPC_WARN_EMULATED(lxvb16x, regs); -+ break; -+ } -+ -+#ifdef __LITTLE_ENDIAN__ -+ /* -+ * An LE kernel stores the vector in the task struct as an LE -+ * byte array (effectively swapping both the components and -+ * the content of the components). Those instructions expect -+ * the components to remain in ascending address order, so we -+ * swap them back. -+ * -+ * If we are running a BE user space, the expectation is that -+ * of a simple memcpy, so forcing the emulation to look like -+ * a lxvb16x should do the trick. -+ */ -+ if (swap) -+ sel = 3; -+ -+ switch (sel) { -+ case 0: /* lxvw4x */ -+ for (i = 0; i < 4; i++) -+ ((u32 *)vdst)[i] = ((u32 *)vbuf)[3-i]; -+ break; -+ case 1: /* lxvh8x */ -+ for (i = 0; i < 8; i++) -+ ((u16 *)vdst)[i] = ((u16 *)vbuf)[7-i]; -+ break; -+ case 2: /* lxvd2x */ -+ for (i = 0; i < 2; i++) -+ ((u64 *)vdst)[i] = ((u64 *)vbuf)[1-i]; -+ break; -+ case 3: /* lxvb16x */ -+ for (i = 0; i < 16; i++) -+ vdst[i] = vbuf[15-i]; -+ break; -+ } -+#else /* __LITTLE_ENDIAN__ */ -+ /* On a big endian kernel, a BE userspace only needs a memcpy */ -+ if (!swap) -+ sel = 3; -+ -+ /* Otherwise, we need to swap the content of the components */ -+ switch (sel) { -+ case 0: /* lxvw4x */ -+ for (i = 0; i < 4; i++) -+ ((u32 *)vdst)[i] = cpu_to_le32(((u32 *)vbuf)[i]); -+ break; -+ case 1: /* lxvh8x */ -+ for (i = 0; i < 8; i++) -+ ((u16 *)vdst)[i] = cpu_to_le16(((u16 *)vbuf)[i]); -+ break; -+ case 2: /* lxvd2x */ -+ for (i = 0; i < 2; i++) -+ ((u64 *)vdst)[i] = cpu_to_le64(((u64 *)vbuf)[i]); -+ break; -+ case 3: /* lxvb16x */ -+ memcpy(vdst, vbuf, 16); -+ break; -+ } -+#endif /* !__LITTLE_ENDIAN__ */ -+ -+ /* Go to next instruction */ -+ regs->nip += 4; -+} -+#endif /* CONFIG_VSX */ -+ - void handle_hmi_exception(struct pt_regs *regs) - { - struct pt_regs *old_regs; -@@ -706,6 +888,21 @@ void handle_hmi_exception(struct pt_regs *regs) - old_regs = set_irq_regs(regs); - irq_enter(); - -+#ifdef CONFIG_VSX -+ /* Real mode flagged P9 special emu is needed */ -+ if (local_paca->hmi_p9_special_emu) { -+ local_paca->hmi_p9_special_emu = 0; -+ -+ /* -+ * We don't want to take page faults while doing the -+ * emulation, we just replay the instruction if necessary. -+ */ -+ pagefault_disable(); -+ p9_hmi_special_emu(regs); -+ pagefault_enable(); -+ } -+#endif /* CONFIG_VSX */ -+ - if (ppc_md.handle_hmi_exception) - ppc_md.handle_hmi_exception(regs); - -@@ -1924,6 +2121,10 @@ struct ppc_emulated ppc_emulated = { - WARN_EMULATED_SETUP(mfdscr), - WARN_EMULATED_SETUP(mtdscr), - WARN_EMULATED_SETUP(lq_stq), -+ WARN_EMULATED_SETUP(lxvw4x), -+ WARN_EMULATED_SETUP(lxvh8x), -+ WARN_EMULATED_SETUP(lxvd2x), -+ WARN_EMULATED_SETUP(lxvb16x), - #endif - }; - -diff --git a/arch/powerpc/platforms/powernv/smp.c b/arch/powerpc/platforms/powernv/smp.c -index c17f81e433f7..355d3f99cafb 100644 ---- a/arch/powerpc/platforms/powernv/smp.c -+++ b/arch/powerpc/platforms/powernv/smp.c -@@ -49,6 +49,13 @@ - - static void pnv_smp_setup_cpu(int cpu) - { -+ /* -+ * P9 workaround for CI vector load (see traps.c), -+ * enable the corresponding HMI interrupt -+ */ -+ if (pvr_version_is(PVR_POWER9)) -+ mtspr(SPRN_HMEER, mfspr(SPRN_HMEER) | PPC_BIT(17)); -+ - if (xive_enabled()) - xive_smp_setup_cpu(); - else if (cpu != boot_cpuid) diff --git a/openpower/linux/0002-tg3-APE-heartbeat-changes.patch b/openpower/linux/0002-tg3-APE-heartbeat-changes.patch new file mode 100644 index 00000000..a502a396 --- /dev/null +++ b/openpower/linux/0002-tg3-APE-heartbeat-changes.patch @@ -0,0 +1,163 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Prashant Sreedharan <prashant.sreedharan@broadcom.com> +Date: Mon, 19 Feb 2018 12:27:04 +0530 +Subject: [PATCH 2/3] tg3: APE heartbeat changes + +In ungraceful host shutdown or driver crash case BMC connectivity is +lost. APE firmware is missing the driver state in this +case to keep the BMC connectivity alive. +This patch has below change to address this issue. + +Heartbeat mechanism with APE firmware. This heartbeat mechanism +is needed to notify the APE firmware about driver state. + +This patch also has the change in wait time for APE event from +1ms to 20ms as there can be some delay in getting response. + +v2: Drop inline keyword as per David suggestion. + +Signed-off-by: Prashant Sreedharan <prashant.sreedharan@broadcom.com> +Signed-off-by: Satish Baddipadige <satish.baddipadige@broadcom.com> +Signed-off-by: Siva Reddy Kallam <siva.kallam@broadcom.com> +Acked-by: Michael Chan <michael.chan@broadcom.com> +Signed-off-by: David S. Miller <davem@davemloft.net> +(cherry picked from commit 506b0a395f26e52b3f18827e0de1be051acb77ab) +Signed-off-by: Joel Stanley <joel@jms.id.au> +--- + drivers/net/ethernet/broadcom/tg3.c | 35 ++++++++++++++++++++++++----------- + drivers/net/ethernet/broadcom/tg3.h | 5 +++++ + 2 files changed, 29 insertions(+), 11 deletions(-) + +diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c +index 8995cfefbfcf..0cbf537c8f6c 100644 +--- a/drivers/net/ethernet/broadcom/tg3.c ++++ b/drivers/net/ethernet/broadcom/tg3.c +@@ -820,7 +820,7 @@ static int tg3_ape_event_lock(struct tg3 *tp, u32 timeout_us) + + tg3_ape_unlock(tp, TG3_APE_LOCK_MEM); + +- udelay(10); ++ usleep_range(10, 20); + timeout_us -= (timeout_us > 10) ? 10 : timeout_us; + } + +@@ -922,8 +922,8 @@ static int tg3_ape_send_event(struct tg3 *tp, u32 event) + if (!(apedata & APE_FW_STATUS_READY)) + return -EAGAIN; + +- /* Wait for up to 1 millisecond for APE to service previous event. */ +- err = tg3_ape_event_lock(tp, 1000); ++ /* Wait for up to 20 millisecond for APE to service previous event. */ ++ err = tg3_ape_event_lock(tp, 20000); + if (err) + return err; + +@@ -946,6 +946,7 @@ static void tg3_ape_driver_state_change(struct tg3 *tp, int kind) + + switch (kind) { + case RESET_KIND_INIT: ++ tg3_ape_write32(tp, TG3_APE_HOST_HEARTBEAT_COUNT, tp->ape_hb++); + tg3_ape_write32(tp, TG3_APE_HOST_SEG_SIG, + APE_HOST_SEG_SIG_MAGIC); + tg3_ape_write32(tp, TG3_APE_HOST_SEG_LEN, +@@ -962,13 +963,6 @@ static void tg3_ape_driver_state_change(struct tg3 *tp, int kind) + event = APE_EVENT_STATUS_STATE_START; + break; + case RESET_KIND_SHUTDOWN: +- /* With the interface we are currently using, +- * APE does not track driver state. Wiping +- * out the HOST SEGMENT SIGNATURE forces +- * the APE to assume OS absent status. +- */ +- tg3_ape_write32(tp, TG3_APE_HOST_SEG_SIG, 0x0); +- + if (device_may_wakeup(&tp->pdev->dev) && + tg3_flag(tp, WOL_ENABLE)) { + tg3_ape_write32(tp, TG3_APE_HOST_WOL_SPEED, +@@ -990,6 +984,18 @@ static void tg3_ape_driver_state_change(struct tg3 *tp, int kind) + tg3_ape_send_event(tp, event); + } + ++static void tg3_send_ape_heartbeat(struct tg3 *tp, ++ unsigned long interval) ++{ ++ /* Check if hb interval has exceeded */ ++ if (!tg3_flag(tp, ENABLE_APE) || ++ time_before(jiffies, tp->ape_hb_jiffies + interval)) ++ return; ++ ++ tg3_ape_write32(tp, TG3_APE_HOST_HEARTBEAT_COUNT, tp->ape_hb++); ++ tp->ape_hb_jiffies = jiffies; ++} ++ + static void tg3_disable_ints(struct tg3 *tp) + { + int i; +@@ -7262,6 +7268,7 @@ static int tg3_poll_msix(struct napi_struct *napi, int budget) + } + } + ++ tg3_send_ape_heartbeat(tp, TG3_APE_HB_INTERVAL << 1); + return work_done; + + tx_recovery: +@@ -7344,6 +7351,7 @@ static int tg3_poll(struct napi_struct *napi, int budget) + } + } + ++ tg3_send_ape_heartbeat(tp, TG3_APE_HB_INTERVAL << 1); + return work_done; + + tx_recovery: +@@ -10732,7 +10740,7 @@ static int tg3_reset_hw(struct tg3 *tp, bool reset_phy) + if (tg3_flag(tp, ENABLE_APE)) + /* Write our heartbeat update interval to APE. */ + tg3_ape_write32(tp, TG3_APE_HOST_HEARTBEAT_INT_MS, +- APE_HOST_HEARTBEAT_INT_DISABLE); ++ APE_HOST_HEARTBEAT_INT_5SEC); + + tg3_write_sig_post_reset(tp, RESET_KIND_INIT); + +@@ -11077,6 +11085,9 @@ static void tg3_timer(struct timer_list *t) + tp->asf_counter = tp->asf_multiplier; + } + ++ /* Update the APE heartbeat every 5 seconds.*/ ++ tg3_send_ape_heartbeat(tp, TG3_APE_HB_INTERVAL); ++ + spin_unlock(&tp->lock); + + restart_timer: +@@ -16636,6 +16647,8 @@ static int tg3_get_invariants(struct tg3 *tp, const struct pci_device_id *ent) + pci_state_reg); + + tg3_ape_lock_init(tp); ++ tp->ape_hb_interval = ++ msecs_to_jiffies(APE_HOST_HEARTBEAT_INT_5SEC); + } + + /* Set up tp->grc_local_ctrl before calling +diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h +index 1f0271fa7c74..4b9d2906da90 100644 +--- a/drivers/net/ethernet/broadcom/tg3.h ++++ b/drivers/net/ethernet/broadcom/tg3.h +@@ -2499,6 +2499,7 @@ + #define TG3_APE_LOCK_PHY3 5 + #define TG3_APE_LOCK_GPIO 7 + ++#define TG3_APE_HB_INTERVAL (tp->ape_hb_interval) + #define TG3_EEPROM_SB_F1R2_MBA_OFF 0x10 + + +@@ -3413,6 +3414,10 @@ struct tg3 { + struct device *hwmon_dev; + bool link_up; + bool pcierr_recovery; ++ ++ u32 ape_hb; ++ unsigned long ape_hb_interval; ++ unsigned long ape_hb_jiffies; + }; + + /* Accessor macros for chip and asic attributes + diff --git a/openpower/linux/0003-Release-OpenPower-kernel.patch b/openpower/linux/0003-Release-OpenPower-kernel.patch index 76d9208f..3f049a27 100644 --- a/openpower/linux/0003-Release-OpenPower-kernel.patch +++ b/openpower/linux/0003-Release-OpenPower-kernel.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Joel Stanley <joel@jms.id.au> -Date: Thu, 21 Dec 2017 12:54:15 +1030 +Date: Wed, 14 Mar 2018 13:58:25 +1030 Subject: [PATCH 3/3] Release OpenPower kernel Signed-off-by: Joel Stanley <joel@jms.id.au> @@ -9,15 +9,16 @@ Signed-off-by: Joel Stanley <joel@jms.id.au> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 97b5ae76ac8c..6bc09c01fd2a 100644 +index 0420f9a0c70f..66be4c84c3cd 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ VERSION = 4 - PATCHLEVEL = 14 - SUBLEVEL = 8 + PATCHLEVEL = 15 + SUBLEVEL = 9 -EXTRAVERSION = +EXTRAVERSION = -openpower1 - NAME = Petit Gorille + NAME = Fearless Coyote # *DOCUMENTATION* + diff --git a/openpower/package/hostboot/hostboot.mk b/openpower/package/hostboot/hostboot.mk index 09e31586..4192aca6 100644 --- a/openpower/package/hostboot/hostboot.mk +++ b/openpower/package/hostboot/hostboot.mk @@ -3,8 +3,8 @@ # hostboot # ################################################################################ -HOSTBOOT_VERSION_BRANCH_MASTER_P8 ?= d3025f5d7ddd0723946bb54fcb471d2bf1fd2da4 -HOSTBOOT_VERSION_BRANCH_MASTER ?= cc2d45afa61c873f36d04aa5e4b095321ea677d1 +HOSTBOOT_VERSION_BRANCH_MASTER_P8 ?= 5fc3b529c69246a6706577351bccd7898f1c227b +HOSTBOOT_VERSION_BRANCH_MASTER ?= 28927a78ca4144aa8214d35b7ad7e2ddba5ada4e HOSTBOOT_VERSION ?= $(if $(BR2_OPENPOWER_POWER9),$(HOSTBOOT_VERSION_BRANCH_MASTER),$(HOSTBOOT_VERSION_BRANCH_MASTER_P8)) HOSTBOOT_SITE = https://scm.raptorcs.com/scm/git/talos-hostboot diff --git a/openpower/package/openpower-pnor/openpower-pnor.mk b/openpower/package/openpower-pnor/openpower-pnor.mk index 44fec95c..2199d52f 100644 --- a/openpower/package/openpower-pnor/openpower-pnor.mk +++ b/openpower/package/openpower-pnor/openpower-pnor.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENPOWER_PNOR_VERSION ?= f36b98c6971963edf467f71fa74ce1c22e196bd7 +OPENPOWER_PNOR_VERSION ?= 43c04b16746effcb237933f53050fe66636909a6 OPENPOWER_PNOR_SITE ?= https://scm.raptorcs.com/scm/git/pnor OPENPOWER_PNOR_SITE_METHOD = git diff --git a/openpower/package/sbe/sbe.mk b/openpower/package/sbe/sbe.mk index 032e8b1f..67eaa8ce 100644 --- a/openpower/package/sbe/sbe.mk +++ b/openpower/package/sbe/sbe.mk @@ -4,7 +4,7 @@ # ################################################################################ -SBE_VERSION ?= 3c633a6c2cd626dafef63f40bfd611016b05ecc7 +SBE_VERSION ?= 9b7838172f0bbce5fc90c5626664facafc9ecfef SBE_SITE ?= https://scm.raptorcs.com/scm/git/talos-sbe SBE_SITE_METHOD = git diff --git a/openpower/package/skiboot/Config.in b/openpower/package/skiboot/Config.in index 8eb9326a..9c0149a5 100644 --- a/openpower/package/skiboot/Config.in +++ b/openpower/package/skiboot/Config.in @@ -31,7 +31,7 @@ config BR2_SKIBOOT_CUSTOM_VERSION_VALUE config BR2_SKIBOOT_VERSION string - default "4468eccef1700daae5db35eed31346b7ef5b009d" if BR2_SKIBOOT_LATEST_VERSION + default "2154c2e257ac1ef2ae1bdf93a19ea5dcf7dbaee3" if BR2_SKIBOOT_LATEST_VERSION default BR2_SKIBOOT_CUSTOM_VERSION_VALUE \ if BR2_SKIBOOT_CUSTOM_VERSION |