From patchwork Thu Mar 17 21:24:31 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 642161 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2HLObRO028779 for ; Thu, 17 Mar 2011 21:24:38 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755652Ab1CQVYf (ORCPT ); Thu, 17 Mar 2011 17:24:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37977 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755613Ab1CQVYe (ORCPT ); Thu, 17 Mar 2011 17:24:34 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p2HLOVaA024733 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 17 Mar 2011 17:24:32 -0400 Received: from s20.home (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p2HLOV9r010864; Thu, 17 Mar 2011 17:24:31 -0400 From: Alex Williamson Subject: [PATCH v2] device-assignment: Reset device on system reset To: kvm@vger.kernel.org Cc: alex.williamson@redhat.com, ddutile@redhat.com, chrisw@redhat.com, bernhard.kohl@nsn.com Date: Thu, 17 Mar 2011 15:24:31 -0600 Message-ID: <20110317212413.14852.67041.stgit@s20.home> In-Reply-To: <20110317192923.24889.79288.stgit@s20.home> References: <20110317192923.24889.79288.stgit@s20.home> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 17 Mar 2011 21:24:38 +0000 (UTC) diff --git a/hw/device-assignment.c b/hw/device-assignment.c index db82e73..4997b6e 100644 --- a/hw/device-assignment.c +++ b/hw/device-assignment.c @@ -1693,13 +1693,33 @@ static const VMStateDescription vmstate_assigned_device = { static void reset_assigned_device(DeviceState *dev) { - PCIDevice *d = DO_UPCAST(PCIDevice, qdev, dev); + PCIDevice *pci_dev = DO_UPCAST(PCIDevice, qdev, dev); + AssignedDevice *adev = DO_UPCAST(AssignedDevice, dev, pci_dev); + char reset_file[64]; + const char reset[] = "1"; + int fd, ret; + + snprintf(reset_file, sizeof(reset_file), + "/sys/bus/pci/devices/%04x:%02x:%02x.%01x/reset", + adev->host.seg, adev->host.bus, adev->host.dev, adev->host.func); + + /* + * Issue a device reset via pci-sysfs. Note that we use write(2) here + * and ignore the return value because some kernels have a bug that + * returns 0 rather than bytes written on success, sending us into an + * infinite retry loop using other write mechanisms. + */ + fd = open(reset_file, O_WRONLY); + if (fd != -1) { + ret = write(fd, reset, strlen(reset)); + close(fd); + } /* * When a 0 is written to the command register, the device is logically * disconnected from the PCI bus. This avoids further DMA transfers. */ - assigned_dev_pci_write_config(d, PCI_COMMAND, 0, 2); + assigned_dev_pci_write_config(pci_dev, PCI_COMMAND, 0, 2); } static int assigned_initfn(struct PCIDevice *pci_dev)