Commit 29eb6b7d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gpio-v5.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio 

Pull GPIO fixes from Linus Walleij:
 "Some GPIO fixes I've collected with the help of Bartosz.

  Nothing special about them: all are driver and kbuild fixes + some
  documentation fixes:

   - Tidy up a missed function call in the designware driver when
     converting to gpiolib irqchip

   - Fix some bitmasks in the Aspeed driver

   - Fix some kerneldoc warnings and minor bugs in the improved
     userspace API documentation

   - Revert the revert of the OMAP fix for lost edge wakeup interrupts:
     the fix needs to stay in

   - Fix a compile error when deselecting the character device

   - A bunch of IRQ fixes on the idio GPIO drivers

   - Fix an off-by-one error in the SiFive GPIO driver"

* tag 'gpio-v5.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
  gpio: sifive: Fix SiFive gpio probe
  gpio: pcie-idio-24: Enable PEX8311 interrupts
  gpio: pcie-idio-24: Fix IRQ Enable Register value
  gpio: pcie-idio-24: Fix irq mask when masking
  gpiolib: fix sysfs when cdev is not selected
  Revert "Revert "gpio: omap: Fix lost edge wake-up interrupts""
  gpio: uapi: clarify the meaning of 'empty' char arrays
  gpio: uapi: remove whitespace
  gpio: uapi: kernel-doc formatting improvements
  gpio: uapi: comment consistency
  gpio: uapi: fix kernel-doc warnings
  gpio: aspeed: fix ast2600 bank properties
  gpio: dwapb: Fix missing conversion to GPIO-lib-based IRQ-chip
parents 673cb932 b72de3ff

drivers/gpio/gpio-aspeed.c

+1 −0
Original line number Diff line number Diff line
@@ -1114,6 +1114,7 @@ static const struct aspeed_gpio_config ast2500_config = 


