Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp4828129iog; Wed, 22 Jun 2022 06:40:45 -0700 (PDT) X-Google-Smtp-Source: AGRyM1unXaBFR6DgezUUZ/GQFxJPoMTdJjDLWDeLHFsiU5S2HrdIRUbou6trI1kdp6r5srfPSygl X-Received: by 2002:a17:90b:4b02:b0:1e2:ff51:272a with SMTP id lx2-20020a17090b4b0200b001e2ff51272amr3789909pjb.56.1655905245569; Wed, 22 Jun 2022 06:40:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655905245; cv=none; d=google.com; s=arc-20160816; b=ebyWszwmb/VPm2xKrjj+DPCkgc0m3fQqM/9iSS3GvUrpDorRLnq3Z7RJrpO51Hw8RY 5pdNhuc8v/bi8XvGU3NwVq25I3tLF528dr+GttrA8WmVf/vheMZS+PImALqgwaBWwlgJ XIVdA9DEpxtUQxvpNic8LOfsjikrw1leYxIoTRRXqCXagT4yy3QGeM6e5cam7U88fwjY IbMJgUiOU4+IHnWM+7I6LKLhR0cBldENFkkjg/gItZOqYvTpCunuDdcvShMFCb18hnG0 /3/3pwT3ZsE13vbOngHClFWbq2Pxw98KgIg40JbfPAAgU8mDo03C9u/9J/aGhWzdE2Je nPcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=ScROawl2z+oNko3ibbJMC7F1a+G1RxGwnhd0+wk7e+0=; b=VWU5QymAiDtBFecy+1XepbOg55A1y3kpfJ5bkb1hQ6LEocz9zpTkc3IFSM9IOyZ2hb Z1NYIRc8zrNugr3xJXGubiQj/pCGZQwJW+z+wtLvr877BVMpZPTgZODmdzfrFms/beoK m8TvaacH4rsgGHvgX/sY+Q/QjEHhjZoGEjldEBmLczGV4+Yw2ti/T5P/VoIhdjkSw1qX Ws64IMNHG7Ej5aPAr/BKjIG17K25rBKG86ttEfUU4y4e5DUf5FsVwDqtWF9cvJG08qSU e1CrzrMuEiwtMa2C1sPu5tfKYMR3NKBAxTFEGBk8oYQXnhYJFnLAA30o6qXd9/I67Tyk 2Mhg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d19-20020a656b93000000b0040224628c1asi8402219pgw.535.2022.06.22.06.40.20; Wed, 22 Jun 2022 06:40:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355466AbiFVNMq (ORCPT + 99 others); Wed, 22 Jun 2022 09:12:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33210 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355462AbiFVNMZ (ORCPT ); Wed, 22 Jun 2022 09:12:25 -0400 Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC40E35861; Wed, 22 Jun 2022 06:12:13 -0700 (PDT) Received: (Authenticated sender: ash@heyquark.com) by mail.gandi.net (Postfix) with ESMTPSA id 4445DFF810; Wed, 22 Jun 2022 13:12:02 +0000 (UTC) From: Ash Logan To: paulus@samba.org, mpe@ellerman.id.au, christophe.leroy@csgroup.eu, robh+dt@kernel.org, benh@kernel.crashing.org Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, j.ne@posteo.net, linkmauve@linkmauve.fr, rw-r-r-0644@protonmail.com, devicetree@vger.kernel.org Subject: [PATCH v2 11/12] powerpc: wiiu: don't enforce flat memory Date: Wed, 22 Jun 2022 23:10:36 +1000 Message-Id: <20220622131037.57604-12-ash@heyquark.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220622131037.57604-1-ash@heyquark.com> References: <20220302044406.63401-1-ash@heyquark.com> <20220622131037.57604-1-ash@heyquark.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org pgtable_32.c:mapin_ram loops over each valid memory range, which means non-contiguous memory just works. Signed-off-by: Ash Logan --- arch/powerpc/mm/init_32.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/mm/init_32.c b/arch/powerpc/mm/init_32.c index 3d690be48e84..59a84629d9a0 100644 --- a/arch/powerpc/mm/init_32.c +++ b/arch/powerpc/mm/init_32.c @@ -125,10 +125,10 @@ void __init MMU_init(void) * lowmem_end_addr is initialized below. */ if (memblock.memory.cnt > 1) { -#ifndef CONFIG_WII +#if !defined(CONFIG_WII) && !defined(CONFIG_WIIU) memblock_enforce_memory_limit(memblock.memory.regions[0].size); pr_warn("Only using first contiguous memory region\n"); -#else +#elif defined(CONFIG_WII) wii_memory_fixups(); #endif } -- 2.36.1