On Saturday 16 May 2009 4:21:47 am Bruce Simpson wrote:
> John Baldwin wrote:
> > ...
> > Sounds like the ATA driver is allocating the same BAR twice. Hmm, yes, it
> > allocates the resources once for each channel it seems in the ata_ali_sata
> > attachment. Looking in ata-chipset.c, all the other chipsets are good
> > about
> > allocating these resources in their chipinit routines rather than the
> > per-channel allocate routine. Well, except ata_pci_allocate() is also
> > busted. *sigh* I can work on a patch for HEAD if you are willing to test.
> >
>
> Yes, ata is gnarly in places...
>
> If a fix can be dropped straight into a 7.2 tree, then that is even
> better... I could try testing a NanoBSD image of HEAD on this machine if
> the change set delta between branches is sufficiently huge to prevent
> backporting the fix; this is my desktop machine and this is the only
> critical bug I've run into so far with 7.2.
Try this fix for HEAD. I can do a 7.x patch as well, but it needs my other
fix for different ATA breakage merged as well (as it adds support for
chipset-specific data in the ATA controller backends). Note that in 7.x
all the chipset code lives in sys/dev/ata/ata-chipset.c. Also, I plan to
merge the other ATA fixes to 7 today.
--- //depot/vendor/freebsd/src/sys/dev/ata/chipsets/ata-acerlabs.c
2009/03/04 18:30:14
+++ //depot/user/jhb/acpipci/dev/ata/chipsets/ata-acerlabs.c 2009/05/18
16:08:13
@@ -63,6 +63,9 @@
#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 @@
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 @@
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 @@
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 ++) {
--
John Baldwin
_______________________________________________
freebsd-stable@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-stable
To unsubscribe, send any mail to "freebsd-stable-unsubscr...@freebsd.org"
