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

Merge branch 'pci/controller/rockchip' 

- Use 64-bit mask on MSI 64-bit PCI address to avoid zeroing out the upper
  32 bits (Rick Wertenbroek)

* pci/controller/rockchip:
  PCI: rockchip: Use 64-bit mask on MSI 64-bit PCI address
parents 2195c163 cdb50033

drivers/pci/controller/pcie-rockchip.h

+3 −3
Original line number Diff line number Diff line
@@ -158,7 +158,9 @@ 
#define PCIE_RC_CONFIG_THP_CAP		(PCIE_RC_CONFIG_BASE + 0x274)

#define   PCIE_RC_CONFIG_THP_CAP_NEXT_MASK	GENMASK(31, 20)



#define PCIE_ADDR_MASK			0xffffff00

#define MAX_AXI_IB_ROOTPORT_REGION_NUM		3

#define MIN_AXI_ADDR_BITS_PASSED		8

#define PCIE_ADDR_MASK			GENMASK_ULL(63, MIN_AXI_ADDR_BITS_PASSED)

#define PCIE_CORE_AXI_CONF_BASE		0xc00000

#define PCIE_CORE_OB_REGION_ADDR0	(PCIE_CORE_AXI_CONF_BASE + 0x0)

#define   PCIE_CORE_OB_REGION_ADDR0_NUM_BITS	0x3f
@@ -185,8 +187,6 @@ 
#define AXI_WRAPPER_TYPE1_CFG			0xb

#define AXI_WRAPPER_NOR_MSG			0xc



#define MAX_AXI_IB_ROOTPORT_REGION_NUM		3

#define MIN_AXI_ADDR_BITS_PASSED		8

#define PCIE_RC_SEND_PME_OFF			0x11960

#define ROCKCHIP_VENDOR_ID			0x1d87

#define PCIE_LINK_IS_L2(x) \