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

Commit 7c1bc0da authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Ralf Baechle
Browse files

ssb: gpio: add own IRQ domain 



Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Acked-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Acked-by: default avatarMichael Buesch <m@bues.ch>
Signed-off-by: default avatarJohn Crispin <blogic@openwrt.org>
Patchwork: http://patchwork.linux-mips.org/patch/6342/
parent 89fb3ac8

drivers/ssb/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ config SSB_DRIVER_GIGE 
config SSB_DRIVER_GPIO

	bool "SSB GPIO driver"

	depends on SSB && GPIOLIB

	select IRQ_DOMAIN if SSB_EMBEDDED

	help

	  Driver to provide access to the GPIO pins on the bus.

drivers/ssb/driver_gpio.c

+290 −16
Original line number Diff line number Diff line
@@ -9,16 +9,40 @@ 
 */



#include <linux/gpio.h>

#include <linux/irq.h>

#include <linux/interrupt.h>

#include <linux/irqdomain.h>

#include <linux/export.h>

#include <linux/ssb/ssb.h>



#include "ssb_private.h"





/**************************************************

 * Shared

 **************************************************/



static struct ssb_bus *ssb_gpio_get_bus(struct gpio_chip *chip)

{

	return container_of(chip, struct ssb_bus, gpio);

}



#if IS_ENABLED(CONFIG_SSB_EMBEDDED)

static int ssb_gpio_to_irq(struct gpio_chip *chip, unsigned gpio)

{

	struct ssb_bus *bus = ssb_gpio_get_bus(chip);



	if (bus->bustype == SSB_BUSTYPE_SSB)

		return irq_find_mapping(bus->irq_domain, gpio);

	else

		return -EINVAL;

}

#endif



/**************************************************

 * ChipCommon

 **************************************************/



static int ssb_gpio_chipco_get_value(struct gpio_chip *chip, unsigned gpio)

{

	struct ssb_bus *bus = ssb_gpio_get_bus(chip);
@@ -74,19 +98,129 @@ static void ssb_gpio_chipco_free(struct gpio_chip *chip, unsigned gpio) 
	ssb_chipco_gpio_pullup(&bus->chipco, 1 << gpio, 0);

}



static int ssb_gpio_chipco_to_irq(struct gpio_chip *chip, unsigned gpio)

#if IS_ENABLED(CONFIG_SSB_EMBEDDED)

static void ssb_gpio_irq_chipco_mask(struct irq_data *d)

{

	struct ssb_bus *bus = ssb_gpio_get_bus(chip);

	struct ssb_bus *bus = irq_data_get_irq_chip_data(d);

	int gpio = irqd_to_hwirq(d);



	if (bus->bustype == SSB_BUSTYPE_SSB)

		return ssb_mips_irq(bus->chipco.dev) + 2;

	else

		return -EINVAL;

	ssb_chipco_gpio_intmask(&bus->chipco, BIT(gpio), 0);

}



static void ssb_gpio_irq_chipco_unmask(struct irq_data *d)

{

	struct ssb_bus *bus = irq_data_get_irq_chip_data(d);

	int gpio = irqd_to_hwirq(d);

	u32 val = ssb_chipco_gpio_in(&bus->chipco, BIT(gpio));



	ssb_chipco_gpio_polarity(&bus->chipco, BIT(gpio), val);

	ssb_chipco_gpio_intmask(&bus->chipco, BIT(gpio), BIT(gpio));

}



static struct irq_chip ssb_gpio_irq_chipco_chip = {

	.name		= "SSB-GPIO-CC",

	.irq_mask	= ssb_gpio_irq_chipco_mask,

	.irq_unmask	= ssb_gpio_irq_chipco_unmask,

};



static irqreturn_t ssb_gpio_irq_chipco_handler(int irq, void *dev_id)

{

	struct ssb_bus *bus = dev_id;

	struct ssb_chipcommon *chipco = &bus->chipco;

	u32 val = chipco_read32(chipco, SSB_CHIPCO_GPIOIN);

	u32 mask = chipco_read32(chipco, SSB_CHIPCO_GPIOIRQ);

	u32 pol = chipco_read32(chipco, SSB_CHIPCO_GPIOPOL);

	unsigned long irqs = (val ^ pol) & mask;

	int gpio;



	if (!irqs)

		return IRQ_NONE;



	for_each_set_bit(gpio, &irqs, bus->gpio.ngpio)

		generic_handle_irq(ssb_gpio_to_irq(&bus->gpio, gpio));

	ssb_chipco_gpio_polarity(chipco, irqs, val & irqs);



	return IRQ_HANDLED;

}



static int ssb_gpio_irq_chipco_domain_init(struct ssb_bus *bus)

{

	struct ssb_chipcommon *chipco = &bus->chipco;

	struct gpio_chip *chip = &bus->gpio;

	int gpio, hwirq, err;



	if (bus->bustype != SSB_BUSTYPE_SSB)

		return 0;



	bus->irq_domain = irq_domain_add_linear(NULL, chip->ngpio,

						&irq_domain_simple_ops, chipco);

	if (!bus->irq_domain) {

		err = -ENODEV;

		goto err_irq_domain;

	}

	for (gpio = 0; gpio < chip->ngpio; gpio++) {

		int irq = irq_create_mapping(bus->irq_domain, gpio);



		irq_set_chip_data(irq, bus);

		irq_set_chip_and_handler(irq, &ssb_gpio_irq_chipco_chip,

					 handle_simple_irq);

	}



	hwirq = ssb_mips_irq(bus->chipco.dev) + 2;

	err = request_irq(hwirq, ssb_gpio_irq_chipco_handler, IRQF_SHARED,

			  "gpio", bus);

	if (err)

		goto err_req_irq;



	ssb_chipco_gpio_intmask(&bus->chipco, ~0, 0);

	chipco_set32(chipco, SSB_CHIPCO_IRQMASK, SSB_CHIPCO_IRQ_GPIO);



	return 0;



err_req_irq:

	for (gpio = 0; gpio < chip->ngpio; gpio++) {

		int irq = irq_find_mapping(bus->irq_domain, gpio);



		irq_dispose_mapping(irq);

	}

	irq_domain_remove(bus->irq_domain);

err_irq_domain:

	return err;

}



static void ssb_gpio_irq_chipco_domain_exit(struct ssb_bus *bus)

{

	struct ssb_chipcommon *chipco = &bus->chipco;

	struct gpio_chip *chip = &bus->gpio;

	int gpio;



	if (bus->bustype != SSB_BUSTYPE_SSB)

		return;



	chipco_mask32(chipco, SSB_CHIPCO_IRQMASK, ~SSB_CHIPCO_IRQ_GPIO);

	free_irq(ssb_mips_irq(bus->chipco.dev) + 2, chipco);

	for (gpio = 0; gpio < chip->ngpio; gpio++) {

		int irq = irq_find_mapping(bus->irq_domain, gpio);



		irq_dispose_mapping(irq);

	}

	irq_domain_remove(bus->irq_domain);

}

#else

static int ssb_gpio_irq_chipco_domain_init(struct ssb_bus *bus)

{

	return 0;

}



static void ssb_gpio_irq_chipco_domain_exit(struct ssb_bus *bus)

{

}

#endif



static int ssb_gpio_chipco_init(struct ssb_bus *bus)

