From nobody Fri Oct 24 21:50:32 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520013507709949.6974296399387; Fri, 2 Mar 2018 09:58:27 -0800 (PST) Received: from localhost ([::1]:36637 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1erows-0007W0-RY for importer@patchew.org; Fri, 02 Mar 2018 12:58:26 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39172) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1erov2-0006ND-90 for qemu-devel@nongnu.org; Fri, 02 Mar 2018 12:56:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1erouy-00036o-UH for qemu-devel@nongnu.org; Fri, 02 Mar 2018 12:56:32 -0500 Received: from mail-bl2nam02on0042.outbound.protection.outlook.com ([104.47.38.42]:55840 helo=NAM02-BL2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1erouy-00035i-MU for qemu-devel@nongnu.org; Fri, 02 Mar 2018 12:56:28 -0500 Received: from SN4PR0201CA0054.namprd02.prod.outlook.com (10.171.31.144) by CY1PR02MB1301.namprd02.prod.outlook.com (10.161.170.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.527.21; Fri, 2 Mar 2018 17:56:25 +0000 Received: from SN1NAM02FT029.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::206) by SN4PR0201CA0054.outlook.office365.com (2603:10b6:803:20::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.548.13 via Frontend Transport; Fri, 2 Mar 2018 17:56:24 +0000 Received: from xsj-pvapsmtpgw02 (149.199.60.100) by SN1NAM02FT029.mail.protection.outlook.com (10.152.72.110) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.527.18 via Frontend Transport; Fri, 2 Mar 2018 17:56:24 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:46959 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1erouu-0005Th-1C; Fri, 02 Mar 2018 09:56:24 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1erout-00048v-S8; Fri, 02 Mar 2018 09:56:23 -0800 Received: from xsj-pvapsmtp01 (xsj-pvapsmtp01.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id w22HuIkX024812; Fri, 2 Mar 2018 09:56:19 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1erouo-00047x-PB; Fri, 02 Mar 2018 09:56:18 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector1-xilinx-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=wrJU/Y4aAAAgKkstBzidvDVjNvtLrMG5CtVVcQt02iI=; b=rAxbQVvEgfPamsuu3Q+qL5b0s0oKZl75D3BTRlh0lflN/pXNo1HxiHHRRuVVDlGrbFLKMU649YkzS86odFsaRelfkVVuukS/bAz/ZctLVhWjmLRaNxpFjdYIGbcoro7NnhVaNID/b9tNy+haJDkqF3uWtocEALnqL33S2/0ih/k= Authentication-Results: spf=pass (sender IP is 149.199.60.100) smtp.mailfrom=xilinx.com; gmail.com; dkim=none (message not signed) header.d=none;gmail.com; dmarc=bestguesspass action=none header.from=xilinx.com; Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.100 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.100; helo=xsj-pvapsmtpgw02; From: Alistair Francis To: , Date: Fri, 2 Mar 2018 09:51:36 -0800 Message-ID: <5447270c3a38d0c1f3f889e4f0420498ebadd2bb.1520013048.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.2.0.1013-23620.005 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.100; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(376002)(39380400002)(396003)(39850400004)(346002)(2980300002)(438002)(199004)(189003)(77096007)(305945005)(26005)(186003)(50466002)(356003)(6666003)(2950100002)(76176011)(336012)(7696005)(36756003)(36386004)(16586007)(110136005)(106002)(54906003)(316002)(51416003)(63266004)(9786002)(50226002)(8676002)(106466001)(8936002)(81156014)(81166006)(478600001)(4326008)(118296001)(2906002)(5660300001)(48376002)(39060400002)(47776003)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR02MB1301; H:xsj-pvapsmtpgw02; FPR:; SPF:Pass; PTR:unknown-60-100.xilinx.com,xapps1.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SN1NAM02FT029; 1:GiIcClKCy7xz41vbMz5hKvUQ0E9L1bkw3NowMET5Tc5ONsx8r89e0WCc4z+k7PnLzRIloqG6TGEmT51CUZRhw7UEEfmCJGyYvm+gdcaYBqAHb5Ur+R5TVeVuiqJQlwci MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2ee5e708-0fad-499a-3a7b-08d58066ea37 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(4604075)(4608076)(2017052603307)(7153060); SRVR:CY1PR02MB1301; X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1301; 3:SQn4NwGfVSZUVGbpKx4FotVE3u7vp1wtT4syJRPJNSFDi3DRbHQ5C/ncFWU1Nu4Ih1YLLOdWIrCigbrQKXIvTukIJsaUJCqr2X5nk4ISE1Zqc6Q+FLbsURiwUlnHc10OZI2aKZrANsUioTJ6iDd+JtcGb7orKuspMUGzAhfMQhklI4uEMqN6M8vzK3OhOAp0S5h4Pb8PqhOCpc4FIJ2RYpxRIlhvEyFa97+k+dSJc8SiVEtCvcLfAwp32A9MeqydBiidB8wLYlvu6ZIXA1WCdjO5qk5X/0eTCD8Qk7dIN4M18oHU2eVqBj2xxL8g5Rc9tnkFWZrUVvKLNZroHZ6fHJ5s0ZxshKvrIUcKyUL0UO4=; 25:4R+x49neXDmGZF1H1+9Rue0HDidD4lbSMJW8ByfIaSoJf7JY6rmWiLPS/i2fGaK6dAkp+WfXeMWxVwrqQjTW8c1dSuXjw5755mv7MA6LmWotam0SltYp5vh0Z76vJlmV55705xziPFNgZmk7xXZH5TvEkqbUcLB9sGjOf6Yf6PACza9pX4teKu5IwYbT5+sSf9r8kXtC7uAJo90f/cyq3CwgpBSCJO3TC1gir2gTfS9d93EGHuXWoAJV4KoxWqOmYg6yG6qw3vroV5uuvI3SMIQpk5RhZzwRYG3oCvU2/8VssIizW++Qqy9LdcUuz/NopMHSCMW0sqy6dv6AHxWw4Q== X-MS-TrafficTypeDiagnostic: CY1PR02MB1301: X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1301; 31:kULIoOIlHMJS68zTwXBNnWOUkyL8GkUgqdWnV2bE2rCapOzKo0MxDsi2jreO+IlB6s6rLxATEA+8txnIV849nf2tSo2wylZ56fVSCS73FqI6+rJYBlTSuZhLMc7oNwmJ/Ehnm7PjAPOYDXzg5s+2YxBhUyA51YL2cyApj1MJlPaldMK+U0eMnbqsgpSv9PKa8s2tgUx8mw/446scGz8skxYBZYGMoWy8AHo3u4KmnM4=; 20:k4+f6ikWxkF5z9ukOZE81MSpYdOZhJftfVfXoWskld8sA+r97cMxgM0hjIZgHSz/ViuijNV95+BSP9qy4ggXacQSANiVcF9D8tXNHTYbVBJWCyrbb5bmRotQiuEbnud5V3r21D4lHGgYCOrGgIQkJ+HBrtqSdL9Khe8lhDp00qeoSbiI0a3nmF97/bT4RZN9ZEGnsr/f41UALB4/UPSUb8KoRZijP37qPQS+jXm/uVZqO5UT2dnqDPt2ergOqELj2P/MzsHtJlNJc7Lf2/WTzH3j4KiLSsAc0wOu1mKalgRU1VNg2NTS2Glhg7XK13KQZ9J35O1yftZKe2bbW+rSWP4GCRr9dyOBHdH0qKCI3VRO1BZIFxYYTmnFgVnhOrxoNsrqgxuXUjs0Hy0uQ31KO9jYbwta7nodE1hkOJP0Glxvf1ZSu8+3V/719/SNXScz+VOvEj6hF+GRkCNvog0fUBNCMSj3+GReJs/pHhd/imwNdaOQooeVnlUJnHV/JWEq X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(192813158149592); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040501)(2401047)(8121501046)(5005006)(3002001)(10201501046)(3231220)(944501236)(52105095)(93006095)(93004095)(6055026)(6041288)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123564045)(6072148)(201708071742011); SRVR:CY1PR02MB1301; BCL:0; PCL:0; RULEID:; SRVR:CY1PR02MB1301; X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1301; 4:ALdmvK5Tafe5kVgm9SaLLzNq45BeZtiJUahk6TdMHZ7gGbaOtcJvTfnsmhLNx/VRcVK0jt/NRmArCN+uhr7jE++4EDxXqaWC0UZppk0g5wMnrHwslVsyAA3yJEouX9Qfv1dkbpZ291Q56x9IIsb2ryQ9OjomvR+Vg4t0JjtbKnpKZ3NiGjgBlYgVQ+yHFRZZNjEb6YJBbak8cj/vNgohV/o4qBcgEUkfA4uZYPJvUih/bLwFMUIGizbI4MqaITEqe/afejDC5IsqBilylgH8ASBl3AbhB54arhhaqzPTbcMCRxds+36QT2Jd4OLWdoIi X-Forefront-PRVS: 05991796DF X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR02MB1301; 23:Rmn7CD6Aq17t33Ou281A0XcKeKSwRwKg+tF5VosqJ?= =?us-ascii?Q?/Wpt0VG4PaeJ2n/CNAqatV/sPoy1ubVK+pOHca7oVy1YtTaHVM5ORmzoWD86?= =?us-ascii?Q?pn8U1TVQ5KihiIpjPOHRCU0jSc2nfxR8HgH4xdEFVdK3WYqDW4+UIQSb/bjF?= =?us-ascii?Q?DW3ZL0q45+Kjj599l4jMiZYPF78HXqNYJoWi8zX2hboARpJ95jUwrfhyDviC?= =?us-ascii?Q?kFUctDSzEyFxoVQBHgOFlOX5BKc6sqGM1xgULReumNIc40HpkLH5HO6PWtK5?= =?us-ascii?Q?NABWvBGfBcvNm2+na3axmW5SakiOBpJRmY5LdhbY0UctUG+fLlD7xqDPlYyo?= =?us-ascii?Q?737kflvZmWH0hUznUIqi9ftRCwe9ZiJYR969vuLUShlvF9ZV53QAOMNEP9Zl?= =?us-ascii?Q?fUPq9SdV680lk4iCJD2uMAjcChvsUGF8f3rp8W4RBxMtpp0NWnLxks4PZnfr?= =?us-ascii?Q?wSRLFMOMGG7AeOll1DMwGZcs0meR2dQ0rlmOIpgk5uh+fZyaJB+Y9zVZfXqf?= =?us-ascii?Q?ZD1Xl5SCG/qAqBjdI0xo4Lr5HS2ohevN7lsR9/QqRuEKXh9zt0YoEfh7k2mQ?= =?us-ascii?Q?XDRVieWzuw28UNjR/hmr35lM7qGtThvOso6XKvhstyviNeCIrKXYTU8Gacxn?= =?us-ascii?Q?wzSz71PZaeN24p2CYBi+BPhneob54c09miToike6O2uYh77khgnpJddDJuDN?= =?us-ascii?Q?UnvIAm+6U45cFulLChVpcCrSkW8onTpNLCURsWBuvJ/TflCB070GlTMNhHvu?= =?us-ascii?Q?LGg5Vu4dzFkoWxgniaAyxHmPiZ1DT5lki3MQ855HGWuChBGk0cWuQRE6jc6W?= =?us-ascii?Q?6tBP+9JWYTO0wjCbOYfgltRLkPr2AnwJBeyi2EltFfRmTX/FwjbneEWRJruG?= =?us-ascii?Q?nWgKPv43s4VFRFmIMTWGdffdOxU9JQw0131E5PTWGB4mObA0HQ+POp3D3b2A?= =?us-ascii?Q?pGZuR+gUxdZfFL0EiVQ0OtVmAkU596JDeaGs5aEeTUiyB9bIqqsUsGUQXLCh?= =?us-ascii?Q?hRDW13xSh2X+MzzFShkBUKeBICum58LReYm7sLkU5j3eiXOaHRPViXFV6DiZ?= =?us-ascii?Q?99y/pT9VCNIniT6i6elUTNEuVYe?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1301; 6:HkCnEY1K6XKQFTJ04ID8Z1KW61IL1VI/xSZv9ZjLfmzHV0Yx1sKhpcHTgq/gUNwPQz/6a9B2FJTRtew4uWZfRLco7rijpbnzLxxPWJm4kFQT0olUxSnzGClG8m6n2d81YHexqDcUTHMnAH6JPwiYqbFaDAHUmDzx9bIIXpdVHIn4yoKzrJTRsFm38bgWSjK0OrJgVocGXoGbKyXS0urvTOlerSfmLP0SAt2dIq92VEfM6tWmlCh7QMbVNeQ4yXcZdiPSw8MoOwLno8XJg9yo/ei8RzTS61Bq3zYvAm77lfeWHXy4sZcIb0BEMj4bzeRGJnymA/jkaGFFj+DMFIZ9p8C4DZEHp4iwO9V022hmKqU=; 5:8qY5Dyc4YZ25LgD33TTpVKzme3AvO0Sja7klLOcWMD8t8u0OTrkFlrJ1hGiGvPMBsE5cO6Pve4/ntnclWLRnzlBXiXppIw1jDIMuiHmdWCXZQXc4KTrzVFk7iC15g+RmJGbtbN4AtC7+y0EKPy6d33YLoCM+iJpmGT5fP1bUJqA=; 24:URbxltDX9WkrJrThCRiMbXFrIFdW2CrivFc88pudgB+7mAj1IzulrrKqv+GhKkzlB5F2ch50cFq5Yv+vKJqdsDXfWXvZB67ttA9ypMK7xCc=; 7:GO+YrMK9SEKF+FR5W3Ogy0RQZTxUb7Glupxe1TKobIWGD5lFUEJd1imeMYndwhSt50A3WdnXyZ/Gz2v36GVp8pGO/wJIQCpIhvSzA9ZWnyfTlwEdfT7B5HZcHj8qbypRA45KFPgTupX+/ARbUYFvFyUBtoa+ji/pDCmG3RrtPWeKcbgxhm4UNmFryim1dwEQMDGhV81Y1ZCQCgpV3KlVM6txYh40rQhVZufIx9vr3xdXDzBRO7D+Dp93GNC+0TBa SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Mar 2018 17:56:24.5269 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2ee5e708-0fad-499a-3a7b-08d58066ea37 X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.100]; Helo=[xsj-pvapsmtpgw02] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR02MB1301 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.38.42 Subject: [Qemu-devel] [PATCH v2 1/2] target/arm: Add a core count property X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alistair23@gmail.com, alistair.francis@xilinx.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The cortex A53 TRM specifies that bits 24 and 25 of the L2CTLR register specify the number of cores in the processor, not the total number of cores in the sytem. To report this correctly on machines with multiple CPU clusters (ARM's big.LITTLE or Xilinx's ZynqMP) we need to allow the machine to overwrite this value. To do this let's add an optional property. Signed-off-by: Alistair Francis --- V2: - Fix commit message and title. - Move the core_count default setting logic to the arm_cpu_realize() function. target/arm/cpu.h | 5 +++++ target/arm/cpu.c | 6 ++++++ target/arm/cpu64.c | 6 ++++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 8dd6b788df..3fa8fdad21 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -745,6 +745,11 @@ struct ARMCPU { /* Uniprocessor system with MP extensions */ bool mp_is_up; =20 + /* Specify the number of cores in this CPU cluster. Used for the L2CTLR + * register. + */ + int32_t core_count; + /* The instance init functions for implementation-specific subclasses * set these fields to specify the implementation-dependent values of * various constant registers and reset values of non-constant diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 6b77aaa445..83590decde 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -877,6 +877,11 @@ static void arm_cpu_realizefn(DeviceState *dev, Error = **errp) cpu->has_mpu =3D false; } =20 + /* No core_count specified, default to smp_cpus. */ + if (cpu->core_count =3D=3D -1) { + cpu->core_count =3D smp_cpus; + } + if (arm_feature(env, ARM_FEATURE_PMSA) && arm_feature(env, ARM_FEATURE_V7)) { uint32_t nr =3D cpu->pmsav7_dregion; @@ -1765,6 +1770,7 @@ static Property arm_cpu_properties[] =3D { DEFINE_PROP_UINT64("mp-affinity", ARMCPU, mp_affinity, ARM64_AFFINITY_INVALID), DEFINE_PROP_INT32("node-id", ARMCPU, node_id, CPU_UNSET_NUMA_NODE_ID), + DEFINE_PROP_INT32("core-count", ARMCPU, core_count, -1), DEFINE_PROP_END_OF_LIST() }; =20 diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index 4228713b19..dd9ba973f7 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -42,8 +42,10 @@ static inline void unset_feature(CPUARMState *env, int f= eature) #ifndef CONFIG_USER_ONLY static uint64_t a57_a53_l2ctlr_read(CPUARMState *env, const ARMCPRegInfo *= ri) { - /* Number of processors is in [25:24]; otherwise we RAZ */ - return (smp_cpus - 1) << 24; + ARMCPU *cpu =3D arm_env_get_cpu(env); + + /* Number of cores is in [25:24]; otherwise we RAZ */ + return (cpu->core_count - 1) << 24; } #endif =20 --=20 2.14.1 From nobody Fri Oct 24 21:50:32 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520013636510511.95974105609366; Fri, 2 Mar 2018 10:00:36 -0800 (PST) Received: from localhost ([::1]:36649 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eroyx-0001GK-QR for importer@patchew.org; Fri, 02 Mar 2018 13:00:35 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39156) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1erov1-0006MK-5x for qemu-devel@nongnu.org; Fri, 02 Mar 2018 12:56:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eroux-00035d-W6 for qemu-devel@nongnu.org; Fri, 02 Mar 2018 12:56:31 -0500 Received: from mail-by2nam03on0044.outbound.protection.outlook.com ([104.47.42.44]:55785 helo=NAM03-BY2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eroux-00034T-LQ for qemu-devel@nongnu.org; Fri, 02 Mar 2018 12:56:27 -0500 Received: from SN4PR0201CA0069.namprd02.prod.outlook.com (10.171.31.159) by CY1PR02MB1303.namprd02.prod.outlook.com (10.161.170.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.527.15; Fri, 2 Mar 2018 17:56:25 +0000 Received: from SN1NAM02FT018.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::201) by SN4PR0201CA0069.outlook.office365.com (2603:10b6:803:20::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.548.13 via Frontend Transport; Fri, 2 Mar 2018 17:56:24 +0000 Received: from xsj-pvapsmtpgw02 (149.199.60.100) by SN1NAM02FT018.mail.protection.outlook.com (10.152.72.122) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.527.18 via Frontend Transport; Fri, 2 Mar 2018 17:56:25 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:46974 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1erouu-0005Tm-5r; Fri, 02 Mar 2018 09:56:24 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1erouu-00048v-35; Fri, 02 Mar 2018 09:56:24 -0800 Received: from xsj-pvapsmtp01 (mailhub.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id w22HuLMo024838; Fri, 2 Mar 2018 09:56:21 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1erour-00048b-6Z; Fri, 02 Mar 2018 09:56:21 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector1-xilinx-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=SGIe+/Bf72uTmRqTFgd8UULU+6T188gw7aK0C14sQx8=; b=xB5nGhZMh1cgfWTQetyXpDAEDoumT270BgHWTnLsF4f8UJIUx1z7WHUf9TndnK5qIeCY0W4wJ4O+PXbHjoQ5QcTQ5aUx7IN5bg4Ct80jt5MO6PAa/rv7SBsPV4urcwCX+TlHzG4KGRy29Oaw/kBroun+pnDGIwnOxONrInMjwWU= Authentication-Results: spf=pass (sender IP is 149.199.60.100) smtp.mailfrom=xilinx.com; gmail.com; dkim=none (message not signed) header.d=none;gmail.com; dmarc=bestguesspass action=none header.from=xilinx.com; Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.100 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.100; helo=xsj-pvapsmtpgw02; From: Alistair Francis To: , Date: Fri, 2 Mar 2018 09:51:39 -0800 Message-ID: X-Mailer: git-send-email 2.14.1 In-Reply-To: References: X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.2.0.1013-23620.005 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.100; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(346002)(39380400002)(396003)(39860400002)(376002)(2980300002)(438002)(189003)(199004)(8676002)(48376002)(36386004)(106466001)(336012)(50466002)(63266004)(36756003)(305945005)(7696005)(81166006)(478600001)(81156014)(50226002)(356003)(8936002)(51416003)(39060400002)(76176011)(5890100001)(16586007)(47776003)(6666003)(106002)(2950100002)(54906003)(110136005)(5660300001)(118296001)(4326008)(2906002)(316002)(26005)(77096007)(186003)(9786002)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR02MB1303; H:xsj-pvapsmtpgw02; FPR:; SPF:Pass; PTR:xapps1.xilinx.com,unknown-60-100.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SN1NAM02FT018; 1:+PHYIT4M2mtVQH2+qQwYRpln1bZKQa+/38VbJD9d1XyEX8bqdZbpo/X3zesLyq1VAnIP8wcVkF9BJiEno9EwSJit+WNPRr6KRQTq+ncEt2aamesVPTpF49NeIuJwHawc MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5967d128-8d4f-4fe1-361e-08d58066eaa2 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(4604075)(4608076)(2017052603307)(7153060); SRVR:CY1PR02MB1303; X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1303; 3:rKDSuJaGGkdClHnIxHOAcNk4xRW7lggMhoO4LkDjDAVloWMEiiSJPSaFpApV/U4fpABny7IVfhlOMlUVlZVLTYKxJEwaL3XrH2BqbnKTs9TPPWXQ4DuRuZYS/JXaEUXkJU5z2v6N1pA1falJ63CjAWLaiAJP20Hu5guzueKZpjGHolc3ujW+ZxgLIy7lwiw1GEvUyxGZ7T85KDWAzopMNTpKKmAab/MHueDNeIuYG6uthIo4Iq+3uVTxgMBgsflYlfSkgTHKtpdYdFuM8eu2raCvPHcZ81l+By+TEWvUKVEkHzVqesjxQf/jt2SxR7+xclXqjh7mdzFccMbPhj3qq3YyqO7aC3VBcdivInHKBhc=; 25:kNXbs2EvS2Si45PP13528YI0zoD1QD9moXGiwDaMu/x2c+XWsHUKCckyUN83PALkIBQ78peVkNfgQ1jxpQbLZTWEM/wWt7v6GG0Z8+FDXzVtBoHI0fGqrN7knxL2E77l478BMQ/Ifdhn5VkgF4AtDMYFO6eJFT5xrrbOPeKyo7jE+9os0/BhjNjYHxI6Gi7CXARJp1xG3SzoHnxzRnAz8YRJHhW3SYkb0mc8BTc4hChiEUuyIF5aR+LGNKHu3SnNhonAUSRDKIwTBgBkvKtd7txUIvDDuX3lX2H0/BPP1Pg02vp7abpdJ5cxs2ciyjtK7ISJkEqbhHsAf5ptoQLhSQ== X-MS-TrafficTypeDiagnostic: CY1PR02MB1303: X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1303; 31:xfqgmmbSgFunFaqdChujQjClZlfm+U7nZ2IMhPcuRlNkimpf/aJWgTZgrngOht0gEebXqnchAV+AtIdlk/oGE89YXrthI0TYDmFU6awJ1uu0L76gPfKchD7/MsPlOCttQQexqt6CMAYCyo7tfp4fuqMzJLgSu0t/e7b/4qhbhniI8c/cyTeM5kMb89DdOccvxa1cJl9bsKJx6ra8Af8d7InFwG1FmdBfvWbSyJtpZ2o=; 20:6nNIM1i7cd/UEOA1BT0e0Qnn9LtpIll/G31LnsFsAYEBwT9yNoYq4gLGBf+g0ZLkrIB9Q8XNnOJZW6SkXZhpYIQX49SU5li/+EjkHdPf7Cp0V1qblTJbVBeGjwaa0LjkQgNTClXemYhFRdiDWSTZFKrgvAVLpXRcNgP+J5tQ+YENdN834XEI7YqTb2igKnbYDUxe+jyka6V7Qq+0j3wZUL5OJiSuGRjFVSOTQfczu3Ci6+9xtmvhUs/u510R7mR797PVQYtd0BOZTR/ZLj4SYoa5aBo+CgURP1i/aLWtlWFMCfURLW+sptG7S0JZitok+U6vHhbQ/NvorAz6lKzthdWNnhpeLibAqiB2+GGjW4MutWUAdprrm1dlSpJfDxlWoa+DE2144NetdOqM1shaoR5m5VqQs38Q5SbmeEeFHEwHYJfOWNmeMSI+w84fsLsU0LI4xVuzIxzWuMbxxks93mHqgVJOT2ryzdr0q00SGRa56jrmH6Jx2wyGA8Tq7ITt X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(192813158149592); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040501)(2401047)(8121501046)(5005006)(3231220)(944501223)(52105095)(93006095)(93004095)(10201501046)(3002001)(6055026)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:CY1PR02MB1303; BCL:0; PCL:0; RULEID:; SRVR:CY1PR02MB1303; X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1303; 4:YpARgvVJaGKKCTemexKL5xGPf/WOzGZ0g5rRYj2haIKQ/Cnxa3F/t2auujAT7qWqYWllcKSSBnAG6sapfOXP5bafTOMtOzuuYeQQLplV026FAIAK9jXp6G/vDb+dZ+p83Z7KMaowJ5aAXaOU+M8KjAY/UjstpQiePGDAGUfqw3kbMadxfntb0r3f4RcrBU2+3jT9DL1yw7wbxD0okLH+CMpEap1xHD1udZWiMHUHgKohNfWOHx3GnteIptTuRKzdWlplTwS7gfUiEC8tSKl14+dJdX9oLCWmogVInSMiWNKUEBtt0Ok6cK0VdE1hHVQa X-Forefront-PRVS: 05991796DF X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR02MB1303; 23:81wTiBUvtAl2gDEMsQkmeJSTpqIdJIMXM5WyoEay0?= =?us-ascii?Q?8lZ5eWqPpAZNHtzD7PelnDQq3juJe9Np93zrcIprXSigcuAKl0qIEY+2osCi?= =?us-ascii?Q?l0YAiLBxyUh9vYWwdp2TtLrT4mWZ11L6GBZ/HUIEXb1Nbv2ZRmG7I/JfVmtB?= =?us-ascii?Q?LX+laMeoJpFfvrGvM8RmuFgiI0XpkUp51rSfPJsxWIuLhJjRONjAYpksAlLe?= =?us-ascii?Q?tb+yMVIcedOnqC7YLsPSoIeB7YPcQ9j1oVjCV42n6+QYHZgfEkeATu/HJeyQ?= =?us-ascii?Q?DG830yYHmwSnaB1auwNLRj5P4HWxn6rPYXA3p4MS6uZlD/HMANj/GepiCnNA?= =?us-ascii?Q?QZAld3REc/uG7KIoGXJnkInBkvD7EElP0CUzKAFqej2YkKIfFQbHdpJJy9Ko?= =?us-ascii?Q?L4ZbFy5QTthOTIjscSxJWQUy8lhFvOItc6rcGLxaAQvk70+drJXB2EZi5LeH?= =?us-ascii?Q?h6+01J2UMYrWxdPu2aVBJiJ5X4BTS5G1xjfvyBpe0HL7d/kbAVJx6S5a5Lwx?= =?us-ascii?Q?lVuMqVWOLP6BjVLtdZ85CQU0CYZPl2yUIMSByEkLwI3TtnnXftWShcdnzoYC?= =?us-ascii?Q?5atAdoG50Zr2iM72D5OGM5ep7pGEomfPbDBw6aRl9xrqvl+EAeE6qIdsU8H2?= =?us-ascii?Q?PATiusZgjcWGgV1VUVz9jPSj+aYvUWoW3DcNFqAtED5Ow0JtMRKg8byV2vp+?= =?us-ascii?Q?gsPynoKuqJ7iq9j7HJrOxMIUvW8tVBbuw0EO7AF4hvv0yRHJlGpypa1SvNe5?= =?us-ascii?Q?6Wyhel9aICKvS7frTGFdh293XGGNLCF8sEtLDPm66KXlEJFX1S9Xm6NC1Bjt?= =?us-ascii?Q?A/RS/0LRLuZh9UhwhDvWqhQfiF9gfgW7je2ky7/ws/LKozBTiqniiLGPV9nX?= =?us-ascii?Q?obk7x+Lk6We1FB22V7A/DkmabYIMVu5R4Bs1Z5p8iydQfoPb6vDl3xsDxJ55?= =?us-ascii?Q?bNuUgh1CVFFf4UCOY/xeRoQD3HUeayMlBBKuixRtlhgL7WoThyUGMgQGGtWm?= =?us-ascii?Q?zXedwFtZrjvomojRAqdQ+KoJDK74V9v+dWu5lApwphA2TrW3WedWRbf3R9rL?= =?us-ascii?Q?z3lnXPjdg3A+VG4COTikCDxvnbRW6V8nGWqqrvYAPYjelfQgg=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1303; 6:x2yxPY4fSxYqmAewXQA+Wig2bDX4OEy6KjI2PwXgRqtRwLl5Tvc0HNADDxT+L7efPVp7ckCRo/95v9n16QQXEMn6kJJ2boJGBdBEPKLciIihQ3yEWwlOvES25bQlGUIOgsEUFIf0ODP+/ZNlN6bjyjB1mwxs8HpOqupEOP6hRYFOxuKWvqGzyflhYDV4KuyxOzptVleGzHnOug7tALQtBT8HLKwkfjvxO0jCJaUe4zUI/zDBBpku/9npeztG4lzJyBxI/MNIHtz1c/0fA17rOFazACkzVBipBD97UV08wEbs6euMKT0NFaCJT/q3pYK1a16NHydq4X9JYWMsbYXvnYApyD52OhdunAVCTDbM1mQ=; 5:4sW+bHw/A8b5n8TD1VkDCVd35GGeRRVlIABF9SrhV1gCF3vniMlb9mC2aLoIApAHithlgDcFm/j5Ps0aafezA2+oaEMM1hY+S4f8QioedrIlmjVIJgpnp8dhWFPPvT50/aq32YAUVZJQztw+Sg5qvz6z5qTeJZ2Q3FenBpYNm34=; 24:4/HgWiPdtoEDhPZxMIZFXMivzpNAIXNa3gdAqF0QQS5kxrsriDwI/hwX8hlm69tVTEk0AFTbm6LZ7LxLJzNoP/l1EDXz3d/KsnFcynlc7Us=; 7:GjQ9ZxPEoOQBcigxx7FOf/u6X7nzNAIq9Kmxpyw4hGvdy+nTsgYTmepgODZWt7uKCmunisVlh0mwVVjUekBaTKgrEJi3Iiw+74HKYD1nFb1trE874VHJ0AR+OiVces0jgZPXscvslys9IYkLm4C1pkJ1iiglliZ3j4bq7y6wtf/mHSwmtKBXblQpG9HQEK3nBUfcZSmx936IViepBZd8RroI5xp8loS4a94yCv5Okp87yKAjVtxfFnzZ8IcmBFOn SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Mar 2018 17:56:25.2593 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5967d128-8d4f-4fe1-361e-08d58066eaa2 X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.100]; Helo=[xsj-pvapsmtpgw02] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR02MB1303 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.42.44 Subject: [Qemu-devel] [PATCH v2 2/2] hw/arm: Set the core count for Xilinx's ZynqMP X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alistair23@gmail.com, alistair.francis@xilinx.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Set the ARM CPU core count property for the A53's attached to the Xilnx ZynqMP machine. Signed-off-by: Alistair Francis Reviewed-by: Peter Maydell --- hw/arm/xlnx-zynqmp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c index 69227fd4c9..465796e97c 100644 --- a/hw/arm/xlnx-zynqmp.c +++ b/hw/arm/xlnx-zynqmp.c @@ -282,6 +282,8 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error= **errp) s->virt, "has_el2", NULL); object_property_set_int(OBJECT(&s->apu_cpu[i]), GIC_BASE_ADDR, "reset-cbar", &error_abort); + object_property_set_int(OBJECT(&s->apu_cpu[i]), num_apus, + "core-count", &error_abort); object_property_set_bool(OBJECT(&s->apu_cpu[i]), true, "realized", &err); if (err) { --=20 2.14.1