Received: by 2002:a05:6a10:9afc:0:0:0:0 with SMTP id t28csp51629pxm; Wed, 2 Mar 2022 10:14:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJzD337M+6kNcUmvUS35vt62A9tSBwzv7uKV05gZSfUPYu9gXscmlWseuTWwa/motTnY4Ik4 X-Received: by 2002:a17:906:2ad3:b0:6ce:3662:8d68 with SMTP id m19-20020a1709062ad300b006ce36628d68mr23905302eje.71.1646244847837; Wed, 02 Mar 2022 10:14:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646244847; cv=none; d=google.com; s=arc-20160816; b=je8+kpWhv3XlAwLFaGzmDijk5g/NtBEai4ZDxPZGvNEKRT8G7xCaA6WztjIoYU+frT jTP28xiGRDV3kuG+lG68dhQOYbCogH8eXCkk8kHaoeCtEbmysMCBza61Uubfcm1O5TkR Zk+1BCrWQeJYshq459SddwGi2BXAR1ON7nDuKxUtdVhOKLvWE9PZmucw5SKco8pgJEJQ dsChG0D1m1x8c4gH4fWBmsV0jGCcV9cbcOeBHlavWu6bDhICnLG8nksRJwAyznGitSU6 AFc5siDH/aop1OmzHY9oxoE75k/Ut25oM395VsPgnaYAywDY71h+xpAF37eGaDzYaL9e A2NA== 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=wMQLUT5ySySeWTwmCbfz8Dlb+r+whOgrtz3l49bbG9s=; b=Kr7LRdUBH8YfOBNpYcknGRotBJL6UumFhZOGVqC5hZQ9aubThYe0WKWvKnLWrZApOb 6+SwUjmbwk9NS5NTiENFUeVfT/0uk55fMzOftggD7Ldxsw4e1tq1bFr4FdBQHXqonSqX R8V1j8EsbnrLeaoeXkjMl0W2XkcXq+E8bRPrqpYCL6dn3F5DlVroTg/q97LUFcGI5zMH hmmfstQSGtaIC+yd46jBxIk66gnmphE1fhqS9A8sYMmVnJxa+moV3DEmrlnYdKJ7b84k qq4HdFwQM+8wd1Sy3nq1P2cRYq7OrNL/x7FWmrD3En2ijhYEIeX7TROk4wP+LpwguyvO HvaA== 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 t23-20020a50d717000000b00415a3351f04si2401783edi.561.2022.03.02.10.13.43; Wed, 02 Mar 2022 10:14:07 -0800 (PST) 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 S239590AbiCBEqJ (ORCPT + 99 others); Tue, 1 Mar 2022 23:46:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41304 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239517AbiCBEqD (ORCPT ); Tue, 1 Mar 2022 23:46:03 -0500 Received: from relay11.mail.gandi.net (relay11.mail.gandi.net [217.70.178.231]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DE7D4B12E1 for ; Tue, 1 Mar 2022 20:45:17 -0800 (PST) Received: (Authenticated sender: ash@heyquark.com) by mail.gandi.net (Postfix) with ESMTPSA id 379B3100006; Wed, 2 Mar 2022 04:45:09 +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 Subject: [PATCH 11/12] powerpc: wiiu: don't enforce flat memory Date: Wed, 2 Mar 2022 15:44:05 +1100 Message-Id: <20220302044406.63401-12-ash@heyquark.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220302044406.63401-1-ash@heyquark.com> References: <20220302044406.63401-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, 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.35.1