github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-24 10:17:28 +00:00
Code Issues Projects Releases Wiki Activity

HV: Add vuart port base address/IRQ Kconfig options

Browse Source 
Adding Kconfig option to define the vuart port base address/IRQ.
By default, use 0x3F8/IRQ4. For MRB, use 0x3E8/IRQ6.
We are experiencing problems on NUC after changing from 0x3F8/IRQ4
to 0x3E8/IRQ6.

Tracked-On: #1817
Change-Id: Ie407e51a7bc25ac0bb4c61453c969f1466fa33ca
Signed-off-by: dongshen <dongsheng.x.zhang@intel.com>
This commit is contained in:
dongshen
2018-11-15 11:14:41 -08:00
committed by lijinxia
parent b32e689a64
commit 3b87e7c67f
4 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
hypervisor/debug/vuart.c
View File

@@ -32,7 +32,6 @@
#include "uart16550.h"
#define COM1_BASE 0x3E8U
#ifndef CONFIG_PARTITION_MODE
static char vuart_rx_buf[RX_BUF_SIZE];
@@ -132,10 +131,10 @@ static void vuart_toggle_intr(const struct acrn_vuart *vu)
uint32_t operation;
intr_reason = vuart_intr_reason(vu);
vioapic_get_rte(vu->vm, COM1_IRQ, &rte);
vioapic_get_rte(vu->vm, CONFIG_COM_IRQ, &rte);
/* TODO:
* Here should assert vuart irq according to COM1_IRQ polarity.
* Here should assert vuart irq according to CONFIG_COM_IRQ polarity.
* The best way is to get the polarity info from ACIP table.
* Here we just get the info from vioapic configuration.
* based on this, we can still have irq storm during guest
@@ -150,8 +149,8 @@ static void vuart_toggle_intr(const struct acrn_vuart *vu)
GSI_SET_HIGH : GSI_SET_LOW;
}
vpic_set_irq(vu->vm, COM1_IRQ, operation);
vioapic_set_irq(vu->vm, COM1_IRQ, operation);
vpic_set_irq(vu->vm, CONFIG_COM_IRQ, operation);
vioapic_set_irq(vu->vm, CONFIG_COM_IRQ, operation);
}
static void vuart_write(struct acrn_vm *vm, uint16_t offset_arg,
@@ -323,7 +322,7 @@ static void vuart_register_io_handler(struct acrn_vm *vm)
{
struct vm_io_range range = {
.flags = IO_ATTR_RW,
.base = COM1_BASE,
.base = CONFIG_COM_BASE,
.len = 8U
};
@@ -402,7 +401,7 @@ void vuart_init(struct acrn_vm *vm)
vm->vuart.dlh = (uint8_t)(divisor >> 8U);
vm->vuart.active = false;
vm->vuart.base = COM1_BASE;
vm->vuart.base = CONFIG_COM_BASE;
vm->vuart.vm = vm;
vuart_fifo_init(vu);
vuart_lock_init(vu);