Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ede8123 authored by Ralf Baechle's avatar Ralf Baechle Committed by Rusty Russell
Browse files

MIPS: Fix module.c build for 32 bit 



Fixes build failure introduced by "Make most arch asm/module.h files use
asm-generic/module.h" by moving all the RELA processing code to a
separate file to be used only for RELA processing on 64-bit kernels.

  CC      arch/mips/kernel/module.o
arch/mips/kernel/module.c:250:14: error: 'reloc_handlers_rela' defined but not
used [-Werror=unused-variable]
cc1: all warnings being treated as errors

make[6]: *** [arch/mips/kernel/module.o] Error 1

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent c99af375

arch/mips/kernel/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ obj-$(CONFIG_SYNC_R4K) += sync-r4k.o 


obj-$(CONFIG_STACKTRACE)	+= stacktrace.o

obj-$(CONFIG_MODULES)		+= mips_ksyms.o module.o

obj-$(CONFIG_MODULES)		+= module-rela.o



obj-$(CONFIG_FUNCTION_TRACER)	+= mcount.o ftrace.o

arch/mips/kernel/module-rela.c

0 → 100644
+145 −0
Original line number Diff line number Diff line 
/*

 *  This program is free software; you can redistribute it and/or modify

 *  it under the terms of the GNU General Public License as published by

 *  the Free Software Foundation; either version 2 of the License, or

 *  (at your option) any later version.

 *

 *  This program is distributed in the hope that it will be useful,

 *  but WITHOUT ANY WARRANTY; without even the implied warranty of

 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *  GNU General Public License for more details.

 *

 *  You should have received a copy of the GNU General Public License

 *  along with this program; if not, write to the Free Software

 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 *

 *  Copyright (C) 2001 Rusty Russell.

 *  Copyright (C) 2003, 2004 Ralf Baechle (ralf@linux-mips.org)

 *  Copyright (C) 2005 Thiemo Seufer

 */



#include <linux/elf.h>

#include <linux/err.h>

#include <linux/errno.h>

#include <linux/moduleloader.h>



extern int apply_r_mips_none(struct module *me, u32 *location, Elf_Addr v);



static int apply_r_mips_32_rela(struct module *me, u32 *location, Elf_Addr v)

{

	*location = v;



	return 0;

}



static int apply_r_mips_26_rela(struct module *me, u32 *location, Elf_Addr v)

{

	if (v % 4) {

		pr_err("module %s: dangerous R_MIPS_26 RELArelocation\n",

		       me->name);

		return -ENOEXEC;

	}



	if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {

		printk(KERN_ERR

		       "module %s: relocation overflow\n",

		       me->name);

		return -ENOEXEC;

	}



	*location = (*location & ~0x03ffffff) | ((v >> 2) & 0x03ffffff);



	return 0;

}



static int apply_r_mips_hi16_rela(struct module *me, u32 *location, Elf_Addr v)

{

	*location = (*location & 0xffff0000) |

	            ((((long long) v + 0x8000LL) >> 16) & 0xffff);



	return 0;

}



static int apply_r_mips_lo16_rela(struct module *me, u32 *location, Elf_Addr v)

{

	*location = (*location & 0xffff0000) | (v & 0xffff);



	return 0;

}



static int apply_r_mips_64_rela(struct module *me, u32 *location, Elf_Addr v)

{

	*(Elf_Addr *)location = v;



	return 0;

}



static int apply_r_mips_higher_rela(struct module *me, u32 *location,

				    Elf_Addr v)

{

	*location = (*location & 0xffff0000) |

	            ((((long long) v + 0x80008000LL) >> 32) & 0xffff);



	return 0;

}



static int apply_r_mips_highest_rela(struct module *me, u32 *location,

				     Elf_Addr v)

{

	*location = (*location & 0xffff0000) |

	            ((((long long) v + 0x800080008000LL) >> 48) & 0xffff);



	return 0;

}



static int (*reloc_handlers_rela[]) (struct module *me, u32 *location,

				Elf_Addr v) = {

	[R_MIPS_NONE]		= apply_r_mips_none,

	[R_MIPS_32]		= apply_r_mips_32_rela,

	[R_MIPS_26]		= apply_r_mips_26_rela,

	[R_MIPS_HI16]		= apply_r_mips_hi16_rela,

	[R_MIPS_LO16]		= apply_r_mips_lo16_rela,

	[R_MIPS_64]		= apply_r_mips_64_rela,

	[R_MIPS_HIGHER]		= apply_r_mips_higher_rela,

	[R_MIPS_HIGHEST]	= apply_r_mips_highest_rela

};



int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab,

		       unsigned int symindex, unsigned int relsec,

		       struct module *me)

{

	Elf_Mips_Rela *rel = (void *) sechdrs[relsec].sh_addr;

	Elf_Sym *sym;

	u32 *location;

	unsigned int i;

	Elf_Addr v;

	int res;



	pr_debug("Applying relocate section %u to %u\n", relsec,

	       sechdrs[relsec].sh_info);



	for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {

		/* This is where to make the change */

		location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr

			+ rel[i].r_offset;

		/* This is the symbol it is referring to */

		sym = (Elf_Sym *)sechdrs[symindex].sh_addr

			+ ELF_MIPS_R_SYM(rel[i]);

		if (IS_ERR_VALUE(sym->st_value)) {

			/* Ignore unresolved weak symbol */

			if (ELF_ST_BIND(sym->st_info) == STB_WEAK)

				continue;

			printk(KERN_WARNING "%s: Unknown symbol %s\n",

			       me->name, strtab + sym->st_name);

			return -ENOENT;

		}



		v = sym->st_value + rel[i].r_addend;



		res = reloc_handlers_rela[ELF_MIPS_R_TYPE(rel[i])](me, location, v);

		if (res)

			return res;

	}



