From patchwork Mon Dec 6 22:45:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12660229 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 lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6800EC433F5 for ; Mon, 6 Dec 2021 22:49:50 +0000 (UTC) Received: from localhost ([::1]:45836 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1muMnt-0008Mk-95 for qemu-devel@archiver.kernel.org; Mon, 06 Dec 2021 17:49:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38286) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1muMjt-0000ox-9P for qemu-devel@nongnu.org; Mon, 06 Dec 2021 17:45:41 -0500 Received: from [2a00:1450:4864:20::330] (port=53811 helo=mail-wm1-x330.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1muMjr-00077m-9e for qemu-devel@nongnu.org; Mon, 06 Dec 2021 17:45:41 -0500 Received: by mail-wm1-x330.google.com with SMTP id y196so9307261wmc.3 for ; Mon, 06 Dec 2021 14:45:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9qz4AKFNIN2qnCPkv3JO022Rqx3rJT8mFAHOQmP3u04=; b=p1cWL3hFehOQAYhaLPxIQCuBf4xjtGAdXzG/paPrM/1B0Pe5CJ5Rq8QXX22cr8UsKL 9iFK0zi1ChhBYkg/Vh1/KUSqwkuCqbV6LNl5ukNVhVBjdFH17E4/ewmaYf/jecnsS/jx 592pvv45RgqH0sn40KHKMo8usPSxgZz3+dUf4CTBm241VQgHJtEDEqSPR/cux4OzySp0 Nj9MA54IIZh+Ncdar9H5IkRZ/iLhuxO1FB4LiAABAb9zaZ9w3A0Mbe/Y1b/zxgHJfkV0 E+M8rgkFVYF8ICIu5Qkmmj/k7W9ISJmBHF5pMWWB2P8pGJLvXxNnLkt1h3AT4WSahJ+1 hQkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=9qz4AKFNIN2qnCPkv3JO022Rqx3rJT8mFAHOQmP3u04=; b=64Aqj2Cnvsn5SsdpjAlJAi1eW1yR62B1ckiXAavW59WpgrQuLmCfmSdFHc974tjNhs 3fPEKJP5RefHYz2b3yyPCY8s1ccVENUGvt/O9EAqqn8cBt896AJUULeevBLFoBgARlIu ioeFNkuSmx7M1xkVMztCVJSjs7SM3vFxlI71/KGHewHCmAW50uFL7x/7gms9AZk0DDyp 7peY5oXxfJmttkz75gItbWICaXLDl+9tVsYa6J7R7jmMjGpQlSVs7CCDLrF/LM3LAukS yf8j6q8L2ShRIXIPVhzKv3O2c4ZXPhLFCkovRnMC7YeuGSshOcByHwV5jVTP8YgyIzWm 1HEA== X-Gm-Message-State: AOAM533zRjW4lgWUFJN4CevFZzwxivLvyjnQg9SjUud1fJ36gofFdjaT LmSX82nCRLVOPw1SL4FN/CumEo202us= X-Google-Smtp-Source: ABdhPJzICQSez9xQRsgMHAk/pWa5/itEpY+i58gyQTYtp38aNxiMFhy9qRS/Ht4/buiPQI7m32JYXA== X-Received: by 2002:a05:600c:1988:: with SMTP id t8mr1894767wmq.48.1638830737242; Mon, 06 Dec 2021 14:45:37 -0800 (PST) Received: from x1w.. (174.red-83-50-185.dynamicip.rima-tde.net. [83.50.185.174]) by smtp.gmail.com with ESMTPSA id h27sm701340wmc.43.2021.12.06.14.45.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Dec 2021 14:45:36 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 1/4] hw/display: Rename VGA_ISA_MM -> VGA_MMIO Date: Mon, 6 Dec 2021 23:45:25 +0100 Message-Id: <20211206224528.563588-2-f4bug@amsat.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211206224528.563588-1-f4bug@amsat.org> References: <20211206224528.563588-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::330 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x330.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Herv?= =?utf-8?q?=C3=A9_Poussineau?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" There is no ISA bus part in the MMIO VGA device, so rename: * hw/display/vga-isa-mm.c -> hw/display/vga-mmio.c * CONFIG_VGA_ISA_MM -> CONFIG_VGA_MMIO * ISAVGAMMState -> VGAMmioState * isa_vga_mm_init() -> vga_mmio_init() Reviewed-by: BALATON Zoltan Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daudé --- configs/devices/mips-softmmu/common.mak | 2 +- include/hw/display/vga.h | 5 ++--- hw/display/{vga-isa-mm.c => vga-mmio.c} | 19 +++++++++---------- hw/mips/jazz.c | 2 +- hw/display/Kconfig | 2 +- hw/display/meson.build | 2 +- hw/mips/Kconfig | 2 +- 7 files changed, 16 insertions(+), 18 deletions(-) rename hw/display/{vga-isa-mm.c => vga-mmio.c} (90%) diff --git a/configs/devices/mips-softmmu/common.mak b/configs/devices/mips-softmmu/common.mak index 752b62b1e63..d2202c839e0 100644 --- a/configs/devices/mips-softmmu/common.mak +++ b/configs/devices/mips-softmmu/common.mak @@ -7,7 +7,7 @@ CONFIG_ISA_BUS=y CONFIG_PCI=y CONFIG_PCI_DEVICES=y CONFIG_VGA_ISA=y -CONFIG_VGA_ISA_MM=y +CONFIG_VGA_MMIO=y CONFIG_VGA_CIRRUS=y CONFIG_VMWARE_VGA=y CONFIG_SERIAL=y diff --git a/include/hw/display/vga.h b/include/hw/display/vga.h index 5f7825e0e36..c16a5c26dae 100644 --- a/include/hw/display/vga.h +++ b/include/hw/display/vga.h @@ -24,8 +24,7 @@ enum vga_retrace_method { extern enum vga_retrace_method vga_retrace_method; -int isa_vga_mm_init(hwaddr vram_base, - hwaddr ctrl_base, int it_shift, - MemoryRegion *address_space); +int vga_mmio_init(hwaddr vram_base, hwaddr ctrl_base, + int it_shift, MemoryRegion *address_space); #endif diff --git a/hw/display/vga-isa-mm.c b/hw/display/vga-mmio.c similarity index 90% rename from hw/display/vga-isa-mm.c rename to hw/display/vga-mmio.c index 7321b7a06d5..4ffe3afe32d 100644 --- a/hw/display/vga-isa-mm.c +++ b/hw/display/vga-mmio.c @@ -1,5 +1,5 @@ /* - * QEMU ISA MM VGA Emulator. + * QEMU MMIO VGA Emulator. * * Copyright (c) 2003 Fabrice Bellard * @@ -32,15 +32,15 @@ #define VGA_RAM_SIZE (8 * MiB) -typedef struct ISAVGAMMState { +typedef struct VGAMmioState { VGACommonState vga; int it_shift; -} ISAVGAMMState; +} VGAMmioState; /* Memory mapped interface */ static uint64_t vga_mm_read(void *opaque, hwaddr addr, unsigned size) { - ISAVGAMMState *s = opaque; + VGAMmioState *s = opaque; return vga_ioport_read(&s->vga, addr >> s->it_shift) & MAKE_64BIT_MASK(0, size * 8); @@ -49,7 +49,7 @@ static uint64_t vga_mm_read(void *opaque, hwaddr addr, unsigned size) static void vga_mm_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - ISAVGAMMState *s = opaque; + VGAMmioState *s = opaque; vga_ioport_write(&s->vga, addr >> s->it_shift, value & MAKE_64BIT_MASK(0, size * 8)); @@ -65,7 +65,7 @@ static const MemoryRegionOps vga_mm_ctrl_ops = { .endianness = DEVICE_NATIVE_ENDIAN, }; -static void vga_mm_init(ISAVGAMMState *s, hwaddr vram_base, +static void vga_mm_init(VGAMmioState *s, hwaddr vram_base, hwaddr ctrl_base, int it_shift, MemoryRegion *address_space) { @@ -91,11 +91,10 @@ static void vga_mm_init(ISAVGAMMState *s, hwaddr vram_base, memory_region_set_coalescing(vga_io_memory); } -int isa_vga_mm_init(hwaddr vram_base, - hwaddr ctrl_base, int it_shift, - MemoryRegion *address_space) +int vga_mmio_init(hwaddr vram_base, hwaddr ctrl_base, + int it_shift, MemoryRegion *address_space) { - ISAVGAMMState *s; + VGAMmioState *s; s = g_malloc0(sizeof(*s)); diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c index f5a26e174d5..8f345afd137 100644 --- a/hw/mips/jazz.c +++ b/hw/mips/jazz.c @@ -274,7 +274,7 @@ static void mips_jazz_init(MachineState *machine, } break; case JAZZ_PICA61: - isa_vga_mm_init(0x40000000, 0x60000000, 0, get_system_memory()); + vga_mmio_init(0x40000000, 0x60000000, 0, get_system_memory()); break; default: break; diff --git a/hw/display/Kconfig b/hw/display/Kconfig index a2306b67d87..a1b159becd7 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -49,7 +49,7 @@ config VGA_ISA depends on ISA_BUS select VGA -config VGA_ISA_MM +config VGA_MMIO bool select VGA diff --git a/hw/display/meson.build b/hw/display/meson.build index 861c43ff984..adc53dd8b6c 100644 --- a/hw/display/meson.build +++ b/hw/display/meson.build @@ -18,7 +18,7 @@ softmmu_ss.add(when: 'CONFIG_VGA_PCI', if_true: files('vga-pci.c')) softmmu_ss.add(when: 'CONFIG_VGA_ISA', if_true: files('vga-isa.c')) -softmmu_ss.add(when: 'CONFIG_VGA_ISA_MM', if_true: files('vga-isa-mm.c')) +softmmu_ss.add(when: 'CONFIG_VGA_MMIO', if_true: files('vga-mmio.c')) softmmu_ss.add(when: 'CONFIG_VMWARE_VGA', if_true: files('vmware_vga.c')) softmmu_ss.add(when: 'CONFIG_BOCHS_DISPLAY', if_true: files('bochs-display.c')) diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig index b4c5549ce84..725525358d9 100644 --- a/hw/mips/Kconfig +++ b/hw/mips/Kconfig @@ -16,7 +16,7 @@ config JAZZ select I8254 select I8257 select PCSPK - select VGA_ISA_MM + select VGA_MMIO select G364FB select DP8393X select ESP From patchwork Mon Dec 6 22:45:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12660231 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 lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 316AEC433EF for ; Mon, 6 Dec 2021 22:51:24 +0000 (UTC) Received: from localhost ([::1]:50060 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1muMpP-0002oc-9P for qemu-devel@archiver.kernel.org; Mon, 06 Dec 2021 17:51:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38302) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1muMjx-0000yG-Bn for qemu-devel@nongnu.org; Mon, 06 Dec 2021 17:45:46 -0500 Received: from [2a00:1450:4864:20::332] (port=42640 helo=mail-wm1-x332.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1muMjv-000788-TW for qemu-devel@nongnu.org; Mon, 06 Dec 2021 17:45:45 -0500 Received: by mail-wm1-x332.google.com with SMTP id d72-20020a1c1d4b000000b00331140f3dc8so910917wmd.1 for ; Mon, 06 Dec 2021 14:45:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=S41Bx0PKiSXj39RU/0leVOxf7HhF7IplspLzvzcX9jo=; b=bfTiKK0ie48Zzhd/6+NWdFwhQtmXBzuzMaDCJJ6m+JpgkEWfHExFDwj99BxfnU7jmB qrT/blDWe8PZGnM34w4Fjyo8FM633YUtaviCddZdO7s9ZeClBLgNOXjZsjxs8Jg/5atu FCPu49KGtPAYc28khvS3O1YgJJXIpQKRTX/yBItjntaORnPQtMUgJaZN9K4000m3I89+ TY2u1+o3Y7TdHDdOxvWcyxD+ezM5dscAuJjz8/KbHcZYp9JX2pYnfTAYgGiS6rn+e5P4 2xubWPn0h07A6zigNYW91OV6+eVqTNITXsKkkNhlFppEHBjg9hfj12QQYen2wJZEQN8/ v+GA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=S41Bx0PKiSXj39RU/0leVOxf7HhF7IplspLzvzcX9jo=; b=57fhF4cIZX5Uv/wqP584A3m4fxkjI3d9YCvR+Gz58480sIrlE0ZsjpxeiNo1sK/OiX DPaUVoMXruIwC5sak37Hy7EQhNpoDKAlSrG1aBbkpWPS85vKm5zxXjgvwMTElNl5Su7z NARxOHsQjPoNqVeqJWMfxc/WHJ0lHnVA9uXI5wM3JZWK3gxbhD4zFBkYpsP19cEtHnXV /haTv6SHcCUYuEMmcfZgZ0hVRFElPaiaAbOX9llscX1FlnP5MHe2PWRDmUy4dRX0UGLl DmsOiUBox5Nf9i8kPF298FnFS0Sn2Ag5TFPiHkKcn/g8mleu7HptdByh25aLXGTeZdo9 RzRA== X-Gm-Message-State: AOAM532N+YDHA9RGVXIMtDaY16pwlWR2OuTA3OoUjXAN3mMePlz0NFF7 P9LeDCOCT9PbHMs2jN0LyyIwTlDH6p4= X-Google-Smtp-Source: ABdhPJzQXbtPT/sONIhv8YJt57FFC1QYctFVBdWaja3Z7Mqlagr2qvi+ivONXVQYeARXsYFZwkq5aw== X-Received: by 2002:a7b:c848:: with SMTP id c8mr1442471wml.105.1638830742381; Mon, 06 Dec 2021 14:45:42 -0800 (PST) Received: from x1w.. (174.red-83-50-185.dynamicip.rima-tde.net. [83.50.185.174]) by smtp.gmail.com with ESMTPSA id l8sm750832wmc.40.2021.12.06.14.45.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Dec 2021 14:45:41 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 2/4] hw/display/vga-mmio: Inline vga_mm_init() Date: Mon, 6 Dec 2021 23:45:26 +0100 Message-Id: <20211206224528.563588-3-f4bug@amsat.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211206224528.563588-1-f4bug@amsat.org> References: <20211206224528.563588-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::332 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x332.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Herv?= =?utf-8?q?=C3=A9_Poussineau?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Inline vga_mm_init() in vga_mmio_init() to simplify the next patch review. Kind of. Reviewed-by: BALATON Zoltan Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daudé --- hw/display/vga-mmio.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/hw/display/vga-mmio.c b/hw/display/vga-mmio.c index 4ffe3afe32d..5671fdb920f 100644 --- a/hw/display/vga-mmio.c +++ b/hw/display/vga-mmio.c @@ -65,12 +65,18 @@ static const MemoryRegionOps vga_mm_ctrl_ops = { .endianness = DEVICE_NATIVE_ENDIAN, }; -static void vga_mm_init(VGAMmioState *s, hwaddr vram_base, - hwaddr ctrl_base, int it_shift, - MemoryRegion *address_space) +int vga_mmio_init(hwaddr vram_base, hwaddr ctrl_base, + int it_shift, MemoryRegion *address_space) { + VGAMmioState *s; MemoryRegion *s_ioport_ctrl, *vga_io_memory; + s = g_malloc0(sizeof(*s)); + + s->vga.vram_size_mb = VGA_RAM_SIZE / MiB; + s->vga.global_vmstate = true; + vga_common_init(&s->vga, NULL); + s->it_shift = it_shift; s_ioport_ctrl = g_malloc(sizeof(*s_ioport_ctrl)); memory_region_init_io(s_ioport_ctrl, NULL, &vga_mm_ctrl_ops, s, @@ -89,19 +95,6 @@ static void vga_mm_init(VGAMmioState *s, hwaddr vram_base, memory_region_add_subregion(address_space, vram_base + 0x000a0000, vga_io_memory); memory_region_set_coalescing(vga_io_memory); -} - -int vga_mmio_init(hwaddr vram_base, hwaddr ctrl_base, - int it_shift, MemoryRegion *address_space) -{ - VGAMmioState *s; - - s = g_malloc0(sizeof(*s)); - - s->vga.vram_size_mb = VGA_RAM_SIZE / MiB; - s->vga.global_vmstate = true; - vga_common_init(&s->vga, NULL); - vga_mm_init(s, vram_base, ctrl_base, it_shift, address_space); s->vga.con = graphic_console_init(NULL, 0, s->vga.hw_ops, s); From patchwork Mon Dec 6 22:45:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12660227 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 lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4D218C433EF for ; Mon, 6 Dec 2021 22:49:35 +0000 (UTC) Received: from localhost ([::1]:44788 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1muMne-0007gV-Ab for qemu-devel@archiver.kernel.org; Mon, 06 Dec 2021 17:49:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38352) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1muMk3-0001Bl-9D for qemu-devel@nongnu.org; Mon, 06 Dec 2021 17:45:51 -0500 Received: from [2a00:1450:4864:20::32b] (port=43598 helo=mail-wm1-x32b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1muMk1-00079A-Gr for qemu-devel@nongnu.org; Mon, 06 Dec 2021 17:45:50 -0500 Received: by mail-wm1-x32b.google.com with SMTP id o19-20020a1c7513000000b0033a93202467so910738wmc.2 for ; Mon, 06 Dec 2021 14:45:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5k3RRBPujACcqHFQADio8BD2t3DHIvuu1P9AHplVN/s=; b=mfggu546xl6qhBmw0oXMBv8YEsZnScAURco5xYlJjpBZnBEQLXvuVBnFQWPW01X821 MNiQuYg6FnlFNtRVUo+A0bbEG6GSlGUqN3KxG65vRho/8qt2K66FrJGPIRExfB/Dmo5I IGpLI0Lahd5Ku89iWwOselZVqYcvWb7vJA5RpbStKAznwMzkz8ytXnDikBxZH1p2B67E Uf3JhFrQ8v4DLQ/rsbGPF6TLjcgra4HmliKXXlarTGZWfcVIvFQAkT6Lm5SAHwlblYus b366KTHavyVWVmPPR0sj0J3kRptfWNDizneGGGZdPWbGJnlf5OchNzJ8xU+f5SkFlh7+ dqjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=5k3RRBPujACcqHFQADio8BD2t3DHIvuu1P9AHplVN/s=; b=ppV/Kde/Cywc5zvaLH8JxmxpQ9E8+dFc291uS5nfS9guXlYE7rNl1W0v0t6ToEDEij Rg489NRCfHQ3ko19Dx7FkuWyW4DJzFXVMAitEeQZk4vkgJHq8I8es3XSo39qJq8t1z33 dYlRHWFsdbbZqk7D1sfLfGksJQU4C0PRSEqdmf2KwgSUF4kdHh1J7uCu+wm07IwYDsgs Rf+/7T9ocXhYjeVjoWPBNofqMi6L1wMFYg3Rr0c8rFuTTwHJhZk8CQPi5OeIcWRn9Gyv MpbAfqvd4qFqIyKp1E1yUl2tHRWP2KSU0Es64pOGYIqtS7N8AkoNM854rV6RgkwNIIig gJSA== X-Gm-Message-State: AOAM532YBF8MoH1Mf/l/jzsyyyMR2+pIgUPhgGyJplTMnK2fF134fkso VDg+yVWXqi76n3LXbQrtfyVO+w9V47w= X-Google-Smtp-Source: ABdhPJxHOVfmKJvWweqDO+0v8U4ih3M5o5Hf1yKJjDznOjX28bzeka3h1FsFulnQJUmkonEkf/2cPQ== X-Received: by 2002:a1c:4d8:: with SMTP id 207mr1880664wme.23.1638830747764; Mon, 06 Dec 2021 14:45:47 -0800 (PST) Received: from x1w.. (174.red-83-50-185.dynamicip.rima-tde.net. [83.50.185.174]) by smtp.gmail.com with ESMTPSA id p8sm12354815wrx.25.2021.12.06.14.45.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Dec 2021 14:45:46 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 3/4] hw/display/vga-mmio: QOM'ify vga_mmio_init() as TYPE_VGA_MMIO Date: Mon, 6 Dec 2021 23:45:27 +0100 Message-Id: <20211206224528.563588-4-f4bug@amsat.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211206224528.563588-1-f4bug@amsat.org> References: <20211206224528.563588-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::32b (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x32b.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Herv?= =?utf-8?q?=C3=A9_Poussineau?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Introduce TYPE_VGA_MMIO, a sysbus device. While there is no change in the vga_mmio_init() interface, this is a migration compatibility break of the MIPS Acer Pica 61 Jazz machine (pica61). Suggested-by: Thomas Huth Reviewed-by: BALATON Zoltan Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth --- include/hw/display/vga.h | 2 + hw/display/vga-mmio.c | 132 +++++++++++++++++++++++++++------------ 2 files changed, 94 insertions(+), 40 deletions(-) diff --git a/include/hw/display/vga.h b/include/hw/display/vga.h index c16a5c26dae..98b2e560f9b 100644 --- a/include/hw/display/vga.h +++ b/include/hw/display/vga.h @@ -24,6 +24,8 @@ enum vga_retrace_method { extern enum vga_retrace_method vga_retrace_method; +#define TYPE_VGA_MMIO "vga-mmio" + int vga_mmio_init(hwaddr vram_base, hwaddr ctrl_base, int it_shift, MemoryRegion *address_space); diff --git a/hw/display/vga-mmio.c b/hw/display/vga-mmio.c index 5671fdb920f..10bde32af5c 100644 --- a/hw/display/vga-mmio.c +++ b/hw/display/vga-mmio.c @@ -23,21 +23,34 @@ */ #include "qemu/osdep.h" -#include "qemu/bitops.h" -#include "qemu/units.h" -#include "migration/vmstate.h" +#include "qapi/error.h" #include "hw/display/vga.h" +#include "hw/sysbus.h" +#include "hw/display/vga.h" +#include "hw/qdev-properties.h" #include "vga_int.h" -#include "ui/pixel_ops.h" -#define VGA_RAM_SIZE (8 * MiB) +/* + * QEMU interface: + * + sysbus MMIO region 0: VGA I/O registers + * + sysbus MMIO region 1: VGA MMIO registers + * + sysbus MMIO region 2: VGA memory + */ -typedef struct VGAMmioState { +OBJECT_DECLARE_SIMPLE_TYPE(VGAMmioState, VGA_MMIO) + +struct VGAMmioState { + /*< private >*/ + SysBusDevice parent_obj; + + /*< public >*/ VGACommonState vga; - int it_shift; -} VGAMmioState; + MemoryRegion iomem; + MemoryRegion lowmem; + + uint8_t it_shift; +}; -/* Memory mapped interface */ static uint64_t vga_mm_read(void *opaque, hwaddr addr, unsigned size) { VGAMmioState *s = opaque; @@ -65,42 +78,81 @@ static const MemoryRegionOps vga_mm_ctrl_ops = { .endianness = DEVICE_NATIVE_ENDIAN, }; +static void vga_mmio_reset(DeviceState *dev) +{ + VGAMmioState *s = VGA_MMIO(dev); + + vga_common_reset(&s->vga); +} + int vga_mmio_init(hwaddr vram_base, hwaddr ctrl_base, int it_shift, MemoryRegion *address_space) { - VGAMmioState *s; - MemoryRegion *s_ioport_ctrl, *vga_io_memory; + DeviceState *dev; + SysBusDevice *s; - s = g_malloc0(sizeof(*s)); + dev = qdev_new(TYPE_VGA_MMIO); + qdev_prop_set_uint8(dev, "it_shift", it_shift); + s = SYS_BUS_DEVICE(dev); + sysbus_realize_and_unref(s, &error_fatal); - s->vga.vram_size_mb = VGA_RAM_SIZE / MiB; - s->vga.global_vmstate = true; - vga_common_init(&s->vga, NULL); - - s->it_shift = it_shift; - s_ioport_ctrl = g_malloc(sizeof(*s_ioport_ctrl)); - memory_region_init_io(s_ioport_ctrl, NULL, &vga_mm_ctrl_ops, s, - "vga-mm-ctrl", 0x100000); - memory_region_set_flush_coalesced(s_ioport_ctrl); - - vga_io_memory = g_malloc(sizeof(*vga_io_memory)); - /* XXX: endianness? */ - memory_region_init_io(vga_io_memory, NULL, &vga_mem_ops, &s->vga, - "vga-mem", 0x20000); - - vmstate_register(NULL, 0, &vmstate_vga_common, s); - - memory_region_add_subregion(address_space, ctrl_base, s_ioport_ctrl); - s->vga.bank_offset = 0; - memory_region_add_subregion(address_space, - vram_base + 0x000a0000, vga_io_memory); - memory_region_set_coalescing(vga_io_memory); - - s->vga.con = graphic_console_init(NULL, 0, s->vga.hw_ops, s); - - memory_region_add_subregion(address_space, - VBE_DISPI_LFB_PHYSICAL_ADDRESS, - &s->vga.vram); + sysbus_mmio_map(s, 0, ctrl_base); + sysbus_mmio_map(s, 1, vram_base + 0x000a0000); + sysbus_mmio_map(s, 2, VBE_DISPI_LFB_PHYSICAL_ADDRESS); return 0; } + +static void vga_mmio_realizefn(DeviceState *dev, Error **errp) +{ + VGAMmioState *s = VGA_MMIO(dev); + SysBusDevice *sbd = SYS_BUS_DEVICE(dev); + + memory_region_init_io(&s->iomem, OBJECT(dev), &vga_mm_ctrl_ops, s, + "vga-mmio", 0x100000); + memory_region_set_flush_coalesced(&s->iomem); + sysbus_init_mmio(sbd, &s->iomem); + + /* XXX: endianness? */ + memory_region_init_io(&s->lowmem, OBJECT(dev), &vga_mem_ops, &s->vga, + "vga-lowmem", 0x20000); + memory_region_set_coalescing(&s->lowmem); + sysbus_init_mmio(sbd, &s->lowmem); + + s->vga.bank_offset = 0; + s->vga.global_vmstate = true; + vga_common_init(&s->vga, OBJECT(dev)); + sysbus_init_mmio(sbd, &s->vga.vram); + s->vga.con = graphic_console_init(dev, 0, s->vga.hw_ops, &s->vga); +} + +static Property vga_mmio_properties[] = { + DEFINE_PROP_UINT8("it_shift", VGAMmioState, it_shift, 0), + DEFINE_PROP_UINT32("vgamem_mb", VGAMmioState, vga.vram_size_mb, 8), + DEFINE_PROP_END_OF_LIST(), +}; + +static void vga_mmio_class_initfn(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + + dc->realize = vga_mmio_realizefn; + dc->reset = vga_mmio_reset; + dc->vmsd = &vmstate_vga_common; + device_class_set_props(dc, vga_mmio_properties); + set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories); +} + +static const TypeInfo vga_mmio_info = { + .name = TYPE_VGA_MMIO, + .parent = TYPE_SYS_BUS_DEVICE, + .instance_size = sizeof(VGAMmioState), + .class_init = vga_mmio_class_initfn, +}; + +static void vga_mmio_register_types(void) +{ + type_register_static(&vga_mmio_info); +} + +type_init(vga_mmio_register_types) From patchwork Mon Dec 6 22:45:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12660155 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 lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E31D1C433F5 for ; Mon, 6 Dec 2021 22:48:15 +0000 (UTC) Received: from localhost ([::1]:39780 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1muMmM-0004LG-No for qemu-devel@archiver.kernel.org; Mon, 06 Dec 2021 17:48:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38366) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1muMk8-0001PE-1Y for qemu-devel@nongnu.org; Mon, 06 Dec 2021 17:45:56 -0500 Received: from [2a00:1450:4864:20::430] (port=41938 helo=mail-wr1-x430.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1muMk6-00079W-3q for qemu-devel@nongnu.org; Mon, 06 Dec 2021 17:45:55 -0500 Received: by mail-wr1-x430.google.com with SMTP id a9so25439904wrr.8 for ; Mon, 06 Dec 2021 14:45:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=w+yRQYeZ7bbAuc5HEXn4edg23VKEzwxJXX8ulRzRrI8=; b=fsBZVGR1SaDSWX2D9gGKqMipKf3QYwglqMie1g6y8NUwYJWFCno9B1qNYV6u9NtbsG /Gtnn3ZHR1y4ueyTH9nGO/W9lj+wE2/2BypnT99quvAJSr2pFCVHfajSbMjRUaNe+T8L +B0HQ8eCafvn+AD9A/C09BnEHu0uDBOXSEhWK9jz9i8jDqj/1l5yq91QzQm/vrdRNL7F pzLEJQt47OET4/HP3dYF7FlHtFSnAu4Bk0ktfNnpq6A4msiDRxwBb902Th5fmVjpqDwP Tar1jc9ta+TRoVDhoHqSUmabWsQeGWQoPRRirsXBnOnUXj5Il556570TnoTSNhyLc+D7 qt+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=w+yRQYeZ7bbAuc5HEXn4edg23VKEzwxJXX8ulRzRrI8=; b=6nyIsCTgoK9xHhmDlFOmcsZu/28CJhRtdaHx8JWw9XSGxeQgerKOzLcht7YIw8XOs5 7veAIlvhxYi1zmRGR1ZIxkloM70rNqUp2DP2eeinIbQQAfTLgDpJEkyh/4qQCfKHwT6N UqJPCrOuFxkewZ599MzIhPRE0iW2sOL3VVsYGRVJVM3p4p6o/Q4ceR5g8CSJzeQ3RleF IbFg8lfkEhiEHTraznAmEj8RsrAhrpZovsWgEUZVZr5oqJUhaQ3f2pHrYer/EquiG4bj sgiLXJ/rJtFlm77relj0Bl+z8T+XgebN8LPK9ykO1AuSuaqWV+Lc1MglKGFmqVr5PZxU MkxA== X-Gm-Message-State: AOAM5320Mw+tKIcskeik/hFi1k0tRN4r0r3cjiks+Es9BFUBtksZMlBZ wxkj3SPPWJsE3C/o2Vm7NpqlXVBf3/8= X-Google-Smtp-Source: ABdhPJxfn0iFulNSafMMU5r1zMheG3Sd/IjVsfwSDKvghqfpu3UonxrFSpd+NL8S7jR4lTXHzvleIQ== X-Received: by 2002:a5d:54cf:: with SMTP id x15mr48411043wrv.30.1638830752552; Mon, 06 Dec 2021 14:45:52 -0800 (PST) Received: from x1w.. (174.red-83-50-185.dynamicip.rima-tde.net. [83.50.185.174]) by smtp.gmail.com with ESMTPSA id m7sm637366wml.38.2021.12.06.14.45.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Dec 2021 14:45:52 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 4/4] hw/mips/jazz: Inline vga_mmio_init() and remove it Date: Mon, 6 Dec 2021 23:45:28 +0100 Message-Id: <20211206224528.563588-5-f4bug@amsat.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211206224528.563588-1-f4bug@amsat.org> References: <20211206224528.563588-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::430 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x430.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Herv?= =?utf-8?q?=C3=A9_Poussineau?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" vga_mmio_init() is used only one time and not very helpful, inline and remove it. Reviewed-by: BALATON Zoltan Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth --- include/hw/display/vga.h | 5 ----- hw/display/vga-mmio.c | 19 ------------------- hw/mips/jazz.c | 9 ++++++++- 3 files changed, 8 insertions(+), 25 deletions(-) diff --git a/include/hw/display/vga.h b/include/hw/display/vga.h index 98b2e560f9b..a79aa2909b2 100644 --- a/include/hw/display/vga.h +++ b/include/hw/display/vga.h @@ -9,8 +9,6 @@ #ifndef QEMU_HW_DISPLAY_VGA_H #define QEMU_HW_DISPLAY_VGA_H -#include "exec/hwaddr.h" - /* * modules can reference this symbol to avoid being loaded * into system emulators without vga support @@ -26,7 +24,4 @@ extern enum vga_retrace_method vga_retrace_method; #define TYPE_VGA_MMIO "vga-mmio" -int vga_mmio_init(hwaddr vram_base, hwaddr ctrl_base, - int it_shift, MemoryRegion *address_space); - #endif diff --git a/hw/display/vga-mmio.c b/hw/display/vga-mmio.c index 10bde32af5c..49693680813 100644 --- a/hw/display/vga-mmio.c +++ b/hw/display/vga-mmio.c @@ -24,7 +24,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/display/vga.h" #include "hw/sysbus.h" #include "hw/display/vga.h" #include "hw/qdev-properties.h" @@ -85,24 +84,6 @@ static void vga_mmio_reset(DeviceState *dev) vga_common_reset(&s->vga); } -int vga_mmio_init(hwaddr vram_base, hwaddr ctrl_base, - int it_shift, MemoryRegion *address_space) -{ - DeviceState *dev; - SysBusDevice *s; - - dev = qdev_new(TYPE_VGA_MMIO); - qdev_prop_set_uint8(dev, "it_shift", it_shift); - s = SYS_BUS_DEVICE(dev); - sysbus_realize_and_unref(s, &error_fatal); - - sysbus_mmio_map(s, 0, ctrl_base); - sysbus_mmio_map(s, 1, vram_base + 0x000a0000); - sysbus_mmio_map(s, 2, VBE_DISPI_LFB_PHYSICAL_ADDRESS); - - return 0; -} - static void vga_mmio_realizefn(DeviceState *dev, Error **errp) { VGAMmioState *s = VGA_MMIO(dev); diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c index 8f345afd137..44f0d48bfd7 100644 --- a/hw/mips/jazz.c +++ b/hw/mips/jazz.c @@ -43,6 +43,7 @@ #include "hw/rtc/mc146818rtc.h" #include "hw/timer/i8254.h" #include "hw/display/vga.h" +#include "hw/display/bochs-vbe.h" #include "hw/audio/pcspk.h" #include "hw/input/i8042.h" #include "hw/sysbus.h" @@ -274,7 +275,13 @@ static void mips_jazz_init(MachineState *machine, } break; case JAZZ_PICA61: - vga_mmio_init(0x40000000, 0x60000000, 0, get_system_memory()); + dev = qdev_new(TYPE_VGA_MMIO); + qdev_prop_set_uint8(dev, "it_shift", 0); + sysbus = SYS_BUS_DEVICE(dev); + sysbus_realize_and_unref(sysbus, &error_fatal); + sysbus_mmio_map(sysbus, 0, 0x60000000); + sysbus_mmio_map(sysbus, 1, 0x400a0000); + sysbus_mmio_map(sysbus, 2, VBE_DISPI_LFB_PHYSICAL_ADDRESS); break; default: break;