From patchwork Fri Jun 28 20:54:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Quinlan X-Patchwork-Id: 13716595 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 DFF70C2BD09 for ; Fri, 28 Jun 2024 20:56:51 +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=qo4J6XF4UpYmOJK0wz/NVdEU/LGyozINj/5w97A5PPw=; b=X3l67tDGbb2aFUzcmU4slDiYMz 4qXT/2CemWUZrBOsP0CJ8PiHpsruicTeHvoF78VYNiois/0BQ1Q5+A0lcRozY0HahG7y6uAhvpl3t IBQ7cOjHcznGgNoWw6vIyW/FbXJw+R4rYu0vUD0UOS9dYT+18fyaSHda0J4DxwoBoVr5ijJMx7+84 FKCxFX0W6/11ShnQS8gWsFmnHPhMXV/NYhDwlJ+8WP+/QD/iSCqZWdt/IpnaF/mHcFC98XABmHsRb QivJSVmQuT2laRGnd3/cuTTWifz+DsXN5mw0cjYEMVjTnjjbhr5hg8k4yBUWgo5REzgXPyboBJPYe aFnhCtdw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sNIeA-0000000Ew1B-1Xsv; Fri, 28 Jun 2024 20:56:42 +0000 Received: from mail-pl1-x629.google.com ([2607:f8b0:4864:20::629]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sNIcI-0000000EuyH-4C2e for linux-arm-kernel@lists.infradead.org; Fri, 28 Jun 2024 20:54:50 +0000 Received: by mail-pl1-x629.google.com with SMTP id d9443c01a7336-1f6fabe9da3so7176405ad.0 for ; Fri, 28 Jun 2024 13:54:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1719608086; x=1720212886; 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=qo4J6XF4UpYmOJK0wz/NVdEU/LGyozINj/5w97A5PPw=; b=aBO74KQe+YfYlDGHhPkByGs00X7AnCp31TEC2oERwNsYnu5wtKgYYvc6tcqTrdBnf+ srRPXlE/fomGdAtqkH23F/D7vejIbHCaOu7i4fySt1mKoklWvYoyQEnIrAV6aYTaBulN 1FCNuSP7s+oUaaQwPpp8x9GWeTgPYA84X7aMY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719608086; x=1720212886; 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=qo4J6XF4UpYmOJK0wz/NVdEU/LGyozINj/5w97A5PPw=; b=ILu0EfDag5vq1/MK1uZ2JRMMnRYYaN/BLd9mgFip3Pa2+W9BAvUMML97kEnSbfpSb2 9N8yPHQ6/GMpOPYu/KzlvqEV7I+PJ+gaF3t9G+HS2jrDwprg0JW/nO8unxttDFF9MzTe QO21w40M7mMiyNuCDKldklyum4SVwiD5mV+sTawT6VnHG1sHRXzm4pP3ZAiJXmJjEgAo EhMFUVKz6cKwRksrxlElhO2i6VTcuwlH9DkR0Jo00vjb8Y9YKszl2Av6dxZfEstQSThd 6UmtkMUcnJhoIVS7lNmS5r9c1dr234eOCfhXHKDF+kG2/S3LUdBpsSvfVa081PqPEPZm x0DQ== X-Forwarded-Encrypted: i=1; AJvYcCWCJrg0FLcJFqro3kE7CUhc6//OPXJc6tQs2oyWRnryZtZqwxVpLlLBeVKdHTPoQvC/n/ldo8SiP0H0/VV1bQ0wfQLxDUPJE2xgjnTL0ymB478bg54= X-Gm-Message-State: AOJu0YxbF8WK5eGngq7cflTdwT0ih4IYYn5OBPzvQiYv5kriOYxxkhMZ d3ApFZ8fqVF83/08EPWoNt/MrLItIl0A76h8O6EwQgSSt1prUb+JRE4aSU+thQ== X-Google-Smtp-Source: AGHT+IH/L+b6uQbJFoZXayOD8y14oJ/r7oa8wxPA2GIhVQOwDkQLMKI+EZwDN8QDCgoLaXZnM2uLgQ== X-Received: by 2002:a17:902:e846:b0:1f6:502d:ca88 with SMTP id d9443c01a7336-1fa23f15aa5mr171432915ad.49.1719608085820; Fri, 28 Jun 2024 13:54:45 -0700 (PDT) Received: from stbsrv-and-01.and.broadcom.net ([192.19.144.250]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1fac15393d1sm19695135ad.157.2024.06.28.13.54.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jun 2024 13:54:45 -0700 (PDT) From: Jim Quinlan To: linux-pci@vger.kernel.org, Nicolas Saenz Julienne , Bjorn Helgaas , Lorenzo Pieralisi , Cyril Brulebois , Stanimir Varbanov , 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 , Philipp Zabel , 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 v1 3/8] PCI: brcmstb: Use bridge reset if available Date: Fri, 28 Jun 2024 16:54:22 -0400 Message-Id: <20240628205430.24775-4-james.quinlan@broadcom.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240628205430.24775-1-james.quinlan@broadcom.com> References: <20240628205430.24775-1-james.quinlan@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240628_135447_089585_25D53596 X-CRM114-Status: GOOD ( 16.70 ) 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 7712 SOC has a bridge reset which can be described in the device tree. If it is present, use it. Otherwise, continue to use the legacy method to reset the bridge. Signed-off-by: Jim Quinlan --- drivers/pci/controller/pcie-brcmstb.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c index c2eb29b886f7..4104c3668fdb 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -265,6 +265,7 @@ struct brcm_pcie { enum pcie_type type; struct reset_control *rescal; struct reset_control *perst_reset; + struct reset_control *bridge; int num_memc; u64 memc_size[PCIE_BRCM_MAX_MEMC]; u32 hw_rev; @@ -732,12 +733,19 @@ static void __iomem *brcm7425_pcie_map_bus(struct pci_bus *bus, static void brcm_pcie_bridge_sw_init_set_generic(struct brcm_pcie *pcie, u32 val) { - u32 tmp, mask = RGR1_SW_INIT_1_INIT_GENERIC_MASK; - u32 shift = RGR1_SW_INIT_1_INIT_GENERIC_SHIFT; + if (pcie->bridge) { + if (val) + reset_control_assert(pcie->bridge); + else + reset_control_deassert(pcie->bridge); + } else { + u32 tmp, mask = RGR1_SW_INIT_1_INIT_GENERIC_MASK; + u32 shift = RGR1_SW_INIT_1_INIT_GENERIC_SHIFT; - tmp = readl(pcie->base + PCIE_RGR1_SW_INIT_1(pcie)); - tmp = (tmp & ~mask) | ((val << shift) & mask); - writel(tmp, pcie->base + PCIE_RGR1_SW_INIT_1(pcie)); + tmp = readl(pcie->base + PCIE_RGR1_SW_INIT_1(pcie)); + tmp = (tmp & ~mask) | ((val << shift) & mask); + writel(tmp, pcie->base + PCIE_RGR1_SW_INIT_1(pcie)); + } } static void brcm_pcie_bridge_sw_init_set_7278(struct brcm_pcie *pcie, u32 val) @@ -1635,6 +1643,12 @@ static int brcm_pcie_probe(struct platform_device *pdev) goto clk_out; } + pcie->bridge = devm_reset_control_get_optional_exclusive(&pdev->dev, "bridge"); + if (IS_ERR(pcie->bridge)) { + ret = PTR_ERR(pcie->bridge); + goto clk_out; + } + ret = brcm_phy_start(pcie); if (ret) { reset_control_rearm(pcie->rescal);