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: 10437207 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 708BD604D4 for ; Tue, 29 May 2018 22:01:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5CD482886B for ; Tue, 29 May 2018 22:01:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 510D2288E8; Tue, 29 May 2018 22:01:42 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B187C2886B for ; Tue, 29 May 2018 22:01:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=l6Rwo8QeMdIY9np9APhx+kt88CJQLCABUn68fq6eN5g=; b=gvkKcyS6cAIYzWxUWjb1NvlCME d9TyyU+in+yPp2MZ1wYcs/3wmB+SGH2+kwx55F0kzSbn9wBx8NExG1wxTRADpu9JpaBxOZl+Hhzq6 NZEjY4Vj2NtUk4Jbz8gMZixBNs/RUX6GmRG0/rNTKlcxGKIrn4cPEsevjR8lLjZ7sOW6SEbEv+aZ6 8lSe6zCVJzv4H2Hz07IV0vqGmXntEl9gn+G1S6AKSO6Ip/rDQw82qvMQL6owDU6Kg8j6N4vgHc76c sm9Lsi3wFwCuPwQd3KigeSdxl3sJzNCwanFUuBxz+qR4fwyzBC8SuNKt9NJ6bGKf/3yvF96q37fA0 NDsZy/jQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fNmgN-0000ur-DN; Tue, 29 May 2018 22:01:31 +0000 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fNmeS-0006wK-8I for linux-arm-kernel@lists.infradead.org; Tue, 29 May 2018 21:59:44 +0000 Received: by mail-qt0-x242.google.com with SMTP id j1-v6so20745203qtp.2 for ; Tue, 29 May 2018 14:59:22 -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=d7pp/lVlsSe0RWKDsB8Y14QlpROXu0jg4zDgky8uxtuEkhHLoQbMBV83T3a4BJUkUH zutDxJIsHRRGXm5QMAJmUllLjuryltwXA4pa1UIzrTNFIhc7+i6ldJ7RC5jKWJMHLksZ QTvg1OKJPMf7UJk1fqRgvRX+awz3vMilOI3+nrRz/+HDHlkmTjpY1UAUrSv7lF7xDRmH fDWVcW69zSDjkLU2WMdR5MgDNrQy/iWW6ZVZO/R1Oz6P9G1nboRMSyhjvIPJl/6VT3cP VIzZ5F4aVNgmYiPJoGtbYXR/H1zVgo1M1iI23/gMO2Quwi0mBc1MeYz1wKh2eMQZWpvi RZ2A== X-Gm-Message-State: APt69E39z831HRYtjJeTlYNAMrWHbu4AxaO28G4mYHAAQ+Bgcpvj9AAV I6gvADtayujMVHvvXnwS5mg9QQ== 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180529_145932_337927_B2B551B3 X-CRM114-Status: GOOD ( 13.93 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Ray Jui , bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.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>; };