The NetBSD Project

CVS log for src/sys/dev/cardbus/if_re_cardbus.c

[BACK] Up to [cvs.netbsd.org] / src / sys / dev / cardbus

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.27 / (download) - annotate - [select for diffs], Mon Aug 1 11:20:27 2011 UTC (9 months, 3 weeks ago) by drochner
Branch: MAIN
CVS Tags: yamt-pagecache-base5, yamt-pagecache-base4, yamt-pagecache-base3, yamt-pagecache-base2, yamt-pagecache-base, yamt-pagecache, netbsd-6-base, netbsd-6, jmcneill-usbmp-pre-base2, jmcneill-usbmp-base9, jmcneill-usbmp-base8, jmcneill-usbmp-base7, jmcneill-usbmp-base6, jmcneill-usbmp-base5, jmcneill-usbmp-base4, jmcneill-usbmp-base3, jmcneill-usbmp-base2, jmcneill-usbmp-base, jmcneill-usbmp, jmcneill-audiomp3-base, jmcneill-audiomp3, HEAD
Changes since 1.26: +3 -6 lines
Diff to previous 1.26 (colored)

remove some bloat:
-cardbus doesn't use multiple interrupt lines like PCI, and it doesn't
 use machanisms like interrupt line register and swizzling -- no need
 to carry around dummy information, this is all dealt with by the
 bridge
 (I'm asking myself how "rbus_ppb" can work -- a bridge attached to
 cardbus just can't work like a normal PCI bridge as far as interrupts
 are concerned. I thing that should be a hardware specific driver
 because behavior is not covered by a standard.)
-cardbus always uses 3.3V -- no need for a variable to keep track
 of the voltage

Revision 1.24.2.2 / (download) - annotate - [select for diffs], Sat Mar 5 20:53:06 2011 UTC (14 months, 3 weeks ago) by rmind
Branch: rmind-uvmplock
Changes since 1.24.2.1: +5 -6 lines
Diff to previous 1.24.2.1 (colored) to branchpoint 1.24 (colored) next main 1.25 (colored)

sync with head

Revision 1.20.2.2 / (download) - annotate - [select for diffs], Tue Aug 17 06:46:04 2010 UTC (21 months, 1 week ago) by uebayasi
Branch: uebayasi-xip
Changes since 1.20.2.1: +3 -4 lines
Diff to previous 1.20.2.1 (colored) to branchpoint 1.20 (colored) next main 1.21 (colored)

Sync with HEAD.

Revision 1.17.2.4 / (download) - annotate - [select for diffs], Wed Aug 11 22:53:19 2010 UTC (21 months, 2 weeks ago) by yamt
Branch: yamt-nfs-mp
Changes since 1.17.2.3: +8 -21 lines
Diff to previous 1.17.2.3 (colored) to branchpoint 1.17 (colored) next main 1.18 (colored)

sync with head.

Revision 1.26 / (download) - annotate - [select for diffs], Tue Jul 27 21:02:00 2010 UTC (21 months, 4 weeks ago) by jakllsch
Branch: MAIN
CVS Tags: yamt-nfs-mp-base11, yamt-nfs-mp-base10, uebayasi-xip-base4, uebayasi-xip-base3, uebayasi-xip-base2, rmind-uvmplock-nbase, rmind-uvmplock-base, matt-mips64-premerge-20101231, jruoho-x86intr-base, jruoho-x86intr, cherry-xenmp-base, cherry-xenmp, bouyer-quota2-nbase, bouyer-quota2-base, bouyer-quota2
Changes since 1.25: +5 -6 lines
Diff to previous 1.25 (colored)

Make the Realtek PCI network interfaces detachable.
Use __arraycount to avoid null table entries.
Miscellaneous other touch-ups in bus front-ends.

Revision 1.24.2.1 / (download) - annotate - [select for diffs], Sun May 30 05:17:19 2010 UTC (23 months, 3 weeks ago) by rmind
Branch: rmind-uvmplock
Changes since 1.24: +5 -17 lines
Diff to previous 1.24 (colored)

sync with head

Revision 1.20.2.1 / (download) - annotate - [select for diffs], Fri Apr 30 14:43:10 2010 UTC (2 years ago) by uebayasi
Branch: uebayasi-xip
Changes since 1.20: +35 -57 lines
Diff to previous 1.20 (colored)

Sync with HEAD.

Revision 1.25 / (download) - annotate - [select for diffs], Thu Mar 18 20:51:42 2010 UTC (2 years, 2 months ago) by dyoung
Branch: MAIN
CVS Tags: uebayasi-xip-base1
Changes since 1.24: +5 -17 lines
Diff to previous 1.24 (colored)

This is *always* compiled with #define rbus 1, so get rid of the
conditional compilation.

Simplify interrupt (dis)establishment by two source transformations:

-       cardbus_intr_disestablish(cc, cf, ih);
+       Cardbus_intr_disestablish(ct, ih);

-       ih = cardbus_intr_establish(cc, cf, ...);
+       ih = Cardbus_intr_establish(ct, ...);

The identical change to a few other CardBus NICs has not caused any
problems, as expected, so I'm going to commit this rather safe change
and get on with the work.

Testers have been enlisted.  I will revisit this change if I get any
negative responses.

Revision 1.17.2.3 / (download) - annotate - [select for diffs], Thu Mar 11 15:03:25 2010 UTC (2 years, 2 months ago) by yamt
Branch: yamt-nfs-mp
Changes since 1.17.2.2: +32 -42 lines
Diff to previous 1.17.2.2 (colored) to branchpoint 1.17 (colored)

sync with head

Revision 1.24 / (download) - annotate - [select for diffs], Fri Feb 26 00:57:02 2010 UTC (2 years, 2 months ago) by dyoung
Branch: MAIN
CVS Tags: yamt-nfs-mp-base9
Branch point for: rmind-uvmplock
Changes since 1.23: +30 -33 lines
Diff to previous 1.23 (colored)

