Re: PR/39468 CVS commit: src/sys/dev

["Greg A. Woods" <woods%planix.com@localhost>]

The following reply was made to PR kern/39468; it has been noted by GNATS.

From: "Greg A. Woods" <woods%planix.com@localhost>
To: NetBSD GNATS <gnats-bugs%NetBSD.org@localhost>
Cc: tron%NetBSD.org@localhost,
        xtraeme%gmail.com@localhost
Subject: Re: PR/39468 CVS commit: src/sys/dev
Date: Wed, 10 Sep 2008 14:28:53 -0400

 --pgp-sign-Multipart_Wed_Sep_10_14:28:53_2008-1
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: quoted-printable
 
 At Tue,  9 Sep 2008 12:50:04 +0000 (UTC), Matthias Scheler wrote:
 Subject: PR/39468 CVS commit: src/sys/dev
 >=20
 >  Module Name:        src
 >  Committed By:       tron
 >  Date:               Tue Sep  9 12:45:40 UTC 2008
 > =20
 >  Modified Files:
 >      src/sys/dev: ld.c ldvar.h
 >      src/sys/dev/ata: ld_ataraid.c
 >      src/sys/dev/i2o: ld_iop.c
 >      src/sys/dev/ic: ld_aac.c ld_cac.c ld_icp.c ld_mlx.c mlx.c
 >      src/sys/dev/pci: ld_amr.c ld_twa.c ld_twe.c
 > =20
 >  Log Message:
 >  Complete device_t/softc split for the ld(4) attachments. This should
 >  prevent crashes while attaching a drive.
 > =20
 >  Patch supplied by Juan RP in PR kern/39468.
 > =20
 
 Also this conflict shows up now too:
 
 Index: sys/dev/ic/ld_mlx.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: /cvs/master/m-NetBSD/main/src/sys/dev/ic/ld_mlx.c,v
 retrieving revision 1.18
 diff -u -r1.18 ld_mlx.c
 --- sys/dev/ic/ld_mlx.c        9 Sep 2008 12:45:40 -0000       1.18
 +++ sys/dev/ic/ld_mlx.c        10 Sep 2008 18:21:50 -0000
 @@ -232,12 +232,21 @@
                bp->b_resid =3D bp->b_bcount;
 =20
                if (mc->mc_status =3D=3D MLX_STATUS_RDWROFFLINE)
 +<<<<<<< ld_mlx.c
 +                      aprint_error_dev(&sc->sc_ld.sc_dv, "drive offline\n");
 +=3D=3D=3D=3D=3D=3D=3D
                        printf("%s: drive offline\n",
                            device_xname(sc->sc_ld.sc_dv));
 +>>>>>>> 1.18
                else
 +<<<<<<< ld_mlx.c
 +                      aprint_error_dev(&sc->sc_ld.sc_dv, "I/O error - %s\n",
 +                                       mlx_ccb_diagnose(mc));
 +=3D=3D=3D=3D=3D=3D=3D
                        printf("%s: I/O error - %s\n",
                            device_xname(sc->sc_ld.sc_dv),
                            mlx_ccb_diagnose(mc));
 +>>>>>>> 1.18
        } else
                bp->b_resid =3D 0;
 
 Index: sys/dev/pci/ld_amr.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: /cvs/master/m-NetBSD/main/src/sys/dev/pci/ld_amr.c,v
 retrieving revision 1.17
 diff -u -r1.17 ld_amr.c
 --- sys/dev/pci/ld_amr.c       9 Sep 2008 12:45:40 -0000       1.17
 +++ sys/dev/pci/ld_amr.c       10 Sep 2008 18:26:08 -0000
 @@ -189,8 +189,13 @@
        amr =3D device_private(device_parent(sc->sc_ld.sc_dv));
 =20
        if (ac->ac_status !=3D AMR_STATUS_SUCCESS) {
 +<<<<<<< ld_amr.c
 +              aprint_error_dev(&sc->sc_ld.sc_dv, "cmd status 0x%02x\n",
 +                               ac->ac_status);
 +=3D=3D=3D=3D=3D=3D=3D
                printf("%s: cmd status 0x%02x\n", device_xname(sc->sc_ld.sc_dv),
                    ac->ac_status);
 +>>>>>>> 1.17
 =20
                bp->b_error =3D EIO;
                bp->b_resid =3D bp->b_bcount;
 =20
 
 And I have the following change in the previously mentioned file which I
 find very helpful:
 
 Index: sys/dev/ata/ld_ataraid.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: /cvs/master/m-NetBSD/main/src/sys/dev/ata/ld_ataraid.c,v
 retrieving revision 1.29
 diff -u -r1.29 ld_ataraid.c
 --- sys/dev/ata/ld_ataraid.c   9 Sep 2008 12:45:39 -0000       1.29
 +++ sys/dev/ata/ld_ataraid.c   10 Sep 2008 18:20:15 -0000
 @@ -180,6 +180,9 @@
        aprint_naive(": ATA %s array\n", level);
        aprint_normal(": %s ATA %s array\n",
            ata_raid_type_name(aai->aai_type), level);
 +#ifdef DIAGNOSTIC
 +      aprint_normal_dev(&ld->sc_dv, "ld_ataraid_attach(): ld unit %d 
(ld->sc_dv=
  =3D %p)\n", ld->sc_dv.dv_unit, &ld->sc_dv);
 +#endif
 =20
        if (ld->sc_start =3D=3D NULL) {
                aprint_error_dev(ld->sc_dv, "unsupported array type\n");
 
 
 --=20
                                                Greg A. Woods
                                                Planix, Inc.
 
 <woods%planix.com@localhost>     +1 416 489-5852 x122     
http://www.planix.com/
 
 --pgp-sign-Multipart_Wed_Sep_10_14:28:53_2008-1
 Content-Type: application/pgp-signature
 Content-Transfer-Encoding: 7bit
 
 -----BEGIN PGP SIGNATURE-----
 Version: PGPfreeware 5.0i for non-commercial use
 MessageID: HygYynrwnZfx1n9U7Qa8tddz1fuOIqU7
 
 iQA/AwUBSMgR5WZ9cbd4v/R/EQJpIQCfQMw3JJMYlc0rFlaD0473HStC1gwAnA/w
 HiR5F/FwZZh9IohDSW6B2i4u
 =Bf1n
 -----END PGP SIGNATURE-----
 
 --pgp-sign-Multipart_Wed_Sep_10_14:28:53_2008-1--