From owner-cvs-all Tue Jan 11 16: 5:26 2000 Delivered-To: cvs-all@freebsd.org Received: from front2.grolier.fr (front2.grolier.fr [194.158.96.52]) by hub.freebsd.org (Postfix) with ESMTP id F086714C0C; Tue, 11 Jan 2000 16:05:13 -0800 (PST) (envelope-from groudier@club-internet.fr) Received: from localhost (ppp-168-155.villette.club-internet.fr [195.36.168.155]) by front2.grolier.fr (8.9.3/No_Relay+No_Spam_MGC990224) with SMTP id BAA15551; Wed, 12 Jan 2000 01:04:28 +0100 (MET) Date: Wed, 12 Jan 2000 01:32:13 +0100 (MET) From: Gerard Roudier X-Sender: groudier@localhost To: Matthew Jacob Cc: "Rodney W. Grimes" , Peter Wemm , obrien@NUXI.com, "Chris D. Faulhaber" , cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/i386/conf GENERIC LINT In-Reply-To: Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=ISO-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk On Tue, 11 Jan 2000, Matthew Jacob wrote: =20 > FWIW, I totally agree with you about the two drivers and the reasons for > it. >=20 >=20 > My only concern originally had been dropping support for folks with the > older h/w. We've addressed that by retaining support for the NCR driver. > That older h/w will flush out over time, but it's like the Adaptec 154X > now- EOL'd. >=20 > Everyone- can we move on now? Yes. But I need approval for the changes to apply to RELENG_3. 4.0 can go with `sym' taking precedence in GENERIC, in my opinion, but I will accept any different decision, obviously. Changing the default 53C8XXX driver for 3.X in GENERIC may make unacceptable differences on some systems due to the `sym' applying the user settings from NVRAM. The below untested patch (I will test it if it is accepted and add additionnal comments to involved files) adds the 53C895A and 53C1510D Ultra-2 chips to the ncr device table and let the sym only attach chips the ncr is unable to handle (C1010 Ultra-3 chip only for now).=20 =20 If it is the way we actually want to go for 3.X, I will complete it and commit it. Index: GENERIC =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/src/sys/i386/conf/GENERIC,v retrieving revision 1.143.2.25 diff -u -r1.143.2.25 GENERIC --- GENERIC=092000/01/08 18:39:49=091.143.2.25 +++ GENERIC=092000/01/12 00:43:06 @@ -88,8 +88,10 @@ # SCSI Controllers # A single entry for any of these controllers (ncr, ahb, ahc) is # sufficient for any number of installed devices. -controller=09ncr0=09=09# NCR/Symbios Logic -#controller=09sym0=09=09# NCR/Symbios Logic (do not mix with ncr, it confl= icts) +options=09=09SYM_SETUP_LP_PROBE=3D7=09# Let sym only attach Ultra-3 capabl= e=20 +=09=09=09=09=09# chips when ncr is configured. +controller=09sym0=09=09# NCR/Symbios Logic (Newer Chips) +controller=09ncr0=09=09# NCR/Symbios Logic (Generic, no Ultra-3) controller=09ahb0=09=09# EISA AHA1742 family controller=09ahc0=09=09# AHA2940 and onboard AIC7xxx devices controller=09amd0=09=09# AMD 53C974 (Teckram DC-390(T)) Index: ncr.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 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=091999/08/29 16:31:53=091.141.2.4 +++ ncr.c=092000/01/12 00:09:08 @@ -1394,6 +1394,8 @@ #define=09NCR_885_ID=09(0x000d1000ul) #define=09NCR_895_ID=09(0x000c1000ul) #define=09NCR_896_ID=09(0x000b1000ul) +#define=09NCR_895A_ID=09(0x00121000ul) +#define=09NCR_1510D_ID=09(0x000a1000ul) =20 =20 static u_long ncr_count; @@ -3305,6 +3307,12 @@ FE_WIDE|FE_ULTRA2|FE_QUAD|FE_CACHE_SET|FE_DFS|FE_LDSTR|FE_PFEN|FE_RAM} , {NCR_896_ID, 0x00,=09"ncr 53c896 fast40 wide scsi",=09=097, 31, 7, + FE_WIDE|FE_ULTRA2|FE_QUAD|FE_CACHE_SET|FE_DFS|FE_LDSTR|FE_PFEN|FE_RAM} + , + {NCR_895A_ID, 0x00,=09"ncr 53c895a fast40 wide scsi",=09=097, 31, 7, + FE_WIDE|FE_ULTRA2|FE_QUAD|FE_CACHE_SET|FE_DFS|FE_LDSTR|FE_PFEN|FE_RAM} + , + {NCR_1510D_ID, 0x00,=09"ncr 53c1510d fast40 wide scsi",=097, 31, 7, FE_WIDE|FE_ULTRA2|FE_QUAD|FE_CACHE_SET|FE_DFS|FE_LDSTR|FE_PFEN|FE_RAM} }; =20 Index: sym_hipd.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/src/sys/dev/sym/sym_hipd.c,v retrieving revision 1.2.2.1 diff -u -r1.2.2.1 sym_hipd.c --- sym_hipd.c=091999/12/30 06:20:08=091.2.2.1 +++ sym_hipd.c=092000/01/11 23:45:33 @@ -128,6 +128,9 @@ #include #include =20 +/* We want to know if the ncr has been configured */ +#include "ncr..h" + /* * On x86 architecture, write buffers management does not=20 * reorder writes to memory. So, preventing compiler from =20 @@ -9649,7 +9652,12 @@ =09struct=09sym_pci_chip *chip; =20 =09chip =3D sym_find_pci_chip(pci_tag); +#if NNCR > 0 +=09/* Only claim chips we are allowed to take precedence over the ncr */ +=09if (chip && !(chip->lp_probe_bit & SYM_SETUP_LP_PROBE_MAP)) +#else =09if (chip) +#endif =09=09return chip->name; =09return 0; } G=E9rard. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message