AmigaOne X1000 platform specific issues related to Linux only.
xeno74
Posts: 9348 Joined: Fri Mar 23, 2012 7:58 am
Post
by xeno74 » Sun Aug 09, 2020 4:54 pm
Aneesh Kumar has released a patch because of the X1000 boot issue.
Code: Select all
commit 919a177bcdaf1eaeaeecc0d0f50a688629d7b5df
Author: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Date: Sun Aug 9 20:37:38 2020 +0530
powerpc/pkeys: Fix boot failures with Nemo board (A-EON AmigaOne X1000)
On p6 and before we should avoid updating UAMOR SPRN. This resulted
in boot failure on Nemo board.
Fixes: 269e829f48a0 ("powerpc/book3s64/pkey: Disable pkey on POWER6 and before")
Reported-by: Christian Zigotzky <chzigotzky@xenosoft.de>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
diff --git a/arch/powerpc/mm/book3s64/pkeys.c b/arch/powerpc/mm/book3s64/pkeys.c
index 69a6b87f2bb4..b1d091a97611 100644
--- a/arch/powerpc/mm/book3s64/pkeys.c
+++ b/arch/powerpc/mm/book3s64/pkeys.c
@@ -73,12 +73,6 @@ static int scan_pkey_feature(void)
if (early_radix_enabled())
return 0;
- /*
- * Only P7 and above supports SPRN_AMR update with MSR[PR] = 1
- */
- if (!early_cpu_has_feature(CPU_FTR_ARCH_206))
- return 0;
-
ret = of_scan_flat_dt(dt_scan_storage_keys, &pkeys_total);
if (ret == 0) {
/*
@@ -124,6 +118,12 @@ void __init pkey_early_init_devtree(void)
__builtin_popcountl(ARCH_VM_PKEY_FLAGS >> VM_PKEY_SHIFT)
!= (sizeof(u64) * BITS_PER_BYTE));
+ /*
+ * Only P7 and above supports SPRN_AMR update with MSR[PR] = 1
+ */
+ if (!early_cpu_has_feature(CPU_FTR_ARCH_206))
+ return;
+
/* scan the device tree for pkey feature */
pkeys_total = scan_pkey_feature();
if (!pkeys_total)
If this patch works then we can release the alpha3 tomorrow.
xeno74
Posts: 9348 Joined: Fri Mar 23, 2012 7:58 am
Post
by xeno74 » Mon Aug 10, 2020 11:33 am
X1000: There were some other problems like not displaying boot messages or only one CPU core so Aneesh has released a new patch.
Code: Select all
On p6 and before we should avoid updating UAMOR SPRN. This resulted
in boot failure on Nemo board.
Fixes: 269e829f48a0 ("powerpc/book3s64/pkey: Disable pkey on POWER6 and before")
Reported-by: Christian Zigotzky <chzigotzky@xenosoft.de>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
---
arch/powerpc/mm/book3s64/hash_utils.c | 5 ++---
arch/powerpc/mm/book3s64/pkeys.c | 12 ++++++------
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/arch/powerpc/mm/book3s64/hash_utils.c b/arch/powerpc/mm/book3s64/hash_utils.c
index 1478fceeb683..1da9dbba9217 100644
--- a/arch/powerpc/mm/book3s64/hash_utils.c
+++ b/arch/powerpc/mm/book3s64/hash_utils.c
@@ -1115,9 +1115,8 @@ void hash__early_init_mmu_secondary(void)
&& cpu_has_feature(CPU_FTR_HVMODE))
tlbiel_all();
-#ifdef CONFIG_PPC_MEM_KEYS
- mtspr(SPRN_UAMOR, default_uamor);
-#endif
+ if (IS_ENABLED(CONFIG_PPC_MEM_KEYS) && mmu_has_feature(MMU_FTR_PKEY))
+ mtspr(SPRN_UAMOR, default_uamor);
}
#endif /* CONFIG_SMP */
diff --git a/arch/powerpc/mm/book3s64/pkeys.c b/arch/powerpc/mm/book3s64/pkeys.c
index 69a6b87f2bb4..b1d091a97611 100644
--- a/arch/powerpc/mm/book3s64/pkeys.c
+++ b/arch/powerpc/mm/book3s64/pkeys.c
@@ -73,12 +73,6 @@ static int scan_pkey_feature(void)
if (early_radix_enabled())
return 0;
- /*
- * Only P7 and above supports SPRN_AMR update with MSR[PR] = 1
- */
- if (!early_cpu_has_feature(CPU_FTR_ARCH_206))
- return 0;
-
ret = of_scan_flat_dt(dt_scan_storage_keys, &pkeys_total);
if (ret == 0) {
/*
@@ -124,6 +118,12 @@ void __init pkey_early_init_devtree(void)
__builtin_popcountl(ARCH_VM_PKEY_FLAGS >> VM_PKEY_SHIFT)
!= (sizeof(u64) * BITS_PER_BYTE));
+ /*
+ * Only P7 and above supports SPRN_AMR update with MSR[PR] = 1
+ */
+ if (!early_cpu_has_feature(CPU_FTR_ARCH_206))
+ return;
+
/* scan the device tree for pkey feature */
pkeys_total = scan_pkey_feature();
if (!pkeys_total)
--
2.26.2
xeno74
Posts: 9348 Joined: Fri Mar 23, 2012 7:58 am
Post
by xeno74 » Fri Aug 14, 2020 7:56 pm
FYI:
Code: Select all
[GIT PULL] Please pull powerpc/linux.git powerpc-5.9-2 tag
Hi Linus,
Please pull a powerpc fix for 5.9:
The following changes since commit 7b9de97711225559af213dc52b6ea883ef1ea7a8:
powerpc/ptrace: Fix build error in pkey_get() (2020-08-07 18:27:26 -0700)
are available in the git repository at:
https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git tags/powerpc-5.9-2
for you to fetch changes up to 6553fb799f601497ca0703682e2aff131197dc5c:
powerpc/pkeys: Fix boot failures with Nemo board (A-EON AmigaOne X1000) (2020-08-10 23:07:21 +1000)
- ------------------------------------------------------------------
powerpc fixes for 5.9 #2
One fix for a boot crash on some platforms introduced by the recent pkey
refactoring.
Thanks to:
Christian Zigotzky, Aneesh Kumar K.V.
- ------------------------------------------------------------------
Aneesh Kumar K.V (1):
powerpc/pkeys: Fix boot failures with Nemo board (A-EON AmigaOne X1000)
arch/powerpc/mm/book3s64/hash_utils.c | 5 ++---
arch/powerpc/mm/book3s64/pkeys.c | 12 ++++++------
2 files changed, 8 insertions(+), 9 deletions(-)
xeno74
Posts: 9348 Joined: Fri Mar 23, 2012 7:58 am
Post
by xeno74 » Mon Aug 17, 2020 10:40 am
Hi All,
The
RC1 of kernel
5.9 is available for the X1000 and X5000.
New:
Issues:
Virtual e5500 QEMU machine with a VirtIO-GPU: The issue with the VirtIO-GPU still exists. Therefore we still need the virtio_gpu patch .
X5000: We still need the dpaa-v1 patch because of the DPAA issue on Ubuntu 16.04.
Download:
linux-image-5.9-rc1-X1000_X5000.tar.gz
Please test the kernels.
Thanks,
Christian
xeno74
Posts: 9348 Joined: Fri Mar 23, 2012 7:58 am
Post
by xeno74 » Tue Aug 18, 2020 12:24 pm
Great news because of the issue with the VirtIO-GPU.
Gerd Hoffmann wrote:
It is fixed in drm-misc-next (commit 51c3b0cc32d2e17581fce5b487ee95bbe9e8270a).
Will cherry-pick into drm-misc-fixes once the branch is 5.9-based, which
in turn should bring it to 5.9-rc2 or -rc3.
take care,
Gerd
Link to
drm-misc-next (commit 51c3b0cc32d2e17581fce5b487ee95bbe9e8270a)
xeno74
Posts: 9348 Joined: Fri Mar 23, 2012 7:58 am
Post
by xeno74 » Wed Aug 19, 2020 11:14 am
Hi All,
I compiled a new RC1 with Gerd's and our patch today. With these patches, the VirtIO-GPU works without any problems. I can use higher resolutions again.
Download:
linux-image-5.9-rc1-3-X5000.tar.gz
Screenshot of the RC1-3 with the VirtIO-GPU in a virtual e5500 QEMU/KVM HV machine on my X5000:
Cheers,
Christian