ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ich9lpc: fix typo 

change some "rbca" to "rcrb"(root complex register block) while
the other to "rcba"(root complex base address).
Bonus: add more comments and fix some indentation.

Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Cao jin 2016-03-07 20:38:58 +08:00 committed by Michael S. Tsirkin
parent 226419d615
commit 7335a95abd
2 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
hw/isa/lpc_ich9.c
View File

@ -409,18 +409,18 @@ ich9_lpc_pmbase_update(ICH9LPCState *lpc)
ich9_pm_iospace_update(&lpc->pm, pm_io_base); ich9_pm_iospace_update(&lpc->pm, pm_io_base);
} }
/* config:RBCA */ /* config:RCBA */
static void ich9_lpc_rcba_update(ICH9LPCState *lpc, uint32_t rbca_old) static void ich9_lpc_rcba_update(ICH9LPCState *lpc, uint32_t rcba_old)
{ {
uint32_t rbca = pci_get_long(lpc->d.config + ICH9_LPC_RCBA); uint32_t rcba = pci_get_long(lpc->d.config + ICH9_LPC_RCBA);
if (rbca_old & ICH9_LPC_RCBA_EN) { if (rcba_old & ICH9_LPC_RCBA_EN) {
memory_region_del_subregion(get_system_memory(), &lpc->rbca_mem); memory_region_del_subregion(get_system_memory(), &lpc->rcrb_mem);
} }
if (rbca & ICH9_LPC_RCBA_EN) { if (rcba & ICH9_LPC_RCBA_EN) {
memory_region_add_subregion_overlap(get_system_memory(), memory_region_add_subregion_overlap(get_system_memory(),
rbca & ICH9_LPC_RCBA_BA_MASK, rcba & ICH9_LPC_RCBA_BA_MASK,
&lpc->rbca_mem, 1); &lpc->rcrb_mem, 1);
} }
} }
@ -444,7 +444,7 @@ static int ich9_lpc_post_load(void *opaque, int version_id)
ICH9LPCState *lpc = opaque; ICH9LPCState *lpc = opaque;
ich9_lpc_pmbase_update(lpc); ich9_lpc_pmbase_update(lpc);
ich9_lpc_rcba_update(lpc, 0 /* disabled ICH9_LPC_RBCA_EN */); ich9_lpc_rcba_update(lpc, 0 /* disabled ICH9_LPC_RCBA_EN */);
ich9_lpc_pmcon_update(lpc); ich9_lpc_pmcon_update(lpc);
return 0; return 0;
} }
@ -453,14 +453,14 @@ static void ich9_lpc_config_write(PCIDevice *d,
uint32_t addr, uint32_t val, int len) uint32_t addr, uint32_t val, int len)
{ {
ICH9LPCState *lpc = ICH9_LPC_DEVICE(d); ICH9LPCState *lpc = ICH9_LPC_DEVICE(d);
uint32_t rbca_old = pci_get_long(d->config + ICH9_LPC_RCBA); uint32_t rcba_old = pci_get_long(d->config + ICH9_LPC_RCBA);
pci_default_write_config(d, addr, val, len); pci_default_write_config(d, addr, val, len);
if (ranges_overlap(addr, len, ICH9_LPC_PMBASE, 4)) { if (ranges_overlap(addr, len, ICH9_LPC_PMBASE, 4)) {
ich9_lpc_pmbase_update(lpc); ich9_lpc_pmbase_update(lpc);
} }
if (ranges_overlap(addr, len, ICH9_LPC_RCBA, 4)) { if (ranges_overlap(addr, len, ICH9_LPC_RCBA, 4)) {
ich9_lpc_rcba_update(lpc, rbca_old); ich9_lpc_rcba_update(lpc, rcba_old);
} }
if (ranges_overlap(addr, len, ICH9_LPC_PIRQA_ROUT, 4)) { if (ranges_overlap(addr, len, ICH9_LPC_PIRQA_ROUT, 4)) {
pci_bus_fire_intx_routing_notifier(lpc->d.bus); pci_bus_fire_intx_routing_notifier(lpc->d.bus);
@ -477,7 +477,7 @@ static void ich9_lpc_reset(DeviceState *qdev)
{ {
PCIDevice *d = PCI_DEVICE(qdev); PCIDevice *d = PCI_DEVICE(qdev);
ICH9LPCState *lpc = ICH9_LPC_DEVICE(d); ICH9LPCState *lpc = ICH9_LPC_DEVICE(d);
uint32_t rbca_old = pci_get_long(d->config + ICH9_LPC_RCBA); uint32_t rcba_old = pci_get_long(d->config + ICH9_LPC_RCBA);
int i; int i;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
@ -496,13 +496,14 @@ static void ich9_lpc_reset(DeviceState *qdev)
ich9_cc_reset(lpc); ich9_cc_reset(lpc);
ich9_lpc_pmbase_update(lpc); ich9_lpc_pmbase_update(lpc);
ich9_lpc_rcba_update(lpc, rbca_old); ich9_lpc_rcba_update(lpc, rcba_old);
lpc->sci_level = 0; lpc->sci_level = 0;
lpc->rst_cnt = 0; lpc->rst_cnt = 0;
} }
static const MemoryRegionOps rbca_mmio_ops = { /* root complex register block is mapped into memory space */
static const MemoryRegionOps rcrb_mmio_ops = {
.read = ich9_cc_read, .read = ich9_cc_read,
.write = ich9_cc_write, .write = ich9_cc_write,
.endianness = DEVICE_LITTLE_ENDIAN, .endianness = DEVICE_LITTLE_ENDIAN,
@ -616,8 +617,8 @@ static void ich9_lpc_realize(PCIDevice *d, Error **errp)
pci_set_long(d->wmask + ICH9_LPC_PMBASE, pci_set_long(d->wmask + ICH9_LPC_PMBASE,
ICH9_LPC_PMBASE_BASE_ADDRESS_MASK); ICH9_LPC_PMBASE_BASE_ADDRESS_MASK);
memory_region_init_io(&lpc->rbca_mem, OBJECT(d), &rbca_mmio_ops, lpc, memory_region_init_io(&lpc->rcrb_mem, OBJECT(d), &rcrb_mmio_ops, lpc,
"lpc-rbca-mmio", ICH9_CC_SIZE); "lpc-rcrb-mmio", ICH9_CC_SIZE);
lpc->isa_bus = isa_bus; lpc->isa_bus = isa_bus;

4
include/hw/i386/ich9.h
View File

@ -23,7 +23,7 @@ I2CBus *ich9_smb_init(PCIBus *bus, int devfn, uint32_t smb_io_base);
void ich9_generate_smi(void); void ich9_generate_smi(void);
void ich9_generate_nmi(void); void ich9_generate_nmi(void);
#define ICH9_CC_SIZE (16 * 1024) /* 16KB */ #define ICH9_CC_SIZE (16 * 1024) /* 16KB. Chipset configuration registers */
#define TYPE_ICH9_LPC_DEVICE "ICH9-LPC" #define TYPE_ICH9_LPC_DEVICE "ICH9-LPC"
#define ICH9_LPC_DEVICE(obj) \ #define ICH9_LPC_DEVICE(obj) \
@ -65,7 +65,7 @@ typedef struct ICH9LPCState {
/* isa bus */ /* isa bus */
ISABus *isa_bus; ISABus *isa_bus;
MemoryRegion rbca_mem; MemoryRegion rcrb_mem; /* root complex register block */
Notifier machine_ready; Notifier machine_ready;
qemu_irq *pic; qemu_irq *pic;