[src/netbsd-9]: src/sys/arch/x86/pci Pull up following revision(s) (requested...

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

details:   https://anonhg.NetBSD.org/src/rev/c00822b87574
branches:  netbsd-9
changeset: 984097:c00822b87574
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Jun 21 17:19:55 2021 +0000

description:
Pull up following revision(s) (requested by riastradh in ticket #1303):

        sys/arch/x86/pci/dwiic_pci.c: revision 1.5 (patch)

dwiic(4): Attribute output correctly and relegate to debug-level.

Tidy up a little while here.

diffstat:

 sys/arch/x86/pci/dwiic_pci.c |  30 +++++++++++++++++-------------
 1 files changed, 17 insertions(+), 13 deletions(-)

diffs (73 lines):

diff -r 24f7d40d5970 -r c00822b87574 sys/arch/x86/pci/dwiic_pci.c
--- a/sys/arch/x86/pci/dwiic_pci.c      Mon Jun 21 17:15:38 2021 +0000
+++ b/sys/arch/x86/pci/dwiic_pci.c      Mon Jun 21 17:19:55 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dwiic_pci.c,v 1.2 2018/09/26 19:06:33 jakllsch Exp $ */
+/* $NetBSD: dwiic_pci.c,v 1.2.4.1 2021/06/21 17:19:55 martin Exp $ */
 
 /*-
  * Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwiic_pci.c,v 1.2 2018/09/26 19:06:33 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwiic_pci.c,v 1.2.4.1 2021/06/21 17:19:55 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -68,9 +68,8 @@
 static uint32_t
 lpss_read(struct pci_dwiic_softc *sc, int offset)
 {
-       u_int32_t b = bus_space_read_4(sc->sc_dwiic.sc_iot, sc->sc_dwiic.sc_ioh,
-            offset);
-       return b;
+       return bus_space_read_4(sc->sc_dwiic.sc_iot, sc->sc_dwiic.sc_ioh,
+           offset);
 }
 
 static void
@@ -169,7 +168,7 @@
            pa->pa_bus, pa->pa_device, pa->pa_function);
 
        if (sc->sc_acpinode) {
-               sc->sc_dwiic.sc_iba.iba_child_devices = 
+               sc->sc_dwiic.sc_iba.iba_child_devices =
                    acpi_enter_i2c_devs(sc->sc_acpinode);
        } else {
                aprint_verbose_dev(self, "no matching ACPI node\n");
@@ -188,13 +187,18 @@
 static bool
 dwiic_pci_power(struct dwiic_softc *dwsc, bool power)
 {
-       struct pci_dwiic_softc *sc = (void *)dwsc;
-       pcireg_t pmreg;
+       struct pci_dwiic_softc *sc = container_of(dwsc, struct pci_dwiic_softc,
+           sc_dwiic);
+       pcireg_t pmreg, csr;
+       uint32_t reset, rlo, rhi;
 
-       printf("status 0x%x\n", pci_conf_read(sc->sc_pc, sc->sc_ptag, PCI_COMMAND_STATUS_REG));
-       printf("reset 0x%x\n", lpss_read(sc, LPSS_RESET));
-       printf("rlo 0x%x\n", lpss_read(sc, LPSS_REMAP_LO));
-       printf("rho 0x%x\n", lpss_read(sc, LPSS_REMAP_HI));
+       csr = pci_conf_read(sc->sc_pc, sc->sc_ptag, PCI_COMMAND_STATUS_REG);
+       reset = lpss_read(sc, LPSS_RESET);
+       rlo = lpss_read(sc, LPSS_REMAP_LO);
+       rhi = lpss_read(sc, LPSS_REMAP_HI);
+       aprint_debug_dev(dwsc->sc_dev,
+           "status 0x%x reset 0x%x rlo 0x%x rhi 0x%x\n",
+           csr, reset, rlo, rhi);
 
        if (!power)
                lpss_write(sc, LPSS_CLKGATE, LPSS_CLKGATE_CTRL_OFF);
@@ -205,7 +209,7 @@
                pci_conf_write(sc->sc_pc, sc->sc_ptag, pmreg + PCI_PMCSR,
                    power ? PCI_PMCSR_STATE_D0 : PCI_PMCSR_STATE_D3);
                DELAY(10000); /* 10 milliseconds */
-               DPRINTF((" -> 0x%x\n", 
+               DPRINTF((" -> 0x%x\n",
                    pci_conf_read(sc->sc_pc, sc->sc_ptag, pmreg + PCI_PMCSR)));
        }
        if (power) {