From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755800AbcBCDqE (ORCPT ); Tue, 2 Feb 2016 22:46:04 -0500 Received: from mailapp01.imgtec.com ([195.59.15.196]:18424 "EHLO mailapp01.imgtec.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755765AbcBCDqB (ORCPT ); Tue, 2 Feb 2016 22:46:01 -0500 From: Paul Burton To: , Ralf Baechle CC: Paul Burton , Andrey Konovalov , Andrey Ryabinin , , Andrew Morton Subject: [PATCH 4/5] MIPS: Support R_MIPS_PC16 rel-style reloc Date: Wed, 3 Feb 2016 03:44:44 +0000 Message-ID: <1454471085-20963-5-git-send-email-paul.burton@imgtec.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1454471085-20963-1-git-send-email-paul.burton@imgtec.com> References: <1454471085-20963-1-git-send-email-paul.burton@imgtec.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.100.200.215] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org MIPS32 code uses rel-style relocs, and MIPS32r6 modules may include the R_MIPS_PC16 relocation. We thus need to support R_MIPS_PC16 rel-style relocations in order to load MIPS32r6 kernel modules. This patch adds such support, which is similar to the rela-style R_MIPS_PC16 support but making use of the implicit addend from the instruction encoding. Signed-off-by: Paul Burton --- arch/mips/kernel/module.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/arch/mips/kernel/module.c b/arch/mips/kernel/module.c index 2adf572..f2de9b8 100644 --- a/arch/mips/kernel/module.c +++ b/arch/mips/kernel/module.c @@ -183,13 +183,25 @@ out_danger: return -ENOEXEC; } +static int apply_r_mips_pc16_rel(struct module *me, u32 *location, Elf_Addr v) +{ + u16 val; + + val = *location; + val += (v - (Elf_Addr)location) >> 2; + *location = (*location & 0xffff0000) | val; + + return 0; +} + static int (*reloc_handlers_rel[]) (struct module *me, u32 *location, Elf_Addr v) = { [R_MIPS_NONE] = apply_r_mips_none, [R_MIPS_32] = apply_r_mips_32_rel, [R_MIPS_26] = apply_r_mips_26_rel, [R_MIPS_HI16] = apply_r_mips_hi16_rel, - [R_MIPS_LO16] = apply_r_mips_lo16_rel + [R_MIPS_LO16] = apply_r_mips_lo16_rel, + [R_MIPS_PC16] = apply_r_mips_pc16_rel, }; int apply_relocate(Elf_Shdr *sechdrs, const char *strtab, -- 2.7.0