From: Jan Beulich <jbeulich@suse.com>
To: "xen-devel@lists.xenproject.org" <xen-devel@lists.xenproject.org>
Cc: "Andrew Cooper" <andrew.cooper3@citrix.com>,
"Wei Liu" <wl@xen.org>, "Roger Pau Monné" <roger.pau@citrix.com>
Subject: [PATCH v2 10/12] video/vesa: drop "vesa-mtrr" command line option
Date: Thu, 27 May 2021 14:35:21 +0200 [thread overview]
Message-ID: <10607087-9216-c5fb-08cd-29090a80e402@suse.com> (raw)
In-Reply-To: <8f56a8f4-0482-932f-96a9-c791bebb4610@suse.com>
Now that we use ioremap_wc() for mapping the frame buffer, there's no
need for this option anymore. As noted in the change introducing the
use of ioremap_wc(), mtrr_add() didn't work in certain cases anyway.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,9 +6,10 @@ The format is based on [Keep a Changelog
## [unstable UNRELEASED](https://xenbits.xen.org/gitweb/?p=xen.git;a=shortlog;h=staging) - TBD
-### Removed
+### Removed / support downgraded
- XENSTORED_ROOTDIR environment variable from configuartion files and
initscripts, due to being unused.
+ - dropped support for the (x86-only) "vesa-mtrr" command line option
## [4.15.0 UNRELEASED](https://xenbits.xen.org/gitweb/?p=xen.git;a=shortlog;h=RELEASE-4.15.0) - TBD
--- a/docs/misc/xen-command-line.pandoc
+++ b/docs/misc/xen-command-line.pandoc
@@ -2369,9 +2369,6 @@ cache-warming. 1ms (1000) has been measu
### vesa-map
> `= <integer>`
-### vesa-mtrr
-> `= <integer>`
-
### vesa-ram
> `= <integer>`
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -1816,8 +1816,6 @@ void __init noreturn __start_xen(unsigne
local_irq_enable();
- vesa_mtrr_init();
-
early_msi_init();
iommu_setup(); /* setup iommu if available */
--- a/xen/drivers/video/vesa.c
+++ b/xen/drivers/video/vesa.c
@@ -145,38 +145,6 @@ void __init vesa_init(void)
video_puts = lfb_redraw_puts;
}
-#include <asm/mtrr.h>
-
-static unsigned int vesa_mtrr;
-integer_param("vesa-mtrr", vesa_mtrr);
-
-void __init vesa_mtrr_init(void)
-{
- static const int mtrr_types[] = {
- 0, MTRR_TYPE_UNCACHABLE, MTRR_TYPE_WRBACK,
- MTRR_TYPE_WRCOMB, MTRR_TYPE_WRTHROUGH };
- unsigned int size_total;
- int rc, type;
-
- if ( !lfb || (vesa_mtrr == 0) || (vesa_mtrr >= ARRAY_SIZE(mtrr_types)) )
- return;
-
- type = mtrr_types[vesa_mtrr];
- if ( !type )
- return;
-
- /* Find the largest power-of-two */
- size_total = vram_total;
- while ( size_total & (size_total - 1) )
- size_total &= size_total - 1;
-
- /* Try and find a power of two to add */
- do {
- rc = mtrr_add(lfb_base(), size_total, type, 1);
- size_total >>= 1;
- } while ( (size_total >= PAGE_SIZE) && (rc == -EINVAL) );
-}
-
static void lfb_flush(void)
{
__asm__ __volatile__ ("sfence" : : : "memory");
--- a/xen/include/asm-x86/setup.h
+++ b/xen/include/asm-x86/setup.h
@@ -25,10 +25,8 @@ void init_IRQ(void);
#ifdef CONFIG_VIDEO
void vesa_init(void);
-void vesa_mtrr_init(void);
#else
static inline void vesa_init(void) {};
-static inline void vesa_mtrr_init(void) {};
#endif
int construct_dom0(
next prev parent reply other threads:[~2021-05-27 12:35 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-27 12:29 [PATCH v2 00/12] x86: memcpy() / memset() (non-)ERMS flavors plus fallout Jan Beulich
2021-05-27 12:30 ` [PATCH v2 01/12] x86: introduce ioremap_wc() Jan Beulich
2021-05-27 12:48 ` Julien Grall
2021-05-27 13:09 ` Jan Beulich
2021-05-27 13:30 ` Julien Grall
2021-05-27 14:57 ` Jan Beulich
2021-05-27 12:31 ` [PATCH v2 02/12] x86: re-work memset() Jan Beulich
2021-05-27 12:31 ` [PATCH v2 03/12] x86: re-work memcpy() Jan Beulich
2021-05-27 12:31 ` [PATCH v2 04/12] x86: control memset() and memcpy() inlining Jan Beulich
2021-05-27 12:32 ` [PATCH v2 05/12] x86: introduce "hot" and "cold" page clearing functions Jan Beulich
2021-05-27 12:32 ` [PATCH v2 06/12] page-alloc: make scrub_on_page() static Jan Beulich
2021-05-27 12:33 ` [PATCH v2 07/12] mm: allow page scrubbing routine(s) to be arch controlled Jan Beulich
2021-05-27 13:06 ` Julien Grall
2021-05-27 13:58 ` Jan Beulich
2021-06-03 9:39 ` Julien Grall
2021-06-04 13:23 ` Jan Beulich
2021-06-07 18:12 ` Julien Grall
2021-05-27 12:34 ` [PATCH v2 08/12] x86: move .text.kexec Jan Beulich
2022-02-18 13:34 ` Andrew Cooper
2021-05-27 12:34 ` [PATCH v2 09/12] video/vesa: unmap frame buffer when relinquishing console Jan Beulich
2022-02-18 13:36 ` Andrew Cooper
2021-05-27 12:35 ` Jan Beulich [this message]
2021-05-27 12:35 ` [PATCH v2 11/12] video/vesa: drop "vesa-remap" command line option Jan Beulich
2022-02-18 13:35 ` Andrew Cooper
2021-05-27 12:36 ` [PATCH v2 12/12] video/vesa: adjust (not just) command line option handling Jan Beulich
2022-02-17 11:01 ` [PATCH RESEND v2] x86: introduce ioremap_wc() Jan Beulich
2022-02-17 14:47 ` Roger Pau Monné
2022-02-17 15:02 ` Jan Beulich
2022-02-17 15:50 ` Roger Pau Monné
2022-02-17 15:57 ` Jan Beulich
2022-02-18 9:09 ` Roger Pau Monné
2022-02-18 9:23 ` Jan Beulich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=10607087-9216-c5fb-08cd-29090a80e402@suse.com \
--to=jbeulich@suse.com \
--cc=andrew.cooper3@citrix.com \
--cc=roger.pau@citrix.com \
--cc=wl@xen.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.