From mboxrd@z Thu Jan 1 00:00:00 1970 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 0C849C531DC for ; Fri, 16 Aug 2024 07:08:35 +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:In-Reply-To: Content-Transfer-Encoding:Content-Type:MIME-Version:References:Message-ID: Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=O0k8JzYHQaThRxAHYqkzcgQEmY5VY+g+3F3Xyn+HevI=; b=i378JEGw6DdeHVYfNHedom7Q14 D1nK7reLFh3tkvRxl24puNzrRO7r4pVLbX6C3YYtPjvSFHP6ldLm/ptUExLkEvEH3fPaV1tKdq1aO /NadU22UD+RGRqwXl3BFuxAtCLVSfYE79khfFUjCNNc639mH1R597/MNZqdvJVaGFcXvvs8EJP4ef XjX9/aY6UzcrgA+cQPyf3IncVr3xMvkBB9YFb1ccVMMuMNzIQIbKCjf9KZqSHhkVb0sY836zM4ljA xS80h3LhCJcOZ83S8rG1EDNM0agcbJwVyTeAi/pZGtdQ1R1P32XAaFc5x8EyMAMZx6kjosDpliP5t SHt3RLIQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1ser4O-0000000C274-16y8; Fri, 16 Aug 2024 07:08:20 +0000 Received: from mail-pl1-f180.google.com ([209.85.214.180]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1ser3b-0000000C20f-3u08 for linux-arm-kernel@lists.infradead.org; Fri, 16 Aug 2024 07:07:40 +0000 Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-2020b730049so2482425ad.3 for ; Fri, 16 Aug 2024 00:07:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1723792050; x=1724396850; darn=lists.infradead.org; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:from:to :cc:subject:date:message-id:reply-to; bh=O0k8JzYHQaThRxAHYqkzcgQEmY5VY+g+3F3Xyn+HevI=; b=fQktQQveV4C7ilhH61aSpOJ4ToPSZPZ3myaFytOecarQcs6OOdrTOtbYPtlMYIPzWt 3trlVOnu3WlhnDaIgwPEDbR2bdpwKRuUHd133zl9wOFALAyFtH4NhxaSSwVzgo7c6UXp IEecQleoLrDgtzKCrwxbrGhPtrVKvXIPDqZrEkoHRK9qBEj8mtGmFqAQGFw/ZtENsaTZ H6UfI09hpc/M4t2198OPTIKUdhpVR6MVkKig4u8y8bGl7qGC343m+sq7tjqfvptJnNYK s4POioK5Z66ccfdoNWQRVXaXCl4YZ0IpgeMjcLGJgN/JmelP2gMRmCTtgHQUOGVSRq7O 4QaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723792050; x=1724396850; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=O0k8JzYHQaThRxAHYqkzcgQEmY5VY+g+3F3Xyn+HevI=; b=Fw4tQCkYje6dANwye/MWid2JjYt8gJw/e/WnxMzmwdIrrAXGBZB73uJXvpq1690NSJ DHYff0BDI1VFV/HyWDlGO8HJ6Rj3aGlBaZ6/lkjaJNvkJ2Oo9NmcCylhhSjVt1rnkEW2 1E9/32YGlrBSHZVh9e4qOBm3CEegcm1b8kvm/VZ8pvVMQMnA9w66HZCo0klgCckzw/kM JGZJNpXLFmlE87CILs0PpS6NcCH44j6BDCd7w0MruKb3LeyKfMLEYgkZaY+VipT3iaHN MShaHTj2OuToDzirLbeYk5H1g3Mcn8viz9RXtk/jcOCX6iYkwSYEd7Nkpz1fr66lnjeN bjSg== X-Forwarded-Encrypted: i=1; AJvYcCXcJlLCtO7DYPdHMcL7cQHYaZKI912dWeVXy3SGVzXUggap4Rl++0gS73ml0NUl8Do4iHsJpABWa7jNGw9TZr27esL0n4tFV+l31iCIOA3ZdZl82Kw= X-Gm-Message-State: AOJu0YyOw8IQUYDqlGZVH4XR5fjEYMTc9JPDsHhUcoNv8J+eyBkwFSN+ +3o3PKu8sD/Q1tms7qh6I8mG1wiXHbkPjv2Wx/zGLdebu4vQkqvTzWTLTqnvEg== X-Google-Smtp-Source: AGHT+IHKExLprs85qhO0U2PEP/08ew+AFLlzlNAEgq2CZoEQqhDB9QZy1dnL1kGwmhCct0aCPZ+DBg== X-Received: by 2002:a17:90b:374a:b0:2d3:d7b9:2c7e with SMTP id 98e67ed59e1d1-2d3dfd9074bmr2315720a91.24.1723792050274; Fri, 16 Aug 2024 00:07:30 -0700 (PDT) Received: from thinkpad ([36.255.17.34]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2d3e3d97f97sm1053761a91.50.2024.08.16.00.07.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Aug 2024 00:07:29 -0700 (PDT) Date: Fri, 16 Aug 2024 12:37:24 +0530 From: Manivannan Sadhasivam To: Jim Quinlan Cc: 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, Florian Fainelli , Lorenzo Pieralisi , Krzysztof =?utf-8?Q?Wilczy=C5=84ski?= , Rob Herring , Philipp Zabel , "moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE" , "moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE" , open list Subject: Re: [PATCH v6 05/13] PCI: brcmstb: Use bridge reset if available Message-ID: <20240816070724.GJ2331@thinkpad> References: <20240815225731.40276-1-james.quinlan@broadcom.com> <20240815225731.40276-6-james.quinlan@broadcom.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20240815225731.40276-6-james.quinlan@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240816_000732_405813_F544B252 X-CRM114-Status: GOOD ( 23.55 ) 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 On Thu, Aug 15, 2024 at 06:57:18PM -0400, Jim Quinlan wrote: > The 7712 SOC has a bridge reset which can be described in the device tree. > Use it if present. Otherwise, continue to use the legacy method to reset > the bridge. > > Signed-off-by: Jim Quinlan Reviewed-by: Manivannan Sadhasivam - Mani > --- > 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 790a149f6581..af14debd81d0 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_reset; > 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 (val) > + reset_control_assert(pcie->bridge_reset); > + else > + reset_control_deassert(pcie->bridge_reset); > > - 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)); > + if (!pcie->bridge_reset) { > + 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)); > + } > } > > static void brcm_pcie_bridge_sw_init_set_7278(struct brcm_pcie *pcie, u32 val) > @@ -1621,10 +1629,16 @@ static int brcm_pcie_probe(struct platform_device *pdev) > if (IS_ERR(pcie->perst_reset)) > return PTR_ERR(pcie->perst_reset); > > + pcie->bridge_reset = devm_reset_control_get_optional_exclusive(&pdev->dev, "bridge"); > + if (IS_ERR(pcie->bridge_reset)) > + return PTR_ERR(pcie->bridge_reset); > + > ret = clk_prepare_enable(pcie->clk); > if (ret) > return dev_err_probe(&pdev->dev, ret, "could not enable clock\n"); > > + pcie->bridge_sw_init_set(pcie, 0); > + > ret = reset_control_reset(pcie->rescal); > if (ret) { > clk_disable_unprepare(pcie->clk); > -- > 2.17.1 > -- மணிவண்ணன் சதாசிவம்