From patchwork Thu Jan 25 09:46:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kunwu Chan X-Patchwork-Id: 191932 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2553:b0:103:945f:af90 with SMTP id p19csp1530128dyi; Thu, 25 Jan 2024 01:59:28 -0800 (PST) X-Google-Smtp-Source: AGHT+IHGKDLFgeeY2zSj5ufFi+PEHOrnG4NmUkbAaydt8Bi37/utOWMbnfCs420ADeKqVlzXD4R5 X-Received: by 2002:ac2:4423:0:b0:50e:b19c:94d7 with SMTP id w3-20020ac24423000000b0050eb19c94d7mr299817lfl.106.1706176768661; Thu, 25 Jan 2024 01:59:28 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706176768; cv=pass; d=google.com; s=arc-20160816; b=L7owzT9hAnosMbN97ZZ77miugwuqbYeICinUA+Y7FXmb6iY/ecVBJoVVo54Ge3QB9b aKPRbhFOyaCKiQUk11+tVRW6+SgKdKPYDQ93vpi19YsyG4m+X46lo7nbISDYOiJU1YdI L2FL7JIbsBNNzsQzBfEHYko+zmR6xklu6uAG13t0uA7XuhtBgQbBg3ecWS9V2gpHSpB1 WPaGx4tjAhogC96SouCgRhjavzjfoaSoPzjPhz2GjI8PJsDdu8arvce5KCml52Hvne6V DacX20okZihbL+UtYMWkAASa+l+Xl/QP87i56xgCZU7Xg0OlQQKl5pwIM/f1UCR+Cx7i Y+PA== 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; bh=EfntFj0MNniOwqL0Oe17iIWcRJgcwYfl+v5LPKkub4s=; fh=vRbHvZ+tnxC90vVJcmBHnHrvglW9FXV+QTVyG5rDtlc=; b=y+Iz3ECtJREFvsc1Jws32dhacvSNvQzLjUQHmiLBumf79wsLRNx1gXBMA07tfLnz2v l5/S2s1iTOE2sFkycAd8XVv5OsGWSASW2L5O31MzUOHCSxO/saSTACpEGlMBwVTfBvxp iCn6gcit0BjSrwnK7qY7XzDVA2EfQJ6Lc55N0gdXrjOTesME5n100K7oEAhPIrslPP3G u4hWJ6mBoE/TEszGLj6FLHJVVEOTf2nCJSBCCg5BGywTjOsjJSRyRWOZ14VXLp7k1u7H mkfcek35vRdsK0PDj42opZjcTKKR1tVQdGx0rUT0w0enSdO0Ilb01ucs6ymCzCRNIBH2 BnIg== ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=kylinos.cn); spf=pass (google.com: domain of linux-kernel+bounces-38322-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-38322-ouuuleilei=gmail.com@vger.kernel.org" Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id cf7-20020a0564020b8700b0055c055e8ac2si5122197edb.368.2024.01.25.01.59.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 01:59:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-38322-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=kylinos.cn); spf=pass (google.com: domain of linux-kernel+bounces-38322-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-38322-ouuuleilei=gmail.com@vger.kernel.org" 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 am.mirrors.kernel.org (Postfix) with ESMTPS id 0DA731F329D4 for ; Thu, 25 Jan 2024 09:48:24 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 248121CD3A; Thu, 25 Jan 2024 09:46:51 +0000 (UTC) Received: from mailgw.kylinos.cn (mailgw.kylinos.cn [124.126.103.232]) (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 ADCB01BF38 for ; Thu, 25 Jan 2024 09:46:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=124.126.103.232 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706176009; cv=none; b=XFD21Vlm8aaDBbmqEtffNJBqEULpOhMkMaURUVkVzPCa2i0Z7hPDVzjs0I7t4Yco/tFzn8GIV2VWdd+Nx4WwMO+Dq7hE5nJC83W/Taa33nGwRhpCABArMtDALH5iUM4M9aq83usPYg04ycMnWpUEO06DOFM7A67R8KduMxwjKLg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706176009; c=relaxed/simple; bh=xdFZpeCRG2TNf/DDO5k9jUPoTXk8oGxfpATTRCbxTkc=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=IJUwlgqWqUZuQpNIsKfxalae/MsgfJRG7fN0zWIS/oDvhdlwGLD0OwPQKwWNFu2PqZ+FDqZz/n9Az54FRfaKtQN/RpKaUiPRtm/t+0UPwqgeKffHYVH8jFDDIHpM/N9rbajpwuVTTZIlPpsnQWArJtomGoK+dJ9OiZ/s/xXscTE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylinos.cn; spf=pass smtp.mailfrom=kylinos.cn; arc=none smtp.client-ip=124.126.103.232 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylinos.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kylinos.cn X-UUID: 0f8b16b06b254827ab24561f4300281f-20240125 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.35,REQID:d351d60f-d08e-48cc-8450-7bce4e5d0dad,IP:20, URL:0,TC:0,Content:-5,EDM:0,RT:0,SF:-15,FILE:0,BULK:0,RULE:Release_Ham,ACT ION:release,TS:0 X-CID-INFO: VERSION:1.1.35,REQID:d351d60f-d08e-48cc-8450-7bce4e5d0dad,IP:20,UR L:0,TC:0,Content:-5,EDM:0,RT:0,SF:-15,FILE:0,BULK:0,RULE:Release_Ham,ACTIO N:release,TS:0 X-CID-META: VersionHash:5d391d7,CLOUDID:df05a68e-e2c0-40b0-a8fe-7c7e47299109,B ulkID:240125174642EFIYU8ZJ,BulkQuantity:0,Recheck:0,SF:17|19|44|66|38|24|1 02,TC:nil,Content:0,EDM:-3,IP:-2,URL:0,File:nil,Bulk:nil,QS:nil,BEC:nil,CO L:0,OSI:0,OSA:0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-CID-FACTOR: TF_CID_SPAM_FAS,TF_CID_SPAM_FSD,TF_CID_SPAM_FSI,TF_CID_SPAM_SNR X-UUID: 0f8b16b06b254827ab24561f4300281f-20240125 Received: from mail.kylinos.cn [(39.156.73.10)] by mailgw (envelope-from ) (Generic MTA) with ESMTP id 1965344753; Thu, 25 Jan 2024 17:46:41 +0800 Received: from mail.kylinos.cn (localhost [127.0.0.1]) by mail.kylinos.cn (NSMail) with SMTP id 62C7FE000EBA; Thu, 25 Jan 2024 17:46:41 +0800 (CST) X-ns-mid: postfix-65B22E01-303995797 Received: from kernel.. (unknown [172.20.15.234]) by mail.kylinos.cn (NSMail) with ESMTPA id D0B63E000EBA; Thu, 25 Jan 2024 17:46:38 +0800 (CST) From: Kunwu Chan To: mpe@ellerman.id.au, npiggin@gmail.com, christophe.leroy@csgroup.eu, aneesh.kumar@kernel.org, naveen.n.rao@linux.ibm.com Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, Kunwu Chan Subject: [PATCH] powerpc/mm/hash: Code cleanup Date: Thu, 25 Jan 2024 17:46:36 +0800 Message-Id: <20240125094636.539372-1-chentao@kylinos.cn> X-Mailer: git-send-email 2.39.2 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: 1789056011410097868 X-GMAIL-MSGID: 1789056011410097868 This part was commented in about 17 years before. If there are no plans to enable this part code in the future, we can remove this dead code. Signed-off-by: Kunwu Chan --- arch/powerpc/include/asm/book3s/64/mmu-hash.h | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/arch/powerpc/include/asm/book3s/64/mmu-hash.h b/arch/powerpc/include/asm/book3s/64/mmu-hash.h index 1c4eebbc69c9..d39ec7134a78 100644 --- a/arch/powerpc/include/asm/book3s/64/mmu-hash.h +++ b/arch/powerpc/include/asm/book3s/64/mmu-hash.h @@ -731,26 +731,6 @@ struct hash_mm_context { #endif /* CONFIG_PPC_SUBPAGE_PROT */ }; -#if 0 -/* - * The code below is equivalent to this function for arguments - * < 2^VSID_BITS, which is all this should ever be called - * with. However gcc is not clever enough to compute the - * modulus (2^n-1) without a second multiply. - */ -#define vsid_scramble(protovsid, size) \ - ((((protovsid) * VSID_MULTIPLIER_##size) % VSID_MODULUS_##size)) - -/* simplified form avoiding mod operation */ -#define vsid_scramble(protovsid, size) \ - ({ \ - unsigned long x; \ - x = (protovsid) * VSID_MULTIPLIER_##size; \ - x = (x >> VSID_BITS_##size) + (x & VSID_MODULUS_##size); \ - (x + ((x+1) >> VSID_BITS_##size)) & VSID_MODULUS_##size; \ - }) - -#else /* 1 */ static inline unsigned long vsid_scramble(unsigned long protovsid, unsigned long vsid_multiplier, int vsid_bits) { @@ -764,8 +744,6 @@ static inline unsigned long vsid_scramble(unsigned long protovsid, return (vsid + ((vsid + 1) >> vsid_bits)) & vsid_modulus; } -#endif /* 1 */ - /* Returns the segment size indicator for a user address */ static inline int user_segment_size(unsigned long addr) {