[src/trunk]: src/sys/dev/pci As discussed with Jason Thorpe: while the `cache...

[kleink <kleink%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ba10a069a232
branches:  trunk
changeset: 522570:ba10a069a232
user:      kleink <kleink%NetBSD.org@localhost>
date:      Thu Feb 21 20:22:48 2002 +0000

description:
As discussed with Jason Thorpe: while the `cacheline_size\' argument is
a byte-size quantity, the CacheLine Size configuration register specifies
the system cacheline size in units of 32-bit words; per PCI Local Bus
Specification, rev. 2.1, section 6.2.4.

diffstat:

 sys/dev/pci/pciconf.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 92741296a2b6 -r ba10a069a232 sys/dev/pci/pciconf.c
--- a/sys/dev/pci/pciconf.c     Thu Feb 21 20:00:13 2002 +0000
+++ b/sys/dev/pci/pciconf.c     Thu Feb 21 20:22:48 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pciconf.c,v 1.14 2001/11/28 23:48:34 thorpej Exp $     */
+/*     $NetBSD: pciconf.c,v 1.15 2002/02/21 20:22:48 kleink Exp $      */
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciconf.c,v 1.14 2001/11/28 23:48:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciconf.c,v 1.15 2002/02/21 20:22:48 kleink Exp $");
 
 #include "opt_pci.h"
 
@@ -983,7 +983,7 @@
                misc &= ~((PCI_LATTIMER_MASK << PCI_LATTIMER_SHIFT) |
                    (PCI_CACHELINE_MASK << PCI_CACHELINE_SHIFT));
                misc |= (ltim & PCI_LATTIMER_MASK) << PCI_LATTIMER_SHIFT;
-               misc |= (pb->cacheline_size & PCI_CACHELINE_MASK) <<
+               misc |= ((pb->cacheline_size >> 2) & PCI_CACHELINE_MASK) <<
                    PCI_CACHELINE_SHIFT;
                pci_conf_write(pd->pc, pd->tag, PCI_BHLC_REG, misc);