From owner-svn-src-head@FreeBSD.ORG  Mon Jan 27 19:49:53 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3AAA475C;
 Mon, 27 Jan 2014 19:49:53 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 271B21A15;
 Mon, 27 Jan 2014 19:49:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0RJnr02067978;
 Mon, 27 Jan 2014 19:49:53 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0RJnr7t067977;
 Mon, 27 Jan 2014 19:49:53 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201401271949.s0RJnr7t067977@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Mon, 27 Jan 2014 19:49:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r261216 - head/sys/dev/pccbb
X-SVN-Group: head
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.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Jan 2014 19:49:53 -0000

Author: jhb
Date: Mon Jan 27 19:49:52 2014
New Revision: 261216
URL: http://svnweb.freebsd.org/changeset/base/261216

Log:
  Explicitly enable I/O and memory decoding in the bridge's command register
  when activating an I/O or memory window on the CardBus bridge.
  
  Tested by:	Olivier Cochard-Labbe <olivier@cochard.me>
  Reviewed by:	imp
  MFC after:	3 days

Modified:
  head/sys/dev/pccbb/pccbb.c

Modified: head/sys/dev/pccbb/pccbb.c
==============================================================================
--- head/sys/dev/pccbb/pccbb.c	Mon Jan 27 19:37:35 2014	(r261215)
+++ head/sys/dev/pccbb/pccbb.c	Mon Jan 27 19:49:52 2014	(r261216)
@@ -1038,6 +1038,13 @@ cbb_cardbus_power_disable_socket(device_
 /* CardBus Resource							*/
 /************************************************************************/
 
+static void
+cbb_activate_window(device_t brdev, int type)
+{
+
+	PCI_ENABLE_IO(device_get_parent(brdev), brdev, type);
+}
+
 static int
 cbb_cardbus_io_open(device_t brdev, int win, uint32_t start, uint32_t end)
 {
@@ -1055,6 +1062,7 @@ cbb_cardbus_io_open(device_t brdev, int 
 
 	pci_write_config(brdev, basereg, start, 4);
 	pci_write_config(brdev, limitreg, end, 4);
+	cbb_activate_window(brdev, SYS_RES_IOPORT);
 	return (0);
 }
 
@@ -1075,6 +1083,7 @@ cbb_cardbus_mem_open(device_t brdev, int
 
 	pci_write_config(brdev, basereg, start, 4);
 	pci_write_config(brdev, limitreg, end, 4);
+	cbb_activate_window(brdev, SYS_RES_MEMORY);
 	return (0);
 }
 
@@ -1342,7 +1351,12 @@ cbb_pcic_activate_resource(device_t brde
     struct resource *res)
 {
 	struct cbb_softc *sc = device_get_softc(brdev);
-	return (exca_activate_resource(&sc->exca[0], child, type, rid, res));
+	int error;
+
+	error = exca_activate_resource(&sc->exca[0], child, type, rid, res);
+	if (error == 0)
+		cbb_activate_window(brdev, type);
+	return (error);
 }
 
 static int