[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v5 36/44] x86/boot: remove remaining early_mod references
- To: "Daniel P. Smith" <dpsmith@xxxxxxxxxxxxxxxxxxxx>, <xen-devel@xxxxxxxxxxxxxxxxxxxx>
- From: Jason Andryuk <jason.andryuk@xxxxxxx>
- Date: Tue, 8 Oct 2024 15:15:30 -0400
- Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=apertussolutions.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0)
- Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=DRurKgHlYk5Rq9zpnnBpVE9SWJZiDkTt027V1AaYp6w=; b=t8KKeoHP4sRG5YugWCWX8d0TAnKwx3TwQD/wxK0NI+12romj7VgqETyukiEMPXE04FuqpS547FtqgFyFWzOJs4aJW7xdTVA7fg5QhiMVPqFQRbbI9Ftf8xJxHRoOsy1JRmdlT/yzy6VUdjqYIxsNEnTJMVMHVEXJkFnGU/ejl1VGoR3VGlSVvHqlCcUFEW+W4tTUeYBhPC1NOO/lShQTShjx4A68Ohy4do/62egvGAbwBmDVbhtZDl6AHbecIEV6bVzIo0jX1OF/Z+N5YGQfq3BqvqRbSf9BxkIupnl9XbwJ4j3/J5LzoyH4kL380iMjsIquysd7d2DygZTeaIWw3Q==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=xV+uzjw5cURYkXVCABvcBhX5E5LqxFQA0AnOINtpMFW6xjI0yh8K+JxlY2XEqjI36RVDHrWR5MjhsCBnY4+KwSsE28TJcMf0V44qTNgPLK82vcmJETPxNxIQDJajs1W1xEGVcQ9vFQjtTU7OWbngWp3BUK4H4PHRElyy3DEboSvKkivQFADYyuibFazmduMd6C0IEhWMI3TXVehNhJ62VloKv2GRjpwjuvMCaNfmyJ80aoZz1XDxdb51JHTL40QR3V8ZnZmqF3t2XBeGUtbEeLmvBwO2Es/9w5/ZOK/LS7drN8LYNChwBT/qPZvoJn971Mo9VICIVGQ7QFNWdU9kBQ==
- Cc: <christopher.w.clark@xxxxxxxxx>, <stefano.stabellini@xxxxxxx>, Jan Beulich <jbeulich@xxxxxxxx>, Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, Roger Pau Monné <roger.pau@xxxxxxxxxx>
- Delivery-date: Tue, 08 Oct 2024 20:16:34 +0000
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
On 2024-10-06 17:49, Daniel P. Smith wrote:
Any direct usages of struct mod have been transitioned, remove the remaining
references to early_mod fields.
This is unclear, please try to re-word. "struct mod" and "early_mod"
don't exist.
Signed-off-by: Daniel P. Smith <dpsmith@xxxxxxxxxxxxxxxxxxxx>
---
xen/arch/x86/setup.c | 31 +++++++++++--------------------
1 file changed, 11 insertions(+), 20 deletions(-)
diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index e9e3da3204f1..0ffe8d3ff8dd 100644
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -1404,16 +1401,12 @@ void asmlinkage __init noreturn __start_xen(unsigned
long mbi_p)
*/
bi->mods[xen].start = virt_to_mfn(_stext);
bi->mods[xen].size = __2M_rwdata_end - _stext;
-
- bi->mods[xen].mod->mod_start = bi->mods[xen].start;
- bi->mods[xen].mod->mod_end = bi->mods[xen].size;
}
- bi->mods[0].headroom =
- bzimage_headroom(bootstrap_map(bi->mods[0].mod),
- bi->mods[0].mod->mod_end);
-
- bootstrap_map(NULL);
+ bi->mods[0].headroom = bzimage_headroom(
+ bootstrap_map_bm(&bi->mods[0]),
+ bi->mods[0].size);
Thunderbird might corrupt this, bit the above can fit on two lines:
bi->mods[0].headroom = bzimage_headroom(bootstrap_map_bm(&bi->mods[0]),
bi->mods[0].size);
+ bootstrap_map_bm(NULL);
#ifndef highmem_start
/* Don't allow split below 4Gb. */
@@ -1708,8 +1699,8 @@ void asmlinkage __init noreturn __start_xen(unsigned long
mbi_p)
for ( i = 0; i < bi->nr_modules; ++i )
{
- set_pdx_range(paddr_to_pfn(bi->mods[i].mod->mod_start),
- paddr_to_pfn(bi->mods[i].mod->mod_start) +
+ set_pdx_range(paddr_to_pfn(bi->mods[i].start),
+ paddr_to_pfn(bi->mods[i].start) +
This belongs in patch 14 as mentioned there.
PFN_UP(bi->mods[i].size));
map_pages_to_xen(
(unsigned long)maddr_to_virt(bi->mods[i].start),
|