From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752041AbbJJNJ1 (ORCPT ); Sat, 10 Oct 2015 09:09:27 -0400 Received: from mout.gmx.net ([212.227.17.20]:50967 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751047AbbJJNIp (ORCPT ); Sat, 10 Oct 2015 09:08:45 -0400 From: Oleksij Rempel To: linux-kernel@vger.kernel.org, marc.zyngier@arm.com, jason@lakedaemon.net, tglx@linutronix.de Cc: Oleksij Rempel Subject: [PATCH v6 1/2] ARM: irqchip: mxs: prepare driver for HW with different offsets Date: Sat, 10 Oct 2015 15:08:26 +0200 Message-Id: <1444482507-6748-2-git-send-email-linux@rempel-privat.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1444482507-6748-1-git-send-email-linux@rempel-privat.de> References: <1444482507-6748-1-git-send-email-linux@rempel-privat.de> X-Provags-ID: V03:K0:th273xGaBkJq+ZHZIW5n8X4MyRp8unAHqLGWx57CtQluNd3fz+r QgaPs3nUd86srq5oEcK0H0M+pyLvydTWuZ8izvxu+KkPsHAfbXK7YGCBB8j6ayieothAXgH NaXqp94+D7ij80O/Av6rDtWjUPKpxGIJGepAkNTMBOHE2AjNqAlZ93HRwTnWJS7pNC6ORqw QWmXr17wjobi0pPJCxRKA== X-UI-Out-Filterresults: notjunk:1;V01:K0:P/EwY2h4IPU=:hQgmtFVCcex5OVsrkmH3Co vi4PyzKJeCbEY2WlCnHAqfAUq3TooWS4kUciVpglea39GZZE+uX9FSFh4Sq9exdIVcNiH0SHt OSe7mWR7TAiauRlG6EcO/vwXe2ShFqeXxH4ypdcjP2L1QAL8lPgjkLbV+8Osp2cCtGvZMArqW Kf6MWFNs8nQ5Rrn4IG9TR5gR7oPgHWoQIoTxFzRXmwH3/UKwsXhV3huT5yIiAPdbTaQW2OUng R/UUNTWYxMF05mnbB+DRLVyJn8VXf4TaEqLwB/8Ze3T5yyFaoaEyjrUoOHC7i5czslYJ10ivt Vyf3nC+kNHts0TZow6y+3e0VIpNpcUSbfkCJeTITPtc+zz+8+SKvF9Td1wMD9HFLMQDJlyYT8 ZoWmXKr1IeXP8E22YlR4bvpLBwpXAH2vBVyzU0Tk4k2sEiKcEbHycAOBmHfz+cSXSXycMdJZA /On9tV3NnkiSxFcjFs/PkU10CpXg1eQNj3CCRbPk00XhqfgAZUmr2Z6ythNDANkL4fJbziyeE 6VNZId0VJA1iu3tc/4jg+Uwrpih5ptWZPCEbps+/QPsPWg17bX4TaVN2w4CTP8e4a/YxexfUN DLqajVP/uby5XXibGdUAnaLqn0QVtopnV10vXDZVv/+bhZowFyEaZytLjN/0QKfoJoByyu0JI Ti+VV683Lh9QQiFVIF7vkmbxGL/VcpqgwMvantIsA9IfcPl0zMqHIOA5jhR/52A4agHkR/fJx tmvvhIZvM0A3VtClnHgoCmD9FEi+asklXGt+WDrc33WFVJk9MTuzgbzLgM8= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Some HW has similar functionality but different register offsets. Make sure we can change offsets dynamically. Signed-off-by: Oleksij Rempel --- drivers/irqchip/irq-mxs.c | 78 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 62 insertions(+), 16 deletions(-) diff --git a/drivers/irqchip/irq-mxs.c b/drivers/irqchip/irq-mxs.c index 604df63..86dec9a 100644 --- a/drivers/irqchip/irq-mxs.c +++ b/drivers/irqchip/irq-mxs.c @@ -28,18 +28,36 @@ #include #include +/* + * this device provide 4 offsets for each register: + * 0x0 - plain read write mode + * 0x4 - set mode, OR logic. + * 0x8 - clr mode, XOR logic. + * 0xc - togle mode. + */ +#define SET_REG 4 +#define CLR_REG 8 + #define HW_ICOLL_VECTOR 0x0000 #define HW_ICOLL_LEVELACK 0x0010 #define HW_ICOLL_CTRL 0x0020 #define HW_ICOLL_STAT_OFFSET 0x0070 -#define HW_ICOLL_INTERRUPTn_SET(n) (0x0124 + (n) * 0x10) -#define HW_ICOLL_INTERRUPTn_CLR(n) (0x0128 + (n) * 0x10) -#define BM_ICOLL_INTERRUPTn_ENABLE 0x00000004 +#define HW_ICOLL_INTERRUPT0 0x0120 +#define HW_ICOLL_INTERRUPTn(n) ((n) * 0x10) +#define BM_ICOLL_INTR_ENABLE BIT(2) #define BV_ICOLL_LEVELACK_IRQLEVELACK__LEVEL0 0x1 #define ICOLL_NUM_IRQS 128 -static void __iomem *icoll_base; +struct icoll_priv { + void __iomem *vector; + void __iomem *levelack; + void __iomem *ctrl; + void __iomem *stat; + void __iomem *intr; +}; + +static struct icoll_priv icoll_priv; static struct irq_domain *icoll_domain; static void icoll_ack_irq(struct irq_data *d) @@ -50,19 +68,19 @@ static void icoll_ack_irq(struct irq_data *d) * BV_ICOLL_LEVELACK_IRQLEVELACK__LEVEL0 unconditionally. */ __raw_writel(BV_ICOLL_LEVELACK_IRQLEVELACK__LEVEL0, - icoll_base + HW_ICOLL_LEVELACK); + icoll_priv.levelack); } static void icoll_mask_irq(struct irq_data *d) { - __raw_writel(BM_ICOLL_INTERRUPTn_ENABLE, - icoll_base + HW_ICOLL_INTERRUPTn_CLR(d->hwirq)); + __raw_writel(BM_ICOLL_INTR_ENABLE, + icoll_priv.intr + CLR_REG + HW_ICOLL_INTERRUPTn(d->hwirq)); } static void icoll_unmask_irq(struct irq_data *d) { - __raw_writel(BM_ICOLL_INTERRUPTn_ENABLE, - icoll_base + HW_ICOLL_INTERRUPTn_SET(d->hwirq)); + __raw_writel(BM_ICOLL_INTR_ENABLE, + icoll_priv.intr + SET_REG + HW_ICOLL_INTERRUPTn(d->hwirq)); } static struct irq_chip mxs_icoll_chip = { @@ -75,8 +93,8 @@ asmlinkage void __exception_irq_entry icoll_handle_irq(struct pt_regs *regs) { u32 irqnr; - irqnr = __raw_readl(icoll_base + HW_ICOLL_STAT_OFFSET); - __raw_writel(irqnr, icoll_base + HW_ICOLL_VECTOR); + irqnr = __raw_readl(icoll_priv.stat); + __raw_writel(irqnr, icoll_priv.vector); handle_domain_irq(icoll_domain, irqnr, regs); } @@ -93,20 +111,48 @@ static const struct irq_domain_ops icoll_irq_domain_ops = { .xlate = irq_domain_xlate_onecell, }; +static void __init icoll_add_domain(struct device_node *np, + int num) +{ + icoll_domain = irq_domain_add_linear(np, num, + &icoll_irq_domain_ops, NULL); + + if (!icoll_domain) + panic("%s: unable add irq domain", np->full_name); + irq_set_default_host(icoll_domain); + set_handle_irq(icoll_handle_irq); +} + +static void __iomem * __init icoll_init_iobase(struct device_node *np) +{ + void __iomem *icoll_base; + + icoll_base = of_io_request_and_map(np, 0, np->name); + if (!icoll_base) + panic("%s: unable to map resource", np->full_name); + return icoll_base; +} + static int __init icoll_of_init(struct device_node *np, struct device_node *interrupt_parent) { - icoll_base = of_iomap(np, 0); - WARN_ON(!icoll_base); + void __iomem *icoll_base; + + icoll_base = icoll_init_iobase(np); + icoll_priv.vector = icoll_base + HW_ICOLL_VECTOR; + icoll_priv.levelack = icoll_base + HW_ICOLL_LEVELACK; + icoll_priv.ctrl = icoll_base + HW_ICOLL_CTRL; + icoll_priv.stat = icoll_base + HW_ICOLL_STAT_OFFSET; + icoll_priv.intr = icoll_base + HW_ICOLL_INTERRUPT0; /* * Interrupt Collector reset, which initializes the priority * for each irq to level 0. */ - stmp_reset_block(icoll_base + HW_ICOLL_CTRL); + stmp_reset_block(icoll_priv.ctrl); + + icoll_add_domain(np, ICOLL_NUM_IRQS); - icoll_domain = irq_domain_add_linear(np, ICOLL_NUM_IRQS, - &icoll_irq_domain_ops, NULL); return icoll_domain ? 0 : -ENODEV; } IRQCHIP_DECLARE(mxs, "fsl,icoll", icoll_of_init); -- 2.1.4