From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC781C433EF for ; Fri, 10 Jun 2022 12:17:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348632AbiFJMRA (ORCPT ); Fri, 10 Jun 2022 08:17:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55320 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345267AbiFJMQ7 (ORCPT ); Fri, 10 Jun 2022 08:16:59 -0400 Received: from mail-lj1-x236.google.com (mail-lj1-x236.google.com [IPv6:2a00:1450:4864:20::236]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B4934248577 for ; Fri, 10 Jun 2022 05:16:55 -0700 (PDT) Received: by mail-lj1-x236.google.com with SMTP id y15so23974141ljc.0 for ; Fri, 10 Jun 2022 05:16:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=gx0HoGasRN7LdR7eXYM/bWw5laTDgx21Bj10QU7IgZA=; b=PnkYuuTonTwBAgjp/oKukv2FRIPd9je9Ttx3Q7yPHEpSoRKF9u97bHZ5iZ6/9JNTFS rhA5sF0dx/LtqGpSihcCe5Vsf6yVNhWEm3yCE2Uc23JvAxaaelk/CWNhazNI/abNqL5Q PABNTspLYCIwWOsW8fRrQUBWWG+XSnXU9YGS1QdDHhewm+5321VV+AVLpJ77ALXkJJzn a7PxBnMdO7CtNWeROr5ayi4wtni+E2aA82zhcSJ752cDBFC2JaBTnRiTCa99ph0NtaTe q4A1pWQNZCtjoPzO2v4xzEAh/BW094vPipo8w/R+PYFayhNprB/QBOhb9EPotq478h0V kUUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=gx0HoGasRN7LdR7eXYM/bWw5laTDgx21Bj10QU7IgZA=; b=z4lf+S0KkzydZSkD3AG/Egr08a5Vg5vjwY5hhY/sjksp0BxBR1/I8EH0XWNhjd6hK3 tiqI+6hNY5FPVq06f++ol8Ef8sSBTFrTLtYpPLGMTa3oCQaa4GQVigftNSfBONmHcmx4 aoek8oGziZ/Mqztt7YOg9WY0hbbU3zLXT/frtFXZjTERK/dViyAt6IuZTDhdtJyWD+p1 jlAdmPzC+k4n7xyuI/jwOWfk9v7TZMk5AGlN7Tj7yH9VhLOzrUMxyqrlO7BCwF+cLs1T mM8o+xPSWuJMcWNjNPX2gzHYQ4wtlJ/OsLH7Z2qMdP5oxoENjc1qflpXzjLTCqmNzeSQ /P6w== X-Gm-Message-State: AOAM533gcHR6qFJiA7GD7J45cbqy+AXboM05YMXqmZ2gY2bjN3UJ4d3F BEPRXtItI+jm9RbeaDlLskU8KPHpWjuK7nDtG51YLQ== X-Google-Smtp-Source: ABdhPJzVguDPZ+MKhgnbfJ241zsjVT6vsWAAftLPmBKsL1BbPVGEvC63gkUEhpJLAgXajRky7w54C+QoCvQsvmQNKRc= X-Received: by 2002:a2e:818c:0:b0:255:a6c5:4304 with SMTP id e12-20020a2e818c000000b00255a6c54304mr10731225ljg.367.1654863413929; Fri, 10 Jun 2022 05:16:53 -0700 (PDT) MIME-Version: 1.0 References: <1843211.tdWV9SEqCh@kreacher> <2159220.NgBsaNRSFp@kreacher> In-Reply-To: <2159220.NgBsaNRSFp@kreacher> From: Ulf Hansson Date: Fri, 10 Jun 2022 14:16:17 +0200 Message-ID: Subject: Re: [PATCH v1 15/16] ACPI / MMC: PM: Unify fixing up device power To: "Rafael J. Wysocki" Cc: Linux ACPI , LKML , Linux PM , Andy Shevchenko , Mika Westerberg , Hans de Goede , Sakari Ailus , Adrian Hunter , linux-mmc@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org On Thu, 9 Jun 2022 at 16:20, Rafael J. Wysocki wrote: > > From: Rafael J. Wysocki > > Introduce acpi_device_fix_up_power_extended() for fixing up power of > a device having an ACPI companion in a manner that takes the device's > children into account and make the MMC code use it in two places > instead of walking the list of the device ACPI companion's children > directly. > > This will help to eliminate the children list head from struct > acpi_device as it is redundant and it is used in questionable ways > in some places (in particular, locking is needed for walking the > list pointed to it safely, but it is often missing). > > Signed-off-by: Rafael J. Wysocki Rafael, feel free to pick this via your tree. Acked-by: Ulf Hansson Kind regards Uffe > --- > drivers/acpi/device_pm.c | 22 ++++++++++++++++++++++ > drivers/mmc/host/sdhci-acpi.c | 7 ++----- > drivers/mmc/host/sdhci-pci-core.c | 11 +++-------- > include/acpi/acpi_bus.h | 1 + > 4 files changed, 28 insertions(+), 13 deletions(-) > > Index: linux-pm/drivers/mmc/host/sdhci-acpi.c > =================================================================== > --- linux-pm.orig/drivers/mmc/host/sdhci-acpi.c > +++ linux-pm/drivers/mmc/host/sdhci-acpi.c > @@ -775,8 +775,8 @@ static int sdhci_acpi_probe(struct platf > { > struct device *dev = &pdev->dev; > const struct sdhci_acpi_slot *slot; > - struct acpi_device *device, *child; > const struct dmi_system_id *id; > + struct acpi_device *device; > struct sdhci_acpi_host *c; > struct sdhci_host *host; > struct resource *iomem; > @@ -796,10 +796,7 @@ static int sdhci_acpi_probe(struct platf > slot = sdhci_acpi_get_slot(device); > > /* Power on the SDHCI controller and its children */ > - acpi_device_fix_up_power(device); > - list_for_each_entry(child, &device->children, node) > - if (child->status.present && child->status.enabled) > - acpi_device_fix_up_power(child); > + acpi_device_fix_up_power_extended(device); > > if (sdhci_acpi_byt_defer(dev)) > return -EPROBE_DEFER; > Index: linux-pm/drivers/acpi/device_pm.c > =================================================================== > --- linux-pm.orig/drivers/acpi/device_pm.c > +++ linux-pm/drivers/acpi/device_pm.c > @@ -369,6 +369,28 @@ int acpi_device_fix_up_power(struct acpi > } > EXPORT_SYMBOL_GPL(acpi_device_fix_up_power); > > +static int fix_up_power_if_applicable(struct acpi_device *adev, void *not_used) > +{ > + if (adev->status.present && adev->status.enabled) > + acpi_device_fix_up_power(adev); > + > + return 0; > +} > + > +/** > + * acpi_device_fix_up_power_extended - Force device and its children into D0. > + * @adev: Parent device object whose power state is to be fixed up. > + * > + * Call acpi_device_fix_up_power() for @adev and its children so long as they > + * are reported as present and enabled. > + */ > +void acpi_device_fix_up_power_extended(struct acpi_device *adev) > +{ > + acpi_device_fix_up_power(adev); > + acpi_dev_for_each_child(adev, fix_up_power_if_applicable, NULL); > +} > +EXPORT_SYMBOL_GPL(acpi_device_fix_up_power_extended); > + > int acpi_device_update_power(struct acpi_device *device, int *state_p) > { > int state; > Index: linux-pm/include/acpi/acpi_bus.h > =================================================================== > --- linux-pm.orig/include/acpi/acpi_bus.h > +++ linux-pm/include/acpi/acpi_bus.h > @@ -524,6 +524,7 @@ const char *acpi_power_state_string(int > int acpi_device_set_power(struct acpi_device *device, int state); > int acpi_bus_init_power(struct acpi_device *device); > int acpi_device_fix_up_power(struct acpi_device *device); > +void acpi_device_fix_up_power_extended(struct acpi_device *adev); > int acpi_bus_update_power(acpi_handle handle, int *state_p); > int acpi_device_update_power(struct acpi_device *device, int *state_p); > bool acpi_bus_power_manageable(acpi_handle handle); > Index: linux-pm/drivers/mmc/host/sdhci-pci-core.c > =================================================================== > --- linux-pm.orig/drivers/mmc/host/sdhci-pci-core.c > +++ linux-pm/drivers/mmc/host/sdhci-pci-core.c > @@ -1240,16 +1240,11 @@ static const struct sdhci_pci_fixes sdhc > #ifdef CONFIG_ACPI > static void intel_mrfld_mmc_fix_up_power_slot(struct sdhci_pci_slot *slot) > { > - struct acpi_device *device, *child; > + struct acpi_device *device; > > device = ACPI_COMPANION(&slot->chip->pdev->dev); > - if (!device) > - return; > - > - acpi_device_fix_up_power(device); > - list_for_each_entry(child, &device->children, node) > - if (child->status.present && child->status.enabled) > - acpi_device_fix_up_power(child); > + if (device) > + acpi_device_fix_up_power_extended(device); > } > #else > static inline void intel_mrfld_mmc_fix_up_power_slot(struct sdhci_pci_slot *slot) {} > > >