The difference between "fsl,etsec2-mdio" and "gianfar" has to do with
the .get_tbipa function, which calculates the address of the TBIPA
register automatically, if not explicitly specified. [ see
drivers/net/ethernet/freescale/fsl_pq_mdio.c ]. On LS1021A, the TBIPA
register is at offset 0x30 within the port register block, which is what
the "gianfar" method of calculating addresses actually does.
Luckily, the bad "compatible" is inconsequential for ls1021a.dtsi,
because the TBIPA register is explicitly specified via the second "reg"
(<0x0 0x2d10030 0x0 0x4>), so the "get_tbipa" function is dead code.
Nonetheless it's good to restore it to its correct value.
Background discussion:
https://www.spinics.net/lists/stable/msg361156.html
Fixes: c7861adbe37f ("ARM: dts: ls1021: Fix SGMII PCS link remaining down after PHY disconnect")
Reported-by: Pavel Machek <pavel(a)denx.de>
Signed-off-by: Vladimir Oltean <olteanv(a)gmail.com>
---
arch/arm/boot/dts/ls1021a.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/ls1021a.dtsi b/arch/arm/boot/dts/ls1021a.dtsi
index 2f6977ada447..63d9f4a066e3 100644
--- a/arch/arm/boot/dts/ls1021a.dtsi
+++ b/arch/arm/boot/dts/ls1021a.dtsi
@@ -728,7 +728,7 @@
};
mdio0: mdio@2d24000 {
- compatible = "fsl,etsec2-mdio";
+ compatible = "gianfar";
device_type = "mdio";
#address-cells = <1>;
#size-cells = <0>;
@@ -737,7 +737,7 @@
};
mdio1: mdio@2d64000 {
- compatible = "fsl,etsec2-mdio";
+ compatible = "gianfar";
device_type = "mdio";
#address-cells = <1>;
#size-cells = <0>;
--
2.17.1
For this (and all of the other patches in this series), we can just drop this
from stable. I need to send a respin of this series anyway so I will go ahead
and drop the stable cc from there.
On Thu, 2020-02-13 at 17:37 +0000, Sasha Levin wrote:
> Hi,
>
> [This is an automated email]
>
> This commit has been processed because it contains a -stable tag.
> The stable tag indicates that it's relevant for the following trees: all
>
> The bot has tested the following trees: v5.5.3, v5.4.19, v4.19.103,
> v4.14.170, v4.9.213, v4.4.213.
>
> v5.5.3: Failed to apply! Possible dependencies:
> 5ff0cb1ce253 ("drm/nouveau/kms/nv50-: Use less encoders by making mstos
> per-head")
>
> v5.4.19: Failed to apply! Possible dependencies:
> 5ff0cb1ce253 ("drm/nouveau/kms/nv50-: Use less encoders by making mstos
> per-head")
>
> v4.19.103: Failed to apply! Possible dependencies:
> 5e292e7646ef ("drm/nouveau: Remove unnecessary VCPI checks in
> nv50_msto_cleanup()")
> 5ff0cb1ce253 ("drm/nouveau/kms/nv50-: Use less encoders by making mstos
> per-head")
>
> v4.14.170: Failed to apply! Possible dependencies:
> 07bbc1c5f49b ("drm/nouveau/core/memory: split info pointers from
> accessor pointers")
> 0b11b30de9d2 ("drm/nouveau/mmu/nv04-nv4x: move global vmm to nvkm_mmu")
> 11fc017dfb1e ("drm/nouveau/kms/nv50: prepare for double-buffered LUTs")
> 1590700d94ac ("drm/nouveau/kms/nv50-: split each resource type into
> their own source files")
> 269fe32d3343 ("drm/nouveau/bar: swap oneinit/init ordering, and rename
> bar3 to bar2")
> 30ed49b55b6e ("drm/nouveau/kms/nv50-: move code underneath dispnv50/")
> 34508f9d260c ("drm/nouveau/kms/nv50-: determine MST support from DP Info
> Table")
> 5b17f3624efa ("drm/nouveau/mmu/nv04: implement vmm on top of new base")
> 5e075fdeb166 ("drm/nouveau/mmu: automatically handle "un-bootstrapping"
> of vmm")
> 6359c982243e ("drm/nouveau/mmu/gp10b: fork from gf100")
> 698c1aa9f83b ("drm/nouveau/kms/nv50-: Don't create MSTMs for eDP
> connectors")
> 7f53d6dc9a72 ("drm/nouveau/core/memory: comptag allocation")
> 806a73356537 ("drm/nouveau/mmu: implement base for new vm management")
> 90df522912ac ("drm/nouveau/kms/nv50: use INTERPOLATE_257_UNITY_RANGE LUT
> on newer chipsets")
> 997a89003c2d ("drm/nouveau/core/memory: add reference counting")
> b86a45877ead ("drm/nouveau/mmu/gp100: fork from gf100")
> c83c4097eba8 ("drm/nouveau/mmu: define user interfaces to mmu memory
> allocation")
> cedc4d57df26 ("drm/nouveau/mmu/gm20b: fork from gf100")
> d1f6c8d2e9df ("drm/nouveau/mmu/gk20a: fork from gf100")
> e1e33c791a23 ("drm/nouveau/mmu/gm200: fork from gf100")
> e69dae85c90b ("drm/nouveau/bar/nv50,g84: drop mmu invalidate")
> e75182f68b7b ("drm/nouveau/kms/nv50: use "low res" lut for indexed
> mode")
> eaf1a69110f4 ("drm/nouveau/mmu: add base for type-based memory
> allocation")
> f4778f08a038 ("drm/nouveau/kms/nv50: fix handling of gamma since atomic
> conversion")
> f5650478ab07 ("drm/nouveau/disp/nv50-: pass nvkm_memory objects for
> channel push buffers")
>
> v4.9.213: Failed to apply! Possible dependencies:
> 11fc017dfb1e ("drm/nouveau/kms/nv50: prepare for double-buffered LUTs")
> 34508f9d260c ("drm/nouveau/kms/nv50-: determine MST support from DP Info
> Table")
> 3dbd036b8419 ("drm/nouveau/kms/nv50: separate out mode commit")
> 52aa30f2524d ("drm/nouveau/kms/nv50: switch mst sink back into sst
> mode")
> 698c1aa9f83b ("drm/nouveau/kms/nv50-: Don't create MSTMs for eDP
> connectors")
> 6bbab3b6b656 ("drm/nouveau/kms/nv50: separate out base/ovly channel
> usage bounds commit")
> a7ae1561909d ("drm/nouveau/kms/nv50: separate out lut commit")
> ad6336195393 ("drm/nouveau/kms/nv50: separate out core surface commit")
> f4778f08a038 ("drm/nouveau/kms/nv50: fix handling of gamma since atomic
> conversion")
>
> v4.4.213: Failed to apply! Possible dependencies:
> 13a3d91f17a5 ("drm: Pass 'name' to drm_encoder_init()")
> 34508f9d260c ("drm/nouveau/kms/nv50-: determine MST support from DP Info
> Table")
> 52aa30f2524d ("drm/nouveau/kms/nv50: switch mst sink back into sst
> mode")
> 698c1aa9f83b ("drm/nouveau/kms/nv50-: Don't create MSTMs for eDP
> connectors")
> a7ae1561909d ("drm/nouveau/kms/nv50: separate out lut commit")
> ad6336195393 ("drm/nouveau/kms/nv50: separate out core surface commit")
> f4778f08a038 ("drm/nouveau/kms/nv50: fix handling of gamma since atomic
> conversion")
>
>
> NOTE: The patch will not be queued to stable trees until it is upstream.
>
> How should we proceed with this patch?
>
--
Cheers,
Lyude Paul (she/her)
Associate Software Engineer at Red Hat
On Thu, 2020-02-13 at 17:37 +0000, Sasha Levin wrote:
> Hi,
>
> [This is an automated email]
>
> This commit has been processed because it contains a "Fixes:" tag,
> fixing commit: facaed62b4cb ("drm/nouveau/kms/gv100: initial support").
>
> The bot has tested the following trees: v5.5.3, v5.4.19, v4.19.103.
>
> v5.5.3: Build OK!
> v5.4.19: Build OK!
> v4.19.103: Failed to apply! Possible dependencies:
> 88b703527ba7 ("drm/nouveau/kms/gf119-: add ctm property support")
> cb55cd0c66a1 ("drm/nouveau/kms/nv50-: allow more flexibility with lut
> formats")
>
>
> NOTE: The patch will not be queued to stable trees until it is upstream.
>
> How should we proceed with this patch?
Apply it to 5.5.3, 5.4.19. We can drop the rest
>
--
Cheers,
Lyude Paul (she/her)
Associate Software Engineer at Red Hat