From: Julien Grall <julien@xen.org>
To: Stefano Stabellini <sstabellini@kernel.org>
Cc: xen-devel@lists.xenproject.org, alex.bennee@linaro.org,
masami.hiramatsu@linaro.org, ehem+xen@m5p.com,
bertrand.marquis@arm.com, andre.przywara@arm.com,
"Julien Grall" <jgrall@amazon.com>,
"Volodymyr Babchuk" <Volodymyr_Babchuk@epam.com>,
"Andrew Cooper" <andrew.cooper3@citrix.com>,
"George Dunlap" <george.dunlap@citrix.com>,
"Ian Jackson" <iwj@xenproject.org>,
"Jan Beulich" <jbeulich@suse.com>, "Wei Liu" <wl@xen.org>,
"Roger Pau Monné" <roger.pau@citrix.com>
Subject: Re: [PATCH 1/4] xen/acpi: Rework acpi_os_map_memory() and acpi_os_unmap_memory()
Date: Thu, 1 Oct 2020 16:09:04 +0100 [thread overview]
Message-ID: <764fb618-634b-18a5-8f45-e231c71c1bb5@xen.org> (raw)
In-Reply-To: <alpine.DEB.2.21.2009301659350.10908@sstabellini-ThinkPad-T480s>
Hi Stefano,
On 01/10/2020 01:06, Stefano Stabellini wrote:
> On Sat, 26 Sep 2020, Julien Grall wrote:
>> From: Julien Grall <jgrall@amazon.com>
>>
>> The functions acpi_os_{un,}map_memory() are meant to be arch-agnostic
>> while the __acpi_os_{un,}map_memory() are meant to be arch-specific.
>>
>> Currently, the former are still containing x86 specific code.
>>
>> To avoid this rather strange split, the generic helpers are reworked so
>> they are arch-agnostic. This requires the introduction of a new helper
>> __acpi_os_unmap_memory() that will undo any mapping done by
>> __acpi_os_map_memory().
>>
>> Currently, the arch-helper for unmap is basically a no-op so it only
>> returns whether the mapping was arch specific. But this will change
>> in the future.
>>
>> Note that the x86 version of acpi_os_map_memory() was already able to
>> able the 1MB region. Hence why there is no addition of new code.
>>
>> Signed-off-by: Julien Grall <jgrall@amazon.com>
>> ---
>> xen/arch/arm/acpi/lib.c | 10 ++++++++++
>> xen/arch/x86/acpi/lib.c | 18 ++++++++++++++++++
>> xen/drivers/acpi/osl.c | 34 ++++++++++++++++++----------------
>> xen/include/xen/acpi.h | 1 +
>> 4 files changed, 47 insertions(+), 16 deletions(-)
>>
>> diff --git a/xen/arch/arm/acpi/lib.c b/xen/arch/arm/acpi/lib.c
>> index 4fc6e17322c1..2192a5519171 100644
>> --- a/xen/arch/arm/acpi/lib.c
>> +++ b/xen/arch/arm/acpi/lib.c
>> @@ -30,6 +30,10 @@ char *__acpi_map_table(paddr_t phys, unsigned long size)
>> unsigned long base, offset, mapped_size;
>> int idx;
>>
>> + /* No arch specific implementation after early boot */
>> + if ( system_state >= SYS_STATE_boot )
>> + return NULL;
>> +
>> offset = phys & (PAGE_SIZE - 1);
>> mapped_size = PAGE_SIZE - offset;
>> set_fixmap(FIXMAP_ACPI_BEGIN, maddr_to_mfn(phys), PAGE_HYPERVISOR);
>> @@ -49,6 +53,12 @@ char *__acpi_map_table(paddr_t phys, unsigned long size)
>> return ((char *) base + offset);
>> }
>>
>> +bool __acpi_unmap_table(void *ptr, unsigned long size)
>> +{
>> + return ( vaddr >= FIXMAP_ADDR(FIXMAP_ACPI_BEGIN) &&
>> + vaddr < (FIXMAP_ADDR(FIXMAP_ACPI_END) + PAGE_SIZE) );
>> +}
>
> vaddr or ptr? :-)
>
> lib.c: In function '__acpi_unmap_table':
> lib.c:58:14: error: 'vaddr' undeclared (first use in this function)
> return ( vaddr >= FIXMAP_ADDR(FIXMAP_ACPI_BEGIN) &&
> ^
> lib.c:58:14: note: each undeclared identifier is reported only once for each function it appears in
> lib.c:60:1: error: control reaches end of non-void function [-Werror=return-type]
> }
> ^
> cc1: all warnings being treated as errors
The whole series builds because 'vaddr' is added in the next patch. But
I forgot to build patch by patch :(.
I will fix it in the next version.
Cheers,
--
Julien Grall
next prev parent reply other threads:[~2020-10-01 15:09 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-26 20:55 [PATCH 0/4] xen/arm: Unbreak ACPI Julien Grall
2020-09-26 20:55 ` [PATCH 1/4] xen/acpi: Rework acpi_os_map_memory() and acpi_os_unmap_memory() Julien Grall
2020-09-28 8:18 ` Jan Beulich
2020-09-28 9:58 ` Julien Grall
2020-09-28 10:09 ` Jan Beulich
2020-09-28 10:39 ` Julien Grall
2020-10-10 9:49 ` Julien Grall
2020-10-10 10:04 ` Julien Grall
2020-09-29 11:10 ` Rahul Singh
2020-10-01 0:06 ` Stefano Stabellini
2020-10-01 15:09 ` Julien Grall [this message]
2020-09-26 20:55 ` [PATCH 2/4] xen/arm: acpi: The fixmap area should always be cleared during failure/unmap Julien Grall
2020-09-29 11:13 ` Rahul Singh
2020-10-01 0:30 ` Stefano Stabellini
2020-10-01 15:14 ` Julien Grall
2020-09-26 20:55 ` [PATCH 3/4] xen/arm: Check if the platform is not using ACPI before initializing Dom0less Julien Grall
2020-09-29 11:17 ` Rahul Singh
2020-09-30 23:26 ` Stefano Stabellini
2020-09-26 20:55 ` [PATCH 4/4] xen/arm: Introduce fw_unreserved_regions() and use it Julien Grall
2020-09-30 23:40 ` Stefano Stabellini
2020-10-01 15:34 ` Julien Grall
2020-09-27 1:47 ` [PATCH 0/4] xen/arm: Unbreak ACPI Elliott Mitchell
2020-09-29 15:28 ` Elliott Mitchell
2020-09-28 6:47 ` Masami Hiramatsu
2020-09-28 12:41 ` [PATCH] xen: acpi: Hide UART address only if SPCR exists Masami Hiramatsu
2020-09-28 12:42 ` Masami Hiramatsu
2021-01-19 7:25 ` Elliott Mitchell
2021-01-20 18:05 ` Julien Grall
2020-09-28 13:00 ` [PATCH 0/4] xen/arm: Unbreak ACPI Masami Hiramatsu
2020-10-16 22:33 ` Xen-ARM EFI/ACPI problems (was: Re: [PATCH 0/4] xen/arm: Unbreak ACPI) Elliott Mitchell
2020-10-17 5:12 ` Elliott Mitchell
2020-10-08 18:39 ` [PATCH 0/4] xen/arm: Unbreak ACPI Elliott Mitchell
2020-10-09 9:39 ` Julien Grall
2020-10-09 14:22 ` Elliott Mitchell
2020-10-09 18:15 ` Julien Grall
2020-10-09 22:36 ` Elliott Mitchell
2020-10-09 21:49 ` Elliott Mitchell
2020-10-10 11:02 ` Julien Grall
2020-10-12 19:02 ` Stefano Stabellini
2020-10-12 21:34 ` Elliott Mitchell
2020-10-14 1:06 ` Stefano Stabellini
2020-10-14 1:37 ` Elliott Mitchell
2020-10-14 17:47 ` Julien Grall
2020-10-15 18:00 ` Stefano Stabellini
2020-10-14 17:44 ` Julien Grall
2020-09-29 11:10 ` Rahul Singh
2020-09-29 15:29 ` Alex Bennée
2020-09-29 17:07 ` Julien Grall
2020-09-29 21:11 ` Alex Bennée
2020-09-29 23:39 ` André Przywara
2020-09-30 8:51 ` Alex Bennée
2020-09-30 10:35 ` Julien Grall
2020-09-30 9:42 ` Julien Grall
2020-09-30 10:38 ` Alex Bennée
2020-09-30 11:10 ` Julien Grall
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=764fb618-634b-18a5-8f45-e231c71c1bb5@xen.org \
--to=julien@xen.org \
--cc=Volodymyr_Babchuk@epam.com \
--cc=alex.bennee@linaro.org \
--cc=andre.przywara@arm.com \
--cc=andrew.cooper3@citrix.com \
--cc=bertrand.marquis@arm.com \
--cc=ehem+xen@m5p.com \
--cc=george.dunlap@citrix.com \
--cc=iwj@xenproject.org \
--cc=jbeulich@suse.com \
--cc=jgrall@amazon.com \
--cc=masami.hiramatsu@linaro.org \
--cc=roger.pau@citrix.com \
--cc=sstabellini@kernel.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).