 65cb7129f4
			
		
	
	
		65cb7129f4
		
	
	
	
	
		
			
			- Ignore writes to CNTP_CTL_EL0 on HVF ARM (Alexander)
 - Add '-d invalid_mem' logging option (Zoltan)
 - Create QOM containers explicitly (Peter)
 - Rename sysemu/ -> system/ (Philippe)
 - Re-orderning of include/exec/ headers (Philippe)
   Move a lot of declarations from these legacy mixed bag headers:
     . "exec/cpu-all.h"
     . "exec/cpu-common.h"
     . "exec/cpu-defs.h"
     . "exec/exec-all.h"
     . "exec/translate-all"
   to these more specific ones:
     . "exec/page-protection.h"
     . "exec/translation-block.h"
     . "user/cpu_loop.h"
     . "user/guest-host.h"
     . "user/page-protection.h"
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE+qvnXhKRciHc/Wuy4+MsLN6twN4FAmdlnyAACgkQ4+MsLN6t
 wN6mBw//QFWi7CrU+bb8KMM53kOU9C507tjn99LLGFb5or73/umDsw6eo/b8DHBt
 KIwGLgATel42oojKfNKavtAzLK5rOrywpboPDpa3SNeF1onW+99NGJ52LQUqIX6K
 A6bS0fPdGG9ZzEuPpbjDXlp++0yhDcdSgZsS42fEsT7Dyj5gzJYlqpqhiXGqpsn8
 4Y0UMxSL21K3HEexlzw2hsoOBFA3tUm2ujNDhNkt8QASr85yQVLCypABJnuoe///
 5Ojl5wTBeDwhANET0rhwHK8eIYaNboiM9fHopJYhvyw1bz6yAu9jQwzF/MrL3s/r
 xa4OBHBy5mq2hQV9Shcl3UfCQdk/vDaYaWpgzJGX8stgMGYfnfej1SIl8haJIfcl
 VMX8/jEFdYbjhO4AeGRYcBzWjEJymkDJZoiSWp2NuEDi6jqIW+7yW1q0Rnlg9lay
 ShAqLK5Pv4zUw3t0Jy3qv9KSW8sbs6PQxtzXjk8p97rTf76BJ2pF8sv1tVzmsidP
 9L92Hv5O34IqzBu2oATOUZYJk89YGmTIUSLkpT7asJZpBLwNM2qLp5jO00WVU0Sd
 +kAn324guYPkko/TVnjC/AY7CMu55EOtD9NU35k3mUAnxXT9oDUeL4NlYtfgrJx6
 x1Nzr2FkS68+wlPAFKNSSU5lTjsjNaFM0bIJ4LCNtenJVP+SnRo=
 =cjz8
 -----END PGP SIGNATURE-----
Merge tag 'exec-20241220' of https://github.com/philmd/qemu into staging
Accel & Exec patch queue
- Ignore writes to CNTP_CTL_EL0 on HVF ARM (Alexander)
- Add '-d invalid_mem' logging option (Zoltan)
- Create QOM containers explicitly (Peter)
- Rename sysemu/ -> system/ (Philippe)
- Re-orderning of include/exec/ headers (Philippe)
  Move a lot of declarations from these legacy mixed bag headers:
    . "exec/cpu-all.h"
    . "exec/cpu-common.h"
    . "exec/cpu-defs.h"
    . "exec/exec-all.h"
    . "exec/translate-all"
  to these more specific ones:
    . "exec/page-protection.h"
    . "exec/translation-block.h"
    . "user/cpu_loop.h"
    . "user/guest-host.h"
    . "user/page-protection.h"
 # -----BEGIN PGP SIGNATURE-----
 #
 # iQIzBAABCAAdFiEE+qvnXhKRciHc/Wuy4+MsLN6twN4FAmdlnyAACgkQ4+MsLN6t
 # wN6mBw//QFWi7CrU+bb8KMM53kOU9C507tjn99LLGFb5or73/umDsw6eo/b8DHBt
 # KIwGLgATel42oojKfNKavtAzLK5rOrywpboPDpa3SNeF1onW+99NGJ52LQUqIX6K
 # A6bS0fPdGG9ZzEuPpbjDXlp++0yhDcdSgZsS42fEsT7Dyj5gzJYlqpqhiXGqpsn8
 # 4Y0UMxSL21K3HEexlzw2hsoOBFA3tUm2ujNDhNkt8QASr85yQVLCypABJnuoe///
 # 5Ojl5wTBeDwhANET0rhwHK8eIYaNboiM9fHopJYhvyw1bz6yAu9jQwzF/MrL3s/r
 # xa4OBHBy5mq2hQV9Shcl3UfCQdk/vDaYaWpgzJGX8stgMGYfnfej1SIl8haJIfcl
 # VMX8/jEFdYbjhO4AeGRYcBzWjEJymkDJZoiSWp2NuEDi6jqIW+7yW1q0Rnlg9lay
 # ShAqLK5Pv4zUw3t0Jy3qv9KSW8sbs6PQxtzXjk8p97rTf76BJ2pF8sv1tVzmsidP
 # 9L92Hv5O34IqzBu2oATOUZYJk89YGmTIUSLkpT7asJZpBLwNM2qLp5jO00WVU0Sd
 # +kAn324guYPkko/TVnjC/AY7CMu55EOtD9NU35k3mUAnxXT9oDUeL4NlYtfgrJx6
 # x1Nzr2FkS68+wlPAFKNSSU5lTjsjNaFM0bIJ4LCNtenJVP+SnRo=
 # =cjz8
 # -----END PGP SIGNATURE-----
 # gpg: Signature made Fri 20 Dec 2024 11:45:20 EST
 # gpg:                using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE
 # gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" [unknown]
 # gpg: WARNING: This key is not certified with a trusted signature!
 # gpg:          There is no indication that the signature belongs to the owner.
 # Primary key fingerprint: FAAB E75E 1291 7221 DCFD  6BB2 E3E3 2C2C DEAD C0DE
