From: Dmitry Osipenko <digetx@gmail.com>
To: "Thierry Reding" <thierry.reding@gmail.com>,
"Jonathan Hunter" <jonathanh@nvidia.com>,
"Ulf Hansson" <ulf.hansson@linaro.org>,
"Viresh Kumar" <vireshk@kernel.org>,
"Stephen Boyd" <sboyd@kernel.org>,
"Peter De Schrijver" <pdeschrijver@nvidia.com>,
"Mikko Perttunen" <mperttunen@nvidia.com>,
"Lee Jones" <lee.jones@linaro.org>,
"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
"Nishanth Menon" <nm@ti.com>,
"Adrian Hunter" <adrian.hunter@intel.com>,
"Michael Turquette" <mturquette@baylibre.com>
Cc: linux-kernel@vger.kernel.org, linux-tegra@vger.kernel.org,
linux-pm@vger.kernel.org, linux-pwm@vger.kernel.org,
linux-mmc@vger.kernel.org, dri-devel@lists.freedesktop.org,
linux-clk@vger.kernel.org, David Heidelberg <david@ixit.cz>
Subject: [PATCH v15 28/39] soc/tegra: fuse: Use resource-managed helpers
Date: Sun, 14 Nov 2021 22:34:24 +0300 [thread overview]
Message-ID: <20211114193435.7705-29-digetx@gmail.com> (raw)
In-Reply-To: <20211114193435.7705-1-digetx@gmail.com>
Use resource-managed helpers to make code cleaner and more correct,
properly releasing all resources in case of driver probe error.
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
---
drivers/soc/tegra/fuse/fuse-tegra.c | 32 ++++++++++++++------------
drivers/soc/tegra/fuse/fuse-tegra20.c | 33 ++++++++++++++++++++++++---
2 files changed, 48 insertions(+), 17 deletions(-)
diff --git a/drivers/soc/tegra/fuse/fuse-tegra.c b/drivers/soc/tegra/fuse/fuse-tegra.c
index cc032729a143..fe4f935ce73a 100644
--- a/drivers/soc/tegra/fuse/fuse-tegra.c
+++ b/drivers/soc/tegra/fuse/fuse-tegra.c
@@ -182,6 +182,12 @@ static const struct nvmem_cell_info tegra_fuse_cells[] = {
},
};
+static void tegra_fuse_restore(void *base)
+{
+ fuse->clk = NULL;
+ fuse->base = base;
+}
+
static int tegra_fuse_probe(struct platform_device *pdev)
{
void __iomem *base = fuse->base;
@@ -189,13 +195,16 @@ static int tegra_fuse_probe(struct platform_device *pdev)
struct resource *res;
int err;
+ err = devm_add_action(&pdev->dev, tegra_fuse_restore, base);
+ if (err)
+ return err;
+
/* take over the memory region from the early initialization */
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
fuse->phys = res->start;
fuse->base = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(fuse->base)) {
err = PTR_ERR(fuse->base);
- fuse->base = base;
return err;
}
@@ -205,19 +214,20 @@ static int tegra_fuse_probe(struct platform_device *pdev)
dev_err(&pdev->dev, "failed to get FUSE clock: %ld",
PTR_ERR(fuse->clk));
- fuse->base = base;
return PTR_ERR(fuse->clk);
}
platform_set_drvdata(pdev, fuse);
fuse->dev = &pdev->dev;
- pm_runtime_enable(&pdev->dev);
+ err = devm_pm_runtime_enable(&pdev->dev);
+ if (err)
+ return err;
if (fuse->soc->probe) {
err = fuse->soc->probe(fuse);
if (err < 0)
- goto restore;
+ return err;
}
memset(&nvmem, 0, sizeof(nvmem));
@@ -241,7 +251,7 @@ static int tegra_fuse_probe(struct platform_device *pdev)
err = PTR_ERR(fuse->nvmem);
dev_err(&pdev->dev, "failed to register NVMEM device: %d\n",
err);
- goto restore;
+ return err;
}
fuse->rst = devm_reset_control_get_optional(&pdev->dev, "fuse");
@@ -249,7 +259,7 @@ static int tegra_fuse_probe(struct platform_device *pdev)
err = PTR_ERR(fuse->rst);
dev_err(&pdev->dev, "failed to get FUSE reset: %pe\n",
fuse->rst);
- goto restore;
+ return err;
}
/*
@@ -258,26 +268,20 @@ static int tegra_fuse_probe(struct platform_device *pdev)
*/
err = pm_runtime_resume_and_get(&pdev->dev);
if (err)
- goto restore;
+ return err;
err = reset_control_reset(fuse->rst);
pm_runtime_put(&pdev->dev);
if (err < 0) {
dev_err(&pdev->dev, "failed to reset FUSE: %d\n", err);
- goto restore;
+ return err;
}
/* release the early I/O memory mapping */
iounmap(base);
return 0;
-
-restore:
- fuse->clk = NULL;
- fuse->base = base;
- pm_runtime_disable(&pdev->dev);
- return err;
}
static int __maybe_unused tegra_fuse_runtime_resume(struct device *dev)
diff --git a/drivers/soc/tegra/fuse/fuse-tegra20.c b/drivers/soc/tegra/fuse/fuse-tegra20.c
index 8ec9fc5e5e4b..12503f563e36 100644
--- a/drivers/soc/tegra/fuse/fuse-tegra20.c
+++ b/drivers/soc/tegra/fuse/fuse-tegra20.c
@@ -94,9 +94,28 @@ static bool dma_filter(struct dma_chan *chan, void *filter_param)
return of_device_is_compatible(np, "nvidia,tegra20-apbdma");
}
+static void tegra20_fuse_release_channel(void *data)
+{
+ struct tegra_fuse *fuse = data;
+
+ dma_release_channel(fuse->apbdma.chan);
+ fuse->apbdma.chan = NULL;
+}
+
+static void tegra20_fuse_free_coherent(void *data)
+{
+ struct tegra_fuse *fuse = data;
+
+ dma_free_coherent(fuse->dev, sizeof(u32), fuse->apbdma.virt,
+ fuse->apbdma.phys);
+ fuse->apbdma.virt = NULL;
+ fuse->apbdma.phys = 0x0;
+}
+
static int tegra20_fuse_probe(struct tegra_fuse *fuse)
{
dma_cap_mask_t mask;
+ int err;
dma_cap_zero(mask);
dma_cap_set(DMA_SLAVE, mask);
@@ -105,13 +124,21 @@ static int tegra20_fuse_probe(struct tegra_fuse *fuse)
if (!fuse->apbdma.chan)
return -EPROBE_DEFER;
+ err = devm_add_action_or_reset(fuse->dev, tegra20_fuse_release_channel,
+ fuse);
+ if (err)
+ return err;
+
fuse->apbdma.virt = dma_alloc_coherent(fuse->dev, sizeof(u32),
&fuse->apbdma.phys,
GFP_KERNEL);
- if (!fuse->apbdma.virt) {
- dma_release_channel(fuse->apbdma.chan);
+ if (!fuse->apbdma.virt)
return -ENOMEM;
- }
+
+ err = devm_add_action_or_reset(fuse->dev, tegra20_fuse_free_coherent,
+ fuse);
+ if (err)
+ return err;
fuse->apbdma.config.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
fuse->apbdma.config.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
--
2.33.1
next prev parent reply other threads:[~2021-11-14 19:46 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-14 19:33 [PATCH v15 00/39] NVIDIA Tegra power management patches for 5.17 Dmitry Osipenko
2021-11-14 19:33 ` [PATCH v15 01/39] soc/tegra: Enable runtime PM during OPP state-syncing Dmitry Osipenko
2021-11-14 19:33 ` [PATCH v15 02/39] soc/tegra: Add devm_tegra_core_dev_init_opp_table_common() Dmitry Osipenko
2021-11-14 19:33 ` [PATCH v15 03/39] soc/tegra: Don't print error message when OPPs not available Dmitry Osipenko
2021-11-14 19:34 ` [PATCH v15 04/39] dt-bindings: clock: tegra-car: Document new clock sub-nodes Dmitry Osipenko
2021-11-14 19:34 ` [PATCH v15 05/39] clk: tegra: Support runtime PM and power domain Dmitry Osipenko
2021-11-14 19:34 ` [PATCH v15 06/39] dt-bindings: host1x: Document OPP and power domain properties Dmitry Osipenko
2021-11-14 19:34 ` [PATCH v15 07/39] dt-bindings: host1x: Document Memory Client resets of Host1x, GR2D and GR3D Dmitry Osipenko
2021-11-14 19:34 ` [PATCH v15 08/39] gpu: host1x: Add initial runtime PM and OPP support Dmitry Osipenko
2021-11-14 19:34 ` [PATCH v15 09/39] gpu: host1x: Add host1x_channel_stop() Dmitry Osipenko
2021-11-14 19:34 ` [PATCH v15 10/39] drm/tegra: dc: Support OPP and SoC core voltage scaling Dmitry Osipenko
2021-11-14 19:34 ` [PATCH v15 11/39] drm/tegra: hdmi: Add OPP support Dmitry Osipenko
2021-11-14 19:34 ` [PATCH v15 12/39] drm/tegra: gr2d: Support generic power domain and runtime PM Dmitry Osipenko
2021-11-28 5:47 ` Michał Mirosław
2021-11-28 21:50 ` Dmitry Osipenko
2021-11-14 19:34 ` [PATCH v15 13/39] drm/tegra: gr3d: " Dmitry Osipenko
2021-11-14 19:34 ` [PATCH v15 14/39] drm/tegra: vic: Stop channel on suspend Dmitry Osipenko
2021-11-14 19:34 ` [PATCH v15 15/39] drm/tegra: nvdec: " Dmitry Osipenko
2021-11-14 19:34 ` [PATCH v15 16/39] drm/tegra: submit: Remove pm_runtime_enabled() checks Dmitry Osipenko
2021-11-14 19:34 ` [PATCH v15 17/39] drm/tegra: submit: Add missing pm_runtime_mark_last_busy() Dmitry Osipenko
2021-11-14 19:34 ` [PATCH v15 18/39] usb: chipidea: tegra: Add runtime PM and OPP support Dmitry Osipenko
2021-11-14 19:34 ` [PATCH v15 19/39] bus: tegra-gmi: " Dmitry Osipenko
2021-11-14 19:34 ` [PATCH v15 20/39] pwm: tegra: " Dmitry Osipenko
2021-11-14 19:34 ` [PATCH v15 21/39] mmc: sdhci-tegra: " Dmitry Osipenko
2021-11-14 19:34 ` [PATCH v15 22/39] mtd: rawnand: tegra: " Dmitry Osipenko
2021-11-14 19:34 ` [PATCH v15 23/39] spi: tegra20-slink: Add " Dmitry Osipenko
2021-11-14 19:34 ` [PATCH v15 24/39] media: dt: bindings: tegra-vde: Convert to schema Dmitry Osipenko
2021-11-14 19:34 ` [PATCH v15 25/39] media: dt: bindings: tegra-vde: Document OPP and power domain Dmitry Osipenko
2021-11-14 19:34 ` [PATCH v15 26/39] media: staging: tegra-vde: Support generic " Dmitry Osipenko
2021-11-14 19:34 ` [PATCH v15 27/39] soc/tegra: fuse: Reset hardware Dmitry Osipenko
2021-11-14 19:34 ` Dmitry Osipenko [this message]
2021-11-14 19:34 ` [PATCH v15 29/39] soc/tegra: regulators: Prepare for suspend Dmitry Osipenko
2021-11-14 19:34 ` [PATCH v15 30/39] soc/tegra: pmc: Rename 3d power domains Dmitry Osipenko
2021-11-14 19:34 ` [PATCH v15 31/39] soc/tegra: pmc: Rename core power domain Dmitry Osipenko
2021-11-14 19:34 ` [PATCH v15 32/39] soc/tegra: pmc: Enable core domain support for Tegra20 and Tegra30 Dmitry Osipenko
2021-11-14 19:34 ` [PATCH v15 33/39] ARM: tegra: Rename CPU and EMC OPP table device-tree nodes Dmitry Osipenko
2021-11-14 19:34 ` [PATCH v15 34/39] ARM: tegra: Add 500MHz entry to Tegra30 memory OPP table Dmitry Osipenko
2021-11-14 19:34 ` [PATCH v15 35/39] ARM: tegra: Add OPP tables and power domains to Tegra20 device-trees Dmitry Osipenko
2021-11-14 19:34 ` [PATCH v15 36/39] ARM: tegra: Add OPP tables and power domains to Tegra30 device-trees Dmitry Osipenko
2021-11-14 19:34 ` [PATCH v15 37/39] ARM: tegra: Add Memory Client resets to Tegra20 GR2D, GR3D and Host1x Dmitry Osipenko
2021-11-14 19:34 ` [PATCH v15 38/39] ARM: tegra: Add Memory Client resets to Tegra30 " Dmitry Osipenko
2021-11-14 19:34 ` [PATCH v15 39/39] ARM: tegra20/30: Disable unused host1x hardware Dmitry Osipenko
2021-11-28 5:40 ` [PATCH v15 00/39] NVIDIA Tegra power management patches for 5.17 Michał Mirosław
2021-11-28 22:03 ` Dmitry Osipenko
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=20211114193435.7705-29-digetx@gmail.com \
--to=digetx@gmail.com \
--cc=adrian.hunter@intel.com \
--cc=david@ixit.cz \
--cc=dri-devel@lists.freedesktop.org \
--cc=jonathanh@nvidia.com \
--cc=lee.jones@linaro.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-pwm@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=mperttunen@nvidia.com \
--cc=mturquette@baylibre.com \
--cc=nm@ti.com \
--cc=pdeschrijver@nvidia.com \
--cc=sboyd@kernel.org \
--cc=thierry.reding@gmail.com \
--cc=u.kleine-koenig@pengutronix.de \
--cc=ulf.hansson@linaro.org \
--cc=vireshk@kernel.org \
/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).