From patchwork Sun Jan 12 08:46:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hugh Dickins X-Patchwork-Id: 309561 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id 940EE2C0371 for ; Sun, 12 Jan 2014 19:47:19 +1100 (EST) Received: from mail-pb0-x22d.google.com (mail-pb0-x22d.google.com [IPv6:2607:f8b0:400e:c01::22d]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id D1EFB2C0098 for ; Sun, 12 Jan 2014 19:46:52 +1100 (EST) Received: by mail-pb0-f45.google.com with SMTP id rp16so6138721pbb.18 for ; Sun, 12 Jan 2014 00:46:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:to:cc:subject:message-id:user-agent:mime-version :content-type; bh=qAoOfJzZ6zfa6xIYj8POaN5zbeQzkakp4bSZxygMM7Q=; b=Q2G31zyid1Lsv9QD7Nj1yoLIiU0uZwDSMr8wsDUA5dxwWwuaWn24tvopphojHkU60m l007e68SSlt1W4ahQHsn+5naE3+5Y4xj6hQrPYNcNWRinLlLHO9KgGoipMfjjtyD6cCU d2AmkRr8Fo9h0ygofYgKXiWwx9y9X3guSd1FA5rtaGeS1asc9TzC1aS+NL3p7QyV0uWj FsRKmzxIfUZa0W05bNSJl8WG1hh/qH7FWw7fnYs8YFUVRlrfg4CM09yOHJYNFUp/AWkp INgUDVuXRZNOEB55FMNKBdZV6gXQVuLGlryn+476Q/jfAT1rJvENGpANl4cImpGEgoik 6qiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:user-agent :mime-version:content-type; bh=qAoOfJzZ6zfa6xIYj8POaN5zbeQzkakp4bSZxygMM7Q=; b=jqh0TA04pCGrB3TWaWtYc1l6GQKGlU79MyqpbwDnVdV+T+Tk7W+Uw+Ay3COxHLEuDH zm3nA6RL0l10w6N3WIyUtUi6IxH9Lxjnb2bXGehkgJCG7zWV1wCDd022g4gQe5/1Kqu6 lwpihYtH4ctUP75jsgXupdsOGtrOsqvpAU6v8xmetmzjUsMPIe42JVNhDa+Q1X7+dfeN cEsgsAAXco2ZDVDFX1UBUCm2j2r56jK9KRsJioi5g+UBFdE+b9B6ONXUluIdyI3r1U/n xntrmqEZ9+UT4xfhwXZ4IHi0+YoX06SdKh2pk1W7vwhtKqNIRfWjKLCBG0DnA763ZwFk q1JA== X-Gm-Message-State: ALoCoQnsI+RZBqpvztoIENRSVQLkxKeVGPNBF8xbA22Waj+fbnYhX2D3z+HBrfXkZM9i5mevGMAQWen+IAagY1wEl8krZs25mtan1FvawZTQeQZ3X2SwFFSUevWUIDrnndxaog6DOqWi2JX5dKNjET1wP4qUy3MRqjW8may/GDbKAg/+ecOSm0WrL677qtinwV35YOeE7FneAslWsNp9/svGD2MmNNhK+A== X-Received: by 10.66.144.102 with SMTP id sl6mr22447916pab.96.1389516409011; Sun, 12 Jan 2014 00:46:49 -0800 (PST) Received: from [192.168.1.19] (c-67-169-183-19.hsd1.ca.comcast.net. [67.169.183.19]) by mx.google.com with ESMTPSA id gn5sm12135130pbc.29.2014.01.12.00.46.47 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 12 Jan 2014 00:46:48 -0800 (PST) Date: Sun, 12 Jan 2014 00:46:20 -0800 (PST) From: Hugh Dickins X-X-Sender: hugh@eggly.anvils To: Benjamin Herrenschmidt Subject: [PATCH mmotm/next] powerpc: fix powernv boot breakage on G5??? Message-ID: User-Agent: Alpine 2.11 (LSU 23 2013-08-11) MIME-Version: 1.0 Cc: Mahesh Salgaonkar , linuxppc-dev@lists.ozlabs.org X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" My PowerMac G5 cannot boot mmotm these days: different symptoms (starting /sbin/init failed? or ATA errors and hang?), with unrelated bugs adding to the confusion; but a bisection led to b5ff4211a829 "powerpc/book3s: Queue up and process delayed MCE events". Since that series seems to be mostly about powernv, I tried changing BOOK3S_64 to POWERNV in entry_64.S, which has got it back to working for me. Signed-off-by: Hugh Dickins just in case this happens to be right, but it's well beyond me! --- arch/powerpc/kernel/entry_64.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- mmotm/arch/powerpc/kernel/entry_64.S 2014-01-10 18:24:56.940448828 -0800 +++ linux/arch/powerpc/kernel/entry_64.S 2014-01-10 18:29:24.276455182 -0800 @@ -184,7 +184,7 @@ syscall_exit: bl .do_show_syscall_exit ld r3,RESULT(r1) #endif -#ifdef CONFIG_PPC_BOOK3S_64 +#ifdef CONFIG_PPC_POWERNV BEGIN_FTR_SECTION bl .machine_check_process_queued_event END_FTR_SECTION_IFSET(CPU_FTR_HVMODE)