[src/netbsd-8]: src/sys/dev/pci Pull up the following revisions, via patch, r...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/04d81f5054eb
branches:  netbsd-8
changeset: 378305:04d81f5054eb
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Jul 29 10:54:05 2023 +0000

description:
Pull up the following revisions, via patch, requested by msaitoh in
ticket #1856:

        sys/dev/pci/ichsmb.c                            1.83-1.84

- Add support Intel 700 series chipset and Alder Lake-N devices.
- Use device_printf() instead of aprint_error_dev() in
  ichsmb_i2c_exec().

diffstat:

 sys/dev/pci/ichsmb.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (43 lines):

diff -r 436c0302d4c2 -r 04d81f5054eb sys/dev/pci/ichsmb.c
--- a/sys/dev/pci/ichsmb.c      Sat Jul 29 10:43:36 2023 +0000
+++ b/sys/dev/pci/ichsmb.c      Sat Jul 29 10:54:05 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ichsmb.c,v 1.50.6.6 2022/10/15 10:33:42 martin Exp $   */
+/*     $NetBSD: ichsmb.c,v 1.50.6.7 2023/07/29 10:54:05 martin Exp $   */
 /*     $OpenBSD: ichiic.c,v 1.44 2020/10/07 11:23:05 jsg Exp $ */
 
 /*
@@ -22,7 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.50.6.6 2022/10/15 10:33:42 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.50.6.7 2023/07/29 10:54:05 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -130,6 +130,7 @@ ichsmb_match(device_t parent, cfdata_t m
                case PCI_PRODUCT_INTEL_GLK_SMB:
                case PCI_PRODUCT_INTEL_EHL_SMB:
                case PCI_PRODUCT_INTEL_JSL_SMB:
+               case PCI_PRODUCT_INTEL_ADL_N_SMB:
                case PCI_PRODUCT_INTEL_C600_SMBUS:
                case PCI_PRODUCT_INTEL_C600_SMB_0:
                case PCI_PRODUCT_INTEL_C600_SMB_1:
@@ -147,6 +148,7 @@ ichsmb_match(device_t parent, cfdata_t m
                case PCI_PRODUCT_INTEL_5HS_LP_SMB:
                case PCI_PRODUCT_INTEL_6HS_H_SMB:
                case PCI_PRODUCT_INTEL_6HS_LP_SMB:
+               case PCI_PRODUCT_INTEL_7HS_SMB:
                        return 1;
                }
        }
@@ -398,7 +400,7 @@ timeout:
        st = bus_space_read_1(sc->sc_iot, sc->sc_ioh, LPCIB_SMB_HS);
        if ((st & LPCIB_SMB_HS_FAILED) == 0) {
                snprintb(fbuf, sizeof(fbuf), LPCIB_SMB_HS_BITS, st);
-               aprint_error_dev(sc->sc_dev, "abort failed, status %s\n",
+               device_printf(sc->sc_dev, "abort failed, status %s\n",
                    fbuf);
        }
        bus_space_write_1(sc->sc_iot, sc->sc_ioh, LPCIB_SMB_HS, st);