From patchwork Mon May 30 06:18:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rashmica Gupta X-Patchwork-Id: 627615 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 AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rJ68l5Gbmz9t77 for ; Mon, 30 May 2016 16:26:47 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=I5nS/0Mt; dkim-atps=neutral Received: from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3rJ68l46swzDqk1 for ; Mon, 30 May 2016 16:26:47 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=I5nS/0Mt; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-pa0-x242.google.com (mail-pa0-x242.google.com [IPv6:2607:f8b0:400e:c03::242]) (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 3rJ5zs0RgMzDqZ2 for ; Mon, 30 May 2016 16:19:05 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=I5nS/0Mt; dkim-atps=neutral Received: by mail-pa0-x242.google.com with SMTP id gp3so13599640pac.2 for ; Sun, 29 May 2016 23:19:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=WamZJfL+4mAzbjfQE2BeAat6QNlGSM9y39RYbQlBfDw=; b=I5nS/0MtExCgC4DPzFQEewrfupPZIk9W4xzoKvKkTkaALELZbhtzNfHlWHvVwkwVee CweCk/wDcKbtFUZkqfbPpzbxsJ5r/fdK0saUppeGlFPLshwp2Ojw2+L1qTZKBh4VIPzh vt33DOWio5YiR7n+cHQpfUtkkIo7FIQBUNmrGgaPhKOuhrZWEOb8Ci14LtTYGRpH64sw ioN+6OaW69wBx40T2/1d/pu6/5HUSvge8uJF6kbUL9+pv8yC9EN81zCyoOx/d4bvnkaq nsi1eL3KdEx5LbkhZZDDvRonh0rtg10M+1P17Oe1XsXusySTIVyawMeHGrxoJTXP4+3z YJhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=WamZJfL+4mAzbjfQE2BeAat6QNlGSM9y39RYbQlBfDw=; b=JVLh5Kuzkn6lWGiUoi5cuYO/6evS97bv8GIxro83Q8NNUcWRAGiFzrlA2rFm1K2bLN D8PXSde4rtDNXV02rxsYAXGU46TxreuVX2WLgyZRPZZRIw0ssGh1hkrkDHYchl39mSNj w3NPWglPo/7LZu5vheuEjaG7SV2ZaI3NbfgVvGr8/dmOmIK0eQeq1BeJxImh9PQ7Ww7W 2dHQTj9CtMcsTfoVbPGIkfuNl6CnaqSjzb/jrUXlOrdOSeJidRoOqUgCUv+7u5NjY//Y 5upDT3NUX8AxhPkSOzeP8lRK5sirIiSBd0zv9EVeVXr2HbOXWza0bNq0Y8LSAigzR8RN JXlA== X-Gm-Message-State: ALyK8tJC5moYP7377LHSwuOrF5WHkvRZGmdjODhDhDkEV2wg5r++4J2bMVMOtmk+37IUXw== X-Received: by 10.66.26.165 with SMTP id m5mr43055028pag.155.1464589143257; Sun, 29 May 2016 23:19:03 -0700 (PDT) Received: from circle.ozlabs.ibm.com ([122.99.82.10]) by smtp.gmail.com with ESMTPSA id m81sm16432256pfi.51.2016.05.29.23.19.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 29 May 2016 23:19:02 -0700 (PDT) From: Rashmica Gupta To: mpe@ellerman.id.au, benh@kernel.crashing.org, paulus@samba.org, nfont@linux.vnet.ibm.com Subject: [PATCH 5/5] powerpc/pseries: Remove MPIC from pseries event sources Date: Mon, 30 May 2016 16:18:15 +1000 Message-Id: <1464589095-442-5-git-send-email-rashmicy@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1464589095-442-1-git-send-email-rashmicy@gmail.com> References: <1464589095-442-1-git-send-email-rashmicy@gmail.com> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linuxppc-dev@lists.ozlabs.org MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" MPIC was only used by Power3 which is now unsupported, so remove MPIC code. XICS is now the only supported interrupt controller for pSeries so do some cleanups too. Signed-off-by: Rashmica Gupta --- arch/powerpc/platforms/pseries/event_sources.c | 53 +++++++------------------- 1 file changed, 13 insertions(+), 40 deletions(-) diff --git a/arch/powerpc/platforms/pseries/event_sources.c b/arch/powerpc/platforms/pseries/event_sources.c index 18380e8f6dfe..a6ddca833119 100644 --- a/arch/powerpc/platforms/pseries/event_sources.c +++ b/arch/powerpc/platforms/pseries/event_sources.c @@ -26,48 +26,21 @@ void request_event_sources_irqs(struct device_node *np, { int i, index, count = 0; struct of_phandle_args oirq; - const u32 *opicprop; - unsigned int opicplen; unsigned int virqs[16]; - /* Check for obsolete "open-pic-interrupt" property. If present, then - * map those interrupts using the default interrupt host and default - * trigger - */ - opicprop = of_get_property(np, "open-pic-interrupt", &opicplen); - if (opicprop) { - opicplen /= sizeof(u32); - for (i = 0; i < opicplen; i++) { - if (count > 15) - break; - virqs[count] = irq_create_mapping(NULL, *(opicprop++)); - if (virqs[count] == NO_IRQ) { - pr_err("event-sources: Unable to allocate " - "interrupt number for %s\n", - np->full_name); - WARN_ON(1); - } - else - count++; - - } - } - /* Else use normal interrupt tree parsing */ - else { - /* First try to do a proper OF tree parsing */ - for (index = 0; of_irq_parse_one(np, index, &oirq) == 0; - index++) { - if (count > 15) - break; - virqs[count] = irq_create_of_mapping(&oirq); - if (virqs[count] == NO_IRQ) { - pr_err("event-sources: Unable to allocate " - "interrupt number for %s\n", - np->full_name); - WARN_ON(1); - } - else - count++; + /* First try to do a proper OF tree parsing */ + for (index = 0; of_irq_parse_one(np, index, &oirq) == 0; + index++) { + if (count > 15) + break; + virqs[count] = irq_create_of_mapping(&oirq); + if (virqs[count] == NO_IRQ) { + pr_err("event-sources: Unable to allocate " + "interrupt number for %s\n", + np->full_name); + WARN_ON(1); + } else { + count++; } }