From: Arnd Bergmann <arnd@arndb.de> To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, Kukjin Kim <kgene.kim@samsung.com>, linux-samsung-soc@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>, Thomas Gleixner <tglx@linutronix.de> Subject: [PATCH 26/30] irqchip: exynos: allocate combiner_data dynamically Date: Thu, 11 Apr 2013 02:05:08 +0200 [thread overview] Message-ID: <1365638712-1028578-27-git-send-email-arnd@arndb.de> (raw) In-Reply-To: <1365638712-1028578-1-git-send-email-arnd@arndb.de> The number of combiners on a given SoC is a platform specific constant, and we cannot encode this number on a multiplatform kernel since the header file defining it is not available. Allocating the structure dynamically ends up cleaner anyway since we keep all the data local. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Thomas Gleixner <tglx@linutronix.de> --- drivers/irqchip/exynos-combiner.c | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/drivers/irqchip/exynos-combiner.c b/drivers/irqchip/exynos-combiner.c index e7aef59..ffb10aa 100644 --- a/drivers/irqchip/exynos-combiner.c +++ b/drivers/irqchip/exynos-combiner.c @@ -12,6 +12,7 @@ #include <linux/export.h> #include <linux/init.h> #include <linux/io.h> +#include <linux/slab.h> #include <linux/irqdomain.h> #include <linux/irqchip/chained_irq.h> #include <linux/of_address.h> @@ -38,7 +39,6 @@ struct combiner_chip_data { }; static struct irq_domain *combiner_irq_domain; -static struct combiner_chip_data combiner_data[MAX_COMBINER_NR]; static inline void __iomem *combiner_base(struct irq_data *data) { @@ -115,26 +115,26 @@ static struct irq_chip combiner_chip = { #endif }; -static void __init combiner_cascade_irq(unsigned int combiner_nr, +static void __init combiner_cascade_irq(struct combiner_chip_data *combiner_data, unsigned int irq) { - if (irq_set_handler_data(irq, &combiner_data[combiner_nr]) != 0) + if (irq_set_handler_data(irq, combiner_data) != 0) BUG(); irq_set_chained_handler(irq, combiner_handle_cascade_irq); } -static void __init combiner_init_one(unsigned int combiner_nr, +static void __init combiner_init_one(struct combiner_chip_data *combiner_data, + unsigned int combiner_nr, void __iomem *base, unsigned int irq) { - combiner_data[combiner_nr].base = base; - combiner_data[combiner_nr].irq_offset = irq_find_mapping( + combiner_data->base = base; + combiner_data->irq_offset = irq_find_mapping( combiner_irq_domain, combiner_nr * IRQ_IN_COMBINER); - combiner_data[combiner_nr].irq_mask = 0xff << ((combiner_nr % 4) << 3); - combiner_data[combiner_nr].parent_irq = irq; + combiner_data->irq_mask = 0xff << ((combiner_nr % 4) << 3); + combiner_data->parent_irq = irq; /* Disable all interrupts */ - __raw_writel(combiner_data[combiner_nr].irq_mask, - base + COMBINER_ENABLE_CLEAR); + __raw_writel(combiner_data->irq_mask, base + COMBINER_ENABLE_CLEAR); } #ifdef CONFIG_OF @@ -169,6 +169,8 @@ static int combiner_irq_domain_xlate(struct irq_domain *d, static int combiner_irq_domain_map(struct irq_domain *d, unsigned int irq, irq_hw_number_t hw) { + struct combiner_chip_data *combiner_data = d->host_data; + irq_set_chip_and_handler(irq, &combiner_chip, handle_level_irq); irq_set_chip_data(irq, &combiner_data[hw >> 3]); set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); @@ -203,6 +205,7 @@ void __init combiner_init(void __iomem *combiner_base, { int i, irq, irq_base; unsigned int nr_irq; + struct combiner_chip_data *combiner_data; nr_irq = max_nr * IRQ_IN_COMBINER; @@ -212,8 +215,14 @@ void __init combiner_init(void __iomem *combiner_base, pr_warning("%s: irq desc alloc failed. Continuing with %d as linux irq base\n", __func__, irq_base); } + combiner_data = kcalloc(max_nr, sizeof (*combiner_data), GFP_KERNEL); + if (!combiner_data) { + pr_warning("%s: could not allocate combiner data\n", __func__); + return; + } + combiner_irq_domain = irq_domain_add_legacy(np, nr_irq, irq_base, 0, - &combiner_irq_domain_ops, &combiner_data); + &combiner_irq_domain_ops, combiner_data); if (WARN_ON(!combiner_irq_domain)) { pr_warning("%s: irq domain init failed\n", __func__); return; @@ -228,8 +237,9 @@ void __init combiner_init(void __iomem *combiner_base, if (np) irq = irq_of_parse_and_map(np, i); #endif - combiner_init_one(i, combiner_base + (i >> 2) * 0x10, irq); - combiner_cascade_irq(i, irq); + combiner_init_one(&combiner_data[i], i, + combiner_base + (i >> 2) * 0x10, irq); + combiner_cascade_irq(&combiner_data[i], irq); } } -- 1.8.1.2
WARNING: multiple messages have this Message-ID (diff)
From: arnd@arndb.de (Arnd Bergmann) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 26/30] irqchip: exynos: allocate combiner_data dynamically Date: Thu, 11 Apr 2013 02:05:08 +0200 [thread overview] Message-ID: <1365638712-1028578-27-git-send-email-arnd@arndb.de> (raw) In-Reply-To: <1365638712-1028578-1-git-send-email-arnd@arndb.de> The number of combiners on a given SoC is a platform specific constant, and we cannot encode this number on a multiplatform kernel since the header file defining it is not available. Allocating the structure dynamically ends up cleaner anyway since we keep all the data local. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Thomas Gleixner <tglx@linutronix.de> --- drivers/irqchip/exynos-combiner.c | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/drivers/irqchip/exynos-combiner.c b/drivers/irqchip/exynos-combiner.c index e7aef59..ffb10aa 100644 --- a/drivers/irqchip/exynos-combiner.c +++ b/drivers/irqchip/exynos-combiner.c @@ -12,6 +12,7 @@ #include <linux/export.h> #include <linux/init.h> #include <linux/io.h> +#include <linux/slab.h> #include <linux/irqdomain.h> #include <linux/irqchip/chained_irq.h> #include <linux/of_address.h> @@ -38,7 +39,6 @@ struct combiner_chip_data { }; static struct irq_domain *combiner_irq_domain; -static struct combiner_chip_data combiner_data[MAX_COMBINER_NR]; static inline void __iomem *combiner_base(struct irq_data *data) { @@ -115,26 +115,26 @@ static struct irq_chip combiner_chip = { #endif }; -static void __init combiner_cascade_irq(unsigned int combiner_nr, +static void __init combiner_cascade_irq(struct combiner_chip_data *combiner_data, unsigned int irq) { - if (irq_set_handler_data(irq, &combiner_data[combiner_nr]) != 0) + if (irq_set_handler_data(irq, combiner_data) != 0) BUG(); irq_set_chained_handler(irq, combiner_handle_cascade_irq); } -static void __init combiner_init_one(unsigned int combiner_nr, +static void __init combiner_init_one(struct combiner_chip_data *combiner_data, + unsigned int combiner_nr, void __iomem *base, unsigned int irq) { - combiner_data[combiner_nr].base = base; - combiner_data[combiner_nr].irq_offset = irq_find_mapping( + combiner_data->base = base; + combiner_data->irq_offset = irq_find_mapping( combiner_irq_domain, combiner_nr * IRQ_IN_COMBINER); - combiner_data[combiner_nr].irq_mask = 0xff << ((combiner_nr % 4) << 3); - combiner_data[combiner_nr].parent_irq = irq; + combiner_data->irq_mask = 0xff << ((combiner_nr % 4) << 3); + combiner_data->parent_irq = irq; /* Disable all interrupts */ - __raw_writel(combiner_data[combiner_nr].irq_mask, - base + COMBINER_ENABLE_CLEAR); + __raw_writel(combiner_data->irq_mask, base + COMBINER_ENABLE_CLEAR); } #ifdef CONFIG_OF @@ -169,6 +169,8 @@ static int combiner_irq_domain_xlate(struct irq_domain *d, static int combiner_irq_domain_map(struct irq_domain *d, unsigned int irq, irq_hw_number_t hw) { + struct combiner_chip_data *combiner_data = d->host_data; + irq_set_chip_and_handler(irq, &combiner_chip, handle_level_irq); irq_set_chip_data(irq, &combiner_data[hw >> 3]); set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); @@ -203,6 +205,7 @@ void __init combiner_init(void __iomem *combiner_base, { int i, irq, irq_base; unsigned int nr_irq; + struct combiner_chip_data *combiner_data; nr_irq = max_nr * IRQ_IN_COMBINER; @@ -212,8 +215,14 @@ void __init combiner_init(void __iomem *combiner_base, pr_warning("%s: irq desc alloc failed. Continuing with %d as linux irq base\n", __func__, irq_base); } + combiner_data = kcalloc(max_nr, sizeof (*combiner_data), GFP_KERNEL); + if (!combiner_data) { + pr_warning("%s: could not allocate combiner data\n", __func__); + return; + } + combiner_irq_domain = irq_domain_add_legacy(np, nr_irq, irq_base, 0, - &combiner_irq_domain_ops, &combiner_data); + &combiner_irq_domain_ops, combiner_data); if (WARN_ON(!combiner_irq_domain)) { pr_warning("%s: irq domain init failed\n", __func__); return; @@ -228,8 +237,9 @@ void __init combiner_init(void __iomem *combiner_base, if (np) irq = irq_of_parse_and_map(np, i); #endif - combiner_init_one(i, combiner_base + (i >> 2) * 0x10, irq); - combiner_cascade_irq(i, irq); + combiner_init_one(&combiner_data[i], i, + combiner_base + (i >> 2) * 0x10, irq); + combiner_cascade_irq(&combiner_data[i], irq); } } -- 1.8.1.2
next prev parent reply other threads:[~2013-04-11 0:07 UTC|newest] Thread overview: 167+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-04-11 0:04 [PATCH 00/30] ARM: exynos multiplatform support Arnd Bergmann 2013-04-11 0:04 ` Arnd Bergmann 2013-04-11 0:04 ` Arnd Bergmann 2013-04-11 0:04 ` Arnd Bergmann 2013-04-11 0:04 ` [PATCH 01/30] ARM: exynos: introduce EXYNOS_ATAGS symbol Arnd Bergmann 2013-04-11 0:04 ` Arnd Bergmann 2013-04-11 0:04 ` [PATCH 02/30] ARM: exynos: prepare for sparse IRQ Arnd Bergmann 2013-04-11 0:04 ` Arnd Bergmann 2013-04-11 0:04 ` Arnd Bergmann 2013-04-11 0:17 ` Kyungmin Park 2013-04-11 0:17 ` Kyungmin Park 2013-04-11 0:04 ` [PATCH 03/30] ARM: exynos: move debug-macro.S to include/debug/ Arnd Bergmann 2013-04-11 0:04 ` Arnd Bergmann 2013-04-11 0:04 ` [PATCH 04/30] ARM: samsung: move mfc device definition to s5p-dev-mfc.c Arnd Bergmann 2013-04-11 0:04 ` Arnd Bergmann 2013-04-11 0:04 ` Arnd Bergmann 2013-04-11 0:04 ` [PATCH 05/30] tty: serial/samsung: prepare for common clock API Arnd Bergmann 2013-04-11 0:04 ` Arnd Bergmann 2013-04-11 0:04 ` [PATCH 06/30] tty: serial/samsung: make register definitions global Arnd Bergmann 2013-04-11 0:04 ` Arnd Bergmann 2013-04-11 0:04 ` [PATCH 07/30] tty: serial/samsung: fix modular build Arnd Bergmann 2013-04-11 0:04 ` Arnd Bergmann 2013-04-11 0:04 ` Arnd Bergmann 2013-04-11 0:04 ` [PATCH 08/30] i2c: s3c2410: make header file local Arnd Bergmann 2013-04-11 0:04 ` Arnd Bergmann 2013-04-11 0:04 ` Arnd Bergmann 2013-04-14 12:20 ` Wolfram Sang 2013-04-14 12:20 ` Wolfram Sang 2013-04-14 12:20 ` Wolfram Sang 2013-04-14 17:01 ` Heiko Stübner 2013-04-14 17:01 ` Heiko Stübner 2013-04-11 0:04 ` [PATCH 09/30] mmc: sdhci-s3c: remove platform dependencies Arnd Bergmann 2013-04-11 0:04 ` Arnd Bergmann 2013-04-11 1:06 ` Chris Ball 2013-04-11 1:06 ` Chris Ball 2013-04-11 0:04 ` [PATCH 10/30] usb: exynos: do not include plat/usb-phy.h Arnd Bergmann 2013-04-11 0:04 ` Arnd Bergmann 2013-04-11 20:25 ` Greg Kroah-Hartman 2013-04-11 20:25 ` Greg Kroah-Hartman 2013-04-11 20:49 ` [PATCH v3] " Arnd Bergmann 2013-04-11 20:49 ` Arnd Bergmann 2013-04-11 20:49 ` Arnd Bergmann 2013-04-11 0:04 ` [PATCH 11/30] [media] exynos: remove unnecessary header inclusions Arnd Bergmann 2013-04-11 0:04 ` Arnd Bergmann 2013-04-11 0:04 ` Arnd Bergmann 2013-04-11 0:13 ` Mauro Carvalho Chehab 2013-04-11 0:13 ` Mauro Carvalho Chehab 2013-04-11 9:07 ` Sylwester Nawrocki 2013-04-11 9:07 ` Sylwester Nawrocki 2013-04-11 10:52 ` Arnd Bergmann 2013-04-11 10:52 ` Arnd Bergmann 2013-04-11 0:04 ` [PATCH 12/30] video/exynos: " Arnd Bergmann 2013-04-11 0:04 ` Arnd Bergmann 2013-04-11 0:04 ` Arnd Bergmann 2013-04-11 5:07 ` Jingoo Han 2013-04-11 5:07 ` Jingoo Han 2013-04-11 5:07 ` Jingoo Han 2013-04-11 11:51 ` Tomi Valkeinen 2013-04-11 11:51 ` Tomi Valkeinen 2013-04-11 11:51 ` Tomi Valkeinen 2013-04-11 11:51 ` Tomi Valkeinen 2013-04-11 12:08 ` Arnd Bergmann 2013-04-11 12:08 ` Arnd Bergmann 2013-04-11 12:08 ` Arnd Bergmann 2013-04-11 0:04 ` [PATCH 13/30] video/s3c: move platform_data out of arch/arm Arnd Bergmann 2013-04-11 0:04 ` Arnd Bergmann 2013-04-11 0:04 ` Arnd Bergmann 2013-04-11 4:34 ` Jingoo Han 2013-04-11 4:34 ` Jingoo Han 2013-04-11 4:34 ` Jingoo Han 2013-04-11 5:12 ` Jingoo Han 2013-04-11 5:12 ` Jingoo Han 2013-04-11 5:12 ` Jingoo Han 2013-04-11 0:04 ` [PATCH 14/30] thermal/exynos: remove unnecessary header inclusions Arnd Bergmann 2013-04-11 0:04 ` Arnd Bergmann 2013-04-11 1:19 ` Eduardo Valentin 2013-04-11 1:19 ` Eduardo Valentin 2013-04-11 1:19 ` Eduardo Valentin 2013-04-11 23:26 ` Zhang Rui 2013-04-11 23:26 ` Zhang Rui 2013-04-11 0:04 ` [PATCH 15/30] mtd: onenand/samsung: make regs-onenand.h file local Arnd Bergmann 2013-04-11 0:04 ` Arnd Bergmann 2013-04-11 0:04 ` Arnd Bergmann 2013-04-11 0:04 ` Arnd Bergmann 2013-04-11 0:18 ` Kyungmin Park 2013-04-11 0:18 ` Kyungmin Park 2013-04-11 0:18 ` Kyungmin Park 2013-04-11 0:04 ` [PATCH 16/30] rtc: s3c: make header " Arnd Bergmann 2013-04-11 0:04 ` Arnd Bergmann 2013-04-11 0:04 ` [PATCH 17/30] pwm: samsung: repair the worst MMIO abuses Arnd Bergmann 2013-04-11 0:04 ` Arnd Bergmann 2013-04-12 7:06 ` Thierry Reding 2013-04-12 7:06 ` Thierry Reding 2013-04-12 7:46 ` Tomasz Figa 2013-04-12 7:46 ` Tomasz Figa 2013-04-11 0:05 ` [PATCH 18/30] ASoC: samsung: move plat/ headers to local directory Arnd Bergmann 2013-04-11 0:05 ` Arnd Bergmann 2013-04-11 0:05 ` Arnd Bergmann 2013-04-11 16:47 ` Mark Brown 2013-04-11 16:47 ` Mark Brown 2013-04-11 17:08 ` Arnd Bergmann 2013-04-11 17:08 ` Arnd Bergmann 2013-04-11 17:19 ` Mark Brown 2013-04-11 17:19 ` Mark Brown 2013-04-11 19:02 ` [PATCH] ASoC: samsung: fix neo1973-wm8753 compilation Heiko Stübner 2013-04-11 19:02 ` Heiko Stübner 2013-04-12 12:13 ` Mark Brown 2013-04-12 12:13 ` Mark Brown 2013-04-12 11:04 ` [alsa-devel] [PATCH 18/30] ASoC: samsung: move plat/ headers to local directory Lars-Peter Clausen 2013-04-12 11:04 ` Lars-Peter Clausen 2013-04-12 11:26 ` Mark Brown 2013-04-12 11:26 ` Mark Brown 2013-04-11 0:05 ` [PATCH 19/30] ASoC: samsung: use irq resource for idma Arnd Bergmann 2013-04-11 0:05 ` Arnd Bergmann 2013-04-11 16:48 ` Mark Brown 2013-04-11 16:48 ` Mark Brown 2013-04-11 0:05 ` [PATCH 20/30] ASoC: samsung: convert to dmaengine API Arnd Bergmann 2013-04-11 0:05 ` Arnd Bergmann 2013-04-11 0:05 ` Arnd Bergmann 2013-04-11 14:27 ` Mark Brown 2013-04-11 14:27 ` Mark Brown 2013-04-11 14:47 ` Arnd Bergmann 2013-04-11 14:47 ` Arnd Bergmann 2013-04-11 15:42 ` Mark Brown 2013-04-11 15:42 ` Mark Brown 2013-04-12 19:27 ` [alsa-devel] " Lars-Peter Clausen 2013-04-12 19:27 ` Lars-Peter Clausen 2013-04-15 11:04 ` Mark Brown 2013-04-15 11:04 ` Mark Brown 2013-04-11 0:05 ` [PATCH 21/30] ASoC: samsung/i2s: fix module_device_table Arnd Bergmann 2013-04-11 0:05 ` Arnd Bergmann 2013-04-11 16:48 ` Mark Brown 2013-04-11 16:48 ` Mark Brown 2013-04-11 0:05 ` [PATCH 22/30] ASoC: samsung/idma: export idma_reg_addr_init Arnd Bergmann 2013-04-11 0:05 ` Arnd Bergmann 2013-04-11 0:05 ` Arnd Bergmann 2013-04-11 16:48 ` Mark Brown 2013-04-11 16:48 ` Mark Brown 2013-04-11 0:05 ` [PATCH 23/30] clk: exynos: prepare for multiplatform Arnd Bergmann 2013-04-11 0:05 ` Arnd Bergmann 2013-04-11 0:05 ` [PATCH 24/30] clocksource: exynos_mct: remove platform header dependency Arnd Bergmann 2013-04-11 0:05 ` Arnd Bergmann 2013-04-11 0:05 ` [PATCH 25/30] irqchip: exynos: pass max combiner number to combiner_init Arnd Bergmann 2013-04-11 0:05 ` Arnd Bergmann 2013-04-11 0:05 ` Arnd Bergmann [this message] 2013-04-11 0:05 ` [PATCH 26/30] irqchip: exynos: allocate combiner_data dynamically Arnd Bergmann 2013-04-11 0:05 ` [PATCH 27/30] irqchip: exynos: localize irq lookup for ATAGS Arnd Bergmann 2013-04-11 0:05 ` Arnd Bergmann 2013-04-11 0:05 ` [PATCH 28/30] irqchip: exynos: pass irq_base from platform Arnd Bergmann 2013-04-11 0:05 ` Arnd Bergmann 2013-04-11 0:05 ` [PATCH 29/30] spi: s3c64xx: move to generic dmaengine API Arnd Bergmann 2013-04-11 0:05 ` Arnd Bergmann 2013-04-11 16:55 ` Mark Brown 2013-04-11 16:55 ` Mark Brown 2013-04-11 20:42 ` [PATCH v2] " Arnd Bergmann 2013-04-11 20:42 ` Arnd Bergmann 2013-04-11 20:42 ` Arnd Bergmann 2013-04-12 12:55 ` Mark Brown 2013-04-12 12:55 ` Mark Brown 2013-04-17 14:46 ` Mark Brown 2013-04-17 14:46 ` Mark Brown 2013-04-17 20:05 ` [PATCH 29/30] " Arnd Bergmann 2013-04-17 20:05 ` Arnd Bergmann 2013-04-18 16:46 ` Mark Brown 2013-04-18 16:46 ` Mark Brown 2013-04-11 0:05 ` [PATCH 30/30] ARM: exynos: enable multiplatform support Arnd Bergmann 2013-04-11 0:05 ` Arnd Bergmann
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1365638712-1028578-27-git-send-email-arnd@arndb.de \ --to=arnd@arndb.de \ --cc=kgene.kim@samsung.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=tglx@linutronix.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.