[PATCH v13 3/5] clk: en7523: protect concurrent access to reset and PCI register

From: Christian Marangi

Date: Tue Nov 17 2026 - 13:25:03 EST


Use spinlock for concurrent access to reset and PCI register to catch case
when clock is enabled/disabled while a reset is also operated at the same
time. This is needed as register are shared for both clock and reset
operation and rmw operation require protection against writing inconsistent
data.

Some minor rework was needed for PCI unprepare case to permit calling it
before clk_hw_register and reference the global spinlock.

Signed-off-by: Christian Marangi <ansuelsmth@xxxxxxxxx>
---
drivers/clk/clk-en7523.c | 74 +++++++++++++++++++++++++++++++++++++---
1 file changed, 69 insertions(+), 5 deletions(-)

diff --git a/drivers/clk/clk-en7523.c b/drivers/clk/clk-en7523.c
index 9e92586f207c..6aa6dfaf414e 100644
--- a/drivers/clk/clk-en7523.c
+++ b/drivers/clk/clk-en7523.c
@@ -150,6 +150,7 @@ struct en_clk_soc_data {
const struct clk_ops pcie_ops;
int (*hw_init)(struct platform_device *pdev,
struct clk_hw_onecell_data *clk_data);
+ void (*pci_unprepare)(struct device *dev, struct en_clk_gate *cg);
};

static const u32 gsw_base[] = { 400000000, 500000000 };
@@ -584,51 +585,95 @@ static int en7523_pci_is_enabled(struct clk_hw *hw)
static int en7523_pci_prepare(struct clk_hw *hw)
{
struct en_clk_gate *cg = container_of(hw, struct en_clk_gate, hw);
+ struct device *dev = clk_hw_get_dev(hw);
void __iomem *np_base = cg->base;
+ struct en_clk_priv *priv;
+ unsigned long flags;
u32 val, mask;

+ priv = dev_get_drvdata(dev);
+
/* Need to pull device low before reset */
+ spin_lock_irqsave(&priv->lock, flags);
val = readl(np_base + REG_PCI_CONTROL);
val &= ~(REG_PCI_CONTROL_PERSTOUT1 | REG_PCI_CONTROL_PERSTOUT);
writel(val, np_base + REG_PCI_CONTROL);
+ spin_unlock_irqrestore(&priv->lock, flags);
+
usleep_range(1000, 2000);

/* Enable PCIe port 1 */
+ spin_lock_irqsave(&priv->lock, flags);
+ val = readl(np_base + REG_PCI_CONTROL);
val |= REG_PCI_CONTROL_REFCLK_EN1;
writel(val, np_base + REG_PCI_CONTROL);
+ spin_unlock_irqrestore(&priv->lock, flags);
+
usleep_range(1000, 2000);

/* Reset to default */
+ spin_lock_irqsave(&priv->lock, flags);
val = readl(np_base + REG_RESET_CONTROL1);
mask = REG_RESET_CONTROL_PCIE1 | REG_RESET_CONTROL_PCIE2 |
REG_RESET_CONTROL_PCIEHB;
writel(val & ~mask, np_base + REG_RESET_CONTROL1);
+ spin_unlock_irqrestore(&priv->lock, flags);
+
usleep_range(1000, 2000);
+
+ spin_lock_irqsave(&priv->lock, flags);
+ val = readl(np_base + REG_RESET_CONTROL1);
writel(val | mask, np_base + REG_RESET_CONTROL1);
+ spin_unlock_irqrestore(&priv->lock, flags);
+
msleep(100);
+
+ spin_lock_irqsave(&priv->lock, flags);
+ val = readl(np_base + REG_RESET_CONTROL1);
writel(val & ~mask, np_base + REG_RESET_CONTROL1);
+ spin_unlock_irqrestore(&priv->lock, flags);
+
usleep_range(5000, 10000);

/* Release device */
- mask = REG_PCI_CONTROL_PERSTOUT1 | REG_PCI_CONTROL_PERSTOUT;
+ spin_lock_irqsave(&priv->lock, flags);
val = readl(np_base + REG_PCI_CONTROL);
+ mask = REG_PCI_CONTROL_PERSTOUT1 | REG_PCI_CONTROL_PERSTOUT;
writel(val & ~mask, np_base + REG_PCI_CONTROL);
+ spin_unlock_irqrestore(&priv->lock, flags);
+
usleep_range(1000, 2000);
+
+ spin_lock_irqsave(&priv->lock, flags);
+ val = readl(np_base + REG_PCI_CONTROL);
writel(val | mask, np_base + REG_PCI_CONTROL);
+ spin_unlock_irqrestore(&priv->lock, flags);
+
msleep(250);

return 0;
}

