From patchwork Sun Oct 30 22:27:53 2022 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: 620004 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2449628pvb; Sun, 30 Oct 2022 15:29:57 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7IWQ2q9i1/7KzrTfk+5/qZG+KWIsJr9vHDJxhsh1T8sLHO+OAvJywqvfxD3T7k0za1Va/y X-Received: by 2002:ac8:550b:0:b0:3a5:2784:8d0a with SMTP id j11-20020ac8550b000000b003a527848d0amr683962qtq.96.1667168997642; Sun, 30 Oct 2022 15:29:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667168997; cv=none; d=google.com; s=arc-20160816; b=qbPyLFMx7tPF/BJD4KtNaCUGVbq7Uff24jMZ9fAGfERm7aL1HdNdl8ovFVdlEXrq/n I9aOzSGpg82vq2Cjp4RwgEw1TrZA36mU7/TMvD6ynfcOXW/w8t5vsaaRRnfgnqOf4mW4 BMXm0G3tYsSNYbUlJGIOYCrpSd+5Qj83qoxADOfSuHmNwek9HEBdudVFuffZh5deQo6W cQLRhtKgHVfvxK1xalz4D67SziDns+7TzcYLQA11cz71f4rLnSM1TllYwMso9DmyRXsc IsO9DlV2X6pjaNcC5PhHqsymncFYBaWyUoHQj6xU3Yyhlv15POMNgTFwf6Fy8l97bjmI owlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=+Whyv3BXRJ6VWOnTQ1DAYj2diPnC5pT8crq6E+lTYIk=; b=JY8v17DnnFjhVzjd4ED845KPsB81ROwS8rQs5ybwsb5JxpiH8CJp+sJUs0DqgszHiS LsGkRQuoUiLRYXwoj44iDaNnKU1Nkyjwm4wQdy6ABncHGqrqWvF7wmJORwvUC+Jktaer fPL/SSEzNEd+shTW9MRJYvp863DhPUbs8tKqNNlbyDUJ4bmtzSMeGE1fTBtUw+vhFrMk gqFrEWVkQhx6YezSHbQ6To+KPr0ZJm23SfAcn+jJxkqBySIN+/ZAOMU+DYzxL7NRvVh4 NBRO4x/GHAleXSVxbswR3Vl5TaxIsJ8qKaKjR6Ypqc7kltsQeQGfayvKyIDc1/wLcUKM bL4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TebcZ4Vx; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id jx5-20020a0562142b0500b004bbb9628ea6si2920784qvb.13.2022.10.30.15.29.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 30 Oct 2022 15:29:57 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TebcZ4Vx; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opGoH-0000ZX-BI; Sun, 30 Oct 2022 18:29:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opGoB-0000Uf-8T for qemu-devel@nongnu.org; Sun, 30 Oct 2022 18:29:35 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opGo9-0007D2-JA for qemu-devel@nongnu.org; Sun, 30 Oct 2022 18:29:35 -0400 Received: by mail-wm1-x336.google.com with SMTP id m29-20020a05600c3b1d00b003c6bf423c71so9822452wms.0 for ; Sun, 30 Oct 2022 15:29:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+Whyv3BXRJ6VWOnTQ1DAYj2diPnC5pT8crq6E+lTYIk=; b=TebcZ4VxJ8S/tlkFgvuv3OmFLDrCM6mqw3EnTIIsUBoNOQTBgiWKiM9Xg7QajjIif7 croOCIm9q0+B0hbaabB+G1wT3+7q+uJ9xlvLfoIyF5AVA1tytuvVaWFHntCObKAdBWr3 0VStmqxbMZsCXQbfnUqtPlsCGtRpIHQ3Zw8RGeeQ1e+j5NsHehjstXWFa4oeBhJFLhXM HJ7HX88JKPpidTlKMlXuzuTkD9SJw5bOHKF5yeW5mHW7YJ4Ib5qJm6wOB8jNgFSGyBu+ by0CiVxjSR3Nr3BvwYO4/MOiSlhSa4/p6NhhmwGzp9DeESmeC8FTcBgNM6i1lpek8GP6 1w3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+Whyv3BXRJ6VWOnTQ1DAYj2diPnC5pT8crq6E+lTYIk=; b=C7JEP6f/UjVuIftLwcS1n4apVjiRa7jn9Xco6cea1bJEoTYoqWNxg9C3AtbGLRx0NR 6GfKIslxGmHX/e+SXZmvdGs93AswFb6ytTw75v9vdMxRAlMVT+UhCR3mv0IRoIk2Men8 rvHf4MYg/e6Fk1Q9qL/bPZAnn0kWIL5MWczAGlQxlmLTUD5qucgORwLZgkzFxPGSMnEi 3IxPVUu8JniThCtlVIrqplpueXzA7uLQpxUhe6hnnvZ+WTxJlTMw1LEjRqqr0gaGrIqh 3K0V5/asY1XNLdii8fetqfOa4H+13FtW/7zLC2F6a+ow8koFTEIlGGXmLLg1UKjnheah wuyg== X-Gm-Message-State: ACrzQf3BwZ15D7lJ7rrkg913ut6ktqovS6xc7Ba0jpX57AuFiTaBXs6N 7XXAxDfDMEtc2rdeskR5K2fTiSezRnMMEQ== X-Received: by 2002:a1c:35c9:0:b0:3c3:d9a:385f with SMTP id c192-20020a1c35c9000000b003c30d9a385fmr5994710wma.139.1667168971319; Sun, 30 Oct 2022 15:29:31 -0700 (PDT) Received: from localhost.localdomain ([185.126.107.38]) by smtp.gmail.com with ESMTPSA id b6-20020adfee86000000b0023677fd2657sm5202420wro.52.2022.10.30.15.29.29 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 30 Oct 2022 15:29:30 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Huacai Chen , Stefan Pejic , Jiaxun Yang , Aurelien Jarno , Paul Burton , Bernhard Beschow , BALATON Zoltan , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Daniel Henrique Barboza Subject: [PULL 07/55] hw/isa/vt82c686: Introduce TYPE_VT82C686B_USB_UHCI define Date: Sun, 30 Oct 2022 23:27:53 +0100 Message-Id: <20221030222841.42377-8-philmd@linaro.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221030222841.42377-1-philmd@linaro.org> References: <20221030222841.42377-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Bernhard Beschow Suggested-by: BALATON Zoltan Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daudé Acked-by: Daniel Henrique Barboza Message-Id: <20220901114127.53914-8-shentey@gmail.com> Signed-off-by: Philippe Mathieu-Daudé --- hw/mips/fuloong2e.c | 4 ++-- hw/ppc/pegasos2.c | 4 ++-- hw/usb/vt82c686-uhci-pci.c | 4 ++-- include/hw/isa/vt82c686.h | 1 + 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c index 32605901e7..6b7370f2aa 100644 --- a/hw/mips/fuloong2e.c +++ b/hw/mips/fuloong2e.c @@ -208,8 +208,8 @@ static void vt82c686b_southbridge_init(PCIBus *pci_bus, int slot, qemu_irq intc, dev = PCI_DEVICE(object_resolve_path_component(OBJECT(via), "ide")); pci_ide_create_devs(dev); - pci_create_simple(pci_bus, PCI_DEVFN(slot, 2), "vt82c686b-usb-uhci"); - pci_create_simple(pci_bus, PCI_DEVFN(slot, 3), "vt82c686b-usb-uhci"); + pci_create_simple(pci_bus, PCI_DEVFN(slot, 2), TYPE_VT82C686B_USB_UHCI); + pci_create_simple(pci_bus, PCI_DEVFN(slot, 3), TYPE_VT82C686B_USB_UHCI); dev = pci_create_simple(pci_bus, PCI_DEVFN(slot, 4), TYPE_VT82C686B_PM); *i2c_bus = I2C_BUS(qdev_get_child_bus(DEVICE(dev), "i2c")); diff --git a/hw/ppc/pegasos2.c b/hw/ppc/pegasos2.c index 76f0dee4aa..23b4156a5e 100644 --- a/hw/ppc/pegasos2.c +++ b/hw/ppc/pegasos2.c @@ -169,8 +169,8 @@ static void pegasos2_init(MachineState *machine) pci_ide_create_devs(dev); /* VT8231 function 2-3: USB Ports */ - pci_create_simple(pci_bus, PCI_DEVFN(12, 2), "vt82c686b-usb-uhci"); - pci_create_simple(pci_bus, PCI_DEVFN(12, 3), "vt82c686b-usb-uhci"); + pci_create_simple(pci_bus, PCI_DEVFN(12, 2), TYPE_VT82C686B_USB_UHCI); + pci_create_simple(pci_bus, PCI_DEVFN(12, 3), TYPE_VT82C686B_USB_UHCI); /* VT8231 function 4: Power Management Controller */ dev = pci_create_simple(pci_bus, PCI_DEVFN(12, 4), TYPE_VT8231_PM); diff --git a/hw/usb/vt82c686-uhci-pci.c b/hw/usb/vt82c686-uhci-pci.c index 0bf2b72ff0..46a901f56f 100644 --- a/hw/usb/vt82c686-uhci-pci.c +++ b/hw/usb/vt82c686-uhci-pci.c @@ -31,7 +31,7 @@ static void usb_uhci_vt82c686b_realize(PCIDevice *dev, Error **errp) static UHCIInfo uhci_info[] = { { - .name = "vt82c686b-usb-uhci", + .name = TYPE_VT82C686B_USB_UHCI, .vendor_id = PCI_VENDOR_ID_VIA, .device_id = PCI_DEVICE_ID_VIA_UHCI, .revision = 0x01, @@ -45,7 +45,7 @@ static UHCIInfo uhci_info[] = { static const TypeInfo vt82c686b_usb_uhci_type_info = { .parent = TYPE_UHCI, - .name = "vt82c686b-usb-uhci", + .name = TYPE_VT82C686B_USB_UHCI, .class_init = uhci_data_class_init, .class_data = uhci_info, }; diff --git a/include/hw/isa/vt82c686.h b/include/hw/isa/vt82c686.h index 87aca3e5bb..e6f6dd4d43 100644 --- a/include/hw/isa/vt82c686.h +++ b/include/hw/isa/vt82c686.h @@ -5,6 +5,7 @@ #define TYPE_VT82C686B_ISA "vt82c686b-isa" #define TYPE_VT82C686B_PM "vt82c686b-pm" +#define TYPE_VT82C686B_USB_UHCI "vt82c686b-usb-uhci" #define TYPE_VT8231_ISA "vt8231-isa" #define TYPE_VT8231_PM "vt8231-pm" #define TYPE_VIA_AC97 "via-ac97"