From patchwork Thu Sep 7 11:44:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 810980 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="bpLJqGNC"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xnzC23tSkz9t2W for ; Thu, 7 Sep 2017 21:44:46 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755352AbdIGLon (ORCPT ); Thu, 7 Sep 2017 07:44:43 -0400 Received: from mail-lf0-f42.google.com ([209.85.215.42]:33026 "EHLO mail-lf0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755149AbdIGLok (ORCPT ); Thu, 7 Sep 2017 07:44:40 -0400 Received: by mail-lf0-f42.google.com with SMTP id c80so1853788lfh.0 for ; Thu, 07 Sep 2017 04:44:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=RSSjDHTx9mmlbA22cy1ZqflPBPV627ztpoKXV3tRRnQ=; b=bpLJqGNCigoeh+9+ircKIlAiVFhfYV11row8hjsGEwy/u2p+ylL+7LRm7Z8VDvgcSX fGA8etAg4BYU3HEmruxcOUianJdclvdoDAIbA1ic3aoCS5ebNFexICnWrKZ4D3ddnwYE cZVqJPKrfjEARJs6JSeMo4BJRr20GJZqQFoX4= 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; bh=RSSjDHTx9mmlbA22cy1ZqflPBPV627ztpoKXV3tRRnQ=; b=n2RKeQbk8NcPlGz3feKwf8vypfqQvZHczRUxh6MLKn53hSvbOIl6WDYnmTm6P/cdUL qoN23szG1fyi3TLDx3iyZWFMlC7OQAdzQeltUqY7RtpB+mbAgROXmcaX1D1wUcXpAYzt 66L+Gfvd1gRZWxYUKJ4AJ/6K2FhJLLU1PKuKGs2WKja+KrHL4LtBOvVKMq1/eJmAfbTq Pg3XTvaLajgBrTBeEgw0eLIIoCxhIKqQg/hs2pCD0Dnh8nluTJSk3vggM7PCWvwP38vy 76pB+LMBblNs0vjHa/f4om/AicjIhZ2cR4YlFkm04oVav9Rpa63N6r56ULWOdMwJbLsG afHw== X-Gm-Message-State: AHPjjUig2J1/GLaC4CpOjQ3tQcj/8ILWbT1p4EdIu/ap04XWTnOI7tAB aehCb2bbWeESSstb X-Google-Smtp-Source: ADKCNb5NaM7l2uBaboCCfny5oIgmLjO7TVfxB5q5ZyD3N62Ua/qb1dA9vpd/3rId86VRVa3PRxqDwg== X-Received: by 10.46.33.139 with SMTP id h11mr1161936lji.92.1504784678848; Thu, 07 Sep 2017 04:44:38 -0700 (PDT) Received: from genomnajs.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id j1sm370575lfe.82.2017.09.07.04.44.37 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Sep 2017 04:44:38 -0700 (PDT) From: Linus Walleij To: Bjorn Helgaas , Lorenzo Pieralisi , Arnd Bergmann Cc: linux-pci@vger.kernel.org, Linus Walleij Subject: [PATCH 1/2 v3] PCI: v3: Update the device tree bindings Date: Thu, 7 Sep 2017 13:44:30 +0200 Message-Id: <20170907114431.4748-1-linus.walleij@linaro.org> X-Mailer: git-send-email 2.13.5 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org The bindings for the V3 Semiconductor PCI bridge are a tad bit outdated and predates the more formal format we have adopted for the bindings. Update them a bit so it is easier to read, and add the Integrator AP- specific compatible so we can detect that we are running on that specific platform. Add a second register bank for the configuration memory area. The device tree specs does specify a memory range for configuration space but it is not applicable to custom accessors like this. Instead follow the pattern from the Versatile PCI adapter and simply add a second register bank for this memory. Acked-by: Rob Herring Signed-off-by: Linus Walleij --- ChangeLog v2->v3: - Add a second register bank for the config space. - Mention that nonpre and pre memory must be 256MB and adjacent - Make the prefetched and non-prefetched memory mapped 1:1 to the PCI address space so that local bus 0x40000000 and 0x50000000 maps to the *same* local (CPU) bus addresses. - Add reference to dma-ranges and that this is required. - Add an example from the ARM Integrator/AP - Rob ACKed an earlier version, he might want to have a glance at this before merging. ChangeLog v1->v2: - Added Rob's ACK. Bjorn: please merge this when you feel confident with it. --- .../devicetree/bindings/pci/v3-v360epc-pci.txt | 73 +++++++++++++++++++--- 1 file changed, 66 insertions(+), 7 deletions(-) diff --git a/Documentation/devicetree/bindings/pci/v3-v360epc-pci.txt b/Documentation/devicetree/bindings/pci/v3-v360epc-pci.txt index 30b364e504ba..7729295506f5 100644 --- a/Documentation/devicetree/bindings/pci/v3-v360epc-pci.txt +++ b/Documentation/devicetree/bindings/pci/v3-v360epc-pci.txt @@ -2,14 +2,73 @@ V3 Semiconductor V360 EPC PCI bridge This bridge is found in the ARM Integrator/AP (Application Platform) -Integrator-specific notes: +Required properties: +- compatible: should be one of: + "v3,v360epc-pci" + "arm,integrator-ap-pci", "v3,v360epc-pci" +- reg: should contain two register areas: + first the base address of the V3 host bridge controller, 64KB + second the configuration area register space, 16MB +- interrupts: should contain a reference to the V3 error interrupt + as routed on the system. +- ranges: this follows the standard PCI bindings in the IEEE Std + 1275-1994 (see pci.txt) with the following restriction: + - The non-prefetchable and prefetchable memory windows must + each be exactly 256MB (0x10000000) in size. + - The prefetchable memory window must be immediately adjacent + to the non-prefetcable memory window +- dma-ranges: three ranges for the inbound memory region. The ranges must + be aligned to a 1MB boundary, and may be 1MB, 2MB, 4MB, 8MB, 16MB, 32MB, + 64MB, 128MB, 256MB, 512MB, 1GB or 2GB in size. The memory should be marked + as pre-fetchable. Two ranges are supported by the hardware. -- syscon: should contain a link to the syscon device node (since +Integrator-specific required properties: +- syscon: should contain a link to the syscon device node, since on the Integrator, some registers in the syscon are required to - operate the V3). + operate the V3 host bridge. -V360 EPC specific notes: +Example: -- reg: should contain the base address of the V3 adapter. -- interrupts: should contain a reference to the V3 error interrupt - as routed on the system. +pci: pciv3@62000000 { + compatible = "arm,integrator-ap-pci", "v3,v360epc-pci"; + #interrupt-cells = <1>; + #size-cells = <2>; + #address-cells = <3>; + reg = <0x62000000 0x10000>, <0x61000000 0x01000000>; + interrupt-parent = <&pic>; + interrupts = <17>; /* Bus error IRQ */ + clocks = <&pciclk>; + ranges = 0x01000000 0 0x00000000 /* I/O space @00000000 */ + 0x60000000 0 0x01000000 /* 16 MiB @ LB 60000000 */ + 0x02000000 0 0x40000000 /* non-prefectable memory @40000000 */ + 0x40000000 0 0x10000000 /* 256 MiB @ LB 40000000 1:1 */ + 0x42000000 0 0x50000000 /* prefetchable memory @50000000 */ + 0x50000000 0 0x10000000>; /* 256 MiB @ LB 50000000 1:1 */ + dma-ranges = <0x02000000 0 0x20000000 /* EBI memory space */ + 0x20000000 0 0x20000000 /* 512 MB @ LB 20000000 1:1 */ + 0x02000000 0 0x80000000 /* Core module alias memory */ + 0x80000000 0 0x40000000>; /* 1GB @ LB 80000000 */ + interrupt-map-mask = <0xf800 0 0 0x7>; + interrupt-map = < + /* IDSEL 9 */ + 0x4800 0 0 1 &pic 13 /* INT A on slot 9 is irq 13 */ + 0x4800 0 0 2 &pic 14 /* INT B on slot 9 is irq 14 */ + 0x4800 0 0 3 &pic 15 /* INT C on slot 9 is irq 15 */ + 0x4800 0 0 4 &pic 16 /* INT D on slot 9 is irq 16 */ + /* IDSEL 10 */ + 0x5000 0 0 1 &pic 14 /* INT A on slot 10 is irq 14 */ + 0x5000 0 0 2 &pic 15 /* INT B on slot 10 is irq 15 */ + 0x5000 0 0 3 &pic 16 /* INT C on slot 10 is irq 16 */ + 0x5000 0 0 4 &pic 13 /* INT D on slot 10 is irq 13 */ + /* IDSEL 11 */ + 0x5800 0 0 1 &pic 15 /* INT A on slot 11 is irq 15 */ + 0x5800 0 0 2 &pic 16 /* INT B on slot 11 is irq 16 */ + 0x5800 0 0 3 &pic 13 /* INT C on slot 11 is irq 13 */ + 0x5800 0 0 4 &pic 14 /* INT D on slot 11 is irq 14 */ + /* IDSEL 12 */ + 0x6000 0 0 1 &pic 16 /* INT A on slot 12 is irq 16 */ + 0x6000 0 0 2 &pic 13 /* INT B on slot 12 is irq 13 */ + 0x6000 0 0 3 &pic 14 /* INT C on slot 12 is irq 14 */ + 0x6000 0 0 4 &pic 15 /* INT D on slot 12 is irq 15 */ + >; +};