From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753414AbbLRPWR (ORCPT ); Fri, 18 Dec 2015 10:22:17 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:62659 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752734AbbLRPWP (ORCPT ); Fri, 18 Dec 2015 10:22:15 -0500 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: Jason Cooper , Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , rmk+kernel@arm.linux.org.uk, linux-kernel@vger.kernel.org, Will Deacon Subject: [RFC, PATCH] ARM: PJ4: don't use PJ4B code on PJ4 Date: Fri, 18 Dec 2015 16:21:15 +0100 Message-ID: <5220349.xrH4GrVd0b@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:ANFEa/LiRJAxMU14fD5HQW2zF+cOalCbYIUZ/Thz8e7Vwj4G0e+ RzaaC+irRX569cZt6/vlc6rSMtWp+BUXfff36LHZPfhemxKqkOFYPOn1oQkHdHFcKI8e2x0 XZ/OW44HSRphPcEeISuwPKJazo8tU9Z/MkXNSBfSBrQJVDx4Ou7Sa+Dkp9rEx4uO51mRZ1N YvGraTBpDiS4PjBOyv/gQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:R0tYp5hNSxw=:e+OJkVQEaEH13QU3sVzwor IKUIReTiLepqJr65QKf526dhS6aLpYg7tYud2ypCMRqx98UturCK0gX/7GeAQtPwcJvOoiD0P FnXTyT/aitYJkDrqZmOKIRVu5GkInoRTzi0/37soU7GQ6d2B81yb4ZbU8ASiOf5JSfF5MzCaR KoDPdPykhwFAC2xJ0H9dmtaPB9ZkZk24ElH+XyCLtEU2d+LHqWro/boWuS2IV0eC/ZnEz+LdO CUP0nWGK1OWSlwE2/ehYz6JZ1VCr3pROvy6KArTpGdcuRDwSbRI9oiKJ17NO+elKEgxtON+zF sEMb+kQHRjLXSW+88S2UBSuEyl1Cgr/ZXG08eNN6xVsVR/Qce4jaON3dyTEMKAGEERe5YHMYW 72aOjuJEjgd418WxwYyXm9ZelhT4XYgbL3BI8VKJMewEVFEzkdsE2MsiihqCJvm7kfqOPewI0 rQR8Ro9Srv7u9sO/UgnW5oqcYcirc2y8pMjljdRmFLAC576i7L79PumttikChcq1oUF03Dc3i +4JRSTCwA0qPj7NLTZVxon1x4UYpakBVULYD1BDra/IpiwblV6H1ZO/N/bHUJXxBiE9MIQyEF d4UvHToeCLWgUcUSwP9BHT5EKwatCXfnApsiOnSwY7rVEbAjVBjGLCsVJEpLeIbHj0PV2lB5/ iGCWKAf4I4XVqeGyQa0WpCng1/B4GLfE5qXhfrFim+8B8+xnWjqRK+SCwjOCtp8n2jIbc+oxv l/3CiG5dgum+yQI1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We can have multiplatform kernels with PJ4 (Dove, MMP2) in combination with PJ4B (Armada 370) or PJ4B-MP (Berlin, Armada XP), and the processor functions that are defined for PJ4B use a mask that covers all three core types, rather than using the default ARMv7 type for the original PJ4. This adds a second entry for PJ4B-MP, so we at least get a consistent behavior between single-machine kernels and combined ones. I suspect however that we actually want different contents for each of the three cores, as PJ4B and PJ4B-MP appear to be at least as different as PJ4 is from PJ4B, in particular the support for the standard architecture extensions like IDIV and LPAE, and the PJ4B_ERRATA_4742 workaround apparently does not apply to PJ4B-MP but might apply to PJ4. Signed-off-by: Arnd Bergmann Fixes: 049be07053eb ("ARM: 7754/1: Fix the CPU ID and the mask associated to the PJ4B") diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S index 0f92d575a304..c9384c4780ea 100644 --- a/arch/arm/mm/proc-v7.S +++ b/arch/arm/mm/proc-v7.S @@ -576,10 +576,17 @@ __v7_ca8_proc_info: #ifdef CONFIG_CPU_PJ4B .type __v7_pj4b_proc_info, #object __v7_pj4b_proc_info: - .long 0x560f5800 - .long 0xff0fff00 + .long 0x562f5840 + .long 0xfffffff0 __v7_proc __v7_pj4b_proc_info, __v7_pj4b_setup, proc_fns = pj4b_processor_functions .size __v7_pj4b_proc_info, . - __v7_pj4b_proc_info + + .type __v7_pj4bmp_proc_info, #object +__v7_pj4bmp_proc_info: + .long 0x561f5810 + .long 0xfffffff0 + __v7_proc __v7_pj4bmp_proc_info, __v7_pj4b_setup, proc_fns = pj4b_processor_functions + .size __v7_pj4bmp_proc_info, . - __v7_pj4bmp_proc_info #endif /*