Commit 0cf985d6 authored by Kishon Vijay Abraham I's avatar Kishon Vijay Abraham I Committed by Lorenzo Pieralisi
Browse files

PCI: cadence: Simplify code to get register base address for configuring BAR 

No functional change. Simplify code to get register base address for
configuring PCI BAR.

Link: https://lore.kernel.org/r/20210819123343.1951-6-kishon@ti.com


Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
parent 53fd3cbe

drivers/pci/controller/cadence/pcie-cadence-ep.c

+4 −14
Original line number Diff line number Diff line
@@ -97,13 +97,8 @@ static int cdns_pcie_ep_set_bar(struct pci_epc *epc, u8 fn, u8 vfn, 
	cdns_pcie_writel(pcie, CDNS_PCIE_AT_IB_EP_FUNC_BAR_ADDR1(fn, bar),

			 addr1);



	if (bar < BAR_4) {

		reg = CDNS_PCIE_LM_EP_FUNC_BAR_CFG0(fn);

		b = bar;

	} else {

		reg = CDNS_PCIE_LM_EP_FUNC_BAR_CFG1(fn);

		b = bar - BAR_4;

	}

	reg = CDNS_PCIE_LM_EP_FUNC_BAR_CFG(bar, fn);

	b = (bar < BAR_4) ? bar : bar - BAR_4;



	cfg = cdns_pcie_readl(pcie, reg);

	cfg &= ~(CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_APERTURE_MASK(b) |
@@ -126,13 +121,8 @@ static void cdns_pcie_ep_clear_bar(struct pci_epc *epc, u8 fn, u8 vfn, 
	enum pci_barno bar = epf_bar->barno;

	u32 reg, cfg, b, ctrl;



	if (bar < BAR_4) {

		reg = CDNS_PCIE_LM_EP_FUNC_BAR_CFG0(fn);

		b = bar;

	} else {

		reg = CDNS_PCIE_LM_EP_FUNC_BAR_CFG1(fn);

		b = bar - BAR_4;

	}

	reg = CDNS_PCIE_LM_EP_FUNC_BAR_CFG(bar, fn);

	b = (bar < BAR_4) ? bar : bar - BAR_4;



	ctrl = CDNS_PCIE_LM_BAR_CFG_CTRL_DISABLED;

	cfg = cdns_pcie_readl(pcie, reg);

drivers/pci/controller/cadence/pcie-cadence.h

+3 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 


#include <linux/kernel.h>

#include <linux/pci.h>

#include <linux/pci-epf.h>

#include <linux/phy/phy.h>



/* Parameters for the waiting for link up routine */
@@ -46,6 +47,8 @@ 
#define  CDNS_PCIE_LM_EP_ID_BUS_SHIFT	8



/* Endpoint Function f BAR b Configuration Registers */

#define CDNS_PCIE_LM_EP_FUNC_BAR_CFG(bar, fn) \

	(((bar) < BAR_4) ? CDNS_PCIE_LM_EP_FUNC_BAR_CFG0(fn) : CDNS_PCIE_LM_EP_FUNC_BAR_CFG1(fn))

#define CDNS_PCIE_LM_EP_FUNC_BAR_CFG0(fn) \

	(CDNS_PCIE_LM_BASE + 0x0240 + (fn) * 0x0008)

#define CDNS_PCIE_LM_EP_FUNC_BAR_CFG1(fn) \