From patchwork Mon Jul 12 07:18:01 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 58577 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9FA92B6F01 for ; Mon, 12 Jul 2010 17:20:38 +1000 (EST) Received: from localhost ([127.0.0.1]:46085 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OYDJb-0006he-QV for incoming@patchwork.ozlabs.org; Mon, 12 Jul 2010 03:20:35 -0400 Received: from [140.186.70.92] (port=49723 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OYDHD-0005Tn-8y for qemu-devel@nongnu.org; Mon, 12 Jul 2010 03:18:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OYDHB-0005N4-DB for qemu-devel@nongnu.org; Mon, 12 Jul 2010 03:18:07 -0400 Received: from mail.valinux.co.jp ([210.128.90.3]:40505) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OYDHA-0005Mo-Sg for qemu-devel@nongnu.org; Mon, 12 Jul 2010 03:18:05 -0400 Received: from ps.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with SMTP id 2074810773D; Mon, 12 Jul 2010 16:18:01 +0900 (JST) Received: (nullmailer pid 31578 invoked by uid 1000); Mon, 12 Jul 2010 07:18:01 -0000 From: Isaku Yamahata To: qemu-devel@nongnu.org Date: Mon, 12 Jul 2010 16:18:01 +0900 Message-Id: X-Mailer: git-send-email 1.7.1.1 X-Virus-Scanned: clamav-milter 0.95.2 at va-mail.local.valinux.co.jp X-Virus-Status: Clean X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: Blue Swirl , yamahata@valinux.co.jp, Huacai Chen , Aurelien Jarno , mst@redhat.com Subject: [Qemu-devel] [PATCH] pci/multi function bit: fix v582c686.c. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The file, v582c686.c, was added after the change set of b80d4a9887fa4b6cc63f8c3a13ab2a45054d3e5c and fecb93c45c749a4c994d8d12bdee17ce2012de9e are created, but before the patch series was commit. So similar fix is needed to v582c686.c. Cc: Huacai Chen Cc: Aurelien Jarno Cc: Michael S. Tsirkin Cc: Blue Swirl Signed-off-by: Isaku Yamahata --- This is only compile tested. Huacai, can you please test it? Or provide me pmon_fulong2e.bin? I wasn't able to find it, and tried the source repository, http://www.loongson.cn/support/git/pmon, but wasn't able to clone. $ git clone http://www.loongson.cn/support/git/pmon Cloning into pmon... fatal: http://www.loongson.cn/support/git/pmon/info/refs not found: did you run git update-server-info on the server? --- hw/vt82c686.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/hw/vt82c686.c b/hw/vt82c686.c index a0c5747..cacc217 100644 --- a/hw/vt82c686.c +++ b/hw/vt82c686.c @@ -468,7 +468,6 @@ static int vt82c686b_pm_initfn(PCIDevice *dev) pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_VIA_ACPI); pci_config_set_class(pci_conf, PCI_CLASS_BRIDGE_OTHER); pci_config_set_revision(pci_conf, 0x40); - pci_conf[PCI_HEADER_TYPE] = PCI_HEADER_TYPE_NORMAL; // header_type pci_set_word(pci_conf + PCI_COMMAND, 0); pci_set_word(pci_conf + PCI_STATUS, PCI_STATUS_FAST_BACK | @@ -556,8 +555,6 @@ static int vt82c686b_initfn(PCIDevice *d) pci_config_set_class(pci_conf, PCI_CLASS_BRIDGE_ISA); pci_config_set_prog_interface(pci_conf, 0x0); pci_config_set_revision(pci_conf,0x40); /* Revision 4.0 */ - pci_conf[PCI_HEADER_TYPE] = - PCI_HEADER_TYPE_NORMAL | PCI_HEADER_TYPE_MULTI_FUNCTION; wmask = d->wmask; for (i = 0x00; i < 0xff; i++) { @@ -575,7 +572,7 @@ int vt82c686b_init(PCIBus *bus, int devfn) { PCIDevice *d; - d = pci_create_simple(bus, devfn, "VT82C686B"); + d = pci_create_simple_multifunction(bus, devfn, true, "VT82C686B"); return d->devfn; }