diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2018-02-01 20:40:01 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <helgaas@kernel.org> | 2018-02-01 20:40:01 +0300 |
| commit | 7dd113b7caf54b7c45a9627da5d6392784377e7c (patch) | |
| tree | 4fa43480f225dfdff3b63ecd6a33b1f69ecc35a6 /drivers/pci/dwc/pcie-designware.h | |
| parent | 16093362d66ac205811b666ce7c38a0f34ace623 (diff) | |
| parent | b330104fa76df3eae6e199a23791fed5d35f06b4 (diff) | |
| download | linux-7dd113b7caf54b7c45a9627da5d6392784377e7c.tar.xz | |
Merge remote-tracking branch 'lorenzo/pci/endpoint' into next
* lorenzo/pci/endpoint:
PCI: endpoint: Use EPC's device in dma_alloc_coherent()/dma_free_coherent()
PCI: designware-ep: Fix ->get_msi() to check MSI_EN bit
PCI: endpoint: Fix find_first_zero_bit() usage
PCI: endpoint: Populate func_no before calling pci_epc_add_epf()
PCI: designware-ep: Fix find_first_zero_bit() usage
Diffstat (limited to 'drivers/pci/dwc/pcie-designware.h')
| -rw-r--r-- | drivers/pci/dwc/pcie-designware.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/pci/dwc/pcie-designware.h b/drivers/pci/dwc/pcie-designware.h index eae17d96e6f7..6f530cfe3423 100644 --- a/drivers/pci/dwc/pcie-designware.h +++ b/drivers/pci/dwc/pcie-designware.h @@ -103,6 +103,7 @@ #define MSI_CAP_MMC_SHIFT 1 #define MSI_CAP_MMC_MASK (7 << MSI_CAP_MMC_SHIFT) #define MSI_CAP_MME_SHIFT 4 +#define MSI_CAP_MSI_EN_MASK 0x1 #define MSI_CAP_MME_MASK (7 << MSI_CAP_MME_SHIFT) #define MSI_MESSAGE_ADDR_L32 0x54 #define MSI_MESSAGE_ADDR_U32 0x58 @@ -117,6 +118,10 @@ #define MAX_MSI_IRQS 32 #define MAX_MSI_CTRLS (MAX_MSI_IRQS / 32) +/* Maximum number of inbound/outbound iATUs */ +#define MAX_IATU_IN 256 +#define MAX_IATU_OUT 256 + struct pcie_port; struct dw_pcie; struct dw_pcie_ep; @@ -196,8 +201,8 @@ struct dw_pcie_ep { size_t page_size; u8 bar_to_atu[6]; phys_addr_t *outbound_addr; - unsigned long ib_window_map; - unsigned long ob_window_map; + unsigned long *ib_window_map; + unsigned long *ob_window_map; u32 num_ib_windows; u32 num_ob_windows; void __iomem *msi_mem; |