From patchwork Wed Jul 10 22:16:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Quinlan X-Patchwork-Id: 13729780 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 59293C3DA42 for ; Wed, 10 Jul 2024 22:21:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Reply-To:MIME-Version: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=qO2gJqfvqzGpRuVqmN6pskTDvNyWo2lOUU2fMPKmKpA=; b=sU/ayVsjr7jrc+qeGbXTZdsDdn UgKpFoxSkhOXN/nJYU4ivtypoJTxDHBS1fvuzmiRXuvsGoJ7M8wBNotYO7yihEEvwdDj+6IBsxFHF KTL2gaHCYPo7RJzW77npCbmSqvIawJeByHJlmWRtUZkqtGVah92nbBzwR7TJpc9q2xW5IQLpnY7JH NVdAiGJq0GRWsrEIZuJaf9hk3MaQ6/mqMyDORft2vpQOaXj4MOsEwUJTMe65rpwVXpYmHWK0WVFj5 juntNjnbhbPraccNYPjbXGstakIO007zenkv1YC7Eh9RX68zQgPDb+HkkFw7ii/HLPaRQtskt5Q6j O32y3SPA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sRfgE-0000000Bvjx-0U9O; Wed, 10 Jul 2024 22:20:54 +0000 Received: from mail-qk1-x72c.google.com ([2607:f8b0:4864:20::72c]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sRfcN-0000000Bu3V-2tOD for linux-arm-kernel@lists.infradead.org; Wed, 10 Jul 2024 22:16:57 +0000 Received: by mail-qk1-x72c.google.com with SMTP id af79cd13be357-7a05b7c8e38so16758885a.0 for ; Wed, 10 Jul 2024 15:16:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1720649814; x=1721254614; darn=lists.infradead.org; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=qO2gJqfvqzGpRuVqmN6pskTDvNyWo2lOUU2fMPKmKpA=; b=hIakqOhcmbkRnNgueXDsBGdYOgk2aW3uV/GuQbTzXzNNZVS3uCkWWXGuyNNKiZcpLT Jj7ZvcBceZK5LoqFqo9/6aOOKkpbqyiDRdYhqE3nhm3QVRsMXlpE5imV42IB5aNUtkvj 0yIdy4b4QkkZTbJdsjrcBzOJCDx3nhfWEc8sU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720649814; x=1721254614; h=references:in-reply-to:message-id:date:subject:cc:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=qO2gJqfvqzGpRuVqmN6pskTDvNyWo2lOUU2fMPKmKpA=; b=aTNvUYFldqs8DOecDVBphvfLCfXqG+3axq4h/In6vw2crT1Z9t/kLpjmpnnrgpk6iS jSZtJaR5fcFa5P+opqPLhNEFoyuA3W23GcWORhdww7Ug0xNpqtQcI1T6uBWPM53ZFFMz CUCuGQj8DfQjzf0S0iAd6+Ax1d/suB7yixR9c69AlIzlknR02o0z3QVb7p1Ef6d8JyEe o6bHXKULF+eCejGtMMe9wZycvEBSVLvlbDW1SDDOxLUortTVnPRapXdwuUCHTJjgBgED yCP27qfTtmrWSiUu2mLnFNRXo1B3TNhCv56FjanJP41jB/vtr3aEuJcSj9fwi3O9LPjB 169w== X-Forwarded-Encrypted: i=1; AJvYcCVwxpg9nO++4wExoyaJYckExxS6+0v5lIAZpxaFiPNM4IafFEaec7q8DBWwYMsuw8ZJ2cmJPdK8pJsbVeZCpIM0nJTKr3000nZRd/Tz5MAcu/cO2ek= X-Gm-Message-State: AOJu0Yyda59PVtx41dK8Xgnfr6Y57Yj8c6obwTJ6z2wDxNMTntIIzc1h Jh9yYEZgX4kdFTo1JKdN3Yonhy1aT/0mInBX29+tnnYiNFN0XOiJZ9/fwFdfkw== X-Google-Smtp-Source: AGHT+IEtvfgftukcEuMP8g+teSoGXWxp4LtmlU5wcExPt32R4L59Qk3fQiOR4w8Ur6sm+YF1IKLsUQ== X-Received: by 2002:a05:6214:482:b0:6b0:76e8:921f with SMTP id 6a1803df08f44-6b61c21354dmr83964016d6.60.1720649814001; Wed, 10 Jul 2024 15:16:54 -0700 (PDT) Received: from stbsrv-and-01.and.broadcom.net ([192.19.144.250]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b61ba04c16sm20182326d6.60.2024.07.10.15.16.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jul 2024 15:16:53 -0700 (PDT) From: Jim Quinlan To: linux-pci@vger.kernel.org, Nicolas Saenz Julienne , Bjorn Helgaas , Lorenzo Pieralisi , Cyril Brulebois , Stanimir Varbanov , Krzysztof Kozlowski , bcm-kernel-feedback-list@broadcom.com, jim2101024@gmail.com, james.quinlan@broadcom.com Cc: Florian Fainelli , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , Rob Herring , linux-rpi-kernel@lists.infradead.org (moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE), linux-arm-kernel@lists.infradead.org (moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v3 12/12] PCI: brcmstb: Enable 7712 SOCs Date: Wed, 10 Jul 2024 18:16:26 -0400 Message-Id: <20240710221630.29561-13-james.quinlan@broadcom.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240710221630.29561-1-james.quinlan@broadcom.com> References: <20240710221630.29561-1-james.quinlan@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240710_151655_792848_0C4D701F X-CRM114-Status: GOOD ( 12.22 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The Broadcom STB 7712 is the sibling chip of the RPi 5 (2712). Signed-off-by: Jim Quinlan Reviewed-by: Stanimir Varbanov Reviewed-by: Florian Fainelli --- drivers/pci/controller/pcie-brcmstb.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c index b6b21e0a56a8..3bc6b49227fe 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -1192,6 +1192,10 @@ static void brcm_extend_rbus_timeout(struct brcm_pcie *pcie) const unsigned int REG_OFFSET = PCIE_RGR1_SW_INIT_1(pcie) - 8; u32 timeout_us = 4000000; /* 4 seconds, our setting for L1SS */ + /* 7712 does not have this (RGR1) timer */ + if (pcie->model == BCM7712) + return; + /* Each unit in timeout register is 1/216,000,000 seconds */ writel(216 * timeout_us, pcie->base + REG_OFFSET); } @@ -1663,6 +1667,13 @@ static const int pcie_offsets_bmips_7425[] = { [PCIE_INTR2_CPU_BASE] = 0x4300, }; +static const int pcie_offset_bcm7712[] = { + [EXT_CFG_INDEX] = 0x9000, + [EXT_CFG_DATA] = 0x9004, + [PCIE_HARD_DEBUG] = 0x4304, + [PCIE_INTR2_CPU_BASE] = 0x4400, +}; + static const struct pcie_cfg_data generic_cfg = { .offsets = pcie_offsets, .model = GENERIC, @@ -1728,6 +1739,14 @@ static const struct pcie_cfg_data bcm7216_cfg = { .num_inbound = 3, }; +static const struct pcie_cfg_data bcm7712_cfg = { + .offsets = pcie_offset_bcm7712, + .perst_set = brcm_pcie_perst_set_7278, + .bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic, + .model = BCM7712, + .num_inbound = 10, +}; + static const struct of_device_id brcm_pcie_match[] = { { .compatible = "brcm,bcm2711-pcie", .data = &bcm2711_cfg }, { .compatible = "brcm,bcm4908-pcie", .data = &bcm4908_cfg }, @@ -1737,6 +1756,7 @@ static const struct of_device_id brcm_pcie_match[] = { { .compatible = "brcm,bcm7445-pcie", .data = &generic_cfg }, { .compatible = "brcm,bcm7435-pcie", .data = &bcm7435_cfg }, { .compatible = "brcm,bcm7425-pcie", .data = &bcm7425_cfg }, + { .compatible = "brcm,bcm7712-pcie", .data = &bcm7712_cfg }, {}, };