From patchwork Fri Jul 14 13:43:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaldo Carvalho de Melo X-Patchwork-Id: 120493 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp2528859vqm; Fri, 14 Jul 2023 07:08:16 -0700 (PDT) X-Google-Smtp-Source: APBJJlHcBHVuhg3zlBvfCv6hB78ePJY6I5kRAVEpIfx+PZ5mMcyfsfoAVMXcNlJOJUYERDWFs9dd X-Received: by 2002:a17:90a:4ce5:b0:263:41ae:8163 with SMTP id k92-20020a17090a4ce500b0026341ae8163mr3296792pjh.12.1689343695648; Fri, 14 Jul 2023 07:08:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689343695; cv=none; d=google.com; s=arc-20160816; b=DSqWS7XKEkVCmXE6LrP+VDP0Ub6hqzM7rezVrsb8o2hNKqGozkim3IT1bipJ1s+JZy VXAEBn+9ZEXV9ygNN2aECsXqWIMIlD85UVBLCMNhqcMVbBUZ4Rtsx2NwxSZhkLmQIPJI zeOzjp+xay+po0B0ato5+pGfbj4nt33SKamivyhjrzi19bXmfUd6j0x/PWDx51rQQVEt eRVXz8Q9wFvaH3Pxd4Mr2FBHiUDB3pKmcOHvcQE9cZwrRFzYq/KEMV2XajK8RwMW27WU Njvsjn199grzEj1FJWEDGXz4Xk6JNthwfekShB++h6FcqCEzU+YbpRJZ2VJmJG/rJlvq iORA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date:dkim-signature; bh=XB0Vx+dNy+P2vc1wmvibcYlMF0TN9YS4/p+T9sRdBOQ=; fh=TlPoDefSMJCFkK1GRhqyBltkFh3okRzyyN2udZEVmSA=; b=vB+uK1GVLr+o2g6YGo00CBfwMsURcO/m34NFJuPg18+qL12f//ikyYS89fEQNnBoIA GEvoEynKslijRGCgpeQU5VhqNnuNSNJfp1Ddiq7K/AvdyTruHr+HiXO+rjt1EipETAlo fzImBSp7YPVceseDNrAewYqh00CgWCtLbNwUXpI3fMH52s3OTbr/qlSeAEyiJsNok0ta Fl5QtD4toWcYpVxHcynq9jPreXRtP+yTw7rVbi43cGCw/x6ZSvnbGXQP6mI747BlahlX M1ba/eQ+Cz9P8EGPnl+I4wXUS+YaZn/KQPGEnmFOYj7mwX7znxidSr950ZmbD8yvriG7 NnZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="Ho7/7Y21"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v70-20020a638949000000b0055e607f1e99si1306930pgd.882.2023.07.14.07.08.03; Fri, 14 Jul 2023 07:08:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="Ho7/7Y21"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235332AbjGNNnc (ORCPT + 99 others); Fri, 14 Jul 2023 09:43:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43116 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232239AbjGNNnb (ORCPT ); Fri, 14 Jul 2023 09:43:31 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 37CC42D64 for ; Fri, 14 Jul 2023 06:43:30 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C378461D08 for ; Fri, 14 Jul 2023 13:43:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E6B21C433C8; Fri, 14 Jul 2023 13:43:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689342209; bh=Wl+NOirb0+IZpn85ajXuMmTBackogxREuPeBWQEkt5w=; h=Date:From:To:Cc:Subject:From; b=Ho7/7Y21p+m6b4dUaDJlBJM6AJap8U3+8SSpEAkHci19lT8AWN23RSrlaKJPBAEGL 1q03mv9Q72t3ZTwx9JJfCyOMnvRz162PD25BAZ2fuIe3J08nzwT0b9jsujbM+ZQYgT WctExiXCKBY7ijwKp/tWw/TtSl2t3KwwcjEWd46rT8ye9iBYO6vlhyWgbKhFtaS0UI qM3Gi1GfWQuvGZeIXlEVbmLtALdxCMqGSfbMHKitwOqPH6t/cMD3Ile3ZpaAlaNGwE o2jETN1rHtlwaZ2PbGLgcZ0Mz9GBpFRJajckOVG8U4y+duOIqJt/HJ7ztLJ+2ZiYM7 sZJXRaeuHVXPw== Received: by quaco.ghostprotocols.net (Postfix, from userid 1000) id 3A0AB40516; Fri, 14 Jul 2023 10:43:26 -0300 (-03) Date: Fri, 14 Jul 2023 10:43:26 -0300 From: Arnaldo Carvalho de Melo To: linux-kernel@vger.kernel.org Cc: Adrian Hunter , Ali Saidi , Ian Rogers , Jiri Olsa , Leo Yan , Marc Zyngier , Namhyung Kim Subject: [PATCH 1/1 fyi] tools headers arm64: Sync arm64's cputype.h with the kernel sources Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771405254976873977 X-GMAIL-MSGID: 1771405254976873977 tldr; Just FYI, I'm carrying this on the perf tools tree. - Arnaldo Full explanation: There used to be no copies, with tools/ code using kernel headers directly. From time to time tools/perf/ broke due to legitimate kernel hacking. At some point Linus complained about such direct usage. Then we adopted the current model. The way these headers are used in perf are not restricted to just including them to compile something. There are sometimes used in scripts that convert defines into string tables, etc, so some change may break one of these scripts, or new MSRs may use some different #define pattern, etc. E.g.: $ ls -1 tools/perf/trace/beauty/*.sh | head -5 tools/perf/trace/beauty/arch_errno_names.sh tools/perf/trace/beauty/drm_ioctl.sh tools/perf/trace/beauty/fadvise.sh tools/perf/trace/beauty/fsconfig.sh tools/perf/trace/beauty/fsmount.sh $ $ tools/perf/trace/beauty/fadvise.sh static const char *fadvise_advices[] = { [0] = "NORMAL", [1] = "RANDOM", [2] = "SEQUENTIAL", [3] = "WILLNEED", [4] = "DONTNEED", [5] = "NOREUSE", }; $ The tools/perf/check-headers.sh script, part of the tools/ build process, points out changes in the original files. So its important not to touch the copies in tools/ when doing changes in the original kernel headers, that will be done later, when check-headers.sh inform about the change to the perf tools hackers. --- To get the changes in: e910baa9c1efdf76 ("KVM: arm64: vgic: Add Apple M2 PRO/MAX cpus to the list of broken SEIS implementations") That makes this perf source code to be rebuilt: CC /tmp/build/perf-tools/util/arm-spe.o The changes in the above patch don't affect things that are used in arm-spe.c (things like MIDR_NEOVERSE_N1, etc). Unsure if Apple M2 has SPE (Statistical Profiling Extension) :-) That addresses this perf build warning: Warning: Kernel ABI header differences: diff -u tools/arch/arm64/include/asm/cputype.h arch/arm64/include/asm/cputype.h Cc: Adrian Hunter Cc: Ali Saidi Cc: Ian Rogers Cc: Jiri Olsa Cc: Leo Yan Cc: Marc Zyngier Cc: Namhyung Kim Link: https://lore.kernel.org/lkml/ Signed-off-by: Arnaldo Carvalho de Melo --- tools/arch/arm64/include/asm/cputype.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/arch/arm64/include/asm/cputype.h b/tools/arch/arm64/include/asm/cputype.h index 683ca3af408485aa..5f6f84837a490375 100644 --- a/tools/arch/arm64/include/asm/cputype.h +++ b/tools/arch/arm64/include/asm/cputype.h @@ -126,6 +126,10 @@ #define APPLE_CPU_PART_M1_FIRESTORM_MAX 0x029 #define APPLE_CPU_PART_M2_BLIZZARD 0x032 #define APPLE_CPU_PART_M2_AVALANCHE 0x033 +#define APPLE_CPU_PART_M2_BLIZZARD_PRO 0x034 +#define APPLE_CPU_PART_M2_AVALANCHE_PRO 0x035 +#define APPLE_CPU_PART_M2_BLIZZARD_MAX 0x038 +#define APPLE_CPU_PART_M2_AVALANCHE_MAX 0x039 #define AMPERE_CPU_PART_AMPERE1 0xAC3 @@ -181,6 +185,10 @@ #define MIDR_APPLE_M1_FIRESTORM_MAX MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_FIRESTORM_MAX) #define MIDR_APPLE_M2_BLIZZARD MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_BLIZZARD) #define MIDR_APPLE_M2_AVALANCHE MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_AVALANCHE) +#define MIDR_APPLE_M2_BLIZZARD_PRO MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_BLIZZARD_PRO) +#define MIDR_APPLE_M2_AVALANCHE_PRO MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_AVALANCHE_PRO) +#define MIDR_APPLE_M2_BLIZZARD_MAX MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_BLIZZARD_MAX) +#define MIDR_APPLE_M2_AVALANCHE_MAX MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_AVALANCHE_MAX) #define MIDR_AMPERE1 MIDR_CPU_MODEL(ARM_CPU_IMP_AMPERE, AMPERE_CPU_PART_AMPERE1) /* Fujitsu Erratum 010001 affects A64FX 1.0 and 1.1, (v0r0 and v1r0) */