mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2026-08-09 06:14:34 +02:00
Mark TomlinsonandBjorn Helgaas
3c2e6cc6af
Commitb64aa11eb2("PCI: Set bridge map_irq and swizzle_irq to default functions") moved the assignment of default .map_irq() callback to devm_of_pci_bridge_init() and removed the initialization of 'iproc_pcie::map_irq' in platform bus driver. This led to the callback getting assigned the NULL pointer for platform bus driver, thereby breaking the INTx functionality, since 'iproc_pcie::map_irq' overrides the 'pci_host_bridge::map_irq' callback in iproc_pcie_setup(). This issue only affected the iproc platform bus driver as this driver relies on the default callback for non-PAXC controllers. iproc-brcm driver was already providing the custom mapping function, so it was unaffected. Restore the original (and intended) behaviour to use the default map_irq function by removing the local 'iproc_pcie::map_irq' pointer and directly assigning the 'pci_host_bridge::map_irq' callback in iproc-bcma driver. This ensures that the default 'map_irq' callback is used for platform bus driver and only iproc-brcm driver overrides it with a custom one. Fixes:b64aa11eb2("PCI: Set bridge map_irq and swizzle_irq to default functions") Signed-off-by: Mark Tomlinson <mark.tomlinson@alliedtelesis.co.nz> [mani: commit log] Signed-off-by: Manivannan Sadhasivam <mani@kernel.org> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Ray Jui <ray.jui@broadcom.com> Link: https://patch.msgid.link/20260430021628.1343154-1-mark.tomlinson@alliedtelesis.co.nz
130 lines
3.9 KiB
C
130 lines
3.9 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/*
|
|
* Copyright (C) 2014-2015 Broadcom Corporation
|
|
*/
|
|
|
|
#ifndef _PCIE_IPROC_H
|
|
#define _PCIE_IPROC_H
|
|
|
|
/**
|
|
* enum iproc_pcie_type - iProc PCIe interface type
|
|
* @IPROC_PCIE_PAXB_BCMA: BCMA-based host controllers
|
|
* @IPROC_PCIE_PAXB: PAXB-based host controllers for
|
|
* NS, NSP, Cygnus, NS2, and Pegasus SOCs
|
|
* @IPROC_PCIE_PAXB_V2: PAXB-based host controllers for Stingray SoCs
|
|
* @IPROC_PCIE_PAXC: PAXC-based host controllers
|
|
* @IPROC_PCIE_PAXC_V2: PAXC-based host controllers (second generation)
|
|
*
|
|
* PAXB is the wrapper used in root complex that can be connected to an
|
|
* external endpoint device.
|
|
*
|
|
* PAXC is the wrapper used in root complex dedicated for internal emulated
|
|
* endpoint devices.
|
|
*/
|
|
enum iproc_pcie_type {
|
|
IPROC_PCIE_PAXB_BCMA = 0,
|
|
IPROC_PCIE_PAXB,
|
|
IPROC_PCIE_PAXB_V2,
|
|
IPROC_PCIE_PAXC,
|
|
IPROC_PCIE_PAXC_V2,
|
|
};
|
|
|
|
/**
|
|
* struct iproc_pcie_ob - iProc PCIe outbound mapping
|
|
* @axi_offset: offset from the AXI address to the internal address used by
|
|
* the iProc PCIe core
|
|
* @nr_windows: total number of supported outbound mapping windows
|
|
*/
|
|
struct iproc_pcie_ob {
|
|
resource_size_t axi_offset;
|
|
unsigned int nr_windows;
|
|
};
|
|
|
|
/**
|
|
* struct iproc_pcie_ib - iProc PCIe inbound mapping
|
|
* @nr_regions: total number of supported inbound mapping regions
|
|
*/
|
|
struct iproc_pcie_ib {
|
|
unsigned int nr_regions;
|
|
};
|
|
|
|
struct iproc_pcie_ob_map;
|
|
struct iproc_pcie_ib_map;
|
|
struct iproc_msi;
|
|
|
|
/**
|
|
* struct iproc_pcie - iProc PCIe device
|
|
* @dev: pointer to device data structure
|
|
* @type: iProc PCIe interface type
|
|
* @reg_offsets: register offsets
|
|
* @base: PCIe host controller I/O register base
|
|
* @base_addr: PCIe host controller register base physical address
|
|
* @mem: host bridge memory window resource
|
|
* @phy: optional PHY device that controls the Serdes
|
|
* @ep_is_internal: indicates an internal emulated endpoint device is connected
|
|
* @iproc_cfg_read: indicates the iProc config read function should be used
|
|
* @rej_unconfig_pf: indicates the root complex needs to detect and reject
|
|
* enumeration against unconfigured physical functions emulated in the ASIC
|
|
* @has_apb_err_disable: indicates the controller can be configured to prevent
|
|
* unsupported request from being forwarded as an APB bus error
|
|
* @fix_paxc_cap: indicates the controller has corrupted capability list in its
|
|
* config space registers and requires SW based fixup
|
|
*
|
|
* @need_ob_cfg: indicates SW needs to configure the outbound mapping window
|
|
* @ob: outbound mapping related parameters
|
|
* @ob_map: outbound mapping related parameters specific to the controller
|
|
*
|
|
* @need_ib_cfg: indicates SW needs to configure the inbound mapping window
|
|
* @ib: inbound mapping related parameters
|
|
* @ib_map: outbound mapping region related parameters
|
|
*
|
|
* @need_msi_steer: indicates additional configuration of the iProc PCIe
|
|
* controller is required to steer MSI writes to external interrupt controller
|
|
* @msi: MSI data
|
|
*/
|
|
struct iproc_pcie {
|
|
struct device *dev;
|
|
enum iproc_pcie_type type;
|
|
u16 *reg_offsets;
|
|
void __iomem *base;
|
|
phys_addr_t base_addr;
|
|
struct resource mem;
|
|
struct phy *phy;
|
|
bool ep_is_internal;
|
|
bool iproc_cfg_read;
|
|
bool rej_unconfig_pf;
|
|
bool has_apb_err_disable;
|
|
bool fix_paxc_cap;
|
|
|
|
bool need_ob_cfg;
|
|
struct iproc_pcie_ob ob;
|
|
const struct iproc_pcie_ob_map *ob_map;
|
|
|
|
bool need_ib_cfg;
|
|
struct iproc_pcie_ib ib;
|
|
const struct iproc_pcie_ib_map *ib_map;
|
|
|
|
bool need_msi_steer;
|
|
struct iproc_msi *msi;
|
|
};
|
|
|
|
int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res);
|
|
void iproc_pcie_remove(struct iproc_pcie *pcie);
|
|
int iproc_pcie_shutdown(struct iproc_pcie *pcie);
|
|
|
|
#ifdef CONFIG_PCIE_IPROC_MSI
|
|
int iproc_msi_init(struct iproc_pcie *pcie, struct device_node *node);
|
|
void iproc_msi_exit(struct iproc_pcie *pcie);
|
|
#else
|
|
static inline int iproc_msi_init(struct iproc_pcie *pcie,
|
|
struct device_node *node)
|
|
{
|
|
return -ENODEV;
|
|
}
|
|
static inline void iproc_msi_exit(struct iproc_pcie *pcie)
|
|
{
|
|
}
|
|
#endif
|
|
|
|
#endif /* _PCIE_IPROC_H */
|