diff mbox series

[V6,1/7] x86: Drop CPU_SUP_INTEL from SCHED_MC_PRIO for the expansion.

Message ID 20230908074653.2799055-2-li.meng@amd.com (mailing list archive)
State Accepted
Commit 6894dc7f1d99962355bfff2dddfcbfc9a9b3383b
Headers show
Series amd-pstate preferred core | expand

Commit Message

Meng, Li (Jassmine) Sept. 8, 2023, 7:46 a.m. UTC 
amd-pstate driver also uses SCHED_MC_PRIO, so decouple the requirement
of CPU_SUP_INTEL from the dependencies to allow compilation in kernels
without Intel CPU support.

Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Meng Li <li.meng@amd.com>
---
 arch/x86/Kconfig | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

kernel test robot Sept. 13, 2023, 1:34 a.m. UTC | #1 
Hi Meng,

kernel test robot noticed the following build errors:

[auto build test ERROR on rafael-pm/linux-next]
[also build test ERROR on tip/x86/core linus/master v6.6-rc1 next-20230912]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]

url:    https://github.com/intel-lab-lkp/linux/commits/Meng-Li/x86-Drop-CPU_SUP_INTEL-from-SCHED_MC_PRIO-for-the-expansion/20230908-154939
base:   https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git linux-next
patch link:    https://lore.kernel.org/r/20230908074653.2799055-2-li.meng%40amd.com
patch subject: [PATCH V6 1/7] x86: Drop CPU_SUP_INTEL from SCHED_MC_PRIO for the expansion.
config: i386-buildonly-randconfig-004-20230913 (https://download.01.org/0day-ci/archive/20230913/202309130938.dmI2pWUB-lkp@intel.com/config)
compiler: gcc-12 (Debian 12.2.0-14) 12.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20230913/202309130938.dmI2pWUB-lkp@intel.com/reproduce)

If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202309130938.dmI2pWUB-lkp@intel.com/

All errors (new ones prefixed by >>):

   In file included from drivers/cpufreq/amd-pstate.c:41:
