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: 13729776 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 7FA35C3DA41 for ; Wed, 10 Jul 2024 22:19:50 +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:Content-Type:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Reply-To:MIME-Version: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=mxdDgMk4y93q1F86z0CEDKDwAJyUz85Uw1Y3qUcb9N0=; b=yU1kEgxzNUNgexDgMYEkvNbl7B pp3tUtHXrNv08mwlvMTUYaZkTEcAlhxm8/SJt/VQbuD/bJK82UxVfvdzajM+Xj9Vg8c4qMJf1DuMn wnSVG5YA799CYoUEjxlqtMvl2li5iHpSQiLRUSrjT3+ZldU+mq/tpxjnyuETXdQDUIXGaTJniRsm2 ucg72FOcCaD1LgYDxhFClhXEwj4g9HRafLdM57knXRWkqq9EM6EY6ULBXvb1N3PjWy446J2fE6SoC IM/7sv+bcYYzy08yFSptpJTnw+Am6aRt2jTvvDVe/RC58QjdPz70O2lq5yDxOgkB4Gcf541gz48zo 3SHZh/7w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sRfex-0000000BvAk-2aTo; Wed, 10 Jul 2024 22:19:35 +0000 Received: from mail-ot1-x330.google.com ([2607:f8b0:4864:20::330]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sRfcG-0000000Btxk-3VI1 for linux-arm-kernel@lists.infradead.org; Wed, 10 Jul 2024 22:16:51 +0000 Received: by mail-ot1-x330.google.com with SMTP id 46e09a7af769-7039e4a4a03so121143a34.3 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=lists.infradead.org; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=mxdDgMk4y93q1F86z0CEDKDwAJyUz85Uw1Y3qUcb9N0=; b=Bz9/x7U+QSxiaXnIfMlKGrn0s3GOoS8q65sO9ELEswlmqg3sdKcHQ8j/S8dx1vO0xy t24nSRflg6PQZEaBoi9vCPzD7jBhugh54q0Vr0GLswKhLpT1rGH75qM39e4Edd/N4zhM k+7yVwQTsFMOlSA7OJP9O/1eucQ4feCmnhywY= 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=mxdDgMk4y93q1F86z0CEDKDwAJyUz85Uw1Y3qUcb9N0=; b=cKJ0/ttJMa1zalJKnzLx7OxghO0JWxtKMcOsZCC/3Z3hX8kF2nLRlsVTGos7XgNpxv 1KEqXcIPBqxZKG1fJ86k4PuYQbNY8vOKx3coEPKyr5+SycPU+7LIAHlbAL67NAQIR6th 8q1hX5GcsZToKGOhR8d0tKnm2iyE0iwXm2N3v6wl5T0Qi0SssjDzoKP6g84UE84cmb18 IiR0ZWu8XVoll+3A2hgaSI0YiyKyoaolkuwHq7tdEK1foFQN3N+uFwOkLkSXzagwePWh JiVL744vyOaZ6GD1ZMnazLnCaZ9msIrL1bwJX3yxXV37tODiAxKxEvvphLZLBNmWPVei bi0g== X-Forwarded-Encrypted: i=1; AJvYcCWxbTHZmZ5Nl4M2h7IUD4nnGeL/SDCY/EIi4uz8rwvh1X43hNfeZA/tfGspRpYUqWF94iCgGoiFcTNeXRAmUtOkcrmbMcZopkWwFjdIBy+5nMlun8I= X-Gm-Message-State: AOJu0YxvDlZ1m6XHnJnmzR6pr9XKryNmzzcEc+9QodCHPAF/jTgTv+Lq XOVJDi3fcf2wVOQ8yxYUzmi6WqDe3McfZwlyO6rRmk9TV9cFBRYA40ZCH6aD9g== 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240710_151649_015348_1BFA4D48 X-CRM114-Status: GOOD ( 15.30 ) 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 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))