From 9385f3f3b0aab63ea07c077f62835e0d54f5275b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 15 Aug 2022 15:38:10 +0200 Subject: [PATCH] 5.15-stable patches added patches: drm-bridge-tc358767-fix-e-dp-bridge-endpoint-parsing-in-dedicated-function.patch drm-vc4-change-vc4_dma_range_matches-from-a-global-to-static.patch net-phy-smsc-disable-energy-detect-power-down-in-interrupt-mode.patch --- ...dpoint-parsing-in-dedicated-function.patch | 48 ++++++++++++++ ...ange_matches-from-a-global-to-static.patch | 35 ++++++++++ ...-detect-power-down-in-interrupt-mode.patch | 64 +++++++++++++++++++ queue-5.15/series | 3 + 4 files changed, 150 insertions(+) create mode 100644 queue-5.15/drm-bridge-tc358767-fix-e-dp-bridge-endpoint-parsing-in-dedicated-function.patch create mode 100644 queue-5.15/drm-vc4-change-vc4_dma_range_matches-from-a-global-to-static.patch create mode 100644 queue-5.15/net-phy-smsc-disable-energy-detect-power-down-in-interrupt-mode.patch diff --git a/queue-5.15/drm-bridge-tc358767-fix-e-dp-bridge-endpoint-parsing-in-dedicated-function.patch b/queue-5.15/drm-bridge-tc358767-fix-e-dp-bridge-endpoint-parsing-in-dedicated-function.patch new file mode 100644 index 00000000000..e61afe3fe3f --- /dev/null +++ b/queue-5.15/drm-bridge-tc358767-fix-e-dp-bridge-endpoint-parsing-in-dedicated-function.patch @@ -0,0 +1,48 @@ +From 9030a9e571b3ba250d3d450a98310e3c74ecaff4 Mon Sep 17 00:00:00 2001 +From: Marek Vasut +Date: Thu, 28 Apr 2022 23:31:32 +0200 +Subject: drm/bridge: tc358767: Fix (e)DP bridge endpoint parsing in dedicated function + +From: Marek Vasut + +commit 9030a9e571b3ba250d3d450a98310e3c74ecaff4 upstream. + +Per toshiba,tc358767.yaml DT binding document, port@2 the output (e)DP +port is optional. In case this port is not described in DT, the bridge +driver operates in DPI-to-DP mode. The drm_of_find_panel_or_bridge() +call in tc_probe_edp_bridge_endpoint() returns -ENODEV in case port@2 +is not present in DT and this specific return value is incorrectly +propagated outside of tc_probe_edp_bridge_endpoint() function. All +other error values must be propagated and are propagated correctly. + +Return 0 in case the port@2 is missing instead, that reinstates the +original behavior before the commit this patch fixes. + +Fixes: 8478095a8c4b ("drm/bridge: tc358767: Move (e)DP bridge endpoint parsing into dedicated function") +Signed-off-by: Marek Vasut +Cc: Jonas Karlman +Cc: Laurent Pinchart +Cc: Lucas Stach +Cc: Marek Vasut +Cc: Maxime Ripard +Cc: Neil Armstrong +Cc: Robert Foss +Cc: Sam Ravnborg +Reviewed-by: Lucas Stach +Link: https://patchwork.freedesktop.org/patch/msgid/20220428213132.447890-1-marex@denx.de +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/bridge/tc358767.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/gpu/drm/bridge/tc358767.c ++++ b/drivers/gpu/drm/bridge/tc358767.c +@@ -1573,7 +1573,7 @@ static int tc_probe_edp_bridge_endpoint( + tc->bridge.type = DRM_MODE_CONNECTOR_DisplayPort; + } + +- return ret; ++ return 0; + } + + static int tc_probe(struct i2c_client *client, const struct i2c_device_id *id) diff --git a/queue-5.15/drm-vc4-change-vc4_dma_range_matches-from-a-global-to-static.patch b/queue-5.15/drm-vc4-change-vc4_dma_range_matches-from-a-global-to-static.patch new file mode 100644 index 00000000000..4f45fbe335d --- /dev/null +++ b/queue-5.15/drm-vc4-change-vc4_dma_range_matches-from-a-global-to-static.patch @@ -0,0 +1,35 @@ +From 63569d90863ff26c8b10c8971d1271c17a45224b Mon Sep 17 00:00:00 2001 +From: Tom Rix +Date: Wed, 29 Jun 2022 16:01:01 -0400 +Subject: drm/vc4: change vc4_dma_range_matches from a global to static + +From: Tom Rix + +commit 63569d90863ff26c8b10c8971d1271c17a45224b upstream. + +sparse reports +drivers/gpu/drm/vc4/vc4_drv.c:270:27: warning: symbol 'vc4_dma_range_matches' was not declared. Should it be static? + +vc4_dma_range_matches is only used in vc4_drv.c, so it's storage class specifier +should be static. + +Fixes: da8e393e23ef ("drm/vc4: drv: Adopt the dma configuration from the HVS or V3D component") +Signed-off-by: Tom Rix +Signed-off-by: Maxime Ripard +Link: https://patchwork.freedesktop.org/patch/msgid/20220629200101.498138-1-trix@redhat.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/vc4/vc4_drv.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/gpu/drm/vc4/vc4_drv.c ++++ b/drivers/gpu/drm/vc4/vc4_drv.c +@@ -214,7 +214,7 @@ static void vc4_match_add_drivers(struct + } + } + +-const struct of_device_id vc4_dma_range_matches[] = { ++static const struct of_device_id vc4_dma_range_matches[] = { + { .compatible = "brcm,bcm2711-hvs" }, + { .compatible = "brcm,bcm2835-hvs" }, + { .compatible = "brcm,bcm2835-v3d" }, diff --git a/queue-5.15/net-phy-smsc-disable-energy-detect-power-down-in-interrupt-mode.patch b/queue-5.15/net-phy-smsc-disable-energy-detect-power-down-in-interrupt-mode.patch new file mode 100644 index 00000000000..4548108e21f --- /dev/null +++ b/queue-5.15/net-phy-smsc-disable-energy-detect-power-down-in-interrupt-mode.patch @@ -0,0 +1,64 @@ +From 2642cc6c3bbe0900ba15bab078fd15ad8baccbc5 Mon Sep 17 00:00:00 2001 +From: Lukas Wunner +Date: Mon, 20 Jun 2022 13:04:50 +0200 +Subject: net: phy: smsc: Disable Energy Detect Power-Down in interrupt mode + +From: Lukas Wunner + +commit 2642cc6c3bbe0900ba15bab078fd15ad8baccbc5 upstream. + +Simon reports that if two LAN9514 USB adapters are directly connected +without an intermediate switch, the link fails to come up and link LEDs +remain dark. The issue was introduced by commit 1ce8b37241ed ("usbnet: +smsc95xx: Forward PHY interrupts to PHY driver to avoid polling"). + +The PHY suffers from a known erratum wherein link detection becomes +unreliable if Energy Detect Power-Down is used. In poll mode, the +driver works around the erratum by briefly disabling EDPD for 640 msec +to detect a neighbor, then re-enabling it to save power. + +In interrupt mode, no interrupt is signaled if EDPD is used by both link +partners, so it must not be enabled at all. + +We'll recoup the power savings by enabling SUSPEND1 mode on affected +LAN95xx chips in a forthcoming commit. + +Fixes: 1ce8b37241ed ("usbnet: smsc95xx: Forward PHY interrupts to PHY driver to avoid polling") +Reported-by: Simon Han +Signed-off-by: Lukas Wunner +Link: https://lore.kernel.org/r/439a3f3168c2f9d44b5fd9bb8d2b551711316be6.1655714438.git.lukas@wunner.de +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/phy/smsc.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- a/drivers/net/phy/smsc.c ++++ b/drivers/net/phy/smsc.c +@@ -110,7 +110,7 @@ static int smsc_phy_config_init(struct p + struct smsc_phy_priv *priv = phydev->priv; + int rc; + +- if (!priv->energy_enable) ++ if (!priv->energy_enable || phydev->irq != PHY_POLL) + return 0; + + rc = phy_read(phydev, MII_LAN83C185_CTRL_STATUS); +@@ -210,6 +210,8 @@ static int lan95xx_config_aneg_ext(struc + * response on link pulses to detect presence of plugged Ethernet cable. + * The Energy Detect Power-Down mode is enabled again in the end of procedure to + * save approximately 220 mW of power if cable is unplugged. ++ * The workaround is only applicable to poll mode. Energy Detect Power-Down may ++ * not be used in interrupt mode lest link change detection becomes unreliable. + */ + static int lan87xx_read_status(struct phy_device *phydev) + { +@@ -217,7 +219,7 @@ static int lan87xx_read_status(struct ph + + int err = genphy_read_status(phydev); + +- if (!phydev->link && priv->energy_enable) { ++ if (!phydev->link && priv->energy_enable && phydev->irq == PHY_POLL) { + /* Disable EDPD to wake up PHY */ + int rc = phy_read(phydev, MII_LAN83C185_CTRL_STATUS); + if (rc < 0) diff --git a/queue-5.15/series b/queue-5.15/series index bb3fc1205de..54ebd315fbd 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -766,3 +766,6 @@ tcp-fix-over-estimation-in-sk_forced_mem_schedule.patch crypto-lib-blake2s-reduce-stack-frame-usage-in-self-test.patch revert-mwifiex-fix-sleep-in-atomic-context-bugs-caused-by-dev_coredumpv.patch revert-s390-smp-enforce-lowcore-protection-on-cpu-restart.patch +drm-bridge-tc358767-fix-e-dp-bridge-endpoint-parsing-in-dedicated-function.patch +net-phy-smsc-disable-energy-detect-power-down-in-interrupt-mode.patch +drm-vc4-change-vc4_dma_range_matches-from-a-global-to-static.patch -- 2.47.3