	return 0;

}

arch/mips/kernel/module.c

+1 −120
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ void *module_alloc(unsigned long size) 
}

#endif



static int apply_r_mips_none(struct module *me, u32 *location, Elf_Addr v)

int apply_r_mips_none(struct module *me, u32 *location, Elf_Addr v)

{

	return 0;

}
@@ -63,13 +63,6 @@ static int apply_r_mips_32_rel(struct module *me, u32 *location, Elf_Addr v) 
	return 0;

}



static int apply_r_mips_32_rela(struct module *me, u32 *location, Elf_Addr v)

{

	*location = v;



	return 0;

}



static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v)

{

	if (v % 4) {
@@ -91,26 +84,6 @@ static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v) 
	return 0;

}



static int apply_r_mips_26_rela(struct module *me, u32 *location, Elf_Addr v)

{

	if (v % 4) {

		pr_err("module %s: dangerous R_MIPS_26 RELArelocation\n",

		       me->name);

		return -ENOEXEC;

	}



	if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {

		printk(KERN_ERR

		       "module %s: relocation overflow\n",

		       me->name);

		return -ENOEXEC;

	}



	*location = (*location & ~0x03ffffff) | ((v >> 2) & 0x03ffffff);



	return 0;

}



static int apply_r_mips_hi16_rel(struct module *me, u32 *location, Elf_Addr v)

{

	struct mips_hi16 *n;
@@ -132,14 +105,6 @@ static int apply_r_mips_hi16_rel(struct module *me, u32 *location, Elf_Addr v) 
	return 0;

}



static int apply_r_mips_hi16_rela(struct module *me, u32 *location, Elf_Addr v)

{

	*location = (*location & 0xffff0000) |

	            ((((long long) v + 0x8000LL) >> 16) & 0xffff);



	return 0;

}



static void free_relocation_chain(struct mips_hi16 *l)

{

	struct mips_hi16 *next;
@@ -217,38 +182,6 @@ static int apply_r_mips_lo16_rel(struct module *me, u32 *location, Elf_Addr v) 
	return -ENOEXEC;

}



static int apply_r_mips_lo16_rela(struct module *me, u32 *location, Elf_Addr v)

{

	*location = (*location & 0xffff0000) | (v & 0xffff);



	return 0;

}



static int apply_r_mips_64_rela(struct module *me, u32 *location, Elf_Addr v)

{

	*(Elf_Addr *)location = v;



	return 0;

}



static int apply_r_mips_higher_rela(struct module *me, u32 *location,

				    Elf_Addr v)

{

	*location = (*location & 0xffff0000) |

	            ((((long long) v + 0x80008000LL) >> 32) & 0xffff);



	return 0;

}



static int apply_r_mips_highest_rela(struct module *me, u32 *location,

				     Elf_Addr v)

{

	*location = (*location & 0xffff0000) |

	            ((((long long) v + 0x800080008000LL) >> 48) & 0xffff);



	return 0;

}



static int (*reloc_handlers_rel[]) (struct module *me, u32 *location,

				Elf_Addr v) = {

	[R_MIPS_NONE]		= apply_r_mips_none,
@@ -258,18 +191,6 @@ static int (*reloc_handlers_rel[]) (struct module *me, u32 *location, 
	[R_MIPS_LO16]		= apply_r_mips_lo16_rel

};



static int (*reloc_handlers_rela[]) (struct module *me, u32 *location,

				Elf_Addr v) = {

	[R_MIPS_NONE]		= apply_r_mips_none,

	[R_MIPS_32]		= apply_r_mips_32_rela,

	[R_MIPS_26]		= apply_r_mips_26_rela,

	[R_MIPS_HI16]		= apply_r_mips_hi16_rela,

	[R_MIPS_LO16]		= apply_r_mips_lo16_rela,

	[R_MIPS_64]		= apply_r_mips_64_rela,

	[R_MIPS_HIGHER]		= apply_r_mips_higher_rela,

	[R_MIPS_HIGHEST]	= apply_r_mips_highest_rela

};



int apply_relocate(Elf_Shdr *sechdrs, const char *strtab,

		   unsigned int symindex, unsigned int relsec,

		   struct module *me)
@@ -324,46 +245,6 @@ int apply_relocate(Elf_Shdr *sechdrs, const char *strtab, 
	return 0;

}



int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab,

		       unsigned int symindex, unsigned int relsec,

		       struct module *me)

{

	Elf_Mips_Rela *rel = (void *) sechdrs[relsec].sh_addr;

	Elf_Sym *sym;

	u32 *location;

	unsigned int i;

	Elf_Addr v;

	int res;



	pr_debug("Applying relocate section %u to %u\n", relsec,

	       sechdrs[relsec].sh_info);



	for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {

		/* This is where to make the change */

		location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr

			+ rel[i].r_offset;

		/* This is the symbol it is referring to */

		sym = (Elf_Sym *)sechdrs[symindex].sh_addr

			+ ELF_MIPS_R_SYM(rel[i]);

		if (IS_ERR_VALUE(sym->st_value)) {

			/* Ignore unresolved weak symbol */

			if (ELF_ST_BIND(sym->st_info) == STB_WEAK)

				continue;

			printk(KERN_WARNING "%s: Unknown symbol %s\n",

			       me->name, strtab + sym->st_name);

			return -ENOENT;

		}



		v = sym->st_value + rel[i].r_addend;



		res = reloc_handlers_rela[ELF_MIPS_R_TYPE(rel[i])](me, location, v);

		if (res)

			return res;

	}



	return 0;

}



/* Given an address, look for it in the module exception tables. */

const struct exception_table_entry *search_module_dbetables(unsigned long addr)

{