From nobody Tue Nov 26 04:38:20 2024 Received: from smtpout34.security-mail.net (smtpout34.security-mail.net [85.31.212.34]) (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 5F9A31E7C1C for ; Mon, 21 Oct 2024 13:33:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=85.31.212.34 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729517609; cv=fail; b=lRLKj/Yly+hJ23s+WxMgI0TpnBHzs5HCCVBiSZi0Wae0beYBllhXDaRJQW/sWRnjq1bn5J/KgFrr1XxDOocvc6wpqgBJdUyEAccdm7AfVUOGUJWYZ8yzGY9vSp2ziArvkwTkeqDG1+ff6NV+lzu0DbwvFF7zAtvx+eaxx9bzItQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729517609; c=relaxed/simple; bh=uICJ8KJLfrjysdrGIsRkiSWaussGKWwSuhXsz9g1G+8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=qMDMoTELqvvGY/1R8nVimO9JV6+Tz7f4nVbh1/hZ48DSKn/DdtsNTyfkqj8dbUwzM+N6XrkK7PCH4T/zVlyDf/tckgLLMZxh57ub4IyRfKExwVlGPDeBkR+cQNQpL83G23P/uWoJLiYrTn8dF7D/4qSds2kcwHmre5IaRAPoqAY= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=kalrayinc.com; spf=pass smtp.mailfrom=kalrayinc.com; dkim=pass (1024-bit key) header.d=kalrayinc.com header.i=@kalrayinc.com header.b=bDTdP4Zn; dkim=fail (2048-bit key) header.d=kalrayinc.com header.i=@kalrayinc.com header.b=OwNwMtRC reason="signature verification failed"; arc=fail smtp.client-ip=85.31.212.34 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=kalrayinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kalrayinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=kalrayinc.com header.i=@kalrayinc.com header.b="bDTdP4Zn"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=kalrayinc.com header.i=@kalrayinc.com header.b="OwNwMtRC" Received: from localhost (localhost [127.0.0.1]) by fx304.security-mail.net (Postfix) with ESMTP id 17C0D2A42BA for ; Mon, 21 Oct 2024 15:33:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kalrayinc.com; s=sec-sig-email; t=1729517588; bh=uICJ8KJLfrjysdrGIsRkiSWaussGKWwSuhXsz9g1G+8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=bDTdP4Zn7uDz8h9jCbZkZ0jPy7ya+AycQUHPxA7nCsyRp34sLFg4DMFirF4jtpsyK LzWViO3z7IXzo7o9ao5pQftCpWO1IVq/iLjWP8xhFUf+8/6zE6c3IOinQBLsMIzZCB YD6Qsc6nWDnLc57k4UtdwwgCnJxKxo5D/yGnECU0= Received: from fx304 (localhost [127.0.0.1]) by fx304.security-mail.net (Postfix) with ESMTP id B4E092A4530; Mon, 21 Oct 2024 15:33:07 +0200 (CEST) Received: from PR0P264CU014.outbound.protection.outlook.com (mail-francecentralazlp17012055.outbound.protection.outlook.com [40.93.76.55]) by fx304.security-mail.net (Postfix) with ESMTPS id 24E5D2A4528; Mon, 21 Oct 2024 15:33:07 +0200 (CEST) Received: from PAYP264MB3766.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:118::6) by MR1P264MB2339.FRAP264.PROD.OUTLOOK.COM (2603:10a6:501:34::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.29; Mon, 21 Oct 2024 13:33:06 +0000 Received: from PAYP264MB3766.FRAP264.PROD.OUTLOOK.COM ([fe80::6fc2:2c8c:edc1:f626]) by PAYP264MB3766.FRAP264.PROD.OUTLOOK.COM ([fe80::6fc2:2c8c:edc1:f626%3]) with mapi id 15.20.8069.027; Mon, 21 Oct 2024 13:33:06 +0000 X-Secumail-id: <10612.67165813.23051.0> ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=bG8lQkaTl9BFftfNkXkOtqvHZEMhyUfN10o10RkEpwEMvehp0pTwzaXgfXIJy8BMTLDRDT1TLekc691ADk0pNElvaA8mNWuK/kTlkn6xXKLLWNheAYP9HNhNFEspW29VSDWzfKLaNGAPSpDZIMpWRljrwnunehNcsWUZYY1x4iOaw5dQzWfaeF3PVQk3zYBoszGG9UKege6kNt2ed/1Ty5WqMsHu9cQAXjb84xHf1gKAMYCpWag/4AuPBzA6HExtgRM9CXQ3G2y0PFkf32pjipczl4fj0LQhg5uaHzbrORK/lT+ypCdtxp7I1QVdj6U5SDK4uXaiyqO+lETJ3dRiRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=ssq82j9Qbkmg1cRToienkjgOiLGK2G6nnz6q05Vjq1k=; b=LszJjhX2obncatXYEPqhSzhJb03MgimIfgkVrQVCHyWCS7NuWDPjtpB+ioYfVrR931G8tYnv8/AdyhB0eSqfnX4f3yUtUmTsqeYkff8Cr9HTyUhSPoCvcwJXeonjw5Tc/WmglP72sl81qQ3j9QAYJR5vKW9lsW10Jdjvf9sYh0ZlzTQ0N/a1D02ZBoyGj1EhM2DkIJICAOgQbfv/hKkS8iqo6vb2FiGheTmh5qrtzSPzmpVgDQAQETdG10wz4UuEDFbI5M2F8hzQ6IM3szsLO/oK33AEAdSuoHT/6YBoZi48dwjjDdrjN0AWhaA3cz1kIx8MqLegCol+wBu28Om4DQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=kalrayinc.com; dmarc=pass action=none header.from=kalrayinc.com; dkim=pass header.d=kalrayinc.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kalrayinc.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ssq82j9Qbkmg1cRToienkjgOiLGK2G6nnz6q05Vjq1k=; b=OwNwMtRCqmAc5i3L8GL1tB3wuttljJvSz1P9Bc/IQsA9W1u/MX3yqZQwCWXtZVWQain9owl5iNTvF4Nf/JSMJ990qgJFFmYztJ76kbKxdgWqbIwFhqffnwSITzZM1uA3K7ascd+2BLHWQ8/a620Q+Ood8TeAYQvf+7jNc89TJyRuFNE8iKLNkvOaMhM7HjnqjJJID/fgmlFx9pj1e9qo7rGyUJ8QHjVjpwCFOTSjsTxTYTW7rbBNuLjJsjqoW6eKgP5DjdPE4xPSvjh2G7/BRW4S1pC24/18nBS74EP+zrPYCgVEJLXaV9KO4Q9hAu+8F22c5qFB/DNZmwp9yQ4XPA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=kalrayinc.com; From: Julian Vetter To: Arnd Bergmann , Catalin Marinas , Will Deacon , Guo Ren , Huacai Chen , WANG Xuerui , Andrew Morton , Geert Uytterhoeven , Richard Henderson , Niklas Schnelle , Takashi Iwai , Miquel Raynal , David Laight , Johannes Berg , Christoph Hellwig Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-csky@vger.kernel.org, loongarch@lists.linux.dev, linux-arch@vger.kernel.org, Yann Sionneau , Julian Vetter Subject: [PATCH v10 1/4] Replace fallback for IO memcpy and IO memset Date: Mon, 21 Oct 2024 15:31:51 +0200 Message-ID: <20241021133154.516847-2-jvetter@kalrayinc.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241021133154.516847-1-jvetter@kalrayinc.com> References: <20241021133154.516847-1-jvetter@kalrayinc.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS4P192CA0012.EURP192.PROD.OUTLOOK.COM (2603:10a6:20b:5da::20) To PAYP264MB3766.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:118::6) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAYP264MB3766:EE_|MR1P264MB2339:EE_ X-MS-Office365-Filtering-Correlation-Id: ddda53a6-32b7-44c0-261b-08dcf1d4e517 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|52116014|7416014|376014|1800799024|921020|38350700014; X-Microsoft-Antispam-Message-Info: 98hQq+5lkcCAg/EK51k5jG1vryOKtBAkUUflHalRWCEIZ1TvkH/1+mo/SQ3IlqrW1EMWY64Qz5+jqGG36YJIlgrEo2biE3gCvncOVWHZoALb6ASZrNDpRqJS9xS3k4Fw/tTsMhBXgyI1sQ8kbz0CCzdd4QfZrwx4t2x9L6x0KDhF1mpYqtmflKqyGq6FRME3cIY3vZiUx8Rw+qMTLjEKx2yN4Sbdvd5SU53E/6E7vJkbZ3qMV+Ab3KEoDbZUK7G76g1nxQrZn5lAUJKI8wCIlJEWol6V2Y5xLo9SHDyU6fhIhUYgoWzm7j+4qQYsf+vwhBZweT5UTcq6u6LIYXG4PbH1AZVy7GoSUGq6F7JhlmN65yJkEowEDtb3uM1HTxxbOXmeKUOOIUG+CLVn96ex3fZYGoxkRdfk6g7vBQ5Bkfsps/XdizL3Hogs2D+pro6joZD+tg6cbGq8WtgoPupx78wqjjZLmDbaS6Wm1y0XOEOi6qSGb/InSmTRDB1Dxm4QBkH5HIe2azj4KOYago+p4PYDZBifvVaXx6QGwUjBiECbGfigDuUsU30o4oyV3SJ3yybMYFtv/iGIrSIYyT+rwjVgxf1H5VIh9CAir0kp/ZSGKAV0X/Wmq65esw8K725VuQZxRuypc28c+EddKCC8CVVdfZ/wQ46LP/Vp9IByR/B/F22hIOkZO87d+O+xzOpxHfwr3AorQtJsvASp9DDQGa2M+4rvUzQTuBaAfjZeM7TYS7/p4X4SggD6TLLJoZ6x9sVJGiPGQMPrXAHOVCBPiqipbMatjERV7HRmbO0nRn/p8Fn4wuWCPLWdxPAfEyiJhdLBZm9BIwlpa/GS4aRsXQNDsclNeBDRDPxREwJbWVAYGb7LxMwoIQv8/59MJlnupMu5GEk4YTYaeLC8I4+Z2io43XpgWj4VJ00pNZCvmuKRPlkZY/UNTlyNo32DlJ+PaE5 JbKCncZegGWm8lDycwbnfC/5TObH30IOV7HW2IAujbh7QQggwTLJ2qkmXLarrsTB4NzjwePb7zd+m3wNFmJTx0NO3yk2qxxQaHVq6cwhY1lSfMp7ODFv+36jU74RmcH2qauVyg0vlNI4efHUF6QCaQ0xUVqiqaAqCv32FnIsop2n/ACFZSI7K4b+B17mxbczHBP6YTNgh24bypgqmJdfH4iJAvqePd/nPGdsU7l57HZVFT8aNbwTFa6usoImJtbVx8ymfQ53UIYnVOg8dKg0qxPQlEMJEez/fFSsE/IeH9rv6KiSrAupyEknxAAJQgT2sw1iwcrxvDNziMl3fOEs3gbtao49u38XLS5YfUvIzci/cpS6UFwTwQ26+ztUkkSHhC847nZiRC9Wpv43yJiv5M3MIynsrpQ7TG9JnX0ReKVlWvN5DRJ7pmDEKfphb X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAYP264MB3766.FRAP264.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(366016)(52116014)(7416014)(376014)(1800799024)(921020)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3ubZV3yvhvw9wEueJwvx2rvWza3xDYpADHyqSkXK371JOYWP9oGN6VVYJuda9B38VAjvoPGyBUqcGTzzl6fY9gZ7Xl6GWE5qGKq0oxodViUjDeeHUmUgYltC8nPEsx4PWs4fpw41IHN0My/xDVjlpoU8bEbCqyfJVlA0NHIDS0micMef1eeYM1G5hd35HwRNSDROODshfeIAyoD7VBepB3jUtZ8pn/DRaB1cauLRurl3LASNdDWIpy1UGyLvei/8dEGF/IySipsdrHfG4eZTg/qMvs1bvCWCPkQgFIaW3rNPa/20Nlu1Zq4wkrdKSUq5qc6noIFUEWt3wPVSvKHIvwf92fr4Bu4dZaZjfrTuUJ/6teCFUEYpz3ZB2HdZGz6upSD1xnrWsP/zN8y6xSdYiqlNaymdPjlV+y/OkC8jdZQqOTvn6eUO27N0uIZVMbHPgUaSbaWV65qyvV3SzyiLrKLh/YsP+yEl6QhpQRyFzkBLnEGutrJar60H0+xyieCE2VBBqdV5/eBEzMX1tPz5X53/KVfotbOHv7vYsjrY8tVfyp/fX5jglobUb1fctAuOx69Hi09lur+ctnYdWVRTBlxCviLhWLBoeBUfcYvOYDwfPdS3dA5ulTgiZId/wiWXdD/DOycrbBpgibUdNKs0Equ+iZWokeqVbkPclXYhdCiZN2+AQtFeHk5L6r/EwoqFVDTEPbu4mmGEVJ1g/fDR1QxE4odCHYjZe51Rmc5gujB2m/O8adq2K/9ot9VYpf5tCACVFB9vJS2isIiPNLI35n4V/BM8Q8ke2O0mZKkF67vSEz6DrjiC9Ew08pwVNJegumOKc+RjkX15kVLumcMU8+J2vQqR1gbbriPeiQ9oWSyVZPgYPzWMcxMYKHaUb57UayKpXZD5mpqt7Jxg2lEW8BkR1apm+mCFkTqEWy8z+8jkBMdXewJOqZlPZ2/RlLIu 5D0AVRKTc77cAu6q7+Bq8AGbRmRSFqzFz7D0WSMh7mNOomHYNGw3J9F6pWr1v6BlF28bftc2oGuHhfFZQEnWBccrR0izbYIbjQEjk8ocCu83ey3Nnzokdvw03/K51VH84f00fNktN/JtnpzuU77PPOX+1jWJUZ421UN+cvS4GWInDjj13PsSqPxf78WphSX4XGVoeGN8uR2mijSzlZCSW2PPm4JiAb4qxGE+pizhOkjFDarKT/N5lkLQMkqUzGuXRXBxOpWxc+r/BO+xlrOoinee94g3560bqZdLwFTCsqRhmAP3x+BEUF0YK+BPaafmHcXpfTWe3+og4bkmytH9JFh8m5ZcoOBVQchoL/xJNbjlNVjJg4BaA1qpF7I+VfeMgUFOzC07p9uKc9ROw4zshJlkAf13JAkKWKRgpnXs5VXf4hQ0IP+l2dtFctlytiyL7vmQPaNwUesJ6kIxAXh56O+8P73kdl3WGXv4MmVtzb6uA4OZmkfvAFCjC+teLyvTWQ2jPU8ProvdLKAu1g7Lm//vD9w4K2gm/voggdZxef+GR8ITSzxBuRapFPF0j/U73ujeW5sGqVDRW7i6I46O6Mfx5V8yHJdOF1baIqbXHHRmDPsWFVWnHAtVW5unyPHQ X-OriginatorOrg: kalrayinc.com X-MS-Exchange-CrossTenant-Network-Message-Id: ddda53a6-32b7-44c0-261b-08dcf1d4e517 X-MS-Exchange-CrossTenant-AuthSource: PAYP264MB3766.FRAP264.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2024 13:33:05.9537 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8931925d-7620-4a64-b7fe-20afd86363d3 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 8kIwMtCS1VKi8eonl3y2a3vllahimyXhuL5sXFvpWtOeJvdK/EkQQUaUiK9GUHKlpTlzrPvtYQtZJFmPbRfA2g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MR1P264MB2339 X-ALTERMIMEV2_out: done Content-Type: text/plain; charset="utf-8" The fallback for IO memcpy and IO memset in asm-generic/io.h simply call memcpy and memset. This might lead to alignment problems or faults on architectures that do not define their own version and fall back to these defaults. This patch replaces the memcpy and memset. The new versions use read{l,q} accessor functions, align accesses to machine word size, and resort to byte accesses when the target memory is not machine word aligned. So, architectures that were using the old fallback functions (e.g., arc, mips, riscv, etc.) now have more resilient versions that take IO memory constrains into account. Moreover, architectures with similar implementations can use this new fallback versions as well, not needing to implement their own. Reviewed-by: Yann Sionneau Signed-off-by: Julian Vetter --- Changes for v10: - Removed iomem_copy.c again - Updated implementations directly in asm-generic/io.h - Updated commit message to reflect the changes made in the patch --- include/asm-generic/io.h | 116 ++++++++++++++++++++++++++++++++------- 1 file changed, 96 insertions(+), 20 deletions(-) diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h index 80de699bf6af..00cbf8587586 100644 --- a/include/asm-generic/io.h +++ b/include/asm-generic/io.h @@ -7,10 +7,12 @@ #ifndef __ASM_GENERIC_IO_H #define __ASM_GENERIC_IO_H =20 +#include #include /* I/O is all done through memory accesses */ #include /* for memset() and memcpy() */ #include #include +#include #include =20 #ifdef CONFIG_GENERIC_IOMAP @@ -1154,16 +1156,40 @@ static inline void unxlate_dev_mem_ptr(phys_addr_t = phys, void *addr) #define memset_io memset_io /** * memset_io Set a range of I/O memory to a constant value - * @addr: The beginning of the I/O-memory range to set - * @val: The value to set the memory to + * @dst: The beginning of the I/O-memory range to set + * @c: The value to set the memory to * @count: The number of bytes to set * * Set a range of I/O memory to a given value. */ -static inline void memset_io(volatile void __iomem *addr, int value, - size_t size) +static inline void memset_io(volatile void __iomem *dst, int c, size_t cou= nt) { - memset(__io_virt(addr), value, size); + long qc =3D (u8)c; + + qc *=3D ~0UL / 0xff; + + while (count && !IS_ALIGNED((long)dst, sizeof(long))) { + __raw_writeb(c, dst); + dst++; + count--; + } + + while (count >=3D sizeof(long)) { +#ifdef CONFIG_64BIT + __raw_writeq(qc, dst); +#else + __raw_writel(qc, dst); +#endif + + dst +=3D sizeof(long); + count -=3D sizeof(long); + } + + while (count) { + __raw_writeb(c, dst); + dst++; + count--; + } } #endif =20 @@ -1171,34 +1197,84 @@ static inline void memset_io(volatile void __iomem = *addr, int value, #define memcpy_fromio memcpy_fromio /** * memcpy_fromio Copy a block of data from I/O memory - * @dst: The (RAM) destination for the copy - * @src: The (I/O memory) source for the data + * @to: The (RAM) destination for the copy + * @from: The (I/O memory) source for the data * @count: The number of bytes to copy * * Copy a block of data from I/O memory. */ -static inline void memcpy_fromio(void *buffer, - const volatile void __iomem *addr, - size_t size) -{ - memcpy(buffer, __io_virt(addr), size); +static inline void memcpy_fromio(void *to, const volatile void __iomem *fr= om, + size_t count) +{ + while (count && !IS_ALIGNED((long)from, sizeof(long))) { + *(u8 *)to =3D __raw_readb(from); + from++; + to++; + count--; + } + + while (count >=3D sizeof(long)) { +#ifdef CONFIG_64BIT + long val =3D __raw_readq(from); +#else + long val =3D __raw_readl(from); +#endif + put_unaligned(val, (long *)to); + + + from +=3D sizeof(long); + to +=3D sizeof(long); + count -=3D sizeof(long); + } + + while (count) { + *(u8 *)to =3D __raw_readb(from); + from++; + to++; + count--; + } } #endif =20 #ifndef memcpy_toio #define memcpy_toio memcpy_toio /** - * memcpy_toio Copy a block of data into I/O memory - * @dst: The (I/O memory) destination for the copy - * @src: The (RAM) source for the data - * @count: The number of bytes to copy + * memcpy_toio Copy a block of data into I/O memory + * @to: The (I/O memory) destination for the copy + * @from: The (RAM) source for the data + * @count: The number of bytes to copy * * Copy a block of data to I/O memory. */ -static inline void memcpy_toio(volatile void __iomem *addr, const void *bu= ffer, - size_t size) -{ - memcpy(__io_virt(addr), buffer, size); +static inline void memcpy_toio(volatile void __iomem *to, const void *from, + size_t count) +{ + while (count && !IS_ALIGNED((long)to, sizeof(long))) { + __raw_writeb(*(u8 *)from, to); + from++; + to++; + count--; + } + + while (count >=3D sizeof(long)) { + long val =3D get_unaligned((long *)from); +#ifdef CONFIG_64BIT + __raw_writeq(val, to); +#else + __raw_writel(val, to); +#endif + + from +=3D sizeof(long); + to +=3D sizeof(long); + count -=3D sizeof(long); + } + + while (count) { + __raw_writeb(*(u8 *)from, to); + from++; + to++; + count--; + } } #endif =20 --=20 2.34.1 From nobody Tue Nov 26 04:38:20 2024 Received: from smtpout34.security-mail.net (smtpout34.security-mail.net [85.31.212.34]) (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 BE07F1EBA1B for ; Mon, 21 Oct 2024 13:33:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=85.31.212.34 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729517615; cv=fail; b=FmjFoI6ZDAxWszu8KD3nMbFF7y3KwzbWLN6tr78WI2+mguXtlD68q2Xf/izYkxDC4r2FxGehVu0Aq6DvqclUvy4InsTxxnvL7l3k29LwR+baqp18mJpZzytSzkG6fZ1qWxuCbEZuE0PVJQSVlnFvSBJwD3ZEA3xEm23MxrhXBas= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729517615; c=relaxed/simple; bh=/ocSKZKP1X1oscswsJlqywTbmenaHDpKiNI1VPu/Qp4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=kvrxU3bp4YCg0TvTK4+ok4KRpAiq3iRbDR+F6eJx+2GrAY9wFz+sPPtDHsUcOYzPwIpqbCoPkYqWDqgIT4uTTrRyKHHtvyjwAKF7FHV7pDHSjsCTCN3aEpY5b5OCr0GX8aZAeAMHp3+AivBv0YwJd2a+B8jXQKjjuL9VV9q3W6I= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=kalrayinc.com; spf=pass smtp.mailfrom=kalrayinc.com; dkim=pass (1024-bit key) header.d=kalrayinc.com header.i=@kalrayinc.com header.b=Omjxj7Ml; dkim=fail (2048-bit key) header.d=kalrayinc.com header.i=@kalrayinc.com header.b=L/J9OjrL reason="signature verification failed"; arc=fail smtp.client-ip=85.31.212.34 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=kalrayinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kalrayinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=kalrayinc.com header.i=@kalrayinc.com header.b="Omjxj7Ml"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=kalrayinc.com header.i=@kalrayinc.com header.b="L/J9OjrL" Received: from localhost (localhost [127.0.0.1]) by fx304.security-mail.net (Postfix) with ESMTP id CCF632A422B for ; Mon, 21 Oct 2024 15:33:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kalrayinc.com; s=sec-sig-email; t=1729517588; bh=/ocSKZKP1X1oscswsJlqywTbmenaHDpKiNI1VPu/Qp4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Omjxj7MlpOpYtYHF/CtwYtN6ApmbbScLxy2FFjfT4DQyTHAYPtTVTCcpLmbkSOZo0 AjlO/QaTaE7qzXEs71i9Xyuw2eClX8BXFfOV7YX0e4Jbz4Dvv4vTlDrpqcs8oBty8G SCNuS70cNmHVsI9hIY8YbF9XGJqOA6XU0TwBzvso= Received: from fx304 (localhost [127.0.0.1]) by fx304.security-mail.net (Postfix) with ESMTP id 8F6772A4580; Mon, 21 Oct 2024 15:33:08 +0200 (CEST) Received: from PR0P264CU014.outbound.protection.outlook.com (mail-francecentralazlp17012050.outbound.protection.outlook.com [40.93.76.50]) by fx304.security-mail.net (Postfix) with ESMTPS id E7A2A2A3BEA; Mon, 21 Oct 2024 15:33:07 +0200 (CEST) Received: from PAYP264MB3766.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:118::6) by MR1P264MB2339.FRAP264.PROD.OUTLOOK.COM (2603:10a6:501:34::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.29; Mon, 21 Oct 2024 13:33:06 +0000 Received: from PAYP264MB3766.FRAP264.PROD.OUTLOOK.COM ([fe80::6fc2:2c8c:edc1:f626]) by PAYP264MB3766.FRAP264.PROD.OUTLOOK.COM ([fe80::6fc2:2c8c:edc1:f626%3]) with mapi id 15.20.8069.027; Mon, 21 Oct 2024 13:33:06 +0000 X-Secumail-id: <106e4.67165813.e5c9e.0> ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=iOEwvfpp4QNRW6gno77VwtnPc1kRrVfoUKXBbtcx3oSxzZw91WvEJhRk9ytKQd9byZx5ftZBhPiBYnVtjn27Yhnf040F7hdw4Pwt+n3Tg+YnnE3il/qKZ9EpMc4g/jbvqyzf6gbJeYk7IAED1rYtC2pXXGLAy7+MthQqgZtWegFsUqYLrBWq2xM7IPpT2S/j1RoXgfN7Ye+g+f4lIMbdkLIgIWzmqJuRPW8iofSqbR93fd2zTuEqPlaBxHoDoJsB03ogs9LHs3T0VwIELxjT3b3WM8F9x0GAXEoQqi/68Gc3m0SZ+scBtaVCupg/jFjGM3Wxo/yxbN06GH1Ei0zw+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=k/Pgfr4aqWNaoWCaK9VM3FAG6Mrhm2a/4ETZWcrPJJs=; b=okkVWtDIhjrzPP/MXE9GnmqCzMR0tA1SpCOspsylsKHZHTK0+xYpzafYplbrz4XUdEc0VZpb9PuaAj5HmQcRd0CeOWfa42bqcv9+7ManuT7WOcp+YcAzLuJL/Itp/cOdRb+5s+Njm5UfKTivNKq3WsbO07AcN4iHCRGaB+ANToVtUknNMIYGqCYU1j5GKyUGPtayFxz1blR7xxnTzfLIHSceyxhZp6+Uld2bv8+IUsDpufMrKKQ/LGmzawa073iX8/tllbSlhcpku02aWPBKEGtn5DVDQlikKHY06ySPAExOq6WeTuGuocz1oM1VoSJof/rUPs9uS9l5JlK0omMIgw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=kalrayinc.com; dmarc=pass action=none header.from=kalrayinc.com; dkim=pass header.d=kalrayinc.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kalrayinc.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=k/Pgfr4aqWNaoWCaK9VM3FAG6Mrhm2a/4ETZWcrPJJs=; b=L/J9OjrLY8hmAKFnRwd9IQIXt/O9SLNkfcmhJhF96apdywjybuDg6m4udCjGJRe8nMqFcGBWV4fFoRVVjI+T8gmIbkfCIpzzDwE2RVc92RTExsiXxcD3CWNHL7PpScuN+YqMqRXsY8uUR1wr+hr0edLeUbHpzm5+fTuXGra0hqY6K3q9wlu8dXGTFX7CoIbzRuarFQ1/q5pR1N4njETbLzhEQRKVLalloXD/NOLFcEe0eRxB/giWM7UBgkm1YmPPckqZDoy0hY87mMtxl6ebCSN9tABv+IGXfU71uvvLfptOW+eyWpSPkmxkxtRUEnAqhMRAUPLnhp1NQPFcv5ID4Q== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=kalrayinc.com; From: Julian Vetter To: Arnd Bergmann , Catalin Marinas , Will Deacon , Guo Ren , Huacai Chen , WANG Xuerui , Andrew Morton , Geert Uytterhoeven , Richard Henderson , Niklas Schnelle , Takashi Iwai , Miquel Raynal , David Laight , Johannes Berg , Christoph Hellwig Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-csky@vger.kernel.org, loongarch@lists.linux.dev, linux-arch@vger.kernel.org, Yann Sionneau , Julian Vetter Subject: [PATCH v10 2/4] arm64: Use new fallback IO memcpy/memset Date: Mon, 21 Oct 2024 15:31:52 +0200 Message-ID: <20241021133154.516847-3-jvetter@kalrayinc.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241021133154.516847-1-jvetter@kalrayinc.com> References: <20241021133154.516847-1-jvetter@kalrayinc.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS4P192CA0012.EURP192.PROD.OUTLOOK.COM (2603:10a6:20b:5da::20) To PAYP264MB3766.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:118::6) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAYP264MB3766:EE_|MR1P264MB2339:EE_ X-MS-Office365-Filtering-Correlation-Id: fc60c16d-29d3-412a-034e-08dcf1d4e59c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|52116014|7416014|376014|1800799024|921020|38350700014; X-Microsoft-Antispam-Message-Info: rjEBdPkcjo9OxI80XBkwvNTCZtI2Ptdbu5x9pib1LLPRJz+YhwzOgfzvcb4Jf+Yk57mGGGPRSkjczQb3VqHsuDhp1wvY9xe+K4y94KgeQXqsw3CML89qnXu2KjwlnLJVjzN6sQJCJ3lfAcJ7Al0dZjAR7FC81GjTAZ3iwsuvCbbJa/PHmX5agOsCjJAFKxVtF4eHa8qZgAVWRo+W3px4/2iUpEnwWjZZQDa1+davy/bpyXw96RbD7hzD965gQbPXWH6XPTC0WnYnr+HEkLnEUVRXVF0a16rM3vOkLIm1MbDjpepExtOdAWtIdvVp9CYDyN/9jVLU1bE1ZNlOzJrGGPHfHua0h51TgqN7hJve+7afX9pWXQPOWyxyGPdn/N01aBqgRW7W3QSRWigC4DonW2Sz35toNxALYXtVu4EQMGI9OZJe94E7ryzx/RVO33J65sXcUZcsVebjOAePOVIu+YEcKtsHLlNd09ldNAJyiSFaqCLOjV33fTuJhrWbaJWatKFKhCAs/EP4oko9I20dR0GS5Xc9IJK3MB4UnWEuelq0DDcg8dIKxb72v+NR0+/iu4pfDBVxpYhTtcpJrERWNcy5Lyz9ipoKLBogRPQzr6eAuZZsYFZOp/Ij0zJ5SOCTMboZeXTqZy5XW6wzWdTIF2yFjCTnpdQx1+gbuGGBJraXrqeX6BiQKwvZhyi5qRpRdf/ylg1Jd+4mhTHGROG7RB71KOtrxz1AZugIOl4hvSPa50yJaL+k/cuhhX/dkmPWGkXpicDeUrBC981fMfqX4renW4Lzm2puZQHKYU2PayQTXOt+P7M3uBQfm8AdJ474bYeUtgV7rcmyWE8etUDjDZ88xf3AZiv4OnUHZewVLk1OteBqVQRtDAooU2a1c6oz41jNlgcWJtEm+TpHQVvDrgfeANb/SS0vK9hvs2/YXdFOFPnp7PSZWUD2j3rAKEE93VO 4U5CF2EF39Ib3BYsg4g8B3GrKjuartZ3ZJ4XI9gzDM+aPddADIZv06/jQZvt+s0JMEdg6uTBTOZGkELhEEQuRJiaqPPZZCs2oy+97ohncjcQ+NuLUBfg3u9pWNotNBl+sIMElWxAQAW5AkDGA1asuwa8niwpj0aMgS6lm+QitOEmCIYahDP8WoEDQEFA6GzYIGMVJ8XMAzTSj69Di5vmg0yIBvV0kjKL6D7bJXzyAhuY2xnlK459TBWS9mVQOOZAHPcPUKPFWAXIghX/i4Hxposvywtwyu9Zzz03A02UoPpSoClLypTUfRmC1nxcQdGjE7aBRfVYFR9TiHM2drmGyCz1lj2K/p1r1WuRuVDLOjEEM8CF3L+aEjt8I+jOwFQwr3U1sY16CzH0yub2wRRGux926cjZWF2qLt4oX4cZ/GBK6b8CoCkO6kyqEZGMe X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAYP264MB3766.FRAP264.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(366016)(52116014)(7416014)(376014)(1800799024)(921020)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: kihkfdOx2VIAk8sd6cb64EACsa7B02KKJJI5DBhSQWcj5rDnOImgN0F/u7ZDariI+7AJa/xwgoME51qCJUDAuX/EsgV4qoHFnXwpSV9n3uh7GeNivH7jZk3lPbaU51rB96vr3owAlBj/M/G+Tba/5EHMIe8XO7Vvl39zFgvAHThEef7KhpdLGfom8TygzLiCx8/LfcFoDAY8Mzvp9GwvMjutSouVcqU7RckRthDlPsA9I3Ky2aF+wpNslnJbgS/6IbYp7HL84FvT2+3CpBZ/w/HJh0GucMedGWGakG7R0TcOzcsMsN7/7BuX4W9JxTKdWUuEMbOzfgmP1STANPdPsdhSl4A+MnSwcisUzhPFJM3mxvfTZJtcJ/c4t+o1GeND6pKOkKJc6nMcwtDJDQknqBQf/81dX6A5/LO+039QK6GHmANKln0Org51p/YTRrwJ16elK6bsAGGcMkQr28NdqFXBX43wzprQcbWA6EG5RfNeQR0Na5DGDcrGhMgWcSTKXuTbn/tas7piU48WOyHkBkXxnp1dj5Chj6BcMOWmjD8GeWV42rkc/CKR4UorT2HIfZGJZ4cS8eVizjk+6/aeeZqOE/3CUISFjqlHHt8OWPa6ZLstWut52jiqvW5Z/qa3eG95EbPZ4aCijHMB0WSr3riAFJht/xTFJJwop6IR2c1R0pj1Eu8esnBk0ydW01tlmEL0z0mdDk3G5MuKMeG2EML226XLPYlZEfimyhP+FaJhWtCFtHLPtrGOlpTHS7gSfZK5Fb0eX//trk4SejOoN8IsHlw24sTme6RVVRolrKbJCBmsDFpGjonQ+iC+frSKRc/vkNDF8fQLyJldqJ+HIO5ggifZaVL1oh1FfozqO/T61nmHb8EJNX+weU8/Saqbysnjyp4xzbyyuX59fG55WbsfS/room7fy7w+PnCnt/wAehMyrkY8Jhsg5Rsa6yTl lcJIqhh64KnRIcyweiuNTqMvwGbc3vaYresH62/yTC7cTPp3xiLuWT6t1MuY6l9judXeicfHtmDCKkGXQloZRUb+/peYTKy6oY6bFach1Np0CaMwhWQO5DsudAQdPeY0bunjrVRSI9w7ShVMZA27pjolLbf2HFPbOM8FbpPUAgcpo+oHMm3qqs6EW4+tN2gE+3JO4kKHS4nO7mO5goNSP/6g8W31m6Zei6t7VVav6LNWZknjD0i0+27b/y5HRp2Q8JgjNx+80f3ihKHpOE8S1Hx6fyX89vC8QyJL2piHJWx/8GfYLiJZtNuxZZoHNKsiLHntMsJD8XM7obZUrGmmq3Nki8qXrJt5qtB+rvT3DHEKGLZ2SGGv5tEYOZPdn0sJANdiaM8yVR3LIomlCaBcRjm16FzxnXIRWX/BaSsTGcaT+nqM/rgiwRUPLwB/3gWBfV+CNlp88dwu4I28OlIV5TJ8S5wcRGlAS90jmqOVRyTeKkOXSgxYPcr3Rgtfqlp0PZte2AZz9FIURxwUwuF6n95ZBqUzDWZ/4L4YBw7XE+cQPz21PpjZcgJ2HQUq6knq/BXOlnonZw0S51jVqIvrhciWsLqoGKl5uxyWTqI4XaBFOefzxkFKLYIvShtxQA4B X-OriginatorOrg: kalrayinc.com X-MS-Exchange-CrossTenant-Network-Message-Id: fc60c16d-29d3-412a-034e-08dcf1d4e59c X-MS-Exchange-CrossTenant-AuthSource: PAYP264MB3766.FRAP264.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2024 13:33:06.8276 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8931925d-7620-4a64-b7fe-20afd86363d3 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: PnaTTzpXO2SCGPJxy8dnp5t4ejw6OX2zAQyKgRia29BmnLMnMhtUkjDrMZY6XkKitmJmV5j2GQ7NYJSiNS2aow== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MR1P264MB2339 X-ALTERMIMEV2_out: done Content-Type: text/plain; charset="utf-8" Use the new fallback memcpy_{from,to}io and memset_io functions from asm-generic/io.h on the arm64 processor architecture. Reviewed-by: Catalin Marinas Reviewed-by: Yann Sionneau Signed-off-by: Julian Vetter --- Changes for v10: - Slightly updated commit message to clarify that on arm64 we now use the fallback from asm-generic/io.h --- arch/arm64/include/asm/io.h | 11 ----- arch/arm64/kernel/io.c | 87 ------------------------------------- 2 files changed, 98 deletions(-) diff --git a/arch/arm64/include/asm/io.h b/arch/arm64/include/asm/io.h index 1ada23a6ec19..463067bffdfd 100644 --- a/arch/arm64/include/asm/io.h +++ b/arch/arm64/include/asm/io.h @@ -128,17 +128,6 @@ static __always_inline u64 __raw_readq(const volatile = void __iomem *addr) #define IO_SPACE_LIMIT (PCI_IO_SIZE - 1) #define PCI_IOBASE ((void __iomem *)PCI_IO_START) =20 -/* - * String version of I/O memory access operations. - */ -extern void __memcpy_fromio(void *, const volatile void __iomem *, size_t); -extern void __memcpy_toio(volatile void __iomem *, const void *, size_t); -extern void __memset_io(volatile void __iomem *, int, size_t); - -#define memset_io(c,v,l) __memset_io((c),(v),(l)) -#define memcpy_fromio(a,c,l) __memcpy_fromio((a),(c),(l)) -#define memcpy_toio(c,a,l) __memcpy_toio((c),(a),(l)) - /* * The ARM64 iowrite implementation is intended to support drivers that wa= nt to * use write combining. For instance PCI drivers using write combining wit= h a 64 diff --git a/arch/arm64/kernel/io.c b/arch/arm64/kernel/io.c index ef48089fbfe1..fe86ada23c7d 100644 --- a/arch/arm64/kernel/io.c +++ b/arch/arm64/kernel/io.c @@ -9,34 +9,6 @@ #include #include =20 -/* - * Copy data from IO memory space to "real" memory space. - */ -void __memcpy_fromio(void *to, const volatile void __iomem *from, size_t c= ount) -{ - while (count && !IS_ALIGNED((unsigned long)from, 8)) { - *(u8 *)to =3D __raw_readb(from); - from++; - to++; - count--; - } - - while (count >=3D 8) { - *(u64 *)to =3D __raw_readq(from); - from +=3D 8; - to +=3D 8; - count -=3D 8; - } - - while (count) { - *(u8 *)to =3D __raw_readb(from); - from++; - to++; - count--; - } -} -EXPORT_SYMBOL(__memcpy_fromio); - /* * This generates a memcpy that works on a from/to address which is aligne= d to * bits. Count is in terms of the number of bits sized quantities to copy.= It @@ -78,62 +50,3 @@ void __iowrite32_copy_full(void __iomem *to, const void = *from, size_t count) dgh(); } EXPORT_SYMBOL(__iowrite32_copy_full); - -/* - * Copy data from "real" memory space to IO memory space. - */ -void __memcpy_toio(volatile void __iomem *to, const void *from, size_t cou= nt) -{ - while (count && !IS_ALIGNED((unsigned long)to, 8)) { - __raw_writeb(*(u8 *)from, to); - from++; - to++; - count--; - } - - while (count >=3D 8) { - __raw_writeq(*(u64 *)from, to); - from +=3D 8; - to +=3D 8; - count -=3D 8; - } - - while (count) { - __raw_writeb(*(u8 *)from, to); - from++; - to++; - count--; - } -} -EXPORT_SYMBOL(__memcpy_toio); - -/* - * "memset" on IO memory space. - */ -void __memset_io(volatile void __iomem *dst, int c, size_t count) -{ - u64 qc =3D (u8)c; - - qc |=3D qc << 8; - qc |=3D qc << 16; - qc |=3D qc << 32; - - while (count && !IS_ALIGNED((unsigned long)dst, 8)) { - __raw_writeb(c, dst); - dst++; - count--; - } - - while (count >=3D 8) { - __raw_writeq(qc, dst); - dst +=3D 8; - count -=3D 8; - } - - while (count) { - __raw_writeb(c, dst); - dst++; - count--; - } -} -EXPORT_SYMBOL(__memset_io); --=20 2.34.1 From nobody Tue Nov 26 04:38:20 2024 Received: from smtpout35.security-mail.net (smtpout35.security-mail.net [85.31.212.35]) (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 41DE31EF939 for ; Mon, 21 Oct 2024 13:35:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=85.31.212.35 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729517712; cv=fail; b=UxjiTRcSGIN3BCp9L5e10lEkt7Ywduk9waIq2NCjKpKcoOEgJkSp1d/cUFdaYQWHJKaAyuwnuBsgs5Sl6CR3CUeQE6yZdP4hFtsPXU1TpDhIFi0uZ5ChsNc0srqkNVOkxbv5gKPNAwUpyojLMA56dZ8qoNGEwRCtAOH3QypkOjo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729517712; c=relaxed/simple; bh=rWJitnMus/PcMNtJrIku8s/XDC0T/AmzlDyeGJ3xs4c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=nO/rLGywgp+nzcOoZMJnOjY20OY4SDDNXC9/E6dc6zCnBO1FuNAJegtfSMwsY6W5/pIqHSV3h8ypzGJpIlO9SRPaMzgV+lHQqpc7Yz3MjlEo7SGeNo5QTS2Jr+dlEzbLVsGnKgrlNzR6b1d/HiGsJGxruCP93erJGetleiBtMr8= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=kalrayinc.com; spf=pass smtp.mailfrom=kalrayinc.com; dkim=pass (1024-bit key) header.d=kalrayinc.com header.i=@kalrayinc.com header.b=MFRSR8P0; dkim=fail (2048-bit key) header.d=kalrayinc.com header.i=@kalrayinc.com header.b=rmGxICws reason="signature verification failed"; arc=fail smtp.client-ip=85.31.212.35 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=kalrayinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kalrayinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=kalrayinc.com header.i=@kalrayinc.com header.b="MFRSR8P0"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=kalrayinc.com header.i=@kalrayinc.com header.b="rmGxICws" Received: from localhost (fx305.security-mail.net [127.0.0.1]) by fx305.security-mail.net (Postfix) with ESMTP id E80EF30EDB2 for ; Mon, 21 Oct 2024 15:33:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kalrayinc.com; s=sec-sig-email; t=1729517590; bh=rWJitnMus/PcMNtJrIku8s/XDC0T/AmzlDyeGJ3xs4c=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=MFRSR8P0yKzPopQ8LsA64SbgGQ+Zdbc9sTwQgFNUDXk4BaWkWxISJbIhZzU4bH9mq 2Vugiak3MGLxxAv7cTv3jBohQZ4BChmjnJuva5I5Y3yiyLtsDMn/rgC0km//wC3o6N uCZopOzh8/m061soxppXadaaI/knD1E5GKEErhSs= Received: from fx305 (fx305.security-mail.net [127.0.0.1]) by fx305.security-mail.net (Postfix) with ESMTP id AF31330ED42; Mon, 21 Oct 2024 15:33:09 +0200 (CEST) Received: from PR0P264CU014.outbound.protection.outlook.com (mail-francecentralazlp17012050.outbound.protection.outlook.com [40.93.76.50]) by fx305.security-mail.net (Postfix) with ESMTPS id 0F14B30ED27; Mon, 21 Oct 2024 15:33:09 +0200 (CEST) Received: from PAYP264MB3766.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:118::6) by MR1P264MB2339.FRAP264.PROD.OUTLOOK.COM (2603:10a6:501:34::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.29; Mon, 21 Oct 2024 13:33:08 +0000 Received: from PAYP264MB3766.FRAP264.PROD.OUTLOOK.COM ([fe80::6fc2:2c8c:edc1:f626]) by PAYP264MB3766.FRAP264.PROD.OUTLOOK.COM ([fe80::6fc2:2c8c:edc1:f626%3]) with mapi id 15.20.8069.027; Mon, 21 Oct 2024 13:33:08 +0000 X-Secumail-id: ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Tc9QX+31wE0T1TB3nHXVkzQqarNmD1ULc6H5Lnti47pAb0CgJWfhQqDBJ34LKleEZXGBlxJDCc/3ksq/va1qF2xsSaCNuplGgT72PHS+e7Cp+hCpfdxca969mkKBFbJGjyom7Gxh9Gko4KhkLSKflV56XsWm3+eej4avbAEWWF8qVNJUlcWeA3d4qel2h+yLSeA+FbhFqJtHpPCDq7o2KLu8t8HhV01+uaA+xxIRZbLGGyBVC9VyAb+L7e6pNdnX2+eI6SR9UM88s+MXHduDKqBhroFVoEJ4IfSKmwm93zW/4RxlfmT5qlD2BXrh5XniFopHy2mfPvi98egVDdq5gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=qyh6O614b/8IkSe3xXMOvUBqzvmThFjUZ7QxLC46PX0=; b=HDIt7DI3IfOk8EuzLPFnuSPETtyO2O3tsN0uJArjQ4U24nBAjI39aKgf3nF/lOyFwW3wxWyOF0UqaobTPKNPJjQfAmo1ePBxUq8scACFeb1l99xyFLUG2oFdM4xF9nUstqH6zaUfZnSwuv6PCfIxCpC6HjEMD/63wnv1syxAcvBckNV4hizzAcrbcVS2toZgn/UN4Nywg9DL7vHXIy/t+8oKk2DHBU/XFK+s5+H2j5/BZzeJcbm3K/Hb2yBP0g7mGi48TnYx5odmzd/dmI2LY2OHxqe2r+5eh78HIMQMVT8HrgLouPaeHpkIhMocle1GHuc8zssgxT+Lyu9pvn6O0g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=kalrayinc.com; dmarc=pass action=none header.from=kalrayinc.com; dkim=pass header.d=kalrayinc.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kalrayinc.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qyh6O614b/8IkSe3xXMOvUBqzvmThFjUZ7QxLC46PX0=; b=rmGxICwszCUq4zWSwspsPAuwB6rPhweDe1iLbFZgn9ycdPZjTcAjZRP+1XXPlf9S/po0BsZGeVr7h2qR6qEcJ17tfoXl0nRYIy6o5HKLiY2RXWChdpbT1MgT5v682xplNlt6hqQlOuXdJ1/VxsvMYjb+2uhzZ1gduIbjS0uDS4VlDBlRi3XDOeEPtO8jLyHkMxNS81C9I29CdofP4QI1ZZ4GF2fLg4rHrF3cedC55dqD6nb1Hvbz0C+z99KwDdm2auWuY8mWQQiFGKS9MDCJ0+tSo4gce03IAz5Ge54/maynCPCJfY+9C5m8sMaPtgA7lJWoOofYWlXMWdnVHfwB6w== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=kalrayinc.com; From: Julian Vetter To: Arnd Bergmann , Catalin Marinas , Will Deacon , Guo Ren , Huacai Chen , WANG Xuerui , Andrew Morton , Geert Uytterhoeven , Richard Henderson , Niklas Schnelle , Takashi Iwai , Miquel Raynal , David Laight , Johannes Berg , Christoph Hellwig Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-csky@vger.kernel.org, loongarch@lists.linux.dev, linux-arch@vger.kernel.org, Yann Sionneau , Julian Vetter Subject: [PATCH v10 3/4] csky: Use new fallback IO memcpy/memset Date: Mon, 21 Oct 2024 15:31:53 +0200 Message-ID: <20241021133154.516847-4-jvetter@kalrayinc.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241021133154.516847-1-jvetter@kalrayinc.com> References: <20241021133154.516847-1-jvetter@kalrayinc.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS4P192CA0012.EURP192.PROD.OUTLOOK.COM (2603:10a6:20b:5da::20) To PAYP264MB3766.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:118::6) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAYP264MB3766:EE_|MR1P264MB2339:EE_ X-MS-Office365-Filtering-Correlation-Id: e534fd21-48f0-4c24-3243-08dcf1d4e643 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|52116014|7416014|376014|1800799024|921020|38350700014; X-Microsoft-Antispam-Message-Info: T2ZL6eMCe/CVAf5qmUjAJXLDo3vFwC+eSoYWgZSnkqD91akiGQL5cPLNjie49TJPYKYzK5vDn7SRXxG+6aAgrxYEj51XYgKDgPOYj573Yr0MpJ71xrjkXlg2FGLXksl2ysZTM/VRwa8gC8buWLofKXNBf+0qx5w7WzdGat3GGiuqBgwqF5dHvA6WdIVXrguqPrzWlxEuVarWfgnk/B2pu+Se0d/tvRMSqmfUqbF4KtTiSJ8OKgBi0LtNi1Z4AIKkj/oNzU3aZomOojhDqE+odbphUdmKQSfiZIXry2ley82plwVMEjXwKzIagcJfJOWF/2UlLB6JXDtIRCvu8zhaIm3eT+O3vsO8+RijS3ZB54WeDl/ydqv7TTQU9T3oJ/6WfCPesj2udmkYKvZUhe8+lC/sFzRh1wlq2i2qm/l2iDvag7aRmbSJl/dIUMFmVxUrV4rPmZ1DbEGI9CYB32/cgSCGtwR3nSyDfh5SQNneoJmC9i+AW7hSepPQwxfoqetQj9GOhY6UKwDAzOYftwVGXjKzAytZZ1rKhhkbrkdGfeK82rgq655TV9Ka4yB4lIrEXczYvS4Z+YR61R6sh7WoMYE/44mz8UiEt0U/O+fxOetUkAssU0GTRMVWdQ+ilM3uvL/AW+McirUFSRAGgEIk8Gaip3d7opuTa/q8gcXY2cPhbNFBFYR9v53FZtgkHyExGT2Q5daHhmnTrKlc5oyS7Amzpze+w+/+zzYXhGEGwIuG9AbcHbeB2UFO9beWFqBCIJbrVdsk393fs96klyKynyXIigvyAr2trKc7NxeHZFHnRKwFA+HbbxHgAV6aZVlqvBlazRlocCwx1ea1Wxtu6RkENPm9iDghxOIj3G/7VN2d57h0euNcJSKed2rXhUJo0tyAOyi8KmBCNyod2peNsfFmpHkBxw0GDVC0xFaAMTZAtCB9biGalTEpDsgXBz/0ryz p2cRYopPFmrODtxtMzUprhk2k1VbIUatlTJkTgwLLsZ3EwbIIkVaG5UCqLk7YI37lZQkMxNIeV+U2PjPR8PRvjPDqmjiIpyK6wyzJ5AX4si/Q4VzTOwkD6Pgxc52XAVQJGm0+Y1t1vbtKlFdZSyDa5n17ChSt2wUreUGWlhc65Ae1jErWhy+WqO9kZYgcl3xaJPlsBHjT5ZgdJliDvFqERw6JoBAuJaqIhTnK3FDKYlNeCw9uKMq9ylf0FUMrO5x2eylPdoRAh3Q+g5csWlRw1cf3cZsfwvQmF8AibnVgN/j9My33Qf1z8GRpPLz/qf618IPg63QH23blDH3C5a9DFko2D5Izb/9QZ2qASPeqC+ksKJ0Gq8xS8EY++JxJ+k9OA9Chh9omxyai90CLXki5VL8z1rHyjGXYmzdD//XNjZkzyi7USrTwe1RHB1lF X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAYP264MB3766.FRAP264.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(366016)(52116014)(7416014)(376014)(1800799024)(921020)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: WMGD2dne5ziNP4UGyiS9Z0nwIH1njwtIRPauGN2C8DuJcgO6ajUap6rrEc1hKbVZovwQzBIuQ7EfIJ3We905hL1PTcBJ9C3t0uF/nAdJ352d2bL02fUD4+WOVAyIFh/PU596LmSVTeQq4L9pQxa5E6MSGZ8phH5G0+SbuXfAAwAuz5JJ81FuhpbAYzEVvCI2fgW8SsBpEx+QZFqG1utMHNvgqa2NUV3NVJWaD+Bv8PY3Ie4G5eJnJ2DnyUYFOfNMS/YsR6CCbe0gjgrWfUbcNeDp0fQvkP2FbqxS6pJyxeJcmLPUfnu373R1woMiTOboTQaXpOE8ckyrMGUotntifvNDlSr49zOWa0W9w9jcRI9ly5ikJO6+9lfBsps4cEsWRk2z6yQnA6UlEptoiRAZIqdqm7+9K0p55jirEfPLJ7TxG9pWS5o7DsBdcJ2ZZuWiJzIyfQORVFrqPhjqSXBeo5ctxsqomSdjmdzHei0qk7pqHCChw0S5mwD1ZXgPUbbOT28CPFYvHWlovIQ5PPSXeeABNOn9wiaslLiaiJ5Wvz7XLEEgr7VfhPMZSYjvBIk8jSxbyHUk7gnmeCcU4sUPsmllmZF5s95Y3Jlp030AmkU9D9YPJ+VTCwKr2Tma5fLq1Ssep5eA3rAnwIVuItcfKm98yNZSMLZodgUQg3KASy3Ut2pGqmDpL+YUvUsOxzJaKILePdasgA3SPe+aQhpHLW6EXWtlRjhbDjzDKZxmQlI9os2Yy6reeiC9GAzySlwTF1tREHfjezMm+s4EbX2ArvRsvNE4rrSA9nqtuC4LR3O5XixYP/FAf2tTQSagsjeeVPjr/hCgavc1Nra+JTCWbVx+P0bbxt61mKkLJg4RfZ1qFcHxnhPPxyMQ1ay2qT0XUn6MiluLkIuZGSs5pTgsq68qXrKRXSP0pDTdBwFtTtuSiHOGmCPge9n6q5/03N5l np4wudHEfllb4KmRlqPHzEL5zFjy+D9gv9TZfVkv1V3pPz2wrHulAjG+63tqsPwuaGA67FWo818OP4yUMHww/BIVyxoRREeOA0IEqwF84hr13OzqHidVWuuktjS7/hp6U+i7qvqsZE1LSrnMzy+D7WWfBi2kyCKuT2LjQwJMYDLyYZCTRMKEUMjQivqINpbkEkm4JuCJ5c/bwrpfE6T2FJqJWLJ5F54pl3jZf229JP4wYl72LOQgbZ9bPHNxrK1vNRq5yFv+9i+5frtwhH3SZARk46/d/FSAM40O+h9mYj8c6heBK04Z8XV4++UEHxz7yeTUhc0SAFqeSlX6co0man3bshKo/Zvigzioz3kkdqOGNw3Z5PaGJNNCHJqLbCIqq/XryK2wBJWCWZfBC9qm/HJZ/5a1yN1vH1/gHUsgEQ8ZDQJO/LbLUdl6w+n+01HkSwRXvoipwzHt8eHBntSeX9fG7J0cft+gqcKcMrSJqdAQJzvOJLpvH1ycuRLIlCAM5CeQPeywe7vEOmqaPb7SDW4YeBq89NVccdWFmd+r0Ghd5cII29gySRUiBwnrD8VM+s0mi2Vz0Ta3lHxfM20IduS7Ecu0lHE903I88X52zxjt+yKKgB4uYnEJ5PHUbeVh X-OriginatorOrg: kalrayinc.com X-MS-Exchange-CrossTenant-Network-Message-Id: e534fd21-48f0-4c24-3243-08dcf1d4e643 X-MS-Exchange-CrossTenant-AuthSource: PAYP264MB3766.FRAP264.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2024 13:33:07.9985 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8931925d-7620-4a64-b7fe-20afd86363d3 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: QH1PP+A6oSJI72aC/BhZiypWVMTDk2EYnt0Kpzh8W3e2hcmpngqMnfvwon7znGzACj9mOWPILQJoHHUbfyJ8AQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MR1P264MB2339 X-ALTERMIMEV2_out: done Content-Type: text/plain; charset="utf-8" Use the new fallback memcpy_{from,to}io and memset_io functions from asm-generic/io.h on the csky processor architecture. Acked-by: Guo Ren Reviewed-by: Yann Sionneau Signed-off-by: Julian Vetter --- Changes for v10: - Slightly updated commit message to clarify that on csky we now use the fallback from asm-generic/io.h --- arch/csky/include/asm/io.h | 11 ----- arch/csky/kernel/Makefile | 2 +- arch/csky/kernel/io.c | 91 -------------------------------------- 3 files changed, 1 insertion(+), 103 deletions(-) delete mode 100644 arch/csky/kernel/io.c diff --git a/arch/csky/include/asm/io.h b/arch/csky/include/asm/io.h index 4725bb977b0f..ed53f0b47388 100644 --- a/arch/csky/include/asm/io.h +++ b/arch/csky/include/asm/io.h @@ -31,17 +31,6 @@ #define writel(v,c) ({ wmb(); writel_relaxed((v),(c)); mb(); }) #endif =20 -/* - * String version of I/O memory access operations. - */ -extern void __memcpy_fromio(void *, const volatile void __iomem *, size_t); -extern void __memcpy_toio(volatile void __iomem *, const void *, size_t); -extern void __memset_io(volatile void __iomem *, int, size_t); - -#define memset_io(c,v,l) __memset_io((c),(v),(l)) -#define memcpy_fromio(a,c,l) __memcpy_fromio((a),(c),(l)) -#define memcpy_toio(c,a,l) __memcpy_toio((c),(a),(l)) - /* * I/O memory mapping functions. */ diff --git a/arch/csky/kernel/Makefile b/arch/csky/kernel/Makefile index 8a868316b912..de1c3472e8f0 100644 --- a/arch/csky/kernel/Makefile +++ b/arch/csky/kernel/Makefile @@ -2,7 +2,7 @@ extra-y :=3D vmlinux.lds =20 obj-y +=3D head.o entry.o atomic.o signal.o traps.o irq.o time.o vdso.o vd= so/ -obj-y +=3D power.o syscall.o syscall_table.o setup.o io.o +obj-y +=3D power.o syscall.o syscall_table.o setup.o obj-y +=3D process.o cpu-probe.o ptrace.o stacktrace.o obj-y +=3D probes/ =20 diff --git a/arch/csky/kernel/io.c b/arch/csky/kernel/io.c deleted file mode 100644 index 5883f13fa2b1..000000000000 --- a/arch/csky/kernel/io.c +++ /dev/null @@ -1,91 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 - -#include -#include -#include - -/* - * Copy data from IO memory space to "real" memory space. - */ -void __memcpy_fromio(void *to, const volatile void __iomem *from, size_t c= ount) -{ - while (count && !IS_ALIGNED((unsigned long)from, 4)) { - *(u8 *)to =3D __raw_readb(from); - from++; - to++; - count--; - } - - while (count >=3D 4) { - *(u32 *)to =3D __raw_readl(from); - from +=3D 4; - to +=3D 4; - count -=3D 4; - } - - while (count) { - *(u8 *)to =3D __raw_readb(from); - from++; - to++; - count--; - } -} -EXPORT_SYMBOL(__memcpy_fromio); - -/* - * Copy data from "real" memory space to IO memory space. - */ -void __memcpy_toio(volatile void __iomem *to, const void *from, size_t cou= nt) -{ - while (count && !IS_ALIGNED((unsigned long)to, 4)) { - __raw_writeb(*(u8 *)from, to); - from++; - to++; - count--; - } - - while (count >=3D 4) { - __raw_writel(*(u32 *)from, to); - from +=3D 4; - to +=3D 4; - count -=3D 4; - } - - while (count) { - __raw_writeb(*(u8 *)from, to); - from++; - to++; - count--; - } -} -EXPORT_SYMBOL(__memcpy_toio); - -/* - * "memset" on IO memory space. - */ -void __memset_io(volatile void __iomem *dst, int c, size_t count) -{ - u32 qc =3D (u8)c; - - qc |=3D qc << 8; - qc |=3D qc << 16; - - while (count && !IS_ALIGNED((unsigned long)dst, 4)) { - __raw_writeb(c, dst); - dst++; - count--; - } - - while (count >=3D 4) { - __raw_writel(qc, dst); - dst +=3D 4; - count -=3D 4; - } - - while (count) { - __raw_writeb(c, dst); - dst++; - count--; - } -} -EXPORT_SYMBOL(__memset_io); --=20 2.34.1 From nobody Tue Nov 26 04:38:20 2024 Received: from smtpout35.security-mail.net (smtpout35.security-mail.net [85.31.212.35]) (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 B45721F81B7 for ; Mon, 21 Oct 2024 13:33:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=85.31.212.35 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729517633; cv=fail; b=I2Sr+rQPciH7bwVF5/l4qONMO4ByeWISQ9504gPxCq69jyhtZsryd6fppjGM8sI5/bDRroJPooatM/Ju7YzrwFSQNkG3fwugwSsHd3gS77ApOJ7zF92FRQMwz/y3S8ic/buIsHQefY1Qzc1EPLlvHm8cI+BXwHg8M6q421Ihnog= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729517633; c=relaxed/simple; bh=9MrRi+HIu1RpyTjzo4eMu1vZlTPkh23XxFp3JMnYzCA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=DoJoaOnjwA2dx7uWRIgkXQCP7Xb6aMNrXCKwqGripxS1VVS4zmN6vfjR7+Q5dV8WlodxNBrYaOl45MpDyQpegBz35D4wRBj56byYAKWYh2IH/YGnzQs2yDKd5RCx3jA5/1ZNT+RpqilruMpy3PXAbO2qAD2mOoa4V76wDComQhE= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=kalrayinc.com; spf=pass smtp.mailfrom=kalrayinc.com; dkim=pass (1024-bit key) header.d=kalrayinc.com header.i=@kalrayinc.com header.b=hvoGeB6H; dkim=fail (2048-bit key) header.d=kalrayinc.com header.i=@kalrayinc.com header.b=KOkrBftH reason="signature verification failed"; arc=fail smtp.client-ip=85.31.212.35 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=kalrayinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kalrayinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=kalrayinc.com header.i=@kalrayinc.com header.b="hvoGeB6H"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=kalrayinc.com header.i=@kalrayinc.com header.b="KOkrBftH" Received: from localhost (fx305.security-mail.net [127.0.0.1]) by fx305.security-mail.net (Postfix) with ESMTP id 963F830F17D for ; Mon, 21 Oct 2024 15:33:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kalrayinc.com; s=sec-sig-email; t=1729517591; bh=9MrRi+HIu1RpyTjzo4eMu1vZlTPkh23XxFp3JMnYzCA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=hvoGeB6Hc+iKZlAiL9tZQ7LI2rn1tHT4yeqWS48dvmMQrP6R1NErXZ8t18wDl5qQW 279WcO4kLFmi416cF+0FnzTaRNnjmNZ5DuonXLw4w+j+h9G74xkOSVLx6ecBWw789y R9M0eJYW4X2Iwcn1F9F2LITyDKLd32MFITCn4X2g= Received: from fx305 (fx305.security-mail.net [127.0.0.1]) by fx305.security-mail.net (Postfix) with ESMTP id EEE4230F08A; Mon, 21 Oct 2024 15:33:10 +0200 (CEST) Received: from PR0P264CU014.outbound.protection.outlook.com (mail-francecentralazlp17012054.outbound.protection.outlook.com [40.93.76.54]) by fx305.security-mail.net (Postfix) with ESMTPS id 03C3530EDE2; Mon, 21 Oct 2024 15:33:10 +0200 (CEST) Received: from PAYP264MB3766.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:118::6) by MR1P264MB2339.FRAP264.PROD.OUTLOOK.COM (2603:10a6:501:34::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.29; Mon, 21 Oct 2024 13:33:09 +0000 Received: from PAYP264MB3766.FRAP264.PROD.OUTLOOK.COM ([fe80::6fc2:2c8c:edc1:f626]) by PAYP264MB3766.FRAP264.PROD.OUTLOOK.COM ([fe80::6fc2:2c8c:edc1:f626%3]) with mapi id 15.20.8069.027; Mon, 21 Oct 2024 13:33:08 +0000 X-Secumail-id: ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=OLdEx5zBIhxlI+ciim1NNGxybSUKLysqvQjYipcO+OmTK/11aMnsy6uLn6Y8CDoN7W7P+E2/1WXLqMjqZ8MmC5VI2AH4qVgnnITK8/OhwUVRsKqr2l3ThUVrCJmER3spIejU+9UtNZAwde1WIKn+Qc9EsJPMqr1eqOxYb2niMHZ8M7F+5G1/S+jhkwhC4SI2flVfmkTJH5iWAnrfPtQc87qvfPoyHjBGEyygfV5eoLh8vgn8pTODGQplQgToT1G/pcXmSUXft1ogXJa4v6AZKZ69WFTaqWikqkgsPzFlfZA5yONqTKm4W+ltMKPr2sN+6FtFdGIZwP7mjcDi7NePJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=l7Njht9EXOov+4QFI7riJf17Y/k/EfOjTSncmbNefbI=; b=VMwz6aa/o2MWdEbFajwCZm2E1eK37MdV+VXagon2jr6vZV8v0osyUjyqj1iIt5jYEgBwrt/VpemGlnNuZWNlMS7CYTwQ5NqabMz9KYdLAg+crafEEPB9lhj3zU+av/qL0gjAV0+RjwPZBp2B/VHT3GC+RphT0VGPBDJzNafBf+JLddfGRQ++dDQJFbSFztBKOzQm+u9U2PN4vDE1AUL8BaNoxTvsao03J0/cXJQOPajepYFnGUY0pFArC611naNlZ8W5BwmtlX+Y0N+ESBvTAJe3i5XO2aVdiDgTo3ftdQHIeYkiW+oT+3iEnLvXIR2j4m/TEDL54iIJ0J3A8xYHwQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=kalrayinc.com; dmarc=pass action=none header.from=kalrayinc.com; dkim=pass header.d=kalrayinc.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kalrayinc.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=l7Njht9EXOov+4QFI7riJf17Y/k/EfOjTSncmbNefbI=; b=KOkrBftHFJwHxQC0cQ8cUg4/L+QnxCF2uK0nmNmMojq/UzWJA2X8+BpG7P7k/cp5V4btjgDgV3hKctnyUGrJYoLO6n1iECVHFDMxfmlCvLGg+X2G1MIYBe7/NyqCd+6am+lnXwMc2TQAp6YtbNC3hEnyJmbT8mo31ONBJCelEiB9ump9qAkCf//CXh603LMuwA0xV+jXxTtbNCfh+8wK76XJnwpD/rGZpVLz8+mBBJxas6rSDQz0a7vlH4l96NdAhna26dKBrtPQpSBAm17i2X8OVdLCI//R4Zk5je2PDTKPCucEp1QHBWaYRY2tbVeB37idXjJii/CfiDQbtYtJig== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=kalrayinc.com; From: Julian Vetter To: Arnd Bergmann , Catalin Marinas , Will Deacon , Guo Ren , Huacai Chen , WANG Xuerui , Andrew Morton , Geert Uytterhoeven , Richard Henderson , Niklas Schnelle , Takashi Iwai , Miquel Raynal , David Laight , Johannes Berg , Christoph Hellwig Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-csky@vger.kernel.org, loongarch@lists.linux.dev, linux-arch@vger.kernel.org, Yann Sionneau , Julian Vetter Subject: [PATCH v10 4/4] loongarch: Use new fallback IO memcpy/memset Date: Mon, 21 Oct 2024 15:31:54 +0200 Message-ID: <20241021133154.516847-5-jvetter@kalrayinc.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241021133154.516847-1-jvetter@kalrayinc.com> References: <20241021133154.516847-1-jvetter@kalrayinc.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS4P192CA0012.EURP192.PROD.OUTLOOK.COM (2603:10a6:20b:5da::20) To PAYP264MB3766.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:118::6) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAYP264MB3766:EE_|MR1P264MB2339:EE_ X-MS-Office365-Filtering-Correlation-Id: ca301b52-955c-426c-e4aa-08dcf1d4e6d6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|52116014|7416014|376014|1800799024|921020|38350700014; X-Microsoft-Antispam-Message-Info: JWJ4gjrindRvyprbjFVJokFDqjHe6mWgnjeWGpq/7TVdzZk/oVE82SnZTtDU36mT4Csi96eA4cih2HvQV6q8qPp+3a1H6hSTgkGb7rMLVr2mWJH1TT2Dx41bWccClK3ZzBPLkcBBRKoczuPaNd4rsiwjnmZGWySBbG7EoRd1Xc6Cn8wPjqIFsTZuSkTfykqv37UWyZzUZthXDeZvw2qOEfKOMo+x+SoNi8Alm1uStrjPi3x6hP3T69Ph8EmuITsabxdnsRi6l7AAKKDfcqtNKNUzECZ4NalZXfEpn60bfyt54UXhO1OeyJAhr4K8W2yk2o+ZM/IG4uHfGF3xA+tK1TH1kX+B62wZYxRw0TaL5f0LPyXpnLYauEtasfH6WitkGrhLm3TJbMVJZTmEVHLm9zt+VuQgdArHA/n+S8uk2HJOUUFkP+BfBvrZ9hbuq4GUA68ZLa7a2cNoH0NeAWr92Fjpj3V4iG6gOpCOIiA3kBfD6FDLvfSaKc7WqP+HygCMvV1RXdVHPV1n//iHyEilEEAfaSF9rHxFu8mVEtDHMcpFU7WnzgS98JCZmAgr8hMqIg6dQdk6P+92gxgzoRqnsWRUs/H2cU6UzWR6dSD3rAVdKjUlcHxCZ9VyUTkjTrfVbFdGDQe0Cw9hrX8f6XkOZtwsu10N7kxMRwMRGn4+yw8SKYtp0vz8pB9us8LYWr1q3GUIyeNEwVqne9XIuxk5A/pS2TYLRv7ODcAF7xlgp1SntfNwqFyHL0ANwm8IBA3H0xM31tf5c7s6E5knHXTS+NgYbuigZ5GTVtIbEbumVlynQsfhKygeWP7BdAKE3rSpBSa8ig7EM6i3OIDBdGtBOs0CPEKoxlmojcoOT30iMNfMWmI004zjEPT5zvKxV3nLRclaqb5XatMjQ32uNkknFpDan9aQxf5uM45/YfJuh/8OUntEu4HjQhleSTlJnX8k3h2 lsu2QJLBK08FEkWnWh/EvKX6quIW/PcCbZmffz922RYiM9WeBoG7UHhGOSFZzbrFyIOIT0l2e5iJpAK1RHgEwRCxf0EF+9MOy65buY6C5+Vxh+ZcPz7VRQxjEDf0jX3xS0rp0HZj8KOUnAqirkPftYtv8tkZeojWXaY2Gb/tJTbuLmjGGiaQUhDyXYgGYLRhLh3h6Zl7X87w/bewdolagW/E2kCY8W/lFSJMzxPivQvSBy92uHTEbsMBvqRs+a/R88ntnj8u2CGenue73iSVrkTlhU698Y8OAa1I7IlRgb01CLHkYT+YEoQq9Vpr93CQLn8twsabBDWOLXhz05T5omQHLQd/E0VAsgGQ5x8BPgYvLQnOmJOTljt9ChkH575pCOlGea2dzVKxO/D+BKnomURIaEvGkEvRlDTEmnqRvTxRKuRwqmm4bc2oqCWa0 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAYP264MB3766.FRAP264.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(366016)(52116014)(7416014)(376014)(1800799024)(921020)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: q7pAdVamevcwDP24bVE0E5CcpsZi9WrlU866JQwuRhfQxVc33Ta0eZWVmjCKPmVrgIoqke1sOF/ZByybLquG3xNaDc1APaV7Dg4o4+BU3EyWJ5TvdMAZfgkVNPdCXB0T1qvSkwpJP0tSDcv+C9DcyWbdja2gZRlAVLF49etqeYj3zfGSWJXnS2r+sEyKeQ8aumuOaPA3+qvL+g5off1UpxzAjWaSo56Z/L7/eZw1c4eAUTYob14/YBNai7vHo0HHVyT6a2vShBAjpDkHCMlPrfl6UfbSGvuG4lyRT0fQyt67vLV6TD7xUYGfBgf4x9jIf2JtIzeQTRhDBziNSHjM4bQgf+sUThjtgTHZcPhfFQkE691UppcB0OEqek1nZ4vNx0kiO5kutpgEDZK37e0g9HdQ+HnkJacQY4X+cbwB53WrR2h/WLQsZXFevFSGbTJpXty1mMziGYROS8eR42Y9PNLVEB6HJ+IUNzm7kRyeGaCzS0sF+yrL075QV15SAcM1DVYVO+ZZ2T4EjZ+gyk2PjPldUayWhUA7PeHF3zY6gWzZ5om88Be0bLxngPgxrNWJCAiJrAfIZeHPQQWMUobJd79WImzGdvOW+/7qjXZQP3W6t/wyHamG02X/RFzd0itYvyVk006P5vkS6OmsbUgXmzumRkxo339Co4EuSj9LLgbO4uag1/LRVTWfLfkjuRYWA2JiI9crjF5z8Ok50Lky7kz84dRF2IES7ADwzDtBrvrGSbb4KYpOo9KzTtI6TrXs9D8c/Nts5jnKeiuyYdqyWGpwvssVN5e6bMYC4EDjihZm2uY2ke0krPsO4nZh7cvWYKGRjSSc4uvfD/E9Rbr/Z3n2x1b3lqpTRAgH3HwtwwJieKL/98i13eofRM5X373zD1MQ6s+wfrtWzbsmFC4sRuaX53WWButgnlt0thqgY5pTCb/riCkj/hDj4iauEiGM mXytdLrulW5/ErKlfMWu1CwI0SICKqUN+wut6RKdo0zOIqfYKfggedacSt6v84qm/NmcQr1J2ic/bVvDuv3wNbOFiy1xDjps5j/DdMxgDJZCrJGva7oY7o/8ruG9bUeyFx5Gcy3dRZNgTX49jxdlUR3ovi4jwHFGOUoc/0BonAva46TaRlYMjh7kjJO9p6vif23TLOnN1JL+i9thJgJWofavpVTt2mCmDGASeCdTkINUtXtLYPZTP6TbwI9pRRB/4wJCYAqz5U/XofJ6xBvXVXeP+BSi1oYOL7RFIj3f8UHmoRpbfV/Ls2R4ULm4nO/EAC7NLitcyACTCqZzBp+cz9Dx5YrVJNzczJnl52YFHHyozMxGSFvKiw4CJxokL44iRsf4kmiOAEN45CxLHvnbpMtVwkYDTAORg9qRouKFImg8W4XjhxxLofl0E+QJeh6K6yG1y7s6nPRLzw6SJfdYxSiFvbnZ80R/cf/AlRcb42Emo+mUjfwHJhupllbmogNCobC4kYaxaB24Xf3SI0m+Q+windOj/coAxRzk15JWf7bjKHcg33PfygEO5aINBUu+WBZaYK7c3Pm4cVfh0qgQc4XYzAbwgEsI8AmHk9oTQwYoPjeIA3xgn0XR2HCwWOcv X-OriginatorOrg: kalrayinc.com X-MS-Exchange-CrossTenant-Network-Message-Id: ca301b52-955c-426c-e4aa-08dcf1d4e6d6 X-MS-Exchange-CrossTenant-AuthSource: PAYP264MB3766.FRAP264.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2024 13:33:08.8848 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8931925d-7620-4a64-b7fe-20afd86363d3 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: EFeQpEgGJTN1Wm29wkZeK2LrbBrwHTqjxfA+Amsltq1itEq2kvT1tHf6MAe+STmIChc0kCrgLbHTVYbwj2UNug== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MR1P264MB2339 X-ALTERMIMEV2_out: done Content-Type: text/plain; charset="utf-8" Use the new fallback memcpy_{from,to}io and memset_io functions from asm-generic/io.h on the loongarch processor architecture. Reviewed-by: Yann Sionneau Signed-off-by: Julian Vetter --- Changes for v10: - Slightly updated commit message to clarify that on loongarch we now use the fallback from asm-generic/io.h --- arch/loongarch/include/asm/io.h | 10 ---- arch/loongarch/kernel/Makefile | 2 +- arch/loongarch/kernel/io.c | 94 --------------------------------- 3 files changed, 1 insertion(+), 105 deletions(-) delete mode 100644 arch/loongarch/kernel/io.c diff --git a/arch/loongarch/include/asm/io.h b/arch/loongarch/include/asm/i= o.h index 5e95a60df180..e77a56eaf906 100644 --- a/arch/loongarch/include/asm/io.h +++ b/arch/loongarch/include/asm/io.h @@ -62,16 +62,6 @@ static inline void __iomem *ioremap_prot(phys_addr_t off= set, unsigned long size, =20 #define mmiowb() wmb() =20 -/* - * String version of I/O memory access operations. - */ -extern void __memset_io(volatile void __iomem *dst, int c, size_t count); -extern void __memcpy_toio(volatile void __iomem *to, const void *from, siz= e_t count); -extern void __memcpy_fromio(void *to, const volatile void __iomem *from, s= ize_t count); -#define memset_io(c, v, l) __memset_io((c), (v), (l)) -#define memcpy_fromio(a, c, l) __memcpy_fromio((a), (c), (l)) -#define memcpy_toio(c, a, l) __memcpy_toio((c), (a), (l)) - #define __io_aw() mmiowb() =20 #ifdef CONFIG_KFENCE diff --git a/arch/loongarch/kernel/Makefile b/arch/loongarch/kernel/Makefile index c9bfeda89e40..9497968ee158 100644 --- a/arch/loongarch/kernel/Makefile +++ b/arch/loongarch/kernel/Makefile @@ -8,7 +8,7 @@ OBJECT_FILES_NON_STANDARD_head.o :=3D y extra-y :=3D vmlinux.lds =20 obj-y +=3D head.o cpu-probe.o cacheinfo.o env.o setup.o entry.o genex.o \ - traps.o irq.o idle.o process.o dma.o mem.o io.o reset.o switch.o \ + traps.o irq.o idle.o process.o dma.o mem.o reset.o switch.o \ elf.o syscall.o signal.o time.o topology.o inst.o ptrace.o vdso.o \ alternative.o unwind.o =20 diff --git a/arch/loongarch/kernel/io.c b/arch/loongarch/kernel/io.c deleted file mode 100644 index cb85bda5a6ad..000000000000 --- a/arch/loongarch/kernel/io.c +++ /dev/null @@ -1,94 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Copyright (C) 2020-2022 Loongson Technology Corporation Limited - */ -#include -#include -#include - -/* - * Copy data from IO memory space to "real" memory space. - */ -void __memcpy_fromio(void *to, const volatile void __iomem *from, size_t c= ount) -{ - while (count && !IS_ALIGNED((unsigned long)from, 8)) { - *(u8 *)to =3D __raw_readb(from); - from++; - to++; - count--; - } - - while (count >=3D 8) { - *(u64 *)to =3D __raw_readq(from); - from +=3D 8; - to +=3D 8; - count -=3D 8; - } - - while (count) { - *(u8 *)to =3D __raw_readb(from); - from++; - to++; - count--; - } -} -EXPORT_SYMBOL(__memcpy_fromio); - -/* - * Copy data from "real" memory space to IO memory space. - */ -void __memcpy_toio(volatile void __iomem *to, const void *from, size_t cou= nt) -{ - while (count && !IS_ALIGNED((unsigned long)to, 8)) { - __raw_writeb(*(u8 *)from, to); - from++; - to++; - count--; - } - - while (count >=3D 8) { - __raw_writeq(*(u64 *)from, to); - from +=3D 8; - to +=3D 8; - count -=3D 8; - } - - while (count) { - __raw_writeb(*(u8 *)from, to); - from++; - to++; - count--; - } -} -EXPORT_SYMBOL(__memcpy_toio); - -/* - * "memset" on IO memory space. - */ -void __memset_io(volatile void __iomem *dst, int c, size_t count) -{ - u64 qc =3D (u8)c; - - qc |=3D qc << 8; - qc |=3D qc << 16; - qc |=3D qc << 32; - - while (count && !IS_ALIGNED((unsigned long)dst, 8)) { - __raw_writeb(c, dst); - dst++; - count--; - } - - while (count >=3D 8) { - __raw_writeq(qc, dst); - dst +=3D 8; - count -=3D 8; - } - - while (count) { - __raw_writeb(c, dst); - dst++; - count--; - } -} -EXPORT_SYMBOL(__memset_io); --=20 2.34.1