Use PCI_ constants and macros instead of CARDBUS_.  Use
Cardbus_conf_{read,write}() instead of cardbus_conf_{read,write}().
Delete all of the CARDBUS_ constants and macros that replicate PCI_.

Compile-tested, only.

Revision 1.23 / (download) - annotate - [select for diffs], Fri Feb 26 00:01:27 2010 UTC (2 years, 2 months ago) by dyoung
Branch: MAIN
Changes since 1.22: +3 -3 lines
Diff to previous 1.22 (colored)

sc_csr is read & written from the PCI Command & Status Register,
so make its type pcireg_t.

Revision 1.22 / (download) - annotate - [select for diffs], Thu Feb 25 23:40:39 2010 UTC (2 years, 2 months ago) by dyoung
Branch: MAIN
Changes since 1.21: +2 -9 lines
Diff to previous 1.21 (colored)

Make fxp at cardbus detach during shutdown.

Stop calling (*cardbus_ctrl) to enable bus mastering, I/O and memory
spaces on the CardBus bridge.  cbb(4) always enables that stuff,
anyway.  In the process, avoid remembering what BAR we mapped by
writing CARDBUS_{IO,MEM}_ENABLE to sc_cben or sc_cbenable, and
record the BAR in use sc_bar, instead.

Replace more CARDBUS_ constants with PCI_ constants.

Compile-tested, only.

Revision 1.21 / (download) - annotate - [select for diffs], Wed Feb 24 19:52:51 2010 UTC (2 years, 3 months ago) by dyoung
Branch: MAIN
Changes since 1.20: +3 -3 lines
Diff to previous 1.20 (colored)

Start to tuck Cardbus under the PCI abstraction.  Step #1, textual
substitution: for all practical purposes, pcitag_t and cardbustag_t
are interchangeable, so just use pcitag_t.  Ditto pcireg_t and
cardbusreg_t.

While I'm here, don't make a copy (sc_intrline) of
cardbus_attach_args.ca_intrline unless we use it, later.

Revision 1.17.2.2 / (download) - annotate - [select for diffs], Wed Sep 16 13:37:46 2009 UTC (2 years, 8 months ago) by yamt
Branch: yamt-nfs-mp
Changes since 1.17.2.1: +2 -33 lines
Diff to previous 1.17.2.1 (colored) to branchpoint 1.17 (colored)

sync with head

Revision 1.20 / (download) - annotate - [select for diffs], Wed Sep 2 15:11:13 2009 UTC (2 years, 8 months ago) by tsutsui
Branch: MAIN
CVS Tags: yamt-nfs-mp-base8, uebayasi-xip-base, matt-premerge-20091211, jym-xensuspend-nbase
Branch point for: uebayasi-xip
Changes since 1.19: +2 -9 lines
Diff to previous 1.19 (colored)

Move pmf(9) calls to MI re_attach() and re_detach() from each backend.

Revision 1.19 / (download) - annotate - [select for diffs], Sat Aug 29 14:18:34 2009 UTC (2 years, 8 months ago) by tsutsui
Branch: MAIN
Changes since 1.18: +2 -26 lines
Diff to previous 1.18 (colored)

Remove unnecessary #includes.

Revision 1.17.2.1 / (download) - annotate - [select for diffs], Mon May 4 08:12:36 2009 UTC (3 years ago) by yamt
Branch: yamt-nfs-mp
Changes since 1.17: +4 -6 lines
Diff to previous 1.17 (colored)

sync with head.

Revision 1.17.4.1 / (download) - annotate - [select for diffs], Thu Sep 18 04:35:02 2008 UTC (3 years, 8 months ago) by wrstuden
Branch: wrstuden-revivesa
Changes since 1.17: +4 -6 lines
Diff to previous 1.17 (colored) next main 1.18 (colored)

Sync with wrstuden-revivesa-base-2.

Revision 1.15.10.2 / (download) - annotate - [select for diffs], Sun Jun 29 09:33:05 2008 UTC (3 years, 10 months ago) by mjf
Branch: mjf-devfs2
Changes since 1.15.10.1: +2 -4 lines
Diff to previous 1.15.10.1 (colored) to branchpoint 1.15 (colored) next main 1.16 (colored)

Sync with HEAD.

Revision 1.17.6.1 / (download) - annotate - [select for diffs], Fri Jun 27 15:11:21 2008 UTC (3 years, 10 months ago) by simonb
Branch: simonb-wapbl
Changes since 1.17: +4 -6 lines
Diff to previous 1.17 (colored) next main 1.18 (colored)

Sync with head.

Revision 1.18 / (download) - annotate - [select for diffs], Tue Jun 24 19:44:52 2008 UTC (3 years, 11 months ago) by drochner
Branch: MAIN
CVS Tags: yamt-nfs-mp-base7, yamt-nfs-mp-base6, yamt-nfs-mp-base5, yamt-nfs-mp-base4, yamt-nfs-mp-base3, wrstuden-revivesa-base-4, wrstuden-revivesa-base-3, wrstuden-revivesa-base-2, simonb-wapbl-nbase, simonb-wapbl-base, nick-hppapmap-base4, nick-hppapmap-base3, nick-hppapmap-base2, nick-hppapmap-base, nick-hppapmap, netbsd-5-base, netbsd-5-1-RELEASE, netbsd-5-1-RC4, netbsd-5-1-RC3, netbsd-5-1-RC2, netbsd-5-1-RC1, netbsd-5-1-2-RELEASE, netbsd-5-1-1-RELEASE, netbsd-5-1, netbsd-5-0-RELEASE, netbsd-5-0-RC4, netbsd-5-0-RC3, netbsd-5-0-RC2, netbsd-5-0-RC1, netbsd-5-0-2-RELEASE, netbsd-5-0-1-RELEASE, netbsd-5-0, netbsd-5, mjf-devfs2-base, matt-nb5-pq3-base, matt-nb5-pq3, matt-nb5-mips64-u2-k2-k4-k7-k8-k9, matt-nb5-mips64-u1-k1-k5, matt-nb5-mips64-premerge-20101231, matt-nb5-mips64-premerge-20091211, matt-nb5-mips64-k15, matt-nb5-mips64, matt-nb4-mips64-k7-u2a-k9b, matt-mips64-base2, jymxensuspend-base, jym-xensuspend-base, jym-xensuspend, haad-nbase2, haad-dm-base2, haad-dm-base1, haad-dm-base, haad-dm, ad-audiomp2-base, ad-audiomp2
Changes since 1.17: +4 -6 lines
Diff to previous 1.17 (colored)

