8c46f7ec85
On sPAPR, virtio devices are connected to the PCI bus and use MSI-X.
Commit cc943c36faa192cd4b32af8fe5edb31894017d35 has modified MSI-X
so that writes are made using the bus master address space and follow
the IOMMU path.
Unfortunately, the IOMMU address space address space does not have an
MSI window: the notification is silently dropped in unassigned_mem_write
instead of reaching the guest... The most visible effect is that all
virtio devices are non-functional on sPAPR since then. :(
This patch does the following:
1) map the MSI window into the IOMMU address space for each PHB
- since each PHB instantiates its own IOMMU address space, we
can safely map the window at a fixed address (SPAPR_PCI_MSI_WINDOW)
- no real need to keep the MSI window setup in a separate function,
the spapr_pci_msi_init() code moves to spapr_phb_realize().
2) kill the global MSI window as it is not needed in the end
Signed-off-by: Greg Kurz <gkurz@linux.vnet.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
126 lines
3.6 KiB
C
126 lines
3.6 KiB
C
/*
|
|
* QEMU SPAPR PCI BUS definitions
|
|
*
|
|
* Copyright (c) 2011 Alexey Kardashevskiy <aik@au1.ibm.com>
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
#if !defined(__HW_SPAPR_H__)
|
|
#error Please include spapr.h before this file!
|
|
#endif
|
|
|
|
#if !defined(__HW_SPAPR_PCI_H__)
|
|
#define __HW_SPAPR_PCI_H__
|
|
|
|
#include "hw/pci/pci.h"
|
|
#include "hw/pci/pci_host.h"
|
|
#include "hw/ppc/xics.h"
|
|
|
|
#define TYPE_SPAPR_PCI_HOST_BRIDGE "spapr-pci-host-bridge"
|
|
#define TYPE_SPAPR_PCI_VFIO_HOST_BRIDGE "spapr-pci-vfio-host-bridge"
|
|
|
|
#define SPAPR_PCI_HOST_BRIDGE(obj) \
|
|
OBJECT_CHECK(sPAPRPHBState, (obj), TYPE_SPAPR_PCI_HOST_BRIDGE)
|
|
|
|
#define SPAPR_PCI_VFIO_HOST_BRIDGE(obj) \
|
|
OBJECT_CHECK(sPAPRPHBVFIOState, (obj), TYPE_SPAPR_PCI_VFIO_HOST_BRIDGE)
|
|
|
|
#define SPAPR_PCI_HOST_BRIDGE_CLASS(klass) \
|
|
OBJECT_CLASS_CHECK(sPAPRPHBClass, (klass), TYPE_SPAPR_PCI_HOST_BRIDGE)
|
|
#define SPAPR_PCI_HOST_BRIDGE_GET_CLASS(obj) \
|
|
OBJECT_GET_CLASS(sPAPRPHBClass, (obj), TYPE_SPAPR_PCI_HOST_BRIDGE)
|
|
|
|
typedef struct sPAPRPHBClass sPAPRPHBClass;
|
|
typedef struct sPAPRPHBState sPAPRPHBState;
|
|
typedef struct sPAPRPHBVFIOState sPAPRPHBVFIOState;
|
|
|
|
struct sPAPRPHBClass {
|
|
PCIHostBridgeClass parent_class;
|
|
|
|
void (*finish_realize)(sPAPRPHBState *sphb, Error **errp);
|
|
};
|
|
|
|
typedef struct spapr_pci_msi {
|
|
uint32_t first_irq;
|
|
uint32_t num;
|
|
} spapr_pci_msi;
|
|
|
|
typedef struct spapr_pci_msi_mig {
|
|
uint32_t key;
|
|
spapr_pci_msi value;
|
|
} spapr_pci_msi_mig;
|
|
|
|
struct sPAPRPHBState {
|
|
PCIHostState parent_obj;
|
|
|
|
int32_t index;
|
|
uint64_t buid;
|
|
char *dtbusname;
|
|
|
|
MemoryRegion memspace, iospace;
|
|
hwaddr mem_win_addr, mem_win_size, io_win_addr, io_win_size;
|
|
MemoryRegion memwindow, iowindow, msiwindow;
|
|
|
|
uint32_t dma_liobn;
|
|
AddressSpace iommu_as;
|
|
MemoryRegion iommu_root;
|
|
|
|
struct spapr_pci_lsi {
|
|
uint32_t irq;
|
|
} lsi_table[PCI_NUM_PINS];
|
|
|
|
GHashTable *msi;
|
|
/* Temporary cache for migration purposes */
|
|
int32_t msi_devs_num;
|
|
spapr_pci_msi_mig *msi_devs;
|
|
|
|
QLIST_ENTRY(sPAPRPHBState) list;
|
|
};
|
|
|
|
struct sPAPRPHBVFIOState {
|
|
sPAPRPHBState phb;
|
|
|
|
int32_t iommugroupid;
|
|
};
|
|
|
|
#define SPAPR_PCI_BASE_BUID 0x800000020000000ULL
|
|
|
|
#define SPAPR_PCI_WINDOW_BASE 0x10000000000ULL
|
|
#define SPAPR_PCI_WINDOW_SPACING 0x1000000000ULL
|
|
#define SPAPR_PCI_MMIO_WIN_OFF 0xA0000000
|
|
#define SPAPR_PCI_MMIO_WIN_SIZE 0x20000000
|
|
#define SPAPR_PCI_IO_WIN_OFF 0x80000000
|
|
#define SPAPR_PCI_IO_WIN_SIZE 0x10000
|
|
|
|
#define SPAPR_PCI_MSI_WINDOW 0x40000000000ULL
|
|
|
|
#define SPAPR_PCI_MEM_WIN_BUS_OFFSET 0x80000000ULL
|
|
|
|
static inline qemu_irq spapr_phb_lsi_qirq(struct sPAPRPHBState *phb, int pin)
|
|
{
|
|
return xics_get_qirq(spapr->icp, phb->lsi_table[pin].irq);
|
|
}
|
|
|
|
PCIHostState *spapr_create_phb(sPAPREnvironment *spapr, int index);
|
|
|
|
int spapr_populate_pci_dt(sPAPRPHBState *phb,
|
|
uint32_t xics_phandle,
|
|
void *fdt);
|
|
|
|
void spapr_pci_msi_init(sPAPREnvironment *spapr, hwaddr addr);
|
|
|
|
void spapr_pci_rtas_init(void);
|
|
|
|
#endif /* __HW_SPAPR_PCI_H__ */
|