Commit cc36114d authored Jan 26, 2024 by Dan Carpenter Committed by sanglipeng1 Jul 23, 2024

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

stable inclusion
from stable-v5.10.210
commit cf5a69e35591954f65f149f3d75492537a605584
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAE52H

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=cf5a69e35591954f65f149f3d75492537a605584

--------------------------------

commit b5d1b4b46f856da1473c7ba9a5cdfcb55c9b2478 upstream.

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: 2217fffcd63f ("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: 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>
Cc: <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: sanglipeng1 <sanglipeng1@jd.com>

parent a1affbcf

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/kernel.h>
		#include <linux/of.h>

		#include "pcie-designware.h"
		@@ -593,7 +594,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, ep->msi_mem_phys, msg_addr,
		epc->mem->window.page_size);
		if (ret)