linux-nvdimm.lists.01.org archive mirror
 help / color / mirror / Atom feed
From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
To: Dan Williams <dan.j.williams@intel.com>
Cc: ACPI Devel Maling List <linux-acpi@vger.kernel.org>,
	Thomas Gleixner <tglx@linutronix.de>,
	Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
	"H. Peter Anvin" <hpa@zytor.com>,
	the arch/x86 maintainers <x86@kernel.org>,
	Peter Zijlstra <peterz@infradead.org>,
	Dave Hansen <dave.hansen@linux.intel.com>,
	linux-nvdimm <linux-nvdimm@lists.01.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 2/5] efi/fake_mem: Arrange for a resource entry per efi_fake_mem instance
Date: Tue, 3 Mar 2020 09:01:09 +0100	[thread overview]
Message-ID: <CAKv+Gu_Erea9q4Ay2wmq70EQ8844baBtvVQsv0T1DM8U8eHY6Q@mail.gmail.com> (raw)
In-Reply-To: <158318760967.2216124.7838939599184768260.stgit@dwillia2-desk3.amr.corp.intel.com>

On Mon, 2 Mar 2020 at 23:36, Dan Williams <dan.j.williams@intel.com> wrote:
>
> In preparation for attaching a platform device per iomem resource teach
> the efi_fake_mem code to create an e820 entry per instance. Similar to
> E820_TYPE_PRAM, bypass merging resource when the e820 map is sanitized.
>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: Borislav Petkov <bp@alien8.de>
> Cc: "H. Peter Anvin" <hpa@zytor.com>
> Cc: x86@kernel.org
> Cc: Ard Biesheuvel <ardb@kernel.org>
> Signed-off-by: Dan Williams <dan.j.williams@intel.com>

Acked-by: Ard Biesheuvel <ardb@kernel.org>

> ---
>  arch/x86/kernel/e820.c              |   16 +++++++++++++++-
>  drivers/firmware/efi/x86_fake_mem.c |   12 +++++++++---
>  2 files changed, 24 insertions(+), 4 deletions(-)
>
> diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
> index c5399e80c59c..96babb3a6629 100644
> --- a/arch/x86/kernel/e820.c
> +++ b/arch/x86/kernel/e820.c
> @@ -305,6 +305,20 @@ static int __init cpcompare(const void *a, const void *b)
>         return (ap->addr != ap->entry->addr) - (bp->addr != bp->entry->addr);
>  }
>
> +static bool e820_nomerge(enum e820_type type)
> +{
> +       /*
> +        * These types may indicate distinct platform ranges aligned to
> +        * numa node, protection domain, performance domain, or other
> +        * boundaries. Do not merge them.
> +        */
> +       if (type == E820_TYPE_PRAM)
> +               return true;
> +       if (type == E820_TYPE_SOFT_RESERVED)
> +               return true;
> +       return false;
> +}
> +
>  int __init e820__update_table(struct e820_table *table)
>  {
>         struct e820_entry *entries = table->entries;
> @@ -380,7 +394,7 @@ int __init e820__update_table(struct e820_table *table)
>                 }
>
>                 /* Continue building up new map based on this information: */
> -               if (current_type != last_type || current_type == E820_TYPE_PRAM) {
> +               if (current_type != last_type || e820_nomerge(current_type)) {
>                         if (last_type != 0)      {
>                                 new_entries[new_nr_entries].size = change_point[chg_idx]->addr - last_addr;
>                                 /* Move forward only if the new size was non-zero: */
> diff --git a/drivers/firmware/efi/x86_fake_mem.c b/drivers/firmware/efi/x86_fake_mem.c
> index e5d6d5a1b240..0bafcc1bb0f6 100644
> --- a/drivers/firmware/efi/x86_fake_mem.c
> +++ b/drivers/firmware/efi/x86_fake_mem.c
> @@ -38,7 +38,7 @@ void __init efi_fake_memmap_early(void)
>                 m_start = mem->range.start;
>                 m_end = mem->range.end;
>                 for_each_efi_memory_desc(md) {
> -                       u64 start, end;
> +                       u64 start, end, size;
>
>                         if (md->type != EFI_CONVENTIONAL_MEMORY)
>                                 continue;
> @@ -58,11 +58,17 @@ void __init efi_fake_memmap_early(void)
>                          */
>                         start = max(start, m_start);
>                         end = min(end, m_end);
> +                       size = end - start + 1;
>
>                         if (end <= start)
>                                 continue;
> -                       e820__range_update(start, end - start + 1, E820_TYPE_RAM,
> -                                       E820_TYPE_SOFT_RESERVED);
> +
> +                       /*
> +                        * Ensure each efi_fake_mem instance results in
> +                        * a unique e820 resource
> +                        */
> +                       e820__range_remove(start, size, E820_TYPE_RAM, 1);
> +                       e820__range_add(start, size, E820_TYPE_SOFT_RESERVED);
>                         e820__update_table(e820_table);
>                 }
>         }
>
_______________________________________________
Linux-nvdimm mailing list -- linux-nvdimm@lists.01.org
To unsubscribe send an email to linux-nvdimm-leave@lists.01.org

  reply	other threads:[~2020-03-03  8:01 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-02 22:19 [PATCH 0/5] Manual definition of Soft Reserved memory devices Dan Williams
2020-03-02 22:20 ` [PATCH 1/5] ACPI: NUMA: Add 'nohmat' option Dan Williams
2020-03-18  0:08   ` Dan Williams
2020-03-18  8:24     ` Rafael J. Wysocki
2020-03-18 17:39       ` Dan Williams
2020-03-19  9:30         ` Rafael J. Wysocki
2020-03-02 22:20 ` [PATCH 2/5] efi/fake_mem: Arrange for a resource entry per efi_fake_mem instance Dan Williams
2020-03-03  8:01   ` Ard Biesheuvel [this message]
2020-03-02 22:20 ` [PATCH 3/5] ACPI: HMAT: Refactor hmat_register_target_device to hmem_register_device Dan Williams
2020-03-02 22:20 ` [PATCH 4/5] resource: Report parent to walk_iomem_res_desc() callback Dan Williams
2020-03-05 14:42   ` Tom Lendacky
2020-03-17 22:04     ` Dan Williams
2020-03-02 22:20 ` [PATCH 5/5] ACPI: HMAT: Attach a device for each soft-reserved range Dan Williams
2020-03-06 20:07 ` [PATCH 0/5] Manual definition of Soft Reserved memory devices Jeff Moyer
2020-03-06 21:05   ` Dan Williams

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=CAKv+Gu_Erea9q4Ay2wmq70EQ8844baBtvVQsv0T1DM8U8eHY6Q@mail.gmail.com \
    --to=ard.biesheuvel@linaro.org \
    --cc=bp@alien8.de \
    --cc=dan.j.williams@intel.com \
    --cc=dave.hansen@linux.intel.com \
    --cc=hpa@zytor.com \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-nvdimm@lists.01.org \
    --cc=mingo@redhat.com \
    --cc=peterz@infradead.org \
    --cc=tglx@linutronix.de \
    --cc=x86@kernel.org \
    --subject='Re: [PATCH 2/5] efi/fake_mem: Arrange for a resource entry per efi_fake_mem instance' \
    /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

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).