PCI: mobiveil: Reformat the code for readability (e369faf6) · Commits · 戴 / test

drivers/pci/controller/pcie-mobiveil.c

+107 −101

Original line number	Diff line number	Diff line
		@@ -34,8 +34,10 @@
		#define PAB_REG_BLOCK_SIZE 16
		#define PAB_EXT_REG_BLOCK_SIZE 4

		#define PAB_REG_ADDR(offset, win) (offset + (win * PAB_REG_BLOCK_SIZE))
		#define PAB_EXT_REG_ADDR(offset, win) (offset + (win * PAB_EXT_REG_BLOCK_SIZE))
		#define PAB_REG_ADDR(offset, win) \
		(offset + (win * PAB_REG_BLOCK_SIZE))
		#define PAB_EXT_REG_ADDR(offset, win) \
		(offset + (win * PAB_EXT_REG_BLOCK_SIZE))

		#define LTSSM_STATUS 0x0404
		#define LTSSM_STATUS_L0_MASK 0x3f
		@@ -301,10 +303,9 @@ static void __iomem mobiveil_pcie_map_bus(struct pci_bus bus,
		if (!mobiveil_pcie_valid_device(bus, devfn))
		return NULL;

		if (bus->number == pcie->root_bus_nr) {
		/* RC config access */
		if (bus->number == pcie->root_bus_nr)
		return pcie->csr_axi_slave_base + where;
		}

		/*
		* EP config access (in Config/APIO space)
		@@ -359,8 +360,8 @@ static void mobiveil_pcie_isr(struct irq_desc *desc)
		if (virq)
		generic_handle_irq(virq);
		else
		dev_err_ratelimited(dev,
		"unexpected IRQ, INT%d\n", bit);
		dev_err_ratelimited(dev, "unexpected IRQ, INT%d\n",
		bit);

		/* clear interrupt */
		csr_writel(pcie,
		@@ -375,8 +376,7 @@ static void mobiveil_pcie_isr(struct irq_desc *desc)

		/* handle MSI interrupts */
		while (msi_status & 1) {
		msi_data = readl_relaxed(pcie->apb_csr_base
		+ MSI_DATA_OFFSET);
		msi_data = readl_relaxed(pcie->apb_csr_base + MSI_DATA_OFFSET);

		/*
		* MSI_STATUS_OFFSET register gets updated to zero
		@@ -463,8 +463,8 @@ static void program_ib_windows(struct mobiveil_pcie *pcie, int win_num,
		}

		pio_ctrl_val = csr_readl(pcie, PAB_PEX_PIO_CTRL);
		csr_writel(pcie,
		pio_ctrl_val \| (1 << PIO_ENABLE_SHIFT), PAB_PEX_PIO_CTRL);
		csr_writel(pcie, pio_ctrl_val \| (1 << PIO_ENABLE_SHIFT),
		PAB_PEX_PIO_CTRL);
		amap_ctrl_dw = csr_readl(pcie, PAB_PEX_AMAP_CTRL(win_num));
		amap_ctrl_dw = (amap_ctrl_dw \| (type << AMAP_CTRL_TYPE_SHIFT));
		amap_ctrl_dw = (amap_ctrl_dw \| (1 << AMAP_CTRL_EN_SHIFT));
		@@ -484,7 +484,8 @@ static void program_ib_windows(struct mobiveil_pcie *pcie, int win_num,
		* routine to program the outbound windows
		*/
		static void program_ob_windows(struct mobiveil_pcie *pcie, int win_num,
		u64 cpu_addr, u64 pci_addr, u32 config_io_bit, u64 size)
		u64 cpu_addr, u64 pci_addr,
		u32 config_io_bit, u64 size)
		{

		u32 value, type;
		@@ -536,7 +537,9 @@ static int mobiveil_bringup_link(struct mobiveil_pcie *pcie)

		usleep_range(LINK_WAIT_MIN, LINK_WAIT_MAX);
		}

		dev_err(&pcie->pdev->dev, "link never came up\n");

		return -ETIMEDOUT;
		}

		@@ -679,6 +682,7 @@ static int mobiveil_pcie_intx_map(struct irq_domain *domain, unsigned int irq,
		{
		irq_set_chip_and_handler(irq, &intx_irq_chip, handle_level_irq);
		irq_set_chip_data(irq, domain->host_data);

		return 0;
		}

		@@ -725,7 +729,8 @@ static struct irq_chip mobiveil_msi_bottom_irq_chip = {
		};

		static int mobiveil_irq_msi_domain_alloc(struct irq_domain *domain,
		unsigned int virq, unsigned int nr_irqs, void *args)
		unsigned int virq,
		unsigned int nr_irqs, void *args)
		{
		struct mobiveil_pcie *pcie = domain->host_data;
		struct mobiveil_msi *msi = &pcie->msi;
		@@ -745,13 +750,13 @@ static int mobiveil_irq_msi_domain_alloc(struct irq_domain *domain,
		mutex_unlock(&msi->lock);

		irq_domain_set_info(domain, virq, bit, &mobiveil_msi_bottom_irq_chip,
		domain->host_data, handle_level_irq,
		NULL, NULL);
		domain->host_data, handle_level_irq, NULL, NULL);
		return 0;
		}

		static void mobiveil_irq_msi_domain_free(struct irq_domain *domain,
		unsigned int virq, unsigned int nr_irqs)
		unsigned int virq,
		unsigned int nr_irqs)
		{
		struct irq_data *d = irq_domain_get_irq_data(domain, virq);
		struct mobiveil_pcie *pcie = irq_data_get_irq_chip_data(d);
		@@ -759,12 +764,11 @@ static void mobiveil_irq_msi_domain_free(struct irq_domain *domain,

		mutex_lock(&msi->lock);

		if (!test_bit(d->hwirq, msi->msi_irq_in_use)) {
		if (!test_bit(d->hwirq, msi->msi_irq_in_use))
		dev_err(&pcie->pdev->dev, "trying to free unused MSI#%lu\n",
		d->hwirq);
		} else {
		else
		__clear_bit(d->hwirq, msi->msi_irq_in_use);
		}

		mutex_unlock(&msi->lock);
		}
		@@ -788,12 +792,14 @@ static int mobiveil_allocate_msi_domains(struct mobiveil_pcie *pcie)
		}

		msi->msi_domain = pci_msi_create_irq_domain(fwnode,
		&mobiveil_msi_domain_info, msi->dev_domain);
		&mobiveil_msi_domain_info,
		msi->dev_domain);
		if (!msi->msi_domain) {
		dev_err(dev, "failed to create MSI domain\n");
		irq_domain_remove(msi->dev_domain);
		return -ENOMEM;
		}

		return 0;
		}

		@@ -804,8 +810,8 @@ static int mobiveil_pcie_init_irq_domain(struct mobiveil_pcie *pcie)
		int ret;

		/* setup INTx */
		pcie->intx_domain = irq_domain_add_linear(node,
		PCI_NUM_INTX, &intx_domain_ops, pcie);
		pcie->intx_domain = irq_domain_add_linear(node, PCI_NUM_INTX,
		&intx_domain_ops, pcie);

		if (!pcie->intx_domain) {
		dev_err(dev, "Failed to get a INTx IRQ domain\n");

Admin message