From:   Vladimir Oltean <vladimir.oltean@nxp.com>
To:     Michael Ellerman <mpe@ellerman.id.au>,
        linuxppc-dev@lists.ozlabs.org
Cc:     Benjamin Herrenschmidt <benh@kernel.crashing.org>,
        Paul Mackerras <paulus@samba.org>,
        Christophe Leroy <christophe.leroy@csgroup.eu>,
        linux-kernel@vger.kernel.org, stable@vger.kernel.org
Subject: [PATCH] powerpc/mm: fix early initialization failure for MMUs with no hash table
Date:   Sat, 27 Nov 2021 04:04:48 +0200
Message-Id: <20211127020448.4008507-1-vladimir.oltean@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?WvwTsNWPZOcXKO3EBF5CPu3knaStr7cYJHoVYsVCS1p6hF7NjUAWASTQ8J24?=
 =?us-ascii?Q?brnH46xKwj1gVFlM2zpPzXDJZI7DyK2GFR8XKt0uQqKOjSd5TYky+Cav6J4W?=
 =?us-ascii?Q?fvlMu7eWCSsd8TbM/uIVwwlmDlf0QrKVOv9KbMe6Lhn37ot1X/9wCRVVQfMG?=
 =?us-ascii?Q?adh+djYB+7BmgwnirdfQGB/qdmLL5Bi7q4+1cYD0nNveq4w+skcoHBYWkXD7?=
 =?us-ascii?Q?GEdj5uMUA41r9YPXVAsgBdIvNsoBY8W/UtI4yPtqsoV7BhaA1wP8Qg6KQtUm?=
 =?us-ascii?Q?toytpSFI3jQY4rumjsWPjpEGcoJyzVUon0YauMSmpXjMuHuq3T1GxtYXtIJn?=
 =?us-ascii?Q?k7NcI44tRcU1BOFFdfdWPrTWmSRhnjJRyoCHeklCzAq6agb1fzCu4007bJ9C?=
 =?us-ascii?Q?deNORPgt5fsy0D7KgJuEfqh5oIT5fcAvcVtfU7bON+F8RUOCgZZopLZinP3J?=
 =?us-ascii?Q?E/rFU/VkdDtl5q8WipkkVbSpqqGJh0dkfUz5tIuOxS5PXsAOheIi9oUThBnx?=
 =?us-ascii?Q?gacA8kTpw+YNC0UZXm7JN6MtjjAUQQazzS2pCFIWtM/u5Yx0vIiaz2Q+iPxv?=
 =?us-ascii?Q?FCXssB2i/z5FkbOuPv3/krST2cyS75HwI0wkiQA6F85uLRLFUlAQSqOpRlTi?=
 =?us-ascii?Q?eTNcjj/6/kqXNV4l0MiiSWfktbG3Zm1sdRMFVlbXyquURobWf7TpOFo8Pl9I?=
 =?us-ascii?Q?EBJf2N4jqpzrM0BD/65fyHpl8EYkb1QxFuf+8HcM1gxz/GEIRJfjZbkqkcNE?=
 =?us-ascii?Q?gN2i4Jkj/tqVgXMpTCeKokFnjCCRDgwrACHOVd51p+IAGo+Gd7lsV9wr8Zc8?=
 =?us-ascii?Q?OYCjyx+mEO0vrtYfJu8d+XSU8eEk5P3B/lgrhQ7qknVAQWMIEV1d2NmE/nNw?=
 =?us-ascii?Q?05CGa/AnEtHRpF75lFWYjPkFaPU76Dymp28mfTFGwSKiskWc3aXzRIWbYvlo?=
 =?us-ascii?Q?CZ97RdWgGEGuQdFwAcLizeS60STufG+OBrFU9GYGJcpmNCsne7rWAVbstwp2?=
 =?us-ascii?Q?6sv9O6YaYdPMBQdZWI4WuWQxSYDQ5k3rUHUApdW6eBhRso0Cj4vHCvKrAE3P?=
 =?us-ascii?Q?f7pKtvb6jDqNUt1Jb2KAvtVLJyqONW2DfQDpfx2AR9LjFG3XDZ8A1JAeTf7n?=
 =?us-ascii?Q?N1eY/A32ZDHNMbV+4InuPzbAUFiTbXZo15ThDHFCsZHjq996sckiLyOGilmJ?=
 =?us-ascii?Q?9vHF61/f2QuLv3DNwnnDrfCwht722TA5TZmXiJ0q+T10ynCWmSSGr2m06Xf2?=
 =?us-ascii?Q?Xpw+7d54gracnhTw1zyW6Bu9lAZ2tXKfxTWnQrUhgz/pFM4C9kqsIFhhwYSz?=
 =?us-ascii?Q?Uhstyzv8AupqPFn8zU8TzOy39X7LfXB4UuFLq6GfvyHRNnGlgoDdVwYptT4A?=
 =?us-ascii?Q?m1gKg9RKTUoUxQqrr8pfly77XrHqkh40gNCwYmWP+2+e7hL8m7d+HJfBTREh?=
 =?us-ascii?Q?UmtTeKCCR50YcPEpZlPhdS2tCuEqjH2eW2MgnnCbAIucDlQOO6BKI8yWyRdk?=
 =?us-ascii?Q?lTlsh2PhDHvrWdSsN0Vetm2lCk66RTRozXanl5JcOy7JOFoQVeFd8zsI8kiQ?=
 =?us-ascii?Q?DvKlaRr55BwK2IXc788BcGOrsKzT1B1BAkP30NpGy/EBZ441W5RIjzos4Au3?=
 =?us-ascii?Q?mL4Tpw8QhnKPylZ6JTRQYvM=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 9fcac5f0-ab56-47f1-2125-08d9b14a54b1
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Nov 2021 02:05:05.7955
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: ZXBnaSSwfLsvxtrDJO81avrw4tyabe77EmRVmz9HkIMOM3tcdFRBm7Ucsgr05FNt+2xVgTF5aJ8d3o9KchdF4A==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3837
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The blamed patch attempted to do a trivial conversion of
map_mem_in_cams() by adding an extra "bool init" argument, but by
mistake, changed the way in which two call sites pass the other boolean
argument, "bool dry_run".

