linux-next: manual merge of the tip tree with the cpupower tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the tip tree got a conflict in:

  tools/power/cpupower/utils/helpers/misc.c

between commit:

  748f0d70087c ("cpupower: Provide online and offline CPU information")

from the cpupower tree and commit:

  8113ab20e850 ("tools/power/cpupower: Read energy_perf_bias from sysfs")

from the tip tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc tools/power/cpupower/utils/helpers/misc.c
index 2ead98169cf5,e8f8f643a627..000000000000
--- a/tools/power/cpupower/utils/helpers/misc.c
+++ b/tools/power/cpupower/utils/helpers/misc.c
@@@ -1,12 -1,16 +1,17 @@@
  // SPDX-License-Identifier: GPL-2.0
  
  #include <stdio.h>
+ #include <errno.h>
  #include <stdlib.h>
  
 +#include "helpers/helpers.h"
 +
  #if defined(__i386__) || defined(__x86_64__)
  
 -#include "helpers/helpers.h"
+ #include "helpers/sysfs.h"
+ 
+ #include "cpupower_intern.h"
+ 
  #define MSR_AMD_HWCR	0xc0010015
  
  int cpufreq_has_boost_support(unsigned int cpu, int *support, int *active,
@@@ -44,64 -48,44 +49,104 @@@
  		*support = *active = 1;
  	return 0;
  }
+ 
+ int cpupower_intel_get_perf_bias(unsigned int cpu)
+ {
+ 	char linebuf[MAX_LINE_LEN];
+ 	char path[SYSFS_PATH_MAX];
+ 	unsigned long val;
+ 	char *endp;
+ 
+ 	if (!(cpupower_cpu_info.caps & CPUPOWER_CAP_PERF_BIAS))
+ 		return -1;
+ 
+ 	snprintf(path, sizeof(path), PATH_TO_CPU "cpu%u/power/energy_perf_bias", cpu);
+ 
+ 	if (cpupower_read_sysfs(path, linebuf, MAX_LINE_LEN) == 0)
+ 		return -1;
+ 
+ 	val = strtol(linebuf, &endp, 0);
+ 	if (endp == linebuf || errno == ERANGE)
+ 		return -1;
+ 
+ 	return val;
+ }
+ 
+ int cpupower_intel_set_perf_bias(unsigned int cpu, unsigned int val)
+ {
+ 	char path[SYSFS_PATH_MAX];
+ 	char linebuf[3] = {};
+ 
+ 	if (!(cpupower_cpu_info.caps & CPUPOWER_CAP_PERF_BIAS))
+ 		return -1;
+ 
+ 	snprintf(path, sizeof(path), PATH_TO_CPU "cpu%u/power/energy_perf_bias", cpu);
+ 	snprintf(linebuf, sizeof(linebuf), "%d", val);
+ 
+ 	if (cpupower_write_sysfs(path, linebuf, 3) <= 0)
+ 		return -1;
+ 
+ 	return 0;
+ }
+ 
  #endif /* #if defined(__i386__) || defined(__x86_64__) */
 +
 +/* get_cpustate
 + *
 + * Gather the information of all online CPUs into bitmask struct
 + */
 +void get_cpustate(void)
 +{
 +	unsigned int cpu = 0;
 +
 +	bitmask_clearall(online_cpus);
 +	bitmask_clearall(offline_cpus);
 +
 +	for (cpu = bitmask_first(cpus_chosen);
 +		cpu <= bitmask_last(cpus_chosen); cpu++) {
 +
 +		if (cpupower_is_cpu_online(cpu) == 1)
 +			bitmask_setbit(online_cpus, cpu);
 +		else
 +			bitmask_setbit(offline_cpus, cpu);
 +
 +		continue;
 +	}
 +}
 +
 +/* print_online_cpus
 + *
 + * Print the CPU numbers of all CPUs that are online currently
 + */
 +void print_online_cpus(void)
 +{
 +	int str_len = 0;
 +	char *online_cpus_str = NULL;
 +
 +	str_len = online_cpus->size * 5;
 +	online_cpus_str = (void *)malloc(sizeof(char) * str_len);
 +
 +	if (!bitmask_isallclear(online_cpus)) {
 +		bitmask_displaylist(online_cpus_str, str_len, online_cpus);
 +		printf(_("Following CPUs are online:\n%s\n"), online_cpus_str);
 +	}
 +}
 +
 +/* print_offline_cpus
 + *
 + * Print the CPU numbers of all CPUs that are offline currently
 + */
 +void print_offline_cpus(void)
 +{
 +	int str_len = 0;
 +	char *offline_cpus_str = NULL;
 +
 +	str_len = offline_cpus->size * 5;
 +	offline_cpus_str = (void *)malloc(sizeof(char) * str_len);
 +
 +	if (!bitmask_isallclear(offline_cpus)) {
 +		bitmask_displaylist(offline_cpus_str, str_len, offline_cpus);
 +		printf(_("Following CPUs are offline:\n%s\n"), offline_cpus_str);
 +		printf(_("cpupower set operation was not performed on them\n"));
 +	}
 +}

Attachment: pgppwqwFL5OFV.pgp
Description: OpenPGP digital signature