Author: jhb
Date: Wed Jun 10 13:56:42 2009
New Revision: 193918
URL: http://svn.freebsd.org/changeset/base/193918

Log:
  Preallocate the four BARs in ALI SATA controllers during the chipinit
  routine and save the resources using a chipset-data structure.  Use these
  preallocated resources to setup resources for the SATA channels to avoid
  asking the PCI bus to allocate the same BAR multiple times.
  
  Tested by:    bms
  MFC after:    1 week

Modified:
  head/sys/dev/ata/chipsets/ata-acerlabs.c

Modified: head/sys/dev/ata/chipsets/ata-acerlabs.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-acerlabs.c    Wed Jun 10 13:48:43 2009        
(r193917)
+++ head/sys/dev/ata/chipsets/ata-acerlabs.c    Wed Jun 10 13:56:42 2009        
(r193918)
@@ -63,6 +63,9 @@ static void ata_ali_setmode(device_t dev
 #define ALI_NEW                0x02
 #define ALI_SATA       0x04
 
+struct ali_sata_resources {
+       struct resource *bars[4];
+};
 
 /*
  * Acer Labs Inc (ALI) chipset support functions
@@ -98,6 +101,8 @@ static int
 ata_ali_chipinit(device_t dev)
 {
     struct ata_pci_controller *ctlr = device_get_softc(dev);
+    struct ali_sata_resources *res;
+    int i, rid;
 
     if (ata_setup_interrupt(dev, ata_generic_intr))
        return ENXIO;
@@ -113,6 +118,22 @@ ata_ali_chipinit(device_t dev)
        if ((ctlr->chip->chipid == ATA_ALI_5288) &&
            (ata_ahci_chipinit(dev) != ENXIO))
             return 0;
+
+       /* Allocate resources for later use by channel attach routines. */
+       res = malloc(sizeof(struct ali_sata_resources), M_TEMP, M_WAITOK);
+       for (i = 0; i < 4; i++) {
+               rid = PCIR_BAR(i);
+               res->bars[i] = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid,
+                   RF_ACTIVE);
+               if (res->bars[i] == NULL) {
+                       device_printf(dev, "Failed to allocate BAR %d\n", i);
+                       for (i--; i >=0; i--)
+                               bus_release_resource(dev, SYS_RES_IOPORT,
+                                   PCIR_BAR(i), res->bars[i]);
+                       free(res, M_TEMP);
+               }
+       }
+       ctlr->chipset_data = res;
        break;
 
     case ALI_NEW:
@@ -168,20 +189,18 @@ ata_ali_sata_ch_attach(device_t dev)
     device_t parent = device_get_parent(dev);
     struct ata_pci_controller *ctlr = device_get_softc(parent);
     struct ata_channel *ch = device_get_softc(dev);
+    struct ali_sata_resources *res;
     struct resource *io = NULL, *ctlio = NULL;
     int unit01 = (ch->unit & 1), unit10 = (ch->unit & 2);
-    int i, rid;
-               
-    rid = PCIR_BAR(0) + (unit01 ? 8 : 0);
-    io = bus_alloc_resource_any(parent, SYS_RES_IOPORT, &rid, RF_ACTIVE);
-    if (!io)
-       return ENXIO;
+    int i;
 
-    rid = PCIR_BAR(1) + (unit01 ? 8 : 0);
-    ctlio = bus_alloc_resource_any(parent, SYS_RES_IOPORT, &rid, RF_ACTIVE);
-    if (!ctlio) {
-       bus_release_resource(dev, SYS_RES_IOPORT, ATA_IOADDR_RID, io);
-       return ENXIO;
+    res = ctlr->chipset_data;
+    if (unit01) {
+           io = res->bars[2];
+           ctlio = res->bars[3];
+    } else {
+           io = res->bars[0];
+           ctlio = res->bars[1];
     }
                
     for (i = ATA_DATA; i <= ATA_COMMAND; i ++) {
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to