mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
Bug-fixes:
* Fix compile issues on ARM. * Fix hypercall fallback code for old hypervisors. * Print out which HVM parameter failed if it fails. * Fix idle notifier call after irq_enter. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQEcBAABAgAGBQJQnQdGAAoJEFjIrFwIi8fJPBAIAMX1HRx3udqhv7fziynZvFTb hj47XYIJHOK7P4fK7vZoSNgMHjL6LW5cUqC8VN67G3zUSkX9JYFsPBj6v4bWn+rG b9CS+MW7hS80LGbbqkh1F+YSEfZ863RlF9PPX2acaHTw49MlIgIqwhxIo6hy+Nm6 thu6SlbEIJkSUdhbYMOAmy5aH/3+UuuQg+oq3P7mzV8fZjEihnrrF0NlT4wOZK1o gsfrKYKJLVT526W9PF/L23/A/MCHMpvjNStpaDLOGNjV9sBMpJI8JRax6+657+q1 0kXvN5mAwTKWOaXBl4LEC9R8n1IKB91TgOY6HJAcXkb1eoP5KAeNSmU8RbsZ2T0= =XZ+0 -----END PGP SIGNATURE----- Merge tag 'stable/for-linus-3.7-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen Pull Xen fixes from Konrad Rzeszutek Wilk: "There are three ARM compile fixes (we forgot to export certain functions and if the drivers are built as an module - we go belly-up). There is also an mismatch of irq_enter() / exit_idle() calls sequence which were fixed some time ago in other piece of codes, but failed to appear in the Xen code. Lastly a fix for to help in the field with troubleshooting in case we cannot get the appropriate parameter and also fallback code when working with very old hypervisors." Bug-fixes: - Fix compile issues on ARM. - Fix hypercall fallback code for old hypervisors. - Print out which HVM parameter failed if it fails. - Fix idle notifier call after irq_enter. * tag 'stable/for-linus-3.7-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen/arm: Fix compile errors when drivers are compiled as modules (export more). xen/arm: Fix compile errors when drivers are compiled as modules. xen/generic: Disable fallback build on ARM. xen/events: fix RCU warning, or Call idle notifier after irq_enter() xen/hvm: If we fail to fetch an HVM parameter print out which flag it is. xen/hypercall: fix hypercall fallback code for very old hypervisors
This commit is contained in:
commit
0020dd0b8c
6 changed files with 132 additions and 17 deletions
|
|
@ -5,6 +5,36 @@
|
|||
#include <xen/interface/hvm/params.h>
|
||||
#include <asm/xen/hypercall.h>
|
||||
|
||||
static const char *param_name(int op)
|
||||
{
|
||||
#define PARAM(x) [HVM_PARAM_##x] = #x
|
||||
static const char *const names[] = {
|
||||
PARAM(CALLBACK_IRQ),
|
||||
PARAM(STORE_PFN),
|
||||
PARAM(STORE_EVTCHN),
|
||||
PARAM(PAE_ENABLED),
|
||||
PARAM(IOREQ_PFN),
|
||||
PARAM(BUFIOREQ_PFN),
|
||||
PARAM(TIMER_MODE),
|
||||
PARAM(HPET_ENABLED),
|
||||
PARAM(IDENT_PT),
|
||||
PARAM(DM_DOMAIN),
|
||||
PARAM(ACPI_S_STATE),
|
||||
PARAM(VM86_TSS),
|
||||
PARAM(VPT_ALIGN),
|
||||
PARAM(CONSOLE_PFN),
|
||||
PARAM(CONSOLE_EVTCHN),
|
||||
};
|
||||
#undef PARAM
|
||||
|
||||
if (op >= ARRAY_SIZE(names))
|
||||
return "unknown";
|
||||
|
||||
if (!names[op])
|
||||
return "reserved";
|
||||
|
||||
return names[op];
|
||||
}
|
||||
static inline int hvm_get_parameter(int idx, uint64_t *value)
|
||||
{
|
||||
struct xen_hvm_param xhv;
|
||||
|
|
@ -14,8 +44,8 @@ static inline int hvm_get_parameter(int idx, uint64_t *value)
|
|||
xhv.index = idx;
|
||||
r = HYPERVISOR_hvm_op(HVMOP_get_param, &xhv);
|
||||
if (r < 0) {
|
||||
printk(KERN_ERR "Cannot get hvm parameter %d: %d!\n",
|
||||
idx, r);
|
||||
printk(KERN_ERR "Cannot get hvm parameter %s (%d): %d!\n",
|
||||
param_name(idx), idx, r);
|
||||
return r;
|
||||
}
|
||||
*value = xhv.value;
|
||||
|
|
|
|||
Loading…
Reference in a new issue