Skip to content

Commit

Permalink
apic: qdev conversion cleanup
Browse files Browse the repository at this point in the history 
Make APICState completely private to apic.c by using DeviceState
in external APIs.

Move apic_init() to pc.c.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
  • Loading branch information
@blueswirl
blueswirl committed Jun 19, 2010
1 parent 8546b09 commit 92a16d7
Show file tree
Hide file tree
Showing 5 changed files with 82 additions and 63 deletions.
86 changes: 38 additions & 48 deletions hw/apic.c
View file
Expand Up @@ -18,7 +18,6 @@
*/
#include "hw.h"
#include "apic.h"
#include "msix.h"
#include "qemu-timer.h"
#include "host-utils.h"
#include "sysbus.h"
Expand Down Expand Up @@ -89,9 +88,10 @@
#define MSI_ADDR_DEST_ID_SHIFT 12
#define MSI_ADDR_DEST_ID_MASK 0x00ffff0

#define MSI_ADDR_BASE 0xfee00000
#define MSI_ADDR_SIZE 0x100000

typedef struct APICState APICState;

struct APICState {
SysBusDevice busdev;
void *cpu_env;
Expand Down Expand Up @@ -195,8 +195,10 @@ static void apic_local_deliver(APICState *s, int vector)
}
}

void apic_deliver_pic_intr(APICState *s, int level)
void apic_deliver_pic_intr(DeviceState *d, int level)
{
APICState *s = DO_UPCAST(APICState, busdev.qdev, d);

if (level) {
apic_local_deliver(s, APIC_LVT_LINT0);
} else {
Expand Down Expand Up @@ -306,8 +308,10 @@ void apic_deliver_irq(uint8_t dest, uint8_t dest_mode,
trigger_mode);
}

void cpu_set_apic_base(APICState *s, uint64_t val)
void cpu_set_apic_base(DeviceState *d, uint64_t val)
{
APICState *s = DO_UPCAST(APICState, busdev.qdev, d);

DPRINTF("cpu_set_apic_base: %016" PRIx64 "\n", val);
if (!s)
return;
Expand All @@ -321,23 +325,29 @@ void cpu_set_apic_base(APICState *s, uint64_t val)
}
}

uint64_t cpu_get_apic_base(APICState *s)
uint64_t cpu_get_apic_base(DeviceState *d)
{
APICState *s = DO_UPCAST(APICState, busdev.qdev, d);

DPRINTF("cpu_get_apic_base: %016" PRIx64 "\n",
s ? (uint64_t)s->apicbase: 0);
return s ? s->apicbase : 0;
}

void cpu_set_apic_tpr(APICState *s, uint8_t val)
void cpu_set_apic_tpr(DeviceState *d, uint8_t val)
{
APICState *s = DO_UPCAST(APICState, busdev.qdev, d);

if (!s)
return;
s->tpr = (val & 0x0f) << 4;
apic_update_irq(s);
}

uint8_t cpu_get_apic_tpr(APICState *s)
uint8_t cpu_get_apic_tpr(DeviceState *d)
{
APICState *s = DO_UPCAST(APICState, busdev.qdev, d);

return s ? s->tpr >> 4 : 0;
}

Expand Down Expand Up @@ -479,9 +489,9 @@ static void apic_get_delivery_bitmask(uint32_t *deliver_bitmask,
}
}


void apic_init_reset(APICState *s)
void apic_init_reset(DeviceState *d)
{
APICState *s = DO_UPCAST(APICState, busdev.qdev, d);
int i;

if (!s)
Expand Down Expand Up @@ -512,8 +522,10 @@ static void apic_startup(APICState *s, int vector_num)
cpu_interrupt(s->cpu_env, CPU_INTERRUPT_SIPI);
}

void apic_sipi(APICState *s)
void apic_sipi(DeviceState *d)
{
APICState *s = DO_UPCAST(APICState, busdev.qdev, d);

cpu_reset_interrupt(s->cpu_env, CPU_INTERRUPT_SIPI);

if (!s->wait_for_sipi)
Expand All @@ -522,10 +534,11 @@ void apic_sipi(APICState *s)
s->wait_for_sipi = 0;
}

