forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
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: "Reasonably busy this cycle, but perhaps not as busy as in the 4.12 merge window: 1) Several optimizations for UDP processing under high load from Paolo Abeni. 2) Support pacing internally in TCP when using the sch_fq packet scheduler for this is not practical. From Eric Dumazet. 3) Support mutliple filter chains per qdisc, from Jiri Pirko. 4) Move to 1ms TCP timestamp clock, from Eric Dumazet. 5) Add batch dequeueing to vhost_net, from Jason Wang. 6) Flesh out more completely SCTP checksum offload support, from Davide Caratti. 7) More plumbing of extended netlink ACKs, from David Ahern, Pablo Neira Ayuso, and Matthias Schiffer. 8) Add devlink support to nfp driver, from Simon Horman. 9) Add RTM_F_FIB_MATCH flag to RTM_GETROUTE queries, from Roopa Prabhu. 10) Add stack depth tracking to BPF verifier and use this information in the various eBPF JITs. From Alexei Starovoitov. 11) Support XDP on qed device VFs, from Yuval Mintz. 12) Introduce BPF PROG ID for better introspection of installed BPF programs. From Martin KaFai Lau. 13) Add bpf_set_hash helper for TC bpf programs, from Daniel Borkmann. 14) For loads, allow narrower accesses in bpf verifier checking, from Yonghong Song. 15) Support MIPS in the BPF selftests and samples infrastructure, the MIPS eBPF JIT will be merged in via the MIPS GIT tree. From David Daney. 16) Support kernel based TLS, from Dave Watson and others. 17) Remove completely DST garbage collection, from Wei Wang. 18) Allow installing TCP MD5 rules using prefixes, from Ivan Delalande. 19) Add XDP support to Intel i40e driver, from Björn Töpel 20) Add support for TC flower offload in nfp driver, from Simon Horman, Pieter Jansen van Vuuren, Benjamin LaHaise, Jakub Kicinski, and Bert van Leeuwen. 21) IPSEC offloading support in mlx5, from Ilan Tayari. 22) Add HW PTP support to macb driver, from Rafal Ozieblo. 23) Networking refcount_t conversions, From Elena Reshetova. 24) Add sock_ops support to BPF, from Lawrence Brako. This is useful for tuning the TCP sockopt settings of a group of applications, currently via CGROUPs" * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1899 commits) net: phy: dp83867: add workaround for incorrect RX_CTRL pin strap dt-bindings: phy: dp83867: provide a workaround for incorrect RX_CTRL pin strap cxgb4: Support for get_ts_info ethtool method cxgb4: Add PTP Hardware Clock (PHC) support cxgb4: time stamping interface for PTP nfp: default to chained metadata prepend format nfp: remove legacy MAC address lookup nfp: improve order of interfaces in breakout mode net: macb: remove extraneous return when MACB_EXT_DESC is defined bpf: add missing break in for the TCP_BPF_SNDCWND_CLAMP case bpf: fix return in load_bpf_file mpls: fix rtm policy in mpls_getroute net, ax25: convert ax25_cb.refcount from atomic_t to refcount_t net, ax25: convert ax25_route.refcount from atomic_t to refcount_t net, ax25: convert ax25_uid_assoc.refcount from atomic_t to refcount_t net, sctp: convert sctp_ep_common.refcnt from atomic_t to refcount_t net, sctp: convert sctp_transport.refcnt from atomic_t to refcount_t net, sctp: convert sctp_chunk.refcnt from atomic_t to refcount_t net, sctp: convert sctp_datamsg.refcnt from atomic_t to refcount_t net, sctp: convert sctp_auth_bytes.refcnt from atomic_t to refcount_t ...
- Loading branch information
Showing
1,901 changed files
with
98,596 additions
and
35,934 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -251,3 +251,11 @@ Contact: [email protected] | |
Description: | ||
Indicates the unique physical switch identifier of a switch this | ||
port belongs to, as a string. | ||
|
||
What: /sys/class/net/<iface>/phydev | ||
Date: May 2017 | ||
KernelVersion: 4.13 | ||
Contact: [email protected] | ||
Description: | ||
Symbolic link to the PHY device this network device is attached | ||
to. |
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,36 @@ | ||
What: /sys/class/mdio_bus/<bus>/<device>/attached_dev | ||
Date: May 2017 | ||
KernelVersion: 4.13 | ||
Contact: [email protected] | ||
Description: | ||
Symbolic link to the network device this PHY device is | ||
attached to. | ||
|
||
What: /sys/class/mdio_bus/<bus>/<device>/phy_has_fixups | ||
Date: February 2014 | ||
KernelVersion: 3.15 | ||
Contact: [email protected] | ||
Description: | ||
Boolean value indicating whether the PHY device has | ||
any fixups registered against it (phy_register_fixup) | ||
|
||
What: /sys/class/mdio_bus/<bus>/<device>/phy_id | ||
Date: November 2012 | ||
KernelVersion: 3.8 | ||
Contact: [email protected] | ||
Description: | ||
32-bit hexadecimal value corresponding to the PHY device's OUI, | ||
model and revision number. | ||
|
||
What: /sys/class/mdio_bus/<bus>/<device>/phy_interface | ||
Date: February 2014 | ||
KernelVersion: 3.15 | ||
Contact: [email protected] | ||
Description: | ||
String value indicating the PHY interface, possible | ||
values are:. | ||
<empty> (not available), mii, gmii, sgmii, tbi, rev-mii, | ||
rmii, rgmii, rgmii-id, rgmii-rxid, rgmii-txid, rtbi, smii | ||
xgmii, moca, qsgmii, trgmii, 1000base-x, 2500base-x, rxaui, | ||
xaui, 10gbase-kr, unknown | ||
|
20 changes: 20 additions & 0 deletions
20
Documentation/devicetree/bindings/misc/allwinner,syscon.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,20 @@ | ||
* Allwinner sun8i system controller | ||
|
||
This file describes the bindings for the system controller present in | ||
Allwinner SoC H3, A83T and A64. | ||
The principal function of this syscon is to control EMAC PHY choice and | ||
config. | ||
|
||
Required properties for the system controller: | ||
- reg: address and length of the register for the device. | ||
- compatible: should be "syscon" and one of the following string: | ||
"allwinner,sun8i-h3-system-controller" | ||
"allwinner,sun8i-v3s-system-controller" | ||
"allwinner,sun50i-a64-system-controller" | ||
"allwinner,sun8i-a83t-system-controller" | ||
|
||
Example: | ||
syscon: syscon@1c00000 { | ||
compatible = "allwinner,sun8i-h3-system-controller", "syscon"; | ||
reg = <0x01c00000 0x1000>; | ||
}; |
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,21 @@ | ||
Cortina Phy Driver Device Tree Bindings | ||
--------------------------------------- | ||
|
||
CORTINA is a registered trademark of Cortina Systems, Inc. | ||
|
||
The driver supports the Cortina Electronic Dispersion Compensation (EDC) | ||
devices, equipped with clock and data recovery (CDR) circuits. These | ||
devices make use of registers that are not compatible with Clause 45 or | ||
Clause 22, therefore they need to be described using the | ||
"ethernet-phy-id" compatible. | ||
|
||
Since the driver only implements polling mode support, interrupts info | ||
can be skipped. | ||
|
||
Example (CS4340 phy): | ||
mdio { | ||
cs4340_phy@10 { | ||
compatible = "ethernet-phy-id13e5.1002"; | ||
reg = <0x10>; | ||
}; | ||
}; |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,72 @@ | ||
Microchip KSZ Series Ethernet switches | ||
================================== | ||
|
||
Required properties: | ||
|
||
- compatible: For external switch chips, compatible string must be exactly one | ||
of: "microchip,ksz9477" | ||
|
||
See Documentation/devicetree/bindings/dsa/dsa.txt for a list of additional | ||
required and optional properties. | ||
|
||
Examples: | ||
|
||
Ethernet switch connected via SPI to the host, CPU port wired to eth0: | ||
|
||
eth0: ethernet@10001000 { | ||
fixed-link { | ||
speed = <1000>; | ||
full-duplex; | ||
}; | ||
}; | ||
|
||
spi1: spi@f8008000 { | ||
pinctrl-0 = <&pinctrl_spi_ksz>; | ||
cs-gpios = <&pioC 25 0>; | ||
id = <1>; | ||
status = "okay"; | ||
|
||
ksz9477: ksz9477@0 { | ||
compatible = "microchip,ksz9477"; | ||
reg = <0>; | ||
|
||
spi-max-frequency = <44000000>; | ||
spi-cpha; | ||
spi-cpol; | ||
|
||
status = "okay"; | ||
ports { | ||
#address-cells = <1>; | ||
#size-cells = <0>; | ||
port@0 { | ||
reg = <0>; | ||
label = "lan1"; | ||
}; | ||
port@1 { | ||
reg = <1>; | ||
label = "lan2"; | ||
}; | ||
port@2 { | ||
reg = <2>; | ||
label = "lan3"; | ||
}; | ||
port@3 { | ||
reg = <3>; | ||
label = "lan4"; | ||
}; | ||
port@4 { | ||
reg = <4>; | ||
label = "lan5"; | ||
}; | ||
port@5 { | ||
reg = <5>; | ||
label = "cpu"; | ||
ethernet = <ð0>; | ||
fixed-link { | ||
speed = <1000>; | ||
full-duplex; | ||
}; | ||
}; | ||
}; | ||
}; | ||
}; |
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,84 @@ | ||
* Allwinner sun8i GMAC ethernet controller | ||
|
||
This device is a platform glue layer for stmmac. | ||
Please see stmmac.txt for the other unchanged properties. | ||
|
||
Required properties: | ||
- compatible: should be one of the following string: | ||
"allwinner,sun8i-a83t-emac" | ||
"allwinner,sun8i-h3-emac" | ||
"allwinner,sun8i-v3s-emac" | ||
"allwinner,sun50i-a64-emac" | ||
- reg: address and length of the register for the device. | ||
- interrupts: interrupt for the device | ||
- interrupt-names: should be "macirq" | ||
- clocks: A phandle to the reference clock for this device | ||
- clock-names: should be "stmmaceth" | ||
- resets: A phandle to the reset control for this device | ||
- reset-names: should be "stmmaceth" | ||
- phy-mode: See ethernet.txt | ||
- phy-handle: See ethernet.txt | ||
- #address-cells: shall be 1 | ||
- #size-cells: shall be 0 | ||
- syscon: A phandle to the syscon of the SoC with one of the following | ||
compatible string: | ||
- allwinner,sun8i-h3-system-controller | ||
- allwinner,sun8i-v3s-system-controller | ||
- allwinner,sun50i-a64-system-controller | ||
- allwinner,sun8i-a83t-system-controller | ||
|
||
Optional properties: | ||
- allwinner,tx-delay-ps: TX clock delay chain value in ps. Range value is 0-700. Default is 0) | ||
- allwinner,rx-delay-ps: RX clock delay chain value in ps. Range value is 0-3100. Default is 0) | ||
Both delay properties need to be a multiple of 100. They control the delay for | ||
external PHY. | ||
|
||
Optional properties for the following compatibles: | ||
- "allwinner,sun8i-h3-emac", | ||
- "allwinner,sun8i-v3s-emac": | ||
- allwinner,leds-active-low: EPHY LEDs are active low | ||
|
||
Required child node of emac: | ||
- mdio bus node: should be named mdio | ||
|
||
Required properties of the mdio node: | ||
- #address-cells: shall be 1 | ||
- #size-cells: shall be 0 | ||
|
||
The device node referenced by "phy" or "phy-handle" should be a child node | ||
of the mdio node. See phy.txt for the generic PHY bindings. | ||
|
||
Required properties of the phy node with the following compatibles: | ||
- "allwinner,sun8i-h3-emac", | ||
- "allwinner,sun8i-v3s-emac": | ||
- clocks: a phandle to the reference clock for the EPHY | ||
- resets: a phandle to the reset control for the EPHY | ||
|
||
Example: | ||
|
||
emac: ethernet@1c0b000 { | ||
compatible = "allwinner,sun8i-h3-emac"; | ||
syscon = <&syscon>; | ||
reg = <0x01c0b000 0x104>; | ||
interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>; | ||
interrupt-names = "macirq"; | ||
resets = <&ccu RST_BUS_EMAC>; | ||
reset-names = "stmmaceth"; | ||
clocks = <&ccu CLK_BUS_EMAC>; | ||
clock-names = "stmmaceth"; | ||
#address-cells = <1>; | ||
#size-cells = <0>; | ||
|
||
phy-handle = <&int_mii_phy>; | ||
phy-mode = "mii"; | ||
allwinner,leds-active-low; | ||
mdio: mdio { | ||
#address-cells = <1>; | ||
#size-cells = <0>; | ||
int_mii_phy: ethernet-phy@1 { | ||
reg = <1>; | ||
clocks = <&ccu CLK_BUS_EPHY>; | ||
resets = <&ccu RST_BUS_EPHY>; | ||
}; | ||
}; | ||
}; |
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
10 changes: 6 additions & 4 deletions
10
Documentation/devicetree/bindings/net/marvell-orion-mdio.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
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
Oops, something went wrong.