diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2024-01-19 17:49:29 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2024-01-23 20:52:36 +0300 |
| commit | 56b44a9896b5068220cbd7d58795773b750149c8 (patch) | |
| tree | 26baf5d8f0d7031707b62deab067516b733c915a /meta-arm/meta-arm-bsp | |
| parent | 1ada3c2d58691868267415a1ea08dab4a7f54aef (diff) | |
| download | openbmc-56b44a9896b5068220cbd7d58795773b750149c8.tar.xz | |
subtree updates
meta-arm: 5712422011..1cad3c3813:
Jon Mason (3):
arm/pyhsslms: update to 2.0.0
arm/trusted-firmware-m: update to 2.0.0
arm/opencsd: update to 1.4.2
Ross Burton (2):
arm-bsp/documentation: upgrade Sphinx slightly
arm/fvp-base-a-aem: upgrade to 11.24.11
Vikas Katariya (2):
arm-bsp/n1sdp: Downgrade to 6.1 linux yocto kernel
arm-bsp/linux-yocto: Remove EOL Linux yocto kernel 6.5
meta-openembedded: 098dc606f9..4dbbef7a39:
Alex Kiernan (1):
thin-provisioning-tools: Drop musl fixes (fixed upstream)
Derek Straka (9):
python3-web3: update to version 6.14.0
python3-engineio: update to version 4.8.2
python3-marshmallow: update to version 3.20.2
python3-apispec: update to version 6.4.0
python3-protobuf: update to version 4.25.1
python3-eth-hash: update to version 0.6.0
python3-google-auth: update to version 2.26.2
python3-socketio: update to version 5.11.0
python3-google-api-python-client: update to version 2.113.0
Fabio Estevam (1):
v4l-utils: Update to 1.26.1
Jörg Sommer (1):
i2cdev: Fix MUSL build
Khem Raj (7):
thunar: inherit gtk-doc
libxklavier: inherit gtk-doc
libwnck: inherit gtk-doc
schroedinger: inherit gtk-doc
gst-shark: inherit gtk-doc
evolution-data-server: Use inherit_defer for native class
opencl-icd: Rename rdepends to virtual-opencl-icd
Markus Volk (2):
flatpak: fix gtk-doc build
gvfs: drop gnome-keyring rdepend
Peter Marko (1):
grpc: correct dependencies
Randy MacLeod (1):
rng-tools: move from oe-core to meta-oe
Ross Burton (9):
libuser: fix gtk-doc configure call
libuser: remove obsolete GTKDOC_DOCDIR assignment
gtksourceview4: remove check for target gtk-doc
gtksourceview4: remove obsolete workaround for build failures
telepathy-glib: inherit gtk-doc
glade: inherit gtk-doc, fix FILES
libgxim: inherit gtk-doc
gmime: inherit gtk-doc
raptor2: inherit gtk-doc
Wang Mingyu (3):
frr: use update-alternatives for ietf-interfaces.yang
libsmi: use update-alternatives for ietf-interfaces.yang
frr: Fix install conflict when enable multilib.
alperak (1):
adcli: use https protocol for fetching
poky: 61182659c2..7af374c90c:
Alexander Kanavin (3):
glib-2.0: ensure GI_DATA_ENABLED is set
gobject-introspection-data.bbclass: move do_compile() tweak to g-i class
python: update 3.11.5 -> 3.12.1
Alexander Sverdlin (2):
linux-firmware: upgrade 20231030 -> 20231211
linux-firmware: package PowerVR firmware
André Draszik (1):
linux-firmware: split out rockchip/dptx firmware
Changhyeok Bae (1):
iw: upgrade 5.19 -> 6.7
Etienne Cordonnier (3):
package.py: fix Darwin support
chrpath.bbclass: fix Darwin support
siteinfo.bbclass: add support for darwin19 and darwin21
Fabio Estevam (2):
mesa: Upgrade 23.3.2 -> 23.3.3
libdrm: Upgrade to 2.4.120
Joe Slater (1):
init-ifupdown: add predictable interface names
Kai Kang (1):
xserver-xorg: 21.1.9 -> 21.1.11
Khem Raj (3):
webkitgtk: Workaround for clang compiler segfault
mdadm: Disable 10ddf-fail-spare and 10ddf-fail-stop-readd testcases
openssl: Fix build on riscv
Ola x Nilsson (2):
insane.bbclass: Check for adjtime in check_32_bit_symbols
insane.bbclass: Python code cleanup in check_32bit_symbols
Petr Vorel (1):
iputils: update to 20240117
Randy MacLeod (2):
rng-tools: move to meta-oe
rng-tools: Revert "rng-tools: move to meta-oe"
Richard Purdie (13):
bitbake: ast/BBHandler: Add inherit_defer support
allarch: Fix allarch corner case
rootfs: Fix MULTILIB_RE_ALLOW to be inherit order independent
rootfs-postcommands: Try and improve ordering constraints
classes/recipes: Switch to use inherit_defer
libtool: Update patches to mark as backports
libtool: Update nios2 patch to match upstream merged version
libtool: Update prefixmap and clang patches to match upstream submission
libtool: Update cleanup sysroot handling patch
libtool: Update patch offsets
libtool: Update further patch status to backport
reproducible: Fix race with externalsrc/devtool over lockfile
build-appliance-image: Update to master head revision
Ross Burton (4):
musl: doesn't support riscv32
libunwind: merge .inc and .bb
libunwind: refresh patches
libunwind: clean up configuration
Simone Weiß (1):
classes-global/insane: Add check for "virtual/" in RPROVIDES and RDEPENDS
Tim Orling (1):
python3-alabaster: upgrade 0.7.13 -> 0.7.16
Trevor Woerner (1):
bmaptool: add 3 fixes
Vyacheslav Yurkov (9):
recipetool: Don't fail on local go modules
classes: go-vendor: Reference local modules
classes: go-vendor: Handle modules from the same repo
classes: go-vendor: Unlink vendor dir later
recipetool: Proceed even with a missing license file
recipetool: Disregard version in URL for replaced modules
oeqa/selftest/recipetool: Move create_go test to a proper class
oeqa/selftest/recipetool: Move helper function to the class scope
oeqa/selftest/recipetool: Add test coverage for local go modules
Wang Mingyu (22):
mpg123: upgrade 1.32.3 -> 1.32.4
bind: upgrade 9.18.20 -> 9.18.21
iproute2: upgrade 6.6.0 -> 6.7.0
kexec-tools: upgrade 2.0.27 -> 2.0.28
libbsd: upgrade 0.11.7 -> 0.11.8
libxmlb: upgrade 0.3.14 -> 0.3.15
nghttp2: upgrade 1.57.0 -> 1.58.0
ofono: upgrade 2.2 -> 2.3
python3-numpy: upgrade 1.26.2 -> 1.26.3
vte: upgrade 0.74.1 -> 0.74.2
python3-cython: upgrade 3.0.7 -> 3.0.8
python3-git: upgrade 3.1.40 -> 3.1.41
python3-hypothesis: upgrade 6.92.2 -> 6.92.9
python3-jinja2: upgrade 3.1.2 -> 3.1.3
python3-markdown: upgrade 3.5 -> 3.5.2
python3-more-itertools: upgrade 10.1.0 -> 10.2.0
python3-pycryptodome: upgrade 3.19.1 -> 3.20.0
python3-pycryptodomex: upgrade 3.19.1 -> 3.20.0
python3-trove-classifiers: upgrade 2023.11.29 -> 2024.1.8
stress-ng: upgrade 0.17.03 -> 0.17.04
virglrenderer: upgrade 1.0.0 -> 1.0.1
xz: upgrade 5.4.4 -> 5.4.5
Change-Id: I9581526d3addb54889dd73268e672c2d84345f3e
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'meta-arm/meta-arm-bsp')
18 files changed, 92 insertions, 86 deletions
diff --git a/meta-arm/meta-arm-bsp/conf/machine/include/corstone1000.inc b/meta-arm/meta-arm-bsp/conf/machine/include/corstone1000.inc index 381eaaf365..d03c23c09c 100644 --- a/meta-arm/meta-arm-bsp/conf/machine/include/corstone1000.inc +++ b/meta-arm/meta-arm-bsp/conf/machine/include/corstone1000.inc @@ -12,7 +12,8 @@ TFA_BL2_BINARY = "bl2-corstone1000.bin" TFA_FIP_BINARY = "fip-corstone1000.bin" # TF-M -EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-m" +EXTRA_IMAGEDEPENDS += "trusted-firmware-m" +PREFERRED_VERSION_trusted-firmware-m ?= "1.8.%" # TF-M settings for signing host images TFA_BL2_RE_IMAGE_LOAD_ADDRESS = "0x62353000" diff --git a/meta-arm/meta-arm-bsp/conf/machine/n1sdp.conf b/meta-arm/meta-arm-bsp/conf/machine/n1sdp.conf index 2a246de006..51b6d56fdb 100644 --- a/meta-arm/meta-arm-bsp/conf/machine/n1sdp.conf +++ b/meta-arm/meta-arm-bsp/conf/machine/n1sdp.conf @@ -19,7 +19,7 @@ WKS_FILE_DEPENDS:append = " ${EXTRA_IMAGEDEPENDS}" # Use kernel provided by yocto PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "6.5%" +PREFERRED_VERSION_linux-yocto ?= "6.1%" # RTL8168E Gigabit Ethernet Controller is attached to the PCIe interface MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "linux-firmware-rtl8168" diff --git a/meta-arm/meta-arm-bsp/documentation/requirements.txt b/meta-arm/meta-arm-bsp/documentation/requirements.txt index b82e5e071a..6b4e3bb22d 100644 --- a/meta-arm/meta-arm-bsp/documentation/requirements.txt +++ b/meta-arm/meta-arm-bsp/documentation/requirements.txt @@ -6,7 +6,6 @@ jinja2==3.1.1 # Required to build the documentation -sphinx==4.5.0 -sphinx_rtd_theme==1.0.0 -sphinx-copybutton==0.5.0 +sphinx~=5.0 +sphinx_rtd_theme~=2.0.0 docutils==0.17.1 diff --git a/meta-arm/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-1.8.1-src.inc b/meta-arm/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-1.8.1-src.inc new file mode 100644 index 0000000000..f7e202ad70 --- /dev/null +++ b/meta-arm/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-1.8.1-src.inc @@ -0,0 +1,46 @@ +# Common src definitions for trusted-firmware-m and trusted-firmware-m-scripts + +LICENSE = "BSD-2-Clause & BSD-3-Clause & Apache-2.0" + +LIC_FILES_CHKSUM = "file://license.rst;md5=07f368487da347f3c7bd0fc3085f3afa \ + file://../tf-m-tests/license.rst;md5=4481bae2221b0cfca76a69fb3411f390 \ + file://../mbedtls/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://../mcuboot/LICENSE;md5=b6ee33f1d12a5e6ee3de1e82fb51eeb8" + +SRC_URI_TRUSTED_FIRMWARE_M ?= "git://git.trustedfirmware.org/TF-M/trusted-firmware-m.git;protocol=https" +SRC_URI_TRUSTED_FIRMWARE_M_TESTS ?= "git://git.trustedfirmware.org/TF-M/tf-m-tests.git;protocol=https" +SRC_URI_TRUSTED_FIRMWARE_M_MBEDTLS ?= "git://github.com/ARMmbed/mbedtls.git;protocol=https" +SRC_URI_TRUSTED_FIRMWARE_M_MCUBOOT ?= "git://github.com/mcu-tools/mcuboot.git;protocol=https" +SRC_URI_TRUSTED_FIRMWARE_M_QCBOR ?= "git://github.com/laurencelundblade/QCBOR.git;protocol=https" +SRC_URI_TRUSTED_FIRMWARE_M_EXTRAS ?= "git://git.trustedfirmware.org/TF-M/tf-m-extras.git;protocol=https" +SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_M};branch=${SRCBRANCH_tfm};name=tfm;destsuffix=git/tfm \ + ${SRC_URI_TRUSTED_FIRMWARE_M_TESTS};branch=${SRCBRANCH_tfm-tests};name=tfm-tests;destsuffix=git/tf-m-tests \ + ${SRC_URI_TRUSTED_FIRMWARE_M_MBEDTLS};branch=${SRCBRANCH_mbedtls};name=mbedtls;destsuffix=git/mbedtls \ + ${SRC_URI_TRUSTED_FIRMWARE_M_MCUBOOT};branch=${SRCBRANCH_mcuboot};name=mcuboot;destsuffix=git/mcuboot \ + ${SRC_URI_TRUSTED_FIRMWARE_M_QCBOR};branch=${SRCBRANCH_qcbor};name=qcbor;destsuffix=git/qcbor \ + ${SRC_URI_TRUSTED_FIRMWARE_M_EXTRAS};branch=${SRCBRANCH_tfm-extras};name=tfm-extras;destsuffix=git/tfm-extras \ + " + +# The required dependencies are documented in tf-m/config/config_default.cmake +# TF-Mv1.8.1 +SRCBRANCH_tfm ?= "master" +SRCREV_tfm = "53aa78efef274b9e46e63b429078ae1863609728" +# TF-Mv1.8.1 +SRCBRANCH_tfm-tests ?= "master" +SRCREV_tfm-tests = "1273c5bcd3d8ade60d51524797e0b22b6fd7eea1" +# mbedtls-3.4.1 +SRCBRANCH_mbedtls ?= "master" +SRCREV_mbedtls = "72718dd87e087215ce9155a826ee5a66cfbe9631" +# mcuboot v1.10.0 +SRCBRANCH_mcuboot ?= "main" +SRCREV_mcuboot = "23d28832f02dcdc18687782c6cd8ba99e9b274d2" +# QCBOR v1.2 +SRCBRANCH_qcbor ?= "master" +SRCREV_qcbor = "b0e7033268e88c9f27146fa9a1415ef4c19ebaff" +# TF-Mv1.8.1 +SRCBRANCH_tfm-extras ?= "master" +SRCREV_tfm-extras = "504ae9a9a50981e9dd4d8accec8261a1dba9e965" + +SRCREV_FORMAT = "tfm" + +S = "${WORKDIR}/git/tfm" diff --git a/meta-arm/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_1.8.1.bb b/meta-arm/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_1.8.1.bb new file mode 100644 index 0000000000..d50d886f60 --- /dev/null +++ b/meta-arm/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_1.8.1.bb @@ -0,0 +1,2 @@ +require recipes-bsp/trusted-firmware-m/trusted-firmware-m-${PV}-src.inc +require recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native.inc diff --git a/meta-arm/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.8.1.bb b/meta-arm/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.8.1.bb new file mode 100644 index 0000000000..3464f49dd9 --- /dev/null +++ b/meta-arm/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.8.1.bb @@ -0,0 +1,2 @@ +require recipes-bsp/trusted-firmware-m/trusted-firmware-m-${PV}-src.inc +require recipes-bsp/trusted-firmware-m/trusted-firmware-m.inc diff --git a/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc b/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc index 6c132c9796..f43bbd6359 100644 --- a/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc +++ b/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc @@ -67,7 +67,7 @@ COMPATIBLE_MACHINE:musca-s1 = "(^$)" # # N1SDP KMACHINE # -FILESEXTRAPATHS:prepend:n1sdp := "${THISDIR}/linux-yocto-6.5/n1sdp:" +FILESEXTRAPATHS:prepend:n1sdp := "${THISDIR}/linux-yocto-6.1/n1sdp:" COMPATIBLE_MACHINE:n1sdp = "n1sdp" KBUILD_DEFCONFIG:n1sdp = "defconfig" KCONFIG_MODE:n1sdp = "--alldefconfig" diff --git a/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.5/n1sdp/0001-iommu-arm-smmu-v3-workaround-for-ATC_INV_SIZE_ALL-in.patch b/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.1/n1sdp/0001-iommu-arm-smmu-v3-workaround-for-ATC_INV_SIZE_ALL-in.patch index df7586cf0f..d7a47c654d 100644 --- a/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.5/n1sdp/0001-iommu-arm-smmu-v3-workaround-for-ATC_INV_SIZE_ALL-in.patch +++ b/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.1/n1sdp/0001-iommu-arm-smmu-v3-workaround-for-ATC_INV_SIZE_ALL-in.patch @@ -1,4 +1,4 @@ -From 63da10da7a57776196a3c323e93ef66f1d553c0c Mon Sep 17 00:00:00 2001 +From 32ae4539865e64bcfb0c6955bdac8db5904e493d Mon Sep 17 00:00:00 2001 From: Manoj Kumar <manoj.kumar3@arm.com> Date: Mon, 1 Feb 2021 21:36:43 +0530 Subject: [PATCH] iommu/arm-smmu-v3: workaround for ATC_INV_SIZE_ALL in N1SDP @@ -9,9 +9,11 @@ N1SDP platform. This workaround manually sets the ATS address field to proper value for ATC_INV_SIZE_ALL command. Change-Id: If89465be94720a62be85e1e6612f17e93fa9b8a5 -Upstream-Status: Inappropriate [Workaround] Signed-off-by: Manoj Kumar <manoj.kumar3@arm.com> Signed-off-by: Khasim Syed Mohammed <khasim.mohammed@arm.com> + +Upstream-Status: Inappropriate [Workaround] +Signed-off-by: Manoj Kumar <manoj.kumar3@arm.com> Signed-off-by: Vishnu Banavath <vishnu.banavath@arm.com> Signed-off-by: Adam Johnston <adam.johnston@arm.com> --- @@ -20,10 +22,10 @@ Signed-off-by: Adam Johnston <adam.johnston@arm.com> 2 files changed, 2 insertions(+) diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c -index 6ccbae9b93a1..5387f152fb07 100644 +index d4d8bfee9feb..0524bf2ec021 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c -@@ -1753,6 +1753,7 @@ arm_smmu_atc_inv_to_cmd(int ssid, unsigned long iova, size_t size, +@@ -1738,6 +1738,7 @@ arm_smmu_atc_inv_to_cmd(int ssid, unsigned long iova, size_t size, }; if (!size) { @@ -32,10 +34,10 @@ index 6ccbae9b93a1..5387f152fb07 100644 return; } diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h -index dcab85698a4e..12e12d03eebf 100644 +index cd48590ada30..20892b2bfe1d 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h -@@ -478,6 +478,7 @@ struct arm_smmu_cmdq_ent { +@@ -472,6 +472,7 @@ struct arm_smmu_cmdq_ent { #define CMDQ_OP_ATC_INV 0x40 #define ATC_INV_SIZE_ALL 52 diff --git a/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.5/n1sdp/0002-n1sdp-pci_quirk-add-acs-override-for-PCI-devices.patch b/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.1/n1sdp/0002-n1sdp-pci_quirk-add-acs-override-for-PCI-devices.patch index 73e7a583f0..cb72ed0a07 100644 --- a/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.5/n1sdp/0002-n1sdp-pci_quirk-add-acs-override-for-PCI-devices.patch +++ b/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.1/n1sdp/0002-n1sdp-pci_quirk-add-acs-override-for-PCI-devices.patch @@ -1,4 +1,4 @@ -From 7d24cc041cbcff07b21a9a380426b38e09149648 Mon Sep 17 00:00:00 2001 +From fc8605e74b51d9e0ab8efd0489eca2e11d807f07 Mon Sep 17 00:00:00 2001 From: Manoj Kumar <manoj.kumar3@arm.com> Date: Tue, 31 Aug 2021 16:15:38 +0000 Subject: [PATCH] n1sdp: pci_quirk: add acs override for PCI devices @@ -7,8 +7,9 @@ Patch taken from: https://gitlab.com/Queuecumber/linux-acs-override/raw/master/workspaces/5.4/acso.patch Change-Id: Ib926bf50524ce9990fbaa2f2f8670fe84bd571f9 -Upstream-Status: Inappropriate [will not be submitted as its a workaround to address hardware issue] Signed-off-by: Manoj Kumar <manoj.kumar3@arm.com> + +Upstream-Status: Inappropriate [will not be submitted as its a workaround to address hardware issue] Signed-off-by: Khasim Syed Mohammed <khasim.mohammed@arm.com> Signed-off-by: Vishnu Banavath <vishnu.banavath@arm.com> Signed-off-by: Adam Johnston <adam.johnston@arm.com> @@ -18,10 +19,10 @@ Signed-off-by: Adam Johnston <adam.johnston@arm.com> 2 files changed, 110 insertions(+) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index 23ebe34ff901..054b6e6d22f3 100644 +index 963cdaecabcb..8e94af513b9f 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -4271,6 +4271,14 @@ +@@ -4162,6 +4162,14 @@ nomsi [MSI] If the PCI_MSI kernel config parameter is enabled, this kernel boot option can be used to disable the use of MSI interrupts system-wide. @@ -37,10 +38,10 @@ index 23ebe34ff901..054b6e6d22f3 100644 Safety option to keep boot IRQs enabled. This should never be necessary. diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index 321156ca273d..1144c3a8a3bb 100644 +index 285acc4aaccc..d6ebef1f30db 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c -@@ -3718,6 +3718,107 @@ static void quirk_no_bus_reset(struct pci_dev *dev) +@@ -3612,6 +3612,107 @@ static void quirk_no_bus_reset(struct pci_dev *dev) dev->dev_flags |= PCI_DEV_FLAGS_NO_BUS_RESET; } @@ -148,7 +149,7 @@ index 321156ca273d..1144c3a8a3bb 100644 /* * Some NVIDIA GPU devices do not work with bus reset, SBR needs to be * prevented for those affected devices. -@@ -5112,6 +5213,7 @@ static const struct pci_dev_acs_enabled { +@@ -4980,6 +5081,7 @@ static const struct pci_dev_acs_enabled { { PCI_VENDOR_ID_ZHAOXIN, PCI_ANY_ID, pci_quirk_zhaoxin_pcie_ports_acs }, /* Wangxun nics */ { PCI_VENDOR_ID_WANGXUN, PCI_ANY_ID, pci_quirk_wangxun_nic_acs }, diff --git a/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.5/n1sdp/0003-pcie-Add-quirk-for-the-Arm-Neoverse-N1SDP-platform.patch b/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.1/n1sdp/0003-pcie-Add-quirk-for-the-Arm-Neoverse-N1SDP-platform.patch index e91147a1b2..9b439e472d 100644 --- a/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.5/n1sdp/0003-pcie-Add-quirk-for-the-Arm-Neoverse-N1SDP-platform.patch +++ b/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.1/n1sdp/0003-pcie-Add-quirk-for-the-Arm-Neoverse-N1SDP-platform.patch @@ -1,4 +1,4 @@ -From 51879bfe6b0850b3746df9f9471120a6709807cb Mon Sep 17 00:00:00 2001 +From 5aa5769af625c79589fd84b8afc06149c2362218 Mon Sep 17 00:00:00 2001 From: Deepak Pandey <Deepak.Pandey@arm.com> Date: Fri, 31 May 2019 16:42:43 +0100 Subject: [PATCH] pcie: Add quirk for the Arm Neoverse N1SDP platform @@ -24,6 +24,7 @@ Signed-off-by: Deepak Pandey <Deepak.Pandey@arm.com> Signed-off-by: Sudipto Paul <sudipto.paul@arm.com> [Andre: fix coding style issues, rewrite some parts, add DT support] Signed-off-by: Andre Przywara <andre.przywara@arm.com> + Change-Id: I1d3a4b9bf6b3b883d262e3c4ff1f88a0eb81c1fe Upstream-Status: Inappropriate [will not be submitted as its a workaround to address hardware issue] Signed-off-by: Deepak Pandey <Deepak.Pandey@arm.com> @@ -40,10 +41,10 @@ Signed-off-by: Adam Johnston <adam.johnston@arm.com> create mode 100644 drivers/pci/controller/pcie-n1sdp.c diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig -index 02adc6ceb831..398a5429a8e2 100644 +index bbbc31391a65..973aa3b4d407 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig -@@ -207,6 +207,7 @@ CONFIG_NFC_S3FWRN5_I2C=m +@@ -214,6 +214,7 @@ CONFIG_NFC_S3FWRN5_I2C=m CONFIG_PCI=y CONFIG_PCIEPORTBUS=y CONFIG_PCIEAER=y @@ -70,12 +71,12 @@ index 860014b89b8e..2d4c1c699ffe 100644 #ifdef CONFIG_LOONGARCH diff --git a/drivers/pci/controller/Kconfig b/drivers/pci/controller/Kconfig -index 0859be86e718..c51b89781472 100644 +index bfd9bac37e24..7a65799dded7 100644 --- a/drivers/pci/controller/Kconfig +++ b/drivers/pci/controller/Kconfig -@@ -21,6 +21,17 @@ config PCIE_ALTERA - Say Y here if you want to enable PCIe controller support on Altera - FPGA. +@@ -50,6 +50,17 @@ config PCI_IXP4XX + Say Y here if you want support for the PCI host controller found + in the Intel IXP4xx XScale-based network processor SoC. +config PCIE_HOST_N1SDP_ECAM + bool "ARM N1SDP PCIe Controller" @@ -88,9 +89,9 @@ index 0859be86e718..c51b89781472 100644 + The controller is ECAM compliant, but needs a quirk to workaround + an integration issue. + - config PCIE_ALTERA_MSI - tristate "Altera PCIe MSI feature" - depends on PCIE_ALTERA + config PCI_TEGRA + bool "NVIDIA Tegra PCIe controller" + depends on ARCH_TEGRA || COMPILE_TEST diff --git a/drivers/pci/controller/Makefile b/drivers/pci/controller/Makefile index 37c8663de7fe..08e5afcf6e86 100644 --- a/drivers/pci/controller/Makefile diff --git a/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.5/n1sdp/0004-n1sdp-pcie-add-quirk-support-enabling-remote-chip-PC.patch b/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.1/n1sdp/0004-n1sdp-pcie-add-quirk-support-enabling-remote-chip-PC.patch index f85abd9eeb..b804658b00 100644 --- a/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.5/n1sdp/0004-n1sdp-pcie-add-quirk-support-enabling-remote-chip-PC.patch +++ b/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.1/n1sdp/0004-n1sdp-pcie-add-quirk-support-enabling-remote-chip-PC.patch @@ -1,4 +1,4 @@ -From aa7c785aff4276aa8579a54f39347cd47eb48ebb Mon Sep 17 00:00:00 2001 +From b59e0d6c6035db80fc9044df0333f96ede53ad7a Mon Sep 17 00:00:00 2001 From: Sayanta Pattanayak <sayanta.pattanayak@arm.com> Date: Wed, 9 Feb 2022 20:37:43 +0530 Subject: [PATCH] n1sdp: pcie: add quirk support enabling remote chip PCIe diff --git a/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.5/n1sdp/0005-arm64-kpti-Whitelist-early-Arm-Neoverse-N1-revisions.patch b/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.1/n1sdp/0005-arm64-kpti-Whitelist-early-Arm-Neoverse-N1-revisions.patch index 42ef0ee38a..cc9d87170f 100644 --- a/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.5/n1sdp/0005-arm64-kpti-Whitelist-early-Arm-Neoverse-N1-revisions.patch +++ b/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.1/n1sdp/0005-arm64-kpti-Whitelist-early-Arm-Neoverse-N1-revisions.patch @@ -1,4 +1,4 @@ -From a9df434f077e7f1d8895e76381ba7179f3ebb1ba Mon Sep 17 00:00:00 2001 +From ff02f77788f8c01e9d675912c063e89415804b7d Mon Sep 17 00:00:00 2001 From: Andre Przywara <andre.przywara@arm.com> Date: Fri, 17 May 2019 17:39:27 +0100 Subject: [PATCH] arm64: kpti: Whitelist early Arm Neoverse N1 revisions @@ -20,10 +20,10 @@ Signed-off-by: Adam Johnston <adam.johnston@arm.com> 1 file changed, 1 insertion(+) diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c -index 2c0b8444fea6..5c0ff40c6c8b 100644 +index b3f37e2209ad..b74210f38cd8 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c -@@ -1690,6 +1690,7 @@ static bool unmap_kernel_at_el0(const struct arm64_cpu_capabilities *entry, +@@ -1646,6 +1646,7 @@ static bool unmap_kernel_at_el0(const struct arm64_cpu_capabilities *entry, MIDR_ALL_VERSIONS(MIDR_QCOM_KRYO_2XX_SILVER), MIDR_ALL_VERSIONS(MIDR_QCOM_KRYO_3XX_SILVER), MIDR_ALL_VERSIONS(MIDR_QCOM_KRYO_4XX_SILVER), diff --git a/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.5/n1sdp/0006-arm64-defconfig-disable-config-options-that-does-not.patch b/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.1/n1sdp/0006-arm64-defconfig-disable-config-options-that-does-not.patch index dae3243fb8..8aea1f60d7 100644 --- a/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.5/n1sdp/0006-arm64-defconfig-disable-config-options-that-does-not.patch +++ b/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.1/n1sdp/0006-arm64-defconfig-disable-config-options-that-does-not.patch @@ -1,4 +1,4 @@ -From d59c5c17d3345f923d66fc85a7681fc6c4fd657d Mon Sep 17 00:00:00 2001 +From 330a620b5c73505e62a2e0accc155fbc78859cee Mon Sep 17 00:00:00 2001 From: Vishnu Banavath <vishnu.banavath@arm.com> Date: Wed, 21 Sep 2022 15:54:14 +0100 Subject: [PATCH] arm64: defconfig: disable config options that does not apply @@ -6,8 +6,6 @@ Subject: [PATCH] arm64: defconfig: disable config options that does not apply Following config options should be not set to be more accurate and works with build system like yocto -CONFIG_BT_HCIBTUSB -CONFIG_BT_HCIBTUSB_MTK CONFIG_BT_HCIUART_MRVL CONFIG_BT_MRVL CONFIG_BT_MRVL_SDIO @@ -16,24 +14,15 @@ CONFIG_BT_QCOMSMD Upstream-Status: Pending [not submitted upstream yet] Signed-off-by: Adam Johnston <adam.johnston@arm.com> Signed-off-by: Vishnu Banavath <vishnu.banavath@arm.com> -Signed-off-by: Xueliang Zhong <xueliang.zhong@arm.com> --- - arch/arm64/configs/defconfig | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) + arch/arm64/configs/defconfig | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig -index cd73d1704dd2..958a43bd00e6 100644 +index 973aa3b4d407..61f040394a2d 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig -@@ -181,16 +181,16 @@ CONFIG_BT_HIDP=m - # CONFIG_BT_LE is not set - CONFIG_BT_LEDS=y - # CONFIG_BT_DEBUGFS is not set --CONFIG_BT_HCIBTUSB=m --CONFIG_BT_HCIBTUSB_MTK=y -+# CONFIG_BT_HCIBTUSB is not set -+# CONFIG_BT_HCIBTUSB_MTK is not set - CONFIG_BT_HCIUART=m +@@ -198,10 +198,10 @@ CONFIG_BT_HCIUART=m CONFIG_BT_HCIUART_LL=y CONFIG_BT_HCIUART_BCM=y CONFIG_BT_HCIUART_QCA=y diff --git a/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.5/n1sdp/enable-nvme.cfg b/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.1/n1sdp/enable-nvme.cfg index 268103555e..268103555e 100644 --- a/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.5/n1sdp/enable-nvme.cfg +++ b/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.1/n1sdp/enable-nvme.cfg diff --git a/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.5/n1sdp/enable-realtek-R8169.cfg b/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.1/n1sdp/enable-realtek-R8169.cfg index 7a5747407c..7a5747407c 100644 --- a/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.5/n1sdp/enable-realtek-R8169.cfg +++ b/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.1/n1sdp/enable-realtek-R8169.cfg diff --git a/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.5/n1sdp/enable-usb_conn_gpio.cfg b/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.1/n1sdp/enable-usb_conn_gpio.cfg index 128c902710..128c902710 100644 --- a/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.5/n1sdp/enable-usb_conn_gpio.cfg +++ b/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.1/n1sdp/enable-usb_conn_gpio.cfg diff --git a/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.5/n1sdp/usb_xhci_pci_renesas.cfg b/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.1/n1sdp/usb_xhci_pci_renesas.cfg index c06507c060..c06507c060 100644 --- a/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.5/n1sdp/usb_xhci_pci_renesas.cfg +++ b/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.1/n1sdp/usb_xhci_pci_renesas.cfg diff --git a/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto_6.5.bb b/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto_6.5.bb deleted file mode 100644 index a5cc546191..0000000000 --- a/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto_6.5.bb +++ /dev/null @@ -1,37 +0,0 @@ -KBRANCH ?= "v6.5/standard/base" - -require recipes-kernel/linux/linux-yocto.inc - -# CVE exclusions -include recipes-kernel/linux/cve-exclusion.inc -include recipes-kernel/linux/cve-exclusion_6.5.inc - -SRCREV_machine ?= "e53dc7514de7d2fbe0f80547a50c0542928e2d11" -SRCREV_meta ?= "3b1f87ec237ec3ad9acffb3d75c55efe958085dc" - -# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll -# get the <version>/base branch, which is pure upstream -stable, and the same -# meta SRCREV as the linux-yocto-standard builds. Select your version using the -# normal PREFERRED_VERSION settings. -BBCLASSEXTEND = "devupstream:target" -SRCREV_machine:class-devupstream ?= "4631960b4700dd53f5cebb4f7055fd00ccd556ce" -PN:class-devupstream = "linux-yocto-upstream" -KBRANCH:class-devupstream = "v6.5/base" - -SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH};protocol=https \ - git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.5;destsuffix=${KMETA};protocol=https" - -LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "6.5.13" - -PV = "${LINUX_VERSION}+git" - -KMETA = "kernel-meta" -KCONF_BSP_AUDIT_LEVEL = "1" - -# Functionality flags -KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" -KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}" -KERNEL_FEATURES:append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "", d)}" -KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}" -KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}" |