kern/183167: RTL8111/8168 fails to attach.

[Edward O'Callaghan]

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

From: Edward O'Callaghan <eocallaghan at alterapraxis.com>
To: bug-followup at FreeBSD.org,eocallaghan at alterapraxis.com
Cc:  
Subject: Re: kern/183167: RTL8111/8168 fails to attach.
Date: Wed, 23 Oct 2013 03:40:34 +1100

 --MP_/IgIZzM0sgnOe4YTg117kGzi
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 Possible patch attached. Needs a review and better testing.
 --MP_/IgIZzM0sgnOe4YTg117kGzi
 Content-Type: text/x-patch
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename=0001-Add-preliminary-support-for-some-newer-RTL8111-8168-.patch
 
 From 7d54f474d91b362c3e90894ab99ccf7655c60204 Mon Sep 17 00:00:00 2001
 From: Edward O'Callaghan <eocallaghan at alterapraxis.com>
 Date: Wed, 23 Oct 2013 01:16:14 +1100
 Subject: [PATCH] Add preliminary support for some newer RTL8111/8168 Express
  Gigabit Ethernet controllers such as the one found in PR183167.
 Organization: Altera Praxis Pty Ltd.
 To: freebsd-net at freebsd.org
 
 Signed-off-by: Edward O'Callaghan <eocallaghan at alterapraxis.com>
 ---
  sys/dev/re/if_re.c | 6 ++++++
  sys/pci/if_rlreg.h | 3 +++
  2 files changed, 9 insertions(+)
 
 diff --git a/sys/dev/re/if_re.c b/sys/dev/re/if_re.c
 index 381fa87..0ea330a 100644
 --- a/sys/dev/re/if_re.c
 +++ b/sys/dev/re/if_re.c
 @@ -234,6 +234,9 @@ static const struct rl_hwrev re_hwrevs[] = {
  	{ RL_HWREV_8168E, RL_8169, "8168E/8111E", RL_JUMBO_MTU_9K},
  	{ RL_HWREV_8168E_VL, RL_8169, "8168E/8111E-VL", RL_JUMBO_MTU_6K},
  	{ RL_HWREV_8168F, RL_8169, "8168F/8111F", RL_JUMBO_MTU_9K},
 +	{ RL_HWREV_8168G, RL_8169, "8168G/8111G", RL_MTU},
 +	{ RL_HWREV_8168EP, RL_8169, "8168G/8111EP", RL_MTU},
 +	{ RL_HWREV_8168GU, RL_8169, "8168G/8111GU", RL_MTU},
  	{ RL_HWREV_8411, RL_8169, "8411", RL_JUMBO_MTU_9K},
  	{ 0, 0, NULL, 0 }
  };
 @@ -1451,6 +1454,7 @@ re_attach(device_t dev)
  		    RL_FLAG_DESCV2 | RL_FLAG_MACSTAT | RL_FLAG_AUTOPAD |
  		    RL_FLAG_JUMBOV2 | RL_FLAG_WAIT_TXPOLL | RL_FLAG_WOL_MANLINK;
  		break;
 +	case RL_HWREV_8168GU:
  	case RL_HWREV_8168E:
  		sc->rl_flags |= RL_FLAG_PHYWAKE | RL_FLAG_PHYWAKE_PM |
  		    RL_FLAG_PAR | RL_FLAG_DESCV2 | RL_FLAG_MACSTAT |
 @@ -1458,7 +1462,9 @@ re_attach(device_t dev)
  		    RL_FLAG_WOL_MANLINK;
  		break;
  	case RL_HWREV_8168E_VL:
 +	case RL_HWREV_8168EP:
  	case RL_HWREV_8168F:
 +	case RL_HWREV_8168G:
  	case RL_HWREV_8411:
  		sc->rl_flags |= RL_FLAG_PHYWAKE | RL_FLAG_PAR |
  		    RL_FLAG_DESCV2 | RL_FLAG_MACSTAT | RL_FLAG_CMDSTOP |
 diff --git a/sys/pci/if_rlreg.h b/sys/pci/if_rlreg.h
 index 142fe48..95550b7 100644
 --- a/sys/pci/if_rlreg.h
 +++ b/sys/pci/if_rlreg.h
 @@ -192,6 +192,9 @@
  #define	RL_HWREV_8106E		0x44800000
  #define	RL_HWREV_8168F		0x48000000
  #define	RL_HWREV_8411		0x48800000
 +#define RE_HWREV_8168G      0x4C000000
 +#define RE_HWREV_8168EP     0x50000000
 +#define RE_HWREV_8168GU     0x50800000      /* 8106EUS */
  #define	RL_HWREV_8139		0x60000000
  #define	RL_HWREV_8139A		0x70000000
  #define	RL_HWREV_8139AG		0x70800000
 -- 
 1.8.4.1
 
 
 --MP_/IgIZzM0sgnOe4YTg117kGzi--