Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
142 commits
Select commit Hold shift + click to select a range
d6d3260
Ubuntu: [Packaging] Initialize noble:linux-nvidia-6.17
Sep 24, 2025
6ee91fa
UBUNTU: [Packaging] debian.nvidia-6.17/dkms-versions -- update from k…
Sep 26, 2025
d2f603a
UBUNTU: [Config] nvidia-6.14: import misc configs from noble:linux-nv…
jacobmartin0 Apr 8, 2025
697b43e
UBUNTU: [Packaging] dkms-versions standalone provides support
nvidia-bfigg Jan 5, 2024
d4cb6f8
UBUNTU: [Packaging] add versioning to dkms standalone rprovides
ianmay81 Mar 21, 2024
6d19ae5
NVIDIA: [Config]: Disable the NOUVEAU driver which is not used with -…
nvidia-bfigg Apr 4, 2024
f0a3047
NVIDIA: [Config]: Adding CORESIGHT and ARM64_ERRATUM configs to annot…
nvidia-bfigg Apr 5, 2024
040390e
UBUNTU: [Config] Disable Ubuntu ODM drivers for NVIDIA kernels
jacobmartin0 Oct 17, 2024
37a0b39
NVIDIA: [Config] arm64: ARM64_CONTPTE=y
Mar 27, 2024
7fdbd15
UBUNTU: [Packaging] blacklist coresight_etm4x
ianmay81 Apr 25, 2024
7b6b690
NVIDIA: [Config] EFI: set CAPSULE_LOADER=y for arm64
nvidia-bfigg Aug 7, 2024
4ba3142
UBUNTU: [Config] nvidia-6.11: Enable MANA configs on x86 and arm64
jacobmartin0 Oct 16, 2024
bf87248
NVIDIA: SAUCE: WAR: Expose PCI PASID capability to userspace
ankita-nv Nov 15, 2023
8bb2b8b
NVIDIA: SAUCE: WAR: iommufd/pages: Bypass PFNMAP
ankita-nv Nov 15, 2023
089abf4
NVIDIA: SAUCE: [Config] nvidia-6.14: Update annotations for Grace I/O…
nvmochs Jul 16, 2024
24ca881
NVIDIA: [Config] set CONFIG_CPUFREQ_ARCH_CUR_FREQ=y for x86
jamieNguyenNVIDIA Feb 25, 2025
8392790
NVIDIA: SAUCE: serial: 8250_mtk: Add ACPI support
yenchia-chen Feb 11, 2025
d27ef10
NVIDIA: SAUCE: Adds MT7925 BT devices
nvidia-bfigg Feb 11, 2025
da56a55
NVIDIA: SAUCE: Fixes the kernel boot issues due to xhci mem errors
nvidia-bfigg Feb 11, 2025
901fb2b
NVIDIA: SAUCE: MEDIATEK: usb: host: xhci-plat: support usb3 bulks str…
Apr 12, 2025
a1d0131
NVIDIA: SAUCE: MEDIATEK: PCI: disable SBR on Gen5 ports
Apr 11, 2025
6942dff
UBUNTU: [Packaging] update variants
Oct 2, 2025
a9fd99b
NVIDIA: [Packaging] Take out the sbsa_gwdt from the blacklist
clsotog Apr 29, 2025
b8284df
UBUNTU: [Config] nvidia-6.17: do not build lib-rust package
Oct 6, 2025
f939f9a
NVIDIA: SAUCE: r8127: Add Realtek r8127 ethernet driver
abhsahu Apr 28, 2025
7483483
NVIDIA: SAUCE: r8127: Remove Realtek r8127 non required files
abhsahu Apr 28, 2025
a70b562
NVIDIA: SAUCE: r8127: Moved files from r8127/src to r8127 folder
abhsahu Apr 28, 2025
74305ff
NVIDIA: SAUCE: Add r8127 in kernel build
terjebergstrom Apr 22, 2025
ef52c6d
UBUNTU: [Config] nvidia-6.11: Update annotations to enable realtek R8…
abhsahu Apr 24, 2025
35dbf0d
UBUNTU: [Config] nvidia-6.14: Drop CONFIG_TEGRA241_CMDQV from annotat…
jamieNguyenNVIDIA May 5, 2025
ec6873b
NVIDIA: SAUCE: [Config] nvidia-6.14 CONFIG_SND_HDA_ACPI=m on arm64
dadap Apr 22, 2025
79f4a4e
UBUNTU: [Config] nvidia-6.14: Update annotations to enable TPM over FFA
abhsahu May 22, 2025
c824fc0
NVIDIA: SAUCE: MEDIATEK: wifi: mt76: mt7925: add reg hint support
May 2, 2025
0064e27
NVIDIA: SAUCE: MEDIATEK: wifi: mt76: mt7925: update the regd by count…
May 26, 2025
315f09f
NVIDIA: SAUCE: Add support for custom ARM FFH offset handler
abhsahu May 7, 2025
506b2a0
NVIDIA: SAUCE: Add nvidia ffa driver for EC communication
abhsahu May 7, 2025
f36b032
NVIDIA: SAUCE: Add ffa driver for each secure EC service
abhsahu May 7, 2025
bcf701e
NVIDIA: SAUCE: Add support for EC secure service communication
abhsahu May 7, 2025
af76b98
NVIDIA: SAUCE: Rescan acpi devices that uses secure EC communication
abhsahu May 7, 2025
3f7d85e
NVIDIA: SAUCE: irqchip/gic-v3: Allow unused SGIs for drivers/modules
shankerd04 Aug 13, 2024
a14a790
NVIDIA: SAUCE: Add support for notifications from secure EC services
abhsahu May 8, 2025
1746aeb
UBUNTU: [Config] nvidia-6.14: Update annotations to enable NVIDIA FFA…
abhsahu Jun 13, 2025
e6b304c
NVIDIA: SAUCE: MEDIATEK: pcie: disable SBR on Gen4 Ports
Jun 9, 2025
cfc7c5d
NVIDIA: SAUCE: MEDIATEK: pinctrl: mediatek: Add gpio-range record in …
Apr 21, 2025
a45c189
NVIDIA: SAUCE: MEDIATEK: pinctrl: mediatek: Add acpi support
Apr 22, 2025
9b0575c
NVIDIA: SAUCE: MEDIATEK: pinctrl: mt8901: Add pinctrl driver
Apr 22, 2025
1977c55
UBUNTU: [Config] nvidia-6.14: Update annotations to enable CONFIG_PIN…
abhsahu Jul 22, 2025
c54d669
NVIDIA: SAUCE: Fix FFH data response length
abhsahu Jul 22, 2025
74c7e53
NVIDIA: SAUCE: arm64: cputype: Add NVIDIA Olympus definitions
shankerd04 May 3, 2025
b214fb8
UBUNTU: [Config] nvidia-6.14: Enable BRBE
nvmochs Jul 23, 2025
387f70d
NVIDIA: SAUCE: mm: handle poisoning of pfn without struct pages
ankita-nv Jul 14, 2025
22ae182
NVIDIA: SAUCE: mm: correctly identify pfn without struct pages
nvmochs Sep 22, 2025
43a226d
NVIDIA: SAUCE: mm: Add poison error check in fixup_user_fault() for m…
ankita-nv Dec 6, 2023
a106f3e
NVIDIA: SAUCE: mm: Change ghes code to allow poison of non-struct pfn
ankita-nv Dec 6, 2023
eda3c2f
NVIDIA: SAUCE: vfio/nvgrace-gpu: register device memory for poison ha…
ankita-nv Feb 25, 2024
6356d62
NVIDIA: SAUCE: arm64: configs: Build NVGRACE_GPU_VFIO_PCI as LKM
nicolinc Dec 4, 2023
dfbbf1f
NVIDIA: SAUCE: arm64: configs: Enable IOMMUFD and VFIO_DEVICE_CDEV
nicolinc Nov 7, 2023
7f517f8
NVIDIA: SAUCE: arm64: configs: Replace VFIO_CONTAINER with IOMMUFD_VF…
nicolinc Jan 22, 2024
93277da
NVIDIA: SAUCE: KVM: arm64: Allow exec fault on memory mapped cacheabl…
ankita-nv Aug 29, 2024
6b556e7
NVIDIA: SAUCE: vfio/nvgrace-egm: Introduce module to manage EGM
ankita-nv Aug 29, 2024
75df37d
NVIDIA: SAUCE: vfio/nvgrace-egm: Handle pages with ECC errors on the EGM
ankita-nv Aug 29, 2024
2ad32de
NVIDIA: SAUCE: vfio/nvgrace-egm: Register EGM for runtime ECC poison …
ankita-nv Aug 29, 2024
4973176
NVIDIA: SAUCE: arm64: configs: Build CONFIG_NVGRACE_EGM as LKM
nvmochs Aug 30, 2024
9474053
NVIDIA: SAUCE: vfio/nvgrace-egm: Move the egm header file to include
ankita-nv Oct 13, 2024
f83c73f
NVIDIA: SAUCE: vfio/nvgrace-egm: Free region memory during unregistra…
nvmochs Nov 7, 2024
4d4ba23
NVIDIA: SAUCE: vfio/nvgrace-egm: Move region hash initialization
nvmochs Nov 7, 2024
e21c708
NVIDIA: SAUCE: vfio/nvgrace-egm: Handle and convey EGM registration e…
nvmochs Nov 7, 2024
1e3bc6c
NVIDIA: SAUCE: vfio/nvgrace-gpu: Handle EGM registration failure
nvmochs Nov 7, 2024
7facf9e
NVIDIA: SAUCE: vfio/nvgrace-gpu: Address checkpatch warnings
nvmochs Nov 7, 2024
ae23479
NVIDIA: SAUCE: vfio/nvgrace-egm: Address sparse errors
nvmochs Nov 8, 2024
d526659
NVIDIA: SAUCE: vfio/nvgrace-egm: Address smatch errors
nvmochs Nov 8, 2024
8ed8845
NVIDIA: SAUCE: vfio/nvgrace-gpu: Address smatch errors
nvmochs Nov 8, 2024
6c132df
NVIDIA: SAUCE: vfio/nvgrace-egm: Ensure ACPI value reads are successful
nvmochs Nov 22, 2024
d82ad58
NVIDIA: SAUCE: vfio/nvgrace-egm: Avoid invalid retired pages base
nvmochs Nov 14, 2024
2b1bb7b
NVIDIA: SAUCE: vfio/nvgrace-egm: Update EGM unregistration API
nvmochs Jan 23, 2025
dd55a40
NVIDIA: SAUCE: vfio/nvgrace-egm: track GPUs associated with the EGM r…
ankita-nv May 6, 2025
b875505
NVIDIA: SAUCE: vfio/nvgrace-egm: list gpus through sysfs
ankita-nv May 6, 2025
864e846
NVIDIA: SAUCE: vfio/nvgrace-egm: expose the egm size through sysfs
ankita-nv May 6, 2025
281f85c
NVIDIA: SAUCE: vfio/nvgrace-egm: Add null pointer checks after memory…
KobaKoNvidia May 26, 2025
f3bfa5f
NVIDIA: SAUCE: arm64: configs: enable NVGRACE_EGM as module
nirmoy Jul 14, 2025
5e7f83d
NVIDIA: SAUCE: vfio/nvgrace-gpu: Avoid resmem pfn unregistration
nvmochs Jun 30, 2025
99b7e28
NVIDIA: [Config] Fix CONFIG_IRQ_MSI_IOMMU annotation for amd64
nvmochs Jul 25, 2025
4539ade
UBUNTU: [Config] nvidia-6.14: Update annotations to set CONFIG_IOMMU_…
nirmoy Aug 6, 2025
16aea2d
UBUNTU: [Config] nvidia-6.14: Use performance CPU frequency governor …
jacobmartin0 Aug 26, 2025
5abe65c
PCI/ACPI: Fix pci_acpi_preserve_config() memory leak
nirmoy Aug 25, 2025
7d5742c
NVIDIA: SAUCE: vfio/nvgrace-gpu: Add GB300 SKU to the devid table
tdavenvidia Aug 25, 2025
6d467d7
NVIDIA: SAUCE: Fix FFA notification count initialization
abhsahu Sep 15, 2025
7c6a5fa
NVIDIA: SAUCE: MEDIATEK: usb: host: xhci-hub: fix MT89xx SoCs return …
May 26, 2025
5793d13
UBUNTU: [Config] nvidia-6.17: update configs
Oct 6, 2025
be1fa78
UBUNTU: [Packaging] update update.conf
jacobmartin0 Oct 9, 2025
7248f41
UBUNTU: Start new release
jacobmartin0 Oct 9, 2025
9701fbb
UBUNTU: link-to-tracker: update tracking bug
jacobmartin0 Oct 9, 2025
a454ed4
UBUNTU: [Packaging] nvidia-6.17: Drop use of do_extras_package = false
jacobmartin0 Oct 9, 2025
324793e
UBUNTU: [Packaging] nvidia-6.17: Update build dependencies for Noble …
jacobmartin0 Oct 10, 2025
589e348
UBUNTU: Ubuntu-nvidia-6.17-6.17.0-1002.2
jacobmartin0 Oct 10, 2025
d6fa42d
NVIDIA: SAUCE: iommu/io-pgtable-arm: backport contiguous bit support
aritger May 21, 2025
cfb9c61
NVIDIA: SAUCE: wifi: mt76: mt7925: introduce CSA support in non-MLO mode
leon-yen Sep 26, 2025
1a9a650
NVIDIA: SAUCE: iommu/arm-smmu-v3: Set DGX Spark iGPU default domain t…
nirmoy Sep 10, 2025
cb6e8ea
UBUNTU: [Config] nvidia-6.17: Update annotations to set CONFIG_IOMMU_…
nirmoy Oct 24, 2025
f6cade0
arm64: cpufeature: Add Olympus MIDR to BBML2 allow list
shankerd04 Sep 18, 2025
e7a2fc4
spi: tegra210-quad: Fix timeout handling
Oct 28, 2025
bf0b14d
spi: tegra210-quad: Refactor error handling into helper functions
Oct 28, 2025
696a2cb
spi: tegra210-quad: Check hardware status on timeout
Oct 28, 2025
2ed55ea
NVIDIA: SAUCE: r8127: fix a kernel panic when dump all registers
RealtekNIC Oct 28, 2025
16dc943
NVIDIA: SAUCE: r8127: add support for RTL8127 cable diagnostic test
RealtekNIC Oct 28, 2025
2d23b22
UBUNTU: [Packaging] Add do_tools_noble_hwe to include perf and bpftoo…
jacobmartin0 Sep 29, 2025
95ece95
UBUNTU: [Packaging] nvidia-6.17: enable do_tools_noble_hwe
jacobmartin0 Oct 1, 2025
ad0d816
UBUNTU: Start new release
jacobmartin0 Nov 15, 2025
54ba828
UBUNTU: link-to-tracker: update tracking bug
jacobmartin0 Nov 15, 2025
b9a0de4
UBUNTU: [Packaging] debian.nvidia-6.17/dkms-versions -- update from k…
jacobmartin0 Nov 15, 2025
f060e5f
UBUNTU: [Config] nvidia-6.17: update annotations
jacobmartin0 Nov 15, 2025
0e1ab8a
perf tools: Fix arm64 libjvmti build by generating unistd_64.h
vminet Sep 22, 2025
35c5348
Revert "UBUNTU: [Packaging] Install compressed vmlinuz.efi on arm64"
smb49 Nov 17, 2025
fc20631
UBUNTU: Ubuntu-nvidia-6.17-6.17.0-1004.4
jacobmartin0 Nov 17, 2025
e358c73
NVIDIA: SAUCE: cpufreq: CPPC: Add generic helpers for sysfs show/store
Nov 5, 2025
c0e888a
NVIDIA: SAUCE: ACPI: CPPC: Add cppc_get_perf() API to read performanc…
Nov 5, 2025
70a9098
NVIDIA: SAUCE: ACPI: CPPC: extend APIs to support auto_sel and epp
Nov 5, 2025
117bff7
NVIDIA: SAUCE: ACPI: CPPC: add APIs and sysfs interface for min/max_perf
Nov 5, 2025
13dd147
NVIDIA: SAUCE: ACPI: CPPC: add APIs and sysfs interface for perf_limi…
Nov 5, 2025
0cc0106
NVIDIA: SAUCE: cpufreq: CPPC: Add sysfs for min/max_perf and perf_lim…
Nov 5, 2025
fe4e905
NVIDIA: SAUCE: cpufreq: CPPC: update policy min/max when toggling aut…
Nov 5, 2025
44b0e1a
NVIDIA: SAUCE: cpufreq: CPPC: add autonomous mode boot parameter support
Nov 5, 2025
b6251e4
NVIDIA: SAUCE: iommu/arm-smmu-v3: Add two more DGX Spark iGPU IDs for…
nirmoy Nov 20, 2025
4d57f26
NVIDIA: SAUCE: vfio/nvgrace-egm: Prevent double-unregister of pfn_add…
NathanChenNVIDIA Nov 15, 2025
fd96be3
perf/arm_cspmu: Add callback to reset filter config
bwicaksononv Sep 30, 2025
1ce9624
perf/arm_cspmu: Add pmpidr support
bwicaksononv Sep 30, 2025
6d96cf1
perf/arm_cspmu: nvidia: Add revision id matching
bwicaksononv Sep 30, 2025
4086fd9
perf/arm_cspmu: nvidia: Add pmevfiltr2 support
bwicaksononv Sep 30, 2025
32b89e4
gpio: tegra186: Use generic macro for port definitions
Oct 10, 2025
5443ed9
gpio: tegra186: Add support for Tegra410
Oct 10, 2025
5b22909
net: aquantia: Add missing descriptor cache invalidation on ATL2
Nov 20, 2025
e52d53d
NVIDIA: SAUCE: Patch NVMe/NVMeoF driver to support GDS on Linux 6.17 …
sourabgupta3 Nov 20, 2025
6babb32
NVIDIA: SAUCE: r8127: Remove registers2 proc entry
RealtekNIC Dec 4, 2025
b665c99
Revert "NVIDIA: SAUCE: Fixes the kernel boot issues due to xhci mem e…
clsotog Dec 11, 2025
6057cda
UBUNTU: [Packaging] update Ubuntu.md
jacobmartin0 Dec 15, 2025
7ada37e
UBUNTU: Start new release
jacobmartin0 Dec 15, 2025
3bd0b78
UBUNTU: link-to-tracker: update tracking bug
jacobmartin0 Dec 15, 2025
bb43492
UBUNTU: [Packaging] debian.nvidia-6.17/dkms-versions -- update from k…
jacobmartin0 Dec 15, 2025
fe47267
UBUNTU: [Packaging] update variants
jacobmartin0 Dec 16, 2025
6a9a932
UBUNTU: Ubuntu-nvidia-6.17-6.17.0-1006.6
jacobmartin0 Dec 17, 2025
217f95b
NVIDIA: SAUCE: PCI: Add ASPEED vendor ID to pci_ids.h
nirmoy Dec 17, 2025
2d6f076
NVIDIA: SAUCE: PCI: Add PCI_BRIDGE_NO_ALIASES quirk for ASPEED AST1150
nirmoy Dec 17, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 46 additions & 0 deletions Documentation/ABI/testing/sysfs-devices-system-cpu
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,52 @@ Description: Energy performance preference

