iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MIPS: vpe-mt: drop physical_memsize

Browse Source 
When neither LANTIQ nor MIPS_MALTA is set, 'physical_memsize' is not
declared. This causes the build to fail with:

mips-linux-ld: arch/mips/kernel/vpe-mt.o: in function `vpe_run':
arch/mips/kernel/vpe-mt.c:(.text.vpe_run+0x280): undefined reference to `physical_memsize'

LANTIQ is not using 'physical_memsize' and MIPS_MALTA's use of it is
self-contained in mti-malta/malta-dtshim.c.
Use of physical_memsize in vpe-mt.c appears to be unused, so eliminate
this loader mode completely and require VPE programs to be compiled with
DFLT_STACK_SIZE and DFLT_HEAP_SIZE defined.

Fixes: 9050d50e22 ("MIPS: lantiq: Set physical_memsize")
Fixes: 1a2a6d7e88 ("MIPS: APRP: Split VPE loader into separate files.")
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Reported-by: kernel test robot <lkp@intel.com>
Link: https://lore.kernel.org/all/202302030625.2g3E98sY-lkp@intel.com/
Cc: Dengcheng Zhu <dzhu@wavecomp.com>
Cc: John Crispin <john@phrozen.org>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Philippe Mathieu-Daudé <philmd@linaro.org>
Cc: "Steven J. Hill" <Steven.Hill@imgtec.com>
Cc: Qais Yousef <Qais.Yousef@imgtec.com>
Cc: Yang Yingliang <yangyingliang@huawei.com>
Cc: Hauke Mehrtens <hauke@hauke-m.de>
Cc: James Hogan <jhogan@kernel.org>
Cc: linux-mips@vger.kernel.org
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
This commit is contained in:
Randy Dunlap 2023-02-19 15:15:25 -08:00 committed by Thomas Bogendoerfer
parent 85cc91e2ba
commit 91dc288f4e
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/mips/include/asm/vpe.h
View File

@ -102,7 +102,6 @@ struct vpe_control {
struct list_head tc_list; /* Thread contexts */ struct list_head tc_list; /* Thread contexts */
}; };
extern unsigned long physical_memsize;
extern struct vpe_control vpecontrol; extern struct vpe_control vpecontrol;
extern const struct file_operations vpe_fops; extern const struct file_operations vpe_fops;

7
arch/mips/kernel/vpe-mt.c
View File

@ -92,12 +92,11 @@ int vpe_run(struct vpe *v)
write_tc_c0_tchalt(read_tc_c0_tchalt() & ~TCHALT_H); write_tc_c0_tchalt(read_tc_c0_tchalt() & ~TCHALT_H);
/* /*
* The sde-kit passes 'memsize' to __start in $a3, so set something * We don't pass the memsize here, so VPE programs need to be
* here... Or set $a3 to zero and define DFLT_STACK_SIZE and * compiled with DFLT_STACK_SIZE and DFLT_HEAP_SIZE defined.
* DFLT_HEAP_SIZE when you compile your program
*/ */
mttgpr(7, 0);
mttgpr(6, v->ntcs); mttgpr(6, v->ntcs);
mttgpr(7, physical_memsize);
/* set up VPE1 */ /* set up VPE1 */
/* /*

6
arch/mips/lantiq/prom.c
View File

@ -22,12 +22,6 @@
DEFINE_SPINLOCK(ebu_lock); DEFINE_SPINLOCK(ebu_lock);
EXPORT_SYMBOL_GPL(ebu_lock); EXPORT_SYMBOL_GPL(ebu_lock);
/*
* This is needed by the VPE loader code, just set it to 0 and assume
* that the firmware hardcodes this value to something useful.
*/
unsigned long physical_memsize = 0L;
/* /*
* this struct is filled by the soc specific detection code and holds * this struct is filled by the soc specific detection code and holds
* information about the specific soc type, revision and name * information about the specific soc type, revision and name