| Message ID | 20221204190553.3274-2-shentey@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | Consolidate PIIX south bridges | expand |
On Sun, 4 Dec 2022 20:05:22 +0100 Bernhard Beschow <shentey@gmail.com> wrote: > From: Philippe Mathieu-Daudé <philmd@linaro.org> > > The PIIX4 PCI-ISA bridge function is always located at 10:0. > Since we want to re-use its address, add the PIIX4_PCI_DEVFN > definition. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > Message-Id: <20221027204720.33611-2-philmd@linaro.org> Reviewed-by: Igor Mammedov <imammedo@redhat.com> > --- > hw/mips/malta.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/hw/mips/malta.c b/hw/mips/malta.c > index c0a2e0ab04..9bffa1b128 100644 > --- a/hw/mips/malta.c > +++ b/hw/mips/malta.c > @@ -71,6 +71,8 @@ > > #define FLASH_SIZE 0x400000 > > +#define PIIX4_PCI_DEVFN PCI_DEVFN(10, 0) > + > typedef struct { > MemoryRegion iomem; > MemoryRegion iomem_lo; /* 0 - 0x900 */ > @@ -1401,7 +1403,7 @@ void mips_malta_init(MachineState *machine) > empty_slot_init("GT64120", 0, 0x20000000); > > /* Southbridge */ > - piix4 = pci_create_simple_multifunction(pci_bus, PCI_DEVFN(10, 0), true, > + piix4 = pci_create_simple_multifunction(pci_bus, PIIX4_PCI_DEVFN, true, > TYPE_PIIX4_PCI_DEVICE); > isa_bus = ISA_BUS(qdev_get_child_bus(DEVICE(piix4), "isa.0")); >
diff --git a/hw/mips/malta.c b/hw/mips/malta.c index c0a2e0ab04..9bffa1b128 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -71,6 +71,8 @@ #define FLASH_SIZE 0x400000 +#define PIIX4_PCI_DEVFN PCI_DEVFN(10, 0) + typedef struct { MemoryRegion iomem; MemoryRegion iomem_lo; /* 0 - 0x900 */ @@ -1401,7 +1403,7 @@ void mips_malta_init(MachineState *machine) empty_slot_init("GT64120", 0, 0x20000000); /* Southbridge */ - piix4 = pci_create_simple_multifunction(pci_bus, PCI_DEVFN(10, 0), true, + piix4 = pci_create_simple_multifunction(pci_bus, PIIX4_PCI_DEVFN, true, TYPE_PIIX4_PCI_DEVICE); isa_bus = ISA_BUS(qdev_get_child_bus(DEVICE(piix4), "isa.0"));