From patchwork Wed Jul 10 22:16:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Quinlan X-Patchwork-Id: 13729762 X-Patchwork-Delegate: kw@linux.com Received: from mail-ot1-f54.google.com (mail-ot1-f54.google.com [209.85.210.54]) (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 D1A8B14EC50 for ; Wed, 10 Jul 2024 22:16:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720649810; cv=none; b=rJU9qeSdYXOnMTIWjSLK/ZjPTD5yObRCRej57ykfdwWce7TlTK61fB3MFbDa3ff1mgLdMGyn/Q3RPMNjMtzHIs7rJqrfBqL/6MQThHur9bS1Sbt2tqqp2KSMWQ2zhY37YUB/9G7cg+iXja9NEunPMCWfWHHNCDwdoTcwK3yOD9A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720649810; c=relaxed/simple; bh=OTPI92l9RCvnkyeJm8HlRcsGbMOcf8LKUw1c7ZV2FhE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type; b=sSIDAqDHPvzpzkFAujtufsKdeQvxWdAbQydBcoj8rsbwcAmeyqCHfTnvFUkzUINUy7SToJJGfDR6zjKtixAeqo3vZecmTD0VCRLwWGULGIwqpVKeDw1lmVUQGEGtLZyUTPF0YtaWCpPVGuFyYQ1Yz9TL+8U+YQFnSipr5wMCFBQ= 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=PJ/1iEq7; arc=none smtp.client-ip=209.85.210.54 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="PJ/1iEq7" Received: by mail-ot1-f54.google.com with SMTP id 46e09a7af769-7037c464792so101366a34.2 for ; Wed, 10 Jul 2024 15:16:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1720649807; x=1721254607; 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=jzjm5mVqoNmpf0Lt2FWntfSJm0h8ZSla3KTGoQp6bGc=; b=PJ/1iEq7YUMLoK+3xv18CaUeDeDsdG/n1WD26kagCxgOeMkF6JKX2XFV0SJwkYHp4c MyDfJw7KmJTe0Cqd49keOIKPAcIpFqrfTRqNKtsXy7OAds6g5tjUTYAmstpSEouqwbb3 zkezOFgiy512U8bVIs1QlBM21xLb4AbfMZf+U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720649807; x=1721254607; 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=jzjm5mVqoNmpf0Lt2FWntfSJm0h8ZSla3KTGoQp6bGc=; b=seH1CdreUhsDMKXW821Tew56OGUUyf/DX0JBkstoCWu5UbaImqzkgRSKwrHSZmH/dv IQNv3RVnFJjChoVoiXYy7vdBqAeM+rwrlnTWLtdae6Rhx6a34fTsnBzC+lT5W2Y08PIU TJqeX8XLBBbMajgnSuRSPgm1higEaI14AbE2F7vkumb7hUcWLf701ljrTsRMmuuedHJD BMunKJLLGaS070CPA5bc3K/MveK5sUvha4bw7cowKTmkQdra5aLYL2v0OULUuDr1YzAq PAtnQZ2vjWzpxTEeYjzTkcWvUvU07cVLY+g9o6asVe914B3HuTel0wfj11C67FCaewuL vyGA== X-Gm-Message-State: AOJu0YxlG5wt+nBfCGBOY9jLdWvwVAi8Cv7+UG4484BeFDIBpnyKXFwd J3Tqa5L5YDo1NTo1lu6nyBBKpi1vxax0Fuma6AkcWQw4YrWzFrPkdgHcPj94/Ii3RVPovz4r9yP u1NNi5jErWWny58JPLNbm6Y30HpX4XOrId/lcl8lciXaZ+023SpsvbJVYnPNJnxgvno9GnrdpTa TC2GkuEREFad0cydV0BlL6n8ZgrYJ8s7caXRytLKQB9nRH0QyB X-Google-Smtp-Source: AGHT+IGfstohiQxH9qeYpEe8jT1Qz3dU6XY4QCpslF096AfkFrsBFGhdMK+hAk+7UZl/TOMgq+/yJQ== X-Received: by 2002:a9d:7cd6:0:b0:703:662a:4627 with SMTP id 46e09a7af769-70375b499e2mr6777671a34.35.1720649807258; Wed, 10 Jul 2024 15:16:47 -0700 (PDT) Received: from stbsrv-and-01.and.broadcom.net ([192.19.144.250]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b61ba04c16sm20182326d6.60.2024.07.10.15.16.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jul 2024 15:16:46 -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 , 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 v3 08/12] PCI: brcmstb: Don't conflate the reset rescal with phy ctrl Date: Wed, 10 Jul 2024 18:16:22 -0400 Message-Id: <20240710221630.29561-9-james.quinlan@broadcom.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240710221630.29561-1-james.quinlan@broadcom.com> References: <20240710221630.29561-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 Reviewed-by: Florian Fainelli --- 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 dfb404748ad8..8ab5a8ca05b4 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))