From nobody Mon May 6 14:20:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.67 as permitted sender) client-ip=209.85.221.67; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f67.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.67 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1599899390; cv=none; d=zohomail.com; s=zohoarc; b=TeHhw5LUEz5A0YBgw70GO7iJuWMmeXJR9HW51c8JlUlAeJidTPFFsRMQ/5YmHhQHcdV9WggL4eQIXAwT5ULupG3Dve2atJLKxqHVrhGk37U9Lj7McRgdYmRUIJbtx2bfhTgBly3FuHnjlddEDT8bHfb5cX/3YK8yKyx1WerdIDs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599899390; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=sRmT9s6gxreTis3LbuIGANYw4jl0FBXlKwAjDaThnyE=; b=XnFmGOrugKl46MxbX8QUGOHwBxHQbjucrBwEFMZcDfURLKZC47IVn0vS1WBhYX2RsXs97Fk9u2ZeVI235eUGlMXHdia82X9rq4nfZ7L4BoD3qIb8bhNroA16G8YYhB2I2aJ1+ExF2/kJFxT+g4/3hUJj+0at4SkG73SLr6UFUMs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.67 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by mx.zohomail.com with SMTPS id 1599899390184428.6165318377168; Sat, 12 Sep 2020 01:29:50 -0700 (PDT) Received: by mail-wr1-f67.google.com with SMTP id a17so13612388wrn.6 for ; Sat, 12 Sep 2020 01:29:49 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (65.red-83-57-170.dynamicip.rima-tde.net. [83.57.170.65]) by smtp.gmail.com with ESMTPSA id t188sm9598698wmf.41.2020.09.12.01.29.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Sep 2020 01:29:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sRmT9s6gxreTis3LbuIGANYw4jl0FBXlKwAjDaThnyE=; b=dmJkUqjQLxjUEhk3JjA28gOZXMqOFceO6OO67PrEV9PzcC3jsl0yeAybKVIW+twfsD O08uqax+lqQuAF7zktMpmhFKsdzNaMxc78S+WderMVPT5kECo1CSQSF+K3rMl2YX5b3B i1wAItIJmc+WX3Zm3ADXjYwGnOxZ4Le03RiHUqH9TdiUT7FLwzyoNtkOuO7PT6hXJWXS baaWyuRXkg632jtXnOKtHYXBy4gjMVvxO4qsaGASrDRy740r7ecXVInHc1kq757HJeTc EP+4bFq/YTfHZqh4SVzqg1M03lyrxWRIy/7QEGaNpdB7WrUGBbTFHI5Tmcj+Vf1qTsF2 LcoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=sRmT9s6gxreTis3LbuIGANYw4jl0FBXlKwAjDaThnyE=; b=NLao07tKVOhfWZZuiYlMXLWdLyww/lgQCx39h3cN79bykSgeoepnyWJt2JzstL6GoD A7Nrd2a/FEN7xYU0OM6k2rY8vreBTZ7pwnvg/Z22JZhGYbBhITDgrHk032uVt89YEDxe 3rqEw/m8GLS1ipNtPHXr+IlLrzbEOgVXuM5u965UfGteJpmzac/YNky2cZbeaJ0KJvtu jM/W0xJ9L4pturAmtMi4EzZ9uoi25UKqEG0xzgo2v2p+T+Opd46VL88z9mVWWkMcq6qr 64fmDHIiVytMk5QGT+0IcDNG4GvOrTBgNy/FPdPKgkgub2t214AHWGK0NatbzmSPiiW7 AN5w== X-Gm-Message-State: AOAM530h8hTN6PSJ6lkPHaf9zIidQrC8oTPJhhFD7jozNQHipYXVHmFU ohW/HaeOs0VikVLIcw15i/U= X-Google-Smtp-Source: ABdhPJzJUVFWcGD6npESWVNmWeXi3bzXWmk24AkYwVkVUoNE403MAtZ82QIYNRGIRxodHp+E373hBw== X-Received: by 2002:a5d:4710:: with SMTP id y16mr6031768wrq.203.1599899388204; Sat, 12 Sep 2020 01:29:48 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aleksandar Markovic , "Michael S. Tsirkin" , Peter Maydell , Aleksandar Rikalo , Aurelien Jarno , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v3 1/2] hw/mips/mipssim: Use MMIO serial device on fake ISA I/O Date: Sat, 12 Sep 2020 10:29:43 +0200 Message-Id: <20200912082944.890972-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200912082944.890972-1-f4bug@amsat.org> References: <20200912082944.890972-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) From: Philippe Mathieu-Daud=C3=A9 The 'mipssim' is not a real hardware, it is a simulator. There is an ISA MMIO space mapped at 0x1fd00000, however this is not a real ISA bus (no ISA IRQ). So can not use the TYPE_ISA_SERIAL device... Instead we have been using a plain MMIO device, but named it IO. TYPE_SERIAL_IO is a subset of TYPE_SERIAL_MM, using regshift=3D0 and endianness=3DDEVICE_LITTLE_ENDIAN. Directly use the TYPE_SERIAL_MM device, enforcing the regshift/endianness values. 'regshift' default is already '0'. 'endianness' is meaningless for 8-bit accesses. This change breaks migration back compatibility, but this is not an issue for the mipssim machine. Suggested-by: Peter Maydell Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/mips/mipssim.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/mips/mipssim.c b/hw/mips/mipssim.c index 1b3b7622035..5d4ad74828d 100644 --- a/hw/mips/mipssim.c +++ b/hw/mips/mipssim.c @@ -216,10 +216,11 @@ mips_mipssim_init(MachineState *machine) * MIPS CPU INT2, which is interrupt 4. */ if (serial_hd(0)) { - DeviceState *dev =3D qdev_new(TYPE_SERIAL_IO); + DeviceState *dev =3D qdev_new(TYPE_SERIAL_MM); =20 qdev_prop_set_chr(dev, "chardev", serial_hd(0)); - qdev_set_legacy_instance_id(dev, 0x3f8, 2); + qdev_prop_set_uint8(dev, "regshift", 0); + qdev_prop_set_uint8(dev, "endianness", DEVICE_LITTLE_ENDIAN); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, env->irq[4]); sysbus_add_io(SYS_BUS_DEVICE(dev), 0x3f8, --=20 2.26.2 From nobody Mon May 6 14:20:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.66 as permitted sender) client-ip=209.85.221.66; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f66.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.66 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1599899391; cv=none; d=zohomail.com; s=zohoarc; b=Vt4UGhx5qbVxq6GsyjDulHoEwTbYM0mXEeNtnKFOuJ6PZbn4jzdC9H2qXAd+tCgif1JYMGJ5zUEyl61NTGaLH247suWiKw/Fn/r88YPrSC6L0OqJnFDF3VEOT1r4CK/Oic0Rcf+vS0DiKUx4iZljA5lhc/SthJdTxIvXFHSkgak= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599899391; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gAoMYvbh6PKb/CST4Gg+2AFyuso3E0ZdXk61WQRCbQo=; b=PBG/ZrJL+gmbKpmwzySd72JRT9TbtVY/Jy1sudx1cYOmnVl4qucm/koc6PCFNqSx5EtoLFzkGZJaD5E96DWlHN5rfVzkuz6Lf3oo2Ju2Jzbon/47XwA0atsP7Aq2qUWtBLBXx+dBYgDFK47y3cMDxZwCkJ1YBTvZj1FJzL+58HA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.66 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by mx.zohomail.com with SMTPS id 1599899391832762.8718908249901; Sat, 12 Sep 2020 01:29:51 -0700 (PDT) Received: by mail-wr1-f66.google.com with SMTP id j2so13609380wrx.7 for ; Sat, 12 Sep 2020 01:29:51 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (65.red-83-57-170.dynamicip.rima-tde.net. [83.57.170.65]) by smtp.gmail.com with ESMTPSA id t188sm9598698wmf.41.2020.09.12.01.29.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Sep 2020 01:29:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gAoMYvbh6PKb/CST4Gg+2AFyuso3E0ZdXk61WQRCbQo=; b=DGw7UjhjP2vauXfLjAsCfKYqeWU5h53umqgNAQdDyHZL7+UZa8lNDgcWEK1bz82g3A 12NLLuAjCsqqqtlBdthVAPy3bk5apZMlzdI5Nsd1bgBUDDlVFkGi7g+1AuNH1+2WE0GU oJgA/cSl9u9dJi19lgQrwz/sjQQVc3tOkvZJmZHxn7xjorf1v801BlgMIq95LfbCU/sq N2B2YSGn86guSZwCojkcs58N8MY62r4a6dquVSqPRB23FV2H9r5inKKPxWmRwebuk/oV ndZER8eRrPoifjHW8YkUYfZ95HNiETaTVTnOOmrlUrQ04V8lJyTwYtzxVWP982VJXBer HV8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=gAoMYvbh6PKb/CST4Gg+2AFyuso3E0ZdXk61WQRCbQo=; b=PSSXg0wODkXhXd/IK3SKgu/tzfQfEGlyfD93jPWfopdJVnuWJV1vD31EKoZYSUdzmu fyWY2C1XIcOnYrHTDJTO+65+yMdEhGR8k6S3BmOcJFWvEdK+AMyIkRHHyQSqUp5pTG4U EYsKXWzkr6mIdn1oGHI2RE0X1f8/eAnkpBiyGb3XUfTd2A146kFK8BCV1aEosScAJUVt 9TBc0w5FvkRCuEyUxoa6GvAOkOAEBZyfv8Wju/H2N3R90lXhBv4C/FLJVwcq3cRlGBLt Xp1SwWNFKM5ljjs/H0w2BEtrnnRhiCo/1FXS/3Esq4vrdXmd+EZGNk04xcZrkKqmYwDN Zh2A== X-Gm-Message-State: AOAM532JK5DLfVg9noCPZEkBB7/jXZJ4zzAl9J0fq0/p00DPhcST5/zA YXThklMDJfKdRDCLXqjxIP8= X-Google-Smtp-Source: ABdhPJwkWo6+i0YDX58FSEg9FV+YKqke0U8ziBczkQ/pFuFvZ8wCS/NwF+p+PYlSYZXdcydWX+bp5Q== X-Received: by 2002:adf:eacf:: with SMTP id o15mr6241963wrn.12.1599899389810; Sat, 12 Sep 2020 01:29:49 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aleksandar Markovic , "Michael S. Tsirkin" , Peter Maydell , Aleksandar Rikalo , Aurelien Jarno , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v3 2/2] hw/char/serial: Remove TYPE_SERIAL_IO (superset of TYPE_SERIAL_MM) Date: Sat, 12 Sep 2020 10:29:44 +0200 Message-Id: <20200912082944.890972-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200912082944.890972-1-f4bug@amsat.org> References: <20200912082944.890972-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) From: Philippe Mathieu-Daud=C3=A9 TYPE_SERIAL_IO is a superset of TYPE_SERIAL_MM, and it is not used anymore. Remove it. Suggested-by: Paolo Bonzini Suggested-by: Peter Maydell Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/char/serial.c | 41 ----------------------------------------- 1 file changed, 41 deletions(-) diff --git a/hw/char/serial.c b/hw/char/serial.c index 23864794929..fd80ae55929 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -985,46 +985,6 @@ const MemoryRegionOps serial_io_ops =3D { .endianness =3D DEVICE_LITTLE_ENDIAN, }; =20 -static void serial_io_realize(DeviceState *dev, Error **errp) -{ - SerialIO *sio =3D SERIAL_IO(dev); - SerialState *s =3D &sio->serial; - - if (!qdev_realize(DEVICE(s), NULL, errp)) { - return; - } - - memory_region_init_io(&s->io, OBJECT(dev), &serial_io_ops, s, "serial"= , 8); - sysbus_init_mmio(SYS_BUS_DEVICE(sio), &s->io); - sysbus_init_irq(SYS_BUS_DEVICE(sio), &s->irq); -} - -static void serial_io_class_init(ObjectClass *klass, void* data) -{ - DeviceClass *dc =3D DEVICE_CLASS(klass); - - dc->realize =3D serial_io_realize; - /* No dc->vmsd: class has no migratable state */ -} - -static void serial_io_instance_init(Object *o) -{ - SerialIO *sio =3D SERIAL_IO(o); - - object_initialize_child(o, "serial", &sio->serial, TYPE_SERIAL); - - qdev_alias_all_properties(DEVICE(&sio->serial), o); -} - - -static const TypeInfo serial_io_info =3D { - .name =3D TYPE_SERIAL_IO, - .parent =3D TYPE_SYS_BUS_DEVICE, - .instance_size =3D sizeof(SerialIO), - .instance_init =3D serial_io_instance_init, - .class_init =3D serial_io_class_init, -}; - static Property serial_properties[] =3D { DEFINE_PROP_CHR("chardev", SerialState, chr), DEFINE_PROP_UINT32("baudbase", SerialState, baudbase, 115200), @@ -1178,7 +1138,6 @@ static const TypeInfo serial_mm_info =3D { static void serial_register_types(void) { type_register_static(&serial_info); - type_register_static(&serial_io_info); type_register_static(&serial_mm_info); } =20 --=20 2.26.2