Merge "msm: smd_debug: Remove the hardcoded entry from debugfs" (fbf74d09) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm/mach-msm/smd.c

+9 −9

Original line number	Diff line number	Diff line
		@@ -339,7 +339,7 @@ static inline void notify_modem_smd(smd_channel_t *ch)

		log_notify(SMD_APPS_MODEM, ch);
		if (intr->out_base) {
		++interrupt_stats[SMD_MODEM].smd_out_config_count;
		++interrupt_stats[SMD_MODEM].smd_out_count;
		smd_write_intr(intr->out_bit_pos,
		intr->out_base + intr->out_offset);
		}
		@@ -352,7 +352,7 @@ static inline void notify_dsp_smd(smd_channel_t *ch)

		log_notify(SMD_APPS_QDSP, ch);
		if (intr->out_base) {
		++interrupt_stats[SMD_Q6].smd_out_config_count;
		++interrupt_stats[SMD_Q6].smd_out_count;
		smd_write_intr(intr->out_bit_pos,
		intr->out_base + intr->out_offset);
		}
		@@ -365,7 +365,7 @@ static inline void notify_dsps_smd(smd_channel_t *ch)

		log_notify(SMD_APPS_DSPS, ch);
		if (intr->out_base) {
		++interrupt_stats[SMD_DSPS].smd_out_config_count;
		++interrupt_stats[SMD_DSPS].smd_out_count;
		smd_write_intr(intr->out_bit_pos,
		intr->out_base + intr->out_offset);
		}
		@@ -378,7 +378,7 @@ static inline void notify_wcnss_smd(struct smd_channel *ch)

		log_notify(SMD_APPS_WCNSS, ch);
		if (intr->out_base) {
		++interrupt_stats[SMD_WCNSS].smd_out_config_count;
		++interrupt_stats[SMD_WCNSS].smd_out_count;
		smd_write_intr(intr->out_bit_pos,
		intr->out_base + intr->out_offset);
		}
		@@ -391,7 +391,7 @@ static inline void notify_rpm_smd(smd_channel_t *ch)

		if (intr->out_base) {
		log_notify(SMD_APPS_RPM, ch);
		++interrupt_stats[SMD_RPM].smd_out_config_count;
		++interrupt_stats[SMD_RPM].smd_out_count;
		smd_write_intr(intr->out_bit_pos,
		intr->out_base + intr->out_offset);
		}
		@@ -405,7 +405,7 @@ static inline void notify_modem_smsm(void)
		SMSM_POWER_INFO("SMSM Apps->%s", "MODEM");

		if (intr->out_base) {
		++interrupt_stats[SMD_MODEM].smsm_out_config_count;
		++interrupt_stats[SMD_MODEM].smsm_out_count;
		smd_write_intr(intr->out_bit_pos,
		intr->out_base + intr->out_offset);
		}
		@@ -419,7 +419,7 @@ static inline void notify_dsp_smsm(void)
		SMSM_POWER_INFO("SMSM Apps->%s", "ADSP");

		if (intr->out_base) {
		++interrupt_stats[SMD_Q6].smsm_out_config_count;
		++interrupt_stats[SMD_Q6].smsm_out_count;
		smd_write_intr(intr->out_bit_pos,
		intr->out_base + intr->out_offset);
		}
		@@ -433,7 +433,7 @@ static inline void notify_dsps_smsm(void)
		SMSM_POWER_INFO("SMSM Apps->%s", "DSPS");

		if (intr->out_base) {
		++interrupt_stats[SMD_DSPS].smsm_out_config_count;
		++interrupt_stats[SMD_DSPS].smsm_out_count;
		smd_write_intr(intr->out_bit_pos,
		intr->out_base + intr->out_offset);
		}
		@@ -447,7 +447,7 @@ static inline void notify_wcnss_smsm(void)
		SMSM_POWER_INFO("SMSM Apps->%s", "WCNSS");

		if (intr->out_base) {
		++interrupt_stats[SMD_WCNSS].smsm_out_config_count;
		++interrupt_stats[SMD_WCNSS].smsm_out_count;
		smd_write_intr(intr->out_bit_pos,
		intr->out_base + intr->out_offset);
		}

arch/arm/mach-msm/smd_debug.c

+7 −12

Original line number	Diff line number	Diff line
		@@ -56,27 +56,24 @@ static void debug_int_stats(struct seq_file *s)
		const char *subsys_name;

		seq_puts(s,
		" Subsystem \| Interrupt ID \| In \| Out (Hardcoded) \|"
		" Out (Configured)\|\n");
		" Subsystem \| Interrupt ID \| In \| Out \|\n");

		for (subsys = 0; subsys < NUM_SMD_SUBSYSTEMS; ++subsys) {
		subsys_name = smd_pid_to_subsystem(subsys);
		if (subsys_name) {
		seq_printf(s,
		"%-10s %4s \| %9d \| %9u \| %9u \| %9u \|\n",
		"%-10s %4s \| %9d \| %9u \| %9u \|\n",
		smd_pid_to_subsystem(subsys), "smd",
		stats->smd_interrupt_id,
		stats->smd_in_count,
		stats->smd_out_hardcode_count,
		stats->smd_out_config_count);
		stats->smd_out_count);

		seq_printf(s,
		"%-10s %4s \| %9d \| %9u \| %9u \| %9u \|\n",
		"%-10s %4s \| %9d \| %9u \| %9u \|\n",
		smd_pid_to_subsystem(subsys), "smsm",
		stats->smsm_interrupt_id,
		stats->smsm_in_count,
		stats->smsm_out_hardcode_count,
		stats->smsm_out_config_count);
		stats->smsm_out_count);
		}
		++stats;
		}
		@@ -91,11 +88,9 @@ static void debug_int_stats_reset(struct seq_file *s)

		for (subsys = 0; subsys < NUM_SMD_SUBSYSTEMS; ++subsys) {
		stats->smd_in_count = 0;
		stats->smd_out_hardcode_count = 0;
		stats->smd_out_config_count = 0;
		stats->smd_out_count = 0;
		stats->smsm_in_count = 0;
		stats->smsm_out_hardcode_count = 0;
		stats->smsm_out_config_count = 0;
		stats->smsm_out_count = 0;
		++stats;
		}
		}

arch/arm/mach-msm/smd_private.h

+2 −4

Original line number	Diff line number	Diff line
		@@ -206,13 +206,11 @@ void smd_diag(void);

		struct interrupt_stat {
		uint32_t smd_in_count;
		uint32_t smd_out_hardcode_count;
		uint32_t smd_out_config_count;
		uint32_t smd_out_count;
		uint32_t smd_interrupt_id;

		uint32_t smsm_in_count;
		uint32_t smsm_out_hardcode_count;
		uint32_t smsm_out_config_count;
		uint32_t smsm_out_count;
		uint32_t smsm_interrupt_id;
		};
		extern struct interrupt_stat interrupt_stats[NUM_SMD_SUBSYSTEMS];