From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752623AbbJLTPx (ORCPT ); Mon, 12 Oct 2015 15:15:53 -0400 Received: from mout.gmx.net ([212.227.15.19]:57227 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752275AbbJLTPu (ORCPT ); Mon, 12 Oct 2015 15:15:50 -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: Mon, 12 Oct 2015 21:15:31 +0200 Message-Id: <1444677334-12242-3-git-send-email-linux@rempel-privat.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1444677334-12242-1-git-send-email-linux@rempel-privat.de> References: <1444677334-12242-1-git-send-email-linux@rempel-privat.de> X-Provags-ID: V03:K0:MTYbEkcx/Af1tWbxO3+LEQgk0xCh0xPA8tzqe2UwiNIq4Vd7Zbk /Cth17D7yH9OlacWx/vXlrfW2olaIf1+udVlLEV7EvoI4y1SHPfFIevi9b9xRvXNzhh5/Up yoi01lZUNVIKd25lR3Bi9yXfmSD1RQXCDNj+Ocsw5pmA0uBQ/R7wGdpueJYokkd0aD04Nk9 FoUcrQmH9PpDPGk8moJbQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:TCv/GjkmWdE=:w2PNMaUYAPOlCiPRV6Rs4l w1wv9a+/caYK41G87+K3fUyGmK6CMyScneBfhId0yy2p0/3ryPf5+w8g6jusm+DNY+S594Tyq gtpVOF6K1A3yNCtS6zw/5109jMNLsheS4cu+ZY+cX5mgPMDd4jxsp/eUxM7LoyyfdsbZnMj56 Y5UXJR+wYzylvHvUoxfhRCC7eHqStIC9jw65LVvff3pqw8KhgHdB7Rx+3igGE7J96w3cbfXiE VTLnAuIEjsLYbct1qLP/Tlf68zgGjYDax7kmgJI1XzjCtk2Quc5u55v84mJWZEIeY/GqaYhim /3H1lm1+elhND6Dhkvq+srra4i9pKVZv2JojSuUdUKH31HZM2OnUS1kOndvnjewwZqFpwIYu6 RHHgdym6/S7gjYBRLzlJdyVef9WJBqQKbGjRGyNZpzECSmdJbL/whktWFwe76MKlpzzh4yK27 xmEc7q9YvMM6gp1uUzfG0IU34fIbE66O1DqAFGizoXahXe7AYRBj6XiAV5JUFi8dZhCpxusfv PyXnOx+3ICRkqOdWBtdVFXbzkPSGLKh+OKzwAeVxL0QFqRl1gtKMJBGyxG2r51SthdxrXwc1x AD7EKXZYgQ4qxNB60KwvF4VNWMad9Q3KxH0N4ovKgg1ZUZAPwMkduXO8a+3ryfL6m4tp0jjf0 1Owdy79+ZTjKlDVlTQzDzxXIcB5Pb5bjVMpRbfAGlIgPDNGSZCocJA/Yq7tiZQjzybUke4h4O Wt8DctyElWvRZpF+TNFrIOixXMdv3CMBc++IRYah0vjE2OLmWd2Wp7ivHhY= 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