 @@ -1,14 +1,14 @@
-/*	$NetBSD: pci_subr.c,v 1.224 2020/05/30 10:43:46 jdolecek Exp $	*/
+/*	$NetBSD: pci_subr.c,v 1.225 2021/01/27 05:00:15 thorpej Exp $	*/
 /*
  * Copyright (c) 1997 Zubin D. Dittia.  All rights reserved.
  * Copyright (c) 1995, 1996, 1998, 2000
  *	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
 @@ -30,27 +30,27 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * PCI autoconfiguration support functions.
+ *
  * Note: This file is also built into a userland library (libpci).
  * Pay attention to this when you make modifications.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.224 2020/05/30 10:43:46 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.225 2021/01/27 05:00:15 thorpej Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_pci.h"
 #endif
 #include <sys/param.h>
 #ifdef _KERNEL
 #include <sys/systm.h>
 #include <sys/intr.h>
 #include <sys/module.h>
 #include <sys/kmem.h>
 @@ -74,26 +74,70 @@ __KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v
 #ifdef _KERNEL
 #include <dev/pci/pcivar.h>
 #else
 #include <dev/pci/pci_verbose.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/pcidevs_data.h>
 #endif
 static int pci_conf_find_cap(const pcireg_t *, unsigned int, int *);
 static int pci_conf_find_extcap(const pcireg_t *, unsigned int, int *);
 static void pci_conf_print_pcie_power(uint8_t, unsigned int);
 #define PCIREG_SHIFTOUT(a, b) ((pcireg_t)__SHIFTOUT((a), (b)))
 #ifdef _KERNEL
 /*
  * Common routines used to match a compatible device by its PCI ID code.
  */
 const struct device_compatible_entry *
 pci_compatible_lookup_id(pcireg_t const id,
     const struct device_compatible_entry *dce)
+{
 	return device_compatible_lookup_id(id, PCI_COMPAT_EOL_VALUE, dce);
+}
 const struct device_compatible_entry *
 pci_compatible_lookup(const struct pci_attach_args * const pa,
     const struct device_compatible_entry * const dce)
+{
 	return pci_compatible_lookup_id(pa->pa_id, dce);
+}
 const struct device_compatible_entry *
 pci_compatible_lookup_subsys(const struct pci_attach_args * const pa,
     const struct device_compatible_entry * const dce)
+{
 	const pcireg_t subsysid =
 	    pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_SUBSYS_ID_REG);
 	return pci_compatible_lookup_id(subsysid, dce);
+}
 int
 pci_compatible_match(const struct pci_attach_args * const pa,
     const struct device_compatible_entry * const dce)
+{
 	return pci_compatible_lookup(pa, dce) != NULL;
+}
 int
 pci_compatible_match_subsys(const struct pci_attach_args * const pa,
     const struct device_compatible_entry * const dce)
+{
 	return pci_compatible_lookup_subsys(pa, dce) != NULL;
+}
 #endif /* _KERNEL */
 /*
  * Descriptions of known PCI classes and subclasses.
+ *
  * Subclasses are described in the same way as classes, but have a
  * NULL subclass pointer.
  */
 struct pci_class {
 	const char	*name;
 	u_int		val;		/* as wide as pci_{,sub}class_t */
 	const struct pci_class *subclasses;
 };
 /*

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pcivar.h,v 1.113 2018/12/01 01:23:24 msaitoh Exp $	*/
+/*	$NetBSD: pcivar.h,v 1.114 2021/01/27 05:00:16 thorpej Exp $	*/
 /*
  * Copyright (c) 1996, 1997 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.
 @@ -288,43 +288,59 @@ int pcibusprint(void *, const char *);
  * e.g. make_tag, conf_read, conf_write are declared by pci_machdep.h.)
  */
 int	pci_mapreg_probe(pci_chipset_tag_t, pcitag_t, int, pcireg_t *);
 pcireg_t pci_mapreg_type(pci_chipset_tag_t, pcitag_t, int);
 int	pci_mapreg_info(pci_chipset_tag_t, pcitag_t, int, pcireg_t,
 	    bus_addr_t *, bus_size_t *, int *);
 int	pci_mapreg_map(const struct pci_attach_args *, int, pcireg_t, int,
 	    bus_space_tag_t *, bus_space_handle_t *, bus_addr_t *,
 	    bus_size_t *);
 int	pci_mapreg_submap(const struct pci_attach_args *, int, pcireg_t, int,
 	    bus_size_t, bus_size_t, bus_space_tag_t *, bus_space_handle_t *,
 	    bus_addr_t *, bus_size_t *);
 int pci_find_rom(const struct pci_attach_args *, bus_space_tag_t,
 	    bus_space_handle_t, bus_size_t,
 	    int, bus_space_handle_t *, bus_size_t *);
 int	pci_get_capability(pci_chipset_tag_t, pcitag_t, int, int *, pcireg_t *);
 int	pci_get_ht_capability(pci_chipset_tag_t, pcitag_t, int, int *,
 	    pcireg_t *);
 int	pci_get_ext_capability(pci_chipset_tag_t, pcitag_t, int, int *,
 	    pcireg_t *);
 int	pci_msi_count(pci_chipset_tag_t, pcitag_t);
 int	pci_msix_count(pci_chipset_tag_t, pcitag_t);
 /*
  * Helper functions for autoconfiguration.
  */
 #define	PCI_COMPAT_EOL_VALUE	(0xffffffffU)
 #define	PCI_COMPAT_EOL		{ .id = PCI_COMPAT_EOL_VALUE }
 const struct device_compatible_entry *
 	pci_compatible_lookup_id(pcireg_t,
 	    const struct device_compatible_entry *);
 const struct device_compatible_entry *
 	pci_compatible_lookup(const struct pci_attach_args *,
 	    const struct device_compatible_entry *);
 int	pci_compatible_match(const struct pci_attach_args *,
 	    const struct device_compatible_entry *);
 const struct device_compatible_entry *
 	pci_compatible_lookup_subsys(const struct pci_attach_args *,
 	    const struct device_compatible_entry *);
 int	pci_compatible_match_subsys(const struct pci_attach_args *,
 	    const struct device_compatible_entry *);
 #ifndef PCI_MACHDEP_ENUMERATE_BUS
 int	pci_enumerate_bus(struct pci_softc *, const int *,
 	    int (*)(const struct pci_attach_args *), struct pci_attach_args *);
 #endif
 int	pci_probe_device(struct pci_softc *, pcitag_t tag,
 	    int (*)(const struct pci_attach_args *),
 	    struct pci_attach_args *);
 void	pci_devinfo(pcireg_t, pcireg_t, int, char *, size_t);
 void	pci_aprint_devinfo_fancy(const struct pci_attach_args *,
 				 const char *, const char *, int);
 #define pci_aprint_devinfo(pap, naive) \
 	pci_aprint_devinfo_fancy(pap, naive, NULL, 0);
 void	pci_conf_print(pci_chipset_tag_t, pcitag_t,