| Message ID | 20211122170536.7725-1-hdegoede@redhat.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | ACPI: acpi_device_override_status() changes | expand |
On Mon, 22 Nov 2021 at 18:05, Hans de Goede <hdegoede@redhat.com> wrote: > > Hi Rafael, > > As requested here is a v2 of my series previously titled: > "ACPI: scan: Skip turning off some unused objects during scan" > > Which was a regression fix series for the commit c10383e8ddf4 > ("ACPI: scan: Release PM resources blocked by unused objects") > change, but that has been reverted now. So as requested here is > a v2 changing the wording of various commit messages since these > changes are still useful to have regardless. > > Patch 1/7 is a v2/resend of the "ACPI / x86: Drop PWM2 device on > Lenovo Yoga Book from always present table" patch. You requested > changing the commit message of this one a bit to make it sound > less like a regression fix (which it is not). But you already > have the previous version of this patch in your bleeding-edge > branch, with a "Cc: 5.1+ <stable@vger.kernel.org> # 5.1+" > added ? So depending on which version you want you can either > skip this patch when applying this series, or replace it with > the version from this series. > > Patches 2-4 are the main changes to make the always_present > quirk handling more flexible, changing it into a status_override > mechanism + adding a quirk for the GPD win and pocket to fix > an issue with those in a more elegant matter then the current > kludge in the sdhci-acpi code. > > Patch 5 is an unrelated patch which touches the override-status > quirk table, so it needed to be rebased and I decided to add it > to this series to make it clear that its v2 needs to be applied > on top of the other ACPI changes from this series. > > Patches 6+7 cleanup the sdhci-acpi code, removing the now no > longer needed ugly kludge for the GPD win/pocket. These can > be merged independently from patches 1-5, through the mmc > tree, as long as they get send to Linus during the same > kernel cycle as the ACPI bits. This sounds like the mmc changes are really not that independent after all. What about bisectability? An option is to funnel the sdhci patches together with the ACPI patches through Rafael's tree. You have my ack for this, but let's wait for Adrian's ack too. [...] Kind regards Uffe
Hi, On 11/23/21 12:13, Ulf Hansson wrote: > On Mon, 22 Nov 2021 at 18:05, Hans de Goede <hdegoede@redhat.com> wrote: >> >> Hi Rafael, >> >> As requested here is a v2 of my series previously titled: >> "ACPI: scan: Skip turning off some unused objects during scan" >> >> Which was a regression fix series for the commit c10383e8ddf4 >> ("ACPI: scan: Release PM resources blocked by unused objects") >> change, but that has been reverted now. So as requested here is >> a v2 changing the wording of various commit messages since these >> changes are still useful to have regardless. >> >> Patch 1/7 is a v2/resend of the "ACPI / x86: Drop PWM2 device on >> Lenovo Yoga Book from always present table" patch. You requested >> changing the commit message of this one a bit to make it sound >> less like a regression fix (which it is not). But you already >> have the previous version of this patch in your bleeding-edge >> branch, with a "Cc: 5.1+ <stable@vger.kernel.org> # 5.1+" >> added ? So depending on which version you want you can either >> skip this patch when applying this series, or replace it with >> the version from this series. >> >> Patches 2-4 are the main changes to make the always_present >> quirk handling more flexible, changing it into a status_override >> mechanism + adding a quirk for the GPD win and pocket to fix >> an issue with those in a more elegant matter then the current >> kludge in the sdhci-acpi code. >> >> Patch 5 is an unrelated patch which touches the override-status >> quirk table, so it needed to be rebased and I decided to add it >> to this series to make it clear that its v2 needs to be applied >> on top of the other ACPI changes from this series. >> >> Patches 6+7 cleanup the sdhci-acpi code, removing the now no >> longer needed ugly kludge for the GPD win/pocket. These can >> be merged independently from patches 1-5, through the mmc >> tree, as long as they get send to Linus during the same >> kernel cycle as the ACPI bits. > > This sounds like the mmc changes are really not that independent after > all. What about bisectability? Merging the ACPI and mmc bits separately does indeed have a 50% chance of causing an issue where during a bisect the wifi might stop working on the GPD win / pocket. But only on those 2 models, so it won't be a general bisect break; and it will only break wifi, without causing other side-effects. So I believe this really is mostly a theoretical issue. With that said merging the entire set to one tree of course is fine too, maybe even better because it keeps the related ACPI and sdhci commit close together in the history. > An option is to funnel the sdhci patches together with the ACPI > patches through Rafael's tree. You have my ack for this, but let's > wait for Adrian's ack too. Thanks. Regards, Hans
On 23/11/2021 13:13, Ulf Hansson wrote: > On Mon, 22 Nov 2021 at 18:05, Hans de Goede <hdegoede@redhat.com> wrote: >> >> Hi Rafael, >> >> As requested here is a v2 of my series previously titled: >> "ACPI: scan: Skip turning off some unused objects during scan" >> >> Which was a regression fix series for the commit c10383e8ddf4 >> ("ACPI: scan: Release PM resources blocked by unused objects") >> change, but that has been reverted now. So as requested here is >> a v2 changing the wording of various commit messages since these >> changes are still useful to have regardless. >> >> Patch 1/7 is a v2/resend of the "ACPI / x86: Drop PWM2 device on >> Lenovo Yoga Book from always present table" patch. You requested >> changing the commit message of this one a bit to make it sound >> less like a regression fix (which it is not). But you already >> have the previous version of this patch in your bleeding-edge >> branch, with a "Cc: 5.1+ <stable@vger.kernel.org> # 5.1+" >> added ? So depending on which version you want you can either >> skip this patch when applying this series, or replace it with >> the version from this series. >> >> Patches 2-4 are the main changes to make the always_present >> quirk handling more flexible, changing it into a status_override >> mechanism + adding a quirk for the GPD win and pocket to fix >> an issue with those in a more elegant matter then the current >> kludge in the sdhci-acpi code. >> >> Patch 5 is an unrelated patch which touches the override-status >> quirk table, so it needed to be rebased and I decided to add it >> to this series to make it clear that its v2 needs to be applied >> on top of the other ACPI changes from this series. >> >> Patches 6+7 cleanup the sdhci-acpi code, removing the now no >> longer needed ugly kludge for the GPD win/pocket. These can >> be merged independently from patches 1-5, through the mmc >> tree, as long as they get send to Linus during the same >> kernel cycle as the ACPI bits. > > This sounds like the mmc changes are really not that independent after > all. What about bisectability? > > An option is to funnel the sdhci patches together with the ACPI > patches through Rafael's tree. You have my ack for this, but let's > wait for Adrian's ack too. Looks OK to me. Acked-by: Adrian Hunter <adrian.hunter@intel.com>
On Thu, Nov 25, 2021 at 10:53 AM Adrian Hunter <adrian.hunter@intel.com> wrote: > > On 23/11/2021 13:13, Ulf Hansson wrote: > > On Mon, 22 Nov 2021 at 18:05, Hans de Goede <hdegoede@redhat.com> wrote: > >> > >> Hi Rafael, > >> > >> As requested here is a v2 of my series previously titled: > >> "ACPI: scan: Skip turning off some unused objects during scan" > >> > >> Which was a regression fix series for the commit c10383e8ddf4 > >> ("ACPI: scan: Release PM resources blocked by unused objects") > >> change, but that has been reverted now. So as requested here is > >> a v2 changing the wording of various commit messages since these > >> changes are still useful to have regardless. > >> > >> Patch 1/7 is a v2/resend of the "ACPI / x86: Drop PWM2 device on > >> Lenovo Yoga Book from always present table" patch. You requested > >> changing the commit message of this one a bit to make it sound > >> less like a regression fix (which it is not). But you already > >> have the previous version of this patch in your bleeding-edge > >> branch, with a "Cc: 5.1+ <stable@vger.kernel.org> # 5.1+" > >> added ? So depending on which version you want you can either > >> skip this patch when applying this series, or replace it with > >> the version from this series. > >> > >> Patches 2-4 are the main changes to make the always_present > >> quirk handling more flexible, changing it into a status_override > >> mechanism + adding a quirk for the GPD win and pocket to fix > >> an issue with those in a more elegant matter then the current > >> kludge in the sdhci-acpi code. > >> > >> Patch 5 is an unrelated patch which touches the override-status > >> quirk table, so it needed to be rebased and I decided to add it > >> to this series to make it clear that its v2 needs to be applied > >> on top of the other ACPI changes from this series. > >> > >> Patches 6+7 cleanup the sdhci-acpi code, removing the now no > >> longer needed ugly kludge for the GPD win/pocket. These can > >> be merged independently from patches 1-5, through the mmc > >> tree, as long as they get send to Linus during the same > >> kernel cycle as the ACPI bits. > > > > This sounds like the mmc changes are really not that independent after > > all. What about bisectability? > > > > An option is to funnel the sdhci patches together with the ACPI > > patches through Rafael's tree. You have my ack for this, but let's > > wait for Adrian's ack too. > > Looks OK to me. > > Acked-by: Adrian Hunter <adrian.hunter@intel.com> All patches in the series applied as 5.17 material, thanks!
Hi Rafael, As requested here is a v2 of my series previously titled: "ACPI: scan: Skip turning off some unused objects during scan" Which was a regression fix series for the commit c10383e8ddf4 ("ACPI: scan: Release PM resources blocked by unused objects") change, but that has been reverted now. So as requested here is a v2 changing the wording of various commit messages since these changes are still useful to have regardless. Patch 1/7 is a v2/resend of the "ACPI / x86: Drop PWM2 device on Lenovo Yoga Book from always present table" patch. You requested changing the commit message of this one a bit to make it sound less like a regression fix (which it is not). But you already have the previous version of this patch in your bleeding-edge branch, with a "Cc: 5.1+ <stable@vger.kernel.org> # 5.1+" added ? So depending on which version you want you can either skip this patch when applying this series, or replace it with the version from this series. Patches 2-4 are the main changes to make the always_present quirk handling more flexible, changing it into a status_override mechanism + adding a quirk for the GPD win and pocket to fix an issue with those in a more elegant matter then the current kludge in the sdhci-acpi code. Patch 5 is an unrelated patch which touches the override-status quirk table, so it needed to be rebased and I decided to add it to this series to make it clear that its v2 needs to be applied on top of the other ACPI changes from this series. Patches 6+7 cleanup the sdhci-acpi code, removing the now no longer needed ugly kludge for the GPD win/pocket. These can be merged independently from patches 1-5, through the mmc tree, as long as they get send to Linus during the same kernel cycle as the ACPI bits. Regards, Hans Hans de Goede (7): ACPI / x86: Drop PWM2 device on Lenovo Yoga Book from always present table ACPI: Change acpi_device_always_present() into acpi_device_override_status() ACPI / x86: Allow specifying acpi_device_override_status() quirks by path ACPI / x86: Add not-present quirk for the PCI0.SDHB.BRC1 device on the GPD win ACPI / x86: Add PWM2 on the Xiaomi Mi Pad 2 to the always_present list mmc: sdhci-acpi: Remove special handling for GPD win/pocket devices mmc: sdhci-acpi: Use the new soc_intel_is_byt() helper drivers/acpi/bus.c | 4 +- drivers/acpi/x86/utils.c | 122 +++++++++++++++++++++++----------- drivers/mmc/host/sdhci-acpi.c | 78 ++-------------------- include/acpi/acpi_bus.h | 5 +- 4 files changed, 96 insertions(+), 113 deletions(-)