Commit 5ddfc246 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pci-v6.8-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci 

Pull pci fixes from Bjorn Helgaas:

 - Fix an unintentional truncation of DWC MSI-X address to 32 bits and
   update similar MSI code to match (Dan Carpenter)

* tag 'pci-v6.8-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci:
  PCI: dwc: Clean up dw_pcie_ep_raise_msi_irq() alignment
  PCI: dwc: Fix a 64bit bug in dw_pcie_ep_raise_msix_irq()
parents 5ca243c2 67057f48

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

+6 −4
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>
@@ -482,9 +483,10 @@ int dw_pcie_ep_raise_msi_irq(struct dw_pcie_ep *ep, u8 func_no, 
		reg = ep_func->msi_cap + PCI_MSI_DATA_32;

		msg_data = dw_pcie_ep_readw_dbi(ep, func_no, 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)
@@ -551,7 +553,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)