summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorgibbs <gibbs@FreeBSD.org>1999-05-25 20:12:32 +0000
committergibbs <gibbs@FreeBSD.org>1999-05-25 20:12:32 +0000
commit4be64fdc3beaca9a272bd9472089e1412b72db05 (patch)
tree1a9b1c928870d80481e2b0bc60ded686c2fea140 /sys
parent2326a927fb5c5a3f2f457a704828dd8cc1c87e64 (diff)
downloadFreeBSD-src-4be64fdc3beaca9a272bd9472089e1412b72db05.zip
FreeBSD-src-4be64fdc3beaca9a272bd9472089e1412b72db05.tar.gz
All cards using aic789X chips use the new eeprom format.
Corrects bogus negotiation values on aic7890 based controllers. PR: 11872
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/aic7xxx/ahc_pci.c5
-rw-r--r--sys/pci/ahc_pci.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/sys/dev/aic7xxx/ahc_pci.c b/sys/dev/aic7xxx/ahc_pci.c
index b1e837e..44cb21f 100644
--- a/sys/dev/aic7xxx/ahc_pci.c
+++ b/sys/dev/aic7xxx/ahc_pci.c
@@ -34,7 +34,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: ahc_pci.c,v 1.12 1999/05/14 17:38:07 gibbs Exp $
+ * $Id: ahc_pci.c,v 1.13 1999/05/17 21:53:09 gibbs Exp $
*/
#include <pci.h>
@@ -1541,6 +1541,7 @@ ahc_aic7890_setup(device_t dev, char *channel, ahc_chip *chip,
*channel = 'A';
*chip = AHC_AIC7890;
*features = AHC_AIC7890_FE;
+ *flags |= AHC_NEWEEPROM_FMT;
return (0);
}
@@ -1553,6 +1554,7 @@ ahc_aic7895_setup(device_t dev, char *channel, ahc_chip *chip,
*channel = pci_get_function(dev) == 1 ? 'B' : 'A';
*chip = AHC_AIC7895;
*features = AHC_AIC7895_FE;
+ *flags |= AHC_NEWEEPROM_FMT;
devconfig = pci_read_config(dev, DEVCONFIG, /*bytes*/4);
devconfig &= ~SCBSIZE32;
pci_write_config(dev, DEVCONFIG, devconfig, /*bytes*/4);
@@ -1566,6 +1568,7 @@ ahc_aic7896_setup(device_t dev, char *channel, ahc_chip *chip,
*channel = pci_get_function(dev) == 1 ? 'B' : 'A';
*chip = AHC_AIC7896;
*features = AHC_AIC7896_FE;
+ *flags |= AHC_NEWEEPROM_FMT;
return (0);
}
diff --git a/sys/pci/ahc_pci.c b/sys/pci/ahc_pci.c
index b1e837e..44cb21f 100644
--- a/sys/pci/ahc_pci.c
+++ b/sys/pci/ahc_pci.c
@@ -34,7 +34,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: ahc_pci.c,v 1.12 1999/05/14 17:38:07 gibbs Exp $
+ * $Id: ahc_pci.c,v 1.13 1999/05/17 21:53:09 gibbs Exp $
*/
#include <pci.h>
@@ -1541,6 +1541,7 @@ ahc_aic7890_setup(device_t dev, char *channel, ahc_chip *chip,
*channel = 'A';
*chip = AHC_AIC7890;
*features = AHC_AIC7890_FE;
+ *flags |= AHC_NEWEEPROM_FMT;
return (0);
}
@@ -1553,6 +1554,7 @@ ahc_aic7895_setup(device_t dev, char *channel, ahc_chip *chip,
*channel = pci_get_function(dev) == 1 ? 'B' : 'A';
*chip = AHC_AIC7895;
*features = AHC_AIC7895_FE;
+ *flags |= AHC_NEWEEPROM_FMT;
devconfig = pci_read_config(dev, DEVCONFIG, /*bytes*/4);
devconfig &= ~SCBSIZE32;
pci_write_config(dev, DEVCONFIG, devconfig, /*bytes*/4);
@@ -1566,6 +1568,7 @@ ahc_aic7896_setup(device_t dev, char *channel, ahc_chip *chip,
*channel = pci_get_function(dev) == 1 ? 'B' : 'A';
*chip = AHC_AIC7896;
*features = AHC_AIC7896_FE;
+ *flags |= AHC_NEWEEPROM_FMT;
return (0);
}
OpenPOWER on IntegriCloud