riscv
/
qemu
mirror of https://gitea.goldendeliverer.com/riscv/qemu.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

spapr: Clean up spapr_dr_connector_by_*() 

* Change names to something less ludicrously verbose
 * Now that we have QOM subclasses for the different DRC types, use a QOM
   typename instead of a PAPR type value parameter

The latter allows removal of the get_type_shift() helper.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Acked-by: Michael Roth <mdroth@linux.vnet.ibm.com>
pull/49/merge
David Gibson 9 years ago
parent
2d33581899
commit
fbf5539718
5 changed files with 29 additions and 46 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 28
      hw/ppc/spapr.c
  2. 34
      hw/ppc/spapr_drc.c
  3. 2
      hw/ppc/spapr_events.c
  4. 6
      hw/ppc/spapr_pci.c
  5. 5
      include/hw/ppc/spapr_drc.h

28
hw/ppc/spapr.c
View File

@ -461,7 +461,7 @@ static void spapr_populate_cpu_dt(CPUState *cs, void *fdt, int offset,
uint32_t radix_AP_encodings[PPC_PAGE_SIZES_MAX_SZ]; uint32_t radix_AP_encodings[PPC_PAGE_SIZES_MAX_SZ];
int i; int i;
drc = spapr_dr_connector_by_id(SPAPR_DR_CONNECTOR_TYPE_CPU, index); drc = spapr_drc_by_id(TYPE_SPAPR_DRC_CPU, index);
if (drc) { if (drc) {
drc_index = spapr_drc_index(drc); drc_index = spapr_drc_index(drc);
_FDT((fdt_setprop_cell(fdt, offset, "ibm,my-drc-index", drc_index))); _FDT((fdt_setprop_cell(fdt, offset, "ibm,my-drc-index", drc_index)));
@ -654,7 +654,7 @@ static int spapr_populate_drconf_memory(sPAPRMachineState *spapr, void *fdt)
if (i >= hotplug_lmb_start) { if (i >= hotplug_lmb_start) {
sPAPRDRConnector *drc; sPAPRDRConnector *drc;
drc = spapr_dr_connector_by_id(SPAPR_DR_CONNECTOR_TYPE_LMB, i); drc = spapr_drc_by_id(TYPE_SPAPR_DRC_LMB, i);
g_assert(drc); g_assert(drc);
dynamic_memory[0] = cpu_to_be32(addr >> 32); dynamic_memory[0] = cpu_to_be32(addr >> 32);
@ -2536,8 +2536,8 @@ static void spapr_add_lmbs(DeviceState *dev, uint64_t addr_start, uint64_t size,
uint64_t addr = addr_start; uint64_t addr = addr_start;
for (i = 0; i < nr_lmbs; i++) { for (i = 0; i < nr_lmbs; i++) {
drc = spapr_dr_connector_by_id(SPAPR_DR_CONNECTOR_TYPE_LMB, drc = spapr_drc_by_id(TYPE_SPAPR_DRC_LMB,
addr/SPAPR_MEMORY_BLOCK_SIZE); addr / SPAPR_MEMORY_BLOCK_SIZE);
g_assert(drc); g_assert(drc);
fdt = create_device_tree(&fdt_size); fdt = create_device_tree(&fdt_size);
@ -2558,8 +2558,8 @@ static void spapr_add_lmbs(DeviceState *dev, uint64_t addr_start, uint64_t size,
*/ */
if (dev->hotplugged) { if (dev->hotplugged) {
if (dedicated_hp_event_source) { if (dedicated_hp_event_source) {
drc = spapr_dr_connector_by_id(SPAPR_DR_CONNECTOR_TYPE_LMB, drc = spapr_drc_by_id(TYPE_SPAPR_DRC_LMB,
addr_start / SPAPR_MEMORY_BLOCK_SIZE); addr_start / SPAPR_MEMORY_BLOCK_SIZE);
drck = SPAPR_DR_CONNECTOR_GET_CLASS(drc); drck = SPAPR_DR_CONNECTOR_GET_CLASS(drc);
spapr_hotplug_req_add_by_count_indexed(SPAPR_DR_CONNECTOR_TYPE_LMB, spapr_hotplug_req_add_by_count_indexed(SPAPR_DR_CONNECTOR_TYPE_LMB,
nr_lmbs, nr_lmbs,
@ -2676,8 +2676,8 @@ static sPAPRDIMMState *spapr_recover_pending_dimm_state(sPAPRMachineState *ms,
addr = addr_start; addr = addr_start;
for (i = 0; i < nr_lmbs; i++) { for (i = 0; i < nr_lmbs; i++) {
drc = spapr_dr_connector_by_id(SPAPR_DR_CONNECTOR_TYPE_LMB, drc = spapr_drc_by_id(TYPE_SPAPR_DRC_LMB,
addr / SPAPR_MEMORY_BLOCK_SIZE); addr / SPAPR_MEMORY_BLOCK_SIZE);
g_assert(drc); g_assert(drc);
if (drc->indicator_state != SPAPR_DR_INDICATOR_STATE_INACTIVE) { if (drc->indicator_state != SPAPR_DR_INDICATOR_STATE_INACTIVE) {
avail_lmbs++; avail_lmbs++;
@ -2760,8 +2760,8 @@ static void spapr_memory_unplug_request(HotplugHandler *hotplug_dev,
addr = addr_start; addr = addr_start;
for (i = 0; i < nr_lmbs; i++) { for (i = 0; i < nr_lmbs; i++) {
drc = spapr_dr_connector_by_id(SPAPR_DR_CONNECTOR_TYPE_LMB, drc = spapr_drc_by_id(TYPE_SPAPR_DRC_LMB,
addr / SPAPR_MEMORY_BLOCK_SIZE); addr / SPAPR_MEMORY_BLOCK_SIZE);
g_assert(drc); g_assert(drc);
drck = SPAPR_DR_CONNECTOR_GET_CLASS(drc); drck = SPAPR_DR_CONNECTOR_GET_CLASS(drc);
@ -2769,8 +2769,8 @@ static void spapr_memory_unplug_request(HotplugHandler *hotplug_dev,
addr += SPAPR_MEMORY_BLOCK_SIZE; addr += SPAPR_MEMORY_BLOCK_SIZE;
} }
drc = spapr_dr_connector_by_id(SPAPR_DR_CONNECTOR_TYPE_LMB, drc = spapr_drc_by_id(TYPE_SPAPR_DRC_LMB,
addr_start / SPAPR_MEMORY_BLOCK_SIZE); addr_start / SPAPR_MEMORY_BLOCK_SIZE);
drck = SPAPR_DR_CONNECTOR_GET_CLASS(drc); drck = SPAPR_DR_CONNECTOR_GET_CLASS(drc);
spapr_hotplug_req_remove_by_count_indexed(SPAPR_DR_CONNECTOR_TYPE_LMB, spapr_hotplug_req_remove_by_count_indexed(SPAPR_DR_CONNECTOR_TYPE_LMB,
nr_lmbs, spapr_drc_index(drc)); nr_lmbs, spapr_drc_index(drc));
@ -2841,7 +2841,7 @@ void spapr_core_unplug_request(HotplugHandler *hotplug_dev, DeviceState *dev,
return; return;
} }
drc = spapr_dr_connector_by_id(SPAPR_DR_CONNECTOR_TYPE_CPU, index * smt); drc = spapr_drc_by_id(TYPE_SPAPR_DRC_CPU, index * smt);
g_assert(drc); g_assert(drc);
drck = SPAPR_DR_CONNECTOR_GET_CLASS(drc); drck = SPAPR_DR_CONNECTOR_GET_CLASS(drc);
@ -2876,7 +2876,7 @@ static void spapr_core_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
cc->core_id); cc->core_id);
return; return;
} }
drc = spapr_dr_connector_by_id(SPAPR_DR_CONNECTOR_TYPE_CPU, index * smt); drc = spapr_drc_by_id(TYPE_SPAPR_DRC_CPU, index * smt);
g_assert(drc || !mc->has_hotpluggable_cpus); g_assert(drc || !mc->has_hotpluggable_cpus);

34
hw/ppc/spapr_drc.c
View File

@ -55,21 +55,6 @@ static void spapr_ccs_remove(sPAPRMachineState *spapr,
g_free(ccs); g_free(ccs);
} }
static sPAPRDRConnectorTypeShift get_type_shift(sPAPRDRConnectorType type)
{
uint32_t shift = 0;
/* make sure this isn't SPAPR_DR_CONNECTOR_TYPE_ANY, or some
* other wonky value.
*/
g_assert(is_power_of_2(type));
while (type != (1 << shift)) {
shift++;
}
return shift;
}
sPAPRDRConnectorType spapr_drc_type(sPAPRDRConnector *drc) sPAPRDRConnectorType spapr_drc_type(sPAPRDRConnector *drc)
{ {
sPAPRDRConnectorClass *drck = SPAPR_DR_CONNECTOR_GET_CLASS(drc); sPAPRDRConnectorClass *drck = SPAPR_DR_CONNECTOR_GET_CLASS(drc);
@ -804,7 +789,7 @@ static const TypeInfo spapr_drc_lmb_info = {
/* helper functions for external users */ /* helper functions for external users */
sPAPRDRConnector *spapr_dr_connector_by_index(uint32_t index) sPAPRDRConnector *spapr_drc_by_index(uint32_t index)
{ {
Object *obj; Object *obj;
char name[256]; char name[256];
@ -815,12 +800,13 @@ sPAPRDRConnector *spapr_dr_connector_by_index(uint32_t index)
return !obj ? NULL : SPAPR_DR_CONNECTOR(obj); return !obj ? NULL : SPAPR_DR_CONNECTOR(obj);
} }
sPAPRDRConnector *spapr_dr_connector_by_id(sPAPRDRConnectorType type, sPAPRDRConnector *spapr_drc_by_id(const char *type, uint32_t id)
uint32_t id)
{ {
return spapr_dr_connector_by_index( sPAPRDRConnectorClass *drck
(get_type_shift(type) << DRC_INDEX_TYPE_SHIFT) | = SPAPR_DR_CONNECTOR_CLASS(object_class_by_name(type));
(id & DRC_INDEX_ID_MASK));
return spapr_drc_by_index(drck->typeshift << DRC_INDEX_TYPE_SHIFT
| (id & DRC_INDEX_ID_MASK));
} }
/* generate a string the describes the DRC to encode into the /* generate a string the describes the DRC to encode into the
@ -1023,7 +1009,7 @@ static void rtas_set_indicator(PowerPCCPU *cpu, sPAPRMachineState *spapr,
} }
/* if this is a DR sensor we can assume sensor_index == drc_index */ /* if this is a DR sensor we can assume sensor_index == drc_index */
drc = spapr_dr_connector_by_index(sensor_index); drc = spapr_drc_by_index(sensor_index);
if (!drc) { if (!drc) {
trace_spapr_rtas_set_indicator_invalid(sensor_index); trace_spapr_rtas_set_indicator_invalid(sensor_index);
ret = RTAS_OUT_PARAM_ERROR; ret = RTAS_OUT_PARAM_ERROR;
@ -1096,7 +1082,7 @@ static void rtas_get_sensor_state(PowerPCCPU *cpu, sPAPRMachineState *spapr,
goto out; goto out;
} }
drc = spapr_dr_connector_by_index(sensor_index); drc = spapr_drc_by_index(sensor_index);
if (!drc) { if (!drc) {
trace_spapr_rtas_get_sensor_state_invalid(sensor_index); trace_spapr_rtas_get_sensor_state_invalid(sensor_index);
ret = RTAS_OUT_PARAM_ERROR; ret = RTAS_OUT_PARAM_ERROR;
@ -1161,7 +1147,7 @@ static void rtas_ibm_configure_connector(PowerPCCPU *cpu,
wa_addr = ((uint64_t)rtas_ld(args, 1) << 32) | rtas_ld(args, 0); wa_addr = ((uint64_t)rtas_ld(args, 1) << 32) | rtas_ld(args, 0);
drc_index = rtas_ld(wa_addr, 0); drc_index = rtas_ld(wa_addr, 0);
drc = spapr_dr_connector_by_index(drc_index); drc = spapr_drc_by_index(drc_index);
if (!drc) { if (!drc) {
trace_spapr_rtas_ibm_configure_connector_invalid(drc_index); trace_spapr_rtas_ibm_configure_connector_invalid(drc_index);
rc = RTAS_OUT_PARAM_ERROR; rc = RTAS_OUT_PARAM_ERROR;

2
hw/ppc/spapr_events.c
View File

@ -477,7 +477,7 @@ static void spapr_powerdown_req(Notifier *n, void *opaque)
static void spapr_hotplug_set_signalled(uint32_t drc_index) static void spapr_hotplug_set_signalled(uint32_t drc_index)
{ {
sPAPRDRConnector *drc = spapr_dr_connector_by_index(drc_index); sPAPRDRConnector *drc = spapr_drc_by_index(drc_index);
sPAPRDRConnectorClass *drck = SPAPR_DR_CONNECTOR_GET_CLASS(drc); sPAPRDRConnectorClass *drck = SPAPR_DR_CONNECTOR_GET_CLASS(drc);
drck->set_signalled(drc); drck->set_signalled(drc);
} }

6
hw/ppc/spapr_pci.c
View File

@ -1400,10 +1400,8 @@ static sPAPRDRConnector *spapr_phb_get_pci_func_drc(sPAPRPHBState *phb,
uint32_t busnr, uint32_t busnr,
int32_t devfn) int32_t devfn)
{ {
return spapr_dr_connector_by_id(SPAPR_DR_CONNECTOR_TYPE_PCI, return spapr_drc_by_id(TYPE_SPAPR_DRC_PCI,
(phb->index << 16) | (phb->index << 16) | (busnr << 8) | devfn);
(busnr << 8) |
devfn);
} }
static sPAPRDRConnector *spapr_phb_get_pci_drc(sPAPRPHBState *phb, static sPAPRDRConnector *spapr_phb_get_pci_drc(sPAPRPHBState *phb,

5
include/hw/ppc/spapr_drc.h
View File

@ -230,9 +230,8 @@ sPAPRDRConnectorType spapr_drc_type(sPAPRDRConnector *drc);
sPAPRDRConnector *spapr_dr_connector_new(Object *owner, const char *type, sPAPRDRConnector *spapr_dr_connector_new(Object *owner, const char *type,
uint32_t id); uint32_t id);
sPAPRDRConnector *spapr_dr_connector_by_index(uint32_t index); sPAPRDRConnector *spapr_drc_by_index(uint32_t index);
sPAPRDRConnector *spapr_dr_connector_by_id(sPAPRDRConnectorType type, sPAPRDRConnector *spapr_drc_by_id(const char *type, uint32_t id);
uint32_t id);
int spapr_drc_populate_dt(void *fdt, int fdt_offset, Object *owner, int spapr_drc_populate_dt(void *fdt, int fdt_offset, Object *owner,
uint32_t drc_type_mask); uint32_t drc_type_mask);

Write Preview
Loading…
Cancel
Save