Skip to content

Enable CONFIG_ARM_SMMU and CONFIG_ARM_SMMU_V3 in aarch64. #6823

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ddaney-fungible wants to merge 7 commits into from
Closed

Enable CONFIG_ARM_SMMU and CONFIG_ARM_SMMU_V3 in aarch64. #6823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0dc4790
Enable CONFIG_ARM_SMMU and CONFIG_ARM_SMMU_V3 in aarch64.
ddaney-fungible Nov 21, 2023
7598ee5
Set CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT for aarch64 kernel.
ddaney-fungible Nov 21, 2023
1e95731
Adjust mariner-required-configs.json for aarch64 kernel IOMMU configs.
ddaney-fungible Nov 21, 2023
c711ad6
Update Release to match kernel.spec
ddaney-fungible Nov 21, 2023
e7432ee
Update manifests to match kernel-headers-5.15.137.1-2.cm2.
ddaney-fungible Nov 21, 2023
6eac7a8
Fix missing comman syntax error in mariner-required-configs.json.
ddaney-fungible Nov 21, 2023
135a32b
Add CONFIG_ARM_SMMU_QCOM to mariner-required-configs.json.
ddaney-fungible Nov 21, 2023
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
2 changes: 1 addition & 1 deletion SPECS-SIGNED/kernel-signed/kernel-signed.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
Summary: Signed Linux Kernel for %{buildarch} systems
Name: kernel-signed-%{buildarch}
Version: 5.15.137.1
Release: 1%{?dist}
Release: 2%{?dist}
Copy link
Copy Markdown
Collaborator

@christopherco christopherco Nov 22, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add a corresponding changelog entry in the %changelog section for this -2 release increment

License: GPLv2
Vendor: Microsoft Corporation
Distribution: Mariner
Expand Down
2 changes: 1 addition & 1 deletion SPECS/kernel-headers/kernel-headers.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Summary: Linux API header files
Name: kernel-headers
Version: 5.15.137.1
Release: 1%{?dist}
Release: 2%{?dist}
Copy link
Copy Markdown
Collaborator

@christopherco christopherco Nov 22, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add a corresponding changelog entry in the %changelog section for this -2 release increment

License: GPLv2
Vendor: Microsoft Corporation
Distribution: Mariner
Expand Down
10 changes: 8 additions & 2 deletions SPECS/kernel/config_aarch64
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8147,6 +8147,7 @@ CONFIG_SUN6I_MSGBOX=y
# CONFIG_SPRD_MBOX is not set
# CONFIG_QCOM_IPCC is not set
CONFIG_IOMMU_IOVA=y
CONFIG_IOASID=y
CONFIG_IOMMU_API=y
CONFIG_IOMMU_SUPPORT=y

Expand All @@ -8165,12 +8166,17 @@ CONFIG_IOMMU_DEFAULT_DMA_STRICT=y
# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
CONFIG_OF_IOMMU=y
CONFIG_IOMMU_DMA=y
CONFIG_IOMMU_SVA_LIB=y
# CONFIG_ROCKCHIP_IOMMU is not set
# CONFIG_SUN50I_IOMMU is not set
# CONFIG_TEGRA_IOMMU_SMMU is not set
# CONFIG_IPMMU_VMSA is not set
# CONFIG_ARM_SMMU is not set
# CONFIG_ARM_SMMU_V3 is not set
CONFIG_ARM_SMMU=y
# CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y
CONFIG_ARM_SMMU_QCOM=y
CONFIG_ARM_SMMU_V3=y
CONFIG_ARM_SMMU_V3_SVA=y
# CONFIG_MTK_IOMMU is not set
# CONFIG_QCOM_IOMMU is not set
# CONFIG_VIRTIO_IOMMU is not set
Expand Down
4 changes: 2 additions & 2 deletions SPECS/kernel/kernel.signatures.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"Signatures": {
"cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0",
"config": "f529b9e9ad21c4f26edc849658bf38de43736901d8f3aabc9f3be2f0dc37497e",
"config_aarch64": "00728640d6c8bbe24667e0f63059a9bfef523962805648860e0d2e22e7fe0079",
"config_aarch64": "54f395290e569cc08f176166a8bed851f4bcae3628bbb4772fc6288164224aa2",
"sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f",
"kernel-5.15.137.1.tar.gz": "c00abd18daa5fcdf732d88bed57eb26a247473888c8aa9003897baa15d6c0e58"
}
}
}
2 changes: 1 addition & 1 deletion SPECS/kernel/kernel.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
Summary: Linux Kernel
Name: kernel
Version: 5.15.137.1
Release: 1%{?dist}
Release: 2%{?dist}
Copy link
Copy Markdown
Collaborator

@christopherco christopherco Nov 22, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add a corresponding changelog entry in the %changelog section for this -2 release increment

