Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/arm/broadcom Add a way to force PCI to negotiate ge...
details: https://anonhg.NetBSD.org/src/rev/e21f1c70cb9e
branches: trunk
changeset: 782000:e21f1c70cb9e
user: matt <matt%NetBSD.org@localhost>
date: Fri Oct 12 17:18:02 2012 +0000
description:
Add a way to force PCI to negotiate gen1 (setting flags 1 in the config file).
diffstat:
sys/arch/arm/broadcom/bcm53xx_pax.c | 11 ++++++++---
sys/arch/arm/broadcom/bcm53xx_reg.h | 2 ++
2 files changed, 10 insertions(+), 3 deletions(-)
diffs (47 lines):
diff -r 3646867b5a1f -r e21f1c70cb9e sys/arch/arm/broadcom/bcm53xx_pax.c
--- a/sys/arch/arm/broadcom/bcm53xx_pax.c Fri Oct 12 17:06:48 2012 +0000
+++ b/sys/arch/arm/broadcom/bcm53xx_pax.c Fri Oct 12 17:18:02 2012 +0000
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: bcm53xx_pax.c,v 1.5 2012/09/27 00:25:26 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: bcm53xx_pax.c,v 1.6 2012/10/12 17:18:02 matt Exp $");
#include <sys/bus.h>
#include <sys/device.h>
@@ -218,8 +218,6 @@
bcmpax_write_4(sc, PCIE_CLK_CONTROL, 3);
delay(250);
bcmpax_write_4(sc, PCIE_CLK_CONTROL, 1);
- // delay(100*1000);
-
uint32_t v = bcmpax_read_4(sc, PCIE_STRAP_STATUS);
const bool enabled = (v & STRAP_PCIE_IF_ENABLE) != 0;
@@ -292,6 +290,13 @@
KASSERT(ok);
/*
+ * This will force the device to negotiate to a max of gen1.
+ */
+ if (device_cfdata(self)->cf_flags & 1) {
+ bcmpax_conf_write(sc, 0, offset + PCI_PCIE_LCSR2, 1);
+ }
+
+ /*
* Now we wait (.25 sec) for the link to come up.
*/
offset += PCI_PCIE_LCSR;
diff -r 3646867b5a1f -r e21f1c70cb9e sys/arch/arm/broadcom/bcm53xx_reg.h
--- a/sys/arch/arm/broadcom/bcm53xx_reg.h Fri Oct 12 17:06:48 2012 +0000
+++ b/sys/arch/arm/broadcom/bcm53xx_reg.h Fri Oct 12 17:18:02 2012 +0000
@@ -443,6 +443,8 @@
#define PCIE_SYS_RC_INTX_EN 0x330
#define PCIE_SYS_RC_INTX_CSR 0x334
+#define PCIE_CFG000_BASE 0x400
+
#define PCIE_FUNC0_IMAP0_0 0xc00
#define PCIE_FUNC0_IMAP0_1 0xc04
#define PCIE_FUNC0_IMAP0_2 0xc08
Home |
Main Index |
Thread Index |
Old Index