Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Christophe Leroy <christophe.leroy@csgroup.eu>
To:     Benjamin Herrenschmidt <benh@kernel.crashing.org>,
        Paul Mackerras <paulus@samba.org>,
        Michael Ellerman <mpe@ellerman.id.au>
CC:     Christophe Leroy <christophe.leroy@csgroup.eu>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "linuxppc-dev@lists.ozlabs.org" <linuxppc-dev@lists.ozlabs.org>
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-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?tlVQjN3VblvdG2sIwzSLDVb6imyFapeTNC33EmwaQO+kUW0+GyB5GMoqJq?=
 =?iso-8859-1?Q?q9yISLO7WKWfXZBnaBm5/i86PgT9YAv1vGcwunRcwpBmbOP6fwVEZ9zuYU?=
 =?iso-8859-1?Q?Esb6fmVew/BqKkVyz5DukR7NI569F5eD9wSyhz5M4zKqSUUmW20llacIVn?=
 =?iso-8859-1?Q?cVNRljFAdgUk1+sQSO53akMcvKv6rSbeWQ7rbevr3Wya0E+t0Vs/xcn85+?=
 =?iso-8859-1?Q?X8z9X6//C5PWPVB3kXRaydfrUiAc1SXWAc9aTZ7dnPAv4W6rqvOQI7Ck+a?=
 =?iso-8859-1?Q?cj2D6T85alLLrKlJ3rtfnqzZriC/JKHAcltlwwr5yXrrVlKtfdvTs/+8zU?=
 =?iso-8859-1?Q?Hov0ePYt5p9j5E9Q3RdyXWNg4xWoOFDWBH44nDoAJa1fnOA/jJGn86yZw8?=
 =?iso-8859-1?Q?bWjU5TyigUdDUSHHRnmB49CZSfug9PAClr6s50Hsw2Qucko5qKNwlImNvi?=
 =?iso-8859-1?Q?p5l2CSni1d+aJtDgv2Ew5wZ+C6bMondZ3sEu5dKVoRd564oVPzPZCRv5zG?=
 =?iso-8859-1?Q?koecu82wRQ2aeDdl5Iu/z2GOKyCg8NHwz3+Lxo0mYunYSmf1KsZ/Ge5jta?=
 =?iso-8859-1?Q?WWIzuDw+70D6DAIMRTxsox5VOT9l1jdioNVk0KQ+yxIMXn5E5ShkkC/78R?=
 =?iso-8859-1?Q?MxLI94P8jIre4GlXxpRtbNM7unU64u853hS5RgmOMj0AkEnDnYepUdksED?=
 =?iso-8859-1?Q?QhSPLIpjGX9qgBjuvqrGSrFvdPAEg8pkdjw+Kv7wvULMorE+RdTS3poQp3?=
 =?iso-8859-1?Q?eJAwUfVuRp9Uw7QsU1gqM5uTMegFqioUTjvNZpHvBoPRpa5gBaIXxzRDaw?=
 =?iso-8859-1?Q?Kz+f60G9i/Fv6eF3mF0tX7Cp6SOQ+S9M7NvzJizvBaEseFJA0a/viihMG4?=
 =?iso-8859-1?Q?lK7xtvAzArRGj2mUdOauRVeMfnEW/YqXojUpGC+t9zZNufPryo3rNNdiMs?=
 =?iso-8859-1?Q?tAi5kBjlr03RRtPvWx6k6Xt3TJL85dnrK5zCvqcp0FRGHaYpsGl033Tnl8?=
 =?iso-8859-1?Q?n5p5fCYhgfuNkkYm8I/j02p59S1btSDOTXywmF+jjRJOpZmtyqBqDwmbut?=
 =?iso-8859-1?Q?ao9hSytJ2yz8sSgZTU0lCVZjcoDC6kCAT3kBYhhLdqIDc4UXyOxniLnnkj?=
 =?iso-8859-1?Q?eyOUjzjgRJDglc722FhAd4lblytmwxaxxQQW4dYtSMojbRyMynYE4v4H0+?=
 =?iso-8859-1?Q?uUxQ3EnIrjrj7qWZv3ShKTsVQUVf2WGSQKiX2ujk3iAp+6y8/TWtXJLEKL?=
 =?iso-8859-1?Q?I3LpQm7pkc/DEC2XNb2Clbae8Xn94iSvSfixeZ0uhpOOLGyupcIx+sKz0P?=
 =?iso-8859-1?Q?eWP3ViWBWdQLUwtc4k87nJEsG78AKZ5H/FriVdr2sTFEK+ctgLXnAPvv8L?=
 =?iso-8859-1?Q?eMtPE+n7vCIXBg7N6ZbnDpZghzmASkOKRQK06EHIH7mvtZuJBUOVd7k1Ig?=
 =?iso-8859-1?Q?AMmfKc3km8YAOQbSpE3wPVOA753YLcyMQM4j751ogx6QyqM6B4K9CLTs/X?=
 =?iso-8859-1?Q?Yn/k1dtDuICLdKE8mea70fY58j8PTuKTIejVKlMtKC/eYcYWhJ+Xfyi2vY?=
 =?iso-8859-1?Q?rTo1muN8PuqNA5hp2zMvBGb4RCZDlvq2um1wjlcGI84gfKxLTv+wemRQq+?=
 =?iso-8859-1?Q?Vh5ljTlygeAM/zUt2eHjcZQ5UxPlyOsq8h9vDekuR2LlUmb3NObCGFxTQg?=
 =?iso-8859-1?Q?786sl2iruCkYO4JEMK2JoOu/SeJA8a7Ml5IVdQ5jyaLIgM5bXge5geCpm/?=
 =?iso-8859-1?Q?0yohu9o5gj2VRxXQWb4CIr/ls=3D?=
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: 8BIT
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
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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 <christophe.leroy@csgroup.eu>
---
 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;
-- 
2.33.1