diff options
| author | Adrian Chadd <adrian@FreeBSD.org> | 2014-07-20 07:45:48 +0000 |
|---|---|---|
| committer | Adrian Chadd <adrian@FreeBSD.org> | 2014-07-20 07:45:48 +0000 |
| commit | e3af537e75e24de22706a0208bcb8252133cb12a (patch) | |
| tree | 731297542b04d4c4b5d171e4caa3858a0262eec8 /sys/dev | |
| parent | e965b0dcd130fc8b0d1bc7dfa15b1dd6c4fab14d (diff) | |
| download | src-e3af537e75e24de22706a0208bcb8252133cb12a.tar.gz src-e3af537e75e24de22706a0208bcb8252133cb12a.zip | |
Teach ixgbe(4) about rss_gethashconfig().
If RSS is enabled, ixgbe(4) will query the RSS API for the types of hashes
which should be used. It'll then only enable hashes that are exposed via
the RSS layer.
This way it won't try to do things like enable UDP hashing if RSS explicitly
states that it isn't supported in lookups.
Tested:
* 82599EB ixgbe(4) NIC
Notes
Notes:
svn path=/head/; revision=268916
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ixgbe/ixgbe.c | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/sys/dev/ixgbe/ixgbe.c b/sys/dev/ixgbe/ixgbe.c index f5b63d853066..151bb797ba0d 100644 --- a/sys/dev/ixgbe/ixgbe.c +++ b/sys/dev/ixgbe/ixgbe.c @@ -4204,6 +4204,9 @@ ixgbe_initialise_rss_mapping(struct adapter *adapter) int i, j, queue_id; uint32_t rss_key[10]; uint32_t mrqc; +#ifdef RSS + uint32_t rss_hash_config; +#endif /* Setup RSS */ reta = 0; @@ -4247,6 +4250,32 @@ ixgbe_initialise_rss_mapping(struct adapter *adapter) IXGBE_WRITE_REG(hw, IXGBE_RSSRK(i), rss_key[i]); /* Perform hash on these packet types */ +#ifdef RSS + mrqc = IXGBE_MRQC_RSSEN; + rss_hash_config = rss_gethashconfig(); + if (rss_hash_config & RSS_HASHTYPE_RSS_IPV4) + mrqc |= IXGBE_MRQC_RSS_FIELD_IPV4; + if (rss_hash_config & RSS_HASHTYPE_RSS_TCP_IPV4) + mrqc |= IXGBE_MRQC_RSS_FIELD_IPV4_TCP; + if (rss_hash_config & RSS_HASHTYPE_RSS_IPV6) + mrqc |= IXGBE_MRQC_RSS_FIELD_IPV6; + if (rss_hash_config & RSS_HASHTYPE_RSS_TCP_IPV6) + mrqc |= IXGBE_MRQC_RSS_FIELD_IPV6_TCP; + if (rss_hash_config & RSS_HASHTYPE_RSS_IPV6_EX) + mrqc |= IXGBE_MRQC_RSS_FIELD_IPV6_EX; + if (rss_hash_config & RSS_HASHTYPE_RSS_TCP_IPV6_EX) + mrqc |= IXGBE_MRQC_RSS_FIELD_IPV6_EX_TCP; + if (rss_hash_config & RSS_HASHTYPE_RSS_UDP_IPV4) + mrqc |= IXGBE_MRQC_RSS_FIELD_IPV4_UDP; + if (rss_hash_config & RSS_HASHTYPE_RSS_UDP_IPV4_EX) + device_printf(adapter->dev, + "%s: RSS_HASHTYPE_RSS_UDP_IPV4_EX defined, " + "but not supported\n", __func__); + if (rss_hash_config & RSS_HASHTYPE_RSS_UDP_IPV6) + mrqc |= IXGBE_MRQC_RSS_FIELD_IPV6_UDP; + if (rss_hash_config & RSS_HASHTYPE_RSS_UDP_IPV6_EX) + mrqc |= IXGBE_MRQC_RSS_FIELD_IPV6_EX_UDP; +#else /* * Disable UDP - IP fragments aren't currently being handled * and so we end up with a mix of 2-tuple and 4-tuple @@ -4267,6 +4296,7 @@ ixgbe_initialise_rss_mapping(struct adapter *adapter) | IXGBE_MRQC_RSS_FIELD_IPV6_EX_UDP #endif ; +#endif /* RSS */ IXGBE_WRITE_REG(hw, IXGBE_MRQC, mrqc); } |