soc/tegra: pmc: Restrict legacy code to 32-bit ARM (7d71e903) · Commits · 戴 / test

drivers/soc/tegra/pmc.c

+41 −15

Original line number	Diff line number	Diff line
		@@ -17,6 +17,8 @@
		*
		*/

		#define pr_fmt(fmt) "tegra-pmc: " fmt

		#include <linux/kernel.h>
		#include <linux/clk.h>
		#include <linux/clk/tegra.h>
		@@ -1003,6 +1005,7 @@ static const struct tegra_pmc_soc tegra124_pmc_soc = {
		};

		static const struct of_device_id tegra_pmc_match[] = {
		{ .compatible = "nvidia,tegra132-pmc", .data = &tegra124_pmc_soc },
		{ .compatible = "nvidia,tegra124-pmc", .data = &tegra124_pmc_soc },
		{ .compatible = "nvidia,tegra114-pmc", .data = &tegra114_pmc_soc },
		{ .compatible = "nvidia,tegra30-pmc", .data = &tegra30_pmc_soc },
		@@ -1035,12 +1038,20 @@ static int __init tegra_pmc_early_init(void)
		bool invert;
		u32 value;

		if (!soc_is_tegra())
		return 0;

		np = of_find_matching_node_and_match(NULL, tegra_pmc_match, &match);
		if (!np) {
		pr_warn("PMC device node not found, disabling powergating\n");
		/*
		* Fall back to legacy initialization for 32-bit ARM only. All
		* 64-bit ARM device tree files for Tegra are required to have
		* a PMC node.
		*
		* This is for backwards-compatibility with old device trees
		* that didn't contain a PMC node. Note that in this case the
		* SoC data can't be matched and therefore powergating is
		* disabled.
		*/
		if (IS_ENABLED(CONFIG_ARM) && soc_is_tegra()) {
		pr_warn("DT node not found, powergating disabled\n");

		regs.start = 0x7000e400;
		regs.end = 0x7000e7ff;
		@@ -1048,14 +1059,25 @@ static int __init tegra_pmc_early_init(void)

		pr_warn("Using memory region %pR\n", &regs);
		} else {
		pmc->soc = match->data;
		/*
		* At this point we're not running on Tegra, so play
		* nice with multi-platform kernels.
		*/
		return 0;
		}

		} else {
		/*
		* Extract information from the device tree if we've found a
		* matching node.
		*/
		if (of_address_to_resource(np, 0, &regs) < 0) {
		pr_err("failed to get PMC registers\n");
		return -ENXIO;
		}

		pmc->soc = match->data;
		}

		pmc->base = ioremap_nocache(regs.start, resource_size(&regs));
		if (!pmc->base) {
		pr_err("failed to map PMC registers\n");
		@@ -1064,6 +1086,10 @@ static int __init tegra_pmc_early_init(void)

		mutex_init(&pmc->powergates_lock);

		/*
		* Invert the interrupt polarity if a PMC device tree node exists and
		* contains the nvidia,invert-interrupt property.
		*/
		invert = of_property_read_bool(np, "nvidia,invert-interrupt");

		value = tegra_pmc_readl(PMC_CNTRL);

Admin message