static void apic_deliver(APICState *s, uint8_t dest, uint8_t dest_mode,
static void apic_deliver(DeviceState *d, uint8_t dest, uint8_t dest_mode,
uint8_t delivery_mode, uint8_t vector_num,
uint8_t polarity, uint8_t trigger_mode)
{
APICState *s = DO_UPCAST(APICState, busdev.qdev, d);
uint32_t deliver_bitmask[MAX_APIC_WORDS];
int dest_shorthand = (s->icr[0] >> 18) & 3;
APICState *apic_iter;
Expand Down Expand Up @@ -570,8 +583,9 @@ static void apic_deliver(APICState *s, uint8_t dest, uint8_t dest_mode,
trigger_mode);
}

int apic_get_interrupt(APICState *s)
int apic_get_interrupt(DeviceState *d)
{
APICState *s = DO_UPCAST(APICState, busdev.qdev, d);
int intno;

/* if the APIC is installed or enabled, we let the 8259 handle the
Expand All @@ -593,8 +607,9 @@ int apic_get_interrupt(APICState *s)
return intno;
}

int apic_accept_pic_intr(APICState *s)
int apic_accept_pic_intr(DeviceState *d)
{
APICState *s = DO_UPCAST(APICState, busdev.qdev, d);
uint32_t lvt0;

if (!s)
Expand Down Expand Up @@ -680,14 +695,16 @@ static void apic_mem_writew(void *opaque, target_phys_addr_t addr, uint32_t val)

static uint32_t apic_mem_readl(void *opaque, target_phys_addr_t addr)
{
DeviceState *d;
APICState *s;
uint32_t val;
int index;

s = cpu_get_current_apic();
if (!s) {
d = cpu_get_current_apic();
if (!d) {
return 0;
}
s = DO_UPCAST(APICState, busdev.qdev, d);

index = (addr >> 4) & 0xff;
switch(index) {
Expand Down Expand Up @@ -769,6 +786,7 @@ static void apic_send_msi(target_phys_addr_t addr, uint32 data)

static void apic_mem_writel(void *opaque, target_phys_addr_t addr, uint32_t val)
{
DeviceState *d;
APICState *s;
int index = (addr >> 4) & 0xff;
if (addr > 0xfff || !index) {
Expand All @@ -781,10 +799,11 @@ static void apic_mem_writel(void *opaque, target_phys_addr_t addr, uint32_t val)
return;
}

s = cpu_get_current_apic();
if (!s) {
d = cpu_get_current_apic();
if (!d) {
return;
}
s = DO_UPCAST(APICState, busdev.qdev, d);

DPRINTF("write: " TARGET_FMT_plx " = %08x\n", addr, val);

Expand Down Expand Up @@ -821,7 +840,7 @@ static void apic_mem_writel(void *opaque, target_phys_addr_t addr, uint32_t val)
break;
case 0x30:
s->icr[0] = val;
apic_deliver(s, (s->icr[1] >> 24) & 0xff, (s->icr[0] >> 11) & 1,
apic_deliver(d, (s->icr[1] >> 24) & 0xff, (s->icr[0] >> 11) & 1,
(s->icr[0] >> 8) & 7, (s->icr[0] & 0xff),
(s->icr[0] >> 14) & 1, (s->icr[0] >> 15) & 1);
break;
Expand Down Expand Up @@ -935,7 +954,7 @@ static void apic_reset(DeviceState *d)
s->apicbase = 0xfee00000 |
(bsp ? MSR_IA32_APICBASE_BSP : 0) | MSR_IA32_APICBASE_ENABLE;

apic_init_reset(s);
apic_init_reset(d);

if (bsp) {
/*
Expand All @@ -959,35 +978,6 @@ static CPUWriteMemoryFunc * const apic_mem_write[3] = {
apic_mem_writel,
};

APICState *apic_init(void *env, uint8_t apic_id)
{
DeviceState *dev;
SysBusDevice *d;
APICState *s;
static int apic_mapped;

dev = qdev_create(NULL, "apic");
qdev_prop_set_uint8(dev, "id", apic_id);
qdev_prop_set_ptr(dev, "cpu_env", env);
qdev_init_nofail(dev);
d = sysbus_from_qdev(dev);

/* XXX: mapping more APICs at the same memory location */
if (apic_mapped == 0) {
/* NOTE: the APIC is directly connected to the CPU - it is not
on the global memory bus. */
/* XXX: what if the base changes? */
sysbus_mmio_map(d, 0, MSI_ADDR_BASE);
apic_mapped = 1;
}

msix_supported = 1;

s = DO_UPCAST(APICState, busdev.qdev, dev);

return s;
}

static int apic_init1(SysBusDevice *dev)
{
APICState *s = FROM_SYSBUS(APICState, dev);
Expand Down
24 changes: 12 additions & 12 deletions hw/apic.h
View file
@@ -1,27 +1,27 @@
#ifndef APIC_H
#define APIC_H

#include "qemu-common.h"

/* apic.c */
typedef struct APICState APICState;
void apic_deliver_irq(uint8_t dest, uint8_t dest_mode,
uint8_t delivery_mode,
uint8_t vector_num, uint8_t polarity,
uint8_t trigger_mode);
APICState *apic_init(void *env, uint8_t apic_id);
int apic_accept_pic_intr(APICState *s);
void apic_deliver_pic_intr(APICState *s, int level);
int apic_get_interrupt(APICState *s);
int apic_accept_pic_intr(DeviceState *s);
void apic_deliver_pic_intr(DeviceState *s, int level);
int apic_get_interrupt(DeviceState *s);
void apic_reset_irq_delivered(void);
int apic_get_irq_delivered(void);
void cpu_set_apic_base(APICState *s, uint64_t val);
uint64_t cpu_get_apic_base(APICState *s);
void cpu_set_apic_tpr(APICState *s, uint8_t val);
uint8_t cpu_get_apic_tpr(APICState *s);
void apic_init_reset(APICState *s);
void apic_sipi(APICState *s);
void cpu_set_apic_base(DeviceState *s, uint64_t val);
uint64_t cpu_get_apic_base(DeviceState *s);
void cpu_set_apic_tpr(DeviceState *s, uint8_t val);
uint8_t cpu_get_apic_tpr(DeviceState *s);
void apic_init_reset(DeviceState *s);
void apic_sipi(DeviceState *s);

/* pc.c */
int cpu_is_bsp(CPUState *env);
APICState *cpu_get_current_apic(void);
DeviceState *cpu_get_current_apic(void);

#endif
31 changes: 30 additions & 1 deletion hw/pc.c
View file
Expand Up @@ -35,6 +35,7 @@
#include "elf.h"
#include "multiboot.h"
#include "mc146818rtc.h"
#include "msix.h"
#include "sysbus.h"
#include "sysemu.h"

Expand Down Expand Up @@ -64,6 +65,8 @@
#define FW_CFG_E820_TABLE (FW_CFG_ARCH_LOCAL + 3)
#define FW_CFG_HPET (FW_CFG_ARCH_LOCAL + 4)

#define MSI_ADDR_BASE 0xfee00000

#define E820_NR_ENTRIES 16

struct e820_entry {
Expand Down Expand Up @@ -754,7 +757,7 @@ int cpu_is_bsp(CPUState *env)
return env->cpu_index == 0;
}

APICState *cpu_get_current_apic(void)
DeviceState *cpu_get_current_apic(void)
{
if (cpu_single_env) {
return cpu_single_env->apic_state;
Expand All @@ -763,6 +766,32 @@ APICState *cpu_get_current_apic(void)
}
}

static DeviceState *apic_init(void *env, uint8_t apic_id)
{
DeviceState *dev;
SysBusDevice *d;
static int apic_mapped;

dev = qdev_create(NULL, "apic");
qdev_prop_set_uint8(dev, "id", apic_id);
qdev_prop_set_ptr(dev, "cpu_env", env);
qdev_init_nofail(dev);
d = sysbus_from_qdev(dev);

/* XXX: mapping more APICs at the same memory location */
if (apic_mapped == 0) {
/* NOTE: the APIC is directly connected to the CPU - it is not
on the global memory bus. */
/* XXX: what if the base changes? */
sysbus_mmio_map(d, 0, MSI_ADDR_BASE);
apic_mapped = 1;
}

msix_supported = 1;

return dev;
}

/* set CMOS shutdown status register (index 0xF) as S3_resume(0xFE)
BIOS will read it and start S3 resume at POST Entry */
void pc_cmos_set_s3_resume(void *opaque, int irq, int level)
Expand Down
2 changes: 1 addition & 1 deletion qemu-common.h
View file
Expand Up @@ -16,6 +16,7 @@
typedef struct QEMUTimer QEMUTimer;
typedef struct QEMUFile QEMUFile;
typedef struct QEMUBH QEMUBH;
typedef struct DeviceState DeviceState;

/* Hack around the mess dyngen-exec.h causes: We need QEMU_NORETURN in files that
cannot include the following headers without conflicts. This condition has
Expand Down Expand Up @@ -224,7 +225,6 @@ typedef struct PCMCIACardState PCMCIACardState;
typedef struct MouseTransformInfo MouseTransformInfo;
typedef struct uWireSlave uWireSlave;
typedef struct I2SCodec I2SCodec;
typedef struct DeviceState DeviceState;
typedef struct SSIBus SSIBus;
typedef struct EventNotifier EventNotifier;
typedef struct VirtIODevice VirtIODevice;
Expand Down
2 changes: 1 addition & 1 deletion target-i386/cpu.h
View file
Expand Up @@ -705,7 +705,7 @@ typedef struct CPUX86State {

/* in order to simplify APIC support, we leave this pointer to the
user */
struct APICState *apic_state;
struct DeviceState *apic_state;

uint64 mcg_cap;
uint64 mcg_status;
Expand Down

0 comments on commit 92a16d7

Please sign in to comment.