From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Sat, 5 Mar 2022 01:25:09 +0000 (-0500)
Subject: linux-yocto/5.15: riscv64: drop MAXPHYSMEM_128GB
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=da19366b44af8521b0f311581793fc89d554cd40;p=openembedded-core.git

linux-yocto/5.15: riscv64: drop MAXPHYSMEM_128GB

Integrating the following commit(s) to linux-yocto:

    commit e1b976ee4fb5af517cf01a9f2dd4a32f560ca894
    Author: Bruce Ashfield <bruce.ashfield@gmail.com>
    Date:   Tue Feb 15 23:27:31 2022 -0500

        riscv64: drop MAXPHYSMEM_128GB

        The MAXPHYSMEM config options have been removed upstream via the
        following commit, so we drop our setting.

           commit 6250ecf5ba42292b652cd01c9fcb2239010c5c44
           Author: Alexandre Ghiti <alexandre.ghiti@canonical.com>
           Date:   Mon Jan 17 10:57:16 2022 +0100

               riscv: Get rid of MAXPHYSMEM configs

               commit db1503d355a79d1d4255a9996f20e72848b74a56 upstream.

               CONFIG_MAXPHYSMEM_* are actually never used, even the nommu defconfigs
               selecting the MAXPHYSMEM_2GB had no effects on PAGE_OFFSET since it was
               preempted by !MMU case right before.

               In addition, the move of the kernel mapping at the end of the address
               space broke the use of MAXPHYSMEM_2G with MMU since it defines PAGE_OFFSET
               at the same address as the kernel mapping.

               Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
               Fixes: 2bfc6cd81bd1 ("riscv: Move kernel mapping outside of linear mapping")
               Signed-off-by: Alexandre Ghiti <alexandre.ghiti@canonical.com>
               Tested-by: Geert Uytterhoeven <geert@linux-m68k.org>
               Tested-by: Conor Dooley <Conor.Dooley@microchip.com>
               Cc: stable@vger.kernel.org
               Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
               Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
index 9b652a797b..22385ad38c 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
@@ -12,7 +12,7 @@ python () {
 }
 
 SRCREV_machine ?= "c5b3006ccedbb8397aa58b667b981e0c2435b943"
-SRCREV_meta ?= "2d38a472b21ae343707c8bd64ac68a9eaca066a0"
+SRCREV_meta ?= "e1b976ee4fb5af517cf01a9f2dd4a32f560ca894"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
index 754dbc7d60..ae72f34c26 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
@@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2"
 
 SRCREV_machine:qemuarm ?= "66d56b3bcc1391639a84e35be3ef00c5197089a8"
 SRCREV_machine ?= "7f685244afb3acd13e94968312580b63d7296705"
-SRCREV_meta ?= "2d38a472b21ae343707c8bd64ac68a9eaca066a0"
+SRCREV_meta ?= "e1b976ee4fb5af517cf01a9f2dd4a32f560ca894"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb
index 4b5e332c37..43409fb45e 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb
@@ -23,7 +23,7 @@ SRCREV_machine:qemux86 ?= "7f685244afb3acd13e94968312580b63d7296705"
 SRCREV_machine:qemux86-64 ?= "7f685244afb3acd13e94968312580b63d7296705"
 SRCREV_machine:qemumips64 ?= "1d269d782d6b6effed2437ad6b11ae4f4e789259"
 SRCREV_machine ?= "7f685244afb3acd13e94968312580b63d7296705"
-SRCREV_meta ?= "2d38a472b21ae343707c8bd64ac68a9eaca066a0"
+SRCREV_meta ?= "e1b976ee4fb5af517cf01a9f2dd4a32f560ca894"
 
 # 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