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

Merge branch 'pci/controller/rockchip' 

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

- Set Subsystem Vendor ID correctly (Rick Wertenbroek)

* pci/controller/rockchip:
  PCI: rockchip-ep: Remove wrong mask on subsys_vendor_id
  PCI: rockchip-ep: Set a 64-bit BAR if requested
parents 102c6969 2dba285c

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

+3 −5
Original line number Diff line number Diff line
@@ -98,10 +98,8 @@ static int rockchip_pcie_ep_write_header(struct pci_epc *epc, u8 fn, u8 vfn, 


	/* All functions share the same vendor ID with function 0 */

	if (fn == 0) {

		u32 vid_regs = (hdr->vendorid & GENMASK(15, 0)) |

			       (hdr->subsys_vendor_id & GENMASK(31, 16)) << 16;



		rockchip_pcie_write(rockchip, vid_regs,

		rockchip_pcie_write(rockchip,

				    hdr->vendorid | hdr->subsys_vendor_id << 16,

				    PCIE_CORE_CONFIG_VENDOR);

	}
@@ -153,7 +151,7 @@ static int rockchip_pcie_ep_set_bar(struct pci_epc *epc, u8 fn, u8 vfn, 
		ctrl = ROCKCHIP_PCIE_CORE_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;