From patchwork Mon Nov 30 08:32:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 11939911 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 16B51C64E8A for ; Mon, 30 Nov 2020 08:33:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BC0572085B for ; Mon, 30 Nov 2020 08:33:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="b5RN6gP3" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727768AbgK3Idf (ORCPT ); Mon, 30 Nov 2020 03:33:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48522 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727094AbgK3Idf (ORCPT ); Mon, 30 Nov 2020 03:33:35 -0500 Received: from mail-lf1-x143.google.com (mail-lf1-x143.google.com [IPv6:2a00:1450:4864:20::143]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 95222C0613D3; Mon, 30 Nov 2020 00:32:54 -0800 (PST) Received: by mail-lf1-x143.google.com with SMTP id l11so19926488lfg.0; Mon, 30 Nov 2020 00:32:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xQaTKjIL7uyY8gr0YDIKGL8MjTlRYaLcoibNbpV+CJ0=; b=b5RN6gP3m+uJd0q3dvPRkDzT2BSNvQcu8NuQynWalyH5PL7FRyMhmoxf9zu/4H5TfT BSXDqh2vpo8tUq4FPg9nfnDSUXBW7y0mp81Wk9r5KUv7xWX4h7vrl0At0PCmEgBTdwIC DwYaAqJwuo+qV86PDGrkoIUF9YQuLUcsG2MUclN8nZoHxY9T2Np2Sag8rTLZIywOXA3Q Qy8tofrCA7mbqRDejQ3mmomI5mA6Yen63f8IrP09KBXOlUeJ/ZZB09DoHlidEfSqcr4o tDZVTwgOvEZMAehaYo5eOXq848lYYmsm119SkIlss9VrbpVtmb7j4MUUGKQk/+HgyzU0 iU/g== 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:mime-version:content-transfer-encoding; bh=xQaTKjIL7uyY8gr0YDIKGL8MjTlRYaLcoibNbpV+CJ0=; b=tC3Gt8slm7XerbxUN/SX8qUwESvt39zKGwZzVajJMUTpJwatRgOXwzVaf5wkS3atn/ nmnTlhei3573ZTR3JQW0AdwFQ+H3oNRco3rUZwGQbn0HGZRGXSinbdv4qq/zlp+tswuv ufNMx7VH8yYcVOE1YfpErGhNbvN1qgFbX7HR3/Ld3WcpUEpV+O5mzops3fHH7cwWpU2o qkrO695aJASVOjBBbqEYxas1S1VRWb+KCkBSPeIsy52oXEwt6VmCIxMPimkqJpEf4C16 yroKJaPJ7X/ii7lXRmT4BTpDFwc/cdqv2PP/+idITzVwv4wjnyZDMjHbYE6GykLjakzx buaA== X-Gm-Message-State: AOAM530u9vEFvZOeYm22YsZR6kpyB1EJT7a4+Sx6RjQ7wZXfIOvSn1D+ VuXZ9VYkm4PucXC90yn28bg= X-Google-Smtp-Source: ABdhPJyAlEj1+97dD1IxP38BidZhTYxYqRjQz0V0/zWT559D4PacHJzAGdZ1PLwaNnR8Qq1+JJjW7g== X-Received: by 2002:ac2:46f3:: with SMTP id q19mr8620909lfo.76.1606725173075; Mon, 30 Nov 2020 00:32:53 -0800 (PST) Received: from elitebook.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id y81sm2355420lfc.100.2020.11.30.00.32.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Nov 2020 00:32:52 -0800 (PST) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= To: Lorenzo Pieralisi Cc: Bjorn Helgaas , Rob Herring , linux-pci@vger.kernel.org, devicetree@vger.kernel.org, Florian Fainelli , Nicolas Saenz Julienne , Philipp Zabel , linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, bcm-kernel-feedback-list@broadcom.com, =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= Subject: [PATCH V2 1/2] dt-bindings: PCI: brcmstb: add BCM4908 binding Date: Mon, 30 Nov 2020 09:32:22 +0100 Message-Id: <20201130083223.32594-2-zajec5@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201130083223.32594-1-zajec5@gmail.com> References: <20201130083223.32594-1-zajec5@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Rafał Miłecki BCM4908 is a SoC family with PCIe controller sharing design with the one for STB. BCM4908 has different power management and memory controller so few tweaks are required. PERST# signal on BCM4908 is handled by an external MISC block so it needs specifying a reset phandle. Signed-off-by: Rafał Miłecki Acked-by: Florian Fainelli --- .../bindings/pci/brcm,stb-pcie.yaml | 30 +++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml b/Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml index 807694b4f41f..d3ab9e22f97c 100644 --- a/Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml +++ b/Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml @@ -14,6 +14,7 @@ properties: items: - enum: - brcm,bcm2711-pcie # The Raspberry Pi 4 + - brcm,bcm4908-pcie - brcm,bcm7211-pcie # Broadcom STB version of RPi4 - brcm,bcm7278-pcie # Broadcom 7278 Arm - brcm,bcm7216-pcie # Broadcom 7216 Arm @@ -64,8 +65,6 @@ properties: aspm-no-l0s: true resets: - description: for "brcm,bcm7216-pcie", must be a valid reset - phandle pointing to the RESCAL reset controller provider node. $ref: "/schemas/types.yaml#/definitions/phandle" reset-names: @@ -98,12 +97,39 @@ required: allOf: - $ref: /schemas/pci/pci-bus.yaml# + - if: + properties: + compatible: + contains: + const: brcm,bcm4908-pcie + then: + properties: + resets: + items: + - description: reset controller handling the PERST# signal + + reset-names: + items: + - const: perst + + required: + - resets + - reset-names - if: properties: compatible: contains: const: brcm,bcm7216-pcie then: + properties: + resets: + items: + - description: phandle pointing to the RESCAL reset controller + + reset-names: + items: + - const: rescal + required: - resets - reset-names From patchwork Mon Nov 30 08:32:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 11939913 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2C348C71155 for ; Mon, 30 Nov 2020 08:33:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CAC0D208DB for ; Mon, 30 Nov 2020 08:33:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WJ5AxPuY" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727781AbgK3Idi (ORCPT ); Mon, 30 Nov 2020 03:33:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48530 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726950AbgK3Idh (ORCPT ); Mon, 30 Nov 2020 03:33:37 -0500 Received: from mail-lj1-x231.google.com (mail-lj1-x231.google.com [IPv6:2a00:1450:4864:20::231]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 268EEC0613D4; Mon, 30 Nov 2020 00:32:57 -0800 (PST) Received: by mail-lj1-x231.google.com with SMTP id y10so16472995ljc.7; Mon, 30 Nov 2020 00:32:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HyXbdo2hXDjhZebrj1MjXRgu3sgvcOhu5l8NPDQBwRI=; b=WJ5AxPuYwLEAJRDdmAsTi8cZHbG2C1sDtyObblBhGXjJJFHcpe6gjSskGed2AgSZdp d3YXocVCwGt8ep0xsYgz+r91onJh4GnwdmcK/6L1TlxZpzqb8RToXnYBQAEaHS8EWiwy QXslelUKLHG8HoMC0RxM97yiEW4aQe9sJmwBYt/xFvgB2p3S7sH/vlvebBW0C8a6G5LH Ljvv7PbpnTg2YjPL6Jv0TXjXC9Of2SA9M5cVmWUCJ+9l2YXrGc7sjXoIHpBCfPtXya+L uddgtiygw7Gs3KtO/cTNZBILyXLw8dBtFd1pfN3tSb+Zt7V3BpqFBtdessu5Ml1zKm/W LOYQ== 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:mime-version:content-transfer-encoding; bh=HyXbdo2hXDjhZebrj1MjXRgu3sgvcOhu5l8NPDQBwRI=; b=OGCGVCCecIbFlAfpwocVRm57zvjhqeUkZ5ycS13pXlPF8DApBdFUUW78wJHIbooqmt sa2rM3rfUwSvb/cNXfr1IzOuPmA6FoaRwiAYzi49COlf39+znSLWist+I6hDhfalqQ17 C4/zRNdjcxKfq8DitHrbSlYYCD/dAj84Ma45S8yfMaEX5ZVjAk/rs8rq0XgxsScDQAQk vs5x+6KYbppdzIvJadG0MSQiI3PCV9m+KxKL0X5kNXX/BFFGFzBsAQ+d2L4pDUwxtnLZ OfpzYaAGFHkQz9SOw5ibJpEvbA9emOQrwzMNmy74xKePfkwJb+wsnjuMdnY99n6vTcrU YSiw== X-Gm-Message-State: AOAM530mcS9KNDbJkrSO0SY9Btrmclzyi/W6wZ1m2Hf8UTrloXY8rYZW szVuThRSemOwq+XWpY+xwLFHiRYIkTE= X-Google-Smtp-Source: ABdhPJy6IT6LoolcCk/kaXobihraCsDZDLQCY0VHa91NksmJz9Ctv3qa0cg9dS2PCZswndkINvIVQQ== X-Received: by 2002:a05:651c:c7:: with SMTP id 7mr8636307ljr.116.1606725175530; Mon, 30 Nov 2020 00:32:55 -0800 (PST) Received: from elitebook.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id y81sm2355420lfc.100.2020.11.30.00.32.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Nov 2020 00:32:54 -0800 (PST) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= To: Lorenzo Pieralisi Cc: Bjorn Helgaas , Rob Herring , linux-pci@vger.kernel.org, devicetree@vger.kernel.org, Florian Fainelli , Nicolas Saenz Julienne , Philipp Zabel , linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, bcm-kernel-feedback-list@broadcom.com, =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= Subject: [PATCH V2 2/2] PCI: brcmstb: support BCM4908 with external PERST# signal controller Date: Mon, 30 Nov 2020 09:32:23 +0100 Message-Id: <20201130083223.32594-3-zajec5@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201130083223.32594-1-zajec5@gmail.com> References: <20201130083223.32594-1-zajec5@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Rafał Miłecki BCM4908 uses external MISC block for controlling PERST# signal. Use it as a reset controller. Signed-off-by: Rafał Miłecki Acked-by: Florian Fainelli Acked-by: Florian Fainelli --- V2: Reorder BCM4908 in the enum pcie_type Use devm_reset_control_get_optional_exclusive() Don't move hw_rev read up in the code --- drivers/pci/controller/Kconfig | 2 +- drivers/pci/controller/pcie-brcmstb.c | 32 +++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/drivers/pci/controller/Kconfig b/drivers/pci/controller/Kconfig index 64e2f5e379aa..d44c70bb88f6 100644 --- a/drivers/pci/controller/Kconfig +++ b/drivers/pci/controller/Kconfig @@ -273,7 +273,7 @@ config VMD config PCIE_BRCMSTB tristate "Broadcom Brcmstb PCIe host controller" - depends on ARCH_BRCMSTB || ARCH_BCM2835 || COMPILE_TEST + depends on ARCH_BRCMSTB || ARCH_BCM2835 || ARCH_BCM4908 || COMPILE_TEST depends on OF depends on PCI_MSI_IRQ_DOMAIN default ARCH_BRCMSTB diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c index 9c3d2982248d..98536cf3af58 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -96,6 +96,7 @@ #define PCIE_MISC_REVISION 0x406c #define BRCM_PCIE_HW_REV_33 0x0303 +#define BRCM_PCIE_HW_REV_3_20 0x0320 #define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_LIMIT 0x4070 #define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_LIMIT_LIMIT_MASK 0xfff00000 @@ -190,6 +191,7 @@ struct brcm_pcie; static inline void brcm_pcie_bridge_sw_init_set_7278(struct brcm_pcie *pcie, u32 val); static inline void brcm_pcie_bridge_sw_init_set_generic(struct brcm_pcie *pcie, u32 val); +static inline void brcm_pcie_perst_set_4908(struct brcm_pcie *pcie, u32 val); static inline void brcm_pcie_perst_set_7278(struct brcm_pcie *pcie, u32 val); static inline void brcm_pcie_perst_set_generic(struct brcm_pcie *pcie, u32 val); @@ -206,6 +208,7 @@ enum { enum pcie_type { GENERIC, + BCM4908, BCM7278, BCM2711, }; @@ -230,6 +233,13 @@ static const struct pcie_cfg_data generic_cfg = { .bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic, }; +static const struct pcie_cfg_data bcm4908_cfg = { + .offsets = pcie_offsets, + .type = BCM4908, + .perst_set = brcm_pcie_perst_set_4908, + .bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic, +}; + static const int pcie_offset_bcm7278[] = { [RGR1_SW_INIT_1] = 0xc010, [EXT_CFG_INDEX] = 0x9000, @@ -282,6 +292,7 @@ struct brcm_pcie { const int *reg_offsets; enum pcie_type type; struct reset_control *rescal; + struct reset_control *perst_reset; int num_memc; u64 memc_size[PCIE_BRCM_MAX_MEMC]; u32 hw_rev; @@ -747,6 +758,17 @@ static inline void brcm_pcie_bridge_sw_init_set_7278(struct brcm_pcie *pcie, u32 writel(tmp, pcie->base + PCIE_RGR1_SW_INIT_1(pcie)); } +static inline void brcm_pcie_perst_set_4908(struct brcm_pcie *pcie, u32 val) +{ + if (WARN_ONCE(!pcie->perst_reset, "missing PERST# reset controller\n")) + return; + + if (val) + reset_control_assert(pcie->perst_reset); + else + reset_control_deassert(pcie->perst_reset); +} + static inline void brcm_pcie_perst_set_7278(struct brcm_pcie *pcie, u32 val) { u32 tmp; @@ -1206,6 +1228,7 @@ static int brcm_pcie_remove(struct platform_device *pdev) static const struct of_device_id brcm_pcie_match[] = { { .compatible = "brcm,bcm2711-pcie", .data = &bcm2711_cfg }, + { .compatible = "brcm,bcm4908-pcie", .data = &bcm4908_cfg }, { .compatible = "brcm,bcm7211-pcie", .data = &generic_cfg }, { .compatible = "brcm,bcm7278-pcie", .data = &bcm7278_cfg }, { .compatible = "brcm,bcm7216-pcie", .data = &bcm7278_cfg }, @@ -1262,6 +1285,11 @@ static int brcm_pcie_probe(struct platform_device *pdev) clk_disable_unprepare(pcie->clk); return PTR_ERR(pcie->rescal); } + pcie->perst_reset = devm_reset_control_get_optional_exclusive(&pdev->dev, "perst"); + if (IS_ERR(pcie->perst_reset)) { + clk_disable_unprepare(pcie->clk); + return PTR_ERR(pcie->perst_reset); + } ret = reset_control_deassert(pcie->rescal); if (ret) @@ -1279,6 +1307,10 @@ static int brcm_pcie_probe(struct platform_device *pdev) goto fail; pcie->hw_rev = readl(pcie->base + PCIE_MISC_REVISION); + if (pcie->type == BCM4908 && pcie->hw_rev >= BRCM_PCIE_HW_REV_3_20) { + dev_err(pcie->dev, "hardware revision with unsupported PERST# setup\n"); + goto fail; + } msi_np = of_parse_phandle(pcie->np, "msi-parent", 0); if (pci_msi_enabled() && msi_np == pcie->np) {