Merge "firmware: scm: Remove arch check for dma_set_mask" (1ff72e68) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/cpuidle/lpm-levels.c

+8 −3

Original line number	Diff line number	Diff line
		@@ -121,12 +121,14 @@ static void cluster_prepare(struct lpm_cluster *cluster,
		static bool sleep_disabled;
		module_param_named(sleep_disabled, sleep_disabled, bool, 0664);

		#ifdef CONFIG_SMP
		static int lpm_cpu_qos_notify(struct notifier_block *nb,
		unsigned long val, void *ptr);

		static struct notifier_block dev_pm_qos_nb[MAX_LPM_CPUS] = {
		[0 ... (MAX_LPM_CPUS - 1)] = { .notifier_call = lpm_cpu_qos_notify },
		};
		#endif

		#ifdef CONFIG_SCHED_WALT
		static bool check_cpu_isolated(int cpu)
		@@ -140,6 +142,7 @@ static bool check_cpu_isolated(int cpu)
		}
		#endif

		#ifdef CONFIG_SMP
		static int lpm_cpu_qos_notify(struct notifier_block *nb,
		unsigned long val, void *ptr)
		{
		@@ -171,6 +174,7 @@ static int lpm_online_cpu(unsigned int cpu)
		DEV_PM_QOS_RESUME_LATENCY);
		return 0;
		}
		#endif

		/**
		* msm_cpuidle_get_deep_idle_latency - Get deep idle latency value
		@@ -219,6 +223,7 @@ static void update_debug_pc_event(enum debug_event event, uint32_t arg1,
		spin_unlock(&debug_lock);
		}

		#ifdef CONFIG_SMP
		static int lpm_dying_cpu(unsigned int cpu)
		{
		struct lpm_cluster *cluster = per_cpu(cpu_lpm, cpu)->parent;
		@@ -241,7 +246,7 @@ static int lpm_starting_cpu(unsigned int cpu)
		0, true);
		return 0;
		}

		#endif
		static void histtimer_cancel(void)
		{
		unsigned int cpu = raw_smp_processor_id();
		@@ -1695,7 +1700,7 @@ static int lpm_probe(struct platform_device *pdev)
		pr_err("Failed to register with cpuidle framework\n");
		goto failed;
		}

		#ifdef CONFIG_SMP
		ret = cpuhp_setup_state(CPUHP_AP_QCOM_TIMER_STARTING,
		"AP_QCOM_SLEEP_STARTING",
		lpm_starting_cpu, lpm_dying_cpu);
		@@ -1707,7 +1712,7 @@ static int lpm_probe(struct platform_device *pdev)
		lpm_online_cpu, lpm_offline_cpu);
		if (ret)
		goto failed;

		#endif
		module_kobj = kset_find_obj(module_kset, KBUILD_MODNAME);
		if (!module_kobj) {
		pr_err("Cannot find kobject for module %s\n", KBUILD_MODNAME);

drivers/firmware/qcom_scm.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -1093,11 +1093,9 @@ static int qcom_scm_probe(struct platform_device *pdev)

		__qcom_scm_init();

		#if CONFIG_ARM64
		ret = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
		if (ret)
		return ret;
		#endif

		return 0;
		}

drivers/irqchip/qcom-pdc.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -569,6 +569,7 @@ module_platform_driver(qcom_pdc_driver);
		IRQCHIP_DECLARE(qcom_pdc, "qcom,pdc", qcom_pdc_init);
		IRQCHIP_DECLARE(pdc_lahaina, "qcom,lahaina-pdc", qcom_pdc_init);
		IRQCHIP_DECLARE(pdc_shima, "qcom,shima-pdc", qcom_pdc_init);
		IRQCHIP_DECLARE(pdc_sdxlemur, "qcom,sdxlemur-pdc", qcom_pdc_init);
		#endif

		MODULE_DESCRIPTION("Qualcomm Technologies, Inc. Power Domain Controller");

drivers/soc/qcom/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -349,7 +349,7 @@ config MSM_CORE_HANG_DETECT

		config QCOM_RPMH
		bool "Qualcomm RPM-Hardened (RPMH) Communication"
		depends on ARCH_QCOM && ARM64 \|\| COMPILE_TEST
		depends on ARCH_QCOM \|\| COMPILE_TEST
		help
		Support for communication with the hardened-RPM blocks in
		Qualcomm Technologies Inc (QTI) SoCs. RPMH communication uses an