clean up the cardbus interrupt stuff:
There were cardbus_intr_line_t and cardbus_intr_handle_t used intermixed
for the same variable, and that variable is pretty much useless because
cardbus doesn't follow the PCI interrupt swizzling etc scheme.
Useless interrupt numbers were printed on cardbus device attach.
So as a first step to sanity, kill cardbus_intr_handle_t and poison
cardbus_intr_line_t to discourage printing it as a %d.
Use cardbus_intr_line_t consistently throughout the code.
Remove the "interrupting at foo" messages because the information
is misleading. We could come up with a better interrupt vector
information, but because cardbus interrupts are mediated by pccbb
it would still be misleading.

Revision 1.15.10.1 / (download) - annotate - [select for diffs], Mon Jun 2 13:23:14 2008 UTC (3 years, 11 months ago) by mjf
Branch: mjf-devfs2
Changes since 1.15: +26 -26 lines
Diff to previous 1.15 (colored)

Sync with HEAD.

Revision 1.16.2.1 / (download) - annotate - [select for diffs], Sun May 18 12:33:35 2008 UTC (4 years ago) by yamt
Branch: yamt-pf42
Changes since 1.16: +26 -25 lines
Diff to previous 1.16 (colored) next main 1.17 (colored)

sync with head.

Revision 1.17 / (download) - annotate - [select for diffs], Fri Apr 25 11:27:19 2008 UTC (4 years, 1 month ago) by tsutsui
Branch: MAIN
CVS Tags: yamt-pf42-base4, yamt-pf42-base3, yamt-pf42-base2, yamt-nfs-mp-base2, yamt-nfs-mp-base, wrstuden-revivesa-base-1, wrstuden-revivesa-base, hpcarm-cleanup-nbase
Branch point for: yamt-nfs-mp, wrstuden-revivesa, simonb-wapbl
Changes since 1.16: +26 -25 lines
Diff to previous 1.16 (colored)

Split device_t/softc for re(4) and rtk(4).

Revision 1.16 / (download) - annotate - [select for diffs], Sun Apr 6 07:54:17 2008 UTC (4 years, 1 month ago) by cegger
Branch: MAIN
CVS Tags: yamt-pf42-baseX, yamt-pf42-base
Branch point for: yamt-pf42
Changes since 1.15: +9 -10 lines
Diff to previous 1.15 (colored)

use aprint_*_dev and device_xname

Revision 1.5.4.5 / (download) - annotate - [select for diffs], Mon Jan 21 09:42:40 2008 UTC (4 years, 4 months ago) by yamt
Branch: yamt-lazymbuf
Changes since 1.5.4.4: +11 -22 lines
Diff to previous 1.5.4.4 (colored) to branchpoint 1.5 (colored) next main 1.6 (colored)

sync with head

Revision 1.13.10.2 / (download) - annotate - [select for diffs], Wed Jan 9 01:52:30 2008 UTC (4 years, 4 months ago) by matt
Branch: matt-armv6
Changes since 1.13.10.1: +11 -22 lines
Diff to previous 1.13.10.1 (colored) to branchpoint 1.13 (colored) next main 1.14 (colored)

sync with HEAD

Revision 1.14.4.1 / (download) - annotate - [select for diffs], Wed Dec 26 19:46:06 2007 UTC (4 years, 5 months ago) by ad
Branch: vmlocking2
Changes since 1.14: +11 -22 lines
Diff to previous 1.14 (colored) next main 1.15 (colored)

Sync with head.

Revision 1.14.6.1 / (download) - annotate - [select for diffs], Tue Dec 11 15:25:36 2007 UTC (4 years, 5 months ago) by yamt
Branch: yamt-kmem
Changes since 1.14: +11 -22 lines
Diff to previous 1.14 (colored) next main 1.15 (colored)

sync with head.

Revision 1.15 / (download) - annotate - [select for diffs], Sun Dec 9 20:27:56 2007 UTC (4 years, 5 months ago) by jmcneill
Branch: MAIN
CVS Tags: yamt-lazymbuf-base15, yamt-lazymbuf-base14, yamt-kmem-base3, yamt-kmem-base2, vmlocking2-base3, nick-net80211-sync-base, nick-net80211-sync, mjf-devfs-base, matt-armv6-nbase, matt-armv6-base, keiichi-mipv6-nbase, keiichi-mipv6-base, keiichi-mipv6, hpcarm-cleanup-base, cube-autoconf-base, cube-autoconf, bouyer-xeni386-nbase, bouyer-xeni386-merge1, bouyer-xeni386-base, bouyer-xeni386, ad-socklock-base1
Branch point for: mjf-devfs2
Changes since 1.14: +11 -22 lines
Diff to previous 1.14 (colored)

Merge jmcneill-pm branch.

