From: Sasha Levin Date: Sun, 10 Mar 2024 13:17:11 +0000 (-0400) Subject: Drop soc-qcom-pmic-glink-switch-to-drm_aux_hpd_bridge.patch X-Git-Tag: v6.8.1~25 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dd24b1f76d5bcc208d659be1b984d6739bcdea64;p=thirdparty%2Fkernel%2Fstable-queue.git Drop soc-qcom-pmic-glink-switch-to-drm_aux_hpd_bridge.patch Signed-off-by: Sasha Levin --- diff --git a/queue-6.6/series b/queue-6.6/series index fa87bc7ba95..ee6ad29ac1f 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -1,6 +1,5 @@ drm-bridge-add-transparent-bridge-helper.patch drm-bridge-implement-generic-dp-hpd-bridge.patch -soc-qcom-pmic-glink-switch-to-drm_aux_hpd_bridge.patch dt-bindings-dma-fsl-edma-add-fsl-edma.h-to-prevent-h.patch dmaengine-fsl-edma-utilize-common-dt-binding-header-.patch dmaengine-fsl-edma-correct-max_segment_size-setting.patch diff --git a/queue-6.6/soc-qcom-pmic-glink-switch-to-drm_aux_hpd_bridge.patch b/queue-6.6/soc-qcom-pmic-glink-switch-to-drm_aux_hpd_bridge.patch deleted file mode 100644 index cf425a162a9..00000000000 --- a/queue-6.6/soc-qcom-pmic-glink-switch-to-drm_aux_hpd_bridge.patch +++ /dev/null @@ -1,111 +0,0 @@ -From bb14b6982fe054b9297263c12201143bc1732d73 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sun, 3 Dec 2023 14:43:32 +0300 -Subject: soc: qcom: pmic-glink: switch to DRM_AUX_HPD_BRIDGE - -From: Dmitry Baryshkov - -[ Upstream commit 2bcca96abfbf89d26fc10fc92e40532bb2ae8891 ] - -Use the freshly defined DRM_AUX_HPD_BRIDGE instead of open-coding the -same functionality for the DRM bridge chain termination. - -Reviewed-by: Bjorn Andersson -Acked-by: Bjorn Andersson -Signed-off-by: Dmitry Baryshkov -Link: https://patchwork.freedesktop.org/patch/msgid/20231203114333.1305826-6-dmitry.baryshkov@linaro.org -Stable-dep-of: b979f2d50a09 ("soc: qcom: pmic_glink_altmode: fix drm bridge use-after-free") -Signed-off-by: Sasha Levin ---- - drivers/soc/qcom/Kconfig | 1 + - drivers/soc/qcom/pmic_glink_altmode.c | 33 ++++++++------------------- - 2 files changed, 10 insertions(+), 24 deletions(-) - -diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig -index 715348869d048..a4a201404d09f 100644 ---- a/drivers/soc/qcom/Kconfig -+++ b/drivers/soc/qcom/Kconfig -@@ -102,6 +102,7 @@ config QCOM_PMIC_GLINK - depends on OF - select AUXILIARY_BUS - select QCOM_PDR_HELPERS -+ select DRM_AUX_HPD_BRIDGE - help - The Qualcomm PMIC GLINK driver provides access, over GLINK, to the - USB and battery firmware running on one of the coprocessors in -diff --git a/drivers/soc/qcom/pmic_glink_altmode.c b/drivers/soc/qcom/pmic_glink_altmode.c -index 9b0000b5f064c..c07cddecc85e9 100644 ---- a/drivers/soc/qcom/pmic_glink_altmode.c -+++ b/drivers/soc/qcom/pmic_glink_altmode.c -@@ -11,7 +11,7 @@ - #include - #include - #include --#include -+#include - - #include - #include -@@ -76,7 +76,7 @@ struct pmic_glink_altmode_port { - - struct work_struct work; - -- struct drm_bridge bridge; -+ struct device *bridge; - - enum typec_orientation orientation; - u16 svid; -@@ -230,10 +230,10 @@ static void pmic_glink_altmode_worker(struct work_struct *work) - else - pmic_glink_altmode_enable_usb(altmode, alt_port); - -- if (alt_port->hpd_state) -- drm_bridge_hpd_notify(&alt_port->bridge, connector_status_connected); -- else -- drm_bridge_hpd_notify(&alt_port->bridge, connector_status_disconnected); -+ drm_aux_hpd_bridge_notify(alt_port->bridge, -+ alt_port->hpd_state ? -+ connector_status_connected : -+ connector_status_disconnected); - - pmic_glink_altmode_request(altmode, ALTMODE_PAN_ACK, alt_port->index); - }; -@@ -365,16 +365,6 @@ static void pmic_glink_altmode_callback(const void *data, size_t len, void *priv - } - } - --static int pmic_glink_altmode_attach(struct drm_bridge *bridge, -- enum drm_bridge_attach_flags flags) --{ -- return flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR ? 0 : -EINVAL; --} -- --static const struct drm_bridge_funcs pmic_glink_altmode_bridge_funcs = { -- .attach = pmic_glink_altmode_attach, --}; -- - static void pmic_glink_altmode_put_retimer(void *data) - { - typec_retimer_put(data); -@@ -464,15 +454,10 @@ static int pmic_glink_altmode_probe(struct auxiliary_device *adev, - alt_port->index = port; - INIT_WORK(&alt_port->work, pmic_glink_altmode_worker); - -- alt_port->bridge.funcs = &pmic_glink_altmode_bridge_funcs; -- alt_port->bridge.of_node = to_of_node(fwnode); -- alt_port->bridge.ops = DRM_BRIDGE_OP_HPD; -- alt_port->bridge.type = DRM_MODE_CONNECTOR_DisplayPort; -- -- ret = devm_drm_bridge_add(dev, &alt_port->bridge); -- if (ret) { -+ alt_port->bridge = drm_dp_hpd_bridge_register(dev, to_of_node(fwnode)); -+ if (IS_ERR(alt_port->bridge)) { - fwnode_handle_put(fwnode); -- return ret; -+ return PTR_ERR(alt_port->bridge); - } - - alt_port->dp_alt.svid = USB_TYPEC_DP_SID; --- -2.43.0 - diff --git a/queue-6.7/series b/queue-6.7/series index 21e1f1e4c59..574aaac4d8c 100644 --- a/queue-6.7/series +++ b/queue-6.7/series @@ -1,6 +1,5 @@ drm-bridge-add-transparent-bridge-helper.patch drm-bridge-implement-generic-dp-hpd-bridge.patch -soc-qcom-pmic-glink-switch-to-drm_aux_hpd_bridge.patch dt-bindings-dma-fsl-edma-add-fsl-edma.h-to-prevent-h.patch dmaengine-fsl-edma-utilize-common-dt-binding-header-.patch dmaengine-fsl-edma-correct-max_segment_size-setting.patch diff --git a/queue-6.7/soc-qcom-pmic-glink-switch-to-drm_aux_hpd_bridge.patch b/queue-6.7/soc-qcom-pmic-glink-switch-to-drm_aux_hpd_bridge.patch deleted file mode 100644 index bba56aac59d..00000000000 --- a/queue-6.7/soc-qcom-pmic-glink-switch-to-drm_aux_hpd_bridge.patch +++ /dev/null @@ -1,111 +0,0 @@ -From c2f051c3e81e9216cc2ca7096b1dfd0093ae89a3 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sun, 3 Dec 2023 14:43:32 +0300 -Subject: soc: qcom: pmic-glink: switch to DRM_AUX_HPD_BRIDGE - -From: Dmitry Baryshkov - -[ Upstream commit 2bcca96abfbf89d26fc10fc92e40532bb2ae8891 ] - -Use the freshly defined DRM_AUX_HPD_BRIDGE instead of open-coding the -same functionality for the DRM bridge chain termination. - -Reviewed-by: Bjorn Andersson -Acked-by: Bjorn Andersson -Signed-off-by: Dmitry Baryshkov -Link: https://patchwork.freedesktop.org/patch/msgid/20231203114333.1305826-6-dmitry.baryshkov@linaro.org -Stable-dep-of: b979f2d50a09 ("soc: qcom: pmic_glink_altmode: fix drm bridge use-after-free") -Signed-off-by: Sasha Levin ---- - drivers/soc/qcom/Kconfig | 1 + - drivers/soc/qcom/pmic_glink_altmode.c | 33 ++++++++------------------- - 2 files changed, 10 insertions(+), 24 deletions(-) - -diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig -index b3634e10f6f5e..c954001ae79ec 100644 ---- a/drivers/soc/qcom/Kconfig -+++ b/drivers/soc/qcom/Kconfig -@@ -86,6 +86,7 @@ config QCOM_PMIC_GLINK - depends on OF - select AUXILIARY_BUS - select QCOM_PDR_HELPERS -+ select DRM_AUX_HPD_BRIDGE - help - The Qualcomm PMIC GLINK driver provides access, over GLINK, to the - USB and battery firmware running on one of the coprocessors in -diff --git a/drivers/soc/qcom/pmic_glink_altmode.c b/drivers/soc/qcom/pmic_glink_altmode.c -index 7ee52cf2570fa..1539ccb7a346d 100644 ---- a/drivers/soc/qcom/pmic_glink_altmode.c -+++ b/drivers/soc/qcom/pmic_glink_altmode.c -@@ -11,7 +11,7 @@ - #include - #include - #include --#include -+#include - - #include - #include -@@ -76,7 +76,7 @@ struct pmic_glink_altmode_port { - - struct work_struct work; - -- struct drm_bridge bridge; -+ struct device *bridge; - - enum typec_orientation orientation; - u16 svid; -@@ -230,10 +230,10 @@ static void pmic_glink_altmode_worker(struct work_struct *work) - else - pmic_glink_altmode_enable_usb(altmode, alt_port); - -- if (alt_port->hpd_state) -- drm_bridge_hpd_notify(&alt_port->bridge, connector_status_connected); -- else -- drm_bridge_hpd_notify(&alt_port->bridge, connector_status_disconnected); -+ drm_aux_hpd_bridge_notify(alt_port->bridge, -+ alt_port->hpd_state ? -+ connector_status_connected : -+ connector_status_disconnected); - - pmic_glink_altmode_request(altmode, ALTMODE_PAN_ACK, alt_port->index); - }; -@@ -365,16 +365,6 @@ static void pmic_glink_altmode_callback(const void *data, size_t len, void *priv - } - } - --static int pmic_glink_altmode_attach(struct drm_bridge *bridge, -- enum drm_bridge_attach_flags flags) --{ -- return flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR ? 0 : -EINVAL; --} -- --static const struct drm_bridge_funcs pmic_glink_altmode_bridge_funcs = { -- .attach = pmic_glink_altmode_attach, --}; -- - static void pmic_glink_altmode_put_retimer(void *data) - { - typec_retimer_put(data); -@@ -464,15 +454,10 @@ static int pmic_glink_altmode_probe(struct auxiliary_device *adev, - alt_port->index = port; - INIT_WORK(&alt_port->work, pmic_glink_altmode_worker); - -- alt_port->bridge.funcs = &pmic_glink_altmode_bridge_funcs; -- alt_port->bridge.of_node = to_of_node(fwnode); -- alt_port->bridge.ops = DRM_BRIDGE_OP_HPD; -- alt_port->bridge.type = DRM_MODE_CONNECTOR_DisplayPort; -- -- ret = devm_drm_bridge_add(dev, &alt_port->bridge); -- if (ret) { -+ alt_port->bridge = drm_dp_hpd_bridge_register(dev, to_of_node(fwnode)); -+ if (IS_ERR(alt_port->bridge)) { - fwnode_handle_put(fwnode); -- return ret; -+ return PTR_ERR(alt_port->bridge); - } - - alt_port->dp_alt.svid = USB_TYPEC_DP_SID; --- -2.43.0 -