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 C7C5AC49EA1 for ; Wed, 7 Aug 2024 03:00:11 +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=U1m00D/eRsR3sTtSAbUOk6Hp4zyD2ST919kFJY6iP6U=; b=mucynAYusiGWnvDwFZHbvVapqU jSE3Ks9u1Lv6BnqnFQhAyYpe68wGiWCdZ7mgV79FjMWYIinbOHFwuHlfLj0PuM9gaXVL6w581bO8p jXN8/vaERq2nVa6+k25k1FhsysrMl8COewxKHzI5X4Wqm9IbGk1KiQeRrcZHKRNemFe+qpOGWkyK/ AIgPd8s9Sy8QCqXMvtSfRgFGF9xkSFoGRdvHS+vrpw3v2UQrKzN/eIqmYlvN/a0t149xsXp5nyCjs cHSR8Pgz+p48dqeU8D8fbUqY+Bh2j9o3kIG1fqK8f/uNCwYS1if48zRLp1tFLLe3b4SemMhz63Hji 5rhXX5tQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sbWu8-00000003fk8-3tpb; Wed, 07 Aug 2024 03:00:00 +0000 Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sbWtb-00000003fex-196Y for linux-arm-kernel@lists.infradead.org; Wed, 07 Aug 2024 02:59:28 +0000 Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-70d18112b60so345408b3a.1 for ; Tue, 06 Aug 2024 19:59:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1722999566; x=1723604366; 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=U1m00D/eRsR3sTtSAbUOk6Hp4zyD2ST919kFJY6iP6U=; b=zo1YuY1JjslsZN3SiYwmN84nK5k3WObTysPrNsNiH15UEdj0yRZDMfmbFl9AT0jv2G UylnI16El5OrhDlXufrEZ2W767ew8KWf4ye9BNLmeckNewl2chvvke3L+3eDuYyvg1Hx 5rdSxja+CwAJ2xQroqTL+3xKwc7u212wQ8f2W50zfbzp5/HLt4KzCEQdy+DRbRbg6BEr eWjdgPw79mIJm2pPNueVNg0grXsWP6z6kcHjFVawc++LzhZmjXPzk2Em3UJcT2GtogCr dp/Di35Y1yn/epmAqE8MHSKjGwI5t8jtL/yv5kTWrAnan5BIn4LQVgxQzwrsw5uD5f8v WLtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722999566; x=1723604366; 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=U1m00D/eRsR3sTtSAbUOk6Hp4zyD2ST919kFJY6iP6U=; b=B1bZz+YW7i2Nz3Vj9Lr2Esv93CK5YGVkals6uWRZ+cZS/yepG9KX+7nmgDDTW/WMDl 8DxuOvF02bhGoMlG5jA1N9BesLR1vEL1+D+vy9HcgitPbuntHIARv3eKT1PZA8d/OtxD GpYxL62oBfv/SlDlEmRtvWh3zlDR1603SdJB0fPO7Dx3sM1OtGte3jRzdVyXIbua3WnQ FuQqikunYNMvLafvEH/41Ow2GiWvys8Cor/inGlLLQs9Ldlq3Z8AvumBuM5SpM5fu/fD 7vH3c3gQSuGZzLz9byBt64ef+nhaX3NKzY71H5QuxDqsbPl9+9yKUgbZbIwQhoaKno7E 93yw== X-Forwarded-Encrypted: i=1; AJvYcCUgJzGdSH16d/NCKaUExXWBoi1IAtHJSCYUhz8oVumCZuxX/PQc6y4HhDJ4bS8RbxKKrD9pJ1MSfgaPNtiFAq8k@lists.infradead.org X-Gm-Message-State: AOJu0Yx2T4qFLhwsdyqtcQN5J0TxPKiXQmPWyyWoc2N6pBn9XaYsDvNq BGxqOn618VDPxV0N7DFcMAZYACA3IttUM5wxTI2HBdLPxWvTSJMtsNWEnzhRAA== X-Google-Smtp-Source: AGHT+IFT/iYT7B/31my5hbcrkTJerIDiFHN9YWyJe4xOGN7mYzxSxl23V8TqbGRxeAzEquMvFM8eRQ== X-Received: by 2002:a05:6a00:2184:b0:707:fa61:1c6a with SMTP id d2e1a72fcca58-710bc89d6bfmr1262074b3a.10.1722999565598; Tue, 06 Aug 2024 19:59:25 -0700 (PDT) Received: from thinkpad ([120.60.72.69]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7106ecdfe2dsm7580256b3a.114.2024.08.06.19.59.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Aug 2024 19:59:25 -0700 (PDT) Date: Wed, 7 Aug 2024 08:29:18 +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 v5 04/12] PCI: brcmstb: Use bridge reset if available Message-ID: <20240807025918.GG3412@thinkpad> References: <20240731222831.14895-1-james.quinlan@broadcom.com> <20240731222831.14895-5-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: <20240731222831.14895-5-james.quinlan@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240806_195927_343991_1ED2E913 X-CRM114-Status: GOOD ( 23.79 ) 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 Wed, Jul 31, 2024 at 06:28: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 7595e7009192..4d68fe318178 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 (dev_err_probe(&pdev->dev, ret, "failed to deassert 'rescal'\n")) > goto clk_disable_unprepare; > -- > 2.17.1 > -- மணிவண்ணன் சதாசிவம்