Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp2837507imu; Thu, 29 Nov 2018 11:01:45 -0800 (PST) X-Google-Smtp-Source: AFSGD/WGR9l91fJbBEIujrYIc9HbrHLdw0VAlEnK0gONBTzQJNO/hnCSHj/pqRZm/YtXOJBHlQ0E X-Received: by 2002:a17:902:a411:: with SMTP id p17mr2587816plq.292.1543518105921; Thu, 29 Nov 2018 11:01:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543518105; cv=none; d=google.com; s=arc-20160816; b=rx3jWbK14JRgzeLX8VxYvOEgt1oaJ5DTIz0kB18kB/FcCl81jN2BRW3FAbIuahN+8z HjLMqmOKsGOJ8KMUP85OQWAAsWPECH7zMjpENcWLUHO7xixtj5q3aGXJWCHnKsNFcJIs dGpPMqJycKF2E452AdSWbV4pWzFEOv1g/aRObGNuT7AmQpcugiTkI+AY4N6ZWmuN2u66 5C+Htbb0hwLk3ZEe+QJrfEDrbRdA15KAOvH2geP1UWuj8dndFyIVhLun7ocW39oWuoTb 3QQPRnTgzgGUwDeMcbwxqg3L1f0lEaGLud8b7ot9NmNyUlnE/c0gY21zJg6kVLD4xy99 Lfmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:date:cc:to:subject:from:references :in-reply-to:message-id; bh=KyNyxe8Ll/uKXOchcBPikH8i8fpOeG8E6/EG+VfdlPY=; b=ymKvmaghwwPHt70tR4HKoi8u03FHH4owXTCXEyGHuV10CtQ09N2jMZK0Vay3m8m0tY qjHd7lK767WX6Z17nt/DgdooKe50qTfU9WAsIp1P5PddVyYWNg0/sw+FsOEzkZ13q+e2 YYbZOYuvQy0cwB2puwj848Qte1Tr8zKuX1U80AkBtS8dHwu8JAd9leH5fEm+ZWwrJf7u gh6ewA1wx+NyA0gFuSpIF7N5DnkGImSTttJLUIWIXMLC+5ZfUx7oHzLUXFxMXsxJjXWm Ovxnr7HxQKfrGCSjf3DqcNSghMl75y5b4K4iNiO9oT34RDKP03vTOH5jjMdeG7LwDk/y L66Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w185si3088955pfw.122.2018.11.29.11.01.31; Thu, 29 Nov 2018 11:01:45 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726832AbeK3GGw (ORCPT + 99 others); Fri, 30 Nov 2018 01:06:52 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:64460 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725928AbeK3GGv (ORCPT ); Fri, 30 Nov 2018 01:06:51 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 435Rfz08tcz9tyxN; Thu, 29 Nov 2018 20:00:27 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id K5AZy-h-sxdI; Thu, 29 Nov 2018 20:00:26 +0100 (CET) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 435Rfy6jr3z9tyxJ; Thu, 29 Nov 2018 20:00:26 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 39A908B8DA; Thu, 29 Nov 2018 20:00:24 +0100 (CET) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id hzh5H42HS3sG; Thu, 29 Nov 2018 20:00:23 +0100 (CET) Received: from po14163vm.idsi0.si.c-s.fr (unknown [192.168.232.3]) by messagerie.si.c-s.fr (Postfix) with ESMTP id E55548B913; Thu, 29 Nov 2018 20:00:20 +0100 (CET) Received: by po14163vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 6A0D469B5F; Thu, 29 Nov 2018 19:00:20 +0000 (UTC) Message-Id: <5805a0f6944e998877fb66c611ec2d72cc4d4a8f.1543517818.git.christophe.leroy@c-s.fr> In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v1 05/13] powerpc/wii: remove wii_mmu_mapin_mem2() To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , j.neuschaefer@gmx.net Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Thu, 29 Nov 2018 19:00:20 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org wii_mmu_mapin_mem2() is not used anymore, remove it. Signed-off-by: Christophe Leroy --- arch/powerpc/platforms/embedded6xx/wii.c | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/arch/powerpc/platforms/embedded6xx/wii.c b/arch/powerpc/platforms/embedded6xx/wii.c index ecf703ee3a76..235fe81aa2b1 100644 --- a/arch/powerpc/platforms/embedded6xx/wii.c +++ b/arch/powerpc/platforms/embedded6xx/wii.c @@ -54,10 +54,6 @@ static void __iomem *hw_ctrl; static void __iomem *hw_gpio; -unsigned long wii_hole_start; -unsigned long wii_hole_size; - - static int __init page_aligned(unsigned long x) { return !(x & (PAGE_SIZE-1)); @@ -69,26 +65,6 @@ void __init wii_memory_fixups(void) BUG_ON(memblock.memory.cnt != 2); BUG_ON(!page_aligned(p[0].base) || !page_aligned(p[1].base)); - - /* determine hole */ - wii_hole_start = ALIGN(p[0].base + p[0].size, PAGE_SIZE); - wii_hole_size = p[1].base - wii_hole_start; -} - -unsigned long __init wii_mmu_mapin_mem2(unsigned long top) -{ - unsigned long delta, size, bl; - unsigned long max_size = (256<<20); - - /* MEM2 64MB@0x10000000 */ - delta = wii_hole_start + wii_hole_size; - size = top - delta; - for (bl = 128<<10; bl < max_size; bl <<= 1) { - if (bl * 2 > size) - break; - } - setbat(4, PAGE_OFFSET+delta, delta, bl, PAGE_KERNEL_X); - return delta + bl; } static void __noreturn wii_spin(void) -- 2.13.3