diff options
| author | Vignesh Raghavendra <vigneshr@ti.com> | 2024-03-02 19:58:24 +0530 |
|---|---|---|
| committer | Vignesh Raghavendra <vigneshr@ti.com> | 2024-03-02 19:58:24 +0530 |
| commit | 3f61bc1ce372c051f38858b5d1ee875d2e5558dd (patch) | |
| tree | c5052a026415aac55b1fd9066871150ea648edaa /drivers/pci | |
| parent | c686519656ebb626c3946bf152163cd259ae1a58 (diff) | |
| parent | a3eb3a74aa8c94e6c8130b55f3b031f29162868c (diff) | |
Merge tag 'v6.1.80' of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux into ti-linux-6.1.y-cicd
This is the 6.1.80 stable release
* tag 'v6.1.80' of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux: (195 commits)
Linux 6.1.80
fs/ntfs3: Enhance the attribute size check
arp: Prevent overflow in arp_req_get().
ahci: Extend ASM1061 43-bit DMA address quirk to other ASM106x parts
ata: ahci: add identifiers for ASM2116 series adapters
mptcp: add needs_id for netlink appending addr
mptcp: userspace pm send RM_ADDR for ID 0
mm: zswap: fix missing folio cleanup in writeback race path
fs/aio: Restrict kiocb_set_cancel_fn() to I/O submitted via libaio
mm/damon/reclaim: fix quota stauts loss due to online tunings
erofs: fix inconsistent per-file compression format
erofs: simplify compression configuration parser
i2c: imx: when being a target, mark the last read as processed
drm/amd/display: Fix memory leak in dm_sw_fini()
drm/syncobj: call drm_syncobj_fence_add_wait when WAIT_AVAILABLE flag is set
net: phy: realtek: Fix rtl8211f_config_init() for RTL8211F(D)(I)-VD-CG PHY
Fix write to cloned skb in ipv6_hop_ioam()
phonet/pep: fix racy skb_queue_empty() use
phonet: take correct lock to peek at the RX queue
net: sparx5: Add spinlock for frame transmission from CPU
...
Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/controller/dwc/pcie-designware-ep.c | 3 | ||||
| -rw-r--r-- | drivers/pci/msi/irqdomain.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/pci/controller/dwc/pcie-designware-ep.c b/drivers/pci/controller/dwc/pcie-designware-ep.c index 59c164b5c64a..4086a7818981 100644 --- a/drivers/pci/controller/dwc/pcie-designware-ep.c +++ b/drivers/pci/controller/dwc/pcie-designware-ep.c @@ -6,6 +6,7 @@ * Author: Kishon Vijay Abraham I <kishon@ti.com> */ +#include <linux/align.h> #include <linux/of.h> #include <linux/platform_device.h> @@ -600,7 +601,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) diff --git a/drivers/pci/msi/irqdomain.c b/drivers/pci/msi/irqdomain.c index e9cf318e6670..34877a1f43a1 100644 --- a/drivers/pci/msi/irqdomain.c +++ b/drivers/pci/msi/irqdomain.c @@ -60,7 +60,7 @@ static irq_hw_number_t pci_msi_domain_calc_hwirq(struct msi_desc *desc) return (irq_hw_number_t)desc->msi_index | pci_dev_id(dev) << 11 | - (pci_domain_nr(dev->bus) & 0xFFFFFFFF) << 27; + ((irq_hw_number_t)(pci_domain_nr(dev->bus) & 0xFFFFFFFF)) << 27; } static inline bool pci_msi_desc_is_multi_msi(struct msi_desc *desc) |