From patchwork Fri Jan 21 08:06:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 1582470 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=112.213.38.117; helo=lists.ozlabs.org; envelope-from=linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JgBmk4dLfz9s1l for ; Fri, 21 Jan 2022 19:07:02 +1100 (AEDT) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4JgBmk3Srrz3bTy for ; Fri, 21 Jan 2022 19:07:02 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=csgroup.eu (client-ip=2a01:111:f400:7e18::618; helo=fra01-pr2-obe.outbound.protection.outlook.com; envelope-from=christophe.leroy@csgroup.eu; receiver=) Received: from FRA01-PR2-obe.outbound.protection.outlook.com (mail-pr2fra01on0618.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e18::618]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4JgBmV1Sh1z2xDv for ; Fri, 21 Jan 2022 19:06:48 +1100 (AEDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=A42e67B5eNA9Ew5mLc1a9Z3z+PedzLAaHzRCgSKA3iscQzGE+MCzocITyyaNbRoe7acttmKCqlefKa2s5GBZMe0GHJlt0tjZuUXvmdCjg2mmARtk19wbc1O5zzVvdM2et7x4CDTgi4xQzA7BqBKtT4QAHR38gWZE0J16l8R2I1MuwQYv349keHybI5aRApyQB2r67InR8QXm7P8E9uzMtVAdp0ut/dto498Le9jwaoxHw0ZuCx0mhwyd1dnm+m44RM8/qlRPHlvxL0n/+HSlVQ9g1KcBEGKVvcntRF9MPTdgSbppzrjtx+1z5/RmpT/whRgcXE4mmxgYGdp2rJ6rDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=G8hs8l7WHPPydoXukEZNT/gIMPrgXT+B0Vp+IO3Bf2k=; b=UvkPk0u94hH0w7liPawsg/Pq+HdQmSNyrGh7af6DjXYyX6AzCvb61cs3aSJMmDRR/tIYL3/QPonIw0rl7aPUKzws6N5h6B03EsyqBij+79T5VKyLTgh5++Ucd9u+uMGPxoJnqym2/rCwwYr3lqtVkwSCejyw01rvyBSGWiNs54JISGtiJDO8eA8xhFA/bQ5hehhuEPcLEvJxHQUIgmf2IEa1vNhjWMOCMTf/HfrARGE12d/xhA6+V3FtiKB9zNcR0ZWPrO9qcSE5DlKOYRm3h8yxNaivgrwvHP41qic1bfn/k198GwJmVWFQlOaDEwEDvOGxNPl62RyW1xmX2+SZ+g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM (2603:10a6:501:31::15) by MR1P264MB2035.FRAP264.PROD.OUTLOOK.COM (2603:10a6:501:2::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.7; Fri, 21 Jan 2022 08:06:28 +0000 Received: from MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM ([fe80::9d4f:1090:9b36:3fc5]) by MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM ([fe80::9d4f:1090:9b36:3fc5%5]) with mapi id 15.20.4909.008; Fri, 21 Jan 2022 08:06:28 +0000 From: Christophe Leroy To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Subject: [PATCH 1/3] powerpc/lib/sstep: Use l1_dcache_bytes() instead of opencoding Thread-Topic: [PATCH 1/3] powerpc/lib/sstep: Use l1_dcache_bytes() instead of opencoding Thread-Index: AQHYDp3Kwnm9xv1Fq0eWPq5uOxaSxA== Date: Fri, 21 Jan 2022 08:06:27 +0000 Message-ID: <6c608fd4795e2d8ea1a0a449405a0087f76d8bb3.1642752375.git.christophe.leroy@csgroup.eu> Accept-Language: fr-FR, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=csgroup.eu; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: cb17415c-bb03-4abf-bb6d-08d9dcb4ed22 x-ms-traffictypediagnostic: MR1P264MB2035:EE_ x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:202; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 6Jl4hoTO7dks2+0edxvY+U4XknTVTDLFixcnq8nA1FuIDm70QM4+d+Y2zo5qlJfnDKAdsdbKMPJCo1k53BlYHZeMZsz6lGxRfP8GsTR7Vmv7vtPJ3G657c7KDIKejOMPZD0a1laO6YII5Fe+MOqH6LtKCIb3+Yr0uRfOiV7tIIfixDo1RaRviF/v/KuFjTNyd34Zn4mh17eI9S7I7rlg62xlhL81ZW9XUhGRtd7uC9AtJxfiHFVeI2iZEwaduFb9EfU2elobC2vKwa5Z28suOp+K+4pFTYITp9E+czGy2Pz6ZStYH5INjZJ5LMeMLX6Y+Miw003mxxiI1JPvs7l2MB6C46DtFQRr0VDLXTpnYPM2Ea6IadMenRhBZayRzSrd2vVG5NNErY6K/IVH3lSYNhfYIVKGTIudmeB2ezqHAF2kGK+ZtqlngEsykWAhI3WS1G/qqiMZ0edogmESfUqkxGAX5pyKd5MbvcgTiJsW1hKNrgwvTadN2yocbEeXBXxCgsuZmRFDgwC5iqII8uIza2qt78sDH8cfAhGFV083JgYikPxsZpkFYsryidM5/21xV45em2IDUVkVaNpx3al/c1508o45c4cUzAOVDCJyJbJ6rrsZ+HtKBIqFojcfGmJznKzJIkQ0FdCT/ocH3SF/4o/dFjLYERjVOTH9oN6Kv/Y82TKHviqphXhAcK8Yz8MAyZuAnWEjY9p3o748hlmKNA== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(4636009)(366004)(44832011)(186003)(4326008)(54906003)(2906002)(4744005)(316002)(6486002)(508600001)(8676002)(66946007)(66476007)(86362001)(26005)(66446008)(64756008)(36756003)(8936002)(83380400001)(66556008)(38100700002)(76116006)(38070700005)(71200400001)(110136005)(2616005)(5660300002)(6506007)(6512007)(91956017)(122000001); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?W2vPXBzDFDUWrOTygzmOPi2?= =?iso-8859-1?q?aOpDWYvY3LtcyhTDJU/TxLShuJ8ooYXYoumn37lKh2nrsNbvS2qnFC7KjhU6?= =?iso-8859-1?q?0jK8qjD0ekHL7SuJ+2Urj5ZdCUdOrlWSZWIVqmb010JJ6TBFGXMvtYlICqOT?= =?iso-8859-1?q?h1ftcaCjIrnSN09h15PObqKVgLN2yqkt+HBmTeBpAL55M0Z3Yu3egq7w0Hmp?= =?iso-8859-1?q?0IZlUAcHVy8Dn963D3Wcjp98HTW3Q5jFg+Kc7b7AsNXkOS12eptbTnkbXos9?= =?iso-8859-1?q?TkwwBBKO+M6qOkh1GaFsiSSwW0yJeHzoDxsLkK2Wy2EO4oZYHPWJ49HMf8yX?= =?iso-8859-1?q?An37BX1kZMWN5522PgsIaNtOa2M/bh2+F1ze1se9kCH/tAQLCHZpwFjSN4JV?= =?iso-8859-1?q?3r1V4KFZz2YqEFjMWT8bdZ4RC172AC5xEh97Difds8tSV8cnvVrCZXxT/wTK?= =?iso-8859-1?q?AkiNEnIg5DLY+krrEw4bcxKGFHAPyf5ab8dT5V+twYXbvjVtjNFNE93AffcP?= =?iso-8859-1?q?oq3p+betFTnKp7KCTlZQS6EutsB9pskRAZbfqG/yit8sZjRis4dhNaOvAD4O?= =?iso-8859-1?q?zpaydXcXuE+6aAR7ZV+wULjuT4wvbEp7YSmSw5B5YKemmlj9z/CS8Lbj9c+O?= =?iso-8859-1?q?8o3fTqi1NbOpsEXE+Ii6zUm5g1/C3n0amdsXXEVsKe+Fm7Ihz/2d6NCTcGoV?= =?iso-8859-1?q?Y350ZN6b+8UivpR/xOPgp4PcbKUJxUzMn0fwpZW6HjYtuNiTpYe6kXs5GDox?= =?iso-8859-1?q?g10+vY1oqupa59WGH7y8o0/N/Bh6qFXtPADLuOEu1kqTO4QpE/z3jL1aMRGH?= =?iso-8859-1?q?B8nkbPjiekM9VpI+G6vLBReTw2MZi6oTh1NfVEMmSCZKFZxF83h6U5vHb1qp?= =?iso-8859-1?q?xrsBiqdmNEIJbJfZa274PBtoq+cNN69M3+xhoqjh8wSZWk6lz2lmWqELvTqU?= =?iso-8859-1?q?9NanryXSF8WtRAMdVBrvsZMMcws4x9kvb0g+qUMY4IHLxKKXJTIC1Zrb2HBp?= =?iso-8859-1?q?0QYr8/NJ39bhwJ1q3p7goPjAvoR0HZTwSRdfBZeKz2nuKkV0+2Z2gc1+h5v6?= =?iso-8859-1?q?QAqwkF4zo9Br6To2cWxvrTEO/ISrEgTmL3LFMUcclbVg4oIVnAhsG+AMi3jl?= =?iso-8859-1?q?7qzWOuTMsROyp+Uj0REQFGLb6EYCE4fZtTg9DL4M60zVlHly0APBScbXiQ48?= =?iso-8859-1?q?xqBME+ftJ04ssSosIngnI20Kn9tzG9ekU5wfABYU9J3rg3MdLs6pA11udJUC?= =?iso-8859-1?q?hkh+ZvwMR3WrQ//8bNNN5dD/nsjhaobJdeQRixmiU6PmkJl6Xas4y0tUnDDs?= =?iso-8859-1?q?/h07o4FErmk6ASY6Zebvw9cFDcYOuD29iYdp5dIbQpNSAEql1N/V4JGH2FTz?= =?iso-8859-1?q?TS/7RdyseCgqqX4gXDIs+RWMN1kckW5/kw8upa3HLfBhBcdrb4Th8pvm617f?= =?iso-8859-1?q?Ved9PcAPPK+BYXBG2SArY8WYFHn/k7TWP9KgoKU1iQOpLlqTpBX7M2dm/rFQ?= =?iso-8859-1?q?mS921ZrOWY/XWM50Q10lZMfrUS8D19JasOAGI9x3piEUDlOTxAkV8/pTJuJJ?= =?iso-8859-1?q?5+ByKbZxxu9hXwTXFkSeycsdIOr2zsCLQnvSs0VwFAT+NnSYbyb+TktATp+b?= =?iso-8859-1?q?HgcU4UnoUWW62mmh3utTLlUIoox6eBU1+aKgKNtOtirCsZBw217r7IGseogB?= =?iso-8859-1?q?DtshwCEC5N4kJ0n7K6IEmF7xQkMnVJRPBDzJ6iYqzGYotlEIxznsrj61RAmU?= =?iso-8859-1?q?MNIk=3D?= MIME-Version: 1.0 X-OriginatorOrg: csgroup.eu X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: cb17415c-bb03-4abf-bb6d-08d9dcb4ed22 X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Jan 2022 08:06:27.9242 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 9914def7-b676-4fda-8815-5d49fb3b45c8 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: Je4TbCRG4a8lC/k5bKBF3mkqkMnQgWxTV/IsuszPBoH+aMS984v9RMgnU+wNaJ+HoaJE5ltMyiCX0mP44BX53w2V97qjtOcnmCsbBGErAhw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MR1P264MB2035 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "linuxppc-dev@lists.ozlabs.org" , "linux-kernel@vger.kernel.org" Errors-To: linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Don't opencode dcache size retrieval based on whether that's ppc32 or ppc64. Use l1_dcache_bytes() Signed-off-by: Christophe Leroy --- arch/powerpc/lib/sstep.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/powerpc/lib/sstep.c b/arch/powerpc/lib/sstep.c index a94b0cd0bdc5..b7316d697d80 100644 --- a/arch/powerpc/lib/sstep.c +++ b/arch/powerpc/lib/sstep.c @@ -1065,14 +1065,11 @@ static int __emulate_dcbz(unsigned long ea) int emulate_dcbz(unsigned long ea, struct pt_regs *regs) { int err; - unsigned long size; + unsigned long size = l1_dcache_bytes(); #ifdef __powerpc64__ - size = ppc64_caches.l1d.block_size; if (!(regs->msr & MSR_64BIT)) ea &= 0xffffffffUL; -#else - size = L1_CACHE_BYTES; #endif ea &= ~(size - 1); if (!address_ok(regs, ea, size)) From patchwork Fri Jan 21 08:06:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 1582471 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=112.213.38.117; helo=lists.ozlabs.org; envelope-from=linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JgBnF1ThNz9s1l for ; Fri, 21 Jan 2022 19:07:29 +1100 (AEDT) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4JgBnF0LtQz3cBl for ; Fri, 21 Jan 2022 19:07:29 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=csgroup.eu (client-ip=2a01:111:f400:7e18::618; helo=fra01-pr2-obe.outbound.protection.outlook.com; envelope-from=christophe.leroy@csgroup.eu; receiver=) Received: from FRA01-PR2-obe.outbound.protection.outlook.com (mail-pr2fra01on0618.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e18::618]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4JgBmV544Dz2xDv for ; Fri, 21 Jan 2022 19:06:50 +1100 (AEDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JzlsbgDKNeZnofpP4z+ose3lHCvaXdOBo5SsRRf7eny/EUuxSk+hO9AzlA7D100bAGZlehmKhYhHX1FBJE61ODGGdCLhQU6W2onumrHuCaxAopQ2d6wbJD/XgAiRDk/0TLup9NVxnEnP6skvGDIRPbTmwP+9XejpbXdX93rOPfw/f0rFgdEYI2IfdB441Wc7ZjkdjpDQhZtQ0gTuw60/oPeU0C0nX+oJc6V0KesNSN9+yomqamgfRWIEdj6pYGbZyl0cpQSZGE7r46czFI6+OdU75wiP0l28bCZesc+MGJ1EsooJ3PcHYgIqtOiLZURxZfMpLPKBOz/oqI11/9lMZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=7zYbH831aFhbE4WPMdgECvazcemaLo2YBZt5g7tbMk4=; b=hwMmXJbUgIN95HsVn2N343dfhbB8bU9i9fe7VFMa01XmZmxfk/F4mWJB2FqRQRutJcDP9f/5qC5i5MVYZ0zU10LbU6YikF0FXTOrLk0VgQM90B0Sa27vAuCajtgvj6a2JUG2mlJRg0mazE4tnHePX0ZNqM4D6cU8O5lDOAEikLcMl8Jasp41gfdX2jJh9nQVZc3oIlysp6iAwlJlbDtkp6fSDK9mS9Mqfu680UEBau2tJtgWV0oZe5uFIWtrmmSFtYkEbaVForE5etbR4V1dekWbSDQQZi7JwbNvXw3bQrHp/8L7xxLWWnsBm2FtVsg50GyoYe3hMz+D5FoY62pk/A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM (2603:10a6:501:31::15) by MR1P264MB2035.FRAP264.PROD.OUTLOOK.COM (2603:10a6:501:2::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.7; Fri, 21 Jan 2022 08:06:32 +0000 Received: from MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM ([fe80::9d4f:1090:9b36:3fc5]) by MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM ([fe80::9d4f:1090:9b36:3fc5%5]) with mapi id 15.20.4909.008; Fri, 21 Jan 2022 08:06:32 +0000 From: Christophe Leroy To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Subject: [PATCH 2/3] powerpc/lib/sstep: Remove unneeded #ifdef __powerpc64__ Thread-Topic: [PATCH 2/3] powerpc/lib/sstep: Remove unneeded #ifdef __powerpc64__ Thread-Index: AQHYDp3N3afa5Bk3SEeYq+oBxP6DJQ== Date: Fri, 21 Jan 2022 08:06:32 +0000 Message-ID: References: <6c608fd4795e2d8ea1a0a449405a0087f76d8bb3.1642752375.git.christophe.leroy@csgroup.eu> In-Reply-To: <6c608fd4795e2d8ea1a0a449405a0087f76d8bb3.1642752375.git.christophe.leroy@csgroup.eu> Accept-Language: fr-FR, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=csgroup.eu; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: d06ae815-b1e3-4cf2-14ab-08d9dcb4efee x-ms-traffictypediagnostic: MR1P264MB2035:EE_ x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:1360; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: wSBP5G8p191bcbdVd/k7aAHyBJ48ROlkbS/tu5qUPhCakHvQfU0gCHutnjeemZMEoYvPrQx7mPxDWhBj8feNFIQajy5ei2flXpgBBx4TBlL6cGJEUc3KR0wTCNqowmwuuwvoz2IH18YedIoh7SFMNtLo91EjJsMworeTd+hJTAeVgQhlR+Ny1600flGeHLDhHwcYJh5Ne2S+87lyo+EVoHZalXTfrS5VrspV6OVqRYx+P+8/5Qyp1oyuO+2Ks0g2mVbsahoKchjKPdBOCt/xOB7wgnpHHQftC8H/nsvjdpZP+1C8eTPNxJ7eXBnDGwGGnqRvYqC+XjlTab35PB8vcFS1eiriFILEvCFHZafJl73T7tstXABQ2rR76FefGuLV9AJXrJbFhr7xJrT1PsJK5PHq+e1HVB/pVi1ynQoBo9NsDqvbu5EtFdAqNV1RqQ8o0B5eQTztMPOof7DBWwRL+afvxlcQQXZUomO92URe1JFylPTjCADtHLCBvSzoO250c3M7zlHmhhYn2kc7D+ZVvIAI6m7Hhp8LiMDp0QhKt+wTi//70GnSBSNkQdCeHZtz1qCw5hTFalACWjW5OysivE2IxKw0RGcbsz3oNe0HEnU97U7FkXAF5o39FRBDP+3qEGkOR88nFkTbfVQTPtN0xeQHyPsgeGBilgrqCZp/DyjfS1qPkBBQkfVLbHUj0/iDKplhB2R3GmSJ47RNwCazyg== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(4636009)(366004)(44832011)(186003)(4326008)(54906003)(2906002)(316002)(6486002)(508600001)(8676002)(66946007)(66476007)(86362001)(26005)(66446008)(64756008)(36756003)(8936002)(83380400001)(66556008)(38100700002)(76116006)(38070700005)(71200400001)(110136005)(2616005)(5660300002)(6506007)(6512007)(91956017)(122000001); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?zEi8m4vaAC2BLCVKlZ9myKr?= =?iso-8859-1?q?2og13mDGC9lhZFpXrA4nyvu5NFfi+frx9zSy85PobqeE1hmGKWco+ExBVJgG?= =?iso-8859-1?q?iAyoSuy/PZTpmvE56tiOManenQZlUJg/x+qyg1tKvXRHV7mmEd9U7z2YZ3im?= =?iso-8859-1?q?RwfmP8ttsUlqcU6JhA5AgcguAfw/KlW5cv/CBLY/QnVOpNiUA5EzfVkceUI0?= =?iso-8859-1?q?kv6G8yES90pdQii8hxmdlhosLKAFbgUs+ZshJplNoYnKceY6PqXNcs32Cx3e?= =?iso-8859-1?q?yLDJCDYz1INotUlww7unJ4osH33gz2BMHoIxxatWYcaHOtjoQc16pKG5rehB?= =?iso-8859-1?q?8Z0C+Oxa8DzxXpkT9l9FSVqkaH/Ad8VDJYjc0XVUPVOybID4HHI7Szsuxnf+?= =?iso-8859-1?q?xEpX5kB5XunDO65jY6X+z67uoZ/FUDbc5a3GfJeBS+4t6W+e2yymiAEnzE07?= =?iso-8859-1?q?xhEgJubdUNaUoP8xgmOlS77m75ejZyyf5dx61lSEUaOHKwt0JeL3QON2M7jP?= =?iso-8859-1?q?3UjkuLz9W5yZ2qJmj2uX0r1Ittb4sVGHBHbsCTw1EytAxwUAt9CA6AtGCDLG?= =?iso-8859-1?q?a+UYFZEPOB/awuvl/w5Fo+ZOsEGe3G3G7i6TGoP4y4iP1QMsKq/WgfXk+/V3?= =?iso-8859-1?q?IiBgEfTXVIqJQe+tsSRfYJVDpTw7OQOwZ2zrjD+zRSlryT0rrnA0FvuD3m7e?= =?iso-8859-1?q?rjGvnjK0ZcO5ojLJ9mJstFYP43+XBr1czkyUZtUvn6UlkGR4JMtK6X4IDfIF?= =?iso-8859-1?q?RNbaEPIe5Uh3lLz58NlJXi/b7dpelzCWNzDRmTvsCNLw2+M4L4487n8BNHZD?= =?iso-8859-1?q?GmNbqNSrOV40a1XMQ5xHJ8roJ02E45Eqjje6Gg1odOxDrhMnU7T/pRy233Ni?= =?iso-8859-1?q?oknVJ4nzBNFwu5qjNQ99GJXKR3i2n6/xUVRad600r6cUgLhtyJrbY91z14mz?= =?iso-8859-1?q?JBWy5FU9hZ8+9HFJQJy3vdAYmI+LD2UfFYlNt7kNXIkom91ktdRQMlO/ibnn?= =?iso-8859-1?q?tdVoPDa0IEOp0EWPbqiyux/vPf1CWtOjAFBraoQkv+uLCGRixWtzRfNE8+5w?= =?iso-8859-1?q?oEQr7PqydlGsqUu9rrD93PF6RoDOx9G3pkbOEAJFshih/NImyLCcnSaDWzLc?= =?iso-8859-1?q?NOKX1a1XuJU+NZINXs1B0VMOwe8qv0RT+USDekCzPm/2rv/zvemxObhBaAS3?= =?iso-8859-1?q?tWwSri1GA1Or4OHmyTn95D07ZOH8OR296TU1PMpfOCh/GCoymqb2EqgyoV6N?= =?iso-8859-1?q?KNU2h/2PP7/48wuFm23nWZv+7TBc3S+83xdPLL2M6N9msKXjoVgujfj1b6AU?= =?iso-8859-1?q?MPz4KqqWQuyo4RiXM+KTaB9CJQzYWEowIIIdhGoCrE3UNM3Uu1xD1OnlXj+S?= =?iso-8859-1?q?EO90/z2GqwkLFYh6HuwovbcH3yLR0tXgO8pbS2rmoREzn1wRTms44jAY618U?= =?iso-8859-1?q?HJWmU21sRy2qzcz/Q0FESFDWGPtzBcVv4QhCLpcl9fnPMK+11hfoIUlBA/mW?= =?iso-8859-1?q?BXSHYfLHvvtFYfgkpNtxoADT/SFs9yRuMgPstj53BZTmA7fQBUsLMJABmTin?= =?iso-8859-1?q?of+djCs2mghEsRROHTOQDt8rHCXYE5ET5dq9P2OVW9uyy+Bwp0cxiMyzZx+2?= =?iso-8859-1?q?TEUaY4tvS7uJxoxrHhh9nweaw2U1ee/2vWDOwhrxf0JRhKV/MBTAU+r9gIJm?= =?iso-8859-1?q?jFpweGCRxEGW8OZPDHtprkFy9f9Zkas+Uts8OKWFWoJrjUNpG8M2kUQ2LNS5?= =?iso-8859-1?q?Gm9A=3D?= MIME-Version: 1.0 X-OriginatorOrg: csgroup.eu X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: d06ae815-b1e3-4cf2-14ab-08d9dcb4efee X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Jan 2022 08:06:32.6592 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 9914def7-b676-4fda-8815-5d49fb3b45c8 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 7IJfXNHq+qp/r9n0LSasGeIWV2sQydQIvDhycq5OdBBHTdb6PAXrqHp+NvAgXMXRQxxarZRuPsk3ZKbnRQfDl+UP1EXW9Crf3he+tGFn3I8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MR1P264MB2035 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "linuxppc-dev@lists.ozlabs.org" , "linux-kernel@vger.kernel.org" Errors-To: linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" MSR_64BIT is always defined, no need to hide code using MSR_64BIT inside an #ifdef __powerpc64__ Signed-off-by: Christophe Leroy --- arch/powerpc/lib/sstep.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/arch/powerpc/lib/sstep.c b/arch/powerpc/lib/sstep.c index b7316d697d80..4aabe3854484 100644 --- a/arch/powerpc/lib/sstep.c +++ b/arch/powerpc/lib/sstep.c @@ -75,10 +75,8 @@ extern int do_stqcx(unsigned long ea, unsigned long val0, unsigned long val1, static nokprobe_inline unsigned long truncate_if_32bit(unsigned long msr, unsigned long val) { -#ifdef __powerpc64__ if ((msr & MSR_64BIT) == 0) val &= 0xffffffffUL; -#endif return val; } @@ -1067,10 +1065,8 @@ int emulate_dcbz(unsigned long ea, struct pt_regs *regs) int err; unsigned long size = l1_dcache_bytes(); -#ifdef __powerpc64__ if (!(regs->msr & MSR_64BIT)) ea &= 0xffffffffUL; -#endif ea &= ~(size - 1); if (!address_ok(regs, ea, size)) return -EFAULT; @@ -1136,10 +1132,8 @@ static nokprobe_inline void set_cr0(const struct pt_regs *regs, op->type |= SETCC; op->ccval = (regs->ccr & 0x0fffffff) | ((regs->xer >> 3) & 0x10000000); -#ifdef __powerpc64__ if (!(regs->msr & MSR_64BIT)) val = (int) val; -#endif if (val < 0) op->ccval |= 0x80000000; else if (val > 0) @@ -1170,12 +1164,10 @@ static nokprobe_inline void add_with_carry(const struct pt_regs *regs, op->type = COMPUTE + SETREG + SETXER; op->reg = rd; op->val = val; -#ifdef __powerpc64__ if (!(regs->msr & MSR_64BIT)) { val = (unsigned int) val; val1 = (unsigned int) val1; } -#endif op->xerval = regs->xer; if (val < val1 || (carry_in && val == val1)) op->xerval |= XER_CA; From patchwork Fri Jan 21 08:06:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 1582472 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=112.213.38.117; helo=lists.ozlabs.org; envelope-from=linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JgBnt6GG8z9s1l for ; Fri, 21 Jan 2022 19:08:02 +1100 (AEDT) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4JgBnt54V8z3cDY for ; Fri, 21 Jan 2022 19:08:02 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=csgroup.eu (client-ip=2a01:111:f400:7e19::604; helo=fra01-mr2-obe.outbound.protection.outlook.com; envelope-from=christophe.leroy@csgroup.eu; receiver=) Received: from FRA01-MR2-obe.outbound.protection.outlook.com (mail-mr2fra01on0604.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e19::604]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4JgBmd3tlKz3bXd for ; Fri, 21 Jan 2022 19:06:57 +1100 (AEDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=F+Eu7XgumGBGJYMG9OQuuJgSviT8MT6O1kmxJ4ycwEo0/i6KCC1q4pOA65NT3Ai5rqqPZTdkR1xAYUUkoRm4uQ5RknLxZCf8DUezFNWJmdlsCuZGGTSHgTnDRTSgZGXT9CU6mUAH6Eue30zoVhFVJedIZwlWellJqFxax1tpSRQczMJsEGp++9w1EK8ogIyFEnFha++Kq3r6CZooODpdGdL2IPdXdbRaFYOYPvVavCgtiyNzeuD+gFf5APzS/FDqlfxde1ydeTkXUCeryp+89mYeQnk5L54IWVA+4lpIswKL50H/LfjGtUHhwWu3B2w0hjZlDPK8mqxWfIRKT5RvNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Z3wjFFjEQNoPJejY4efQOtpANBEP8Aka2DcsdMne6ew=; b=PpuL+P7xKe4X0Vd/AKKF0kixHbiGi8y7H9HLdvLuzlzlm/nFMo/2qk3CcRKCIRZIcpmEp4bfTPkVqga8fHlUk8lVGBEYrEa+K6SeZ9pGmilcyUPs5ygg1aa7d3x0aaGY15eaWqtPqbyJ31ltVztHoqEGko1dVRufeFSmpHEnkVhlHS3zU+7/0rwe7htYQ2vXZbqiC94BdUQSqbjDpkZpGldrTmnCeBRjSCihxjTGjS44F3oYIU4J7I0d7KPdV7phWJRRj3Kzi9hy8gR9OGzYujIQcbI+6Q8TpkwxjKmx4XdhKAIjUXFY1AVIsHf9ckokz+IplvsYuZGvxjmqVtblQw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM (2603:10a6:501:31::15) by MR1P264MB3475.FRAP264.PROD.OUTLOOK.COM (2603:10a6:501:20::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.7; Fri, 21 Jan 2022 08:06:38 +0000 Received: from MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM ([fe80::9d4f:1090:9b36:3fc5]) by MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM ([fe80::9d4f:1090:9b36:3fc5%5]) with mapi id 15.20.4909.008; Fri, 21 Jan 2022 08:06:38 +0000 From: Christophe Leroy To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Subject: [PATCH 3/3] powerpc/lib/sstep: use truncate_if_32bit() Thread-Topic: [PATCH 3/3] powerpc/lib/sstep: use truncate_if_32bit() Thread-Index: AQHYDp3Q3+1McVpc502dpiOkuseC5g== Date: Fri, 21 Jan 2022 08:06:38 +0000 Message-ID: <7e1c07123f13156d4a27991a2e2694fb584bc068.1642752375.git.christophe.leroy@csgroup.eu> References: <6c608fd4795e2d8ea1a0a449405a0087f76d8bb3.1642752375.git.christophe.leroy@csgroup.eu> In-Reply-To: <6c608fd4795e2d8ea1a0a449405a0087f76d8bb3.1642752375.git.christophe.leroy@csgroup.eu> Accept-Language: fr-FR, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=csgroup.eu; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: abd9737e-da2f-4cef-f6a8-08d9dcb4f337 x-ms-traffictypediagnostic: MR1P264MB3475:EE_ x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2201; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: JOcieOOe3gH4y243gra0ka+S/lp0IJPBmTypyZ47bkyRcxN5CHNxCkQflt+Erebk7hp+7MXIUWXQTHxGaLbjwqN0cZ3bsah+w1pX1J4u83afmd6pCBRut/VNPLBQqcx+wOroMWgoLDI+IEv7Zq09EwL+x6gTD3lnRso3ZmFjQfGVNWzBLX9PFw263TT67zFYUCdTgASiaTF/xgW+G4FNY54Od4dMR4ZrOT2ESkzgUZdEQyiAUrq50yrIsAwdnrlNwP3KbXVCO30+xgzIDLwti8VO4yFmfKfaAh9R1kNCEuEFEP8dotFlAfDjog7vCOiR6Y2L5TnCY+KA9paI0k4FLlQ4uR4A/ItBTeKOG/isDtjtL9BFWCgwrBcRpFx/ZHWxUUIJctptjbAZcigYielVgXE4VzT//xVqXejSa5gqFSRa8CR7y3GZaoTBWANTn0bdwcwnKIQ4deM2hGEIyoG/ar3rfrEt0GoqBmWRxQigO2CYIVO3ttzlJ75e+cfUzBfCNaQd1P77jiJobToA2s6Pnf6LQtNpJmv1/Kuk5rQgbZxfrDG6pbSUyFsu8EUNTKo+Z/gNwF5IKKacz+GveuLmMX8eszbYIpqk0DIqE6yqcEXkLyiEB/CmdWHk+PYxRfVd6cgljvoNVP8QV7xXKT429hKd20Upn6Dm/SknQSzZSVNKIvuhIV5U31hyeA5pmpjYC6L7zvYS3yaMwCprJmcvzA== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(4636009)(366004)(83380400001)(38100700002)(8936002)(38070700005)(186003)(4326008)(508600001)(36756003)(2906002)(8676002)(6486002)(86362001)(122000001)(316002)(2616005)(26005)(66446008)(66556008)(6512007)(5660300002)(110136005)(64756008)(91956017)(54906003)(6506007)(76116006)(66476007)(71200400001)(66946007)(44832011); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?tlVQjN3VblvdG2sIwzSLDVb?= =?iso-8859-1?q?6imyFapeTNC33EmwaQO+kUW0+GyB5GMoqJqq9yISLO7WKWfXZBnaBm5/i86P?= =?iso-8859-1?q?gT9YAv1vGcwunRcwpBmbOP6fwVEZ9zuYUEsb6fmVew/BqKkVyz5DukR7NI56?= =?iso-8859-1?q?9F5eD9wSyhz5M4zKqSUUmW20llacIVncVNRljFAdgUk1+sQSO53akMcvKv6r?= =?iso-8859-1?q?SbeWQ7rbevr3Wya0E+t0Vs/xcn85+X8z9X6//C5PWPVB3kXRaydfrUiAc1SX?= =?iso-8859-1?q?WAc9aTZ7dnPAv4W6rqvOQI7Ck+acj2D6T85alLLrKlJ3rtfnqzZriC/JKHAc?= =?iso-8859-1?q?ltlwwr5yXrrVlKtfdvTs/+8zUHov0ePYt5p9j5E9Q3RdyXWNg4xWoOFDWBH4?= =?iso-8859-1?q?4nDoAJa1fnOA/jJGn86yZw8bWjU5TyigUdDUSHHRnmB49CZSfug9PAClr6s5?= =?iso-8859-1?q?0Hsw2Qucko5qKNwlImNvip5l2CSni1d+aJtDgv2Ew5wZ+C6bMondZ3sEu5dK?= =?iso-8859-1?q?VoRd564oVPzPZCRv5zGkoecu82wRQ2aeDdl5Iu/z2GOKyCg8NHwz3+Lxo0mY?= =?iso-8859-1?q?unYSmf1KsZ/Ge5jtaWWIzuDw+70D6DAIMRTxsox5VOT9l1jdioNVk0KQ+yxI?= =?iso-8859-1?q?MXn5E5ShkkC/78RMxLI94P8jIre4GlXxpRtbNM7unU64u853hS5RgmOMj0Ak?= =?iso-8859-1?q?EnDnYepUdksEDQhSPLIpjGX9qgBjuvqrGSrFvdPAEg8pkdjw+Kv7wvULMorE?= =?iso-8859-1?q?+RdTS3poQp3eJAwUfVuRp9Uw7QsU1gqM5uTMegFqioUTjvNZpHvBoPRpa5gB?= =?iso-8859-1?q?aIXxzRDawKz+f60G9i/Fv6eF3mF0tX7Cp6SOQ+S9M7NvzJizvBaEseFJA0a/?= =?iso-8859-1?q?viihMG4lK7xtvAzArRGj2mUdOauRVeMfnEW/YqXojUpGC+t9zZNufPryo3rN?= =?iso-8859-1?q?NdiMstAi5kBjlr03RRtPvWx6k6Xt3TJL85dnrK5zCvqcp0FRGHaYpsGl033T?= =?iso-8859-1?q?nl8n5p5fCYhgfuNkkYm8I/j02p59S1btSDOTXywmF+jjRJOpZmtyqBqDwmbu?= =?iso-8859-1?q?tao9hSytJ2yz8sSgZTU0lCVZjcoDC6kCAT3kBYhhLdqIDc4UXyOxniLnnkje?= =?iso-8859-1?q?yOUjzjgRJDglc722FhAd4lblytmwxaxxQQW4dYtSMojbRyMynYE4v4H0+uUx?= =?iso-8859-1?q?Q3EnIrjrj7qWZv3ShKTsVQUVf2WGSQKiX2ujk3iAp+6y8/TWtXJLEKLI3LpQ?= =?iso-8859-1?q?m7pkc/DEC2XNb2Clbae8Xn94iSvSfixeZ0uhpOOLGyupcIx+sKz0PeWP3ViW?= =?iso-8859-1?q?BWdQLUwtc4k87nJEsG78AKZ5H/FriVdr2sTFEK+ctgLXnAPvv8LeMtPE+n7v?= =?iso-8859-1?q?CIXBg7N6ZbnDpZghzmASkOKRQK06EHIH7mvtZuJBUOVd7k1IgAMmfKc3km8Y?= =?iso-8859-1?q?AOQbSpE3wPVOA753YLcyMQM4j751ogx6QyqM6B4K9CLTs/XYn/k1dtDuICLd?= =?iso-8859-1?q?KE8mea70fY58j8PTuKTIejVKlMtKC/eYcYWhJ+Xfyi2vYrTo1muN8PuqNA5h?= =?iso-8859-1?q?p2zMvBGb4RCZDlvq2um1wjlcGI84gfKxLTv+wemRQq+Vh5ljTlygeAM/zUt2?= =?iso-8859-1?q?eHjcZQ5UxPlyOsq8h9vDekuR2LlUmb3NObCGFxTQg786sl2iruCkYO4JEMK2?= =?iso-8859-1?q?JoOu/SeJA8a7Ml5IVdQ5jyaLIgM5bXge5geCpm/0yohu9o5gj2VRxXQWb4CI?= =?iso-8859-1?q?r/ls=3D?= MIME-Version: 1.0 X-OriginatorOrg: csgroup.eu X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: abd9737e-da2f-4cef-f6a8-08d9dcb4f337 X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Jan 2022 08:06:38.1297 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 9914def7-b676-4fda-8815-5d49fb3b45c8 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: iOMSFWAHqEtBcZeKgHPcfCl1PMYUmVG6HhG0+j/1Nu64i9aXGO5LcyzjuojY7AgcYBs3ve55Qn/sOUEsK+4ylgHmH4HPs7chMqUSwkNAqNs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MR1P264MB3475 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "linuxppc-dev@lists.ozlabs.org" , "linux-kernel@vger.kernel.org" Errors-To: linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Use truncate_if_32bit() when possible instead of open coding. truncate_if_32bit() returns an unsigned long, so don't use it when a signed value is expected. Signed-off-by: Christophe Leroy --- arch/powerpc/lib/sstep.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/arch/powerpc/lib/sstep.c b/arch/powerpc/lib/sstep.c index 4aabe3854484..ca38d026fd88 100644 --- a/arch/powerpc/lib/sstep.c +++ b/arch/powerpc/lib/sstep.c @@ -1065,8 +1065,7 @@ int emulate_dcbz(unsigned long ea, struct pt_regs *regs) int err; unsigned long size = l1_dcache_bytes(); - if (!(regs->msr & MSR_64BIT)) - ea &= 0xffffffffUL; + ea = truncate_if_32bit(regs->msr, ea); ea &= ~(size - 1); if (!address_ok(regs, ea, size)) return -EFAULT; @@ -1164,10 +1163,8 @@ static nokprobe_inline void add_with_carry(const struct pt_regs *regs, op->type = COMPUTE + SETREG + SETXER; op->reg = rd; op->val = val; - if (!(regs->msr & MSR_64BIT)) { - val = (unsigned int) val; - val1 = (unsigned int) val1; - } + val = truncate_if_32bit(regs->msr, val); + val1 = truncate_if_32bit(regs->msr, val1); op->xerval = regs->xer; if (val < val1 || (carry_in && val == val1)) op->xerval |= XER_CA;