f9294e989f
For 32-bit, CONFIG_EPAPR_PARAVIRT pulls in both epapr_paravirt.c and epapr_hcalls.c which contains the 32-bit paravirt idle loop. For 64-bit, the paravirt idle loop is in idle_book3e.S and that source file is included only if CONFIG_PPC_BOOK3E_64 defined. This patch makes that dependency for 64-bit explicit. Fixes these build errors: arch/powerpc/kernel/built-in.o: In function `restore_pblist_ptr': ftrace.c:(.toc+0xdc0): undefined reference to `epapr_ev_idle_start' ftrace.c:(.toc+0xdd0): undefined reference to `epapr_ev_idle' Signed-off-by: Stuart Yoder <stuart.yoder@freescale.com> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
68 lines
1.8 KiB
C
68 lines
1.8 KiB
C
/*
|
|
* ePAPR para-virtualization support.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License, version 2, as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
* This program 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 this program; if not, write to the Free Software
|
|
* Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*
|
|
* Copyright (C) 2012 Freescale Semiconductor, Inc.
|
|
*/
|
|
|
|
#include <linux/of.h>
|
|
#include <asm/epapr_hcalls.h>
|
|
#include <asm/cacheflush.h>
|
|
#include <asm/code-patching.h>
|
|
#include <asm/machdep.h>
|
|
|
|
#if !defined(CONFIG_64BIT) || defined(CONFIG_PPC_BOOK3E_64)
|
|
extern void epapr_ev_idle(void);
|
|
extern u32 epapr_ev_idle_start[];
|
|
#endif
|
|
|
|
bool epapr_paravirt_enabled;
|
|
|
|
static int __init epapr_paravirt_init(void)
|
|
{
|
|
struct device_node *hyper_node;
|
|
const u32 *insts;
|
|
int len, i;
|
|
|
|
hyper_node = of_find_node_by_path("/hypervisor");
|
|
if (!hyper_node)
|
|
return -ENODEV;
|
|
|
|
insts = of_get_property(hyper_node, "hcall-instructions", &len);
|
|
if (!insts)
|
|
return -ENODEV;
|
|
|
|
if (len % 4 || len > (4 * 4))
|
|
return -ENODEV;
|
|
|
|
for (i = 0; i < (len / 4); i++) {
|
|
patch_instruction(epapr_hypercall_start + i, insts[i]);
|
|
#if !defined(CONFIG_64BIT) || defined(CONFIG_PPC_BOOK3E_64)
|
|
patch_instruction(epapr_ev_idle_start + i, insts[i]);
|
|
#endif
|
|
}
|
|
|
|
#if !defined(CONFIG_64BIT) || defined(CONFIG_PPC_BOOK3E_64)
|
|
if (of_get_property(hyper_node, "has-idle", NULL))
|
|
ppc_md.power_save = epapr_ev_idle;
|
|
#endif
|
|
|
|
epapr_paravirt_enabled = true;
|
|
|
|
return 0;
|
|
}
|
|
|
|
early_initcall(epapr_paravirt_init);
|