mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Yongbang Shi <shiyongbang@huawei.com>
To: Thomas Zimmermann <tzimmermann@suse.de>,
	"dmitry.baryshkov@oss.qualcomm.com"
	<dmitry.baryshkov@oss.qualcomm.com>,
	"tiantao (H)" <tiantao6@hisilicon.com>,
	"maarten.lankhorst@linux.intel.com"
	<maarten.lankhorst@linux.intel.com>,
	"mripard@kernel.org" <mripard@kernel.org>,
	"airlied@gmail.com" <airlied@gmail.com>,
	"daniel@ffwll.ch" <daniel@ffwll.ch>,
	"kongxinwei (A)" <kong.kongxinwei@hisilicon.com>
Cc: "Liangjian(Jim,Kunpeng Solution Development Dept)"
	<liangjian010@huawei.com>,
	"Shuliubin(Turing&Kunpeng)" <shuliubin@huawei.com>,
	Chenjianmin <chenjianmin@huawei.com>,
	"helin (T)" <helin52@h-partners.com>,
	"shenjian (K)" <shenjian15@huawei.com>,
	shaojijie <shaojijie@huawei.com>,
	"dri-devel@lists.freedesktop.org"
	<dri-devel@lists.freedesktop.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	<shiyongbang@huawei.com>
Subject: Re: [PATCH for drm-misc-fixes v5 2/2] drm/hisilicon/hibmc: Add a flag to indicate whether the OS-side driver has been loaded
Date: Sat, 21 Nov 2026 17:36:24 +0800	[thread overview]
Message-ID: <a49be309-1062-4027-a6bd-10e1aa9c156a@huawei.com> (raw)
In-Reply-To: <e113b27d-3065-43a2-a60f-aca3552f2002@suse.de>

