Change in ...coreboot[master]: nb/intel/i945: Add and use defines for registers of device 0:01.0 - coreboot-gerrit

24 Nov 2018

HAOUAS Elyes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/29824
Change subject: nb/intel/i945: Add and use defines for registers of device 0:01.0
......................................................................
nb/intel/i945: Add and use defines for registers of device 0:01.0
Some registers are not documented in "Mobile Intel 945 Express
Chipset Family" datasheet but they are in "Intel 945G/945GZ/
945GC/945P/945PL Express Chipset Family" datasheet.
Change-Id: I81f68a5b16e195626d4d271f8c7036032611bea3
Signed-off-by: Elyes HAOUAS ehaouas@noos.fr
---
M src/northbridge/intel/i945/early_init.c
M src/northbridge/intel/i945/i945.h
2 files changed, 59 insertions(+), 41 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/24/29824/1

diff --git a/src/northbridge/intel/i945/early_init.c b/src/northbridge/intel/i945/early_init.c
index 39d660b..5d70250 100644
--- a/src/northbridge/intel/i945/early_init.c
+++ b/src/northbridge/intel/i945/early_init.c
@@ -566,9 +566,9 @@
    reg16 |= DEVEN_D1F0;
    pci_write_config16(PCI_DEV(0, 0x00, 0), DEVEN, reg16);
-	reg32 = pci_read_config32(PCI_DEV(0, 0x01, 0), 0x208);
+	reg32 = pci_read_config32(PCI_DEV(0, 0x01, 0), PEGCC);
    reg32 &= ~(1 << 8);
-	pci_write_config32(PCI_DEV(0, 0x01, 0), 0x208, reg32);
+	pci_write_config32(PCI_DEV(0, 0x01, 0), PEGCC, reg32);
/* We have no success with querying the usual PCIe registers
     * for link setup success on the i945. Hence we assign a temporary
@@ -576,25 +576,25 @@
     */
/* First we reset the secondary bus */
-	reg16 = pci_read_config16(PCI_DEV(0, 0x01, 0), 0x3e);
+	reg16 = pci_read_config16(PCI_DEV(0, 0x01, 0), BCTRL1);
    reg16 |= (1 << 6); /* SRESET */
-	pci_write_config16(PCI_DEV(0, 0x01, 0), 0x3e, reg16);
+	pci_write_config16(PCI_DEV(0, 0x01, 0), BCTRL1, reg16);
    /* Read back and clear reset bit. */
-	reg16 = pci_read_config16(PCI_DEV(0, 0x01, 0), 0x3e);
+	reg16 = pci_read_config16(PCI_DEV(0, 0x01, 0), BCTRL1);
    reg16 &= ~(1 << 6); /* SRESET */
-	pci_write_config16(PCI_DEV(0, 0x01, 0), 0x3e, reg16);
+	pci_write_config16(PCI_DEV(0, 0x01, 0), BCTRL1, reg16);
-	reg16 = pci_read_config16(PCI_DEV(0, 0x01, 0), 0xba);
+	reg16 = pci_read_config16(PCI_DEV(0, 0x01, 0), SLOTSTS);
    printk(BIOS_DEBUG, "SLOTSTS: %04x\n", reg16);
    if (!(reg16 & 0x48))
    	goto disable_pciexpress_x16_link;
    reg16 |= (1 << 4) | (1 << 0);
-	pci_write_config16(PCI_DEV(0, 0x01, 0), 0xba, reg16);
+	pci_write_config16(PCI_DEV(0, 0x01, 0), SLOTSTS, reg16);
-	pci_write_config8(PCI_DEV(0, 0x01, 0), 0x19, 0x00);
-	pci_write_config8(PCI_DEV(0, 0x01, 0), 0x1a, 0x00);
-	pci_write_config8(PCI_DEV(0, 0x01, 0), 0x19, 0x0a);
-	pci_write_config8(PCI_DEV(0, 0x01, 0), 0x1a, 0x0a);
+	pci_write_config8(PCI_DEV(0, 0x01, 0), SBUSN1, 0x00);
+	pci_write_config8(PCI_DEV(0, 0x01, 0), SUBUSN1, 0x00);
+	pci_write_config8(PCI_DEV(0, 0x01, 0), SBUSN1, 0x0a);
+	pci_write_config8(PCI_DEV(0, 0x01, 0), SUBUSN1, 0x0a);
reg32 = pci_read_config32(PCI_DEV(0, 0x01, 0), 0x224);
    reg32 &= ~(1 << 8);
@@ -603,21 +603,21 @@
    MCHBAR16(UPMC1) &= ~((1 << 5) | (1 << 0));
/* Initialize PEG_CAP */
-	reg16 = pci_read_config16(PCI_DEV(0, 0x01, 0), 0xa2);
+	reg16 = pci_read_config16(PCI_DEV(0, 0x01, 0), PEG_CAP);
    reg16 |= (1 << 8);
-	pci_write_config16(PCI_DEV(0, 0x01, 0), 0xa2, reg16);
+	pci_write_config16(PCI_DEV(0, 0x01, 0), PEG_CAP, reg16);
/* Setup SLOTCAP */
    /* TODO: These values are mainboard dependent and should
     * be set from devicetree.cb.
     */
    /* NOTE: SLOTCAP becomes RO after the first write! */
