From: Florian Fainelli <florian.fainelli@broadcom.com>
To: "Rafał Miłecki" <zajec5@gmail.com>,
"Lorenzo Pieralisi" <lorenzo.pieralisi@arm.com>
Cc: "Bjorn Helgaas" <bhelgaas@google.com>,
"Rob Herring" <robh+dt@kernel.org>,
linux-pci@vger.kernel.org, devicetree@vger.kernel.org,
"Florian Fainelli" <f.fainelli@gmail.com>,
"Nicolas Saenz Julienne" <nsaenzjulienne@suse.de>,
"Philipp Zabel" <p.zabel@pengutronix.de>,
linux-rpi-kernel@lists.infradead.org,
linux-arm-kernel@lists.infradead.org,
bcm-kernel-feedback-list@broadcom.com,
"Rafał Miłecki" <rafal@milecki.pl>
Subject: Re: [PATCH 2/2] PCI: brcmstb: support BCM4908 with external PERST# signal controller
Date: Fri, 27 Nov 2020 21:01:39 -0800 [thread overview]
Message-ID: <1e18fd61-594f-499f-d7a0-1de54b9f9a45@broadcom.com> (raw)
In-Reply-To: <20201126135939.21982-3-zajec5@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 3165 bytes --]
On 11/26/2020 5:59 AM, Rafał Miłecki wrote:
> From: Rafał Miłecki <rafal@milecki.pl>
>
> BCM4908 uses external MISC block for controlling PERST# signal. Use it
> as a reset controller.
>
> Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
> ---
> enum pcie_type {
> + BCM4908,
> GENERIC,
This needs to be moved after GENERIC such that GENERIC == 0
> BCM7278,
> BCM2711,
> @@ -230,6 +233,13 @@ static const struct pcie_cfg_data generic_cfg = {
> .bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic,
> };
>
> +static const struct pcie_cfg_data bcm4908_cfg = {
> + .offsets = pcie_offsets,
> + .type = BCM4908,
> + .perst_set = brcm_pcie_perst_set_4908,
> + .bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic,
> +};
> +
> static const int pcie_offset_bcm7278[] = {
> [RGR1_SW_INIT_1] = 0xc010,
> [EXT_CFG_INDEX] = 0x9000,
> @@ -282,6 +292,7 @@ struct brcm_pcie {
> const int *reg_offsets;
> enum pcie_type type;
> struct reset_control *rescal;
> + struct reset_control *perst_reset;
> int num_memc;
> u64 memc_size[PCIE_BRCM_MAX_MEMC];
> u32 hw_rev;
> @@ -747,6 +758,18 @@ static inline void brcm_pcie_bridge_sw_init_set_7278(struct brcm_pcie *pcie, u32
> writel(tmp, pcie->base + PCIE_RGR1_SW_INIT_1(pcie));
> }
>
> +static inline void brcm_pcie_perst_set_4908(struct brcm_pcie *pcie, u32 val)
> +{
> + if (WARN_ONCE(!pcie->perst_reset, "missing PERST# reset controller\n") ||
> + WARN_ONCE(pcie->hw_rev >= BRCM_PCIE_HW_REV_3_20, "unsupported hardware revision\n"))
> + return;
> +
> + if (val)
> + reset_control_assert(pcie->perst_reset);
> + else
> + reset_control_deassert(pcie->perst_reset);
> +}
> +
> static inline void brcm_pcie_perst_set_7278(struct brcm_pcie *pcie, u32 val)
> {
> u32 tmp;
> @@ -1206,6 +1229,7 @@ static int brcm_pcie_remove(struct platform_device *pdev)
>
> 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 },
> @@ -1262,11 +1286,18 @@ static int brcm_pcie_probe(struct platform_device *pdev)
> clk_disable_unprepare(pcie->clk);
> return PTR_ERR(pcie->rescal);
> }
> + pcie->perst_reset = devm_reset_control_get_optional_shared(&pdev->dev, "perst");
Is not this an exclusive reset?
> + if (IS_ERR(pcie->perst_reset)) {
> + clk_disable_unprepare(pcie->clk);
> + return PTR_ERR(pcie->perst_reset);
> + }
>
> ret = reset_control_deassert(pcie->rescal);
> if (ret)
> dev_err(&pdev->dev, "failed to deassert 'rescal'\n");
>
> + pcie->hw_rev = readl(pcie->base + PCIE_MISC_REVISION);
This is likely going to cause a regression on STB, you cannot read from
most PCIe registers except the main bridge register until after
brcm_pcie_setup() has been called. I do not find the warning on an
unknown revision to be particularly helpful, can you consider leaving
the hw_rev read where it is and not warn?
--
Florian
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4178 bytes --]
prev parent reply other threads:[~2020-11-28 18:00 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-26 13:59 [PATCH 0/2] brcmstb: initial work on BCM4908 Rafał Miłecki
2020-11-26 13:59 ` [PATCH 1/2] dt-bindings: PCI: brcmstb: add BCM4908 binding Rafał Miłecki
2020-11-28 4:56 ` Florian Fainelli
2020-11-26 13:59 ` [PATCH 2/2] PCI: brcmstb: support BCM4908 with external PERST# signal controller Rafał Miłecki
2020-11-28 5:01 ` Florian Fainelli [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1e18fd61-594f-499f-d7a0-1de54b9f9a45@broadcom.com \
--to=florian.fainelli@broadcom.com \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=bhelgaas@google.com \
--cc=devicetree@vger.kernel.org \
--cc=f.fainelli@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=nsaenzjulienne@suse.de \
--cc=p.zabel@pengutronix.de \
--cc=rafal@milecki.pl \
--cc=robh+dt@kernel.org \
--cc=zajec5@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).