| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <79ad8faa-02ce-470b-a01b-a7fb5dc5ba23@huawei.com>
Date: Thu, 6 Mar 2025 22:36:31 +0800
From: Yongbang Shi <shiyongbang@...wei.com>
To: Dmitry Baryshkov <dmitry.baryshkov@...aro.org>
CC: <xinliang.liu@...aro.org>, <tiantao6@...ilicon.com>,
<maarten.lankhorst@...ux.intel.com>, <mripard@...nel.org>,
<tzimmermann@...e.de>, <airlied@...il.com>, <daniel@...ll.ch>,
<kong.kongxinwei@...ilicon.com>, <liangjian010@...wei.com>,
<chenjianmin@...wei.com>, <lidongming5@...wei.com>, <libaihan@...wei.com>,
<shenjian15@...wei.com>, <shaojijie@...wei.com>,
<dri-devel@...ts.freedesktop.org>, <linux-kernel@...r.kernel.org>,
<shiyongbang@...wei.com>
Subject: Re: [PATCH v4 drm-dp 7/8] drm/hisilicon/hibmc: Enable this hot plug
detect of irq feature
> On Wed, Mar 05, 2025 at 07:26:46PM +0800, Yongbang Shi wrote:
>> From: Baihan Li <libaihan@...wei.com>
>>
>> Add HPD interrupt enable functions in drm framework. Add link reset
>> process to reset link status when a new connector pulgged in. Because the
>> connected VGA connector would make driver can't get the userspace
>> call, adding detect_ctx in vga connector to make HPD active userspace.
>>
>> Signed-off-by: Baihan Li <libaihan@...wei.com>
>> Signed-off-by: Yongbang Shi <shiyongbang@...wei.com>
>> ---
>> ChangeLog:
>> v3 -> v4:
>> - add link reset of rates and lanes in pre link training process, suggested by Dmitry Baryshkov.
>> - add vdac detect and connected/disconnected status to enable HPD process, suggested by Dmitry Baryshkov.
>> - remove a drm_client, suggested by Dmitry Baryshkov.
>> - fix build errors reported by kernel test robot <lkp@...el.com>
>> Closes: https://lore.kernel.org/oe-kbuild-all/202502231304.BCzV4Y8D-lkp@intel.com/
>> v2 -> v3:
>> - remove mdelay(100) hpd function in ISR, suggested by Dmitry Baryshkov.
>> - remove enble_display in ISR, suggested by Dmitry Baryshkov.
>> - change drm_kms_helper_connector_hotplug_event() to
>> drm_connector_helper_hpd_irq_event(), suggested by Dmitry Baryshkov.
>> - move macros to dp_reg.h, suggested by Dmitry Baryshkov.
>> - remove struct irqs, suggested by Dmitry Baryshkov.
>> - split this patch into two parts, suggested by Dmitry Baryshkov.
>> - add a drm client dev to handle HPD event.
>> v1 -> v2:
>> - optimizing the description in commit message, suggested by Dmitry Baryshkov.
>> - add mdelay(100) comments, suggested by Dmitry Baryshkov.
>> - deleting display enable in hpd event, suggested by Dmitry Baryshkov.
>> ---
>> .../gpu/drm/hisilicon/hibmc/dp/dp_config.h | 1 +
>> drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.c | 36 +++++++++++++++++++
>> drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.h | 5 +++
>> drivers/gpu/drm/hisilicon/hibmc/dp/dp_link.c | 3 ++
>> .../gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c | 33 +++++++++++++++++
>> .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 2 ++
>> .../gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 3 ++
>> 7 files changed, 83 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/hisilicon/hibmc/dp/dp_config.h b/drivers/gpu/drm/hisilicon/hibmc/dp/dp_config.h
>> index c5feef8dc27d..08f9e1caf7fc 100644
>> --- a/drivers/gpu/drm/hisilicon/hibmc/dp/dp_config.h
>> +++ b/drivers/gpu/drm/hisilicon/hibmc/dp/dp_config.h
>> @@ -16,5 +16,6 @@
>> #define HIBMC_DP_SYNC_EN_MASK 0x3
>> #define HIBMC_DP_LINK_RATE_CAL 27
>> #define HIBMC_DP_SYNC_DELAY(lanes) ((lanes) == 0x2 ? 86 : 46)
>> +#define HIBMC_DP_INT_ENABLE 0xc
>>
>> #endif
>> diff --git a/drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.c b/drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.c
>> index ce7cb07815b2..8f0daec7d174 100644
>> --- a/drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.c
>> +++ b/drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.c
>> @@ -189,6 +189,36 @@ int hibmc_dp_hw_init(struct hibmc_dp *dp)
>> return 0;
>> }
>>
>> +void hibmc_dp_enable_int(struct hibmc_dp *dp)
>> +{
>> + struct hibmc_dp_dev *dp_dev = dp->dp_dev;
>> +
>> + writel(HIBMC_DP_INT_ENABLE, dp_dev->base + HIBMC_DP_INTR_ENABLE);
>> +}
>> +
>> +void hibmc_dp_disable_int(struct hibmc_dp *dp)
>> +{
>> + struct hibmc_dp_dev *dp_dev = dp->dp_dev;
>> +
>> + writel(0, dp_dev->base + HIBMC_DP_INTR_ENABLE);
>> + writel(HIBMC_DP_INT_RST, dp_dev->base + HIBMC_DP_INTR_ORIGINAL_STATUS);
>> +}
>> +
>> +void hibmc_dp_hpd_cfg(struct hibmc_dp *dp)
>> +{
>> + struct hibmc_dp_dev *dp_dev = dp->dp_dev;
>> +
>> + hibmc_dp_reg_write_field(dp_dev, HIBMC_DP_AUX_REQ, HIBMC_DP_CFG_AUX_SYNC_LEN_SEL, 0x0);
>> + hibmc_dp_reg_write_field(dp_dev, HIBMC_DP_AUX_REQ, HIBMC_DP_CFG_AUX_TIMER_TIMEOUT, 0x1);
>> + hibmc_dp_reg_write_field(dp->dp_dev, HIBMC_DP_AUX_REQ, HIBMC_DP_CFG_AUX_MIN_PULSE_NUM, 0x9);
>> + writel(HIBMC_DP_HDCP, dp_dev->base + HIBMC_DP_HDCP_CFG);
>> + writel(0, dp_dev->base + HIBMC_DP_INTR_ENABLE);
>> + writel(HIBMC_DP_INT_RST, dp_dev->base + HIBMC_DP_INTR_ORIGINAL_STATUS);
>> + writel(HIBMC_DP_INT_ENABLE, dp_dev->base + HIBMC_DP_INTR_ENABLE);
>> + writel(HIBMC_DP_DPTX_RST, dp_dev->base + HIBMC_DP_DPTX_RST_CTRL);
>> + writel(HIBMC_DP_CLK_EN, dp_dev->base + HIBMC_DP_DPTX_CLK_CTRL);
>> +}
>> +
>> void hibmc_dp_display_en(struct hibmc_dp *dp, bool enable)
>> {
>> struct hibmc_dp_dev *dp_dev = dp->dp_dev;
>> @@ -227,6 +257,12 @@ int hibmc_dp_mode_set(struct hibmc_dp *dp, struct drm_display_mode *mode)
>> return 0;
>> }
>>
>> +void hibmc_dp_reset_link(struct hibmc_dp *dp)
>> +{
>> + dp->dp_dev->link.status.clock_recovered = false;
>> + dp->dp_dev->link.status.channel_equalized = false;
>> +}
>> +
>> static const struct hibmc_dp_color_raw g_rgb_raw[] = {
>> {CBAR_COLOR_BAR, 0x000, 0x000, 0x000},
>> {CBAR_WHITE, 0xfff, 0xfff, 0xfff},
>> diff --git a/drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.h b/drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.h
>> index 83a53dae8012..665f5b166dfb 100644
>> --- a/drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.h
>> +++ b/drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.h
>> @@ -49,11 +49,16 @@ struct hibmc_dp {
>> void __iomem *mmio;
>> struct drm_dp_aux aux;
>> struct hibmc_dp_cbar_cfg cfg;
>> + u32 irq_status;
>> };
>>
>> int hibmc_dp_hw_init(struct hibmc_dp *dp);
>> int hibmc_dp_mode_set(struct hibmc_dp *dp, struct drm_display_mode *mode);
>> void hibmc_dp_display_en(struct hibmc_dp *dp, bool enable);
>> void hibmc_dp_set_cbar(struct hibmc_dp *dp, const struct hibmc_dp_cbar_cfg *cfg);
>> +void hibmc_dp_reset_link(struct hibmc_dp *dp);
>> +void hibmc_dp_hpd_cfg(struct hibmc_dp *dp);
>> +void hibmc_dp_enable_int(struct hibmc_dp *dp);
>> +void hibmc_dp_disable_int(struct hibmc_dp *dp);
>>
>> #endif
>> diff --git a/drivers/gpu/drm/hisilicon/hibmc/dp/dp_link.c b/drivers/gpu/drm/hisilicon/hibmc/dp/dp_link.c
>> index f6e722d063de..54a09e7565ec 100644
>> --- a/drivers/gpu/drm/hisilicon/hibmc/dp/dp_link.c
>> +++ b/drivers/gpu/drm/hisilicon/hibmc/dp/dp_link.c
>> @@ -45,6 +45,9 @@ static int hibmc_dp_link_training_configure(struct hibmc_dp_dev *dp)
>> if (ret)
>> drm_err(dp->dev, "dp aux read dpcd failed, ret: %d\n", ret);
>>
>> + dp->link.cap.link_rate = dp->dpcd[DP_MAX_LINK_RATE];
>> + dp->link.cap.lanes = 0x2;
>> +
>> return ret;
>> }
>>
>> diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c
>> index a7f611e82f73..31f1e8970265 100644
>> --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c
>> +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c
>> @@ -13,6 +13,8 @@
>> #include "hibmc_drm_drv.h"
>> #include "dp/dp_hw.h"
>>
>> +#define DP_MASKED_SINK_HPD_PLUG_INT BIT(2)
>> +
>> static int hibmc_dp_connector_get_modes(struct drm_connector *connector)
>> {
>> struct hibmc_dp *dp = to_hibmc_dp(connector);
>> @@ -39,6 +41,8 @@ static int hibmc_dp_late_register(struct drm_connector *connector)
>> {
>> struct hibmc_dp *dp = to_hibmc_dp(connector);
>>
>> + hibmc_dp_enable_int(dp);
>> +
>> return drm_dp_aux_register(&dp->aux);
>> }
>>
>> @@ -47,6 +51,8 @@ static void hibmc_dp_early_unregister(struct drm_connector *connector)
>> struct hibmc_dp *dp = to_hibmc_dp(connector);
>>
>> drm_dp_aux_unregister(&dp->aux);
>> +
>> + hibmc_dp_disable_int(dp);
>> }
>>
>> static const struct drm_connector_funcs hibmc_dp_conn_funcs = {
>> @@ -98,6 +104,31 @@ static const struct drm_encoder_helper_funcs hibmc_dp_encoder_helper_funcs = {
>> .atomic_disable = hibmc_dp_encoder_disable,
>> };
>>
>> +irqreturn_t hibmc_dp_hpd_isr(int irq, void *arg)
>> +{
>> + struct drm_device *dev = (struct drm_device *)arg;
>> + struct hibmc_drm_private *priv = to_hibmc_drm_private(dev);
>> + int idx;
>> +
>> + if (!drm_dev_enter(dev, &idx))
>> + return -ENODEV;
>> +
>> + if (priv->dp.irq_status & DP_MASKED_SINK_HPD_PLUG_INT) {
>> + drm_dbg_dp(&priv->dev, "HPD IN isr occur!\n");
>> + hibmc_dp_hpd_cfg(&priv->dp);
>> + } else {
>> + drm_dbg_dp(&priv->dev, "HPD OUT isr occur!\n");
>> + hibmc_dp_reset_link(&priv->dp);
>> + }
>> +
>> + if (dev->registered)
>> + drm_connector_helper_hpd_irq_event(&priv->dp.connector);
>> +
>> + drm_dev_exit(idx);
>> +
>> + return IRQ_HANDLED;
>> +}
>> +
>> int hibmc_dp_init(struct hibmc_drm_private *priv)
>> {
>> struct drm_device *dev = &priv->dev;
>> @@ -138,5 +169,7 @@ int hibmc_dp_init(struct hibmc_drm_private *priv)
>>
>> drm_connector_attach_encoder(connector, encoder);
>>
>> + connector->polled = DRM_CONNECTOR_POLL_HPD;
>> +
>> return 0;
>> }
>> diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h
>> index bc89e4b9f4e3..daed1330b961 100644
>> --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h
>> +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h
>> @@ -71,4 +71,6 @@ int hibmc_dp_init(struct hibmc_drm_private *priv);
>>
>> void hibmc_debugfs_init(struct drm_connector *connector, struct dentry *root);
>>
>> +irqreturn_t hibmc_dp_hpd_isr(int irq, void *arg);
>> +
>> #endif
>> diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c
>> index 05e19ea4c9f9..e8a527ede854 100644
>> --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c
>> +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c
> Separate commit, please. It concerns your VGA connector, not the DP
> connector.
>
> LGTM otherwise.
Okay!
>> @@ -60,6 +60,7 @@ static void hibmc_connector_destroy(struct drm_connector *connector)
>> static const struct drm_connector_helper_funcs
>> hibmc_connector_helper_funcs = {
>> .get_modes = hibmc_connector_get_modes,
>> + .detect_ctx = drm_connector_helper_detect_from_ddc,
>> };
>>
>> static const struct drm_connector_funcs hibmc_connector_funcs = {
>> @@ -127,5 +128,7 @@ int hibmc_vdac_init(struct hibmc_drm_private *priv)
>>
>> drm_connector_attach_encoder(connector, encoder);
>>
>> + connector->polled = DRM_CONNECTOR_POLL_CONNECT | DRM_CONNECTOR_POLL_DISCONNECT;
>> +
>> return 0;
>> }
>> --
>> 2.33.0
>>
Powered by blists - more mailing lists