From patchwork Fri Mar 2 19:16:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 880829 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=xilinx.onmicrosoft.com header.i=@xilinx.onmicrosoft.com header.b="gXfK+R8u"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3ztKQq1gQMz9s3L for ; Sat, 3 Mar 2018 06:40:35 +1100 (AEDT) Received: from localhost ([::1]:37179 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1erqXh-0007Yo-5q for incoming@patchwork.ozlabs.org; Fri, 02 Mar 2018 14:40:33 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59958) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1erqEl-0007i8-RS for qemu-devel@nongnu.org; Fri, 02 Mar 2018 14:21:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1erqEi-0002f5-3n for qemu-devel@nongnu.org; Fri, 02 Mar 2018 14:20:59 -0500 Received: from mail-cys01nam02on0631.outbound.protection.outlook.com ([2a01:111:f400:fe45::631]:5908 helo=NAM02-CY1-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 1erqEh-0002eQ-Qm for qemu-devel@nongnu.org; Fri, 02 Mar 2018 14:20:56 -0500 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=fqjJ5Kcu6GPceQrFACmzydeoKC+gajd9vEkRsJpwdmQ=; b=gXfK+R8uLdGmdwWZ31fEARS+X1Bw8DQqxS+3TMjB69s74q3eF2yxZrT9B53HCwFz2g9QTesyy+A2jj0bgXkc7H6i6O9TpZ3AirgHwsLR7So0Jvckm4e9njM8pldzEN4MbiKmSz4QVB4xVIRDtn93GgjB60EjXTkKrheQQUAgrl4= Received: from MWHPR02CA0034.namprd02.prod.outlook.com (10.164.133.23) by BN6PR02MB2258.namprd02.prod.outlook.com (10.168.253.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Fri, 2 Mar 2018 19:20:53 +0000 Received: from CY1NAM02FT034.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::203) by MWHPR02CA0034.outlook.office365.com (2603:10b6:301:60::23) 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 19:20:53 +0000 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; Received: from xsj-pvapsmtpgw02 (149.199.60.100) by CY1NAM02FT034.mail.protection.outlook.com (10.152.75.190) 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 19:20:52 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:42639 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1erqEe-0005yi-81; Fri, 02 Mar 2018 11:20:52 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1erqEe-0000A5-5J; Fri, 02 Mar 2018 11:20:52 -0800 Received: from xsj-pvapsmtp01 (mailman.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id w22JKhvC004847; Fri, 2 Mar 2018 11:20:43 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1erqEV-00008T-49; Fri, 02 Mar 2018 11:20:43 -0800 From: Alistair Francis To: , Date: Fri, 2 Mar 2018 11:16:01 -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)(979002)(396003)(39380400002)(39860400002)(346002)(376002)(2980300002)(438002)(189003)(199004)(5660300001)(36756003)(107886003)(336012)(48376002)(2906002)(106466001)(305945005)(50466002)(76176011)(16586007)(478600001)(356003)(316002)(59450400001)(6346003)(26005)(8676002)(106002)(63266004)(2950100002)(186003)(47776003)(110136005)(54906003)(118296001)(51416003)(7696005)(50226002)(77096007)(36386004)(9786002)(81166006)(8936002)(6666003)(81156014)(4326008)(107986001)(5001870100001)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR02MB2258; H:xsj-pvapsmtpgw02; FPR:; SPF:Pass; PTR:unknown-60-100.xilinx.com,xapps1.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1NAM02FT034; 1:6LPFtv/FF5DkP7/JIh1fJMfxRih+eQvMvuNRLRADRoYBVerLOLdeouiRzFsGu9tgqs77Ljb/F4kcQPxYvnnEj258UdH3wns9h8kVPG6yuiP45mVaCshrHQ6AyYfiPAIC MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e92ce8bd-c3cc-4592-d509-08d58072b721 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(4604075)(4608076)(2017052603307)(7153060); SRVR:BN6PR02MB2258; X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB2258; 3:BxR5d5pXXoprRnwNGw19miAOCGuK+BjsFUhKudA/Cg67B87/AcUg74O6ShNzwgg5/7aev3nSuT7QkZ8+QG6yAKUacWyVNw1fOwVtpsY6eMdN+tKzgmxfW0a+sFMtMa8kn3VBUln89mzYGb1UjWaRSfvpNaf7I/30BRaYMQFKzRP9vm6jgsDgaurPQhpKW713NyhaEIpV1jn0vqKew0I7jviFcwKRK5H6A7IaaEyHZPEf3Wk5DkKRCKICviK0mpSiH5SJCTW62THg+oP6IlvfD0VUFXOcwfe0o6hoTMWcKFUIYak0EowrsOckdgmcIqjBbbRX0YzskdReUPQqVZCF78dXuSUCyZk145mM0WhygZE=; 25:f73teiQgq24KBjSvJ+/ZqhAFQxwXh87nQ4BRpy+YTafqU5xJDXJNkLAXUWebva6QO34pnJsmzGOQZXAuF0cEl1696zr2N+OXDt8Ynyuyib2TjYLR58RFAlQ6nxu+FwCKrrP9l6B9v52rQ4eNghVDneovSkVfpzrSXou1tfzpnqwhte5jFDhxis/UNNP3ccpgZpQqzPppyHc+iZgt0l46NbGGhUEtNGwMNPy8/6oCfTMPM+qNuCETEDTcpguMiONAAuJIL7eptLhwCkE+E0h5QIJ6cfNqenqMFBYsUkTSvfBZX7kAqmhegUrvxtMhePeQREbgdNSBCPAMnL5BCFJRcQ== X-MS-TrafficTypeDiagnostic: BN6PR02MB2258: X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB2258; 31:QoUDuVWfpoJpVXSG8L3jp4c1TXjDWdk2gzAJDBRtu8b72K7AgeCbEjGWrzeswVUeIpgqUxizk1+4MAcK1jNy61QZRLvZbCOxu1d1ab9uxaVKf7YayaAshsO3dGY8cYR2crG+qRpF0GHREkf2faMjofV3BG7MRRmQPRtEEhbXbA8yjLYzxjmaGeiuQxajvLKiZ91RHtC3eld5SFlaQG9CUjGhyDdfMSXuTXmb44toYH4=; 20:IFxE3awizUCBrasw31SVjl7+NRPd88E+6lkc8rNAt3nYwlFfC8caWwumSo5SRStRgppnA1L6x6itBs5xItbeMhwMJ4jrx8F9l9C4IfUQH901K64F5pyfd0+kb3W2ZjzO1lRSK1BDS41tnXkil/utBO/CKRFKg9qWH6GwkJtkE/yZYbCQm6mLwoZhAv4ynzmLydUu4185hoPnvsAuW3J7Jw9a7C22rXQ7KQ2OeMtmlmVBrOUtBBB5p6I7ldgTZ3zKk68adFFpCEpC4C06ZHs8oNUiRc+zdsG+A+xvhE4mkGxntnrxyOvbT7LTC/BhQbwJpZpzX6jCyUBZhBGiYHbYwkU/iQn+vTBsAPSIzhMks5oQPGnpjSWmbZkR13F0gx18EzkdZ4BUJSpKE+ItWhLRTY34QiMsO+I8aFeVusJrfaYH05DonMwWcPbFZk1gZsdKZrYBFPPE3p+61eX10F0cYLE/sGn06dj9GvgWRJFGRwqgJNh+C5agb65u6Z1mRxqw 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)(93006095)(93004095)(10201501046)(3002001)(6055026)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:BN6PR02MB2258; BCL:0; PCL:0; RULEID:; SRVR:BN6PR02MB2258; X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB2258; 4:lC+VTOOkt3UlsUwVslhYxkA9OASHvZb+VtHjLqSlckp0Pv/R76uoChw1FssimDhnlGfvIhb8Fnr1bOj3oASiUkEP6wGYQKBLBqXXj09Kcu7ym7zAq2EkLZZ/9nea2cug1PtAPyNwGJrUl6Z7X1KrS7bhFQZ5X2Q/3tNZuy4w6ltmmYUWWmlUcSw2CNEF73aLsfh+d/w3zE7/fY6YFtk8rb9Ikob2OPkmqzTGHy3zcfdm/WhH4PNBqaRoKHINCNjPtvnG6h/Wiwe2vp7dLwxGnHHXGn14tewi/bMiH2KiEG8arsklZb09baO0h5NIYKp1 X-Forefront-PRVS: 05991796DF X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR02MB2258; 23:J07rBKo8bnE1+exACZ7sP8di0Gt8hK/NaQgBBio13?= 5NY2Y4CmxTsWBTiPptwqZY8haURJtT2jeJUzIU0rHbp4X6csVYCQ0NukMqzk2T5emnfu6O/CK+n1Zz2GWi90GsfQJZOHc49xZafXSF7sig7RH0ygRqSDNwodwoO6ah1CHVUvdegxzHoCcLzntrJV6Af6WuGn4aCwdIy5NdZrnEGBn9uZkwdSmGJaXndaLZL7aoQ42/BfBU2L/qm/DrOA3FX+qdVODAsvOgBXoNAkjADjDmkNJhh3ZnI73X4mK1Gy3iylbcPDl3dIh8jk4AhyGOkdUY9VZqgBl1KD0lut3UNsGcAqlow+c4BWwyDt268V1VC1AiXfaxFzg/JvyzbdlUIC4MwUb6+5KvBXXmiregizqWBPB0Pw+pNBa4gR4Z68MoI9SyWh9QkG8Md5BNeXRW7GL7ZI9lMFLjy/sPKtGszw/kSunPmZLo0gUwOuaXUUBeFUGPUhTj7CkIUXhME3ptcemcvW88tbD922GwX7KgjjM8N/HMPCoAdp9nl/R+a6XRXJgh57MlPVVGi30ShwRiYOtp88xGFdA+H7D3XMwOuzkF/XcKxmuDOiUzI5gsYTjxHruHMhsIQ0mhKF2QPO82V3hNQdxFqpP136QYtfCJEpUBHcwuicqcxuNlGsT8LjudFzjJHa283ILRM4RDwnzInaYJHey4HRZVT1EmDSL9ufWeY3vOf2mdXEv9UtnfrvQ4ne40HfHFwjIU/PW3O2cMTqelsZysA8uvvEMwbEmVkvYaf3SoXshBhkJQfuYqwcj0l3CYgeqc7fz5aWV0foScHONyJkEh7cii79QomJnjAAQhgaInNjcsW1a8LcP7hURcjILBXO/XWjIuFP1uzVsNqPTTnpGpxltRIrvRIxYu8/UJiCb9/qs3dmySU3SgyEkM9ckESL+YEBuRuiHyfchhrZK6wjgGEX4k7Ad6LnkjXOEFab8N71gLqZB1Mf3Gq2Bh5B5CyurjWCNXlIwmElp2bhnNC0JL2p+DZ/9y6clvzbLtuODRULD/GCnWaT1f5X8Iph4MGFVnh08rCP5dvX9O0mJyml7KhJbz99ZBUbczM1tuuX4I7EZlp8AQGkBLOzEPrcGU47vXLk2pr6OLEebNGkLnDMgysydaCqf4ERF2smkDU+Cm9RS4077/8F7Oa3iJiOqVjU39KqIS0G/UQl+X6DIJwadBt6tvY6CeGUyNhYw== X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB2258; 6:ujHB0cIjkuQ3S7IZNWRDIGMSPlhgxABTaJdOCmYwmqDKN7LDCABs0VgAF1JoXO7pVQ6WexNvodK6dYw5fiJa6y0nkg0smt+rnEJO1qT4yayRjjhp9eMHsvx4n8jcoGOxGq4VKacggfYrmogmT35HlZYkyuEvvF+vm09nABGdULATvQkJX8KejFrkci0UPG/clgdHqKL1OoXwXbDp81knHnjuWGtHlcX5DkG0PDFVKhwJq9pM72SGMf82Fq2toqq07NGg7rB6OpKlyfE6em3fTIbn948MrBcCACIkL9vEyPZiOUdUY9FByuX2sWqZQWktTMPACkWSeMKW3I1FncCeWd5Wt3t2K2MIJsJvKeMPBIs=; 5:YBfH68BL8A0z818vzsWAJQmoPqMQLSTNoTSPGsuLg6nuNb9Ub2MqlnnCPK5zGs2ztpB8c99xz9ktneS8iQrRI6ygGFKuSixpmsC/NNuVcv1IMi8UQPRqFEntroTx6WMxvRxIc0E4h+z4eRBJixV0AlyiYZMjHUrh/HtYgJW8tK4=; 24:1WXIQw826kwzKZDZDG8VXVAe0SvUYMLi1/VF5NKCeI2i0kMBjRQbMPb36yIxlT/0bnsz78ZmZ33cdkSxW3OH3WoLWCTbdXSsgMf9MUXKwM4=; 7:y84eg0pIlA0S8ptMsCWOM+sYuClpV7WwdfUyYBWfGgvNZas5wiabGVoQ9uL1pWmnJPAsP7BHthRUn1U/5Im2Va+qlImlmSCn6NJ+i8GzqpRidlZgWXhvJ0XQ3u4yn41kEMrs2IhBG5daauMTkfSoe+LFkqqIEPs8Q1Cs0xVhkFP5KWdXi/xHN5LSJeGxDqWxIrwoSgSp1U43ZBagnM6py3NXkxzAZXd7EqXbDXERizABpBGfHnTP7ahtc5c+2f9W SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Mar 2018 19:20:52.7367 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e92ce8bd-c3cc-4592-d509-08d58072b721 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: BN6PR02MB2258 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 2a01:111:f400:fe45::631 Subject: [Qemu-devel] [PATCH v3 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 --- V3: - Fix Linux user compile failure 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; + /* 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..3e4e9f1873 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -939,6 +939,11 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp) cs->num_ases = 1; } cpu_address_space_init(cs, ARMASIdx_NS, "cpu-memory", cs->memory); + + /* No core_count specified, default to smp_cpus. */ + if (cpu->core_count == -1) { + cpu->core_count = smp_cpus; + } #endif qemu_init_vcpu(cs); @@ -1765,6 +1770,7 @@ static Property arm_cpu_properties[] = { 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() }; 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 feature) #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 = arm_env_get_cpu(env); + + /* Number of cores is in [25:24]; otherwise we RAZ */ + return (cpu->core_count - 1) << 24; } #endif