Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
181 commits
Select commit Hold shift + click to select a range
2f6ab0f
PCI: add pci_devices_ignore cmdline option
yonghuah Aug 31, 2018
e59f87d
VHM: add vhm char device driver
polarisdll Aug 31, 2018
6422378
VHM: add guest memory management support
JasonChenCJ Aug 31, 2018
94fc7e4
VHM: add guest memory remote mapping support
x56Jason Aug 31, 2018
9f56100
VHM: add ioreq service support
JasonChenCJ Aug 31, 2018
6ca8671
VHM: add interrupt injection support
polarisdll Dec 29, 2017
f14897f
VHM: add API to get vm info
JasonChenCJ Aug 31, 2018
eacf4cd
VHM: add API to do guest gpa2hpa translation
JasonChenCJ Aug 31, 2018
56fe2f3
VHM: add passthrough device support
binbinwu1 Aug 31, 2018
38ae4fc
sos: cleanup hypercall API
mingqiangchi Aug 31, 2018
cd9c26f
vcpu: export vcpu create interface to DM
fyin1 Aug 31, 2018
9e32b01
sos: Update the common head file
mingqiangchi Aug 31, 2018
d8bebeb
sos: cleanup ptdev irq structure
binbinwu1 Aug 31, 2018
73db539
VBS-K (Virtio Backend Service in Kernel): a kernel-level virtio frame…
lihao-intel Aug 31, 2018
61936f3
VBS-K: virtqueue initialization API.
lihao-intel Aug 31, 2018
a6a36c4
VBS-K: virtqueue runtime API.
lihao-intel Aug 31, 2018
1bdc0eb
VBS-K: added a VBS-K reference driver.
lihao-intel Aug 31, 2018
43dc3f2
hypercall: refine hypercall interfaces
JasonChenCJ Aug 31, 2018
148a14b
vhm: refine vm related hypercall/ioctrl
fyin1 Aug 31, 2018
6ac8c6d
hypercall: refine HC ID and parameter number
JasonChenCJ Aug 31, 2018
c4fb8b4
ioctl: cleanup ioctl structure
gzhai7 Aug 31, 2018
f8cc410
Shared_buf: add shared buffer
lifeix Aug 31, 2018
f204608
Shared_buf: added hypercall for shared_buf setup
lifeix Aug 31, 2018
4ef60c3
ACRNTrace: add acrn trace module
lifeix Aug 31, 2018
2f5fea1
vhm: cleanup ioctls
gzhai7 Aug 31, 2018
0d55634
VHM: check HV api version for VHM module init
JasonChenCJ Aug 31, 2018
315aad9
VHM: add VHM api version support
JasonChenCJ Aug 31, 2018
98ce5a6
virtio framework: support ACRN virtio devices
lihao-intel Aug 31, 2018
e5758b8
VHM: sync public header file acrn_common.h
JasonChenCJ Aug 31, 2018
617963b
Check x86_hyper type before doing hypercall
JasonChenCJ Aug 31, 2018
af04e2c
VHM: replace function name update_mmio_map with update_memmap_attr
JasonChenCJ Aug 31, 2018
f78e329
VHM: refine memory segment interface
JasonChenCJ Aug 31, 2018
119c2c6
VBS-K: added VHM wrapper APIs
lihao-intel Jan 25, 2018
8763ebb
api doc: add ACRN VBS API docs
lihao-intel Aug 31, 2018
5a5fbca
HVLog: reserve memory for ACRN HVLog
lifeix Aug 31, 2018
d30dfe2
HVLog: add HVLog module
lifeix Aug 31, 2018
3ccdc2e
update MEM_ATTR_WRITE_PROT with WB policy
JasonChenCJ Aug 31, 2018
63113b4
vhm: modify mmio/memory map/unmap api
mingqiangchi Aug 31, 2018
9133952
vhm cleanup: update one field name in vhm
fyin1 Aug 31, 2018
74b4547
sos: add a config for VHM
shiqingg Aug 31, 2018
f23546c
api doc: add vhm API docs
fyin1 Aug 31, 2018
27ad63e
api doc: update ACRN VBS API docs
lihao-intel Aug 31, 2018
121eda9
license: update intel license for ACRN VBS
lihao-intel Aug 31, 2018
c17ae40
VBS-K: fix compilation warnings in VBS-K reference driver
lihao-intel Aug 31, 2018
a86cddc
Cleanup Kconfig
lyan3 Aug 31, 2018
8092662
skip sbuf and vhm initialization when booting natively
jren1 Aug 31, 2018
c76c97a
VHM: add hugetlb page ept mapping support
JasonChenCJ Aug 31, 2018
c872fe1
VHM: change VM_SYSMEM/VM_MMIO to VM_MEMMAP_SYSMEM/VM_MEMMAP_MMIO
JasonChenCJ Aug 31, 2018
d84e744
VHM: add hash table support for huge pages
JasonChenCJ Aug 31, 2018
8d8ac1e
VHM: add service to support px data transition
jsun26intel Aug 31, 2018
a8a3dcf
sos: sync common header file
mingqiangchi Aug 31, 2018
15f3812
sos_kernel: export reset vm function to DM.
fyin1 Aug 31, 2018
00f6175
VHM: add service to support cx data transition
jsun26intel Apr 18, 2018
8581db2
vhm: add set_memmaps hypercall support
JasonChenCJ Aug 31, 2018
1ba90f2
vhm: use set memmaps hypercall for hugetlb
JasonChenCJ Aug 31, 2018
c8b7e7f
vhm: prepare future update for struct vm_set_memmap
JasonChenCJ Aug 31, 2018
301d209
VHM: bug fix on operating multi-thread synchronization
zhenggen Aug 31, 2018
5520974
VHM:Update cpu id type as uint16_t for struct acrn_create_vcpu
wuxyintel Aug 31, 2018
55f7747
vhm: add sos offline cpu support
JasonChenCJ Aug 31, 2018
ffd548e
vhm: Fix kernel-doc issues
xinyunliu Aug 31, 2018
78bdaf4
vhm: add trusty init/de-init support
mingqiangchi Aug 31, 2018
c64ab94
vhm: fix kerneldoc format
xinyunliu Aug 31, 2018
6573603
sos: vhm: remove set guest memory map by CMA
lifeix Aug 31, 2018
168cd39
sos: vhm: remove hugetlb_enabled flag
lifeix Aug 31, 2018
99d8152
sos: vhm: remove MAP_MMIO
lifeix Aug 31, 2018
f64826f
vhm: revisit types in structure parameters of hypercalls
junjiemao1 Aug 31, 2018
5dfa602
sos: vhm: add hcall_write_protect_page hypercall
lifeix Aug 31, 2018
d7c5d4b
sos: vhm: refine set memory region API
lifeix Aug 31, 2018
03a8582
vhm: remove re-schedule for ioreq tasklet
Aug 31, 2018
fc59e90
vhm: Add vcpu_num to record vcpu number of each VM
Aug 31, 2018
3e2ccfb
vhm: mark pending ioreqs in bitmap then dispatch it to vhm client
Aug 31, 2018
126cc40
vhm: use correct string length
Aug 31, 2018
9179947
vhm: adapt to the new state transition of VHM requests
junjiemao1 Aug 31, 2018
3e6f099
vhm: Add error handling for IC_CREATE_VM ioctl
Aug 31, 2018
b719bdf
vhm: setup ioreq shared buf in IC_CREATE_VM ioctl
Aug 31, 2018
724543c
VBS-K: add virtio_dev_reset
chejianj Aug 31, 2018
5366df3
VBS-K: Check whether vhm_client_id is valid before deregister
chejianj Aug 31, 2018
5470750
VBS-K: add reset support for vbs_rng
chejianj Aug 31, 2018
9a47a3f
VBS-K: fix a bug due to incorrect check of return value of bitmap_empty
chejianj Aug 31, 2018
77e46b5
VHM: remove panic action when ioreq fails.
mgcao Aug 31, 2018
74fc757
vbs: fix virtio_vq_index_get func handling of multi VQ concurrent req…
yuonghock Aug 31, 2018
2b064a1
vhm: init client->kthread_exit true
zhijianli88 Aug 22, 2018
a9f7770
vhm: fix client use-after-free
zhijianli88 Aug 31, 2018
523059b
Adds new API for unmap memseg
gzhai7 Sep 5, 2018
d998bc6
sos: vhm: add HC_SETUP_HV_NPK_LOG hypercall
zjin7 Aug 1, 2018
587a1cf
acrn: add hv_npk_log module
zjin7 Aug 1, 2018
04c4c95
Adding kernel parameter for forcing xapic in physical mode
Sep 13, 2018
0b3c159
VHM: Add EXPORT_SYMBOL for VHM API function so that it can be used by…
fei-yang Sep 21, 2018
f2c741c
vhm: deinit trusty after hcall_destroy_vm
JasonChenCJ Sep 8, 2018
15648e8
VHM: add ioctl/hypercall for UOS intr data monitor
mgcao Aug 8, 2018
e5540c9
vhm: enable -Werror while compiling vhm/vbs/hyper-dmabuf
Sep 20, 2018
d9e5fbf
vhm: change trace_printk of vhm_dev_ioctl to pr_debug
Sep 29, 2018
ee2b7a0
vhm: add ioeventfd support for ACRN hypervisor service module
Jul 11, 2018
263800a
vhm: add irqfd support for ACRN hypervisor service module
Jul 12, 2018
bc73869
vhm: add ioctl for set/clear IRQ line
yonghuah Sep 26, 2018
c793d44
sos: vhm: add hypercall to set guest vcpu registers
fyin1 Aug 23, 2018
d6d753e
Kernel/Acrn: Use HYPERVISOR_CALLBACK_VECTOR for Acrn upcall vector
Oct 16, 2018
0db93cd
VHM: Add one hypercall to configure the up-notifier interrupt vector
Oct 16, 2018
5685ffe
VHM: Setup the driver ISR for hypervisor up-notification vector
Oct 16, 2018
4ca7b24
Add support for hypercalls for sep and socwatch tool support
mchinth Oct 23, 2018
c694bc8
vhm: Add ioctl IC_CLEAR_VM_IOREQ to cleanup VM ioreqs
Oct 12, 2018
32f1380
vhm: mark ioreq completed in acrn_ioreq_complete_request
Sep 24, 2018
d1123a6
vhm: support polling mode of ioreq completion
Oct 30, 2018
1b93a24
vhm: remove "reserve memory for trusty"
lifeix Nov 28, 2018
dc11d3c
Kernel/VHM: Use the bit_op to remove the volatile definition in ioreq…
Nov 29, 2018
378eddb
Kernel/VHM: Use the traped pci_access addr based on VM instead of sta…
Nov 29, 2018
ea57fc0
kernel/VHM: Fix race condition in ioreq_client by using refcnt and id…
Nov 29, 2018
12d76cb
Kernel/VHM: refine the refcnt of vhm_vm so that vhm_vm exists before …
Dec 6, 2018
c08dcff
VHM: Check null-pointer of vhm_req before updating state of emulated …
Dec 14, 2018
7332061
kernel/VHM: Add the vm owner for each ioreq_client to release vhm_vm …
Dec 18, 2018
ec48eb1
Kernel/VHM: VM_list changes the lock from mutex to rw_lock to avoid s…
Dec 18, 2018
470a30a
Kernel/VHM: Refine the usage of spinlock in VHM
Dec 18, 2018
f9508b0
VBS-K: use kernel virtio header files
chejianj Dec 6, 2018
865fce5
VHM: Add one hypercall to query hardware info
KaigeFu Dec 6, 2018
2b856c6
HVLog: Refine acrn_hvlog to remove the limitation on fixed CPU number
KaigeFu Dec 12, 2018
44918fc
ACRNTrace: Refine acrn trace module to remove the limitation on fixed…
KaigeFu Dec 13, 2018
952e9c8
kernel: Sync the common header file
mingqiangchi Jan 10, 2019
8ed306a
vhm: remove the flooding log from vhm
fyin1 Jan 17, 2019
2ec367c
kernel/vhm:Add some debugs to print the client id/name for create/des…
Mar 8, 2019
359243e
acrn: fix used uninitialized warning
KaigeFu Feb 21, 2019
155741d
gpio virtio frontend driver
yliu80 Jan 18, 2019
9ba83c7
add an IRQ chip to gpio-virtio GPIO chip.
yliu80 Feb 27, 2019
d6edb61
ACRN: hvlog: check whether it's ACRN before init hvlog
fyin1 Apr 12, 2019
53c19f3
fix possible nulll pointer dereference in ACRN VHM
yonghuah Apr 22, 2019
ee087d9
acrn/vhm: HC_ASSIGN_PTDEV passes the bdf directly instead of guest ph…
Apr 23, 2019
befc24c
acrn/vhm: Use the mempool to allocate the buffer for hypercall parameter
Apr 12, 2019
1573e4b
acrn/vhm: Change some stack variable of hypercall parameter as static
Apr 12, 2019
0798262
acrn/vhm/Kconfig: Remove the limitation that acrn can't work with VMA…
Apr 12, 2019
afcdbb0
vhm: simplify bdf_match check
xinyunliu Feb 21, 2019
bd8cbcc
vhm: Emulate PCI extended cfg mmio access as PCI request
xinyunliu Feb 21, 2019
e850391
vhm:Expose ACRN IOCTL interface to get platform information
yonghuah Apr 16, 2019
810d608
acrn_hvlog:use ioremap for hvlog to avoid memory crash
fuyanX May 13, 2019
bbd3ed1
vbs: set memory barrier for virtio_vq
gaojunhao0504 May 30, 2019
cc0edf2
ded support for new hypercall
mchinth Jun 20, 2019
152ffa5
vhm: destroy VM and release all its resources while closing vhm device
Nov 30, 2018
29948a0
virtio: virtio polling mode POC
gaojunhao0504 Jun 6, 2019
985855c
virtio: enable polling mode for virtio-net
gaojunhao0504 Jun 5, 2019
029171e
virtio: enable polling mode for virtio-blk
gaojunhao0504 Jun 5, 2019
69dc8b0
virtio: enable polling mode for virtio-console
gaojunhao0504 Jun 5, 2019
28f8e94
virtio: enable polling mode for virtio-input
gaojunhao0504 Jun 5, 2019
25b2723
virtio: add VIRTIO_PMD menuconfig
gaojunhao0504 Jun 5, 2019
f9a1c95
ACRN: don't init SCI/GL handler for ACRN RT VM
lyan3 Jun 11, 2019
75f4c93
virtio: enable polling mode for virtio-rnd
gaojunhao0504 Jun 11, 2019
28afdbd
add support for virtio-i2c FE driver
conghuic23 Jun 26, 2019
297a93f
kernel:fix acrn-dm can not exit in some case
mingqiangchi Jul 26, 2019
58ee2e3
ACRN: Add the kernel_config for SOS/UOS
Oct 8, 2018
4211bdd
Add the EFI support to unify one kernel_config for NUC
Oct 19, 2018
e52958a
ASoC: SOF: (cosmetic) remove platform device left-over
lyakh Jun 28, 2019
a5b5c8b
drm/i915/gvt: add acrngt support
Sep 14, 2018
6a40ff9
i915: fix for ACRN
lyakh Jul 9, 2019
ed6920e
VHM: fix an uninitialised variable warning
lyakh Jul 9, 2019
3c2c847
ASoC: Intel: add machine driver for BXT/APL with pcm512x codec
plbossart Apr 23, 2018
b50e8ce
ASoC: SOF: hda: set autosuspend delay for hda bus device
ranj063 May 24, 2019
4f9d00b
ASoC: (cosmetic) simplify a function
lyakh Aug 28, 2019
32e14e5
ASoC: SOF: Intel: handle firmware panic first
lyakh Aug 28, 2019
57c3117
ASoC: SOF: HDA: Intel: initialise elapsed period work
lyakh Aug 28, 2019
2707f76
ASoC: SOF: fix a memory leak on an error path
lyakh Aug 28, 2019
47a3986
ASoC: SOF: (cosmetic) simplify a function
lyakh Aug 28, 2019
e1d6a1c
ASoC: SOF: (cosmetic) use an existing variable
lyakh Aug 28, 2019
7c23df2
ASoC: SOF: fix pipeline completion logic
lyakh Aug 28, 2019
3ade027
ASoC: [cosmetic] clean up
lyakh Sep 13, 2019
7fd6f4d
ACRN: fix remaining CONFIG_ACRN uses
lyakh Sep 30, 2019
5e4d2f8
sound: remove a redundant check
lyakh Sep 30, 2019
411c2a7
sound: remove a redundant initialisation
lyakh Sep 30, 2019
768b8b8
ASoC: remove a redundant loop
lyakh Sep 30, 2019
8b7b509
ASoC: Intel: update the bxt_pcm512x.c machine driver
lyakh Sep 30, 2019
1ee9df3
ASoC: Intel: use an accessor instead of open-coding
lyakh Sep 30, 2019
c463c91
ASoC: add function parameters to enable forced path pruning
lyakh Sep 30, 2019
3b00591
ASoC: (cosmetic) simplify a function and fix indentation
lyakh Sep 30, 2019
a3d9238
ASoC: SOF: Intel: make a function static
lyakh Sep 30, 2019
4e15579
ASoC: SOF: (cosmetic) fix indentation
lyakh Sep 30, 2019
306e7cb
ASoC: SOF: Intel: re-use the struct sof_intel_stream
lyakh Sep 30, 2019
e549e57
ASoC: SOF: extract firmware-related operation into a function
lyakh Sep 30, 2019
f18f4f3
ASoC: SOF: (cosmetic) simplify calculations
lyakh Sep 30, 2019
f6862fa
ASoC: SOF: IPC: fix error handling
lyakh Sep 30, 2019
8d05bdd
ASoC: SOF: IPC: eliminate a memcpy()
lyakh Sep 30, 2019
f14b089
sound: use PFN_UP() instead of snd_sgbuf_aligned_pages()
lyakh Oct 29, 2019
1c2bbe3
vhost: add a DSP driver
lyakh Oct 29, 2019
2f15984
ASoC: SOF: (cosmetic) add a missing header
lyakh Oct 29, 2019
040ce68
ASoC: SOF: do not propagate a positive return code
lyakh Oct 29, 2019
dca67d7
ASoC: SOF: add a VirtIO DSP driver
lyakh Oct 29, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Documentation/virtual/acrn/00-INDEX
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
00-INDEX
- this file.
index.rst
- Index.
vhm.rst
- virtio and hypervisor service module (VHM) APIs.
vbs.rst
- virtio and backend service (VBS) APIs.
5 changes: 5 additions & 0 deletions Documentation/virtual/acrn/conf.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# -*- coding: utf-8; mode: python -*-

