From nobody Tue Jun 30 09:24:30 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 47319C433F5 for ; Thu, 20 Jan 2022 08:04:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1358578AbiATIEb (ORCPT ); Thu, 20 Jan 2022 03:04:31 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:48323 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1358355AbiATIEU (ORCPT ); Thu, 20 Jan 2022 03:04:20 -0500 Received: from quad ([82.142.13.186]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MZT2u-1mqBiB1OsA-00WXJm; Thu, 20 Jan 2022 09:03:53 +0100 From: Laurent Vivier To: linux-kernel@vger.kernel.org Cc: Alessandro Zummo , linux-rtc@vger.kernel.org, John Stultz , Arnd Bergmann , Daniel Lezcano , Jiaxun Yang , Alexandre Belloni , linux-m68k@lists.linux-m68k.org, Thomas Gleixner , Stephen Boyd , Geert Uytterhoeven , Laurent Vivier Subject: [PATCH v11 1/5] m68k: add asm/config.h Date: Thu, 20 Jan 2022 09:03:43 +0100 Message-Id: <20220120080347.1595379-2-laurent@vivier.eu> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220120080347.1595379-1-laurent@vivier.eu> References: <20220120080347.1595379-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:1lvuRUcUif2PKwRAzIzC/D0FWV3r2SFOPt02QRTDt0b06TxRojh haEDx6tjCrwuX6Zw4YU8QsY/rfSCf3Sf0fC86LWjDkFPyflzFbJeawC4njWC/1l65y7E0sD XJxdpPFXRpLAToiHnG7PlgOEBjZGrKHa6G92hanQtL1HTXNqSerrPZfrlIOVMgWRh9OLetg gljp9zNHXoZf2gozlkjOg== X-UI-Out-Filterresults: notjunk:1;V03:K0:e2QkesX9kY0=:dwml8KNsuLbgXxYKdKtNTs ORrfeXmNR80HM/uFgAShIq9AHIavGN2P4iqYdJroUdyerB0fqUMGswu84ozejo+mX5nJtgNGG XwBscVJ9la0F/fuFBSEtUPoKL0MlV3Dhnov6MLlxnIi+LsV8VW9GtkRfypcfQOZP5hFjBeX8N LgfPMzKmxm24kMctOUybwdRAQI7A3NMWXqlYhFuG9IOC+cTo2QS+xT7IV4pACek9aRUTKdl8K LeFydrG3zb7Wli5p2nUI3xYHGMYxUcAls4j8M2BMD6n0xciAo/Gys/tXseAL88zERBR40Wm+/ rcBZQ7oXM2BKfiC1mFiTcR7GNFMC2LGm3XFFYj/9DVP2IpTLMubK6CeTcNkhFZwwijIKjtuDP UFkLMromRy28x2UhMkkJfpboNXtZrqONhhkyBPezTzcKJ6GG+xD8GCAu8e5BvuUEDFnMaMEBy MH+CtWuuFPT+45UBjxYijteSqogbvHMg58Sz9Wpir4/aj5gBEoVY4mGUtEI38KPer/gdwU6ST czVe2jyZOhHOQFuocfLAWx2q7Yu7+NYj2uhfAPwaV8vQEj8GrQ5d68yVQ6SP63QSxnFqh8n3j XxKKvPcDqw3zMkIoamDxbClr59PO/cQ9bk2BO24tpYblTv51SQdhzcltNhu1Aw2YKPjtJcDj3 /CrPC6pMOSOxSw7ZfD/DN0beKK34qyrdzJQyCfgmcYW9E2OlRKl6ASUbXNX/hLAeP6JQ= 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 Tue Jun 30 09:24:30 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 BFAE8C433EF for ; Thu, 20 Jan 2022 08:04:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1359072AbiATIEi (ORCPT ); Thu, 20 Jan 2022 03:04:38 -0500 Received: from mout.kundenserver.de ([212.227.17.13]:33789 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1358391AbiATIEV (ORCPT ); Thu, 20 Jan 2022 03:04:21 -0500 Received: from quad ([82.142.13.186]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MTAS1-1mjL0v21hH-00UbNX; Thu, 20 Jan 2022 09:03:54 +0100 From: Laurent Vivier To: linux-kernel@vger.kernel.org Cc: Alessandro Zummo , linux-rtc@vger.kernel.org, John Stultz , Arnd Bergmann , Daniel Lezcano , Jiaxun Yang , Alexandre Belloni , linux-m68k@lists.linux-m68k.org, Thomas Gleixner , Stephen Boyd , Geert Uytterhoeven , Laurent Vivier Subject: [PATCH v11 2/5] tty: goldfish: introduce gf_ioread32()/gf_iowrite32() Date: Thu, 20 Jan 2022 09:03:44 +0100 Message-Id: <20220120080347.1595379-3-laurent@vivier.eu> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220120080347.1595379-1-laurent@vivier.eu> References: <20220120080347.1595379-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:dJDSImD3kRyXEJdZ97I6Z1oPvkUw0A+R37WfUDA+HmbJZPkdRv6 h3xLhhkYKYqikVzzyc5QQZEIWdDmgAKKUQ0UoJi4XHRwVjWCjqg4m9ypQhdGjfTA6zKZ9qr 9SYerVo07QzqYQ0fRsnRb0rtQv4T3HZIf2zpQrVlms8AQHG3sl3vS6PgYs8YjqeN2agcch1 3a304KWYcVg6juwIX7qYg== X-UI-Out-Filterresults: notjunk:1;V03:K0:wVMKcL8y36M=:cGtbXVXjpWs96O1RFZ1Xrp 85st+Hag15JRWdUeOl9Xvh0ePhdMtRZRKUvMHy0FOqpqpyMey65YMZExJ3Z08L39SUx1a/Q1D DnHfBuwByGcQ0rXLQNEX/TvPp+h6wob7rVQ8p6ONlXHGDze0uk3Ck9UQY7aQfK3JFjCciwjN1 9uq1m+gOZLu44ljunalK5yCAt7RB8HIHFXD2mCqeaLUv67JX2BgXW5jqGdJklALcUVD2qO1lm SaUAAsA8v2+jgkmH6woRfoOhKxo2PT23Kqji0g4IlMwkWc6jV+eCH+7K6dGEYMMMyoDocI564 p114i1hzTOkXhQe+Kmc6GWkExL+ibaZHTOCM6823cxYUcL6nrLbgk6Nlb+iwkCVhX639YnCqY y6K6nrulCLjVYiDbFEt9XmGAODUFxbajzhhclP5TWDrB9APEeV8kEPCscHvjgAHTJ8kxVoVRZ MMvwes5MRsX6cg3MEFPCJzVlY7et96h1gJluzRyqeIVZi0NDd7kGs3IhnwohulvMlTvhEW//Q gCyECfUamJhU2TaRumpWGQC3ZI/t+Wn09o5r9/AABT8nlZvonVPTr/D5i4jQZgjxQ3n3xY89q OIJ1MbTD2Q1hbKVy4oA7EsGk9p10vcLpbKcKon78PhrCYFXFAnzbW1fblOSs08KNifB1PF6Ev KXnKTTRFP0umEc8u7C+qscoN6C7q6PlAXBQNk6ACXuyn8I5ZpfcEFtSJlpP7tFcl6EHU= 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()") to use accessors defined by the architecture. Define by default the accessor to be little-endian as we have only little-endian architectures using goldfish devices. 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 Tue Jun 30 09:24:30 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 4971AC433F5 for ; Thu, 20 Jan 2022 08:05:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1359135AbiATIFF (ORCPT ); Thu, 20 Jan 2022 03:05:05 -0500 Received: from mout.kundenserver.de ([217.72.192.73]:58995 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1358448AbiATIE2 (ORCPT ); Thu, 20 Jan 2022 03:04:28 -0500 Received: from quad ([82.142.13.186]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1Mnqfc-1mVN6P2AqA-00pJic; Thu, 20 Jan 2022 09:03:55 +0100 From: Laurent Vivier To: linux-kernel@vger.kernel.org Cc: Alessandro Zummo , linux-rtc@vger.kernel.org, John Stultz , Arnd Bergmann , Daniel Lezcano , Jiaxun Yang , Alexandre Belloni , linux-m68k@lists.linux-m68k.org, Thomas Gleixner , Stephen Boyd , Geert Uytterhoeven , Laurent Vivier Subject: [PATCH v11 3/5] rtc: goldfish: use gf_ioread32()/gf_iowrite32() Date: Thu, 20 Jan 2022 09:03:45 +0100 Message-Id: <20220120080347.1595379-4-laurent@vivier.eu> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220120080347.1595379-1-laurent@vivier.eu> References: <20220120080347.1595379-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:PDlTvEErr5w6REUxeS4f2MUuaTmpsPqLy8NBpWsWLJ7HitgBOLP j8hOIts9trIqV0mIBdQzPWMXhzv/1yO3Y9mBAjx7hTkUdXL9DzUhQdMbOJ5ljGLRom48J5E FVzWOuy+dn16RlGPpr4JPQjA+J0w0GW0keR512UgAnzHa51ef0Ugrd0QX3S3cwPvCwYW19M NeteAPzQotgVF2T/v+OKw== X-UI-Out-Filterresults: notjunk:1;V03:K0:IXTJ/PC8SO8=:hOtS4rQX09Ypm+WJJiDFVN WmoA5tMLstWnfC/eAk9DwElhUKRlH/dQCTQ/52Imeuc5nhFNsytHZPTxzPM3CtFnAdL/xXTJh 961yf4MbNZOffBoLzvuEzIwoS0G2C4g4H5bgaKE8HiKxDZYMThMKbNI2+YgADN5Fg5KLIeV2a /7skmHjjiPaKKM2p5Eypj16zfIJQzIg3hWwflwJ4DyB2w7drLMUNtOyFeeHffazAasGJ8pAaL 2B+rjVTqHPaS1BSk1vxRBLIO+XpWzZRI/ZlcKuLwek/gKSN3xFX5SIBWBeNLIQpGZvibF95ZA +EJ2WBvaXKP95+s8jWvNfCBiXF3vIWNvD93mGs+ZzBXU3Dskf2Xd4CfTLARTJtp8dIryU5kAZ +GAGxhqXZl0VMQmi4U+cOslIY84UATnP6cLoUj9Hq/hHwNAKfIbECv4zrybpHkKIvkhe9RTWG yGEVQv3eZBTEPULat9GrsmCRpYVwBfQ5x15uxWdHOUQs7jWZg2lOLxkjlWAwMZMF8rClG3ZZq Fk9fL9LUK7Y5BgASpcj9UP4QLWgFq07xHvvzY352FKNlufStP7tlPjlIWUNsIfNd2u9xVb5IV Gplbq77+qOYuHhp04vqYWpRYzAARE/2YOHnA4YjDdWoICNorJojKxnK93+ZxLRS+eImFuu1lK dcYd2G/DWm0oPd39FJlan23DxeO73D81+xRzU98wk3B+Sm/tsPWUeKyQG4GZZfbId9XQ= 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 | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/rtc/rtc-goldfish.c b/drivers/rtc/rtc-goldfish.c index 7ab95d052644..a3a556f6a3e0 100644 --- a/drivers/rtc/rtc-goldfish.c +++ b/drivers/rtc/rtc-goldfish.c @@ -41,8 +41,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 +50,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 +71,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 +98,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 +110,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 +128,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 +149,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 Tue Jun 30 09:24:30 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 C1C8FC433F5 for ; Thu, 20 Jan 2022 08:04:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1358413AbiATIEU (ORCPT ); Thu, 20 Jan 2022 03:04:20 -0500 Received: from mout.kundenserver.de ([212.227.17.24]:48149 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345111AbiATIEN (ORCPT ); Thu, 20 Jan 2022 03:04:13 -0500 Received: from quad ([82.142.13.186]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MadGG-1mZkpC28pW-00c8Ru; Thu, 20 Jan 2022 09:03:56 +0100 From: Laurent Vivier To: linux-kernel@vger.kernel.org Cc: Alessandro Zummo , linux-rtc@vger.kernel.org, John Stultz , Arnd Bergmann , Daniel Lezcano , Jiaxun Yang , Alexandre Belloni , linux-m68k@lists.linux-m68k.org, Thomas Gleixner , Stephen Boyd , Geert Uytterhoeven , Laurent Vivier Subject: [PATCH v11 4/5] clocksource/drivers: Add a goldfish-timer clocksource Date: Thu, 20 Jan 2022 09:03:46 +0100 Message-Id: <20220120080347.1595379-5-laurent@vivier.eu> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220120080347.1595379-1-laurent@vivier.eu> References: <20220120080347.1595379-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:tX47dR4GqPQ8lZzM2rFQxq26QCNH2k5h57dbhZSG8C93GSEZ2Uf zZYOBta1y/88sp2igVRuY9DD/r/vM/7C7wUqHGFQhHS8bzULEvwlh2i4Pxc2tI0uzMuZZQZ Wly+XED10CXFiTZGITHjRYUHHtWvGPhAFoMlbVzPYpyghOr0m1dOOZ8ie5Z2eYEydT1/jeD 5Ll864bqeox2nEBeeBA6A== X-UI-Out-Filterresults: notjunk:1;V03:K0:fYpxx3P4xJ0=:9pPsDHnzdt9nYu8bTgUcAD ZpEd0q0d327UP1Iy6tvrMKDAvsLpMpabnCClqBpL+nRE8NGOmJ8IG5SLH9zkcriIxe1E1qkeC 04ZHSJU7K4uLWgtADnwzY/ZtRcidSFQ8SKAvhjYenzHuFFFiCx1kVAqOQct7ctHh6aE4eVJBi nyIG44pQ8WH7qUlgfwAhGcevoddztKLmxgvbTxENTNq8VYZrZqa4RuujTpLiWAXx2y9/JgHFW 8e5oQjmV5Aiv1tGyZZcrp2heiS1ImHeBbjiujW/uhek+rrgplzi30RygsNI3W1Nsk9c9xTgXa Wul2eta1eUYnBoOY9ypNo7oPDWm/2xPLE/Sa/KHug/LrrF1xa6ZxpwUrrtBWcYJgb4NJfgRvT 4gLa0ZUw03GMvzdVM6t43Mg4z5TjzQ6va8KmawWzfdHyBKMcxXYnqgE11qKRV1hR1QqNNOljR Dd90qX6v8ft2SRKWLR7Rt19yu5Y+o28W7Myi4OKCqmf+Z4/0psG+Gl7+bMYeJHkehpdn9Jg+k 3bClq578ePTzxdX9PAhIK6MEjadHLhSXj3XyQUn2dUDdAIpral0UubesDcGYcFJdIfN7eddCi 6obxR6+RDo0p7GLArEkuF9JGpWnHrWN+XXRWf8lzma/UnXYQwYK1SEim51+ytuGn+ppAHVkF1 b35QrEflhH2I8HDRLbUKJGyAiaFdCffnun+2tbj/NV5El3VWzBYicEr9uaIELX++MHz0= 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. Signed-off-by: Laurent Vivier --- drivers/clocksource/Kconfig | 7 ++ drivers/clocksource/Makefile | 1 + drivers/clocksource/timer-goldfish.c | 162 +++++++++++++++++++++++++++ include/clocksource/timer-goldfish.h | 11 ++ 4 files changed, 181 insertions(+) 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..b57c964b3dda --- /dev/null +++ b/drivers/clocksource/timer-goldfish.c @@ -0,0 +1,162 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include +#include +#include +#include +#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 + +struct goldfish_timer { + struct clocksource cs; + struct clock_event_device ced; + struct resource res; + void __iomem *base; + int irq; +}; + +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 golfish_timer_tick(int irq, void *dev_id) +{ + struct clock_event_device *evt =3D dev_id; + struct goldfish_timer *timerdrv =3D ced_to_gf(evt); + void __iomem *base =3D timerdrv->base; + + gf_iowrite32(1, base + TIMER_CLEAR_INTERRUPT); + + evt->event_handler(evt); + + return IRQ_HANDLED; +} + +void __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; + + timerdrv->base =3D base; + timerdrv->irq =3D irq; + + 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, + }; + + if (request_resource(&iomem_resource, &timerdrv->res)) { + pr_err("Cannot allocate goldfish-timer resource\n"); + return; + } + + 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(timerdrv->irq, golfish_timer_tick, IRQF_TIMER, + "goldfish_timer", &timerdrv->ced); + if (ret) { + pr_err("Couldn't register goldfish-timer interrupt\n"); + return; + } + + clockevents_config_and_register(&timerdrv->ced, NSEC_PER_SEC, + 1, 0xffffffff); +} diff --git a/include/clocksource/timer-goldfish.h b/include/clocksource/tim= er-goldfish.h new file mode 100644 index 000000000000..b237267844f1 --- /dev/null +++ b/include/clocksource/timer-goldfish.h @@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * goldfish-timer clocksource + */ + +#ifndef _CLOCKSOURCE_GOLDFISH_TIMER_H +#define _CLOCKSOURCE_GOLDFISH_TIMER_H + +extern void goldfish_timer_init(int irq, void __iomem *base); + +#endif /* _CLOCKSOURCE_GOLDFISH_TIMER_H */ --=20 2.34.1 From nobody Tue Jun 30 09:24:30 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 CC079C433F5 for ; Thu, 20 Jan 2022 08:06:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1358678AbiATIGn (ORCPT ); Thu, 20 Jan 2022 03:06:43 -0500 Received: from mout.kundenserver.de ([217.72.192.74]:53021 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1358549AbiATIEd (ORCPT ); Thu, 20 Jan 2022 03:04:33 -0500 Received: from quad ([82.142.13.186]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1M9nAB-1nFexM2Whx-005pEb; Thu, 20 Jan 2022 09:03:58 +0100 From: Laurent Vivier To: linux-kernel@vger.kernel.org Cc: Alessandro Zummo , linux-rtc@vger.kernel.org, John Stultz , Arnd Bergmann , Daniel Lezcano , Jiaxun Yang , Alexandre Belloni , linux-m68k@lists.linux-m68k.org, Thomas Gleixner , Stephen Boyd , Geert Uytterhoeven , Laurent Vivier Subject: [PATCH v11 5/5] m68k: introduce a virtual m68k machine Date: Thu, 20 Jan 2022 09:03:47 +0100 Message-Id: <20220120080347.1595379-6-laurent@vivier.eu> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220120080347.1595379-1-laurent@vivier.eu> References: <20220120080347.1595379-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:S3C3yLgpgBH80UGlUsf2H0ZYekuKdaeMB+1QQVJAZlY+UuCyhXE SYx+CV7tc4IOWAtSk9qMhKz/XSodH4mh9crTHw9fBqKOwyxhuuHu4q5ClMpG4XoJgHvzkWk 4SCRNxyi5QjZBgAR6xTSeR745NkqXhajCYR+71PqWzaRbG2Wszeza3r1Xcvhg1/EulsV61q hhebyG7B7/VIv8vKN75mQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:V8wjQqN/4o0=:AsafjIfYSGCuT7wOc+0z8D KzDEEJOqaXBFvBxBYNENpE2WhrYRk+/hUDSGkd3tF21YlcyUHfCRUJMQqBF7SwaT7oSPFlKOz 6WYxYW+338orRJ37A/vMYJ+PBq+ELTwqSZcajIhAfJzi2kSnpixtaVIUb9fgwhK/S35wg4Z9l RvXCGhBYqBaHKZvZQ68jKcqrMPys7QmZRcQA9dsQZils2UFZbJOyKOVKEv0qVzERJx0eilKq1 BUoEyFX5LYJLxskjZvMRle8vJdERvTUyxbSBa8spljc/Pg+DNxiMfyuLd5ordt8o0REfRLYlB NRrtsAH/VA2jOrkQC888LPJKSFsOm4dXhqnvjGccwLek/eDzkt54gR2KkB/Hc5EyNF2K86MpZ xpAk4FvYhOhMaixwVEszEki1GtfFT4SNCSIsb2BGDNYiwPHyRh85PJvirKoARBHPBqdLrvndP +TnLUw12gFQthe1OuBbIoLONOMT1S915jXW8ANC3L/Ga+8XY1ti7jUAlaSBBYJTVcIkts3CSy ZIvPs4a5kSrVorq3vrwcT1lW4L3FB5mskFgzOZDlZi2MwF7Ez+cAIDoUNAmF2BEeWaqpyMPFn D2z7Fh5iqK4V5lxf5RkDOLxsLTP49VgDLvTjkqRwrtUqQ5w5fZUENKmwMXxm95EiVdby+bJpj R8DqYil29z5kRvRg2Z/btIladZJwlIVZn8FoQKaohZeb6XjALs+FuHKxfAHGiuAavfsM= 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 | 65 ++++++++++ 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 | 119 ++++++++++++++++++ arch/m68k/virt/ints.c | 133 +++++++++++++++++++++ arch/m68k/virt/platform.c | 72 +++++++++++ 19 files changed, 560 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..462e51ef69eb --- /dev/null +++ b/arch/m68k/configs/virt_defconfig @@ -0,0 +1,65 @@ +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_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..e92a22dad1bc --- /dev/null +++ b/arch/m68k/virt/config.c @@ -0,0 +1,119 @@ +// 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 + +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); + + 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..c4e6386afeef --- /dev/null +++ b/arch/m68k/virt/ints.c @@ -0,0 +1,133 @@ +// SPDX-License-Identifier: GPL-2.0 + +#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); + +/* + * 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 i; + + m68k_setup_irq_controller(&virt_irq_chip, handle_simple_irq, IRQ_USER, + NUM_VIRT_SOURCES - IRQ_USER); + + for (i =3D 0; i < 6; i++) { + irq_set_chained_handler(virt_bi_data.pic.irq + i, + 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