Author: nwhitehorn
Date: Tue Jun 8 17:26:18 2010
New Revision: 208916
URL: http://svn.freebsd.org/changeset/base/208916
Log:
MFC r208168:
It is not necessary (and in some cases harmful) to hardcode ata_kauai's
IRQ to 39 on K2 devices, as well as Shasta ones.
Reported by: Andreas Tobler
Approved by: re (kib)
Modified:
stable/8/sys/powerpc/powermac/ata_kauai.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
stable/8/sys/geom/sched/ (props changed)
Modified: stable/8/sys/powerpc/powermac/ata_kauai.c
==============================================================================
--- stable/8/sys/powerpc/powermac/ata_kauai.c Tue Jun 8 17:08:13 2010
(r208915)
+++ stable/8/sys/powerpc/powermac/ata_kauai.c Tue Jun 8 17:26:18 2010
(r208916)
@@ -220,8 +220,9 @@ ata_kauai_probe(device_t dev)
if (compatstring != NULL && strcmp(compatstring,"shasta-ata") == 0)
sc->shasta = 1;
- /* Regular Kauai controllers apparently need this hack */
- if (!sc->shasta)
+ /* Pre-K2 controllers apparently need this hack */
+ if (!sc->shasta &&
+ (compatstring == NULL || strcmp(compatstring, "K2-UATA") != 0))
bus_set_resource(dev, SYS_RES_IRQ, 0, 39, 1);
rid = PCIR_BARS;
_______________________________________________
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"
