 @@ -1,14 +1,14 @@
-/*	$NetBSD: pci_subr.c,v 1.243 2023/08/10 20:02:56 andvar Exp $	*/
+/*	$NetBSD: pci_subr.c,v 1.244 2024/04/19 21:24:00 andvar 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.243 2023/08/10 20:02:56 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.244 2024/04/19 21:24:00 andvar 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>
 @@ -2549,30 +2549,30 @@ pci_conf_print_ea_cap_prop(unsigned int
+{
 	switch (prop) {
 	case PCI_EA_PROP_MEM_NONPREF:
 		printf("Memory Space, Non-Prefetchable\n");
 		break;
 	case PCI_EA_PROP_MEM_PREF:
 		printf("Memory Space, Prefetchable\n");
 		break;
 	case PCI_EA_PROP_IO:
 		printf("I/O Space\n");
 		break;
 	case PCI_EA_PROP_VF_MEM_NONPREF:
-		printf("Resorce for VF use, Memory Space, Non-Prefetchable\n");
+		printf("Resource for VF use, Memory Space, Non-Prefetchable\n");
 		break;
 	case PCI_EA_PROP_VF_MEM_PREF:
-		printf("Resorce for VF use, Memory Space, Prefetch\n");
+		printf("Resource for VF use, Memory Space, Prefetch\n");
 		break;
 	case PCI_EA_PROP_BB_MEM_NONPREF:
 		printf("Behind the Bridge, Memory Space, Non-Pref\n");
 		break;
 	case PCI_EA_PROP_BB_MEM_PREF:
 		printf("Behind the Bridge, Memory Space. Prefetchable\n");
 		break;
 	case PCI_EA_PROP_BB_IO:
 		printf("Behind Bridge, I/O Space\n");
 		break;
 	case PCI_EA_PROP_MEM_UNAVAIL:
 		printf("Memory Space Unavailable\n");
 		break;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pcireg.h,v 1.169 2024/02/02 22:19:13 andvar Exp $	*/
+/*	$NetBSD: pcireg.h,v 1.170 2024/04/19 21:24:00 andvar Exp $	*/
 /*
  * Copyright (c) 1995, 1996, 1999, 2000
  *     Christopher G. Demetriou.  All rights reserved.
  * Copyright (c) 1994, 1996 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
 @@ -1953,28 +1953,28 @@ struct pci_rom {
 #define  PCI_EA_BEI_VFBAR0	9	/* VF BAR0 */
 #define  PCI_EA_BEI_VFBAR1	10	/* VF BAR1 */
 #define  PCI_EA_BEI_VFBAR2	11	/* VF BAR2 */
 #define  PCI_EA_BEI_VFBAR3	12	/* VF BAR3 */
 #define  PCI_EA_BEI_VFBAR4	13	/* VF BAR4 */
 #define  PCI_EA_BEI_VFBAR5	14	/* VF BAR5 */
 #define  PCI_EA_BEI_RESERVED	15	/* Reserved (treat as Not Indicated) */
 #define PCI_EA_PP	__BITS(15, 8)	/* Primary Properties */
 #define PCI_EA_SP	__BITS(23, 16)	/* Secondary Properties */
 /* PP and SP's values */
 #define  PCI_EA_PROP_MEM_NONPREF	0x00	/* Memory Space, Non-Prefetchable */
 #define  PCI_EA_PROP_MEM_PREF		0x01	/* Memory Space, Prefetchable */
 #define  PCI_EA_PROP_IO			0x02	/* I/O Space */
-#define  PCI_EA_PROP_VF_MEM_NONPREF	0x03	/* Resorce for VF use. Mem. Non-Pref */
+#define  PCI_EA_PROP_VF_MEM_NONPREF	0x03	/* Resource for VF use. Mem. Non-Pref */
-#define  PCI_EA_PROP_VF_MEM_PREF	0x04	/* Resorce for VF use. Mem. Prefetch */
+#define  PCI_EA_PROP_VF_MEM_PREF	0x04	/* Resource for VF use. Mem. Prefetch */
 #define  PCI_EA_PROP_BB_MEM_NONPREF	0x05	/* Behind Bridge: MEM. Non-Pref */
 #define  PCI_EA_PROP_BB_MEM_PREF	0x06	/* Behind Bridge: MEM. Prefetch */
 #define  PCI_EA_PROP_BB_IO		0x07	/* Behind Bridge: I/O Space */
 #define  PCI_EA_PROP_MEM_UNAVAIL	0xfd	/* Memory Space Unavailable */
 #define  PCI_EA_PROP_IO_UNAVAIL		0xfe	/* IO Space Unavailable */
 #define  PCI_EA_PROP_UNAVAIL		0xff	/* Entry Unavailable for use */
 #define PCI_EA_W	__BIT(30)	/* Writable */
 #define PCI_EA_E	__BIT(31)	/* Enable for this entry */
 #define PCI_EA_LOWMASK	__BITS(31, 2)	/* Low register's mask */
 #define PCI_EA_BASEMAXOFFSET_S	__BIT(1)	/* Field Size */
 #define PCI_EA_BASEMAXOFFSET_64BIT __BIT(1)	/* 64bit */
 #define PCI_EA_BASEMAXOFFSET_32BIT 0		/* 32bit */