public inbox for linux-staging@lists.linux.dev
 help / color / mirror / Atom feed
* [PATCH] clocking-wizard: fix a schedule during spin lock acquisition
@ 2022-09-23 14:53 Hao Peng
  2022-09-23 15:29 ` Dan Carpenter
  0 siblings, 1 reply; 4+ messages in thread
From: Hao Peng @ 2022-09-23 14:53 UTC (permalink / raw)
  To: gregkh@linuxfoundation.org; +Cc: linux-staging@lists.linux.dev

From: Peng Hao <flyingpeng@tencent.com>

when the interrupt is disabled and the spin lock is acquired,
calling read_poll_timeout will trigger the schedule, which should
be replaced by read_poll_timeout_atomic.

Signed-off-by: Peng Hao <flyingpeng@tencent.com>
---
 drivers/staging/clocking-wizard/clk-xlnx-clock-wizard.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/clocking-wizard/clk-xlnx-clock-wizard.c
b/drivers/staging/clocking-wizard/clk-xlnx-clock-wizard.c
index 39367712ef54..986af03b31c9 100644
--- a/drivers/staging/clocking-wizard/clk-xlnx-clock-wizard.c
+++ b/drivers/staging/clocking-wizard/clk-xlnx-clock-wizard.c
@@ -157,7 +157,7 @@ static int clk_wzrd_dynamic_reconfig(struct clk_hw
*hw, unsigned long rate,
        writel(0x00, div_addr + WZRD_DR_DIV_TO_PHASE_OFFSET);

        /* Check status register */
-       err = readl_poll_timeout(divider->base + WZRD_DR_STATUS_REG_OFFSET,
+       err = readl_poll_timeout_atomic(divider->base +
WZRD_DR_STATUS_REG_OFFSET,
                                       value, value & WZRD_DR_LOCK_BIT_MASK,
                                       WZRD_USEC_POLL, WZRD_TIMEOUT_POLL);
        if (err)
@@ -168,7 +168,7 @@ static int clk_wzrd_dynamic_reconfig(struct clk_hw
*hw, unsigned long rate,
               divider->base + WZRD_DR_INIT_REG_OFFSET);

        /* Check status register */
-       err = readl_poll_timeout(divider->base + WZRD_DR_STATUS_REG_OFFSET,
+       err = readl_poll_timeout_atomic(divider->base +
WZRD_DR_STATUS_REG_OFFSET,
                                       value, value & WZRD_DR_LOCK_BIT_MASK,
                                       WZRD_USEC_POLL, WZRD_TIMEOUT_POLL);
 err_reconfig:
--
2.27.0

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [PATCH]  clocking-wizard: fix a schedule during spin lock acquisition
@ 2022-09-18  2:43 flyingpeng(彭浩)
  2022-09-24 11:06 ` gregkh
  0 siblings, 1 reply; 4+ messages in thread
From: flyingpeng(彭浩) @ 2022-09-18  2:43 UTC (permalink / raw)
  To: gregkh@linuxfoundation.org; +Cc: linux-staging@lists.linux.dev

when the interrupt is disabled and the spin lock is acquired,
calling read_poll_timeout will trigger the schedule, which should
be replaced by read_poll_timeout_atomic.

Signed-off-by: Peng Hao <flyingpeng@tencent.com>
---
 drivers/staging/clocking-wizard/clk-xlnx-clock-wizard.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/clocking-wizard/clk-xlnx-clock-wizard.c b/drivers/staging/clocking-wizard/clk-xlnx-clock-wizard.c
index 39367712ef54..986af03b31c9 100644
--- a/drivers/staging/clocking-wizard/clk-xlnx-clock-wizard.c
+++ b/drivers/staging/clocking-wizard/clk-xlnx-clock-wizard.c
@@ -157,7 +157,7 @@ static int clk_wzrd_dynamic_reconfig(struct clk_hw *hw, unsigned long rate,
        writel(0x00, div_addr + WZRD_DR_DIV_TO_PHASE_OFFSET);

        /* Check status register */
-       err = readl_poll_timeout(divider->base + WZRD_DR_STATUS_REG_OFFSET,
+       err = readl_poll_timeout_atomic(divider->base + WZRD_DR_STATUS_REG_OFFSET,
                                 value, value & WZRD_DR_LOCK_BIT_MASK,
                                 WZRD_USEC_POLL, WZRD_TIMEOUT_POLL);
        if (err)
@@ -168,7 +168,7 @@ static int clk_wzrd_dynamic_reconfig(struct clk_hw *hw, unsigned long rate,
               divider->base + WZRD_DR_INIT_REG_OFFSET);

        /* Check status register */
-       err = readl_poll_timeout(divider->base + WZRD_DR_STATUS_REG_OFFSET,
+       err = readl_poll_timeout_atomic(divider->base + WZRD_DR_STATUS_REG_OFFSET,
                                 value, value & WZRD_DR_LOCK_BIT_MASK,
                                 WZRD_USEC_POLL, WZRD_TIMEOUT_POLL);
 err_reconfig:
--
2.27.0


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2022-09-24 11:06 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-23 14:53 [PATCH] clocking-wizard: fix a schedule during spin lock acquisition Hao Peng
2022-09-23 15:29 ` Dan Carpenter
  -- strict thread matches above, loose matches on Subject: below --
2022-09-18  2:43 flyingpeng(彭浩)
2022-09-24 11:06 ` gregkh

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox