Commit ec549857 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/controller/cadence' 

- Configure endpoint BAR to be 64-bit if the PCI_BASE_ADDRESS_MEM_TYPE_64
  flag is set instead of depending on the new BAR value itself (Niklas
  Cassel)

* pci/controller/cadence:
  PCI: cadence: Set a 64-bit BAR if requested
parents 14680b25 07db0fa8

drivers/pci/controller/cadence/pcie-cadence-ep.c

+1 −4
Original line number Diff line number Diff line
@@ -99,14 +99,11 @@ static int cdns_pcie_ep_set_bar(struct pci_epc *epc, u8 fn, u8 vfn, 
		ctrl = CDNS_PCIE_LM_BAR_CFG_CTRL_IO_32BITS;

	} else {

		bool is_prefetch = !!(flags & PCI_BASE_ADDRESS_MEM_PREFETCH);

		bool is_64bits = sz > SZ_2G;

		bool is_64bits = !!(flags & PCI_BASE_ADDRESS_MEM_TYPE_64);



		if (is_64bits && (bar & 1))

			return -EINVAL;



		if (is_64bits && !(flags & PCI_BASE_ADDRESS_MEM_TYPE_64))

			epf_bar->flags |= PCI_BASE_ADDRESS_MEM_TYPE_64;



		if (is_64bits && is_prefetch)

			ctrl = CDNS_PCIE_LM_BAR_CFG_CTRL_PREFETCH_MEM_64BITS;

		else if (is_prefetch)