Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
9
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Switch to GitLab Next
Sign in / Register
Toggle navigation
Open sidebar
ayufan-repos
rock64
linux-mainline-kernel
Commits
41eeb7cd
Commit
41eeb7cd
authored
Mar 08, 2019
by
Kamil Trzciński
🔴
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ayufan: stmmac: disable TX offload for mtu bigger than 1498
parent
6ba42b59
Pipeline
#50994945
passed with stage
in 5 minutes
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
2 deletions
+9
-2
arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
+1
-1
arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
+1
-1
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+4
-0
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+2
-0
include/linux/stmmac.h
include/linux/stmmac.h
+1
-0
No files found.
arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
View file @
41eeb7cd
...
...
@@ -170,7 +170,7 @@ &gmac2io {
phy
-
mode
=
"rgmii"
;
pinctrl
-
names
=
"default"
;
pinctrl
-
0
=
<&
rgmiim1_pins
>;
snps
,
force_thresh_dma_mod
e
;
rockchip
,
bugged_tx_co
e
;
snps
,
reset
-
gpio
=
<&
gpio1
RK_PC2
GPIO_ACTIVE_LOW
>;
snps
,
reset
-
active
-
low
;
snps
,
reset
-
delays
-
us
=
<
0
10000
50000
>;
...
...
arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
View file @
41eeb7cd
...
...
@@ -265,7 +265,7 @@ &gmac {
phy
-
mode
=
"rgmii"
;
pinctrl
-
names
=
"default"
;
pinctrl
-
0
=
<&
rgmii_pins
>;
snps
,
force_thresh_dma_mod
e
;
rockchip
,
bugged_tx_co
e
;
snps
,
reset
-
gpio
=
<&
gpio3
RK_PB7
GPIO_ACTIVE_LOW
>;
snps
,
reset
-
active
-
low
;
snps
,
reset
-
delays
-
us
=
<
0
10000
50000
>;
...
...
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
View file @
41eeb7cd
...
...
@@ -3629,6 +3629,10 @@ static netdev_features_t stmmac_fix_features(struct net_device *dev,
if
(
priv
->
plat
->
bugged_jumbo
&&
(
dev
->
mtu
>
ETH_DATA_LEN
))
features
&=
~
NETIF_F_CSUM_MASK
;
/* Including very small MTUs of 1498 for Rockchip devices */
if
(
priv
->
plat
->
bugged_tx_coe
&&
(
dev
->
mtu
>
ETH_DATA_LEN
-
2
))
features
&=
~
NETIF_F_CSUM_MASK
;
/* Disable tso if asked by ethtool */
if
((
priv
->
plat
->
tso_en
)
&&
(
priv
->
dma_cap
.
tsoen
))
{
if
(
features
&
NETIF_F_TSO
)
...
...
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
View file @
41eeb7cd
...
...
@@ -516,6 +516,8 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac)
pr_warn
(
"force_sf_dma_mode is ignored if force_thresh_dma_mode is set."
);
}
plat
->
bugged_tx_coe
=
of_property_read_bool
(
np
,
"rockchip,bugged_tx_coe"
);
of_property_read_u32
(
np
,
"snps,ps-speed"
,
&
plat
->
mac_port_sel_speed
);
plat
->
axi
=
stmmac_axi_setup
(
pdev
);
...
...
include/linux/stmmac.h
View file @
41eeb7cd
...
...
@@ -162,6 +162,7 @@ struct plat_stmmacenet_data {
int
pmt
;
int
force_sf_dma_mode
;
int
force_thresh_dma_mode
;
int
bugged_tx_coe
;
int
riwt_off
;
int
max_speed
;
int
maxmtu
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment