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: 1959047 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=broadcom.com header.i=@broadcom.com header.a=rsa-sha256 header.s=google header.b=GOEJEKRk; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=147.75.199.223; helo=ny.mirrors.kernel.org; envelope-from=linux-pci+bounces-10123-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org [147.75.199.223]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WKC2l2mvwz1xqr for ; Thu, 11 Jul 2024 08:19:43 +1000 (AEST) Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 4469C1C23666 for ; Wed, 10 Jul 2024 22:19:41 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2633715ECE9; Wed, 10 Jul 2024 22:16:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="GOEJEKRk" X-Original-To: linux-pci@vger.kernel.org Received: from mail-qv1-f52.google.com (mail-qv1-f52.google.com [209.85.219.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 72C9915ECC5 for ; Wed, 10 Jul 2024 22:16:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720649817; cv=none; b=uFnQosqWtXomStLKKHwqiiJ0ya/GbhmxH95voOLF5+dgW1TjfyECH0uXEr11ciRBkLWudRTCgLkBFoWUa0LIF3mj1y4neymHVW/WjpbR7NcU8XByMTA80fvlCP9l82Ohd27paB2b9XIUs3BqRjdd1uvzcgmmlom87xFUonNh5ws= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720649817; c=relaxed/simple; bh=3xZVM/uJSviCpzE0wPUGUMjnob5o5oFwgNuvHTotwPU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type; b=a1M8LFPvkh9G/zpun5XqzSVPPqpRGp6dhcGrZs06b4eCv/LU7xKpfB/7ZAIPBlCskASI4jmn5zpncf/TjDTLQZuJgNP6cCwnh0Uv/9zzW4gxaAW8U1wLseQVOM2cuRaQ7In/ccn1AS6jof01S/CdfCEbebdHK80AoO21DXVlC34= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=GOEJEKRk; arc=none smtp.client-ip=209.85.219.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Received: by mail-qv1-f52.google.com with SMTP id 6a1803df08f44-6b5d6ba7c90so1591156d6.1 for ; Wed, 10 Jul 2024 15:16:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1720649814; x=1721254614; darn=vger.kernel.org; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=hYqi9NW405GZQlkF3jz4AV5VONl8JK1RgbEjm7x/Rn8=; b=GOEJEKRkxU20fvK+6Y730/hl4n2HZQFbxvtv1h8qJMP2ioHww7gRatJgY4YJVhXRKJ oaB2m+673nFytCy80+buFcNZXJDWpV1IJZYzzmVz8CQJyYzAtgwamy254oopZJ+kQ50U zvJgZxr1aCJtMiWvd1IB1XE6k166e8fo+OyUw= 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=hYqi9NW405GZQlkF3jz4AV5VONl8JK1RgbEjm7x/Rn8=; b=CX3Dyl5y0nlYc9S1MCLNCS0Aa1CiC4Ri7peNSvNihL6XtUT8vFUSFv4J8f9yTwLZVV xK1v9Yjc++uPT3OjXOpoX/OnRyeg3oDQK/78fslK7/luHGCKwui+umIFvvNZRGnxSKvF khrYp5gn/EzVbDP52pEZ7+sfZwghycJlvD76DKIrDEI4DPNZSfYWyD1hORMN5wv5UlmM CjIvgq+UXAcEzL3PFCsijCWSIxZgxp+AjHfNPy4P4pBIa68LLrI6Yq5Dn2w4zYvZSjkR UWVbFPdLaOAOyVkEioEX5M/8o68VJkzp6xoBaNxrRLo+bzr1y6vcEvYJ7YWpCDk6qHFu JgEg== X-Gm-Message-State: AOJu0YxjDsWH7lTptYtSA0Mj8gAVYLbOFHmvepmmZd33IgTZKmEKNhhn mpK6a7mEXuFnAizR6Yu3JvUwRVmI9iPkGTUXAXCYgHSt865co1kOzeQtwABRE4sfEH06IVvAJ4A iOXdKOYHln2XBwqnPx/LQTUPKd6hkx26cNh2zRSfZwML20OMWZJUGsOJ39eKmN8eNRATat4iUB7 EJHsmkWwxL3PTQD9XcOLOROfu9zvjFjhW6U9OLUCTWDgGqzzO+ 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> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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 }, {}, };