Commit b5d1b4b4 authored by Dan Carpenter's avatar Dan Carpenter Committed by Bjorn Helgaas
Browse files

PCI: dwc: Fix a 64bit bug in dw_pcie_ep_raise_msix_irq() 

The "msg_addr" variable is u64.  However, the "aligned_offset" is an
unsigned int.  This means that when the code does:

  msg_addr &= ~aligned_offset;

it will unintentionally zero out the high 32 bits.  Use ALIGN_DOWN() to do
the alignment instead.

Fixes: 2217fffc ("PCI: dwc: endpoint: Fix dw_pcie_ep_raise_msix_irq() alignment support")
Link: https://lore.kernel.org/r/af59c7ad-ab93-40f7-ad4a-7ac0b14d37f5@moroto.mountain


Signed-off-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarNiklas Cassel <cassel@kernel.org>
Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Reviewed-by: default avatarManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Cc: <stable@vger.kernel.org>
parent 6613476e

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

+2 −1
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
 * Author: Kishon Vijay Abraham I <kishon@ti.com>

 */



#include <linux/align.h>

#include <linux/bitfield.h>

#include <linux/of.h>

#include <linux/platform_device.h>
@@ -551,7 +552,7 @@ int dw_pcie_ep_raise_msix_irq(struct dw_pcie_ep *ep, u8 func_no, 
	}



	aligned_offset = msg_addr & (epc->mem->window.page_size - 1);

	msg_addr &= ~aligned_offset;

	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)