From 521c179f7df8aafb5fdfdd6e312f4b281b19d597 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Sun, 29 Sep 2002 23:37:07 +0000 Subject: [PATCH] SMIENB not needed, but maybe PCI_CLOCK is, so put it in #if 0'd out --- sys/pccard/pcic_pci.c | 14 ++++++++------ sys/pccard/pcic_pci.h | 1 + 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/sys/pccard/pcic_pci.c b/sys/pccard/pcic_pci.c index 3487b307388f..39576f17f47d 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 f1d48f825a0e..d5f7a83079fa 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