From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751665AbdFHTsu (ORCPT ); Thu, 8 Jun 2017 15:48:50 -0400 Received: from mail-co1nam03on0049.outbound.protection.outlook.com ([104.47.40.49]:2432 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751467AbdFHTsq (ORCPT ); Thu, 8 Jun 2017 15:48:46 -0400 Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=amd.com; From: Janakarajan Natarajan To: linux-kernel@vger.kernel.org Cc: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Alexander Shishkin , Borislav Petkov , Suravee Suthikulpanit , Janakarajan Natarajan Subject: [Patch v2 1/2] amd: uncore: Rename cpufeatures macro for cache counters Date: Thu, 8 Jun 2017 14:48:23 -0500 Message-Id: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: CY4PR16CA0004.namprd16.prod.outlook.com (10.172.173.14) To MWHPR12MB1677.namprd12.prod.outlook.com (10.172.56.141) X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWHPR12MB1677: X-MS-Office365-Filtering-Correlation-Id: 32445944-f333-41b4-3598-08d4aea75f32 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(48565401081)(201703131423075)(201703031133081);SRVR:MWHPR12MB1677; X-Microsoft-Exchange-Diagnostics: 1;MWHPR12MB1677;3:6g37nkGxXmeL5y77e0D9YXK2V2ys3Yzv3I+xlcCcXzebypWSTqoDC5GvDCB37CpFttass7xVUiOF5QQJ1Ze7VLqpSs1pJmWz0r8cwtlM9JEFnwk6BGg2taHnS5z7KPykIIUqDDiLMyp6D3gNz764k2XK9QWzr7fbVGIGbWcPG/gsIUDFuWgSkVTubGdhhL60OlPr47nF0AcFh7D8RUFuFDFc1kNj4aPY7hQP/tDBL2cwOLDjzPKx9yKxcW6prysUvKmfRxsYaVwgUqiSk4yzIGzWZcTqCWfNBNyzq54O38VmDvwbCZGnTW+urreWUJO5pMR0xmP0if2ohEqk6ZeF/xuHs6bqyOYq2X0t3DfAAz0=;25:YlANkYk1bR96iHM/BjzTgR37WXe6/PKUHsEq7qkVorDKDcA00C65v5mtoU0iZbWc2VQ52Yr/6Vl1au9Du4NWmwwYS+z7m2pOQDAO3RvMTGqYN9ZKZh82PCPTRE3tQUycoi6uE2RGcY5oe6fiRPLWRtRaAtL6Nh8+8FOjTuxt3541B2zDfrvHrksU6zCV9nqyrcsR52hojxqVKGlKLlIp+nYI/+X9EmVyAg2zeiqBNAsUatgiTbLDZSavTFD3gZ6ir73qETIOfaotLiF671aSzGWXJt8z/Slo1Nhz5bK5592z6oKc2q8gzORGkAshTULVBoBIAwvLe9yHmtmVg66v2vd3x1WZ3d0RQ1cbSFHtlqiO6YwGKSmrr3RkXj+fkwpXpOYmbhEcCOkJ6uaBKtQyHrL0keslwWqwpp0YGuVs+bOf3u13enYriY6UFmMXuFp3AeMZE+5nWExrlAsMjuPhPkMsHHhHah27GISHU95reLw= X-Microsoft-Exchange-Diagnostics: 1;MWHPR12MB1677;31:QwIl4b6Ulqnvx+fjnsaDq1oZLB5r7PcbrhsrmNA3vYMooJhjsJ23+IXluAimay9obLWe373vVzJPGVL3Zq1IHZ+CLflGzUew9pIz0Qnfed+H/YjS8lAA73Jibm/yv/I8zg8eIZlDfqNiDWeFs9KSOU2SPJk++bdBm+RDUwyaLmAKmoZmLrEZh8plEhffLuvgQyqd5/eLFVz+/LO5fTrSnUW4dd1sdztbrkzrPlfO0us=;20:/Ttb2c+oC4heHigx7+esAkJsIr4fTbbrThqDrw/xhW4XQgL0W6pknIsfosZueE+E7hWySQw8afScrd9ClPKGI4l7MX8R2JdGkcss1LnmjcJwGQZxhC2Yq7DRF/yQyEHuysDu9aPlPtMomaleieAOX7mcNnbzCyDgd/H8RrukG7kZTyI+IS0GFy4/ikvcoj52r7N1sXXemj2a3B/4zdfF1/JdXYSSjcqiRDiXK4a5LUVLHOBTYhKUFS7x/a0/ZD8fbd4v47Yapg8qSyix1mZv8SrdKoVY6Iahe5Ayfbsj5KWen7zeCpaKbdav4CX0eLckvZfw1/g8ek2YeYMy0Vlo2o2oyy/muEpbpnRSlBTrkDUdLfVqTksp4qpvcSIeLeU3plsJbqu+3MUX9W0onb3f+B6QHCYvCDzsob52vPDBMAaelX5mQ+PzaKRGRgn1gHAWsrO6/j/DG6Vkf+3p8fitavyhOOC702jEu+ylnUSpT7f1itNIae/s4kcWXE/w78Fq X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(8121501046)(5005006)(93006095)(93001095)(100000703101)(100105400095)(10201501046)(3002001)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(20161123558100)(20161123560025)(20161123562025)(20161123564025)(6072148)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:MWHPR12MB1677;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:MWHPR12MB1677; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;MWHPR12MB1677;4:Yt/xSm7dDzhyhblj1pyPK5Ujk4/6IaM7bOywVT+QDb?= =?us-ascii?Q?dadLvTqK64ij7qRxiPe3YHG5JRp18k1fG5uvZb24xucUiBnkvorqhb8VN0pn?= =?us-ascii?Q?oTex2PHlHgMQWmOndw9yMj74PmBIQUuZ+EIEW3PO0VMG4b/W+nYCkRuld0d2?= =?us-ascii?Q?NCz+F/WmQcVWqMFTxImnYsINj4m0i5g5cRV8xAjEjajngU6fPj+2L0LJ8kNK?= =?us-ascii?Q?vDeGaEG56UCfH0AwlxBNM+SUDge7iJMM1uBs6lUufHZnYAemWFpVhJ10RDru?= =?us-ascii?Q?NXZ/+vJajfDdiIDCv4Hnb99hQNBF/VVg7JOS7vcB/3DlHRVseBMTLWUKT9Vn?= =?us-ascii?Q?0EZgQw4EL1esdJzVK3eIICyLrPOKyAOaTpkTNDes4qcZz+yGH2fG8qBlD4nN?= =?us-ascii?Q?38nHkEWcfDz/9d3AYKTszszwrN1fXpGekz+d62X5cfVPN2QUpm5vDfzAgapS?= =?us-ascii?Q?611RHaTu5vQ3sSMRHtJCMr4QdydDHCoaQwOQS21+6otxJsuG3XqAObiZGr1y?= =?us-ascii?Q?yDIvWj2au2xwsOIz1X5DD7InfPy9Ybe3RlMuahckteNIiS3mF3t9aTZmPD29?= =?us-ascii?Q?kez9uJoO7RFX7X8vHRjlGuvPRCsTVJXFq5KAt6p/c4rmHoNSUcLpEE3QtnOq?= =?us-ascii?Q?mqMMyP1tbyOJkXAbdx7G8Z5NFiDKxNv3aMwvJT7N/qLev36JMKDEfJ4gvxLm?= =?us-ascii?Q?YEulw0BUqI+oJt5H8CN3jgxHpr98+oh4UbMbJnsu/M+e4kXQnHzUAWgx2usZ?= =?us-ascii?Q?iGeshssH1zaEIZa8XfHRyU0L7SQuBclyFnnVQA5m+AYt8fTkhzAJfyWV785K?= =?us-ascii?Q?al1DB5bbYdBOLxg2SpJW2yPLkQDuO7gnjMdgS8sFEqshZWnPuZ8Y81d7M65P?= =?us-ascii?Q?AxPoLulNn+RVdCuMXJy6Vr6fOZMl2SETgF+fOlzaR9bJ69yyNFvts9WZHe+I?= =?us-ascii?Q?mih3hDGGfclve19MTYLJK9jZEYA1E3kfzcqrWj5I3oTJ53R4k5s/lL90Cf1G?= =?us-ascii?Q?zECYpN9eHhNXBxiQxsE5UuJ9RviUzuH5/ZB1wHrA/75c8i2NDnUbr63tHKJu?= =?us-ascii?Q?chL6fuU482XB9bpYQcf1L2oXzRO81Ye8BZ8LF9K0hGmYZXXtrA86m6fGPIet?= =?us-ascii?Q?EBqWrS5ql38XFEG5c2A8TAYS67LWeENIQsWg5kaEhP9DMrDTF+swgoPA20r5?= =?us-ascii?Q?VHDPSEf8m/cy1QQHemgKNbZeaMh7ihfGfC?= X-Forefront-PRVS: 0332AACBC3 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(39400400002)(39410400002)(39850400002)(39450400003)(39840400002)(76176999)(25786009)(4326008)(6486002)(50226002)(48376002)(53416004)(72206003)(36756003)(7736002)(189998001)(110136004)(42186005)(478600001)(38730400002)(66066001)(2351001)(8676002)(81166006)(6916009)(6666003)(118296001)(2906002)(86362001)(5003940100001)(305945005)(50986999)(54906002)(2950100002)(3846002)(53936002)(5660300001)(47776003)(2361001)(575784001);DIR:OUT;SFP:1101;SCL:1;SRVR:MWHPR12MB1677;H:gi-joe.amd.com;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;MWHPR12MB1677;23:U+jMwnkh5eU0d1p3kvTSeYHwiJQgrX+c+OwvfGTq1?= =?us-ascii?Q?sqe1uj9RF3PsmQyn5GE9Wsh+4GGUcC4R5yUcoUd15m7FCuhwB4eYxm9psXMk?= =?us-ascii?Q?2q9Mj7ITiUHSl+Z/+cT6Sjv8lGsyCdMF/VcRsa7nglZLtL6HfkYSi3dida1B?= =?us-ascii?Q?EL12h5Ohd8WDy+g+tEvr0rBa6YCq5s7ryZH0u2Vu0+Ah4Kb4riTGUsU5uTRy?= =?us-ascii?Q?arrkjH/muIvTdtKwjl8q27J5SADCb7wZs22/vXppTRJem8+eAsY51Q4SF04v?= =?us-ascii?Q?yooQmaOEySlMa9hJVAeum/iMOwXaHrNbo1aX4FHgh9r8qPUQcsyeMvXlFIsq?= =?us-ascii?Q?RqIaAp0C/jslGTaHKHBdP2AP36bzX1jxHm9cNiVHmI8O2FDjeJN9/5LDu3TE?= =?us-ascii?Q?Ml0lw700l8qqUNa6CwdObn7wEoFyZ6mBAJwhDVnZZGHlBqNqMSpX1KY6Ua4C?= =?us-ascii?Q?vkdwC05Ae3NQFw2u5ERvkUZdZjEhBtC8SFP/JS4NI9p633QvlZxtTV1CMsFq?= =?us-ascii?Q?ykI5wyjbojonDyCA4H6Cz585Le8nhFxRTdrP1WVwbDwFrcNs0vGawBwSFsYh?= =?us-ascii?Q?56/EQoEXlXNAZR9fAY99YqiWLcqpV0E8pYIulzD96UZMdzw+aYMxx44xSYuQ?= =?us-ascii?Q?TJSceV67Y+Fg+QsMu+B40Ij1GS7dB3S0iGPetXqxROJOz3dc9bgHL5y+OOGP?= =?us-ascii?Q?NVt16a7jeM8aS/Lv26F5WF5wX2vWCG1ZpIrtrFVQK5H3hu0YxuVZXC4AoEyG?= =?us-ascii?Q?wD+9U6yNnR3pnO2XJ068Gv2PyUiXD8GWmSTOMxSyNn8hGw7q8BhyMojRGqN3?= =?us-ascii?Q?6lPn9Tjak41lT3HYywScTivVs1jeEh3g7ZPbJ0YeTzh7PI4NPcXcGv35CyH+?= =?us-ascii?Q?wsNbkH808jp1lGIgOM/zsTWyo+raJVHeuQhQX30Zka9r8SrQABkEkK5EqkHe?= =?us-ascii?Q?yds5yAF3CeX9dPLA4zVOAw6LviAj6Zr0DSs2wK85tw3LONFGzWpUYO3I8PaJ?= =?us-ascii?Q?CWeTmKu7M7+6ocr2UoMGCva9Vyf4dovwSpSKlOppAT9su9rG/hhm5ChJDH+6?= =?us-ascii?Q?sXrEbp+CwVqNxMuPdut0JOc5QEW?= X-Microsoft-Exchange-Diagnostics: 1;MWHPR12MB1677;6:i301B66G8ng2PwWQaNKkyoQdaN/7HnMqbGHXXfulAbfKkvyd9T8hL9hqKQ1D3AcRxOFUHQcERUYrZZ1r1cz9joEY45p2u9h9FZgDUI3pkOwz9TMxZtRWSlQiNZPErKzJp1gLs/5kPtMi2LHq746OsqGqoG5ElAbDk7NoDMSB8nSS8871f41zd14ZhRmnGBE62gI3uwlMUBhd5Oc9oZx/xx0IPaajcdUUo17RUskq569l16fDZCO+9kxCOPIegfJDoIxh9gOqTNBpWgQFghfhCteRLShQwOfoP12WDJAWThTwLwe0t7CCZlcuIDV/StF4bgrLPVp8entkLqR3M9hGALIF/rhKiBDQpXKr5wmXabRvOgRnayswnnAK04JdcTL0Sho8SkA3VyTFvSyNJvVluC2vPaWtjKOkCaQINpmuJ4cSajtVKPa6T2o/eYJJc78A63SlCNjIP0ZEAPRCjlvQF+EMDmTuu7eq3e90uJhawiVfvAwv2QuCY2dvwfGy1BSxCen2pMqeAxP8oJ+jj6oHG2aTOJZkz4GNPElwgXZ5IUc= X-Microsoft-Exchange-Diagnostics: 1;MWHPR12MB1677;5:4ZcZMrePzSaBX5kX1H1wM4xf7Pcz7Wwr8ZzM06qXpgMbnawHX2cLfhCw9MAC0/UeTISGnrFwbEGNvksGnMZaJELYcRPZ1VTc7MUuzWoq1zSYRrS/us5hAEKmmDWV9wJOtrg/rmuMaYhzn6iaAVOuZ+1O6xvZ75bl3QHlwnF+K4sW5mjD2Ce9lCA0Z16sAGXH+h8R3ogrr0W0+bniKgNWiY3vPEeTlocRYdxP1lDfYbuy1NXyZDlEGLQFIrS6IaR3Xr5u32Zhv02qoBueLmmddb/PFiiVI5msgWqbf8QnREZEGj02rNVlLw4A4tPk7AyIIjmJFQ1w2/laA3VgxnrxVN0/Zf4rElUgkiSg27mDJmcxo4h3wsd2acILXAFfUtI39CNE39G6SwMIxtH0wAydUFJPqeeUwrkCDDaScjoumOahSrXvblOhDkaX2rpo3WZ47yBiGfaA3MygWD/WTjcXffFZgn3tIXbAuS9D/QuMSFovAgTq647AHuSI31mIwD2n;24:brU9i7mc/ZX/r0bdIebfvN5z+sva5FXcbWw8GVUFXpQe5d3yzvAwylDjTqXR04cdyZdZdZud1JUcjEzW1fQOa80hHWMa1qCgPHeZ+rm2xeU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;MWHPR12MB1677;7:CAd7A4Clk07Ep9xgqG06hdQsVWpNGenZe23P37xfVc8721P7t+cxLfqPUizT8fTvJ0f7grDawiOKnzGlBPMpIBNu3o1WYDaIz6CL4tMjFDS+FxWSAC+16K6aD12t5iX9hFy2FW7ySlTuw9qaprzmKBs2wM1M37G0BCTPnOZ8+KJ/6k1gzEK98b1sXCmQ3LVybt0vpyhp5zNtOGYDiO3vY0UpYwzBSFm91RPhaNzzz7e/QRPLfXSzWt6hGpBdHpTLV0Qa1F7+CghkzSqsGIkPBjBrXTlUOzF3tW0HLPhkMlToIHvoKC62cGkSzTsTqOKOgZyaPPqfl5hptbY/RG9xzw==;20:zfknUFCie1wkvjATdTNipyMAQKazID/6lpxnbIdDrNcAUggY/bpIBMqx8JeDVkE2Fgy2t/5r1itnuGNrOux5Tht414B65oSsbTC9K2go5+waS1UzeKXMWdVqFBRcItsEvU/SDgJZKF1rpLq9zgRxWbbWyzbSbaUhWXSdrpRwkjkZ1zVZWt4Z+5r5g21CmiB0qLAxlfZDu/j+RRzNVAB9X/j19fCsdp2osutrSAGn43twmlAX34wsqSzqkLrqd6gU X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jun 2017 19:48:43.8948 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1677 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In Family 17h, L3 is the last level cache as opposed to L2 in previous families. Avoid this name confusion and rename X86_FEATURE_PERFCTR_L2 to X86_FEATURE_PERFCTR_LLC to indicate the performance counter on the last level of cache Signed-off-by: Janakarajan Natarajan --- arch/x86/events/amd/uncore.c | 2 +- arch/x86/include/asm/cpufeatures.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/events/amd/uncore.c b/arch/x86/events/amd/uncore.c index ad44af0..e34f8a6 100644 --- a/arch/x86/events/amd/uncore.c +++ b/arch/x86/events/amd/uncore.c @@ -555,7 +555,7 @@ static int __init amd_uncore_init(void) ret = 0; } - if (boot_cpu_has(X86_FEATURE_PERFCTR_L2)) { + if (boot_cpu_has(X86_FEATURE_PERFCTR_LLC)) { amd_uncore_llc = alloc_percpu(struct amd_uncore *); if (!amd_uncore_llc) { ret = -ENOMEM; diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h index 2701e5f..e3f3d0c 100644 --- a/arch/x86/include/asm/cpufeatures.h +++ b/arch/x86/include/asm/cpufeatures.h @@ -177,7 +177,7 @@ #define X86_FEATURE_PERFCTR_NB ( 6*32+24) /* NB performance counter extensions */ #define X86_FEATURE_BPEXT (6*32+26) /* data breakpoint extension */ #define X86_FEATURE_PTSC ( 6*32+27) /* performance time-stamp counter */ -#define X86_FEATURE_PERFCTR_L2 ( 6*32+28) /* L2 performance counter extensions */ +#define X86_FEATURE_PERFCTR_LLC ( 6*32+28) /* Last Level Cache performance counter extensions */ #define X86_FEATURE_MWAITX ( 6*32+29) /* MWAIT extension (MONITORX/MWAITX) */ /* -- 2.7.4