Revision 1.13.8.5 / (download) - annotate - [select for diffs], Sat Dec 8 16:21:08 2007 UTC (4 years, 5 months ago) by jmcneill
Branch: jmcneill-pm
Changes since 1.13.8.4: +5 -5 lines
Diff to previous 1.13.8.4 (colored) to branchpoint 1.13 (colored) next main 1.14 (colored)

Rename pnp(9) -> pmf(9), as requested by many.

Revision 1.13.10.1 / (download) - annotate - [select for diffs], Tue Nov 6 23:25:52 2007 UTC (4 years, 6 months ago) by matt
Branch: matt-armv6
CVS Tags: matt-armv6-prevmlocking
Changes since 1.13: +3 -3 lines
Diff to previous 1.13 (colored)

sync with HEAD

Revision 1.13.8.4 / (download) - annotate - [select for diffs], Tue Nov 6 14:27:16 2007 UTC (4 years, 6 months ago) by joerg
Branch: jmcneill-pm
Changes since 1.13.8.3: +9 -7 lines
Diff to previous 1.13.8.3 (colored) to branchpoint 1.13 (colored)

Refactor PNP API:
- Make suspend/resume directly a device functionality. It consists of
  three layers (class logic, device logic, bus logic), all of them being
  optional. This replaces D0/D3 transitions.
- device_is_active returns true if the device was not disabled and was
  not suspended (even partially), device_is_enabled returns true if the
  device was enabled.
- Change pnp_global_transition into pnp_system_suspend and
  pnp_system_resume. Before running any suspend/resume handlers, check
  that all currently attached devices support power management and bail
  out otherwise. The latter is not done for the shutdown/panic case.
- Make the former bus-specific generic network handlers a class handler.
- Make PNP message like volume up/down/toogle PNP events. Each device
  can register what events they are interested in and whether the handler
  should be global or not.
- Introduce device_active API for devices to mark themselve in use from
  either the system or the device. Use this to implement the idle handling
  for audio and input devices. This is intended to replace most ad-hoc
  watchdogs as well.
- Fix somes situations in which audio resume would lose mixer settings.
- Make USB host controllers better deal with suspend in the light of
  shared interrupts.
- Flush filesystem cache on suspend.
- Flush disk caches on suspend. Put ATA disks into standby on suspend as
  well.
- Adopt drivers to use the new PNP API.
- Fix a critical bug in the generic cardbus layer that made D0->D3
  break.
- Fix ral(4) to set if_stop.
- Convert cbb(4) to the new PNP API.
- Apply the PCI Express SCI fix on resume again.

Revision 1.5.4.4 / (download) - annotate - [select for diffs], Sat Oct 27 11:30:10 2007 UTC (4 years, 6 months ago) by yamt
Branch: yamt-lazymbuf
Changes since 1.5.4.3: +3 -3 lines
Diff to previous 1.5.4.3 (colored) to branchpoint 1.5 (colored)

sync with head.

Revision 1.13.8.3 / (download) - annotate - [select for diffs], Fri Oct 26 15:44:20 2007 UTC (4 years, 7 months ago) by joerg
Branch: jmcneill-pm
Changes since 1.13.8.2: +3 -3 lines
Diff to previous 1.13.8.2 (colored) to branchpoint 1.13 (colored)

Sync with HEAD.

Follow the merge of pmap.c on i386 and amd64 and move
pmap_init_tmp_pgtbl into arch/x86/x86/pmap.c. Modify the ACPI wakeup
code to restore CR4 before jumping back into kernel space as the large
page option might cover that.

Revision 1.13.14.1 / (download) - annotate - [select for diffs], Thu Oct 25 22:37:14 2007 UTC (4 years, 7 months ago) by bouyer
Branch: bouyer-xenamd64
Changes since 1.13: +3 -3 lines
Diff to previous 1.13 (colored) next main 1.14 (colored)

Sync with HEAD.

Revision 1.12.8.2 / (download) - annotate - [select for diffs], Tue Oct 23 20:06:58 2007 UTC (4 years, 7 months ago) by ad
Branch: vmlocking
Changes since 1.12.8.1: +3 -3 lines
Diff to previous 1.12.8.1 (colored) to branchpoint 1.12 (colored) next main 1.13 (colored)

Sync with head.

Revision 1.14 / (download) - annotate - [select for diffs], Fri Oct 19 11:59:39 2007 UTC (4 years, 7 months ago) by ad
Branch: MAIN
CVS Tags: yamt-kmem-base, vmlocking2-base2, vmlocking2-base1, vmlocking-nbase, reinoud-bufcleanup-nbase, reinoud-bufcleanup-base, mjf-devfs, jmcneill-pm-base, jmcneill-base, bouyer-xenamd64-base2, bouyer-xenamd64-base
Branch point for: yamt-kmem, vmlocking2
Changes since 1.13: +3 -3 lines
Diff to previous 1.13 (colored)

machine/{bus,cpu,intr}.h -> sys/{bus,cpu,intr}.h

Revision 1.13.8.2 / (download) - annotate - [select for diffs], Fri Oct 5 18:12:17 2007 UTC (4 years, 7 months ago) by joerg
Branch: jmcneill-pm
Changes since 1.13.8.1: +4 -4 lines
Diff to previous 1.13.8.1 (colored) to branchpoint 1.13 (colored)

Fix compilation errors that slipped through because i386/ALL doesn't
have re* at cardbus.

Revision 1.13.8.1 / (download) - annotate - [select for diffs], Fri Oct 5 01:08:56 2007 UTC (4 years, 7 months ago) by joerg
Branch: jmcneill-pm
Changes since 1.13: +9 -22 lines
Diff to previous 1.13 (colored)

Remove the power management nonsense in the PCI versions of
rtk(4) and re(4). It is not really likely to work anyway.
Use PNP power management for the cardbus attachment as well and
remove the power management handlers from the chipset code.

