Hi Simon, On Mon, Oct 21, 2019 at 11:40 AM Simon Glass <s...@chromium.org> wrote: > > Intel x86 SoCs have a power manager/controller which handles several > power-related aspects of the platform. Add a uclass for this, with a few > useful operations. > > Signed-off-by: Simon Glass <s...@chromium.org> > --- > > Changes in v3: > - Rename power-mgr uclass to acpi-pmc > > Changes in v2: None > > drivers/power/Kconfig | 2 + > drivers/power/acpi_pmc/Kconfig | 25 +++ > drivers/power/acpi_pmc/Makefile | 5 + > drivers/power/acpi_pmc/acpi-pmc-uclass.c | 191 +++++++++++++++++++++++ > include/dm/uclass-id.h | 1 + > include/power/acpi_pmc.h | 185 ++++++++++++++++++++++ > 6 files changed, 409 insertions(+) > create mode 100644 drivers/power/acpi_pmc/Kconfig > create mode 100644 drivers/power/acpi_pmc/Makefile > create mode 100644 drivers/power/acpi_pmc/acpi-pmc-uclass.c > create mode 100644 include/power/acpi_pmc.h > > diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig > index 9495dca33b9..4b4f6d55568 100644 > --- a/drivers/power/Kconfig > +++ b/drivers/power/Kconfig > @@ -4,6 +4,8 @@ source "drivers/power/domain/Kconfig" > > source "drivers/power/pmic/Kconfig" > > +source "drivers/power/acpi_pmc/Kconfig" > + > source "drivers/power/regulator/Kconfig" > > choice > diff --git a/drivers/power/acpi_pmc/Kconfig b/drivers/power/acpi_pmc/Kconfig > new file mode 100644 > index 00000000000..472a61a9fd1 > --- /dev/null > +++ b/drivers/power/acpi_pmc/Kconfig > @@ -0,0 +1,25 @@ > +config ACPI_PMC > + bool "Power Manager (x86 PMC) support" > + help > + Enable support for an x86-style power-management controller which > + provides features including checking whether the system started from > + resume, powering off the system and enabling/disabling the reset > + mechanism. > + > +config SPL_ACPI_PMC > + bool "Power Manager (x86 PMC) support in SPL" > + default y if ACPI_PMC > + help > + Enable support for an x86-style power-management controller which > + provides features including checking whether the system started from > + resume, powering off the system and enabling/disabling the reset > + mechanism. > + > +config TPL_ACPI_PMC > + bool "Power Manager (x86 PMC) support in TPL" > + default y if ACPI_PMC > + help > + Enable support for an x86-style power-management controller which > + provides features including checking whether the system started from > + resume, powering off the system and enabling/disabling the reset > + mechanism. > diff --git a/drivers/power/acpi_pmc/Makefile b/drivers/power/acpi_pmc/Makefile > new file mode 100644 > index 00000000000..7c1ba05c9f3 > --- /dev/null > +++ b/drivers/power/acpi_pmc/Makefile > @@ -0,0 +1,5 @@ > +# SPDX-License-Identifier: GPL-2.0+ > +# > +# Copyright 2019 Google LLC > + > +obj-$(CONFIG_$(SPL_TPL_)ACPI_PMC) += acpi-pmc-uclass.o > diff --git a/drivers/power/acpi_pmc/acpi-pmc-uclass.c > b/drivers/power/acpi_pmc/acpi-pmc-uclass.c > new file mode 100644 > index 00000000000..8800afecf10 > --- /dev/null > +++ b/drivers/power/acpi_pmc/acpi-pmc-uclass.c > @@ -0,0 +1,191 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Copyright 2019 Google LLC > + */ > + > +#define LOG_CATEGORY UCLASS_ACPI_PMC > + > +#include <common.h> > +#include <acpi_s3.h> > +#include <dm.h> > +#include <log.h> > +#include <asm/io.h> > +#ifdef CONFIG_CREATE_ARCH_SYMLINK > +#include <asm/arch/gpio.h> > +#endif > +#include <power/acpi_pmc.h> > + > +enum { > + PM1_STS = 0x00, > + PM1_EN = 0x02, > + PM1_CNT = 0x04, > + > + GPE0_STS = 0x20, > + GPE0_EN = 0x30, > +}; > + > +struct tco_regs { > + u32 tco_rld; > + u32 tco_sts; > + u32 tco1_cnt; > + u32 tco_tmr; > +}; > + > +enum { > + TCO_STS_TIMEOUT = 1 << 3, > + TCO_STS_SECOND_TO_STS = 1 << 17, > + TCO1_CNT_HLT = 1 << 11, > +}; > + > +static void pmc_fill_pm_reg_info(struct udevice *dev) > +{ > + struct acpi_pmc_upriv *upriv = dev_get_uclass_priv(dev); > + int i; > + > + upriv->pm1_sts = inw(upriv->acpi_base + PM1_STS); > + upriv->pm1_en = inw(upriv->acpi_base + PM1_EN); > + upriv->pm1_cnt = inw(upriv->acpi_base + PM1_CNT); > + > + log_debug("pm1_sts: %04x pm1_en: %04x pm1_cnt: %08x\n", > + upriv->pm1_sts, upriv->pm1_en, upriv->pm1_cnt); > + > + for (i = 0; i < GPE0_REG_MAX; i++) { > + upriv->gpe0_sts[i] = inl(upriv->acpi_base + GPE0_STS + i * 4); > + upriv->gpe0_en[i] = inl(upriv->acpi_base + GPE0_EN + i * 4); > + log_debug("gpe0_sts[%d]: %08x gpe0_en[%d]: %08x\n", i, > + upriv->gpe0_sts[i], i, upriv->gpe0_en[i]); > + } > +} > + > +int pmc_disable_tco_base(ulong tco_base) > +{ > + struct tco_regs *regs = (struct tco_regs *)tco_base; > + > + debug("tco_base %lx = %x\n", (ulong)®s->tco1_cnt, TCO1_CNT_HLT); > + setio_32(®s->tco1_cnt, TCO1_CNT_HLT); > + > + return 0; > +} > + > +int pmc_init(struct udevice *dev) > +{ > + const struct acpi_pmc_ops *ops = acpi_pmc_get_ops(dev); > + int ret; > + > + pmc_fill_pm_reg_info(dev); > + if (!ops->init) > + return -ENOSYS; > + > + ret = ops->init(dev); > + if (ret) > + return log_msg_ret("Failed to init pmc", ret); > + > +#ifdef DEBUG > + pmc_dump_info(dev); > +#endif > + > + return 0; > +}
I wonder shouldn't this be covered by the probe() method? > + > +int pmc_prev_sleep_state(struct udevice *dev) > +{ > + struct acpi_pmc_upriv *upriv = dev_get_uclass_priv(dev); > + const struct acpi_pmc_ops *ops = acpi_pmc_get_ops(dev); > + int prev_sleep_state = ACPI_S0; /* Default to S0 */ > + > + if (upriv->pm1_sts & WAK_STS) { > + switch (acpi_sleep_from_pm1(upriv->pm1_cnt)) { > + case ACPI_S3: > + if (IS_ENABLED(HAVE_ACPI_RESUME)) > + prev_sleep_state = ACPI_S3; > + break; > + case ACPI_S5: > + prev_sleep_state = ACPI_S5; > + break; > + default: > + break; > + } > + > + /* Clear SLP_TYP */ > + outl(upriv->pm1_cnt & ~SLP_TYP, upriv->acpi_base + PM1_CNT); > + } > + > + if (!ops->prev_sleep_state) > + return prev_sleep_state; > + > + return ops->prev_sleep_state(dev, prev_sleep_state); > +} > + [snip] Regards, Bin _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot