Date: Sun, 09 Jan 2000 23:16:02 +0800 From: Peter Wemm <peter@netplex.com.au> To: Gerard Roudier <groudier@club-internet.fr> Cc: "Rodney W. Grimes" <freebsd@gndrsh.dnsmgr.net>, obrien@NUXI.com, "Chris D. Faulhaber" <jedgar@fxp.org>, cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/i386/conf GENERIC LINT Message-ID: <20000109151602.C6BAE1CC6@overcee.netplex.com.au> In-Reply-To: Message from Peter Wemm <peter@netplex.com.au> of "Sun, 09 Jan 2000 22:44:03 %2B0800." <20000109144403.E6D8E1CCE@overcee.netplex.com.au>
next in thread | previous in thread | raw e-mail | index | archive | help
I wrote:
> Gerard Roudier wrote:
> > On Sun, 9 Jan 2000, Rodney W. Grimes wrote:
> >
> > > > On Sat, Jan 08, 2000 at 08:14:55PM -0500, Chris D. Faulhaber wrote:
> > > > > > Add the `sym' SCSI driver. Commented out in GENERIC as I have no
w
> ay of
> > > > > > testing if `ncr' and `sym' can co-exist in a 3.x machine. Uncomm
en
> ted of
> > > > > > course in LINT.
> > > > >
> > > > > FWIW, with both
> > > > > controller ncr0
> > > > > controller sym0
> > > > > in the kernel config, the machine boots successfully, attaching:
> > > >
> > > > Are you able to test this kernel in a machine with a SCSI card that onl
y
> > > > `ncr' supports?
> > >
> > > I just built a -stable kernel with both ncr0 and sym0 in it (the comment
> > > is wrong, they do not conflict with each other) and booted the
> > > same kernel twice , once with a 53C825 and once with a 53C875, everything
> > > worked just fine.
> > >
> > > Please uncomment the sym0 driver in GENERIC and remove the bogus
> > > coment about it conflicting with ncr0
> >
> > Depends on what 'conflict' means in that context. On 3.X system, the PCI
> > device drivers are seen from the `pcidevice_set' kernel data section and
> > the code that attaches PCI device drivers is (seems?) careful about not
> > allowing the same PCI device to be attached by 2 different drivers.
> Anyway, lets get the hack for allowing sym to be the default regardless of th
e
> probe order into 3.x. (ie: the ncr.c modification).
Just for reference, this is the patch I am talking about and think we should
use:
Index: ncr.c
===================================================================
RCS file: /home/ncvs/src/sys/pci/ncr.c,v
retrieving revision 1.141.2.4
diff -u -r1.141.2.4 ncr.c
--- ncr.c 1999/08/29 16:31:53 1.141.2.4
+++ ncr.c 2000/01/09 15:10:39
@@ -39,6 +39,8 @@
***************************************************************************
*/
+#include "sym.h" /* for NSYM */
+
#define NCR_DATE "pl30 98/1/1"
#define NCR_VERSION (2)
@@ -3314,6 +3316,14 @@
found = -1;
for (i = 0; i < sizeof(ncr_chip_table)/sizeof(ncr_chip_table[0]); i++) {
+#if NSYM > 0
+ /*
+ * Ignore chips that support LOAD/STORE, so the sym_hipd
+ * driver will attach them without any conflict.
+ */
+ if (ncr_chip_table[i].features & FE_LDSTR)
+ continue;
+#endif
if (device_id == ncr_chip_table[i].device_id &&
ncr_chip_table[i].minrevid <= revision_id) {
if (found < 0 ||
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 cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000109151602.C6BAE1CC6>