From patchwork Tue Jul 16 21:31:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Quinlan X-Patchwork-Id: 13734959 X-Patchwork-Delegate: kw@linux.com Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) (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 4A29C144300 for ; Tue, 16 Jul 2024 21:31:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721165516; cv=none; b=G2QD/30beq/ORFhb+P2J6XzcGNFC1u8V6eb13JLuJ66CyBr55XOfIFSg8E9ypRPE5BeHLVsBEz0honZ9XzJsfAQCvtNYxRpsbV0IFVLmu21HFZ2jJGMI0Vqkv7oQaynHzmyt2OZq2ubcdZWP58cfQHxSb6HXzsVrTkpWFwG1H3I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721165516; c=relaxed/simple; bh=8+0WI5bdP02CXunsJ9/uM0VSRLg7WIJgVoSD8XrlkZw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type; b=VK7Mu2vMIjFA5tIiuAdH0BGNP4Gcq3QJBDHsDagG6DKiWA1J0lSjhw5e4RUQh13Dr4ufq38J3vn8DB9TvfyB6adz9SkXidxoKghZaw8eKgzGiMyaMnVODL2KC6tJh7L/8JZ34/B34QjND4vPu2/PeKE0Xh7nkRUM9QcO9PvZWac= 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=DqivQQVy; arc=none smtp.client-ip=209.85.210.179 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="DqivQQVy" Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-70b5117ae06so4361614b3a.2 for ; Tue, 16 Jul 2024 14:31:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1721165513; x=1721770313; 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=aU6d61u3g7i0xFUcV2E6dGZN+pyXVhWDJKsn2Ba9lj8=; b=DqivQQVyKz5cVfb5LKDgr/SjMEXycvDd8mj79Ar88enhJSS5ACeHxwNuxgTZyOosKT m1lLkaCVs2kT+Qvd0SeRpbZ1LzFF/23DCiA7KGaVsp3ctug+gLHDEGQ/iqn0G+xy54MU gBgwd8dPF9P7JpbdPsJH5pUqiSD+48uFKYZwM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721165513; x=1721770313; 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=aU6d61u3g7i0xFUcV2E6dGZN+pyXVhWDJKsn2Ba9lj8=; b=c+if/OAR6IAI4HRlu7sNnlIBWH4U3+qxt7dDxHmR6/ipNPyVzoWZmF5W2I7Ze9eu+s 9uZmYihtyRyyFSfV1Xpf335EcClqco98LEkqU6saEXbWBaxEkswjDEzYVYcpQB/fv4G4 S6gDaUO0KK4d9MsGdplW1iFuojxoouzUrrPXrSS5hH39Fz9Uk7cI/Ztp/E3t6mL74HZ3 ljhN1clzaJlDe9YJPNXEuyTweEc5YBlTmwB8Lc5uLhrLeWcshVqw1lQdA/JU2vEMY5gK KI9kEg+cXzSed4ZP0KQHcHeCh1LjaevITE5/Oe7xjY3O9fKvYCfNulGpu/obvIY/jawe wKIw== X-Gm-Message-State: AOJu0Yy3MXzlpupHg3wTU855PKSBkf629o+9RjW2kQbLrakM52kdk+WI n+/743Xz52lTh7k8AeBujzZbSoaf33H/Ke/AHaHKM7uPsQhs5Z3ph8dWj7HNuSRZblQlWcRqRC6 2XJzU8Bzj2B1TjAVehYjqzdioH2DrdEm+V0qOSjzaKLSWPANPieWBN9EmVXHwi3Rxv7bm8c62hO DA9NZ19I2dpJSSVk4C2ZY+rruW3w9l4rfcIlc8ys71nHkU/g== X-Google-Smtp-Source: AGHT+IHCARefO9Q321jDvjEHJDSQPCVyz+1t2AKROGzfe5YcdNqEPgxb9TJaujSadqlPYWaeSwYl+A== X-Received: by 2002:a05:6a00:a1a:b0:704:23dc:6473 with SMTP id d2e1a72fcca58-70c2ea01f0cmr3716530b3a.30.1721165513082; Tue, 16 Jul 2024 14:31:53 -0700 (PDT) Received: from stbsrv-and-01.and.broadcom.net ([192.19.144.250]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-70b7eb9e20fsm6812828b3a.31.2024.07.16.14.31.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jul 2024 14:31:52 -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 , 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 v4 04/12] PCI: brcmstb: Use bridge reset if available Date: Tue, 16 Jul 2024 17:31:19 -0400 Message-Id: <20240716213131.6036-5-james.quinlan@broadcom.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240716213131.6036-1-james.quinlan@broadcom.com> References: <20240716213131.6036-1-james.quinlan@broadcom.com> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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 Reviewed-by: Stanimir Varbanov Reviewed-by: Florian Fainelli --- drivers/pci/controller/pcie-brcmstb.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c index c257434edc08..92816d8d215a 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) @@ -1621,6 +1629,10 @@ static int brcm_pcie_probe(struct platform_device *pdev) if (IS_ERR(pcie->perst_reset)) return PTR_ERR(pcie->perst_reset); + pcie->bridge = devm_reset_control_get_optional_exclusive(&pdev->dev, "bridge"); + if (IS_ERR(pcie->bridge)) + return PTR_ERR(pcie->bridge); + ret = clk_prepare_enable(pcie->clk); if (ret) { dev_err(&pdev->dev, "could not enable clock\n");