* tag 'exec-20241220' of https://github.com/philmd/qemu: (59 commits)
  util/qemu-timer: fix indentation
  meson: Do not define CONFIG_DEVICES on user emulation
  system/accel-ops: Remove unnecessary 'exec/cpu-common.h' header
  system/numa: Remove unnecessary 'exec/cpu-common.h' header
  hw/xen: Remove unnecessary 'exec/cpu-common.h' header
  target/mips: Drop left-over comment about Jazz machine
  target/mips: Remove tswap() calls in semihosting uhi_fstat_cb()
  target/xtensa: Remove tswap() calls in semihosting simcall() helper
  accel/tcg: Un-inline translator_is_same_page()
  accel/tcg: Include missing 'exec/translation-block.h' header
  accel/tcg: Move tcg_cflags_has/set() to 'exec/translation-block.h'
  accel/tcg: Restrict curr_cflags() declaration to 'internal-common.h'
  qemu/coroutine: Include missing 'qemu/atomic.h' header
  exec/translation-block: Include missing 'qemu/atomic.h' header
  accel/tcg: Declare cpu_loop_exit_requested() in 'exec/cpu-common.h'
  exec/cpu-all: Include 'cpu.h' earlier so MMU_USER_IDX is always defined
  target/sparc: Move sparc_restore_state_to_opc() to cpu.c
  target/sparc: Uninline cpu_get_tb_cpu_state()
  target/loongarch: Declare loongarch_cpu_dump_state() locally
  user: Move various declarations out of 'exec/exec-all.h'
  ...
Conflicts:
	hw/char/riscv_htif.c
	hw/intc/riscv_aplic.c
	target/s390x/cpu.c
	Apply sysemu header path changes to not in the pull request.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
		
	
			
		
			
				
	
	
		
			141 lines
		
	
	
		
			3.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			141 lines
		
	
	
		
			3.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * QEMU PowerNV PNOR simple model
 | |
|  *
 | |
|  * Copyright (c) 2015-2019, IBM Corporation.
 | |
|  *
 | |
|  * This code is licensed under the GPL version 2 or later. See the
 | |
|  * COPYING file in the top-level directory.
 | |
|  */
 | |
| 
 | |
| #include "qemu/osdep.h"
 | |
| #include "qapi/error.h"
 | |
| #include "qemu/error-report.h"
 | |
| #include "qemu/units.h"
 | |
| #include "system/block-backend.h"
 | |
| #include "system/blockdev.h"
 | |
| #include "hw/loader.h"
 | |
| #include "hw/ppc/pnv_pnor.h"
 | |
| #include "hw/qdev-properties.h"
 | |
| #include "hw/qdev-properties-system.h"
 | |
| 
 | |
| static uint64_t pnv_pnor_read(void *opaque, hwaddr addr, unsigned size)
 | |
| {
 | |
|     PnvPnor *s = PNV_PNOR(opaque);
 | |
|     uint64_t ret = 0;
 | |
|     int i;
 | |
| 
 | |
|     for (i = 0; i < size; i++) {
 | |
|         ret |= (uint64_t) s->storage[addr + i] << (8 * (size - i - 1));
 | |
|     }
 | |
| 
 | |
|     return ret;
 | |
| }
 | |
| 
 | |
| static void pnv_pnor_update(PnvPnor *s, int offset, int size)
 | |
