From: Dmitry Osipenko <digetx@gmail.com> To: Thierry Reding <thierry.reding@gmail.com>, Jonathan Hunter <jonathanh@nvidia.com>, Georgi Djakov <georgi.djakov@linaro.org>, Rob Herring <robh+dt@kernel.org>, Michael Turquette <mturquette@baylibre.com>, Stephen Boyd <sboyd@kernel.org>, Peter De Schrijver <pdeschrijver@nvidia.com>, MyungJoo Ham <myungjoo.ham@samsung.com>, Kyungmin Park <kyungmin.park@samsung.com>, Chanwoo Choi <cw00.choi@samsung.com>, Mikko Perttunen <cyndis@kapsi.fi>, Viresh Kumar <vireshk@kernel.org>, Peter Geis <pgwipeout@gmail.com>, Nicolas Chauvet <kwizart@gmail.com>, Krzysztof Kozlowski <krzk@kernel.org> Cc: linux-tegra@vger.kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH v8 08/26] memory: tegra30-emc: Continue probing if timings are missing in device-tree Date: Wed, 11 Nov 2020 04:14:38 +0300 [thread overview] Message-ID: <20201111011456.7875-9-digetx@gmail.com> (raw) In-Reply-To: <20201111011456.7875-1-digetx@gmail.com> EMC driver will become mandatory after turning it into interconnect provider because interconnect users, like display controller driver, will fail to probe using newer device-trees that have interconnect properties. Thus make EMC driver to probe even if timings are missing in device-tree. Signed-off-by: Dmitry Osipenko <digetx@gmail.com> --- drivers/memory/tegra/tegra30-emc.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/drivers/memory/tegra/tegra30-emc.c b/drivers/memory/tegra/tegra30-emc.c index d0926088360a..3488786da03b 100644 --- a/drivers/memory/tegra/tegra30-emc.c +++ b/drivers/memory/tegra/tegra30-emc.c @@ -988,6 +988,11 @@ static struct device_node *emc_find_node_by_ram_code(struct device *dev) u32 value, ram_code; int err; + if (of_get_child_count(dev->of_node) == 0) { + dev_info(dev, "device-tree doesn't have memory timings\n"); + return NULL; + } + ram_code = tegra_read_ram_code(); for_each_child_of_node(dev->of_node, np) { @@ -1057,6 +1062,9 @@ static long emc_round_rate(unsigned long rate, struct tegra_emc *emc = arg; unsigned int i; + if (!emc->num_timings) + return clk_get_rate(emc->clk); + min_rate = min(min_rate, emc->timings[emc->num_timings - 1].rate); for (i = 0; i < emc->num_timings; i++) { @@ -1262,16 +1270,6 @@ static int tegra_emc_probe(struct platform_device *pdev) struct tegra_emc *emc; int err; - if (of_get_child_count(pdev->dev.of_node) == 0) { - dev_info(&pdev->dev, - "device-tree node doesn't have memory timings\n"); - return -ENODEV; - } - - np = emc_find_node_by_ram_code(&pdev->dev); - if (!np) - return -EINVAL; - emc = devm_kzalloc(&pdev->dev, sizeof(*emc), GFP_KERNEL); if (!emc) { of_node_put(np); @@ -1285,10 +1283,13 @@ static int tegra_emc_probe(struct platform_device *pdev) emc->clk_nb.notifier_call = emc_clk_change_notify; emc->dev = &pdev->dev; - err = emc_load_timings_from_dt(emc, np); - of_node_put(np); - if (err) - return err; + np = emc_find_node_by_ram_code(&pdev->dev); + if (np) { + err = emc_load_timings_from_dt(emc, np); + of_node_put(np); + if (err) + return err; + } emc->regs = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(emc->regs)) -- 2.29.2
WARNING: multiple messages have this Message-ID (diff)
From: Dmitry Osipenko <digetx@gmail.com> To: Thierry Reding <thierry.reding@gmail.com>, Jonathan Hunter <jonathanh@nvidia.com>, Georgi Djakov <georgi.djakov@linaro.org>, Rob Herring <robh+dt@kernel.org>, Michael Turquette <mturquette@baylibre.com>, Stephen Boyd <sboyd@kernel.org>, Peter De Schrijver <pdeschrijver@nvidia.com>, MyungJoo Ham <myungjoo.ham@samsung.com>, Kyungmin Park <kyungmin.park@samsung.com>, Chanwoo Choi <cw00.choi@samsung.com>, Mikko Perttunen <cyndis@kapsi.fi>, Viresh Kumar <vireshk@kernel.org>, Peter Geis <pgwipeout@gmail.com>, Nicolas Chauvet <kwizart@gmail.com>, Krzysztof Kozlowski <krzk@kernel.org> Cc: linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-pm@vger.kernel.org Subject: [PATCH v8 08/26] memory: tegra30-emc: Continue probing if timings are missing in device-tree Date: Wed, 11 Nov 2020 04:14:38 +0300 [thread overview] Message-ID: <20201111011456.7875-9-digetx@gmail.com> (raw) In-Reply-To: <20201111011456.7875-1-digetx@gmail.com> EMC driver will become mandatory after turning it into interconnect provider because interconnect users, like display controller driver, will fail to probe using newer device-trees that have interconnect properties. Thus make EMC driver to probe even if timings are missing in device-tree. Signed-off-by: Dmitry Osipenko <digetx@gmail.com> --- drivers/memory/tegra/tegra30-emc.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/drivers/memory/tegra/tegra30-emc.c b/drivers/memory/tegra/tegra30-emc.c index d0926088360a..3488786da03b 100644 --- a/drivers/memory/tegra/tegra30-emc.c +++ b/drivers/memory/tegra/tegra30-emc.c @@ -988,6 +988,11 @@ static struct device_node *emc_find_node_by_ram_code(struct device *dev) u32 value, ram_code; int err; + if (of_get_child_count(dev->of_node) == 0) { + dev_info(dev, "device-tree doesn't have memory timings\n"); + return NULL; + } + ram_code = tegra_read_ram_code(); for_each_child_of_node(dev->of_node, np) { @@ -1057,6 +1062,9 @@ static long emc_round_rate(unsigned long rate, struct tegra_emc *emc = arg; unsigned int i; + if (!emc->num_timings) + return clk_get_rate(emc->clk); + min_rate = min(min_rate, emc->timings[emc->num_timings - 1].rate); for (i = 0; i < emc->num_timings; i++) { @@ -1262,16 +1270,6 @@ static int tegra_emc_probe(struct platform_device *pdev) struct tegra_emc *emc; int err; - if (of_get_child_count(pdev->dev.of_node) == 0) { - dev_info(&pdev->dev, - "device-tree node doesn't have memory timings\n"); - return -ENODEV; - } - - np = emc_find_node_by_ram_code(&pdev->dev); - if (!np) - return -EINVAL; - emc = devm_kzalloc(&pdev->dev, sizeof(*emc), GFP_KERNEL); if (!emc) { of_node_put(np); @@ -1285,10 +1283,13 @@ static int tegra_emc_probe(struct platform_device *pdev) emc->clk_nb.notifier_call = emc_clk_change_notify; emc->dev = &pdev->dev; - err = emc_load_timings_from_dt(emc, np); - of_node_put(np); - if (err) - return err; + np = emc_find_node_by_ram_code(&pdev->dev); + if (np) { + err = emc_load_timings_from_dt(emc, np); + of_node_put(np); + if (err) + return err; + } emc->regs = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(emc->regs)) -- 2.29.2 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-11-11 1:15 UTC|newest] Thread overview: 108+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-11-11 1:14 [PATCH v8 00/26] Introduce memory interconnect for NVIDIA Tegra SoCs Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-11 1:14 ` [PATCH v8 01/26] memory: tegra: Correct stub of devm_tegra_memory_controller_get() Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-14 15:36 ` Krzysztof Kozlowski 2020-11-14 15:36 ` Krzysztof Kozlowski 2020-11-11 1:14 ` [PATCH v8 02/26] memory: tegra20-emc: Use dev_pm_opp_set_clkname() Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-11 5:45 ` Viresh Kumar 2020-11-11 5:45 ` Viresh Kumar 2020-11-11 5:54 ` Viresh Kumar 2020-11-11 5:54 ` Viresh Kumar 2020-11-11 6:15 ` Dmitry Osipenko 2020-11-11 6:15 ` Dmitry Osipenko 2020-11-14 15:37 ` Krzysztof Kozlowski 2020-11-14 15:37 ` Krzysztof Kozlowski 2020-11-11 1:14 ` [PATCH v8 03/26] memory: tegra20-emc: Factor out clk initialization Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-14 15:37 ` Krzysztof Kozlowski 2020-11-14 15:37 ` Krzysztof Kozlowski 2020-11-11 1:14 ` [PATCH v8 04/26] memory: tegra20-emc: Add devfreq support Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-11 2:23 ` Chanwoo Choi 2020-11-11 2:23 ` Chanwoo Choi 2020-11-14 15:38 ` Krzysztof Kozlowski 2020-11-14 15:38 ` Krzysztof Kozlowski 2020-11-11 1:14 ` [PATCH v8 05/26] memory: tegra20-emc: Remove IRQ number from error message Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-14 15:38 ` Krzysztof Kozlowski 2020-11-14 15:38 ` Krzysztof Kozlowski 2020-11-11 1:14 ` [PATCH v8 06/26] memory: tegra30: Add FIFO sizes to memory clients Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-14 15:39 ` Krzysztof Kozlowski 2020-11-14 15:39 ` Krzysztof Kozlowski 2020-11-11 1:14 ` [PATCH v8 07/26] memory: tegra30-emc: Make driver modular Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-14 15:41 ` Krzysztof Kozlowski 2020-11-14 15:41 ` Krzysztof Kozlowski 2020-11-11 1:14 ` Dmitry Osipenko [this message] 2020-11-11 1:14 ` [PATCH v8 08/26] memory: tegra30-emc: Continue probing if timings are missing in device-tree Dmitry Osipenko 2020-11-14 15:42 ` Krzysztof Kozlowski 2020-11-14 15:42 ` Krzysztof Kozlowski 2020-11-15 9:25 ` Dmitry Osipenko 2020-11-15 9:25 ` Dmitry Osipenko 2020-11-11 1:14 ` [PATCH v8 09/26] memory: tegra30: Support interconnect framework Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-11 5:53 ` Viresh Kumar 2020-11-11 5:53 ` Viresh Kumar 2020-11-11 6:14 ` Dmitry Osipenko 2020-11-11 6:14 ` Dmitry Osipenko 2020-11-11 6:18 ` Viresh Kumar 2020-11-11 6:18 ` Viresh Kumar 2020-11-11 7:32 ` Dmitry Osipenko 2020-11-11 7:32 ` Dmitry Osipenko 2020-11-11 7:54 ` Viresh Kumar 2020-11-11 7:54 ` Viresh Kumar 2020-11-11 14:08 ` Dmitry Osipenko 2020-11-11 14:08 ` Dmitry Osipenko 2020-11-11 1:14 ` [PATCH v8 10/26] memory: tegra30-emc: Factor out clk initialization Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-11 8:51 ` Krzysztof Kozlowski 2020-11-11 8:51 ` Krzysztof Kozlowski 2020-11-11 8:52 ` Krzysztof Kozlowski 2020-11-11 8:52 ` Krzysztof Kozlowski 2020-11-11 9:01 ` Dmitry Osipenko 2020-11-11 9:01 ` Dmitry Osipenko 2020-11-11 1:14 ` [PATCH v8 11/26] memory: tegra124-emc: Make driver modular Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-11 9:04 ` Krzysztof Kozlowski 2020-11-11 9:04 ` Krzysztof Kozlowski 2020-11-11 9:17 ` Dmitry Osipenko 2020-11-11 9:17 ` Dmitry Osipenko 2020-11-11 9:26 ` Krzysztof Kozlowski 2020-11-11 9:26 ` Krzysztof Kozlowski 2020-11-11 10:25 ` Dmitry Osipenko 2020-11-11 10:25 ` Dmitry Osipenko 2020-11-11 11:53 ` Dmitry Osipenko 2020-11-11 11:53 ` Dmitry Osipenko 2020-11-11 1:14 ` [PATCH v8 12/26] memory: tegra124-emc: Continue probing if timings are missing in device-tree Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-11 1:14 ` [PATCH v8 13/26] memory: tegra124: Support interconnect framework Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-11 1:14 ` [PATCH v8 14/26] drm/tegra: dc: Support memory bandwidth management Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-11 1:14 ` [PATCH v8 15/26] drm/tegra: dc: Extend debug stats with total number of events Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-11 1:14 ` [PATCH v8 16/26] PM / devfreq: tegra30: Support interconnect and OPPs from device-tree Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-11 1:14 ` [PATCH v8 17/26] PM / devfreq: tegra30: Separate configurations per-SoC generation Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-11 1:14 ` [PATCH v8 18/26] PM / devfreq: tegra20: Deprecate in a favor of emc-stat based driver Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-11 1:14 ` [PATCH v8 19/26] ARM: tegra: Correct EMC registers size in Tegra20 device-tree Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-11 1:14 ` [PATCH v8 20/26] ARM: tegra: Add interconnect properties to " Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-11 1:14 ` [PATCH v8 21/26] ARM: tegra: Add interconnect properties to Tegra30 device-tree Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-11 1:14 ` [PATCH v8 22/26] ARM: tegra: Add interconnect properties to Tegra124 device-tree Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-11 1:14 ` [PATCH v8 23/26] ARM: tegra: Add nvidia,memory-controller phandle to Tegra20 EMC device-tree Dmitry Osipenko 2020-11-11 1:14 ` [PATCH v8 23/26] ARM: tegra: Add nvidia, memory-controller " Dmitry Osipenko 2020-11-11 1:14 ` [PATCH v8 24/26] ARM: tegra: Add DVFS properties to Tegra20 EMC device-tree node Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-11 1:14 ` [PATCH v8 25/26] ARM: tegra: Add DVFS properties to Tegra30 EMC and ACTMON device-tree nodes Dmitry Osipenko 2020-11-11 1:14 ` Dmitry Osipenko 2020-11-11 1:14 ` [PATCH v8 26/26] ARM: tegra: Add DVFS properties to Tegra124 " Dmitry Osipenko 2020-11-11 1:14 ` 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=20201111011456.7875-9-digetx@gmail.com \ --to=digetx@gmail.com \ --cc=cw00.choi@samsung.com \ --cc=cyndis@kapsi.fi \ --cc=dri-devel@lists.freedesktop.org \ --cc=georgi.djakov@linaro.org \ --cc=jonathanh@nvidia.com \ --cc=krzk@kernel.org \ --cc=kwizart@gmail.com \ --cc=kyungmin.park@samsung.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pm@vger.kernel.org \ --cc=linux-tegra@vger.kernel.org \ --cc=mturquette@baylibre.com \ --cc=myungjoo.ham@samsung.com \ --cc=pdeschrijver@nvidia.com \ --cc=pgwipeout@gmail.com \ --cc=robh+dt@kernel.org \ --cc=sboyd@kernel.org \ --cc=thierry.reding@gmail.com \ --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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.