This file is only present if the cppc-cpufreq driver is in use.

What: /sys/devices/system/cpu/cpuX/cpufreq/min_perf
Date: December 2025
Contact: linux-pm@vger.kernel.org
Description: Minimum Performance Frequency

Read/write a frequency value in kHz from/to this file. This
file conveys the minimum performance level (as frequency) at
which the platform may run. The frequency value is internally
converted to a performance value and must correspond to a
performance level in the range [Lowest Performance, Highest
Performance], inclusive. The minimum must be less than or equal
to the maximum performance. The performance range can be checked
from nodes:
/sys/devices/system/cpu/cpuX/acpi_cppc/highest_perf
/sys/devices/system/cpu/cpuX/acpi_cppc/lowest_perf

This file is only present if the cppc-cpufreq driver is in use.

What: /sys/devices/system/cpu/cpuX/cpufreq/max_perf
Date: December 2025
Contact: linux-pm@vger.kernel.org
Description: Maximum Performance Frequency

Read/write a frequency value in kHz from/to this file. This
file conveys the maximum performance level (as frequency) at
which the platform may run. The frequency value is internally
converted to a performance value and must correspond to a
performance level in the range [Lowest Performance, Highest
Performance], inclusive. The performance range can be checked
from nodes:
/sys/devices/system/cpu/cpuX/acpi_cppc/highest_perf
/sys/devices/system/cpu/cpuX/acpi_cppc/lowest_perf

