From: Bjorn Helgaas <bhelgaas@google.com>
Date: Thu, 1 Feb 2018 17:40:01 +0000 (-0600)
Subject: Merge remote-tracking branch 'lorenzo/pci/endpoint' into next
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7dd113b7caf54b7c45a9627da5d6392784377e7c;p=openwrt%2Fstaging%2Fblogic.git

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
---

7dd113b7caf54b7c45a9627da5d6392784377e7c
diff --cc drivers/pci/dwc/pcie-designware-ep.c
index 52edcb19da36,0989946df32c..d3fc67048e3b
--- a/drivers/pci/dwc/pcie-designware-ep.c
+++ b/drivers/pci/dwc/pcie-designware-ep.c
@@@ -126,11 -119,10 +124,11 @@@ static void dw_pcie_ep_clear_bar(struc
  	dw_pcie_ep_reset_bar(pci, bar);
  
  	dw_pcie_disable_atu(pci, atu_index, DW_PCIE_REGION_INBOUND);
- 	clear_bit(atu_index, &ep->ib_window_map);
+ 	clear_bit(atu_index, ep->ib_window_map);
  }
  
 -static int dw_pcie_ep_set_bar(struct pci_epc *epc, enum pci_barno bar,
 +static int dw_pcie_ep_set_bar(struct pci_epc *epc, u8 func_no,
 +			      enum pci_barno bar,
  			      dma_addr_t bar_phys, size_t size, int flags)
  {
  	int ret;
@@@ -184,11 -173,10 +182,11 @@@ static void dw_pcie_ep_unmap_addr(struc
  		return;
  
  	dw_pcie_disable_atu(pci, atu_index, DW_PCIE_REGION_OUTBOUND);
- 	clear_bit(atu_index, &ep->ob_window_map);
+ 	clear_bit(atu_index, ep->ob_window_map);
  }
  
 -static int dw_pcie_ep_map_addr(struct pci_epc *epc, phys_addr_t addr,
 +static int dw_pcie_ep_map_addr(struct pci_epc *epc, u8 func_no,
 +			       phys_addr_t addr,
  			       u64 pci_addr, size_t size)
  {
  	int ret;
@@@ -204,11 -192,9 +202,9 @@@
  	return 0;
  }
  
 -static int dw_pcie_ep_get_msi(struct pci_epc *epc)
 +static int dw_pcie_ep_get_msi(struct pci_epc *epc, u8 func_no)
  {
  	int val;
- 	u32 lower_addr;
- 	u32 upper_addr;
  	struct dw_pcie_ep *ep = epc_get_drvdata(epc);
  	struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
  
diff --cc drivers/pci/dwc/pcie-designware.h
index eae17d96e6f7,8700ba12c130..6f530cfe3423
--- a/drivers/pci/dwc/pcie-designware.h
+++ b/drivers/pci/dwc/pcie-designware.h
@@@ -101,8 -100,8 +101,9 @@@
  
  #define MSI_MESSAGE_CONTROL		0x52
  #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
@@@ -196,12 -197,10 +201,12 @@@ 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;
 +	phys_addr_t		msi_mem_phys;
  };
  
  struct dw_pcie_ops {