From patchwork Mon Mar 19 11:02:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 132029 Delivered-To: patches@linaro.org Received: by 10.46.84.17 with SMTP id i17csp2580348ljb; Mon, 19 Mar 2018 04:02:19 -0700 (PDT) X-Google-Smtp-Source: AG47ELvt77wnR6iMGiS62bOhgg9HIAp6Gg5rcPE82FzgxbeY7JXN7B0vHuNbKPLDLZCt1xf5U4y7 X-Received: by 10.28.116.14 with SMTP id p14mr8814273wmc.117.1521457338925; Mon, 19 Mar 2018 04:02:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521457338; cv=none; d=google.com; s=arc-20160816; b=bXSdm0kzNEcRT/kww/m+IYYYukp4np+OEV2awcSgdMr77qbRmo3/LVE06gY6gQnmV9 +41nVr08VJq3eFJ6gaGo5wgk9Ib5x1xHA4x9+mb716KvfBgIKcdDJ+ruaJglxp5ujUyU +D6bH4ECcszkk902ne5UZ7y4KsJmCOJWhy6/jy7Un3gz1rI4rPAL7JjBO6/sd75ks0Ts aTAx2DJHak/thDHcIzyhK3XFa9VPpBD7arGLNoIlJKgJj+a95tHfGZ3CRAAlVsANkJRB 7Sh5CiQiERvScvKKCkdcAHJCFOKa55RTFxoYzgkAhauyEgrvS97oePh3HCnV62OHHmxq XhAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:arc-authentication-results; bh=SBVtt5NuRg/pWHkQ9hW1kca8KomhKMvZsByc8mI5V1U=; b=iEiTeDjXCUJa9li7UDXI67uHhyHbhtjWrYY44h/nBmH/1CHDPi0jE1LO7a/i+hilQz 1scU91iTWn4ONM9GAV1KYqGidH11qUQy0J+TUH+ZqKNS9jTkAQ4fQELwUiFWKfU2Ow1L nc55zArf14ZYW7LHbp/40dEojmDMiPJrqc7omjP6OKjt7KVi5rbWEANNq3AfmzF/Mnl3 atKBy+jWGgrMtyfTjsvLPcA1PeMKP3hkUFYeL7Iv4aCOolbshn4DlpbRAmeOhLWE9PdC IzCnXOILJg/q4c60qrRYwLP/nj/+DRe+ayXvmXrJgPXj5aq79wWsHS8dfp/ypPCSvxI4 kh7A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by mx.google.com with ESMTPS id c57si4768617wra.305.2018.03.19.04.02.18 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 19 Mar 2018 04:02:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) client-ip=2001:8b0:1d0::2; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1exsYS-0002i4-U2; Mon, 19 Mar 2018 11:02:16 +0000 From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: patches@linaro.org, Andrew Baumann , Pekka Enberg , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH for-2.12] hw/arm/bcm2836: Use the Cortex-A7 instead of Cortex-A15 Date: Mon, 19 Mar 2018 11:02:15 +0000 Message-Id: <20180319110215.16755-1-peter.maydell@linaro.org> X-Mailer: git-send-email 2.16.2 The BCM2836 uses a Cortex-A7, not a Cortex-A15. Update the device to use the correct CPU. https://www.raspberrypi.org/documentation/hardware/raspberrypi/bcm2836/QA7_rev3.4.pdf When the BCM2836 was introduced (bad5623690b) the Cortex-A7 was not available, so the very similar Cortex-A15 was used. Since dcf578ed8ce we can model the correct core. Signed-off-by: Peter Maydell --- This was originally done by a patch from Alistair: http://lists.nongnu.org/archive/html/qemu-devel/2018-02/msg00311.html The refactor of bcm2836 means the code is different, but I'm using the same commit message. Based-on: <20180313153458.26822-1-peter.maydell@linaro.org> --- hw/arm/bcm2836.c | 2 +- hw/arm/raspi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.16.2 Reviewed-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Philippe Mathieu-Daudé diff --git a/hw/arm/bcm2836.c b/hw/arm/bcm2836.c index 25e74b67d9..8c1e707d9c 100644 --- a/hw/arm/bcm2836.c +++ b/hw/arm/bcm2836.c @@ -32,7 +32,7 @@ struct BCM283XInfo { static const BCM283XInfo bcm283x_socs[] = { { .name = TYPE_BCM2836, - .cpu_type = ARM_CPU_TYPE_NAME("cortex-a15"), + .cpu_type = ARM_CPU_TYPE_NAME("cortex-a7"), .clusterid = 0xf, }, { diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index 06f1e08ca9..955a7c4e80 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -226,7 +226,7 @@ static void raspi2_machine_init(MachineClass *mc) mc->no_parallel = 1; mc->no_floppy = 1; mc->no_cdrom = 1; - mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a15"); + mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a7"); mc->max_cpus = BCM283X_NCPUS; mc->min_cpus = BCM283X_NCPUS; mc->default_cpus = BCM283X_NCPUS;