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 6/7] video/vesa: drop "vesa-mtrr" command line option
Date: Tue, 27 Apr 2021 14:56:01 +0200 [thread overview]
Message-ID: <afa6121c-42bc-4078-0013-24fa7397fb12@suse.com> (raw)
In-Reply-To: <6d6da76c-ccc8-afa2-bd06-5ae132c354f2@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>
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,9 @@ The format is based on [Keep a Changelog
## [unstable UNRELEASED](https://xenbits.xen.org/gitweb/?p=xen.git;a=shortlog;h=staging) - TBD
+### Removed / support downgraded
+ - 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
### Added / support upgraded
--- 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
@@ -1813,8 +1813,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-04-27 12:56 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-27 12:51 [PATCH 0/7] x86: memcpy() / memset() (non-)ERMS flavors plus fallout Jan Beulich
2021-04-27 12:53 ` [PATCH 1/7] x86: correct comment about alternatives ordering Jan Beulich
2021-04-27 13:19 ` Andrew Cooper
2021-04-27 12:54 ` [PATCH 2/7] x86: introduce ioremap_wc() Jan Beulich
2021-04-27 17:13 ` Andrew Cooper
2021-04-28 9:41 ` Jan Beulich
2021-04-27 12:54 ` [PATCH 3/7] x86: re-work memset() Jan Beulich
2021-04-27 12:54 ` [PATCH 4/7] x86: re-work memcpy() Jan Beulich
2021-04-27 12:55 ` [PATCH 5/7] video/vesa: unmap frame buffer when relinquishing console Jan Beulich
2021-04-27 12:56 ` Jan Beulich [this message]
2021-04-27 13:20 ` [PATCH 6/7] video/vesa: drop "vesa-mtrr" command line option Andrew Cooper
2021-04-27 12:56 ` [PATCH 7/7] video/vesa: adjust (not just) command line option handling Jan Beulich
2021-04-27 13:49 ` Andrew Cooper
2021-04-27 14:04 ` Jan Beulich
2021-05-27 11:47 ` 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=afa6121c-42bc-4078-0013-24fa7397fb12@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.