 @@ -1,14 +1,14 @@
-/*	$NetBSD: pci_machdep_common.h,v 1.6 2011/04/04 20:37:55 dyoung Exp $	*/
+/*	$NetBSD: pci_machdep_common.h,v 1.7 2011/08/01 11:08:03 drochner Exp $	*/
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
  * Copyright (c) 1994 Charles M. Hannum.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -100,26 +100,30 @@ pcitag_t	pci_make_tag(pci_chipset_tag_t,
 void		pci_decompose_tag(pci_chipset_tag_t, pcitag_t,
 		    int *, int *, int *);
 pcireg_t	pci_conf_read(pci_chipset_tag_t, pcitag_t, int);
 void		pci_conf_write(pci_chipset_tag_t, pcitag_t, int,
 		    pcireg_t);
 int		pci_intr_map(const struct pci_attach_args *,
 		    pci_intr_handle_t *);
 const char	*pci_intr_string(pci_chipset_tag_t, pci_intr_handle_t);
 const struct evcnt *pci_intr_evcnt(pci_chipset_tag_t, pci_intr_handle_t);
 void		*pci_intr_establish(pci_chipset_tag_t, pci_intr_handle_t,
 		    int, int (*)(void *), void *);
 void		pci_intr_disestablish(pci_chipset_tag_t, void *);
 /* experimental MSI support */
 void *pci_msi_establish(struct pci_attach_args *, int, int (*)(void *), void *);
 void pci_msi_disestablish(void *);
 /*
  * ALL OF THE FOLLOWING ARE MACHINE-DEPENDENT, AND SHOULD NOT BE USED
  * BY PORTABLE CODE.
  */
 /* Extract Bus Number for a host bridge or -1 if unknown. */
 int		pchb_get_bus_number(pci_chipset_tag_t, pcitag_t);
 /*
  * Section 6.2.4, `Miscellaneous Functions' of the PCI Specification,
  * says that 255 means `unknown' or `no connection' to the interrupt
  * controller on a PC.
  */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pci_intr_machdep.c,v 1.19 2011/04/04 20:37:55 dyoung Exp $	*/
+/*	$NetBSD: pci_intr_machdep.c,v 1.20 2011/08/01 11:08:03 drochner Exp $	*/
 /*-
  * Copyright (c) 1997, 1998, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -63,35 +63,36 @@
 /*
  * Machine-specific functions for PCI autoconfiguration.
+ *
  * On PCs, there are two methods of generating PCI configuration cycles.
  * We try to detect the appropriate mechanism for this machine and set
  * up a few function pointers to access the correct method directly.
+ *
  * The configuration method can be hard-coded in the config file by
  * using `options PCI_CONF_MODE=N', where `N' is the configuration mode
  * as defined section 3.6.4.1, `Generating Configuration Cycles'.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_intr_machdep.c,v 1.19 2011/04/04 20:37:55 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_intr_machdep.c,v 1.20 2011/08/01 11:08:03 drochner Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/device.h>
 #include <sys/intr.h>
 #include <sys/malloc.h>
 #include <dev/pci/pcivar.h>
 #include "ioapic.h"
 #include "eisa.h"
 #include "acpica.h"
 #include "opt_mpbios.h"
 #include "opt_acpi.h"
 #if NIOAPIC > 0 || NACPICA > 0
 #include <machine/i82093var.h>
 #include <machine/mpconfig.h>
 #include <machine/mpbiosvar.h>
 @@ -315,13 +316,103 @@ pci_intr_disestablish(pci_chipset_tag_t
 		if ((pc->pc_present & PCI_OVERRIDE_INTR_ESTABLISH) != 0) {
 			(*pc->pc_ov->ov_intr_disestablish)(pc->pc_ctx,
 			    pc, cookie);
 			return;
+		}
 		if (pc->pc_super != NULL) {
 			pci_intr_disestablish(pc->pc_super, cookie);
 			return;
+		}
+	}
 	intr_disestablish(cookie);
+}
 #if NIOAPIC > 0
 /*
  * experimental support for MSI, does support a single vector,
  * no MSI-X, 8-bit APIC IDs
  * (while it doesn't need the ioapic technically, it borrows
  * from its kernel support)
  */
 /* dummies, needed by common intr_establish code */
 static void
 msipic_hwmask(struct pic *pic, int pin)
+{
+}
 static void
 msipic_addroute(struct pic *pic, struct cpu_info *ci,
 		int pin, int vec, int type)
+{
+}
 static struct pic msi_pic = {
 	.pic_name = "msi",
 	.pic_type = PIC_SOFT,
 	.pic_vecbase = 0,
 	.pic_apicid = 0,
 	.pic_lock = __SIMPLELOCK_UNLOCKED,
 	.pic_hwmask = msipic_hwmask,
 	.pic_hwunmask = msipic_hwmask,
 	.pic_addroute = msipic_addroute,
 	.pic_delroute = msipic_addroute,
 	.pic_edge_stubs = ioapic_edge_stubs,
 };
 struct msi_hdl {
 	struct intrhand *ih;
 	pci_chipset_tag_t pc;
 	pcitag_t tag;
 	int co;
 };
 void *
 pci_msi_establish(struct pci_attach_args *pa, int level,
 		  int (*func)(void *), void *arg)
+{
 	int co;
 	void *ih;
 	struct msi_hdl *msih;
 	struct cpu_info *ci;
 	struct intrsource *s;
 	u_int32_t cr;
 	if (!pci_get_capability(pa->pa_pc, pa->pa_tag, PCI_CAP_MSI, &co, 0))
 		return NULL;
 	ih = intr_establish(-1, &msi_pic, -1, IST_EDGE, level,
 			    func, arg, 0);
 	if (!ih)
 		return NULL;
 	msih = malloc(sizeof(*msih), M_DEVBUF, M_WAITOK);
 	msih->ih = ih;
 	msih->pc = pa->pa_pc;
 	msih->tag = pa->pa_tag;
 	msih->co = co;
 	ci = msih->ih->ih_cpu;
 	s = ci->ci_isources[msih->ih->ih_slot];
 	cr = pci_conf_read(pa->pa_pc, pa->pa_tag, co);
 	pci_conf_write(pa->pa_pc, pa->pa_tag, co + 4,
 xfee00000 | ci->ci_cpuid << 12);
 	if (cr & 0x800000) {
 		pci_conf_write(pa->pa_pc, pa->pa_tag, co + 8, 0);
 		pci_conf_write(pa->pa_pc, pa->pa_tag, co + 12,
 			       s->is_idtvec | 0x4000);
 	} else
 		pci_conf_write(pa->pa_pc, pa->pa_tag, co + 8,
 			       s->is_idtvec | 0x4000);
 	pci_conf_write(pa->pa_pc, pa->pa_tag, co, 0x10000);
 	return ih;
+}
 void
 pci_msi_disestablish(void *ih)
+{
 	struct msi_hdl *msih = ih;
 	pci_conf_write(msih->pc, msih->tag, msih->co, 0);
 	intr_disestablish(msih->ih);
+}
 #endif