qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 1d4ae5: hw/block/pflash_cfi02: Set romd mode


From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] 1d4ae5: hw/block/pflash_cfi02: Set romd mode in pflash_cfi...
Date: Thu, 13 May 2021 06:46:17 -0700

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 1d4ae5a34f45e530d2dfd2cb86fa9e86b0abec29
      
https://github.com/qemu/qemu/commit/1d4ae5a34f45e530d2dfd2cb86fa9e86b0abec29
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2021-05-11 (Tue, 11 May 2021)

  Changed paths:
    M hw/block/pflash_cfi02.c

  Log Message:
  -----------
  hw/block/pflash_cfi02: Set romd mode in pflash_cfi02_realize()

The ROMD mode isn't related to mapping setup.
Ideally we'd set this mode when the state machine resets,
but for now simply move it to pflash_cfi02_realize() to
not introduce logical change.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210325120921.858993-2-f4bug@amsat.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>


  Commit: 27545c9df24f509c6d1c1f17478281a357125554
      
https://github.com/qemu/qemu/commit/27545c9df24f509c6d1c1f17478281a357125554
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2021-05-11 (Tue, 11 May 2021)

  Changed paths:
    M hw/block/pflash_cfi02.c

  Log Message:
  -----------
  hw/block/pflash_cfi02: Do not create aliases when not necessary

When no mapping is requested, it is pointless to create
alias regions.
Only create them when multiple mappings are requested to
simplify the memory layout. The flatview is not changed.

For example using 'qemu-system-sh4 -M r2d -S -monitor stdio',

* before:

  (qemu) info mtree
  address-space: memory
    0000000000000000-ffffffffffffffff (prio 0, i/o): system
      0000000000000000-0000000000ffffff (prio 0, i/o): pflash
        0000000000000000-0000000000ffffff (prio 0, romd): alias pflash-alias 
@r2d.flash 0000000000000000-0000000000ffffff
      0000000004000000-000000000400003f (prio 0, i/o): r2d-fpga
      000000000c000000-000000000fffffff (prio 0, ram): r2d.sdram
  (qemu) info mtree -f
  FlatView #0
   AS "memory", root: system
   AS "cpu-memory-0", root: system
   Root memory region: system
    0000000000000000-0000000000ffffff (prio 0, romd): r2d.flash
    0000000004000000-000000000400003f (prio 0, i/o): r2d-fpga
    000000000c000000-000000000fffffff (prio 0, ram): r2d.sdram

* after:

  (qemu) info mtree
  address-space: memory
    0000000000000000-ffffffffffffffff (prio 0, i/o): system
      0000000000000000-0000000000ffffff (prio 0, romd): r2d.flash
      0000000004000000-000000000400003f (prio 0, i/o): r2d-fpga
      000000000c000000-000000000fffffff (prio 0, ram): r2d.sdram
  (qemu) info mtree -f
  FlatView #0
   AS "memory", root: system
   AS "cpu-memory-0", root: system
   Root memory region: system
    0000000000000000-0000000000ffffff (prio 0, romd): r2d.flash
    0000000004000000-000000000400003f (prio 0, i/o): r2d-fpga
    000000000c000000-000000000fffffff (prio 0, ram): r2d.sdram

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210325120921.858993-3-f4bug@amsat.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>


  Commit: dab59ce031228066eb95a9c518846fcacfb0dbbf
      
https://github.com/qemu/qemu/commit/dab59ce031228066eb95a9c518846fcacfb0dbbf
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-05-13 (Thu, 13 May 2021)

  Changed paths:
    M hw/block/pflash_cfi02.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/philmd/tags/pflash-20210511' into 
staging

Parallel NOR Flash patches queue

- Simplify memory layout when no pflash_cfi02 mapping requested

# gpg: Signature made Tue 11 May 2021 17:12:58 BST
# gpg:                using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE
# gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" 
[full]
# Primary key fingerprint: FAAB E75E 1291 7221 DCFD  6BB2 E3E3 2C2C DEAD C0DE

* remotes/philmd/tags/pflash-20210511:
  hw/block/pflash_cfi02: Do not create aliases when not necessary
  hw/block/pflash_cfi02: Set romd mode in pflash_cfi02_realize()

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/45ceb2ffe62b...dab59ce03122



reply via email to

[Prev in Thread] Current Thread [Next in Thread]