Lncvrt/grub
1
0 Fork 0
mirror of https://git.savannah.gnu.org/git/grub.git synced 2026-10-20 22:48:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

i386/memory: Rename PAGE_SHIFT to GRUB_PAGE_SHIFT

Browse Source 
This fixes naming inconsistency that goes against coding style as well
as helps to avoid potential conflicts and confusion as this constant is
used in multiple places.

Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>
Reviewed-by: Ross Philipson <ross.philipson@oracle.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Daniel Kiper committed 2024-10-10 13:10:10 +02:00
1 parent 1b1061409d
commit 95a7bfef5d
4 files changed
+20 -20
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

grub-core/lib/i386/xen/relocator.S
+3 -3
View File
@@ -75,10 +75,10 @@ VARIABLE(grub_relocator_xen_mfn_list)
.long 0 .long 0
movl 0(%eax, %ebp, 4), %ecx /* mfn */ movl 0(%eax, %ebp, 4), %ecx /* mfn */
movl %ebp, %ebx movl %ebp, %ebx
shll $PAGE_SHIFT, %ebx /* virtual address (1:1 mapping) */ shll $GRUB_PAGE_SHIFT, %ebx /* virtual address (1:1 mapping) */
movl %ecx, %edx movl %ecx, %edx
shll $PAGE_SHIFT, %ecx /* prepare pte low part */ shll $GRUB_PAGE_SHIFT, %ecx /* prepare pte low part */
shrl $(32 - PAGE_SHIFT), %edx /* pte high part */ shrl $(32 - GRUB_PAGE_SHIFT), %edx /* pte high part */
orl $(GRUB_PAGE_PRESENT | GRUB_PAGE_USER), %ecx /* pte low */ orl $(GRUB_PAGE_PRESENT | GRUB_PAGE_USER), %ecx /* pte low */
movl $UVMF_INVLPG, %esi movl $UVMF_INVLPG, %esi
movl $__HYPERVISOR_update_va_mapping, %eax movl $__HYPERVISOR_update_va_mapping, %eax
grub-core/lib/x86_64/xen/relocator.S
+2 -2
View File
@@ -60,9 +60,9 @@ LOCAL(cont):
jz 3f jz 3f
2: 2:
movq %r12, %rdi movq %r12, %rdi
shlq $PAGE_SHIFT, %rdi /* virtual address (1:1 mapping) */ shlq $GRUB_PAGE_SHIFT, %rdi /* virtual address (1:1 mapping) */
movq (%rbx, %r12, 8), %rsi /* mfn */ movq (%rbx, %r12, 8), %rsi /* mfn */
shlq $PAGE_SHIFT, %rsi shlq $GRUB_PAGE_SHIFT, %rsi
orq $(GRUB_PAGE_PRESENT | GRUB_PAGE_USER), %rsi /* Build pte */ orq $(GRUB_PAGE_PRESENT | GRUB_PAGE_USER), %rsi /* Build pte */
movq $UVMF_INVLPG, %rdx movq $UVMF_INVLPG, %rdx
movq %rcx, %r9 /* %rcx clobbered by hypercall */ movq %rcx, %r9 /* %rcx clobbered by hypercall */
grub-core/loader/i386/xen.c
+14 -14
View File
@@ -92,7 +92,7 @@ static struct xen_loader_state xen_state;
static grub_dl_t my_mod; static grub_dl_t my_mod;
#define PAGE_SIZE (1UL << PAGE_SHIFT) #define PAGE_SIZE (1UL << GRUB_PAGE_SHIFT)
#define MAX_MODULES (PAGE_SIZE / sizeof (struct xen_multiboot_mod_list)) #define MAX_MODULES (PAGE_SIZE / sizeof (struct xen_multiboot_mod_list))
#define STACK_SIZE 1048576 #define STACK_SIZE 1048576
#define ADDITIONAL_SIZE (1 << 19) #define ADDITIONAL_SIZE (1 << 19)
@@ -103,7 +103,7 @@ static grub_dl_t my_mod;
static grub_uint64_t static grub_uint64_t
page2offset (grub_uint64_t page) page2offset (grub_uint64_t page)
{ {
return page << PAGE_SHIFT; return page << GRUB_PAGE_SHIFT;
} }
static grub_err_t static grub_err_t
@@ -142,7 +142,7 @@ get_pgtable_size (grub_uint64_t from, grub_uint64_t to, grub_uint64_t pfn)
continue; continue;
} }
bits = PAGE_SHIFT + (i + 1) * LOG_POINTERS_PER_PAGE; bits = GRUB_PAGE_SHIFT + (i + 1) * LOG_POINTERS_PER_PAGE;
mask = (1ULL << bits) - 1; mask = (1ULL << bits) - 1;
map->lvls[i].virt_start = map->area.virt_start & ~mask; map->lvls[i].virt_start = map->area.virt_start & ~mask;
map->lvls[i].virt_end = map->area.virt_end | mask; map->lvls[i].virt_end = map->area.virt_end | mask;
@@ -247,11 +247,11 @@ generate_page_table (grub_xen_mfn_t *mfn_list)
if (lvl->virt_start >= end || lvl->virt_end <= start) if (lvl->virt_start >= end || lvl->virt_end <= start)
continue; continue;
p_s = (grub_max (start, lvl->virt_start) - start) >> p_s = (grub_max (start, lvl->virt_start) - start) >>
(PAGE_SHIFT + l * LOG_POINTERS_PER_PAGE); (GRUB_PAGE_SHIFT + l * LOG_POINTERS_PER_PAGE);
p_e = (grub_min (end, lvl->virt_end) - start) >> p_e = (grub_min (end, lvl->virt_end) - start) >>
(PAGE_SHIFT + l * LOG_POINTERS_PER_PAGE); (GRUB_PAGE_SHIFT + l * LOG_POINTERS_PER_PAGE);
pfn = ((grub_max (start, lvl->virt_start) - lvl->virt_start) >> pfn = ((grub_max (start, lvl->virt_start) - lvl->virt_start) >>
(PAGE_SHIFT + l * LOG_POINTERS_PER_PAGE)) + lvl->pfn_start; (GRUB_PAGE_SHIFT + l * LOG_POINTERS_PER_PAGE)) + lvl->pfn_start;
grub_dprintf ("xen", "write page table entries level %d pg %p " grub_dprintf ("xen", "write page table entries level %d pg %p "
"mapping %d/%d index %lx-%lx pfn %llx\n", "mapping %d/%d index %lx-%lx pfn %llx\n",
l, pg, m1, m2, p_s, p_e, (unsigned long long) pfn); l, pg, m1, m2, p_s, p_e, (unsigned long long) pfn);
@@ -329,16 +329,16 @@ grub_xen_p2m_alloc (void)
{ {
err = get_pgtable_size (xen_state.xen_inf.p2m_base, err = get_pgtable_size (xen_state.xen_inf.p2m_base,
xen_state.xen_inf.p2m_base + p2msize, xen_state.xen_inf.p2m_base + p2msize,
(xen_state.max_addr + p2msize) >> PAGE_SHIFT); (xen_state.max_addr + p2msize) >> GRUB_PAGE_SHIFT);
if (err) if (err)
return err; return err;
map->area.pfn_start = xen_state.max_addr >> PAGE_SHIFT; map->area.pfn_start = xen_state.max_addr >> GRUB_PAGE_SHIFT;
p2malloc = p2msize + page2offset (map->area.n_pt_pages); p2malloc = p2msize + page2offset (map->area.n_pt_pages);
xen_state.n_mappings++; xen_state.n_mappings++;
xen_state.next_start.mfn_list = xen_state.xen_inf.p2m_base; xen_state.next_start.mfn_list = xen_state.xen_inf.p2m_base;
xen_state.next_start.first_p2m_pfn = map->area.pfn_start; xen_state.next_start.first_p2m_pfn = map->area.pfn_start;
xen_state.next_start.nr_p2m_frames = p2malloc >> PAGE_SHIFT; xen_state.next_start.nr_p2m_frames = p2malloc >> GRUB_PAGE_SHIFT;
} }
else else
{ {
@@ -381,7 +381,7 @@ grub_xen_special_alloc (void)
xen_state.virt_start_info = get_virtual_current_address (ch); xen_state.virt_start_info = get_virtual_current_address (ch);
xen_state.max_addr = xen_state.max_addr =
ALIGN_UP (xen_state.max_addr + sizeof (xen_state.next_start), PAGE_SIZE); ALIGN_UP (xen_state.max_addr + sizeof (xen_state.next_start), PAGE_SIZE);
xen_state.console_pfn = xen_state.max_addr >> PAGE_SHIFT; xen_state.console_pfn = xen_state.max_addr >> GRUB_PAGE_SHIFT;
xen_state.max_addr += 2 * PAGE_SIZE; xen_state.max_addr += 2 * PAGE_SIZE;
xen_state.next_start.nr_pages = grub_xen_start_page_addr->nr_pages; xen_state.next_start.nr_pages = grub_xen_start_page_addr->nr_pages;
@@ -413,7 +413,7 @@ grub_xen_pt_alloc (void)
xen_state.next_start.pt_base = xen_state.next_start.pt_base =
xen_state.max_addr + xen_state.xen_inf.virt_base; xen_state.max_addr + xen_state.xen_inf.virt_base;
nr_info_pages = xen_state.max_addr >> PAGE_SHIFT; nr_info_pages = xen_state.max_addr >> GRUB_PAGE_SHIFT;
nr_need_pages = nr_info_pages; nr_need_pages = nr_info_pages;
while (1) while (1)
@@ -461,7 +461,7 @@ grub_xen_pt_alloc (void)
xen_state.max_addr + STACK_SIZE + xen_state.xen_inf.virt_base; xen_state.max_addr + STACK_SIZE + xen_state.xen_inf.virt_base;
xen_state.next_start.nr_pt_frames = nr_need_pages; xen_state.next_start.nr_pt_frames = nr_need_pages;
xen_state.max_addr = try_virt_end - xen_state.xen_inf.virt_base; xen_state.max_addr = try_virt_end - xen_state.xen_inf.virt_base;
xen_state.pgtbl_end = xen_state.max_addr >> PAGE_SHIFT; xen_state.pgtbl_end = xen_state.max_addr >> GRUB_PAGE_SHIFT;
xen_state.map_reloc->where = (grub_uint64_t *) ((char *) map->where + xen_state.map_reloc->where = (grub_uint64_t *) ((char *) map->where +
page2offset (map->area.n_pt_pages)); page2offset (map->area.n_pt_pages));
@@ -515,7 +515,7 @@ grub_xen_boot (void)
if (err) if (err)
return err; return err;
nr_pages = xen_state.max_addr >> PAGE_SHIFT; nr_pages = xen_state.max_addr >> GRUB_PAGE_SHIFT;
grub_dprintf ("xen", "bootstrap domain %llx+%llx\n", grub_dprintf ("xen", "bootstrap domain %llx+%llx\n",
(unsigned long long) xen_state.xen_inf.virt_base, (unsigned long long) xen_state.xen_inf.virt_base,
@@ -818,7 +818,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
if (xen_state.xen_inf.unmapped_initrd) if (xen_state.xen_inf.unmapped_initrd)
{ {
xen_state.next_start.flags |= SIF_MOD_START_PFN; xen_state.next_start.flags |= SIF_MOD_START_PFN;
xen_state.next_start.mod_start = xen_state.max_addr >> PAGE_SHIFT; xen_state.next_start.mod_start = xen_state.max_addr >> GRUB_PAGE_SHIFT;
} }
else else
xen_state.next_start.mod_start = xen_state.next_start.mod_start =
include/grub/i386/memory.h
+1 -1
View File
@@ -20,7 +20,7 @@
#ifndef GRUB_MEMORY_CPU_HEADER #ifndef GRUB_MEMORY_CPU_HEADER
#define GRUB_MEMORY_CPU_HEADER 1 #define GRUB_MEMORY_CPU_HEADER 1
#define PAGE_SHIFT 12 #define GRUB_PAGE_SHIFT 12
/* The flag for protected mode. */ /* The flag for protected mode. */
#define GRUB_MEMORY_CPU_CR0_PE_ON 0x1 #define GRUB_MEMORY_CPU_CR0_PE_ON 0x1