Merge mainline into newreloc. For now without boot tests
This commit is contained in:
Vladimir 'phcoder' Serbinenko
commit
16bd6cfab2
625 changed files with 45066 additions and 10823 deletions
142
grub-core/lib/ieee1275/datetime.c
Normal file
142
grub-core/lib/ieee1275/datetime.c
Normal file
|
|
@ -0,0 +1,142 @@
|
|||
/* kern/cmos_datetime.c - CMOS datetime function.
|
||||
*
|
||||
* GRUB -- GRand Unified Bootloader
|
||||
* Copyright (C) 2008,2009 Free Software Foundation, Inc.
|
||||
*
|
||||
* GRUB is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* GRUB is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <grub/datetime.h>
|
||||
#include <grub/ieee1275/ieee1275.h>
|
||||
#include <grub/misc.h>
|
||||
|
||||
static char *rtc = 0;
|
||||
|
||||
static void
|
||||
find_rtc (void)
|
||||
{
|
||||
auto int hook (struct grub_ieee1275_devalias *alias);
|
||||
int hook (struct grub_ieee1275_devalias *alias)
|
||||
{
|
||||
if (grub_strcmp (alias->type, "rtc") == 0)
|
||||
{
|
||||
grub_dprintf ("datetime", "Found RTC %s\n", alias->path);
|
||||
rtc = grub_strdup (alias->path);
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
grub_ieee1275_devices_iterate (hook);
|
||||
}
|
||||
|
||||
grub_err_t
|
||||
grub_get_datetime (struct grub_datetime *datetime)
|
||||
{
|
||||
struct get_time_args
|
||||
{
|
||||
struct grub_ieee1275_common_hdr common;
|
||||
grub_ieee1275_cell_t method;
|
||||
grub_ieee1275_cell_t device;
|
||||
grub_ieee1275_cell_t catch_result;
|
||||
grub_ieee1275_cell_t year;
|
||||
grub_ieee1275_cell_t month;
|
||||
grub_ieee1275_cell_t day;
|
||||
grub_ieee1275_cell_t hour;
|
||||
grub_ieee1275_cell_t minute;
|
||||
grub_ieee1275_cell_t second;
|
||||
}
|
||||
args;
|
||||
int status;
|
||||
grub_ieee1275_ihandle_t ihandle;
|
||||
|
||||
if (!rtc)
|
||||
find_rtc ();
|
||||
if (!rtc)
|
||||
return grub_error (GRUB_ERR_IO, "no RTC found");
|
||||
|
||||
status = grub_ieee1275_open (rtc, &ihandle);
|
||||
if (status == -1)
|
||||
return grub_error (GRUB_ERR_IO, "couldn't open RTC");
|
||||
|
||||
INIT_IEEE1275_COMMON (&args.common, "call-method", 2, 7);
|
||||
args.device = (grub_ieee1275_cell_t) ihandle;
|
||||
args.method = (grub_ieee1275_cell_t) "get-time";
|
||||
|
||||
status = IEEE1275_CALL_ENTRY_FN (&args);
|
||||
|
||||
grub_ieee1275_close (ihandle);
|
||||
|
||||
if (status == -1)
|
||||
return grub_error (GRUB_ERR_IO, "get-time failed");
|
||||
|
||||
datetime->year = args.year;
|
||||
datetime->month = args.month;
|
||||
datetime->day = args.day;
|
||||
datetime->hour = args.hour;
|
||||
datetime->minute = args.minute;
|
||||
datetime->second = args.second;
|
||||
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
||||
grub_err_t
|
||||
grub_set_datetime (struct grub_datetime *datetime)
|
||||
{
|
||||
struct set_time_args
|
||||
{
|
||||
struct grub_ieee1275_common_hdr common;
|
||||
grub_ieee1275_cell_t method;
|
||||
grub_ieee1275_cell_t device;
|
||||
grub_ieee1275_cell_t year;
|
||||
grub_ieee1275_cell_t month;
|
||||
grub_ieee1275_cell_t day;
|
||||
grub_ieee1275_cell_t hour;
|
||||
grub_ieee1275_cell_t minute;
|
||||
grub_ieee1275_cell_t second;
|
||||
grub_ieee1275_cell_t catch_result;
|
||||
}
|
||||
args;
|
||||
int status;
|
||||
grub_ieee1275_ihandle_t ihandle;
|
||||
|
||||
if (!rtc)
|
||||
find_rtc ();
|
||||
if (!rtc)
|
||||
return grub_error (GRUB_ERR_IO, "no RTC found");
|
||||
|
||||
status = grub_ieee1275_open (rtc, &ihandle);
|
||||
if (status == -1)
|
||||
return grub_error (GRUB_ERR_IO, "couldn't open RTC");
|
||||
|
||||
INIT_IEEE1275_COMMON (&args.common, "call-method", 8, 1);
|
||||
args.device = (grub_ieee1275_cell_t) ihandle;
|
||||
args.method = (grub_ieee1275_cell_t) "set-time";
|
||||
|
||||
args.year = datetime->year;
|
||||
args.month = datetime->month;
|
||||
args.day = datetime->day;
|
||||
args.hour = datetime->hour;
|
||||
args.minute = datetime->minute;
|
||||
args.second = datetime->second;
|
||||
|
||||
status = IEEE1275_CALL_ENTRY_FN (&args);
|
||||
|
||||
grub_ieee1275_close (ihandle);
|
||||
|
||||
if (status == -1)
|
||||
return grub_error (GRUB_ERR_IO, "set-time failed");
|
||||
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
95
grub-core/lib/ieee1275/relocator.c
Normal file
95
grub-core/lib/ieee1275/relocator.c
Normal file
|
|
@ -0,0 +1,95 @@
|
|||
/*
|
||||
* GRUB -- GRand Unified Bootloader
|
||||
* Copyright (C) 2010 Free Software Foundation, Inc.
|
||||
*
|
||||
* GRUB is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* GRUB is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <grub/relocator.h>
|
||||
#include <grub/relocator_private.h>
|
||||
#include <grub/memory.h>
|
||||
#include <grub/ieee1275/ieee1275.h>
|
||||
|
||||
unsigned
|
||||
grub_relocator_firmware_get_max_events (void)
|
||||
{
|
||||
int counter = 0;
|
||||
auto int NESTED_FUNC_ATTR count (grub_uint64_t addr __attribute__ ((unused)),
|
||||
grub_uint64_t len __attribute__ ((unused)),
|
||||
grub_uint32_t type __attribute__ ((unused)));
|
||||
int NESTED_FUNC_ATTR count (grub_uint64_t addr __attribute__ ((unused)),
|
||||
grub_uint64_t len __attribute__ ((unused)),
|
||||
grub_uint32_t type __attribute__ ((unused)))
|
||||
{
|
||||
counter++;
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_CANNOT_INTERPRET))
|
||||
return 0;
|
||||
grub_machine_mmap_iterate (count);
|
||||
return 2 * counter;
|
||||
}
|
||||
|
||||
unsigned
|
||||
grub_relocator_firmware_fill_events (struct grub_relocator_mmap_event *events)
|
||||
{
|
||||
int counter = 0;
|
||||
auto int NESTED_FUNC_ATTR fill (grub_uint64_t addr, grub_uint64_t len,
|
||||
grub_uint32_t type);
|
||||
int NESTED_FUNC_ATTR fill (grub_uint64_t addr, grub_uint64_t len,
|
||||
grub_uint32_t type)
|
||||
{
|
||||
if (type != GRUB_MACHINE_MEMORY_AVAILABLE)
|
||||
return 0;
|
||||
|
||||
if (grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_NO_PRE1_5M_CLAIM))
|
||||
{
|
||||
if (addr + len <= 0x180000)
|
||||
return 0;
|
||||
|
||||
if (addr < 0x180000)
|
||||
{
|
||||
len = addr + len - 0x180000;
|
||||
addr = 0x180000;
|
||||
}
|
||||
}
|
||||
|
||||
events[counter].type = REG_FIRMWARE_START;
|
||||
events[counter].pos = addr;
|
||||
counter++;
|
||||
events[counter].type = REG_FIRMWARE_END;
|
||||
events[counter].pos = addr + len;
|
||||
counter++;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_CANNOT_INTERPRET))
|
||||
return 0;
|
||||
grub_machine_mmap_iterate (fill);
|
||||
return counter;
|
||||
}
|
||||
|
||||
int
|
||||
grub_relocator_firmware_alloc_region (grub_addr_t start, grub_size_t size)
|
||||
{
|
||||
return (grub_claimmap (start, size) >= 0);
|
||||
}
|
||||
|
||||
void
|
||||
grub_relocator_firmware_free_region (grub_addr_t start, grub_size_t size)
|
||||
{
|
||||
grub_ieee1275_release (start, size);
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue