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

Commit a5c8a019 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge tag 'irqchip-for-4.8' of... 

Merge tag 'irqchip-for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/core

First drop of irqchip updates for 4.8 from Marc Zyngier:

 - Fix a few bugs in configuring the default trigger from the irqdomain layer
 - Make the genirq layer PM aware
 - Add PM capability to the ARM GIC driver
 - Add support for 2-level translation tables to the GICv3 ITS driver
parents ff5b706f 3faf24ea

Documentation/devicetree/bindings/interrupt-controller/arm,gic.txt

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ Main node required properties: 
	"arm,pl390"

	"arm,tc11mp-gic"

	"brcm,brahma-b15-gic"

	"nvidia,tegra210-agic"

	"qcom,msm-8660-qgic"

	"qcom,msm-qgic2"

- interrupt-controller : Identifies the node as an interrupt controller
@@ -68,7 +69,7 @@ Optional 
	"ic_clk" (for "arm,arm11mp-gic")

	"PERIPHCLKEN" (for "arm,cortex-a15-gic")

	"PERIPHCLK", "PERIPHCLKEN" (for "arm,cortex-a9-gic")

	"clk" (for "arm,gic-400")

	"clk" (for "arm,gic-400" and "nvidia,tegra210")

	"gclk" (for "arm,pl390")



- power-domains : A phandle and PM domain specifier as defined by bindings of

drivers/irqchip/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -8,6 +8,12 @@ config ARM_GIC 
	select IRQ_DOMAIN_HIERARCHY

	select MULTI_IRQ_HANDLER



config ARM_GIC_PM

	bool

	depends on PM

	select ARM_GIC

	select PM_CLK



config ARM_GIC_MAX_NR

	int

	default 2 if ARCH_REALVIEW

drivers/irqchip/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ obj-$(CONFIG_ARCH_SUNXI) += irq-sun4i.o 
obj-$(CONFIG_ARCH_SUNXI)		+= irq-sunxi-nmi.o

obj-$(CONFIG_ARCH_SPEAR3XX)		+= spear-shirq.o

obj-$(CONFIG_ARM_GIC)			+= irq-gic.o irq-gic-common.o

obj-$(CONFIG_ARM_GIC_PM)		+= irq-gic-pm.o

obj-$(CONFIG_REALVIEW_DT)		+= irq-gic-realview.o

obj-$(CONFIG_ARM_GIC_V2M)		+= irq-gic-v2m.o

obj-$(CONFIG_ARM_GIC_V3)		+= irq-gic-v3.o irq-gic-common.o

drivers/irqchip/irq-gic-common.c

+2 −2
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ int gic_configure_irq(unsigned int irq, unsigned int type, 
	return ret;

}



void __init gic_dist_config(void __iomem *base, int gic_irqs,

void gic_dist_config(void __iomem *base, int gic_irqs,

		     void (*sync_access)(void))

{

	unsigned int i;

drivers/irqchip/irq-gic-pm.c

0 → 100644
+184 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 NVIDIA CORPORATION, All Rights Reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */

#include <linux/module.h>

#include <linux/clk.h>

#include <linux/of_device.h>

#include <linux/of_irq.h>

#include <linux/irqchip/arm-gic.h>

#include <linux/platform_device.h>

#include <linux/pm_clock.h>

#include <linux/pm_runtime.h>

#include <linux/slab.h>



struct gic_clk_data {

	unsigned int num_clocks;

	const char *const *clocks;

};



static int gic_runtime_resume(struct device *dev)

{

	struct gic_chip_data *gic = dev_get_drvdata(dev);

	int ret;



	ret = pm_clk_resume(dev);

	if (ret)

		return ret;



	/*

	 * On the very first resume, the pointer to the driver data

	 * will be NULL and this is intentional, because we do not

	 * want to restore the GIC on the very first resume. So if

	 * the pointer is not valid just return.

	 */

	if (!gic)

		return 0;



	gic_dist_restore(gic);

	gic_cpu_restore(gic);



	return 0;

}



static int gic_runtime_suspend(struct device *dev)

{

	struct gic_chip_data *gic = dev_get_drvdata(dev);



	gic_dist_save(gic);

	gic_cpu_save(gic);



	return pm_clk_suspend(dev);

}



static int gic_get_clocks(struct device *dev, const struct gic_clk_data *data)

{

	struct clk *clk;

	unsigned int i;

	int ret;



	if (!dev || !data)

		return -EINVAL;



	ret = pm_clk_create(dev);

	if (ret)

		return ret;



	for (i = 0; i < data->num_clocks; i++) {

		clk = of_clk_get_by_name(dev->of_node, data->clocks[i]);

		if (IS_ERR(clk)) {

			dev_err(dev, "failed to get clock %s\n",

				data->clocks[i]);

			ret = PTR_ERR(clk);

			goto error;

		}



		ret = pm_clk_add_clk(dev, clk);

		if (ret) {

			dev_err(dev, "failed to add clock at index %d\n", i);

			clk_put(clk);

			goto error;

		}

	}



	return 0;



error:

	pm_clk_destroy(dev);



	return ret;

}



static int gic_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	const struct gic_clk_data *data;

	struct gic_chip_data *gic;

	int ret, irq;



	data = of_device_get_match_data(&pdev->dev);

	if (!data) {

		dev_err(&pdev->dev, "no device match found\n");

		return -ENODEV;

	}



	irq = irq_of_parse_and_map(dev->of_node, 0);

	if (!irq) {

		dev_err(dev, "no parent interrupt found!\n");

		return -EINVAL;

	}



	ret = gic_get_clocks(dev, data);

	if (ret)

		goto irq_dispose;



	pm_runtime_enable(dev);



	ret = pm_runtime_get_sync(dev);

	if (ret < 0)

		goto rpm_disable;



	ret = gic_of_init_child(dev, &gic, irq);

	if (ret)

		goto rpm_put;



	platform_set_drvdata(pdev, gic);



	pm_runtime_put(dev);



	dev_info(dev, "GIC IRQ controller registered\n");



	return 0;



rpm_put:

	pm_runtime_put_sync(dev);

rpm_disable:

	pm_runtime_disable(dev);

	pm_clk_destroy(dev);

irq_dispose:

	irq_dispose_mapping(irq);



	return ret;

}



static const struct dev_pm_ops gic_pm_ops = {

	SET_RUNTIME_PM_OPS(gic_runtime_suspend,

			   gic_runtime_resume, NULL)

};



static const char * const gic400_clocks[] = {

	"clk",

};



static const struct gic_clk_data gic400_data = {

	.num_clocks = ARRAY_SIZE(gic400_clocks),

	.clocks = gic400_clocks,

};



static const struct of_device_id gic_match[] = {

	{ .compatible = "nvidia,tegra210-agic",	.data = &gic400_data },

	{},

};

MODULE_DEVICE_TABLE(of, gic_match);



static struct platform_driver gic_driver = {

	.probe		= gic_probe,

	.driver		= {

		.name	= "gic",

		.of_match_table	= gic_match,

		.pm	= &gic_pm_ops,

	}

};



builtin_platform_driver(gic_driver);