Commit 7fed891d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gpio-fixes-for-v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux 

Pull gpio fix from Bartosz Golaszewski:

 - convert regular spinlock to raw spinlock in gpio-xilinx to avoid a
   lockdep splat

* tag 'gpio-fixes-for-v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux:
  gpio: xilinx: Convert gpio_lock to raw spinlock
parents 5e74b9bf 9860370c

drivers/gpio/gpio-xilinx.c

+16 −16
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ struct xgpio_instance { 
	DECLARE_BITMAP(state, 64);

	DECLARE_BITMAP(last_irq_read, 64);

	DECLARE_BITMAP(dir, 64);

	spinlock_t gpio_lock;	/* For serializing operations */

	raw_spinlock_t gpio_lock;	/* For serializing operations */

	int irq;

	DECLARE_BITMAP(enable, 64);

	DECLARE_BITMAP(rising_edge, 64);
@@ -179,14 +179,14 @@ static void xgpio_set(struct gpio_chip *gc, unsigned int gpio, int val) 
	struct xgpio_instance *chip = gpiochip_get_data(gc);

	int bit = xgpio_to_bit(chip, gpio);



	spin_lock_irqsave(&chip->gpio_lock, flags);

	raw_spin_lock_irqsave(&chip->gpio_lock, flags);



	/* Write to GPIO signal and set its direction to output */

	__assign_bit(bit, chip->state, val);



	xgpio_write_ch(chip, XGPIO_DATA_OFFSET, bit, chip->state);



	spin_unlock_irqrestore(&chip->gpio_lock, flags);

	raw_spin_unlock_irqrestore(&chip->gpio_lock, flags);

}



/**
@@ -210,7 +210,7 @@ static void xgpio_set_multiple(struct gpio_chip *gc, unsigned long *mask, 
	bitmap_remap(hw_mask, mask, chip->sw_map, chip->hw_map, 64);

	bitmap_remap(hw_bits, bits, chip->sw_map, chip->hw_map, 64);



	spin_lock_irqsave(&chip->gpio_lock, flags);

	raw_spin_lock_irqsave(&chip->gpio_lock, flags);



	bitmap_replace(state, chip->state, hw_bits, hw_mask, 64);
@@ -218,7 +218,7 @@ static void xgpio_set_multiple(struct gpio_chip *gc, unsigned long *mask, 


	bitmap_copy(chip->state, state, 64);



	spin_unlock_irqrestore(&chip->gpio_lock, flags);

	raw_spin_unlock_irqrestore(&chip->gpio_lock, flags);

}



/**
@@ -236,13 +236,13 @@ static int xgpio_dir_in(struct gpio_chip *gc, unsigned int gpio) 
	struct xgpio_instance *chip = gpiochip_get_data(gc);

	int bit = xgpio_to_bit(chip, gpio);



	spin_lock_irqsave(&chip->gpio_lock, flags);

	raw_spin_lock_irqsave(&chip->gpio_lock, flags);



	/* Set the GPIO bit in shadow register and set direction as input */

	__set_bit(bit, chip->dir);

	xgpio_write_ch(chip, XGPIO_TRI_OFFSET, bit, chip->dir);



	spin_unlock_irqrestore(&chip->gpio_lock, flags);

	raw_spin_unlock_irqrestore(&chip->gpio_lock, flags);



	return 0;

}
@@ -265,7 +265,7 @@ static int xgpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val) 
	struct xgpio_instance *chip = gpiochip_get_data(gc);

	int bit = xgpio_to_bit(chip, gpio);



	spin_lock_irqsave(&chip->gpio_lock, flags);

	raw_spin_lock_irqsave(&chip->gpio_lock, flags);



	/* Write state of GPIO signal */

	__assign_bit(bit, chip->state, val);
@@ -275,7 +275,7 @@ static int xgpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val) 
	__clear_bit(bit, chip->dir);

	xgpio_write_ch(chip, XGPIO_TRI_OFFSET, bit, chip->dir);



	spin_unlock_irqrestore(&chip->gpio_lock, flags);

	raw_spin_unlock_irqrestore(&chip->gpio_lock, flags);



	return 0;

}
@@ -398,7 +398,7 @@ static void xgpio_irq_mask(struct irq_data *irq_data) 
	int bit = xgpio_to_bit(chip, irq_offset);

	u32 mask = BIT(bit / 32), temp;



	spin_lock_irqsave(&chip->gpio_lock, flags);

	raw_spin_lock_irqsave(&chip->gpio_lock, flags);



	__clear_bit(bit, chip->enable);
@@ -408,7 +408,7 @@ static void xgpio_irq_mask(struct irq_data *irq_data) 
		temp &= ~mask;

		xgpio_writereg(chip->regs + XGPIO_IPIER_OFFSET, temp);

	}

	spin_unlock_irqrestore(&chip->gpio_lock, flags);

	raw_spin_unlock_irqrestore(&chip->gpio_lock, flags);



	gpiochip_disable_irq(&chip->gc, irq_offset);

}
@@ -428,7 +428,7 @@ static void xgpio_irq_unmask(struct irq_data *irq_data) 


	gpiochip_enable_irq(&chip->gc, irq_offset);



	spin_lock_irqsave(&chip->gpio_lock, flags);

	raw_spin_lock_irqsave(&chip->gpio_lock, flags);



	__set_bit(bit, chip->enable);
@@ -447,7 +447,7 @@ static void xgpio_irq_unmask(struct irq_data *irq_data) 
		xgpio_writereg(chip->regs + XGPIO_IPIER_OFFSET, val);

	}



	spin_unlock_irqrestore(&chip->gpio_lock, flags);

	raw_spin_unlock_irqrestore(&chip->gpio_lock, flags);

}



/**
@@ -512,7 +512,7 @@ static void xgpio_irqhandler(struct irq_desc *desc) 


	chained_irq_enter(irqchip, desc);



	spin_lock(&chip->gpio_lock);

	raw_spin_lock(&chip->gpio_lock);



	xgpio_read_ch_all(chip, XGPIO_DATA_OFFSET, all);
@@ -529,7 +529,7 @@ static void xgpio_irqhandler(struct irq_desc *desc) 
	bitmap_copy(chip->last_irq_read, all, 64);

	bitmap_or(all, rising, falling, 64);



	spin_unlock(&chip->gpio_lock);

	raw_spin_unlock(&chip->gpio_lock);



	dev_dbg(gc->parent, "IRQ rising %*pb falling %*pb\n", 64, rising, 64, falling);
@@ -620,7 +620,7 @@ static int xgpio_probe(struct platform_device *pdev) 
	bitmap_set(chip->hw_map,  0, width[0]);

	bitmap_set(chip->hw_map, 32, width[1]);



	spin_lock_init(&chip->gpio_lock);

	raw_spin_lock_init(&chip->gpio_lock);



	chip->gc.base = -1;

	chip->gc.ngpio = bitmap_weight(chip->hw_map, 64);