svn commit: r364430 - in head: share/man/man4 sys/dev/an sys/dev/ata sys/dev/cmx sys/dev/fdc sys/dev/if_ndis sys/dev/puc sys/dev/uart sys/dev/wi sys/netgraph/bluetooth/drivers/bt3c

Warner Losh imp at bsdimp.com
Thu Aug 20 19:49:24 UTC 2020


https://reviews.freebsd.org/D26138 has the code review.

Warner

On Thu, Aug 20, 2020 at 1:41 PM Warner Losh <imp at bsdimp.com> wrote:

>
>
> On Thu, Aug 20, 2020 at 1:13 PM Rodney W. Grimes <
> freebsd at gndrsh.dnsmgr.net> wrote:
>
>> > Author: imp
>> > Date: Thu Aug 20 17:19:40 2020
>> > New Revision: 364430
>> > URL: https://svnweb.freebsd.org/changeset/base/364430
>> >
>> > Log:
>> >   Tag pccard drivers with gone in 13.
>> >
>> >   MFC After: 3 days
>> >   Reviewed by: emaste, brooks, adrian (on twitter)
>> >   Differential Revision: https://reviews.freebsd.org/D26095
>> >
>> > Modified:
>> >   head/share/man/man4/an.4
>>
>> This device has a PCI version, so why is it going away with PC card?
>> Typically these are plx9050 bridge cards which makes the AN device
>> appear like any other PCI device.
>>
>
> Because it is no longer relevant. The device that an supports was a
> relatively rare mini-pci version of the card that was sold for maybe a year
> in a few laptops before those designed moved on to the atheros cards. It
> couldn't do the newer crypto, nor the newer than 802.11b standard. Since
> the crypto it could to was flabwed and long since abandoned, most of these
> cards were replaced by some variation of atheros cards by FreeBSD since
> they were usually a drop-in replacement. IIRC, there was no raw interface
> for this card, so you were stuck with what the firmware did and Cisco never
> produced a newer firmware.
>
>
>> It looks as if you only tagged if_an_pccard.c, so the man page
>> change is all that is wrong.
>>
>
> I just didn't tag the if_an_pci.c version too.
>
>
>> >   head/share/man/man4/ata.4
>> >   head/share/man/man4/cmx.4
>> >   head/share/man/man4/fdc.4
>> >   head/share/man/man4/ndis.4
>> >   head/share/man/man4/ng_bt3c.4
>> >   head/share/man/man4/pccard.4
>> >   head/share/man/man4/puc.4
>> >   head/share/man/man4/uart.4
>> >   head/share/man/man4/wi.4
>>
>> These are also often plx9050 based, and your only doing
>> the if_wi_pccard.c file, so probably also a man page error.
>>
>
> Some here. I got Adrian's approval for wi specifically. These are just too
> old and don't support the relevant standards. The PCI attachments were
> relatively rare in the day for both of these devices (though the wi ones
> were a little more common than than an ones). Usually wi got connected to
> the PCI bus via a full PCMCIA/CardBus bridge since those were off-the-shelf
> components that the makers of these cards shifted too when then one-off PLX
> solution ran out of steam. The wi cards theoretically could be updated to
> the new crypto standards, but nobody has bothered to do that for the
> FreeBSD driver in the 15 or so years since they became necessary.
>
> I'll update the pci attachment code for wi too, since it's not worth
> keeping around. Adrian has volunteered to create a port and put it on
> github if anybody is actually still using this card. Though Adrian has also
> said that there's a fair amount of cleanup we could do to the 802.11 stack
> if we were to get rid of all the old 802.11b-only cards. wi and an were the
> last two as far as I can tell...
>
> I get that these were once quite popular and ubiquitous. But it's 15 years
> later and they don't follow enough of the standards to be a viable option
> for all but the most niche deployments. And those niche deployments do not
> buy us enough to be worth the bother.
>
> Warner
>
>
>> >   head/sys/dev/an/if_an_pccard.c
>> >   head/sys/dev/ata/ata-card.c
>> >   head/sys/dev/cmx/cmx_pccard.c
>> >   head/sys/dev/fdc/fdc_pccard.c
>> >   head/sys/dev/if_ndis/if_ndis_pccard.c
>> >   head/sys/dev/puc/puc_pccard.c
>> >   head/sys/dev/uart/uart_bus_pccard.c
>> >   head/sys/dev/wi/if_wi_pccard.c
>> >   head/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
>> >
>> > Modified: head/share/man/man4/an.4
>> >
>> ==============================================================================
>> > --- head/share/man/man4/an.4  Thu Aug 20 17:14:44 2020        (r364429)
>> > +++ head/share/man/man4/an.4  Thu Aug 20 17:19:40 2020        (r364430)
>> > @@ -51,6 +51,9 @@ module at boot time, place the following line in
>> >  .Bd -literal -offset indent
>> >  if_an_load="YES"
>> >  .Ed
>> > +.Sh DEPRECATION NOTICE
>> > +This driver is scheduled for removal prior to the release of
>> > +.Fx 13.0
>> >  .Sh DESCRIPTION
>> >  The
>> >  .Nm
>> >
>> > Modified: head/share/man/man4/ata.4
>> >
>> ==============================================================================
>> > --- head/share/man/man4/ata.4 Thu Aug 20 17:14:44 2020        (r364429)
>> > +++ head/share/man/man4/ata.4 Thu Aug 20 17:19:40 2020        (r364430)
>> > @@ -222,6 +222,9 @@ Unknown ATA chipsets are supported in PIO modes,
>> and i
>> >  busmaster DMA registers are present and contain valid setup, DMA is
>> >  also enabled, although the max mode is limited to UDMA33, as it is
>> >  not known what the chipset can do and how to program it.
>> > +.Sh DEPRECATION NOTICE
>> > +The PC Card attachment of this driver is scheduled for removal prior
>> to the release of
>> > +.Fx 13.0
>> >  .Sh NOTES
>> >  Please remember that in order to use UDMA4/ATA66 and above modes you
>> >  .Em must
>> >
>> > Modified: head/share/man/man4/cmx.4
>> >
>> ==============================================================================
>> > --- head/share/man/man4/cmx.4 Thu Aug 20 17:14:44 2020        (r364429)
>> > +++ head/share/man/man4/cmx.4 Thu Aug 20 17:19:40 2020        (r364430)
>> > @@ -34,6 +34,9 @@
>> >  .Nd Omnikey CardMan 4040 smartcard reader device driver
>> >  .Sh SYNOPSIS
>> >  .Cd device cmx
>> > +.Sh DEPRECATION NOTICE
>> > +This driver is scheduled for removal prior to the release of
>> > +.Fx 13.0
>> >  .Sh DESCRIPTION
>> >  The
>> >  .Nm
>> >
>> > Modified: head/share/man/man4/fdc.4
>> >
>> ==============================================================================
>> > --- head/share/man/man4/fdc.4 Thu Aug 20 17:14:44 2020        (r364429)
>> > +++ head/share/man/man4/fdc.4 Thu Aug 20 17:19:40 2020        (r364430)
>> > @@ -313,6 +313,9 @@ Third argument is a pointer to
>> >  This type is the same as being used in the per-drive configuration
>> >  flags, or in the CMOS configuration data or ACPI namespace on IA32
>> systems.
>> >  .El
>> > +.Sh DEPRECATION NOTICE
>> > +The PC Card attachment of this driver is scheduled for removal prior
>> to the release of
>> > +.Fx 13.0
>> >  .Sh FILES
>> >  .Bl -tag -width ".Pa /dev/fd*" -compact
>> >  .It Pa /dev/fd*
>> >
>> > Modified: head/share/man/man4/ndis.4
>> >
>> ==============================================================================
>> > --- head/share/man/man4/ndis.4        Thu Aug 20 17:14:44 2020
>> (r364429)
>> > +++ head/share/man/man4/ndis.4        Thu Aug 20 17:19:40 2020
>> (r364430)
>> > @@ -120,6 +120,9 @@ driver-specific registry keys to control the media
>> set
>> >  which can be configured via the
>> >  .Xr sysctl 8
>> >  command.
>> > +.Sh DEPRECATION NOTICE
>> > +The PC Card attachment of this driver is scheduled for removal prior
>> to the release of
>> > +.Fx 13.0
>> >  .Sh DIAGNOSTICS
>> >  .Bl -diag
>> >  .It "ndis%d: watchdog timeout"
>> >
>> > Modified: head/share/man/man4/ng_bt3c.4
>> >
>> ==============================================================================
>> > --- head/share/man/man4/ng_bt3c.4     Thu Aug 20 17:14:44 2020
>> (r364429)
>> > +++ head/share/man/man4/ng_bt3c.4     Thu Aug 20 17:19:40 2020
>> (r364430)
>> > @@ -34,6 +34,9 @@
>> >  .Sh SYNOPSIS
>> >  .In sys/types.h
>> >  .In netgraph/bluetooth/include/ng_bt3c.h
>> > +.Sh DEPRECATION NOTICE
>> > +This driver is scheduled for removal prior to the release of
>> > +.Fx 13.0
>> >  .Sh DESCRIPTION
>> >  The
>> >  .Nm btccc
>> >
>> > Modified: head/share/man/man4/pccard.4
>> >
>> ==============================================================================
>> > --- head/share/man/man4/pccard.4      Thu Aug 20 17:14:44 2020
>> (r364429)
>> > +++ head/share/man/man4/pccard.4      Thu Aug 20 17:19:40 2020
>> (r364430)
>> > @@ -33,7 +33,7 @@
>> >  .Cd device pccard
>> >  .Sh DEPRECATION NOTICE
>> >  This driver is scheduled for removal prior to the release of
>> > -.Fx 13.0
>> > +.Fx 13.0 .
>> >  .Sh DESCRIPTION
>> >  The
>> >  .Nm
>> >
>> > Modified: head/share/man/man4/puc.4
>> >
>> ==============================================================================
>> > --- head/share/man/man4/puc.4 Thu Aug 20 17:14:44 2020        (r364429)
>> > +++ head/share/man/man4/puc.4 Thu Aug 20 17:19:40 2020        (r364430)
>> > @@ -47,6 +47,9 @@ driver.
>> >  The list of supported devices is in
>> >  .Pa sys/dev/puc/pucdata.c .
>> >  Support for new cards should be added there.
>> > +.Sh DEPRECATION NOTICE
>> > +The PC Card attachment of this driver is scheduled for removal prior
>> to the release of
>> > +.Fx 13.0
>> >  .Sh SEE ALSO
>> >  .Xr ppc 4 ,
>> >  .Xr uart 4
>> >
>> > Modified: head/share/man/man4/uart.4
>> >
>> ==============================================================================
>> > --- head/share/man/man4/uart.4        Thu Aug 20 17:14:44 2020
>> (r364429)
>> > +++ head/share/man/man4/uart.4        Thu Aug 20 17:19:40 2020
>> (r364430)
>> > @@ -271,6 +271,9 @@ be locked for devices that support more than one
>> setti
>> >  The CLOCAL flag on callin ports should be locked off for logins
>> >  to avoid certain security holes, but this needs to be done by
>> >  getty if the callin port is used for anything else.
>> > +.Sh DEPRECATION NOTICE
>> > +The PC Card attachment of this driver is scheduled for removal prior
>> to the release of
>> > +.Fx 13.0
>> >  .Sh FILES
>> >  .Bl -tag -width "/dev/ttyu?.init" -compact
>> >  .It Pa /dev/ttyu?
>> >
>> > Modified: head/share/man/man4/wi.4
>> >
>> ==============================================================================
>> > --- head/share/man/man4/wi.4  Thu Aug 20 17:14:44 2020        (r364429)
>> > +++ head/share/man/man4/wi.4  Thu Aug 20 17:19:40 2020        (r364430)
>> > @@ -52,6 +52,9 @@ module at boot time, place the following line in
>> >  .Bd -literal -offset indent
>> >  if_wi_load="YES"
>> >  .Ed
>> > +.Sh DEPRECATION NOTICE
>> > +This driver is scheduled for removal prior to the release of
>> > +.Fx 13.0
>> >  .Sh DESCRIPTION
>> >  The
>> >  .Nm
>> >
>> > Modified: head/sys/dev/an/if_an_pccard.c
>> >
>> ==============================================================================
>> > --- head/sys/dev/an/if_an_pccard.c    Thu Aug 20 17:14:44 2020
>> (r364429)
>> > +++ head/sys/dev/an/if_an_pccard.c    Thu Aug 20 17:19:40 2020
>> (r364430)
>> > @@ -156,5 +156,7 @@ an_pccard_attach(device_t dev)
>> >  fail:
>> >       if (error)
>> >               an_release_resources(dev);
>> > +     else
>> > +             gone_in_dev(dev, 13, "pccard removed");
>> >       return (error);
>> >  }
>> >
>> > Modified: head/sys/dev/ata/ata-card.c
>> >
>> ==============================================================================
>> > --- head/sys/dev/ata/ata-card.c       Thu Aug 20 17:14:44 2020
>> (r364429)
>> > +++ head/sys/dev/ata/ata-card.c       Thu Aug 20 17:19:40 2020
>> (r364430)
>> > @@ -144,6 +144,7 @@ ata_pccard_attach(device_t dev)
>> >      err = ata_probe(dev);
>> >      if (err > 0)
>> >       return (err);
>> > +    gone_in_dev(dev, 13, "pccard removed");
>> >      return (ata_attach(dev));
>> >  }
>> >
>> >
>> > Modified: head/sys/dev/cmx/cmx_pccard.c
>> >
>> ==============================================================================
>> > --- head/sys/dev/cmx/cmx_pccard.c     Thu Aug 20 17:14:44 2020
>> (r364429)
>> > +++ head/sys/dev/cmx/cmx_pccard.c     Thu Aug 20 17:19:40 2020
>> (r364430)
>> > @@ -95,7 +95,7 @@ cmx_pccard_attach(device_t dev)
>> >               return rv;
>> >       }
>> >
>> > -     device_printf(dev, "attached\n");
>> > +     gone_in_dev(dev, 13, "pccard removed");
>> >       return 0;
>> >  }
>> >
>> >
>> > Modified: head/sys/dev/fdc/fdc_pccard.c
>> >
>> ==============================================================================
>> > --- head/sys/dev/fdc/fdc_pccard.c     Thu Aug 20 17:14:44 2020
>> (r364429)
>> > +++ head/sys/dev/fdc/fdc_pccard.c     Thu Aug 20 17:19:40 2020
>> (r364430)
>> > @@ -110,9 +110,10 @@ fdc_pccard_attach(device_t dev)
>> >               device_set_flags(child, 0x24);
>> >               error = bus_generic_attach(dev);
>> >       }
>> > -     if (error == 0)
>> > +     if (error == 0) {
>> > +             gone_in_dev(dev, 13, "pccard removed");
>> >               fdc_start_worker(dev);
>> > -     else
>> > +     } else
>> >               fdc_release_resources(fdc);
>> >       return (error);
>> >  }
>> >
>> > Modified: head/sys/dev/if_ndis/if_ndis_pccard.c
>> >
>> ==============================================================================
>> > --- head/sys/dev/if_ndis/if_ndis_pccard.c     Thu Aug 20 17:14:44 2020
>>       (r364429)
>> > +++ head/sys/dev/if_ndis/if_ndis_pccard.c     Thu Aug 20 17:19:40 2020
>>       (r364430)
>> > @@ -303,6 +303,8 @@ ndis_attach_pccard(dev)
>> >       }
>> >
>> >       error = ndis_attach(dev);
>> > +     if (error == 0)
>> > +             gone_in_dev(dev, 13, "pccard removed");
>> >
>> >  fail:
>> >       return(error);
>> >
>> > Modified: head/sys/dev/puc/puc_pccard.c
>> >
>> ==============================================================================
>> > --- head/sys/dev/puc/puc_pccard.c     Thu Aug 20 17:14:44 2020
>> (r364429)
>> > +++ head/sys/dev/puc/puc_pccard.c     Thu Aug 20 17:19:40 2020
>> (r364430)
>> > @@ -73,10 +73,21 @@ puc_pccard_probe(device_t dev)
>> >       return (ENXIO);
>> >  }
>> >
>> > +static int
>> > +puc_pccard_attach(device_t dev)
>> > +{
>> > +     int error;
>> > +
>> > +     error = puc_bfe_attach(dev);
>> > +     if (error == 0)
>> > +             gone_in_dev(dev, 13, "pccard removed");
>> > +     return (error);
>> > +}
>> > +
>> >  static device_method_t puc_pccard_methods[] = {
>> >      /* Device interface */
>> >      DEVMETHOD(device_probe,          puc_pccard_probe),
>> > -    DEVMETHOD(device_attach,         puc_bfe_attach),
>> > +    DEVMETHOD(device_attach,         puc_pccard_attach),
>> >      DEVMETHOD(device_detach,         puc_bfe_detach),
>> >
>> >      DEVMETHOD(bus_alloc_resource,    puc_bus_alloc_resource),
>> >
>> > Modified: head/sys/dev/uart/uart_bus_pccard.c
>> >
>> ==============================================================================
>> > --- head/sys/dev/uart/uart_bus_pccard.c       Thu Aug 20 17:14:44 2020
>>       (r364429)
>> > +++ head/sys/dev/uart/uart_bus_pccard.c       Thu Aug 20 17:19:40 2020
>>       (r364430)
>> > @@ -98,6 +98,7 @@ uart_pccard_attach(device_t dev)
>> >       error = uart_bus_probe(dev, 0, 0, 0, 0, 0, 0);
>> >       if (error > 0)
>> >               return (error);
>> > +     gone_in_dev(dev, 13, "pccard removed");
>> >       return (uart_bus_attach(dev));
>> >  }
>> >
>> >
>> > Modified: head/sys/dev/wi/if_wi_pccard.c
>> >
>> ==============================================================================
>> > --- head/sys/dev/wi/if_wi_pccard.c    Thu Aug 20 17:14:44 2020
>> (r364429)
>> > +++ head/sys/dev/wi/if_wi_pccard.c    Thu Aug 20 17:19:40 2020
>> (r364430)
>> > @@ -200,6 +200,7 @@ wi_pccard_attach(device_t dev)
>> >               error = wi_attach(dev);
>> >               if (error != 0)
>> >                       wi_free(dev);
>> > +             gone_in_dev(dev, 13, "pccard removed");
>> >       }
>> >       return error;
>> >  }
>> >
>> > Modified: head/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
>> >
>> ==============================================================================
>> > --- head/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c Thu Aug
>> 20 17:14:44 2020        (r364429)
>> > +++ head/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c Thu Aug
>> 20 17:19:40 2020        (r364430)
>> > @@ -677,6 +677,8 @@ bt3c_pccard_attach(device_t dev)
>> >
>> >       NG_NODE_SET_PRIVATE(sc->node, sc);
>> >
>> > +     gone_in_dev(dev, 13, "pccard removed");
>> > +
>> >       return (0);
>> >  bad:
>> >       if (sc->ith != NULL) {
>> >
>>
>> --
>> Rod Grimes
>> rgrimes at freebsd.org
>>
>


More information about the svn-src-head mailing list