From nobody Tue Jun 30 11:02:21 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 06FD2C433F5 for ; Wed, 19 Jan 2022 00:05:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350361AbiASAFn (ORCPT ); Tue, 18 Jan 2022 19:05:43 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:60617 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346769AbiASAFl (ORCPT ); Tue, 18 Jan 2022 19:05:41 -0500 Received: from quad ([82.142.13.186]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1N0nOF-1mMFSl0ojd-00wpnl; Wed, 19 Jan 2022 01:05:10 +0100 From: Laurent Vivier To: linux-kernel@vger.kernel.org Cc: Alexandre Belloni , Alessandro Zummo , John Stultz , Arnd Bergmann , linux-rtc@vger.kernel.org, Thomas Gleixner , Jiaxun Yang , Geert Uytterhoeven , linux-m68k@lists.linux-m68k.org, Daniel Lezcano , Stephen Boyd , Laurent Vivier Subject: [PATCH v10 1/5] m68k: add asm/config.h Date: Wed, 19 Jan 2022 01:05:02 +0100 Message-Id: <20220119000506.1299843-2-laurent@vivier.eu> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220119000506.1299843-1-laurent@vivier.eu> References: <20220119000506.1299843-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:K5qjz0zUehgqdQGjQH9QmTj2AyKeXILhTCZkx+FjE0Tr4NT6S2j RCqBYBrPOwC5P2KWJW7gth4bRm1gl/MjG8z2mQIK/mfYDoD8AVJMXzCQEBtBHg57+7WymP0 UFMt48mHAtTsn9zVrX/9tMDF+JsZsAQcQRd4DBZX2VdtZ9YET14vFYng96lpzVf518aaD63 ebggbiyq/cFrKYZES4YeA== X-UI-Out-Filterresults: notjunk:1;V03:K0:Uu2ewiBoqZQ=:pAvAql2wY22MCAls9n5YVE idEXIiWYVnjdOlVfKLhPedVJvXji7e/UWxljQZ65vMPQk24aQVdUBmsxNPxHb9J0G+HreXdy9 XeCvcABhBM7GRUw8dKdHvO0yckycw2GmlB05EQqtNSepAzedpzuAMy33fskSnqOjIrzZs/raa J9Q40tEffRWUu+se+mUcr9QOaBczEgpfOUFylRv8Ob2z5nwL85kbCkzUXHgXSkfgBwedhuTUE bMMzclr5QY+YCBrzfAOc3F3EZOLcwXVCQz/0fyReulS5Z/Nzw7jUDM5QISblVzuRpA4fhebaU L4qfG/7iIjj8Pat0rspWmySatNIKBj428rNJWqXmkEm6E6OzwNVodeZeaC52R0lg3iBTRoRce iJI0OuIHfoXQJX0dSeO3i6TyUcphwPDILm1v48v9NxqiwRbSfSM2e+oAxNV7AM91F/gjM8fNB TmAIVQGEn5S/AEbSS90w8nCdw3tgDQa01JM0J34oaf1jw+iSTQlpb1/SbMD0e0GaVjAeeM5oP MgBxAjDNS7E+prIQjTzdvqHhpW3KHNISJiUKzt3MgmshKQ445/H91cQHY72H5F/69YcoU4deA AYzKp6qY1vwu1hLlotFTqg0IXyDIuW6rTW7rUbbh89m5mFIkNzw7R9oBJHkMlVLcJ6tbHO/JL 9ss9J3lL8/99DYPxmMBmDGqq1Pu7kZpnUZS86A0SyfcnoyKmuHWb2sOxKdcKLQmIXRHk= 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 4b51bfd38e5f..226dc3750397 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 11:02:21 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 6A72AC433EF for ; Wed, 19 Jan 2022 00:05:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350388AbiASAF4 (ORCPT ); Tue, 18 Jan 2022 19:05:56 -0500 Received: from mout.kundenserver.de ([217.72.192.73]:43981 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350354AbiASAFn (ORCPT ); Tue, 18 Jan 2022 19:05:43 -0500 Received: from quad ([82.142.13.186]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MJW5G-1muW1X0kEi-00JugW; Wed, 19 Jan 2022 01:05:11 +0100 From: Laurent Vivier To: linux-kernel@vger.kernel.org Cc: Alexandre Belloni , Alessandro Zummo , John Stultz , Arnd Bergmann , linux-rtc@vger.kernel.org, Thomas Gleixner , Jiaxun Yang , Geert Uytterhoeven , linux-m68k@lists.linux-m68k.org, Daniel Lezcano , Stephen Boyd , Laurent Vivier Subject: [PATCH v10 2/5] rtc: goldfish: introduce goldfish_ioread32()/goldfish_iowrite32() Date: Wed, 19 Jan 2022 01:05:03 +0100 Message-Id: <20220119000506.1299843-3-laurent@vivier.eu> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220119000506.1299843-1-laurent@vivier.eu> References: <20220119000506.1299843-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:0bxgxaXMXgbL7csaXO2BB1eRaJk0rCjqkzDj0UjF7V23QJ5xWD0 /ZFeL6X34SMhWEwkx51zHptBsS5PvTvwMd+EiWT8fIDwrohazZZvw6r40qH8HKEG1P62IoM tB5rIBQauuYw7PwGBxgf5UyJZ3s+rXUX2QXH8iEZWQICKxwF8X7AWrL9mz/gkjcdiIr0f2u bfb69LNPqovp6PUYi7xdQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:iHCX0BuEoY4=:YYQHByIHg07sUO4NKXweB4 5656OGcoUEYdODgMuxhgoGGQnhAtUv9qeLreGwYct66HC4K6B7PQzg5oduxhgW4Pr/Q9AW6pq PEo8+YUcjyEdYDLhT3JmAEk+4f85rD58LFqZCYUbOBL/RrKqiRNt772xgCz3ZWW4MllhrlyhJ gIxJc8kQrl96m2OMH1nm2Lc/v2LlMsQp3pJjdZyW7CpmbTPg84/RjdYXNFohOTH5FtxCQ8ni4 Bip4HpvWmID4QnzAA3rN4Ltc8mB+bkxgqIsIfalifRPsykcYCBVFRxlMJI4JUdj1XIVZO1IJd TS7NglU+E6YtIIg1KegckWitKSr6WPeG5D0qtuOTSek0Z6zyaKmgvZOmcfFrk+sDTvxcEJ26/ sHSbSfdWyTqTSMy8eTrPL1ofCZCPyQIeUFx1bi7aPzVfhf+eNTSfqpBKwlcmQhNuMIt/NJFOs HB1ytUAgGjtfI3n3DlnydYXwLH1UdNKVvGDzYKs3L5/GmqDjoKkBj+L50GMw1bXk4fjv/OJy/ vUw7V0K4x6SghZquK2VqfNnOoq8Bba06l+rnEcS8mve5ixhI3Awvb2Tz8IvhL9Sakx/7SKFZI YM+56txGjxZTQaaBD1IgZXaFeNtfk449FKTuM75VloBqwbzEYzghbIM60oLm8UkBVZddG5Lhu 7UiGjmjr1Dp8OXA9EcGjfOFUi+F97EdNGxIH1QRScFd2CI6fG0kZHMK+7gSicFwPyR7M= Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The goldfish device always uses the same endianness as the architecture using it: https://android.googlesource.com/platform/external/qemu/+/refs/heads/emu-ma= ster-dev/hw/timer/goldfish_timer.c#177 On a big-endian machine, the device is also big-endian, on a little-endian machine the device is little-endian. So we need to use the right accessor to read/write values to the goldfish registers: ioread32()/iowrite32() on a little-endian machine, ioread32be()/iowrite32be() on a big-endian machine. This patch introduces goldfish_ioread32()/goldfish_iowrite32() to allow architectures to define them accordlingly to their endianness. We define them by default in asm-generic/io.h to access the device using little-endian access as it is the current use, but we will be able to define big-endian version when new architectures will use them. Signed-off-by: Laurent Vivier --- drivers/rtc/rtc-goldfish.c | 30 +++++++++++++++--------------- include/asm-generic/io.h | 7 +++++++ 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/drivers/rtc/rtc-goldfish.c b/drivers/rtc/rtc-goldfish.c index 7ab95d052644..1b2180ccfcdd 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 goldfish_ioread32(base + TIMER_ALARM_LOW); + rtc_alarm_high =3D goldfish_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 (goldfish_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); + goldfish_iowrite32((rtc_alarm64 >> 32), base + TIMER_ALARM_HIGH); + goldfish_iowrite32(rtc_alarm64, base + TIMER_ALARM_LOW); + goldfish_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 goldfish_ioread32(base + TIMER_ALARM_STATUS); if (rtc_status_reg) - writel(1, base + TIMER_CLEAR_ALARM); + goldfish_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); + goldfish_iowrite32(1, base + TIMER_IRQ_ENABLED); else - writel(0, base + TIMER_IRQ_ENABLED); + goldfish_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); + goldfish_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 goldfish_ioread32(base + TIMER_TIME_LOW); + time_high =3D goldfish_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); + goldfish_iowrite32((now64 >> 32), base + TIMER_TIME_HIGH); + goldfish_iowrite32(now64, base + TIMER_TIME_LOW); =20 return 0; } diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h index 7ce93aaf69f8..7f7e9d8c2eef 100644 --- a/include/asm-generic/io.h +++ b/include/asm-generic/io.h @@ -906,6 +906,13 @@ static inline void iowrite64_rep(volatile void __iomem= *addr, #endif /* CONFIG_64BIT */ #endif /* CONFIG_GENERIC_IOMAP */ =20 +#ifndef goldfish_ioread32 +#define goldfish_ioread32 ioread32 +#endif +#ifndef goldfish_iowrite32 +#define goldfish_iowrite32 iowrite32 +#endif + #ifdef __KERNEL__ =20 #include --=20 2.34.1 From nobody Tue Jun 30 11:02:21 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 41E24C4167B for ; Wed, 19 Jan 2022 00:05:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350378AbiASAFu (ORCPT ); Tue, 18 Jan 2022 19:05:50 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:44203 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350331AbiASAFl (ORCPT ); Tue, 18 Jan 2022 19:05:41 -0500 Received: from quad ([82.142.13.186]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MmD2M-1mS9GK0WwK-00i8a4; Wed, 19 Jan 2022 01:05:12 +0100 From: Laurent Vivier To: linux-kernel@vger.kernel.org Cc: Alexandre Belloni , Alessandro Zummo , John Stultz , Arnd Bergmann , linux-rtc@vger.kernel.org, Thomas Gleixner , Jiaxun Yang , Geert Uytterhoeven , linux-m68k@lists.linux-m68k.org, Daniel Lezcano , Stephen Boyd , Laurent Vivier Subject: [PATCH v10 3/5] tty: goldfish: use goldfish_ioread32()/goldfish_iowrite32() Date: Wed, 19 Jan 2022 01:05:04 +0100 Message-Id: <20220119000506.1299843-4-laurent@vivier.eu> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220119000506.1299843-1-laurent@vivier.eu> References: <20220119000506.1299843-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:QxFaS+c7ajuC5r/o5VtShEEJM53Ltn9w6NH3CVcVs0gjmbAzNdO mWy8QMazzBQSuz2IpKW/cEbGDFUPUj3P0IgJPmSAyvVCT7jOTamQCRliyv6W6TOZktDE/qB xV5YYh7vTHwB2FsENumu/n3AIlS2Wn5f3l2Xhz41RR9z/bjXgOGOHaxXaQGNJjQc3+bNDtf 6zSGpn6cUtlpmhZuh+aXw== X-UI-Out-Filterresults: notjunk:1;V03:K0:8nr+kI4ncSM=:88rohAjb4IR4em7WAxth4N VzKkXNa9tbHibxBak1t0l9CMdmD5rhHZYDUbBp7IsJO3MmYooQ2YapyEvsUB1qi1T/sWZI9b9 CC/NUf+bAf0KeKqkBycA6nO4/67QZU2mjHLWlNL8BiEVD/C4AQJsBdY4KWH7+ZKQXweInicBl Xt+KTqjLm/Jbnm+Lg1Wy3jusbryMt/kvOr8lWOtShp27DuguwDWkoex0HRYkD+9LPmw7MlcQR /J7OVhwaTbyAf4rg1PFn/nlF/XWi4EBJh4DeelHR/AWFVYnpuumxqyEHaE6iCrReV3X3nK8Lf 57y3vt4tPrFr12QC7omncQpbpKPvaLezljEJDNmRf9mmgVsoTdfTkHR/QE6xE7hA4/J88Pb03 L/w8QyuF8xdLLlFqRe2VLq/uUua9Mjsc/UinKnoH5kDjQST51QlCOF65LVl9Mo8aURG5Lpq/d 2/mtZMndWJZ64XkxjMOuiOtHaQTjUIZssi89pElPyeLHtGUZkCkPyku1OoM+5gO3Evu221hV1 iQFxlPXGaBYUINxHhW3CnXx+bCi+cPLBGuwOsfbpjh4OwtiqeRHS1mgEvwymLQ943So//wTLO QDtrN5BhC9Br/AccV8b9uvHiVej7Yki1MkW2lMlpLrYrczcrwYM48nkNHaCznANUYEVBR5s0c XSIZKbqCQrLbBkrpiwl+HJsDu3karsDVotUBjdZx6kp4s+ODhJnkm9PO1+qbsVTTe8hw= Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use architecture endianness aware accessors as done for rtc-goldfish. Signed-off-by: Laurent Vivier --- drivers/tty/goldfish.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/tty/goldfish.c b/drivers/tty/goldfish.c index d24af649a8bb..267f1f084629 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); + goldfish_iowrite32(count, base + GOLDFISH_TTY_REG_DATA_LEN); =20 if (is_write) - __raw_writel(GOLDFISH_TTY_CMD_WRITE_BUFFER, + goldfish_iowrite32(GOLDFISH_TTY_CMD_WRITE_BUFFER, base + GOLDFISH_TTY_REG_CMD); else - __raw_writel(GOLDFISH_TTY_CMD_READ_BUFFER, + goldfish_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 goldfish_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); + goldfish_iowrite32(GOLDFISH_TTY_CMD_INT_ENABLE, qtty->base + GOLDFISH_TTY= _REG_CMD); 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); + goldfish_iowrite32(GOLDFISH_TTY_CMD_INT_DISABLE, qtty->base + GOLDFISH_TT= Y_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 goldfish_ioread32(base + GOLDFISH_TTY_REG_BYTES_READY); } =20 static void goldfish_tty_console_write(struct console *co, const char *b, @@ -357,7 +357,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 goldfish_ioread32(base + GOLDFISH_TTY_REG_VERSION); =20 /* * Goldfish TTY device on Ranchu emulator (qemu2) @@ -376,7 +376,7 @@ static int goldfish_tty_probe(struct platform_device *p= dev) } } =20 - __raw_writel(GOLDFISH_TTY_CMD_INT_DISABLE, base + GOLDFISH_TTY_REG_CMD); + goldfish_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); @@ -438,7 +438,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); + goldfish_iowrite32(ch, port->membase); } =20 static void gf_early_write(struct console *con, const char *s, unsigned in= t n) --=20 2.34.1 From nobody Tue Jun 30 11:02:21 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 D91C4C433EF for ; Wed, 19 Jan 2022 00:06:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350404AbiASAF7 (ORCPT ); Tue, 18 Jan 2022 19:05:59 -0500 Received: from mout.kundenserver.de ([217.72.192.74]:46449 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350362AbiASAFp (ORCPT ); Tue, 18 Jan 2022 19:05:45 -0500 Received: from quad ([82.142.13.186]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1N8GAQ-1mErbF0Bqi-014Dng; Wed, 19 Jan 2022 01:05:13 +0100 From: Laurent Vivier To: linux-kernel@vger.kernel.org Cc: Alexandre Belloni , Alessandro Zummo , John Stultz , Arnd Bergmann , linux-rtc@vger.kernel.org, Thomas Gleixner , Jiaxun Yang , Geert Uytterhoeven , linux-m68k@lists.linux-m68k.org, Daniel Lezcano , Stephen Boyd , Laurent Vivier Subject: [PATCH v10 4/5] clocksource/drivers: Add a goldfish-timer clocksource Date: Wed, 19 Jan 2022 01:05:05 +0100 Message-Id: <20220119000506.1299843-5-laurent@vivier.eu> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220119000506.1299843-1-laurent@vivier.eu> References: <20220119000506.1299843-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:kvishkwe6iiVARgzrVfUl7UML0CqT5azoRc51L5oImQ6gOIbysR ol10OFkIkz65ZCPiuRZnp5I5fmgkW7NlmUKaZ+YaZFp4IHuS9dLtHsnBIaA/vBYn+xURsSn phyHawcA1+I7iZvOR5RFn+euoJ2xagJrkQDIis6qsBadsPNeKnab/04ISznlmiuVep7CVTN xTT5vA+H9QitdcBN5ADwA== X-UI-Out-Filterresults: notjunk:1;V03:K0:QDP+Gf0OIdA=:MSlaAkLNpvaQdiOOvw/9pl xyTSu3eQme8pIulJwfLkLZ+r0NqYl8jSxHVkpoZOqgBL2m6DliRhaVO5AUO1C1aif/VfC3m6B DAokki4VMdD/LvassfH6CBH6DjiA3TX5t0utstsLbTh0+QuSE27y5bbkA6suPYjkly5jEZb7E RV+c4ucsEuEPwcw30YhLRoPqTowJbE8SRTJK0mJshpdxodBbrFdE5EWVEYz8yyeArgPISFamc nPazwGdjdYx4ujDV0BRCeo/keg64A8Kqv3x2FmmRdsD0vRFtwfWMDF8DnsgwD+AynXb6UmCbA eXe76V1pmUqiKkWU2ZkCv8Xvng7TYfSDzFwSWlRMJ50xvb+XA1AenKAFMN64RvNq/InMagCu7 RbP7UwZlP3joHdfrqfjWbzPF/+mZOrirt9InYWIi90MeLA8GajEiHSFyARhau2juoyCPFHQtn ea+I9JySERGPckfa5v4sxZgI6mqeidk0z25/JXD4Sf6fmmoVXGV28Gibq5XOuIW2PKcS9jOx6 HJ38lEmrnbiRa+uQqCABgSKC46SlDWeii/bkPkFFPI4EEW/sBMSxIhaTk1jEDg3cVgW8NlgiJ Eu+30AeSiXDapHRLWPLt3fJOey3hx2XCCAIbtXAK9XmQcC9IP5NDvYJxG4KTw83RX1I/hhuNC /dGErRRkL+uF34AAWZvzTGy4YGkIjdiM6hvbB/rAriitU3hl14yDp0GrJD64ldh7D+5k= 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 | 130 +++++++++++++++++++++++++++ include/clocksource/timer-goldfish.h | 11 +++ 4 files changed, 149 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 f65e31bab9ae..fa66fb7156da 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -711,4 +711,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 c17ee32a7151..e624a1a27027 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -88,3 +88,4 @@ obj-$(CONFIG_CSKY_MP_TIMER) +=3D timer-mp-csky.o 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_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..e446f9d3cc49 --- /dev/null +++ b/drivers/clocksource/timer-goldfish.c @@ -0,0 +1,130 @@ +// 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 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 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; + + goldfish_iowrite32(0, base + TIMER_ALARM_HIGH); + goldfish_iowrite32(0, base + TIMER_ALARM_LOW); + goldfish_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; + + goldfish_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; + + goldfish_iowrite32(1, base + TIMER_CLEAR_INTERRUPT); + + /* + * time_low: get low bits of current time and update time_high + * time_high: get high bits of time at last time_low read + */ + now =3D goldfish_ioread32(base + TIMER_TIME_LOW); + now +=3D (u64)goldfish_ioread32(base + TIMER_TIME_HIGH) << 32; + + now +=3D delta; + + goldfish_iowrite32(upper_32_bits(now), base + TIMER_ALARM_HIGH); + goldfish_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; + + 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, + .shift =3D 32, + }; + 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; + } + + 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 11:02:21 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 8C19FC4332F for ; Wed, 19 Jan 2022 00:05:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350387AbiASAFx (ORCPT ); Tue, 18 Jan 2022 19:05:53 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:55745 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350342AbiASAFm (ORCPT ); Tue, 18 Jan 2022 19:05:42 -0500 Received: from quad ([82.142.13.186]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MKszj-1mt8Rb0HjZ-00LI81; Wed, 19 Jan 2022 01:05:14 +0100 From: Laurent Vivier To: linux-kernel@vger.kernel.org Cc: Alexandre Belloni , Alessandro Zummo , John Stultz , Arnd Bergmann , linux-rtc@vger.kernel.org, Thomas Gleixner , Jiaxun Yang , Geert Uytterhoeven , linux-m68k@lists.linux-m68k.org, Daniel Lezcano , Stephen Boyd , Laurent Vivier Subject: [PATCH v10 5/5] m68k: introduce a virtual m68k machine Date: Wed, 19 Jan 2022 01:05:06 +0100 Message-Id: <20220119000506.1299843-6-laurent@vivier.eu> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220119000506.1299843-1-laurent@vivier.eu> References: <20220119000506.1299843-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:AUDkppax/kARh1cLhgJqKsS7hyT8/6TYwXK37QGfvufN+TDygWc ep8jTGzzErzMMSxSEr6AfPdtUcJbyFb+HP3fQ21OuTr7EWRFrCWUKjyJv0ltkbU2zeGt3+E jmHVz9ApuSSC8oRE0xca1HnAbrJpvU4v998E3CACnaRLFK34jRidnNwfvXC7VAege5+oSX+ pvcEErnUcCXXpp5LaKwqA== X-UI-Out-Filterresults: notjunk:1;V03:K0:RO3h/zquDU0=:mIn0dxMlBKKea3fqOVcjZm bo7WxcYrdENt1FkKmyNRYAGMLIUZlJ+/iiXTEj3oMXJieWbEVpSw2DoFeBeJ4yIXU23cB43Nj vcZjAUn7AiDr/Z6H9Nn5PjcHt3HVOd0xHMRDCKybjJ5986zGA7fASsY6czfsThGpmim86i66H jcemEHPrVfxAOJ4XnHJElwnSXvgZUFSAT+ragLy2iPNwAdwAyeyeAjkbV1OhFCs3r+9HlklYG 9hNDry9bbzzteLuedp5rIJcCZwWGoRWz58sNgAytaS8GLQcKAQk1nNrbdV49z7m4AbMbZ1SrH 7VaE3I3J6aKxiDAY6+XDU5Hv9264pdmA8itd9491aadIEVS9komVYsEvKm8q1VD2pDtaiPMTO VlIKCmYrZSWzFhfTOkrSnIAwswBfy/c2rTDCTX6qkDUxaT3Aks8/bE81vZkoHA5VgR8d11GrO tTi4FV/kmOf92yS8B7uGaGbtdCK0EXyOCf7n6ph8aklve62lRdPWxJ0Esebv6+aoBA5pWR5i+ NMr2dXwBq++V8BuAiuXSn4N/uZOdD9aa225ygavuGu7vnPyirmb+XtkeJ2BIw6E3GC/B+oZyl g77j2hkPFDZ1rxgmS6aFU1AlQQPGTkrykJZ2ynJ7CX0WFHZnNAgf05lna5Lvfw9JUeLz9blOn Kvev+NbTmrY+RkVhTq4oFh5kksGqZ3IaIY4pEGtVVmr3di7pQwITeFXuT7vLaT5li13A= 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..193c2984d27f 100644 --- a/arch/m68k/include/asm/io.h +++ b/arch/m68k/include/asm/io.h @@ -8,6 +8,9 @@ #include #endif =20 +#define goldfish_ioread32 ioread32be +#define goldfish_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 226dc3750397..b4ece3b05504 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