summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2007-10-22 23:55:59 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2007-10-22 23:55:59 +0000
commitd649604def052ef75a1d96ef30b9b3fe6d5fba48 (patch)
tree7df778d60fa9f295d26e4258b1b01ec9b9f82412 /sys
parentc09265ae199ebf1e4d7ef8d3ab846478d7a093e1 (diff)
let alipm0 still be used for spdmem probes, but skip sensors. alipm (or
more likely psycho) still has a bug where the pci bus croaks on the intermittent i2c accesses. the spdmem accesses are safe, though. if you wish to help us find out when this bug gets fixed, please run your machine WITHOUT this diff, though. ok kettenis jsg
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/sparc64/dev/ofwi2c.c16
1 files changed, 15 insertions, 1 deletions
diff --git a/sys/arch/sparc64/dev/ofwi2c.c b/sys/arch/sparc64/dev/ofwi2c.c
index 7fa2ef6fbc2..4bffc20c3f8 100644
--- a/sys/arch/sparc64/dev/ofwi2c.c
+++ b/sys/arch/sparc64/dev/ofwi2c.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ofwi2c.c,v 1.7 2007/10/15 18:43:28 kettenis Exp $ */
+/* $OpenBSD: ofwi2c.c,v 1.8 2007/10/22 23:55:58 deraadt Exp $ */
/*
* Copyright (c) 2006 Theo de Raadt
@@ -95,6 +95,20 @@ ofwiic_scan(struct device *self, struct i2cbus_attach_args *iba, void *aux)
continue;
}
+ /*
+ * XXX alipm crashes on some machines for an unknown, skip
+ * reason when doing the periodic i2c accesses things like
+ * sensors need. However, devices accessed only at boot
+ * are fine.
+ */
+ if (strcmp(self->dv_parent->dv_xname, "alipm0") == 0 &&
+ (ia.ia_addr < 0x50 || ia.ia_addr > 0x57)) {
+ iic_print(&ia, self->dv_parent->dv_xname);
+ printf(" skipped due to %s bugs\n",
+ self->dv_parent->dv_xname);
+ continue;
+ }
+
config_found(self, &ia, iic_print);
}
}