From patchwork Sun Dec 31 22:04:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Darren Stevens X-Patchwork-Id: 854269 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3z8vs92Hzcz9t3r for ; Mon, 1 Jan 2018 09:20:13 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3z8vs90yT8zDr29 for ; Mon, 1 Jan 2018 09:20:13 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=stevens-zone.net (client-ip=212.227.17.10; helo=mout.kundenserver.de; envelope-from=darren@stevens-zone.net; receiver=) Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.17.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3z8vnN2DQJzDr1l for ; Mon, 1 Jan 2018 09:16:55 +1100 (AEDT) Received: from [127.0.0.1] ([86.161.101.150]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.179]) with ESMTPA (Nemesis) id 0LxOqw-1eyyuk0bQQ-016zT4; Sun, 31 Dec 2017 23:16:52 +0100 From: Darren Stevens To: linuxppc-dev@lists.ozlabs.org Date: Sun, 31 Dec 2017 22:04:10 +0000 (GMT) Message-ID: <4b3d1fd01f9.613e9d05@auth.smtp.1and1.co.uk> User-Agent: YAM/2.9p1 (AmigaOS4; PPC; rv:20140418r7798) Subject: [PATCH NEXT 2/4] powerpc/pasemi: Add Nemo board IRQ init routine MIME-Version: 1.0 Content-type: multipart/mixed; boundary="--=_BOUNDARY.6c3689404196289f.50" X-Provags-ID: V03:K0:a853RWnBSIEnspUDGOKtkLJU5+u5wwl/5cd8G2RL2FM3L/SjSuw wOybjC4uxZTM2rk76Jlqc20EpqocmjF5/mX7HP0xnk2MaOULvROm+hpaFVNfpAbBqZagHC8 tmg/dARBKEGTtssvK7OunK5IERt1kFr+j4JyTBvyicH8OZHXH2UOOsbwV16cPej3pFivGkD SH02+c8GWq1HVR0ynBn+Q== X-UI-Out-Filterresults: notjunk:1; V01:K0:igF5Ez1/BFk=:tuM9TFKUmnkwZ5Xbix/TQr /r3Cpaa+oXuGjYOTKEymHyqZoGx/d2s8oX3ZTfcGwJCcNtDKxS0uy66693qEtPfiqGZReKw/d ws1997UQUlU0nJG7LruHbiUzM7kisyEQEGaswHehwGZoIW2HQAkeGNtYr+t4YpdJZ2pEXdK2O xkzrrBJAs1c/52EAbyru1iuZeIkWk08P3Xw5as9hEChrhjyoKWtax8wvZ63B4780jc7I61tcX E7jtwckzlyFlrGBHGqn6vckmjuoaMt/d35yt0Vuu1BQHvcIvu7/nIdIs9kb0bXu2EdObx1kqV hStNUZAX36KLuh2DXrG/vy7iRTGFVr+6fKEtAN0S+1yMVDJx+IeT/9iP2m5mw+3N9NGPfB9Mr +F1ncVRXSZIqXd6EUdghOZiesz+Z0Ozyb1iqdBlZZwUg+/B8JfBSesjNtsRRpRWAJXr+yQDbL yEOMuKttoOf1c8I+X20GRPE/w+vg4OBMVAYhpS4ne6bddOPyZBh89ITCliFPO0Emr2GRDuSv9 MF8uSmFhbIHF80l3+M/1/ZfJgRl0Cm1Dr9qv8fVFwNrWihte8IoJGHNtE/kgXTjUs5hv+EE7d eBpiGltVatTdru/xt2Bv03wH7efsON+kJlZ7E8Fy+50plVNZUNiG6DTLGc+xBKa4nMnE4jk8w Nn9poFTWgkuUWCVpbqTh5KKxfI/Pvu2H4uchnaf23feIi1SkW8fV9bHvonJkCq6pOOoYXgB7u tmXViIA7odfs3xqZ792y1pT1chZDhZ4q7Jt79A== X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.24 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Christian Zigotzky Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Add a IRQ init routine for the Nemo board which also inits and attatches the i8259 found in the SB600. Signed-off-by: Darren Stevens diff --git a/arch/powerpc/platforms/pasemi/setup.c b/arch/powerpc/platforms/pasemi/setup.c index c4a3e93..c583c17 100644 --- a/arch/powerpc/platforms/pasemi/setup.c +++ b/arch/powerpc/platforms/pasemi/setup.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -183,6 +184,99 @@ static int __init pas_setup_mce_regs(void) } machine_device_initcall(pasemi, pas_setup_mce_regs); +#ifdef CONFIG_PPC_PASEMI_NEMO +static void sb600_8259_cascade(struct irq_desc *desc) +{ + struct irq_chip *chip = irq_desc_get_chip(desc); + unsigned int cascade_irq = i8259_irq(); + + if (cascade_irq) + generic_handle_irq(cascade_irq); + + chip->irq_eoi(&desc->irq_data); +} + +static __init void nemo_init_IRQ(void) +{ + struct device_node *np; + struct device_node *root, *mpic_node, *i8259_node; + unsigned long openpic_addr; + const unsigned int *opprop; + int naddr, opplen; + int mpic_flags; + const unsigned int *nmiprop; + struct mpic *mpic; + int gpio_virq; + + mpic_node = NULL; + + for_each_node_by_type(np, "interrupt-controller") + if (of_device_is_compatible(np, "open-pic")) { + mpic_node = np; + break; + } + if (!mpic_node) + for_each_node_by_type(np, "open-pic") { + mpic_node = np; + break; + } + if (!mpic_node) { + printk(KERN_ERR + "Failed to locate the MPIC interrupt controller\n"); + return; + } + + /* Find address list in /platform-open-pic */ + root = of_find_node_by_path("/"); + naddr = of_n_addr_cells(root); + opprop = of_get_property(root, "platform-open-pic", &opplen); + if (!opprop) { + printk(KERN_ERR "No platform-open-pic property.\n"); + of_node_put(root); + return; + } + openpic_addr = of_read_number(opprop, naddr); + printk(KERN_DEBUG "OpenPIC addr: %lx\n", openpic_addr); + + mpic_flags = MPIC_LARGE_VECTORS | MPIC_NO_BIAS | MPIC_NO_RESET; + + nmiprop = of_get_property(mpic_node, "nmi-source", NULL); + if (nmiprop) + mpic_flags |= MPIC_ENABLE_MCK; + + mpic = mpic_alloc(mpic_node, openpic_addr, + mpic_flags, 0, 0, "PASEMI-OPIC"); + BUG_ON(!mpic); + + mpic_assign_isu(mpic, 0, mpic->paddr + 0x10000); + mpic_init(mpic); + /* The NMI/MCK source needs to be prio 15 */ + if (nmiprop) { + nmi_virq = irq_create_mapping(NULL, *nmiprop); + mpic_irq_set_priority(nmi_virq, 15); + irq_set_irq_type(nmi_virq, IRQ_TYPE_EDGE_RISING); + mpic_unmask_irq(irq_get_irq_data(nmi_virq)); + } + + + /* Connect the SB600's legacy i8259 controller */ + i8259_node = of_find_node_by_path("/pxp@0,e0000000"); + i8259_init(i8259_node, 0); + of_node_put(i8259_node); + + gpio_virq = irq_create_mapping(NULL, 3); + irq_set_irq_type(gpio_virq, IRQ_TYPE_LEVEL_HIGH); + irq_set_chained_handler(gpio_virq, sb600_8259_cascade); + mpic_unmask_irq(irq_get_irq_data(gpio_virq)); + + irq_set_default_host(mpic->irqhost); + + of_node_put(mpic_node); + of_node_put(root); + +} +#endif + static __init void pas_init_IRQ(void) { struct device_node *np;