From owner-svn-src-all@freebsd.org Fri Sep 11 17:01:02 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CBA00A01B44; Fri, 11 Sep 2015 17:01:02 +0000 (UTC) (envelope-from jimharris@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BC5631650; Fri, 11 Sep 2015 17:01:02 +0000 (UTC) (envelope-from jimharris@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8BH1202039374; Fri, 11 Sep 2015 17:01:02 GMT (envelope-from jimharris@FreeBSD.org) Received: (from jimharris@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8BH12Sm039373; Fri, 11 Sep 2015 17:01:02 GMT (envelope-from jimharris@FreeBSD.org) Message-Id: <201509111701.t8BH12Sm039373@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jimharris set sender to jimharris@FreeBSD.org using -f From: Jim Harris Date: Fri, 11 Sep 2015 17:01:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r287677 - stable/10/sys/dev/isci X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Sep 2015 17:01:02 -0000 Author: jimharris Date: Fri Sep 11 17:01:01 2015 New Revision: 287677 URL: https://svnweb.freebsd.org/changeset/base/287677 Log: MFC r287563: isci: explicitly enable/disable PCI busmaster BIOS always enables PCI busmaster on the isci device, which effectively worked around this omission. But when passing the isci device through to a guest VM, the hypervisor will disable busmaster and isci will not work without calling pci_enable_busmaster(). Sponsored by: Intel Modified: stable/10/sys/dev/isci/isci.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/isci/isci.c ============================================================================== --- stable/10/sys/dev/isci/isci.c Fri Sep 11 16:59:04 2015 (r287676) +++ stable/10/sys/dev/isci/isci.c Fri Sep 11 17:01:01 2015 (r287677) @@ -163,6 +163,7 @@ isci_attach(device_t device) g_isci = isci; isci->device = device; + pci_enable_busmaster(device); isci_allocate_pci_memory(isci); @@ -272,6 +273,7 @@ isci_detach(device_t device) pci_release_msi(device); } + pci_disable_busmaster(device); return (0); }