Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp1866632pxb; Sat, 7 Nov 2020 01:12:26 -0800 (PST) X-Google-Smtp-Source: ABdhPJzv3IBIIUhnVlt+ds/LY8ai9ind000qf611Oxu70eOa1WwbzKjZMXHvWBpo6xbppMQYJcG1 X-Received: by 2002:a17:906:c1c3:: with SMTP id bw3mr5850234ejb.126.1604740346170; Sat, 07 Nov 2020 01:12:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604740346; cv=none; d=google.com; s=arc-20160816; b=bvEJYUX43lvWfvXCjlVfzESSJn5f2+nRWW2nqtBs0isi3OHJwS8KPZ1MDs2czC9+ok 90/fxPWAnQhTQhr60pTHrb9oOZfBU3xvnqSjP2D5vhnIoTFP8k3v4Pb/QT3Qsq0yoKmA WaknlG0FiNHYeZM0uUOfiFw0EAnR5v5BSAkNLayQ0ULMsXVHvmXEmKfXhJV2LGgsMG// DRa0GiTUOmF0ubt7QdcScevskv/ZUce6Q8JMCYrHbmaDaS3Up1XZ5ndF/yVtBjNuOnMN A5zZmFoordEjirUASTJCSv/A23VpdETkTxUMcZja88bocl9JIVL1alEbyX5++S/xiD4r KJ6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:cc:to:subject:from:message-id; bh=J1jwn0HHXlyLTRhHl+LAeCUqiXdscepRBNklCrj56uw=; b=u9Lre+qjOJWBGcRPkek6sxGAsSob0Nl961WthoCSOmy78qcssD1ZW++0UrE1PG/YpX qcZMCYUgbduhl0L5QDzbWFKH36arwgVDYZQZqFYZaGqC0hSw3jDletWijZJwXXjz4RMr lMxp6dLXoRq/r/Rg4VwKBpM0kCEO/4aC3S5KaQE5NN6WFvlUWHESBMIShq4ebsMFzLWr VGrYMdwr/q+tJ4+EI0C8egH0X6cUw62dD+6vzmLi9Bg8CF273g0smbwIarEBJwNqMpd3 QZCY33uNyAuT9lHi1ERb5zYfz/IBGhlZgYKJGKmUoJnUWAFA/TdmPmmdqR/vCSshBDtC nexw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h27si3216012ejd.385.2020.11.07.01.12.02; Sat, 07 Nov 2020 01:12:26 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728397AbgKGJHp (ORCPT + 99 others); Sat, 7 Nov 2020 04:07:45 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:30510 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727977AbgKGJHo (ORCPT ); Sat, 7 Nov 2020 04:07:44 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 4CSrxm2xC5z9v6vC; Sat, 7 Nov 2020 10:07:40 +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 SBU23wXPkMUB; Sat, 7 Nov 2020 10:07:40 +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 4CSrxm1HNrz9v6vB; Sat, 7 Nov 2020 10:07:40 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 4A6128B776; Sat, 7 Nov 2020 10:07:41 +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 k0GTKzkPiJkJ; Sat, 7 Nov 2020 10:07:41 +0100 (CET) Received: from po17688vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id EDE1D8B75B; Sat, 7 Nov 2020 10:07:40 +0100 (CET) Received: by po17688vm.idsi0.si.c-s.fr (Postfix, from userid 0) id AFC2B66868; Sat, 7 Nov 2020 09:07:40 +0000 (UTC) Message-Id: <9e225a856a8b22e0e77587ee22ab7a2f5bca8753.1604740029.git.christophe.leroy@csgroup.eu> From: Christophe Leroy Subject: [PATCH] powerpc/32s: Use relocation offset when setting early hash table To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , erhard_f@mailbox.org, schwab@linux-m68k.org Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Sat, 7 Nov 2020 09:07:40 +0000 (UTC) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When calling early_hash_table(), the kernel hasn't been yet relocated to its linking address, so data must be addressed with relocation offset. Add relocation offset to write into Hash in early_hash_table(). Reported-by: Erhard Furtner Reported-by: Andreas Schwab Fixes: 69a1593abdbc ("powerpc/32s: Setup the early hash table at all time.") Signed-off-by: Christophe Leroy --- arch/powerpc/kernel/head_book3s_32.S | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/kernel/head_book3s_32.S b/arch/powerpc/kernel/head_book3s_32.S index 5eb9eedac920..8aa7eb11754e 100644 --- a/arch/powerpc/kernel/head_book3s_32.S +++ b/arch/powerpc/kernel/head_book3s_32.S @@ -156,6 +156,7 @@ __after_mmu_off: bl initial_bats bl load_segment_registers BEGIN_MMU_FTR_SECTION + bl reloc_offset bl early_hash_table END_MMU_FTR_SECTION_IFSET(MMU_FTR_HPTE_TABLE) #if defined(CONFIG_BOOTX_TEXT) @@ -932,7 +933,7 @@ early_hash_table: ori r6, r6, 3 /* 256kB table */ mtspr SPRN_SDR1, r6 lis r6, early_hash@h - lis r3, Hash@ha + addis r3, r3, Hash@ha stw r6, Hash@l(r3) blr -- 2.25.0