Skip to contentSkip to conversation

phy: exynos-mipi-video: Use spin_lock to protct state->regmap rmw operations

PATCH In review Axel Lin 3 participants 5 messages Feb 27, 2015 – Mar 4, 2015

Subsystems (2)
lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 phy: exynos-mipi-video: Use spin_lock to protct state->regmap rmw operations

The state->regmap is initialized by devm_regmap_init_mmio().
So it's fine to use spin_lock rather than mutex to protct state->regmap rmw operations.

---
Hi Sylwester,
I don't have this hardware handy, so can you test if this patch works.
This patch is on top of my previous patch (phy: exynos-mipi-video: Fixup the test for state->regmap) Thanks,
Axel

 drivers/phy/phy-exynos-mipi-video.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/phy/phy-exynos-mipi-video.c +3 -5
index d196493..8d6d117 100644
@@ -43,7 +43,6 @@ struct exynos_mipi_video_phy {
 	} phys[EXYNOS_MIPI_PHYS_NUM];
 	spinlock_t slock;
 	void __iomem *regs;
-	struct mutex mutex;
 	struct regmap *regmap;
 };
 
@@ -59,8 +58,9 @@ static int __set_phy_state(struct exynos_mipi_video_phy *state,
 	else
 		reset = EXYNOS4_MIPI_PHY_SRESETN;
 
+	spin_lock(&state->slock);
+
 	if (!IS_ERR(state->regmap)) {
-		mutex_lock(&state->mutex);
 		regmap_read(state->regmap, offset, &val);
 		if (on)
 			val |= reset;
@@ -72,7 +72,6 @@ static int __set_phy_state(struct exynos_mipi_video_phy *state,
 		else if (!(val & EXYNOS4_MIPI_PHY_RESET_MASK))
 			val &= ~EXYNOS4_MIPI_PHY_ENABLE;
 		regmap_write(state->regmap, offset, val);
-		mutex_unlock(&state->mutex);
 	} else {
 		addr = state->regs + EXYNOS_MIPI_PHY_CONTROL(id / 2);
 
@@ -90,9 +89,9 @@ static int __set_phy_state(struct exynos_mipi_video_phy *state,
 			val &= ~EXYNOS4_MIPI_PHY_ENABLE;
 
 		writel(val, addr);
-		spin_unlock(&state->slock);
 	}
 
+	spin_unlock(&state->slock);
 	return 0;
 }
 
@@ -158,7 +157,6 @@ static int exynos_mipi_video_phy_probe(struct platform_device *pdev)
 
 	dev_set_drvdata(dev, state);
 	spin_lock_init(&state->slock);
-	mutex_init(&state->mutex);
 
 	for (i = 0; i < EXYNOS_MIPI_PHYS_NUM; i++) {
 		struct phy *phy = devm_phy_create(dev, NULL,
Signature · 1 line
1.9.1
Acked-by Tested-by on v1 1/1
#1 lore raw
Quoted 10 lines · Axel Lin

he state->regmap is initialized by devm_regmap_init_mmio().
So it's fine to use spin_lock rather than mutex to protct state->regmap rmw operations.

---
Hi Sylwester,
I don't have this hardware handy, so can you test if this patch works. This patch is on top of my previous patch (phy: exynos-mipi-video: Fixup the test for state->regmap)

Thanks for the patch, it looks good to me. I somehow missed the syscon already uses a spinlock for regmap protection.

v4.0-rc1 seems devastated as far as exynos4 is concerned, it may take some time until I get around and fix all the issues so I tested your patch on v3.19. It all works well as expected.

Signature · 2 lines
Thanks,
Sylwester
#2 lore raw

Hi,

Quoted 15 lines · Sylwester Nawrocki
Quoted 10 lines · Axel Lin

he state->regmap is initialized by devm_regmap_init_mmio().
So it's fine to use spin_lock rather than mutex to protct state->regmap rmw operations.

---
Hi Sylwester,
I don't have this hardware handy, so can you test if this patch works. This patch is on top of my previous patch (phy: exynos-mipi-video: Fixup the test for state->regmap)

Thanks for the patch, it looks good to me. I somehow missed the syscon already uses a spinlock for regmap protection.

Quoted 6 lines

v4.0-rc1 seems devastated as far as exynos4 is concerned, it may take some time until I get around and fix all the issues so I tested your patch on v3.19. It all works well as expected.

This patch doesn't apply on 4.0-rc1. Can to refresh it to mainline latest?

Cheers
Kishon

#3 lore raw

Hi,

Quoted 2 lines · Kishon Vijay Abraham I

This patch doesn't apply on 4.0-rc1. Can to refresh it to mainline latest?

It depends on Axel's previous patch: "phy: exynos-mipi-video: Fixup the test for state->regmap". Are there any issues even with that patch applied ?

Signature · 2 lines
Thanks
Sylwester
#4 lore raw
Quoted 9 lines · Sylwester Nawrocki

Hi,

Quoted 2 lines · Kishon Vijay Abraham I

This patch doesn't apply on 4.0-rc1. Can to refresh it to mainline latest?

It depends on Axel's previous patch: "phy: exynos-mipi-video: Fixup the test for state->regmap". Are there any issues even with that patch applied ?

no. okay I'll apply in that order.

Cheers
kishon