Skip to content

L
linux
Commit c2791b80 authored by Yijing Wang's avatar Yijing Wang Committed by Bjorn Helgaas
Browse files
Options

PCI/MSI: Rename "struct msi_chip" to "struct msi_controller" 

"msi_chip" isn't very descriptive, so rename it to "msi_controller".  That
tells a little more about what it does and is already used in device tree
bindings.

No functional change.

[bhelgaas: changelog, change *only* the struct name so it's reviewable]
Suggested-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: default avatarYijing Wang <wangyijing@huawei.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent f8338694
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 38 deletions
drivers/irqchip/irq-armada-370-xp.c
View file @ c2791b80
...@@ -129,7 +129,7 @@ static void armada_370_xp_free_msi(int hwirq) ...@@ -129,7 +129,7 @@ static void armada_370_xp_free_msi(int hwirq)
mutex_unlock(&msi_used_lock); mutex_unlock(&msi_used_lock);
} }
static int armada_370_xp_setup_msi_irq(struct msi_chip *chip, static int armada_370_xp_setup_msi_irq(struct msi_controller *chip,
struct pci_dev *pdev, struct pci_dev *pdev,
struct msi_desc *desc) struct msi_desc *desc)
{ {
...@@ -160,7 +160,7 @@ static int armada_370_xp_setup_msi_irq(struct msi_chip *chip, ...@@ -160,7 +160,7 @@ static int armada_370_xp_setup_msi_irq(struct msi_chip *chip,
return 0; return 0;
} }
static void armada_370_xp_teardown_msi_irq(struct msi_chip *chip, static void armada_370_xp_teardown_msi_irq(struct msi_controller *chip,
unsigned int irq) unsigned int irq)
{ {
struct irq_data *d = irq_get_irq_data(irq); struct irq_data *d = irq_get_irq_data(irq);
...@@ -195,7 +195,7 @@ static const struct irq_domain_ops armada_370_xp_msi_irq_ops = { ...@@ -195,7 +195,7 @@ static const struct irq_domain_ops armada_370_xp_msi_irq_ops = {
static int armada_370_xp_msi_init(struct device_node *node, static int armada_370_xp_msi_init(struct device_node *node,
phys_addr_t main_int_phys_base) phys_addr_t main_int_phys_base)
{ {
struct msi_chip *msi_chip; struct msi_controller *msi_chip;
u32 reg; u32 reg;
int ret; int ret;
......
drivers/of/of_pci.c
View file @ c2791b80
...@@ -236,7 +236,7 @@ EXPORT_SYMBOL_GPL(of_pci_get_host_bridge_resources); ...@@ -236,7 +236,7 @@ EXPORT_SYMBOL_GPL(of_pci_get_host_bridge_resources);
static LIST_HEAD(of_pci_msi_chip_list); static LIST_HEAD(of_pci_msi_chip_list);
static DEFINE_MUTEX(of_pci_msi_chip_mutex); static DEFINE_MUTEX(of_pci_msi_chip_mutex);
int of_pci_msi_chip_add(struct msi_chip *chip) int of_pci_msi_chip_add(struct msi_controller *chip)
{ {
if (!of_property_read_bool(chip->of_node, "msi-controller")) if (!of_property_read_bool(chip->of_node, "msi-controller"))
return -EINVAL; return -EINVAL;
...@@ -249,7 +249,7 @@ int of_pci_msi_chip_add(struct msi_chip *chip) ...@@ -249,7 +249,7 @@ int of_pci_msi_chip_add(struct msi_chip *chip)
} }
EXPORT_SYMBOL_GPL(of_pci_msi_chip_add); EXPORT_SYMBOL_GPL(of_pci_msi_chip_add);
void of_pci_msi_chip_remove(struct msi_chip *chip) void of_pci_msi_chip_remove(struct msi_controller *chip)
{ {
mutex_lock(&of_pci_msi_chip_mutex); mutex_lock(&of_pci_msi_chip_mutex);
list_del(&chip->list); list_del(&chip->list);
...@@ -257,9 +257,9 @@ void of_pci_msi_chip_remove(struct msi_chip *chip) ...@@ -257,9 +257,9 @@ void of_pci_msi_chip_remove(struct msi_chip *chip)
} }
EXPORT_SYMBOL_GPL(of_pci_msi_chip_remove); EXPORT_SYMBOL_GPL(of_pci_msi_chip_remove);
struct msi_chip *of_pci_find_msi_chip_by_node(struct device_node *of_node) struct msi_controller *of_pci_find_msi_chip_by_node(struct device_node *of_node)
{ {
struct msi_chip *c; struct msi_controller *c;
mutex_lock(&of_pci_msi_chip_mutex); mutex_lock(&of_pci_msi_chip_mutex);
list_for_each_entry(c, &of_pci_msi_chip_list, list) { list_for_each_entry(c, &of_pci_msi_chip_list, list) {
......
drivers/pci/host/pci-keystone-dw.c
View file @ c2791b80
...@@ -205,7 +205,7 @@ const struct irq_domain_ops ks_dw_pcie_msi_domain_ops = { ...@@ -205,7 +205,7 @@ const struct irq_domain_ops ks_dw_pcie_msi_domain_ops = {
.map = ks_dw_pcie_msi_map, .map = ks_dw_pcie_msi_map,
}; };
int ks_dw_pcie_msi_host_init(struct pcie_port *pp, struct msi_chip *chip) int ks_dw_pcie_msi_host_init(struct pcie_port *pp, struct msi_controller *chip)
{ {
struct keystone_pcie *ks_pcie = to_keystone_pcie(pp); struct keystone_pcie *ks_pcie = to_keystone_pcie(pp);
int i; int i;
......
drivers/pci/host/pci-keystone.h
View file @ c2791b80
...@@ -55,4 +55,4 @@ void ks_dw_pcie_msi_set_irq(struct pcie_port *pp, int irq); ...@@ -55,4 +55,4 @@ void ks_dw_pcie_msi_set_irq(struct pcie_port *pp, int irq);
void ks_dw_pcie_msi_clear_irq(struct pcie_port *pp, int irq); void ks_dw_pcie_msi_clear_irq(struct pcie_port *pp, int irq);
void ks_dw_pcie_v3_65_scan_bus(struct pcie_port *pp); void ks_dw_pcie_v3_65_scan_bus(struct pcie_port *pp);
int ks_dw_pcie_msi_host_init(struct pcie_port *pp, int ks_dw_pcie_msi_host_init(struct pcie_port *pp,
struct msi_chip *chip); struct msi_controller *chip);
drivers/pci/host/pci-mvebu.c
View file @ c2791b80
...@@ -99,7 +99,7 @@ struct mvebu_pcie_port; ...@@ -99,7 +99,7 @@ struct mvebu_pcie_port;
struct mvebu_pcie { struct mvebu_pcie {
struct platform_device *pdev; struct platform_device *pdev;
struct mvebu_pcie_port *ports; struct mvebu_pcie_port *ports;
struct msi_chip *msi; struct msi_controller *msi;
struct resource io; struct resource io;
char io_name[30]; char io_name[30];
struct resource realio; struct resource realio;
......
drivers/pci/host/pci-tegra.c
View file @ c2791b80
...@@ -238,7 +238,7 @@ ...@@ -238,7 +238,7 @@
) )
struct tegra_msi { struct tegra_msi {
struct msi_chip chip; struct msi_controller chip;
DECLARE_BITMAP(used, INT_PCI_MSI_NR); DECLARE_BITMAP(used, INT_PCI_MSI_NR);
struct irq_domain *domain; struct irq_domain *domain;
unsigned long pages; unsigned long pages;
...@@ -259,7 +259,7 @@ struct tegra_pcie_soc_data { ...@@ -259,7 +259,7 @@ struct tegra_pcie_soc_data {
bool has_gen2; bool has_gen2;
}; };
static inline struct tegra_msi *to_tegra_msi(struct msi_chip *chip) static inline struct tegra_msi *to_tegra_msi(struct msi_controller *chip)
{ {
return container_of(chip, struct tegra_msi, chip); return container_of(chip, struct tegra_msi, chip);
} }
...@@ -1283,8 +1283,8 @@ static irqreturn_t tegra_pcie_msi_irq(int irq, void *data) ...@@ -1283,8 +1283,8 @@ static irqreturn_t tegra_pcie_msi_irq(int irq, void *data)
return processed > 0 ? IRQ_HANDLED : IRQ_NONE; return processed > 0 ? IRQ_HANDLED : IRQ_NONE;
} }
static int tegra_msi_setup_irq(struct msi_chip *chip, struct pci_dev *pdev, static int tegra_msi_setup_irq(struct msi_controller *chip,
struct msi_desc *desc) struct pci_dev *pdev, struct msi_desc *desc)
{ {
struct tegra_msi *msi = to_tegra_msi(chip); struct tegra_msi *msi = to_tegra_msi(chip);
struct msi_msg msg; struct msi_msg msg;
...@@ -1313,7 +1313,8 @@ static int tegra_msi_setup_irq(struct msi_chip *chip, struct pci_dev *pdev, ...@@ -1313,7 +1313,8 @@ static int tegra_msi_setup_irq(struct msi_chip *chip, struct pci_dev *pdev,
return 0; return 0;
} }
static void tegra_msi_teardown_irq(struct msi_chip *chip, unsigned int irq) static void tegra_msi_teardown_irq(struct msi_controller *chip,
unsigned int irq)
{ {
struct tegra_msi *msi = to_tegra_msi(chip); struct tegra_msi *msi = to_tegra_msi(chip);
struct irq_data *d = irq_get_irq_data(irq); struct irq_data *d = irq_get_irq_data(irq);
......
drivers/pci/host/pcie-designware.c
View file @ c2791b80
...@@ -276,7 +276,7 @@ static int assign_irq(int no_irqs, struct msi_desc *desc, int *pos) ...@@ -276,7 +276,7 @@ static int assign_irq(int no_irqs, struct msi_desc *desc, int *pos)
return -ENOSPC; return -ENOSPC;
} }
static int dw_msi_setup_irq(struct msi_chip *chip, struct pci_dev *pdev, static int dw_msi_setup_irq(struct msi_controller *chip, struct pci_dev *pdev,
struct msi_desc *desc) struct msi_desc *desc)
{ {
int irq, pos; int irq, pos;
...@@ -303,7 +303,7 @@ static int dw_msi_setup_irq(struct msi_chip *chip, struct pci_dev *pdev, ...@@ -303,7 +303,7 @@ static int dw_msi_setup_irq(struct msi_chip *chip, struct pci_dev *pdev,
return 0; return 0;
} }
static void dw_msi_teardown_irq(struct msi_chip *chip, unsigned int irq) static void dw_msi_teardown_irq(struct msi_controller *chip, unsigned int irq)
{ {
struct irq_data *data = irq_get_irq_data(irq); struct irq_data *data = irq_get_irq_data(irq);
struct msi_desc *msi = irq_data_get_msi(data); struct msi_desc *msi = irq_data_get_msi(data);
...@@ -312,7 +312,7 @@ static void dw_msi_teardown_irq(struct msi_chip *chip, unsigned int irq) ...@@ -312,7 +312,7 @@ static void dw_msi_teardown_irq(struct msi_chip *chip, unsigned int irq)
clear_irq_range(pp, irq, 1, data->hwirq); clear_irq_range(pp, irq, 1, data->hwirq);
} }
static struct msi_chip dw_pcie_msi_chip = { static struct msi_controller dw_pcie_msi_chip = {
.setup_irq = dw_msi_setup_irq, .setup_irq = dw_msi_setup_irq,
.teardown_irq = dw_msi_teardown_irq, .teardown_irq = dw_msi_teardown_irq,
}; };
......
drivers/pci/host/pcie-designware.h
View file @ c2791b80
...@@ -73,7 +73,7 @@ struct pcie_host_ops { ...@@ -73,7 +73,7 @@ struct pcie_host_ops {
u32 (*get_msi_addr)(struct pcie_port *pp); u32 (*get_msi_addr)(struct pcie_port *pp);
u32 (*get_msi_data)(struct pcie_port *pp, int pos); u32 (*get_msi_data)(struct pcie_port *pp, int pos);
void (*scan_bus)(struct pcie_port *pp); void (*scan_bus)(struct pcie_port *pp);
int (*msi_host_init)(struct pcie_port *pp, struct msi_chip *chip); int (*msi_host_init)(struct pcie_port *pp, struct msi_controller *chip);
}; };
int dw_pcie_cfg_read(void __iomem *addr, int where, int size, u32 *val); int dw_pcie_cfg_read(void __iomem *addr, int where, int size, u32 *val);
......
drivers/pci/host/pcie-rcar.c
View file @ c2791b80
...@@ -111,14 +111,14 @@ ...@@ -111,14 +111,14 @@
struct rcar_msi { struct rcar_msi {
DECLARE_BITMAP(used, INT_PCI_MSI_NR); DECLARE_BITMAP(used, INT_PCI_MSI_NR);
struct irq_domain *domain; struct irq_domain *domain;
struct msi_chip chip; struct msi_controller chip;
unsigned long pages; unsigned long pages;
struct mutex lock; struct mutex lock;
int irq1; int irq1;
int irq2; int irq2;
}; };
static inline struct rcar_msi *to_rcar_msi(struct msi_chip *chip) static inline struct rcar_msi *to_rcar_msi(struct msi_controller *chip)
{ {
return container_of(chip, struct rcar_msi, chip); return container_of(chip, struct rcar_msi, chip);
} }
...@@ -622,7 +622,7 @@ static irqreturn_t rcar_pcie_msi_irq(int irq, void *data) ...@@ -622,7 +622,7 @@ static irqreturn_t rcar_pcie_msi_irq(int irq, void *data)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static int rcar_msi_setup_irq(struct msi_chip *chip, struct pci_dev *pdev, static int rcar_msi_setup_irq(struct msi_controller *chip, struct pci_dev *pdev,
struct msi_desc *desc) struct msi_desc *desc)
{ {
struct rcar_msi *msi = to_rcar_msi(chip); struct rcar_msi *msi = to_rcar_msi(chip);
...@@ -652,7 +652,7 @@ static int rcar_msi_setup_irq(struct msi_chip *chip, struct pci_dev *pdev, ...@@ -652,7 +652,7 @@ static int rcar_msi_setup_irq(struct msi_chip *chip, struct pci_dev *pdev,
return 0; return 0;
} }
static void rcar_msi_teardown_irq(struct msi_chip *chip, unsigned int irq) static void rcar_msi_teardown_irq(struct msi_controller *chip, unsigned int irq)
{ {
struct rcar_msi *msi = to_rcar_msi(chip); struct rcar_msi *msi = to_rcar_msi(chip);
struct irq_data *d = irq_get_irq_data(irq); struct irq_data *d = irq_get_irq_data(irq);
......
drivers/pci/host/pcie-xilinx.c
View file @ c2791b80
...@@ -335,7 +335,8 @@ static int xilinx_pcie_assign_msi(struct xilinx_pcie_port *port) ...@@ -335,7 +335,8 @@ static int xilinx_pcie_assign_msi(struct xilinx_pcie_port *port)
* @chip: MSI Chip descriptor * @chip: MSI Chip descriptor
* @irq: MSI IRQ to destroy * @irq: MSI IRQ to destroy
*/ */
static void xilinx_msi_teardown_irq(struct msi_chip *chip, unsigned int irq) static void xilinx_msi_teardown_irq(struct msi_controller *chip,
unsigned int irq)
{ {
xilinx_pcie_destroy_msi(irq); xilinx_pcie_destroy_msi(irq);
} }
...@@ -348,7 +349,7 @@ static void xilinx_msi_teardown_irq(struct msi_chip *chip, unsigned int irq) ...@@ -348,7 +349,7 @@ static void xilinx_msi_teardown_irq(struct msi_chip *chip, unsigned int irq)
* *
* Return: '0' on success and error value on failure * Return: '0' on success and error value on failure
*/ */
static int xilinx_pcie_msi_setup_irq(struct msi_chip *chip, static int xilinx_pcie_msi_setup_irq(struct msi_controller *chip,
struct pci_dev *pdev, struct pci_dev *pdev,
struct msi_desc *desc) struct msi_desc *desc)
{ {
...@@ -380,7 +381,7 @@ static int xilinx_pcie_msi_setup_irq(struct msi_chip *chip, ...@@ -380,7 +381,7 @@ static int xilinx_pcie_msi_setup_irq(struct msi_chip *chip,
} }
/* MSI Chip Descriptor */ /* MSI Chip Descriptor */
static struct msi_chip xilinx_pcie_msi_chip = { static struct msi_controller xilinx_pcie_msi_chip = {
.setup_irq = xilinx_pcie_msi_setup_irq, .setup_irq = xilinx_pcie_msi_setup_irq,
.teardown_irq = xilinx_msi_teardown_irq, .teardown_irq = xilinx_msi_teardown_irq,
}; };
......
drivers/pci/msi.c
View file @ c2791b80
...@@ -32,7 +32,7 @@ int pci_msi_ignore_mask; ...@@ -32,7 +32,7 @@ int pci_msi_ignore_mask;
int __weak arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc) int __weak arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc)
{ {
struct msi_chip *chip = dev->bus->msi; struct msi_controller *chip = dev->bus->msi;
int err; int err;
if (!chip || !chip->setup_irq) if (!chip || !chip->setup_irq)
...@@ -49,7 +49,7 @@ int __weak arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc) ...@@ -49,7 +49,7 @@ int __weak arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc)
void __weak arch_teardown_msi_irq(unsigned int irq) void __weak arch_teardown_msi_irq(unsigned int irq)
{ {
struct msi_chip *chip = irq_get_chip_data(irq); struct msi_controller *chip = irq_get_chip_data(irq);
if (!chip || !chip->teardown_irq) if (!chip || !chip->teardown_irq)
return; return;
......
include/linux/msi.h
View file @ c2791b80
...@@ -65,15 +65,15 @@ void arch_restore_msi_irqs(struct pci_dev *dev); ...@@ -65,15 +65,15 @@ void arch_restore_msi_irqs(struct pci_dev *dev);
void default_teardown_msi_irqs(struct pci_dev *dev); void default_teardown_msi_irqs(struct pci_dev *dev);
void default_restore_msi_irqs(struct pci_dev *dev); void default_restore_msi_irqs(struct pci_dev *dev);
struct msi_chip { struct msi_controller {
struct module *owner; struct module *owner;
struct device *dev; struct device *dev;
struct device_node *of_node; struct device_node *of_node;
struct list_head list; struct list_head list;
int (*setup_irq)(struct msi_chip *chip, struct pci_dev *dev, int (*setup_irq)(struct msi_controller *chip, struct pci_dev *dev,
struct msi_desc *desc); struct msi_desc *desc);
void (*teardown_irq)(struct msi_chip *chip, unsigned int irq); void (*teardown_irq)(struct msi_controller *chip, unsigned int irq);
}; };
#endif /* LINUX_MSI_H */ #endif /* LINUX_MSI_H */
include/linux/of_pci.h
View file @ c2791b80
...@@ -59,13 +59,13 @@ int of_pci_get_host_bridge_resources(struct device_node *dev, ...@@ -59,13 +59,13 @@ int of_pci_get_host_bridge_resources(struct device_node *dev,
#endif #endif
#if defined(CONFIG_OF) && defined(CONFIG_PCI_MSI) #if defined(CONFIG_OF) && defined(CONFIG_PCI_MSI)
int of_pci_msi_chip_add(struct msi_chip *chip); int of_pci_msi_chip_add(struct msi_controller *chip);
void of_pci_msi_chip_remove(struct msi_chip *chip); void of_pci_msi_chip_remove(struct msi_controller *chip);
struct msi_chip *of_pci_find_msi_chip_by_node(struct device_node *of_node); struct msi_controller *of_pci_find_msi_chip_by_node(struct device_node *of_node);
#else #else
static inline int of_pci_msi_chip_add(struct msi_chip *chip) { return -EINVAL; } static inline int of_pci_msi_chip_add(struct msi_controller *chip) { return -EINVAL; }
static inline void of_pci_msi_chip_remove(struct msi_chip *chip) { } static inline void of_pci_msi_chip_remove(struct msi_controller *chip) { }
static inline struct msi_chip * static inline struct msi_controller *
of_pci_find_msi_chip_by_node(struct device_node *of_node) { return NULL; } of_pci_find_msi_chip_by_node(struct device_node *of_node) { return NULL; }
#endif #endif
......
include/linux/pci.h
View file @ c2791b80
...@@ -449,7 +449,7 @@ struct pci_bus { ...@@ -449,7 +449,7 @@ struct pci_bus {
struct resource busn_res; /* bus numbers routed to this bus */ struct resource busn_res; /* bus numbers routed to this bus */
struct pci_ops *ops; /* configuration access functions */ struct pci_ops *ops; /* configuration access functions */
struct msi_chip *msi; /* MSI controller */ struct msi_controller *msi; /* MSI controller */
void *sysdata; /* hook for sys-specific extension */ void *sysdata; /* hook for sys-specific extension */
struct proc_dir_entry *procdir; /* directory entry in /proc/bus/pci */ struct proc_dir_entry *procdir; /* directory entry in /proc/bus/pci */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7