Message ID | 20180103180805.18140-5-f4bug@amsat.org |
---|---|
State | Superseded, archived |
Headers | show |
Series | SDHCI: housekeeping | expand |
On Wed, Jan 3, 2018 at 10:07 AM, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > Now both sysbus/pci classes inherit of the 'pending-insert-quirk' property, > which is a HCI dependent property (regardless if accessed through a MMIO > sysbus or a PCI bus). > So far only the BCM implementation has to use it. > > Add sysbus/pci/sdbus comments to have clearer code blocks separation. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Alistair Francis <alistair.francis@xilinx.com> Alistair > --- > hw/sd/sdhci.c | 21 ++++++++++----------- > 1 file changed, 10 insertions(+), 11 deletions(-) > > diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c > index 365bc80009..a11469fbca 100644 > --- a/hw/sd/sdhci.c > +++ b/hw/sd/sdhci.c > @@ -1266,13 +1266,17 @@ const VMStateDescription sdhci_vmstate = { > > /* Capabilities registers provide information on supported features of this > * specific host controller implementation */ > -static Property sdhci_pci_properties[] = { > +static Property sdhci_properties[] = { > DEFINE_PROP_UINT32("capareg", SDHCIState, capareg, > SDHC_CAPAB_REG_DEFAULT), > DEFINE_PROP_UINT32("maxcurr", SDHCIState, maxcurr, 0), > + DEFINE_PROP_BOOL("pending-insert-quirk", SDHCIState, pending_insert_quirk, > + false), > DEFINE_PROP_END_OF_LIST(), > }; > > +/* --- qdev PCI --- */ > + > static void sdhci_pci_realize(PCIDevice *dev, Error **errp) > { > SDHCIState *s = PCI_SDHCI(dev); > @@ -1305,7 +1309,7 @@ static void sdhci_pci_class_init(ObjectClass *klass, void *data) > k->class_id = PCI_CLASS_SYSTEM_SDHCI; > set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); > dc->vmsd = &sdhci_vmstate; > - dc->props = sdhci_pci_properties; > + dc->props = sdhci_properties; > dc->reset = sdhci_poweron_reset; > } > > @@ -1320,14 +1324,7 @@ static const TypeInfo sdhci_pci_info = { > }, > }; > > -static Property sdhci_sysbus_properties[] = { > - DEFINE_PROP_UINT32("capareg", SDHCIState, capareg, > - SDHC_CAPAB_REG_DEFAULT), > - DEFINE_PROP_UINT32("maxcurr", SDHCIState, maxcurr, 0), > - DEFINE_PROP_BOOL("pending-insert-quirk", SDHCIState, pending_insert_quirk, > - false), > - DEFINE_PROP_END_OF_LIST(), > -}; > +/* --- qdev SysBus --- */ > > static void sdhci_sysbus_init(Object *obj) > { > @@ -1360,7 +1357,7 @@ static void sdhci_sysbus_class_init(ObjectClass *klass, void *data) > DeviceClass *dc = DEVICE_CLASS(klass); > > dc->vmsd = &sdhci_vmstate; > - dc->props = sdhci_sysbus_properties; > + dc->props = sdhci_properties; > dc->realize = sdhci_sysbus_realize; > dc->reset = sdhci_poweron_reset; > } > @@ -1374,6 +1371,8 @@ static const TypeInfo sdhci_sysbus_info = { > .class_init = sdhci_sysbus_class_init, > }; > > +/* --- qdev bus master --- */ > + > static void sdhci_bus_class_init(ObjectClass *klass, void *data) > { > SDBusClass *sbc = SD_BUS_CLASS(klass); > -- > 2.15.1 > >
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 365bc80009..a11469fbca 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1266,13 +1266,17 @@ const VMStateDescription sdhci_vmstate = { /* Capabilities registers provide information on supported features of this * specific host controller implementation */ -static Property sdhci_pci_properties[] = { +static Property sdhci_properties[] = { DEFINE_PROP_UINT32("capareg", SDHCIState, capareg, SDHC_CAPAB_REG_DEFAULT), DEFINE_PROP_UINT32("maxcurr", SDHCIState, maxcurr, 0), + DEFINE_PROP_BOOL("pending-insert-quirk", SDHCIState, pending_insert_quirk, + false), DEFINE_PROP_END_OF_LIST(), }; +/* --- qdev PCI --- */ + static void sdhci_pci_realize(PCIDevice *dev, Error **errp) { SDHCIState *s = PCI_SDHCI(dev); @@ -1305,7 +1309,7 @@ static void sdhci_pci_class_init(ObjectClass *klass, void *data) k->class_id = PCI_CLASS_SYSTEM_SDHCI; set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); dc->vmsd = &sdhci_vmstate; - dc->props = sdhci_pci_properties; + dc->props = sdhci_properties; dc->reset = sdhci_poweron_reset; } @@ -1320,14 +1324,7 @@ static const TypeInfo sdhci_pci_info = { }, }; -static Property sdhci_sysbus_properties[] = { - DEFINE_PROP_UINT32("capareg", SDHCIState, capareg, - SDHC_CAPAB_REG_DEFAULT), - DEFINE_PROP_UINT32("maxcurr", SDHCIState, maxcurr, 0), - DEFINE_PROP_BOOL("pending-insert-quirk", SDHCIState, pending_insert_quirk, - false), - DEFINE_PROP_END_OF_LIST(), -}; +/* --- qdev SysBus --- */ static void sdhci_sysbus_init(Object *obj) { @@ -1360,7 +1357,7 @@ static void sdhci_sysbus_class_init(ObjectClass *klass, void *data) DeviceClass *dc = DEVICE_CLASS(klass); dc->vmsd = &sdhci_vmstate; - dc->props = sdhci_sysbus_properties; + dc->props = sdhci_properties; dc->realize = sdhci_sysbus_realize; dc->reset = sdhci_poweron_reset; } @@ -1374,6 +1371,8 @@ static const TypeInfo sdhci_sysbus_info = { .class_init = sdhci_sysbus_class_init, }; +/* --- qdev bus master --- */ + static void sdhci_bus_class_init(ObjectClass *klass, void *data) { SDBusClass *sbc = SD_BUS_CLASS(klass);
Now both sysbus/pci classes inherit of the 'pending-insert-quirk' property, which is a HCI dependent property (regardless if accessed through a MMIO sysbus or a PCI bus). So far only the BCM implementation has to use it. Add sysbus/pci/sdbus comments to have clearer code blocks separation. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- hw/sd/sdhci.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-)