This file is only present if the cppc-cpufreq driver is in use.

What: /sys/devices/system/cpu/cpuX/cpufreq/perf_limited
Date: December 2025
Contact: linux-pm@vger.kernel.org
Description: Performance Limited

Read/write a 32 bits value from/to this file. This file indicates
to OSPM that an unpredictable event has limited processor
performance, and the delivered performance may be less than
desired/minimum performance.

This file is only present if the cppc-cpufreq driver is in use.

What: /sys/devices/system/cpu/cpu*/cache/index3/cache_disable_{0,1}
Date: August 2008
Expand Down
12 changes: 12 additions & 0 deletions Documentation/admin-guide/kernel-parameters.txt
Original file line number Diff line number Diff line change
Expand Up @@ -911,6 +911,18 @@
Format:
<first_slot>,<last_slot>,<port>,<enum_bit>[,<debug>]

cppc_cpufreq.auto_sel_mode=
[CPU_FREQ] Enable ACPI CPPC autonomous performance selection.
When enabled, hardware automatically adjusts CPU frequency
on all CPUs based on workload demands. In Autonomous mode,
Energy Performance Preference(EPP) hints guide hardware
toward performance(0x0) or energy efficiency (0xff).
Requires ACPI CPPC autonomous selection register support.
Format: <bool>
Default: 0 (disabled)
0: use cpufreq governors
1: enable if supoorted by hardware

