CVS log for src/sys/dev/pci/if_re_pci.c

Up to [cvs.NetBSD.org] / src / sys / dev / pci

Request diff between arbitrary revisions

Keyword substitution: kv
Default branch: MAIN

Pull up following revision(s) (requested by jakllsch in ticket #805):

	sys/dev/pci/pcidevs: revision 1.1503
	sys/dev/pci/if_re_pci.c: revision 1.53

Add (Realtek/)Killer E2600 Ethernet
Add Killer E2600, adapted from PR 57969

Add Killer E2600, adapted from PR 57969

Mostly merge changes from HEAD upto 20200411

Merge changes from current as of 20200406

Sync with head.

 Whitespace fix. No functional change.

Prefer memory space register mapping over IO space. Make an exception for
RTL8169SC, as the FreeBSD driver says memory mapped IO doesn't work there.

Pull up the following revisions, requested by msaitoh in ticket #451:

	sys/dev/pci/if_re_pci.c 		1.50 (patch)
	share/man/man4/re.4			1.17-1.18 (patch)

Add D-Link DGE-530T Rev. C,D and TP-Link TG-3468 v2,v3.
Add note about UDP checksum offload feature to the document.

Pull up the following revisions, requested by msaitoh in ticket #1449:

	sys/dev/pci/if_re_pci.c			1.50
	share/man/man4/re.4			1.17-1.18

Add D-Link DGE-530T Rev. C,D and TP-Link TG-3468 v2,v3.
Add note about UDP checksum offload feature to the document.

Add D-Link DGE-530T C1 and TP-Link TG-3468 v2.

Sync with HEAD

Sync with HEAD, resolve a couple of conflicts

use pci_intr_establish_xname()

update from HEAD

Sync with HEAD

Resolve conflicts from previous merge (all resulting from $NetBSD
keywork expansion)

Re-enable RTKQ_IM_HW.  Timeout issues appear to be fixed since
src/sys/dev/ic/rtl8169.c r1.151

Sync with HEAD - tag prg-localcount2-base1

Disable interrupt moderation, as it is it causes watchdog timeouts on
some chips/systems.

Sync with HEAD

Sync with HEAD

Performance improvements for PCIe and 8168 based devices:
 - When using the countdown timer for interrupt moderation on PCIe devices,
   use a timer rate value based on a 125MHz PCIe reference clock instead of
   33 MHz.
 - For 8168 based devices, ditch the countdown timer and instead use the
   (undocumented) hardware interrupt moderation feature.
 - Support TSOv4 on 8168D and later devices.

Sync with HEAD (as of 26th Dec)

Switch PCI re(4) attachment from pci_intr_map() to
pci_intr_alloc()/pci_intr_release().

This enables MSI where available.

Sync with HEAD

Deal with 64-bit BARs

Rebase to HEAD as of a few days ago.

sync with head.

for a reference, the tree before this commit was tagged
as yamt-pagecache-tag8.

this commit was splitted into small chunks to avoid
a limitation of cvs.  ("Protocol error: too many arguments")

sync with head

make pci_intr_string and eisa_intr_string take a buffer and a length
instead of relying in local static storage.

resync from head

remove trailing whitespace

sync with head

merge to -current.

Use pci_aprint_devinfo(9) instead of pci_devinfo+aprint_{normal,naive}
where it looks straightforward, and pci_aprint_devinfo_fancy in a few
others where drivers want to supply their own device names instead
of the pcidevs generated one. More complicated cases, where names
are composed at runtime, are left alone for now. It certainly makes
sense to simplify the drivers here rather than inventing a catch-all API.
This should serve as as example for new drivers, and also ensure
consistent output in the AB_QUIET ("boot -q") case. Also, it avoids
excessive stack usage where drivers attach child devices because the
buffer for the device name is not kept on the local stack anymore.

sync with head

Sync with HEAD.

sync with head.

Use 64-bit DMA tag (if available) on PCI-E re(4) NICs.

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

sync to netbsd-5

sync with head

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

Remove unnecessary #includes.

Pull up following revision(s) (requested by tsutsui in ticket #1339):
	sys/dev/ic/rtl8169.c: revisions 1.107, 1.114, 1.115, 1.116,
					1.117 (via patch), 1.118 (via patch),
					1.119, 1.121
	sys/dev/ic/rtl81x9reg.h: revisions 1.36, 1.37, 1.38, 1.39
	sys/dev/ic/rtl81x9var.h: revision  1.47
	sys/dev/mii/rgephy.c: revisions    1.16, 1.18, 1.19, 1.27 (via patch)
	sys/dev/mii/rgephyreg.h: revision 1.3
	sys/dev/pci/if_re_pci.c: revision 1.36
- add support for RTL8211B(L) to rgephy(4)
- add a wakeup instruction for rgephy(4) on newer re(4) chips
- detect RTL8169CP, RTL8168D/8111D, and RTL8103E variants
- fix rgephy(4) problem on RTL8111D reported on current-users:
  http://mail-index.NetBSD.org/current-users/2009/04/12/msg008977.html
  http://mail-index.NetBSD.org/current-users/2009/04/19/msg009096.html
- pull more quirk handling from FreeBSD
- fix RX hwcksum for DESCV2 chips for PR kern/40605
- remove "B" suffix from RTL8168 device names in attach message

Pull up following revision(s) (requested by tsutsui in ticket #821):
	sys/dev/ic/rtl8169.c: revisions 1.107, 1.114-1.119, 1.121
	sys/dev/ic/rtl81x9reg.h: revisions 1.36-1.39
	sys/dev/ic/rtl81x9var.h: revision 1.47
	sys/dev/mii/rgephy.c: revision 1.27 via patch
	sys/dev/pci/if_re_pci.c: revision 1.36
remove extra semicolons.
--
Add HWREV values of RTL8168CP and RTL8168D.  From FreeBSD.

XXX: needs more quirk handling after wakeup for newer chips.
--
Add HWREV of RTL8102EL variant.  From FUKAUMI Naoki.
--
Assume an unknown HWREV chip has the same features with the latest one.
--
Remove suffix "B" from rtk_name of PCI_PRODUCT_REALTEK_RT8168 devices.
All 8168/8111 variants (8168/8168B/8168C/8168CP/8168D/8111B/8111C/8111CP)
have the same PCI device ID.
--
Remove magic reset sequence except wakeup for rev 2 chips which breaks 8111D.
Problem reported and fix confirmed by Thomas Bieg on current-users.

Also tested on 8111C (no bad side effect) by several users privately.
--
Pull some changes for newer chips from FreeBSD:
- pull MACSTAT and CMDSTOP quirks for 8168/8111 chips
- always set CPLUSCMD_PCI_MRW on reset
- set VLANSTRIP and RXCSUM_ENB bits on CPLUS register per if_capenable

Tested on 8111C and 8111D by several users, and
no bad side effect on my old 8169S.
--
Remove unused sc_rev settings (all quirks are handled by sc_quirk)
and merge HWREV cases which have the same quirks.
--
- rename RTK_HWREV_8102EL_SPIN2 -> RTK_HWREV_8103E
- add a HWREV value for 8168DP
Per Realtek's Linux drivers.
--
Two fixes for RX hwcsum on DESCV2 chips:
 * On checking TCPv4/UDPv4 RX checksum on DESCV2 chips, also check
   RE_RDESC_VLANCTL_IPV4 bit because those DESCV2 chips may also recognize
   IPv6 packets and set RE_PROTOID_TCPIP or RE_PROTOID_UDPIP bits for
   TCPv6/UDPv6 packets.  This may fix PR kern/40605.
 * According to Realtek's Linux driver, DESCV2 chips don't set RE_PROTOID_IP
   for non-TCP/UDP IP packets (set only RE_RDESC_VLANCTL_IPV[46]) so
   remove PROTOID check for IPv4 RX cheksum on DESCV2 chips.

Sync with HEAD.

Commit is split, to avoid a "too many arguments" protocol error.

sync with head.

Sync with HEAD.

Remove suffix "B" from rtk_name of PCI_PRODUCT_REALTEK_RT8168 devices.
All 8168/8111 variants (8168/8168B/8168C/8168CP/8168D/8111B/8111C/8111CP)
have the same PCI device ID.

Pull up following revision(s) (requested by tsutsui in ticket #1297):
	src/sys/dev/ic/rtl8169.c  1.104 (via patch), 1.105 (via patch),
				1.106 (via patch), 1.108, 1.109 (via patch),
				1.110, 1.111, 1.112, 1.113
	sys/dev/ic/rtl81x9reg.h: revision 1.30 - 1.35
	sys/dev/ic/rtl81x9var.h: revision 1.42 - 1.45
	sys/dev/pci/if_re_pci.c: revision 1.35
Add support for 8168C/8111C/8102E chips.
Fix MAC reset issue (PR kern/41009)
Add/fix HW checksum support (PR kern/40955)

Sync with HEAD.

Sync with HEAD.

Sync with wrstuden-revivesa-base-2.

Add support for the Realtek 8102E/8102EL PCIe 10/100 Ethernet devices.
From FreeBSD.

Sync with HEAD.

sync with head.

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

use aprint_*_dev and device_xname

sync with head

sync with HEAD

Sync with head.

Sync with HEAD

sync with head.

use __KERNEL_RCSID()

Merge jmcneill-pm branch.

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

sync with HEAD

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.

sync with head.

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.

Sync with HEAD.

Sync with head.

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

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.

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

sync with head.

Sync with HEAD.

Sync with HEAD.

Sync with HEAD.

Fix a tyop.

include sys/cdefs.h

file if_re_pci.c was added on branch matt-mips64 on 2007-07-19 22:04:23 +0000

include sys/cdefs.h

Sync with head.

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

Pull up revision 1.27 via patch (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.

Sync with head.

Pullup to -current

sync with head.

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.

Sync with HEAD.

Pull up following revision(s) (requested by tsutsui in ticket #1680):
	sys/dev/pci/if_re_pci.c: revision 1.25-1.26
Add an entry to match hwrev RTK_HWREV_8100E_SPIN2 too.
Also check both I/O and memory space on unmap. Pointer out by yamt.

Pull up following revision(s) (requested by tsutsui in ticket #502):
	sys/dev/pci/if_re_pci.c: revision 1.25-1.26
Add an entry to match hwrev RTK_HWREV_8100E_SPIN2 too.
Also check both I/O and memory space on unmap. Pointer out by yamt.

Also check both I/O and memory space on unmap. Pointer out by yamt.

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

Add an entry to match hwrev RTK_HWREV_8100E_SPIN2 too.

XXX: should we use PCI_REVISION() rather than hwrev
     for 8139C+ as OpenBSD does?

- sync with head.
- move sched_changepri back to kern_synch.c as it doesn't know PPQ anymore.

sync with head.

Replace the Mach-derived boolean_t type with the C99 bool type.  A
future commit will replace use of TRUE and FALSE with true and false.

Pull up following revision(s) (requested by tsutsui in ticket #437):
	sys/dev/pci/if_re_pci.c: revision 1.23
Add an 8169SC variant to re_devs. From Darrin B.Jewell.

Pull up following revision(s) (requested by tsutsui in ticket #437):
	sys/dev/pci/if_re_pci.c: revision 1.22
Try to map both PCI I/O and memory space.

Sync with HEAD.

Add an 8169SC variant to re_devs. From Darrin B.Jewell.

Try to map both PCI I/O and memory space.

Sync with head.

sync with head.

sync with head.

fix capitalization of NetBSD; from Zapher

Sync with head.

Rename re_pci_probe() -> re_pci_match().

- sync HWREV definitions with FreeBSD
- recognize 8169SC/8100E/8101E (untested, but won't hurt working devices)
  XXX: 8100E/8101E don't support 1000M; need some flag to set if_baudrate

__unused removal on arguments; approved by core.

Pull another 8139C+ fix from FreeBSD if_re.c rev 1.68:
Perform hardware diagnostic only on the original RTL8169,
which was the only device that really needed it.
(i.e. a possible hardware bug when the NIC was put on a 64bit PCI slot)

Tested with on-board 8139C+ by Brian A. Seklecki.

Note this change might also fix PR kern/34952
(because re_diag() is no longer called on 8169S/8110S),
but I'm not sure if the re(4) chip was properly initialized in such case.

PR/34933: Sami Kantoluoto: RealTek 8168B found from Asus P5B motherboard
is not recognized

Use common macro rather than local one.

sync with head

- sprinkle __unused on function decls.
- fix a couple of unused bugs
- no more -Wno-unused for i386

revert unrelated changes erroneously slipped in.

sync with head

Merge from HEAD.

sync with head.

Complete a sync sys/ with head.

sync with head.

PR/33761: dieter roelants: NetBSD doesn't recognize a RealTek 8168B nic

sync with head.

Pull up following revision(s) (requested by rpaulo in ticket #1070):
	sys/dev/pci/if_re_pci.c: revision 1.12
	sys/dev/ic/rtl81x9reg.h: revision 1.14
PR/32386: Dawid Szymanski (arhea). Add support for the 8169SB chipset.
From FreeBSD.

PR/32386: Dawid Szymanski (arhea). Add support for the 8169SB chipset.

Sync with head.

sync with head.

Pull up following revision(s) (requested by riz in ticket #993):
	sys/dev/pci/if_sk.c: revision 1.18
	sys/dev/pci/if_re_pci.c: revision 1.11
Special-case the Linksys EG1032 cards using PCI subsystem ID;  rev. 2 uses
the sk(4) driver, while rev. 3 needs re(4).
Mostly from brad@openbsd.

Pull up following revision(s) (requested by riz in ticket #995):
	sys/dev/pci/if_re_pci.c: revision 1.10
Match two candidates.  From Francois Romieu in private mail.

Special-case the Linksys EG1032 cards using PCI subsystem ID;  rev. 2 uses
the sk(4) driver, while rev. 3 needs re(4).

Mostly from brad@openbsd.

Sync with HEAD. Here we go again...

Match two candidates.  From Francois Romieu in private mail.

Pull up revision 1.9 (requested by martin in ticket #273):
Add support for Corega CG-LAPCIGT Gigabit Ethernet.
From PR kern/30173.

Add support for Corega CG-LAPCIGT Gigabit Ethernet.
From PR kern/30173.

sync with -current

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

Sync with HEAD.

Hi Perry!

nuke trailing whitespace

re_pci_probe: don't use i/o space unless RE_USEIOSPACE.

Sync with HEAD.

constify

Sync with HEAD.

Put the headers in a more standard order with machine-specific and
dev/bus-specific headers after the sys and net headers.  This allows
it to actually compile on macppc, among other things.

- add rcsid.
- restore Bill Paul's copyright notice.

Sync with HEAD.

file if_re_pci.c was added on branch ktrace-lwp on 2005-01-17 19:31:24 +0000

 - Make sure D0 state if device has Power Managmet capability.
 - Use aprint_*.
 - Change some cosmetic.

XXX not tested.

 - Move re_diag() from bus independend code to PCI attachment code.

XXX: I tested cardbus device,but not PCI device.

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.