From patchwork Thu Oct 12 04:12:36 2023 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: 732461 Delivered-To: patch@linaro.org Received: by 2002:ab3:5b93:0:b0:23f:8cfb:5ad7 with SMTP id j19csp324893ltf; Wed, 11 Oct 2023 21:13:27 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFxvAjnq6Xw6nH2AZG8bPwzxgn+j1GgB4I365A/eSftrONllDDI6gyFlRaMWUNNGojIQV3/ X-Received: by 2002:a05:6214:3a03:b0:658:2037:718b with SMTP id nw3-20020a0562143a0300b006582037718bmr26000236qvb.51.1697084007576; Wed, 11 Oct 2023 21:13:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697084007; cv=none; d=google.com; s=arc-20160816; b=L+02hpeCMOU8LL+apMHbspOtsYQMBSPZJ4LHMjupEDKA4HWuZ/FUOB/feMXIzDjqH/ 709ueJ3GP/+75Sh3cLeDv/7cU1PO0ZVXHnnmpdB2e0IPLKrl5+2Yb4yEYfj5N8f0ivC9 3JvtiYqQBr065CDAcR4MWB2FWjlX7+dhM0ZRj03jZ9L/AesFOBr5LEEIxhSoe8z5/NI4 p79qG3gR+3K7nLa2kMT5xFKgN15ihh1QVN2VsumLBta9KcwU+VgzWU5iEgdjBxgysZiy n1+Bha0vXdAQQu2qcJCeEsHtEvuZv1ZLgaH0RL/xy5mLhv0rL3PtaIPFOvmTO8n+YTlo WkdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=WsX2DG2aDbsRhbntpTTVvqExibrPowqSUQlphKlY4n0=; fh=JC0uePkDNHAC6vZ7v8QWv0c8a4TbaacWMibqgTcw/aQ=; b=YX3XPgMZYBxiaHozSYtDid9ftoOx0E9v9ZJgRiy+4/hwyOl9pIzF+uk/ceium8BX6Q sZmaOxTOJrTClKlgrCF0PtiYC1y43Ljte2Hfpwa1a33XUuCzp5x1iKjmY8WVcouY3E8p At5cWuaba8LJYxJWn2dreLKD1Gngh21oMPKNkxmFnLEpbkZXTVLi3ndI0hXXPGc2UgGX HVT6HNZuLKQRcb43s0Fsw2Wny3yaBKmGKP3HCFrxitXXN1QfchPYDgQ1vzbTYhFRlpIi 0hc1wolaxYug7mAf4zzDvohRjeX0vw44kImg9IP/Jjh1tNxIDfxagRs/fQiUYDAuG/w8 aa8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=w18JCYRj; 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 y12-20020a0ce04c000000b0066d07638aa3si1878274qvk.424.2023.10.11.21.13.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 11 Oct 2023 21:13:27 -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=w18JCYRj; 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 1qqn4F-0003kR-F9; Thu, 12 Oct 2023 00:12:59 -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 1qqn4B-0003Ks-MM for qemu-devel@nongnu.org; Thu, 12 Oct 2023 00:12:55 -0400 Received: from mail-ed1-x52d.google.com ([2a00:1450:4864:20::52d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qqn49-0002Zb-Aj for qemu-devel@nongnu.org; Thu, 12 Oct 2023 00:12:55 -0400 Received: by mail-ed1-x52d.google.com with SMTP id 4fb4d7f45d1cf-53d82bea507so972388a12.2 for ; Wed, 11 Oct 2023 21:12:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697083971; x=1697688771; darn=nongnu.org; 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=WsX2DG2aDbsRhbntpTTVvqExibrPowqSUQlphKlY4n0=; b=w18JCYRji2rvQmiWW8GXzoT4EX2JpQZXD/Ya2nScLFnKDoO90sVXRLuW7ejKXW8sif 4K+miP1lnsG4MhfZyKDL6KySm5rj85VPMZbU1qqHD10Hf42UCzLvepCVf9Qnaz51nuED ht5FwxTh50tT53IzEiP30Ok6WP5/8bqCNI5NyubnbFOnkNZ9QS4n2ot8aMZ+JpZPVs5L sTGmYC94j+dGlpn6oYLDm5Mi6ewLi9Zgx9cwgtkmNWCjiPN1DHzvwmSqOyq+YvFncyd1 0lJGr/2gsSwgATQ3NvViUvD8PfywvNq846/1ONv9VSsEVtIOzu7j5GfI/zDuLovqrzXI DoMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697083971; x=1697688771; 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=WsX2DG2aDbsRhbntpTTVvqExibrPowqSUQlphKlY4n0=; b=dduR1PVu3SsCovg0cEhEI+8LdAx0/21wuLuENE4IMvqMT6ROdOgob/+NKKKZvBWvVE nspPtDwK+i2TUDye9chPrGar8bVDJZADTjkkiV7YyGt/oOb4SWl7IM7d89jMiG0GGa+y nLUvt25plT7qYzbsysEESv7cDwaXl4XH5OASHwhF0rU1UMloKp6kcnV1jJ5OwvCqfU3h Iam/KLW1SUtK2HG1xSU2w6bMoI5lg79fAU4XfwHamALzgp8/9BwyxTqm5ffmlSVqjIlE +1ZcsuVdjMznmXZPDkw2edYrKpvDZs8nidxUnPFaVJ1mn/0vMFcdbIeBbbaVISxPjmQu rTkw== X-Gm-Message-State: AOJu0YwEfWaLExTjWk+sHSvgTBk8gdMy1cLN8guJBFzgduTe0UgM5wmk kposDHe4o7q+35oT4GzWU+orOTB4vVfH5/6hvZMTAQ== X-Received: by 2002:a17:906:8a64:b0:9b3:120:f319 with SMTP id hy4-20020a1709068a6400b009b30120f319mr19483428ejc.51.1697083971231; Wed, 11 Oct 2023 21:12:51 -0700 (PDT) Received: from m1x-phil.lan (dcs23-h01-176-173-173-31.dsl.sta.abo.bbox.fr. [176.173.173.31]) by smtp.gmail.com with ESMTPSA id r14-20020a170906364e00b009b65a698c16sm10513833ejb.220.2023.10.11.21.12.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 11 Oct 2023 21:12:50 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yoshinori Sato , Magnus Damm , qemu-trivial@nongnu.org, =?utf-8?q?Phi?= =?utf-8?q?lippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 2/3] hw/pci-host/sh_pcic: Correct PCI host / devfn#0 function names Date: Thu, 12 Oct 2023 06:12:36 +0200 Message-ID: <20231012041237.22281-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231012041237.22281-1-philmd@linaro.org> References: <20231012041237.22281-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52d; envelope-from=philmd@linaro.org; helo=mail-ed1-x52d.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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Host bridge device and PCI function #0 are inverted. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Yoshinori Sato --- hw/pci-host/sh_pci.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/hw/pci-host/sh_pci.c b/hw/pci-host/sh_pci.c index 41aed48c85..580e273d96 100644 --- a/hw/pci-host/sh_pci.c +++ b/hw/pci-host/sh_pci.c @@ -116,7 +116,7 @@ static void sh_pci_set_irq(void *opaque, int irq_num, int level) qemu_set_irq(pic[irq_num], level); } -static void sh_pci_device_realize(DeviceState *dev, Error **errp) +static void sh_pcic_host_realize(DeviceState *dev, Error **errp) { SysBusDevice *sbd = SYS_BUS_DEVICE(dev); SHPCIState *s = SH_PCI_HOST_BRIDGE(dev); @@ -145,19 +145,19 @@ static void sh_pci_device_realize(DeviceState *dev, Error **errp) s->dev = pci_create_simple(phb->bus, PCI_DEVFN(0, 0), "sh_pci_host"); } -static void sh_pci_host_realize(PCIDevice *d, Error **errp) +static void sh_pcic_pci_realize(PCIDevice *d, Error **errp) { pci_set_word(d->config + PCI_COMMAND, PCI_COMMAND_WAIT); pci_set_word(d->config + PCI_STATUS, PCI_STATUS_CAP_LIST | PCI_STATUS_FAST_BACK | PCI_STATUS_DEVSEL_MEDIUM); } -static void sh_pci_host_class_init(ObjectClass *klass, void *data) +static void sh_pcic_pci_class_init(ObjectClass *klass, void *data) { PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass); - k->realize = sh_pci_host_realize; + k->realize = sh_pcic_pci_realize; k->vendor_id = PCI_VENDOR_ID_HITACHI; k->device_id = PCI_DEVICE_ID_HITACHI_SH7751R; /* @@ -167,11 +167,11 @@ static void sh_pci_host_class_init(ObjectClass *klass, void *data) dc->user_creatable = false; } -static void sh_pci_device_class_init(ObjectClass *klass, void *data) +static void sh_pcic_host_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - dc->realize = sh_pci_device_realize; + dc->realize = sh_pcic_host_realize; } static const TypeInfo sh_pcic_types[] = { @@ -179,12 +179,12 @@ static const TypeInfo sh_pcic_types[] = { .name = TYPE_SH_PCI_HOST_BRIDGE, .parent = TYPE_PCI_HOST_BRIDGE, .instance_size = sizeof(SHPCIState), - .class_init = sh_pci_device_class_init, + .class_init = sh_pcic_host_class_init, }, { .name = "sh_pci_host", .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(PCIDevice), - .class_init = sh_pci_host_class_init, + .class_init = sh_pcic_pci_class_init, .interfaces = (InterfaceInfo[]) { { INTERFACE_CONVENTIONAL_PCI_DEVICE }, { },