Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-21 19:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Microblaze patches for 6.13-rc1

Browse Source 
- Export xmb_manager functions
 - Remove empty #ifndef __ASSEMBLY__ statement
 - Use str_yes_no() helper in show_cpuinfo()
 -----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQQbPNTMvXmYlBPRwx7KSWXLKUoMIQUCZzw3uQAKCRDKSWXLKUoM
 IapyAJ0TsUChBtA7+FFPYXwfQ2nrbhGytQCeNegQkFHSL/Ray6Tsk4Q1zejixlU=
 =2mED
 -----END PGP SIGNATURE-----

Merge tag 'microblaze-v6.13' of git://git.monstr.eu/linux-2.6-microblaze

Pull microblaze updates from Michal Simek:

 - Export xmb_manager functions

 - Remove empty #ifndef __ASSEMBLY__ statement

 - Use str_yes_no() helper in show_cpuinfo()

* tag 'microblaze-v6.13' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: mb: Use str_yes_no() helper in show_cpuinfo()
  microblaze: Remove empty #ifndef __ASSEMBLY__ statement
  microblaze: Export xmb_manager functions
This commit is contained in:
Linus Torvalds 2024-11-20 14:54:05 -08:00
commit f103749785
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/microblaze/include/uapi/asm/setup.h
View File

@ -14,7 +14,4 @@
#define COMMAND_LINE_SIZE 256 #define COMMAND_LINE_SIZE 256
# ifndef __ASSEMBLY__
# endif /* __ASSEMBLY__ */
#endif /* _UAPI_ASM_MICROBLAZE_SETUP_H */ #endif /* _UAPI_ASM_MICROBLAZE_SETUP_H */

10
arch/microblaze/kernel/cpu/mb.c
View File

@ -66,10 +66,10 @@ static int show_cpuinfo(struct seq_file *m, void *v)
" MSR:\t\t%s\n" " MSR:\t\t%s\n"
" PCMP:\t\t%s\n" " PCMP:\t\t%s\n"
" DIV:\t\t%s\n", " DIV:\t\t%s\n",
(cpuinfo.use_instr & PVR0_USE_BARREL_MASK) ? "yes" : "no", str_yes_no(cpuinfo.use_instr & PVR0_USE_BARREL_MASK),
(cpuinfo.use_instr & PVR2_USE_MSR_INSTR) ? "yes" : "no", str_yes_no(cpuinfo.use_instr & PVR2_USE_MSR_INSTR),
(cpuinfo.use_instr & PVR2_USE_PCMP_INSTR) ? "yes" : "no", str_yes_no(cpuinfo.use_instr & PVR2_USE_PCMP_INSTR),
(cpuinfo.use_instr & PVR0_USE_DIV_MASK) ? "yes" : "no"); str_yes_no(cpuinfo.use_instr & PVR0_USE_DIV_MASK));
seq_printf(m, " MMU:\t\t%x\n", cpuinfo.mmu); seq_printf(m, " MMU:\t\t%x\n", cpuinfo.mmu);
@ -120,7 +120,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
seq_printf(m, seq_printf(m,
"HW-Debug:\t%s\n", "HW-Debug:\t%s\n",
cpuinfo.hw_debug ? "yes" : "no"); str_yes_no(cpuinfo.hw_debug));
seq_printf(m, seq_printf(m,
"PVR-USR1:\t%02x\n" "PVR-USR1:\t%02x\n"

10
arch/microblaze/kernel/microblaze_ksyms.c
View File

@ -16,6 +16,7 @@
#include <asm/page.h> #include <asm/page.h>
#include <linux/ftrace.h> #include <linux/ftrace.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <asm/xilinx_mb_manager.h>
#ifdef CONFIG_FUNCTION_TRACER #ifdef CONFIG_FUNCTION_TRACER
extern void _mcount(void); extern void _mcount(void);
@ -46,3 +47,12 @@ extern void __udivsi3(void);
EXPORT_SYMBOL(__udivsi3); EXPORT_SYMBOL(__udivsi3);
extern void __umodsi3(void); extern void __umodsi3(void);
EXPORT_SYMBOL(__umodsi3); EXPORT_SYMBOL(__umodsi3);
#ifdef CONFIG_MB_MANAGER
extern void xmb_manager_register(uintptr_t phys_baseaddr, u32 cr_val,
void (*callback)(void *data),
void *priv, void (*reset_callback)(void *data));
EXPORT_SYMBOL(xmb_manager_register);
extern asmlinkage void xmb_inject_err(void);
EXPORT_SYMBOL(xmb_inject_err);
#endif