* [PATCH v3 0/2] ata: ahci_brcm: Fix use of BCM7216 reset controller
@ 2020-11-20 20:38 Jim Quinlan
2020-11-20 20:38 ` [PATCH v3 2/2] PCI: brcmstb: use reset/rearm instead of deassert/assert Jim Quinlan
0 siblings, 1 reply; 2+ messages in thread
From: Jim Quinlan @ 2020-11-20 20:38 UTC (permalink / raw)
To: Philipp Zabel, Hans de Goede, Jens Axboe,
bcm-kernel-feedback-list, james.quinlan
Cc: Florian Fainelli,
moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE,
open list:LIBATA SUBSYSTEM (Serial and Parallel ATA drivers),
open list, open list:PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS,
moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE,
Rob Herring
[-- Attachment #1: Type: text/plain, Size: 1086 bytes --]
v3 -- discard commit from v2; instead relay on the new function
reset_control_rearm provided in a recent commit [1] applied
to reset/next.
-- New commit to correct pcie-brcmstb.c usage of a reset controller
to use reset/rearm verses deassert/assert.
v2 -- refactor rescal-reset driver to implement assert/deassert rather than
reset because the reset call only fires once per lifetime and we need
to reset after every resume from S2 or S3.
-- Split the use of "ahci" and "rescal" controllers in separate fields
to keep things simple.
v1 -- original
[1] Applied commit "reset: make shared pulsed reset controls re-triggerable"
found at git://git.pengutronix.de/git/pza/linux.git
branch reset/shared-retrigger
Jim Quinlan (2):
ata: ahci_brcm: Fix use of BCM7216 reset controller
PCI: brcmstb: use reset/rearm instead of deassert/assert
drivers/ata/ahci_brcm.c | 46 +++++++++++++--------------
drivers/pci/controller/pcie-brcmstb.c | 19 +++++++----
2 files changed, 36 insertions(+), 29 deletions(-)
--
2.17.1
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4167 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH v3 2/2] PCI: brcmstb: use reset/rearm instead of deassert/assert
2020-11-20 20:38 [PATCH v3 0/2] ata: ahci_brcm: Fix use of BCM7216 reset controller Jim Quinlan
@ 2020-11-20 20:38 ` Jim Quinlan
0 siblings, 0 replies; 2+ messages in thread
From: Jim Quinlan @ 2020-11-20 20:38 UTC (permalink / raw)
To: Philipp Zabel, Hans de Goede, Jens Axboe,
bcm-kernel-feedback-list, james.quinlan
Cc: Nicolas Saenz Julienne, Lorenzo Pieralisi, Rob Herring,
Bjorn Helgaas, Florian Fainelli,
moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE,
moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE,
open list:PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS, open list
[-- Attachment #1: Type: text/plain, Size: 2287 bytes --]
The Brcmstb PCIe RC uses a reset control "rescal" for certain chips. This
reset implements a "pulse reset" so it matches more the reset/rearm
calls instead of the deassert/assert calls.
Also, add reset_control calls in suspend/resume functions.
Signed-off-by: Jim Quinlan <james.quinlan@broadcom.com>
---
drivers/pci/controller/pcie-brcmstb.c | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
index bea86899bd5d..b9745ac2ee0b 100644
--- a/drivers/pci/controller/pcie-brcmstb.c
+++ b/drivers/pci/controller/pcie-brcmstb.c
@@ -1138,6 +1138,7 @@ static int brcm_pcie_suspend(struct device *dev)
brcm_pcie_turn_off(pcie);
ret = brcm_phy_stop(pcie);
+ reset_control_rearm(pcie->rescal);
clk_disable_unprepare(pcie->clk);
return ret;
@@ -1153,9 +1154,13 @@ static int brcm_pcie_resume(struct device *dev)
base = pcie->base;
clk_prepare_enable(pcie->clk);
+ ret = reset_control_reset(pcie->rescal);
+ if (ret)
+ goto err0;
+
ret = brcm_phy_start(pcie);
if (ret)
- goto err;
+ goto err1;
/* Take bridge out of reset so we can access the SERDES reg */
pcie->bridge_sw_init_set(pcie, 0);
@@ -1170,14 +1175,16 @@ static int brcm_pcie_resume(struct device *dev)
ret = brcm_pcie_setup(pcie);
if (ret)
- goto err;
+ goto err1;
if (pcie->msi)
brcm_msi_set_regs(pcie->msi);
return 0;
-err:
+err1:
+ reset_control_rearm(pcie->rescal);
+err0:
clk_disable_unprepare(pcie->clk);
return ret;
}
@@ -1187,7 +1194,7 @@ static void __brcm_pcie_remove(struct brcm_pcie *pcie)
brcm_msi_remove(pcie);
brcm_pcie_turn_off(pcie);
brcm_phy_stop(pcie);
- reset_control_assert(pcie->rescal);
+ reset_control_rearm(pcie->rescal);
clk_disable_unprepare(pcie->clk);
}
@@ -1262,13 +1269,13 @@ static int brcm_pcie_probe(struct platform_device *pdev)
return PTR_ERR(pcie->rescal);
}
- ret = reset_control_deassert(pcie->rescal);
+ ret = reset_control_reset(pcie->rescal);
if (ret)
dev_err(&pdev->dev, "failed to deassert 'rescal'\n");
ret = brcm_phy_start(pcie);
if (ret) {
- reset_control_assert(pcie->rescal);
+ reset_control_rearm(pcie->rescal);
clk_disable_unprepare(pcie->clk);
return ret;
}
--
2.17.1
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4167 bytes --]
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-11-20 20:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-20 20:38 [PATCH v3 0/2] ata: ahci_brcm: Fix use of BCM7216 reset controller Jim Quinlan
2020-11-20 20:38 ` [PATCH v3 2/2] PCI: brcmstb: use reset/rearm instead of deassert/assert Jim Quinlan
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).