Thu Dec 3 22:18:05 2009 UTC ()

Apply errata workarounds.

From OpenBSD.


(skrll)

diff -r1.17 -r1.18 src/sys/arch/hp700/dev/dino.c

--- src/sys/arch/hp700/dev/Attic/dino.c 2009/12/01 22:36:31	1.17
+++ src/sys/arch/hp700/dev/Attic/dino.c 2009/12/03 22:18:04	1.18

 @@ -1,14 +1,14 @@
-/*	$NetBSD: dino.c,v 1.17 2009/12/01 22:36:31 skrll Exp $ */
+/*	$NetBSD: dino.c,v 1.18 2009/12/03 22:18:04 skrll Exp $ */
 /*	$OpenBSD: dino.c,v 1.5 2004/02/13 20:39:31 mickey Exp $	*/
 /*
  * Copyright (c) 2003 Michael Shalayeff
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -19,27 +19,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR OR HIS RELATIVES BE LIABLE FOR ANY DIRECT,
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF MIND, USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.17 2009/12/01 22:36:31 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.18 2009/12/03 22:18:04 skrll Exp $");
 /* #include "cardbus.h" */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/reboot.h>
 #include <sys/malloc.h>
 #include <sys/extent.h>
 #include <machine/iomod.h>
 #include <machine/autoconf.h>
 #include <machine/intr.h>
 @@ -321,48 +321,62 @@ void
 dino_decompose_tag(void *v, pcitag_t tag, int *bus, int *dev, int *func)
+{
 	*bus = (tag >> 16) & 0xff;
 	*dev = (tag >> 11) & 0x1f;
 	*func= (tag >>  8) & 0x07;
+}
 pcireg_t
 dino_conf_read(void *v, pcitag_t tag, int reg)
+{
 	struct dino_softc *sc = v;
 	volatile struct dino_regs *r = sc->sc_regs;
 	pcireg_t data;
 	uint32_t pamr;
 	/* fix arbitration errata by disabling all pci devs on config read */
 	pamr = r->pamr;
 	r->pamr = 0;
 	r->pci_addr = tag | reg;
 	data = r->pci_conf_data;
 	/* restore arbitration */
 	r->pamr = pamr;
 	return le32toh(data);
+}
 void
 dino_conf_write(void *v, pcitag_t tag, int reg, pcireg_t data)
+{
 	struct dino_softc *sc = v;
 	volatile struct dino_regs *r = sc->sc_regs;
 	pcireg_t data1;
 	uint32_t pamr;
-	/* fix coalescing config writes errata by interleaving w/ a read */
+	/* fix arbitration errata by disabling all pci devs on config read */
-	r->pci_addr = tag | PCI_ID_REG;
+	pamr = r->pamr;
-	data1 = r->pci_conf_data;
+	r->pamr = 0;
 	r->pci_addr = tag | reg;
 	r->pci_conf_data = htole32(data);
 	/* fix coalescing config and io writes by interleaving w/ a read */
 	r->pci_addr = tag | PCI_ID_REG;
 	data1 = r->pci_conf_data;
 	/* restore arbitration */
 	r->pamr = pamr;
+}
 int
 dino_intr_map(struct pci_attach_args *pa, pci_intr_handle_t *ihp)
+{
 	pci_chipset_tag_t pc = pa->pa_pc;
 	pcitag_t tag = pa->pa_tag;
 	pcireg_t reg;
 	reg = pci_conf_read(pc, tag, PCI_INTERRUPT_REG);
 	*ihp = PCI_INTERRUPT_LINE(reg);
 	return *ihp < 0;
+}