- 31 Mar, 2015 40 commits
-
-
David S. Miller authored
Nicolas Ferre says: ==================== net/macb: fixes after big driver update The recent modifications to the macb driver lead to issues with the probe function code flow. Here are some attempt to fix them. This time, some more issues are fixed related to the clock as reported by Boris Brezillon. The series is written on top of net-next. Changes in v2: - address Cyrille comment about exit condition of queue configuration loop - add fixes for probe sequence related to clocks - add ethtool register dump - fix peripheral version test ==================== Signed-off-by:David S. Miller <davem@davemloft.net>
-
Nicolas Ferre authored
As we need to check peripheral version from the hardware during probe, I introduce a little helper to unify these tests. It would prevent to de-synchronize the test like previously observed. Signed-off-by:
Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by:
-
Nicolas Ferre authored
We currently need two checks of the peripheral version in MACB_MID register. One of them got out of sync after modification by 8a013a9c (net: macb: Include multi queue support for xilinx ZynqMP ethernet version). Fix this in macb_configure_caps() so that xilinx ZynqMP will be considered as a GEM flavor. Fixes: 8a013a9c ("net: macb: Include multi queue support for xilinx ZynqMP ethernet version") Signed-off-by:
-
Nicolas Ferre authored
User i/o register EMAC_USRIO or GMAC_UR can be found on both macb and gem flavors of the peripheral. By using the proper accessor, we can add it to the register dump feature of ethtool. Increment the version of this API so it can be noticed from user space. Signed-off-by:
-
Nicolas Ferre authored
As accessing the peripheral registers need the clocks to be set, we have to enable them as soon as possible. Their configuration depend on the type of device used and determined by the DT compatible string. That lead to add another initialization function in the DT configuration structure. As the device private structure length depend on an information read in the registers, we have to store the clock pointers in temporary variables before feeding the structure fields. Signed-off-by:
-
Nicolas Ferre authored
As a non-native English speaker, I would correct "capacities" of the macb peripheral to "capabilities": correct me if I'm wrong! Signed-off-by:
-
Nicolas Ferre authored
Capabilities configuration by macb_configure_caps() was moved far too late by 421d9df0 (net/macb: merge at91_ether driver into macb driver) which would lead to badly configured hardware. So, move this function to early probe and modify its prototype to re-gain its original behavior. DT data retrieval is also moved to simplify the probe code flow. Signed-off-by:
-
Nicolas Ferre authored
As we access the MID register directly, we need to tell why we don't use the macb_is_gem() dedicated function. Signed-off-by:
-
Nicolas Ferre authored
When merging at91_ether and macb driver during 421d9df0 (net/macb: merge at91_ether driver into macb driver) the probe function has been split. The code dealing with initialization of queues is now moved in macb_init() which needs information computed in the parent macb_probe() function. So, add the queue_mask information to the private structure and use it when needed in macb_init(). Signed-off-by:
Boris Brezillon <boris.brezillon@free-electrons.com> Cc: Cyrille Pitchen <cyrille.pitchen@atmel.com> Signed-off-by:
-
Fabio Estevam authored
Commit cb6e0b36 ("net: smc91x: make use of 4th parameter to devm_gpiod_get_index") caused the following build warning: drivers/net/ethernet/smsc/smc91x.c:2208:6: warning: unused variable 'res' [-Wunused-variable] Remove the unused 'res' variable. Reported-by:
Olof's autobuilder <build@lixom.net> Signed-off-by:
Fabio Estevam <fabio.estevam@freescale.com> Acked-by:
Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by:
-
David S. Miller authored
Merge tag 'mac80211-next-for-davem-2015-03-30' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next Johannes Berg says: ==================== Lots of updates for net-next; along with the usual flurry of small fixes, cleanups and internal features we have: * VHT support for TDLS and IBSS (conditional on drivers though) * first TX performance improvements (the biggest will come later) * many suspend/resume (race) fixes * name_assign_type support from Tom Gundersen ==================== Signed-off-by:
-
Jiri Pirko authored
Unlike other places, this function uses name "dev" for what should be "orig_dev", which might be a bit confusing. So fix this. Signed-off-by:
Jiri Pirko <jiri@resnulli.us> Signed-off-by:
-
David S. Miller authored
Or Gerlitz says: ==================== mlx4: Extend statistics gathering and display This series from Eran and Matan extends the statistics collected and later reported to the user via ethtool for native mode and SRIOV PF. More Packet statistics, PFC statistics and global pause statistics are now displayed via ethtool. ==================== Signed-off-by: -
Eran Ben Elisha authored
More packet statistics are now calculated and visible to the user via ethtool: - RX packet errors statistics. - TX/RX drops are now calculated. - TX multicast and broadcast statistics. - RX/TX per priority bytes statistics. - RX/TX no vlan packets and bytes statistics. Signed-off-by:
Eran Ben Elisha <eranbe@mellanox.com> Signed-off-by:
Hadar Hen Zion <hadarh@mellanox.com> Signed-off-by:
Or Gerlitz <ogerlitz@mellanox.com> Signed-off-by:
-
Matan Barak authored
Flow control per priority and Global pause counters are now visible via ethtool. The counters shows statistics regarding pauses in the device. Signed-off-by:
Matan Barak <matanb@mellanox.com> Signed-off-by:
Shani Michaeli <shanim@mellanox.com> Signed-off-by:
-
Eran Ben Elisha authored
This will allow parallel access to the statistics bitmap. A pre-step for adding PFC counters, where the statistics bitmap can be dynamically changed when modifying the PFC setting. Signed-off-by:
-
Eran Ben Elisha authored
The driver uses a bitmask to indicate which statistics should be displayed to the user in ethtool. The bitmask is u64, therefore we are limited for a selective view of up to 64 statistics. Extend the bitmap in order to show more than 64 statistics. In addition, add packet statistics to the ethtool display for PF. Signed-off-by:
-
Eran Ben Elisha authored
The statistics bitmap belongs to the Ethernet driver, move it there. Signed-off-by:
-
Eran Ben Elisha authored
Add mlx4_stats.h file and move there all statistics structs and marcos. Signed-off-by:
-
Eran Ben Elisha authored
Two counters (rx_chksum_complete and tx_chksum_offload) are not displayed under SRIOV for the PF via ethtool because their bit mask is off, fix that. Fixes: f8c6455b ('net/mlx4_en: Extend checksum offloading by CHECKSUM COMPLETE') Fixes: 9fab426d ('mlx4: add a new xmit_more counter') Signed-off-by:
-
David S. Miller authored
Petri Gynther says: ==================== net: bcmgenet: code cleanup Five patches to clean up bcmgenet code: 1. add UMAC_IRQ_RXDMA_DONE and UMAC_IRQ_TXDMA_DONE 2. remove __bcmgenet_fini_dma() 3. fix bcmgenet_open() 4. add UMAC_IRQ_LINK_EVENT 5. fix the call to phy_mac_interrupt() ==================== Signed-off-by: -
Petri Gynther authored
On phy_mac_interrupt() call, the new_link parameter should be 0 or 1. Signed-off-by:
Petri Gynther <pgynther@google.com> Signed-off-by:
-
Petri Gynther authored
Add #define UMAC_IRQ_LINK_EVENT to simplify link event handling code. Signed-off-by:
-
Petri Gynther authored
If bcmgenet_init_dma() fails, it cleans up after itself. Rx and Tx DMAs are off, and NAPI instances haven't been netif_napi_add()'ed. Therefore, we need to skip calling bcmgenet_fini_dma() on the error handling path. bcmgenet_resume() already does this correctly. Signed-off-by:
-
Petri Gynther authored
bcmgenet_fini_dma() is the only caller of __bcmgenet_fini_dma(). Move __bcmgenet_fini_dma() code inside bcmgenet_fini_dma(). Signed-off-by:
-
Petri Gynther authored
Add #define for UMAC_IRQ_RXDMA_DONE and UMAC_IRQ_TXDMA_DONE in order to simplify the code that handles Rx and Tx default queue interrupts. Signed-off-by:
-
David S. Miller authored
K. Y. Srinivasan says: ==================== hv_netvsc: Eliminate memory allocation in the send path The network protocol used to communicate with the host is the remote ndis (rndis) protocol. We need to decorate each outgoing packet with a rndis header and additional rndis state (rndis per-packet state). To manage this state, we currently allocate memory in the transmit path. Eliminate this allocation by requesting additional head room in the skb. ==================== Signed-off-by: -
KY Srinivasan authored
The network protocol used to communicate with the host is the remote ndis (rndis) protocol. We need to decorate each outgoing packet with a rndis header and additional rndis state (rndis per-packet state). To manage this state, we currently allocate memory in the transmit path. Eliminate this allocation by requesting additional head room in the skb. Signed-off-by:
K. Y. Srinivasan <kys@microsoft.com> Signed-off-by:
-
KY Srinivasan authored
In preparation for embedding the rndis state and other packet state into the skb, cleanup the test for freeing the skb. Signed-off-by:
-
Joe Perches authored
Use bool constants as the return values instead of 1 and 0. Signed-off-by:
Joe Perches <joe@perches.com> Acked-by:
Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by:
-
David S. Miller authored
Jiri Benc says: ==================== netlink: access functions for IP address attributes There are many places that read or write IP addresses to netlink attributes. With IPv6 addresses, every such place currently has to use generic nla_put and nla_memcpy. Implementing IPv6 address access functions simplify things and makes the code more intelligible. IPv4 address access functions has lesser value but it would be better to be consistent between IPv6 and IPv4 and they still serve as documentation. The conversion is straightforward and the resulting patches are not that large, thus I kept all the changes in the patches that introduce the access functions. If anyone prefers to split the definition of access functions and the conversion and/or break it out by network protocols, please let me know. While doing the conversion, I came across ugly typecasting in inetpeer_addr_base and xfrm_address_t when dealing with IPv6 addresses. Instead of introducing more of this, I cleaned it up. Those are the first two patches, serving as a prerequisite to the latter two. ==================== Signed-off-by: -
Jiri Benc authored
Those are counterparts to nla_put_in_addr and nla_put_in6_addr. Signed-off-by:
Jiri Benc <jbenc@redhat.com> Signed-off-by:
-
Jiri Benc authored
IP addresses are often stored in netlink attributes. Add generic functions to do that. For nla_put_in_addr, it would be nicer to pass struct in_addr but this is not used universally throughout the kernel, in way too many places __be32 is used to store IPv4 address. Signed-off-by:
-
Jiri Benc authored
In many places, the a6 field is typecasted to struct in6_addr. As the fields are in union anyway, just add in6_addr type to the union and get rid of the typecasting. Modifying the uapi header is okay, the union has still the same size. Signed-off-by:
-
Jiri Benc authored
In many places, the a6 field is typecasted to struct in6_addr. As the fields are in union anyway, just add in6_addr type to the union and get rid of the typecasting. Signed-off-by:
-
Jiri Benc authored
Some lines in vxlan code are indented by 7 spaces instead of a tab. Fixes: e4c7ed41 ("vxlan: add ipv6 support") Signed-off-by:
Cong Wang <xiyou.wangcong@gmail.com> Signed-off-by:
-
David S. Miller authored
Ian Morris says: ==================== ipv6: coding style - comparisons with NULL The following patches address some coding style issues only. No functional changes and no changes detected by objdiff. The IPV6 code uses multiple different styles when comparing with NULL (I.e. x == NULL and !x as well as x != NULL and x). Generally the latter form is preferred according to checkpatch and so this changes aligns the code to this style. ==================== Signed-off-by: -
Ian Morris authored
The ipv6 code uses a mixture of coding styles. In some instances check for NULL pointer is done as x != NULL and sometimes as x. x is preferred according to checkpatch and this patch makes the code consistent by adopting the latter form. No changes detected by objdiff. Signed-off-by:
Ian Morris <ipm@chirality.org.uk> Signed-off-by:
-
Ian Morris authored
The ipv6 code uses a mixture of coding styles. In some instances check for NULL pointer is done as x == NULL and sometimes as !x. !x is preferred according to checkpatch and this patch makes the code consistent by adopting the latter form. No changes detected by objdiff. Signed-off-by:
-
David S. Miller authored
Yuval Mintz says: ==================== bnx2x: link and protection changes This patch series contains 2 small additions to link configuration, as well as a safeguard against loading the device on a hardware at a failed state. ==================== Signed-off-by:
-
