summaryrefslogtreecommitdiffstats
path: root/sys/pccard
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2002-09-29 23:37:07 +0000
committerimp <imp@FreeBSD.org>2002-09-29 23:37:07 +0000
commit84dd07c00bd29823d01c5f2ed649e3257393b368 (patch)
treee83b1543d047ce07224ce8f78fc096f87c066b2f /sys/pccard
parent0a14f466d6785d21eeb654fff95b8e41a0213e6e (diff)
downloadFreeBSD-src-84dd07c00bd29823d01c5f2ed649e3257393b368.zip
FreeBSD-src-84dd07c00bd29823d01c5f2ed649e3257393b368.tar.gz
SMIENB not needed, but maybe PCI_CLOCK is, so put it in #if 0'd out
Diffstat (limited to 'sys/pccard')
-rw-r--r--sys/pccard/pcic_pci.c14
-rw-r--r--sys/pccard/pcic_pci.h1
2 files changed, 9 insertions, 6 deletions
diff --git a/sys/pccard/pcic_pci.c b/sys/pccard/pcic_pci.c
index 3487b30..39576f1 100644
--- a/sys/pccard/pcic_pci.c
+++ b/sys/pccard/pcic_pci.c
@@ -696,14 +696,16 @@ pcic_pci_ti12xx_func(struct pcic_slot *sp, enum pcic_intr_way way)
devcntl, 1);
syscntl |= TI113X_SYSCNTL_INTRTIE;
}
- /*
- * I'm not sure that this helps/hurts things at all and
- * plan on removing it in the 4.8 time frame unless someone
- * can show that it really helps.
+#if 0
+ /*
+ * I've had reports that we need the pci clock enabled,
+ * but I'm unsure how wise this is in general, so it
+ * is ifdef'd out at the moment
*/
- syscntl &= ~TI113X_SYSCNTL_SMIENB;
- pci_write_config(dev, TI113X_PCI_SYSTEM_CONTROL, syscntl, 1);
+ syscntl |= TI12XX_SYSCNTL_PCI_CLOCK;
+ pci_write_config(dev, TI113X_PCI_SYSTEM_CONTROL, syscntl, 4);
+#endif
/*
* Some PCI add-in cards don't have good EEPROMs on them,
* so they get this MUX register wrong. The MUX register
diff --git a/sys/pccard/pcic_pci.h b/sys/pccard/pcic_pci.h
index f1d48f8..d5f7a830 100644
--- a/sys/pccard/pcic_pci.h
+++ b/sys/pccard/pcic_pci.h
@@ -54,6 +54,7 @@
/* Card control register (TI113X_SYSTEM_CONTROL == 0x80) */
#define TI113X_SYSCNTL_INTRTIE 0x20000000u
+#define TI12XX_SYSCNTL_PCI_CLOCK 0x08000000u
#define TI113X_SYSCNTL_SMIENB 0x00800000u
#define TI113X_SYSCNTL_VCC_PROTECT 0x00200000u
#define TI113X_SYSCNTL_CLKRUN_SEL 0x00000080u
OpenPOWER on IntegriCloud