project = "ACRN Project"

tags.add("subproject")
17 changes: 17 additions & 0 deletions Documentation/virtual/acrn/index.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
.. -*- coding: utf-8; mode: rst -*-

=============================
ACRN Project
=============================

.. toctree::

vbs.rst
vhm.rst

.. only:: subproject

Indices
=======

* :ref:`genindex`
20 changes: 20 additions & 0 deletions Documentation/virtual/acrn/vbs.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
================================
Virtio and Backend Service (VBS)
================================

The Virtio and Backend Service (VBS) in part of ACRN Project.

The VBS can be further divided into two parts: VBS in user space (VBS-U)
and VBS in kernel space (VBS-K).

Example:
--------
A reference driver for VBS-K can be found at :c:type:`struct vbs_rng`.

.. kernel-doc:: drivers/vbs/vbs_rng.c

APIs:
-----

.. kernel-doc:: include/linux/vbs/vbs.h
.. kernel-doc:: include/linux/vbs/vq.h
13 changes: 13 additions & 0 deletions Documentation/virtual/acrn/vhm.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
==================================
Virtio and Hypervisor Module (VHM)
==================================

The Virtio and Hypervisor service Module (VHM) in part of ACRN Project.

APIs:
-----

.. kernel-doc:: include/linux/vhm/acrn_vhm_ioreq.h
.. kernel-doc:: include/linux/vhm/acrn_vhm_mm.h
.. kernel-doc:: include/linux/vhm/vhm_ioctl_defs.h
.. kernel-doc:: include/linux/vhm/vhm_vm_mngt.h
18 changes: 18 additions & 0 deletions arch/x86/include/asm/acrnhyper.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef _ASM_X86_ACRNHYPER_H
#define _ASM_X86_ACRNHYPER_H

