Skip to content

Commit

Permalink
NVIDIA: SAUCE: [Config] nvidia-6.11: Update annotations for Grace I/O
Browse files Browse the repository at this point in the history
virtualization

This adds the following config options to annotations:

            CONFIG_ARM_SMMU_V3_IOMMUFD=y
            CONFIG_IOMMUFD=m
            CONFIG_IOMMUFD_VFIO_CONTAINER=y
            CONFIG_VFIO_CONTAINER=n
            CONFIG_IOMMU_IOPF=y
            CONFIG_NVGRACE_GPU_VFIO_PCI=m
            CONFIG_FAILSLAB=n
            CONFIG_FAIL_FUTEX=n
            CONFIG_FAIL_IO_TIMEOUT=n
            CONFIG_FAIL_MAKE_REQUEST=n
            CONFIG_FAIL_PAGE_ALLOC=n
            CONFIG_FAULT_INJECTION_CONFIGFS=n
            CONFIG_FAULT_INJECTION_DEBUG_FS=n
            CONFIG_FAULT_INJECTION_USERCOPY=n
            CONFIG_SCSI_UFS_FAULT_INJECTION=n

Modify the CONFIG_DRM_MSM_VALIDATE_XML setting to '-' for
both ARM64 and AMD64 platforms.

Signed-off-by: Matthew R. Ochs <[email protected]>
Acked-by: Kai-Heng Feng <[email protected]>
Acked-by: Koba Ko <[email protected]>
Signed-off-by: Matthew R. Ochs <[email protected]>
(backported from commit 35a55f3 24.04_linux-nvidia-adv-6.8-next)
Signed-off-by: Koba Ko <[email protected]>
  • Loading branch information
nvmochs authored and KobaKoNvidia committed Jan 10, 2025
1 parent 1fb14bd commit 14f468e
Showing 1 changed file with 19 additions and 0 deletions.
19 changes: 19 additions & 0 deletions debian.nvidia-6.11/config/annotations
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ CONFIG_ULTRASOC_SMB note<'Required for Grace enablem
CONFIG_ARCH_SUPPORTS_HUGE_PFNMAP policy<{'amd64': 'y', 'arm64': 'y'}>
CONFIG_ARCH_SUPPORTS_PMD_PFNMAP policy<{'amd64': 'y', 'arm64': 'y'}>
CONFIG_ARCH_SUPPORTS_PUD_PFNMAP policy<{'amd64': 'y'}>
CONFIG_ARM_SMMU_V3_IOMMUFD policy<{'arm64': 'y'}>
CONFIG_AS_VERSION policy<{'amd64': '24200', 'arm64': '24200'}>
CONFIG_AX88796B_RUST_PHY policy<{'amd64': '-'}>
CONFIG_BINDGEN_VERSION_TEXT policy<{'amd64': '-'}>
Expand All @@ -161,8 +162,22 @@ CONFIG_CC_HAS_KASAN_SW_TAGS policy<{'amd64': '-', 'arm64': '
CONFIG_CC_HAS_MIN_FUNCTION_ALIGNMENT policy<{'amd64': '-', 'arm64': '-'}>
CONFIG_CC_HAS_SANE_FUNCTION_ALIGNMENT policy<{'amd64': '-', 'arm64': '-'}>
CONFIG_CC_VERSION_TEXT policy<{'amd64': '"x86_64-linux-gnu-gcc-13 (Ubuntu 13.3.0-6ubuntu2~24.04) 13.3.0"', 'arm64': '"aarch64-linux-gnu-gcc-13 (Ubuntu 13.3.0-6ubuntu2~24.04) 13.3.0"'}>
CONFIG_DRM_MSM_VALIDATE_XML policy<{'amd64': '-', 'arm64': '-'}>
CONFIG_FAILSLAB policy<{'arm64': 'n'}>
CONFIG_FAIL_FUTEX policy<{'arm64': 'n'}>
CONFIG_FAIL_IO_TIMEOUT policy<{'arm64': 'n'}>
CONFIG_FAIL_MAKE_REQUEST policy<{'arm64': 'n'}>
CONFIG_FAIL_PAGE_ALLOC policy<{'arm64': 'n'}>
CONFIG_FAULT_INJECTION policy<{'amd64': 'n', 'arm64': 'y'}>
CONFIG_FAULT_INJECTION_CONFIGFS policy<{'arm64': 'n'}>
CONFIG_FAULT_INJECTION_DEBUG_FS policy<{'arm64': 'n'}>
CONFIG_FAULT_INJECTION_USERCOPY policy<{'arm64': 'n'}>
CONFIG_GCC_ASM_GOTO_OUTPUT_BROKEN policy<{'amd64': '-', 'arm64': '-'}>
CONFIG_GCC_VERSION policy<{'amd64': '130300', 'arm64': '130300'}>
CONFIG_IOMMUFD policy<{'amd64': 'm', 'arm64': 'm'}>
CONFIG_IOMMUFD_DRIVER_CORE policy<{'amd64': 'y', 'arm64': 'y'}>
CONFIG_IOMMUFD_TEST policy<{'arm64': 'y'}>
CONFIG_IOMMUFD_VFIO_CONTAINER policy<{'arm64': 'y'}>
CONFIG_LD_VERSION policy<{'amd64': '24200', 'arm64': '24200'}>
CONFIG_PAHOLE_VERSION policy<{'amd64': '125', 'arm64': '125'}>
CONFIG_RELR policy<{'arm64': '-'}>
Expand All @@ -175,4 +190,8 @@ CONFIG_RUST_IS_AVAILABLE policy<{'amd64': '-', 'arm64': '
CONFIG_RUST_OVERFLOW_CHECKS policy<{'amd64': '-'}>
CONFIG_RUST_PHYLIB_ABSTRACTIONS policy<{'amd64': '-'}>
CONFIG_SAMPLES_RUST policy<{'amd64': '-'}>
CONFIG_SCSI_UFS_FAULT_INJECTION policy<{'arm64': 'n'}>
CONFIG_TEGRA241_CMDQV policy<{'arm64': 'n'}>
CONFIG_TOOLS_SUPPORT_RELR policy<{'amd64': 'y', 'arm64': '-'}>
CONFIG_VFIO_CONTAINER policy<{'amd64': 'y', 'arm64': 'n'}>
CONFIG_VFIO_IOMMU_TYPE1 policy<{'amd64': 'm', 'arm64': '-'}>

0 comments on commit 14f468e

Please sign in to comment.