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

microblaze: Add PVR for endians plus detection

Browse Source 
Upcomming microblaze version will support little-endian.

Signed-off-by: Michal Simek <monstr@monstr.eu>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
This commit is contained in:
Michal Simek 2010-08-13 12:47:42 +02:00
parent 44180a573e
commit 8e2ad016b2
6 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/microblaze/include/asm/cpuinfo.h
View File

@ -38,6 +38,7 @@ struct cpuinfo {
u32 use_exc; u32 use_exc;
u32 ver_code; u32 ver_code;
u32 mmu; u32 mmu;
u32 endian;
/* CPU caches */ /* CPU caches */
u32 use_icache; u32 use_icache;

3
arch/microblaze/include/asm/pvr.h
View File

@ -32,6 +32,7 @@ struct pvr_s {
#define PVR0_USE_DCACHE_MASK 0x01000000 #define PVR0_USE_DCACHE_MASK 0x01000000
#define PVR0_USE_MMU 0x00800000 #define PVR0_USE_MMU 0x00800000
#define PVR0_USE_BTC 0x00400000 #define PVR0_USE_BTC 0x00400000
#define PVR0_ENDI 0x00200000
#define PVR0_VERSION_MASK 0x0000FF00 #define PVR0_VERSION_MASK 0x0000FF00
#define PVR0_USER1_MASK 0x000000FF #define PVR0_USER1_MASK 0x000000FF
@ -209,6 +210,8 @@ struct pvr_s {
#define PVR_MMU_TLB_ACCESS(pvr) (pvr.pvr[11] & PVR11_MMU_TLB_ACCESS) #define PVR_MMU_TLB_ACCESS(pvr) (pvr.pvr[11] & PVR11_MMU_TLB_ACCESS)
#define PVR_MMU_ZONES(pvr) (pvr.pvr[11] & PVR11_MMU_ZONES) #define PVR_MMU_ZONES(pvr) (pvr.pvr[11] & PVR11_MMU_ZONES)
/* endian */
#define PVR_ENDIAN(pvr) (pvr.pvr[0] & PVR0_ENDI)
int cpu_has_pvr(void); int cpu_has_pvr(void);
void get_pvr(struct pvr_s *pvr); void get_pvr(struct pvr_s *pvr);

1
arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c
View File

@ -72,6 +72,7 @@ void set_cpuinfo_pvr_full(struct cpuinfo *ci, struct device_node *cpu)
CI(pvr_user2, USER2); CI(pvr_user2, USER2);
CI(mmu, USE_MMU); CI(mmu, USE_MMU);
CI(endian, ENDIAN);
CI(use_icache, USE_ICACHE); CI(use_icache, USE_ICACHE);
CI(icache_tagbits, ICACHE_ADDR_TAG_BITS); CI(icache_tagbits, ICACHE_ADDR_TAG_BITS);

1
arch/microblaze/kernel/cpu/cpuinfo-static.c
View File

@ -119,6 +119,7 @@ void __init set_cpuinfo_static(struct cpuinfo *ci, struct device_node *cpu)
ci->pvr_user2 = fcpu(cpu, "xlnx,pvr-user2"); ci->pvr_user2 = fcpu(cpu, "xlnx,pvr-user2");
ci->mmu = fcpu(cpu, "xlnx,use-mmu"); ci->mmu = fcpu(cpu, "xlnx,use-mmu");
ci->endian = fcpu(cpu, "xlnx,endianness");
ci->ver_code = 0; ci->ver_code = 0;
ci->fpga_family_code = 0; ci->fpga_family_code = 0;

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

@ -51,11 +51,12 @@ static int show_cpuinfo(struct seq_file *m, void *v)
count = seq_printf(m, count = seq_printf(m,
"CPU-Family: MicroBlaze\n" "CPU-Family: MicroBlaze\n"
"FPGA-Arch: %s\n" "FPGA-Arch: %s\n"
"CPU-Ver: %s\n" "CPU-Ver: %s, %s endian\n"
"CPU-MHz: %d.%02d\n" "CPU-MHz: %d.%02d\n"
"BogoMips: %lu.%02lu\n", "BogoMips: %lu.%02lu\n",
fpga_family, fpga_family,
cpu_ver, cpu_ver,
cpuinfo.endian ? "little" : "big",
cpuinfo.cpu_clock_freq / cpuinfo.cpu_clock_freq /
1000000, 1000000,
cpuinfo.cpu_clock_freq % cpuinfo.cpu_clock_freq %

1
arch/microblaze/platform/generic/system.dts
View File

@ -85,6 +85,7 @@
xlnx,dynamic-bus-sizing = <0x1>; xlnx,dynamic-bus-sizing = <0x1>;
xlnx,edge-is-positive = <0x1>; xlnx,edge-is-positive = <0x1>;
xlnx,family = "virtex5"; xlnx,family = "virtex5";
xlnx,endianness = <0x1>;
xlnx,fpu-exception = <0x1>; xlnx,fpu-exception = <0x1>;
xlnx,fsl-data-size = <0x20>; xlnx,fsl-data-size = <0x20>;
xlnx,fsl-exception = <0x0>; xlnx,fsl-exception = <0x0>;