xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2024-11-27 05:20:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

hw: Use the PCI_DEVFN() macro from 'hw/pci/pci.h'

Browse Source 
We already have a generic PCI_DEVFN() macro in "hw/pci/pci.h"
to pack the PCI slot/function identifiers, use it.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Message-Id: <20201012124506.3406909-6-philmd@redhat.com>
Reviewed-by: Huacai Chen <chenhuacai@kernel.org>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <20201231224911.1467352-4-f4bug@amsat.org>
This commit is contained in:
Philippe Mathieu-Daudé 2020-10-12 08:36:41 +02:00
parent 8d40def66d
commit 4934e479f1
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/arm/virt.c
View File

@ -1147,7 +1147,8 @@ static void create_pcie_irq_map(const VirtMachineState *vms,
full_irq_map, sizeof(full_irq_map)); full_irq_map, sizeof(full_irq_map));
qemu_fdt_setprop_cells(vms->fdt, nodename, "interrupt-map-mask", qemu_fdt_setprop_cells(vms->fdt, nodename, "interrupt-map-mask",
0x1800, 0, 0, /* devfn (PCI_SLOT(3)) */ cpu_to_be16(PCI_DEVFN(3, 0)), /* Slot 3 */
0, 0,
0x7 /* PCI irq */); 0x7 /* PCI irq */);
} }

2
hw/pci-host/bonito.c
View File

@ -631,7 +631,7 @@ static void bonito_pcihost_realize(DeviceState *dev, Error **errp)
phb->bus = pci_register_root_bus(dev, "pci", phb->bus = pci_register_root_bus(dev, "pci",
pci_bonito_set_irq, pci_bonito_map_irq, pci_bonito_set_irq, pci_bonito_map_irq,
dev, &bs->pci_mem, get_system_io(), dev, &bs->pci_mem, get_system_io(),
0x28, 32, TYPE_PCI_BUS); PCI_DEVFN(5, 0), 32, TYPE_PCI_BUS);
for (size_t i = 0; i < 3; i++) { for (size_t i = 0; i < 3; i++) {
char *name = g_strdup_printf("pci.lomem%zu", i); char *name = g_strdup_printf("pci.lomem%zu", i);

6
hw/pci-host/uninorth.c
View File

@ -68,10 +68,8 @@ static uint32_t unin_get_config_reg(uint32_t reg, uint32_t addr)
/* ... and then convert them to x86 format */ /* ... and then convert them to x86 format */
/* config pointer */ /* config pointer */
retval = (reg & (0xff - 7)) | (addr & 7); retval = (reg & (0xff - 7)) | (addr & 7);
/* slot */ /* slot, fn */
retval |= slot << 11; retval |= PCI_DEVFN(slot, func) << 8;
/* fn */
retval |= func << 8;
} }
trace_unin_get_config_reg(reg, addr, retval); trace_unin_get_config_reg(reg, addr, retval);