From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:42618 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751153AbbEBQ4b (ORCPT ); Sat, 2 May 2015 12:56:31 -0400 Subject: Patch "powerpc/cell: Fix crash in iic_setup_cpu() after per_cpu changes" has been added to the 3.19-stable tree To: mpe@ellerman.id.au, gregkh@linuxfoundation.org Cc: , From: Date: Sat, 02 May 2015 18:55:35 +0200 Message-ID: <143058573515431@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled powerpc/cell: Fix crash in iic_setup_cpu() after per_cpu changes to the 3.19-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: powerpc-cell-fix-crash-in-iic_setup_cpu-after-per_cpu-changes.patch and it can be found in the queue-3.19 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From b0dd00addc5035f87ec9c5820dacc1ebc7fcb3e6 Mon Sep 17 00:00:00 2001 From: Michael Ellerman Date: Fri, 3 Apr 2015 14:11:53 +1100 Subject: powerpc/cell: Fix crash in iic_setup_cpu() after per_cpu changes From: Michael Ellerman commit b0dd00addc5035f87ec9c5820dacc1ebc7fcb3e6 upstream. The conversion from __get_cpu_var() to this_cpu_ptr() in iic_setup_cpu() is wrong. It causes an oops at boot. We need the per-cpu address of struct cpu_iic, not cpu_iic.regs->prio. Sparse noticed this, because we pass a non-iomem pointer to out_be64(), but we obviously don't check the sparse results often enough. Fixes: 69111bac42f5 ("powerpc: Replace __get_cpu_var uses") Signed-off-by: Michael Ellerman Signed-off-by: Greg Kroah-Hartman --- arch/powerpc/platforms/cell/interrupt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/powerpc/platforms/cell/interrupt.c +++ b/arch/powerpc/platforms/cell/interrupt.c @@ -163,7 +163,7 @@ static unsigned int iic_get_irq(void) void iic_setup_cpu(void) { - out_be64(this_cpu_ptr(&cpu_iic.regs->prio), 0xff); + out_be64(&this_cpu_ptr(&cpu_iic)->regs->prio, 0xff); } u8 iic_get_target_id(int cpu) Patches currently in stable-queue which might be from mpe@ellerman.id.au are queue-3.19/powerpc-cell-fix-crash-in-iic_setup_cpu-after-per_cpu-changes.patch queue-3.19/powerpc-perf-cap-64bit-userspace-backtraces-to-perf_max_stack_depth.patch queue-3.19/powerpc-jump_label-include-linux-jump_label.h-to-get-have_jump_label-define.patch queue-3.19/powerpc-fix-missing-l2-cache-size-in-sys-devices-system-cpu.patch queue-3.19/powerpc-cell-fix-cell-iommu-after-it_page_shift-changes.patch