Skip to content

Commit b507535

Browse files
committed
Merge tag 'x86-misc-2024-09-17' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull misc x86 updates from Thomas Gleixner: - Rework kcpuid to handle the the autogenerated CSV file correctly and update the CSV file to cover the whole zoo of CPUID. - Avoid memcpy() for ia32 syscall_get_arguments() and use direct assignments as fortified memcpy() is unhappy about writing/reading beyond the end of the addresses destination/source struct member - A few new PCI IDs for AMD - Update MAINTAINERS to cover x86 specific selftests * tag 'x86-misc-2024-09-17' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: MAINTAINERS: Add selftests/x86 entry x86/amd_nb: Add new PCI IDs for AMD family 1Ah model 60h-70h x86/syscall: Avoid memcpy() for ia32 syscall_get_arguments() MAINTAINERS: Add x86 cpuid database entry tools/x86/kcpuid: Introduce a complete cpuid bitfields CSV file tools/x86/kcpuid: Parse subleaf ranges if provided tools/x86/kcpuid: Recognize all leaves with subleaves tools/x86/kcpuid: Strip bitfield names leading/trailing whitespace tools/x86/kcpuid: Protect against faulty "max subleaf" values tools/x86/kcpuid: Set max possible subleaves count to 64 tools/x86/kcpuid: Properly align long-description columns tools/x86/kcpuid: Remove unused variable x86/amd_nb: Add new PCI IDs for AMD family 1Ah model 60h
2 parents a3233da + 4460e85 commit b507535

File tree

7 files changed

+1100
-466
lines changed

7 files changed

+1100
-466
lines changed

MAINTAINERS

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24915,6 +24915,17 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/core
2491524915
F: Documentation/arch/x86/
2491624916
F: Documentation/devicetree/bindings/x86/
2491724917
F: arch/x86/
24918+
F: tools/testing/selftests/x86
24919+
24920+
X86 CPUID DATABASE
24921+
M: Borislav Petkov <[email protected]>
24922+
M: Thomas Gleixner <[email protected]>
24923+
24924+
R: Ahmed S. Darwish <[email protected]>
24925+
24926+
S: Maintained
24927+
W: https://x86-cpuid.org
24928+
F: tools/arch/x86/kcpuid/cpuid.csv
2491824929

2491924930
X86 ENTRY CODE
2492024931
M: Andy Lutomirski <[email protected]>

arch/x86/include/asm/syscall.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,12 @@ static inline void syscall_get_arguments(struct task_struct *task,
8282
struct pt_regs *regs,
8383
unsigned long *args)
8484
{
85-
memcpy(args, &regs->bx, 6 * sizeof(args[0]));
85+
args[0] = regs->bx;
86+
args[1] = regs->cx;
87+
args[2] = regs->dx;
88+
args[3] = regs->si;
89+
args[4] = regs->di;
90+
args[5] = regs->bp;
8691
}
8792

8893
static inline int syscall_get_arch(struct task_struct *task)

arch/x86/kernel/amd_nb.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#define PCI_DEVICE_ID_AMD_19H_M70H_ROOT 0x14e8
2727
#define PCI_DEVICE_ID_AMD_1AH_M00H_ROOT 0x153a
2828
#define PCI_DEVICE_ID_AMD_1AH_M20H_ROOT 0x1507
29+
#define PCI_DEVICE_ID_AMD_1AH_M60H_ROOT 0x1122
2930
#define PCI_DEVICE_ID_AMD_MI200_ROOT 0x14bb
3031
#define PCI_DEVICE_ID_AMD_MI300_ROOT 0x14f8
3132

@@ -43,6 +44,8 @@
4344
#define PCI_DEVICE_ID_AMD_19H_M70H_DF_F4 0x14f4
4445
#define PCI_DEVICE_ID_AMD_19H_M78H_DF_F4 0x12fc
4546
#define PCI_DEVICE_ID_AMD_1AH_M00H_DF_F4 0x12c4
47+
#define PCI_DEVICE_ID_AMD_1AH_M60H_DF_F4 0x124c
48+
#define PCI_DEVICE_ID_AMD_1AH_M70H_DF_F4 0x12bc
4649
#define PCI_DEVICE_ID_AMD_MI200_DF_F4 0x14d4
4750
#define PCI_DEVICE_ID_AMD_MI300_DF_F4 0x152c
4851

@@ -63,6 +66,7 @@ static const struct pci_device_id amd_root_ids[] = {
6366
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M70H_ROOT) },
6467
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M00H_ROOT) },
6568
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M20H_ROOT) },
69+
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M60H_ROOT) },
6670
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI200_ROOT) },
6771
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI300_ROOT) },
6872
{}
@@ -95,6 +99,7 @@ static const struct pci_device_id amd_nb_misc_ids[] = {
9599
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M78H_DF_F3) },
96100
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M00H_DF_F3) },
97101
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M20H_DF_F3) },
102+
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M60H_DF_F3) },
98103
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M70H_DF_F3) },
99104
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI200_DF_F3) },
100105
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI300_DF_F3) },
@@ -122,6 +127,8 @@ static const struct pci_device_id amd_nb_link_ids[] = {
122127
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M78H_DF_F4) },
123128
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F4) },
124129
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M00H_DF_F4) },
130+
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M60H_DF_F4) },
131+
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M70H_DF_F4) },
125132
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI200_DF_F4) },
126133
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI300_DF_F4) },
127134
{}

drivers/hwmon/k10temp.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -548,6 +548,7 @@ static const struct pci_device_id k10temp_id_table[] = {
548548
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M78H_DF_F3) },
549549
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_1AH_M00H_DF_F3) },
550550
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_1AH_M20H_DF_F3) },
551+
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_1AH_M60H_DF_F3) },
551552
{ PCI_VDEVICE(HYGON, PCI_DEVICE_ID_AMD_17H_DF_F3) },
552553
{}
553554
};

include/linux/pci_ids.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -580,6 +580,7 @@
580580
#define PCI_DEVICE_ID_AMD_19H_M78H_DF_F3 0x12fb
581581
#define PCI_DEVICE_ID_AMD_1AH_M00H_DF_F3 0x12c3
582582
#define PCI_DEVICE_ID_AMD_1AH_M20H_DF_F3 0x16fb
583+
#define PCI_DEVICE_ID_AMD_1AH_M60H_DF_F3 0x124b
583584
#define PCI_DEVICE_ID_AMD_1AH_M70H_DF_F3 0x12bb
584585
#define PCI_DEVICE_ID_AMD_MI200_DF_F3 0x14d3
585586
#define PCI_DEVICE_ID_AMD_MI300_DF_F3 0x152b

0 commit comments

Comments
 (0)