> Hi
> 
> Am 17.11.26 um 14:00 schrieb Yongbang Shi:
>> From: Lin He <helin52@huawei.com>
>>
>> Add a flag to indicate whether the OS-side driver has been loaded to
>> prevent the BMC from enabling DP if the driver is not loaded, which could
>> lead to system failure in handling interrupts and generate error messages
>> like:
>>
>> irq xx: nobody cared (try booting with the "irqpoll" option)
>> ...
>> Call Trace:
>> <TRQ>
>> ...
>>
>> The flag is set only after hibmc_dp_init() succeeded, so it also means
>> that the DP block is ready.  If DP initialization fails, only the vblank
>> MSI vector is requested, so the DP interrupt is not registered at all.
>>
>> Fixes: 0ab6ea261c1f ("drm/hisilicon/hibmc: add dp module in hibmc")
>> Signed-off-by: Lin He <helin52@huawei.com>
>> Signed-off-by: Yongbang Shi <shiyongbang@huawei.com>
>> ---
>> ChangeLog:
>> v4 -> v5:
>>     - Only set the enable flag when DP was initialized, clear it only when
>>       it was set, and do not request the DP interrupt if DP initialization
>>       failed. (sashiko-bot)
>> v2 -> v3:
>>     - Move hibmc_set_enable_flag() before drm_dev_register() and
>>       hibmc_set_disable_flag() after drm_dev_unregister() to narrow the
>>       race window. (sashiko-bot)
>>     - Add spinlock_t gpio_lock to hibmc_drm_private to protect all
>>       operations on 0x0802A4. (sashiko-bot)
>> v1 -> v2:
>>     - The call to `hibmc_set_enable_flag()` has been moved before
>>       `drm_client_setup()`, specifically before the connector detection
>>       triggers the I2C bit operation. (sashiko-bot)
>>     - A read-modify-write operation has been implemented instead of directly
>>       writing to prevent clearing the I2C mask bits. (sashiko-bot)
>> ---
>>    drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.h    |  1 +
>>    .../gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c    |  1 +
>>    .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c   | 45 ++++++++++++++++++-
>>    .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h   |  2 +
>>    .../gpu/drm/hisilicon/hibmc/hibmc_drm_i2c.c   | 19 ++++++--
>>    .../gpu/drm/hisilicon/hibmc/hibmc_drm_regs.h  |  3 ++
>>    6 files changed, 66 insertions(+), 5 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.h b/drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.h
>> index 84faa1a7439d..10772cddcfc8 100644
>> --- a/drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.h
>> +++ b/drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.h
>> @@ -57,6 +57,7 @@ struct hibmc_dp {
>>    	struct hibmc_dp_cbar_cfg cfg;
>>    	int hpd_status;
>>    	int phys_status;
>> +	bool initialized;
>>    };
>>    
>>    int hibmc_dp_hw_init(struct hibmc_dp *dp);
>> diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c
>> index 6ea70c31d1a9..9fa49a2ba093 100644
>> --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c
>> +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c
>> @@ -256,6 +256,7 @@ int hibmc_dp_init(struct hibmc_drm_private *priv)
>>    	connector->polled = DRM_CONNECTOR_POLL_HPD;
>>    
>>    	dp->phys_status = connector_status_disconnected;
>> +	dp->initialized = true;
>>    
>>    	return 0;
>>    }
>> diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
>> index 7920f03895fe..7ea050e89005 100644
>> --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
>> +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
>> @@ -174,6 +174,8 @@ static int hibmc_kms_init(struct hibmc_drm_private *priv)
>>    	if (ret)
>>    		return ret;
>>    
>> +	spin_lock_init(&priv->gpio_lock);
>> +
>>    	dev->mode_config.min_width = 0;
>>    	dev->mode_config.min_height = 0;
>>    	dev->mode_config.max_width = 1920;
>> @@ -346,12 +348,17 @@ static void hibmc_unload(struct drm_device *dev)
>>    static int hibmc_msi_init(struct drm_device *dev)
>>    {
>>    	struct pci_dev *pdev = to_pci_dev(dev->dev);
>> +	struct hibmc_drm_private *priv = to_hibmc_drm_private(dev);
>> +	int max_vectors = HIBMC_MIN_VECTORS;
>>    	int valid_irq_num;
>>    	int irq;
>>    	int ret;
>>    
>> -	ret = pci_alloc_irq_vectors(pdev, HIBMC_MIN_VECTORS,
>> -				    HIBMC_MAX_VECTORS, PCI_IRQ_MSI);
>> +	if (priv->dp.initialized)
>> +		max_vectors = HIBMC_MAX_VECTORS;
>> +
>> +	ret = pci_alloc_irq_vectors(pdev, HIBMC_MIN_VECTORS, max_vectors,
>> +				    PCI_IRQ_MSI);
>>    	if (ret < 0) {
>>    		drm_err(dev, "enabling MSI failed: %d\n", ret);
>>    		return ret;
>> @@ -430,6 +437,36 @@ static int hibmc_load(struct drm_device *dev)
>>    	return ret;
>>    }
>>    
>> +static inline void hibmc_set_enable_flag(struct hibmc_drm_private *priv)
>> +{
>> +	unsigned long flags;
>> +	u32 value;
>> +
>> +	if (!priv->dp.initialized)
>> +		return;
>> +
>> +	spin_lock_irqsave(&priv->gpio_lock, flags);
> 
> This is again a good place for a lock guard.
> 

Okay.

Thanks,
Yongbang

> Best regards
> Thomas
> 
>> +	value = readl(priv->mmio + HIBMC_ENABLE_FLAG);
>> +	value |= HIBMC_ENABLE_STATE;
>> +	writel(value, priv->mmio + HIBMC_ENABLE_FLAG);
>> +	spin_unlock_irqrestore(&priv->gpio_lock, flags);
>> +}
>> +
>> +static inline void hibmc_set_disable_flag(struct hibmc_drm_private *priv)
>> +{
>> +	unsigned long flags;
>> +	u32 value;
>> +
>> +	if (!priv->dp.initialized)
>> +		return;
>> +
>> +	spin_lock_irqsave(&priv->gpio_lock, flags);
>> +	value = readl(priv->mmio + HIBMC_ENABLE_FLAG);
>> +	value &= ~HIBMC_ENABLE_STATE;
>> +	writel(value, priv->mmio + HIBMC_ENABLE_FLAG);
>> +	spin_unlock_irqrestore(&priv->gpio_lock, flags);
>> +}
>> +
>>    static int hibmc_pci_probe(struct pci_dev *pdev,
>>    			   const struct pci_device_id *ent)
>>    {
>> @@ -465,6 +502,8 @@ static int hibmc_pci_probe(struct pci_dev *pdev,
>>    		goto err_return;
>>    	}
>>    
>> +	hibmc_set_enable_flag(priv);
>> +
>>    	ret = drm_dev_register(dev, 0);
>>    	if (ret) {
>>    		drm_err(dev, "failed to register drv for userspace access: %d\n",
>> @@ -477,6 +516,7 @@ static int hibmc_pci_probe(struct pci_dev *pdev,
>>    	return 0;
>>    
>>    err_unload:
>> +	hibmc_set_disable_flag(priv);
>>    	hibmc_unload(dev);
>>    err_return:
>>    	return ret;
>> @@ -487,6 +527,7 @@ static void hibmc_pci_remove(struct pci_dev *pdev)
>>    	struct drm_device *dev = pci_get_drvdata(pdev);
>>    
>>    	drm_dev_unregister(dev);
>> +	hibmc_set_disable_flag(to_hibmc_drm_private(dev));
>>    	hibmc_unload(dev);
>>    }
>>    
>> diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h
>> index dce8572bf63e..c2a82000ea7f 100644
>> --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h
>> +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h
>> @@ -49,6 +49,8 @@ struct hibmc_drm_private {
>>    	struct drm_crtc crtc;
>>    	struct hibmc_vdac vdac;
>>    	struct hibmc_dp dp;
>> +
>> +	spinlock_t gpio_lock; /* protects RMW on I2C/ENABLE_FLAG (0x0802A4) */
>>    };
>>    
>>    static inline struct hibmc_vdac *to_hibmc_vdac(struct drm_connector *connector)
>> diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_i2c.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_i2c.c
>> index 44860011855e..4ceb87efec05 100644
>> --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_i2c.c
>> +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_i2c.c
>> @@ -27,7 +27,11 @@ static void hibmc_set_i2c_signal(void *data, u32 mask, int value)
>>    {
>>    	struct hibmc_vdac *vdac = data;
>>    	struct hibmc_drm_private *priv = to_hibmc_drm_private(vdac->connector.dev);
>> -	u32 tmp_dir = readl(priv->mmio + GPIO_DATA_DIRECTION);
>> +	unsigned long flags;
>> +	u32 tmp_dir;
>> +
>> +	spin_lock_irqsave(&priv->gpio_lock, flags);
>> +	tmp_dir = readl(priv->mmio + GPIO_DATA_DIRECTION);
>>    
>>    	if (value) {
>>    		tmp_dir &= ~mask;
>> @@ -41,20 +45,29 @@ static void hibmc_set_i2c_signal(void *data, u32 mask, int value)
>>    		tmp_dir |= mask;
>>    		writel(tmp_dir, priv->mmio + GPIO_DATA_DIRECTION);
>>    	}
>> +	spin_unlock_irqrestore(&priv->gpio_lock, flags);
>>    }
>>    
>>    static int hibmc_get_i2c_signal(void *data, u32 mask)
>>    {
>>    	struct hibmc_vdac *vdac = data;
>>    	struct hibmc_drm_private *priv = to_hibmc_drm_private(vdac->connector.dev);
>> -	u32 tmp_dir = readl(priv->mmio + GPIO_DATA_DIRECTION);
>> +	unsigned long flags;
>> +	u32 tmp_dir;
>> +	int ret;
>> +
>> +	spin_lock_irqsave(&priv->gpio_lock, flags);
>> +	tmp_dir = readl(priv->mmio + GPIO_DATA_DIRECTION);
>>    
>>    	if ((tmp_dir & mask) != mask) {
>>    		tmp_dir &= ~mask;
>>    		writel(tmp_dir, priv->mmio + GPIO_DATA_DIRECTION);
>>    	}
>>    
>> -	return (readl(priv->mmio + GPIO_DATA) & mask) ? 1 : 0;
>> +	ret = (readl(priv->mmio + GPIO_DATA) & mask) ? 1 : 0;
>> +	spin_unlock_irqrestore(&priv->gpio_lock, flags);
>> +
>> +	return ret;
>>    }
>>    
>>    static void hibmc_ddc_setsda(void *data, int state)
>> diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_regs.h b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_regs.h
>> index 17b30c393b10..b95add5b253c 100644
>> --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_regs.h
>> +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_regs.h
>> @@ -200,5 +200,8 @@
>>    
>>    #define HIBMC_CRT_PALETTE                       0x80C00
>>    
>> +#define HIBMC_ENABLE_FLAG			0x802A4
>> +#define HIBMC_ENABLE_STATE			BIT(2)
>> +
>>    #define HIBMC_FIELD(field, value) (field(value) & field##_MASK)
>>    #endif
> 


  reply	other threads:[~2026-11-21  9:36 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-17 13:00 [PATCH for drm-misc-fixes v5 0/2] Fix some bugs in the hibmc DP Yongbang Shi
2026-11-17 13:00 ` [PATCH for drm-misc-fixes v5 1/2] drm/hisilicon/hibmc: Modify the method of obtaining the hpd_status Yongbang Shi
2026-11-17 14:12   ` Thomas Zimmermann
2026-11-21  9:35     ` Yongbang Shi
2026-11-17 13:00 ` [PATCH for drm-misc-fixes v5 2/2] drm/hisilicon/hibmc: Add a flag to indicate whether the OS-side driver has been loaded Yongbang Shi
2026-11-17 14:15   ` Thomas Zimmermann
2026-11-21  9:36     ` Yongbang Shi [this message]
2026-11-17 14:16 ` [PATCH for drm-misc-fixes v5 0/2] Fix some bugs in the hibmc DP Thomas Zimmermann
2026-11-21  9:38   ` Yongbang Shi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=a49be309-1062-4027-a6bd-10e1aa9c156a@huawei.com \
    --to=shiyongbang@huawei.com \
    --cc=airlied@gmail.com \
    --cc=chenjianmin@huawei.com \
    --cc=daniel@ffwll.ch \
    --cc=dmitry.baryshkov@oss.qualcomm.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=helin52@h-partners.com \
    --cc=kong.kongxinwei@hisilicon.com \
    --cc=liangjian010@huawei.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=maarten.lankhorst@linux.intel.com \
    --cc=mripard@kernel.org \
    --cc=shaojijie@huawei.com \
    --cc=shenjian15@huawei.com \
    --cc=shuliubin@huawei.com \
    --cc=tiantao6@hisilicon.com \
    --cc=tzimmermann@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®