License: GPLv2
Vendor: Microsoft Corporation
Distribution: Mariner
Expand Down
2 changes: 1 addition & 1 deletion toolkit/resources/manifests/package/pkggen_core_aarch64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
filesystem-1.1-17.cm2.aarch64.rpm
kernel-headers-5.15.137.1-1.cm2.noarch.rpm
kernel-headers-5.15.137.1-2.cm2.noarch.rpm
glibc-2.35-6.cm2.aarch64.rpm
glibc-devel-2.35-6.cm2.aarch64.rpm
glibc-i18n-2.35-6.cm2.aarch64.rpm
Expand Down
2 changes: 1 addition & 1 deletion toolkit/resources/manifests/package/pkggen_core_x86_64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
filesystem-1.1-17.cm2.x86_64.rpm
kernel-headers-5.15.137.1-1.cm2.noarch.rpm
kernel-headers-5.15.137.1-2.cm2.noarch.rpm
glibc-2.35-6.cm2.x86_64.rpm
glibc-devel-2.35-6.cm2.x86_64.rpm
glibc-i18n-2.35-6.cm2.x86_64.rpm
Expand Down
2 changes: 1 addition & 1 deletion toolkit/resources/manifests/package/toolchain_aarch64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ intltool-0.51.0-7.cm2.noarch.rpm
itstool-2.0.6-4.cm2.noarch.rpm
kbd-2.2.0-1.cm2.aarch64.rpm
kbd-debuginfo-2.2.0-1.cm2.aarch64.rpm
kernel-headers-5.15.137.1-1.cm2.noarch.rpm
kernel-headers-5.15.137.1-2.cm2.noarch.rpm
kmod-29-2.cm2.aarch64.rpm
kmod-debuginfo-29-2.cm2.aarch64.rpm
kmod-devel-29-2.cm2.aarch64.rpm
Expand Down
2 changes: 1 addition & 1 deletion toolkit/resources/manifests/package/toolchain_x86_64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ intltool-0.51.0-7.cm2.noarch.rpm
itstool-2.0.6-4.cm2.noarch.rpm
kbd-2.2.0-1.cm2.x86_64.rpm
kbd-debuginfo-2.2.0-1.cm2.x86_64.rpm
kernel-headers-5.15.137.1-1.cm2.noarch.rpm
kernel-headers-5.15.137.1-2.cm2.noarch.rpm
kmod-29-2.cm2.x86_64.rpm
kmod-debuginfo-29-2.cm2.x86_64.rpm
kmod-devel-29-2.cm2.x86_64.rpm
Expand Down
97 changes: 97 additions & 0 deletions toolkit/scripts/mariner-required-configs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1213,6 +1213,103 @@
"PR": [
"https://github.com/microsoft/CBL-Mariner/pull/6574"
]
},
"CONFIG_IOASID": {
"value": [
"y"
],
"arch": [
"ARM64"
],
"comment": "Needed for CONFIG_ARM_SMMU",
"PR": [
"https://github.com/microsoft/CBL-Mariner/pull/6823"
]
},
"CONFIG_IOMMU_SVA_LIB": {
"value": [
"y"
],
"arch": [
"ARM64"
],
"comment": "Needed for CONFIG_ARM_SMMU_V3_SVA",
"PR": [
"https://github.com/microsoft/CBL-Mariner/pull/6823"
]
},
"CONFIG_ARM_SMMU": {
"value": [
"y"
],
"arch": [
"ARM64"
],
"comment": "Needed for VFIO to work",
"PR": [
"https://github.com/microsoft/CBL-Mariner/pull/6823"
]
},
"CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS": {
"value": [
"<missing>",
"is not set"
],
"arch": [
"ARM64"
],
"comment": "No device tree support needed",
"PR": [
"https://github.com/microsoft/CBL-Mariner/pull/6823"
]
},
"CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT": {
"value": [
"y"
],
"arch": [
"ARM64"
],
"comment": "More secure when set",
"PR": [
"https://github.com/microsoft/CBL-Mariner/pull/6823"
]
},
"CONFIG_ARM_SMMU_QCOM": {
"value": [
"y"
],
"arch": [
"ARM64"
],
"comment": "Allow support of QCom SMMU, because why not?",
"PR": [
"https://github.com/microsoft/CBL-Mariner/pull/6823"
]
},
"CONFIG_ARM_SMMU_V3": {
"value": [
"y"
],
"arch": [
"ARM64"
],
"comment": "Needed for VFIO to work",
"PR": [
"https://github.com/microsoft/CBL-Mariner/pull/6823"
]
},
"CONFIG_ARM_SMMU_V3_SVA": {
"value": [
"y"
],
"arch": [
"ARM64"
],
"comment": "Needed for CONFIG_ARM_SMMU_V3",
"PR": [
"https://github.com/microsoft/CBL-Mariner/pull/6823"
]
}
}
}
Expand Down