mirror of
https://git.yoctoproject.org/meta-arm
synced 2026-05-08 05:09:56 +00:00
arm-bsp/n1sdp: update to linux yocto kernel 6.5
Bump kernel version to v6.5 and rebased N1SDP kernel PCIe quirk patches top of this new version. Signed-off-by: Xueliang Zhong <xueliang.zhong@arm.com> Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Xueliang Zhong
committed by
Jon Mason
Jon Mason
parent
ce1cb5c740
commit
21df60b921
@@ -19,7 +19,7 @@ WKS_FILE_DEPENDS:append = " ${EXTRA_IMAGEDEPENDS}"
|
|||||||
|
|
||||||
# Use kernel provided by yocto
|
# Use kernel provided by yocto
|
||||||
PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
|
PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
|
||||||
PREFERRED_VERSION_linux-yocto ?= "6.4%"
|
PREFERRED_VERSION_linux-yocto ?= "6.5%"
|
||||||
|
|
||||||
# RTL8168E Gigabit Ethernet Controller is attached to the PCIe interface
|
# RTL8168E Gigabit Ethernet Controller is attached to the PCIe interface
|
||||||
MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "linux-firmware-rtl8168"
|
MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "linux-firmware-rtl8168"
|
||||||
|
|||||||
@@ -68,7 +68,7 @@ COMPATIBLE_MACHINE:musca-s1 = "(^$)"
|
|||||||
#
|
#
|
||||||
# N1SDP KMACHINE
|
# N1SDP KMACHINE
|
||||||
#
|
#
|
||||||
FILESEXTRAPATHS:prepend:n1sdp := "${THISDIR}/linux-yocto-6.4/n1sdp:"
|
FILESEXTRAPATHS:prepend:n1sdp := "${THISDIR}/linux-yocto-6.5/n1sdp:"
|
||||||
COMPATIBLE_MACHINE:n1sdp = "n1sdp"
|
COMPATIBLE_MACHINE:n1sdp = "n1sdp"
|
||||||
KBUILD_DEFCONFIG:n1sdp = "defconfig"
|
KBUILD_DEFCONFIG:n1sdp = "defconfig"
|
||||||
KCONFIG_MODE:n1sdp = "--alldefconfig"
|
KCONFIG_MODE:n1sdp = "--alldefconfig"
|
||||||
|
|||||||
+6
-8
@@ -1,4 +1,4 @@
|
|||||||
From ec84afa8e74bc5df8b5794eef8f29b097adc7cb3 Mon Sep 17 00:00:00 2001
|
From 63da10da7a57776196a3c323e93ef66f1d553c0c Mon Sep 17 00:00:00 2001
|
||||||
From: Manoj Kumar <manoj.kumar3@arm.com>
|
From: Manoj Kumar <manoj.kumar3@arm.com>
|
||||||
Date: Mon, 1 Feb 2021 21:36:43 +0530
|
Date: Mon, 1 Feb 2021 21:36:43 +0530
|
||||||
Subject: [PATCH] iommu/arm-smmu-v3: workaround for ATC_INV_SIZE_ALL in N1SDP
|
Subject: [PATCH] iommu/arm-smmu-v3: workaround for ATC_INV_SIZE_ALL in N1SDP
|
||||||
@@ -9,11 +9,9 @@ N1SDP platform. This workaround manually sets the ATS address
|
|||||||
field to proper value for ATC_INV_SIZE_ALL command.
|
field to proper value for ATC_INV_SIZE_ALL command.
|
||||||
|
|
||||||
Change-Id: If89465be94720a62be85e1e6612f17e93fa9b8a5
|
Change-Id: If89465be94720a62be85e1e6612f17e93fa9b8a5
|
||||||
Signed-off-by: Manoj Kumar <manoj.kumar3@arm.com>
|
|
||||||
Signed-off-by: Khasim Syed Mohammed <khasim.mohammed@arm.com>
|
|
||||||
|
|
||||||
Upstream-Status: Inappropriate [Workaround]
|
Upstream-Status: Inappropriate [Workaround]
|
||||||
Signed-off-by: Manoj Kumar <manoj.kumar3@arm.com>
|
Signed-off-by: Manoj Kumar <manoj.kumar3@arm.com>
|
||||||
|
Signed-off-by: Khasim Syed Mohammed <khasim.mohammed@arm.com>
|
||||||
Signed-off-by: Vishnu Banavath <vishnu.banavath@arm.com>
|
Signed-off-by: Vishnu Banavath <vishnu.banavath@arm.com>
|
||||||
Signed-off-by: Adam Johnston <adam.johnston@arm.com>
|
Signed-off-by: Adam Johnston <adam.johnston@arm.com>
|
||||||
---
|
---
|
||||||
@@ -22,10 +20,10 @@ Signed-off-by: Adam Johnston <adam.johnston@arm.com>
|
|||||||
2 files changed, 2 insertions(+)
|
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
|
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 3fd83fb75722..852ed05b14a3 100644
|
index 6ccbae9b93a1..5387f152fb07 100644
|
||||||
--- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
|
--- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
|
||||||
+++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
|
+++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
|
||||||
@@ -1747,6 +1747,7 @@ arm_smmu_atc_inv_to_cmd(int ssid, unsigned long iova, size_t size,
|
@@ -1753,6 +1753,7 @@ arm_smmu_atc_inv_to_cmd(int ssid, unsigned long iova, size_t size,
|
||||||
};
|
};
|
||||||
|
|
||||||
if (!size) {
|
if (!size) {
|
||||||
@@ -34,10 +32,10 @@ index 3fd83fb75722..852ed05b14a3 100644
|
|||||||
return;
|
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
|
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 b574c58a3487..018086b65381 100644
|
index dcab85698a4e..12e12d03eebf 100644
|
||||||
--- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h
|
--- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h
|
||||||
+++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h
|
+++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h
|
||||||
@@ -472,6 +472,7 @@ struct arm_smmu_cmdq_ent {
|
@@ -478,6 +478,7 @@ struct arm_smmu_cmdq_ent {
|
||||||
|
|
||||||
#define CMDQ_OP_ATC_INV 0x40
|
#define CMDQ_OP_ATC_INV 0x40
|
||||||
#define ATC_INV_SIZE_ALL 52
|
#define ATC_INV_SIZE_ALL 52
|
||||||
+7
-8
@@ -1,4 +1,4 @@
|
|||||||
From 9761e48b2d6904a58996fcaadcf25684482a72c8 Mon Sep 17 00:00:00 2001
|
From 7d24cc041cbcff07b21a9a380426b38e09149648 Mon Sep 17 00:00:00 2001
|
||||||
From: Manoj Kumar <manoj.kumar3@arm.com>
|
From: Manoj Kumar <manoj.kumar3@arm.com>
|
||||||
Date: Tue, 31 Aug 2021 16:15:38 +0000
|
Date: Tue, 31 Aug 2021 16:15:38 +0000
|
||||||
Subject: [PATCH] n1sdp: pci_quirk: add acs override for PCI devices
|
Subject: [PATCH] n1sdp: pci_quirk: add acs override for PCI devices
|
||||||
@@ -7,9 +7,8 @@ Patch taken from:
|
|||||||
https://gitlab.com/Queuecumber/linux-acs-override/raw/master/workspaces/5.4/acso.patch
|
https://gitlab.com/Queuecumber/linux-acs-override/raw/master/workspaces/5.4/acso.patch
|
||||||
|
|
||||||
Change-Id: Ib926bf50524ce9990fbaa2f2f8670fe84bd571f9
|
Change-Id: Ib926bf50524ce9990fbaa2f2f8670fe84bd571f9
|
||||||
Signed-off-by: Manoj Kumar <manoj.kumar3@arm.com>
|
|
||||||
|
|
||||||
Upstream-Status: Inappropriate [will not be submitted as its a workaround to address hardware issue]
|
Upstream-Status: Inappropriate [will not be submitted as its a workaround to address hardware issue]
|
||||||
|
Signed-off-by: Manoj Kumar <manoj.kumar3@arm.com>
|
||||||
Signed-off-by: Khasim Syed Mohammed <khasim.mohammed@arm.com>
|
Signed-off-by: Khasim Syed Mohammed <khasim.mohammed@arm.com>
|
||||||
Signed-off-by: Vishnu Banavath <vishnu.banavath@arm.com>
|
Signed-off-by: Vishnu Banavath <vishnu.banavath@arm.com>
|
||||||
Signed-off-by: Adam Johnston <adam.johnston@arm.com>
|
Signed-off-by: Adam Johnston <adam.johnston@arm.com>
|
||||||
@@ -19,10 +18,10 @@ Signed-off-by: Adam Johnston <adam.johnston@arm.com>
|
|||||||
2 files changed, 110 insertions(+)
|
2 files changed, 110 insertions(+)
|
||||||
|
|
||||||
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
|
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
|
||||||
index 9e5bab29685f..7ee740a37e5d 100644
|
index 23ebe34ff901..054b6e6d22f3 100644
|
||||||
--- a/Documentation/admin-guide/kernel-parameters.txt
|
--- a/Documentation/admin-guide/kernel-parameters.txt
|
||||||
+++ b/Documentation/admin-guide/kernel-parameters.txt
|
+++ b/Documentation/admin-guide/kernel-parameters.txt
|
||||||
@@ -4235,6 +4235,14 @@
|
@@ -4271,6 +4271,14 @@
|
||||||
nomsi [MSI] If the PCI_MSI kernel config parameter is
|
nomsi [MSI] If the PCI_MSI kernel config parameter is
|
||||||
enabled, this kernel boot option can be used to
|
enabled, this kernel boot option can be used to
|
||||||
disable the use of MSI interrupts system-wide.
|
disable the use of MSI interrupts system-wide.
|
||||||
@@ -38,10 +37,10 @@ index 9e5bab29685f..7ee740a37e5d 100644
|
|||||||
Safety option to keep boot IRQs enabled. This
|
Safety option to keep boot IRQs enabled. This
|
||||||
should never be necessary.
|
should never be necessary.
|
||||||
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
|
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
|
||||||
index b7c65193e786..16b81d1ccafa 100644
|
index 321156ca273d..1144c3a8a3bb 100644
|
||||||
--- a/drivers/pci/quirks.c
|
--- a/drivers/pci/quirks.c
|
||||||
+++ b/drivers/pci/quirks.c
|
+++ b/drivers/pci/quirks.c
|
||||||
@@ -3625,6 +3625,107 @@ static void quirk_no_bus_reset(struct pci_dev *dev)
|
@@ -3718,6 +3718,107 @@ static void quirk_no_bus_reset(struct pci_dev *dev)
|
||||||
dev->dev_flags |= PCI_DEV_FLAGS_NO_BUS_RESET;
|
dev->dev_flags |= PCI_DEV_FLAGS_NO_BUS_RESET;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -149,7 +148,7 @@ index b7c65193e786..16b81d1ccafa 100644
|
|||||||
/*
|
/*
|
||||||
* Some NVIDIA GPU devices do not work with bus reset, SBR needs to be
|
* Some NVIDIA GPU devices do not work with bus reset, SBR needs to be
|
||||||
* prevented for those affected devices.
|
* prevented for those affected devices.
|
||||||
@@ -5017,6 +5118,7 @@ static const struct pci_dev_acs_enabled {
|
@@ -5112,6 +5213,7 @@ static const struct pci_dev_acs_enabled {
|
||||||
{ PCI_VENDOR_ID_ZHAOXIN, PCI_ANY_ID, pci_quirk_zhaoxin_pcie_ports_acs },
|
{ PCI_VENDOR_ID_ZHAOXIN, PCI_ANY_ID, pci_quirk_zhaoxin_pcie_ports_acs },
|
||||||
/* Wangxun nics */
|
/* Wangxun nics */
|
||||||
{ PCI_VENDOR_ID_WANGXUN, PCI_ANY_ID, pci_quirk_wangxun_nic_acs },
|
{ PCI_VENDOR_ID_WANGXUN, PCI_ANY_ID, pci_quirk_wangxun_nic_acs },
|
||||||
+4
-5
@@ -1,4 +1,4 @@
|
|||||||
From 268bfbcd8f16660bf5fc8e31b18b4090743c6dbe Mon Sep 17 00:00:00 2001
|
From 51879bfe6b0850b3746df9f9471120a6709807cb Mon Sep 17 00:00:00 2001
|
||||||
From: Deepak Pandey <Deepak.Pandey@arm.com>
|
From: Deepak Pandey <Deepak.Pandey@arm.com>
|
||||||
Date: Fri, 31 May 2019 16:42:43 +0100
|
Date: Fri, 31 May 2019 16:42:43 +0100
|
||||||
Subject: [PATCH] pcie: Add quirk for the Arm Neoverse N1SDP platform
|
Subject: [PATCH] pcie: Add quirk for the Arm Neoverse N1SDP platform
|
||||||
@@ -24,7 +24,6 @@ Signed-off-by: Deepak Pandey <Deepak.Pandey@arm.com>
|
|||||||
Signed-off-by: Sudipto Paul <sudipto.paul@arm.com>
|
Signed-off-by: Sudipto Paul <sudipto.paul@arm.com>
|
||||||
[Andre: fix coding style issues, rewrite some parts, add DT support]
|
[Andre: fix coding style issues, rewrite some parts, add DT support]
|
||||||
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
|
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
|
||||||
|
|
||||||
Change-Id: I1d3a4b9bf6b3b883d262e3c4ff1f88a0eb81c1fe
|
Change-Id: I1d3a4b9bf6b3b883d262e3c4ff1f88a0eb81c1fe
|
||||||
Upstream-Status: Inappropriate [will not be submitted as its a workaround to address hardware issue]
|
Upstream-Status: Inappropriate [will not be submitted as its a workaround to address hardware issue]
|
||||||
Signed-off-by: Deepak Pandey <Deepak.Pandey@arm.com>
|
Signed-off-by: Deepak Pandey <Deepak.Pandey@arm.com>
|
||||||
@@ -41,10 +40,10 @@ Signed-off-by: Adam Johnston <adam.johnston@arm.com>
|
|||||||
create mode 100644 drivers/pci/controller/pcie-n1sdp.c
|
create mode 100644 drivers/pci/controller/pcie-n1sdp.c
|
||||||
|
|
||||||
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
|
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
|
||||||
index a24609e14d50..cd73d1704dd2 100644
|
index 02adc6ceb831..398a5429a8e2 100644
|
||||||
--- a/arch/arm64/configs/defconfig
|
--- a/arch/arm64/configs/defconfig
|
||||||
+++ b/arch/arm64/configs/defconfig
|
+++ b/arch/arm64/configs/defconfig
|
||||||
@@ -203,6 +203,7 @@ CONFIG_NFC_S3FWRN5_I2C=m
|
@@ -207,6 +207,7 @@ CONFIG_NFC_S3FWRN5_I2C=m
|
||||||
CONFIG_PCI=y
|
CONFIG_PCI=y
|
||||||
CONFIG_PCIEPORTBUS=y
|
CONFIG_PCIEPORTBUS=y
|
||||||
CONFIG_PCIEAER=y
|
CONFIG_PCIEAER=y
|
||||||
@@ -71,7 +70,7 @@ index 860014b89b8e..2d4c1c699ffe 100644
|
|||||||
|
|
||||||
#ifdef CONFIG_LOONGARCH
|
#ifdef CONFIG_LOONGARCH
|
||||||
diff --git a/drivers/pci/controller/Kconfig b/drivers/pci/controller/Kconfig
|
diff --git a/drivers/pci/controller/Kconfig b/drivers/pci/controller/Kconfig
|
||||||
index 8d49bad7f847..7bb49afbcd5b 100644
|
index 0859be86e718..c51b89781472 100644
|
||||||
--- a/drivers/pci/controller/Kconfig
|
--- a/drivers/pci/controller/Kconfig
|
||||||
+++ b/drivers/pci/controller/Kconfig
|
+++ b/drivers/pci/controller/Kconfig
|
||||||
@@ -21,6 +21,17 @@ config PCIE_ALTERA
|
@@ -21,6 +21,17 @@ config PCIE_ALTERA
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
From 553801193c173711e9f7f6c56a44b5fac2385c1e Mon Sep 17 00:00:00 2001
|
From aa7c785aff4276aa8579a54f39347cd47eb48ebb Mon Sep 17 00:00:00 2001
|
||||||
From: Sayanta Pattanayak <sayanta.pattanayak@arm.com>
|
From: Sayanta Pattanayak <sayanta.pattanayak@arm.com>
|
||||||
Date: Wed, 9 Feb 2022 20:37:43 +0530
|
Date: Wed, 9 Feb 2022 20:37:43 +0530
|
||||||
Subject: [PATCH] n1sdp: pcie: add quirk support enabling remote chip PCIe
|
Subject: [PATCH] n1sdp: pcie: add quirk support enabling remote chip PCIe
|
||||||
+3
-3
@@ -1,4 +1,4 @@
|
|||||||
From d2e55d92eefd99ede330270b00c01b734a6b61c0 Mon Sep 17 00:00:00 2001
|
From a9df434f077e7f1d8895e76381ba7179f3ebb1ba Mon Sep 17 00:00:00 2001
|
||||||
From: Andre Przywara <andre.przywara@arm.com>
|
From: Andre Przywara <andre.przywara@arm.com>
|
||||||
Date: Fri, 17 May 2019 17:39:27 +0100
|
Date: Fri, 17 May 2019 17:39:27 +0100
|
||||||
Subject: [PATCH] arm64: kpti: Whitelist early Arm Neoverse N1 revisions
|
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(+)
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c
|
diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c
|
||||||
index 7d7128c65161..77e109ddd981 100644
|
index 2c0b8444fea6..5c0ff40c6c8b 100644
|
||||||
--- a/arch/arm64/kernel/cpufeature.c
|
--- a/arch/arm64/kernel/cpufeature.c
|
||||||
+++ b/arch/arm64/kernel/cpufeature.c
|
+++ b/arch/arm64/kernel/cpufeature.c
|
||||||
@@ -1674,6 +1674,7 @@ static bool unmap_kernel_at_el0(const struct arm64_cpu_capabilities *entry,
|
@@ -1690,6 +1690,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_2XX_SILVER),
|
||||||
MIDR_ALL_VERSIONS(MIDR_QCOM_KRYO_3XX_SILVER),
|
MIDR_ALL_VERSIONS(MIDR_QCOM_KRYO_3XX_SILVER),
|
||||||
MIDR_ALL_VERSIONS(MIDR_QCOM_KRYO_4XX_SILVER),
|
MIDR_ALL_VERSIONS(MIDR_QCOM_KRYO_4XX_SILVER),
|
||||||
Reference in New Issue
Block a user