From patchwork Wed Feb 7 09:27:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Engraf X-Patchwork-Id: 197811 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp2109624dyb; Wed, 7 Feb 2024 01:31:24 -0800 (PST) X-Google-Smtp-Source: AGHT+IG4gvMbfIAvvxZOiWVMNgJ+/bGQ+MB7k2Vch6ZHkNZqX9ttF76D8LkjJeKvKAe4kjkJPq/L X-Received: by 2002:ad4:4e70:0:b0:68c:8acb:9617 with SMTP id ec16-20020ad44e70000000b0068c8acb9617mr16043997qvb.20.1707298284494; Wed, 07 Feb 2024 01:31:24 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707298284; cv=pass; d=google.com; s=arc-20160816; b=b5L4urUGHvzK+Leg07+ygh9EBM7E0P1uuQpEIavRuF+dnIdfmspPoGDCf0LbQZfL0K e2rKffnmiY4VGoJK50zFk8dzLdNuq7SyNhVx2YDqvm09BOWlFeSgYwJl+gDjqV/EMSo2 54hlOfWWLIO+BNte/n/2Fu1i+prd57vlJRpnor0/lv/hwC/nID8McfsNg+WOS1dRjVGC rOZfPhEmSAdNf4EmHt1N4id9rwtzbnqhONsT12WDwReeXDplSdQIro5Hf4Sk1/d2y21P RPe9Q1JiTEvt0aBCnXYS458JzKIHV26aKJCAX13iIHZTxFrvZ1idX+glNZII+VRfpnEN Cgig== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=KR8loywrqe549dMcInpZZOzBTyI3NtTgoQfmDmuVi9I=; fh=VA+rT9fsUBJ4KitwcJbAjr6kAG9IcPaegLKxihM9lvs=; b=j52iCn2Z3S0C7cJ5WLlQRCueCqihfS6D0v2asZhVjaFB9H88olQKEe6XdMPeweulpy CSXsdDq23MoqobtV/Kke1Na+orIx5x+pK3/5X1olvoyqxGzrnD7eqLylZ0qBWk0ohYz9 FzYygfyazD6I6BJO+OMtkLnKkHAb5CEvBPR8hrdyDNaDzJNPgNVVGI2grSivhXiTees6 UMTjMo3SWGlrXZyzGHqHMAoq9k8igLgQi8cnTDa7wYq3bymrf91l/U4RbMmaNqCkL+bV F6ohJrm2mqD1RrMNxg8dXWGOgpMIWsalSo6xsTE2LFvAi6UGA+wZLOSC9A6ISGRM/ZZi Csvg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=fail header.i=@sysgo.com header.s=k1 header.b=CskoReOt; arc=pass (i=1 spf=pass spfdomain=sysgo.com dkim=pass dkdomain=sysgo.com dmarc=pass fromdomain=sysgo.com); spf=pass (google.com: domain of linux-kernel+bounces-56209-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-56209-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=sysgo.com X-Forwarded-Encrypted: i=2; AJvYcCUtuR59i2qIxVkZyWEv60srBGFMYzirZSCKkQV1vBLrn3Scfh8F2Yg5eYx4ozbcL1sXyg9sxLUvgqiL9PCEDbWUpeIQ/A== Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id v15-20020a0ccd8f000000b0068c8dfa375asi750819qvm.485.2024.02.07.01.31.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Feb 2024 01:31:24 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-56209-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=fail header.i=@sysgo.com header.s=k1 header.b=CskoReOt; arc=pass (i=1 spf=pass spfdomain=sysgo.com dkim=pass dkdomain=sysgo.com dmarc=pass fromdomain=sysgo.com); spf=pass (google.com: domain of linux-kernel+bounces-56209-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-56209-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=sysgo.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 4487A1C21175 for ; Wed, 7 Feb 2024 09:31:24 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C9B6C224CC; Wed, 7 Feb 2024 09:31:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=sysgo.com header.i=@sysgo.com header.b="CskoReOt" Received: from mail.sysgo.com (mail.sysgo.com [159.69.174.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B770A20DC4 for ; Wed, 7 Feb 2024 09:31:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.69.174.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707298269; cv=none; b=P3K0li82zbntwmuR0E7xf0h5dCGVQdxZiu/FE0PW5qfAxBxjSnM+TvbhZqZ2IQaVPvihpSU5n7RVhwrLB0n2GvfEB7xOhSeoH0HgIiRwsyqCHs4Y/Fzzo5YEGA1w3z3DSRW7vnkMpTljLiZIbvFzs7nVky6uUrgFLClTYDc9rmw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707298269; c=relaxed/simple; bh=UQCs7jF0QDQSQP4Z2zUkGNTRIkBTrs+zMEEISjMVJiU=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=jbcGA27vMChXiiCxDz1mJsEdqM0CXevjqiZIc8BmxcJTI+8+Xdxdmh1b1qEZ3MHjNvkVHXbIJJWwyUr8RXcU/D6227rq4FevAW3RPXTPJ8PFuNs1rPWuimmo0SjHaw9JXrTIIheblylkQhK/Yf3ioAW/0km51/pfb9T5zXpbUPE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=sysgo.com; spf=pass smtp.mailfrom=sysgo.com; dkim=pass (2048-bit key) header.d=sysgo.com header.i=@sysgo.com header.b=CskoReOt; arc=none smtp.client-ip=159.69.174.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=sysgo.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sysgo.com DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sysgo.com; s=k1; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:Cc:To: From:Sender:Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=KR8loywrqe549dMcInpZZOzBTyI3NtTgoQfmDmuVi9I=; b=C skoReOtyGYZ/FpsY+JQS4sSZ2rN2xFwmOajdkGm6fMN+/W4Clv+d2oM5d7JYj5AsTMIMOPewKFMOd IU1rCukrBiqVBwgHkTl0poeprDw8i9sBI7m8e+nleBhh8qb3KFVUmiIa5lRmVMgUcu7Xwf+25gutb uBecXo58W5ZPmIhW5NcStxxnv0P9/39/3fZwq4iqYUVwjbg7WmozkCbOVwi/loctMHVC/5e3lBrm4 OnWStqSKonITFjCzgFFppYKHQFtMXw6H40+bzT3E2MIh4bxQB7beiq3pOONgvgbDiW6DNqVFE9T/C mcAESjSM3cRgJjHs8O558cyJ6/qd0nA2g==; Received: from lantia.sysgo.com ([172.20.1.5]:47800) by mail.sysgo.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1rXeDp-0002N2-2b; Wed, 07 Feb 2024 10:28:01 +0100 From: David Engraf To: mpe@ellerman.id.au, npiggin@gmail.com, christophe.leroy@csgroup.eu, aneesh.kumar@kernel.org, naveen.n.rao@linux.ibm.com Cc: david.engraf@sysgo.com, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH] powerpc/cputable: Add missing PPC_FEATURE_BOOKE on PPC64 Book-E Date: Wed, 7 Feb 2024 10:27:58 +0100 Message-Id: <20240207092758.1058893-1-david.engraf@sysgo.com> X-Mailer: git-send-email 2.40.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790232005577638610 X-GMAIL-MSGID: 1790232005577638610 Commit e320a76db4b0 ("powerpc/cputable: Split cpu_specs[] out of cputable.h") moved the cpu_specs to separate header files. Previously PPC_FEATURE_BOOKE was enabled by CONFIG_PPC_BOOK3E_64. The definition in cpu_specs_e500mc.h for PPC64 no longer enables PPC_FEATURE_BOOKE. This breaks user space reading the ELF hwcaps and expect PPC_FEATURE_BOOKE. Debugging an application with gdb is no longer working on e5500/e6500 because the 64-bit detection relies on PPC_FEATURE_BOOKE for Book-E. Fixes: e320a76db4b0 ("powerpc/cputable: Split cpu_specs[] out of cputable.h") Signed-off-by: David Engraf Reviewed-by: Christophe Leroy --- arch/powerpc/kernel/cpu_specs_e500mc.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/kernel/cpu_specs_e500mc.h b/arch/powerpc/kernel/cpu_specs_e500mc.h index ceb06b109f831..2ae8e9a7b461c 100644 --- a/arch/powerpc/kernel/cpu_specs_e500mc.h +++ b/arch/powerpc/kernel/cpu_specs_e500mc.h @@ -8,7 +8,8 @@ #ifdef CONFIG_PPC64 #define COMMON_USER_BOOKE (PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU | \ - PPC_FEATURE_HAS_FPU | PPC_FEATURE_64) + PPC_FEATURE_HAS_FPU | PPC_FEATURE_64 | \ + PPC_FEATURE_BOOKE) #else #define COMMON_USER_BOOKE (PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU | \ PPC_FEATURE_BOOKE)