Skip to content

L
linux
Commit dacee587 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files
Options

PCI: xilinx-cpm: Rename xilinx_cpm_pcie_port to xilinx_cpm_pcie 

Rename struct xilinx_cpm_pcie_port to xilinx_cpm_pcie to match the
convention of <driver>_pcie. No functional change intended.

Link: https://lore.kernel.org/r/20211223011054.1227810-24-helgaas@kernel.orgSigned-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarMichal Simek <michal.simek@xilinx.com>
parent 0519f73a
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 22 deletions
drivers/pci/controller/pcie-xilinx-cpm.c
View file @ dacee587
...@@ -99,10 +99,10 @@ ...@@ -99,10 +99,10 @@
#define XILINX_CPM_PCIE_REG_PSCR_LNKUP BIT(11) #define XILINX_CPM_PCIE_REG_PSCR_LNKUP BIT(11)
/** /**
* struct xilinx_cpm_pcie_port - PCIe port information * struct xilinx_cpm_pcie - PCIe port information
* @dev: Device pointer
* @reg_base: Bridge Register Base * @reg_base: Bridge Register Base
* @cpm_base: CPM System Level Control and Status Register(SLCR) Base * @cpm_base: CPM System Level Control and Status Register(SLCR) Base
* @dev: Device pointer
* @intx_domain: Legacy IRQ domain pointer * @intx_domain: Legacy IRQ domain pointer
* @cpm_domain: CPM IRQ domain pointer * @cpm_domain: CPM IRQ domain pointer
* @cfg: Holds mappings of config space window * @cfg: Holds mappings of config space window
...@@ -110,10 +110,10 @@ ...@@ -110,10 +110,10 @@
* @irq: Error interrupt number * @irq: Error interrupt number
* @lock: lock protecting shared register access * @lock: lock protecting shared register access
*/ */
struct xilinx_cpm_pcie_port { struct xilinx_cpm_pcie {
struct device *dev;
void __iomem *reg_base; void __iomem *reg_base;
void __iomem *cpm_base; void __iomem *cpm_base;
struct device *dev;
struct irq_domain *intx_domain; struct irq_domain *intx_domain;
struct irq_domain *cpm_domain; struct irq_domain *cpm_domain;
struct pci_config_window *cfg; struct pci_config_window *cfg;
...@@ -122,24 +122,24 @@ struct xilinx_cpm_pcie_port { ...@@ -122,24 +122,24 @@ struct xilinx_cpm_pcie_port {
raw_spinlock_t lock; raw_spinlock_t lock;
}; };
static u32 pcie_read(struct xilinx_cpm_pcie_port *port, u32 reg) static u32 pcie_read(struct xilinx_cpm_pcie *port, u32 reg)
{ {
return readl_relaxed(port->reg_base + reg); return readl_relaxed(port->reg_base + reg);
} }
static void pcie_write(struct xilinx_cpm_pcie_port *port, static void pcie_write(struct xilinx_cpm_pcie *port,
u32 val, u32 reg) u32 val, u32 reg)
{ {
writel_relaxed(val, port->reg_base + reg); writel_relaxed(val, port->reg_base + reg);
} }
static bool cpm_pcie_link_up(struct xilinx_cpm_pcie_port *port) static bool cpm_pcie_link_up(struct xilinx_cpm_pcie *port)
{ {
return (pcie_read(port, XILINX_CPM_PCIE_REG_PSCR) & return (pcie_read(port, XILINX_CPM_PCIE_REG_PSCR) &
XILINX_CPM_PCIE_REG_PSCR_LNKUP); XILINX_CPM_PCIE_REG_PSCR_LNKUP);
} }
static void cpm_pcie_clear_err_interrupts(struct xilinx_cpm_pcie_port *port) static void cpm_pcie_clear_err_interrupts(struct xilinx_cpm_pcie *port)
{ {
unsigned long val = pcie_read(port, XILINX_CPM_PCIE_REG_RPEFR); unsigned long val = pcie_read(port, XILINX_CPM_PCIE_REG_RPEFR);
...@@ -153,7 +153,7 @@ static void cpm_pcie_clear_err_interrupts(struct xilinx_cpm_pcie_port *port) ...@@ -153,7 +153,7 @@ static void cpm_pcie_clear_err_interrupts(struct xilinx_cpm_pcie_port *port)
static void xilinx_cpm_mask_leg_irq(struct irq_data *data) static void xilinx_cpm_mask_leg_irq(struct irq_data *data)
{ {
struct xilinx_cpm_pcie_port *port = irq_data_get_irq_chip_data(data); struct xilinx_cpm_pcie *port = irq_data_get_irq_chip_data(data);
unsigned long flags; unsigned long flags;
u32 mask; u32 mask;
u32 val; u32 val;
...@@ -167,7 +167,7 @@ static void xilinx_cpm_mask_leg_irq(struct irq_data *data) ...@@ -167,7 +167,7 @@ static void xilinx_cpm_mask_leg_irq(struct irq_data *data)
static void xilinx_cpm_unmask_leg_irq(struct irq_data *data) static void xilinx_cpm_unmask_leg_irq(struct irq_data *data)
{ {
struct xilinx_cpm_pcie_port *port = irq_data_get_irq_chip_data(data); struct xilinx_cpm_pcie *port = irq_data_get_irq_chip_data(data);
unsigned long flags; unsigned long flags;
u32 mask; u32 mask;
u32 val; u32 val;
...@@ -211,7 +211,7 @@ static const struct irq_domain_ops intx_domain_ops = { ...@@ -211,7 +211,7 @@ static const struct irq_domain_ops intx_domain_ops = {
static void xilinx_cpm_pcie_intx_flow(struct irq_desc *desc) static void xilinx_cpm_pcie_intx_flow(struct irq_desc *desc)
{ {
struct xilinx_cpm_pcie_port *port = irq_desc_get_handler_data(desc); struct xilinx_cpm_pcie *port = irq_desc_get_handler_data(desc);
struct irq_chip *chip = irq_desc_get_chip(desc); struct irq_chip *chip = irq_desc_get_chip(desc);
unsigned long val; unsigned long val;
int i; int i;
...@@ -229,7 +229,7 @@ static void xilinx_cpm_pcie_intx_flow(struct irq_desc *desc) ...@@ -229,7 +229,7 @@ static void xilinx_cpm_pcie_intx_flow(struct irq_desc *desc)
static void xilinx_cpm_mask_event_irq(struct irq_data *d) static void xilinx_cpm_mask_event_irq(struct irq_data *d)
{ {
struct xilinx_cpm_pcie_port *port = irq_data_get_irq_chip_data(d); struct xilinx_cpm_pcie *port = irq_data_get_irq_chip_data(d);
u32 val; u32 val;
raw_spin_lock(&port->lock); raw_spin_lock(&port->lock);
...@@ -241,7 +241,7 @@ static void xilinx_cpm_mask_event_irq(struct irq_data *d) ...@@ -241,7 +241,7 @@ static void xilinx_cpm_mask_event_irq(struct irq_data *d)
static void xilinx_cpm_unmask_event_irq(struct irq_data *d) static void xilinx_cpm_unmask_event_irq(struct irq_data *d)
{ {
struct xilinx_cpm_pcie_port *port = irq_data_get_irq_chip_data(d); struct xilinx_cpm_pcie *port = irq_data_get_irq_chip_data(d);
u32 val; u32 val;
raw_spin_lock(&port->lock); raw_spin_lock(&port->lock);
...@@ -273,7 +273,7 @@ static const struct irq_domain_ops event_domain_ops = { ...@@ -273,7 +273,7 @@ static const struct irq_domain_ops event_domain_ops = {
static void xilinx_cpm_pcie_event_flow(struct irq_desc *desc) static void xilinx_cpm_pcie_event_flow(struct irq_desc *desc)
{ {
struct xilinx_cpm_pcie_port *port = irq_desc_get_handler_data(desc); struct xilinx_cpm_pcie *port = irq_desc_get_handler_data(desc);
struct irq_chip *chip = irq_desc_get_chip(desc); struct irq_chip *chip = irq_desc_get_chip(desc);
unsigned long val; unsigned long val;
int i; int i;
...@@ -327,7 +327,7 @@ static const struct { ...@@ -327,7 +327,7 @@ static const struct {
static irqreturn_t xilinx_cpm_pcie_intr_handler(int irq, void *dev_id) static irqreturn_t xilinx_cpm_pcie_intr_handler(int irq, void *dev_id)
{ {
struct xilinx_cpm_pcie_port *port = dev_id; struct xilinx_cpm_pcie *port = dev_id;
struct device *dev = port->dev; struct device *dev = port->dev;
struct irq_data *d; struct irq_data *d;
...@@ -350,7 +350,7 @@ static irqreturn_t xilinx_cpm_pcie_intr_handler(int irq, void *dev_id) ...@@ -350,7 +350,7 @@ static irqreturn_t xilinx_cpm_pcie_intr_handler(int irq, void *dev_id)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static void xilinx_cpm_free_irq_domains(struct xilinx_cpm_pcie_port *port) static void xilinx_cpm_free_irq_domains(struct xilinx_cpm_pcie *port)
{ {
if (port->intx_domain) { if (port->intx_domain) {
irq_domain_remove(port->intx_domain); irq_domain_remove(port->intx_domain);
...@@ -369,7 +369,7 @@ static void xilinx_cpm_free_irq_domains(struct xilinx_cpm_pcie_port *port) ...@@ -369,7 +369,7 @@ static void xilinx_cpm_free_irq_domains(struct xilinx_cpm_pcie_port *port)
* *
* Return: '0' on success and error value on failure * Return: '0' on success and error value on failure
*/ */
static int xilinx_cpm_pcie_init_irq_domain(struct xilinx_cpm_pcie_port *port) static int xilinx_cpm_pcie_init_irq_domain(struct xilinx_cpm_pcie *port)
{ {
struct device *dev = port->dev; struct device *dev = port->dev;
struct device_node *node = dev->of_node; struct device_node *node = dev->of_node;
...@@ -410,7 +410,7 @@ static int xilinx_cpm_pcie_init_irq_domain(struct xilinx_cpm_pcie_port *port) ...@@ -410,7 +410,7 @@ static int xilinx_cpm_pcie_init_irq_domain(struct xilinx_cpm_pcie_port *port)
return -ENOMEM; return -ENOMEM;
} }
static int xilinx_cpm_setup_irq(struct xilinx_cpm_pcie_port *port) static int xilinx_cpm_setup_irq(struct xilinx_cpm_pcie *port)
{ {
struct device *dev = port->dev; struct device *dev = port->dev;
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
...@@ -462,7 +462,7 @@ static int xilinx_cpm_setup_irq(struct xilinx_cpm_pcie_port *port) ...@@ -462,7 +462,7 @@ static int xilinx_cpm_setup_irq(struct xilinx_cpm_pcie_port *port)
* xilinx_cpm_pcie_init_port - Initialize hardware * xilinx_cpm_pcie_init_port - Initialize hardware
* @port: PCIe port information * @port: PCIe port information
*/ */
static void xilinx_cpm_pcie_init_port(struct xilinx_cpm_pcie_port *port) static void xilinx_cpm_pcie_init_port(struct xilinx_cpm_pcie *port)
{ {
if (cpm_pcie_link_up(port)) if (cpm_pcie_link_up(port))
dev_info(port->dev, "PCIe Link is UP\n"); dev_info(port->dev, "PCIe Link is UP\n");
...@@ -497,7 +497,7 @@ static void xilinx_cpm_pcie_init_port(struct xilinx_cpm_pcie_port *port) ...@@ -497,7 +497,7 @@ static void xilinx_cpm_pcie_init_port(struct xilinx_cpm_pcie_port *port)
* *
* Return: '0' on success and error value on failure * Return: '0' on success and error value on failure
*/ */
static int xilinx_cpm_pcie_parse_dt(struct xilinx_cpm_pcie_port *port, static int xilinx_cpm_pcie_parse_dt(struct xilinx_cpm_pcie *port,
struct resource *bus_range) struct resource *bus_range)
{ {
struct device *dev = port->dev; struct device *dev = port->dev;
...@@ -523,7 +523,7 @@ static int xilinx_cpm_pcie_parse_dt(struct xilinx_cpm_pcie_port *port, ...@@ -523,7 +523,7 @@ static int xilinx_cpm_pcie_parse_dt(struct xilinx_cpm_pcie_port *port,
return 0; return 0;
} }
static void xilinx_cpm_free_interrupts(struct xilinx_cpm_pcie_port *port) static void xilinx_cpm_free_interrupts(struct xilinx_cpm_pcie *port)
{ {
irq_set_chained_handler_and_data(port->intx_irq, NULL, NULL); irq_set_chained_handler_and_data(port->intx_irq, NULL, NULL);
irq_set_chained_handler_and_data(port->irq, NULL, NULL); irq_set_chained_handler_and_data(port->irq, NULL, NULL);
...@@ -537,7 +537,7 @@ static void xilinx_cpm_free_interrupts(struct xilinx_cpm_pcie_port *port) ...@@ -537,7 +537,7 @@ static void xilinx_cpm_free_interrupts(struct xilinx_cpm_pcie_port *port)
*/ */
static int xilinx_cpm_pcie_probe(struct platform_device *pdev) static int xilinx_cpm_pcie_probe(struct platform_device *pdev)
{ {
struct xilinx_cpm_pcie_port *port; struct xilinx_cpm_pcie *port;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct pci_host_bridge *bridge; struct pci_host_bridge *bridge;
struct resource_entry *bus; struct resource_entry *bus;
......
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