From owner-svn-src-head@freebsd.org  Mon Oct 19 22:32:37 2020
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 00540436E90;
 Mon, 19 Oct 2020 22:32:37 +0000 (UTC) (envelope-from br@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4CFWjJ6G8rz4Htk;
 Mon, 19 Oct 2020 22:32:36 +0000 (UTC) (envelope-from br@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BA39AAE48;
 Mon, 19 Oct 2020 22:32:36 +0000 (UTC) (envelope-from br@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09JMWalI053935;
 Mon, 19 Oct 2020 22:32:36 GMT (envelope-from br@FreeBSD.org)
Received: (from br@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09JMWavp053934;
 Mon, 19 Oct 2020 22:32:36 GMT (envelope-from br@FreeBSD.org)
Message-Id: <202010192232.09JMWavp053934@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: br set sender to br@FreeBSD.org
 using -f
From: Ruslan Bukin <br@FreeBSD.org>
Date: Mon, 19 Oct 2020 22:32:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r366865 - head/sys/dev/ahci
X-SVN-Group: head
X-SVN-Commit-Author: br
X-SVN-Commit-Paths: head/sys/dev/ahci
X-SVN-Commit-Revision: 366865
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Oct 2020 22:32:37 -0000

Author: br
Date: Mon Oct 19 22:32:36 2020
New Revision: 366865
URL: https://svnweb.freebsd.org/changeset/base/366865

Log:
  Fix build: only set iommu buswide flag if IOMMU code is included.
  
  Sponsored by:	Innovate DSbD

Modified:
  head/sys/dev/ahci/ahci_pci.c

Modified: head/sys/dev/ahci/ahci_pci.c
==============================================================================
--- head/sys/dev/ahci/ahci_pci.c	Mon Oct 19 22:27:21 2020	(r366864)
+++ head/sys/dev/ahci/ahci_pci.c	Mon Oct 19 22:32:36 2020	(r366865)
@@ -27,6 +27,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_iommu.h"
+
 #include <sys/param.h>
 #include <sys/module.h>
 #include <sys/systm.h>
@@ -499,6 +501,7 @@ ahci_pci_attach(device_t dev)
 		i++;
 	ctlr->quirks = ahci_ids[i].quirks;
 
+#ifdef IOMMU
 	if (ctlr->quirks & AHCI_Q_IOMMU_BUSWIDE) {
 		/*
 		 * The controller issues DMA requests from PCI function 1,
@@ -507,6 +510,7 @@ ahci_pci_attach(device_t dev)
 		 */
 		bus_dma_iommu_set_buswide(dev);
 	}
+#endif
 
 	/* Limit speed for my onboard JMicron external port.
 	 * It is not eSATA really, limit to SATA 1 */