| {
 | |
|     int offset_end;
 | |
|     int ret;
 | |
| 
 | |
|     if (!s->blk || !blk_is_writable(s->blk)) {
 | |
|         return;
 | |
|     }
 | |
| 
 | |
|     offset_end = offset + size;
 | |
|     offset = QEMU_ALIGN_DOWN(offset, BDRV_SECTOR_SIZE);
 | |
|     offset_end = QEMU_ALIGN_UP(offset_end, BDRV_SECTOR_SIZE);
 | |
| 
 | |
|     ret = blk_pwrite(s->blk, offset, offset_end - offset, s->storage + offset,
 | |
|                      0);
 | |
|     if (ret < 0) {
 | |
|         error_report("Could not update PNOR offset=0x%" PRIx32" : %s", offset,
 | |
|                      strerror(-ret));
 | |
|     }
 | |
| }
 | |
| 
 | |
| static void pnv_pnor_write(void *opaque, hwaddr addr, uint64_t data,
 | |
|                            unsigned size)
 | |
| {
 | |
|     PnvPnor *s = PNV_PNOR(opaque);
 | |
|     int i;
 | |
| 
 | |
|     for (i = 0; i < size; i++) {
 | |
|         s->storage[addr + i] = (data >> (8 * (size - i - 1))) & 0xFF;
 | |
|     }
 | |
|     pnv_pnor_update(s, addr, size);
 | |
| }
 | |
| 
 | |
| /*
 | |
|  * TODO: Check endianness: skiboot is BIG, Aspeed AHB is LITTLE, flash
 | |
|  * is BIG.
 | |
|  */
 | |
| static const MemoryRegionOps pnv_pnor_ops = {
 | |
|     .read = pnv_pnor_read,
 | |
|     .write = pnv_pnor_write,
 | |
|     .endianness = DEVICE_BIG_ENDIAN,
 | |
|     .valid = {
 | |
|         .min_access_size = 1,
 | |
|         .max_access_size = 4,
 | |
|     },
 | |
| };
 | |
| 
 | |
| static void pnv_pnor_realize(DeviceState *dev, Error **errp)
 | |
| {
 | |
|     PnvPnor *s = PNV_PNOR(dev);
 | |
|     int ret;
 | |
| 
 | |
|     if (s->blk) {
 | |
|         uint64_t perm = BLK_PERM_CONSISTENT_READ |
 | |
|                         (blk_supports_write_perm(s->blk) ? BLK_PERM_WRITE : 0);
 | |
|         ret = blk_set_perm(s->blk, perm, BLK_PERM_ALL, errp);
 | |
|         if (ret < 0) {
 | |
|             return;
 | |
|         }
 | |
| 
 | |
|         s->size = blk_getlength(s->blk);
 | |
|         if (s->size <= 0) {
 | |
|             error_setg(errp, "failed to get flash size");
 | |
|             return;
 | |
|         }
 | |
| 
 | |
|         s->storage = blk_blockalign(s->blk, s->size);
 | |
| 
 | |
|         if (blk_pread(s->blk, 0, s->size, s->storage, 0) < 0) {
 | |
|             error_setg(errp, "failed to read the initial flash content");
 | |
|             return;
 | |
|         }
 | |
|     } else {
 | |
|         s->storage = blk_blockalign(NULL, s->size);
 | |
|         memset(s->storage, 0xFF, s->size);
 | |
|     }
 | |
| 
 | |
|     memory_region_init_io(&s->mmio, OBJECT(s), &pnv_pnor_ops, s,
 | |
|                           TYPE_PNV_PNOR, s->size);
 | |
| }
 | |
| 
 | |
| static const Property pnv_pnor_properties[] = {
 | |
|     DEFINE_PROP_INT64("size", PnvPnor, size, 128 * MiB),
 | |
|     DEFINE_PROP_DRIVE("drive", PnvPnor, blk),
 | |
| };
 | |
| 
 | |
| static void pnv_pnor_class_init(ObjectClass *klass, void *data)
 | |
| {
 | |
|     DeviceClass *dc = DEVICE_CLASS(klass);
 | |
| 
 | |
|     dc->realize = pnv_pnor_realize;
 | |
|     device_class_set_props(dc, pnv_pnor_properties);
 | |
| }
 | |
| 
 | |
| static const TypeInfo pnv_pnor_info = {
 | |
|     .name          = TYPE_PNV_PNOR,
 | |
|     .parent        = TYPE_SYS_BUS_DEVICE,
 | |
|     .instance_size = sizeof(PnvPnor),
 | |
|     .class_init    = pnv_pnor_class_init,
 | |
| };
 | |
| 
 | |
| static void pnv_pnor_register_types(void)
 | |
| {
 | |
|     type_register_static(&pnv_pnor_info);
 | |
| }
 | |
| 
 | |
| type_init(pnv_pnor_register_types)
 |