Revision 1.5.2.2 / (download) - annotate - [select for diffs], Thu Oct 4 18:50:23 2007 UTC (4 years, 7 months ago) by bouyer
Branch: netbsd-3
Changes since 1.5.2.1: +2 -3 lines
Diff to previous 1.5.2.1 (colored) to branchpoint 1.5 (colored) next main 1.6 (colored)

Pull up following revision(s) (requested by tsutsui in ticket #1852):
	sys/dev/ic/rtl81x9var.h: revision 1.39
	sys/dev/cardbus/if_re_cardbus.c: revision 1.13
	sys/dev/pci/if_re_pci.c: revision 1.27 via patch
	sys/dev/pci/if_rtk_pci.c: revision 1.32
	sys/dev/cardbus/if_rtk_cardbus.c: revision 1.32
	sys/dev/ic/rtl8169.c: revision 1.84, 1.85
	sys/dev/ic/rtl81x9reg.h: revision 1.27
	sys/dev/ic/rtl81x9.c: revision 1.72
Cleanup handling of quikrs on each RealTek chip:
Pull a fix for PCIe variants from FreeBSD

Revision 1.5.4.3 / (download) - annotate - [select for diffs], Mon Sep 3 14:33:32 2007 UTC (4 years, 8 months ago) by yamt
Branch: yamt-lazymbuf
Changes since 1.5.4.2: +2 -3 lines
Diff to previous 1.5.4.2 (colored) to branchpoint 1.5 (colored)

sync with head.

Revision 1.12.10.1 / (download) - annotate - [select for diffs], Wed Jul 11 20:05:23 2007 UTC (4 years, 10 months ago) by mjf
Branch: mjf-ufs-trans
Changes since 1.12: +2 -3 lines
Diff to previous 1.12 (colored) next main 1.13 (colored)

Sync with head.

Revision 1.12.14.1 / (download) - annotate - [select for diffs], Sun Jun 3 17:26:02 2007 UTC (4 years, 11 months ago) by wrstuden
Branch: wrstuden-fixsa
Changes since 1.12: +2 -3 lines
Diff to previous 1.12 (colored) next main 1.13 (colored)

Catch up with now-somewhat-dated netbsd-4. These changes took longer
than expected for me to actually get around to merging.

Revision 1.12.2.1 / (download) - annotate - [select for diffs], Wed May 16 20:43:34 2007 UTC (5 years ago) by jdc
Branch: netbsd-4
CVS Tags: wrstuden-fixsa-newbase, wrstuden-fixsa-base-1, wrstuden-fixsa-base, netbsd-4-0-RELEASE, netbsd-4-0-RC5, netbsd-4-0-RC4, netbsd-4-0-RC3, netbsd-4-0-RC2, netbsd-4-0-RC1, netbsd-4-0-1-RELEASE, netbsd-4-0, matt-nb4-arm-base, matt-nb4-arm
Changes since 1.12: +2 -3 lines
Diff to previous 1.12 (colored) next main 1.13 (colored)

Pull up revision 1.13 (requested by tsutsui in ticket #640).

Cleanup handling of quikrs on each RealTek chip:
- replace rtk_type member in rtk_softc which has chip types
  with new rtk_quirk that represents quirks on each chip:
  - RTKQ_8129           doesn't have internal MII (used in rtk(4))
  - RTKQ_8139CPLUS      has different register layout (for re(4))
  - RTKQ_8169NONS       (original 8169) requires some settings on init
  - RTKQ_PCIE           requires different settings in setmulti
  so that we don't have to check each hwrev values or types everywhere
  and newer variants will also work without changes if they don't
  have other quirks
  (sc_rev is unchenged for now for reference to the Realtek's driver)
- don't check hwrev register in re_pci_match() but check
  only PCI_VENDER(), PCI_PRODUCT() and PCI_REVISION()
  so that we no longer have to map pci space there
- add a new HWREV value for another 8168 variant
- try to map PCI mem space more properly
- remove (probably unneeded) ifp->if_baudrate initialization

Tested on a newer 8168 variant by Dennis den Brok on tech-kern,
and also tested on 8139 and 8169C on macppc, and 8139C+ on landisk
by me.

Revision 1.12.8.1 / (download) - annotate - [select for diffs], Tue Apr 10 13:24:30 2007 UTC (5 years, 1 month ago) by ad
Branch: vmlocking
Changes since 1.12: +2 -3 lines
Diff to previous 1.12 (colored)

Sync with head.

Revision 1.12.12.1 / (download) - annotate - [select for diffs], Thu Mar 29 19:27:44 2007 UTC (5 years, 1 month ago) by reinoud
Branch: reinoud-bufcleanup
Changes since 1.12: +2 -3 lines
Diff to previous 1.12 (colored) next main 1.13 (colored)

Pullup to -current

Revision 1.12.4.1 / (download) - annotate - [select for diffs], Sat Mar 24 14:55:20 2007 UTC (5 years, 2 months ago) by yamt
Branch: yamt-idlelwp
Changes since 1.12: +2 -3 lines
Diff to previous 1.12 (colored) next main 1.13 (colored)

sync with head.

Revision 1.13 / (download) - annotate - [select for diffs], Wed Mar 21 12:17:31 2007 UTC (5 years, 2 months ago) by tsutsui
Branch: MAIN
CVS Tags: yamt-x86pmap-base4, yamt-x86pmap-base3, yamt-x86pmap-base2, yamt-x86pmap-base, yamt-x86pmap, yamt-idlelwp-base8, vmlocking-base, thorpej-atomic-base, thorpej-atomic, nick-csl-alignment-base5, nick-csl-alignment-base, nick-csl-alignment, mjf-ufs-trans-base, matt-mips64-base, matt-mips64, hpcarm-cleanup
Branch point for: matt-armv6, jmcneill-pm, bouyer-xenamd64
Changes since 1.12: +2 -3 lines
Diff to previous 1.12 (colored)

Cleanup handling of quikrs on each RealTek chip:
- replace rtk_type member in rtk_softc which has chip types
  with new rtk_quirk that represents quirks on each chip:
  - RTKQ_8129           doesn't have internal MII (used in rtk(4))
  - RTKQ_8139CPLUS      has different register layout (for re(4))
  - RTKQ_8169NONS       (original 8169) requires some settings on init
  - RTKQ_PCIE           requires different settings in setmulti
  so that we don't have to check each hwrev values or types everywhere
  and newer variants will also work without changes if they don't
  have other quirks
  (sc_rev is unchenged for now for reference to the Realtek's driver)
- don't check hwrev register in re_pci_match() but check
  only PCI_VENDER(), PCI_PRODUCT() and PCI_REVISION()
  so that we no longer have to map pci space there
- add a new HWREV value for another 8168 variant
- try to map PCI mem space more properly
- remove (probably unneeded) ifp->if_baudrate initialization

Tested on a newer 8168 variant by Dennis den Brok on tech-kern,
and also tested on 8139 and 8169C on macppc, and 8139C+ on landisk
by me.

Revision 1.5.2.1 / (download) - annotate - [select for diffs], Sat Mar 3 23:30:23 2007 UTC (5 years, 2 months ago) by bouyer
Branch: netbsd-3
Changes since 1.5: +6 -6 lines
Diff to previous 1.5 (colored)

Pull up following revision(s) (requested by tsutsui in ticket #1673):
	distrib/sets/lists/man/mi		1.844, 1.871
	share/man/man4/Makefile			1.372, 1.379 via patch
	share/man/man4/re.4			1.8, 1.9, 1.11, 1.12
	share/man/man4/rgephy.4			1.1
	share/man/man4/rlphy.4			1.1, 1.2
	sys/arch/amd64/conf/GENERIC		1.79, 1.89
	sys/arch/amd64/conf/INSTALL		1.45, 1.49
	sys/arch/i386/conf/GENERIC		1.717, 1.747
	sys/arch/i386/conf/GENERIC_LAPTOP	1.164
	sys/arch/i386/conf/INSTALL		1.277, 1.283
	sys/arch/i386/conf/INSTALL_LAPTOP	1.96, 1.98
	sys/arch/i386/conf/XEN2_DOM0		1.22 via patch
	sys/arch/macppc/conf/GENERIC		1.220, 1.246
	sys/arch/macppc/conf/INSTALL		1.96, 1.100
	sys/dev/cardbus/if_re_cardbus.c		1.10
	sys/dev/cardbus/if_rtk_cardbus.c 	1.29-1.31
	sys/dev/ic/rtl8169.c			1.14, 1.20, 1.24, 1.25, 1.28-1.61, 1.63, 1.64-1.81 via patch
	sys/dev/ic/rtl81x9.c			1.52, 1.54-1.63, 1.65, 1.67-1.70
	sys/dev/ic/rtl81x9reg.h			1.15-1.26
	sys/dev/ic/rtl81x9var.h			1.19, 1.21-1.37
	sys/dev/mii/files.mii			1.38
	sys/dev/mii/miidevs			1.62, 1.64
	sys/dev/mii/rgephy.c			1.10, 1.13-1.16
	sys/dev/mii/rlphy.c			1.1, 1.6, 1.7, 1.11 via patch
	sys/dev/pci/if_re_pci.c			1.13, 1.15-1.17, 1.19-1.23
	sys/dev/pci/if_rtk_pci.c		1.25, 1.28, 1.29, 1.31
	sys/dev/pci/pcidevs			1.851, 1.852

on re(4):
- improve stability (I believe ;-)
- add a workaround for hardware ip4csum-tx bug
- support newer chips (8169SB/SC, PCIe based 8168 etc.)
- fix 8139C+ support
- enable hardware VLAN
- misc bus_dma(9) fix (which makes re(4) work on mips ports)

on rtk(4):
- fix kern/31348
- fix possible panic on dreamcast

Revision 1.8.2.2 / (download) - annotate - [select for diffs], Fri Jan 12 00:57:34 2007 UTC (5 years, 4 months ago) by ad
Branch: newlock2
Changes since 1.8.2.1: +5 -7 lines
Diff to previous 1.8.2.1 (colored) to branchpoint 1.8 (colored) next main 1.9 (colored)

Sync with head.

Revision 1.5.4.2 / (download) - annotate - [select for diffs], Sat Dec 30 20:47:57 2006 UTC (5 years, 4 months ago) by yamt
Branch: yamt-lazymbuf
Changes since 1.5.4.1: +6 -11 lines
Diff to previous 1.5.4.1 (colored) to branchpoint 1.5 (colored)

sync with head.

Revision 1.8.4.2 / (download) - annotate - [select for diffs], Sun Dec 10 07:16:58 2006 UTC (5 years, 5 months ago) by yamt
Branch: yamt-splraiseipl
Changes since 1.8.4.1: +9 -11 lines
Diff to previous 1.8.4.1 (colored) to branchpoint 1.8 (colored) next main 1.9 (colored)

sync with head.

Revision 1.8.2.1 / (download) - annotate - [select for diffs], Sat Nov 18 21:34:04 2006 UTC (5 years, 6 months ago) by ad
Branch: newlock2
Changes since 1.8: +9 -7 lines
Diff to previous 1.8 (colored)

Sync with head.

Revision 1.12 / (download) - annotate - [select for diffs], Sat Nov 18 16:03:53 2006 UTC (5 years, 6 months ago) by tsutsui
Branch: MAIN
CVS Tags: yamt-splraiseipl-base5, yamt-splraiseipl-base4, yamt-splraiseipl-base3, post-newlock2-merge, newlock2-nbase, newlock2-base, netbsd-4-base, ad-audiomp-base, ad-audiomp
Branch point for: yamt-idlelwp, wrstuden-fixsa, vmlocking, reinoud-bufcleanup, netbsd-4, mjf-ufs-trans
Changes since 1.11: +5 -7 lines
Diff to previous 1.11 (colored)

Unwrap some lines (after __unused removal).

Revision 1.11 / (download) - annotate - [select for diffs], Thu Nov 16 01:32:48 2006 UTC (5 years, 6 months ago) by christos
Branch: MAIN
Changes since 1.10: +6 -6 lines
Diff to previous 1.10 (colored)

__unused removal on arguments; approved by core.

Revision 1.10 / (download) - annotate - [select for diffs], Fri Oct 27 18:47:07 2006 UTC (5 years, 6 months ago) by dogcow
Branch: MAIN
Changes since 1.9: +5 -5 lines
Diff to previous 1.9 (colored)

Sync up with rtk 'common macro' changes.

Revision 1.8.4.1 / (download) - annotate - [select for diffs], Sun Oct 22 06:05:35 2006 UTC (5 years, 7 months ago) by yamt
Branch: yamt-splraiseipl
Changes since 1.8: +7 -5 lines
Diff to previous 1.8 (colored)

sync with head

Revision 1.9 / (download) - annotate - [select for diffs], Thu Oct 12 07:39:27 2006 UTC (5 years, 7 months ago) by xtraeme
Branch: MAIN
CVS Tags: yamt-splraiseipl-base2
Changes since 1.8: +7 -5 lines
Diff to previous 1.8 (colored)

More -Wunused warnings.

Revision 1.6.8.2 / (download) - annotate - [select for diffs], Thu Sep 14 12:31:27 2006 UTC (5 years, 8 months ago) by yamt
Branch: yamt-pdpolicy
Changes since 1.6.8.1: +2 -7 lines
Diff to previous 1.6.8.1 (colored) to branchpoint 1.6 (colored) next main 1.7 (colored)

sync with head.

Revision 1.6.4.1 / (download) - annotate - [select for diffs], Sat Sep 9 02:49:44 2006 UTC (5 years, 8 months ago) by rpaulo
Branch: rpaulo-netinet-merge-pcb
Changes since 1.6: +4 -9 lines
Diff to previous 1.6 (colored) next main 1.7 (colored)

sync with head

Revision 1.8 / (download) - annotate - [select for diffs], Thu Sep 7 02:40:32 2006 UTC (5 years, 8 months ago) by dogcow
Branch: MAIN
CVS Tags: yamt-splraiseipl-base, yamt-pdpolicy-base9, rpaulo-netinet-merge-pcb-base
Branch point for: yamt-splraiseipl, newlock2
Changes since 1.7: +2 -7 lines
Diff to previous 1.7 (colored)

remove more vestiges of CCITT, LLC, HDLC, NS, and NSIP.

Revision 1.5.4.1 / (download) - annotate - [select for diffs], Wed Jun 21 15:02:45 2006 UTC (5 years, 11 months ago) by yamt
Branch: yamt-lazymbuf
Changes since 1.5: +4 -4 lines
Diff to previous 1.5 (colored)

sync with head.

Revision 1.6.6.1 / (download) - annotate - [select for diffs], Sat Apr 22 11:38:51 2006 UTC (6 years, 1 month ago) by simonb
Branch: simonb-timecounters
CVS Tags: simonb-timcounters-final
Changes since 1.6: +4 -4 lines
Diff to previous 1.6 (colored) next main 1.7 (colored)

Sync with head.

Revision 1.6.10.1 / (download) - annotate - [select for diffs], Wed Apr 19 03:24:33 2006 UTC (6 years, 1 month ago) by elad
Branch: elad-kernelauth
Changes since 1.6: +4 -4 lines
Diff to previous 1.6 (colored) next main 1.7 (colored)

sync with head.

Revision 1.6.8.1 / (download) - annotate - [select for diffs], Sat Apr 1 12:06:55 2006 UTC (6 years, 1 month ago) by yamt
Branch: yamt-pdpolicy
Changes since 1.6: +4 -4 lines
Diff to previous 1.6 (colored)

sync with head.

Revision 1.6.12.1 / (download) - annotate - [select for diffs], Fri Mar 31 09:45:18 2006 UTC (6 years, 1 month ago) by tron
Branch: peter-altq
Changes since 1.6: +4 -4 lines
Diff to previous 1.6 (colored) next main 1.7 (colored)

Merge 2006-03-31 NetBSD-current into the "peter-altq" branch.

Revision 1.7 / (download) - annotate - [select for diffs], Wed Mar 29 06:22:38 2006 UTC (6 years, 1 month ago) by thorpej
Branch: MAIN
CVS Tags: yamt-pdpolicy-base8, yamt-pdpolicy-base7, yamt-pdpolicy-base6, yamt-pdpolicy-base5, yamt-pdpolicy-base4, yamt-pdpolicy-base3, simonb-timecounters-base, gdamore-uart-base, gdamore-uart, elad-kernelauth-base, chap-midi-nbase, chap-midi-base, chap-midi, abandoned-netbsd-4-base, abandoned-netbsd-4
Changes since 1.6: +4 -4 lines
Diff to previous 1.6 (colored)

Use device_private().

Revision 1.6 / (download) - annotate - [select for diffs], Sun Dec 11 12:21:15 2005 UTC (6 years, 5 months ago) by christos
Branch: MAIN
CVS Tags: yamt-uio_vmspace-base5, yamt-uio_vmspace, yamt-pdpolicy-base2, yamt-pdpolicy-base, peter-altq-base
Branch point for: yamt-pdpolicy, simonb-timecounters, rpaulo-netinet-merge-pcb, peter-altq, elad-kernelauth
Changes since 1.5: +2 -2 lines
Diff to previous 1.5 (colored)

merge ktrace-lwp.

Revision 1.4.2.1 / (download) - annotate - [select for diffs], Fri Apr 29 11:28:46 2005 UTC (7 years ago) by kent
Branch: kent-audio2
Changes since 1.4: +18 -18 lines
Diff to previous 1.4 (colored) next main 1.5 (colored)

sync with -current

Revision 1.4.6.1 / (download) - annotate - [select for diffs], Sat Mar 19 08:33:55 2005 UTC (7 years, 2 months ago) by yamt
Branch: yamt-km
Changes since 1.4: +18 -18 lines
Diff to previous 1.4 (colored) next main 1.5 (colored)

sync with head.  xen and whitespace.  xen part is not finished.

Revision 1.4.4.3 / (download) - annotate - [select for diffs], Fri Mar 4 16:41:05 2005 UTC (7 years, 2 months ago) by skrll
Branch: ktrace-lwp
Changes since 1.4.4.2: +18 -18 lines
Diff to previous 1.4.4.2 (colored) to branchpoint 1.4 (colored) next main 1.5 (colored)

Sync with HEAD.

Hi Perry!

Revision 1.5 / (download) - annotate - [select for diffs], Sun Feb 27 00:26:59 2005 UTC (7 years, 2 months ago) by perry
Branch: MAIN
CVS Tags: yamt-vop-base3, yamt-vop-base2, yamt-vop-base, yamt-vop, yamt-readahead-pervnode, yamt-readahead-perfile, yamt-readahead-base3, yamt-readahead-base2, yamt-readahead-base, yamt-readahead, yamt-km-base4, yamt-km-base3, thorpej-vnode-attr-base, thorpej-vnode-attr, netbsd-3-base, netbsd-3-1-RELEASE, netbsd-3-1-RC4, netbsd-3-1-RC3, netbsd-3-1-RC2, netbsd-3-1-RC1, netbsd-3-1-1-RELEASE, netbsd-3-1, netbsd-3-0-RELEASE, netbsd-3-0-RC6, netbsd-3-0-RC5, netbsd-3-0-RC4, netbsd-3-0-RC3, netbsd-3-0-RC2, netbsd-3-0-RC1, netbsd-3-0-3-RELEASE, netbsd-3-0-2-RELEASE, netbsd-3-0-1-RELEASE, netbsd-3-0, ktrace-lwp-base, kent-audio2-base
Branch point for: yamt-lazymbuf, netbsd-3
Changes since 1.4: +18 -18 lines
Diff to previous 1.4 (colored)

nuke trailing whitespace

Revision 1.4.4.2 / (download) - annotate - [select for diffs], Mon Jan 17 19:30:39 2005 UTC (7 years, 4 months ago) by skrll
Branch: ktrace-lwp
Changes since 1.4.4.1: +420 -0 lines
Diff to previous 1.4.4.1 (colored) to branchpoint 1.4 (colored)

Sync with HEAD.

Revision 1.4.4.1, Sat Jan 15 12:32:09 2005 UTC (7 years, 4 months ago) by skrll
Branch: ktrace-lwp
Changes since 1.4: +0 -420 lines
FILE REMOVED

file if_re_cardbus.c was added on branch ktrace-lwp on 2005-01-17 19:30:39 +0000

Revision 1.4 / (download) - annotate - [select for diffs], Sat Jan 15 12:32:09 2005 UTC (7 years, 4 months ago) by kanaoka
Branch: MAIN
CVS Tags: yamt-km-base2, yamt-km-base, matt-timespec
Branch point for: yamt-km, ktrace-lwp, kent-audio2
Changes since 1.3: +23 -28 lines
Diff to previous 1.3 (colored)

 - Use aprint_*.
 - Use ANSI decls.
 - Change some cosmetic.

Revision 1.3 / (download) - annotate - [select for diffs], Thu Jan 13 14:13:18 2005 UTC (7 years, 4 months ago) by kanaoka
Branch: MAIN
Changes since 1.2: +5 -4 lines
Diff to previous 1.2 (colored)

 - Add my tested device in a comment.
 - Change minimum value of latency timer from 0x20 to 0x40.

Revision 1.2 / (download) - annotate - [select for diffs], Sun Dec 26 07:27:41 2004 UTC (7 years, 5 months ago) by kanaoka
Branch: MAIN
CVS Tags: kent-audio1-beforemerge
Changes since 1.1: +2 -4 lines
Diff to previous 1.1 (colored)

 - Use ether_ioctl().
 - Remove unnecessary re_init() in re_attach().
 - Remove notyet compile option.

Revision 1.1 / (download) - annotate - [select for diffs], Thu Dec 23 06:26:30 2004 UTC (7 years, 5 months ago) by jonathan
Branch: MAIN

Snapshot of incomplete-but-working split of re(4) driver into a
bus-independent backend, with PCI and CardBus attachment code.
The committed code has two serious bugs:

1. The driver makes no attempt to recover resources when a (Cardbus)
instance is removed; bus resources are leaked.

2. In testing with a NetGear GA-511, the Cardbus card never responded
   to a reset/wakeup if the card is powered down after attachment.
   So for now, leave cardbus instances powered up at attachment
   (insertion, or at boot if a card is already present).

That aside, it acutally works on my GA-511. Committed as-is despite
the bugs, after repeated requests to make the code available for
further testing.  Also requires sys/dev/mii/miidevs rev 1.54 -> 1.55,
and consequent regen of miidevs{,_data}.h.

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.




CVSweb <webmaster@jp.NetBSD.org>