x86/platform: Move AMD specific headers to <asm/amd/*.h>
Subsystems (23)
cover x86/platform: Move AMD specific headers to <asm/amd/*.h>
Also clean up some details while at it.
The Git tree of these patches can also be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/mingo/tip.git WIP.x86/platform
Thanks,
Ingo
===============>
Ingo Molnar (6):
x86/platform/amd: Move the <asm/amd-ibs.h> header to <asm/amd/ibs.h> x86/platform/amd: Add standard header guards to <asm/amd/ibs.h> x86/platform/amd: Move the <asm/amd_nb.h> header to <asm/amd/nb.h> x86/platform/amd: Move the <asm/amd_hsmp.h> header to <asm/amd/hsmp.h> x86/platform/amd: Clean up the <asm/amd/hsmp.h> header guards a bit x86/platform/amd: Move the <asm/amd_node.h> header to <asm/amd/node.h>
Documentation/userspace-api/ioctl/ioctl-number.rst | 2 +-
MAINTAINERS | 6 +++---
arch/x86/events/amd/ibs.c | 2 +-
arch/x86/include/asm/{amd_hsmp.h => amd/hsmp.h} | 4 ++--
arch/x86/include/asm/{amd-ibs.h => amd/ibs.h} | 5 +++++
arch/x86/include/asm/{amd_nb.h => amd/nb.h} | 2 +-
arch/x86/include/asm/{amd_node.h => amd/node.h} | 0
arch/x86/kernel/amd_gart_64.c | 2 +-
arch/x86/kernel/amd_nb.c | 2 +-
arch/x86/kernel/amd_node.c | 2 +-
arch/x86/kernel/aperture_64.c | 2 +-
arch/x86/kernel/cpu/cacheinfo.c | 2 +-
arch/x86/kernel/cpu/mce/inject.c | 2 +-
arch/x86/mm/amdtopology.c | 2 +-
arch/x86/mm/numa.c | 2 +-
arch/x86/pci/amd_bus.c | 2 +-
arch/x86/pci/fixup.c | 2 +-
drivers/char/agp/amd64-agp.c | 2 +-
drivers/edac/amd64_edac.c | 4 ++--
drivers/hwmon/k10temp.c | 2 +-
drivers/platform/x86/amd/hsmp/acpi.c | 4 ++--
drivers/platform/x86/amd/hsmp/hsmp.c | 2 +-
drivers/platform/x86/amd/hsmp/plat.c | 4 ++--
drivers/platform/x86/amd/pmc/mp1_stb.c | 2 +-
drivers/platform/x86/amd/pmc/pmc.c | 2 +-
drivers/platform/x86/amd/pmf/core.c | 2 +-
drivers/pnp/quirks.c | 2 +-
drivers/ras/amd/atl/internal.h | 4 ++--
sound/soc/amd/acp/acp-rembrandt.c | 2 +-
sound/soc/amd/acp/acp63.c | 2 +-
sound/soc/amd/acp/acp70.c | 2 +-
sound/soc/sof/amd/acp.c | 2 +-
tools/perf/check-headers.sh | 2 +-
tools/perf/util/amd-sample-raw.c | 2 +-
34 files changed, 44 insertions(+), 39 deletions(-)
rename arch/x86/include/asm/{amd_hsmp.h => amd/hsmp.h} (91%)
rename arch/x86/include/asm/{amd-ibs.h => amd/ibs.h} (98%)
rename arch/x86/include/asm/{amd_nb.h => amd/nb.h} (98%)
rename arch/x86/include/asm/{amd_node.h => amd/node.h} (100%)Signature · 1 line
2.45.2
PATCH 1/6 x86/platform/amd: Move the <asm/amd-ibs.h> header to <asm/amd/ibs.h>
Collect AMD specific platform header files in <asm/amd/*.h>.
---
arch/x86/events/amd/ibs.c | 2 +-
arch/x86/include/asm/{amd-ibs.h => amd/ibs.h} | 0
tools/perf/check-headers.sh | 2 +-
tools/perf/util/amd-sample-raw.c | 2 +-
4 files changed, 3 insertions(+), 3 deletions(-)arch/x86/events/amd/ibs.c +1 -1
@@ -26,7 +26,7 @@ static u32 ibs_caps;#include <linux/hardirq.h> #include <asm/nmi.h> -#include <asm/amd-ibs.h> +#include <asm/amd/ibs.h> /* attr.config2 */ #define IBS_SW_FILTER_MASK 1
arch/x86/include/asm/amd/ibs.h renamed from arch/x86/include/asm/amd-ibs.h +0 -0
tools/perf/check-headers.sh +1 -1
@@ -185,7 +185,7 @@ done # diff with extra ignore lines check arch/x86/lib/memcpy_64.S '-I "^EXPORT_SYMBOL" -I "^#include <asm/export.h>" -I"^SYM_FUNC_START\(_LOCAL\)*(memcpy_\(erms\|orig\))" -I"^#include <linux/cfi_types.h>"' check arch/x86/lib/memset_64.S '-I "^EXPORT_SYMBOL" -I "^#include <asm/export.h>" -I"^SYM_FUNC_START\(_LOCAL\)*(memset_\(erms\|orig\))"' -check arch/x86/include/asm/amd-ibs.h '-I "^#include [<\"]\(asm/\)*msr-index.h"' +check arch/x86/include/asm/amd/ibs.h '-I "^#include [<\"]\(asm/\)*msr-index.h"' check arch/arm64/include/asm/cputype.h '-I "^#include [<\"]\(asm/\)*sysreg.h"' check include/linux/unaligned.h '-I "^#include <linux/unaligned/packed_struct.h>" -I "^#include <asm/byteorder.h>" -I "^#pragma GCC diagnostic"' check include/uapi/asm-generic/mman.h '-I "^#include <\(uapi/\)*asm-generic/mman-common\(-tools\)*.h>"'
tools/perf/util/amd-sample-raw.c +1 -1
@@ -9,7 +9,7 @@#include <inttypes.h> #include <linux/string.h> -#include "../../arch/x86/include/asm/amd-ibs.h" +#include "../../arch/x86/include/asm/amd/ibs.h" #include "debug.h" #include "session.h"
Signature · 1 line
2.45.2
[tip: x86/merge] x86/platform/amd: Move the <asm/amd-ibs.h> header to <asm/amd/ibs.h>
The following commit has been merged into the x86/merge branch of tip:
The following commit has been merged into the x86/merge branch of tip:
Commit-ID: 3846389c03a8518884f09056611619bd1461ffc7 Gitweb: https://git.kernel.org/tip/3846389c03a8518884f09056611619bd1461ffc7 Author: Ingo Molnar <[email protected]> AuthorDate: Sun, 13 Apr 2025 10:41:39 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Mon, 14 Apr 2025 09:31:47 +02:00
x86/platform/amd: Move the <asm/amd-ibs.h> header to <asm/amd/ibs.h>
Collect AMD specific platform header files in <asm/amd/*.h>.
--- arch/x86/events/amd/ibs.c | 2 +- arch/x86/include/asm/amd-ibs.h | 153 +------------------------------ arch/x86/include/asm/amd/ibs.h | 153 ++++++++++++++++++++++++++++++- tools/perf/check-headers.sh | 2 +- tools/perf/util/amd-sample-raw.c | 2 +- 5 files changed, 156 insertions(+), 156 deletions(-) delete mode 100644 arch/x86/include/asm/amd-ibs.h create mode 100644 arch/x86/include/asm/amd/ibs.h
arch/x86/events/amd/ibs.c +1 -1
@@ -26,7 +26,7 @@ static u32 ibs_caps;#include <linux/hardirq.h> #include <asm/nmi.h> -#include <asm/amd-ibs.h> +#include <asm/amd/ibs.h> /* attr.config2 */ #define IBS_SW_FILTER_MASK 1
arch/x86/include/asm/amd-ibs.h deleted +0 -153
153 lines not on this page · raw message
arch/x86/include/asm/amd/ibs.h new file +153 -0
153 lines not on this page · raw message
tools/perf/check-headers.sh +1 -1
@@ -185,7 +185,7 @@ done # diff with extra ignore lines check arch/x86/lib/memcpy_64.S '-I "^EXPORT_SYMBOL" -I "^#include <asm/export.h>" -I"^SYM_FUNC_START\(_LOCAL\)*(memcpy_\(erms\|orig\))" -I"^#include <linux/cfi_types.h>"' check arch/x86/lib/memset_64.S '-I "^EXPORT_SYMBOL" -I "^#include <asm/export.h>" -I"^SYM_FUNC_START\(_LOCAL\)*(memset_\(erms\|orig\))"' -check arch/x86/include/asm/amd-ibs.h '-I "^#include [<\"]\(asm/\)*msr-index.h"' +check arch/x86/include/asm/amd/ibs.h '-I "^#include [<\"]\(asm/\)*msr-index.h"' check arch/arm64/include/asm/cputype.h '-I "^#include [<\"]\(asm/\)*sysreg.h"' check include/linux/unaligned.h '-I "^#include <linux/unaligned/packed_struct.h>" -I "^#include <asm/byteorder.h>" -I "^#pragma GCC diagnostic"' check include/uapi/asm-generic/mman.h '-I "^#include <\(uapi/\)*asm-generic/mman-common\(-tools\)*.h>"'
tools/perf/util/amd-sample-raw.c +1 -1
@@ -9,7 +9,7 @@#include <inttypes.h> #include <linux/string.h> -#include "../../arch/x86/include/asm/amd-ibs.h" +#include "../../arch/x86/include/asm/amd/ibs.h" #include "debug.h" #include "session.h"
PATCH 2/6 x86/platform/amd: Add standard header guards to <asm/amd/ibs.h>
In reply to Ingo Molnar--- arch/x86/include/asm/amd/ibs.h | 5 +++++ 1 file changed, 5 insertions(+)
arch/x86/include/asm/amd/ibs.h +5 -0
@@ -1,4 +1,7 @@/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_X86_AMD_IBS_H +#define _ASM_X86_AMD_IBS_H +/* * From PPR Vol 1 for AMD Family 19h Model 01h B1 * 55898 Rev 0.35 - Feb 5, 2021
@@ -151,3 +154,5 @@ struct perf_ibs_data { };u64 regs[MSR_AMD64_IBS_REG_COUNT_MAX ]; }; + +#endif /* _ASM_X86_AMD_IBS_H */
Signature · 1 line
2.45.2
[tip: x86/merge] x86/platform/amd: Add standard header guards to <asm/amd/ibs.h>
The following commit has been merged into the x86/merge branch of tip:
The following commit has been merged into the x86/merge branch of tip:
Commit-ID: 861c6b1185fbb2e3fa158aa3aca75d2f767db2a8 Gitweb: https://git.kernel.org/tip/861c6b1185fbb2e3fa158aa3aca75d2f767db2a8 Author: Ingo Molnar <[email protected]> AuthorDate: Sun, 13 Apr 2025 10:41:40 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Mon, 14 Apr 2025 09:31:47 +02:00
x86/platform/amd: Add standard header guards to <asm/amd/ibs.h>
--- arch/x86/include/asm/amd/ibs.h | 5 +++++ 1 file changed, 5 insertions(+)
arch/x86/include/asm/amd/ibs.h +5 -0
@@ -1,4 +1,7 @@/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_X86_AMD_IBS_H +#define _ASM_X86_AMD_IBS_H +/* * From PPR Vol 1 for AMD Family 19h Model 01h B1 * 55898 Rev 0.35 - Feb 5, 2021
@@ -151,3 +154,5 @@ struct perf_ibs_data { };u64 regs[MSR_AMD64_IBS_REG_COUNT_MAX ]; }; + +#endif /* _ASM_X86_AMD_IBS_H */
PATCH 3/6 x86/platform/amd: Move the <asm/amd_nb.h> header to <asm/amd/nb.h>
In reply to Ingo MolnarCollect AMD specific platform header files in <asm/amd/*.h>.
---
arch/x86/include/asm/{amd_nb.h => amd/nb.h} | 0
arch/x86/kernel/amd_gart_64.c | 2 +-
arch/x86/kernel/amd_nb.c | 2 +-
arch/x86/kernel/aperture_64.c | 2 +-
arch/x86/kernel/cpu/cacheinfo.c | 2 +-
arch/x86/kernel/cpu/mce/inject.c | 2 +-
arch/x86/mm/amdtopology.c | 2 +-
arch/x86/mm/numa.c | 2 +-
arch/x86/pci/amd_bus.c | 2 +-
drivers/char/agp/amd64-agp.c | 2 +-
drivers/edac/amd64_edac.c | 2 +-
drivers/platform/x86/amd/pmc/mp1_stb.c | 2 +-
drivers/pnp/quirks.c | 2 +-
drivers/ras/amd/atl/internal.h | 2 +-
14 files changed, 13 insertions(+), 13 deletions(-)arch/x86/include/asm/amd/nb.h renamed from arch/x86/include/asm/amd_nb.h +0 -0
arch/x86/kernel/amd_gart_64.c +1 -1
@@ -39,7 +39,7 @@#include <asm/gart.h> #include <asm/set_memory.h> #include <asm/dma.h> -#include <asm/amd_nb.h> +#include <asm/amd/nb.h> #include <asm/x86_init.h> static unsigned long iommu_bus_base;/* GART remapping area (physical) */
arch/x86/kernel/amd_nb.c +1 -1
@@ -13,7 +13,7 @@#include <linux/export.h> #include <linux/spinlock.h> #include <linux/pci_ids.h> -#include <asm/amd_nb.h> +#include <asm/amd/nb.h> static u32 *flush_words;
arch/x86/kernel/aperture_64.c +1 -1
@@ -29,7 +29,7 @@#include <asm/gart.h> #include <asm/pci-direct.h> #include <asm/dma.h> -#include <asm/amd_nb.h> +#include <asm/amd/nb.h> #include <asm/x86_init.h> #include <linux/crash_dump.h>
arch/x86/kernel/cpu/cacheinfo.c +1 -1
@@ -16,7 +16,7 @@#include <linux/stop_machine.h> #include <linux/sysfs.h> -#include <asm/amd_nb.h> +#include <asm/amd/nb.h> #include <asm/cacheinfo.h> #include <asm/cpufeature.h> #include <asm/mtrr.h>
arch/x86/kernel/cpu/mce/inject.c +1 -1
@@ -24,7 +24,7 @@#include <linux/pci.h> #include <linux/uaccess.h> -#include <asm/amd_nb.h> +#include <asm/amd/nb.h> #include <asm/apic.h> #include <asm/irq_vectors.h> #include <asm/mce.h>
arch/x86/mm/amdtopology.c +1 -1
@@ -25,7 +25,7 @@#include <asm/numa.h> #include <asm/mpspec.h> #include <asm/apic.h> -#include <asm/amd_nb.h> +#include <asm/amd/nb.h> static unsigned char __initdata nodeids[8 ];
arch/x86/mm/numa.c +1 -1
@@ -18,7 +18,7 @@#include <asm/e820/api.h> #include <asm/proto.h> #include <asm/dma.h> -#include <asm/amd_nb.h> +#include <asm/amd/nb.h> #include "numa_internal.h"
arch/x86/pci/amd_bus.c +1 -1
@@ -5,7 +5,7 @@#include <linux/cpu.h> #include <linux/range.h> -#include <asm/amd_nb.h> +#include <asm/amd/nb.h> #include <asm/pci_x86.h> #include <asm/pci-direct.h>
drivers/char/agp/amd64-agp.c +1 -1
@@ -16,7 +16,7 @@#include <linux/mmzone.h> #include <asm/page.h> /* PAGE_SIZE */ #include <asm/e820/api.h> -#include <asm/amd_nb.h> +#include <asm/amd/nb.h> #include <asm/gart.h> #include "agp.h"
drivers/edac/amd64_edac.c +1 -1
@@ -2,7 +2,7 @@#include <linux/ras.h> #include <linux/string_choices.h> #include "amd64_edac.h" -#include <asm/amd_nb.h> +#include <asm/amd/nb.h> #include <asm/amd_node.h> static struct edac_pci_ctl_info *pci_ctl;
drivers/platform/x86/amd/pmc/mp1_stb.c +1 -1
@@ -11,7 +11,7 @@#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt -#include <asm/amd_nb.h> +#include <asm/amd/nb.h> #include <linux/debugfs.h> #include <linux/seq_file.h> #include <linux/uaccess.h>
drivers/pnp/quirks.c +1 -1
@@ -290,7 +290,7 @@ static void quirk_system_pci_resources(struct pnp_dev *dev)#ifdef CONFIG_AMD_NB -#include <asm/amd_nb.h> +#include <asm/amd/nb.h> static void quirk_amd_mmconfig_area (struct pnp_dev *dev) {
drivers/ras/amd/atl/internal.h +1 -1
@@ -17,7 +17,7 @@#include <linux/bitops.h> #include <linux/ras.h> -#include <asm/amd_nb.h> +#include <asm/amd/nb.h> #include <asm/amd_node.h> #include "reg_fields.h"
Signature · 1 line
2.45.2
[tip: x86/merge] x86/platform/amd: Move the <asm/amd_nb.h> header to <asm/amd/nb.h>
The following commit has been merged into the x86/merge branch of tip:
The following commit has been merged into the x86/merge branch of tip:
Commit-ID: bcbb65559532891148d990527e9df6b8fc98e98d Gitweb: https://git.kernel.org/tip/bcbb65559532891148d990527e9df6b8fc98e98d Author: Ingo Molnar <[email protected]> AuthorDate: Mon, 14 Apr 2025 09:32:04 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Mon, 14 Apr 2025 09:34:14 +02:00
x86/platform/amd: Move the <asm/amd_nb.h> header to <asm/amd/nb.h>
Collect AMD specific platform header files in <asm/amd/*.h>.
--- arch/x86/include/asm/amd/nb.h | 77 ++++++++++++++++++++++++- arch/x86/include/asm/amd_nb.h | 77 +------------------------ arch/x86/kernel/amd_gart_64.c | 2 +- arch/x86/kernel/amd_nb.c | 2 +- arch/x86/kernel/aperture_64.c | 2 +- arch/x86/kernel/cpu/amd_cache_disable.c | 2 +- arch/x86/kernel/cpu/cacheinfo.c | 2 +- arch/x86/kernel/cpu/mce/inject.c | 2 +- arch/x86/mm/amdtopology.c | 2 +- arch/x86/mm/numa.c | 2 +- arch/x86/pci/amd_bus.c | 2 +- drivers/char/agp/amd64-agp.c | 2 +- drivers/edac/amd64_edac.c | 2 +- drivers/platform/x86/amd/pmc/mp1_stb.c | 2 +- drivers/pnp/quirks.c | 2 +- drivers/ras/amd/atl/internal.h | 2 +- 16 files changed, 91 insertions(+), 91 deletions(-) create mode 100644 arch/x86/include/asm/amd/nb.h delete mode 100644 arch/x86/include/asm/amd_nb.h
arch/x86/include/asm/amd/nb.h new file +77 -0
@@ -0,0 +1,77 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_X86_AMD_NB_H +#define _ASM_X86_AMD_NB_H + +#include <linux/ioport.h> +#include <linux/pci.h> +#include <asm/amd_node.h> + +struct amd_nb_bus_dev_range { +u8 bus; +u8 dev_base; +u8 dev_limit; +}; + +extern const struct amd_nb_bus_dev_range amd_nb_bus_dev_ranges[]; + +extern bool early_is_amd_nb (u32 value); +extern struct resource *amd_get_mmconfig_range (struct resource *res); +extern void amd_flush_garts (void ); +extern int amd_numa_init (void ); +extern int amd_get_subcaches (int ); +extern int amd_set_subcaches (int ,unsigned long ); + +struct amd_l3_cache { +unsigned indices; +u8 subcaches[4 ]; +}; + +struct amd_northbridge { +struct pci_dev *misc; +struct pci_dev *link; +struct amd_l3_cache l3_cache; +}; + +struct amd_northbridge_info { +u16 num; +u64 flags; +struct amd_northbridge *nb; +}; + +#define AMD_NB_GART BIT(0) +#define AMD_NB_L3_INDEX_DISABLE BIT(1) +#define AMD_NB_L3_PARTITIONING BIT(2) + +#ifdef CONFIG_AMD_NB + +u16 amd_nb_num (void ); +bool amd_nb_has_feature (unsigned int feature); +struct amd_northbridge *node_to_amd_nb (int node); + +static inline bool amd_gart_present (void ) +{ +if (boot_cpu_data.x86_vendor !=X86_VENDOR_AMD ) +return false; + +/* GART present only on Fam15h, up to model 0fh */ +if (boot_cpu_data.x86 ==0xf || boot_cpu_data.x86 ==0x10 || + (boot_cpu_data.x86 ==0x15 && boot_cpu_data.x86_model <0x10 )) +return true; + +return false; +} + +#else + +#define amd_nb_num (x) 0 +#define amd_nb_has_feature (x) false +static inline struct amd_northbridge *node_to_amd_nb (int node) +{ +return NULL ; +} +#define amd_gart_present (x) false + +#endif + + +#endif /* _ASM_X86_AMD_NB_H */
arch/x86/include/asm/amd_nb.h deleted +0 -77
77 lines not on this page · raw message
arch/x86/kernel/amd_gart_64.c +1 -1
@@ -39,7 +39,7 @@#include <asm/gart.h> #include <asm/set_memory.h> #include <asm/dma.h> -#include <asm/amd_nb.h> +#include <asm/amd/nb.h> #include <asm/x86_init.h> static unsigned long iommu_bus_base;/* GART remapping area (physical) */
arch/x86/kernel/amd_nb.c +1 -1
@@ -14,7 +14,7 @@#include <linux/spinlock.h> #include <linux/pci_ids.h> -#include <asm/amd_nb.h> +#include <asm/amd/nb.h> #include <asm/cpuid.h> static u32 *flush_words;
arch/x86/kernel/aperture_64.c +1 -1
@@ -29,7 +29,7 @@#include <asm/gart.h> #include <asm/pci-direct.h> #include <asm/dma.h> -#include <asm/amd_nb.h> +#include <asm/amd/nb.h> #include <asm/x86_init.h> #include <linux/crash_dump.h>
arch/x86/kernel/cpu/amd_cache_disable.c +1 -1
@@ -9,7 +9,7 @@#include <linux/pci.h> #include <linux/sysfs.h> -#include <asm/amd_nb.h> +#include <asm/amd/nb.h> #include "cpu.h"
arch/x86/kernel/cpu/cacheinfo.c +1 -1
@@ -13,7 +13,7 @@#include <linux/cpuhotplug.h> #include <linux/stop_machine.h> -#include <asm/amd_nb.h> +#include <asm/amd/nb.h> #include <asm/cacheinfo.h> #include <asm/cpufeature.h> #include <asm/cpuid.h>
arch/x86/kernel/cpu/mce/inject.c +1 -1
@@ -24,7 +24,7 @@#include <linux/pci.h> #include <linux/uaccess.h> -#include <asm/amd_nb.h> +#include <asm/amd/nb.h> #include <asm/apic.h> #include <asm/irq_vectors.h> #include <asm/mce.h>
arch/x86/mm/amdtopology.c +1 -1
@@ -25,7 +25,7 @@#include <asm/numa.h> #include <asm/mpspec.h> #include <asm/apic.h> -#include <asm/amd_nb.h> +#include <asm/amd/nb.h> static unsigned char __initdata nodeids[8 ];
arch/x86/mm/numa.c +1 -1
@@ -18,7 +18,7 @@#include <asm/e820/api.h> #include <asm/proto.h> #include <asm/dma.h> -#include <asm/amd_nb.h> +#include <asm/amd/nb.h> #include "numa_internal.h"
arch/x86/pci/amd_bus.c +1 -1
@@ -5,7 +5,7 @@#include <linux/cpu.h> #include <linux/range.h> -#include <asm/amd_nb.h> +#include <asm/amd/nb.h> #include <asm/pci_x86.h> #include <asm/pci-direct.h>
drivers/char/agp/amd64-agp.c +1 -1
@@ -16,7 +16,7 @@#include <linux/mmzone.h> #include <asm/page.h> /* PAGE_SIZE */ #include <asm/e820/api.h> -#include <asm/amd_nb.h> +#include <asm/amd/nb.h> #include <asm/gart.h> #include "agp.h"
drivers/edac/amd64_edac.c +1 -1
@@ -2,7 +2,7 @@#include <linux/ras.h> #include <linux/string_choices.h> #include "amd64_edac.h" -#include <asm/amd_nb.h> +#include <asm/amd/nb.h> #include <asm/amd_node.h> static struct edac_pci_ctl_info *pci_ctl;
drivers/platform/x86/amd/pmc/mp1_stb.c +1 -1
@@ -11,7 +11,7 @@#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt -#include <asm/amd_nb.h> +#include <asm/amd/nb.h> #include <linux/debugfs.h> #include <linux/seq_file.h> #include <linux/uaccess.h>
drivers/pnp/quirks.c +1 -1
@@ -290,7 +290,7 @@ static void quirk_system_pci_resources(struct pnp_dev *dev)#ifdef CONFIG_AMD_NB -#include <asm/amd_nb.h> +#include <asm/amd/nb.h> static void quirk_amd_mmconfig_area (struct pnp_dev *dev) {
drivers/ras/amd/atl/internal.h +1 -1
@@ -17,7 +17,7 @@#include <linux/bitops.h> #include <linux/ras.h> -#include <asm/amd_nb.h> +#include <asm/amd/nb.h> #include <asm/amd_node.h> #include "reg_fields.h"
PATCH 4/6 x86/platform/amd: Move the <asm/amd_hsmp.h> header to <asm/amd/hsmp.h>
In reply to Ingo MolnarCollect AMD specific platform header files in <asm/amd/*.h>.
---
Documentation/userspace-api/ioctl/ioctl-number.rst | 2 +-
MAINTAINERS | 4 ++--
arch/x86/include/asm/{amd_hsmp.h => amd/hsmp.h} | 2 +-
drivers/platform/x86/amd/hsmp/acpi.c | 2 +-
drivers/platform/x86/amd/hsmp/hsmp.c | 2 +-
drivers/platform/x86/amd/hsmp/plat.c | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)Documentation/userspace-api/ioctl/ioctl-number.rst +1 -1
@@ -395,7 +395,7 @@ Code Seq# Include File Comments <mailto:[email protected]> 0xF6 all LTTng Linux Trace Toolkit Next Generation <mailto:[email protected]> -0xF8 all arch/x86/include/uapi/asm/amd_hsmp.h AMD HSMP EPYC system management interface driver +0xF8 all arch/x86/include/uapi/asm/amd/hsmp.h AMD HSMP EPYC system management interface driver <mailto:[email protected]> 0xFD all linux/dm-ioctl.h 0xFE all linux/isst_if.h
MAINTAINERS +2 -2
@@ -1097,8 +1097,8 @@ R: Carlos Bilbao <[email protected]> L: [email protected] S: Maintained F: Documentation/arch/x86/amd_hsmp.rst -F: arch/x86/include/asm/amd_hsmp.h -F: arch/x86/include/uapi/asm/amd_hsmp.h +F: arch/x86/include/asm/amd/hsmp.h +F: arch/x86/include/uapi/asm/amd/hsmp.h F: drivers/platform/x86/amd/hsmp/ AMD IOMMU (AMD-VI)
arch/x86/include/asm/amd/hsmp.h renamed from arch/x86/include/asm/amd_hsmp.h +1 -1
@@ -3,7 +3,7 @@#ifndef _ASM_X86_AMD_HSMP_H_#define _ASM_X86_AMD_HSMP_H_ -#include <uapi/asm/amd_hsmp.h> +#include <uapi/asm/amd/hsmp.h> #if IS_ENABLED (CONFIG_AMD_HSMP )int hsmp_send_message (struct hsmp_message *msg);
drivers/platform/x86/amd/hsmp/acpi.c +1 -1
@@ -9,7 +9,7 @@#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt -#include <asm/amd_hsmp.h> +#include <asm/amd/hsmp.h> #include <linux/acpi.h> #include <linux/device.h>
drivers/platform/x86/amd/hsmp/hsmp.c +1 -1
@@ -7,7 +7,7 @@* This file provides a device implementation for HSMP interface */ -#include <asm/amd_hsmp.h> +#include <asm/amd/hsmp.h> #include <linux/acpi.h> #include <linux/delay.h>
drivers/platform/x86/amd/hsmp/plat.c +1 -1
@@ -9,7 +9,7 @@#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt -#include <asm/amd_hsmp.h> +#include <asm/amd/hsmp.h> #include <linux/build_bug.h> #include <linux/device.h>
Signature · 1 line
2.45.2
[tip: x86/merge] x86/platform/amd: Move the <asm/amd_hsmp.h> header to <asm/amd/hsmp.h>
The following commit has been merged into the x86/merge branch of tip:
The following commit has been merged into the x86/merge branch of tip:
Commit-ID: d96c78684166bc0e7997d12d845882cb5824eed3 Gitweb: https://git.kernel.org/tip/d96c78684166bc0e7997d12d845882cb5824eed3 Author: Ingo Molnar <[email protected]> AuthorDate: Sun, 13 Apr 2025 10:41:42 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Mon, 14 Apr 2025 09:34:17 +02:00
x86/platform/amd: Move the <asm/amd_hsmp.h> header to <asm/amd/hsmp.h>
Collect AMD specific platform header files in <asm/amd/*.h>.
--- MAINTAINERS | 2 +- arch/x86/include/asm/amd/hsmp.h | 16 ++++++++++++++++ arch/x86/include/asm/amd_hsmp.h | 16 ---------------- drivers/platform/x86/amd/hsmp/acpi.c | 2 +- drivers/platform/x86/amd/hsmp/hsmp.c | 2 +- drivers/platform/x86/amd/hsmp/plat.c | 2 +- 6 files changed, 20 insertions(+), 20 deletions(-) create mode 100644 arch/x86/include/asm/amd/hsmp.h delete mode 100644 arch/x86/include/asm/amd_hsmp.h
MAINTAINERS +1 -1
@@ -1097,7 +1097,7 @@ R: Carlos Bilbao <[email protected]> L: [email protected] S: Maintained F: Documentation/arch/x86/amd_hsmp.rst -F: arch/x86/include/asm/amd_hsmp.h +F: arch/x86/include/asm/amd/hsmp.h F: arch/x86/include/uapi/asm/amd_hsmp.h F: drivers/platform/x86/amd/hsmp/
arch/x86/include/asm/amd/hsmp.h new file +16 -0
@@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ + +#ifndef _ASM_X86_AMD_HSMP_H_ +#define _ASM_X86_AMD_HSMP_H_ + +#include <uapi/asm/amd_hsmp.h> + +#if IS_ENABLED (CONFIG_AMD_HSMP ) +int hsmp_send_message (struct hsmp_message *msg); +#else +static inline int hsmp_send_message (struct hsmp_message *msg) +{ +return -ENODEV ; +} +#endif +#endif /*_ASM_X86_AMD_HSMP_H_*/
arch/x86/include/asm/amd_hsmp.h deleted +0 -16
@@ -1,16 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ - -#ifndef _ASM_X86_AMD_HSMP_H_ -#define _ASM_X86_AMD_HSMP_H_ - -#include <uapi/asm/amd_hsmp.h> - -#if IS_ENABLED (CONFIG_AMD_HSMP ) -int hsmp_send_message (struct hsmp_message *msg); -#else -static inline int hsmp_send_message (struct hsmp_message *msg) -{ -return -ENODEV ; -} -#endif -#endif /*_ASM_X86_AMD_HSMP_H_*/
drivers/platform/x86/amd/hsmp/acpi.c +1 -1
@@ -9,7 +9,7 @@#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt -#include <asm/amd_hsmp.h> +#include <asm/amd/hsmp.h> #include <linux/acpi.h> #include <linux/device.h>
drivers/platform/x86/amd/hsmp/hsmp.c +1 -1
@@ -7,7 +7,7 @@* This file provides a device implementation for HSMP interface */ -#include <asm/amd_hsmp.h> +#include <asm/amd/hsmp.h> #include <linux/acpi.h> #include <linux/delay.h>
drivers/platform/x86/amd/hsmp/plat.c +1 -1
@@ -9,7 +9,7 @@#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt -#include <asm/amd_hsmp.h> +#include <asm/amd/hsmp.h> #include <linux/build_bug.h> #include <linux/device.h>
PATCH 5/6 x86/platform/amd: Clean up the <asm/amd/hsmp.h> header guards a bit
In reply to Ingo Molnar - There's no need for a newline after the SPDX line
- But there's a need for one before the closing header guard.
Collect AMD specific platform header files in <asm/amd/*.h>.
--- arch/x86/include/asm/amd/hsmp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/include/asm/amd/hsmp.h +1 -1
@@ -1,5 +1,4 @@/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ -#ifndef _ASM_X86_AMD_HSMP_H_#define _ASM_X86_AMD_HSMP_H_
@@ -13,4 +12,5 @@ static inline int hsmp_send_message(struct hsmp_message *msg)return -ENODEV ; }#endif +#endif /*_ASM_X86_AMD_HSMP_H_*/
Signature · 1 line
2.45.2
[tip: x86/merge] x86/platform/amd: Clean up the <asm/amd/hsmp.h> header guards a bit
The following commit has been merged into the x86/merge branch of tip:
The following commit has been merged into the x86/merge branch of tip:
Commit-ID: 5bb144e52c666dc0082a90662a5406133415cacc Gitweb: https://git.kernel.org/tip/5bb144e52c666dc0082a90662a5406133415cacc Author: Ingo Molnar <[email protected]> AuthorDate: Sun, 13 Apr 2025 10:41:43 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Mon, 14 Apr 2025 09:34:17 +02:00
x86/platform/amd: Clean up the <asm/amd/hsmp.h> header guards a bit
- There's no need for a newline after the SPDX line
- But there's a need for one before the closing header guard.
Collect AMD specific platform header files in <asm/amd/*.h>.
--- arch/x86/include/asm/amd/hsmp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/include/asm/amd/hsmp.h +1 -1
@@ -1,5 +1,4 @@/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ -#ifndef _ASM_X86_AMD_HSMP_H_#define _ASM_X86_AMD_HSMP_H_
@@ -13,4 +12,5 @@ static inline int hsmp_send_message(struct hsmp_message *msg)return -ENODEV ; }#endif +#endif /*_ASM_X86_AMD_HSMP_H_*/
PATCH 6/6 x86/platform/amd: Move the <asm/amd_node.h> header to <asm/amd/node.h>
In reply to Ingo MolnarCollect AMD specific platform header files in <asm/amd/*.h>.
---
MAINTAINERS | 2 +-
arch/x86/include/asm/amd/nb.h | 2 +-
arch/x86/include/asm/{amd_node.h => amd/node.h} | 0
arch/x86/kernel/amd_node.c | 2 +-
arch/x86/pci/fixup.c | 2 +-
drivers/edac/amd64_edac.c | 2 +-
drivers/hwmon/k10temp.c | 2 +-
drivers/platform/x86/amd/hsmp/acpi.c | 2 +-
drivers/platform/x86/amd/hsmp/plat.c | 2 +-
drivers/platform/x86/amd/pmc/pmc.c | 2 +-
drivers/platform/x86/amd/pmf/core.c | 2 +-
drivers/ras/amd/atl/internal.h | 2 +-
sound/soc/amd/acp/acp-rembrandt.c | 2 +-
sound/soc/amd/acp/acp63.c | 2 +-
sound/soc/amd/acp/acp70.c | 2 +-
sound/soc/sof/amd/acp.c | 2 +-
16 files changed, 15 insertions(+), 15 deletions(-)MAINTAINERS +1 -1
@@ -1142,7 +1142,7 @@ M: Mario Limonciello <[email protected]> M: Yazen Ghannam <[email protected]> L: [email protected] S: Supported -F: arch/x86/include/asm/amd_node.h +F: arch/x86/include/asm/amd/node.h F: arch/x86/kernel/amd_node.c AMD PDS CORE DRIVER
arch/x86/include/asm/amd/nb.h +1 -1
@@ -4,7 +4,7 @@#include <linux/ioport.h> #include <linux/pci.h> -#include <asm/amd_node.h> +#include <asm/amd/node.h> struct amd_nb_bus_dev_range {u8 bus;
arch/x86/include/asm/amd/node.h renamed from arch/x86/include/asm/amd_node.h +0 -0
arch/x86/kernel/amd_node.c +1 -1
@@ -9,7 +9,7 @@*/ #include <linux/debugfs.h> -#include <asm/amd_node.h> +#include <asm/amd/node.h> /* * AMD Nodes are a physical collection of I/O devices within an SoC. There can be one
arch/x86/pci/fixup.c +1 -1
@@ -9,7 +9,7 @@#include <linux/pci.h> #include <linux/suspend.h> #include <linux/vgaarb.h> -#include <asm/amd_node.h> +#include <asm/amd/node.h> #include <asm/hpet.h> #include <asm/pci_x86.h>
drivers/edac/amd64_edac.c +1 -1
@@ -3,7 +3,7 @@#include <linux/string_choices.h> #include "amd64_edac.h" #include <asm/amd/nb.h> -#include <asm/amd_node.h> +#include <asm/amd/node.h> static struct edac_pci_ctl_info *pci_ctl;
drivers/hwmon/k10temp.c +1 -1
@@ -20,7 +20,7 @@#include <linux/module.h> #include <linux/pci.h> #include <linux/pci_ids.h> -#include <asm/amd_node.h> +#include <asm/amd/node.h> #include <asm/processor.h> MODULE_DESCRIPTION ("AMD Family 10h+ CPU core temperature monitor" );
drivers/platform/x86/amd/hsmp/acpi.c +1 -1
@@ -23,7 +23,7 @@#include <uapi/asm-generic/errno-base.h> -#include <asm/amd_node.h> +#include <asm/amd/node.h> #include "hsmp.h"
drivers/platform/x86/amd/hsmp/plat.c +1 -1
@@ -18,7 +18,7 @@#include <linux/platform_device.h> #include <linux/sysfs.h> -#include <asm/amd_node.h> +#include <asm/amd/node.h> #include "hsmp.h"
drivers/platform/x86/amd/pmc/pmc.c +1 -1
@@ -28,7 +28,7 @@#include <linux/seq_file.h> #include <linux/uaccess.h> -#include <asm/amd_node.h> +#include <asm/amd/node.h> #include "pmc.h"
drivers/platform/x86/amd/pmf/core.c +1 -1
@@ -14,7 +14,7 @@#include <linux/pci.h> #include <linux/platform_device.h> #include <linux/power_supply.h> -#include <asm/amd_node.h> +#include <asm/amd/node.h> #include "pmf.h" /* PMF-SMU communication registers */
drivers/ras/amd/atl/internal.h +1 -1
@@ -18,7 +18,7 @@#include <linux/ras.h> #include <asm/amd/nb.h> -#include <asm/amd_node.h> +#include <asm/amd/node.h> #include "reg_fields.h"
sound/soc/amd/acp/acp-rembrandt.c +1 -1
@@ -22,7 +22,7 @@#include <linux/pci.h> #include <linux/pm_runtime.h> -#include <asm/amd_node.h> +#include <asm/amd/node.h> #include "amd.h" #include "../mach-config.h"
sound/soc/amd/acp/acp63.c +1 -1
@@ -21,7 +21,7 @@#include <linux/pm_runtime.h> #include <linux/pci.h> -#include <asm/amd_node.h> +#include <asm/amd/node.h> #include "amd.h" #include "acp-mach.h"
sound/soc/amd/acp/acp70.c +1 -1
@@ -23,7 +23,7 @@#include "amd.h" #include "acp-mach.h" -#include <asm/amd_node.h> +#include <asm/amd/node.h> #define DRV_NAME "acp_asoc_acp70"
sound/soc/sof/amd/acp.c +1 -1
@@ -16,7 +16,7 @@#include <linux/module.h> #include <linux/pci.h> -#include <asm/amd_node.h> +#include <asm/amd/node.h> #include "../ops.h" #include "acp.h"
Signature · 1 line
2.45.2
[tip: x86/merge] x86/platform/amd: Move the <asm/amd_node.h> header to <asm/amd/node.h>
The following commit has been merged into the x86/merge branch of tip:
The following commit has been merged into the x86/merge branch of tip:
Commit-ID: 0a35c9280a9105e601cfe23b7c15522a195fa412 Gitweb: https://git.kernel.org/tip/0a35c9280a9105e601cfe23b7c15522a195fa412 Author: Ingo Molnar <[email protected]> AuthorDate: Sun, 13 Apr 2025 10:41:44 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Mon, 14 Apr 2025 09:34:17 +02:00
x86/platform/amd: Move the <asm/amd_node.h> header to <asm/amd/node.h>
Collect AMD specific platform header files in <asm/amd/*.h>.
--- MAINTAINERS | 2 +- arch/x86/include/asm/amd/nb.h | 2 +- arch/x86/include/asm/amd/node.h | 60 +++++++++++++++++++++++++++- arch/x86/include/asm/amd_node.h | 60 +--------------------------- arch/x86/kernel/amd_node.c | 2 +- arch/x86/pci/fixup.c | 2 +- drivers/edac/amd64_edac.c | 2 +- drivers/hwmon/k10temp.c | 2 +- drivers/platform/x86/amd/hsmp/acpi.c | 2 +- drivers/platform/x86/amd/hsmp/plat.c | 2 +- drivers/platform/x86/amd/pmc/pmc.c | 2 +- drivers/platform/x86/amd/pmf/core.c | 2 +- drivers/ras/amd/atl/internal.h | 2 +- sound/soc/amd/acp/acp-rembrandt.c | 2 +- sound/soc/amd/acp/acp63.c | 2 +- sound/soc/amd/acp/acp70.c | 2 +- sound/soc/sof/amd/acp.c | 2 +- 17 files changed, 75 insertions(+), 75 deletions(-) create mode 100644 arch/x86/include/asm/amd/node.h delete mode 100644 arch/x86/include/asm/amd_node.h
MAINTAINERS +1 -1
@@ -1142,7 +1142,7 @@ M: Mario Limonciello <[email protected]> M: Yazen Ghannam <[email protected]> L: [email protected] S: Supported -F: arch/x86/include/asm/amd_node.h +F: arch/x86/include/asm/amd/node.h F: arch/x86/kernel/amd_node.c AMD PDS CORE DRIVER
arch/x86/include/asm/amd/nb.h +1 -1
@@ -4,7 +4,7 @@#include <linux/ioport.h> #include <linux/pci.h> -#include <asm/amd_node.h> +#include <asm/amd/node.h> struct amd_nb_bus_dev_range {u8 bus;
arch/x86/include/asm/amd/node.h new file +60 -0
60 lines not on this page · raw message
arch/x86/include/asm/amd_node.h deleted +0 -60
60 lines not on this page · raw message
arch/x86/kernel/amd_node.c +1 -1
@@ -9,7 +9,7 @@*/ #include <linux/debugfs.h> -#include <asm/amd_node.h> +#include <asm/amd/node.h> /* * AMD Nodes are a physical collection of I/O devices within an SoC. There can be one
arch/x86/pci/fixup.c +1 -1
@@ -9,7 +9,7 @@#include <linux/pci.h> #include <linux/suspend.h> #include <linux/vgaarb.h> -#include <asm/amd_node.h> +#include <asm/amd/node.h> #include <asm/hpet.h> #include <asm/pci_x86.h>
drivers/edac/amd64_edac.c +1 -1
@@ -3,7 +3,7 @@#include <linux/string_choices.h> #include "amd64_edac.h" #include <asm/amd/nb.h> -#include <asm/amd_node.h> +#include <asm/amd/node.h> static struct edac_pci_ctl_info *pci_ctl;
drivers/hwmon/k10temp.c +1 -1
@@ -20,7 +20,7 @@#include <linux/module.h> #include <linux/pci.h> #include <linux/pci_ids.h> -#include <asm/amd_node.h> +#include <asm/amd/node.h> #include <asm/processor.h> MODULE_DESCRIPTION ("AMD Family 10h+ CPU core temperature monitor" );
drivers/platform/x86/amd/hsmp/acpi.c +1 -1
@@ -23,7 +23,7 @@#include <uapi/asm-generic/errno-base.h> -#include <asm/amd_node.h> +#include <asm/amd/node.h> #include "hsmp.h"
drivers/platform/x86/amd/hsmp/plat.c +1 -1
@@ -18,7 +18,7 @@#include <linux/platform_device.h> #include <linux/sysfs.h> -#include <asm/amd_node.h> +#include <asm/amd/node.h> #include "hsmp.h"
drivers/platform/x86/amd/pmc/pmc.c +1 -1
@@ -28,7 +28,7 @@#include <linux/seq_file.h> #include <linux/uaccess.h> -#include <asm/amd_node.h> +#include <asm/amd/node.h> #include "pmc.h"
drivers/platform/x86/amd/pmf/core.c +1 -1
@@ -14,7 +14,7 @@#include <linux/pci.h> #include <linux/platform_device.h> #include <linux/power_supply.h> -#include <asm/amd_node.h> +#include <asm/amd/node.h> #include "pmf.h" /* PMF-SMU communication registers */
drivers/ras/amd/atl/internal.h +1 -1
@@ -18,7 +18,7 @@#include <linux/ras.h> #include <asm/amd/nb.h> -#include <asm/amd_node.h> +#include <asm/amd/node.h> #include "reg_fields.h"
sound/soc/amd/acp/acp-rembrandt.c +1 -1
@@ -22,7 +22,7 @@#include <linux/pci.h> #include <linux/pm_runtime.h> -#include <asm/amd_node.h> +#include <asm/amd/node.h> #include "amd.h" #include "../mach-config.h"
sound/soc/amd/acp/acp63.c +1 -1
@@ -21,7 +21,7 @@#include <linux/pm_runtime.h> #include <linux/pci.h> -#include <asm/amd_node.h> +#include <asm/amd/node.h> #include "amd.h" #include "acp-mach.h"
sound/soc/amd/acp/acp70.c +1 -1
@@ -23,7 +23,7 @@#include "amd.h" #include "acp-mach.h" -#include <asm/amd_node.h> +#include <asm/amd/node.h> #define DRV_NAME "acp_asoc_acp70"
sound/soc/sof/amd/acp.c +1 -1
@@ -16,7 +16,7 @@#include <linux/module.h> #include <linux/pci.h> -#include <asm/amd_node.h> +#include <asm/amd/node.h> #include "../ops.h" #include "acp.h"
Borislav Petkov
maintainerQuoted 54 lines · Ingo Molnar
Also clean up some details while at it.
The Git tree of these patches can also be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/mingo/tip.gitWIP.x86/platformThanks,
Ingo
===============>
Ingo Molnar (6):
x86/platform/amd: Move the <asm/amd-ibs.h> header to <asm/amd/ibs.h> x86/platform/amd: Add standard header guards to <asm/amd/ibs.h> x86/platform/amd: Move the <asm/amd_nb.h> header to <asm/amd/nb.h> x86/platform/amd: Move the <asm/amd_hsmp.h> header to <asm/amd/hsmp.h> x86/platform/amd: Clean up the <asm/amd/hsmp.h> header guards a bit x86/platform/amd: Move the <asm/amd_node.h> header to <asm/amd/node.h>Documentation/userspace-api/ioctl/ioctl-number.rst | 2 +- MAINTAINERS | 6 +++--- arch/x86/events/amd/ibs.c | 2 +- arch/x86/include/asm/{amd_hsmp.h => amd/hsmp.h} | 4 ++-- arch/x86/include/asm/{amd-ibs.h => amd/ibs.h} | 5 +++++ arch/x86/include/asm/{amd_nb.h => amd/nb.h} | 2 +- arch/x86/include/asm/{amd_node.h => amd/node.h} | 0 arch/x86/kernel/amd_gart_64.c | 2 +- arch/x86/kernel/amd_nb.c | 2 +- arch/x86/kernel/amd_node.c | 2 +- arch/x86/kernel/aperture_64.c | 2 +- arch/x86/kernel/cpu/cacheinfo.c | 2 +- arch/x86/kernel/cpu/mce/inject.c | 2 +- arch/x86/mm/amdtopology.c | 2 +- arch/x86/mm/numa.c | 2 +- arch/x86/pci/amd_bus.c | 2 +- arch/x86/pci/fixup.c | 2 +- drivers/char/agp/amd64-agp.c | 2 +- drivers/edac/amd64_edac.c | 4 ++-- drivers/hwmon/k10temp.c | 2 +- drivers/platform/x86/amd/hsmp/acpi.c | 4 ++-- drivers/platform/x86/amd/hsmp/hsmp.c | 2 +- drivers/platform/x86/amd/hsmp/plat.c | 4 ++-- drivers/platform/x86/amd/pmc/mp1_stb.c | 2 +- drivers/platform/x86/amd/pmc/pmc.c | 2 +- drivers/platform/x86/amd/pmf/core.c | 2 +- drivers/pnp/quirks.c | 2 +- drivers/ras/amd/atl/internal.h | 4 ++-- sound/soc/amd/acp/acp-rembrandt.c | 2 +- sound/soc/amd/acp/acp63.c | 2 +- sound/soc/amd/acp/acp70.c | 2 +- sound/soc/sof/amd/acp.c | 2 +- tools/perf/check-headers.sh | 2 +- tools/perf/util/amd-sample-raw.c | 2 +- 34 files changed, 44 insertions(+), 39 deletions(-)
Quoted 4 lines
rename
arch/x86/include/asm/{amd_hsmp.h=>amd/hsmp.h} (91%) renamearch/x86/include/asm/{amd-ibs.h=>amd/ibs.h} (98%) renamearch/x86/include/asm/{amd_nb.h=>amd/nb.h} (98%) renamearch/x86/include/asm/{amd_node.h=>amd/node.h} (100%)
Cool, /me like.
Thx.
Signature · 1 line
Sent from a small device: formatting sucks and brevity is inevitable.
Ingo Molnar
Acked-by Borislav Petkov (AMD)Quoted 1 line · Borislav Petkov
Cool, /me like.
Thx, I turned this into:
:-)
Ingo