From nobody Mon Jun 29 23:59:12 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 724EAC433F5 for ; Sat, 29 Jan 2022 18:43:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353018AbiA2Sm7 (ORCPT ); Sat, 29 Jan 2022 13:42:59 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:57313 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244826AbiA2Sm4 (ORCPT ); Sat, 29 Jan 2022 13:42:56 -0500 Received: from quad ([82.142.10.94]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MNLZc-1muhvr16ss-00OsUF; Sat, 29 Jan 2022 19:42:29 +0100 From: Laurent Vivier To: linux-kernel@vger.kernel.org Cc: Alessandro Zummo , Daniel Lezcano , Alexandre Belloni , Thomas Gleixner , Geert Uytterhoeven , Stephen Boyd , linux-m68k@lists.linux-m68k.org, linux-rtc@vger.kernel.org, Jiaxun Yang , Arnd Bergmann , John Stultz , Laurent Vivier Subject: [PATCH v13 1/5] m68k: add asm/config.h Date: Sat, 29 Jan 2022 19:42:21 +0100 Message-Id: <20220129184225.407100-2-laurent@vivier.eu> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220129184225.407100-1-laurent@vivier.eu> References: <20220129184225.407100-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:774je6OltzTn9C5G4dxicOinjsUtlauL08L2DJBb4lII+dtFuz9 nA2kidupU4Jp0N2adtxbiDDDFfidF/0My78s+x4srkwKsHMJvJrY7hXIscrTi1daUpRHgUJ fyj1fwX+qOTY6nA0AIqm1tEw982HF20QgzxLCCldaFzcXWiK4CvKDht7LKfax1hrqH4ga4p 2inf1fwLLld3428AaWFIg== X-UI-Out-Filterresults: notjunk:1;V03:K0:CNcCpKsRKPQ=:c/tPO0FE/M+FNtkxMg0MVa 16rU1iq/8CibjGDwNx7GW4HUV5SzrX5jtEsWwQMksJSPGzt2sRGVvEzKGcadgZjyzvqw1UlKW 7UCnCaD7MJQ2Wo2raArt477YcJd9BNPoJjWtd+8MX/ezM9uJNG4t8MRjJovvRqSDu3mOtTt9t oJmVLby1MVMBk5ydA6ViTYQCULo1KI3L3i0NBQ/TmBRmZgDRtS6TNY5mXeET9RfGSF9Ui1LQW KGgWVjElLLqv3/rpXpmwtv9hgynOuBS0qTRAaDrQjt1HxIw1NzRmbu2u4GH8H5GDZDSFsdQLd DjnKkaptt6fqs/yesLiURcdAKHAs70Q8rHQRYUOJ0iDSEYA94R3amEO6rtcyLAulhVZmttRs/ 04kDwVbablOztJfhs66PejvL/xp4OFMjfYU44i92vf2mW00O8SmsGRzLWzfVv9Gq1hBy29KE7 HiaSBkoyjpUVYmjSKU+HsaqwCo0mn6R5W6Wl+VC8zTI8ZolS8GneYSm27Xaf59vRRUB+7helw OCVa2iiq/GDPIdzh8naJUTTyyPZSMHEbFfNiZchIceBdeNJJAL+PeUC+hUyhb0oqsqMZp8jUw VeKpo0HWrrWauLe2C8p8aoN0qjThv+WrlLHJG61u6UKkqGrlBK9yWpG/jF+MMk2Gt+jesCGgj A6dhQTj3Dui+WSepXE5i696J8Bd5eDytxVOCs4OC7CwxxseGYWvlIZ+A85codglA9xI8= Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" To avoid 'warning: no previous prototype for' error, declare all the parse_bootinfo and config functions prototypes into asm/config.h and include it in arch/m68k/kernel/setup_mm.c and arch/m68k/*/config.c Signed-off-by: Laurent Vivier Reviewed-by: Geert Uytterhoeven --- arch/m68k/amiga/config.c | 1 + arch/m68k/apollo/config.c | 1 + arch/m68k/atari/config.c | 1 + arch/m68k/bvme6000/config.c | 1 + arch/m68k/hp300/config.c | 1 + arch/m68k/include/asm/config.h | 33 +++++++++++++++++++++++++++++++++ arch/m68k/kernel/setup_mm.c | 23 +---------------------- arch/m68k/mac/config.c | 1 + arch/m68k/mvme147/config.c | 1 + arch/m68k/mvme16x/config.c | 1 + arch/m68k/q40/config.c | 1 + 11 files changed, 43 insertions(+), 22 deletions(-) create mode 100644 arch/m68k/include/asm/config.h diff --git a/arch/m68k/amiga/config.c b/arch/m68k/amiga/config.c index be2dfab48fd4..3137b45750df 100644 --- a/arch/m68k/amiga/config.c +++ b/arch/m68k/amiga/config.c @@ -37,6 +37,7 @@ #include #include #include +#include =20 static unsigned long amiga_model; =20 diff --git a/arch/m68k/apollo/config.c b/arch/m68k/apollo/config.c index 581a5f68d102..42a8b8e2b664 100644 --- a/arch/m68k/apollo/config.c +++ b/arch/m68k/apollo/config.c @@ -16,6 +16,7 @@ #include #include #include +#include =20 u_long sio01_physaddr; u_long sio23_physaddr; diff --git a/arch/m68k/atari/config.c b/arch/m68k/atari/config.c index 261a0f57cc9a..38a7c0578105 100644 --- a/arch/m68k/atari/config.c +++ b/arch/m68k/atari/config.c @@ -46,6 +46,7 @@ #include #include #include +#include =20 u_long atari_mch_cookie; EXPORT_SYMBOL(atari_mch_cookie); diff --git a/arch/m68k/bvme6000/config.c b/arch/m68k/bvme6000/config.c index 0c6feafbbd11..9b060d466e03 100644 --- a/arch/m68k/bvme6000/config.c +++ b/arch/m68k/bvme6000/config.c @@ -36,6 +36,7 @@ #include #include #include +#include =20 static void bvme6000_get_model(char *model); extern void bvme6000_sched_init(void); diff --git a/arch/m68k/hp300/config.c b/arch/m68k/hp300/config.c index ce1eb3d3d55d..2c92843397c3 100644 --- a/arch/m68k/hp300/config.c +++ b/arch/m68k/hp300/config.c @@ -22,6 +22,7 @@ #include #include /* readb() and writeb() = */ #include +#include =20 #include "time.h" =20 diff --git a/arch/m68k/include/asm/config.h b/arch/m68k/include/asm/config.h new file mode 100644 index 000000000000..aae61070628b --- /dev/null +++ b/arch/m68k/include/asm/config.h @@ -0,0 +1,33 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +/* + * This file contains prototypes provided by each m68k machine + * to parse bootinfo data structures and to configure the machine + */ + +#ifndef _M68K_CONFIG_H +#define _M68K_CONFIG_H + +extern int amiga_parse_bootinfo(const struct bi_record *record); +extern int atari_parse_bootinfo(const struct bi_record *record); +extern int mac_parse_bootinfo(const struct bi_record *record); +extern int q40_parse_bootinfo(const struct bi_record *record); +extern int bvme6000_parse_bootinfo(const struct bi_record *record); +extern int mvme16x_parse_bootinfo(const struct bi_record *record); +extern int mvme147_parse_bootinfo(const struct bi_record *record); +extern int hp300_parse_bootinfo(const struct bi_record *record); +extern int apollo_parse_bootinfo(const struct bi_record *record); + +extern void config_amiga(void); +extern void config_atari(void); +extern void config_mac(void); +extern void config_sun3(void); +extern void config_apollo(void); +extern void config_mvme147(void); +extern void config_mvme16x(void); +extern void config_bvme6000(void); +extern void config_hp300(void); +extern void config_q40(void); +extern void config_sun3x(void); + +#endif /* _M68K_CONFIG_H */ diff --git a/arch/m68k/kernel/setup_mm.c b/arch/m68k/kernel/setup_mm.c index 49e573b94326..8228275aae3e 100644 --- a/arch/m68k/kernel/setup_mm.c +++ b/arch/m68k/kernel/setup_mm.c @@ -47,6 +47,7 @@ #endif #include #include +#include =20 #if !FPSTATESIZE || !NR_IRQS #warning No CPU/platform type selected, your kernel will not work! @@ -113,28 +114,6 @@ EXPORT_SYMBOL(isa_type); EXPORT_SYMBOL(isa_sex); #endif =20 -extern int amiga_parse_bootinfo(const struct bi_record *); -extern int atari_parse_bootinfo(const struct bi_record *); -extern int mac_parse_bootinfo(const struct bi_record *); -extern int q40_parse_bootinfo(const struct bi_record *); -extern int bvme6000_parse_bootinfo(const struct bi_record *); -extern int mvme16x_parse_bootinfo(const struct bi_record *); -extern int mvme147_parse_bootinfo(const struct bi_record *); -extern int hp300_parse_bootinfo(const struct bi_record *); -extern int apollo_parse_bootinfo(const struct bi_record *); - -extern void config_amiga(void); -extern void config_atari(void); -extern void config_mac(void); -extern void config_sun3(void); -extern void config_apollo(void); -extern void config_mvme147(void); -extern void config_mvme16x(void); -extern void config_bvme6000(void); -extern void config_hp300(void); -extern void config_q40(void); -extern void config_sun3x(void); - #define MASK_256K 0xfffc0000 =20 extern void paging_init(void); diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c index 5d16f9b47aa9..65d124ec80bb 100644 --- a/arch/m68k/mac/config.c +++ b/arch/m68k/mac/config.c @@ -47,6 +47,7 @@ #include #include #include +#include =20 /* Mac bootinfo struct */ struct mac_booter_data mac_bi_data; diff --git a/arch/m68k/mvme147/config.c b/arch/m68k/mvme147/config.c index dfd6202fd403..b96ea7c76a19 100644 --- a/arch/m68k/mvme147/config.c +++ b/arch/m68k/mvme147/config.c @@ -34,6 +34,7 @@ #include #include #include +#include =20 =20 static void mvme147_get_model(char *model); diff --git a/arch/m68k/mvme16x/config.c b/arch/m68k/mvme16x/config.c index b4422c2dfbbf..88cbdc10925b 100644 --- a/arch/m68k/mvme16x/config.c +++ b/arch/m68k/mvme16x/config.c @@ -37,6 +37,7 @@ #include #include #include +#include =20 extern t_bdid mvme_bdid; =20 diff --git a/arch/m68k/q40/config.c b/arch/m68k/q40/config.c index 5caf1e5be1c2..9237243077ce 100644 --- a/arch/m68k/q40/config.c +++ b/arch/m68k/q40/config.c @@ -34,6 +34,7 @@ #include #include #include +#include =20 extern void q40_init_IRQ(void); static void q40_get_model(char *model); --=20 2.34.1 From nobody Mon Jun 29 23:59:12 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D163CC4167D for ; Sat, 29 Jan 2022 18:43:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353034AbiA2SnE (ORCPT ); Sat, 29 Jan 2022 13:43:04 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:39423 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244936AbiA2Sm5 (ORCPT ); Sat, 29 Jan 2022 13:42:57 -0500 Received: from quad ([82.142.10.94]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MCsDe-1n57Fm1kpM-008nlh; Sat, 29 Jan 2022 19:42:30 +0100 From: Laurent Vivier To: linux-kernel@vger.kernel.org Cc: Alessandro Zummo , Daniel Lezcano , Alexandre Belloni , Thomas Gleixner , Geert Uytterhoeven , Stephen Boyd , linux-m68k@lists.linux-m68k.org, linux-rtc@vger.kernel.org, Jiaxun Yang , Arnd Bergmann , John Stultz , Laurent Vivier , stable@vger.kernel.org Subject: [PATCH v13 2/5] tty: goldfish: introduce gf_ioread32()/gf_iowrite32() Date: Sat, 29 Jan 2022 19:42:22 +0100 Message-Id: <20220129184225.407100-3-laurent@vivier.eu> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220129184225.407100-1-laurent@vivier.eu> References: <20220129184225.407100-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:rJdGcDZPOd8iFGvsfhFAhZGfaGQ3KH01uuYfuFmzFdR4xA+dDmG PerZ4Khty6XTEGdXPvtWycQC0+pg0hX/SLBdYNWV18ANKQ8VXSr+EKdRJQ7zNPVXBLSDhvj cBm5Ej+I8E1ltq9IHvcYtPVNFV0aGgquukZdGehHlFOUbeOLLLVaLkNPR4IWGKgB5v0YAtJ 28dv4nwzaqa3jJ0DfItfA== X-UI-Out-Filterresults: notjunk:1;V03:K0:SA3O38Ox8EM=:/6WXMzKAl18M9wD8KiTP1S RoM/8Wov/GIHZlCncR1F/uhNAVhNgrmnwFnJAyGOYu7dmgsX5F0LrEBuL3t2WS5E1j2tBqb2W 1NDvgCVbf+quheXIY6LfWKb7883v/QCVO1lFqfhcr7reSReVPDwBzjDEvFHfOMNuhwk+LY3GS hXYeNMFAJ+ppZ9wQdZC/V7VZsyTDT+EMy9A2/dmRdsZ+PBBs8lZidU/lY/E+s4rhQzxt5lW17 D3OEgnw/sVTKqs0jYNetpYxNiKBD/KM6t4qlRjkDLzl3BZ0klGC0NDe/2uZcjrKFaix8qBs3g h0a/ZS2BsT1yI96Ff/hMa+p8Y/X1aTImqQB4SRFAUOnbO4AfyhtsG8l0K0OQYoNeCfSmum3xP K2pZni0sdbiZqewbfJTctFylKIl1uNNVEx1FU24sRWeINYEgE2lduBMSpEFMEnqNS2MJItcLY 8eV2wAIVauWkjcbZcicup490WetA3THRMSvHl5nsbX5CMgQHValv7tJhKZ1vPY1QQ6Img9sUZ 9qs+HWYlKlgmwYHrsrLunTku243rZ6KcxXijXZ9+NhQZZpiFCKyi1JO2myX0yBlAlLOmd0zAf xvl3ahgq+ftLfzPOXbdYpH2NJyyVKqPsk6ZORxz7E3fOL7HazAvJBWOBHSJKTgsaHz98sVChj OZNt55ziCdJvo1pl6aR+5O6Wc3eexKMx714Mh94/f1u/X3FHF4xxIBV3D4KOPMM9TGy8= Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Revert commit da31de35cd2f ("tty: goldfish: use __raw_writel()/__raw_readl()") and define gf_ioread32()/gf_iowrite32() to be able to use accessors defined by the architecture. Cc: stable@vger.kernel.org # v5.11+ Fixes: da31de35cd2f ("tty: goldfish: use __raw_writel()/__raw_readl()") Signed-off-by: Laurent Vivier --- drivers/tty/goldfish.c | 20 ++++++++++---------- include/linux/goldfish.h | 15 +++++++++++---- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/drivers/tty/goldfish.c b/drivers/tty/goldfish.c index 5ed19a9857ad..10c13b93ed52 100644 --- a/drivers/tty/goldfish.c +++ b/drivers/tty/goldfish.c @@ -61,13 +61,13 @@ static void do_rw_io(struct goldfish_tty *qtty, spin_lock_irqsave(&qtty->lock, irq_flags); gf_write_ptr((void *)address, base + GOLDFISH_TTY_REG_DATA_PTR, base + GOLDFISH_TTY_REG_DATA_PTR_HIGH); - __raw_writel(count, base + GOLDFISH_TTY_REG_DATA_LEN); + gf_iowrite32(count, base + GOLDFISH_TTY_REG_DATA_LEN); =20 if (is_write) - __raw_writel(GOLDFISH_TTY_CMD_WRITE_BUFFER, + gf_iowrite32(GOLDFISH_TTY_CMD_WRITE_BUFFER, base + GOLDFISH_TTY_REG_CMD); else - __raw_writel(GOLDFISH_TTY_CMD_READ_BUFFER, + gf_iowrite32(GOLDFISH_TTY_CMD_READ_BUFFER, base + GOLDFISH_TTY_REG_CMD); =20 spin_unlock_irqrestore(&qtty->lock, irq_flags); @@ -142,7 +142,7 @@ static irqreturn_t goldfish_tty_interrupt(int irq, void= *dev_id) unsigned char *buf; u32 count; =20 - count =3D __raw_readl(base + GOLDFISH_TTY_REG_BYTES_READY); + count =3D gf_ioread32(base + GOLDFISH_TTY_REG_BYTES_READY); if (count =3D=3D 0) return IRQ_NONE; =20 @@ -159,7 +159,7 @@ static int goldfish_tty_activate(struct tty_port *port,= struct tty_struct *tty) { struct goldfish_tty *qtty =3D container_of(port, struct goldfish_tty, port); - __raw_writel(GOLDFISH_TTY_CMD_INT_ENABLE, qtty->base + GOLDFISH_TTY_REG_C= MD); + gf_iowrite32(GOLDFISH_TTY_CMD_INT_ENABLE, qtty->base + GOLDFISH_TTY_REG_C= MD); return 0; } =20 @@ -167,7 +167,7 @@ static void goldfish_tty_shutdown(struct tty_port *port) { struct goldfish_tty *qtty =3D container_of(port, struct goldfish_tty, port); - __raw_writel(GOLDFISH_TTY_CMD_INT_DISABLE, qtty->base + GOLDFISH_TTY_REG_= CMD); + gf_iowrite32(GOLDFISH_TTY_CMD_INT_DISABLE, qtty->base + GOLDFISH_TTY_REG_= CMD); } =20 static int goldfish_tty_open(struct tty_struct *tty, struct file *filp) @@ -202,7 +202,7 @@ static unsigned int goldfish_tty_chars_in_buffer(struct= tty_struct *tty) { struct goldfish_tty *qtty =3D &goldfish_ttys[tty->index]; void __iomem *base =3D qtty->base; - return __raw_readl(base + GOLDFISH_TTY_REG_BYTES_READY); + return gf_ioread32(base + GOLDFISH_TTY_REG_BYTES_READY); } =20 static void goldfish_tty_console_write(struct console *co, const char *b, @@ -355,7 +355,7 @@ static int goldfish_tty_probe(struct platform_device *p= dev) * on Ranchu emulator (qemu2) returns 1 here and * driver will use physical addresses. */ - qtty->version =3D __raw_readl(base + GOLDFISH_TTY_REG_VERSION); + qtty->version =3D gf_ioread32(base + GOLDFISH_TTY_REG_VERSION); =20 /* * Goldfish TTY device on Ranchu emulator (qemu2) @@ -374,7 +374,7 @@ static int goldfish_tty_probe(struct platform_device *p= dev) } } =20 - __raw_writel(GOLDFISH_TTY_CMD_INT_DISABLE, base + GOLDFISH_TTY_REG_CMD); + gf_iowrite32(GOLDFISH_TTY_CMD_INT_DISABLE, base + GOLDFISH_TTY_REG_CMD); =20 ret =3D request_irq(irq, goldfish_tty_interrupt, IRQF_SHARED, "goldfish_tty", qtty); @@ -436,7 +436,7 @@ static int goldfish_tty_remove(struct platform_device *= pdev) #ifdef CONFIG_GOLDFISH_TTY_EARLY_CONSOLE static void gf_early_console_putchar(struct uart_port *port, int ch) { - __raw_writel(ch, port->membase); + gf_iowrite32(ch, port->membase); } =20 static void gf_early_write(struct console *con, const char *s, unsigned in= t n) diff --git a/include/linux/goldfish.h b/include/linux/goldfish.h index 12be1601fd84..bcc17f95b906 100644 --- a/include/linux/goldfish.h +++ b/include/linux/goldfish.h @@ -8,14 +8,21 @@ =20 /* Helpers for Goldfish virtual platform */ =20 +#ifndef gf_ioread32 +#define gf_ioread32 ioread32 +#endif +#ifndef gf_iowrite32 +#define gf_iowrite32 iowrite32 +#endif + static inline void gf_write_ptr(const void *ptr, void __iomem *portl, void __iomem *porth) { const unsigned long addr =3D (unsigned long)ptr; =20 - __raw_writel(lower_32_bits(addr), portl); + gf_iowrite32(lower_32_bits(addr), portl); #ifdef CONFIG_64BIT - __raw_writel(upper_32_bits(addr), porth); + gf_iowrite32(upper_32_bits(addr), porth); #endif } =20 @@ -23,9 +30,9 @@ static inline void gf_write_dma_addr(const dma_addr_t add= r, void __iomem *portl, void __iomem *porth) { - __raw_writel(lower_32_bits(addr), portl); + gf_iowrite32(lower_32_bits(addr), portl); #ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT - __raw_writel(upper_32_bits(addr), porth); + gf_iowrite32(upper_32_bits(addr), porth); #endif } =20 --=20 2.34.1 From nobody Mon Jun 29 23:59:12 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0D1CFC433EF for ; Sat, 29 Jan 2022 18:43:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353101AbiA2SnO (ORCPT ); Sat, 29 Jan 2022 13:43:14 -0500 Received: from mout.kundenserver.de ([217.72.192.75]:34927 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353020AbiA2SnD (ORCPT ); Sat, 29 Jan 2022 13:43:03 -0500 Received: from quad ([82.142.10.94]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1M7bJ5-1nAJuE20Xl-0082Ye; Sat, 29 Jan 2022 19:42:31 +0100 From: Laurent Vivier To: linux-kernel@vger.kernel.org Cc: Alessandro Zummo , Daniel Lezcano , Alexandre Belloni , Thomas Gleixner , Geert Uytterhoeven , Stephen Boyd , linux-m68k@lists.linux-m68k.org, linux-rtc@vger.kernel.org, Jiaxun Yang , Arnd Bergmann , John Stultz , Laurent Vivier Subject: [PATCH v13 3/5] rtc: goldfish: use gf_ioread32()/gf_iowrite32() Date: Sat, 29 Jan 2022 19:42:23 +0100 Message-Id: <20220129184225.407100-4-laurent@vivier.eu> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220129184225.407100-1-laurent@vivier.eu> References: <20220129184225.407100-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:gBBypLL0zhyZ/uCuEHR8GlI2hgXr3Kkh1FDj+Smyq8swU4oM2T0 mTzSGljOqRnDTUKYmgFsXf5fgptHJhS+u6bYPI1W5aoWl9sYzQrC+XEXIToum8jK8EmI2cs hOQB8NYgmIrtIWxkAdOPjBq3ALoMf+0bgxWpki2kB1WdzbZ89dahUL88eiTpfmZGz2QoeLB T8b3dOVROwcjBAtbFnYng== X-UI-Out-Filterresults: notjunk:1;V03:K0:CD2/P4Ijn8k=:NW1RI8Xsp7IfDjlhuRhiU/ Owg+BtAAfIME/BIwb2n07J5P+R0bTm3awUR++qfVwD0DtAEtg7RnpLdhcivOqNMtqhJbkNvrB taWkh684dpdNUwMKJctkfpfXIrv+6/PwPJdAbzsBy65q9NcXz2Z8HTHN2plmU3G4AdMAeMKIf A/PCCpZidF5lGCw881zwpX1zc04gnExvlX0DnYhPKJRNNvfy48xgcQDZ2QS5lQeqm3aJ/e2s7 0av0FxXnMvsPHdoCtX7HFEbAv44wTdv/lyJ38MXhkdW1Z4/Aw7JigZUcvZiYNquALIgGwWnFi a/DCtXpGuautg40PZodEChe/NAPSyF6xDGbVBGS4Q5vZIdzhuNzhxCy0+dHIQi+mNkjxsZj/F 93XIzC+2awQC6eEJwIvwlpjEPnb/L7yKA2zWSMsMeFAVREmEbtUfCpFC+YrW58R5R+lxVeX7s ROSgM6Mz+6OmI/hyMm5A/OaEko37Jfr7HnzqvCSpX9Q2yar1yTE0uuN4401uniqpsOk1vg3Js 0fYDcbCwvDvtMfVMhoiKMaPSigvOOBenbwlkru9Ywj80cl9ndMlE3qRBVw8zi0r5DIQn2+gSW qWPvtT+ycaia89G6PgSp+CoxxJd81RR94py2/BAqOoAwpB2t6vhIiAzWEtLO6vjAXDj1T47iD 5Khoynm83kfWAruWSffqp8I6C1U46RfHziTBT0glxsd7Mw8UvpXpUh/j1LqP3sTLkHKs= Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" replace readl()/writel() by gf_ioread32()/gf_iowrite32() as done for goldfish-tty. Signed-off-by: Laurent Vivier --- drivers/rtc/rtc-goldfish.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/drivers/rtc/rtc-goldfish.c b/drivers/rtc/rtc-goldfish.c index 7ab95d052644..eb1929b0cbb6 100644 --- a/drivers/rtc/rtc-goldfish.c +++ b/drivers/rtc/rtc-goldfish.c @@ -10,6 +10,7 @@ #include #include #include +#include =20 #define TIMER_TIME_LOW 0x00 /* get low bits of current time */ /* and update TIMER_TIME_HIGH */ @@ -41,8 +42,8 @@ static int goldfish_rtc_read_alarm(struct device *dev, rtcdrv =3D dev_get_drvdata(dev); base =3D rtcdrv->base; =20 - rtc_alarm_low =3D readl(base + TIMER_ALARM_LOW); - rtc_alarm_high =3D readl(base + TIMER_ALARM_HIGH); + rtc_alarm_low =3D gf_ioread32(base + TIMER_ALARM_LOW); + rtc_alarm_high =3D gf_ioread32(base + TIMER_ALARM_HIGH); rtc_alarm =3D (rtc_alarm_high << 32) | rtc_alarm_low; =20 do_div(rtc_alarm, NSEC_PER_SEC); @@ -50,7 +51,7 @@ static int goldfish_rtc_read_alarm(struct device *dev, =20 rtc_time64_to_tm(rtc_alarm, &alrm->time); =20 - if (readl(base + TIMER_ALARM_STATUS)) + if (gf_ioread32(base + TIMER_ALARM_STATUS)) alrm->enabled =3D 1; else alrm->enabled =3D 0; @@ -71,18 +72,18 @@ static int goldfish_rtc_set_alarm(struct device *dev, =20 if (alrm->enabled) { rtc_alarm64 =3D rtc_tm_to_time64(&alrm->time) * NSEC_PER_SEC; - writel((rtc_alarm64 >> 32), base + TIMER_ALARM_HIGH); - writel(rtc_alarm64, base + TIMER_ALARM_LOW); - writel(1, base + TIMER_IRQ_ENABLED); + gf_iowrite32((rtc_alarm64 >> 32), base + TIMER_ALARM_HIGH); + gf_iowrite32(rtc_alarm64, base + TIMER_ALARM_LOW); + gf_iowrite32(1, base + TIMER_IRQ_ENABLED); } else { /* * if this function was called with enabled=3D0 * then it could mean that the application is * trying to cancel an ongoing alarm */ - rtc_status_reg =3D readl(base + TIMER_ALARM_STATUS); + rtc_status_reg =3D gf_ioread32(base + TIMER_ALARM_STATUS); if (rtc_status_reg) - writel(1, base + TIMER_CLEAR_ALARM); + gf_iowrite32(1, base + TIMER_CLEAR_ALARM); } =20 return 0; @@ -98,9 +99,9 @@ static int goldfish_rtc_alarm_irq_enable(struct device *d= ev, base =3D rtcdrv->base; =20 if (enabled) - writel(1, base + TIMER_IRQ_ENABLED); + gf_iowrite32(1, base + TIMER_IRQ_ENABLED); else - writel(0, base + TIMER_IRQ_ENABLED); + gf_iowrite32(0, base + TIMER_IRQ_ENABLED); =20 return 0; } @@ -110,7 +111,7 @@ static irqreturn_t goldfish_rtc_interrupt(int irq, void= *dev_id) struct goldfish_rtc *rtcdrv =3D dev_id; void __iomem *base =3D rtcdrv->base; =20 - writel(1, base + TIMER_CLEAR_INTERRUPT); + gf_iowrite32(1, base + TIMER_CLEAR_INTERRUPT); =20 rtc_update_irq(rtcdrv->rtc, 1, RTC_IRQF | RTC_AF); =20 @@ -128,8 +129,8 @@ static int goldfish_rtc_read_time(struct device *dev, s= truct rtc_time *tm) rtcdrv =3D dev_get_drvdata(dev); base =3D rtcdrv->base; =20 - time_low =3D readl(base + TIMER_TIME_LOW); - time_high =3D readl(base + TIMER_TIME_HIGH); + time_low =3D gf_ioread32(base + TIMER_TIME_LOW); + time_high =3D gf_ioread32(base + TIMER_TIME_HIGH); time =3D (time_high << 32) | time_low; =20 do_div(time, NSEC_PER_SEC); @@ -149,8 +150,8 @@ static int goldfish_rtc_set_time(struct device *dev, st= ruct rtc_time *tm) base =3D rtcdrv->base; =20 now64 =3D rtc_tm_to_time64(tm) * NSEC_PER_SEC; - writel((now64 >> 32), base + TIMER_TIME_HIGH); - writel(now64, base + TIMER_TIME_LOW); + gf_iowrite32((now64 >> 32), base + TIMER_TIME_HIGH); + gf_iowrite32(now64, base + TIMER_TIME_LOW); =20 return 0; } --=20 2.34.1 From nobody Mon Jun 29 23:59:12 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DE1FDC4167E for ; Sat, 29 Jan 2022 18:43:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353046AbiA2SnG (ORCPT ); Sat, 29 Jan 2022 13:43:06 -0500 Received: from mout.kundenserver.de ([212.227.17.24]:33931 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351528AbiA2Sm6 (ORCPT ); Sat, 29 Jan 2022 13:42:58 -0500 Received: from quad ([82.142.10.94]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1N8X9L-1m9asj2HNh-014Uoy; Sat, 29 Jan 2022 19:42:32 +0100 From: Laurent Vivier To: linux-kernel@vger.kernel.org Cc: Alessandro Zummo , Daniel Lezcano , Alexandre Belloni , Thomas Gleixner , Geert Uytterhoeven , Stephen Boyd , linux-m68k@lists.linux-m68k.org, linux-rtc@vger.kernel.org, Jiaxun Yang , Arnd Bergmann , John Stultz , Laurent Vivier Subject: [PATCH v13 4/5] clocksource/drivers: Add a goldfish-timer clocksource Date: Sat, 29 Jan 2022 19:42:24 +0100 Message-Id: <20220129184225.407100-5-laurent@vivier.eu> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220129184225.407100-1-laurent@vivier.eu> References: <20220129184225.407100-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:RekmY6/9HHoILjUheFcuOQQ98TeWc+j/9wsNxateYzF8MtKmDhw UhdIUq4KhhoyphbXp1q2Hvj0yr2cLGk5FD1Txo747A/awzvWu0oPHj0IxAr1sfDEPcdF2nH asXNt9CfKO8ZYJEUkFTSHpgFuBxlsPeKaBkSzvp0ZRVCp5Jz26eaIdmClObwB7jU2iF+GAZ S9dWQC1FYc9Row8nG10Vg== X-UI-Out-Filterresults: notjunk:1;V03:K0:4Z2nfx8QHpA=:Kofb23SZOldeHeLvXQArfQ afTLEnhTnH9TelFldbZLOJwsU5tWftfjuLdmrhQakbJOOM8assgoWmZi5XBoiDji2RRCeZRIo g2Iv8fOAs5WoQUfDEDmPkJ5gsxe50Iq5h5eqvXyQjfilPJfAdLvwdOlV2eCDhZ0mHqeaFhOg/ 4p3ANvJMUXBlR4lKskT/ktPbmKQGRrnJdOiUsNSf8F1ZGhYEEpo7TkWuFKevB7M5DhcpFNygQ 7xwrfX5ewYWnINoTKKGAMb+Ao0LunnY+VJymLwbEGomLzDeaU4pTem+9HzIo9tLjxIeL8qzim Nw7V6cjh3EZLH2wrxucWHGjFrn6jWNPSSpTA+sbdSYuoOHHAjsJ0KO+blLyz6MabgjlKxJSpT 1W0dnfUSITH0qWicsCKZmuAvsj/Ipx4YFQVA4J7/Xx+8baJ+Cla4T0BncWgHOsAQ2nd3MEI95 X31E+WIgUVpUSuRqSGARVjByRaOgPK5txag+zhSLijQcvigzLZ1zGaDutiGPAODsu3XEvRmF2 rTaz8LU3Rl8Hwm7/EXNDlCBtBbNBz1sXMcAP1v11PpbRH9u/RWfgONnp66D6E+DtGykPFP3Cc 8lBEhAxHXrh0IwkoQSZDe8yskyI/mHSiFm9SOrsMKYPcaiWO7d4y7OEgThB8qxyqMGXpY+pAz mogUVoVs1hlUIJQVpcyOVcZtdhjGImRJY/mHPCX6NyCf0Y6zk8UjoJ+NK8oxj/uMQ4fY= Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add a clocksource based on the goldfish-rtc device. Move the timer register definition to This kernel implementation is based on the QEMU upstream implementation: https://git.qemu.org/?p=3Dqemu.git;a=3Dblob_plain;f=3Dhw/rtc/goldfish_rt= c.c Details related to Goldfish devices can be found in: https://android.googlesource.com/platform/external/qemu/+/master/docs/GOL= DFISH-VIRTUAL-HARDWARE.TXT Signed-off-by: Laurent Vivier --- drivers/clocksource/Kconfig | 7 ++ drivers/clocksource/Makefile | 1 + drivers/clocksource/timer-goldfish.c | 153 +++++++++++++++++++++++++++ drivers/rtc/rtc-goldfish.c | 13 +-- include/clocksource/timer-goldfish.h | 31 ++++++ 5 files changed, 193 insertions(+), 12 deletions(-) create mode 100644 drivers/clocksource/timer-goldfish.c create mode 100644 include/clocksource/timer-goldfish.h diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index cfb8ea0df3b1..94f00374cebb 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -721,4 +721,11 @@ config MICROCHIP_PIT64B modes and high resolution. It is used as a clocksource and a clockevent. =20 +config GOLDFISH_TIMER + bool "Clocksource using goldfish-rtc" + depends on M68K || COMPILE_TEST + depends on RTC_DRV_GOLDFISH + help + Support for the timer/counter of goldfish-rtc + endmenu diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index fa5f624eadb6..12f5d7e8cc2d 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -89,3 +89,4 @@ obj-$(CONFIG_GX6605S_TIMER) +=3D timer-gx6605s.o obj-$(CONFIG_HYPERV_TIMER) +=3D hyperv_timer.o obj-$(CONFIG_MICROCHIP_PIT64B) +=3D timer-microchip-pit64b.o obj-$(CONFIG_MSC313E_TIMER) +=3D timer-msc313e.o +obj-$(CONFIG_GOLDFISH_TIMER) +=3D timer-goldfish.o diff --git a/drivers/clocksource/timer-goldfish.c b/drivers/clocksource/tim= er-goldfish.c new file mode 100644 index 000000000000..0512d5eabc82 --- /dev/null +++ b/drivers/clocksource/timer-goldfish.c @@ -0,0 +1,153 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include +#include +#include +#include +#include +#include +#include +#include + +struct goldfish_timer { + struct clocksource cs; + struct clock_event_device ced; + struct resource res; + void __iomem *base; +}; + +static struct goldfish_timer *ced_to_gf(struct clock_event_device *ced) +{ + return container_of(ced, struct goldfish_timer, ced); +} + +static struct goldfish_timer *cs_to_gf(struct clocksource *cs) +{ + return container_of(cs, struct goldfish_timer, cs); +} + +static u64 goldfish_timer_read(struct clocksource *cs) +{ + struct goldfish_timer *timerdrv =3D cs_to_gf(cs); + void __iomem *base =3D timerdrv->base; + u32 time_low, time_high; + u64 ticks; + + /* + * time_low: get low bits of current time and update time_high + * time_high: get high bits of time at last time_low read + */ + time_low =3D gf_ioread32(base + TIMER_TIME_LOW); + time_high =3D gf_ioread32(base + TIMER_TIME_HIGH); + + ticks =3D ((u64)time_high << 32) | time_low; + + return ticks; +} + +static int goldfish_timer_set_oneshot(struct clock_event_device *evt) +{ + struct goldfish_timer *timerdrv =3D ced_to_gf(evt); + void __iomem *base =3D timerdrv->base; + + gf_iowrite32(0, base + TIMER_ALARM_HIGH); + gf_iowrite32(0, base + TIMER_ALARM_LOW); + gf_iowrite32(1, base + TIMER_IRQ_ENABLED); + + return 0; +} + +static int goldfish_timer_shutdown(struct clock_event_device *evt) +{ + struct goldfish_timer *timerdrv =3D ced_to_gf(evt); + void __iomem *base =3D timerdrv->base; + + gf_iowrite32(0, base + TIMER_IRQ_ENABLED); + + return 0; +} + +static int goldfish_timer_next_event(unsigned long delta, + struct clock_event_device *evt) +{ + struct goldfish_timer *timerdrv =3D ced_to_gf(evt); + void __iomem *base =3D timerdrv->base; + u64 now; + + now =3D goldfish_timer_read(&timerdrv->cs); + + now +=3D delta; + + gf_iowrite32(upper_32_bits(now), base + TIMER_ALARM_HIGH); + gf_iowrite32(lower_32_bits(now), base + TIMER_ALARM_LOW); + + return 0; +} + +static irqreturn_t goldfish_timer_irq(int irq, void *dev_id) +{ + struct goldfish_timer *timerdrv =3D dev_id; + struct clock_event_device *evt =3D &timerdrv->ced; + void __iomem *base =3D timerdrv->base; + + gf_iowrite32(1, base + TIMER_CLEAR_INTERRUPT); + + evt->event_handler(evt); + + return IRQ_HANDLED; +} + +int __init goldfish_timer_init(int irq, void __iomem *base) +{ + struct goldfish_timer *timerdrv; + int ret; + + timerdrv =3D kzalloc(sizeof(*timerdrv), GFP_KERNEL); + if (!timerdrv) + return -ENOMEM; + + timerdrv->base =3D base; + + timerdrv->ced =3D (struct clock_event_device){ + .name =3D "goldfish_timer", + .features =3D CLOCK_EVT_FEAT_ONESHOT, + .set_state_shutdown =3D goldfish_timer_shutdown, + .set_state_oneshot =3D goldfish_timer_set_oneshot, + .set_next_event =3D goldfish_timer_next_event, + }; + + timerdrv->res =3D (struct resource){ + .name =3D "goldfish_timer", + .start =3D (unsigned long)base, + .end =3D (unsigned long)base + 0xfff, + }; + + ret =3D request_resource(&iomem_resource, &timerdrv->res); + if (ret) { + pr_err("Cannot allocate '%s' resource\n", timerdrv->res.name); + return ret; + } + + timerdrv->cs =3D (struct clocksource){ + .name =3D "goldfish_timer", + .rating =3D 400, + .read =3D goldfish_timer_read, + .mask =3D CLOCKSOURCE_MASK(64), + .flags =3D 0, + .max_idle_ns =3D LONG_MAX, + }; + + clocksource_register_hz(&timerdrv->cs, NSEC_PER_SEC); + + ret =3D request_irq(irq, goldfish_timer_irq, IRQF_TIMER, + "goldfish_timer", timerdrv); + if (ret) { + pr_err("Couldn't register goldfish-timer interrupt\n"); + return ret; + } + + clockevents_config_and_register(&timerdrv->ced, NSEC_PER_SEC, + 1, 0xffffffff); + + return 0; +} diff --git a/drivers/rtc/rtc-goldfish.c b/drivers/rtc/rtc-goldfish.c index eb1929b0cbb6..59c0f38cc08d 100644 --- a/drivers/rtc/rtc-goldfish.c +++ b/drivers/rtc/rtc-goldfish.c @@ -11,18 +11,7 @@ #include #include #include - -#define TIMER_TIME_LOW 0x00 /* get low bits of current time */ - /* and update TIMER_TIME_HIGH */ -#define TIMER_TIME_HIGH 0x04 /* get high bits of time at last */ - /* TIMER_TIME_LOW read */ -#define TIMER_ALARM_LOW 0x08 /* set low bits of alarm and */ - /* activate it */ -#define TIMER_ALARM_HIGH 0x0c /* set high bits of next alarm */ -#define TIMER_IRQ_ENABLED 0x10 -#define TIMER_CLEAR_ALARM 0x14 -#define TIMER_ALARM_STATUS 0x18 -#define TIMER_CLEAR_INTERRUPT 0x1c +#include =20 struct goldfish_rtc { void __iomem *base; diff --git a/include/clocksource/timer-goldfish.h b/include/clocksource/tim= er-goldfish.h new file mode 100644 index 000000000000..d39097729b1d --- /dev/null +++ b/include/clocksource/timer-goldfish.h @@ -0,0 +1,31 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * goldfish-timer clocksource + * Registers definition for the goldfish-timer device + */ + +#ifndef _CLOCKSOURCE_TIMER_GOLDFISH_H +#define _CLOCKSOURCE_TIMER_GOLDFISH_H + +/* + * TIMER_TIME_LOW get low bits of current time and update TIMER_TIME_HIGH + * TIMER_TIME_HIGH get high bits of time at last TIMER_TIME_LOW read + * TIMER_ALARM_LOW set low bits of alarm and activate it + * TIMER_ALARM_HIGH set high bits of next alarm + * TIMER_IRQ_ENABLED enable alarm interrupt + * TIMER_CLEAR_ALARM disarm an existin alarm + * TIMER_ALARM_STATUS alarm status (running or not) + * TIMER_CLEAR_INTERRUPT clear interrupt + */ +#define TIMER_TIME_LOW 0x00 +#define TIMER_TIME_HIGH 0x04 +#define TIMER_ALARM_LOW 0x08 +#define TIMER_ALARM_HIGH 0x0c +#define TIMER_IRQ_ENABLED 0x10 +#define TIMER_CLEAR_ALARM 0x14 +#define TIMER_ALARM_STATUS 0x18 +#define TIMER_CLEAR_INTERRUPT 0x1c + +extern int goldfish_timer_init(int irq, void __iomem *base); + +#endif /* _CLOCKSOURCE_TIMER_GOLDFISH_H */ --=20 2.34.1 From nobody Mon Jun 29 23:59:12 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 277BDC433F5 for ; Sat, 29 Jan 2022 18:43:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353124AbiA2SnT (ORCPT ); Sat, 29 Jan 2022 13:43:19 -0500 Received: from mout.kundenserver.de ([217.72.192.73]:46601 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353023AbiA2SnE (ORCPT ); Sat, 29 Jan 2022 13:43:04 -0500 Received: from quad ([82.142.10.94]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MEF87-1n3kLM30DN-00ABDI; Sat, 29 Jan 2022 19:42:34 +0100 From: Laurent Vivier To: linux-kernel@vger.kernel.org Cc: Alessandro Zummo , Daniel Lezcano , Alexandre Belloni , Thomas Gleixner , Geert Uytterhoeven , Stephen Boyd , linux-m68k@lists.linux-m68k.org, linux-rtc@vger.kernel.org, Jiaxun Yang , Arnd Bergmann , John Stultz , Laurent Vivier Subject: [PATCH v13 5/5] m68k: introduce a virtual m68k machine Date: Sat, 29 Jan 2022 19:42:25 +0100 Message-Id: <20220129184225.407100-6-laurent@vivier.eu> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220129184225.407100-1-laurent@vivier.eu> References: <20220129184225.407100-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:/9oJcg79DIQQWtnJBEO7yxYlNs1RFdpZ0FlXcUoWUFjEyrCN9G2 TG67lYON3IU9aisNk4WgqIsSTrLGIClun8/ohIIFXaG+8BgguLfyoePbkD5polIOfdkFi8F 7OQU6Ciap+jwfZP9v1c4UKPuIejLqNI2OaxFUe0Gm09bDey7AIZ8qwfCnp+JXAfhKZY5qZ0 lpfGAaaRuEwc6FGmjCANA== X-UI-Out-Filterresults: notjunk:1;V03:K0:Z4GI4ljVlr4=:j5a4ZKdL0IiOc79oh9Orjp SDIM4auhMxiG5x8X21YFZqa78Mes73s+7PakfRT2ip8rRy1QY5FrK5TuyUtCdqPs1trM1JvsJ WuJF5hc5qjUgr+OBnC2yf4WDH1NEsXxqUkLjog1IVDhMEFCCjyStWiT2YUiomS/340rzlf1/h NHvgkVeV6gHFMBsgktQ3/+uIm6rglpAUFvzSSGP5sbo94pRJXtdeu9aNUOCb78ZoR9/spiDYJ GTgTTo/xO6XuOrxCjewWDapw/98Sj7WcB8YgKRjK4VqSV5gTRXElgI98uvcUZ6pFQcTY2P6Cv FybAEGxYqT+Hdp9h9kb25i+xI+jlEORXxZ8ZoKNQ4Pf7e6abKOIPjM/K7zNnVKYGg581bGJYq UFSy9k5fFxyyvEr3XA2tezXxQX6ta18qllSLHmisSOi0MEm1Ez3BxyZRs/SFR3bbV6OwyZmM5 ZNKxUWuB+Gc5JmzQu/w2sOVeD9SrKhPb6yBCBF5GbOZv+B1jgJ+oYM21O4xTjCHmn+zqFgMM0 tnBSq6wkDeQAPU2Nf+ti38jW5oBPq3M+LZ6khvafMPZ8UqqoKMIxeXqzC8++TzrTPeFABHeFO pGBJ2GrelAjucQ3K8LOYMEPC5qEHfcRAjp/Agu2OKu5i7jJ30i6rFPq+V1QjWq/9titf+vDAG nMY3DmwFQlG6ZJzCbr7iBbsIVoGULCNHDqIFMPK1xkmGGHQdvldpDUCgaCJ1MUUHpUCY= Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This machine allows to have up to 3.2 GiB and 128 Virtio devices. It is based on android goldfish devices. Signed-off-by: Laurent Vivier --- arch/m68k/Kbuild | 1 + arch/m68k/Kconfig.machine | 17 +++ arch/m68k/configs/virt_defconfig | 68 +++++++++ arch/m68k/include/asm/config.h | 2 + arch/m68k/include/asm/io.h | 3 + arch/m68k/include/asm/irq.h | 3 +- arch/m68k/include/asm/pgtable_mm.h | 7 + arch/m68k/include/asm/setup.h | 44 ++++-- arch/m68k/include/asm/virt.h | 25 ++++ arch/m68k/include/uapi/asm/bootinfo-virt.h | 18 +++ arch/m68k/include/uapi/asm/bootinfo.h | 1 + arch/m68k/kernel/Makefile | 1 + arch/m68k/kernel/head.S | 31 +++++ arch/m68k/kernel/setup_mm.c | 7 + arch/m68k/mm/kmap.c | 23 +++- arch/m68k/virt/Makefile | 6 + arch/m68k/virt/config.c | 130 +++++++++++++++++ arch/m68k/virt/ints.c | 153 +++++++++++++++++++++ arch/m68k/virt/platform.c | 72 ++++++++++ 19 files changed, 594 insertions(+), 18 deletions(-) create mode 100644 arch/m68k/configs/virt_defconfig create mode 100644 arch/m68k/include/asm/virt.h create mode 100644 arch/m68k/include/uapi/asm/bootinfo-virt.h create mode 100644 arch/m68k/virt/Makefile create mode 100644 arch/m68k/virt/config.c create mode 100644 arch/m68k/virt/ints.c create mode 100644 arch/m68k/virt/platform.c diff --git a/arch/m68k/Kbuild b/arch/m68k/Kbuild index 18abb35c26a1..7762af9f6def 100644 --- a/arch/m68k/Kbuild +++ b/arch/m68k/Kbuild @@ -17,3 +17,4 @@ obj-$(CONFIG_M68060) +=3D ifpsp060/ obj-$(CONFIG_M68KFPU_EMU) +=3D math-emu/ obj-$(CONFIG_M68000) +=3D 68000/ obj-$(CONFIG_COLDFIRE) +=3D coldfire/ +obj-$(CONFIG_VIRT) +=3D virt/ diff --git a/arch/m68k/Kconfig.machine b/arch/m68k/Kconfig.machine index eeab4f3e6c19..13b900bf8eb8 100644 --- a/arch/m68k/Kconfig.machine +++ b/arch/m68k/Kconfig.machine @@ -149,6 +149,23 @@ config SUN3 =20 If you don't want to compile a kernel exclusively for a Sun 3, say N. =20 +config VIRT + bool "Virtual M68k Machine support" + depends on MMU + select GENERIC_CLOCKEVENTS + select M68040 + select MMU_MOTOROLA if MMU + select RTC_CLASS + select GOLDFISH + select RTC_DRV_GOLDFISH + select GOLDFISH_TIMER + select GOLDFISH_TTY + select TTY + select VIRTIO_MMIO + help + This options enable a pure virtual machine based on m68k, + VIRTIO MMIO devices and GOLDFISH interfaces (TTY, RTC, PIC) + config PILOT bool =20 diff --git a/arch/m68k/configs/virt_defconfig b/arch/m68k/configs/virt_defc= onfig new file mode 100644 index 000000000000..8059bd618370 --- /dev/null +++ b/arch/m68k/configs/virt_defconfig @@ -0,0 +1,68 @@ +CONFIG_LOCALVERSION=3D"-virt" +CONFIG_SYSVIPC=3Dy +CONFIG_CGROUPS=3Dy +CONFIG_BLK_CGROUP=3Dy +CONFIG_CGROUP_SCHED=3Dy +CONFIG_CGROUP_PIDS=3Dy +CONFIG_CGROUP_RDMA=3Dy +CONFIG_CGROUP_FREEZER=3Dy +CONFIG_CGROUP_DEVICE=3Dy +CONFIG_CGROUP_CPUACCT=3Dy +CONFIG_VIRT=3Dy +CONFIG_PROC_HARDWARE=3Dy +CONFIG_PARTITION_ADVANCED=3Dy +CONFIG_AMIGA_PARTITION=3Dy +CONFIG_ATARI_PARTITION=3Dy +CONFIG_MAC_PARTITION=3Dy +CONFIG_BSD_DISKLABEL=3Dy +CONFIG_MINIX_SUBPARTITION=3Dy +CONFIG_SOLARIS_X86_PARTITION=3Dy +CONFIG_UNIXWARE_DISKLABEL=3Dy +CONFIG_LDM_PARTITION=3Dy +CONFIG_LDM_DEBUG=3Dy +CONFIG_SUN_PARTITION=3Dy +CONFIG_SYSV68_PARTITION=3Dy +CONFIG_NET=3Dy +CONFIG_PACKET=3Dy +CONFIG_UNIX=3Dy +CONFIG_INET=3Dy +CONFIG_IP_PNP=3Dy +CONFIG_IP_PNP_DHCP=3Dy +CONFIG_IP_PNP_BOOTP=3Dy +CONFIG_CGROUP_NET_PRIO=3Dy +CONFIG_CGROUP_NET_CLASSID=3Dy +CONFIG_NET_9P=3Dy +CONFIG_NET_9P_VIRTIO=3Dy +CONFIG_DEVTMPFS=3Dy +CONFIG_BLK_DEV_LOOP=3Dy +CONFIG_BLK_DEV_RAM=3Dy +CONFIG_VIRTIO_BLK=3Dy +CONFIG_SCSI=3Dy +CONFIG_BLK_DEV_SR=3Dy +CONFIG_SCSI_VIRTIO=3Dy +CONFIG_NETDEVICES=3Dy +CONFIG_VIRTIO_NET=3Dy +CONFIG_INPUT_MOUSEDEV=3Dy +CONFIG_INPUT_EVDEV=3Dy +CONFIG_VIRTIO_CONSOLE=3Dy +CONFIG_HW_RANDOM_VIRTIO=3Dy +CONFIG_DRM=3Dy +CONFIG_DRM_VIRTIO_GPU=3Dy +CONFIG_FB=3Dy +CONFIG_SOUND=3Dy +CONFIG_SND=3Dy +CONFIG_SND_VIRTIO=3Dy +CONFIG_VIRT_DRIVERS=3Dy +CONFIG_VIRTIO_INPUT=3Dy +CONFIG_EXT4_FS=3Dy +CONFIG_AUTOFS_FS=3Dy +CONFIG_ISO9660_FS=3Dy +CONFIG_JOLIET=3Dy +CONFIG_ZISOFS=3Dy +CONFIG_UDF_FS=3Dy +CONFIG_TMPFS=3Dy +CONFIG_TMPFS_POSIX_ACL=3Dy +CONFIG_9P_FS=3Dy +CONFIG_9P_FS_POSIX_ACL=3Dy +CONFIG_9P_FS_SECURITY=3Dy +CONFIG_EARLY_PRINTK=3Dy diff --git a/arch/m68k/include/asm/config.h b/arch/m68k/include/asm/config.h index aae61070628b..b9dacc52f2c8 100644 --- a/arch/m68k/include/asm/config.h +++ b/arch/m68k/include/asm/config.h @@ -17,6 +17,7 @@ extern int mvme16x_parse_bootinfo(const struct bi_record = *record); extern int mvme147_parse_bootinfo(const struct bi_record *record); extern int hp300_parse_bootinfo(const struct bi_record *record); extern int apollo_parse_bootinfo(const struct bi_record *record); +extern int virt_parse_bootinfo(const struct bi_record *record); =20 extern void config_amiga(void); extern void config_atari(void); @@ -29,5 +30,6 @@ extern void config_bvme6000(void); extern void config_hp300(void); extern void config_q40(void); extern void config_sun3x(void); +extern void config_virt(void); =20 #endif /* _M68K_CONFIG_H */ diff --git a/arch/m68k/include/asm/io.h b/arch/m68k/include/asm/io.h index aabe6420ead2..aaeabc65e63c 100644 --- a/arch/m68k/include/asm/io.h +++ b/arch/m68k/include/asm/io.h @@ -8,6 +8,9 @@ #include #endif =20 +#define gf_ioread32 ioread32be +#define gf_iowrite32 iowrite32be + #include =20 #endif /* _M68K_IO_H */ diff --git a/arch/m68k/include/asm/irq.h b/arch/m68k/include/asm/irq.h index 91dd493791d7..7829e955ca04 100644 --- a/arch/m68k/include/asm/irq.h +++ b/arch/m68k/include/asm/irq.h @@ -12,7 +12,8 @@ */ #if defined(CONFIG_COLDFIRE) #define NR_IRQS 256 -#elif defined(CONFIG_VME) || defined(CONFIG_SUN3) || defined(CONFIG_SUN3X) +#elif defined(CONFIG_VME) || defined(CONFIG_SUN3) || \ + defined(CONFIG_SUN3X) || defined(CONFIG_VIRT) #define NR_IRQS 200 #elif defined(CONFIG_ATARI) #define NR_IRQS 141 diff --git a/arch/m68k/include/asm/pgtable_mm.h b/arch/m68k/include/asm/pgt= able_mm.h index 143ba7de9bda..9b4e2fe2ac82 100644 --- a/arch/m68k/include/asm/pgtable_mm.h +++ b/arch/m68k/include/asm/pgtable_mm.h @@ -80,6 +80,9 @@ #elif defined(CONFIG_COLDFIRE) #define KMAP_START 0xe0000000 #define KMAP_END 0xf0000000 +#elif defined(CONFIG_VIRT) +#define KMAP_START 0xdf000000 +#define KMAP_END 0xff000000 #else #define KMAP_START 0xd0000000 #define KMAP_END 0xf0000000 @@ -92,6 +95,10 @@ extern unsigned long m68k_vmalloc_end; #elif defined(CONFIG_COLDFIRE) #define VMALLOC_START 0xd0000000 #define VMALLOC_END 0xe0000000 +#elif defined(CONFIG_VIRT) +#define VMALLOC_OFFSET PAGE_SIZE +#define VMALLOC_START (((unsigned long) high_memory + VMALLOC_OFFSET) & ~(= VMALLOC_OFFSET-1)) +#define VMALLOC_END KMAP_START #else /* Just any arbitrary offset to the start of the vmalloc VM area: the * current 8MB value just means that there will be a 8MB "hole" after the diff --git a/arch/m68k/include/asm/setup.h b/arch/m68k/include/asm/setup.h index 8f2023f8c1c4..2c99477aaf89 100644 --- a/arch/m68k/include/asm/setup.h +++ b/arch/m68k/include/asm/setup.h @@ -37,7 +37,8 @@ extern unsigned long m68k_machtype; #elif defined(CONFIG_ATARI) || defined(CONFIG_MAC) || defined(CONFIG_APOLL= O) \ || defined(CONFIG_MVME16x) || defined(CONFIG_BVME6000) \ || defined(CONFIG_HP300) || defined(CONFIG_Q40) \ - || defined(CONFIG_SUN3X) || defined(CONFIG_MVME147) + || defined(CONFIG_SUN3X) || defined(CONFIG_MVME147) \ + || defined(CONFIG_VIRT) # define MACH_IS_AMIGA (m68k_machtype =3D=3D MACH_AMIGA) #else # define MACH_AMIGA_ONLY @@ -50,7 +51,8 @@ extern unsigned long m68k_machtype; #elif defined(CONFIG_AMIGA) || defined(CONFIG_MAC) || defined(CONFIG_APOLL= O) \ || defined(CONFIG_MVME16x) || defined(CONFIG_BVME6000) \ || defined(CONFIG_HP300) || defined(CONFIG_Q40) \ - || defined(CONFIG_SUN3X) || defined(CONFIG_MVME147) + || defined(CONFIG_SUN3X) || defined(CONFIG_MVME147) \ + || defined(CONFIG_VIRT) # define MACH_IS_ATARI (m68k_machtype =3D=3D MACH_ATARI) #else # define MACH_ATARI_ONLY @@ -63,7 +65,8 @@ extern unsigned long m68k_machtype; #elif defined(CONFIG_AMIGA) || defined(CONFIG_ATARI) || defined(CONFIG_APO= LLO) \ || defined(CONFIG_MVME16x) || defined(CONFIG_BVME6000) \ || defined(CONFIG_HP300) || defined(CONFIG_Q40) \ - || defined(CONFIG_SUN3X) || defined(CONFIG_MVME147) + || defined(CONFIG_SUN3X) || defined(CONFIG_MVME147) \ + || defined(CONFIG_VIRT) # define MACH_IS_MAC (m68k_machtype =3D=3D MACH_MAC) #else # define MACH_MAC_ONLY @@ -84,7 +87,8 @@ extern unsigned long m68k_machtype; #elif defined(CONFIG_AMIGA) || defined(CONFIG_MAC) || defined(CONFIG_ATARI= ) \ || defined(CONFIG_MVME16x) || defined(CONFIG_BVME6000) \ || defined(CONFIG_HP300) || defined(CONFIG_Q40) \ - || defined(CONFIG_SUN3X) || defined(CONFIG_MVME147) + || defined(CONFIG_SUN3X) || defined(CONFIG_MVME147) \ + || defined(CONFIG_VIRT) # define MACH_IS_APOLLO (m68k_machtype =3D=3D MACH_APOLLO) #else # define MACH_APOLLO_ONLY @@ -97,7 +101,8 @@ extern unsigned long m68k_machtype; #elif defined(CONFIG_AMIGA) || defined(CONFIG_MAC) || defined(CONFIG_ATARI= ) \ || defined(CONFIG_APOLLO) || defined(CONFIG_BVME6000) \ || defined(CONFIG_HP300) || defined(CONFIG_Q40) \ - || defined(CONFIG_SUN3X) || defined(CONFIG_MVME16x) + || defined(CONFIG_SUN3X) || defined(CONFIG_MVME16x) \ + || defined(CONFIG_VIRT) # define MACH_IS_MVME147 (m68k_machtype =3D=3D MACH_MVME147) #else # define MACH_MVME147_ONLY @@ -110,7 +115,8 @@ extern unsigned long m68k_machtype; #elif defined(CONFIG_AMIGA) || defined(CONFIG_MAC) || defined(CONFIG_ATARI= ) \ || defined(CONFIG_APOLLO) || defined(CONFIG_BVME6000) \ || defined(CONFIG_HP300) || defined(CONFIG_Q40) \ - || defined(CONFIG_SUN3X) || defined(CONFIG_MVME147) + || defined(CONFIG_SUN3X) || defined(CONFIG_MVME147) \ + || defined(CONFIG_VIRT) # define MACH_IS_MVME16x (m68k_machtype =3D=3D MACH_MVME16x) #else # define MACH_MVME16x_ONLY @@ -123,7 +129,8 @@ extern unsigned long m68k_machtype; #elif defined(CONFIG_AMIGA) || defined(CONFIG_MAC) || defined(CONFIG_ATARI= ) \ || defined(CONFIG_APOLLO) || defined(CONFIG_MVME16x) \ || defined(CONFIG_HP300) || defined(CONFIG_Q40) \ - || defined(CONFIG_SUN3X) || defined(CONFIG_MVME147) + || defined(CONFIG_SUN3X) || defined(CONFIG_MVME147) \ + || defined(CONFIG_VIRT) # define MACH_IS_BVME6000 (m68k_machtype =3D=3D MACH_BVME6000) #else # define MACH_BVME6000_ONLY @@ -136,7 +143,8 @@ extern unsigned long m68k_machtype; #elif defined(CONFIG_AMIGA) || defined(CONFIG_MAC) || defined(CONFIG_ATARI= ) \ || defined(CONFIG_APOLLO) || defined(CONFIG_MVME16x) \ || defined(CONFIG_BVME6000) || defined(CONFIG_Q40) \ - || defined(CONFIG_SUN3X) || defined(CONFIG_MVME147) + || defined(CONFIG_SUN3X) || defined(CONFIG_MVME147) \ + || defined(CONFIG_VIRT) # define MACH_IS_HP300 (m68k_machtype =3D=3D MACH_HP300) #else # define MACH_HP300_ONLY @@ -149,7 +157,8 @@ extern unsigned long m68k_machtype; #elif defined(CONFIG_AMIGA) || defined(CONFIG_MAC) || defined(CONFIG_ATARI= ) \ || defined(CONFIG_APOLLO) || defined(CONFIG_MVME16x) \ || defined(CONFIG_BVME6000) || defined(CONFIG_HP300) \ - || defined(CONFIG_SUN3X) || defined(CONFIG_MVME147) + || defined(CONFIG_SUN3X) || defined(CONFIG_MVME147) \ + || defined(CONFIG_VIRT) # define MACH_IS_Q40 (m68k_machtype =3D=3D MACH_Q40) #else # define MACH_Q40_ONLY @@ -162,7 +171,8 @@ extern unsigned long m68k_machtype; #elif defined(CONFIG_AMIGA) || defined(CONFIG_MAC) || defined(CONFIG_ATARI= ) \ || defined(CONFIG_APOLLO) || defined(CONFIG_MVME16x) \ || defined(CONFIG_BVME6000) || defined(CONFIG_HP300) \ - || defined(CONFIG_Q40) || defined(CONFIG_MVME147) + || defined(CONFIG_Q40) || defined(CONFIG_MVME147) \ + || defined(CONFIG_VIRT) # define MACH_IS_SUN3X (m68k_machtype =3D=3D MACH_SUN3X) #else # define CONFIG_SUN3X_ONLY @@ -170,6 +180,20 @@ extern unsigned long m68k_machtype; # define MACH_TYPE (MACH_SUN3X) #endif =20 +#if !defined(CONFIG_VIRT) +# define MACH_IS_VIRT (0) +#elif defined(CONFIG_AMIGA) || defined(CONFIG_MAC) || defined(CONFIG_ATARI= ) \ + || defined(CONFIG_APOLLO) || defined(CONFIG_MVME16x) \ + || defined(CONFIG_BVME6000) || defined(CONFIG_HP300) \ + || defined(CONFIG_Q40) || defined(CONFIG_SUN3X) \ + || defined(CONFIG_MVME147) +# define MACH_IS_VIRT (m68k_machtype =3D=3D MACH_VIRT) +#else +# define MACH_VIRT_ONLY +# define MACH_IS_VIRT (1) +# define MACH_TYPE (MACH_VIRT) +#endif + #ifndef MACH_TYPE # define MACH_TYPE (m68k_machtype) #endif diff --git a/arch/m68k/include/asm/virt.h b/arch/m68k/include/asm/virt.h new file mode 100644 index 000000000000..87647c17afd7 --- /dev/null +++ b/arch/m68k/include/asm/virt.h @@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __ASM_VIRT_H +#define __ASM_VIRT_H + +#define NUM_VIRT_SOURCES 200 + +struct virt_booter_device_data { + unsigned long mmio; + unsigned long irq; +}; + +struct virt_booter_data { + unsigned long qemu_version; + struct virt_booter_device_data pic; + struct virt_booter_device_data rtc; + struct virt_booter_device_data tty; + struct virt_booter_device_data ctrl; + struct virt_booter_device_data virtio; +}; + +extern struct virt_booter_data virt_bi_data; + +extern void __init virt_init_IRQ(void); + +#endif diff --git a/arch/m68k/include/uapi/asm/bootinfo-virt.h b/arch/m68k/include= /uapi/asm/bootinfo-virt.h new file mode 100644 index 000000000000..e4db7e2213ab --- /dev/null +++ b/arch/m68k/include/uapi/asm/bootinfo-virt.h @@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * asm/bootinfo-virt.h -- Virtual-m68k-specific boot information definitio= ns + */ + +#ifndef _UAPI_ASM_M68K_BOOTINFO_VIRT_H +#define _UAPI_ASM_M68K_BOOTINFO_VIRT_H + +#define BI_VIRT_QEMU_VERSION 0x8000 +#define BI_VIRT_GF_PIC_BASE 0x8001 +#define BI_VIRT_GF_RTC_BASE 0x8002 +#define BI_VIRT_GF_TTY_BASE 0x8003 +#define BI_VIRT_VIRTIO_BASE 0x8004 +#define BI_VIRT_CTRL_BASE 0x8005 + +#define VIRT_BOOTI_VERSION MK_BI_VERSION(2, 0) + +#endif /* _UAPI_ASM_M68K_BOOTINFO_MAC_H */ diff --git a/arch/m68k/include/uapi/asm/bootinfo.h b/arch/m68k/include/uapi= /asm/bootinfo.h index 38d3140381fa..203d9cbf9630 100644 --- a/arch/m68k/include/uapi/asm/bootinfo.h +++ b/arch/m68k/include/uapi/asm/bootinfo.h @@ -83,6 +83,7 @@ struct mem_info { #define MACH_SUN3X 11 #define MACH_M54XX 12 #define MACH_M5441X 13 +#define MACH_VIRT 14 =20 =20 /* diff --git a/arch/m68k/kernel/Makefile b/arch/m68k/kernel/Makefile index dbac7f8743fc..c0833da6a2ca 100644 --- a/arch/m68k/kernel/Makefile +++ b/arch/m68k/kernel/Makefile @@ -11,6 +11,7 @@ extra-$(CONFIG_VME) :=3D head.o extra-$(CONFIG_HP300) :=3D head.o extra-$(CONFIG_Q40) :=3D head.o extra-$(CONFIG_SUN3X) :=3D head.o +extra-$(CONFIG_VIRT) :=3D head.o extra-$(CONFIG_SUN3) :=3D sun3-head.o extra-y +=3D vmlinux.lds =20 diff --git a/arch/m68k/kernel/head.S b/arch/m68k/kernel/head.S index 493c95db0e51..9e812d8606be 100644 --- a/arch/m68k/kernel/head.S +++ b/arch/m68k/kernel/head.S @@ -262,6 +262,7 @@ #include #include #include +#include #include #include #include @@ -534,6 +535,7 @@ func_define putn,1 #define is_not_apollo(lab) cmpl &MACH_APOLLO,%pc@(m68k_machtype); jne lab #define is_not_q40(lab) cmpl &MACH_Q40,%pc@(m68k_machtype); jne lab #define is_not_sun3x(lab) cmpl &MACH_SUN3X,%pc@(m68k_machtype); jne lab +#define is_not_virt(lab) cmpl &MACH_VIRT,%pc@(m68k_machtype); jne lab =20 #define hasnt_leds(lab) cmpl &MACH_HP300,%pc@(m68k_machtype); \ jeq 42f; \ @@ -647,6 +649,14 @@ ENTRY(__start) L(test_notmac): #endif /* CONFIG_MAC */ =20 +#ifdef CONFIG_VIRT + is_not_virt(L(test_notvirt)) + + get_bi_record BI_VIRT_GF_TTY_BASE + lea %pc@(L(virt_gf_tty_base)),%a1 + movel %a0@,%a1@ +L(test_notvirt): +#endif /* CONFIG_VIRT */ =20 /* * There are ultimately two pieces of information we want for all kinds of @@ -1237,6 +1247,13 @@ L(mmu_init_not_mac): L(notsun3x): #endif =20 +#ifdef CONFIG_VIRT + is_not_virt(L(novirt)) + mmu_map_tt #1,#0xFF000000,#0x01000000,#_PAGE_NOCACHE_S + jbra L(mmu_init_done) +L(novirt): +#endif + #ifdef CONFIG_APOLLO is_not_apollo(L(notapollo)) =20 @@ -3186,6 +3203,14 @@ func_start serial_putc,%d0/%d1/%a0/%a1 3: #endif =20 +#ifdef CONFIG_VIRT + is_not_virt(1f) + + movel L(virt_gf_tty_base),%a1 + movel %d0,%a1@(GF_PUT_CHAR) +1: +#endif + L(serial_putc_done): func_return serial_putc =20 @@ -3865,3 +3890,9 @@ q40_mem_cptr: L(q40_do_debug): .long 0 #endif + +#if defined(CONFIG_VIRT) +GF_PUT_CHAR =3D 0x00 +L(virt_gf_tty_base): + .long 0 +#endif /* CONFIG_VIRT */ diff --git a/arch/m68k/kernel/setup_mm.c b/arch/m68k/kernel/setup_mm.c index 8228275aae3e..39ba09ccb538 100644 --- a/arch/m68k/kernel/setup_mm.c +++ b/arch/m68k/kernel/setup_mm.c @@ -182,6 +182,8 @@ static void __init m68k_parse_bootinfo(const struct bi_= record *record) unknown =3D hp300_parse_bootinfo(record); else if (MACH_IS_APOLLO) unknown =3D apollo_parse_bootinfo(record); + else if (MACH_IS_VIRT) + unknown =3D virt_parse_bootinfo(record); else unknown =3D 1; } @@ -312,6 +314,11 @@ void __init setup_arch(char **cmdline_p) cf_mmu_context_init(); config_BSP(NULL, 0); break; +#endif +#ifdef CONFIG_VIRT + case MACH_VIRT: + config_virt(); + break; #endif default: panic("No configuration setup"); diff --git a/arch/m68k/mm/kmap.c b/arch/m68k/mm/kmap.c index 20ddf71b43d0..39729f40d106 100644 --- a/arch/m68k/mm/kmap.c +++ b/arch/m68k/mm/kmap.c @@ -179,6 +179,12 @@ void __iomem *__ioremap(unsigned long physaddr, unsign= ed long size, int cachefla return (void __iomem *)physaddr; } #endif +#ifdef CONFIG_VIRT + if (MACH_IS_VIRT) { + if (physaddr >=3D 0xff000000 && cacheflag =3D=3D IOMAP_NOCACHE_SER) + return (void __iomem *)physaddr; + } +#endif #ifdef CONFIG_COLDFIRE if (__cf_internalio(physaddr)) return (void __iomem *) physaddr; @@ -292,18 +298,21 @@ EXPORT_SYMBOL(__ioremap); */ void iounmap(void __iomem *addr) { -#ifdef CONFIG_AMIGA - if ((!MACH_IS_AMIGA) || - (((unsigned long)addr < 0x40000000) || - ((unsigned long)addr > 0x60000000))) - free_io_area((__force void *)addr); -#else +#if defined(CONFIG_AMIGA) + if (MACH_IS_AMIGA && + ((unsigned long)addr >=3D 0x40000000) && + ((unsigned long)addr < 0x60000000)) + return; +#endif +#if defined(CONFIG_VIRT) + if (MACH_IS_VIRT && (unsigned long)addr >=3D 0xff000000) + return; +#endif #ifdef CONFIG_COLDFIRE if (cf_internalio(addr)) return; #endif free_io_area((__force void *)addr); -#endif } EXPORT_SYMBOL(iounmap); =20 diff --git a/arch/m68k/virt/Makefile b/arch/m68k/virt/Makefile new file mode 100644 index 000000000000..54b9b2866654 --- /dev/null +++ b/arch/m68k/virt/Makefile @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +# Makefile for Linux arch/m68k/virt source directory +# + +obj-y :=3D config.o ints.o platform.o diff --git a/arch/m68k/virt/config.c b/arch/m68k/virt/config.c new file mode 100644 index 000000000000..a4a7882b4386 --- /dev/null +++ b/arch/m68k/virt/config.c @@ -0,0 +1,130 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include +#include + +#include +#include +#include +#include +#include +#include + +struct virt_booter_data virt_bi_data; + +#define VIRT_CTRL_REG_FEATURES 0x00 +#define VIRT_CTRL_REG_CMD 0x04 + +static struct resource ctrlres; + +enum { + CMD_NOOP, + CMD_RESET, + CMD_HALT, + CMD_PANIC, +}; + +static void virt_get_model(char *str) +{ + /* str is 80 characters long */ + sprintf(str, "QEMU Virtual M68K Machine (%u.%u.%u)", + (u8)(virt_bi_data.qemu_version >> 24), + (u8)(virt_bi_data.qemu_version >> 16), + (u8)(virt_bi_data.qemu_version >> 8)); +} + +static void virt_halt(void) +{ + void __iomem *base =3D (void *)virt_bi_data.ctrl.mmio; + + iowrite32be(CMD_HALT, base + VIRT_CTRL_REG_CMD); + local_irq_disable(); + while (1) + ; +} + +static void virt_reset(void) +{ + void __iomem *base =3D (void *)virt_bi_data.ctrl.mmio; + + iowrite32be(CMD_RESET, base + VIRT_CTRL_REG_CMD); + local_irq_disable(); + while (1) + ; +} + +/* + * Parse a virtual-m68k-specific record in the bootinfo + */ + +int __init virt_parse_bootinfo(const struct bi_record *record) +{ + int unknown =3D 0; + const void *data =3D record->data; + + switch (be16_to_cpu(record->tag)) { + case BI_VIRT_QEMU_VERSION: + virt_bi_data.qemu_version =3D be32_to_cpup(data); + break; + case BI_VIRT_GF_PIC_BASE: + virt_bi_data.pic.mmio =3D be32_to_cpup(data); + data +=3D 4; + virt_bi_data.pic.irq =3D be32_to_cpup(data); + break; + case BI_VIRT_GF_RTC_BASE: + virt_bi_data.rtc.mmio =3D be32_to_cpup(data); + data +=3D 4; + virt_bi_data.rtc.irq =3D be32_to_cpup(data); + break; + case BI_VIRT_GF_TTY_BASE: + virt_bi_data.tty.mmio =3D be32_to_cpup(data); + data +=3D 4; + virt_bi_data.tty.irq =3D be32_to_cpup(data); + break; + case BI_VIRT_CTRL_BASE: + virt_bi_data.ctrl.mmio =3D be32_to_cpup(data); + data +=3D 4; + virt_bi_data.ctrl.irq =3D be32_to_cpup(data); + break; + case BI_VIRT_VIRTIO_BASE: + virt_bi_data.virtio.mmio =3D be32_to_cpup(data); + data +=3D 4; + virt_bi_data.virtio.irq =3D be32_to_cpup(data); + break; + default: + unknown =3D 1; + break; + } + return unknown; +} + +static void __init virt_sched_init(void) +{ + goldfish_timer_init(virt_bi_data.rtc.irq, + (void *)virt_bi_data.rtc.mmio); +} + +void __init config_virt(void) +{ + char earlycon[24]; + + snprintf(earlycon, sizeof(earlycon), "early_gf_tty,0x%08lx", + virt_bi_data.tty.mmio); + setup_earlycon(earlycon); + + ctrlres =3D (struct resource) + DEFINE_RES_MEM_NAMED(virt_bi_data.ctrl.mmio, 0x100, + "virtctrl"); + + if (request_resource(&iomem_resource, &ctrlres)) { + pr_err("Cannot allocate virt controller resource\n"); + return; + } + + mach_init_IRQ =3D virt_init_IRQ; + mach_sched_init =3D virt_sched_init; + mach_get_model =3D virt_get_model; + mach_reset =3D virt_reset; + mach_halt =3D virt_halt; + mach_power_off =3D virt_halt; +} diff --git a/arch/m68k/virt/ints.c b/arch/m68k/virt/ints.c new file mode 100644 index 000000000000..caca8949dbf0 --- /dev/null +++ b/arch/m68k/virt/ints.c @@ -0,0 +1,153 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#define GFPIC_REG_IRQ_PENDING 0x04 +#define GFPIC_REG_IRQ_DISABLE_ALL 0x08 +#define GFPIC_REG_IRQ_DISABLE 0x0c +#define GFPIC_REG_IRQ_ENABLE 0x10 + +extern void show_registers(struct pt_regs *regs); + +static struct resource picres[6]; +static const char *picname[6] =3D { + "goldfish_pic.0", + "goldfish_pic.1", + "goldfish_pic.2", + "goldfish_pic.3", + "goldfish_pic.4", + "goldfish_pic.5" +}; + +/* + * 6 goldfish-pic for CPU IRQ #1 to IRQ #6 + * CPU IRQ #1 -> PIC #1 + * IRQ #1 to IRQ #31 -> unused + * IRQ #32 -> goldfish-tty + * CPU IRQ #2 -> PIC #2 + * IRQ #1 to IRQ #32 -> virtio-mmio from 1 to 32 + * CPU IRQ #3 -> PIC #3 + * IRQ #1 to IRQ #32 -> virtio-mmio from 33 to 64 + * CPU IRQ #4 -> PIC #4 + * IRQ #1 to IRQ #32 -> virtio-mmio from 65 to 96 + * CPU IRQ #5 -> PIC #5 + * IRQ #1 to IRQ #32 -> virtio-mmio from 97 to 128 + * CPU IRQ #6 -> PIC #6 + * IRQ #1 -> goldfish-timer + * IRQ #2 -> goldfish-rtc + * IRQ #3 to IRQ #32 -> unused + * CPU IRQ #7 -> NMI + */ + +static u32 gfpic_read(int pic, int reg) +{ + void __iomem *base =3D (void *)(virt_bi_data.pic.mmio + pic * 0x1000); + + return ioread32be(base + reg); +} + +static void gfpic_write(u32 value, int pic, int reg) +{ + void __iomem *base =3D (void *)(virt_bi_data.pic.mmio + pic * 0x1000); + + iowrite32be(value, base + reg); +} + +#define GF_PIC(irq) ((irq - IRQ_USER) / 32) +#define GF_IRQ(irq) ((irq - IRQ_USER) % 32) + +static void virt_irq_enable(struct irq_data *data) +{ + gfpic_write(1 << GF_IRQ(data->irq), GF_PIC(data->irq), + GFPIC_REG_IRQ_ENABLE); +} + +static void virt_irq_disable(struct irq_data *data) +{ + gfpic_write(1 << GF_IRQ(data->irq), GF_PIC(data->irq), + GFPIC_REG_IRQ_DISABLE); +} + +static unsigned int virt_irq_startup(struct irq_data *data) +{ + virt_irq_enable(data); + return 0; +} + +static irqreturn_t virt_nmi_handler(int irq, void *dev_id) +{ + static int in_nmi; + + if (READ_ONCE(in_nmi)) + return IRQ_HANDLED; + WRITE_ONCE(in_nmi, 1); + + pr_warn("Non-Maskable Interrupt\n"); + show_registers(get_irq_regs()); + + WRITE_ONCE(in_nmi, 0); + return IRQ_HANDLED; +} + +static struct irq_chip virt_irq_chip =3D { + .name =3D "virt", + .irq_enable =3D virt_irq_enable, + .irq_disable =3D virt_irq_disable, + .irq_startup =3D virt_irq_startup, + .irq_shutdown =3D virt_irq_disable, +}; + +static void goldfish_pic_irq(struct irq_desc *desc) +{ + u32 irq_pending; + int irq_num; + int pic =3D desc->irq_data.irq - 1; + + irq_pending =3D gfpic_read(pic, GFPIC_REG_IRQ_PENDING); + irq_num =3D IRQ_USER + pic * 32; + + do { + if (irq_pending & 1) + generic_handle_irq(irq_num); + ++irq_num; + irq_pending >>=3D 1; + } while (irq_pending); +} + +void __init virt_init_IRQ(void) +{ + int pic; + + m68k_setup_irq_controller(&virt_irq_chip, handle_simple_irq, IRQ_USER, + NUM_VIRT_SOURCES - IRQ_USER); + + for (pic =3D 0; pic < 6; pic++) { + + picres[pic] =3D (struct resource) + DEFINE_RES_MEM_NAMED(virt_bi_data.pic.mmio + pic * 0x1000, + 0x1000, picname[pic]); + if (request_resource(&iomem_resource, &picres[pic])) { + pr_err("Cannot allocate %s resource\n", picname[pic]); + return; + } + + irq_set_chained_handler(virt_bi_data.pic.irq + pic, + goldfish_pic_irq); + } + + if (request_irq(IRQ_AUTO_7, virt_nmi_handler, 0, "NMI", + virt_nmi_handler)) + pr_err("Couldn't register NMI\n"); +} diff --git a/arch/m68k/virt/platform.c b/arch/m68k/virt/platform.c new file mode 100644 index 000000000000..f432b90dcd1a --- /dev/null +++ b/arch/m68k/virt/platform.c @@ -0,0 +1,72 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include +#include +#include +#include +#include + +#define VIRTIO_BUS_NB 128 + +static int __init virt_virtio_init(int id) +{ + const struct resource res[] =3D { + DEFINE_RES_MEM(virt_bi_data.virtio.mmio + id * 0x200, 0x200), + DEFINE_RES_IRQ(virt_bi_data.virtio.irq + id), + }; + struct platform_device *pdev; + + pdev =3D platform_device_register_simple("virtio-mmio", id, + res, ARRAY_SIZE(res)); + if (IS_ERR(pdev)) + return PTR_ERR(pdev); + + return 0; +} + +static int __init virt_platform_init(void) +{ + const struct resource goldfish_tty_res[] =3D { + DEFINE_RES_MEM(virt_bi_data.tty.mmio, 1), + DEFINE_RES_IRQ(virt_bi_data.tty.irq), + }; + /* this is the second gf-rtc, the first one is used by the scheduler */ + const struct resource goldfish_rtc_res[] =3D { + DEFINE_RES_MEM(virt_bi_data.rtc.mmio + 0x1000, 0x1000), + DEFINE_RES_IRQ(virt_bi_data.rtc.irq + 1), + }; + struct platform_device *pdev; + int i; + + if (!MACH_IS_VIRT) + return -ENODEV; + + /* We need this to have DMA'able memory provided to goldfish-tty */ + min_low_pfn =3D 0; + + pdev =3D platform_device_register_simple("goldfish_tty", + PLATFORM_DEVID_NONE, + goldfish_tty_res, + ARRAY_SIZE(goldfish_tty_res)); + if (IS_ERR(pdev)) + return PTR_ERR(pdev); + + pdev =3D platform_device_register_simple("goldfish_rtc", + PLATFORM_DEVID_NONE, + goldfish_rtc_res, + ARRAY_SIZE(goldfish_rtc_res)); + if (IS_ERR(pdev)) + return PTR_ERR(pdev); + + for (i =3D 0; i < VIRTIO_BUS_NB; i++) { + int err; + + err =3D virt_virtio_init(i); + if (err) + return err; + } + + return 0; +} + +arch_initcall(virt_platform_init); --=20 2.34.1