PCI: armada8k: Fix clock resource for Armada 7K/8K
v2 cover PCI: armada8k: Fix clock resource for Armada 7K/8K
Hi,
This short series fixes the way the clocks are used for the PCIe host controller embedded in the Marvell Armada 7K/8K SoCs. On these SoCs a second one is needed in order to clock the registers. It was not noticed until now because we relied on the bootloader and also because the clock driver was wrong.
Thanks to this fix, it would be possible to fix the clock driver without introducing a regression.
The first patch is just a small cleanup found when I wrote the main patch.
Changelog:
v1 -> v2:
- Removed a unneeded new line in the binding documentation, pointed by Thomas Petazzoni.
- Added a new line in driver code, pointed by Thomas Petazzoni.
- Managed the failure of clk_prepare_enable for the clk_reg in a separate case, pointed by Thomas Petazzoni.
- Simplified the -EPROBE_DEFER case for the clk_reg, suggested by Russell King
- Added backed the line getting the reg clock that disappeared in the first version.
Gregory CLEMENT (2):
PCI: armada8k: Remove useless test before clk_disable_unprepare
PCI: armada8k: Fix clock resource by adding a register clock
.../devicetree/bindings/pci/pci-armada8k.txt | 5 ++++- drivers/pci/dwc/pcie-armada8k.c | 21 +++++++++++++++++---- 2 files changed, 21 insertions(+), 5 deletions(-)
Signature · 1 line
2.16.1
PATCH v2 1/2 PCI: armada8k: Remove useless test before clk_disable_unprepare
clk_disable_unprepare() already checks that the clock pointer is valid. No need to test it before calling it.
--- drivers/pci/dwc/pcie-armada8k.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/pci/dwc/pcie-armada8k.c +1 -2
@@ -247,8 +247,7 @@ static int armada8k_pcie_probe(struct platform_device *pdev)return 0 ; fail: -if (!IS_ERR (pcie->clk)) -clk_disable_unprepare (pcie->clk); +clk_disable_unprepare (pcie->clk);return ret; }
Signature · 1 line
2.16.1
PATCH v2 2/2 PCI: armada8k: Fix clock resource by adding a register clock
In reply to Gregory CLEMENTOn Armada 7K/8K we need to explicitly enable the register clock. This clock is optional because not all the SoCs using this IP need it but at least for Armada 7K/8K it is actually mandatory.
The binding documentation is updated accordingly.
--- Documentation/devicetree/bindings/pci/pci-armada8k.txt | 5 ++++- drivers/pci/dwc/pcie-armada8k.c | 18 ++++++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-)
Documentation/devicetree/bindings/pci/pci-armada8k.txt +4 -1
@@ -12,7 +12,10 @@ Required properties: - "ctrl" for the control register region - "config" for the config space region - interrupts: Interrupt specifier for the PCIe controler -- clocks: reference to the PCIe controller clock +- clocks: reference to the PCIe controller clocks +- clock-names: mandatory if there is a second clock, in this case the + name must be "core" for the first clock and "reg" for the second + one Example:
drivers/pci/dwc/pcie-armada8k.c +16 -2
@@ -28,6 +28,7 @@struct armada8k_pcie {struct dw_pcie *pci;struct clk *clk; +struct clk *clk_reg; };#define PCIE_VENDOR_REGS_OFFSET 0x8000
@@ -229,23 +230,36 @@ static int armada8k_pcie_probe(struct platform_device *pdev)if (ret)return ret; + pcie->clk_reg =devm_clk_get (dev,"reg" ); +if (pcie->clk_reg ==ERR_PTR (-EPROBE_DEFER )) { + ret = -EPROBE_DEFER ; + goto fail; + } +if (!IS_ERR (pcie->clk_reg)) { + ret =clk_prepare_enable (pcie->clk_reg); +if (ret) + goto fail_clkreg; + } +/* Get the dw-pcie unit configuration/control registers base. */ base =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"ctrl" ); pci->dbi_base =devm_pci_remap_cfg_resource (dev, base);if (IS_ERR (pci->dbi_base)) {dev_err (dev,"couldn't remap regs base %p\n" , base); ret =PTR_ERR (pci->dbi_base); - goto fail; + goto fail_clkreg; }platform_set_drvdata (pdev, pcie); ret =armada8k_add_pcie_port (pcie, pdev);if (ret) - goto fail; + goto fail_clkreg;return 0 ; +fail_clkreg: +clk_disable_unprepare (pcie->clk_reg); fail:clk_disable_unprepare (pcie->clk);
Signature · 1 line
2.16.1
Lorenzo Pieralisi
Appliedv2 cover PCI: armada8k: Fix clock resource for Armada 7K/8K
In reply to Gregory CLEMENTQuoted 31 lines · Gregory CLEMENT
Hi,
This short series fixes the way the clocks are used for the PCIe host controller embedded in the Marvell Armada 7K/8K SoCs. On these SoCs a second one is needed in order to clock the registers. It was not noticed until now because we relied on the bootloader and also because the clock driver was wrong.
Thanks to this fix, it would be possible to fix the clock driver without introducing a regression.
The first patch is just a small cleanup found when I wrote the main patch.
Changelog:
v1 -> v2:- Removed a unneeded new line in the binding documentation, pointed by Thomas Petazzoni.
- Added a new line in driver code, pointed by Thomas Petazzoni.
- Managed the failure of
clk_prepare_enablefor theclk_regin a separate case, pointed by Thomas Petazzoni.- Simplified the -EPROBE_DEFER case for the
clk_reg, suggested by Russell King- Added backed the line getting the reg clock that disappeared in the first version.
Quoted 7 lines
Gregory CLEMENT (2):
PCI: armada8k: Remove useless test beforeclk_disable_unprepare
PCI: armada8k: Fix clock resource by adding a register clock.../devicetree/bindings/pci/pci-armada8k.txt | 5 ++++- drivers/pci/dwc/pcie-armada8k.c | 21 +++++++++++++++++---- 2 files changed, 21 insertions(+), 5 deletions(-)
Applied to pci/armada8k for v4.17, thank you.
Lorenzo