Skip to content

Commit

Permalink
pci: Convert TYPE_PCIE_ROOT_PORT to 3-phase reset
Browse files Browse the repository at this point in the history
Convert the TYPE_PCIE_ROOT_PORT device to 3-phase reset; this is a
necessary precursor to converting any of its child classes.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Tested-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-id: 20221125115240.3005559-4-peter.maydell@linaro.org
  • Loading branch information
pm215 committed Dec 16, 2022
1 parent 0d89890 commit bb27210
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions hw/pci-bridge/pcie_root_port.c
Expand Up @@ -43,9 +43,10 @@ static void rp_write_config(PCIDevice *d, uint32_t address,
pcie_aer_root_write_config(d, address, val, len, root_cmd);
}

static void rp_reset(DeviceState *qdev)
static void rp_reset_hold(Object *obj)
{
PCIDevice *d = PCI_DEVICE(qdev);
PCIDevice *d = PCI_DEVICE(obj);
DeviceState *qdev = DEVICE(obj);

rp_aer_vector_update(d);
pcie_cap_root_reset(d);
Expand Down Expand Up @@ -171,13 +172,14 @@ static void rp_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
ResettableClass *rc = RESETTABLE_CLASS(klass);

k->is_bridge = true;
k->config_write = rp_write_config;
k->realize = rp_realize;
k->exit = rp_exit;
set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
dc->reset = rp_reset;
rc->phases.hold = rp_reset_hold;
device_class_set_props(dc, rp_props);
}

Expand Down

0 comments on commit bb27210

Please sign in to comment.