| Message ID | 20240529051539.71210-4-philmd@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hw/i386: Remove deprecated pc-i440fx-2.0 -> 2.3 machines | expand |
On Wed, 29 May 2024 07:15:19 +0200 Philippe Mathieu-Daudé <philmd@linaro.org> wrote: > XHCI_FLAG_FORCE_PCIE_ENDCAP was only used by the > pc-i440fx-2.0 machine, which got removed. Remove it > and simplify usb_xhci_pci_realize(). > > Reviewed-by: Thomas Huth <thuth@redhat.com> > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > Reviewed-by: Zhao Liu <zhao1.liu@intel.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> > --- > hw/usb/hcd-xhci.h | 1 - > hw/usb/hcd-xhci-nec.c | 2 -- > hw/usb/hcd-xhci-pci.c | 3 +-- > 3 files changed, 1 insertion(+), 5 deletions(-) > > diff --git a/hw/usb/hcd-xhci.h b/hw/usb/hcd-xhci.h > index 98f598382a..1efa4858fb 100644 > --- a/hw/usb/hcd-xhci.h > +++ b/hw/usb/hcd-xhci.h > @@ -37,7 +37,6 @@ typedef struct XHCIEPContext XHCIEPContext; > > enum xhci_flags { > XHCI_FLAG_SS_FIRST = 1, > - XHCI_FLAG_FORCE_PCIE_ENDCAP, > XHCI_FLAG_ENABLE_STREAMS, > }; > > diff --git a/hw/usb/hcd-xhci-nec.c b/hw/usb/hcd-xhci-nec.c > index 328e5bfe7c..5d5b069cf9 100644 > --- a/hw/usb/hcd-xhci-nec.c > +++ b/hw/usb/hcd-xhci-nec.c > @@ -43,8 +43,6 @@ static Property nec_xhci_properties[] = { > DEFINE_PROP_ON_OFF_AUTO("msix", XHCIPciState, msix, ON_OFF_AUTO_AUTO), > DEFINE_PROP_BIT("superspeed-ports-first", XHCINecState, flags, > XHCI_FLAG_SS_FIRST, true), > - DEFINE_PROP_BIT("force-pcie-endcap", XHCINecState, flags, > - XHCI_FLAG_FORCE_PCIE_ENDCAP, false), > DEFINE_PROP_UINT32("intrs", XHCINecState, intrs, XHCI_MAXINTRS), > DEFINE_PROP_UINT32("slots", XHCINecState, slots, XHCI_MAXSLOTS), > DEFINE_PROP_END_OF_LIST(), > diff --git a/hw/usb/hcd-xhci-pci.c b/hw/usb/hcd-xhci-pci.c > index 4423983308..cbad96f393 100644 > --- a/hw/usb/hcd-xhci-pci.c > +++ b/hw/usb/hcd-xhci-pci.c > @@ -148,8 +148,7 @@ static void usb_xhci_pci_realize(struct PCIDevice *dev, Error **errp) > PCI_BASE_ADDRESS_MEM_TYPE_64, > &s->xhci.mem); > > - if (pci_bus_is_express(pci_get_bus(dev)) || > - xhci_get_flag(&s->xhci, XHCI_FLAG_FORCE_PCIE_ENDCAP)) { > + if (pci_bus_is_express(pci_get_bus(dev))) { > ret = pcie_endpoint_cap_init(dev, 0xa0); > assert(ret > 0); > }
diff --git a/hw/usb/hcd-xhci.h b/hw/usb/hcd-xhci.h index 98f598382a..1efa4858fb 100644 --- a/hw/usb/hcd-xhci.h +++ b/hw/usb/hcd-xhci.h @@ -37,7 +37,6 @@ typedef struct XHCIEPContext XHCIEPContext; enum xhci_flags { XHCI_FLAG_SS_FIRST = 1, - XHCI_FLAG_FORCE_PCIE_ENDCAP, XHCI_FLAG_ENABLE_STREAMS, }; diff --git a/hw/usb/hcd-xhci-nec.c b/hw/usb/hcd-xhci-nec.c index 328e5bfe7c..5d5b069cf9 100644 --- a/hw/usb/hcd-xhci-nec.c +++ b/hw/usb/hcd-xhci-nec.c @@ -43,8 +43,6 @@ static Property nec_xhci_properties[] = { DEFINE_PROP_ON_OFF_AUTO("msix", XHCIPciState, msix, ON_OFF_AUTO_AUTO), DEFINE_PROP_BIT("superspeed-ports-first", XHCINecState, flags, XHCI_FLAG_SS_FIRST, true), - DEFINE_PROP_BIT("force-pcie-endcap", XHCINecState, flags, - XHCI_FLAG_FORCE_PCIE_ENDCAP, false), DEFINE_PROP_UINT32("intrs", XHCINecState, intrs, XHCI_MAXINTRS), DEFINE_PROP_UINT32("slots", XHCINecState, slots, XHCI_MAXSLOTS), DEFINE_PROP_END_OF_LIST(), diff --git a/hw/usb/hcd-xhci-pci.c b/hw/usb/hcd-xhci-pci.c index 4423983308..cbad96f393 100644 --- a/hw/usb/hcd-xhci-pci.c +++ b/hw/usb/hcd-xhci-pci.c @@ -148,8 +148,7 @@ static void usb_xhci_pci_realize(struct PCIDevice *dev, Error **errp) PCI_BASE_ADDRESS_MEM_TYPE_64, &s->xhci.mem); - if (pci_bus_is_express(pci_get_bus(dev)) || - xhci_get_flag(&s->xhci, XHCI_FLAG_FORCE_PCIE_ENDCAP)) { + if (pci_bus_is_express(pci_get_bus(dev))) { ret = pcie_endpoint_cap_init(dev, 0xa0); assert(ret > 0); }