github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-23 14:07:42 +00:00
Code Issues Projects Releases Wiki Activity

hv: shell & vuart: Change interrupt pin to uint32_t

Browse Source 
Change the type from uint8_t to uint32_t for shell and vuart

Tracked-On: #861
Signed-off-by: Mingqiang Chi <mingqiang.chi@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Mingqiang Chi 2019-01-10 11:15:11 +08:00 committed by Xie, Nanlin
parent 49166fc3ac
commit 7725fe3b50
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hypervisor/debug/shell.c
View File

@ -906,7 +906,7 @@ static int32_t shell_show_cpu_int(__unused int32_t argc, __unused char **argv)
#define PTDEV_INVALID_PIN 0xffU #define PTDEV_INVALID_PIN 0xffU
static void get_entry_info(const struct ptirq_remapping_info *entry, char *type, static void get_entry_info(const struct ptirq_remapping_info *entry, char *type,
uint32_t *irq, uint32_t *vector, uint64_t *dest, bool *lvl_tm, uint32_t *irq, uint32_t *vector, uint64_t *dest, bool *lvl_tm,
uint8_t *pin, uint8_t *vpin, uint32_t *bdf, uint32_t *vbdf) uint32_t *pin, uint32_t *vpin, uint32_t *bdf, uint32_t *vbdf)
{ {
if (is_entry_active(entry)) { if (is_entry_active(entry)) {
if (entry->intr_type == PTDEV_INTR_MSI) { if (entry->intr_type == PTDEV_INTR_MSI) {
@ -967,7 +967,7 @@ static void get_ptdev_info(char *str_arg, size_t str_max)
char type[16]; char type[16];
uint64_t dest; uint64_t dest;
bool lvl_tm; bool lvl_tm;
uint8_t pin, vpin; uint32_t pin, vpin;
uint32_t bdf, vbdf; uint32_t bdf, vbdf;
len = snprintf(str, size, "\r\nVM\tTYPE\tIRQ\tVEC\tDEST\tTM\tPIN\tVPIN\tBDF\tVBDF"); len = snprintf(str, size, "\r\nVM\tTYPE\tIRQ\tVEC\tDEST\tTM\tPIN\tVPIN\tBDF\tVBDF");
@ -1133,8 +1133,8 @@ static int32_t get_ioapic_info(char *str_arg, size_t str_max_len)
ioapic_nr_gsi = ioapic_get_nr_gsi (); ioapic_nr_gsi = ioapic_get_nr_gsi ();
for (irq = 0U; irq < ioapic_nr_gsi; irq++) { for (irq = 0U; irq < ioapic_nr_gsi; irq++) {
void *addr = ioapic_get_gsi_irq_addr (irq); void *addr = ioapic_get_gsi_irq_addr(irq);
uint8_t pin = ioapic_irq_to_pin (irq); uint32_t pin = ioapic_irq_to_pin(irq);
union ioapic_rte rte; union ioapic_rte rte;
bool irr, phys, level, mask; bool irr, phys, level, mask;

4
hypervisor/debug/vuart.c
View File

@ -33,7 +33,7 @@
#include "uart16550.h" #include "uart16550.h"
static uint8_t vuart_com_irq = CONFIG_COM_IRQ; static uint32_t vuart_com_irq = CONFIG_COM_IRQ;
static uint16_t vuart_com_base = CONFIG_COM_BASE; static uint16_t vuart_com_base = CONFIG_COM_BASE;
#ifndef CONFIG_PARTITION_MODE #ifndef CONFIG_PARTITION_MODE
@ -407,7 +407,7 @@ void vuart_init(struct acrn_vm *vm)
vuart_register_io_handler(vm); vuart_register_io_handler(vm);
} }
bool hv_used_dbg_intx(uint8_t intx_pin) bool hv_used_dbg_intx(uint32_t intx_pin)
{ {
return is_dbg_uart_enabled() && (intx_pin == vuart_com_irq); return is_dbg_uart_enabled() && (intx_pin == vuart_com_irq);
} }

2
hypervisor/include/debug/vuart.h
View File

@ -75,6 +75,6 @@ struct acrn_vuart *vuart_console_active(void);
void vuart_console_tx_chars(struct acrn_vuart *vu); void vuart_console_tx_chars(struct acrn_vuart *vu);
void vuart_console_rx_chars(struct acrn_vuart *vu); void vuart_console_rx_chars(struct acrn_vuart *vu);
bool hv_used_dbg_intx(uint8_t intx_pin); bool hv_used_dbg_intx(uint32_t intx_pin);
void vuart_set_property(const char *vuart_info); void vuart_set_property(const char *vuart_info);
#endif /* VUART_H */ #endif /* VUART_H */

2
hypervisor/release/vuart.c
View File

@ -16,7 +16,7 @@ struct acrn_vuart *vuart_console_active(void)
void vuart_console_tx_chars(__unused struct acrn_vuart *vu) {} void vuart_console_tx_chars(__unused struct acrn_vuart *vu) {}
void vuart_console_rx_chars(__unused struct acrn_vuart *vu) {} void vuart_console_rx_chars(__unused struct acrn_vuart *vu) {}
bool hv_used_dbg_intx(__unused uint8_t intx_pin) bool hv_used_dbg_intx(__unused uint32_t intx_pin)
{ {
return false; return false;
} }