From f172bc2cf77e429c617ea3dd8aff428fe5e38333 Mon Sep 17 00:00:00 2001
From: purplerain <purplerain@secbsd.org>
Date: Mon, 29 Jul 2024 02:18:31 +0000
Subject: [PATCH] sync with OpenBSD -current

---
 sys/dev/pci/drm/amd/amdgpu/amdgpu_devlist.h | 13 +++++++++----
 sys/dev/pci/drm/amd/amdgpu/sdma_v4_0.c      |  2 +-
 sys/dev/pci/pcidevs                         |  4 +++-
 sys/dev/pci/pcidevs.h                       |  4 +++-
 sys/dev/pci/pcidevs_data.h                  | 10 +++++++++-
 usr.bin/env/env.c                           |  4 ++--
 usr.sbin/pwd_mkdb/pwd_mkdb.c                |  6 +++++-
 7 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_devlist.h b/sys/dev/pci/drm/amd/amdgpu/amdgpu_devlist.h
index f710dd397..d965c2153 100644
--- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_devlist.h
+++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_devlist.h
@@ -209,6 +209,7 @@ static const struct pci_matchid amdgpu_devices[] = {
 
 	/* GC 11.0.0, DCN 3.2.0, dGPU, "Navi 31" */
 	{0x1002, 0x7448 },	/* Radeon Pro W7900 */
+	{0x1002, 0x744a },	/* Radeon Pro W7900 Dual Slot */
 	{0x1002, 0x744c },	/* Radeon RX 7900 XT/XTX/GRE, 7900M */
 	{0x1002, 0x745e },	/* Radeon Pro W7800 */
 
@@ -234,9 +235,13 @@ static const struct pci_matchid amdgpu_devices[] = {
 	/* GC 11.0.4, DCN 3.1.4, APU, Ryzen 8040, "Hawk Point" */
 	{0x1002, 0x1901 },	/* Radeon 740M */
 
-	/* GC 11.5.0, DCN 3.5.0, APU, linux >= 6.7 */
-	/* GC 11.5.1, DCN 3.5.1, APU, linux >= 6.9 */
+#ifdef notyet
+	/* GC 11.5.0, DCN 3.5.0, APU, Ryzen AI 300, "Strix Point", linux 6.7 */
+	{0x1002, 0x150e },	/* Radeon 880M / 890M */
 
-	/* GC 12.0.0, DCN 4.0.1, dGPU, linux ?, amd-staging-drm-next */
-	/* GC 12.0.1, DCN 4.0.1, dGPU, linux ?, amd-staging-drm-next */
+	/* GC 11.5.1, DCN 3.5.1, APU, linux 6.9 */
+
+	/* GC 12.0.0, DCN 4.0.1, dGPU, linux 6.11 */
+	/* GC 12.0.1, DCN 4.0.1, dGPU, linux 6.11 */
+#endif
 };
diff --git a/sys/dev/pci/drm/amd/amdgpu/sdma_v4_0.c b/sys/dev/pci/drm/amd/amdgpu/sdma_v4_0.c
index b5d62cef5..a18d5595d 100644
--- a/sys/dev/pci/drm/amd/amdgpu/sdma_v4_0.c
+++ b/sys/dev/pci/drm/amd/amdgpu/sdma_v4_0.c
@@ -2027,7 +2027,7 @@ static int sdma_v4_0_process_trap_irq(struct amdgpu_device *adev,
 				      struct amdgpu_irq_src *source,
 				      struct amdgpu_iv_entry *entry)
 {
-	uint32_t instance;
+	int instance;
 
 	DRM_DEBUG("IH: SDMA trap\n");
 	instance = sdma_v4_0_irq_id_to_seq(entry->client_id);
diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index b65046226..44fc41bbf 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,4 @@
-$OpenBSD: pcidevs,v 1.2079 2024/07/02 22:28:02 kettenis Exp $
+$OpenBSD: pcidevs,v 1.2080 2024/07/29 01:17:53 jsg Exp $
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
 
 /*
@@ -1327,6 +1327,7 @@ product ATI CYAN_SKILLFISH_2	0x143f	Cyan Skillfish
 product ATI PPB_1		0x1478	PCIE
 product ATI PPB_2		0x1479	PCIE
 product ATI MENDOCINO		0x1506	Mendocino
+product ATI STRIX_POINT		0x150e	Strix Point
 product ATI PHOENIX_1		0x15bf	Phoenix
 product ATI PHOENIX_2		0x15c8	Phoenix
 product ATI PICASSO		0x15d8	Picasso
@@ -2149,6 +2150,7 @@ product ATI BEIGE_GOBY_4	0x7423	Navi 24
 product ATI BEIGE_GOBY_5	0x7424	Navi 24
 product ATI BEIGE_GOBY_6	0x743f	Navi 24
 product ATI NAVI31_2		0x7448	Navi 31
+product ATI NAVI31_4		0x744a	Navi 31
 product ATI NAVI31_1		0x744c	Navi 31
 product ATI NAVI31_3		0x745e	Navi 31
 product ATI NAVI32_1		0x7470	Navi 32
diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index 6c78fc1ef..7a4d65c35 100644
--- a/sys/dev/pci/pcidevs.h
+++ b/sys/dev/pci/pcidevs.h
@@ -2,7 +2,7 @@
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: pcidevs,v 1.2079 2024/07/02 22:28:02 kettenis Exp 
+ *	OpenBSD: pcidevs,v 1.2080 2024/07/29 01:17:53 jsg Exp 
  */
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
 
@@ -1332,6 +1332,7 @@
 #define	PCI_PRODUCT_ATI_PPB_1	0x1478		/* PCIE */
 #define	PCI_PRODUCT_ATI_PPB_2	0x1479		/* PCIE */
 #define	PCI_PRODUCT_ATI_MENDOCINO	0x1506		/* Mendocino */
+#define	PCI_PRODUCT_ATI_STRIX_POINT	0x150e		/* Strix Point */
 #define	PCI_PRODUCT_ATI_PHOENIX_1	0x15bf		/* Phoenix */
 #define	PCI_PRODUCT_ATI_PHOENIX_2	0x15c8		/* Phoenix */
 #define	PCI_PRODUCT_ATI_PICASSO	0x15d8		/* Picasso */
@@ -2154,6 +2155,7 @@
 #define	PCI_PRODUCT_ATI_BEIGE_GOBY_5	0x7424		/* Navi 24 */
 #define	PCI_PRODUCT_ATI_BEIGE_GOBY_6	0x743f		/* Navi 24 */
 #define	PCI_PRODUCT_ATI_NAVI31_2	0x7448		/* Navi 31 */
+#define	PCI_PRODUCT_ATI_NAVI31_4	0x744a		/* Navi 31 */
 #define	PCI_PRODUCT_ATI_NAVI31_1	0x744c		/* Navi 31 */
 #define	PCI_PRODUCT_ATI_NAVI31_3	0x745e		/* Navi 31 */
 #define	PCI_PRODUCT_ATI_NAVI32_1	0x7470		/* Navi 32 */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index fd3c8bc56..e587836f6 100644
--- a/sys/dev/pci/pcidevs_data.h
+++ b/sys/dev/pci/pcidevs_data.h
@@ -2,7 +2,7 @@
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: pcidevs,v 1.2079 2024/07/02 22:28:02 kettenis Exp 
+ *	OpenBSD: pcidevs,v 1.2080 2024/07/29 01:17:53 jsg Exp 
  */
 
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
@@ -3435,6 +3435,10 @@ static const struct pci_known_product pci_known_products[] = {
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MENDOCINO,
 	    "Mendocino",
 	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_STRIX_POINT,
+	    "Strix Point",
+	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_PHOENIX_1,
 	    "Phoenix",
@@ -6723,6 +6727,10 @@ static const struct pci_known_product pci_known_products[] = {
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_NAVI31_2,
 	    "Navi 31",
 	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_NAVI31_4,
+	    "Navi 31",
+	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_NAVI31_1,
 	    "Navi 31",
diff --git a/usr.bin/env/env.c b/usr.bin/env/env.c
index c1629759b..b70e28c77 100644
--- a/usr.bin/env/env.c
+++ b/usr.bin/env/env.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: env.c,v 1.18 2024/07/28 10:08:44 kn Exp $	*/
+/*	$OpenBSD: env.c,v 1.19 2024/07/28 21:44:42 kn Exp $	*/
 
 /*
  * Copyright (c) 1988, 1993, 1994
@@ -49,7 +49,7 @@ main(int argc, char *argv[])
 	if (pledge("stdio exec", NULL) == -1)
 		err(1, "pledge");
 
-	while ((ch = getopt(argc, argv, "-iu:")) != -1)
+	while ((ch = getopt(argc, argv, "iu:-")) != -1)
 		switch(ch) {
 		case '-':			/* obsolete */
 		case 'i':
diff --git a/usr.sbin/pwd_mkdb/pwd_mkdb.c b/usr.sbin/pwd_mkdb/pwd_mkdb.c
index 14a0187ed..30716fe1f 100644
--- a/usr.sbin/pwd_mkdb/pwd_mkdb.c
+++ b/usr.sbin/pwd_mkdb/pwd_mkdb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pwd_mkdb.c,v 1.61 2023/04/19 12:58:16 jsg Exp $	*/
+/*	$OpenBSD: pwd_mkdb.c,v 1.62 2024/07/28 19:13:26 millert Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993, 1994
@@ -608,6 +608,10 @@ db_store(FILE *fp, FILE *oldfp, DB *edp, DB *dp, struct passwd *pw,
 		p += sizeof(int);
 		data.size = p - buf;
 
+		/* getpwent() does not support entries > _PW_BUF_LEN. */
+		if (data.size > _PW_BUF_LEN)
+			fatalx("%s: entry too large", pw->pw_name);
+
 		/* Write the secure record. */
 		if ((edp->put)(edp, &key, &data, dbmode) == -1)
 			fatal("put");