>> include/acpi/processor.h:226:9: error: unknown type name 'phys_cpuid_t'
     226 |         phys_cpuid_t phys_id;   /* CPU hardware ID such as APIC ID for x86 */
         |         ^~~~~~~~~~~~
   include/acpi/processor.h:355:1: error: unknown type name 'phys_cpuid_t'
     355 | phys_cpuid_t acpi_get_phys_id(acpi_handle, int type, u32 acpi_id);
         | ^~~~~~~~~~~~
   include/acpi/processor.h:356:1: error: unknown type name 'phys_cpuid_t'
     356 | phys_cpuid_t acpi_map_madt_entry(u32 acpi_id);
         | ^~~~~~~~~~~~
   include/acpi/processor.h:357:20: error: unknown type name 'phys_cpuid_t'
     357 | int acpi_map_cpuid(phys_cpuid_t phys_id, u32 acpi_id);
         |                    ^~~~~~~~~~~~
   drivers/cpufreq/amd-pstate.c: In function 'amd_pstate_acpi_pm_profile_server':
   drivers/cpufreq/amd-pstate.c:1076:17: error: 'acpi_gbl_FADT' undeclared (first use in this function); did you mean 'acpi_table_fadt'?
    1076 |         switch (acpi_gbl_FADT.preferred_profile) {
         |                 ^~~~~~~~~~~~~
         |                 acpi_table_fadt
   drivers/cpufreq/amd-pstate.c:1076:17: note: each undeclared identifier is reported only once for each function it appears in
   drivers/cpufreq/amd-pstate.c: In function 'amd_pstate_acpi_pm_profile_undefined':
   drivers/cpufreq/amd-pstate.c:1087:13: error: 'acpi_gbl_FADT' undeclared (first use in this function); did you mean 'acpi_table_fadt'?
    1087 |         if (acpi_gbl_FADT.preferred_profile == PM_UNSPECIFIED)
         |             ^~~~~~~~~~~~~
         |             acpi_table_fadt

Kconfig warnings: (for reference only)
   WARNING: unmet direct dependencies detected for X86_AMD_PSTATE
   Depends on [n]: CPU_FREQ [=y] && X86 [=y] && ACPI [=n]
   Selected by [y]:
   - SCHED_MC_PRIO [=y] && SCHED_MC [=y] && CPU_SUP_AMD [=y]
   WARNING: unmet direct dependencies detected for VIDEO_OV7640
   Depends on [n]: MEDIA_SUPPORT [=y] && VIDEO_DEV [=y] && VIDEO_CAMERA_SENSOR [=n]
   Selected by [y]:
   - VIDEO_GO7007 [=y] && MEDIA_SUPPORT [=y] && MEDIA_USB_SUPPORT [=y] && MEDIA_ANALOG_TV_SUPPORT [=y] && VIDEO_DEV [=y] && I2C [=y] && SND [=y] && USB [=y] && MEDIA_SUBDRV_AUTOSELECT [=y] && MEDIA_CAMERA_SUPPORT [=y]


vim +/phys_cpuid_t +226 include/acpi/processor.h

^1da177e4c3f41 Linus Torvalds    2005-04-16  222  
^1da177e4c3f41 Linus Torvalds    2005-04-16  223  struct acpi_processor {
^1da177e4c3f41 Linus Torvalds    2005-04-16  224  	acpi_handle handle;
^1da177e4c3f41 Linus Torvalds    2005-04-16  225  	u32 acpi_id;
828aef376d7a12 Catalin Marinas   2015-03-24 @226  	phys_cpuid_t phys_id;	/* CPU hardware ID such as APIC ID for x86 */
af8f3f514d193e Hanjun Guo        2015-01-04  227  	u32 id;		/* CPU logical ID allocated by OS */
^1da177e4c3f41 Linus Torvalds    2005-04-16  228  	u32 pblk;
^1da177e4c3f41 Linus Torvalds    2005-04-16  229  	int performance_platform_limit;
01854e697a77a4 Luming Yu         2007-05-26  230  	int throttling_platform_limit;
ff55a9cebab024 Len Brown         2007-06-02  231  	/* 0 - states 0..n-th state available */
01854e697a77a4 Luming Yu         2007-05-26  232  
^1da177e4c3f41 Linus Torvalds    2005-04-16  233  	struct acpi_processor_flags flags;
^1da177e4c3f41 Linus Torvalds    2005-04-16  234  	struct acpi_processor_power power;
^1da177e4c3f41 Linus Torvalds    2005-04-16  235  	struct acpi_processor_performance *performance;
^1da177e4c3f41 Linus Torvalds    2005-04-16  236  	struct acpi_processor_throttling throttling;
^1da177e4c3f41 Linus Torvalds    2005-04-16  237  	struct acpi_processor_limit limit;
d9460fd227ed2c Zhang Rui         2008-01-17  238  	struct thermal_cooling_device *cdev;
ac212b6980d8d5 Rafael J. Wysocki 2013-05-03  239  	struct device *dev; /* Processor device. */
3000ce3c52f8b8 Rafael J. Wysocki 2019-10-16  240  	struct freq_qos_request perflib_req;
3000ce3c52f8b8 Rafael J. Wysocki 2019-10-16  241  	struct freq_qos_request thermal_req;
^1da177e4c3f41 Linus Torvalds    2005-04-16  242  };
^1da177e4c3f41 Linus Torvalds    2005-04-16  243
diff mbox series

Patch

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 982b777eadc7..5dd2a2fd4718 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1054,8 +1054,9 @@  config SCHED_MC
 
 config SCHED_MC_PRIO
 	bool "CPU core priorities scheduler support"
-	depends on SCHED_MC && CPU_SUP_INTEL
-	select X86_INTEL_PSTATE
+	depends on SCHED_MC
+	select X86_INTEL_PSTATE if CPU_SUP_INTEL
+	select X86_AMD_PSTATE if CPU_SUP_AMD
 	select CPU_FREQ
 	default y
 	help