From patchwork Wed Jul 31 22:28: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: 13749311 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 AEEAFC3DA64 for ; Wed, 31 Jul 2024 22:35:52 +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:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=48kNXVxTxIS1qqb8DRwWYkv7S1xxdo30DtPId8NrWW4=; b=VUzh50/EehFwNHyMlKGDkXLJjN 4ELUFcVVSBFwmw/DSNwKAhXv6M8bIf7abAvqKC2WBbO/DWZy2fI+sfizgL+m3TJnOWVdvtKfhux4S svN9/Lhk19CfzwF2z/DTlqkiuwExXN4U4AtQTg3z4oqgDDXxjgukb32vrGUEuA/6L0ctofBM6+CwB EZc+uZ+RONXOfqZXqby8cj1I6y/xfP+ULoLdnzfZqaHrvkE5GLKA0yKUTg/gIqNWJWmBzTJ7yCuv2 KDpeT/dnRBqd1UA717wwRPV3mJYRsMhyOAiT3URnjoC4nQPBdUsM+ee9HIlPHxKejSBjd64m3XqYf Ao1w6+vQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sZHv5-00000002jSs-3wMi; Wed, 31 Jul 2024 22:35:43 +0000 Received: from mail-ot1-x32e.google.com ([2607:f8b0:4864:20::32e]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sZHoU-00000002ha7-2IZp for linux-arm-kernel@lists.infradead.org; Wed, 31 Jul 2024 22:28:56 +0000 Received: by mail-ot1-x32e.google.com with SMTP id 46e09a7af769-70944dc8dc6so3221128a34.3 for ; Wed, 31 Jul 2024 15:28:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1722464933; x=1723069733; 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=48kNXVxTxIS1qqb8DRwWYkv7S1xxdo30DtPId8NrWW4=; b=ZVcBpTvC4n/xTht0+GXUEJHJn0pnjOHvOXiWOVM21LsASL+AoYmVBoUM9XHPmJqzQq 2qpTZxzDzvI1EMNXBmfDQcrkN3g9kCdY2Z2rHmHWyFFTg+2dzEoxziGAXsu65t8XqC+L j8afmKGc5KPwWr3UxtCaEBKzTptA67dWHl050= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722464933; x=1723069733; 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=48kNXVxTxIS1qqb8DRwWYkv7S1xxdo30DtPId8NrWW4=; b=p8Z/KOkDGZyFfLcd8Ac6CTYF4TOBVhpZWu8nzCLt+oIvm9EGb4UYQVGKQrManxKzwM Saf6gu/ZilPZg8bzLMMyEgX63xhXdOVByiohyEOtAHCx7m8UY4sdC9g9qsKT1FnOe+lj NYdxlRgocTCuafswwaXeJ3z55F0So1OXfRTdtEM/rKCv36S6G+K4zXtMEEq2/TsXmh3k v4daqUo+SjAcwnD4dbNUZjeyD3plSnYwlkwksvnd3+oHsTWIndv6iPVQY5BWoXFUx3V6 W3DDMlZF44ek4W9Dvkb1JuYvxGZgsO9an87EVIgSL0i+1pEe/706yN/3mDc8RE3lbl88 Rezg== X-Forwarded-Encrypted: i=1; AJvYcCXK89iPbTmPYCzAyy9Op5JU0lwgeh1yqYz2AU1gexcv//8mgyb/i4ptKbhsOmKsmZGNreczv5Kilxh28eHlzHoQO8Mb6WS72FX6z1FRquaIvUdtfm0= X-Gm-Message-State: AOJu0YzERtSl+p+sOadkX4vF8gMQNJaZP8m2l+3HjCFwRMTfHmJ6DRPG R+o188p9/aAaU77WLXHThIYkuDM3soSOX3IymjcnvA0KZSw5cpgcuJtO/fREzQ== X-Google-Smtp-Source: AGHT+IG0HTaGPAQVkMi4hiaQmCdPYjlys/O4jVp+HDfUjEJVYYKtUw47a6LfeJvzWSfPWDUXJnJ9nw== X-Received: by 2002:a05:6830:2a8d:b0:704:3fea:5354 with SMTP id 46e09a7af769-7096b80ab4fmr546436a34.10.1722464933013; Wed, 31 Jul 2024 15:28:53 -0700 (PDT) Received: from stbsrv-and-01.and.broadcom.net ([192.19.144.250]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-44fe8416c80sm62359181cf.96.2024.07.31.15.28.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Jul 2024 15:28:52 -0700 (PDT) From: Jim Quinlan To: linux-pci@vger.kernel.org, Nicolas Saenz Julienne , Bjorn Helgaas , Lorenzo Pieralisi , Cyril Brulebois , Stanimir Varbanov , Manivannan Sadhasivam , 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 v5 12/12] PCI: brcmstb: Enable 7712 SOCs Date: Wed, 31 Jul 2024 18:28:26 -0400 Message-Id: <20240731222831.14895-13-james.quinlan@broadcom.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240731222831.14895-1-james.quinlan@broadcom.com> References: <20240731222831.14895-1-james.quinlan@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240731_152854_762668_32F57000 X-CRM114-Status: GOOD ( 14.18 ) 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). It has one PCIe controller with a single port, supports gen2 and one lane only. The current revision of the chip is "C0" or "C1". Signed-off-by: Jim Quinlan Reviewed-by: Stanimir Varbanov Reviewed-by: Florian Fainelli Reviewed-by: Manivannan Sadhasivam --- 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 4623b70f9ad8..44b323a13357 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -1202,6 +1202,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->soc_base == BCM7712) + return; + /* Each unit in timeout register is 1/216,000,000 seconds */ writel(216 * timeout_us, pcie->base + REG_OFFSET); } @@ -1673,6 +1677,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, .soc_base = GENERIC, @@ -1738,6 +1749,14 @@ static const struct pcie_cfg_data bcm7216_cfg = { .num_inbound_wins = 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, + .soc_base = BCM7712, + .num_inbound_wins = 10, +}; + static const struct of_device_id brcm_pcie_match[] = { { .compatible = "brcm,bcm2711-pcie", .data = &bcm2711_cfg }, { .compatible = "brcm,bcm4908-pcie", .data = &bcm4908_cfg }, @@ -1747,6 +1766,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 }, {}, };