From patchwork Wed Jul 3 18:02:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Quinlan X-Patchwork-Id: 13722651 X-Patchwork-Delegate: kw@linux.com Received: from mail-qv1-f53.google.com (mail-qv1-f53.google.com [209.85.219.53]) (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 B0B9A191F89 for ; Wed, 3 Jul 2024 18:03:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720029802; cv=none; b=fTRPRUFoYzBxp8V/QAKC/8naBHtUr+BGLOg/NGOFA8hRPF+/lZ5o4ig6EsXSb2BU9SR01cM6rZuCLyy3DgdOUdg1EDkJR42+d/GAj9UDhROZp9Ay30qLZqzZBOeDElTeXsYe58RYa67mFGiHzuOhPy2u+ltmjRvg6CXhVvO5NhU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720029802; c=relaxed/simple; bh=ZEZqK0yadLsLJ+8Qm58i6asWi9lWgaVjhKj22znbpL8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type; b=l5wtwcD/MW3WKIDfA3kpezAKt2SmiVz9lOI/uAi+cq4lGWxQKZqDiwGA5pPF8eOVaOQvqRsoSLnERVwnuFYEAjjN8ItN9HaXQ+sK7SOI3Sz7tb8I4+cLHgy2b9Q/nudOOCYvQODSkuM/+LKk06EhV/MVXtKP/mTFWsCIRI6CRjc= 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=eG/9k3I3; arc=none smtp.client-ip=209.85.219.53 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="eG/9k3I3" Received: by mail-qv1-f53.google.com with SMTP id 6a1803df08f44-6b553b1a159so28101146d6.0 for ; Wed, 03 Jul 2024 11:03:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1720029798; x=1720634598; 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=7Ny0X+KajsnegxHH9rAsKibVwAoCUf3WASQfGZNffBQ=; b=eG/9k3I3fsA/cMS0M0oV3lnidEePsWVe2E/JwXAEFeN8/aJTo3ed5omIDdA6OkRUpj 6a48qP+5wRlGZeLLHnaUJMhsUfJp+6NDp2zPvqae0liVWZZmQjI8SIQia8b7dCiLfs7h 0ik75z4f6wwRnzcXdABrVoGiQe/hmhAKV+/e4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720029798; x=1720634598; 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=7Ny0X+KajsnegxHH9rAsKibVwAoCUf3WASQfGZNffBQ=; b=l8teesrNc2K4PRSu0VALRBkjB5QPf5IS3iyy7Y5/32Mu8vWtie8LwoNoEWSG2t0jvV XCCik47FuQ4ReQkfAUT90Me8pbEFDAbXmXuBakZPz5q8gCES2musBD1rnlkHoiwVbjfw 7Qp0uKNgOcn/oXSrEO6GkBTUXCK+CVvY3Lmbm4rHtrzTlz6Uz7CKHdd3Z5oa5tX4+rTP 9RCRWRtMGu31zyLUxiMsWgplMJ96vyzkpqmbMS86xclvitBLxImOOclMf3oeOJ3cze7V RO7B51F2eMf0kPxZyi/mQuy8BxmmMhRwTO03Kitdz3cSGNKw7ooWUtWbyfv96jnJYe9C 9a8Q== X-Gm-Message-State: AOJu0YxryNogbym0wd7WpvxBaGk6nRyKjss7gAevSAKG7EY0bJOjupVt 2nm/c/gQeWtfRwCr+8UntYyH7PwHLg2HTw1OJjp2JwfHV0kl5OEqSu2pxj5iCr5A3Y5yHZuw6nn 6RFG357/Z4MzGFlB0VazRrDJ7bEnj5eND1k7oGmcuOmsobPrdg620k7MBy4/aic6LafIR06XDzm fzTMkZLGfUhe1TXFuEm0TGzPPbQd71dfDBS/kCcBkBeSUGZqhp X-Google-Smtp-Source: AGHT+IEjxUaTGLmO7EJMAa/TgB1qW7iqWFCD0RMo8l2bw7YFxx+GoQgQJT1u8o/uNPyZPEbzb8Mvww== X-Received: by 2002:ad4:5ae2:0:b0:6b5:db70:b980 with SMTP id 6a1803df08f44-6b5db70bf68mr58937496d6.4.1720029798171; Wed, 03 Jul 2024 11:03:18 -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.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jul 2024 11:03:17 -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 , 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 08/12] PCI: brcmstb: Don't conflate the reset rescal with phy ctrl Date: Wed, 3 Jul 2024 14:02:52 -0400 Message-Id: <20240703180300.42959-9-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> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: We've been assuming that if an SOC has a "rescal" reset controller that we should automatically invoke brcm_phy_cntl(...). This will not be true in future SOCs, so we create a bool "has_phy" and adjust the cfg_data appropriately (we need to give 7216 its own cfg_data structure instead of sharing one). Signed-off-by: Jim Quinlan Reviewed-by: Stanimir Varbanov --- drivers/pci/controller/pcie-brcmstb.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c index 3aa82871e9b3..ffb3e8d8fb2a 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -222,6 +222,7 @@ enum pcie_type { struct pcie_cfg_data { const int *offsets; const enum pcie_type type; + const bool has_phy; void (*perst_set)(struct brcm_pcie *pcie, u32 val); void (*bridge_sw_init_set)(struct brcm_pcie *pcie, u32 val); }; @@ -272,6 +273,7 @@ struct brcm_pcie { void (*bridge_sw_init_set)(struct brcm_pcie *pcie, u32 val); struct subdev_regulators *sr; bool ep_wakeup_capable; + bool has_phy; }; static inline bool is_bmips(const struct brcm_pcie *pcie) @@ -1311,12 +1313,12 @@ static int brcm_phy_cntl(struct brcm_pcie *pcie, const int start) static inline int brcm_phy_start(struct brcm_pcie *pcie) { - return pcie->rescal ? brcm_phy_cntl(pcie, 1) : 0; + return pcie->has_phy ? brcm_phy_cntl(pcie, 1) : 0; } static inline int brcm_phy_stop(struct brcm_pcie *pcie) { - return pcie->rescal ? brcm_phy_cntl(pcie, 0) : 0; + return pcie->has_phy ? brcm_phy_cntl(pcie, 0) : 0; } static void brcm_pcie_turn_off(struct brcm_pcie *pcie) @@ -1559,12 +1561,20 @@ static const struct pcie_cfg_data bcm2711_cfg = { .bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic, }; +static const struct pcie_cfg_data bcm7216_cfg = { + .offsets = pcie_offset_bcm7278, + .type = BCM7278, + .perst_set = brcm_pcie_perst_set_7278, + .bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_7278, + .has_phy = true, +}; + static const struct of_device_id brcm_pcie_match[] = { { .compatible = "brcm,bcm2711-pcie", .data = &bcm2711_cfg }, { .compatible = "brcm,bcm4908-pcie", .data = &bcm4908_cfg }, { .compatible = "brcm,bcm7211-pcie", .data = &generic_cfg }, { .compatible = "brcm,bcm7278-pcie", .data = &bcm7278_cfg }, - { .compatible = "brcm,bcm7216-pcie", .data = &bcm7278_cfg }, + { .compatible = "brcm,bcm7216-pcie", .data = &bcm7216_cfg }, { .compatible = "brcm,bcm7445-pcie", .data = &generic_cfg }, { .compatible = "brcm,bcm7435-pcie", .data = &bcm7435_cfg }, { .compatible = "brcm,bcm7425-pcie", .data = &bcm7425_cfg }, @@ -1612,6 +1622,7 @@ static int brcm_pcie_probe(struct platform_device *pdev) pcie->type = data->type; pcie->perst_set = data->perst_set; pcie->bridge_sw_init_set = data->bridge_sw_init_set; + pcie->has_phy = data->has_phy; pcie->base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(pcie->base))