{

	struct gpio_chip *chip = &bus->gpio;

	int err;



	chip->label		= "ssb_chipco_gpio";

	chip->owner		= THIS_MODULE;
@@ -96,7 +230,9 @@ static int ssb_gpio_chipco_init(struct ssb_bus *bus) 
	chip->set		= ssb_gpio_chipco_set_value;

	chip->direction_input	= ssb_gpio_chipco_direction_input;

	chip->direction_output	= ssb_gpio_chipco_direction_output;

	chip->to_irq		= ssb_gpio_chipco_to_irq;

#if IS_ENABLED(CONFIG_SSB_EMBEDDED)

	chip->to_irq		= ssb_gpio_to_irq;

#endif

	chip->ngpio		= 16;

	/* There is just one SoC in one device and its GPIO addresses should be

	 * deterministic to address them more easily. The other buses could get
@@ -106,9 +242,23 @@ static int ssb_gpio_chipco_init(struct ssb_bus *bus) 
	else

		chip->base		= -1;



	return gpiochip_add(chip);

	err = ssb_gpio_irq_chipco_domain_init(bus);

	if (err)

		return err;



	err = gpiochip_add(chip);

	if (err) {

		ssb_gpio_irq_chipco_domain_exit(bus);

		return err;

	}



	return 0;

}



/**************************************************

 * EXTIF

 **************************************************/



#ifdef CONFIG_SSB_DRIVER_EXTIF



static int ssb_gpio_extif_get_value(struct gpio_chip *chip, unsigned gpio)
@@ -145,19 +295,127 @@ static int ssb_gpio_extif_direction_output(struct gpio_chip *chip, 
	return 0;

}



static int ssb_gpio_extif_to_irq(struct gpio_chip *chip, unsigned gpio)

#if IS_ENABLED(CONFIG_SSB_EMBEDDED)

static void ssb_gpio_irq_extif_mask(struct irq_data *d)

{

	struct ssb_bus *bus = ssb_gpio_get_bus(chip);

	struct ssb_bus *bus = irq_data_get_irq_chip_data(d);

	int gpio = irqd_to_hwirq(d);



	if (bus->bustype == SSB_BUSTYPE_SSB)

		return ssb_mips_irq(bus->extif.dev) + 2;

	else

		return -EINVAL;

	ssb_extif_gpio_intmask(&bus->extif, BIT(gpio), 0);

}



static void ssb_gpio_irq_extif_unmask(struct irq_data *d)

{

	struct ssb_bus *bus = irq_data_get_irq_chip_data(d);

	int gpio = irqd_to_hwirq(d);

	u32 val = ssb_extif_gpio_in(&bus->extif, BIT(gpio));



	ssb_extif_gpio_polarity(&bus->extif, BIT(gpio), val);

	ssb_extif_gpio_intmask(&bus->extif, BIT(gpio), BIT(gpio));

}



static struct irq_chip ssb_gpio_irq_extif_chip = {

	.name		= "SSB-GPIO-EXTIF",

	.irq_mask	= ssb_gpio_irq_extif_mask,

	.irq_unmask	= ssb_gpio_irq_extif_unmask,

};



static irqreturn_t ssb_gpio_irq_extif_handler(int irq, void *dev_id)

{

	struct ssb_bus *bus = dev_id;

	struct ssb_extif *extif = &bus->extif;

	u32 val = ssb_read32(extif->dev, SSB_EXTIF_GPIO_IN);

	u32 mask = ssb_read32(extif->dev, SSB_EXTIF_GPIO_INTMASK);

	u32 pol = ssb_read32(extif->dev, SSB_EXTIF_GPIO_INTPOL);

	unsigned long irqs = (val ^ pol) & mask;

	int gpio;



	if (!irqs)

		return IRQ_NONE;



	for_each_set_bit(gpio, &irqs, bus->gpio.ngpio)

		generic_handle_irq(ssb_gpio_to_irq(&bus->gpio, gpio));

	ssb_extif_gpio_polarity(extif, irqs, val & irqs);



	return IRQ_HANDLED;

}



static int ssb_gpio_irq_extif_domain_init(struct ssb_bus *bus)

{

	struct ssb_extif *extif = &bus->extif;

	struct gpio_chip *chip = &bus->gpio;

	int gpio, hwirq, err;



	if (bus->bustype != SSB_BUSTYPE_SSB)

		return 0;



	bus->irq_domain = irq_domain_add_linear(NULL, chip->ngpio,

						&irq_domain_simple_ops, extif);

	if (!bus->irq_domain) {

		err = -ENODEV;

		goto err_irq_domain;

	}

	for (gpio = 0; gpio < chip->ngpio; gpio++) {

		int irq = irq_create_mapping(bus->irq_domain, gpio);



		irq_set_chip_data(irq, bus);

		irq_set_chip_and_handler(irq, &ssb_gpio_irq_extif_chip,

					 handle_simple_irq);

	}



	hwirq = ssb_mips_irq(bus->extif.dev) + 2;

	err = request_irq(hwirq, ssb_gpio_irq_extif_handler, IRQF_SHARED,

			  "gpio", bus);

	if (err)

		goto err_req_irq;



	ssb_extif_gpio_intmask(&bus->extif, ~0, 0);



	return 0;



err_req_irq:

	for (gpio = 0; gpio < chip->ngpio; gpio++) {

		int irq = irq_find_mapping(bus->irq_domain, gpio);



		irq_dispose_mapping(irq);

	}

	irq_domain_remove(bus->irq_domain);

err_irq_domain:

	return err;

}



static void ssb_gpio_irq_extif_domain_exit(struct ssb_bus *bus)

{

	struct ssb_extif *extif = &bus->extif;

	struct gpio_chip *chip = &bus->gpio;

	int gpio;



	if (bus->bustype != SSB_BUSTYPE_SSB)

		return;



	free_irq(ssb_mips_irq(bus->extif.dev) + 2, extif);

	for (gpio = 0; gpio < chip->ngpio; gpio++) {

		int irq = irq_find_mapping(bus->irq_domain, gpio);



		irq_dispose_mapping(irq);

	}

	irq_domain_remove(bus->irq_domain);

}

#else

static int ssb_gpio_irq_extif_domain_init(struct ssb_bus *bus)

{

	return 0;

}



static void ssb_gpio_irq_extif_domain_exit(struct ssb_bus *bus)

{

}

#endif



static int ssb_gpio_extif_init(struct ssb_bus *bus)

{

	struct gpio_chip *chip = &bus->gpio;

	int err;



	chip->label		= "ssb_extif_gpio";

	chip->owner		= THIS_MODULE;
@@ -165,7 +423,9 @@ static int ssb_gpio_extif_init(struct ssb_bus *bus) 
	chip->set		= ssb_gpio_extif_set_value;

	chip->direction_input	= ssb_gpio_extif_direction_input;

	chip->direction_output	= ssb_gpio_extif_direction_output;

	chip->to_irq		= ssb_gpio_extif_to_irq;

#if IS_ENABLED(CONFIG_SSB_EMBEDDED)

	chip->to_irq		= ssb_gpio_to_irq;

#endif

	chip->ngpio		= 5;

	/* There is just one SoC in one device and its GPIO addresses should be

	 * deterministic to address them more easily. The other buses could get
@@ -175,7 +435,17 @@ static int ssb_gpio_extif_init(struct ssb_bus *bus) 
	else

		chip->base		= -1;



	return gpiochip_add(chip);

	err = ssb_gpio_irq_extif_domain_init(bus);

	if (err)

		return err;



	err = gpiochip_add(chip);

	if (err) {

		ssb_gpio_irq_extif_domain_exit(bus);

		return err;

	}



	return 0;

}



#else
@@ -185,6 +455,10 @@ static int ssb_gpio_extif_init(struct ssb_bus *bus) 
}

#endif



/**************************************************

 * Init

 **************************************************/



int ssb_gpio_init(struct ssb_bus *bus)

{

	if (ssb_chipco_available(&bus->chipco))

drivers/ssb/main.c

+7 −5
Original line number Diff line number Diff line
@@ -593,6 +593,13 @@ static int ssb_attach_queued_buses(void) 
		ssb_pcicore_init(&bus->pcicore);

		if (bus->bustype == SSB_BUSTYPE_SSB)

			ssb_watchdog_register(bus);



		err = ssb_gpio_init(bus);

		if (err == -ENOTSUPP)

			ssb_dbg("GPIO driver not activated\n");

		else if (err)

			ssb_dbg("Error registering GPIO driver: %i\n", err);



		ssb_bus_may_powerdown(bus);



		err = ssb_devices_register(bus);
@@ -830,11 +837,6 @@ static int ssb_bus_register(struct ssb_bus *bus, 
	ssb_chipcommon_init(&bus->chipco);

	ssb_extif_init(&bus->extif);

	ssb_mipscore_init(&bus->mipscore);

	err = ssb_gpio_init(bus);

	if (err == -ENOTSUPP)

		ssb_dbg("GPIO driver not activated\n");

	else if (err)

		ssb_dbg("Error registering GPIO driver: %i\n", err);

	err = ssb_fetch_invariants(bus, get_invariants);

	if (err) {

		ssb_bus_may_powerdown(bus);

include/linux/ssb/ssb.h

+1 −0
Original line number Diff line number Diff line
@@ -486,6 +486,7 @@ struct ssb_bus { 
#endif /* EMBEDDED */

#ifdef CONFIG_SSB_DRIVER_GPIO

	struct gpio_chip gpio;

	struct irq_domain *irq_domain;

#endif /* DRIVER_GPIO */



	/* Internal-only stuff follows. Do not touch. */