reset: Add Broadcom STB RESCAL reset controller
v2 cover reset: Add Broadcom STB RESCAL reset controller
Hi Philipp,
This patch series adds support for the BCM7216 RESCAL reset controller which is necessary to initialize SATA and PCIe0/1 on that chip.
Please let us know if you have any comments. Thanks!
Changes in v2:
- binding document is in YAML format per Rob's suggestion
- indented bit definitions the same way for all definitions
- moved reset logic to the .reset() callback
- removed the XOR operation which is not necessary after clarifying with Jim that this was not necessary
- use readl_poll_timeout()
Jim Quinlan (2):
dt-bindings: reset: Document BCM7216 RESCAL reset controller
reset: Add Broadcom STB RESCAL reset controller
.../reset/brcm,bcm7216-pcie-sata-rescal.yaml | 37 ++++++ drivers/reset/Kconfig | 7 ++ drivers/reset/Makefile | 1 + drivers/reset/reset-brcmstb-rescal.c | 110 ++++++++++++++++++ 4 files changed, 155 insertions(+) create mode 100644 Documentation/devicetree/bindings/reset/brcm,bcm7216-pcie-sata-rescal.yaml create mode 100644 drivers/reset/reset-brcmstb-rescal.c
Signature · 1 line
2.17.1
PATCH v2 1/2 dt-bindings: reset: Document BCM7216 RESCAL reset controller
From: Jim Quinlan <[email protected]>
BCM7216 has a special purpose RESCAL reset controller for its SATA and PCIe0/1 instances. This is a simple reset controller with #reset-cells set to 0.
--- .../reset/brcm,bcm7216-pcie-sata-rescal.yaml | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 Documentation/devicetree/bindings/reset/brcm,bcm7216-pcie-sata-rescal.yaml
Documentation/devicetree/bindings/reset/brcm,bcm7216-pcie-sata-rescal.yaml new file +37 -0
@@ -0,0 +1,37 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +# Copyright 2020 Broadcom +%YAML 1.2 +--- +$id: "http://devicetree.org/schemas/reset/brcm,bcm7216-pcie-sata-rescal.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#" + +title: BCM7216 RESCAL reset controller + +description: This document describes the BCM7216 RESCAL reset controller which is responsible for controlling the reset of the SATA and PCIe0/1 instances on BCM7216. + +maintainers: + - Florian Fainelli <[email protected]> + - Jim Quinlan <[email protected]> + +properties: + compatible: + const: brcm,bcm7216-pcie-sata-rescal + + reg: + maxItems: 1 + + "#reset-cells": + const: 0 + +required: + - compatible + - reg + - "#reset-cells" + +examples: + - | + reset-controller@8b2c800 { + compatible = "brcm,bcm7216-pcie-sata-rescal"; + reg = <0x8b2c800 0x10>; + #reset-cells = <0>; + };
Signature · 1 line
2.17.1
PATCH v2 2/2 reset: Add Broadcom STB RESCAL reset controller
In reply to Florian FainelliFrom: Jim Quinlan <[email protected]>
On BCM7216 there is a special purpose reset controller named RESCAL (reset calibration) which is necessary for SATA and PCIe0/1 to operate correctly. This commit adds support for such a reset controller to be available.
--- drivers/reset/Kconfig | 7 ++ drivers/reset/Makefile | 1 + drivers/reset/reset-brcmstb-rescal.c | 110 +++++++++++++++++++++++++++ 3 files changed, 118 insertions(+) create mode 100644 drivers/reset/reset-brcmstb-rescal.c
drivers/reset/Kconfig +7 -0
@@ -49,6 +49,13 @@ config RESET_BRCMSTB This enables the reset controller driver for Broadcom STB SoCs using a SUN_TOP_CTRL_SW_INIT style controller. +config RESET_BRCMSTB_RESCAL + bool "Broadcom STB RESCAL reset controller" + default ARCH_BRCMSTB || COMPILE_TEST + help + This enables the RESCAL reset controller for SATA, PCIe0, or PCIe1 on + BCM7216. + config RESET_HSDK bool "Synopsys HSDK Reset Driver" depends on HAS_IOMEM
drivers/reset/Makefile +1 -0
@@ -8,6 +8,7 @@ obj-$(CONFIG_RESET_ATH79) += reset-ath79.o obj-$(CONFIG_RESET_AXS10X) += reset-axs10x.o obj-$(CONFIG_RESET_BERLIN) += reset-berlin.o obj-$(CONFIG_RESET_BRCMSTB) += reset-brcmstb.o +obj-$(CONFIG_RESET_BRCMSTB_RESCAL) += reset-brcmstb-rescal.o obj-$(CONFIG_RESET_HSDK) += reset-hsdk.o obj-$(CONFIG_RESET_IMX7) += reset-imx7.o obj-$(CONFIG_RESET_LANTIQ) += reset-lantiq.o
drivers/reset/reset-brcmstb-rescal.c new file +110 -0
110 lines not on this page · raw message
Signature · 1 line
2.17.1
Quoted 8 lines · Florian Fainelli
From: Jim Quinlan <[email protected]>
On BCM7216 there is a special purpose reset controller named RESCAL (reset calibration) which is necessary for SATA and PCIe0/1 to operate correctly. This commit adds support for such a reset controller to be available.
Signed-off-by Jim Quinlan <[email protected]>
Doh, there is a typo for Jim's email, I will wait for your feedback before submitting a v3 with that (and possibly other things) corrected.
Signature · 2 lines
-- Florian
Philipp Zabel
maintainerHi Florian,
just a few small nitpicks:
Quoted 60 lines · Florian Fainelli
From: Jim Quinlan <[email protected]>
On BCM7216 there is a special purpose reset controller named RESCAL (reset calibration) which is necessary for SATA and PCIe0/1 to operate correctly. This commit adds support for such a reset controller to be available.
Signed-off-by Jim Quinlan <[email protected]>Signed-off-by Florian Fainelli <[email protected]>--- drivers/reset/Kconfig | 7 ++ drivers/reset/Makefile | 1 + drivers/reset/reset-brcmstb-rescal.c | 110 +++++++++++++++++++++++++++ 3 files changed, 118 insertions(+) create mode 100644 drivers/reset/reset-brcmstb-rescal.cdrivers/reset/Kconfig +7
-0@@ -49,6 +49,13 @@ config RESET_BRCMSTB This enables the reset controller driver for Broadcom STB SoCs using a SUN_TOP_CTRL_SW_INIT style controller. +config RESET_BRCMSTB_RESCAL + bool "Broadcom STB RESCAL reset controller" + default ARCH_BRCMSTB || COMPILE_TEST + help + This enables the RESCAL reset controller for SATA, PCIe0, or PCIe1 on + BCM7216. + config RESET_HSDK bool "Synopsys HSDK Reset Driver" depends on HAS_IOMEMdrivers/reset/Makefile +1
-0@@ -8,6 +8,7 @@ obj-$(CONFIG_RESET_ATH79) += reset-ath79.o obj-$(CONFIG_RESET_AXS10X) += reset-axs10x.o obj-$(CONFIG_RESET_BERLIN) += reset-berlin.o obj-$(CONFIG_RESET_BRCMSTB) += reset-brcmstb.o +obj-$(CONFIG_RESET_BRCMSTB_RESCAL) += reset-brcmstb-rescal.o obj-$(CONFIG_RESET_HSDK) += reset-hsdk.o obj-$(CONFIG_RESET_IMX7) += reset-imx7.o obj-$(CONFIG_RESET_LANTIQ) += reset-lantiq.odrivers/reset/reset-brcmstb-rescal.c new file +8
-0@@ -0,0 +1,110 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2018-2020 Broadcom */ + +#include <linux/device.h> +#include <linux/iopoll.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/platform_device.h>
drivers/reset/reset-brcmstb-rescal.c line 18
Quoted 10 lines
drivers/reset/reset-brcmstb-rescal.c new file +10
-0+#include <linux/reset-controller.h> + +#define BRCM_RESCAL_START 0x0 +#define BRCM_RESCAL_START_BIT BIT(0) +#define BRCM_RESCAL_CTRL 0x4 +#define BRCM_RESCAL_STATUS 0x8 +#define BRCM_RESCAL_STATUS_BIT BIT(0) + +struct brcm_rescal_reset { +void __iomem *base;
You could replace the tab before *base with a space for consistency.
Quoted 16 lines
drivers/reset/reset-brcmstb-rescal.c new file +16
-0+struct device *dev; +struct reset_controller_dev rcdev; +}; + +static int brcm_rescal_reset_set (struct reset_controller_dev *rcdev, +unsigned long id) +{ +struct brcm_rescal_reset *data = + container_of(rcdev, struct brcm_rescal_reset, rcdev); +void __iomem *base = data->base; +u32 reg; +int ret; + + reg =readl (base +BRCM_RESCAL_START ); +writel (reg |BRCM_RESCAL_START_BIT , base +BRCM_RESCAL_START ); + reg =readl (base +BRCM_RESCAL_START );
drivers/reset/reset-brcmstb-rescal.c line 44
Quoted 10 lines
drivers/reset/reset-brcmstb-rescal.c new file +10
-0+if (!(reg &BRCM_RESCAL_START_BIT )) { +dev_err (data->dev,"failed to start SATA/PCIe rescal\n" ); +return -EIO ; + } + + ret =readl_poll_timeout (base +BRCM_RESCAL_STATUS , reg, + !(reg &BRCM_RESCAL_STATUS_BIT ),100 ,1000 ); +if (ret) { +dev_err (data->dev,"time out on SATA/PCIe rescal\n" ); +return -ETIMEDOUT ;
Just return ret here, readl_poll_timeout() already returns -ETIMEDOUT.
drivers/reset/reset-brcmstb-rescal.c line 49
Quoted 5 lines
drivers/reset/reset-brcmstb-rescal.c new file +5
-0+ } + + reg =readl (base +BRCM_RESCAL_START ); +writel (reg & ~BRCM_RESCAL_START_BIT , base +BRCM_RESCAL_START ); + (void )readl (base +BRCM_RESCAL_START );
Is this final read actually necessary (if so, why)?
Quoted 22 lines
drivers/reset/reset-brcmstb-rescal.c new file +22
-0+ +dev_dbg (data->dev,"SATA/PCIe rescal success\n" ); + +return 0 ; +} + +static int brcm_rescal_reset_xlate (struct reset_controller_dev *rcdev, +const struct of_phandle_args *reset_spec) +{ +/* This is needed if #reset-cells == 0. */ +return 0 ; +} + +static const struct reset_control_ops brcm_rescal_reset_ops = { + .reset = brcm_rescal_reset_set, +}; + +static int brcm_rescal_reset_probe (struct platform_device *pdev) +{ +struct brcm_rescal_reset *data; +struct resource *res; +
drivers/reset/reset-brcmstb-rescal.c line 81
Quoted 10 lines
drivers/reset/reset-brcmstb-rescal.c new file +10
-0+ data =devm_kzalloc (&pdev->dev,sizeof (*data),GFP_KERNEL ); +if (!data) +return -ENOMEM ; + + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); + data->base =devm_ioremap_resource (&pdev->dev, res); +if (IS_ERR (data->base)) +return PTR_ERR (data->base); + +platform_set_drvdata (pdev, data);
This can be dropped.
regards
Philipp