1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/pci/controller/dwc/pcie-designware-ep.c b/drivers/pci/controller/dwc/pcie-designware-ep.c
index 0c208b9bda43..2bf5a35c0570 100644
--- a/drivers/pci/controller/dwc/pcie-designware-ep.c
+++ b/drivers/pci/controller/dwc/pcie-designware-ep.c
@@ -397,6 +397,7 @@ int dw_pcie_ep_raise_msi_irq(struct dw_pcie_ep *ep, u8 func_no,
 {
         struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
         struct pci_epc *epc = ep->epc;
+        unsigned int aligned_offset;
         u16 msg_ctrl, msg_data;
         u32 msg_addr_lower, msg_addr_upper, reg;
         u64 msg_addr;
@@ -422,13 +423,15 @@ int dw_pcie_ep_raise_msi_irq(struct dw_pcie_ep *ep, u8 func_no,
                 reg = ep->msi_cap + PCI_MSI_DATA_32;
                 msg_data = dw_pcie_readw_dbi(pci, reg);
         }
-        msg_addr = ((u64) msg_addr_upper) << 32 | msg_addr_lower;
+        aligned_offset = msg_addr_lower & (epc->mem->page_size - 1);
+        msg_addr = ((u64)msg_addr_upper) << 32 |
+                        (msg_addr_lower & ~aligned_offset);
         ret = dw_pcie_ep_map_addr(epc, func_no, ep->msi_mem_phys, msg_addr,
                                   epc->mem->page_size);
         if (ret)
                 return ret;
 
-        writel(msg_data | (interrupt_num - 1), ep->msi_mem);
+        writel(msg_data | (interrupt_num - 1), ep->msi_mem + aligned_offset);
 
         dw_pcie_ep_unmap_addr(epc, func_no, ep->msi_mem_phys);