From owner-freebsd-alpha Sun Sep 10 14:26:49 2000 Delivered-To: freebsd-alpha@freebsd.org Received: from feral.com (feral.com [192.67.166.1]) by hub.freebsd.org (Postfix) with ESMTP id 4181937B423 for ; Sun, 10 Sep 2000 14:26:46 -0700 (PDT) Received: from zeppo.feral.com (IDENT:mjacob@zeppo [192.67.166.71]) by feral.com (8.9.3/8.9.3) with ESMTP id OAA07851; Sun, 10 Sep 2000 14:26:28 -0700 Date: Sun, 10 Sep 2000 14:22:40 -0700 (PDT) From: Matthew Jacob Reply-To: mjacob@feral.com To: Peter Wemm Cc: Bernd Walter , Christian Weisgerber , freebsd-alpha@FreeBSD.ORG Subject: Re: cvs commit: src/sys/pci pcisupport.c (fwd) In-Reply-To: <200009100808.e8A88FG76895@netplex.com.au> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-freebsd-alpha@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org Well, no, I forced non-bwx mode.... just got back from being away...I'll resume where I was with this info... > Bernd Walter wrote: > > On Sat, Sep 09, 2000 at 11:16:51PM -0700, Peter Wemm wrote: > > > AHA! I suspected the bwx/swiz mixup was implicated in this, and this > > > suggests it does have something to do with it. > > > > > > Can you try something like this?: > > > > cc -c -O -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wmiss > ing-prototypes -Wpointer-arith -Winline -Wcast-qual -fformat-extensions -a > nsi -g -nostdinc -I- -I. -I../.. -I../../../include -D_KERNEL -include opt > _global.h -elf -mno-fp-regs -ffixed-8 -Wa,-mev56 ../../alpha/pci/cia.c > > ../../alpha/pci/cia.c: In function `cia_attach': > > ../../alpha/pci/cia.c:493: invalid operands to binary == > > *** Error code 1 > > oops. :-) > > Change it to: if (cia_ispyxis || chipset_bwx) { > > > That's this line: > > > + if (cia_ispyxis || chipset_bwx || chipset == cia_bwx_chipset) { > > ie: if the init code already set chipset_bwx, don't turn it off. > To be most correct, it should probably be: > > Index: cia.c > =================================================================== > RCS file: /home/ncvs/src/sys/alpha/pci/cia.c,v > retrieving revision 1.27 > diff -c -r1.27 cia.c > *** cia.c 2000/09/02 01:05:37 1.27 > --- cia.c 2000/09/10 08:07:02 > *************** > *** 485,499 **** > if (!platform.iointr) /* XXX */ > set_iointr(alpha_dispatch_intr); > > ! if (cia_ispyxis) { > snprintf(chipset_type, sizeof(chipset_type), "pyxis"); > ! chipset_bwx = 1; > chipset_ports = CIA_EV56_BWIO; > chipset_memory = CIA_EV56_BWMEM; > chipset_dense = CIA_PCI_DENSE; > } else { > - snprintf(chipset_type, sizeof(chipset_type), "cia"); > - chipset_bwx = 0; > chipset_ports = CIA_PCI_SIO1; > chipset_memory = CIA_PCI_SMEM1; > chipset_dense = CIA_PCI_DENSE; > --- 485,500 ---- > if (!platform.iointr) /* XXX */ > set_iointr(alpha_dispatch_intr); > > ! if (cia_ispyxis) > snprintf(chipset_type, sizeof(chipset_type), "pyxis"); > ! else > ! snprintf(chipset_type, sizeof(chipset_type), "cia"); > ! > ! if (chipset_bwx) { > chipset_ports = CIA_EV56_BWIO; > chipset_memory = CIA_EV56_BWMEM; > chipset_dense = CIA_PCI_DENSE; > } else { > chipset_ports = CIA_PCI_SIO1; > chipset_memory = CIA_PCI_SMEM1; > chipset_dense = CIA_PCI_DENSE; > > Matt Jacob didn't think this was the problem, but the discovery that > forcing BWX mode suggests otherwise. > > Cheers, > -Peter > -- > Peter Wemm - peter@FreeBSD.org; peter@yahoo-inc.com; peter@netplex.com.au > "All of this is for nothing if we don't go to the stars" - JMS/B5 > > > > To Unsubscribe: send mail to majordomo@FreeBSD.org > with "unsubscribe freebsd-alpha" in the body of the message > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-alpha" in the body of the message