From: David S. Miller Date: Tue, 23 Aug 2016 07:13:11 +0000 (-0700) Subject: Merge branch 'cpsw-mq' X-Git-Tag: v4.9-rc1~127^2~407 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=2d03d4394c13d017968c707150d97ad251900084;p=linux.git Merge branch 'cpsw-mq' Ivan Khoronzhuk says: ==================== net: ethernet: ti: cpsw: add cpdma multi-queue support This series is intended to allow cpsw driver to use cpdma ability of h/w shaper to send/receive data with up to 8 tx and 8 rx queues. This series doesn't contain interface to configure h/w shaper itself, it contains only multi-queue support part and ability to configure number of tx/rx queues with ethtool, it also doesn't contain mapping of input traffic to rx queues, as it can depend on usage and requires separate interface for setup. Default shaper mode - priority mode. The h/w shaper configuration will be added with separate patch series. This series doesn't affect on net throughput. Tested on: am572x-idk, 1Gbps link am335-boneblack, 100Mbps link. A simple example for splitting traffic on queues: $ ethtool -l eth0 $ ethtool -L eth0 rx 8 tx 8 $ tc qdisc add dev eth0 root handle 1: multiq $ tc filter add dev eth0 parent 1: protocol ip prio 1 u32 \ match ip dst 172.22.39.12 \ action skbedit queue_mapping 5 Based on: net-next/master V3: https://lkml.org/lkml/2016/8/15/788 Since v3: -changed arg to priv in fill_rx_channels in net: ethernet: ti: davinci_cpdma: split descs num between all channels - added more comments to cpsw_set_channels Since v2: - added new patch to avoid warn while ctrl stop net: ethernet: ti: cpsw: add ethtool channels support - enable ctrl in case at least one interface is running Since v1: - removed cpdam_check_free_desc function - remove pm_runtime calls as they are used in begin/complete ethtool calls now - removed change of driver version. it can be done later - corrected setup of channels for dual_emac mode with ethtool ==================== Signed-off-by: David S. Miller --- 2d03d4394c13d017968c707150d97ad251900084