[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 1/2] remove DEC 21154 PCI bridge
|
From: |
Igor Mammedov |
|
Subject: |
Re: [PATCH 1/2] remove DEC 21154 PCI bridge |
|
Date: |
Fri, 18 Nov 2022 13:44:47 +0100 |
On Wed, 16 Nov 2022 20:39:29 +0100 (CET)
BALATON Zoltan <balaton@eik.bme.hu> wrote:
> On Wed, 16 Nov 2022, Igor Mammedov wrote:
>
> > Code has not been used practically since its inception (2004)
> > f2aa58c6f4a20 UniNorth PCI bridge support
> > or maybe even earlier, but it was consuming contributors time
> > as QEMU was being rewritten.
> > Drop it for now. Whomever would like to actually
> > use the thing, can make sure it actually works/reintroduce
> > it back when there is a user.
> >
> > PS:
> > I've stumbled upon this when replacing PCIDeviceClass::is_bridge
> > field with QOM cast to PCI_BRIDGE type. Unused DEC 21154
> > was the only one trying to use the field with plain PCIDevice.
> > It's not worth keeping the field around for the sake of the code
> > that was commented out 'forever'.
> >
> > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > ---
> > hw/pci-bridge/dec.h | 9 ---
> > include/hw/pci/pci_ids.h | 1 -
> > hw/pci-bridge/dec.c | 164 --------------------------------------
> > hw/pci-bridge/meson.build | 2 -
> > hw/pci-host/uninorth.c | 6 --
> > 5 files changed, 182 deletions(-)
> > delete mode 100644 hw/pci-bridge/dec.h
> > delete mode 100644 hw/pci-bridge/dec.c
> >
> > diff --git a/hw/pci-bridge/dec.h b/hw/pci-bridge/dec.h
> > deleted file mode 100644
> > index 869e90b136..0000000000
> > --- a/hw/pci-bridge/dec.h
> > +++ /dev/null
> > @@ -1,9 +0,0 @@
> > -#ifndef HW_PCI_BRIDGE_DEC_H
> > -#define HW_PCI_BRIDGE_DEC_H
> > -
> > -
> > -#define TYPE_DEC_21154 "dec-21154-sysbus"
> > -
> > -PCIBus *pci_dec_21154_init(PCIBus *parent_bus, int devfn);
> > -
> > -#endif
> > diff --git a/include/hw/pci/pci_ids.h b/include/hw/pci/pci_ids.h
> > index bc9f834fd1..e4386ebb20 100644
> > --- a/include/hw/pci/pci_ids.h
> > +++ b/include/hw/pci/pci_ids.h
> > @@ -169,7 +169,6 @@
> >
> > #define PCI_VENDOR_ID_DEC 0x1011
> > #define PCI_DEVICE_ID_DEC_21143 0x0019
> > -#define PCI_DEVICE_ID_DEC_21154 0x0026
> >
> > #define PCI_VENDOR_ID_CIRRUS 0x1013
> >
> > diff --git a/hw/pci-bridge/dec.c b/hw/pci-bridge/dec.c
> > deleted file mode 100644
> > index 4773d07e6d..0000000000
> > --- a/hw/pci-bridge/dec.c
> > +++ /dev/null
> > @@ -1,164 +0,0 @@
> > -/*
> > - * QEMU DEC 21154 PCI bridge
> > - *
> > - * Copyright (c) 2006-2007 Fabrice Bellard
> > - * Copyright (c) 2007 Jocelyn Mayer
> > - *
> > - * Permission is hereby granted, free of charge, to any person obtaining a
> > copy
> > - * of this software and associated documentation files (the "Software"),
> > to deal
> > - * in the Software without restriction, including without limitation the
> > rights
> > - * to use, copy, modify, merge, publish, distribute, sublicense, and/or
> > sell
> > - * copies of the Software, and to permit persons to whom the Software is
> > - * furnished to do so, subject to the following conditions:
> > - *
> > - * The above copyright notice and this permission notice shall be included
> > in
> > - * all copies or substantial portions of the Software.
> > - *
> > - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
> > OR
> > - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> > - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> > - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
> > OTHER
> > - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> > FROM,
> > - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
> > IN
> > - * THE SOFTWARE.
> > - */
> > -
> > -#include "qemu/osdep.h"
> > -#include "dec.h"
> > -#include "hw/sysbus.h"
> > -#include "qapi/error.h"
> > -#include "qemu/module.h"
> > -#include "hw/pci/pci.h"
> > -#include "hw/pci/pci_host.h"
> > -#include "hw/pci/pci_bridge.h"
> > -#include "hw/pci/pci_bus.h"
> > -#include "qom/object.h"
> > -
> > -OBJECT_DECLARE_SIMPLE_TYPE(DECState, DEC_21154)
> > -
> > -struct DECState {
> > - PCIHostState parent_obj;
> > -};
> > -
> > -static int dec_map_irq(PCIDevice *pci_dev, int irq_num)
> > -{
> > - return irq_num;
> > -}
> > -
> > -static void dec_pci_bridge_realize(PCIDevice *pci_dev, Error **errp)
> > -{
> > - pci_bridge_initfn(pci_dev, TYPE_PCI_BUS);
> > -}
> > -
> > -static void dec_21154_pci_bridge_class_init(ObjectClass *klass, void *data)
> > -{
> > - DeviceClass *dc = DEVICE_CLASS(klass);
> > - PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
> > -
> > - set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
> > - k->realize = dec_pci_bridge_realize;
> > - k->exit = pci_bridge_exitfn;
> > - k->vendor_id = PCI_VENDOR_ID_DEC;
> > - k->device_id = PCI_DEVICE_ID_DEC_21154;
> > - k->config_write = pci_bridge_write_config;
> > - k->is_bridge = true;
> > - dc->desc = "DEC 21154 PCI-PCI bridge";
> > - dc->reset = pci_bridge_reset;
> > - dc->vmsd = &vmstate_pci_device;
> > -}
> > -
> > -static const TypeInfo dec_21154_pci_bridge_info = {
> > - .name = "dec-21154-p2p-bridge",
> > - .parent = TYPE_PCI_BRIDGE,
> > - .instance_size = sizeof(PCIBridge),
> > - .class_init = dec_21154_pci_bridge_class_init,
> > - .interfaces = (InterfaceInfo[]) {
> > - { INTERFACE_CONVENTIONAL_PCI_DEVICE },
> > - { },
> > - },
> > -};
> > -
> > -PCIBus *pci_dec_21154_init(PCIBus *parent_bus, int devfn)
> > -{
> > - PCIDevice *dev;
> > - PCIBridge *br;
> > -
> > - dev = pci_new_multifunction(devfn, false, "dec-21154-p2p-bridge");
> > - br = PCI_BRIDGE(dev);
> > - pci_bridge_map_irq(br, "DEC 21154 PCI-PCI bridge", dec_map_irq);
> > - pci_realize_and_unref(dev, parent_bus, &error_fatal);
> > - return pci_bridge_get_sec_bus(br);
> > -}
> > -
> > -static void pci_dec_21154_device_realize(DeviceState *dev, Error **errp)
> > -{
> > - PCIHostState *phb;
> > - SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
> > -
> > - phb = PCI_HOST_BRIDGE(dev);
> > -
> > - memory_region_init_io(&phb->conf_mem, OBJECT(dev),
> > &pci_host_conf_le_ops,
> > - dev, "pci-conf-idx", 0x1000);
> > - memory_region_init_io(&phb->data_mem, OBJECT(dev),
> > &pci_host_data_le_ops,
> > - dev, "pci-data-idx", 0x1000);
> > - sysbus_init_mmio(sbd, &phb->conf_mem);
> > - sysbus_init_mmio(sbd, &phb->data_mem);
> > -}
> > -
> > -static void dec_21154_pci_host_realize(PCIDevice *d, Error **errp)
> > -{
> > - /* PCI2PCI bridge same values as PearPC - check this */
> > -}
> > -
> > -static void dec_21154_pci_host_class_init(ObjectClass *klass, void *data)
> > -{
> > - PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
> > - DeviceClass *dc = DEVICE_CLASS(klass);
> > -
> > - set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
> > - k->realize = dec_21154_pci_host_realize;
> > - k->vendor_id = PCI_VENDOR_ID_DEC;
> > - k->device_id = PCI_DEVICE_ID_DEC_21154;
> > - k->revision = 0x02;
> > - k->class_id = PCI_CLASS_BRIDGE_PCI;
> > - k->is_bridge = true;
> > - /*
> > - * PCI-facing part of the host bridge, not usable without the
> > - * host-facing part, which can't be device_add'ed, yet.
> > - */
> > - dc->user_creatable = false;
> > -}
> > -
> > -static const TypeInfo dec_21154_pci_host_info = {
> > - .name = "dec-21154",
> > - .parent = TYPE_PCI_DEVICE,
> > - .instance_size = sizeof(PCIDevice),
> > - .class_init = dec_21154_pci_host_class_init,
> > - .interfaces = (InterfaceInfo[]) {
> > - { INTERFACE_CONVENTIONAL_PCI_DEVICE },
> > - { },
> > - },
> > -};
> > -
> > -static void pci_dec_21154_device_class_init(ObjectClass *klass, void *data)
> > -{
> > - DeviceClass *dc = DEVICE_CLASS(klass);
> > -
> > - dc->realize = pci_dec_21154_device_realize;
> > -}
> > -
> > -static const TypeInfo pci_dec_21154_device_info = {
> > - .name = TYPE_DEC_21154,
> > - .parent = TYPE_PCI_HOST_BRIDGE,
> > - .instance_size = sizeof(DECState),
> > - .class_init = pci_dec_21154_device_class_init,
> > -};
> > -
> > -static void dec_register_types(void)
> > -{
> > - type_register_static(&pci_dec_21154_device_info);
> > - type_register_static(&dec_21154_pci_host_info);
> > - type_register_static(&dec_21154_pci_bridge_info);
> > -}
> > -
> > -type_init(dec_register_types)
> > diff --git a/hw/pci-bridge/meson.build b/hw/pci-bridge/meson.build
> > index 243ceeda50..fe92d43de6 100644
> > --- a/hw/pci-bridge/meson.build
> > +++ b/hw/pci-bridge/meson.build
> > @@ -8,8 +8,6 @@ pci_ss.add(when: 'CONFIG_PXB', if_true:
> > files('pci_expander_bridge.c'),
> > pci_ss.add(when: 'CONFIG_XIO3130', if_true: files('xio3130_upstream.c',
> > 'xio3130_downstream.c'))
> > pci_ss.add(when: 'CONFIG_CXL', if_true: files('cxl_root_port.c',
> > 'cxl_upstream.c', 'cxl_downstream.c'))
> >
> > -# NewWorld PowerMac
> > -pci_ss.add(when: 'CONFIG_DEC_PCI', if_true: files('dec.c'))
> > # Sun4u
> > pci_ss.add(when: 'CONFIG_SIMBA', if_true: files('simba.c'))
> >
> > diff --git a/hw/pci-host/uninorth.c b/hw/pci-host/uninorth.c
> > index aebd44d265..5c617e86c1 100644
> > --- a/hw/pci-host/uninorth.c
> > +++ b/hw/pci-host/uninorth.c
> > @@ -127,12 +127,6 @@ static void pci_unin_main_realize(DeviceState *dev,
> > Error **errp)
> > PCI_DEVFN(11, 0), 4, TYPE_PCI_BUS);
> >
> > pci_create_simple(h->bus, PCI_DEVFN(11, 0), "uni-north-pci");
> > -
> > - /* DEC 21154 bridge */
> > -#if 0
> > - /* XXX: not activated as PPC BIOS doesn't handle multiple buses
> > properly */
>
> I think real hardware has this bridge and QEMU could emulate it but
> OpenBIOS can't handle more than one PCI bus or this bridge yet so this was
> disabled for that reason. Maybe leave the comment around as a reminder
> that this could be brought back from git history if somebody wants to fix
> it in the future, otherwise this may be forgotten and reimplemented from
> scratch.
Ok, I'll leave/amend commend as you suggested on respin.
On the other hand it might not be bad if it's re-implemented
from scratch, but that could be looked into when someone tries
to bring it back.
>
> Regards,
> BALATON Zoltan
>
> > - pci_create_simple(h->bus, PCI_DEVFN(12, 0), "dec-21154");
> > -#endif
> > }
> >
> > static void pci_unin_main_init(Object *obj)
> >
>