From patchwork Wed Jul 3 18:02:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Quinlan X-Patchwork-Id: 13722660 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 48796C2BD09 for ; Wed, 3 Jul 2024 18:04:16 +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=3G1UdWhXQLqPzqIU1YipRjDtctaGGn87odlGJQjPDDE=; b=fIhNYDqfwsccT/6CJ+6l5s4t/i JB+pUbbQXpSs7upMgA+kgIsU1gOmL4i9HZrsX6LnqUuSqo7sGwwBYpHeRQSdbJz7Q6y2KMHwnRu+e QuBTPN4FQ55ameepJ/eOyD3VMdfHfJqZM2sGUQOkie98BxFUxLvLQrwe5/0BvVN2cYRoi7gRdupWm b7HyXqamOa7y7OTSlA+IcYcSOZrupvQGaz164gggWHIRRRYKeq+UuMx+aqQsAV7ZbNPzI4Z/n8YwN +Wvoc1Uq2EqjAw0n4dN+Qhi8MQjp0Su36Vbw14PYm16HdeHL8eU8gVVekRZ6xP1fo4zUJ2Mb5KRc+ OkK5YkSg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sP4Kr-0000000B5TZ-0dQO; Wed, 03 Jul 2024 18:04:05 +0000 Received: from mail-qv1-xf2e.google.com ([2607:f8b0:4864:20::f2e]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sP4Jy-0000000B4yU-2JE4 for linux-arm-kernel@lists.infradead.org; Wed, 03 Jul 2024 18:03:13 +0000 Received: by mail-qv1-xf2e.google.com with SMTP id 6a1803df08f44-6b553b1a159so28100106d6.0 for ; Wed, 03 Jul 2024 11:03:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1720029790; x=1720634590; 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=3G1UdWhXQLqPzqIU1YipRjDtctaGGn87odlGJQjPDDE=; b=DbeDgyJ+9FJY7J2fXf/TzHRoPa7r3tOhoSyItuQAhUujPmLHzwuCapAUDhoPYVtnCU s+OW2EdSzm2apZFlcHaYV907ihsmZ2xOLSH3yHkDyMgzXpyQ3jBikzCue5ynEVx8e8cg xLbzs4u2mItkz0CjERCtMFGyltcix4jExvKMc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720029790; x=1720634590; 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=3G1UdWhXQLqPzqIU1YipRjDtctaGGn87odlGJQjPDDE=; b=aybGtx3UtLv5IQ2kP1OGqiUfzQ6r/fLhzD9HsXBpAuqsNS/mlsZXlZdcNuOaTpmoEP +J7OroYglSwuBDtQfb7Oqvl2wW/qvODTeWk8gaCcM7evrJNi5Pwg+vS6q8kXq/QCygx2 Tgcd9z6YG28mVKy/hU0n2mV54818R4cZGjh3iU1WsvfWnf7uPjhMrwn3o19npRWsWp4w fGjezgwxwndd7VzUVQ66oxVYEh8blhCxH0XkkhCvFEgVLvpBbxtlE7cuozfIw+qLKw3n bZd4GQScTHXdEDv/gad4HAqhfXQf77JF1VNWHKJ4sK1GrETr3JnTVGWGZZt26d3uCHdT guvQ== X-Forwarded-Encrypted: i=1; AJvYcCXly63Fkep40fVaC4pHFz2bbj/GJhc206I12IRhCT9WS2Hz0EJqumC1fr9ExzAUg/Wkqh8xmZF/MKyah9sAohIDroO8W82rkJyEDteYDjkjjHeB0MQ= X-Gm-Message-State: AOJu0Ywq1Zb0kZ6uZOpBFzVhfCXi4DwEx26CaFOTmkwHSqyJKJQLCmeJ cIDPpHLdoc+a5y2L5BLinMqdeI8jxnlqXTgdCUr8NtEZnFTwLjnd4MkmDkL3Ow== X-Google-Smtp-Source: AGHT+IHrIodtULPxBVRNVIp6XlZEo4cm9rcmium+oajhbYxKHA+sJtGuN7oqp5wbg8H+RmYxWagMIg== X-Received: by 2002:a05:6214:ca3:b0:6b5:34b:8c02 with SMTP id 6a1803df08f44-6b5b70c2856mr146549116d6.27.1720029789499; Wed, 03 Jul 2024 11:03:09 -0700 (PDT) Received: from stbsrv-and-01.and.broadcom.net ([192.19.144.250]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b59e5f1a6dsm55589626d6.83.2024.07.03.11.03.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jul 2024 11:03:08 -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 v2 03/12] PCI: brcmstb: Use bridge reset if available Date: Wed, 3 Jul 2024 14:02:47 -0400 Message-Id: <20240703180300.42959-4-james.quinlan@broadcom.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240703180300.42959-1-james.quinlan@broadcom.com> References: <20240703180300.42959-1-james.quinlan@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240703_110310_840853_1C72AB37 X-CRM114-Status: GOOD ( 16.40 ) 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);