-	reg32 = pci_read_config32(PCI_DEV(0, 0x01, 0), 0xb4);
+	reg32 = pci_read_config32(PCI_DEV(0, 0x01, 0), SLOTCAP);
    reg32 &= 0x0007ffff;
reg32 &= 0xfffe007f;
-	pci_write_config32(PCI_DEV(0, 0x01, 0), 0xb4, reg32);
+	pci_write_config32(PCI_DEV(0, 0x01, 0), SLOTCAP, reg32);
/* Wait for training to succeed */
    printk(BIOS_DEBUG, "PCIe link training ...");
@@ -640,12 +640,12 @@
    	reg32 |= 1;
    	pci_write_config32(PCI_DEV(0, 0x01, 0), PEGSTS, reg32);
-		reg16 = pci_read_config16(PCI_DEV(0, 0x01, 0), 0x3e);
+		reg16 = pci_read_config16(PCI_DEV(0, 0x01, 0), BCTRL1);
reg16 |= (1 << 6);
-		pci_write_config16(PCI_DEV(0, 0x01, 0), 0x3e, reg16);
+		pci_write_config16(PCI_DEV(0, 0x01, 0), BCTRL1, reg16);
    	reg16 &= ~(1 << 6);
-		pci_write_config16(PCI_DEV(0, 0x01, 0), 0x3e, reg16);
+		pci_write_config16(PCI_DEV(0, 0x01, 0), BCTRL1, reg16);
printk(BIOS_DEBUG, "PCIe link training ...");
    	timeout = 0x7ffff;
@@ -664,22 +664,22 @@
    	}
    }
-	reg16 = pci_read_config16(PCI_DEV(0, 0x01, 0), 0xb2);
+	reg16 = pci_read_config16(PCI_DEV(0, 0x01, 0), LSTS);
    reg16 >>= 4;
    reg16 &= 0x3f;
    /* reg16 == 1 -> x1; reg16 == 16 -> x16 */
    printk(BIOS_DEBUG, "PCIe x%d link training succeeded.\n", reg16);
-	reg32 = pci_read_config32(PCI_DEV(0, 0x01, 0), 0x204);
+	reg32 = pci_read_config32(PCI_DEV(0, 0x01, 0), PEGTC);
    reg32 &= 0xfffffc00; /* clear [9:0] */
    if (reg16 == 1)
    	reg32 |= 0x32b;
    	// TODO
-		/* pci_write_config32(PCI_DEV(0, 0x01, 0), 0x204, reg32); */
+		/* pci_write_config32(PCI_DEV(0, 0x01, 0), PEGTC, reg32); */
    else if (reg16 == 16)
    	reg32 |= 0x0f4;
    	// TODO
-		/* pci_write_config32(PCI_DEV(0, 0x01, 0), 0x204, reg32); */
+		/* pci_write_config32(PCI_DEV(0, 0x01, 0), PEGTC, reg32); */
reg32 = (pci_read_config32(PCI_DEV(0xa, 0, 0), 0x8) >> 8);
    printk(BIOS_DEBUG, "PCIe device class: %06x\n", reg32);
@@ -693,36 +693,36 @@
    	pci_write_config32(PCI_DEV(0, 0x0, 0), DEVEN, reg32);
/* Set VGA enable bit in PCIe bridge */
-		reg16 = pci_read_config16(PCI_DEV(0, 0x1, 0), 0x3e);
+		reg16 = pci_read_config16(PCI_DEV(0, 0x1, 0), BCTRL1);
    	reg16 |= (1 << 3);
-		pci_write_config16(PCI_DEV(0, 0x1, 0), 0x3e, reg16);
+		pci_write_config16(PCI_DEV(0, 0x1, 0), BCTRL1, reg16);
    }
/* Enable GPEs */
-	reg32 = pci_read_config32(PCI_DEV(0, 0x01, 0), 0xec);
+	reg32 = pci_read_config32(PCI_DEV(0, 0x01, 0), PEG_LC);
    reg32 |= (1 << 2) | (1 << 1) | (1 << 0); /* PMEGPE, HPGPE, GENGPE */
-	pci_write_config32(PCI_DEV(0, 0x01, 0), 0xec, reg32);
+	pci_write_config32(PCI_DEV(0, 0x01, 0), PEG_LC, reg32);
/* Virtual Channel Configuration: Only VC0 on PCIe x16 */
-	reg32 = pci_read_config32(PCI_DEV(0, 0x01, 0), 0x114);
+	reg32 = pci_read_config32(PCI_DEV(0, 0x01, 0), VC0RCTL);
    reg32 &= 0xffffff01;
-	pci_write_config32(PCI_DEV(0, 0x01, 0), 0x114, reg32);
+	pci_write_config32(PCI_DEV(0, 0x01, 0), VC0RCTL, reg32);
/* Extended VC count */
-	reg32 = pci_read_config32(PCI_DEV(0, 0x01, 0), 0x104);
+	reg32 = pci_read_config32(PCI_DEV(0, 0x01, 0), PVCCAP1);
    reg32 &= ~(7 << 0);
