From fe8dcc89f2d24f91a4ac40c268b67dac06486fc0 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Wed, 28 Apr 2021 17:46:26 +0930 Subject: linux-aspeed: Backport v5.13 patches for dts, lpc, spi The following changes were merged to mainline in v5.13 and have been backported to the openbmc dev-5.10 tree. Most are device tree changes, with one fix to the SPI layer and some changes to the LPC devices to match the new device tree. Alpana Kumari (2): ARM: dts: aspeed: rainier: Add presence GPIOs ARM: dts: aspeed: everest: GPIOs support Brandon Wyman (1): ARM: dts: aspeed: everest: Add power supply i2c devices Chia-Wei, Wang (5): dt-bindings: aspeed-lpc: Remove LPC partitioning ARM: dts: Remove LPC BMC and Host partitions ipmi: kcs: aspeed: Adapt to new LPC DTS layout pinctrl: aspeed-g5: Adapt to new LPC device tree layout soc: aspeed: Adapt to new LPC device tree layout Eddie James (9): ARM: dts: aspeed: rainier: Enable fan watchdog ARM: dts: aspeed: rainier 4U: Fix fan configuration ARM: dts: aspeed: everest: Add FSI CFAMs and re-number engines ARM: dts: aspeed: everest: Add RTC ARM: dts: aspeed: everest: Enable fan watchdog ARM: dts: aspeed: Add Rainier 1S4U machine ARM: dts: aspeed: Rainier: Fix PCA9552 on bus 8 ARM: dts: aspeed: Rainier: Fix humidity sensor bus address ARM: dts: aspeed: Rainier: Update to pass 2 hardware Jim Wright (1): ARM: dts: aspeed: everest: Add UCD90320 power sequencer Joel Stanley (2): ARM: dts: aspeed: rainier: Add missing fan nodes ARM: dts: aspeed: everest: Add size/address cells Konstantin Aladyshev (1): ARM: dts: aspeed: amd-ethanolx: Enable all used I2C busses Matthew Barth (2): ARM: dts: aspeed: everest: Add max31785 fan controller device ARM: dts: aspeed: everest: Add pca9552 fan presence Paul Fertser (1): ARM: dts: aspeed: tiogapass: add hotplug controller Priyanga Ramasamy (1): ARM: dts: aspeed: everest: Add I2C components William A. Kennington III (1): spi: Fix use-after-free with devm_spi_alloc_* Change-Id: Ia5425c9cea3fe025f84e93f688ecd8ffec75ad01 Signed-off-by: Joel Stanley --- meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-aspeed/recipes-kernel/linux') diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index 9df959114..53d7f1f02 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb @@ -1,6 +1,6 @@ KBRANCH ?= "dev-5.10" LINUX_VERSION ?= "5.10.30" -SRCREV="d538d632fb2046278ff3457994d64d43ee2901c7" +SRCREV="4c64c5ceebe8210bb838e74500077a0e944ca825" require linux-aspeed.inc -- cgit v1.2.3 From 3a60b152fd8b38e3095b90ca16dbe78526f242e7 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Wed, 12 May 2021 11:20:23 +0930 Subject: linux-aspeed: GFX and GCC 11 backports Arnd Bergmann (1): security: commoncap: fix -Wstringop-overread warning Joel Stanley (2): drm/aspeed: Look up syscon by phandle drm/aspeed: Use dt matching for default register values Change-Id: I5e037831ea1cf47ad0eee63b07b9765dac16ee0a Signed-off-by: Joel Stanley --- meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-aspeed/recipes-kernel/linux') diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index 53d7f1f02..dafa186f1 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb @@ -1,6 +1,6 @@ KBRANCH ?= "dev-5.10" LINUX_VERSION ?= "5.10.30" -SRCREV="4c64c5ceebe8210bb838e74500077a0e944ca825" +SRCREV="37f3fc821284a48d64874d6f451c6789955dc2f0" require linux-aspeed.inc -- cgit v1.2.3 From b8a706a4b625d9a4624f43e7ad6b2593e2363463 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Wed, 12 May 2021 12:24:52 +0930 Subject: linux-aspeed: Move to v5.10.36 stable release This includes security and bug fixes from the 5.10.31 through to 5.10.36 stable releases. Change-Id: Ic1f4aa968c2980d27509d76f7129039dc7645fe5 Signed-off-by: Joel Stanley --- meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-aspeed/recipes-kernel/linux') diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index dafa186f1..1b42ede6a 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb @@ -1,6 +1,6 @@ KBRANCH ?= "dev-5.10" -LINUX_VERSION ?= "5.10.30" +LINUX_VERSION ?= "5.10.36" -SRCREV="37f3fc821284a48d64874d6f451c6789955dc2f0" +SRCREV="fa5949e01036a25d9172efb50cc8475f19b04cef" require linux-aspeed.inc -- cgit v1.2.3 From f920e74c0c9d9096c87cbc1e610fef83747f4a06 Mon Sep 17 00:00:00 2001 From: Klaus Heinrich Kiwi Date: Tue, 9 Mar 2021 21:09:40 -0300 Subject: meta-aspeed: Add development key for Kernel sign Add a development (insecure, also known as 'imprint') key to linux-aspeed that can be used for signing the Kernel fitImage for U-Boot FIT Signature Verification. The key was generated according to U-Boot documentation, using: $ openssl genpkey -algorithm RSA -out rsa_oem_fitimage_key.key \ -pkeyopt rsa_keygen_bits:4096 -pkeyopt rsa_keygen_pubexp:65537 The certificate was created according to U-Boot documentation, using: $ openssl req -batch -new -x509 -key rsa_oem_fitimage_key.key \ -out rsa_oem_fitimage_key.crt Signed-off-by: Klaus Heinrich Kiwi Change-Id: Ic67024ab389c8a4a3fc6709e1d7d92dc72783ca5 --- meta-aspeed/recipes-kernel/linux/linux-aspeed.inc | 6 ++- .../linux/linux-aspeed/rsa_oem_fitimage_key.crt | 35 +++++++++++++ .../linux/linux-aspeed/rsa_oem_fitimage_key.key | 60 ++++++++++++++++++++++ 3 files changed, 100 insertions(+), 1 deletion(-) create mode 100644 meta-aspeed/recipes-kernel/linux/linux-aspeed/rsa_oem_fitimage_key.crt create mode 100644 meta-aspeed/recipes-kernel/linux/linux-aspeed/rsa_oem_fitimage_key.key (limited to 'meta-aspeed/recipes-kernel/linux') diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed.inc b/meta-aspeed/recipes-kernel/linux/linux-aspeed.inc index 6a1471f26..aa060295f 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed.inc +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed.inc @@ -8,7 +8,11 @@ KCONFIG_MODE="--alldefconfig" KSRC ?= "git://github.com/openbmc/linux;protocol=git;branch=${KBRANCH}" SRC_URI = "${KSRC}" -SRC_URI += " file://defconfig" +SRC_URI += " \ + file://defconfig \ + file://rsa_oem_fitimage_key.key;sha256sum=eeb4ff2ebbfbd97b6254fe6dbaeea41067e54c65176c233ec7b2ab2decf1ddcd \ + file://rsa_oem_fitimage_key.crt;sha256sum=45f5a55497cce8040999bf9f3214d471ac7b83ab7acef41c4425a34662e8372e \ + " LINUX_VERSION_EXTENSION ?= "-${SRCREV}" diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed/rsa_oem_fitimage_key.crt b/meta-aspeed/recipes-kernel/linux/linux-aspeed/rsa_oem_fitimage_key.crt new file mode 100644 index 000000000..0e8f25704 --- /dev/null +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed/rsa_oem_fitimage_key.crt @@ -0,0 +1,35 @@ +# Certificate for the 'Insecure' Kernel fitimage key, required +# by the signing process for U-Boot FIT Signature Validation. +# Please refer to 'rsa_oem_fitimage_key.key' for more info + +-----BEGIN CERTIFICATE----- +MIIFazCCA1OgAwIBAgIUMP4fGTalbDhpTcr7sr+VKnUunRUwDQYJKoZIhvcNAQEL +BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM +GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yMTA0MjgxMzAzMDhaFw0yMTA1 +MjgxMzAzMDhaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw +HwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwggIiMA0GCSqGSIb3DQEB +AQUAA4ICDwAwggIKAoICAQDMZ5gF78Jx+yzI4bh0imCi0kgRdljANokDu1DZpa2S +tPybosJk1453fWy8ZEsJupS1l6IPhEvWkehxL4pviADKle1S4yx5vmKV7b+ppKqV +LBXrVF4kphcbSTBqfOGa0mQeGBFUuhTKamjy9yyV6UhIBgutK5bJvQZThzU5ZBtG +g4zWIHSSyVMc5ACWfZuLcfjAp1s3hqY1Fi2grcTHQquPvyuyT5Xr2utmT2tdNr6D +9tdhdS3Xfb7HTjPRCcjRXhCPWxKqTneLrttRhK18vyg0LTPQ4vtVSHnCt2JpVCrV +Vg5YqvyfEu+fSh8kL0aveLK0afEGorb9XY0e2JmIUtJoONRGUaZCHdJ6R7v8fpgu +uEe0kBBOi1QLUUbFu7v/FQzgGbCaCA2E+aJRoBTooxM6RHsJp4s/LTsb+Pdl2sDM +Hno8fJ2qDVPO3vserrHunwTXUWcwyWhpWaYx+P7tDilH5K6cNTgivbvepfcbNDNl +8ZeZCK3EH6fdMkxTb0giqGpVjMlBgwf/RH2cYMzF83BchXoljpoyQmXhoi14uDS7 +LjgA5JUBeeqq1xEyFn+iYPrcnBFubetIg5zBiTjMZmz4aANQxlUGZ9sKAlHzQwPv +J+rkpR3dHzi9PHpzY3+5ptwGfLYP1sLbozNY3qE3wAIerkGgCgMuVp5XDJAlkO4M +HQIDAQABo1MwUTAdBgNVHQ4EFgQU5Du6F0E1sZpyDCGQswhvPuFlKUQwHwYDVR0j +BBgwFoAU5Du6F0E1sZpyDCGQswhvPuFlKUQwDwYDVR0TAQH/BAUwAwEB/zANBgkq +hkiG9w0BAQsFAAOCAgEAYnBJi9l9zvJldrVuVIa7IZQhKlLXuVU2yL3Az3Hr8ejg +FNwF9XdxXDxvBiQatIdZ/fv8ukqo+OBCyw1sE8u668S9ca1rr5+vq2PaxNn//ZLV +zmJ12yZa7SOkJgsWsjNlSwM+VWIbLKC+25nRYuA3S03XcLLmXzxEbxIYFuynds8W +pQqYMn1CZ9y6Yz7MtDo9p+JU1kFqgxocBLKpgcRgqbQ1vWHjE91r10iS6E1N8YAi +EPsO7Nh6DzfhFY4Wo+S9tTZwBL/dKqO4Ft4XPFKA1nEH8ZyGTI3jfRUYn5IaRc7g +5Hy8Mla/n7UvKrZIEitD5fqOvxm2g7Bck28cpr2gH+Cy5q6ivfJkycGRfy6BDfDl +fv41PJSnrrvxNuXB9ylBXat8K0nBPjY8vOr0uFXPzVHC3Rj2e8zD6GsOzFvkyvfQ +qYrUYKVs1U74PMTdu9wc9z+sS1CBvdq2KZPaZImqvctS3VP3mfmqxCHQLYx3WX23 +J0KGpbfmBOtHwcgBHna0ZAY7ImbF47+FL1eHzITVoMagFteEYC4LI4uqsznI2dNi +gjrTmQLnm8DkwvBFwXOa2QyaM2I4Dk+q7+FHwCxiTJdmTnd6LFH5nufmq5oIAy2d +/G0EqPom0AZz1i+Ee90xCjiFLd2vzdv5U+EWKkOjUiM/XdvglrsVCUdQ41gorRo= +-----END CERTIFICATE----- diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed/rsa_oem_fitimage_key.key b/meta-aspeed/recipes-kernel/linux/linux-aspeed/rsa_oem_fitimage_key.key new file mode 100644 index 000000000..d9bc4a748 --- /dev/null +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed/rsa_oem_fitimage_key.key @@ -0,0 +1,60 @@ +# Kernel fitImage 'Insecure' key (also known as 'development' or +# 'imprint' key), used to sign development images of the OpenBMC +# Kernel fitImage. This key SHOULD NOT be used to sign +# production images. +# This key is 4096 bits in size and can be used by adjusting +# the UBOOT_SIGN_KEYNAME, UBOOT_SIGN_KEYDIR and FIT_SIGN_ALG +# variables (see uboot-sign.bbclass for more info) + +-----BEGIN PRIVATE KEY----- +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 +xaPMnGMcWU4pg8ytNSMuYDfobC5hPxo= +-----END PRIVATE KEY----- -- cgit v1.2.3 From 9653de65be91614413c1ab9e8ef65bcddbc23286 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Mon, 24 May 2021 11:04:14 +0930 Subject: linux-aspeed: Move to v5.10.39 stable release This includes security and bug fixes from the 5.10.37 through to 5.10.39 stable releases. Change-Id: I05c6ef8cea894db1357376bc3eeea91783c78ba1 Signed-off-by: Joel Stanley --- meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-aspeed/recipes-kernel/linux') diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index 1b42ede6a..084606b61 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb @@ -1,6 +1,6 @@ KBRANCH ?= "dev-5.10" -LINUX_VERSION ?= "5.10.36" +LINUX_VERSION ?= "5.10.39" -SRCREV="fa5949e01036a25d9172efb50cc8475f19b04cef" +SRCREV="45c6dc0de963bfdd8b468dceeea24f56a8e51424" require linux-aspeed.inc -- cgit v1.2.3