Skip to content

Commit 41f1653

Browse files
committed
Merge tag 'net-5.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Pull networking fixes from Jakub Kicinski: "Networking fixes for 5.10-rc3, including fixes from wireless, can, and netfilter subtrees. Current merge window - bugs in new features: - can: isotp: isotp_rcv_cf(): enable RX timeout handling in listen-only mode Previous releases - regressions: - mac80211: - don't require VHT elements for HE on 2.4 GHz - fix regression where EAPOL frames were sent in plaintext - netfilter: - ipset: Update byte and packet counters regardless of whether they match - ip_tunnel: fix over-mtu packet send by allowing fragmenting even if inner packet has IP_DF (don't fragment) set in its header (when TUNNEL_DONT_FRAGMENT flag is not set on the tunnel dev) - net: fec: fix MDIO probing for some FEC hardware blocks - ip6_tunnel: set inner ipproto before ip6_tnl_encap to un-break gso support - sctp: Fix COMM_LOST/CANT_STR_ASSOC err reporting on big-endian platforms, sparse-related fix used the wrong integer size Previous releases - always broken: - netfilter: use actual socket sk rather than skb sk when routing harder - r8169: work around short packet hw bug on RTL8125 by padding frames - net: ethernet: ti: cpsw: disable PTPv1 hw timestamping advertisement, the hardware does not support it - chelsio/chtls: fix always leaking ctrl_skb and another leak caused by a race condition - fix drivers incorrectly writing into skbs on TX: - cadence: force nonlinear buffers to be cloned - gianfar: Account for Tx PTP timestamp in the skb headroom - gianfar: Replace skb_realloc_headroom with skb_cow_head for PTP - can: flexcan: - remove FLEXCAN_QUIRK_DISABLE_MECR quirk for LS1021A - add ECC initialization for VF610 and LX2160A - flexcan_remove(): disable wakeup completely - can: fix packet echo functionality: - peak_canfd: fix echo management when loopback is on - make sure skbs are not freed in IRQ context in case they need to be dropped - always clone the skbs to make sure they have a reference on the socket, and prevent it from disappearing - fix real payload length return value for RTR frames - can: j1939: return failure on bind if netdev is down, rather than waiting indefinitely Misc: - IPv6: reply ICMP error if the first fragment don't include all headers to improve compliance with RFC 8200" * tag 'net-5.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (66 commits) ionic: check port ptr before use r8169: work around short packet hw bug on RTL8125 net: openvswitch: silence suspicious RCU usage warning chelsio/chtls: fix always leaking ctrl_skb chelsio/chtls: fix memory leaks caused by a race can: flexcan: flexcan_remove(): disable wakeup completely can: flexcan: add ECC initialization for VF610 can: flexcan: add ECC initialization for LX2160A can: flexcan: remove FLEXCAN_QUIRK_DISABLE_MECR quirk for LS1021A can: mcp251xfd: remove unneeded break can: mcp251xfd: mcp251xfd_regmap_nocrc_read(): fix semicolon.cocci warnings can: mcp251xfd: mcp251xfd_regmap_crc_read(): increase severity of CRC read error messages can: peak_canfd: pucan_handle_can_rx(): fix echo management when loopback is on can: peak_usb: peak_usb_get_ts_time(): fix timestamp wrapping can: peak_usb: add range checking in decode operations can: xilinx_can: handle failure cases of pm_runtime_get_sync can: ti_hecc: ti_hecc_probe(): add missed clk_disable_unprepare() in error path can: isotp: padlen(): make const array static, makes object smaller can: isotp: isotp_rcv_cf(): enable RX timeout handling in listen-only mode can: isotp: Explain PDU in CAN_ISOTP help text ...
2 parents 521b619 + 2bcbf42 commit 41f1653

78 files changed

Lines changed: 744 additions & 382 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/net/can/can-controller.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: CAN Controller Generic Binding
8+
9+
maintainers:
10+
- Marc Kleine-Budde <mkl@pengutronix.de>
11+
12+
properties:
13+
$nodename:
14+
pattern: "^can(@.*)?$"
15+
16+
additionalProperties: true
17+
18+
...
Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,135 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/net/can/fsl,flexcan.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title:
8+
Flexcan CAN controller on Freescale's ARM and PowerPC system-on-a-chip (SOC).
9+
10+
maintainers:
11+
- Marc Kleine-Budde <mkl@pengutronix.de>
12+
13+
allOf:
14+
- $ref: can-controller.yaml#
15+
16+
properties:
17+
compatible:
18+
oneOf:
19+
- enum:
20+
- fsl,imx8qm-flexcan
21+
- fsl,imx8mp-flexcan
22+
- fsl,imx6q-flexcan
23+
- fsl,imx53-flexcan
24+
- fsl,imx35-flexcan
25+
- fsl,imx28-flexcan
26+
- fsl,imx25-flexcan
27+
- fsl,p1010-flexcan
28+
- fsl,vf610-flexcan
29+
- fsl,ls1021ar2-flexcan
30+
- fsl,lx2160ar1-flexcan
31+
- items:
32+
- enum:
33+
- fsl,imx7d-flexcan
34+
- fsl,imx6ul-flexcan
35+
- fsl,imx6sx-flexcan
36+
- const: fsl,imx6q-flexcan
37+
- items:
38+
- enum:
39+
- fsl,ls1028ar1-flexcan
40+
- const: fsl,lx2160ar1-flexcan
41+
42+
reg:
43+
maxItems: 1
44+
45+
interrupts:
46+
maxItems: 1
47+
48+
clocks:
49+
maxItems: 2
50+
51+
clock-names:
52+
items:
53+
- const: ipg
54+
- const: per
55+
56+
clock-frequency:
57+
description: |
58+
The oscillator frequency driving the flexcan device, filled in by the
59+
boot loader. This property should only be used the used operating system
60+
doesn't support the clocks and clock-names property.
61+
62+
xceiver-supply:
63+
description: Regulator that powers the CAN transceiver.
64+
65+
big-endian:
66+
$ref: /schemas/types.yaml#/definitions/flag
67+
description: |
68+
This means the registers of FlexCAN controller are big endian. This is
69+
optional property.i.e. if this property is not present in device tree
70+
node then controller is assumed to be little endian. If this property is
71+
present then controller is assumed to be big endian.
72+
73+
fsl,stop-mode:
74+
description: |
75+
Register bits of stop mode control.
76+
77+
The format should be as follows:
78+
<gpr req_gpr req_bit>
79+
gpr is the phandle to general purpose register node.
80+
req_gpr is the gpr register offset of CAN stop request.
81+
req_bit is the bit offset of CAN stop request.
82+
$ref: /schemas/types.yaml#/definitions/phandle-array
83+
items:
84+
- description: The 'gpr' is the phandle to general purpose register node.
85+
- description: The 'req_gpr' is the gpr register offset of CAN stop request.
86+
maximum: 0xff
87+
- description: The 'req_bit' is the bit offset of CAN stop request.
88+
maximum: 0x1f
89+
90+
fsl,clk-source:
91+
description: |
92+
Select the clock source to the CAN Protocol Engine (PE). It's SoC
93+
implementation dependent. Refer to RM for detailed definition. If this
94+
property is not set in device tree node then driver selects clock source 1
95+
by default.
96+
0: clock source 0 (oscillator clock)
97+
1: clock source 1 (peripheral clock)
98+
$ref: /schemas/types.yaml#/definitions/uint32
99+
default: 1
100+
minimum: 0
101+
maximum: 1
102+
103+
wakeup-source:
104+
$ref: /schemas/types.yaml#/definitions/flag
105+
description:
106+
Enable CAN remote wakeup.
107+
108+
required:
109+
- compatible
110+
- reg
111+
- interrupts
112+
113+
additionalProperties: false
114+
115+
examples:
116+
- |
117+
can@1c000 {
118+
compatible = "fsl,p1010-flexcan";
119+
reg = <0x1c000 0x1000>;
120+
interrupts = <48 0x2>;
121+
interrupt-parent = <&mpic>;
122+
clock-frequency = <200000000>;
123+
fsl,clk-source = <0>;
124+
};
125+
- |
126+
#include <dt-bindings/interrupt-controller/irq.h>
127+
128+
can@2090000 {
129+
compatible = "fsl,imx6q-flexcan";
130+
reg = <0x02090000 0x4000>;
131+
interrupts = <0 110 IRQ_TYPE_LEVEL_HIGH>;
132+
clocks = <&clks 1>, <&clks 2>;
133+
clock-names = "ipg", "per";
134+
fsl,stop-mode = <&gpr 0x34 28>;
135+
};

Documentation/devicetree/bindings/net/can/fsl-flexcan.txt

Lines changed: 0 additions & 57 deletions
This file was deleted.

0 commit comments

Comments
 (0)