projects
/
openwrt
/
openwrt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cbe4beb
)
kernel: bump 5.4 to 5.4.99
author
John Audia
<graysky@archlinux.us>
Wed, 17 Feb 2021 10:58:14 +0000
(
05:58
-0500)
committer
Álvaro Fernández Rojas
<noltari@gmail.com>
Fri, 19 Feb 2021 06:15:59 +0000
(07:15 +0100)
Ran update_kernel.sh in a fresh clone without any existing toolchains.
No manual changes needed.
Build system: x86_64
Build-tested: bcm27xx/bcm2711
Signed-off-by: John Audia <graysky@archlinux.us>
(cherry-picked from commit
5d3a6fd970
)
32 files changed:
include/kernel-version.mk
patch
|
blob
|
history
target/linux/bcm27xx/patches-5.4/950-0089-cgroup-Disable-cgroup-memory-by-default.patch
patch
|
blob
|
history
target/linux/bcm27xx/patches-5.4/950-0322-drm-vc4-Add-support-for-YUV-color-encodings-and-rang.patch
patch
|
blob
|
history
target/linux/bcm27xx/patches-5.4/950-0544-drm-vc4-drv-Support-BCM2711.patch
patch
|
blob
|
history
target/linux/bcm27xx/patches-5.4/950-0545-drm-vc4-drv-Add-support-for-the-BCM2711-HVS5.patch
patch
|
blob
|
history
target/linux/bcm27xx/patches-5.4/950-0546-drm-vc4-plane-Improve-LBM-usage.patch
patch
|
blob
|
history
target/linux/bcm27xx/patches-5.4/950-0547-drm-vc4-plane-Move-planes-creation-to-its-own-functi.patch
patch
|
blob
|
history
target/linux/bcm27xx/patches-5.4/950-0549-drm-vc4-plane-Register-all-the-planes-at-once.patch
patch
|
blob
|
history
target/linux/bcm27xx/patches-5.4/950-0550-drm-vc4-plane-Create-overlays-for-any-CRTC.patch
patch
|
blob
|
history
target/linux/bcm27xx/patches-5.4/950-0551-drm-vc4-plane-Create-more-planes.patch
patch
|
blob
|
history
target/linux/bcm27xx/patches-5.4/950-0601-drm-vc4-Add-support-for-DRM_FORMAT_P030-to-vc4-plane.patch
patch
|
blob
|
history
target/linux/bcm27xx/patches-5.4/950-0602-Fixup-P030-support.patch
patch
|
blob
|
history
target/linux/generic/backport-5.4/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch
patch
|
blob
|
history
target/linux/generic/backport-5.4/700-v5.5-net-core-allow-fast-GRO-for-skbs-with-Ethernet-heade.patch
patch
|
blob
|
history
target/linux/generic/hack-5.4/221-module_exports.patch
patch
|
blob
|
history
target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
patch
|
blob
|
history
target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch
patch
|
blob
|
history
target/linux/layerscape/patches-5.4/303-core-0003-cgroup-let-a-symlink-too-be-created-with-a-cftype-fi.patch
patch
|
blob
|
history
target/linux/layerscape/patches-5.4/303-core-0004-cgroup-bfq-revert-bfq.weight-symlink-change.patch
patch
|
blob
|
history
target/linux/layerscape/patches-5.4/701-net-0225-enetc-Configure-the-Time-Aware-Scheduler-via-tc-tapr.patch
patch
|
blob
|
history
target/linux/layerscape/patches-5.4/701-net-0228-enetc-Make-mdio-accessors-more-generic.patch
patch
|
blob
|
history
target/linux/layerscape/patches-5.4/701-net-0229-enetc-Initialize-SerDes-for-SGMII-and-SXGMII-protoco.patch
patch
|
blob
|
history
target/linux/layerscape/patches-5.4/701-net-0231-enetc-Use-DT-protocol-information-to-set-up-the-port.patch
patch
|
blob
|
history
target/linux/layerscape/patches-5.4/701-net-0232-enetc-Handle-USXGMII-protocol.patch
patch
|
blob
|
history
target/linux/layerscape/patches-5.4/701-net-0234-enetc-WA-for-MDIO-register-access-issue.patch
patch
|
blob
|
history
target/linux/layerscape/patches-5.4/701-net-0236-enetc-Replace-enetc_gregs-with-a-readers-writer-lock.patch
patch
|
blob
|
history
target/linux/layerscape/patches-5.4/701-net-0237-enetc-Remove-mdio-bus-on-PF-probe-error-path.patch
patch
|
blob
|
history
target/linux/layerscape/patches-5.4/701-net-0336-enetc-add-support-Credit-Based-Shaper-CBS-for-hardwa.patch
patch
|
blob
|
history
target/linux/layerscape/patches-5.4/701-net-0337-enetc-add-support-tsn-capabilities-qbv-qci-qbu-cbs.patch
patch
|
blob
|
history
target/linux/layerscape/patches-5.4/701-net-0382-enetc-Make-MDIO-accessors-more-generic-and-export-to.patch
patch
|
blob
|
history
target/linux/layerscape/patches-5.4/701-net-0407-LF-924-net-enetc-Set-MAC-Rx-FIFO-to-recommended-valu.patch
patch
|
blob
|
history
target/linux/ramips/patches-5.4/0123-mips-ralink-manage-low-reset-lines.patch
patch
|
blob
|
history
diff --git
a/include/kernel-version.mk
b/include/kernel-version.mk
index b01280508f8d8fc04f88aee5970c74f5839692ec..9602d2b9bd5c33e2417a92f72bb37b6a26630689 100644
(file)
--- a/
include/kernel-version.mk
+++ b/
include/kernel-version.mk
@@
-6,9
+6,9
@@
ifdef CONFIG_TESTING_KERNEL
KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
endif
KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
endif
-LINUX_VERSION-5.4 = .9
8
+LINUX_VERSION-5.4 = .9
9
-LINUX_KERNEL_HASH-5.4.9
8 = 83a248d6fbe388f133769d736f36b754767abc9d66f1c034b537ad778fbd46b1
+LINUX_KERNEL_HASH-5.4.9
9 = 5bdad12c69253d30d836dd51e0b2a9a04a6749cc6b4b2412561a1efcb1351a27
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
diff --git
a/target/linux/bcm27xx/patches-5.4/950-0089-cgroup-Disable-cgroup-memory-by-default.patch
b/target/linux/bcm27xx/patches-5.4/950-0089-cgroup-Disable-cgroup-memory-by-default.patch
index 30eefd3e216c8d4c27337b6fd629a9ff1a3bf29e..86f60e7052f4a3c0c3dd0982f8450f7b647d2b07 100644
(file)
--- a/
target/linux/bcm27xx/patches-5.4/950-0089-cgroup-Disable-cgroup-memory-by-default.patch
+++ b/
target/linux/bcm27xx/patches-5.4/950-0089-cgroup-Disable-cgroup-memory-by-default.patch
@@
-17,7
+17,7
@@
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
-@@ -572
0,6 +5720
,8 @@ int __init cgroup_init_early(void)
+@@ -572
2,6 +5722
,8 @@ int __init cgroup_init_early(void)
}
static u16 cgroup_disable_mask __initdata;
}
static u16 cgroup_disable_mask __initdata;
@@
-26,7
+26,7
@@
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
/**
* cgroup_init - cgroup initialization
/**
* cgroup_init - cgroup initialization
-@@ -57
59,6 +5761
,12 @@ int __init cgroup_init(void)
+@@ -57
61,6 +5763
,12 @@ int __init cgroup_init(void)
mutex_unlock(&cgroup_mutex);
mutex_unlock(&cgroup_mutex);
@@
-39,7
+39,7
@@
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
for_each_subsys(ss, ssid) {
if (ss->early_init) {
struct cgroup_subsys_state *css =
for_each_subsys(ss, ssid) {
if (ss->early_init) {
struct cgroup_subsys_state *css =
-@@ -61
78,6 +6186
,28 @@ static int __init cgroup_disable(char *s
+@@ -61
80,6 +6188
,28 @@ static int __init cgroup_disable(char *s
}
__setup("cgroup_disable=", cgroup_disable);
}
__setup("cgroup_disable=", cgroup_disable);
diff --git
a/target/linux/bcm27xx/patches-5.4/950-0322-drm-vc4-Add-support-for-YUV-color-encodings-and-rang.patch
b/target/linux/bcm27xx/patches-5.4/950-0322-drm-vc4-Add-support-for-YUV-color-encodings-and-rang.patch
index ff55c5677c73e34c80a4ec72624697d9179527f2..d7e6bbc561d194472d459494121531a6ca6f7c73 100644
(file)
--- a/
target/linux/bcm27xx/patches-5.4/950-0322-drm-vc4-Add-support-for-YUV-color-encodings-and-rang.patch
+++ b/
target/linux/bcm27xx/patches-5.4/950-0322-drm-vc4-Add-support-for-YUV-color-encodings-and-rang.patch
@@
-18,7
+18,7
@@
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
--- a/drivers/gpu/drm/vc4/vc4_plane.c
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
--- a/drivers/gpu/drm/vc4/vc4_plane.c
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
-@@ -5
77,6 +577
,53 @@ static int vc4_plane_allocate_lbm(struct
+@@ -5
85,6 +585
,53 @@ static int vc4_plane_allocate_lbm(struct
return 0;
}
return 0;
}
@@
-72,7
+72,7
@@
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
/* Writes out a full display list for an active plane to the plane's
* private dlist state.
*/
/* Writes out a full display list for an active plane to the plane's
* private dlist state.
*/
-@@ -8
56,9 +903
,20 @@ static int vc4_plane_mode_set(struct drm
+@@ -8
64,9 +911
,20 @@ static int vc4_plane_mode_set(struct drm
/* Colorspace conversion words */
if (vc4_state->is_yuv) {
/* Colorspace conversion words */
if (vc4_state->is_yuv) {
@@
-96,7
+96,7
@@
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
}
vc4_state->lbm_offset = 0;
}
vc4_state->lbm_offset = 0;
-@@ -12
65,5 +132
3,13 @@ struct drm_plane *vc4_plane_init(struct
+@@ -12
75,5 +133
3,13 @@ struct drm_plane *vc4_plane_init(struct
DRM_MODE_REFLECT_X |
DRM_MODE_REFLECT_Y);
DRM_MODE_REFLECT_X |
DRM_MODE_REFLECT_Y);
diff --git
a/target/linux/bcm27xx/patches-5.4/950-0544-drm-vc4-drv-Support-BCM2711.patch
b/target/linux/bcm27xx/patches-5.4/950-0544-drm-vc4-drv-Support-BCM2711.patch
index 9a0f790ff4ff59a6609dab267103f8960ecc2df5..21018e11b79313d4dd2616426fd7faa125c88640 100644
(file)
--- a/
target/linux/bcm27xx/patches-5.4/950-0544-drm-vc4-drv-Support-BCM2711.patch
+++ b/
target/linux/bcm27xx/patches-5.4/950-0544-drm-vc4-drv-Support-BCM2711.patch
@@
-95,7
+95,7
@@
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
--- a/drivers/gpu/drm/vc4/vc4_plane.c
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
--- a/drivers/gpu/drm/vc4/vc4_plane.c
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
-@@ -
492,6 +492
,11 @@ static void vc4_plane_calc_load(struct d
+@@ -
500,6 +500
,11 @@ static void vc4_plane_calc_load(struct d
struct vc4_plane_state *vc4_state;
struct drm_crtc_state *crtc_state;
unsigned int vscale_factor;
struct vc4_plane_state *vc4_state;
struct drm_crtc_state *crtc_state;
unsigned int vscale_factor;
diff --git
a/target/linux/bcm27xx/patches-5.4/950-0545-drm-vc4-drv-Add-support-for-the-BCM2711-HVS5.patch
b/target/linux/bcm27xx/patches-5.4/950-0545-drm-vc4-drv-Add-support-for-the-BCM2711-HVS5.patch
index 0f6259e347d9a8e10f54463d3781b8688faed617..a02663ac8b9f5a00f94c59a83bdb3628b57174e8 100644
(file)
--- a/
target/linux/bcm27xx/patches-5.4/950-0545-drm-vc4-drv-Add-support-for-the-BCM2711-HVS5.patch
+++ b/
target/linux/bcm27xx/patches-5.4/950-0545-drm-vc4-drv-Add-support-for-the-BCM2711-HVS5.patch
@@
-186,7
+186,7
@@
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
.pixel_order = HVS_PIXEL_ORDER_XBGR,
},
{
.pixel_order = HVS_PIXEL_ORDER_XBGR,
},
{
-@@ -8
28,35 +843
,6 @@ static int vc4_plane_mode_set(struct drm
+@@ -8
36,35 +851
,6 @@ static int vc4_plane_mode_set(struct drm
return -EINVAL;
}
return -EINVAL;
}
@@
-222,7
+222,7
@@
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
/* Don't waste cycles mixing with plane alpha if the set alpha
* is opaque or there is no per-pixel alpha information.
* In any case we use the alpha property value as the fixed alpha.
/* Don't waste cycles mixing with plane alpha if the set alpha
* is opaque or there is no per-pixel alpha information.
* In any case we use the alpha property value as the fixed alpha.
-@@ -8
64,20 +850
,120 @@ static int vc4_plane_mode_set(struct drm
+@@ -8
72,20 +858
,120 @@ static int vc4_plane_mode_set(struct drm
mix_plane_alpha = state->alpha != DRM_BLEND_ALPHA_OPAQUE &&
fb->format->has_alpha;
mix_plane_alpha = state->alpha != DRM_BLEND_ALPHA_OPAQUE &&
fb->format->has_alpha;
@@
-356,7
+356,7
@@
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
/* Pointer Word 0/1/2: RGB / Y / Cb / Cr Pointers
/* Pointer Word 0/1/2: RGB / Y / Cb / Cr Pointers
-@@ -12
66,6 +135
2,10 @@ static bool vc4_format_mod_supported(str
+@@ -12
76,6 +136
2,10 @@ static bool vc4_format_mod_supported(str
default:
return false;
}
default:
return false;
}
diff --git
a/target/linux/bcm27xx/patches-5.4/950-0546-drm-vc4-plane-Improve-LBM-usage.patch
b/target/linux/bcm27xx/patches-5.4/950-0546-drm-vc4-plane-Improve-LBM-usage.patch
index df7a98fc548160432f68a101994ca60cfa3cab8b..5342e0ad23d980ceae062e64825faf9b05280fc3 100644
(file)
--- a/
target/linux/bcm27xx/patches-5.4/950-0546-drm-vc4-plane-Improve-LBM-usage.patch
+++ b/
target/linux/bcm27xx/patches-5.4/950-0546-drm-vc4-plane-Improve-LBM-usage.patch
@@
-32,7
+32,7
@@
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
return VC4_SCALING_NONE;
if (3 * dst >= 2 * src)
return VC4_SCALING_PPF;
return VC4_SCALING_NONE;
if (3 * dst >= 2 * src)
return VC4_SCALING_PPF;
-@@ -3
69,9 +370
,11 @@ static int vc4_plane_setup_clipping_and_
+@@ -3
77,9 +378
,11 @@ static int vc4_plane_setup_clipping_and_
return ret;
vc4_state->x_scaling[0] = vc4_get_scaling_mode(vc4_state->src_w[0],
return ret;
vc4_state->x_scaling[0] = vc4_get_scaling_mode(vc4_state->src_w[0],
@@
-46,7
+46,7
@@
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
vc4_state->is_unity = (vc4_state->x_scaling[0] == VC4_SCALING_NONE &&
vc4_state->y_scaling[0] == VC4_SCALING_NONE);
vc4_state->is_unity = (vc4_state->x_scaling[0] == VC4_SCALING_NONE &&
vc4_state->y_scaling[0] == VC4_SCALING_NONE);
-@@ -3
84,10 +387
,12 @@ static int vc4_plane_setup_clipping_and_
+@@ -3
92,10 +395
,12 @@ static int vc4_plane_setup_clipping_and_
vc4_state->x_scaling[1] =
vc4_get_scaling_mode(vc4_state->src_w[1],
vc4_state->x_scaling[1] =
vc4_get_scaling_mode(vc4_state->src_w[1],
@@
-61,7
+61,7
@@
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
/* YUV conversion requires that horizontal scaling be enabled
* on the UV plane even if vc4_get_scaling_mode() returned
/* YUV conversion requires that horizontal scaling be enabled
* on the UV plane even if vc4_get_scaling_mode() returned
-@@ -4
37,10 +442
,7 @@ static void vc4_write_ppf(struct vc4_pla
+@@ -4
45,10 +450
,7 @@ static void vc4_write_ppf(struct vc4_pla
static u32 vc4_lbm_size(struct drm_plane_state *state)
{
struct vc4_plane_state *vc4_state = to_vc4_plane_state(state);
static u32 vc4_lbm_size(struct drm_plane_state *state)
{
struct vc4_plane_state *vc4_state = to_vc4_plane_state(state);
@@
-73,7
+73,7
@@
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
u32 lbm;
/* LBM is not needed when there's no vertical scaling. */
u32 lbm;
/* LBM is not needed when there's no vertical scaling. */
-@@ -4
48,6 +450
,11 @@ static u32 vc4_lbm_size(struct drm_plane
+@@ -4
56,6 +458
,11 @@ static u32 vc4_lbm_size(struct drm_plane
vc4_state->y_scaling[1] == VC4_SCALING_NONE)
return 0;
vc4_state->y_scaling[1] == VC4_SCALING_NONE)
return 0;
@@
-85,7
+85,7
@@
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
if (!vc4_state->is_yuv) {
if (vc4_state->y_scaling[0] == VC4_SCALING_TPZ)
lbm = pix_per_line * 8;
if (!vc4_state->is_yuv) {
if (vc4_state->y_scaling[0] == VC4_SCALING_TPZ)
lbm = pix_per_line * 8;
-@@ -5
83,7 +590
,9 @@ static int vc4_plane_allocate_lbm(struct
+@@ -5
91,7 +598
,9 @@ static int vc4_plane_allocate_lbm(struct
spin_lock_irqsave(&vc4->hvs->mm_lock, irqflags);
ret = drm_mm_insert_node_generic(&vc4->hvs->lbm_mm,
&vc4_state->lbm,
spin_lock_irqsave(&vc4->hvs->mm_lock, irqflags);
ret = drm_mm_insert_node_generic(&vc4->hvs->lbm_mm,
&vc4_state->lbm,
diff --git
a/target/linux/bcm27xx/patches-5.4/950-0547-drm-vc4-plane-Move-planes-creation-to-its-own-functi.patch
b/target/linux/bcm27xx/patches-5.4/950-0547-drm-vc4-plane-Move-planes-creation-to-its-own-functi.patch
index 7c3c4708498b92ad6afc38268cb40ef7d7403199..025efee0e3328e1d3ee118501e3417a197eb8ab0 100644
(file)
--- a/
target/linux/bcm27xx/patches-5.4/950-0547-drm-vc4-plane-Move-planes-creation-to-its-own-functi.patch
+++ b/
target/linux/bcm27xx/patches-5.4/950-0547-drm-vc4-plane-Move-planes-creation-to-its-own-functi.patch
@@
-81,7
+81,7
@@
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
void vc4_plane_async_set_fb(struct drm_plane *plane,
--- a/drivers/gpu/drm/vc4/vc4_plane.c
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
void vc4_plane_async_set_fb(struct drm_plane *plane,
--- a/drivers/gpu/drm/vc4/vc4_plane.c
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
-@@ -14
37,3 +143
7,41 @@ struct drm_plane *vc4_plane_init(struct
+@@ -14
47,3 +144
7,41 @@ struct drm_plane *vc4_plane_init(struct
return plane;
}
return plane;
}
diff --git
a/target/linux/bcm27xx/patches-5.4/950-0549-drm-vc4-plane-Register-all-the-planes-at-once.patch
b/target/linux/bcm27xx/patches-5.4/950-0549-drm-vc4-plane-Register-all-the-planes-at-once.patch
index e917410b864ae413b147c9ee057b65dbb612143e..28277f1e56f51e2ddb21420306734e3fad156b41 100644
(file)
--- a/
target/linux/bcm27xx/patches-5.4/950-0549-drm-vc4-plane-Register-all-the-planes-at-once.patch
+++ b/
target/linux/bcm27xx/patches-5.4/950-0549-drm-vc4-plane-Register-all-the-planes-at-once.patch
@@
-55,7
+55,7
@@
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
void vc4_plane_async_set_fb(struct drm_plane *plane,
--- a/drivers/gpu/drm/vc4/vc4_plane.c
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
void vc4_plane_async_set_fb(struct drm_plane *plane,
--- a/drivers/gpu/drm/vc4/vc4_plane.c
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
-@@ -14
38,39 +143
8,41 @@ struct drm_plane *vc4_plane_init(struct
+@@ -14
48,39 +144
8,41 @@ struct drm_plane *vc4_plane_init(struct
return plane;
}
return plane;
}
diff --git
a/target/linux/bcm27xx/patches-5.4/950-0550-drm-vc4-plane-Create-overlays-for-any-CRTC.patch
b/target/linux/bcm27xx/patches-5.4/950-0550-drm-vc4-plane-Create-overlays-for-any-CRTC.patch
index 54d04e59e15e311dd484c2fece81973e7065509a..7b9ec02cf6049ec7b2cea8cf23c4c4efc4277bf0 100644
(file)
--- a/
target/linux/bcm27xx/patches-5.4/950-0550-drm-vc4-plane-Create-overlays-for-any-CRTC.patch
+++ b/
target/linux/bcm27xx/patches-5.4/950-0550-drm-vc4-plane-Create-overlays-for-any-CRTC.patch
@@
-23,7
+23,7
@@
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
--- a/drivers/gpu/drm/vc4/vc4_plane.c
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
--- a/drivers/gpu/drm/vc4/vc4_plane.c
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
-@@ -14
44,26 +144
4,27 @@ int vc4_plane_create_additional_planes(s
+@@ -14
54,26 +145
4,27 @@ int vc4_plane_create_additional_planes(s
struct drm_crtc *crtc;
unsigned int i;
struct drm_crtc *crtc;
unsigned int i;
diff --git
a/target/linux/bcm27xx/patches-5.4/950-0551-drm-vc4-plane-Create-more-planes.patch
b/target/linux/bcm27xx/patches-5.4/950-0551-drm-vc4-plane-Create-more-planes.patch
index 08383e37084e15c1922b9bb30c93bb17e05a1556..931e2bdad4d775a27543d91f1eb6c269bffc61d7 100644
(file)
--- a/
target/linux/bcm27xx/patches-5.4/950-0551-drm-vc4-plane-Create-more-planes.patch
+++ b/
target/linux/bcm27xx/patches-5.4/950-0551-drm-vc4-plane-Create-more-planes.patch
@@
-21,7
+21,7
@@
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
--- a/drivers/gpu/drm/vc4/vc4_plane.c
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
--- a/drivers/gpu/drm/vc4/vc4_plane.c
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
-@@ -14
53,7 +145
3,7 @@ int vc4_plane_create_additional_planes(s
+@@ -14
63,7 +146
3,7 @@ int vc4_plane_create_additional_planes(s
* modest number of planes to expose, that should hopefully
* still cover any sane usecase.
*/
* modest number of planes to expose, that should hopefully
* still cover any sane usecase.
*/
diff --git
a/target/linux/bcm27xx/patches-5.4/950-0601-drm-vc4-Add-support-for-DRM_FORMAT_P030-to-vc4-plane.patch
b/target/linux/bcm27xx/patches-5.4/950-0601-drm-vc4-Add-support-for-DRM_FORMAT_P030-to-vc4-plane.patch
index 9d83d8a3dde3f15d81b4eadc779942ea85e2e335..a4d5afe406d0ee1888fdaf999dc2dd90c4b23d4d 100644
(file)
--- a/
target/linux/bcm27xx/patches-5.4/950-0601-drm-vc4-Add-support-for-DRM_FORMAT_P030-to-vc4-plane.patch
+++ b/
target/linux/bcm27xx/patches-5.4/950-0601-drm-vc4-Add-support-for-DRM_FORMAT_P030-to-vc4-plane.patch
@@
-38,7
+38,7
@@
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
};
static const struct hvs_format *vc4_get_hvs_format(u32 drm_format)
};
static const struct hvs_format *vc4_get_hvs_format(u32 drm_format)
-@@ -80
1,27 +808
,33 @@ static int vc4_plane_mode_set(struct drm
+@@ -80
9,27 +816
,33 @@ static int vc4_plane_mode_set(struct drm
uint32_t param = fourcc_mod_broadcom_param(fb->modifier);
u32 tile_w, tile, x_off, pix_per_tile;
uint32_t param = fourcc_mod_broadcom_param(fb->modifier);
u32 tile_w, tile, x_off, pix_per_tile;
@@
-90,7
+90,7
@@
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
return -EINVAL;
}
return -EINVAL;
}
-@@ -83
1,6 +844
,13 @@ static int vc4_plane_mode_set(struct drm
+@@ -83
9,6 +852
,13 @@ static int vc4_plane_mode_set(struct drm
/* Adjust the base pointer to the first pixel to be scanned
* out.
/* Adjust the base pointer to the first pixel to be scanned
* out.
@@
-104,7
+104,7
@@
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
*/
for (i = 0; i < num_planes; i++) {
vc4_state->offsets[i] += param * tile_w * tile;
*/
for (i = 0; i < num_planes; i++) {
vc4_state->offsets[i] += param * tile_w * tile;
-@@ -9
43,8 +963
,8 @@ static int vc4_plane_mode_set(struct drm
+@@ -9
51,8 +971
,8 @@ static int vc4_plane_mode_set(struct drm
vc4_dlist_write(vc4_state,
VC4_SET_FIELD(state->alpha >> 4,
SCALER5_CTL2_ALPHA) |
vc4_dlist_write(vc4_state,
VC4_SET_FIELD(state->alpha >> 4,
SCALER5_CTL2_ALPHA) |
@@
-115,7
+115,7
@@
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
(mix_plane_alpha ?
SCALER5_CTL2_ALPHA_MIX : 0) |
VC4_SET_FIELD(fb->format->has_alpha ?
(mix_plane_alpha ?
SCALER5_CTL2_ALPHA_MIX : 0) |
VC4_SET_FIELD(fb->format->has_alpha ?
-@@ -
992,7 +1012
,8 @@ static int vc4_plane_mode_set(struct drm
+@@ -
1000,7 +1020
,8 @@ static int vc4_plane_mode_set(struct drm
/* Pitch word 1/2 */
for (i = 1; i < num_planes; i++) {
/* Pitch word 1/2 */
for (i = 1; i < num_planes; i++) {
@@
-125,7
+125,7
@@
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
vc4_dlist_write(vc4_state,
VC4_SET_FIELD(fb->pitches[i],
SCALER_SRC_PITCH));
vc4_dlist_write(vc4_state,
VC4_SET_FIELD(fb->pitches[i],
SCALER_SRC_PITCH));
-@@ -13
61,6 +138
2,13 @@ static bool vc4_format_mod_supported(str
+@@ -13
71,6 +139
2,13 @@ static bool vc4_format_mod_supported(str
default:
return false;
}
default:
return false;
}
@@
-139,7
+139,7
@@
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
case DRM_FORMAT_RGBX1010102:
case DRM_FORMAT_BGRX1010102:
case DRM_FORMAT_RGBA1010102:
case DRM_FORMAT_RGBX1010102:
case DRM_FORMAT_BGRX1010102:
case DRM_FORMAT_RGBA1010102:
-@@ -1
393,8 +142
1,11 @@ struct drm_plane *vc4_plane_init(struct
+@@ -1
403,8 +143
1,11 @@ struct drm_plane *vc4_plane_init(struct
struct drm_plane *plane = NULL;
struct vc4_plane *vc4_plane;
u32 formats[ARRAY_SIZE(hvs_formats)];
struct drm_plane *plane = NULL;
struct vc4_plane *vc4_plane;
u32 formats[ARRAY_SIZE(hvs_formats)];
@@
-151,7
+151,7
@@
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
static const uint64_t modifiers[] = {
DRM_FORMAT_MOD_BROADCOM_VC4_T_TILED,
DRM_FORMAT_MOD_BROADCOM_SAND128,
static const uint64_t modifiers[] = {
DRM_FORMAT_MOD_BROADCOM_VC4_T_TILED,
DRM_FORMAT_MOD_BROADCOM_SAND128,
-@@ -14
09,13 +144
0,17 @@ struct drm_plane *vc4_plane_init(struct
+@@ -14
19,13 +145
0,17 @@ struct drm_plane *vc4_plane_init(struct
if (!vc4_plane)
return ERR_PTR(-ENOMEM);
if (!vc4_plane)
return ERR_PTR(-ENOMEM);
diff --git
a/target/linux/bcm27xx/patches-5.4/950-0602-Fixup-P030-support.patch
b/target/linux/bcm27xx/patches-5.4/950-0602-Fixup-P030-support.patch
index a24127e6f28d332e2d651645d133e550bc652c1a..0963824d9e672952560fcdc50fd602068e213488 100644
(file)
--- a/
target/linux/bcm27xx/patches-5.4/950-0602-Fixup-P030-support.patch
+++ b/
target/linux/bcm27xx/patches-5.4/950-0602-Fixup-P030-support.patch
@@
-15,7
+15,7
@@
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
--- a/drivers/gpu/drm/vc4/vc4_plane.c
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
--- a/drivers/gpu/drm/vc4/vc4_plane.c
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
-@@ -14
41,7 +144
1,7 @@ struct drm_plane *vc4_plane_init(struct
+@@ -14
51,7 +145
1,7 @@ struct drm_plane *vc4_plane_init(struct
return ERR_PTR(-ENOMEM);
for (i = 0; i < ARRAY_SIZE(hvs_formats); i++) {
return ERR_PTR(-ENOMEM);
for (i = 0; i < ARRAY_SIZE(hvs_formats); i++) {
diff --git
a/target/linux/generic/backport-5.4/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch
b/target/linux/generic/backport-5.4/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch
index 4edcbe169171146f0d2138387adce68af7165c74..9bcb33b737eb83d29d036c429a93b0868c190dcf 100644
(file)
--- a/
target/linux/generic/backport-5.4/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch
+++ b/
target/linux/generic/backport-5.4/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch
@@
-21,7
+21,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
-@@ -120
6,18 +1206
,6 @@ static bool gc_worker_can_early_drop(con
+@@ -120
7,18 +1207
,6 @@ static bool gc_worker_can_early_drop(con
return false;
}
return false;
}
@@
-40,7
+40,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
static void gc_worker(struct work_struct *work)
{
unsigned int min_interval = max(HZ / GC_MAX_BUCKETS_DIV, 1u);
static void gc_worker(struct work_struct *work)
{
unsigned int min_interval = max(HZ / GC_MAX_BUCKETS_DIV, 1u);
-@@ -125
4,10 +1242
,8 @@ static void gc_worker(struct work_struct
+@@ -125
5,10 +1243
,8 @@ static void gc_worker(struct work_struct
tmp = nf_ct_tuplehash_to_ctrack(h);
scanned++;
tmp = nf_ct_tuplehash_to_ctrack(h);
scanned++;
diff --git
a/target/linux/generic/backport-5.4/700-v5.5-net-core-allow-fast-GRO-for-skbs-with-Ethernet-heade.patch
b/target/linux/generic/backport-5.4/700-v5.5-net-core-allow-fast-GRO-for-skbs-with-Ethernet-heade.patch
index f864a7899cc68d3b3298c064b989ffa116f93426..a79c860187287363d45ce70d2e0afa178d5efb2f 100644
(file)
--- a/
target/linux/generic/backport-5.4/700-v5.5-net-core-allow-fast-GRO-for-skbs-with-Ethernet-heade.patch
+++ b/
target/linux/generic/backport-5.4/700-v5.5-net-core-allow-fast-GRO-for-skbs-with-Ethernet-heade.patch
@@
-66,7
+66,7
@@
Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/net/core/dev.c
+++ b/net/core/dev.c
--- a/net/core/dev.c
+++ b/net/core/dev.c
-@@ -540
3,8 +5403
,7 @@ static void skb_gro_reset_offset(struct
+@@ -540
4,8 +5404
,7 @@ static void skb_gro_reset_offset(struct
NAPI_GRO_CB(skb)->frag0 = NULL;
NAPI_GRO_CB(skb)->frag0_len = 0;
NAPI_GRO_CB(skb)->frag0 = NULL;
NAPI_GRO_CB(skb)->frag0_len = 0;
diff --git
a/target/linux/generic/hack-5.4/221-module_exports.patch
b/target/linux/generic/hack-5.4/221-module_exports.patch
index 4f805cf7e3dd6beb27ad44978782cd692e3221c5..c56ec9909b5ed58d51dfee63e58f7e5e7e301c00 100644
(file)
--- a/
target/linux/generic/hack-5.4/221-module_exports.patch
+++ b/
target/linux/generic/hack-5.4/221-module_exports.patch
@@
-56,7
+56,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
} \
\
/* __*init sections */ \
} \
\
/* __*init sections */ \
-@@ -8
88,6 +89
8,8 @@
+@@ -8
98,6 +90
8,8 @@
EXIT_TEXT \
EXIT_DATA \
EXIT_CALL \
EXIT_TEXT \
EXIT_DATA \
EXIT_CALL \
diff --git
a/target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
b/target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
index 8ca7b0be35228c35a83a2fef33de87037e84d50c..47e12b0166a007f687481063dd4d91e73c0896c5 100644
(file)
--- a/
target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
+++ b/
target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
@@
-32,7
+32,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
__u16 tc_index; /* traffic control index */
--- a/net/core/dev.c
+++ b/net/core/dev.c
__u16 tc_index; /* traffic control index */
--- a/net/core/dev.c
+++ b/net/core/dev.c
-@@ -546
8,6 +5468
,9 @@ static enum gro_result dev_gro_receive(s
+@@ -546
9,6 +5469
,9 @@ static enum gro_result dev_gro_receive(s
int same_flow;
int grow;
int same_flow;
int grow;
@@
-42,7
+42,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (netif_elide_gro(skb->dev))
goto normal;
if (netif_elide_gro(skb->dev))
goto normal;
-@@ -726
3,6 +7266
,48 @@ static void __netdev_adjacent_dev_unlink
+@@ -726
4,6 +7267
,48 @@ static void __netdev_adjacent_dev_unlink
&upper_dev->adj_list.lower);
}
&upper_dev->adj_list.lower);
}
@@
-91,7
+91,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
static int __netdev_upper_dev_link(struct net_device *dev,
struct net_device *upper_dev, bool master,
void *upper_priv, void *upper_info,
static int __netdev_upper_dev_link(struct net_device *dev,
struct net_device *upper_dev, bool master,
void *upper_priv, void *upper_info,
-@@ -731
3,6 +7358
,7 @@ static int __netdev_upper_dev_link(struc
+@@ -731
4,6 +7359
,7 @@ static int __netdev_upper_dev_link(struc
if (ret)
return ret;
if (ret)
return ret;
@@
-99,7
+99,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
&changeupper_info.info);
ret = notifier_to_errno(ret);
ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
&changeupper_info.info);
ret = notifier_to_errno(ret);
-@@ -740
6,6 +7452
,7 @@ void netdev_upper_dev_unlink(struct net_
+@@ -740
7,6 +7453
,7 @@ void netdev_upper_dev_unlink(struct net_
__netdev_adjacent_dev_unlink_neighbour(dev, upper_dev);
__netdev_adjacent_dev_unlink_neighbour(dev, upper_dev);
@@
-107,7
+107,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
&changeupper_info.info);
call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
&changeupper_info.info);
-@@ -813
6,6 +8183
,7 @@ int dev_set_mac_address(struct net_devic
+@@ -813
7,6 +8184
,7 @@ int dev_set_mac_address(struct net_devic
if (err)
return err;
dev->addr_assign_type = NET_ADDR_SET;
if (err)
return err;
dev->addr_assign_type = NET_ADDR_SET;
diff --git
a/target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch
b/target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch
index d80b1ecd0f43682c102b7e96dd0a09414b736850..6d24007b6a26f4a49f3fc97fdf77fac1f4907cf3 100644
(file)
--- a/
target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch
+++ b/
target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch
@@
-87,7
+87,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
static int netif_rx_internal(struct sk_buff *skb);
static int call_netdevice_notifiers_info(unsigned long val,
static int netif_rx_internal(struct sk_buff *skb);
static int call_netdevice_notifiers_info(unsigned long val,
-@@ -591
0,6 +5911
,11 @@ void __napi_schedule(struct napi_struct
+@@ -591
1,6 +5912
,11 @@ void __napi_schedule(struct napi_struct
{
unsigned long flags;
{
unsigned long flags;
@@
-99,7
+99,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
local_irq_save(flags);
____napi_schedule(this_cpu_ptr(&softnet_data), n);
local_irq_restore(flags);
local_irq_save(flags);
____napi_schedule(this_cpu_ptr(&softnet_data), n);
local_irq_restore(flags);
-@@ -595
7,6 +5963
,11 @@ EXPORT_SYMBOL(napi_schedule_prep);
+@@ -595
8,6 +5964
,11 @@ EXPORT_SYMBOL(napi_schedule_prep);
*/
void __napi_schedule_irqoff(struct napi_struct *n)
{
*/
void __napi_schedule_irqoff(struct napi_struct *n)
{
@@
-111,7
+111,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
____napi_schedule(this_cpu_ptr(&softnet_data), n);
}
EXPORT_SYMBOL(__napi_schedule_irqoff);
____napi_schedule(this_cpu_ptr(&softnet_data), n);
}
EXPORT_SYMBOL(__napi_schedule_irqoff);
-@@ -621
8,6 +6229
,84 @@ static void init_gro_hash(struct napi_st
+@@ -621
9,6 +6230
,84 @@ static void init_gro_hash(struct napi_st
napi->gro_bitmask = 0;
}
napi->gro_bitmask = 0;
}
@@
-196,7
+196,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
void netif_napi_add(struct net_device *dev, struct napi_struct *napi,
int (*poll)(struct napi_struct *, int), int weight)
{
void netif_napi_add(struct net_device *dev, struct napi_struct *napi,
int (*poll)(struct napi_struct *, int), int weight)
{
-@@ -623
7,6 +6326
,7 @@ void netif_napi_add(struct net_device *d
+@@ -623
8,6 +6327
,7 @@ void netif_napi_add(struct net_device *d
#ifdef CONFIG_NETPOLL
napi->poll_owner = -1;
#endif
#ifdef CONFIG_NETPOLL
napi->poll_owner = -1;
#endif
@@
-204,7
+204,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
set_bit(NAPI_STATE_SCHED, &napi->state);
set_bit(NAPI_STATE_NPSVC, &napi->state);
list_add_rcu(&napi->dev_list, &dev->napi_list);
set_bit(NAPI_STATE_SCHED, &napi->state);
set_bit(NAPI_STATE_NPSVC, &napi->state);
list_add_rcu(&napi->dev_list, &dev->napi_list);
-@@ -627
7,6 +6367
,7 @@ static void flush_gro_hash(struct napi_s
+@@ -627
8,6 +6368
,7 @@ static void flush_gro_hash(struct napi_s
void netif_napi_del(struct napi_struct *napi)
{
might_sleep();
void netif_napi_del(struct napi_struct *napi)
{
might_sleep();
@@
-212,7
+212,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (napi_hash_del(napi))
synchronize_net();
list_del_init(&napi->dev_list);
if (napi_hash_del(napi))
synchronize_net();
list_del_init(&napi->dev_list);
-@@ -62
89,50 +6380
,18 @@ EXPORT_SYMBOL(netif_napi_del);
+@@ -62
90,50 +6381
,18 @@ EXPORT_SYMBOL(netif_napi_del);
static int napi_poll(struct napi_struct *n, struct list_head *repoll)
{
static int napi_poll(struct napi_struct *n, struct list_head *repoll)
{
@@
-267,7
+267,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
/* Some drivers may have called napi_schedule
* prior to exhausting their budget.
/* Some drivers may have called napi_schedule
* prior to exhausting their budget.
-@@ -1027
0,6 +10329
,10 @@ static int __init net_dev_init(void)
+@@ -1027
1,6 +10330
,10 @@ static int __init net_dev_init(void)
sd->backlog.weight = weight_p;
}
sd->backlog.weight = weight_p;
}
diff --git
a/target/linux/layerscape/patches-5.4/303-core-0003-cgroup-let-a-symlink-too-be-created-with-a-cftype-fi.patch
b/target/linux/layerscape/patches-5.4/303-core-0003-cgroup-let-a-symlink-too-be-created-with-a-cftype-fi.patch
index 38f34ed2c004200fe71ed4bdeb75856743e990f9..58a7be7f7d22e4ff118936c8454ecac4a75fce8b 100644
(file)
--- a/
target/linux/layerscape/patches-5.4/303-core-0003-cgroup-let-a-symlink-too-be-created-with-a-cftype-fi.patch
+++ b/
target/linux/layerscape/patches-5.4/303-core-0003-cgroup-let-a-symlink-too-be-created-with-a-cftype-fi.patch
@@
-87,7
+87,7
@@
Signed-off-by: Li Yang <leoyang.li@nxp.com>
}
/**
}
/**
-@@ -387
1,6 +3887
,7 @@ static int cgroup_add_file(struct cgroup
+@@ -387
3,6 +3889
,7 @@ static int cgroup_add_file(struct cgroup
{
char name[CGROUP_FILE_NAME_MAX];
struct kernfs_node *kn;
{
char name[CGROUP_FILE_NAME_MAX];
struct kernfs_node *kn;
@@
-95,7
+95,7
@@
Signed-off-by: Li Yang <leoyang.li@nxp.com>
struct lock_class_key *key = NULL;
int ret;
struct lock_class_key *key = NULL;
int ret;
-@@ -390
1,6 +3918
,14 @@ static int cgroup_add_file(struct cgroup
+@@ -390
3,6 +3920
,14 @@ static int cgroup_add_file(struct cgroup
spin_unlock_irq(&cgroup_file_kn_lock);
}
spin_unlock_irq(&cgroup_file_kn_lock);
}
diff --git
a/target/linux/layerscape/patches-5.4/303-core-0004-cgroup-bfq-revert-bfq.weight-symlink-change.patch
b/target/linux/layerscape/patches-5.4/303-core-0004-cgroup-bfq-revert-bfq.weight-symlink-change.patch
index e82161a191d1acdaf0ebaa207afa7acfd35ad2b9..26d64e9b603f33c96b616f9d9b106c5a863f2a9f 100644
(file)
--- a/
target/linux/layerscape/patches-5.4/303-core-0004-cgroup-bfq-revert-bfq.weight-symlink-change.patch
+++ b/
target/linux/layerscape/patches-5.4/303-core-0004-cgroup-bfq-revert-bfq.weight-symlink-change.patch
@@
-89,7
+89,7
@@
Signed-off-by: Li Yang <leoyang.li@nxp.com>
}
/**
}
/**
-@@ -388
7,7 +3871
,6 @@ static int cgroup_add_file(struct cgroup
+@@ -388
9,7 +3873
,6 @@ static int cgroup_add_file(struct cgroup
{
char name[CGROUP_FILE_NAME_MAX];
struct kernfs_node *kn;
{
char name[CGROUP_FILE_NAME_MAX];
struct kernfs_node *kn;
@@
-97,7
+97,7
@@
Signed-off-by: Li Yang <leoyang.li@nxp.com>
struct lock_class_key *key = NULL;
int ret;
struct lock_class_key *key = NULL;
int ret;
-@@ -39
18,14 +3901
,6 @@ static int cgroup_add_file(struct cgroup
+@@ -39
20,14 +3903
,6 @@ static int cgroup_add_file(struct cgroup
spin_unlock_irq(&cgroup_file_kn_lock);
}
spin_unlock_irq(&cgroup_file_kn_lock);
}
diff --git
a/target/linux/layerscape/patches-5.4/701-net-0225-enetc-Configure-the-Time-Aware-Scheduler-via-tc-tapr.patch
b/target/linux/layerscape/patches-5.4/701-net-0225-enetc-Configure-the-Time-Aware-Scheduler-via-tc-tapr.patch
index c210e5b71e77b1be82b0cbaaf920ab06a4d2b524..cba297efc1d9023c3fdd6fde6629598a3373d7c8 100644
(file)
--- a/
target/linux/layerscape/patches-5.4/701-net-0225-enetc-Configure-the-Time-Aware-Scheduler-via-tc-tapr.patch
+++ b/
target/linux/layerscape/patches-5.4/701-net-0225-enetc-Configure-the-Time-Aware-Scheduler-via-tc-tapr.patch
@@
-141,7
+141,7
@@
Signed-off-by: David S. Miller <davem@davemloft.net>
#define ENETC_SIPCAPR0_RSS BIT(8)
#define ENETC_SIPCAPR1 0x24
#define ENETC_SITGTGR 0x30
#define ENETC_SIPCAPR0_RSS BIT(8)
#define ENETC_SIPCAPR1 0x24
#define ENETC_SITGTGR 0x30
-@@ -44
4,22 +445
,6 @@ union enetc_rx_bd {
+@@ -44
6,22 +447
,6 @@ union enetc_rx_bd {
#define EMETC_MAC_ADDR_FILT_RES 3 /* # of reserved entries at the beginning */
#define ENETC_MAX_NUM_VFS 2
#define EMETC_MAC_ADDR_FILT_RES 3 /* # of reserved entries at the beginning */
#define ENETC_MAX_NUM_VFS 2
@@
-164,7
+164,7
@@
Signed-off-by: David S. Miller <davem@davemloft.net>
#define ENETC_CBD_FLAGS_SF BIT(7) /* short format */
#define ENETC_CBD_STATUS_MASK 0xf
#define ENETC_CBD_FLAGS_SF BIT(7) /* short format */
#define ENETC_CBD_STATUS_MASK 0xf
-@@ -5
58,3 +543
,70 @@ static inline void enetc_set_bdr_prio(st
+@@ -5
60,3 +545
,70 @@ static inline void enetc_set_bdr_prio(st
val |= ENETC_TBMR_SET_PRIO(prio);
enetc_txbdr_wr(hw, bdr_idx, ENETC_TBMR, val);
}
val |= ENETC_TBMR_SET_PRIO(prio);
enetc_txbdr_wr(hw, bdr_idx, ENETC_TBMR, val);
}
diff --git
a/target/linux/layerscape/patches-5.4/701-net-0228-enetc-Make-mdio-accessors-more-generic.patch
b/target/linux/layerscape/patches-5.4/701-net-0228-enetc-Make-mdio-accessors-more-generic.patch
index efface684d06d4907819bb6f7ef31ccdfbe4d4a8..e83a0f9f66a8df19691437a4b7ec06658d4a6c94 100644
(file)
--- a/
target/linux/layerscape/patches-5.4/701-net-0228-enetc-Make-mdio-accessors-more-generic.patch
+++ b/
target/linux/layerscape/patches-5.4/701-net-0228-enetc-Make-mdio-accessors-more-generic.patch
@@
-19,7
+19,7
@@
Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
--- a/drivers/net/ethernet/freescale/enetc/enetc_hw.h
+++ b/drivers/net/ethernet/freescale/enetc/enetc_hw.h
--- a/drivers/net/ethernet/freescale/enetc/enetc_hw.h
+++ b/drivers/net/ethernet/freescale/enetc/enetc_hw.h
-@@ -
198,6 +198
,7 @@ enum enetc_bdr_type {TX, RX};
+@@ -
200,6 +200
,7 @@ enum enetc_bdr_type {TX, RX};
#define ENETC_PFPMR 0x1900
#define ENETC_PFPMR_PMACE BIT(1)
#define ENETC_PFPMR_MWLM BIT(0)
#define ENETC_PFPMR 0x1900
#define ENETC_PFPMR_PMACE BIT(1)
#define ENETC_PFPMR_MWLM BIT(0)
diff --git
a/target/linux/layerscape/patches-5.4/701-net-0229-enetc-Initialize-SerDes-for-SGMII-and-SXGMII-protoco.patch
b/target/linux/layerscape/patches-5.4/701-net-0229-enetc-Initialize-SerDes-for-SGMII-and-SXGMII-protoco.patch
index ef78b50148f6349ea2e57ef814dca793f1b02e19..5458141e9f66472c3fe3db6f095285786812e860 100644
(file)
--- a/
target/linux/layerscape/patches-5.4/701-net-0229-enetc-Initialize-SerDes-for-SGMII-and-SXGMII-protoco.patch
+++ b/
target/linux/layerscape/patches-5.4/701-net-0229-enetc-Initialize-SerDes-for-SGMII-and-SXGMII-protoco.patch
@@
-23,7
+23,7
@@
Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
--- a/drivers/net/ethernet/freescale/enetc/enetc_hw.h
+++ b/drivers/net/ethernet/freescale/enetc/enetc_hw.h
--- a/drivers/net/ethernet/freescale/enetc/enetc_hw.h
+++ b/drivers/net/ethernet/freescale/enetc/enetc_hw.h
-@@ -22
1,6 +221
,23 @@ enum enetc_bdr_type {TX, RX};
+@@ -22
3,6 +223
,23 @@ enum enetc_bdr_type {TX, RX};
#define ENETC_PM0_MAXFRM 0x8014
#define ENETC_SET_TX_MTU(val) ((val) << 16)
#define ENETC_SET_MAXFRM(val) ((val) & 0xffff)
#define ENETC_PM0_MAXFRM 0x8014
#define ENETC_SET_TX_MTU(val) ((val) << 16)
#define ENETC_SET_MAXFRM(val) ((val) & 0xffff)
@@
-79,8
+79,8
@@
Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
+}
--- a/drivers/net/ethernet/freescale/enetc/enetc_pf.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
+}
--- a/drivers/net/ethernet/freescale/enetc/enetc_pf.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
-@@ -8
07,6 +807,61 @@ static void enetc_of_put_phy(struct ene
t
-
of_node_put(priv->phy_node)
;
+@@ -8
52,6 +852,61 @@ static int enetc_init_port_rss_memory(s
t
+
return err
;
}
+static void enetc_configure_sgmii(struct mii_bus *imdio)
}
+static void enetc_configure_sgmii(struct mii_bus *imdio)
@@
-141,7
+141,7
@@
Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
static int enetc_pf_probe(struct pci_dev *pdev,
const struct pci_device_id *ent)
{
static int enetc_pf_probe(struct pci_dev *pdev,
const struct pci_device_id *ent)
{
-@@ -
871,6 +926
,10 @@ static int enetc_pf_probe(struct pci_dev
+@@ -
928,6 +983
,10 @@ static int enetc_pf_probe(struct pci_dev
if (err)
dev_warn(&pdev->dev, "Fallback to PHY-less operation\n");
if (err)
dev_warn(&pdev->dev, "Fallback to PHY-less operation\n");
diff --git
a/target/linux/layerscape/patches-5.4/701-net-0231-enetc-Use-DT-protocol-information-to-set-up-the-port.patch
b/target/linux/layerscape/patches-5.4/701-net-0231-enetc-Use-DT-protocol-information-to-set-up-the-port.patch
index dcdd279204a3ccdc48fc654d4142ab7b83549fa6..0e9a659f09a59f4a806b1cfcede8f061118c508b 100644
(file)
--- a/
target/linux/layerscape/patches-5.4/701-net-0231-enetc-Use-DT-protocol-information-to-set-up-the-port.patch
+++ b/
target/linux/layerscape/patches-5.4/701-net-0231-enetc-Use-DT-protocol-information-to-set-up-the-port.patch
@@
-124,8
+124,8
@@
Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
+ of_node_put(pf->phy_node);
}
+ of_node_put(pf->phy_node);
}
- static void enetc_configure_sgmii(struct mii_bus *imdio)
-@@ -
888,6 +891
,10 @@ static int enetc_pf_probe(struct pci_dev
+ /* Initialize the entire shared memory for the flow steering entries
+@@ -
933,6 +936
,10 @@ static int enetc_pf_probe(struct pci_dev
pf->si = si;
pf->total_vfs = pci_sriov_get_totalvfs(pdev);
pf->si = si;
pf->total_vfs = pci_sriov_get_totalvfs(pdev);
@@
-136,7
+136,7
@@
Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
enetc_configure_port(pf);
enetc_get_si_caps(si);
enetc_configure_port(pf);
enetc_get_si_caps(si);
-@@ -9
02,6 +909
,8 @@ static int enetc_pf_probe(struct pci_dev
+@@ -9
47,6 +954
,8 @@ static int enetc_pf_probe(struct pci_dev
enetc_pf_netdev_setup(si, ndev, &enetc_ndev_ops);
priv = netdev_priv(ndev);
enetc_pf_netdev_setup(si, ndev, &enetc_ndev_ops);
priv = netdev_priv(ndev);
@@
-145,7
+145,7
@@
Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
enetc_init_si_rings_params(priv);
enetc_init_si_rings_params(priv);
-@@ -9
17,10 +926
,6 @@ static int enetc_pf_probe(struct pci_dev
+@@ -9
74,10 +983
,6 @@ static int enetc_pf_probe(struct pci_dev
goto err_alloc_msix;
}
goto err_alloc_msix;
}
@@
-156,15
+156,15
@@
Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
err = enetc_configure_serdes(priv);
if (err)
dev_warn(&pdev->dev, "Attempted serdes config but failed\n");
err = enetc_configure_serdes(priv);
if (err)
dev_warn(&pdev->dev, "Attempted serdes config but failed\n");
-@@ -9
38,7 +943
,6 @@ static int enetc_pf_probe(struct pci_dev
+@@ -9
95,7 +1000
,6 @@ static int enetc_pf_probe(struct pci_dev
err_reg_netdev:
enetc_mdio_remove(pf);
- enetc_of_put_phy(priv);
enetc_free_msix(priv);
err_reg_netdev:
enetc_mdio_remove(pf);
- enetc_of_put_phy(priv);
enetc_free_msix(priv);
- err_
alloc_msix
:
- enetc_free_si_resources(priv);
-@@ -
946,6 +950
,7 @@ err_alloc_si_res:
+ err_
init_port_rss
:
+ err_init_port_rfs:
+@@ -
1005,6 +1009
,7 @@ err_alloc_si_res:
si->ndev = NULL;
free_netdev(ndev);
err_alloc_netdev:
si->ndev = NULL;
free_netdev(ndev);
err_alloc_netdev:
@@
-172,7
+172,7
@@
Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
err_map_pf_space:
enetc_pci_remove(pdev);
err_map_pf_space:
enetc_pci_remove(pdev);
-@@ -
968,7 +973
,7 @@ static void enetc_pf_remove(struct pci_d
+@@ -
1027,7 +1032
,7 @@ static void enetc_pf_remove(struct pci_d
unregister_netdev(si->ndev);
enetc_mdio_remove(pf);
unregister_netdev(si->ndev);
enetc_mdio_remove(pf);
diff --git
a/target/linux/layerscape/patches-5.4/701-net-0232-enetc-Handle-USXGMII-protocol.patch
b/target/linux/layerscape/patches-5.4/701-net-0232-enetc-Handle-USXGMII-protocol.patch
index d1e7004546e885d9d8538b9d51ea63c825154545..214d088113b01982f814275150c66700324b11d7 100644
(file)
--- a/
target/linux/layerscape/patches-5.4/701-net-0232-enetc-Handle-USXGMII-protocol.patch
+++ b/
target/linux/layerscape/patches-5.4/701-net-0232-enetc-Handle-USXGMII-protocol.patch
@@
-23,7
+23,7
@@
Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
enetc_port_wr(hw, ENETC_PM0_IF_MODE, ENETC_PM0_IFM_XGMII);
}
enetc_port_wr(hw, ENETC_PM0_IF_MODE, ENETC_PM0_IFM_XGMII);
}
-@@ -8
44,7 +845
,8 @@ static int enetc_configure_serdes(struct
+@@ -8
89,7 +890
,8 @@ static int enetc_configure_serdes(struct
int err;
if (priv->if_mode != PHY_INTERFACE_MODE_SGMII &&
int err;
if (priv->if_mode != PHY_INTERFACE_MODE_SGMII &&
@@
-33,7
+33,7
@@
Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
return 0;
err = enetc_imdio_init(pf);
return 0;
err = enetc_imdio_init(pf);
-@@ -8
54,7 +856
,8 @@ static int enetc_configure_serdes(struct
+@@ -8
99,7 +901
,8 @@ static int enetc_configure_serdes(struct
if (priv->if_mode == PHY_INTERFACE_MODE_SGMII)
enetc_configure_sgmii(pf->imdio);
if (priv->if_mode == PHY_INTERFACE_MODE_SGMII)
enetc_configure_sgmii(pf->imdio);
diff --git
a/target/linux/layerscape/patches-5.4/701-net-0234-enetc-WA-for-MDIO-register-access-issue.patch
b/target/linux/layerscape/patches-5.4/701-net-0234-enetc-WA-for-MDIO-register-access-issue.patch
index 82fde98823f73483ca424d9029cfc7bfa05613e4..6c3c525d5f37147da07ac07d13041870b20b4005 100644
(file)
--- a/
target/linux/layerscape/patches-5.4/701-net-0234-enetc-WA-for-MDIO-register-access-issue.patch
+++ b/
target/linux/layerscape/patches-5.4/701-net-0234-enetc-WA-for-MDIO-register-access-issue.patch
@@
-254,7
+254,7
@@
Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
rx_frm_cnt++;
--- a/drivers/net/ethernet/freescale/enetc/enetc_hw.h
+++ b/drivers/net/ethernet/freescale/enetc/enetc_hw.h
rx_frm_cnt++;
--- a/drivers/net/ethernet/freescale/enetc/enetc_hw.h
+++ b/drivers/net/ethernet/freescale/enetc/enetc_hw.h
-@@ -32
5,8 +325
,15 @@ struct enetc_hw {
+@@ -32
7,8 +327
,15 @@ struct enetc_hw {
};
/* general register accessors */
};
/* general register accessors */
@@
-272,7
+272,7
@@
Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
#ifdef ioread64
#define enetc_rd_reg64(reg) ioread64((reg))
#else
#ifdef ioread64
#define enetc_rd_reg64(reg) ioread64((reg))
#else
-@@ -34
5,12 +352
,102 @@ static inline u64 enetc_rd_reg64(void __
+@@ -34
7,12 +354
,102 @@ static inline u64 enetc_rd_reg64(void __
}
#endif
}
#endif
@@
-397,7
+397,7
@@
Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
#define enetc_mdio_rd(mdio_priv, off) \
--- a/drivers/net/ethernet/freescale/enetc/enetc_pf.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
#define enetc_mdio_rd(mdio_priv, off) \
--- a/drivers/net/ethernet/freescale/enetc/enetc_pf.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
-@@ -
987,6 +987
,9 @@ static void enetc_pf_remove(struct pci_d
+@@ -
1046,6 +1046
,9 @@ static void enetc_pf_remove(struct pci_d
enetc_pci_remove(pdev);
}
enetc_pci_remove(pdev);
}
diff --git
a/target/linux/layerscape/patches-5.4/701-net-0236-enetc-Replace-enetc_gregs-with-a-readers-writer-lock.patch
b/target/linux/layerscape/patches-5.4/701-net-0236-enetc-Replace-enetc_gregs-with-a-readers-writer-lock.patch
index 7f78e1d04399941e49fc474f2112f62932177f64..262e87306a15ab9a9d27a453115f0b24a14fc4f7 100644
(file)
--- a/
target/linux/layerscape/patches-5.4/701-net-0236-enetc-Replace-enetc_gregs-with-a-readers-writer-lock.patch
+++ b/
target/linux/layerscape/patches-5.4/701-net-0236-enetc-Replace-enetc_gregs-with-a-readers-writer-lock.patch
@@
-259,7
+259,7
@@
Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
--- a/drivers/net/ethernet/freescale/enetc/enetc_hw.h
+++ b/drivers/net/ethernet/freescale/enetc/enetc_hw.h
--- a/drivers/net/ethernet/freescale/enetc/enetc_hw.h
+++ b/drivers/net/ethernet/freescale/enetc/enetc_hw.h
-@@ -3
29,7 +329
,7 @@ struct enetc_hw {
+@@ -3
31,7 +331
,7 @@ struct enetc_hw {
#define enetc_wr_reg(reg, val) enetc_wr_reg_wa((reg), (val))
/* accessors for data-path, due to MDIO issue on LS1028 these should be called
#define enetc_wr_reg(reg, val) enetc_wr_reg_wa((reg), (val))
/* accessors for data-path, due to MDIO issue on LS1028 these should be called
@@
-268,7
+268,7
@@
Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
*/
#define enetc_rd_reg_hot(reg) ioread32((reg))
#define enetc_wr_reg_hot(reg, val) iowrite32((val), (reg))
*/
#define enetc_rd_reg_hot(reg) ioread32((reg))
#define enetc_wr_reg_hot(reg, val) iowrite32((val), (reg))
-@@ -35
2,90 +352
,45 @@ static inline u64 enetc_rd_reg64(void __
+@@ -35
4,90 +354
,45 @@ static inline u64 enetc_rd_reg64(void __
}
#endif
}
#endif
@@
-371,7
+371,7
@@
Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
#define enetc_rd(hw, off) enetc_rd_reg((hw)->reg + (off))
--- a/drivers/net/ethernet/freescale/enetc/enetc_pf.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
#define enetc_rd(hw, off) enetc_rd_reg((hw)->reg + (off))
--- a/drivers/net/ethernet/freescale/enetc/enetc_pf.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
-@@ -
987,8 +987
,9 @@ static void enetc_pf_remove(struct pci_d
+@@ -
1046,8 +1046
,9 @@ static void enetc_pf_remove(struct pci_d
enetc_pci_remove(pdev);
}
enetc_pci_remove(pdev);
}
diff --git
a/target/linux/layerscape/patches-5.4/701-net-0237-enetc-Remove-mdio-bus-on-PF-probe-error-path.patch
b/target/linux/layerscape/patches-5.4/701-net-0237-enetc-Remove-mdio-bus-on-PF-probe-error-path.patch
index 87ca136a2138cafb64e871aa589649a703edb018..0fa2d0e6e93afd6641c196a64f4014c614eddb07 100644
(file)
--- a/
target/linux/layerscape/patches-5.4/701-net-0237-enetc-Remove-mdio-bus-on-PF-probe-error-path.patch
+++ b/
target/linux/layerscape/patches-5.4/701-net-0237-enetc-Remove-mdio-bus-on-PF-probe-error-path.patch
@@
-48,7
+48,7
@@
Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
--- a/drivers/net/ethernet/freescale/enetc/enetc_pf.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
--- a/drivers/net/ethernet/freescale/enetc/enetc_pf.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
-@@ -
953,6 +953
,7 @@ err_alloc_si_res:
+@@ -
1012,6 +1012
,7 @@ err_alloc_si_res:
si->ndev = NULL;
free_netdev(ndev);
err_alloc_netdev:
si->ndev = NULL;
free_netdev(ndev);
err_alloc_netdev:
diff --git
a/target/linux/layerscape/patches-5.4/701-net-0336-enetc-add-support-Credit-Based-Shaper-CBS-for-hardwa.patch
b/target/linux/layerscape/patches-5.4/701-net-0336-enetc-add-support-Credit-Based-Shaper-CBS-for-hardwa.patch
index e8b9e98247aeba105954282341deeb80160e7981..2a85f5c8c35e7982b6482adb18aef2ac33df803d 100644
(file)
--- a/
target/linux/layerscape/patches-5.4/701-net-0336-enetc-add-support-Credit-Based-Shaper-CBS-for-hardwa.patch
+++ b/
target/linux/layerscape/patches-5.4/701-net-0336-enetc-add-support-Credit-Based-Shaper-CBS-for-hardwa.patch
@@
-78,8
+78,8
@@
Signed-off-by: David S. Miller <davem@davemloft.net>
+#define ENETC_CBS_BW_MASK GENMASK(6, 0)
#define ENETC_PTCCBSR1(n) (0x1114 + (n) * 8) /* n = 0 to 7*/
#define ENETC_RSSHASH_KEY_SIZE 40
+#define ENETC_CBS_BW_MASK GENMASK(6, 0)
#define ENETC_PTCCBSR1(n) (0x1114 + (n) * 8) /* n = 0 to 7*/
#define ENETC_RSSHASH_KEY_SIZE 40
- #define ENETC_PRSS
K(n) (0x1410 + (n) * 4) /* n = [0..9] */
-@@ -67
7,6 +679
,8 @@ struct enetc_cbd {
+ #define ENETC_PRSS
CAPR 0x1404
+@@ -67
9,6 +681
,8 @@ struct enetc_cbd {
u8 status_flags;
};
u8 status_flags;
};
diff --git
a/target/linux/layerscape/patches-5.4/701-net-0337-enetc-add-support-tsn-capabilities-qbv-qci-qbu-cbs.patch
b/target/linux/layerscape/patches-5.4/701-net-0337-enetc-add-support-tsn-capabilities-qbv-qci-qbu-cbs.patch
index ba71805275c985f977d74433a0190b49d635cd2d..2e264aba089e0b2031eb0fb50eafab982ae89701 100644
(file)
--- a/
target/linux/layerscape/patches-5.4/701-net-0337-enetc-add-support-tsn-capabilities-qbv-qci-qbu-cbs.patch
+++ b/
target/linux/layerscape/patches-5.4/701-net-0337-enetc-add-support-tsn-capabilities-qbv-qci-qbu-cbs.patch
@@
-296,7
+296,7
@@
Signed-off-by: Po Liu <Po.Liu@nxp.com>
#define ENETC_SIPCAPR0_RSS BIT(8)
#define ENETC_SIPCAPR1 0x24
#define ENETC_SITGTGR 0x30
#define ENETC_SIPCAPR0_RSS BIT(8)
#define ENETC_SIPCAPR1 0x24
#define ENETC_SITGTGR 0x30
-@@ -24
1,10 +242
,20 @@ enum enetc_bdr_type {TX, RX};
+@@ -24
3,10 +244
,20 @@ enum enetc_bdr_type {TX, RX};
#define ENETC_PCS_IF_MODE_SGMII_AN 0x0003
#define ENETC_PM0_IF_MODE 0x8300
#define ENETC_PCS_IF_MODE_SGMII_AN 0x0003
#define ENETC_PM0_IF_MODE 0x8300
@@
-317,7
+317,7
@@
Signed-off-by: Po Liu <Po.Liu@nxp.com>
/* MAC counters */
#define ENETC_PM0_REOCT 0x8100
/* MAC counters */
#define ENETC_PM0_REOCT 0x8100
-@@ -
298,6 +309
,15 @@ enum enetc_bdr_type {TX, RX};
+@@ -
300,6 +311
,15 @@ enum enetc_bdr_type {TX, RX};
#define ENETC_PM0_TSCOL 0x82E0
#define ENETC_PM0_TLCOL 0x82E8
#define ENETC_PM0_TECOL 0x82F0
#define ENETC_PM0_TSCOL 0x82E0
#define ENETC_PM0_TLCOL 0x82E8
#define ENETC_PM0_TECOL 0x82F0
@@
-333,7
+333,7
@@
Signed-off-by: Po Liu <Po.Liu@nxp.com>
/* Port counters */
#define ENETC_PICDR(n) (0x0700 + (n) * 8) /* n = [0..3] */
/* Port counters */
#define ENETC_PICDR(n) (0x0700 + (n) * 8) /* n = [0..3] */
-@@ -45
6,6 +476
,7 @@ union enetc_tx_bd {
+@@ -45
8,6 +478
,7 @@ union enetc_tx_bd {
#define ENETC_TXBD_FLAGS_CSUM BIT(3)
#define ENETC_TXBD_FLAGS_EX BIT(6)
#define ENETC_TXBD_FLAGS_F BIT(7)
#define ENETC_TXBD_FLAGS_CSUM BIT(3)
#define ENETC_TXBD_FLAGS_EX BIT(6)
#define ENETC_TXBD_FLAGS_F BIT(7)
@@
-341,7
+341,7
@@
Signed-off-by: Po Liu <Po.Liu@nxp.com>
static inline void enetc_clear_tx_bd(union enetc_tx_bd *txbd)
{
static inline void enetc_clear_tx_bd(union enetc_tx_bd *txbd)
{
-@@ -48
3,6 +504
,8 @@ static inline __le16 enetc_txbd_l3_csoff
+@@ -48
5,6 +506
,8 @@ static inline __le16 enetc_txbd_l3_csoff
#define ENETC_TXBD_L4_UDP BIT(5)
#define ENETC_TXBD_L4_TCP BIT(6)
#define ENETC_TXBD_L4_UDP BIT(5)
#define ENETC_TXBD_L4_TCP BIT(6)
@@
-350,7
+350,7
@@
Signed-off-by: Po Liu <Po.Liu@nxp.com>
union enetc_rx_bd {
struct {
__le64 addr;
union enetc_rx_bd {
struct {
__le64 addr;
-@@ -6
29,21 +652
,307 @@ enum bdcr_cmd_class {
+@@ -6
31,21 +654
,307 @@ enum bdcr_cmd_class {
BDCR_CMD_RFS,
BDCR_CMD_PORT_GCL,
BDCR_CMD_RECV_CLASSIFIER,
BDCR_CMD_RFS,
BDCR_CMD_PORT_GCL,
BDCR_CMD_RECV_CLASSIFIER,
@@
-662,7
+662,7
@@
Signed-off-by: Po Liu <Po.Liu@nxp.com>
/* gate control list entry */
struct gce {
__le32 period;
/* gate control list entry */
struct gce {
__le32 period;
-@@ -66
0,13 +969
,55 @@ struct tgs_gcl_data {
+@@ -66
2,13 +971
,55 @@ struct tgs_gcl_data {
struct gce entry[0];
};
struct gce entry[0];
};
@@
-719,7
+719,7
@@
Signed-off-by: Po Liu <Po.Liu@nxp.com>
};
}; /* Long format */
__le32 data[6];
};
}; /* Long format */
__le32 data[6];
-@@ -68
1,11 +1032
,88 @@ struct enetc_cbd {
+@@ -68
3,11 +1034
,88 @@ struct enetc_cbd {
#define ENETC_CLK 400000000ULL
#define ENETC_CLK 400000000ULL
@@
-839,7
+839,7
@@
Signed-off-by: Po Liu <Po.Liu@nxp.com>
/* pick up primary MAC address from SI */
enetc_get_primary_mac_addr(&si->hw, ndev->dev_addr);
}
/* pick up primary MAC address from SI */
enetc_get_primary_mac_addr(&si->hw, ndev->dev_addr);
}
-@@ -9
42,6 +949
,8 @@ static int enetc_pf_probe(struct pci_dev
+@@ -9
99,6 +1006
,8 @@ static int enetc_pf_probe(struct pci_dev
netif_info(priv, probe, ndev, "%s v%s\n",
enetc_drv_name, enetc_drv_ver);
netif_info(priv, probe, ndev, "%s v%s\n",
enetc_drv_name, enetc_drv_ver);
@@
-848,7
+848,7
@@
Signed-off-by: Po Liu <Po.Liu@nxp.com>
return 0;
err_reg_netdev:
return 0;
err_reg_netdev:
-@@ -
974,6 +983
,8 @@ static void enetc_pf_remove(struct pci_d
+@@ -
1033,6 +1042
,8 @@ static void enetc_pf_remove(struct pci_d
netif_info(priv, drv, si->ndev, "%s v%s remove\n",
enetc_drv_name, enetc_drv_ver);
netif_info(priv, drv, si->ndev, "%s v%s remove\n",
enetc_drv_name, enetc_drv_ver);
diff --git
a/target/linux/layerscape/patches-5.4/701-net-0382-enetc-Make-MDIO-accessors-more-generic-and-export-to.patch
b/target/linux/layerscape/patches-5.4/701-net-0382-enetc-Make-MDIO-accessors-more-generic-and-export-to.patch
index 6a1e647acc450bdcc8ba36c3c8e1281c89ea5da0..77dbc06e2567e13d6830d3371a46254dbcc48819 100644
(file)
--- a/
target/linux/layerscape/patches-5.4/701-net-0382-enetc-Make-MDIO-accessors-more-generic-and-export-to.patch
+++ b/
target/linux/layerscape/patches-5.4/701-net-0382-enetc-Make-MDIO-accessors-more-generic-and-export-to.patch
@@
-344,7
+344,7
@@
MDIO erratum.
static int enetc_of_get_phy(struct enetc_pf *pf)
{
struct device *dev = &pf->si->pdev->dev;
static int enetc_of_get_phy(struct enetc_pf *pf)
{
struct device *dev = &pf->si->pdev->dev;
-@@ -8
46,6 +893
,30 @@ static void enetc_configure_sxgmii(struc
+@@ -8
91,6 +938
,30 @@ static void enetc_configure_sxgmii(struc
ENETC_PCS_CR_LANE_RESET | ENETC_PCS_CR_RESET_AN);
}
ENETC_PCS_CR_LANE_RESET | ENETC_PCS_CR_RESET_AN);
}
diff --git
a/target/linux/layerscape/patches-5.4/701-net-0407-LF-924-net-enetc-Set-MAC-Rx-FIFO-to-recommended-valu.patch
b/target/linux/layerscape/patches-5.4/701-net-0407-LF-924-net-enetc-Set-MAC-Rx-FIFO-to-recommended-valu.patch
index a288938b2a911825674acde2441d6775df0642e6..e381dda7cc52384da1e45cd481481c0f19fa17a0 100644
(file)
--- a/
target/linux/layerscape/patches-5.4/701-net-0407-LF-924-net-enetc-Set-MAC-Rx-FIFO-to-recommended-valu.patch
+++ b/
target/linux/layerscape/patches-5.4/701-net-0407-LF-924-net-enetc-Set-MAC-Rx-FIFO-to-recommended-valu.patch
@@
-17,7
+17,7
@@
Acked-by: Jason Liu <jason.hui.liu@nxp.com>
--- a/drivers/net/ethernet/freescale/enetc/enetc_hw.h
+++ b/drivers/net/ethernet/freescale/enetc/enetc_hw.h
--- a/drivers/net/ethernet/freescale/enetc/enetc_hw.h
+++ b/drivers/net/ethernet/freescale/enetc/enetc_hw.h
-@@ -22
4,6 +224
,8 @@ enum enetc_bdr_type {TX, RX};
+@@ -22
6,6 +226
,8 @@ enum enetc_bdr_type {TX, RX};
#define ENETC_PM0_MAXFRM 0x8014
#define ENETC_SET_TX_MTU(val) ((val) << 16)
#define ENETC_SET_MAXFRM(val) ((val) & 0xffff)
#define ENETC_PM0_MAXFRM 0x8014
#define ENETC_SET_TX_MTU(val) ((val) << 16)
#define ENETC_SET_MAXFRM(val) ((val) & 0xffff)
diff --git
a/target/linux/ramips/patches-5.4/0123-mips-ralink-manage-low-reset-lines.patch
b/target/linux/ramips/patches-5.4/0123-mips-ralink-manage-low-reset-lines.patch
index e59044dd96817ca92cb2b4fa1f6ba05d93731a7c..bdf98f223cbfcb99abcf25d48530a72c598d2ac3 100644
(file)
--- a/
target/linux/ramips/patches-5.4/0123-mips-ralink-manage-low-reset-lines.patch
+++ b/
target/linux/ramips/patches-5.4/0123-mips-ralink-manage-low-reset-lines.patch
@@
-23,11
+23,9
@@
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
arch/mips/ralink/reset.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
arch/mips/ralink/reset.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/arch/mips/ralink/reset.c b/arch/mips/ralink/reset.c
-index 8126f12604071..274d33078c5eb 100644
--- a/arch/mips/ralink/reset.c
+++ b/arch/mips/ralink/reset.c
--- a/arch/mips/ralink/reset.c
+++ b/arch/mips/ralink/reset.c
-@@ -27,7 +27,7 @@ static int ralink_assert_device(struct r
eset_controller_dev *rcdev,
+@@ -27,7 +27,7 @@ static int ralink_assert_device(struct r
{
u32 val;
{
u32 val;
@@
-36,7
+34,7
@@
index 8126f12604071..274d33078c5eb 100644
return -1;
val = rt_sysc_r32(SYSC_REG_RESET_CTRL);
return -1;
val = rt_sysc_r32(SYSC_REG_RESET_CTRL);
-@@ -42,7 +42,7 @@ static int ralink_deassert_device(struct
reset_controller_dev *rcdev,
+@@ -42,7 +42,7 @@ static int ralink_deassert_device(struct
{
u32 val;
{
u32 val;