cpuidle.off=1 [CPU_IDLE]
disable the cpuidle sub-system

Expand Down
8 changes: 4 additions & 4 deletions Ubuntu.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Name: linux
Name: linux-nvidia-6.17
Version: 6.17.0
Series: 25.10 (questing)
Series: 24.04 (noble)
Description:
This is the source code for the Ubuntu linux kernel for the 25.10 series. This
source tree is used to produce the flavours: generic, generic-64k.
This is the source code for the Ubuntu linux kernel for the 24.04 series. This
source tree is used to produce the flavours: nvidia, nvidia-64k.
This kernel is configured to support the widest range of desktop, laptop and
server configurations.
9 changes: 9 additions & 0 deletions arch/arm64/configs/defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -1810,3 +1810,12 @@ CONFIG_CORESIGHT_STM=m
CONFIG_CORESIGHT_CPU_DEBUG=m
CONFIG_CORESIGHT_CTI=m
CONFIG_MEMTEST=y
CONFIG_NVGRACE_GPU_VFIO_PCI=m
CONFIG_NVGRACE_EGM=m
CONFIG_VFIO_DEVICE_CDEV=y
# CONFIG_VFIO_CONTAINER is not set
CONFIG_FAULT_INJECTION=y
CONFIG_IOMMUFD_DRIVER=y
CONFIG_IOMMUFD=y
CONFIG_IOMMUFD_TEST=y
CONFIG_IOMMUFD_VFIO_CONTAINER=y
2 changes: 2 additions & 0 deletions arch/arm64/include/asm/cputype.h
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@