#include <linux/types.h>
#include <linux/atomic.h>
#include <linux/nmi.h>
#include <asm/io.h>

#ifdef CONFIG_ACRN_GUEST
/* ACRN Hypervisor callback */
void acrn_hv_callback_vector(void);

void acrn_setup_intr_irq(void (*handler)(void));
void acrn_remove_intr_irq(void);
#endif

#endif
12 changes: 12 additions & 0 deletions arch/x86/kernel/apic/apic_flat_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,15 @@ static struct apic apic_flat;
struct apic *apic __ro_after_init = &apic_flat;
EXPORT_SYMBOL_GPL(apic);

int xapic_phys = 0;

static int set_xapic_phys_mode(char *arg)
{
xapic_phys = 1;
return 0;
}
early_param("xapic_phys", set_xapic_phys_mode);

static int flat_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
{
return 1;
Expand Down Expand Up @@ -237,6 +246,9 @@ static void physflat_send_IPI_all(int vector)

static int physflat_probe(void)
{
if (xapic_phys == 1)
return 1;

if (apic == &apic_physflat || num_possible_cpus() > 8 ||
jailhouse_paravirt())
return 1;
Expand Down
30 changes: 23 additions & 7 deletions arch/x86/kernel/cpu/acrn.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,12 @@
#include <asm/apic.h>
#include <asm/desc.h>
#include <asm/hypervisor.h>
#include <asm/acrnhyper.h>
#include <asm/irq_vectors.h>
#include <asm/irq_regs.h>
#include <asm/desc.h>
#include <asm/apic.h>
#include <asm/cpufeature.h>

static uint32_t __init acrn_detect(void)
{
Expand All @@ -29,16 +34,13 @@ static void __init acrn_init_platform(void)

static bool acrn_x2apic_available(void)
{
/*
* x2apic is not supported for now. Future enablement will have to check
* X86_FEATURE_X2APIC to determine whether x2apic is supported in the
* guest.
*/
return false;
return boot_cpu_has(X86_FEATURE_X2APIC);
}

static void (*acrn_intr_handler)(void);

/*
* Handler for ACRN_HV_CALLBACK.
*/
__visible void __irq_entry acrn_hv_vector_handler(struct pt_regs *regs)
{
struct pt_regs *old_regs = set_irq_regs(regs);
Expand All @@ -51,7 +53,9 @@ __visible void __irq_entry acrn_hv_vector_handler(struct pt_regs *regs)
* HYPERVISOR_CALLBACK_VECTOR.
*/
entering_ack_irq();
#ifdef CONFIG_X86
inc_irq_stat(irq_hv_callback_count);
#endif

if (acrn_intr_handler)
acrn_intr_handler();
Expand All @@ -60,10 +64,22 @@ __visible void __irq_entry acrn_hv_vector_handler(struct pt_regs *regs)
set_irq_regs(old_regs);
}

void acrn_setup_intr_irq(void (*handler)(void))
{
acrn_intr_handler = handler;
}

void acrn_remove_intr_irq(void)
{
acrn_intr_handler = NULL;
}

const __initconst struct hypervisor_x86 x86_hyper_acrn = {
.name = "ACRN",
.detect = acrn_detect,
.type = X86_HYPER_ACRN,
.init.init_platform = acrn_init_platform,
.init.x2apic_available = acrn_x2apic_available,
};
EXPORT_SYMBOL(acrn_setup_intr_irq);
EXPORT_SYMBOL(acrn_remove_intr_irq);
5 changes: 5 additions & 0 deletions drivers/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -230,4 +230,9 @@ source "drivers/interconnect/Kconfig"

source "drivers/counter/Kconfig"

source "drivers/vbs/Kconfig"

source "drivers/acrn/Kconfig"

source "drivers/vhm/Kconfig"
endmenu
3 changes: 3 additions & 0 deletions drivers/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ obj-$(CONFIG_OF) += of/
obj-$(CONFIG_SSB) += ssb/
obj-$(CONFIG_BCMA) += bcma/
obj-$(CONFIG_VHOST_RING) += vhost/
obj-$(CONFIG_VBS) += vbs/
obj-$(CONFIG_VHOST) += vhost/
obj-$(CONFIG_VLYNQ) += vlynq/
obj-$(CONFIG_STAGING) += staging/
Expand Down Expand Up @@ -182,6 +183,8 @@ obj-$(CONFIG_FPGA) += fpga/
obj-$(CONFIG_FSI) += fsi/
obj-$(CONFIG_TEE) += tee/
obj-$(CONFIG_MULTIPLEXER) += mux/
obj-$(CONFIG_ACRN_VHM) += vhm/
obj-$(CONFIG_ACRN_GUEST) += acrn/
obj-$(CONFIG_UNISYS_VISORBUS) += visorbus/
obj-$(CONFIG_SIOX) += siox/
obj-$(CONFIG_GNSS) += gnss/
Expand Down
4 changes: 4 additions & 0 deletions drivers/acpi/bus.c
Original file line number Diff line number Diff line change
Expand Up @@ -1143,7 +1143,11 @@ static int __init acpi_bus_init(void)
*/
acpi_ec_ecdt_probe();

#if defined(CONFIG_ACRN_GUEST) && defined(CONFIG_PREEMPT_RT_BASE)
status = acpi_enable_subsystem(ACPI_NO_ACPI_ENABLE | ACPI_NO_HANDLER_INIT);
#else
status = acpi_enable_subsystem(ACPI_NO_ACPI_ENABLE);
#endif
if (ACPI_FAILURE(status)) {
printk(KERN_ERR PREFIX
"Unable to start the ACPI Interpreter\n");
Expand Down
29 changes: 29 additions & 0 deletions drivers/acrn/Kconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
config ACRN_SHARED_BUFFER
bool "Intel ACRN SHARED BUFFER"
depends on ACRN_VHM
---help---
Ring buffer shared between ACRN Hypervisor and its SOS.
Help ACRN performance profiling.

config ACRN_TRACE
tristate "Intel ACRN Hypervisor Trace support"
depends on ACRN_SHARED_BUFFER
---help---
This is the Trace driver for the Intel ACRN hypervisor.
You can say y to build it into the kernel, or m to build
it as a module.

config ACRN_HVLOG
bool "Intel ACRN Hypervisor Logmsg support"
depends on ACRN_SHARED_BUFFER
---help---
This is the Trace driver for the Intel ACRN hypervisor log.
You can say y to build it into the kernel.

config ACRN_HV_NPK_LOG
bool "Intel ACRN Hypervisor NPK Log"
depends on INTEL_TH
depends on ACRN_VHM
---help---
The driver is to configure/enable/disable the Intel ACRN hypervisor
NPK log.
5 changes: 5 additions & 0 deletions drivers/acrn/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
subdir-ccflags-$(CONFIG_ACRN_GUEST) := -Werror
obj-$(CONFIG_ACRN_SHARED_BUFFER) += sbuf.o
obj-$(CONFIG_ACRN_TRACE) += acrn_trace.o
obj-$(CONFIG_ACRN_HVLOG) += acrn_hvlog.o
obj-$(CONFIG_ACRN_HV_NPK_LOG) += hv_npk_log.o
Loading