OrgACRN
/
acrn-hypervisor
mirror of https://github.com/projectacrn/acrn-hypervisor.git
1
0
Fork 0
Code Issues Releases Wiki Activity

refine: change the address arguments type of mmio access api 

Change the address arguments type of mmio access api from uint64_t
to void*.

Signed-off-by: Zheng, Gen <gen.zheng@intel.com>
This commit is contained in:
Zheng, Gen 2018-04-16 11:50:56 +08:00 committed by Jack Ren
parent 11d0e59b3e
commit d02f4d4a5f
5 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hypervisor/arch/x86/interrupt.c
View File

@ -215,11 +215,11 @@ void dump_lapic(void)
{
dev_dbg(ACRN_DBG_INTR,
"LAPIC: TIME %08x, init=0x%x cur=0x%x ISR=0x%x IRR=0x%x",
mmio_read_long(0xFEE00000 + LAPIC_LVT_TIMER_REGISTER),
mmio_read_long(0xFEE00000 + LAPIC_INITIAL_COUNT_REGISTER),
mmio_read_long(0xFEE00000 + LAPIC_CURRENT_COUNT_REGISTER),
mmio_read_long(0xFEE00000 + LAPIC_IN_SERVICE_REGISTER_7),
mmio_read_long(0xFEE00000 + LAPIC_INT_REQUEST_REGISTER_7));
mmio_read_long((void*)(0xFEE00000 + LAPIC_LVT_TIMER_REGISTER)),
mmio_read_long((void*)(0xFEE00000 + LAPIC_INITIAL_COUNT_REGISTER)),
mmio_read_long((void*)(0xFEE00000 + LAPIC_CURRENT_COUNT_REGISTER)),
mmio_read_long((void*)(0xFEE00000 + LAPIC_IN_SERVICE_REGISTER_7)),
mmio_read_long((void*)(0xFEE00000 + LAPIC_INT_REQUEST_REGISTER_7)));
}
int vcpu_inject_extint(struct vcpu *vcpu)

4
hypervisor/arch/x86/intr_lapic.c
View File

@ -170,7 +170,7 @@ static inline uint32_t read_lapic_reg32(uint32_t offset)
if (offset < 0x20 || offset > 0x3ff)
return 0;
return mmio_read_long((uint64_t)lapic_info.xapic.vaddr + offset);
return mmio_read_long(lapic_info.xapic.vaddr + offset);
}
inline void write_lapic_reg32(uint32_t offset, uint32_t value)
@ -178,7 +178,7 @@ inline void write_lapic_reg32(uint32_t offset, uint32_t value)
if (offset < 0x20 || offset > 0x3ff)
return;
mmio_write_long(value, (uint64_t)lapic_info.xapic.vaddr + offset);
mmio_write_long(value, lapic_info.xapic.vaddr + offset);
}
static void clear_lapic_isr(void)

14
hypervisor/arch/x86/vtd.c
View File

@ -219,17 +219,17 @@ static int register_hrhd_units(void)
static uint32_t iommu_read32(struct dmar_drhd_rt *dmar_uint, uint32_t offset)
{
return mmio_read_long(dmar_uint->drhd->reg_base_addr + offset);
return mmio_read_long((void*)(dmar_uint->drhd->reg_base_addr + offset));
}
static uint64_t iommu_read64(struct dmar_drhd_rt *dmar_uint, uint32_t offset)
{
uint64_t value;
value = (mmio_read_long(dmar_uint->drhd->reg_base_addr + offset + 4));
value = (mmio_read_long((void*)(dmar_uint->drhd->reg_base_addr + offset + 4)));
value = value << 32;
value = value | (mmio_read_long(dmar_uint->drhd->reg_base_addr +
offset));
value = value | (mmio_read_long((void*)(dmar_uint->drhd->reg_base_addr +
offset)));
return value;
}
@ -237,7 +237,7 @@ static uint64_t iommu_read64(struct dmar_drhd_rt *dmar_uint, uint32_t offset)
static void iommu_write32(struct dmar_drhd_rt *dmar_uint, uint32_t offset,
uint32_t value)
{
mmio_write_long(value, dmar_uint->drhd->reg_base_addr + offset);
mmio_write_long(value, (void*)(dmar_uint->drhd->reg_base_addr + offset));
}
static void iommu_write64(struct dmar_drhd_rt *dmar_uint, uint32_t offset,
@ -246,10 +246,10 @@ static void iommu_write64(struct dmar_drhd_rt *dmar_uint, uint32_t offset,
uint32_t temp;
temp = value;
mmio_write_long(temp, dmar_uint->drhd->reg_base_addr + offset);
mmio_write_long(temp, (void*)(dmar_uint->drhd->reg_base_addr + offset));
temp = value >> 32;
mmio_write_long(temp, dmar_uint->drhd->reg_base_addr + offset + 4);
mmio_write_long(temp, (void*)(dmar_uint->drhd->reg_base_addr + offset + 4));
}
/* flush cache when root table, context table updated */

4
hypervisor/debug/uart16550.c
View File

@ -93,7 +93,7 @@ static inline uint32_t uart16550_read_reg(uint64_t base, uint32_t reg_idx)
if (serial_port_mapped) {
return io_read_byte((uint16_t)base + reg_idx);
} else {
return mmio_read_long((uint64_t)((uint32_t*)base + reg_idx));
return mmio_read_long((void*)((uint32_t*)base + reg_idx));
}
}
@ -103,7 +103,7 @@ static inline void uart16550_write_reg(uint64_t base,
if (serial_port_mapped) {
io_write_byte(val, (uint16_t)base + reg_idx);
} else {
mmio_write_long(val, (uint64_t)((uint32_t*)base + reg_idx));
mmio_write_long(val, (void*)((uint32_t*)base + reg_idx));
}
}

