Hi! > From: Dan Carpenter <dan.carpenter@xxxxxxxxxx> > > [ Upstream commit 67057f48df79a3d73683385f521215146861684b ] > > 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). Just a cleanup, we don't need it in stable. Best regards, Pavel > +++ b/drivers/pci/controller/dwc/pcie-designware-ep.c > @@ -528,9 +528,10 @@ int dw_pcie_ep_raise_msi_irq(struct dw_pcie_ep *ep, u8 func_no, > reg = ep_func->msi_cap + func_offset + PCI_MSI_DATA_32; > msg_data = dw_pcie_readw_dbi(pci, reg); > } > - aligned_offset = msg_addr_lower & (epc->mem->window.page_size - 1); > - msg_addr = ((u64)msg_addr_upper) << 32 | > - (msg_addr_lower & ~aligned_offset); > + 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); > ret = dw_pcie_ep_map_addr(epc, func_no, 0, ep->msi_mem_phys, msg_addr, > epc->mem->window.page_size); > if (ret) -- People of Russia, stop Putin before his war on Ukraine escalates.
Attachment:
signature.asc
Description: PGP signature
