5c1d3310d8
The compilation of of_pci.c is governed by CONFIG_OF_PCI, but the corresponding declarations in of_pci.h are inconsistently guarded by CONFIG_OF, with the result that if CONFIG_PCI is disabled for an OF platform, the dangling external declarations are still active and the inline stub definitions not. So far this has managed to go unnoticed since it happens that the only references to these functions are from code which itself depends on CONFIG_PCI or CONFIG_OF_PCI. Fix this with the appropriate config guard so that any new callers outside PCI-specific code don't start unexpectedly breaking under certain configs. Signed-off-by: Robin Murphy <robin.murphy@arm.com> Signed-off-by: Rob Herring <robh@kernel.org>
83 lines
2.2 KiB
C
83 lines
2.2 KiB
C
#ifndef __OF_PCI_H
|
|
#define __OF_PCI_H
|
|
|
|
#include <linux/pci.h>
|
|
#include <linux/msi.h>
|
|
|
|
struct pci_dev;
|
|
struct of_phandle_args;
|
|
struct device_node;
|
|
|
|
#ifdef CONFIG_OF_PCI
|
|
int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *out_irq);
|
|
struct device_node *of_pci_find_child_device(struct device_node *parent,
|
|
unsigned int devfn);
|
|
int of_pci_get_devfn(struct device_node *np);
|
|
int of_irq_parse_and_map_pci(const struct pci_dev *dev, u8 slot, u8 pin);
|
|
int of_pci_parse_bus_range(struct device_node *node, struct resource *res);
|
|
int of_get_pci_domain_nr(struct device_node *node);
|
|
void of_pci_check_probe_only(void);
|
|
#else
|
|
static inline int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *out_irq)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline struct device_node *of_pci_find_child_device(struct device_node *parent,
|
|
unsigned int devfn)
|
|
{
|
|
return NULL;
|
|
}
|
|
|
|
static inline int of_pci_get_devfn(struct device_node *np)
|
|
{
|
|
return -EINVAL;
|
|
}
|
|
|
|
static inline int
|
|
of_irq_parse_and_map_pci(const struct pci_dev *dev, u8 slot, u8 pin)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline int
|
|
of_pci_parse_bus_range(struct device_node *node, struct resource *res)
|
|
{
|
|
return -EINVAL;
|
|
}
|
|
|
|
static inline int
|
|
of_get_pci_domain_nr(struct device_node *node)
|
|
{
|
|
return -1;
|
|
}
|
|
|
|
static inline void of_pci_check_probe_only(void) { }
|
|
#endif
|
|
|
|
#if defined(CONFIG_OF_ADDRESS)
|
|
int of_pci_get_host_bridge_resources(struct device_node *dev,
|
|
unsigned char busno, unsigned char bus_max,
|
|
struct list_head *resources, resource_size_t *io_base);
|
|
#else
|
|
static inline int of_pci_get_host_bridge_resources(struct device_node *dev,
|
|
unsigned char busno, unsigned char bus_max,
|
|
struct list_head *resources, resource_size_t *io_base)
|
|
{
|
|
return -EINVAL;
|
|
}
|
|
#endif
|
|
|
|
#if defined(CONFIG_OF) && defined(CONFIG_PCI_MSI)
|
|
int of_pci_msi_chip_add(struct msi_controller *chip);
|
|
void of_pci_msi_chip_remove(struct msi_controller *chip);
|
|
struct msi_controller *of_pci_find_msi_chip_by_node(struct device_node *of_node);
|
|
#else
|
|
static inline int of_pci_msi_chip_add(struct msi_controller *chip) { return -EINVAL; }
|
|
static inline void of_pci_msi_chip_remove(struct msi_controller *chip) { }
|
|
static inline struct msi_controller *
|
|
of_pci_find_msi_chip_by_node(struct device_node *of_node) { return NULL; }
|
|
#endif
|
|
|
|
#endif
|