summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-10-08ethtool: fix flow control register dump for 82599 and newerEmil Tantilov1-9/+129
Fix reporting of the flow control settings in the register dump for ixgbe. Use MFLCN for 82599 and X540 HW instead of FCTRL. This patch also adds the ability to check for mac type. Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com> Tested-by: Stephen Ko <stephen.s.ko@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
2011-10-04ethtool: add support for external loopback.Sucheta Chakraborty2-6/+23
External loopback will be performed in addition to other offline tests. User need to pass new parameter "external_lb" for the same. Reqd. man page changes included. Signed-off-by: Sucheta Chakraborty <sucheta.chakraborty@qlogic.com> [bwh: Report whether the external loopback test 'was', not 'is' executed. For compatibility, don't report this if not requested.] Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
2011-10-04ethtool-copy.h: sync with net-nextBen Hutchings1-93/+106
This covers kernel changes up to: commit a355d865f99d0dbbaba5595416e292592bd347dd Author: françois romieu <romieu@fr.zoreil.com> Date: Fri Sep 30 00:39:23 2011 +0000 tehuti: shorten PCI device table. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
2011-08-31ethtool: Uncook tg3 regdump outputMatt Carlson1-23/+7
tg3 devices have changed a lot since the bcm5700 days. Register blocks have been added, removed and redefined. The existing tg3 register dump code has not kept up. This patch changes the tg3_dump_regs() function to be more simplistic. Rather than attempting to locate where meaningful data is, it will instead print the registers as 32-bit values, omitting all registers that have a value of zero. By performing the output this way, we hope to future-proof the interface. Signed-off-by: Matt Carlson <mcarlson@broadcom.com> Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
2011-08-04Release version 3.0.Ben Hutchings2-1/+13
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
2011-07-14Correct parameter types for ethtool -e and ethtool -EBen Hutchings1-16/+24
All parameters to the underlying ethtool commands are unsigned, not signed. In particular, the 'magic' parameter to ethtool -E often has the most significant bit set and users should not have to provide it as a negative number. For ethtool -E, the value to be written is 8-bit, not 32-bit. Reported-by: Jens Rottmann <JRottmann@LiPPERTEmbedded.de> Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
2011-07-14ethtool: RX NFC correctionsSebastian Pöhn2-3/+13
This patch: least as long there is no opportunity to use others than IPv4 and there is no frontend option to enter ip_ver. Signed-off-by: Sebastian Poehn <sebastian.poehn@belden.com> Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
2011-06-06ethtool: Add support for 20G link speedYaniv Rosner2-1/+19
Signed-off-by: Yaniv Rosner <yanivr@broadcom.com>
2011-06-02Fix type mismatch for field width argument to fprintf()Ben Hutchings1-1/+1
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
2011-06-02ethtool: Added FW dump supportAnirban Chakraborty2-1/+139
Added support to take FW dump via ethtool. Signed-off-by: Anirban Chakraborty <anirban.chakraborty@qlogic.com> Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
2011-06-01Combine code to display supported and advertised link capabilitiesBen Hutchings1-59/+21
Rename dump_advertised() to dump_link_caps(), and change dump_supported() to call it instead of repeating nearly identical code. Add a separate prefix parameter and adjust indentation so that the output is unchanged except for added lines. Deleted unused parameter and variables. As an immediate benefit, this adds the display of supported pause frame use. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
2011-06-01ethtool-copy.h: sync with net-next-2.6Ben Hutchings1-4/+37
This covers kernel changes up to: commit 34b1ef04fc050d171e055f75d6a3384e1323bd38 Author: Somnath Kotur <somnath.kotur@emulex.com> Date: Wed Jun 1 00:33:22 2011 +0000 be2net: Fallback to the older opcode if MCC_CREATE_EXT opcode is not supported on the card Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
2011-06-01Release version 2.6.39.Ben Hutchings2-1/+17
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
2011-06-01Add new header ethtool-bitops.h to ethtool_SOURCESBen Hutchings1-1/+1
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
2011-06-01ethtool: mask out FLOW_EXTSebastian Pöhn1-0/+3
The FLOW_EXT bit must be masked out. Otherwise if e.g. vlan is set a driver receiving the ntuple may not detect the flow_type correctly! Signed-off-by: Sebastian Poehn <sebastian.poehn@belden.com> [bwh: Fixed spacing] Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
2011-06-01Change bug-address to netdevBen Hutchings1-1/+1
I really want bug reports to go to both me and netdev, but autoconf wants a single address (without a real name). The netdev address is likely to be valid for longer, so use that. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
2011-06-01Correct references to post-2004 changelogsBen Hutchings1-2/+4
Refer to the git repository for the current changelog. Since the BitKeeper changes aren't included in git history, add a full reference to that repository for anyone who cares to look at the intermediate changelog. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
2011-05-13ethtool: Treat positive return from ETHTOOL_SRXNTUPLE as successfulBen Hutchings1-3/+6
The sfc driver can currently return a positive value (the filter index) on success. This is a bug in the driver, but ethtool previously accepted it. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
2011-05-13Add RX packet classification interfaceAlexander Duyck5-266/+1417
This patch was originally introduced as: [PATCH 1/3] [ethtool] Add rx pkt classification interface Signed-off-by: Santwona Behera <santwona.behera@sun.com> http://patchwork.ozlabs.org/patch/23223/ I removed the local caching of rules. I dropped the use of regions as there were multiple issues found. A network flow classifier is defined using the exact same syntax as n-tuple, and the tool will correct for the fact that NFC uses the 1's compliment of the n-tuple mask. I also updated the ordering of new rules being added. All new rules will take the highest numbered open rule when no location is specified. I split out the addition of bitops and the updates to documentation into separate patches. This makes the total patch size a bit more manageable since the addition of NFC and the merging of it with n-tuple were combined into this patch. If we setup a rule and the device has the NTUPLE flag set we will first try to use set_rx_ntuple. If that fails with EOPNOTSUPP we then will attempt to use the network flow classifier rule insertion. Updated the output to make use of the updated network flow classifier extensions that have been accepted into the kernel. Merged the documentation update into this patch. In addition the documentation changes were made such that there is only one listing of the individual options and they are all listed as optional. Several fixes to address things such as the fact that we were maintaining the table logic even though we only need it for displaying all of the rules, or when adding a rule with no location specified. As such all of the logic for deleting or finding rules in the table has been removed. Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com> [bwh: Abbreviated the above commit message. Fixed a minor formatting error in the manual page additions.] Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
2011-05-13Add support for __be64 and bitops, centralize several needed macrosAlexander Duyck2-2/+39
This change is meant to add support for __be64 values and bitops to ethtool. In addition the patch pulls the SIOCETHTOOL define and the ARRAY_SIZE define into ethtool-util.h for later use by the rxclass files. These changes will be needed in order to support network flow classifier rule configuration. Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com> Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
2011-05-13Cleanup defines and header includes to address several issuesAlexander Duyck2-18/+16
This change is meant to address several issues. First it moves the check for ethtool-config.h into ethtool-util.h the reason for this change is so that any references to ethtool-util.h outside of ethtool.c will use the correct defines for the endian types. In addition I have pulled several headers that will be common to both ethtool.c and rxclass.c into the ethtool-util.h header file. I am also centralizing several macros that will be needed across multiple files when I implement the network flow classifier rules. Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com> Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
2011-05-13ethtool: remove strings based approach for displaying n-tupleAlexander Duyck1-44/+0
This change is meant to remove the strings based approach for displaying n-tuple filters. A follow-on patch will replace that functionality with a network flow classification based approach that will get the number of filters, get their locations, and then request and display them individually. Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com> Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
2011-05-05Support e1000 M88 PHY registers in -dAnthony DeRobertis1-0/+121
The M88 PHY registers contain useful information like the cable length estimate and the MDI/MDIX status. The attached patch makes -d dump them. Signed-off-by: Anthony DeRobertis <anthony@derobert.net> Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
2011-05-04ethtool-copy.h: sync with net-next-2.6Ben Hutchings1-1/+124
This covers kernel changes up to: commit 2bd93d7af1581d40e3c4b25242472661cb7c637a Merge: 64cad2a 0972ddb Author: David S. Miller <davem@davemloft.net> Date: Tue Apr 26 12:16:46 2011 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
2011-04-27Add support for NFC flow classifier extensionsAlexander Duyck1-11/+28
This change makes it so that we can add VLAN Ethertype, TCI, and 64bits of driver defined data to a network flow classifier allowing us to handle a n-tuple flow contained within a network flow classifier. Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
2011-04-27Add support for ESP as a separate protocol from AHAlexander Duyck2-12/+17
This change is mostly cosmetic. NIU had supported AH and ESP seperately. As such it is possible that a return value of ESP or AH may be returned for a has request instead of the AH_ESP combined value. To resolve that the inputs are combined for AH and ESP into the AH_ESP value and return values for AH and ESP will display the combined string info. Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
2011-04-09ethtool: fix manpage so that it will display tables againAlexander Duyck1-7/+7
The current ethtool manpage is not displaying tables. After trying to pass the manpage through tbl I repeatedly saw the error: tbl:ethtool.8.in:707: unrecognised format `x' tbl:ethtool.8.in:707: giving up on this table By dropping the 'x' the errors went away and when I built the manpage the tables reappeared so I am assuming this is the correct approach. [bwh: This format modifier improves table layout in groff 1.20.1, but it's not worth losing backward compatibility.] Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com> [bwh: Removed two more 'x' format modifiers] Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
2011-03-23ethtool.8: Fix line-wrapping of optionsBen Hutchings1-100/+108
Several options that take many keyword arguments are now formatted as huge blocks of texts in the synopsis. This is not very readable and it results in a mixture of literal (must be typed) and non-literal (must not be typed) hyphens. Even with hyphenation, full justification can insert extra space that look wrong in commands. There are also minor problems with hyphenation in the detailed descriptiona. Therefore: - Disable full justification and automatic hyphenation in the synopsis - Use the .HP macro (paragraph with hanging indent) in the synopsis for all options that aren't already formatted with the .TP macro - Write all literal hyphens as '\-' so they are not used for line- breaking Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
2011-03-23ethtool.8: Fix initial blank line/pageBen Hutchings1-1/+3
The .TH macro inserts a page break. There is currently a non-macro line before it, and even though that line is blank this results in a blank line in the terminal and a whole blank page when rendering as Postscript. Use a null macro instead. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
2011-03-23ethtool.8: Format tables with tblBen Hutchings1-163/+86
This makes both the source and the output look nicer. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
2011-03-23ethtool: remove mask for Auto in advertise sectionEmil Tantilov1-2/+0
The mask for Auto in the advertise section is incorrect for any interface that supports speeds > 1000Mbps. Since the description already states that the mask can be a combination of the supported values it's probably better to just remove it. 'Auto' was misleading anyway. Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com> Tested-by: Stephen Ko <stephen.s.ko@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
2011-03-18ethtool: Report driver features described in struct ethtool_drvinfoBen Hutchings1-2/+10
ETHTOOL_GDRVINFO fills out struct ethtool_drvinfo with the size of the data returned by various other operations. The size should be non-zero if and only if the driver implements that operation. Therefore, we can report whether the driver supports certain operations without actually trying them (which may be expensive and disruptive). Do this in dump_drvinfo() rather than adding a separation operation. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
2011-03-15Release version 2.6.38.Ben Hutchings2-1/+14
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
2011-02-21ethtool: Add --version optionBen Hutchings2-0/+11
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
2011-02-21ethtool: Indent the no-options usage line consistently with the othersBen Hutchings1-1/+2
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
2011-02-21ethtool: Allow for long options with no short option and without a device nameBen Hutchings1-9/+14
Change loop conditions to check for a long option string. Generalise check for whether option requires a device name. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
2011-02-21ethtool: Report an error if given an unrecognised optionBen Hutchings1-2/+3
Previously we would print full usage information and return 0. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
2011-02-21ethtool: Split show_usage() into two functionsBen Hutchings1-71/+73
show_usage(0) and show_usage(1) now do unrelated things; split it into show_usage() and exit_bad_args(). Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
2011-02-21Add macro for displaying [value N] formatting to manpageAlexander Duyck1-64/+38
This change adds a macro for displaying optional values that take a numeric value to the manpage. Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com> Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
2011-02-18ethtool: Don't silently ignore speed/duplex when autoneg is onBen Hutchings1-14/+31
When autonegotiation is enabled, drivers must determine link speed and duplex through the autonegotiation process and will generally ignore the speed and duplex specified in struct ethtool_cmd. Currently, if the user specifies autoneg on but does not specify the advertising mask then: - If the user specifies a recognised combination of speed and duplex, we set the advertising mask to the flag for that mode. (Currently only one mode is recognised per combination of speed and duplex.) - Otherwise, we advertise all recognised and supported modes. But we should also set the advertising mask if autoneg is *already* on. Also, we should be able to limit the advertised modes separately by speed and duplex. For now, we just warn if we fail to do that. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
2011-01-10ethtool.8: Fix capitalisationBen Hutchings1-8/+8
Write 'Ethernet' and 'PHY' thus. Use the proper macro for the trademark symbol. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
2011-01-10ethtool.8: Reword synopses for consistency and styleBen Hutchings1-3/+3
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
2011-01-10ethtool.8: Generalise references to network devices, not EthernetBen Hutchings1-19/+20
Most operations are generically applicable to devices using other link-layer protocols. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
2011-01-10ethtool.8: Fix obvious spelling errorsBen Hutchings1-2/+2
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
2011-01-10ethtool.8: Substitute version at configure timeBen Hutchings2-2/+2
Rename ethtool.8 to ethtool.8.in and let autoconf set the version. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
2011-01-10ethtool.8: Update date, version, web site referenceBen Hutchings1-4/+41
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
2011-01-10ethtool: Fix spelling and spacing in online helpBen Hutchings1-2/+2
Kelly Anderson <kelly@silka.with-linux.com> pointed out that the help for --show-nfc was missing a space between two words. I checked the rest of the help text with aspell and found one other error. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
2011-01-05Release version 2.6.37.Ben Hutchings2-1/+6
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
2010-12-15ethtool: Remove suggested change of no-args behaviour from the TODO listBen Hutchings1-1/+1
ethtool can show information about many more settings than mii-tool. It would be useful to have the option to show certain settings for all interfaces, but this should not be restricted to the basic settings. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
2010-12-15ethtool: Remove manual page from TODO listBen Hutchings1-1/+0
The manual page provides a pretty good explanation of all options now. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>