Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23fe5bd4 authored by Kishon Vijay Abraham I's avatar Kishon Vijay Abraham I Committed by Lorenzo Pieralisi
Browse files

PCI: keystone: Cleanup ks_pcie_link_up() 



ks_pcie_link_up() uses registers from the designware core to get the
status of the link. Move the register defines to pcie-designware.h
and cleanup ks_pcie_link_up().

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

drivers/pci/controller/dwc/pci-keystone.c

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


/* Application register defines */

#define LTSSM_EN_VAL		        BIT(0)

#define LTSSM_STATE_MASK		0x1f

#define LTSSM_STATE_L0			0x11

#define DBI_CS2				BIT(5)

#define OB_XLAT_EN_VAL		        BIT(1)
@@ -87,11 +85,7 @@ 
#define ERR_IRQ_ENABLE_SET		0x1c8

#define ERR_IRQ_ENABLE_CLR		0x1cc



/* Config space registers */

#define DEBUG0				0x728



#define MAX_MSI_HOST_IRQS		8



/* PCIE controller device IDs */

#define PCIE_RC_K2HK		0xb008

#define PCIE_RC_K2E		0xb009
@@ -442,8 +436,9 @@ static int ks_pcie_link_up(struct dw_pcie *pci) 
{

	u32 val;



	val = dw_pcie_readl_dbi(pci, DEBUG0);

	return (val & LTSSM_STATE_MASK) == LTSSM_STATE_L0;

	val = dw_pcie_readl_dbi(pci, PCIE_PORT_DEBUG0);

	val &= PORT_LOGIC_LTSSM_STATE_MASK;

	return (val == PORT_LOGIC_LTSSM_STATE_L0);

}



static void ks_pcie_initiate_link_train(struct keystone_pcie *ks_pcie)

drivers/pci/controller/dwc/pcie-designware.h

+4 −0
Original line number Diff line number Diff line
@@ -37,6 +37,10 @@ 
#define PORT_LINK_MODE_4_LANES		(0x7 << 16)

#define PORT_LINK_MODE_8_LANES		(0xf << 16)



#define PCIE_PORT_DEBUG0		0x728

#define PORT_LOGIC_LTSSM_STATE_MASK	0x1f

#define PORT_LOGIC_LTSSM_STATE_L0	0x11



#define PCIE_LINK_WIDTH_SPEED_CONTROL	0x80C

#define PORT_LOGIC_SPEED_CHANGE		(0x1 << 17)

#define PORT_LOGIC_LINK_WIDTH_MASK	(0x1f << 8)