66
hypervisor/include/arch/x86/io.h
View File

@ -180,7 +180,7 @@ int dm_emulate_pio_post(struct vcpu *vcpu);
* @param value The 32 bit value to write.
* @param addr The memory address to write to.
*/
static inline void mmio_write_long(uint32_t value, uint64_t addr)
static inline void mmio_write_long(uint32_t value, void *addr)
{
*((uint32_t *)addr) = value;
}
@ -190,7 +190,7 @@ static inline void mmio_write_long(uint32_t value, uint64_t addr)
* @param value The 16 bit value to write.
* @param addr The memory address to write to.
*/
static inline void mmio_write_word(uint32_t value, uint64_t addr)
static inline void mmio_write_word(uint32_t value, void *addr)
{
*((uint16_t *)addr) = value;
}
@ -200,7 +200,7 @@ static inline void mmio_write_word(uint32_t value, uint64_t addr)
* @param value The 8 bit value to write.
* @param addr The memory address to write to.
*/
static inline void mmio_write_byte(uint32_t value, uint64_t addr)
static inline void mmio_write_byte(uint32_t value, void *addr)
{
*((uint8_t *)addr) = value;
}
@ -211,7 +211,7 @@ static inline void mmio_write_byte(uint32_t value, uint64_t addr)
*
* @return The 32 bit value read from the given address.
*/
static inline uint32_t mmio_read_long(uint64_t addr)
static inline uint32_t mmio_read_long(void *addr)
{
return *((uint32_t *)addr);
}
@ -222,7 +222,7 @@ static inline uint32_t mmio_read_long(uint64_t addr)
*
* @return The 16 bit value read from the given address.
*/
static inline uint16_t mmio_read_word(uint64_t addr)
static inline uint16_t mmio_read_word(void *addr)
{
return *((uint16_t *)addr);
}
@ -233,7 +233,7 @@ static inline uint16_t mmio_read_word(uint64_t addr)
*
* @return The 8 bit value read from the given address.
*/
static inline uint8_t mmio_read_byte(uint64_t addr)
static inline uint8_t mmio_read_byte(void *addr)
{
return *((uint8_t *)addr);
}
@ -245,7 +245,7 @@ static inline uint8_t mmio_read_byte(uint64_t addr)
* location.
* @param addr The memory address to read from/write to.
*/
static inline void mmio_or_long(uint32_t mask, uint64_t addr)
static inline void mmio_or_long(uint32_t mask, void *addr)
{
*((uint32_t *)addr) |= mask;
}
@ -257,7 +257,7 @@ static inline void mmio_or_long(uint32_t mask, uint64_t addr)
* location.
* @param addr The memory address to read from/write to.
*/
static inline void mmio_or_word(uint32_t mask, uint64_t addr)
static inline void mmio_or_word(uint32_t mask, void *addr)
{
*((uint16_t *)addr) |= mask;
}
@ -269,7 +269,7 @@ static inline void mmio_or_word(uint32_t mask, uint64_t addr)
* location.
* @param addr The memory address to read from/write to.
*/
static inline void mmio_or_byte(uint32_t mask, uint64_t addr)
static inline void mmio_or_byte(uint32_t mask, void *addr)
{
*((uint8_t *)addr) |= mask;
}
@ -281,7 +281,7 @@ static inline void mmio_or_byte(uint32_t mask, uint64_t addr)
* location.
* @param addr The memory address to read from/write to.
*/
static inline void mmio_and_long(uint32_t mask, uint64_t addr)
static inline void mmio_and_long(uint32_t mask, void *addr)
{
*((uint32_t *)addr) &= ~mask;
}
@ -293,7 +293,7 @@ static inline void mmio_and_long(uint32_t mask, uint64_t addr)
* location.
* @param addr The memory address to read from/write to.
*/
static inline void mmio_and_word(uint32_t mask, uint64_t addr)
static inline void mmio_and_word(uint32_t mask, void *addr)
{
*((uint16_t *)addr) &= ~mask;
}
@ -305,7 +305,7 @@ static inline void mmio_and_word(uint32_t mask, uint64_t addr)
* location.
* @param addr The memory address to read from/write to.
*/
static inline void mmio_and_byte(uint32_t mask, uint64_t addr)
static inline void mmio_and_byte(uint32_t mask, void *addr)
{
*((uint8_t *)addr) &= ~mask;
}
@ -323,7 +323,7 @@ static inline void mmio_and_byte(uint32_t mask, uint64_t addr)
* mask are cleared at the memory address.
* @param addr The memory address to read from/write to.
*/
static inline void mmio_rmw_long(uint32_t set, uint32_t clear, uint64_t addr)
static inline void mmio_rmw_long(uint32_t set, uint32_t clear, void *addr)
{
*((uint32_t *)addr) =
(*((uint32_t *)addr) & ~clear) | set;
@ -342,7 +342,7 @@ static inline void mmio_rmw_long(uint32_t set, uint32_t clear, uint64_t addr)
* mask are cleared at the memory address.
* @param addr The memory address to read from/write to.
*/
static inline void mmio_rmw_word(uint32_t set, uint32_t clear, uint64_t addr)
static inline void mmio_rmw_word(uint32_t set, uint32_t clear, void *addr)
{
*((uint16_t *)addr) =
(*((uint16_t *)addr) & ~clear) | set;
@ -361,7 +361,7 @@ static inline void mmio_rmw_word(uint32_t set, uint32_t clear, uint64_t addr)
* mask are cleared at the memory address.
* @param addr The memory address to read from/write to.
*/
static inline void mmio_rmw_byte(uint32_t set, uint32_t clear, uint64_t addr)
static inline void mmio_rmw_byte(uint32_t set, uint32_t clear, void *addr)
{
*((uint8_t *)addr) = (*((uint8_t *)addr) & ~clear) | set;
}
@ -371,7 +371,7 @@ static inline void mmio_rmw_byte(uint32_t set, uint32_t clear, uint64_t addr)
* @param value The 32 bit value to write.
* @param addr The memory address to write to.
*/
static inline void __mmio_write_long(uint32_t value, uint64_t addr)
static inline void __mmio_write_long(uint32_t value, void *addr)
{
*((uint32_t *)addr) = value;
}
@ -381,7 +381,7 @@ static inline void __mmio_write_long(uint32_t value, uint64_t addr)
* @param value The 16 bit value to write.
* @param addr The memory address to write to.
*/
static inline void __mmio_write_word(uint32_t value, uint64_t addr)
static inline void __mmio_write_word(uint32_t value, void *addr)
{
*((uint16_t *)addr) = value;
}
@ -391,7 +391,7 @@ static inline void __mmio_write_word(uint32_t value, uint64_t addr)
* @param value The 8 bit value to write.
* @param addr The memory address to write to.
*/
static inline void __mmio_write_byte(uint32_t value, uint64_t addr)
static inline void __mmio_write_byte(uint32_t value, void *addr)
{
*((uint8_t *)addr) = value;
}
@ -402,7 +402,7 @@ static inline void __mmio_write_byte(uint32_t value, uint64_t addr)
*
* @return The 32 bit value read from the given address.
*/
static inline uint32_t __mmio_read_long(uint64_t addr)
static inline uint32_t __mmio_read_long(void *addr)
{
return *((uint32_t *)addr);
}
@ -413,7 +413,7 @@ static inline uint32_t __mmio_read_long(uint64_t addr)
*
* @return The 16 bit value read from the given address.
*/
static inline uint16_t __mmio_read_word(uint64_t addr)
static inline uint16_t __mmio_read_word(void *addr)
{
return *((uint16_t *)addr);
}
@ -424,7 +424,7 @@ static inline uint16_t __mmio_read_word(uint64_t addr)
*
* @return The 32 16 value read from the given address.
*/
static inline uint8_t __mmio_read_byte(uint64_t addr)
static inline uint8_t __mmio_read_byte(void *addr)
{
return *((uint8_t *)addr);
}
@ -436,7 +436,7 @@ static inline uint8_t __mmio_read_byte(uint64_t addr)
* location.
* @param addr The memory address to read from/write to.
*/
static inline void __mmio_or_long(uint32_t mask, uint64_t addr)
static inline void __mmio_or_long(uint32_t mask, void *addr)
{
*((uint32_t *)addr) |= mask;
}
@ -448,7 +448,7 @@ static inline void __mmio_or_long(uint32_t mask, uint64_t addr)
* location.
* @param addr The memory address to read from/write to.
*/
static inline void __mmio_or_word(uint32_t mask, uint64_t addr)
static inline void __mmio_or_word(uint32_t mask, void *addr)
{
*((uint16_t *)addr) |= mask;
}
@ -460,7 +460,7 @@ static inline void __mmio_or_word(uint32_t mask, uint64_t addr)
* location.
* @param addr The memory address to read from/write to.
*/
static inline void __mmio_or_byte(uint32_t mask, uint64_t addr)
static inline void __mmio_or_byte(uint32_t mask, void *addr)
{
*((uint8_t *)addr) |= mask;
}
@ -472,7 +472,7 @@ static inline void __mmio_or_byte(uint32_t mask, uint64_t addr)
* location.
* @param addr The memory address to read from/write to.
*/
static inline void __mmio_and_long(uint32_t mask, uint64_t addr)
static inline void __mmio_and_long(uint32_t mask, void *addr)
{
*((uint32_t *)addr) &= ~mask;
}
@ -484,7 +484,7 @@ static inline void __mmio_and_long(uint32_t mask, uint64_t addr)
* location.
* @param addr The memory address to read from/write to.
*/
static inline void __mmio_and_word(uint32_t mask, uint64_t addr)
static inline void __mmio_and_word(uint32_t mask, void *addr)
{
*((uint16_t *)addr) &= ~mask;
}
@ -496,7 +496,7 @@ static inline void __mmio_and_word(uint32_t mask, uint64_t addr)
* location.
* @param addr The memory address to read from/write to.
*/
static inline void __mmio_and_byte(uint32_t mask, uint64_t addr)
static inline void __mmio_and_byte(uint32_t mask, void *addr)
{
*((uint8_t *)addr) &= ~mask;
}
@ -516,7 +516,7 @@ static inline void __mmio_and_byte(uint32_t mask, uint64_t addr)
* @param addr The memory address to read from/write to.
*/
static inline void
__mmio_rmw_long(uint32_t set, uint32_t clear, uint64_t addr)
__mmio_rmw_long(uint32_t set, uint32_t clear, void *addr)
{
*((uint32_t *)addr) =
(*((uint32_t *)addr) & ~clear) | set;
@ -537,7 +537,7 @@ __mmio_rmw_long(uint32_t set, uint32_t clear, uint64_t addr)
* @param addr The memory address to read from/write to.
*/
static inline void
__mmio_rmw_word(uint32_t set, uint32_t clear, uint64_t addr)
__mmio_rmw_word(uint32_t set, uint32_t clear, void *addr)
{
*((uint16_t *)addr) =
(*((uint16_t *)addr) & ~clear) | set;
@ -558,7 +558,7 @@ __mmio_rmw_word(uint32_t set, uint32_t clear, uint64_t addr)
* @param addr The memory address to read from/write to.
*/
static inline void
__mmio_rmw_byte(uint32_t set, uint32_t clear, uint64_t addr)
__mmio_rmw_byte(uint32_t set, uint32_t clear, void *addr)
{
*((uint8_t *)addr) = (*((uint8_t *)addr) & ~clear) | set;
}
@ -570,7 +570,7 @@ __mmio_rmw_byte(uint32_t set, uint32_t clear, uint64_t addr)
* @param mask The mask to apply to the value read.
* @param value The 32 bit value to write.
*/
static inline void setl(uint64_t addr, uint32_t mask, uint32_t value)
static inline void setl(void *addr, uint32_t mask, uint32_t value)
{
mmio_write_long((mmio_read_long(addr) & ~mask) | value, addr);
}
@ -582,7 +582,7 @@ static inline void setl(uint64_t addr, uint32_t mask, uint32_t value)
* @param mask The mask to apply to the value read.
* @param value The 16 bit value to write.
*/
static inline void setw(uint64_t addr, uint32_t mask, uint32_t value)
static inline void setw(void *addr, uint32_t mask, uint32_t value)
{
mmio_write_word((mmio_read_word(addr) & ~mask) | value, addr);
}
@ -594,7 +594,7 @@ static inline void setw(uint64_t addr, uint32_t mask, uint32_t value)
* @param mask The mask to apply to the value read.
* @param value The 8 bit value to write.
*/
static inline void setb(uint64_t addr, uint32_t mask, uint32_t value)
static inline void setb(void *addr, uint32_t mask, uint32_t value)
{
mmio_write_byte((mmio_read_byte(addr) & ~mask) | value, addr);
}