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

2004-10-28 Hollis Blanchard <hollis@penguinppc.org>

Browse source 
* boot/powerpc/ieee1275/cmain.c (cmain): Remove asm statements
	which initialized BAT registers.
	* boot/powerpc/ieee1275/ieee1275.c (IEEE1275_CALL_ENTRY_FN,
	grub_ieee1275_common_hdr, INIT_IEEE1275_COMMON):
	Move from here...
	* include/grub/powerpc/ieee1275/ieee1275.h (IEEE1275_CALL_ENTRY_FN,
	grub_ieee1275_common_hdr, INIT_IEEE1275_COMMON):
	... to here.
	* kern/powerpc/ieee1275/openfw.c (grub_map): New function.
	(grub_mapclaim): Likewise.
	* loader/powerpc/ieee1275/linux.c (grub_load_linux): Use
	grub_mapclaim instead of grub_ieee1275_claim.  Assign linux_addr by
	hand.
This commit is contained in:
hollisb 2004-10-29 02:45:14 +00:00
parent 9304c1f804
commit a5477a5930
6 changed files with 95 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

54
kern/powerpc/ieee1275/openfw.c
View file

@ -137,3 +137,57 @@ grub_devalias_iterate (int (*hook) (struct grub_ieee1275_devalias *alias))
return 0;
}
/* Call the "map" method of /chosen/mmu. */
int
grub_map (grub_addr_t phys, grub_addr_t virt, grub_uint32_t size,
grub_uint8_t mode)
{
struct map_args {
struct grub_ieee1275_common_hdr common;
char *method;
grub_ieee1275_ihandle_t ihandle;
grub_uint32_t mode;
grub_uint32_t size;
grub_uint32_t virt;
grub_uint32_t phys;
int catch_result;
} args;
grub_ieee1275_ihandle_t mmu;
grub_ieee1275_ihandle_t chosen;
int len;
grub_ieee1275_finddevice ("/chosen", &chosen);
if (chosen == 0)
return -1;
grub_ieee1275_get_property (chosen, "mmu", &mmu, sizeof mmu, &len);
if (len != sizeof mmu)
return -1;
INIT_IEEE1275_COMMON (&args.common, "call-method", 6, 1);
args.method = "map";
args.ihandle = mmu;
args.phys = phys;
args.virt = virt;
args.size = size;
args.mode = mode; /* Format is WIMG0PP. */
if (IEEE1275_CALL_ENTRY_FN (&args) == -1)
return -1;
return args.catch_result;
}
int
grub_claimmap (grub_addr_t addr, grub_size_t size)
{
if (grub_ieee1275_claim (addr, size, 0, 0))
return -1;
if (grub_map (addr, addr, size, 0x00))
{
grub_ieee1275_release (addr, size);
return -1;
}
return 0;
}