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 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-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?W2vPXBzDFDUWrOTygzmOPi2aOpDWYvY3LtcyhTDJU/TxLShuJ8ooYXYoum?=
 =?iso-8859-1?Q?n37lKh2nrsNbvS2qnFC7KjhU60jK8qjD0ekHL7SuJ+2Urj5ZdCUdOrlWSZ?=
 =?iso-8859-1?Q?WIVqmb010JJ6TBFGXMvtYlICqOTh1ftcaCjIrnSN09h15PObqKVgLN2yqk?=
 =?iso-8859-1?Q?t+HBmTeBpAL55M0Z3Yu3egq7w0Hmp0IZlUAcHVy8Dn963D3Wcjp98HTW3Q?=
 =?iso-8859-1?Q?5jFg+Kc7b7AsNXkOS12eptbTnkbXos9TkwwBBKO+M6qOkh1GaFsiSSwW0y?=
 =?iso-8859-1?Q?JeHzoDxsLkK2Wy2EO4oZYHPWJ49HMf8yXAn37BX1kZMWN5522PgsIaNtOa?=
 =?iso-8859-1?Q?2M/bh2+F1ze1se9kCH/tAQLCHZpwFjSN4JV3r1V4KFZz2YqEFjMWT8bdZ4?=
 =?iso-8859-1?Q?RC172AC5xEh97Difds8tSV8cnvVrCZXxT/wTKAkiNEnIg5DLY+krrEw4bc?=
 =?iso-8859-1?Q?xKGFHAPyf5ab8dT5V+twYXbvjVtjNFNE93AffcPoq3p+betFTnKp7KCTlZ?=
 =?iso-8859-1?Q?QS6EutsB9pskRAZbfqG/yit8sZjRis4dhNaOvAD4OzpaydXcXuE+6aAR7Z?=
 =?iso-8859-1?Q?V+wULjuT4wvbEp7YSmSw5B5YKemmlj9z/CS8Lbj9c+O8o3fTqi1NbOpsEX?=
 =?iso-8859-1?Q?E+Ii6zUm5g1/C3n0amdsXXEVsKe+Fm7Ihz/2d6NCTcGoVY350ZN6b+8Uiv?=
 =?iso-8859-1?Q?pR/xOPgp4PcbKUJxUzMn0fwpZW6HjYtuNiTpYe6kXs5GDoxg10+vY1oqup?=
 =?iso-8859-1?Q?a59WGH7y8o0/N/Bh6qFXtPADLuOEu1kqTO4QpE/z3jL1aMRGHB8nkbPjie?=
 =?iso-8859-1?Q?kM9VpI+G6vLBReTw2MZi6oTh1NfVEMmSCZKFZxF83h6U5vHb1qpxrsBiqd?=
 =?iso-8859-1?Q?mNEIJbJfZa274PBtoq+cNN69M3+xhoqjh8wSZWk6lz2lmWqELvTqU9Nanr?=
 =?iso-8859-1?Q?yXSF8WtRAMdVBrvsZMMcws4x9kvb0g+qUMY4IHLxKKXJTIC1Zrb2HBp0QY?=
 =?iso-8859-1?Q?r8/NJ39bhwJ1q3p7goPjAvoR0HZTwSRdfBZeKz2nuKkV0+2Z2gc1+h5v6Q?=
 =?iso-8859-1?Q?AqwkF4zo9Br6To2cWxvrTEO/ISrEgTmL3LFMUcclbVg4oIVnAhsG+AMi3j?=
 =?iso-8859-1?Q?l7qzWOuTMsROyp+Uj0REQFGLb6EYCE4fZtTg9DL4M60zVlHly0APBScbXi?=
 =?iso-8859-1?Q?Q48xqBME+ftJ04ssSosIngnI20Kn9tzG9ekU5wfABYU9J3rg3MdLs6pA11?=
 =?iso-8859-1?Q?udJUChkh+ZvwMR3WrQ//8bNNN5dD/nsjhaobJdeQRixmiU6PmkJl6Xas4y?=
 =?iso-8859-1?Q?0tUnDDs/h07o4FErmk6ASY6Zebvw9cFDcYOuD29iYdp5dIbQpNSAEql1N/?=
 =?iso-8859-1?Q?V4JGH2FTzTS/7RdyseCgqqX4gXDIs+RWMN1kckW5/kw8upa3HLfBhBcdrb?=
 =?iso-8859-1?Q?4Th8pvm617fVed9PcAPPK+BYXBG2SArY8WYFHn/k7TWP9KgoKU1iQOpLlq?=
 =?iso-8859-1?Q?TpBX7M2dm/rFQmS921ZrOWY/XWM50Q10lZMfrUS8D19JasOAGI9x3piEUD?=
 =?iso-8859-1?Q?lOTxAkV8/pTJuJJ5+ByKbZxxu9hXwTXFkSeycsdIOr2zsCLQnvSs0VwFAT?=
 =?iso-8859-1?Q?+NnSYbyb+TktATp+bHgcU4UnoUWW62mmh3utTLlUIoox6eBU1+aKgKNtOt?=
 =?iso-8859-1?Q?irCsZBw217r7IGseogBDtshwCEC5N4kJ0n7K6IEmF7xQkMnVJRPBDzJ6iY?=
 =?iso-8859-1?Q?qzGYotlEIxznsrj61RAmUMNIk=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: 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
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Don't opencode dcache size retrieval based on whether that's ppc32 or ppc64.

Use l1_dcache_bytes()

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
 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))
-- 
2.33.1