-	pci_write_config32(PCI_DEV(0, 0x01, 0), 0x104, reg32);
+	pci_write_config32(PCI_DEV(0, 0x01, 0), PVCCAP1, reg32);
/* Active State Power Management ASPM */
/* TODO */
/* Clear error bits */
-	pci_write_config16(PCI_DEV(0, 0x01, 0), 0x06, 0xffff);
-	pci_write_config16(PCI_DEV(0, 0x01, 0), 0x1e, 0xffff);
-	pci_write_config16(PCI_DEV(0, 0x01, 0), 0xaa, 0xffff);
-	pci_write_config32(PCI_DEV(0, 0x01, 0), 0x1c4, 0xffffffff);
-	pci_write_config32(PCI_DEV(0, 0x01, 0), 0x1d0, 0xffffffff);
+	pci_write_config16(PCI_DEV(0, 0x01, 0), PCISTS1, 0xffff);
+	pci_write_config16(PCI_DEV(0, 0x01, 0), SSTS1, 0xffff);
+	pci_write_config16(PCI_DEV(0, 0x01, 0), DSTS, 0xffff);
+	pci_write_config32(PCI_DEV(0, 0x01, 0), UESTS, 0xffffffff);
+	pci_write_config32(PCI_DEV(0, 0x01, 0), CESTS, 0xffffffff);
    pci_write_config32(PCI_DEV(0, 0x01, 0), 0x1f0, 0xffffffff);
    pci_write_config32(PCI_DEV(0, 0x01, 0), 0x228, 0xffffffff);
@@ -739,8 +739,8 @@
    reg32 = pci_read_config32(PCI_DEV(0, 0x01, 0), 0x328);
    pci_write_config32(PCI_DEV(0, 0x01, 0), 0x328, reg32);
-	reg8 = pci_read_config8(PCI_DEV(0, 0x01, 0), 0xb4);
-	pci_write_config8(PCI_DEV(0, 0x01, 0), 0xb4, reg8);
+	reg8 = pci_read_config8(PCI_DEV(0, 0x01, 0), SLOTCAP);
+	pci_write_config8(PCI_DEV(0, 0x01, 0), SLOTCAP, reg8);
/* Additional PCIe graphics setup */
    reg32 = pci_read_config32(PCI_DEV(0, 0x01, 0), 0xf0);
@@ -874,10 +874,10 @@
/* PCI Express x16 Port Root Topology */
    if (pci_read_config8(PCI_DEV(0, 0x00, 0), DEVEN) & DEVEN_D1F0) {
-		pci_write_config32(PCI_DEV(0, 0x01, 0), 0x158, DEFAULT_EPBAR);
-		reg32 = pci_read_config32(PCI_DEV(0, 0x01, 0), 0x150);
+		pci_write_config32(PCI_DEV(0, 0x01, 0), LE1A, DEFAULT_EPBAR);
+		reg32 = pci_read_config32(PCI_DEV(0, 0x01, 0), LE1D);
    	reg32 |= (1 << 0);
-		pci_write_config32(PCI_DEV(0, 0x01, 0), 0x150, reg32);
+		pci_write_config32(PCI_DEV(0, 0x01, 0), LE1D, reg32);
    }
 }
diff --git a/src/northbridge/intel/i945/i945.h b/src/northbridge/intel/i945/i945.h
index cc5f087..b934a4b 100644
--- a/src/northbridge/intel/i945/i945.h
+++ b/src/northbridge/intel/i945/i945.h
@@ -83,7 +83,25 @@
/* Device 0:1.0 PCI configuration space (PCI Express) */
+#define PCISTS1		0x06	/* 16bit */
+#define SBUSN1		0x19	/*  8bit */
+#define SUBUSN1		0x1a	/*  8bit */
+#define SSTS1		0x1e	/* 16bit */
 #define BCTRL1		0x3e	/* 16bit */
+#define PEG_CAP		0xa2	/* 16bit */
+#define DSTS		0xaa	/* 16bit */
+#define LSTS		0xb2	/* 16bit */
+#define SLOTCAP		0xb4	/* 32bit */
+#define SLOTSTS		0xba	/* 16bit */
+#define PEG_LC		0xec	/* 32bit */
+#define PVCCAP		0x104	/* 32bit */
+#define VC0RCTL		0x114	/* 32bit */
+#define LE1D		0x150	/* 32bit */
+#define LE1A		0x158	/* 64bit */
+#define UESTS		0x1c4	/* 32bit */
+#define CESTS		0x1d0	/* 32bit */
+#define PEGTC		0x204	/* 32bit */
+#define PEGCC		0x208	/* 32bit */
 #define PEGSTS		0x214	/* 32bit */
-- 
To view, visit https://review.coreboot.org/c/coreboot/+/29824
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I81f68a5b16e195626d4d271f8c7036032611bea3
Gerrit-Change-Number: 29824
Gerrit-PatchSet: 1
Gerrit-Owner: HAOUAS Elyes ehaouas@noos.fr
Gerrit-MessageType: newchange



    