-static void en7523_pci_unprepare(struct clk_hw *hw)
+static void __en7523_pci_unprepare(struct device *dev, struct en_clk_gate *cg)
{
- struct en_clk_gate *cg = container_of(hw, struct en_clk_gate, hw);
+ struct en_clk_priv *priv = dev_get_drvdata(dev);
void __iomem *np_base = cg->base;
+ unsigned long flags;
u32 val;

+ spin_lock_irqsave(&priv->lock, flags);
val = readl(np_base + REG_PCI_CONTROL);
val &= ~REG_PCI_CONTROL_REFCLK_EN1;
writel(val, np_base + REG_PCI_CONTROL);
+ spin_unlock_irqrestore(&priv->lock, flags);
+}
+
+static void en7523_pci_unprepare(struct clk_hw *hw)
+{
+ struct en_clk_gate *cg = container_of(hw, struct en_clk_gate, hw);
+ struct device *dev = clk_hw_get_dev(hw);
+
+ __en7523_pci_unprepare(dev, cg);
}

static struct clk_hw *en7523_register_pcie_clk(struct device *dev,
@@ -648,8 +693,8 @@ static struct clk_hw *en7523_register_pcie_clk(struct device *dev,
cg->base = np_base;
cg->hw.init = &init;

- if (init.ops->unprepare)
- init.ops->unprepare(&cg->hw);
+ if (soc_data->pci_unprepare)
+ soc_data->pci_unprepare(dev, cg);

if (devm_clk_hw_register(dev, &cg->hw))
return NULL;
@@ -663,6 +708,7 @@ static int en7581_pci_is_enabled(struct clk_hw *hw)
u32 val, mask;

mask = REG_PCI_CONTROL_REFCLK_EN0 | REG_PCI_CONTROL_REFCLK_EN1;
+
val = readl(cg->base + REG_PCI_CONTROL);
return (val & mask) == mask;
}
@@ -670,10 +716,16 @@ static int en7581_pci_is_enabled(struct clk_hw *hw)
static int en7581_pci_enable(struct clk_hw *hw)
{
struct en_clk_gate *cg = container_of(hw, struct en_clk_gate, hw);
+ struct device *dev = clk_hw_get_dev(hw);
void __iomem *np_base = cg->base;
+ struct en_clk_priv *priv;
u32 val, mask;

+ priv = dev_get_drvdata(dev);
mask = REG_PCI_CONTROL_REFCLK_EN0 | REG_PCI_CONTROL_REFCLK_EN1;
+
+ guard(spinlock_irqsave)(&priv->lock);
+
val = readl(np_base + REG_PCI_CONTROL);
writel(val | mask, np_base + REG_PCI_CONTROL);

@@ -683,10 +735,16 @@ static int en7581_pci_enable(struct clk_hw *hw)
static void en7581_pci_disable(struct clk_hw *hw)
{
struct en_clk_gate *cg = container_of(hw, struct en_clk_gate, hw);
+ struct device *dev = clk_hw_get_dev(hw);
void __iomem *np_base = cg->base;
+ struct en_clk_priv *priv;
u32 val, mask;

+ priv = dev_get_drvdata(dev);
mask = REG_PCI_CONTROL_REFCLK_EN0 | REG_PCI_CONTROL_REFCLK_EN1;
+
+ guard(spinlock_irqsave)(&priv->lock);
+
val = readl(np_base + REG_PCI_CONTROL);
writel(val & ~mask, np_base + REG_PCI_CONTROL);
}
@@ -787,11 +845,14 @@ static int en7523_reset_update(struct reset_controller_dev *rcdev,
unsigned long id, bool assert)
{
struct en_rst_data *rst_data = container_of(rcdev, struct en_rst_data, rcdev);
+ struct en_clk_priv *priv = dev_get_drvdata(rcdev->dev);
u32 offset = rst_data->bank_ofs[id / RST_NR_PER_BANK];
void __iomem *addr = rst_data->base + offset;
bool inverted = false;
u32 val;

+ guard(spinlock_irqsave)(&priv->lock);
+
/* For PCIC reset logic is inverted, 0:assert 1:deassert */
if (offset == REG_NP_SCU_PCIC)
inverted = true;
@@ -832,6 +893,7 @@ static int en7523_reset_status(struct reset_controller_dev *rcdev,
inverted = true;

val = readl(addr) & BIT(id % RST_NR_PER_BANK);
+
return inverted ? !val : !!val;
}

@@ -1220,6 +1282,7 @@ static const struct en_clk_soc_data en7523_data = {
.unprepare = en7523_pci_unprepare,
},
.hw_init = en7523_clk_hw_init,
+ .pci_unprepare = __en7523_pci_unprepare,
};

static const struct en_clk_soc_data en7581_data = {
@@ -1241,6 +1304,7 @@ static const struct en_clk_soc_data en751221_data = {
.unprepare = en7523_pci_unprepare,
},
.hw_init = en751221_clk_hw_init,
+ .pci_unprepare = __en7523_pci_unprepare,
};

static const struct of_device_id of_match_clk_en7523[] = {
--
2.55.0