Skip to content

Commit 67057f4

Browse files
Dan Carpenterbjorn-helgaas
authored andcommitted
PCI: dwc: Clean up dw_pcie_ep_raise_msi_irq() alignment
I recently changed the alignment code in dw_pcie_ep_raise_msix_irq(). The code in dw_pcie_ep_raise_msi_irq() is similar, so update it to match, just for consistency. (No effect on runtime, just a cleanup). Link: https://lore.kernel.org/r/184097e0-c728-42c7-9e8a-556bd33fb612@moroto.mountain Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Niklas Cassel <cassel@kernel.org> Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
1 parent b5d1b4b commit 67057f4

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

drivers/pci/controller/dwc/pcie-designware-ep.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -483,9 +483,10 @@ int dw_pcie_ep_raise_msi_irq(struct dw_pcie_ep *ep, u8 func_no,
483483
reg = ep_func->msi_cap + PCI_MSI_DATA_32;
484484
msg_data = dw_pcie_ep_readw_dbi(ep, func_no, reg);
485485
}
486-
aligned_offset = msg_addr_lower & (epc->mem->window.page_size - 1);
487-
msg_addr = ((u64)msg_addr_upper) << 32 |
488-
(msg_addr_lower & ~aligned_offset);
486+
msg_addr = ((u64)msg_addr_upper) << 32 | msg_addr_lower;
487+
488+
aligned_offset = msg_addr & (epc->mem->window.page_size - 1);
489+
msg_addr = ALIGN_DOWN(msg_addr, epc->mem->window.page_size);
489490
ret = dw_pcie_ep_map_addr(epc, func_no, 0, ep->msi_mem_phys, msg_addr,
490491
epc->mem->window.page_size);
491492
if (ret)

0 commit comments

Comments
 (0)