Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 6 Jun 2011 13:21:11 +0000 (UTC)
From:      John Baldwin <jhb@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r222753 - in head/sys/dev: cardbus pci
Message-ID:  <201106061321.p56DLBWn032781@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: jhb
Date: Mon Jun  6 13:21:11 2011
New Revision: 222753
URL: http://svn.freebsd.org/changeset/base/222753

Log:
  More properly handle Cardbus cards that that store their CIS in a BAR after
  the recent changes to track BAR state explicitly.  The code would now
  attempt to add the same BAR twice in this case.  Instead, change this so
  that it recognizes this case and only adds it once and do not delete the
  BAR outright after parsing the CIS.
  
  Tested by:	bschmidt

Modified:
  head/sys/dev/cardbus/cardbus_cis.c
  head/sys/dev/pci/pci.c

Modified: head/sys/dev/cardbus/cardbus_cis.c
==============================================================================
--- head/sys/dev/cardbus/cardbus_cis.c	Mon Jun  6 13:18:29 2011	(r222752)
+++ head/sys/dev/cardbus/cardbus_cis.c	Mon Jun  6 13:21:11 2011	(r222753)
@@ -324,7 +324,7 @@ decode_tuple_bar(device_t cbdev, device_
 		 * hint when the cardbus bridge is a child of pci0 (the main
 		 * bus).  The PC Card spec seems to indicate that this should
 		 * only be done on x86 based machines, which suggests that on
-		 * non-x86 machines the adddresses can be anywhere.  Since the
+		 * non-x86 machines the addresses can be anywhere.  Since the
 		 * hardware can do it on non-x86 machines, it should be able
 		 * to do it on x86 machines too.  Therefore, we can and should
 		 * ignore this hint.  Furthermore, the PC Card spec recommends
@@ -430,7 +430,6 @@ cardbus_read_tuple_finish(device_t cbdev
 {
 	if (res != CIS_CONFIG_SPACE) {
 		bus_release_resource(child, SYS_RES_MEMORY, rid, res);
-		bus_delete_resource(child, SYS_RES_MEMORY, rid);
 	}
 }
 
@@ -467,7 +466,7 @@ cardbus_read_tuple_init(device_t cbdev, 
 	}
 
 	/* allocate the memory space to read CIS */
-	res = bus_alloc_resource(child, SYS_RES_MEMORY, rid, 0, ~0, 1,
+	res = bus_alloc_resource_any(child, SYS_RES_MEMORY, rid,
 	    rman_make_alignment_flags(4096) | RF_ACTIVE);
 	if (res == NULL) {
 		device_printf(cbdev, "Unable to allocate resource "

Modified: head/sys/dev/pci/pci.c
==============================================================================
--- head/sys/dev/pci/pci.c	Mon Jun  6 13:18:29 2011	(r222752)
+++ head/sys/dev/pci/pci.c	Mon Jun  6 13:21:11 2011	(r222753)
@@ -2576,6 +2576,17 @@ pci_add_map(device_t bus, device_t dev, 
 	uint16_t cmd;
 	struct resource *res;
 
+	/*
+	 * The BAR may already exist if the device is a CardBus card
+	 * whose CIS is stored in this BAR.
+	 */
+	pm = pci_find_bar(dev, reg);
+	if (pm != NULL) {
+		maprange = pci_maprange(pm->pm_value);
+		barlen = maprange == 64 ? 2 : 1;
+		return (barlen);
+	}
+
 	pci_read_bar(dev, reg, &map, &testval);
 	if (PCI_BAR_MEM(map)) {
 		type = SYS_RES_MEMORY;

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201106061321.p56DLBWn032781>