Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1eaf16a authored by Jochen Friedrich's avatar Jochen Friedrich Committed by Kumar Gala
Browse files

powerpc/cpm1: Fix race condition in CPM1 GPIO library. 



The CPM1 GPIO library code uses the non thread-safe clrbits32/setbits32
macros. This patch protects them with a spinlock.

Based on the CPM2 patch from Laurent Pinchart <laurentp@cse-semaphore.com>,
commit 639d6445.

Signed-off-by: default avatarJochen Friedrich <jochen@scram.de>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 1a9314a0

arch/powerpc/sysdev/cpm1.c

+52 −22
Original line number Diff line number Diff line
@@ -546,15 +546,11 @@ static int cpm1_gpio16_get(struct gpio_chip *gc, unsigned int gpio) 
	return !!(in_be16(&iop->dat) & pin_mask);

}



static void cpm1_gpio16_set(struct gpio_chip *gc, unsigned int gpio, int value)

static void __cpm1_gpio16_set(struct of_mm_gpio_chip *mm_gc, u16 pin_mask,

	int value)

{

	struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);

	struct cpm1_gpio16_chip *cpm1_gc = to_cpm1_gpio16_chip(mm_gc);

	struct cpm_ioport16 __iomem *iop = mm_gc->regs;

	unsigned long flags;

	u16 pin_mask = 1 << (15 - gpio);



	spin_lock_irqsave(&cpm1_gc->lock, flags);



	if (value)

		cpm1_gc->cpdata |= pin_mask;
@@ -562,6 +558,18 @@ static void cpm1_gpio16_set(struct gpio_chip *gc, unsigned int gpio, int value) 
		cpm1_gc->cpdata &= ~pin_mask;



	out_be16(&iop->dat, cpm1_gc->cpdata);

}



static void cpm1_gpio16_set(struct gpio_chip *gc, unsigned int gpio, int value)

{

	struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);

	struct cpm1_gpio16_chip *cpm1_gc = to_cpm1_gpio16_chip(mm_gc);

	unsigned long flags;

	u16 pin_mask = 1 << (15 - gpio);



	spin_lock_irqsave(&cpm1_gc->lock, flags);



	__cpm1_gpio16_set(mm_gc, pin_mask, value);



	spin_unlock_irqrestore(&cpm1_gc->lock, flags);

}
@@ -569,14 +577,17 @@ static void cpm1_gpio16_set(struct gpio_chip *gc, unsigned int gpio, int value) 
static int cpm1_gpio16_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)

{

	struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);

	struct cpm1_gpio16_chip *cpm1_gc = to_cpm1_gpio16_chip(mm_gc);

	struct cpm_ioport16 __iomem *iop = mm_gc->regs;

	u16 pin_mask;

	unsigned long flags;

	u16 pin_mask = 1 << (15 - gpio);



	pin_mask = 1 << (15 - gpio);

	spin_lock_irqsave(&cpm1_gc->lock, flags);



	setbits16(&iop->dir, pin_mask);

	__cpm1_gpio16_set(mm_gc, pin_mask, val);



	cpm1_gpio16_set(gc, gpio, val);

	spin_unlock_irqrestore(&cpm1_gc->lock, flags);



	return 0;

}
@@ -584,13 +595,17 @@ static int cpm1_gpio16_dir_out(struct gpio_chip *gc, unsigned int gpio, int val) 
static int cpm1_gpio16_dir_in(struct gpio_chip *gc, unsigned int gpio)

{

	struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);

	struct cpm1_gpio16_chip *cpm1_gc = to_cpm1_gpio16_chip(mm_gc);

	struct cpm_ioport16 __iomem *iop = mm_gc->regs;

	u16 pin_mask;

	unsigned long flags;

	u16 pin_mask = 1 << (15 - gpio);



	pin_mask = 1 << (15 - gpio);

	spin_lock_irqsave(&cpm1_gc->lock, flags);



	clrbits16(&iop->dir, pin_mask);



	spin_unlock_irqrestore(&cpm1_gc->lock, flags);



	return 0;

}
@@ -655,15 +670,11 @@ static int cpm1_gpio32_get(struct gpio_chip *gc, unsigned int gpio) 
	return !!(in_be32(&iop->dat) & pin_mask);

}



static void cpm1_gpio32_set(struct gpio_chip *gc, unsigned int gpio, int value)

static void __cpm1_gpio32_set(struct of_mm_gpio_chip *mm_gc, u32 pin_mask,

	int value)

{

	struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);

	struct cpm1_gpio32_chip *cpm1_gc = to_cpm1_gpio32_chip(mm_gc);

	struct cpm_ioport32b __iomem *iop = mm_gc->regs;

	unsigned long flags;

	u32 pin_mask = 1 << (31 - gpio);



	spin_lock_irqsave(&cpm1_gc->lock, flags);



	if (value)

		cpm1_gc->cpdata |= pin_mask;
@@ -671,6 +682,18 @@ static void cpm1_gpio32_set(struct gpio_chip *gc, unsigned int gpio, int value) 
		cpm1_gc->cpdata &= ~pin_mask;



	out_be32(&iop->dat, cpm1_gc->cpdata);

}



static void cpm1_gpio32_set(struct gpio_chip *gc, unsigned int gpio, int value)

{

	struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);

	struct cpm1_gpio32_chip *cpm1_gc = to_cpm1_gpio32_chip(mm_gc);

	unsigned long flags;

	u32 pin_mask = 1 << (31 - gpio);



	spin_lock_irqsave(&cpm1_gc->lock, flags);



	__cpm1_gpio32_set(mm_gc, pin_mask, value);



	spin_unlock_irqrestore(&cpm1_gc->lock, flags);

}
@@ -678,14 +701,17 @@ static void cpm1_gpio32_set(struct gpio_chip *gc, unsigned int gpio, int value) 
static int cpm1_gpio32_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)

{

	struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);

	struct cpm1_gpio32_chip *cpm1_gc = to_cpm1_gpio32_chip(mm_gc);

	struct cpm_ioport32b __iomem *iop = mm_gc->regs;

	u32 pin_mask;

	unsigned long flags;

	u32 pin_mask = 1 << (31 - gpio);



	pin_mask = 1 << (31 - gpio);

	spin_lock_irqsave(&cpm1_gc->lock, flags);



	setbits32(&iop->dir, pin_mask);

	__cpm1_gpio32_set(mm_gc, pin_mask, val);



	cpm1_gpio32_set(gc, gpio, val);

	spin_unlock_irqrestore(&cpm1_gc->lock, flags);



	return 0;

}
@@ -693,13 +719,17 @@ static int cpm1_gpio32_dir_out(struct gpio_chip *gc, unsigned int gpio, int val) 
static int cpm1_gpio32_dir_in(struct gpio_chip *gc, unsigned int gpio)

{

	struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);

	struct cpm1_gpio32_chip *cpm1_gc = to_cpm1_gpio32_chip(mm_gc);

	struct cpm_ioport32b __iomem *iop = mm_gc->regs;

	u32 pin_mask;

	unsigned long flags;

	u32 pin_mask = 1 << (31 - gpio);



	pin_mask = 1 << (31 - gpio);

	spin_lock_irqsave(&cpm1_gc->lock, flags);



	clrbits32(&iop->dir, pin_mask);



	spin_unlock_irqrestore(&cpm1_gc->lock, flags);



	return 0;

}