As a result, early_init_this_mmu() now calls map_mem_in_cams() with
dry_run=true, and setup_initial_memory_limit() calls with dry_run=false,
both of which are unintended changes.

This makes the kernel boot process hang here:

[    0.045211] e500 family performance monitor hardware support registered
[    0.051891] rcu: Hierarchical SRCU implementation.
[    0.057791] smp: Bringing up secondary CPUs ...

Issue noticed on a Freescale T1040.

Fixes: 52bda69ae8b5 ("powerpc/fsl_booke: Tell map_mem_in_cams() if init is done")
Cc: stable@vger.kernel.org
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
 arch/powerpc/mm/nohash/tlb.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/mm/nohash/tlb.c b/arch/powerpc/mm/nohash/tlb.c
index 89353d4f5604..647bf454a0fa 100644
--- a/arch/powerpc/mm/nohash/tlb.c
+++ b/arch/powerpc/mm/nohash/tlb.c
@@ -645,7 +645,7 @@ static void early_init_this_mmu(void)
 
 		if (map)
 			linear_map_top = map_mem_in_cams(linear_map_top,
-							 num_cams, true, true);
+							 num_cams, false, true);
 	}
 #endif
 
@@ -766,7 +766,7 @@ void setup_initial_memory_limit(phys_addr_t first_memblock_base,
 		num_cams = (mfspr(SPRN_TLB1CFG) & TLBnCFG_N_ENTRY) / 4;
 
 		linear_sz = map_mem_in_cams(first_memblock_size, num_cams,
-					    false, true);
+					    true, true);
 
 		ppc64_rma_size = min_t(u64, linear_sz, 0x40000000);
 	} else
-- 
2.25.1