vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix ARM cpuid probing

Browse source
This commit is contained in:
Francesco Lavra 2013-06-07 16:56:24 +02:00 committed by Vladimir 'phcoder' Serbinenko
parent 2a800dc3f3
commit d60c9a81ac
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
grub-core/kern/arm/cache.c
View file

@ -29,8 +29,7 @@ probe_caches (void)
/* Read main ID Register */ /* Read main ID Register */
asm volatile ("mrc p15, 0, %0, c0, c0, 0": "=r"(main_id)); asm volatile ("mrc p15, 0, %0, c0, c0, 0": "=r"(main_id));
if (((main_id >> 12) & 0xf) == 0x0 || ((main_id >> 12) & 0xf) == 0x7 if (((main_id >> 16) & 0x7) != 0x7)
|| (((main_id >> 16) & 0x7) != 0x7))
grub_fatal ("Unsupported ARM ID 0x%x", main_id); grub_fatal ("Unsupported ARM ID 0x%x", main_id);
/* Read Cache Type Register */ /* Read Cache Type Register */
@ -56,7 +55,7 @@ probe_caches (void)
grub_arch_cache_ilinesz = 8 << (cache_type & 3); grub_arch_cache_ilinesz = 8 << (cache_type & 3);
type = ARCH_ARMV6; type = ARCH_ARMV6;
break; break;
case 0x80 ... 0x9f: case 0x80 ... 0x8f:
grub_arch_cache_dlinesz = 4 << ((cache_type >> 16) & 0xf); grub_arch_cache_dlinesz = 4 << ((cache_type >> 16) & 0xf);
grub_arch_cache_ilinesz = 4 << (cache_type & 0xf); grub_arch_cache_ilinesz = 4 << (cache_type & 0xf);
type = ARCH_ARMV7; type = ARCH_ARMV7;