| Message ID | 20240905130657.4075906-2-andrew.cooper3@citrix.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | x86/trampoline: Header cleanup | expand |
On 05.09.2024 15:06, Andrew Cooper wrote: > This removes a level of indirection, as well as removing a somewhat misleading > name; the variable is really "S3 video quirks". > > More importantly however it makes it very clear that, right now, parsing the > cmdline and quirks depends on having already placed the trampoline; a > dependency which is going to be gnarly to untangle. > > That said, fixing the quirk is easy. The Toshiba Satellite 4030CDT has an > Intel Celeron 300Mhz CPU (Pentium 2 era) from 1998 when MMX was the headline > feature, sporting 64M of RAM. Being a 32-bit processor, it hasn't been able > to run Xen for about a decade now, so drop the quirk entirely. > > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> Reviewed-by: Jan Beulich <jbeulich@suse.com>
On Thu Sep 5, 2024 at 2:06 PM BST, Andrew Cooper wrote: > This removes a level of indirection, as well as removing a somewhat misleading > name; the variable is really "S3 video quirks". nit: Would it be beneficial to rename video_flags to s3_video_flags? > > More importantly however it makes it very clear that, right now, parsing the > cmdline and quirks depends on having already placed the trampoline; a > dependency which is going to be gnarly to untangle. > > That said, fixing the quirk is easy. The Toshiba Satellite 4030CDT has an > Intel Celeron 300Mhz CPU (Pentium 2 era) from 1998 when MMX was the headline > feature, sporting 64M of RAM. Being a 32-bit processor, it hasn't been able > to run Xen for about a decade now, so drop the quirk entirely. > > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> > --- > CC: Jan Beulich <JBeulich@suse.com> > CC: Roger Pau Monné <roger.pau@citrix.com> > CC: Frediano Ziglio <frediano.ziglio@cloud.com> > CC: Alejandro Vallejo <alejandro.vallejo@cloud.com> > --- > xen/arch/x86/acpi/power.c | 2 +- > xen/arch/x86/dmi_scan.c | 12 ------------ > xen/arch/x86/include/asm/acpi.h | 1 - > 3 files changed, 1 insertion(+), 14 deletions(-) Always nice to see old hacks disappear. Reviewed-by: Alejandro Vallejo <alejandro.vallejo@cloud.com> Cheers, Alejandro
On 05/09/2024 4:05 pm, Alejandro Vallejo wrote: > On Thu Sep 5, 2024 at 2:06 PM BST, Andrew Cooper wrote: >> This removes a level of indirection, as well as removing a somewhat misleading >> name; the variable is really "S3 video quirks". > nit: Would it be beneficial to rename video_flags to s3_video_flags? Probably. Also to give it some named constants rather than magic numbers. But I think I'll leave that as an exercise to someone with more time. > >> More importantly however it makes it very clear that, right now, parsing the >> cmdline and quirks depends on having already placed the trampoline; a >> dependency which is going to be gnarly to untangle. >> >> That said, fixing the quirk is easy. The Toshiba Satellite 4030CDT has an >> Intel Celeron 300Mhz CPU (Pentium 2 era) from 1998 when MMX was the headline >> feature, sporting 64M of RAM. Being a 32-bit processor, it hasn't been able >> to run Xen for about a decade now, so drop the quirk entirely. >> >> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> >> --- >> CC: Jan Beulich <JBeulich@suse.com> >> CC: Roger Pau Monné <roger.pau@citrix.com> >> CC: Frediano Ziglio <frediano.ziglio@cloud.com> >> CC: Alejandro Vallejo <alejandro.vallejo@cloud.com> >> --- >> xen/arch/x86/acpi/power.c | 2 +- >> xen/arch/x86/dmi_scan.c | 12 ------------ >> xen/arch/x86/include/asm/acpi.h | 1 - >> 3 files changed, 1 insertion(+), 14 deletions(-) > Always nice to see old hacks disappear. > > Reviewed-by: Alejandro Vallejo <alejandro.vallejo@cloud.com> Thanks. ~Andrew
diff --git a/xen/arch/x86/acpi/power.c b/xen/arch/x86/acpi/power.c index 610937f42e95..557faf312b09 100644 --- a/xen/arch/x86/acpi/power.c +++ b/xen/arch/x86/acpi/power.c @@ -56,7 +56,7 @@ static int __init cf_check parse_acpi_sleep(const char *s) s = ss + 1; } while ( *ss ); - acpi_video_flags |= flag; + bootsym(video_flags) |= flag; return rc; } diff --git a/xen/arch/x86/dmi_scan.c b/xen/arch/x86/dmi_scan.c index 81f80c053a7a..9257aee2ab97 100644 --- a/xen/arch/x86/dmi_scan.c +++ b/xen/arch/x86/dmi_scan.c @@ -499,13 +499,6 @@ static int __init cf_check ich10_bios_quirk(const struct dmi_system_id *d) return 0; } -static __init int cf_check reset_videomode_after_s3(const struct dmi_blacklist *d) -{ - /* See wakeup.S */ - acpi_video_flags |= 2; - return 0; -} - static __init int cf_check dmi_disable_acpi(const struct dmi_blacklist *d) { if (!acpi_force) { @@ -546,11 +539,6 @@ static __init int cf_check force_acpi_ht(const struct dmi_blacklist *d) static const struct dmi_blacklist __initconstrel dmi_blacklist[] = { - { reset_videomode_after_s3, "Toshiba Satellite 4030cdt", { /* Reset video mode after returning from ACPI S3 sleep */ - MATCH(DMI_PRODUCT_NAME, "S4030CDT/4.3"), - NO_MATCH, NO_MATCH, NO_MATCH - } }, - { ich10_bios_quirk, "Intel board & BIOS", /* * BIOS leaves legacy USB emulation enabled while diff --git a/xen/arch/x86/include/asm/acpi.h b/xen/arch/x86/include/asm/acpi.h index 3c47b216d0e0..217819dd619c 100644 --- a/xen/arch/x86/include/asm/acpi.h +++ b/xen/arch/x86/include/asm/acpi.h @@ -103,7 +103,6 @@ extern unsigned long acpi_wakeup_address; extern int8_t acpi_numa; extern struct acpi_sleep_info acpi_sinfo; -#define acpi_video_flags bootsym(video_flags) struct xenpf_enter_acpi_sleep; extern int acpi_enter_sleep(const struct xenpf_enter_acpi_sleep *sleep); extern int acpi_enter_state(u32 state);
This removes a level of indirection, as well as removing a somewhat misleading name; the variable is really "S3 video quirks". More importantly however it makes it very clear that, right now, parsing the cmdline and quirks depends on having already placed the trampoline; a dependency which is going to be gnarly to untangle. That said, fixing the quirk is easy. The Toshiba Satellite 4030CDT has an Intel Celeron 300Mhz CPU (Pentium 2 era) from 1998 when MMX was the headline feature, sporting 64M of RAM. Being a 32-bit processor, it hasn't been able to run Xen for about a decade now, so drop the quirk entirely. Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> --- CC: Jan Beulich <JBeulich@suse.com> CC: Roger Pau Monné <roger.pau@citrix.com> CC: Frediano Ziglio <frediano.ziglio@cloud.com> CC: Alejandro Vallejo <alejandro.vallejo@cloud.com> --- xen/arch/x86/acpi/power.c | 2 +- xen/arch/x86/dmi_scan.c | 12 ------------ xen/arch/x86/include/asm/acpi.h | 1 - 3 files changed, 1 insertion(+), 14 deletions(-)