static const struct aspeed_bank_props ast2600_bank_props[] = {

	/*     input	  output   */

	{4, 0xffffffff,  0x00ffffff}, /* Q/R/S/T */

	{5, 0xffffffff,  0xffffff00}, /* U/V/W/X */

	{6, 0x0000ffff,  0x0000ffff}, /* Y/Z */

	{ },

drivers/gpio/gpio-dwapb.c

+2 −2
Original line number Diff line number Diff line
@@ -343,8 +343,8 @@ static int dwapb_irq_set_type(struct irq_data *d, u32 type) 
#ifdef CONFIG_PM_SLEEP

static int dwapb_irq_set_wake(struct irq_data *d, unsigned int enable)

{

	struct irq_chip_generic *igc = irq_data_get_irq_chip_data(d);

	struct dwapb_gpio *gpio = igc->private;

	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);

	struct dwapb_gpio *gpio = to_dwapb_gpio(gc);

	struct dwapb_context *ctx = gpio->ports[0].ctx;

	irq_hw_number_t bit = irqd_to_hwirq(d);

drivers/gpio/gpio-omap.c

+11 −1
Original line number Diff line number Diff line
@@ -1114,13 +1114,23 @@ static void omap_gpio_idle(struct gpio_bank *bank, bool may_lose_context) 
{

	struct device *dev = bank->chip.parent;

	void __iomem *base = bank->base;

	u32 nowake;

	u32 mask, nowake;



	bank->saved_datain = readl_relaxed(base + bank->regs->datain);



	if (!bank->enabled_non_wakeup_gpios)

		goto update_gpio_context_count;



	/* Check for pending EDGE_FALLING, ignore EDGE_BOTH */

	mask = bank->enabled_non_wakeup_gpios & bank->context.fallingdetect;

	mask &= ~bank->context.risingdetect;

	bank->saved_datain |= mask;



	/* Check for pending EDGE_RISING, ignore EDGE_BOTH */

	mask = bank->enabled_non_wakeup_gpios & bank->context.risingdetect;

	mask &= ~bank->context.fallingdetect;

	bank->saved_datain &= ~mask;



	if (!may_lose_context)

		goto update_gpio_context_count;

drivers/gpio/gpio-pcie-idio-24.c

+56 −6
Original line number Diff line number Diff line
@@ -28,6 +28,47 @@ 
#include <linux/spinlock.h>

#include <linux/types.h>



/*

 * PLX PEX8311 PCI LCS_INTCSR Interrupt Control/Status

 *

 * Bit: Description

 *   0: Enable Interrupt Sources (Bit 0)

 *   1: Enable Interrupt Sources (Bit 1)

 *   2: Generate Internal PCI Bus Internal SERR# Interrupt

 *   3: Mailbox Interrupt Enable

 *   4: Power Management Interrupt Enable

 *   5: Power Management Interrupt

 *   6: Slave Read Local Data Parity Check Error Enable

 *   7: Slave Read Local Data Parity Check Error Status

 *   8: Internal PCI Wire Interrupt Enable

 *   9: PCI Express Doorbell Interrupt Enable

 *  10: PCI Abort Interrupt Enable

 *  11: Local Interrupt Input Enable

 *  12: Retry Abort Enable

 *  13: PCI Express Doorbell Interrupt Active

 *  14: PCI Abort Interrupt Active

 *  15: Local Interrupt Input Active

 *  16: Local Interrupt Output Enable

 *  17: Local Doorbell Interrupt Enable

 *  18: DMA Channel 0 Interrupt Enable

 *  19: DMA Channel 1 Interrupt Enable

 *  20: Local Doorbell Interrupt Active

 *  21: DMA Channel 0 Interrupt Active

 *  22: DMA Channel 1 Interrupt Active

 *  23: Built-In Self-Test (BIST) Interrupt Active

 *  24: Direct Master was the Bus Master during a Master or Target Abort

 *  25: DMA Channel 0 was the Bus Master during a Master or Target Abort

 *  26: DMA Channel 1 was the Bus Master during a Master or Target Abort

 *  27: Target Abort after internal 256 consecutive Master Retrys

 *  28: PCI Bus wrote data to LCS_MBOX0

 *  29: PCI Bus wrote data to LCS_MBOX1

 *  30: PCI Bus wrote data to LCS_MBOX2

 *  31: PCI Bus wrote data to LCS_MBOX3

 */

#define PLX_PEX8311_PCI_LCS_INTCSR  0x68

#define INTCSR_INTERNAL_PCI_WIRE    BIT(8)

#define INTCSR_LOCAL_INPUT          BIT(11)



/**

 * struct idio_24_gpio_reg - GPIO device registers structure

 * @out0_7:	Read: FET Outputs 0-7
@@ -92,6 +133,7 @@ struct idio_24_gpio_reg { 
struct idio_24_gpio {

	struct gpio_chip chip;

	raw_spinlock_t lock;

	__u8 __iomem *plx;

	struct idio_24_gpio_reg __iomem *reg;

	unsigned long irq_mask;

};
@@ -334,13 +376,13 @@ static void idio_24_irq_mask(struct irq_data *data) 
	unsigned long flags;

	const unsigned long bit_offset = irqd_to_hwirq(data) - 24;

	unsigned char new_irq_mask;

	const unsigned long bank_offset = bit_offset/8 * 8;

	const unsigned long bank_offset = bit_offset / 8;

	unsigned char cos_enable_state;



	raw_spin_lock_irqsave(&idio24gpio->lock, flags);



	idio24gpio->irq_mask &= BIT(bit_offset);

	new_irq_mask = idio24gpio->irq_mask >> bank_offset;

	idio24gpio->irq_mask &= ~BIT(bit_offset);

	new_irq_mask = idio24gpio->irq_mask >> bank_offset * 8;



	if (!new_irq_mask) {

		cos_enable_state = ioread8(&idio24gpio->reg->cos_enable);
@@ -363,12 +405,12 @@ static void idio_24_irq_unmask(struct irq_data *data) 
	unsigned long flags;

	unsigned char prev_irq_mask;

	const unsigned long bit_offset = irqd_to_hwirq(data) - 24;

	const unsigned long bank_offset = bit_offset/8 * 8;

	const unsigned long bank_offset = bit_offset / 8;

	unsigned char cos_enable_state;



	raw_spin_lock_irqsave(&idio24gpio->lock, flags);



	prev_irq_mask = idio24gpio->irq_mask >> bank_offset;

	prev_irq_mask = idio24gpio->irq_mask >> bank_offset * 8;

	idio24gpio->irq_mask |= BIT(bit_offset);



	if (!prev_irq_mask) {
@@ -455,6 +497,7 @@ static int idio_24_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	struct device *const dev = &pdev->dev;

	struct idio_24_gpio *idio24gpio;

	int err;

	const size_t pci_plx_bar_index = 1;

	const size_t pci_bar_index = 2;

	const char *const name = pci_name(pdev);

	struct gpio_irq_chip *girq;
@@ -469,12 +512,13 @@ static int idio_24_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
		return err;

	}



	err = pcim_iomap_regions(pdev, BIT(pci_bar_index), name);

	err = pcim_iomap_regions(pdev, BIT(pci_plx_bar_index) | BIT(pci_bar_index), name);

	if (err) {

		dev_err(dev, "Unable to map PCI I/O addresses (%d)\n", err);

		return err;

	}



	idio24gpio->plx = pcim_iomap_table(pdev)[pci_plx_bar_index];

	idio24gpio->reg = pcim_iomap_table(pdev)[pci_bar_index];



	idio24gpio->chip.label = name;
@@ -504,6 +548,12 @@ static int idio_24_probe(struct pci_dev *pdev, const struct pci_device_id *id) 


	/* Software board reset */

	iowrite8(0, &idio24gpio->reg->soft_reset);

	/*

	 * enable PLX PEX8311 internal PCI wire interrupt and local interrupt

	 * input

	 */

	iowrite8((INTCSR_INTERNAL_PCI_WIRE | INTCSR_LOCAL_INPUT) >> 8,

		 idio24gpio->plx + PLX_PEX8311_PCI_LCS_INTCSR + 1);



	err = devm_gpiochip_add_data(dev, &idio24gpio->chip, idio24gpio);

	if (err) {

drivers/gpio/gpio-sifive.c

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ static int sifive_gpio_probe(struct platform_device *pdev) 
		return PTR_ERR(chip->regs);



	ngpio = of_irq_count(node);

	if (ngpio >= SIFIVE_GPIO_MAX) {

	if (ngpio > SIFIVE_GPIO_MAX) {

		dev_err(dev, "Too many GPIO interrupts (max=%d)\n",

			SIFIVE_GPIO_MAX);

		return -ENXIO;