From nobody Tue Nov 18 10:37:45 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) client-ip=209.85.221.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1609707078; cv=none; d=zohomail.com; s=zohoarc; b=FlZyiyn/9Jjwvgf5UIW4pza/MmneRcvzRiBHkU1e+NdKLs6/55DJyn6Zk382FgNFda68WvmYDksYSH/hMilp6yN6j54qm5hE6i4C/DoPPteLCCVANMZB+ryXorNchBDaKpcBYsEWX+JADJxtiqxyiuG45Yak7NcCwpquhZUv8/A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609707078; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xkAWBB0fCP8oR4s0bz1IL0feMKGP5FSRQjkwoaDMIDQ=; b=Jjdxz6EseGgN5pk6nL5lGJ47lX+VEeCV0L14TucAgXLY52d803dIC/i3wRoITClpVIOeefa89+nfLVvITfBDtvBpExBMumswxIQA57o6qeQIx11655cVzCJ/xgOZFL4tXweR0abYBVIYXmChCxFPA7EInOA1HTAnfhHY7wpdZtA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.zohomail.com with SMTPS id 160970707888957.99354483600462; Sun, 3 Jan 2021 12:51:18 -0800 (PST) Received: by mail-wr1-f49.google.com with SMTP id d13so29437448wrc.13 for ; Sun, 03 Jan 2021 12:51:18 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (194.red-83-57-172.dynamicip.rima-tde.net. [83.57.172.194]) by smtp.gmail.com with ESMTPSA id y11sm29615018wmi.0.2021.01.03.12.51.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jan 2021 12:51:16 -0800 (PST) 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=xkAWBB0fCP8oR4s0bz1IL0feMKGP5FSRQjkwoaDMIDQ=; b=ZTZXGFGaXkVU/ZHDY4aU/GSrpW18xclGnlYSWDNe98gr4dvj1rsRPiTwOpoxKN6m52 jNebBo9bVAZmUjzJIVJ+2T5aOPkNSaI5SAJEjtDXBdsRLrUj8P0dkd0QYhKG1YMdu/PB KCke/aj4+WAlG5aK8FzI0bWmZGHqtkwJ1mOGlkDo0qfiRYAQFG14+F0C/JQGCT73q2WO KdRYR25fjM/qU6PFCNXq/7eG+K9Jp3vVJfB35EA6x+R/3R/qEQ+FNSglhw7GiXOVPUol LL1SUbPOJ0LdOTX6jsV1nrOPZdhy0OS4LgQX7+rE4zeaMt042bmbZgcPcIVqW1VcCOx8 xMxQ== 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=xkAWBB0fCP8oR4s0bz1IL0feMKGP5FSRQjkwoaDMIDQ=; b=scjHKqdpa8D702ajpPYbGz3iiVnZ3NSQFkARc3Lnr3iMY+6UmEn+ZJSt/yjEi8R5rj lGqMUsGcDSWqdFlglZPwbLG0JD+PeGdA4CpHxcsn2ca+BV21eRVpbo6UIEAa9+ZW+Atz HX81ppcj8oBDYTIzcqy9lFj+3hdnIqA+15CJfR2CpL5XlhcHMzhHD06n3kl7e4bXQ0yl DY62r8428u9EZfIvCd+W2heA4fkJ+M0EVkBroLzu+rnX29mlfSXVHONdIaGPdS3zgZAk HVluwI0npONYlO/B8PUCeb/4iKsqnhb1ylG3enyrQIaMCsqIMRM6D8qDvxupsq2xUYWV XHYw== X-Gm-Message-State: AOAM5303vLI+UnuUd7ZsQJBYwG02dzCc2KwnbWCeJqzKuER6sfVxtXYT w4Nq3iIWjkCaei7kH7nJ3RI= X-Google-Smtp-Source: ABdhPJzo6LCf4mytO+6npZ1V9YQJxFr5mWMpGvgDdfl7aNkJgWsVRnvHKOC54TR37780TaHHcOOTFQ== X-Received: by 2002:adf:9506:: with SMTP id 6mr76437798wrs.172.1609707077100; Sun, 03 Jan 2021 12:51:17 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aurelien Jarno , Huacai Chen , Jiaxun Yang , BALATON Zoltan , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 11/35] vt82c686: Split off via-[am]c97 into separate file in hw/audio Date: Sun, 3 Jan 2021 21:49:57 +0100 Message-Id: <20210103205021.2837760-12-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210103205021.2837760-1-f4bug@amsat.org> References: <20210103205021.2837760-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) From: BALATON Zoltan The via-[am]c97 code is supposed to implement the audio part of VIA south bridge chips so it is better placed under hw/audio/. Split it off into a separate file. Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/audio/via-ac97.c | 106 +++++++++++++++++++++++++++++++++++++++++++ hw/isa/vt82c686.c | 91 ------------------------------------- hw/audio/meson.build | 1 + 3 files changed, 107 insertions(+), 91 deletions(-) create mode 100644 hw/audio/via-ac97.c diff --git a/hw/audio/via-ac97.c b/hw/audio/via-ac97.c new file mode 100644 index 00000000000..e617416ff76 --- /dev/null +++ b/hw/audio/via-ac97.c @@ -0,0 +1,106 @@ +/* + * VIA south bridges sound support + * + * This work is licensed under the GNU GPL license version 2 or later. + */ + +/* + * TODO: This is entirely boiler plate just registering empty PCI devices + * with the right ID guests expect, functionality should be added here. + */ + +#include "qemu/osdep.h" +#include "hw/isa/vt82c686.h" +#include "hw/pci/pci.h" + +struct VIAAC97State { + PCIDevice dev; +}; + +struct VIAMC97State { + PCIDevice dev; +}; + +OBJECT_DECLARE_SIMPLE_TYPE(VIAAC97State, VIA_AC97) +OBJECT_DECLARE_SIMPLE_TYPE(VIAMC97State, VIA_MC97) + +static void via_ac97_realize(PCIDevice *dev, Error **errp) +{ + VIAAC97State *s =3D VIA_AC97(dev); + uint8_t *pci_conf =3D s->dev.config; + + pci_set_word(pci_conf + PCI_COMMAND, PCI_COMMAND_INVALIDATE | + PCI_COMMAND_PARITY); + pci_set_word(pci_conf + PCI_STATUS, PCI_STATUS_CAP_LIST | + PCI_STATUS_DEVSEL_MEDIUM); + pci_set_long(pci_conf + PCI_INTERRUPT_PIN, 0x03); +} + +static void via_ac97_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + PCIDeviceClass *k =3D PCI_DEVICE_CLASS(klass); + + k->realize =3D via_ac97_realize; + k->vendor_id =3D PCI_VENDOR_ID_VIA; + k->device_id =3D PCI_DEVICE_ID_VIA_AC97; + k->revision =3D 0x50; + k->class_id =3D PCI_CLASS_MULTIMEDIA_AUDIO; + set_bit(DEVICE_CATEGORY_SOUND, dc->categories); + dc->desc =3D "AC97"; +} + +static const TypeInfo via_ac97_info =3D { + .name =3D TYPE_VIA_AC97, + .parent =3D TYPE_PCI_DEVICE, + .instance_size =3D sizeof(VIAAC97State), + .class_init =3D via_ac97_class_init, + .interfaces =3D (InterfaceInfo[]) { + { INTERFACE_CONVENTIONAL_PCI_DEVICE }, + { }, + }, +}; + +static void via_mc97_realize(PCIDevice *dev, Error **errp) +{ + VIAMC97State *s =3D VIA_MC97(dev); + uint8_t *pci_conf =3D s->dev.config; + + pci_set_word(pci_conf + PCI_COMMAND, PCI_COMMAND_INVALIDATE | + PCI_COMMAND_VGA_PALETTE); + pci_set_word(pci_conf + PCI_STATUS, PCI_STATUS_DEVSEL_MEDIUM); + pci_set_long(pci_conf + PCI_INTERRUPT_PIN, 0x03); +} + +static void via_mc97_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + PCIDeviceClass *k =3D PCI_DEVICE_CLASS(klass); + + k->realize =3D via_mc97_realize; + k->vendor_id =3D PCI_VENDOR_ID_VIA; + k->device_id =3D PCI_DEVICE_ID_VIA_MC97; + k->class_id =3D PCI_CLASS_COMMUNICATION_OTHER; + k->revision =3D 0x30; + set_bit(DEVICE_CATEGORY_NETWORK, dc->categories); + dc->desc =3D "MC97"; +} + +static const TypeInfo via_mc97_info =3D { + .name =3D TYPE_VIA_MC97, + .parent =3D TYPE_PCI_DEVICE, + .instance_size =3D sizeof(VIAMC97State), + .class_init =3D via_mc97_class_init, + .interfaces =3D (InterfaceInfo[]) { + { INTERFACE_CONVENTIONAL_PCI_DEVICE }, + { }, + }, +}; + +static void via_ac97_register_types(void) +{ + type_register_static(&via_ac97_info); + type_register_static(&via_mc97_info); +} + +type_init(via_ac97_register_types) diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index 8677a2d212b..9567326d8e2 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -168,14 +168,6 @@ struct VT686PMState { uint32_t smb_io_base; }; =20 -struct VIAAC97State { - PCIDevice dev; -}; - -struct VIAMC97State { - PCIDevice dev; -}; - #define TYPE_VT82C686B_PM "VT82C686B_PM" OBJECT_DECLARE_SIMPLE_TYPE(VT686PMState, VT82C686B_PM) =20 @@ -247,87 +239,6 @@ static const VMStateDescription vmstate_acpi =3D { } }; =20 -/* - * TODO: VIA_AC97 and VIA_MC97 - * just register a PCI device now, functionalities will be implemented lat= er. - */ - -OBJECT_DECLARE_SIMPLE_TYPE(VIAMC97State, VIA_MC97) -OBJECT_DECLARE_SIMPLE_TYPE(VIAAC97State, VIA_AC97) - -static void vt82c686b_ac97_realize(PCIDevice *dev, Error **errp) -{ - VIAAC97State *s =3D VIA_AC97(dev); - uint8_t *pci_conf =3D s->dev.config; - - pci_set_word(pci_conf + PCI_COMMAND, PCI_COMMAND_INVALIDATE | - PCI_COMMAND_PARITY); - pci_set_word(pci_conf + PCI_STATUS, PCI_STATUS_CAP_LIST | - PCI_STATUS_DEVSEL_MEDIUM); - pci_set_long(pci_conf + PCI_INTERRUPT_PIN, 0x03); -} - -static void via_ac97_class_init(ObjectClass *klass, void *data) -{ - DeviceClass *dc =3D DEVICE_CLASS(klass); - PCIDeviceClass *k =3D PCI_DEVICE_CLASS(klass); - - k->realize =3D vt82c686b_ac97_realize; - k->vendor_id =3D PCI_VENDOR_ID_VIA; - k->device_id =3D PCI_DEVICE_ID_VIA_AC97; - k->revision =3D 0x50; - k->class_id =3D PCI_CLASS_MULTIMEDIA_AUDIO; - set_bit(DEVICE_CATEGORY_SOUND, dc->categories); - dc->desc =3D "AC97"; -} - -static const TypeInfo via_ac97_info =3D { - .name =3D TYPE_VIA_AC97, - .parent =3D TYPE_PCI_DEVICE, - .instance_size =3D sizeof(VIAAC97State), - .class_init =3D via_ac97_class_init, - .interfaces =3D (InterfaceInfo[]) { - { INTERFACE_CONVENTIONAL_PCI_DEVICE }, - { }, - }, -}; - -static void vt82c686b_mc97_realize(PCIDevice *dev, Error **errp) -{ - VIAMC97State *s =3D VIA_MC97(dev); - uint8_t *pci_conf =3D s->dev.config; - - pci_set_word(pci_conf + PCI_COMMAND, PCI_COMMAND_INVALIDATE | - PCI_COMMAND_VGA_PALETTE); - pci_set_word(pci_conf + PCI_STATUS, PCI_STATUS_DEVSEL_MEDIUM); - pci_set_long(pci_conf + PCI_INTERRUPT_PIN, 0x03); -} - -static void via_mc97_class_init(ObjectClass *klass, void *data) -{ - DeviceClass *dc =3D DEVICE_CLASS(klass); - PCIDeviceClass *k =3D PCI_DEVICE_CLASS(klass); - - k->realize =3D vt82c686b_mc97_realize; - k->vendor_id =3D PCI_VENDOR_ID_VIA; - k->device_id =3D PCI_DEVICE_ID_VIA_MC97; - k->class_id =3D PCI_CLASS_COMMUNICATION_OTHER; - k->revision =3D 0x30; - set_bit(DEVICE_CATEGORY_NETWORK, dc->categories); - dc->desc =3D "MC97"; -} - -static const TypeInfo via_mc97_info =3D { - .name =3D TYPE_VIA_MC97, - .parent =3D TYPE_PCI_DEVICE, - .instance_size =3D sizeof(VIAMC97State), - .class_init =3D via_mc97_class_init, - .interfaces =3D (InterfaceInfo[]) { - { INTERFACE_CONVENTIONAL_PCI_DEVICE }, - { }, - }, -}; - /* vt82c686 pm init */ static void vt82c686b_pm_realize(PCIDevice *dev, Error **errp) { @@ -516,8 +427,6 @@ static const TypeInfo via_superio_info =3D { =20 static void vt82c686b_register_types(void) { - type_register_static(&via_ac97_info); - type_register_static(&via_mc97_info); type_register_static(&via_pm_info); type_register_static(&via_superio_info); type_register_static(&via_info); diff --git a/hw/audio/meson.build b/hw/audio/meson.build index 549e9a0396a..32c42bdebe4 100644 --- a/hw/audio/meson.build +++ b/hw/audio/meson.build @@ -11,4 +11,5 @@ softmmu_ss.add(when: 'CONFIG_PCSPK', if_true: files('pcspk.c')) softmmu_ss.add(when: 'CONFIG_PL041', if_true: files('pl041.c', 'lm4549.c')) softmmu_ss.add(when: 'CONFIG_SB16', if_true: files('sb16.c')) +softmmu_ss.add(when: 'CONFIG_VT82C686', if_true: files('via-ac97.c')) softmmu_ss.add(when: 'CONFIG_WM8750', if_true: files('wm8750.c')) --=20 2.26.2