forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
Pull networking updates from David Miller:
1) More iov_iter conversion work from Al Viro.
[ The "crypto: switch af_alg_make_sg() to iov_iter" commit was
wrong, and this pull actually adds an extra commit on top of the
branch I'm pulling to fix that up, so that the pre-merge state is
ok. - Linus ]
2) Various optimizations to the ipv4 forwarding information base trie
lookup implementation. From Alexander Duyck.
3) Remove sock_iocb altogether, from CHristoph Hellwig.
4) Allow congestion control algorithm selection via routing metrics.
From Daniel Borkmann.
5) Make ipv4 uncached route list per-cpu, from Eric Dumazet.
6) Handle rfs hash collisions more gracefully, also from Eric Dumazet.
7) Add xmit_more support to r8169, e1000, and e1000e drivers. From
Florian Westphal.
8) Transparent Ethernet Bridging support for GRO, from Jesse Gross.
9) Add BPF packet actions to packet scheduler, from Jiri Pirko.
10) Add support for uniqu flow IDs to openvswitch, from Joe Stringer.
11) New NetCP ethernet driver, from Muralidharan Karicheri and Wingman
Kwok.
12) More sanely handle out-of-window dupacks, which can result in
serious ACK storms. From Neal Cardwell.
13) Various rhashtable bug fixes and enhancements, from Herbert Xu,
Patrick McHardy, and Thomas Graf.
14) Support xmit_more in be2net, from Sathya Perla.
15) Group Policy extensions for vxlan, from Thomas Graf.
16) Remove Checksum Offload support for vxlan, from Tom Herbert.
17) Like ipv4, support lockless transmit over ipv6 UDP sockets. From
Vlad Yasevich.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1494+1 commits)
crypto: fix af_alg_make_sg() conversion to iov_iter
ipv4: Namespecify TCP PMTU mechanism
i40e: Fix for stats init function call in Rx setup
tcp: don't include Fast Open option in SYN-ACK on pure SYN-data
openvswitch: Only set TUNNEL_VXLAN_OPT if VXLAN-GBP metadata is set
ipv6: Make __ipv6_select_ident static
ipv6: Fix fragment id assignment on LE arches.
bridge: Fix inability to add non-vlan fdb entry
net: Mellanox: Delete unnecessary checks before the function call "vunmap"
cxgb4: Add support in cxgb4 to get expansion rom version via ethtool
ethtool: rename reserved1 memeber in ethtool_drvinfo for expansion ROM version
net: dsa: Remove redundant phy_attach()
IB/mlx4: Reset flow support for IB kernel ULPs
IB/mlx4: Always use the correct port for mirrored multicast attachments
net/bonding: Fix potential bad memory access during bonding events
tipc: remove tipc_snprintf
tipc: nl compat add noop and remove legacy nl framework
tipc: convert legacy nl stats show to nl compat
tipc: convert legacy nl net id get to nl compat
tipc: convert legacy nl net id set to nl compat
...- Loading branch information
Showing
1,236 changed files
with
72,067 additions
and
29,395 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
88 changes: 88 additions & 0 deletions
88
Documentation/devicetree/bindings/net/hisilicon-hip04-net.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| Hisilicon hip04 Ethernet Controller | ||
|
|
||
| * Ethernet controller node | ||
|
|
||
| Required properties: | ||
| - compatible: should be "hisilicon,hip04-mac". | ||
| - reg: address and length of the register set for the device. | ||
| - interrupts: interrupt for the device. | ||
| - port-handle: <phandle port channel> | ||
| phandle, specifies a reference to the syscon ppe node | ||
| port, port number connected to the controller | ||
| channel, recv channel start from channel * number (RX_DESC_NUM) | ||
| - phy-mode: see ethernet.txt [1]. | ||
|
|
||
| Optional properties: | ||
| - phy-handle: see ethernet.txt [1]. | ||
|
|
||
| [1] Documentation/devicetree/bindings/net/ethernet.txt | ||
|
|
||
|
|
||
| * Ethernet ppe node: | ||
| Control rx & tx fifos of all ethernet controllers. | ||
| Have 2048 recv channels shared by all ethernet controllers, only if no overlap. | ||
| Each controller's recv channel start from channel * number (RX_DESC_NUM). | ||
|
|
||
| Required properties: | ||
| - compatible: "hisilicon,hip04-ppe", "syscon". | ||
| - reg: address and length of the register set for the device. | ||
|
|
||
|
|
||
| * MDIO bus node: | ||
|
|
||
| Required properties: | ||
|
|
||
| - compatible: should be "hisilicon,hip04-mdio". | ||
| - Inherits from MDIO bus node binding [2] | ||
| [2] Documentation/devicetree/bindings/net/phy.txt | ||
|
|
||
| Example: | ||
| mdio { | ||
| compatible = "hisilicon,hip04-mdio"; | ||
| reg = <0x28f1000 0x1000>; | ||
| #address-cells = <1>; | ||
| #size-cells = <0>; | ||
|
|
||
| phy0: ethernet-phy@0 { | ||
| compatible = "ethernet-phy-ieee802.3-c22"; | ||
| reg = <0>; | ||
| marvell,reg-init = <18 0x14 0 0x8001>; | ||
| }; | ||
|
|
||
| phy1: ethernet-phy@1 { | ||
| compatible = "ethernet-phy-ieee802.3-c22"; | ||
| reg = <1>; | ||
| marvell,reg-init = <18 0x14 0 0x8001>; | ||
| }; | ||
| }; | ||
|
|
||
| ppe: ppe@28c0000 { | ||
| compatible = "hisilicon,hip04-ppe", "syscon"; | ||
| reg = <0x28c0000 0x10000>; | ||
| }; | ||
|
|
||
| fe: ethernet@28b0000 { | ||
| compatible = "hisilicon,hip04-mac"; | ||
| reg = <0x28b0000 0x10000>; | ||
| interrupts = <0 413 4>; | ||
| phy-mode = "mii"; | ||
| port-handle = <&ppe 31 0>; | ||
| }; | ||
|
|
||
| ge0: ethernet@2800000 { | ||
| compatible = "hisilicon,hip04-mac"; | ||
| reg = <0x2800000 0x10000>; | ||
| interrupts = <0 402 4>; | ||
| phy-mode = "sgmii"; | ||
| port-handle = <&ppe 0 1>; | ||
| phy-handle = <&phy0>; | ||
| }; | ||
|
|
||
| ge8: ethernet@2880000 { | ||
| compatible = "hisilicon,hip04-mac"; | ||
| reg = <0x2880000 0x10000>; | ||
| interrupts = <0 410 4>; | ||
| phy-mode = "sgmii"; | ||
| port-handle = <&ppe 8 2>; | ||
| phy-handle = <&phy1>; | ||
| }; |
Oops, something went wrong.