PCI: dwc: ep: Use align addr function for dw_pcie_ep_raise_{msi,msix}_irq()

Use the dw_pcie_ep_align_addr() function to calculate the alignment in
dw_pcie_ep_raise_{msi,msix}_irq() instead of open coding the same.

Link: https://lore.kernel.org/r/20241017132052.4014605-6-cassel@kernel.org
Link: https://lore.kernel.org/r/20241104205144.409236-2-cassel@kernel.org
Tested-by: Damien Le Moal <dlemoal@kernel.org>
Signed-off-by: Niklas Cassel <cassel@kernel.org>
[kwilczynski: squashed patch that fixes memory map sizes]
Signed-off-by: Krzysztof Wilczyński <kwilczynski@kernel.org>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: Frank Li <Frank.Li@nxp.com>
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>

diff --git a/drivers/pci/controller/dwc/pcie-designware-ep.c b/drivers/pci/controller/dwc/pcie-designware-ep.c
index 20f67fd..507e40b 100644 (file)
--- a/drivers/pci/controller/dwc/pcie-designware-ep.c
+++ b/drivers/pci/controller/dwc/pcie-designware-ep.c
@@ -503,7 +503,8 @@ int dw_pcie_ep_raise_msi_irq(struct dw_pcie_ep *ep, u8 func_no,
        u32 msg_addr_lower, msg_addr_upper, reg;
        struct dw_pcie_ep_func *ep_func;
        struct pci_epc *epc = ep->epc;
-       unsigned int aligned_offset;
+       size_t map_size = sizeof(u32);
+       size_t offset;
        u16 msg_ctrl, msg_data;
        bool has_upper;
        u64 msg_addr;
@@ -531,14 +532,13 @@ int dw_pcie_ep_raise_msi_irq(struct dw_pcie_ep *ep, u8 func_no,
        }
        msg_addr = ((u64)msg_addr_upper) << 32 | msg_addr_lower;
 
-       aligned_offset = msg_addr & (epc->mem->window.page_size - 1);
-       msg_addr = ALIGN_DOWN(msg_addr, epc->mem->window.page_size);
+       msg_addr = dw_pcie_ep_align_addr(epc, msg_addr, &map_size, &offset);
        ret = dw_pcie_ep_map_addr(epc, func_no, 0, ep->msi_mem_phys, msg_addr,
-                                 epc->mem->window.page_size);
+                                 map_size);
        if (ret)
                return ret;
 
-       writel(msg_data | (interrupt_num - 1), ep->msi_mem + aligned_offset);
+       writel(msg_data | (interrupt_num - 1), ep->msi_mem + offset);
 
        dw_pcie_ep_unmap_addr(epc, func_no, 0, ep->msi_mem_phys);
 
@@ -589,8 +589,9 @@ int dw_pcie_ep_raise_msix_irq(struct dw_pcie_ep *ep, u8 func_no,
        struct pci_epf_msix_tbl *msix_tbl;
        struct dw_pcie_ep_func *ep_func;
        struct pci_epc *epc = ep->epc;
+       size_t map_size = sizeof(u32);
+       size_t offset;
        u32 reg, msg_data, vec_ctrl;
-       unsigned int aligned_offset;
        u32 tbl_offset;
        u64 msg_addr;
        int ret;
@@ -615,14 +616,13 @@ int dw_pcie_ep_raise_msix_irq(struct dw_pcie_ep *ep, u8 func_no,
                return -EPERM;
        }
 
-       aligned_offset = msg_addr & (epc->mem->window.page_size - 1);
-       msg_addr = ALIGN_DOWN(msg_addr, epc->mem->window.page_size);
+       msg_addr = dw_pcie_ep_align_addr(epc, msg_addr, &map_size, &offset);
        ret = dw_pcie_ep_map_addr(epc, func_no, 0, ep->msi_mem_phys, msg_addr,
-                                 epc->mem->window.page_size);
+                                 map_size);
        if (ret)
                return ret;
 
-       writel(msg_data, ep->msi_mem + aligned_offset);
+       writel(msg_data, ep->msi_mem + offset);
 
        dw_pcie_ep_unmap_addr(epc, func_no, 0, ep->msi_mem_phys);