From patchwork Tue May 29 21:58:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ray Jui X-Patchwork-Id: 10437191 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8CA13601C7 for ; Tue, 29 May 2018 21:59:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7CA972886B for ; Tue, 29 May 2018 21:59:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6F1D6288CE; Tue, 29 May 2018 21:59:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1E70A2886B for ; Tue, 29 May 2018 21:59:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967681AbeE2V7h (ORCPT ); Tue, 29 May 2018 17:59:37 -0400 Received: from mail-qt0-f193.google.com ([209.85.216.193]:33662 "EHLO mail-qt0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967524AbeE2V7W (ORCPT ); Tue, 29 May 2018 17:59:22 -0400 Received: by mail-qt0-f193.google.com with SMTP id e8-v6so20763168qth.0 for ; Tue, 29 May 2018 14:59:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Fp8lXAHYzYx2luxskjHgY8Ta2qy3f0QabYJVBkaRXP4=; b=bB10sP4Q8GC9OwJli6BBTN6TEAjUMp2NCJIVZRTKAjgBc3BGeIT74ahs3cDlG7zAvU VJWBGMMz5aWvUs7YdCPVhSqvp5AdrHCjNiVQtaHGtxxZBs8nlq09znimxrJAusTSOdRH WT60ZPaJJbRSwsxeW3nG55T/Njkp7ryKq4rHA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Fp8lXAHYzYx2luxskjHgY8Ta2qy3f0QabYJVBkaRXP4=; b=UJ308SqjbV4FNZOa8mdyc/8pA4644DwbDfrQEAw+ly5Y/COcl1B9YLzt0QBHwfwcSG YovIg2Iel5lsq02CHUT3OhBOUdEanOVAvkQNodBbgW5tUqmG8QQf0igxw3dLXlwH4nLh OqSJefxwYCxTkNbxtnUEajAtsUAnW7cK3+CiEdKiH17lu6Z8MHi0qYqv1FCDwVIp2nF0 XQ5SN9je4eQTPytyXqt2cvp1uTKxKmFUs8pYMksZvJKeAi9jEegboXRSJfWFi3Qj7tF1 Ms3Po362jnvJll5URSzKjmF1CPmFcOYpxte+Vl7iYxit2LRYRNvZnSbZoqKVN61vh4Zr EOhw== X-Gm-Message-State: APt69E2zDDsan9Wz0Q+IVJFhzsOZwLCtLiNDl7Igt/30WUbYVOmyzK1m VUOO3gJyzZajmjZTSUYbI/J+5g== X-Google-Smtp-Source: ADUXVKK3mKuP/J1lMh1bsl6FlAVmdFM9XVHk4lcPsXnM5ShTZ2FD1NLN1QbFStktx1sWeL+KzJ08Kg== X-Received: by 2002:a0c:d895:: with SMTP id q21-v6mr176901qvj.71.1527631161251; Tue, 29 May 2018 14:59:21 -0700 (PDT) Received: from lbrmn-lnxub44-1.ric.broadcom.com ([192.19.228.250]) by smtp.gmail.com with ESMTPSA id a83-v6sm23217073qkb.22.2018.05.29.14.59.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 May 2018 14:59:20 -0700 (PDT) From: Ray Jui To: Lorenzo Pieralisi , Bjorn Helgaas , Rob Herring , Mark Rutland Cc: linux-kernel@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, linux-pci@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Ray Jui Subject: [PATCH 6/6] arm64: dts: Change PCIe INTx mapping for NS2 Date: Tue, 29 May 2018 14:58:50 -0700 Message-Id: <1527631130-20045-7-git-send-email-ray.jui@broadcom.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1527631130-20045-1-git-send-email-ray.jui@broadcom.com> References: <1527631130-20045-1-git-send-email-ray.jui@broadcom.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Change the PCIe INTx mapping to model the 4 INTx interrupts in the IRQ domain of the iProc PCIe controller itself Signed-off-by: Ray Jui --- arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi b/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi index 4a2a6af..0373ebe 100644 --- a/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi +++ b/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi @@ -116,9 +116,14 @@ reg = <0 0x20020000 0 0x1000>; dma-coherent; + interrupt-controller; #interrupt-cells = <1>; - interrupt-map-mask = <0 0 0 0>; - interrupt-map = <0 0 0 0 &gic 0 GIC_SPI 281 IRQ_TYPE_NONE>; + interrupt-map-mask = <0 0 0 7>; + interrupt-map = <0 0 0 1 &pcie0 1>, + <0 0 0 2 &pcie0 2>, + <0 0 0 3 &pcie0 3>, + <0 0 0 4 &pcie0 4>; + interrupts = ; linux,pci-domain = <0>; @@ -147,9 +152,14 @@ reg = <0 0x50020000 0 0x1000>; dma-coherent; + interrupt-controller; #interrupt-cells = <1>; - interrupt-map-mask = <0 0 0 0>; - interrupt-map = <0 0 0 0 &gic 0 GIC_SPI 305 IRQ_TYPE_NONE>; + interrupt-map-mask = <0 0 0 7>; + interrupt-map = <0 0 0 1 &pcie4 1>, + <0 0 0 2 &pcie4 2>, + <0 0 0 3 &pcie4 3>, + <0 0 0 4 &pcie4 4>; + interrupts = ; linux,pci-domain = <4>; @@ -169,7 +179,6 @@ phys = <&pci_phy1>; phy-names = "pcie-phy"; - msi-parent = <&v2m0>; };