Skip to content
Snippets Groups Projects
  1. Jul 08, 2023
  2. Jul 07, 2023
    • Richard Henderson's avatar
      Merge tag 'pull-ppc-20230707-1' of https://gitlab.com/danielhb/qemu into staging · 276d72ca
      Richard Henderson authored
      ppc patch queue for 2023-07-07:
      
      In this last queue for 8.1 we have a lot of fixes and improvements all
      around: SMT support for powerNV, XIVE fixes, PPC440 cleanups, exception
      handling cleanups and kvm_pph.h cleanups just to name a few.
      
      Thanks everyone in the qemu-ppc community for all the contributions for
      the next QEMU 8.1 release.
      
      # -----BEGIN PGP SIGNATURE-----
      #
      # iIwEABYKADQWIQQX6/+ZI9AYAK8oOBk82cqW3gMxZAUCZKgihBYcZGFuaWVsaGI0
      # MTNAZ21haWwuY29tAAoJEDzZypbeAzFksr0A/jrvSDSDxB5mR7bo0dNGndLXcdTo
      # ZGr6k6pcMpr7RDOAAQDVeaw7f8djQ4Aaelk6v1wPs5bYfNY2ElF4NsqHJFX2Cg==
      # =8lDs
      # -----END PGP SIGNATURE-----
      # gpg: Signature made Fri 07 Jul 2023 03:34:44 PM BST
      # gpg:                using EDDSA key 17EBFF9923D01800AF2838193CD9CA96DE033164
      # gpg:                issuer "danielhb413@gmail.com"
      # gpg: Good signature from "Daniel Henrique Barboza <danielhb413@gmail.com>" [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: 17EB FF99 23D0 1800 AF28  3819 3CD9 CA96 DE03 3164
      
      * tag 'pull-ppc-20230707-1' of https://gitlab.com/danielhb/qemu
      
      : (59 commits)
        ppc/pnv: Add QME region for P10
        target/ppc: Remove pointless checks of CONFIG_USER_ONLY in 'kvm_ppc.h'
        target/ppc: Restrict 'kvm_ppc.h' to sysemu in cpu_init.c
        target/ppc: Define TYPE_HOST_POWERPC_CPU in cpu-qom.h
        target/ppc: Move CPU QOM definitions to cpu-qom.h
        target/ppc: Reorder #ifdef'ry in kvm_ppc.h
        target/ppc: Have 'kvm_ppc.h' include 'sysemu/kvm.h'
        target/ppc: Machine check on invalid real address access on POWER9/10
        tests/qtest: Add xscom tests for powernv10 machine
        ppc/pnv: Set P10 core xscom region size to match hardware
        ppc/pnv: Log all unimp warnings with similar message
        ppc440_pcix: Rename QOM type define abd move it to common header
        ppc4xx_pci: Add define for ppc4xx-host-bridge type name
        ppc4xx_pci: Rename QOM type name define
        ppc440_pcix: Stop using system io region for PCI bus
        ppc440_pcix: Don't use iomem for regs
        ppc/sam460ex: Remove address_space_mem local variable
        ppc440: Remove ppc460ex_pcie_init legacy init function
        ppc440: Add busnum property to PCIe controller model
        ppc440: Stop using system io region for PCIe buses
        ...
      
      Signed-off-by: default avatarRichard Henderson <richard.henderson@linaro.org>
      276d72ca
    • Richard Henderson's avatar
      Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging · 3b08e40b
      Richard Henderson authored
      * Granite Rapids CPU model
      * Miscellaneous bugfixes
      
      # -----BEGIN PGP SIGNATURE-----
      #
      # iQFIBAABCAAyFiEE8TM4V0tmI4mGbHaCv/vSX3jHroMFAmSn7uYUHHBib256aW5p
      # QHJlZGhhdC5jb20ACgkQv/vSX3jHroPi1gf+MJNyMneyyEZgBwlwgs2NYjz+cKwW
      # KxtCOHDfew5S1qpq+gyvUnq5K0JJBGZKoFMwS6JwOpHASGx1o6mlF06CgLAk7wKh
      # yCf1kzvRA4y3tYbSwvxD5iKV3YSsayIHuJ8q2GslVXBtAZ0xC2cREQLzKLNuEV6M
      # rO4bj6QUV2fRc9u9TlurXijsdalUAEjmkIeZhtghhkD+lJo44yzcF7qAROaE3pFa
      # IYEp8pTgcbJeiI0BUNFTRk0OlE5f7MT3GIQwTC34WWPO+r/uBXL5FXNqN38svugh
      # 7hjOliIMU4I6jpL1t7v2+9Vs38gAEPchJ0Nly4TV+dydh7l1pIn9G7ssoA==
      # =OBRZ
      # -----END PGP SIGNATURE-----
      # gpg: Signature made Fri 07 Jul 2023 11:54:30 AM BST
      # gpg:                using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
      # gpg:                issuer "pbonzini@redhat.com"
      # gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [undefined]
      # gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>" [undefined]
      # 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: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
      #      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83
      
      * tag 'for-upstream' of https://gitlab.com/bonzini/qemu
      
      :
        target/i386: Add new CPU model GraniteRapids
        target/i386: Add few security fix bits in ARCH_CAPABILITIES into SapphireRapids CPU model
        target/i386: Add new bit definitions of MSR_IA32_ARCH_CAPABILITIES
        target/i386: Allow MCDT_NO if host supports
        target/i386: Add support for MCDT_NO in CPUID enumeration
        target/i386: Adjust feature level according to FEAT_7_1_EDX
        qemu_cleanup: begin drained section after vm_shutdown()
        meson.build: Remove the logic to link C code with the C++ linker
        python: bump minimum requirements so they are compatible with 3.12
      
      Signed-off-by: default avatarRichard Henderson <richard.henderson@linaro.org>
      3b08e40b
    • Tao Su's avatar
      target/i386: Add new CPU model GraniteRapids · 6d5e9694
      Tao Su authored
      
      The GraniteRapids CPU model mainly adds the following new features
      based on SapphireRapids:
      - PREFETCHITI CPUID.(EAX=7,ECX=1):EDX[bit 14]
      - AMX-FP16 CPUID.(EAX=7,ECX=1):EAX[bit 21]
      
      And adds the following security fix for corresponding vulnerabilities:
      - MCDT_NO CPUID.(EAX=7,ECX=2):EDX[bit 5]
      - SBDR_SSDP_NO MSR_IA32_ARCH_CAPABILITIES[bit 13]
      - FBSDP_NO MSR_IA32_ARCH_CAPABILITIES[bit 14]
      - PSDP_NO MSR_IA32_ARCH_CAPABILITIES[bit 15]
      - PBRSB_NO MSR_IA32_ARCH_CAPABILITIES[bit 24]
      
      Signed-off-by: default avatarTao Su <tao1.su@linux.intel.com>
      Tested-by: default avatarXuelian Guo <xuelian.guo@intel.com>
      Reviewed-by: default avatarXiaoyao Li <xiaoyao.li@intel.com>
      Message-ID: <20230706054949.66556-7-tao1.su@linux.intel.com>
      Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
      6d5e9694
    • Lei Wang's avatar
      target/i386: Add few security fix bits in ARCH_CAPABILITIES into SapphireRapids CPU model · 3baf7ae6
      Lei Wang authored
      
      SapphireRapids has bit 13, 14 and 15 of MSR_IA32_ARCH_CAPABILITIES
      enabled, which are related to some security fixes.
      
      Add version 2 of SapphireRapids CPU model with those bits enabled also.
      
      Signed-off-by: default avatarLei Wang <lei4.wang@intel.com>
      Signed-off-by: default avatarTao Su <tao1.su@linux.intel.com>
      Message-ID: <20230706054949.66556-6-tao1.su@linux.intel.com>
      Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
      3baf7ae6
    • Tao Su's avatar
      target/i386: Add new bit definitions of MSR_IA32_ARCH_CAPABILITIES · 6c43ec3b
      Tao Su authored
      
      Currently, bit 13, 14, 15 and 24 of MSR_IA32_ARCH_CAPABILITIES are
      disclosed for fixing security issues, so add those bit definitions.
      
      Signed-off-by: default avatarTao Su <tao1.su@linux.intel.com>
      Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
      Message-ID: <20230706054949.66556-5-tao1.su@linux.intel.com>
      Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
      6c43ec3b
    • Tao Su's avatar
      target/i386: Allow MCDT_NO if host supports · ba3709fe
      Tao Su authored
      
      MCDT_NO bit indicates HW contains the security fix and doesn't need to
      be mitigated to avoid data-dependent behaviour for certain instructions.
      It needs no hypervisor support. Treat it as supported regardless of what
      KVM reports.
      
      Signed-off-by: default avatarTao Su <tao1.su@linux.intel.com>
      Reviewed-by: default avatarXiaoyao Li <xiaoyao.li@intel.com>
      Message-ID: <20230706054949.66556-4-tao1.su@linux.intel.com>
      Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
      ba3709fe
    • Tao Su's avatar
      target/i386: Add support for MCDT_NO in CPUID enumeration · 9dd8b710
      Tao Su authored
      
      CPUID.(EAX=7,ECX=2):EDX[bit 5] enumerates MCDT_NO. Processors enumerate
      this bit as 1 do not exhibit MXCSR Configuration Dependent Timing (MCDT)
      behavior and do not need to be mitigated to avoid data-dependent behavior
      for certain instructions.
      
      Since MCDT_NO is in a new sub-leaf, add a new CPUID feature word
      FEAT_7_2_EDX. Also update cpuid_level_func7 by FEAT_7_2_EDX.
      
      Signed-off-by: default avatarTao Su <tao1.su@linux.intel.com>
      Reviewed-by: default avatarXiaoyao Li <xiaoyao.li@intel.com>
      Message-ID: <20230706054949.66556-3-tao1.su@linux.intel.com>
      Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
      9dd8b710
    • Tao Su's avatar
      target/i386: Adjust feature level according to FEAT_7_1_EDX · 8731336e
      Tao Su authored
      
      If FEAT_7_1_EAX is 0 and FEAT_7_1_EDX is non-zero, as is the case
      with a Granite Rapids host and
      '-cpu host,-avx-vnni,-avx512-bf16,-fzrm,-fsrs,-fsrc,-amx-fp16', we can't
      get CPUID_7_1 leaf even though CPUID_7_1_EDX has non-zero value.
      
      Update cpuid_level_func7 according to CPUID_7_1_EDX, otherwise
      guest may report wrong maximum number sub-leaves in leaf 07H.
      
      Fixes: eaaa197d ("target/i386: Add support for AVX-VNNI-INT8 in CPUID enumeration")
      Cc: qemu-stable@nongnu.org
      Signed-off-by: default avatarTao Su <tao1.su@linux.intel.com>
      Reviewed-by: default avatarXiaoyao Li <xiaoyao.li@intel.com>
      Message-ID: <20230706054949.66556-2-tao1.su@linux.intel.com>
      Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
      8731336e
    • Fiona Ebner's avatar
      qemu_cleanup: begin drained section after vm_shutdown() · ca2a5e63
      Fiona Ebner authored
      
      in order to avoid requests being stuck in a BlockBackend's request
      queue during cleanup. Having such requests can lead to a deadlock [0]
      with a virtio-scsi-pci device using iothread that's busy with IO when
      initiating a shutdown with QMP 'quit'.
      
      There is a race where such a queued request can continue sometime
      (maybe after bdrv_child_free()?) during bdrv_root_unref_child() [1].
      The completion will hold the AioContext lock and wait for the BQL
      during SCSI completion, but the main thread will hold the BQL and
      wait for the AioContext as part of bdrv_root_unref_child(), leading to
      the deadlock [0].
      
      [0]:
      
      > Thread 3 (Thread 0x7f3bbd87b700 (LWP 135952) "qemu-system-x86"):
      > #0  __lll_lock_wait (futex=futex@entry=0x564183365f00 <qemu_global_mutex>, private=0) at lowlevellock.c:52
      > #1  0x00007f3bc1c0d843 in __GI___pthread_mutex_lock (mutex=0x564183365f00 <qemu_global_mutex>) at ../nptl/pthread_mutex_lock.c:80
      > #2  0x0000564182939f2e in qemu_mutex_lock_impl (mutex=0x564183365f00 <qemu_global_mutex>, file=0x564182b7f774 "../softmmu/physmem.c", line=2593) at ../util/qemu-thread-posix.c:94
      > #3  0x000056418247cc2a in qemu_mutex_lock_iothread_impl (file=0x564182b7f774 "../softmmu/physmem.c", line=2593) at ../softmmu/cpus.c:504
      > #4  0x00005641826d5325 in prepare_mmio_access (mr=0x5641856148a0) at ../softmmu/physmem.c:2593
      > #5  0x00005641826d6fe7 in address_space_stl_internal (as=0x56418679b310, addr=4276113408, val=16418, attrs=..., result=0x0, endian=DEVICE_LITTLE_ENDIAN) at /home/febner/repos/qemu/memory_ldst.c.inc:318
      > #6  0x00005641826d7154 in address_space_stl_le (as=0x56418679b310, addr=4276113408, val=16418, attrs=..., result=0x0) at /home/febner/repos/qemu/memory_ldst.c.inc:357
      > #7  0x0000564182374b07 in pci_msi_trigger (dev=0x56418679b0d0, msg=...) at ../hw/pci/pci.c:359
      > #8  0x000056418237118b in msi_send_message (dev=0x56418679b0d0, msg=...) at ../hw/pci/msi.c:379
      > #9  0x0000564182372c10 in msix_notify (dev=0x56418679b0d0, vector=8) at ../hw/pci/msix.c:542
      > #10 0x000056418243719c in virtio_pci_notify (d=0x56418679b0d0, vector=8) at ../hw/virtio/virtio-pci.c:77
      > #11 0x00005641826933b0 in virtio_notify_vector (vdev=0x5641867a34a0, vector=8) at ../hw/virtio/virtio.c:1985
      > #12 0x00005641826948d6 in virtio_irq (vq=0x5641867ac078) at ../hw/virtio/virtio.c:2461
      > #13 0x0000564182694978 in virtio_notify (vdev=0x5641867a34a0, vq=0x5641867ac078) at ../hw/virtio/virtio.c:2473
      > #14 0x0000564182665b83 in virtio_scsi_complete_req (req=0x7f3bb000e5d0) at ../hw/scsi/virtio-scsi.c:115
      > #15 0x00005641826670ce in virtio_scsi_complete_cmd_req (req=0x7f3bb000e5d0) at ../hw/scsi/virtio-scsi.c:641
      > #16 0x000056418266736b in virtio_scsi_command_complete (r=0x7f3bb0010560, resid=0) at ../hw/scsi/virtio-scsi.c:712
      > #17 0x000056418239aac6 in scsi_req_complete (req=0x7f3bb0010560, status=2) at ../hw/scsi/scsi-bus.c:1526
      > #18 0x000056418239e090 in scsi_handle_rw_error (r=0x7f3bb0010560, ret=-123, acct_failed=false) at ../hw/scsi/scsi-disk.c:242
      > #19 0x000056418239e13f in scsi_disk_req_check_error (r=0x7f3bb0010560, ret=-123, acct_failed=false) at ../hw/scsi/scsi-disk.c:265
      > #20 0x000056418239e482 in scsi_dma_complete_noio (r=0x7f3bb0010560, ret=-123) at ../hw/scsi/scsi-disk.c:340
      > #21 0x000056418239e5d9 in scsi_dma_complete (opaque=0x7f3bb0010560, ret=-123) at ../hw/scsi/scsi-disk.c:371
      > #22 0x00005641824809ad in dma_complete (dbs=0x7f3bb000d9d0, ret=-123) at ../softmmu/dma-helpers.c:107
      > #23 0x0000564182480a72 in dma_blk_cb (opaque=0x7f3bb000d9d0, ret=-123) at ../softmmu/dma-helpers.c:127
      > #24 0x00005641827bf78a in blk_aio_complete (acb=0x7f3bb00021a0) at ../block/block-backend.c:1563
      > #25 0x00005641827bfa5e in blk_aio_write_entry (opaque=0x7f3bb00021a0) at ../block/block-backend.c:1630
      > #26 0x000056418295638a in coroutine_trampoline (i0=-1342102448, i1=32571) at ../util/coroutine-ucontext.c:177
      > #27 0x00007f3bc0caed40 in ?? () from /lib/x86_64-linux-gnu/libc.so.6
      > #28 0x00007f3bbd8757f0 in ?? ()
      > #29 0x0000000000000000 in ?? ()
      >
      > Thread 1 (Thread 0x7f3bbe3e9280 (LWP 135944) "qemu-system-x86"):
      > #0  __lll_lock_wait (futex=futex@entry=0x5641856f2a00, private=0) at lowlevellock.c:52
      > #1  0x00007f3bc1c0d8d1 in __GI___pthread_mutex_lock (mutex=0x5641856f2a00) at ../nptl/pthread_mutex_lock.c:115
      > #2  0x0000564182939f2e in qemu_mutex_lock_impl (mutex=0x5641856f2a00, file=0x564182c0e319 "../util/async.c", line=728) at ../util/qemu-thread-posix.c:94
      > #3  0x000056418293a140 in qemu_rec_mutex_lock_impl (mutex=0x5641856f2a00, file=0x564182c0e319 "../util/async.c", line=728) at ../util/qemu-thread-posix.c:149
      > #4  0x00005641829532d5 in aio_context_acquire (ctx=0x5641856f29a0) at ../util/async.c:728
      > #5  0x000056418279d5df in bdrv_set_aio_context_commit (opaque=0x5641856e6e50) at ../block.c:7493
      > #6  0x000056418294e288 in tran_commit (tran=0x56418630bfe0) at ../util/transactions.c:87
      > #7  0x000056418279d880 in bdrv_try_change_aio_context (bs=0x5641856f7130, ctx=0x56418548f810, ignore_child=0x0, errp=0x0) at ../block.c:7626
      > #8  0x0000564182793f39 in bdrv_root_unref_child (child=0x5641856f47d0) at ../block.c:3242
      > #9  0x00005641827be137 in blk_remove_bs (blk=0x564185709880) at ../block/block-backend.c:914
      > #10 0x00005641827bd689 in blk_remove_all_bs () at ../block/block-backend.c:583
      > #11 0x0000564182798699 in bdrv_close_all () at ../block.c:5117
      > #12 0x000056418248a5b2 in qemu_cleanup () at ../softmmu/runstate.c:821
      > #13 0x0000564182738603 in qemu_default_main () at ../softmmu/main.c:38
      > #14 0x0000564182738631 in main (argc=30, argv=0x7ffd675a8a48) at ../softmmu/main.c:48
      >
      > (gdb) p *((QemuMutex*)0x5641856f2a00)
      > $1 = {lock = {__data = {__lock = 2, __count = 2, __owner = 135952, ...
      > (gdb) p *((QemuMutex*)0x564183365f00)
      > $2 = {lock = {__data = {__lock = 2, __count = 0, __owner = 135944, ...
      
      [1]:
      
      > Thread 1 "qemu-system-x86" hit Breakpoint 5, bdrv_drain_all_end () at ../block/io.c:551
      > #0  bdrv_drain_all_end () at ../block/io.c:551
      > #1  0x00005569810f0376 in bdrv_graph_wrlock (bs=0x0) at ../block/graph-lock.c:156
      > #2  0x00005569810bd3e0 in bdrv_replace_child_noperm (child=0x556982e2d7d0, new_bs=0x0) at ../block.c:2897
      > #3  0x00005569810bdef2 in bdrv_root_unref_child (child=0x556982e2d7d0) at ../block.c:3227
      > #4  0x00005569810e8137 in blk_remove_bs (blk=0x556982e42880) at ../block/block-backend.c:914
      > #5  0x00005569810e7689 in blk_remove_all_bs () at ../block/block-backend.c:583
      > #6  0x00005569810c2699 in bdrv_close_all () at ../block.c:5117
      > #7  0x0000556980db45b2 in qemu_cleanup () at ../softmmu/runstate.c:821
      > #8  0x0000556981062603 in qemu_default_main () at ../softmmu/main.c:38
      > #9  0x0000556981062631 in main (argc=30, argv=0x7ffd7a82a418) at ../softmmu/main.c:48
      > [Switching to Thread 0x7fe76dab2700 (LWP 103649)]
      >
      > Thread 3 "qemu-system-x86" hit Breakpoint 4, blk_inc_in_flight (blk=0x556982e42880) at ../block/block-backend.c:1505
      > #0  blk_inc_in_flight (blk=0x556982e42880) at ../block/block-backend.c:1505
      > #1  0x00005569810e8f36 in blk_wait_while_drained (blk=0x556982e42880) at ../block/block-backend.c:1312
      > #2  0x00005569810e9231 in blk_co_do_pwritev_part (blk=0x556982e42880, offset=3422961664, bytes=4096, qiov=0x556983028060, qiov_offset=0, flags=0) at ../block/block-backend.c:1402
      > #3  0x00005569810e9a4b in blk_aio_write_entry (opaque=0x556982e2cfa0) at ../block/block-backend.c:1628
      > #4  0x000055698128038a in coroutine_trampoline (i0=-2090057872, i1=21865) at ../util/coroutine-ucontext.c:177
      > #5  0x00007fe770f50d40 in ?? () from /lib/x86_64-linux-gnu/libc.so.6
      > #6  0x00007ffd7a829570 in ?? ()
      > #7  0x0000000000000000 in ?? ()
      
      Signed-off-by: default avatarFiona Ebner <f.ebner@proxmox.com>
      Message-ID: <20230706131418.423713-1-f.ebner@proxmox.com>
      Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
      ca2a5e63
    • Thomas Huth's avatar
      meson.build: Remove the logic to link C code with the C++ linker · 785abf0d
      Thomas Huth authored
      
      We are not mixing C++ with C code anymore, the only remaining
      C++ code in qga/vss-win32/ is used for a plain C++ executable.
      Thus we can remove the hacks for linking C code with the C++ linker
      now to simplify meson.build a little bit, and also to avoid that
      some C++ code sneaks in by accident again.
      
      Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
      Message-ID: <20230706064736.178962-1-thuth@redhat.com>
      Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
      785abf0d
    • Paolo Bonzini's avatar
      python: bump minimum requirements so they are compatible with 3.12 · 3d7b8974
      Paolo Bonzini authored
      
      There are many Python 3.12 issues right now, but a particularly
      problematic one when debugging them is that one cannot even use
      minreqs.txt in a Python 3.12 virtual environment to test with
      locked package versions.
      
      Bump the mypy and wrapt versions to fix this, while remaining
      within the realm of versions compatible with Python 3.7.
      
      This requires a workaround for a mypy false positive
      
          qemu/qmp/qmp_tui.py:350: error: Non-overlapping equality check (left operand type: "Literal[Runstate.DISCONNECTING]", right operand type: "Literal[Runstate.IDLE]")  [comparison-overlap]
      
      where mypy does not realize that self.disconnect() could change
      the value of self.runstate.
      
      Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
      3d7b8974
    • Joel Stanley's avatar
      ppc/pnv: Add QME region for P10 · bdb97596
      Joel Stanley authored
      
      The Quad Management Engine (QME) manages power related settings for its
      quad. The xscom region is separate from the quad xscoms, therefore a new
      region is added. The xscoms in a QME select a given core by selecting
      the forth nibble.
      
      Implement dummy reads for the stop state history (SSH) and special
      wakeup (SPWU) registers. This quietens some sxcom errors when skiboot
      boots on p10.
      
      Power9 does not have a QME.
      
      Signed-off-by: default avatarJoel Stanley <joel@jms.id.au>
      Reviewed-by: default avatarCédric Le Goater <clg@kaod.org>
      Signed-off-by: default avatarJoel Stanley <joel@jms.id.au>
      Message-ID: <20230707071213.9924-1-joel@jms.id.au>
      Signed-off-by: default avatarDaniel Henrique Barboza <danielhb413@gmail.com>
      bdb97596
    • Richard Henderson's avatar
      Merge tag 'net-pull-request' of https://github.com/jasowang/qemu into staging · 4f7c7b40
      Richard Henderson authored
      # -----BEGIN PGP SIGNATURE-----
      # Version: GnuPG v1
      #
      # iQEcBAABAgAGBQJkp86uAAoJEO8Ells5jWIRX00H/1T20eOfMZ+8ZyO32P1DBl5U
      # ZQNl5/rcg5cqjatragwagAHGYzmoegJlY3/JbWju09SPtsgbMT/nQI6EFDfpTHb6
      # 9HB2h+43eHq+OBpmPPsmqVRzjuNi9lUmJ20We4aqJe/VM4/DHMtKW3EXGmORb7cF
      # wjazN5FVn+YQHgA+pckQ79k6h/lJhtLv+MuainS12o8yyCO8OyqP6Bm4lYPbBNpb
      # Im3HXiv05gFuS2P4lD8ZvjcdWalHDzDZW4RzKHlpcic0GBN/rcU3FDqGeOIP8qWL
      # oxokpjd2QmW1rX/TwaweiObEjo/3n7ymRu5PofE3T7e+gnAVfAyqDxrgAU6fMjA=
      # =CGHw
      # -----END PGP SIGNATURE-----
      # gpg: Signature made Fri 07 Jul 2023 09:37:02 AM BST
      # gpg:                using RSA key EF04965B398D6211
      # gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>" [undefined]
      # 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: 215D 46F4 8246 689E C77F  3562 EF04 965B 398D 6211
      
      * tag 'net-pull-request' of https://github.com/jasowang/qemu
      
      :
        igb: Remove obsolete workaround for Windows
        e1000e: Add ICR clearing by corresponding IMS bit
        net: socket: remove net_init_socket()
        net: socket: move fd type checking to its own function
        net: socket: prepare to cleanup net_init_socket()
        hw/net: ftgmac100: Drop the small packet check in the receive path
        hw/net: sunhme: Remove the logic of padding short frames in the receive path
        hw/net: sungem: Remove the logic of padding short frames in the receive path
        hw/net: rtl8139: Remove the logic of padding short frames in the receive path
        hw/net: pcnet: Remove the logic of padding short frames in the receive path
        hw/net: ne2000: Remove the logic of padding short frames in the receive path
        hw/net: i82596: Remove the logic of padding short frames in the receive path
        hw/net: vmxnet3: Remove the logic of padding short frames in the receive path
        hw/net: e1000: Remove the logic of padding short frames in the receive path
        virtio-net: correctly report maximum tx_queue_size value
      
      Signed-off-by: default avatarRichard Henderson <richard.henderson@linaro.org>
      4f7c7b40
    • Akihiko Odaki's avatar
      igb: Remove obsolete workaround for Windows · da9f7f77
      Akihiko Odaki authored
      
      I confirmed it works with Windows even without this workaround. It is
      likely to be a mistake so remove it.
      
      Fixes: 3a977dee ("Intrdocue igb device emulation")
      Signed-off-by: default avatarAkihiko Odaki <akihiko.odaki@daynix.com>
      Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
      da9f7f77
    • Akihiko Odaki's avatar
      e1000e: Add ICR clearing by corresponding IMS bit · e4142700
      Akihiko Odaki authored
      The datasheet does not say what happens when interrupt was asserted
      (ICR.INT_ASSERT=1) and auto mask is *not* active.
      However, section of 13.3.27 the PCIe* GbE Controllers Open Source
      Software Developer’s Manual, which were written for older devices,
      namely 631xESB/632xESB, 82563EB/82564EB, 82571EB/82572EI &
      82573E/82573V/82573L, does say:
      > If IMS = 0b, then the ICR register is always clear-on-read. If IMS is
      > not 0b, but some ICR bit is set where the corresponding IMS bit is not
      > set, then a read does not clear the ICR register. For example, if
      > IMS = 10101010b and ICR = 01010101b, then a read to the ICR register
      > does not clear it. If IMS = 10101010b and ICR = 0101011b, then a read
      > to the ICR register clears it entirely (ICR.INT_ASSERTED = 1b).
      
      Linux does no longer activate auto mask since commit
      0a8047ac68e50e4ccbadcfc6b6b070805b976885 and the real hardware clears
      ICR even in such a case so we also should do so.
      
      Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1707441
      
      
      Signed-off-by: default avatarAndrew Melnychenko <andrew@daynix.com>
      Signed-off-by: default avatarAkihiko Odaki <akihiko.odaki@daynix.com>
      Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
      e4142700
    • Laurent Vivier's avatar
      net: socket: remove net_init_socket() · b6aeee02
      Laurent Vivier authored
      
      Move the file descriptor type checking before doing anything with it.
      If it's not usable, don't close it as it could be in use by another
      part of QEMU, only fail and report an error.
      
      Reviewed-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
      Signed-off-by: default avatarLaurent Vivier <lvivier@redhat.com>
      Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
      b6aeee02
    • Laurent Vivier's avatar
    • Laurent Vivier's avatar
      net: socket: prepare to cleanup net_init_socket() · 006c3fa7
      Laurent Vivier authored
      
      Use directly net_socket_fd_init_stream() and net_socket_fd_init_dgram()
      when the socket type is already known.
      
      Reviewed-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
      Signed-off-by: default avatarLaurent Vivier <lvivier@redhat.com>
      Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
      006c3fa7
    • Bin Meng's avatar
      hw/net: ftgmac100: Drop the small packet check in the receive path · 71e11da1
      Bin Meng authored
      
      Now that we have implemented unified short frames padding in the
      QEMU networking codes, the small packet check logic in the receive
      path is no longer needed.
      
      Suggested-by: default avatarCédric Le Goater <clg@kaod.org>
      Reviewed-by: default avatarCédric Le Goater <clg@kaod.org>
      Signed-off-by: default avatarBin Meng <bmeng@tinylab.org>
      Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
      71e11da1
    • Bin Meng's avatar
      hw/net: sunhme: Remove the logic of padding short frames in the receive path · 0fe0efc9
      Bin Meng authored
      
      Now that we have implemented unified short frames padding in the
      QEMU networking codes, remove the same logic in the NIC codes.
      
      Signed-off-by: default avatarBin Meng <bmeng@tinylab.org>
      Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
      0fe0efc9
    • Bin Meng's avatar
      hw/net: sungem: Remove the logic of padding short frames in the receive path · aee87b43
      Bin Meng authored
      
      Now that we have implemented unified short frames padding in the
      QEMU networking codes, remove the same logic in the NIC codes.
      
      Signed-off-by: default avatarBin Meng <bmeng@tinylab.org>
      Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
      aee87b43
    • Bin Meng's avatar
      hw/net: rtl8139: Remove the logic of padding short frames in the receive path · 63b901bf
      Bin Meng authored
      
      Now that we have implemented unified short frames padding in the
      QEMU networking codes, remove the same logic in the NIC codes.
      
      Signed-off-by: default avatarBin Meng <bmeng@tinylab.org>
      Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
      63b901bf
    • Bin Meng's avatar
      hw/net: pcnet: Remove the logic of padding short frames in the receive path · 6d0d261d
      Bin Meng authored
      
      Now that we have implemented unified short frames padding in the
      QEMU networking codes, remove the same logic in the NIC codes.
      
      Signed-off-by: default avatarBin Meng <bmeng@tinylab.org>
      Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
      6d0d261d
    • Bin Meng's avatar
      hw/net: ne2000: Remove the logic of padding short frames in the receive path · 05db4476
      Bin Meng authored
      
      Now that we have implemented unified short frames padding in the
      QEMU networking codes, remove the same logic in the NIC codes.
      
      Signed-off-by: default avatarBin Meng <bmeng@tinylab.org>
      Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
      05db4476
    • Bin Meng's avatar
      hw/net: i82596: Remove the logic of padding short frames in the receive path · c58da33f
      Bin Meng authored
      
      Now that we have implemented unified short frames padding in the
      QEMU networking codes, remove the same logic in the NIC codes.
      
      Signed-off-by: default avatarBin Meng <bmeng@tinylab.org>
      Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
      c58da33f
    • Bin Meng's avatar
      hw/net: vmxnet3: Remove the logic of padding short frames in the receive path · c445f200
      Bin Meng authored
      
      Now that we have implemented unified short frames padding in the
      QEMU networking codes, remove the same logic in the NIC codes.
      
      This actually reverts commit 40a87c6c.
      
      Signed-off-by: default avatarBin Meng <bmeng@tinylab.org>
      Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
      c445f200
    • Bin Meng's avatar
      hw/net: e1000: Remove the logic of padding short frames in the receive path · 140eae9c
      Bin Meng authored
      
      Now that we have implemented unified short frames padding in the
      QEMU networking codes, remove the same logic in the NIC codes.
      
      This actually reverts commit 78aeb23e.
      
      Signed-off-by: default avatarBin Meng <bmeng@tinylab.org>
      Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
      140eae9c
Loading