#define NVIDIA_CPU_PART_DENVER 0x003
#define NVIDIA_CPU_PART_CARMEL 0x004
#define NVIDIA_CPU_PART_OLYMPUS 0x010

#define FUJITSU_CPU_PART_A64FX 0x001

Expand Down Expand Up @@ -220,6 +221,7 @@

#define MIDR_NVIDIA_DENVER MIDR_CPU_MODEL(ARM_CPU_IMP_NVIDIA, NVIDIA_CPU_PART_DENVER)
#define MIDR_NVIDIA_CARMEL MIDR_CPU_MODEL(ARM_CPU_IMP_NVIDIA, NVIDIA_CPU_PART_CARMEL)
#define MIDR_NVIDIA_OLYMPUS MIDR_CPU_MODEL(ARM_CPU_IMP_NVIDIA, NVIDIA_CPU_PART_OLYMPUS)
#define MIDR_FUJITSU_A64FX MIDR_CPU_MODEL(ARM_CPU_IMP_FUJITSU, FUJITSU_CPU_PART_A64FX)
#define MIDR_HISI_TSV110 MIDR_CPU_MODEL(ARM_CPU_IMP_HISI, HISI_CPU_PART_TSV110)
#define MIDR_HISI_HIP09 MIDR_CPU_MODEL(ARM_CPU_IMP_HISI, HISI_CPU_PART_HIP09)
Expand Down
1 change: 1 addition & 0 deletions arch/arm64/kernel/cpufeature.c
Original file line number Diff line number Diff line change
Expand Up @@ -2235,6 +2235,7 @@ static bool has_bbml2_noabort(const struct arm64_cpu_capabilities *caps, int sco
static const struct midr_range supports_bbml2_noabort_list[] = {
MIDR_REV_RANGE(MIDR_CORTEX_X4, 0, 3, 0xf),
MIDR_REV_RANGE(MIDR_NEOVERSE_V3, 0, 2, 0xf),
MIDR_ALL_VERSIONS(MIDR_NVIDIA_OLYMPUS),
{}
};

Expand Down
5 changes: 4 additions & 1 deletion arch/arm64/kvm/mmu.c
Original file line number Diff line number Diff line change
Expand Up @@ -1493,6 +1493,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
bool s2_force_noncacheable = false, vfio_allow_any_uc = false;
unsigned long mmu_seq;
phys_addr_t ipa = fault_ipa;
unsigned long mt;
struct kvm *kvm = vcpu->kvm;
struct vm_area_struct *vma;
short vma_shift;
Expand Down Expand Up @@ -1612,6 +1613,8 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
vma_pagesize = min(vma_pagesize, (long)max_map_size);
}

mt = FIELD_GET(PTE_ATTRINDX_MASK, pgprot_val(vma->vm_page_prot));

/*
* Both the canonical IPA and fault IPA must be hugepage-aligned to
* ensure we find the right PFN and lay down the mapping in the right
Expand Down Expand Up @@ -1695,7 +1698,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
writable = false;
}

if (exec_fault && s2_force_noncacheable)
if (exec_fault && s2_force_noncacheable && mt != MT_NORMAL)
return -ENOEXEC;

/*
Expand Down
4 changes: 2 additions & 2 deletions debian.master/rules.d/arm64.mk
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
build_arch = arm64
defconfig = defconfig
flavours = generic generic-64k
build_image = vmlinuz.efi
kernel_file = arch/$(build_arch)/boot/vmlinuz.efi
build_image = Image.gz
kernel_file = arch/$(build_arch)/boot/Image.gz
install_file = vmlinuz
no_dumpfile = true
uefi_signed = true
Expand Down
Loading