RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

leon, grpci2: latency timer user configurable (default 64)

Browse Source
This commit is contained in:
Javier Jalle
2017-02-13 10:16:14 +01:00
committed by Daniel Hellstrom
parent 0c23dd5046
commit f46f5f845d
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
c/src/lib/libbsp/sparc/shared/include/grpci2.h
View File

@@ -36,6 +36,10 @@ extern void grpci2_register_drv(void);
* ============================ * ============================
* Name="byteTwisting", Type=INT, Enable/Disable Bytetwisting by hardware * Name="byteTwisting", Type=INT, Enable/Disable Bytetwisting by hardware
* *
* PCI Latency timer
* ============================
* Name="latencyTimer", Type=INT, Set the latency timer
*
* PCI Host's Target BARs setup * PCI Host's Target BARs setup
* ============================ * ============================
* The Host's BARs are not configured by the configuration routines, by default * The Host's BARs are not configured by the configuration routines, by default

16
c/src/lib/libbsp/sparc/shared/pci/grpci2.c
View File

@@ -57,6 +57,9 @@
/* If defined to 1 - byte twisting is enabled by default */ /* If defined to 1 - byte twisting is enabled by default */
#define DEFAULT_BT_ENABLED 0 #define DEFAULT_BT_ENABLED 0
/* If defined to 64 - Latency timer is 64 by default */
#define DEFAULT_LATENCY_TIMER 64
/* Interrupt assignment. Set to other value than 0xff in order to /* Interrupt assignment. Set to other value than 0xff in order to
* override defaults and plug&play information * override defaults and plug&play information
*/ */
@@ -237,6 +240,7 @@ struct grpci2_priv {
char irq_mode; /* IRQ Mode from CAPSTS REG */ char irq_mode; /* IRQ Mode from CAPSTS REG */
char bt_enabled; char bt_enabled;
unsigned int irq_mask; unsigned int irq_mask;
unsigned int latency_timer;
struct grpci2_pcibar_cfg *barcfg; struct grpci2_pcibar_cfg *barcfg;
@@ -696,6 +700,12 @@ static int grpci2_hw_init(struct grpci2_priv *priv)
data |= (PCIM_CMD_MEMEN | PCIM_CMD_BUSMASTEREN); data |= (PCIM_CMD_MEMEN | PCIM_CMD_BUSMASTEREN);
grpci2_cfg_w32(host, PCIR_COMMAND, data); grpci2_cfg_w32(host, PCIR_COMMAND, data);
/* set latency timer */
grpci2_cfg_r32(host, PCIR_CACHELNSZ, &data);
data &= ~0xff00;
data |= ((priv->latency_timer & 0xff) << 8);
grpci2_cfg_w32(host, PCIR_CACHELNSZ, data);
/* Enable Error respone (CPU-TRAP) on illegal memory access */ /* Enable Error respone (CPU-TRAP) on illegal memory access */
regs->ctrl = CTRL_ER | CTRL_PE; regs->ctrl = CTRL_ER | CTRL_PE;
@@ -733,6 +743,7 @@ static int grpci2_init(struct grpci2_priv *priv)
priv->regs = (struct grpci2_regs *)apb->start; priv->regs = (struct grpci2_regs *)apb->start;
priv->bt_enabled = DEFAULT_BT_ENABLED; priv->bt_enabled = DEFAULT_BT_ENABLED;
priv->irq_mode = (priv->regs->sts_cap & STS_IRQMODE) >> STS_IRQMODE_BIT; priv->irq_mode = (priv->regs->sts_cap & STS_IRQMODE) >> STS_IRQMODE_BIT;
priv->latency_timer = DEFAULT_LATENCY_TIMER;
/* Calculate the PCI windows /* Calculate the PCI windows
* AMBA->PCI Window: AHB SLAVE AREA0 * AMBA->PCI Window: AHB SLAVE AREA0
@@ -791,6 +802,11 @@ static int grpci2_init(struct grpci2_priv *priv)
else else
priv->barcfg = grpci2_default_bar_mapping; priv->barcfg = grpci2_default_bar_mapping;
/* User may override DEFAULT_LATENCY_TIMER */
value = drvmgr_dev_key_get(priv->dev, "latencyTimer", DRVMGR_KT_INT);
if (value)
priv->latency_timer = value->i;
/* This driver only support HOST systems, we check that it can act as a /* This driver only support HOST systems, we check that it can act as a
* PCI Master and that it is in the Host slot. */ * PCI Master and that it is in the Host slot. */
if ((priv->regs->sts_cap&STS_HOST) || !(priv->regs->sts_cap&STS_MST)) if ((priv->regs->sts_cap&STS_HOST) || !(priv->regs->sts_cap&STS_MST))