From patchwork Tue Feb 19 17:23:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 10820495 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E80436C2 for ; Tue, 19 Feb 2019 17:23:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CEE7F2D18E for ; Tue, 19 Feb 2019 17:23:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CCD312D19D; Tue, 19 Feb 2019 17:23:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4254B2D18E for ; Tue, 19 Feb 2019 17:23:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9CA898E0005; Tue, 19 Feb 2019 12:23:13 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 8E1EB8E0002; Tue, 19 Feb 2019 12:23:13 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 734CB8E0005; Tue, 19 Feb 2019 12:23:13 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by kanga.kvack.org (Postfix) with ESMTP id 1673D8E0002 for ; Tue, 19 Feb 2019 12:23:13 -0500 (EST) Received: by mail-wr1-f72.google.com with SMTP id f4so9239292wrj.11 for ; Tue, 19 Feb 2019 09:23:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:message-id:in-reply-to:references :from:subject:to:cc:date; bh=31DOHOTY8TAFQbUw3ju2ZitoNlqS/Q9KBZdABQSjtuY=; b=DqqHfWEaoID6t5sICO1szqeo2LWSqrtx0wty6fgN68vuhJEGnEN82RLql8a637D9OX 1kvhA3eN2CvT8DGcWP7MaQoVvESlwqZeS2GSxugsKdk1lHBftH4lICOjAvKjADSXSBbb xs8iynJ/8saNNmoA6guilOD07rZo02eHRATfiq/4k+UAlfVFOGO8NgQwehp8ifuLNGU+ G16L+PWImVBCc9QnmdGd4lmdn2tGx6j7FWybwTM8iF0XcE1s5C6F/ODnMgME7B3QtjXn 2IEt/vqAPP1MhZsv33wuY1TyKESBaRBw3IuAh7LzmeP8xs9ZWMnr9Be4qiMycA8jpVEr +CCA== X-Gm-Message-State: AHQUAuZK1ZaMor5naeUZlXh6Yqm8I53krt9WWsO+kHFpKxOjAC53UfBC Au7rUpHrJonc1jTX4h6wcVqHMKL0Qq9OfaZK7fJ7ezKTYcCcl/iqPtXk6USZ0HwUjN8mK7Qbatq 4Ij+80/IxUk9QrTuS3vDABFx2HGSfa1ka5fKfxxb/hB+hKT8QaZ1G9wPFPW5m9a42Vg== X-Received: by 2002:a1c:f509:: with SMTP id t9mr3826372wmh.76.1550596992598; Tue, 19 Feb 2019 09:23:12 -0800 (PST) X-Google-Smtp-Source: AHgI3IZBlNtOKdWMGXwXLENxRPlJt0uuL4DPNYbmW6UzR+1RvAiXUEHJrJfAY+VYwyUhph6qZXzD X-Received: by 2002:a1c:f509:: with SMTP id t9mr3826315wmh.76.1550596991430; Tue, 19 Feb 2019 09:23:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550596991; cv=none; d=google.com; s=arc-20160816; b=wC9t19wkbIF2cr8e8A0eU8T55mKJD/uwkHR2X5/qIuSklepmc2A8lD0/JHye/aBnzt vfcKt9idG/zLErDXmE5NMQ1VbZBVoNjkeYyBNR8uHqAWgSXuDW/sVFbj8nSAu6O2T9mA UQr3hZ/cNQ/OMmI6BcYRW1ZwYRZTOrIlomKDG9sfFPHOfiPXqUZe8E5RtubKqMA4e/xX YDuQYkIOk3gcCotTBXvKZ1s5L9aO6LtGO8NQrOyiM7VVKMMvqb20QLo6BgNYq8LUJa8N xl2z9HXaKxYxdq8T5k1a2aJHTHAEPZzUP8G9m5fvEvMA1slWE/MZ1aOYe6E0ggCfocA5 63wA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=date:cc:to:subject:from:references:in-reply-to:message-id :dkim-signature; bh=31DOHOTY8TAFQbUw3ju2ZitoNlqS/Q9KBZdABQSjtuY=; b=aGxdrfenWhZas665JQsfL977dZx/KJ0i2w2I5JleboqBV5ZaYpbHZ/GPMw1XoTjSzq 2r50oXOHjhBeI2co74w0b9hOZzHyDo0kPoqpAP3EV9zJu/c4TbSASNkd3/tTC/HBCl1h zsjeYKj76krCZXsazuAZW5Gx5ZYRpKFKtkr2NlQzZZNSnauH9zi4pFB/yjtcJeElVjVR /k73BdcbjvbkGhu7Ly+8ysHn61RYaK/EsVn67VGJJPIzG6CT/bniUIhvbUhoULl8tjQu iL04YX6EHbRnwyBXX/MO2NQJGL6gKEsQVoHiPkFIYMF2CBwWFhVssE8DQqbexXAwpFeF Q9uw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=eeyCfSIW; spf=pass (google.com: domain of christophe.leroy@c-s.fr designates 93.17.236.30 as permitted sender) smtp.mailfrom=christophe.leroy@c-s.fr Received: from pegase1.c-s.fr ([93.17.236.30]) by mx.google.com with ESMTPS id y7si1219323wrr.182.2019.02.19.09.23.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Feb 2019 09:23:11 -0800 (PST) Received-SPF: pass (google.com: domain of christophe.leroy@c-s.fr designates 93.17.236.30 as permitted sender) client-ip=93.17.236.30; Authentication-Results: mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=eeyCfSIW; spf=pass (google.com: domain of christophe.leroy@c-s.fr designates 93.17.236.30 as permitted sender) smtp.mailfrom=christophe.leroy@c-s.fr Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 443ncs1wXHz9v4wj; Tue, 19 Feb 2019 18:23:09 +0100 (CET) Authentication-Results: localhost; dkim=pass reason="1024-bit key; insecure key" header.d=c-s.fr header.i=@c-s.fr header.b=eeyCfSIW; dkim-adsp=pass; dkim-atps=neutral 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 NCfK9Cf0tjfn; Tue, 19 Feb 2019 18:23:09 +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 443ncs0h5Hz9v4wf; Tue, 19 Feb 2019 18:23:09 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1550596989; bh=31DOHOTY8TAFQbUw3ju2ZitoNlqS/Q9KBZdABQSjtuY=; h=In-Reply-To:References:From:Subject:To:Cc:Date:From; b=eeyCfSIWTvudaQye+j75JBejWpowCePo06pzvNaHZE9zrJtNT9Gp6pp9Bg7hxckIM 19cNQByqbDCTRfrxe+fkaVAQhxyp/aVaNfrs+uJNv9w6+2BeHUdZCV7GSVzTV9IYYH rZShjWWGuxczfMabwwXpSORweBAJD4gbz78QHC9o= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id B49B28B7FE; Tue, 19 Feb 2019 18:23:10 +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 PNPdzjkKRflZ; Tue, 19 Feb 2019 18:23:10 +0100 (CET) Received: from po16846vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 757D98B7F9; Tue, 19 Feb 2019 18:23:10 +0100 (CET) Received: by po16846vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 5C83E6E81D; Tue, 19 Feb 2019 17:23:10 +0000 (UTC) Message-Id: In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v6 2/6] powerpc/32: Move early_init() in a separate file To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Nicholas Piggin , Aneesh Kumar K.V , Andrey Ryabinin , Alexander Potapenko , Dmitry Vyukov , Daniel Axtens Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, kasan-dev@googlegroups.com, linux-mm@kvack.org Date: Tue, 19 Feb 2019 17:23:10 +0000 (UTC) X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP In preparation of KASAN, move early_init() into a separate file in order to allow deactivation of KASAN for that function. Signed-off-by: Christophe Leroy --- arch/powerpc/kernel/Makefile | 2 +- arch/powerpc/kernel/early_32.c | 36 ++++++++++++++++++++++++++++++++++++ arch/powerpc/kernel/setup_32.c | 26 -------------------------- 3 files changed, 37 insertions(+), 27 deletions(-) create mode 100644 arch/powerpc/kernel/early_32.c diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index cb7f0bb9ee71..879b36602748 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile @@ -93,7 +93,7 @@ extra-y += vmlinux.lds obj-$(CONFIG_RELOCATABLE) += reloc_$(BITS).o -obj-$(CONFIG_PPC32) += entry_32.o setup_32.o +obj-$(CONFIG_PPC32) += entry_32.o setup_32.o early_32.o obj-$(CONFIG_PPC64) += dma-iommu.o iommu.o obj-$(CONFIG_KGDB) += kgdb.o obj-$(CONFIG_BOOTX_TEXT) += btext.o diff --git a/arch/powerpc/kernel/early_32.c b/arch/powerpc/kernel/early_32.c new file mode 100644 index 000000000000..3482118ffe76 --- /dev/null +++ b/arch/powerpc/kernel/early_32.c @@ -0,0 +1,36 @@ +// SPDX-License-Identifier: GPL-2.0 + +/* + * Early init before relocation + */ + +#include +#include +#include +#include +#include + +/* + * We're called here very early in the boot. + * + * Note that the kernel may be running at an address which is different + * from the address that it was linked at, so we must use RELOC/PTRRELOC + * to access static data (including strings). -- paulus + */ +notrace unsigned long __init early_init(unsigned long dt_ptr) +{ + unsigned long offset = reloc_offset(); + + /* First zero the BSS */ + memset(PTRRELOC(&__bss_start), 0, __bss_stop - __bss_start); + + /* + * Identify the CPU type and fix up code sections + * that depend on which cpu we have. + */ + identify_cpu(offset, mfspr(SPRN_PVR)); + + apply_feature_fixups(); + + return KERNELBASE + offset; +} diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c index 5e761eb16a6d..b46a9a33225b 100644 --- a/arch/powerpc/kernel/setup_32.c +++ b/arch/powerpc/kernel/setup_32.c @@ -63,32 +63,6 @@ EXPORT_SYMBOL(DMA_MODE_READ); EXPORT_SYMBOL(DMA_MODE_WRITE); /* - * We're called here very early in the boot. - * - * Note that the kernel may be running at an address which is different - * from the address that it was linked at, so we must use RELOC/PTRRELOC - * to access static data (including strings). -- paulus - */ -notrace unsigned long __init early_init(unsigned long dt_ptr) -{ - unsigned long offset = reloc_offset(); - - /* First zero the BSS */ - memset(PTRRELOC(&__bss_start), 0, __bss_stop - __bss_start); - - /* - * Identify the CPU type and fix up code sections - * that depend on which cpu we have. - */ - identify_cpu(offset, mfspr(SPRN_PVR)); - - apply_feature_fixups(); - - return KERNELBASE + offset; -} - - -/* * This is run before start_kernel(), the kernel has been relocated * and we are running with enough of the MMU enabled to have our * proper kernel virtual addresses