Skip to content

Commit fad84e3

Browse files
committed
ARC: boot log: eliminate struct cpuinfo_arc #4: boot log per ISA
- boot log now clearly per ISA - global struct cpuinfo_arc[] elimiated - local struct struct arcinfo kept for passing info between functions Tested-by: kernel test robot <[email protected]> Closes: https://lore.kernel.org/oe-kbuild-all/[email protected] Signed-off-by: Vineet Gupta <[email protected]>
1 parent c5b678b commit fad84e3

File tree

5 files changed

+268
-343
lines changed

5 files changed

+268
-343
lines changed

arch/arc/include/asm/arcregs.h

Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#define ARC_REG_ICCM_BUILD 0x78 /* ICCM size (common) */
2424
#define ARC_REG_XY_MEM_BCR 0x79
2525
#define ARC_REG_MAC_BCR 0x7a
26-
#define ARC_REG_MUL_BCR 0x7b
26+
#define ARC_REG_MPY_BCR 0x7b
2727
#define ARC_REG_SWAP_BCR 0x7c
2828
#define ARC_REG_NORM_BCR 0x7d
2929
#define ARC_REG_MIXMAX_BCR 0x7e
@@ -177,7 +177,7 @@ struct bcr_isa_arcv2 {
177177
#endif
178178
};
179179

180-
struct bcr_uarch_build_arcv2 {
180+
struct bcr_uarch_build {
181181
#ifdef CONFIG_CPU_BIG_ENDIAN
182182
unsigned int pad:8, prod:8, maj:8, min:8;
183183
#else
@@ -355,35 +355,6 @@ struct bcr_generic {
355355
#endif
356356
};
357357

358-
/*
359-
*******************************************************************
360-
* Generic structures to hold build configuration used at runtime
361-
*/
362-
363-
struct cpuinfo_arc_bpu {
364-
unsigned int ver, full, num_cache, num_pred, ret_stk;
365-
};
366-
367-
struct cpuinfo_arc_ccm {
368-
unsigned int base_addr, sz;
369-
};
370-
371-
struct cpuinfo_arc {
372-
struct cpuinfo_arc_bpu bpu;
373-
struct bcr_identity core;
374-
struct bcr_isa_arcv2 isa;
375-
const char *release, *name;
376-
unsigned int vec_base;
377-
struct cpuinfo_arc_ccm iccm, dccm;
378-
struct {
379-
unsigned int swap:1, norm:1, minmax:1, barrel:1, crc:1, swape:1, pad1:2,
380-
fpu_sp:1, fpu_dp:1, dual:1, dual_enb:1, pad2:4,
381-
ap_num:4, ap_full:1, smart:1, rtt:1, pad3:1,
382-
timer0:1, timer1:1, rtc:1, gfrc:1, pad4:4;
383-
} extn;
384-
struct bcr_mpy extn_mpy;
385-
};
386-
387358
static inline int is_isa_arcv2(void)
388359
{
389360
return IS_ENABLED(CONFIG_ISA_ARCV2);

arch/arc/include/asm/setup.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ long __init arc_get_mem_sz(void);
3535
#define IS_AVAIL3(v, v2, s) IS_AVAIL1(v, s), IS_AVAIL1(v, IS_DISABLED_RUN(v2))
3636

3737
extern void arc_mmu_init(void);
38-
extern char *arc_mmu_mumbojumbo(int cpu_id, char *buf, int len);
38+
extern int arc_mmu_mumbojumbo(int cpu_id, char *buf, int len);
3939

4040
extern void arc_cache_init(void);
41-
extern char *arc_cache_mumbojumbo(int cpu_id, char *buf, int len);
41+
extern int arc_cache_mumbojumbo(int cpu_id, char *buf, int len);
4242

4343
extern void __init handle_uboot_args(void);
4444

0 commit comments

Comments
 (0)