qemu-commits
[Top][All Lists]
Advanced

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

[Qemu-commits] [qemu/qemu] 7998b2: hw/pci-host: Use the PCI_BUILD_BDF()


From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] 7998b2: hw/pci-host: Use the PCI_BUILD_BDF() macro from 'h...
Date: Mon, 04 Jan 2021 02:55:00 -0800

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 7998b24b096c972e511fc27e3f98f3794a365115
      
https://github.com/qemu/qemu/commit/7998b24b096c972e511fc27e3f98f3794a365115
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2021-01-04 (Mon, 04 Jan 2021)

  Changed paths:
    M hw/pci-host/bonito.c
    M hw/pci-host/pnv_phb4.c

  Log Message:
  -----------
  hw/pci-host: Use the PCI_BUILD_BDF() macro from 'hw/pci/pci.h'

We already have a generic PCI_BUILD_BDF() macro in "hw/pci/pci.h"
to pack these values, use it.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <20201012124506.3406909-3-philmd@redhat.com>


  Commit: 92cd184077dc556339bc6ba1dfd6633a6929d4bf
      
https://github.com/qemu/qemu/commit/92cd184077dc556339bc6ba1dfd6633a6929d4bf
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2021-01-04 (Mon, 04 Jan 2021)

  Changed paths:
    M hw/pci-host/uninorth.c

  Log Message:
  -----------
  hw/pci-host/uninorth: Use the PCI_FUNC() macro from 'hw/pci/pci.h'

We already have a generic PCI_FUNC() macro in "hw/pci/pci.h" to
extract the PCI function identifier, use it.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <20201012124506.3406909-4-philmd@redhat.com>


  Commit: 0229d39617a05563624286137705e3d16789d40c
      
https://github.com/qemu/qemu/commit/0229d39617a05563624286137705e3d16789d40c
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2021-01-04 (Mon, 04 Jan 2021)

  Changed paths:
    M hw/hppa/dino.c
    M hw/i386/xen/xen-hvm.c
    M hw/isa/piix3.c
    M hw/mips/gt64xxx_pci.c
    M hw/pci-host/bonito.c
    M hw/pci-host/ppce500.c
    M hw/ppc/ppc4xx_pci.c
    M hw/sh4/sh_pci.c

  Log Message:
  -----------
  hw: Use the PCI_SLOT() macro from 'hw/pci/pci.h'

We already have a generic PCI_SLOT() macro in "hw/pci/pci.h"
to extract the PCI slot identifier, use it.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: Paul Durrant <paul@xen.org>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <20201012124506.3406909-5-philmd@redhat.com>


  Commit: bbc025c9d73f97a4f8fdc553fcccaf4282b9019d
      
https://github.com/qemu/qemu/commit/bbc025c9d73f97a4f8fdc553fcccaf4282b9019d
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2021-01-04 (Mon, 04 Jan 2021)

  Changed paths:
    M hw/arm/virt.c
    M hw/pci-host/bonito.c
    M hw/pci-host/uninorth.c

  Log Message:
  -----------
  hw: Use the PCI_DEVFN() macro from 'hw/pci/pci.h'

We already have a generic PCI_DEVFN() macro in "hw/pci/pci.h"
to pack the PCI slot/function identifiers, use it.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Message-Id: <20201012124506.3406909-6-philmd@redhat.com>
Reviewed-by: Huacai Chen <chenhuacai@kernel.org>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <20201231224911.1467352-4-f4bug@amsat.org>


  Commit: 1642f9c8aebdb1741f062c2e4f2ddb5a000b2ebe
      
https://github.com/qemu/qemu/commit/1642f9c8aebdb1741f062c2e4f2ddb5a000b2ebe
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2021-01-04 (Mon, 04 Jan 2021)

  Changed paths:
    M hw/pci-host/bonito.c

  Log Message:
  -----------
  hw/pci-host/bonito: Display hexadecimal value with '0x' prefix

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Huacai Chen <chenhuacai@kernel.org>
Message-Id: <20201231224911.1467352-3-f4bug@amsat.org>


  Commit: e2b6faa34550fa01d8cfb58d9a3cce5967e86875
      
https://github.com/qemu/qemu/commit/e2b6faa34550fa01d8cfb58d9a3cce5967e86875
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2021-01-04 (Mon, 04 Jan 2021)

  Changed paths:
    M hw/pci-host/bonito.c

  Log Message:
  -----------
  hw/pci-host/bonito: Use pci_config_set_interrupt_pin()

Replace pci_set_byte(PCI_INTERRUPT_PIN) by
pci_config_set_interrupt_pin().

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Huacai Chen <chenhuacai@kernel.org>
Message-Id: <20201231224911.1467352-5-f4bug@amsat.org>


  Commit: 5e6969c8382ab5c67520d69af81645aa4dc1dd53
      
https://github.com/qemu/qemu/commit/5e6969c8382ab5c67520d69af81645aa4dc1dd53
  Author: BALATON Zoltan <balaton@eik.bme.hu>
  Date:   2021-01-04 (Mon, 04 Jan 2021)

  Changed paths:
    M hw/isa/vt82c686.c

  Log Message:
  -----------
  vt82c686: Rename AC97/MC97 parts from VT82C686B to VIA

These parts are common between VT82C686B and VT8231 so can be shared
in the future. Rename them to VIA prefix accordingly.

Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: 
<510ddb17836a2c2e68a27cf2dcaee420bc2efbc1.1609584215.git.balaton@eik.bme.hu>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


  Commit: 0edbcac1a4bb4c43db668e6a65d8dba18c7df98f
      
https://github.com/qemu/qemu/commit/0edbcac1a4bb4c43db668e6a65d8dba18c7df98f
  Author: BALATON Zoltan <balaton@eik.bme.hu>
  Date:   2021-01-04 (Mon, 04 Jan 2021)

  Changed paths:
    M hw/isa/vt82c686.c

  Log Message:
  -----------
  vt82c686: Remove unnecessary _DEVICE suffix from type macros

There's no reason to suffix everything with _DEVICE when the names are
already unique without it and shorter names are more readable.

Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: 
<ea89683ebb3528c0f79ed99d3d3cfcefb63c3bfb.1609584216.git.balaton@eik.bme.hu>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


  Commit: 41901052ff09f93f2f46d55ecce0079f580a82d4
      
https://github.com/qemu/qemu/commit/41901052ff09f93f2f46d55ecce0079f580a82d4
  Author: BALATON Zoltan <balaton@eik.bme.hu>
  Date:   2021-01-04 (Mon, 04 Jan 2021)

  Changed paths:
    M hw/isa/vt82c686.c

  Log Message:
  -----------
  vt82c686: Rename VT82C686B to VT82C686B_ISA

This is really the ISA bridge part so name the type accordingly.

Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: 
<78db2ced4b41a8a775dbc6c97a90db683952c2cb.1609584216.git.balaton@eik.bme.hu>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


  Commit: d88673b7c55cbffb7cad85c6acb3f8e3f2a77f41
      
https://github.com/qemu/qemu/commit/d88673b7c55cbffb7cad85c6acb3f8e3f2a77f41
  Author: BALATON Zoltan <balaton@eik.bme.hu>
  Date:   2021-01-04 (Mon, 04 Jan 2021)

  Changed paths:
    M hw/isa/vt82c686.c
    M hw/mips/fuloong2e.c
    M include/hw/isa/vt82c686.h

  Log Message:
  -----------
  vt82c686: Remove vt82c686b_[am]c97_init() functions

These are legacy init functions that are just equivalent to directly
calling pci_create_simple so do that instead. Also rename objects to
lower case via-ac97 and via-mc97 matching naming of other devices.

Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: 
<1c4373c8aeb6c4fb2a8df2c864b0e91a977a3d7b.1609584216.git.balaton@eik.bme.hu>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


  Commit: a6fd9b6b4af5d47b4a8ad933f4b904f19fea8659
      
https://github.com/qemu/qemu/commit/a6fd9b6b4af5d47b4a8ad933f4b904f19fea8659
  Author: BALATON Zoltan <balaton@eik.bme.hu>
  Date:   2021-01-04 (Mon, 04 Jan 2021)

  Changed paths:
    M hw/audio/meson.build
    A hw/audio/via-ac97.c
    M hw/isa/vt82c686.c

  Log Message:
  -----------
  vt82c686: Split off via-[am]c97 into separate file in hw/audio

The via-[am]c97 code is supposed to implement the audio part of VIA
south bridge chips so it is better placed under hw/audio/. Split it
off into a separate file.

Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: 
<af083634e3b9efe67e6c4247cf0185d3fa7b1810.1609584216.git.balaton@eik.bme.hu>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


  Commit: 160baf03bd2f743f678caad6fa8e47cd86526cb6
      
https://github.com/qemu/qemu/commit/160baf03bd2f743f678caad6fa8e47cd86526cb6
  Author: BALATON Zoltan <balaton@eik.bme.hu>
  Date:   2021-01-04 (Mon, 04 Jan 2021)

  Changed paths:
    M hw/audio/via-ac97.c

  Log Message:
  -----------
  audio/via-ac97: Simplify code and set user_creatable to false

Remove some unneded, empty code and set user_creatable to false
(besides being not implemented yet, so does nothing anyway) it's also
normally part of VIA south bridge chips so no need to confuse users
showing them these devices.

Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: 
<c7a5b1ee4c02e304ff70ebfbf269544f3c1f8412.1609584216.git.balaton@eik.bme.hu>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


  Commit: 6bc907e4837be5bcd69acf73d40b31d52910df9d
      
https://github.com/qemu/qemu/commit/6bc907e4837be5bcd69acf73d40b31d52910df9d
  Author: BALATON Zoltan <balaton@eik.bme.hu>
  Date:   2021-01-04 (Mon, 04 Jan 2021)

  Changed paths:
    M hw/isa/vt82c686.c
    M hw/mips/fuloong2e.c
    M include/hw/isa/vt82c686.h

  Log Message:
  -----------
  vt82c686: Remove legacy vt82c686b_isa_init() function

Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: 
<58d7585f979f154b1f1e69fdc026eed6dbc7996f.1609584216.git.balaton@eik.bme.hu>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


  Commit: e1ed2dbb5edc817bbac5f23ba4c3d8a4db8e1346
      
https://github.com/qemu/qemu/commit/e1ed2dbb5edc817bbac5f23ba4c3d8a4db8e1346
  Author: BALATON Zoltan <balaton@eik.bme.hu>
  Date:   2021-01-04 (Mon, 04 Jan 2021)

  Changed paths:
    M hw/isa/vt82c686.c
    M hw/mips/fuloong2e.c
    M include/hw/isa/vt82c686.h

  Log Message:
  -----------
  vt82c686: Remove legacy vt82c686b_pm_init() function

Remove legacy vt82c686b_pm_init() function and also rename
VT82C686B_PM type name to match other device names.

Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: 
<a70982b32f11222d335385b90749abb6cf2e2cce.1609584216.git.balaton@eik.bme.hu>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


  Commit: 9be4d565cf3ff92f1c488913bc1176f21ae19d60
      
https://github.com/qemu/qemu/commit/9be4d565cf3ff92f1c488913bc1176f21ae19d60
  Author: BALATON Zoltan <balaton@eik.bme.hu>
  Date:   2021-01-04 (Mon, 04 Jan 2021)

  Changed paths:
    M hw/isa/trace-events
    M hw/isa/vt82c686.c

  Log Message:
  -----------
  vt82c686: Convert debug printf to trace points

Drop DPRINTF and use trace functions instead. Two debug messages about
unimplemented registers could be converted to qemu_log_mask() but in
reality all registers are currently unimplemented (we just store and
return values of writable regs but do nothing with them). As we
already trace register access there's no need for additional debug
messages so these are just removed and a comment is added as a reminder.

Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: 
<785854022a37035f66d89e70cb6ca1bc0e0d0163.1609584216.git.balaton@eik.bme.hu>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


  Commit: 4952483018091412ae0408c62998e5ec1fc7a0dc
      
https://github.com/qemu/qemu/commit/4952483018091412ae0408c62998e5ec1fc7a0dc
  Author: BALATON Zoltan <balaton@eik.bme.hu>
  Date:   2021-01-04 (Mon, 04 Jan 2021)

  Changed paths:
    M hw/isa/vt82c686.c

  Log Message:
  -----------
  vt82c686: Remove unneeded includes and defines

These are not used or not needed.

Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: 
<35cefcc3518a3395a796bb6ad6fbc308adc65266.1609584216.git.balaton@eik.bme.hu>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


  Commit: c688859e5fa863d18bf05021dd45bd3b144c2b1b
      
https://github.com/qemu/qemu/commit/c688859e5fa863d18bf05021dd45bd3b144c2b1b
  Author: BALATON Zoltan <balaton@eik.bme.hu>
  Date:   2021-01-04 (Mon, 04 Jan 2021)

  Changed paths:
    M hw/isa/vt82c686.c

  Log Message:
  -----------
  vt82c686: Use shorter name for local variable holding object state

Rename local variable holding object state for readability and
consistency.

Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: 
<69655b23df2ecebbf0aff29726f4b4746f5b74de.1609584216.git.balaton@eik.bme.hu>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


  Commit: 131be0a9333add0f4e1130e2235243d6ce253905
      
https://github.com/qemu/qemu/commit/131be0a9333add0f4e1130e2235243d6ce253905
  Author: BALATON Zoltan <balaton@eik.bme.hu>
  Date:   2021-01-04 (Mon, 04 Jan 2021)

  Changed paths:
    M hw/isa/vt82c686.c

  Log Message:
  -----------
  vt82c686: Rename superio config related parts

Use less confusing naming for superio config register handling related
parts that makes it clearer what belongs to this part.

Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: 
<4d30a2b4b771b2ad651509885daae79d7c4fe7a8.1609584216.git.balaton@eik.bme.hu>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


  Commit: b6085dd7a9af18ffec4468b737b98fa5f734e73b
      
https://github.com/qemu/qemu/commit/b6085dd7a9af18ffec4468b737b98fa5f734e73b
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-01-04 (Mon, 04 Jan 2021)

  Changed paths:
    M docs/devel/clocks.rst
    M include/hw/clock.h

  Log Message:
  -----------
  clock: Introduce clock_ticks_to_ns()

The clock_get_ns() API claims to return the period of a clock in
nanoseconds. Unfortunately since it returns an integer and a
clock's period is represented in units of 2^-32 nanoseconds,
the result is often an approximation, and calculating a clock
expiry deadline by multiplying clock_get_ns() by a number-of-ticks
is unacceptably inaccurate.

Introduce a new API clock_ticks_to_ns() which returns the number
of nanoseconds it takes the clock to make a given number of ticks.
This function can do the complete calculation internally and
will thus give a more accurate result.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Luc Michel <luc@lmichel.fr>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20201215150929.30311-2-peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


  Commit: 777abeecc8dc81dd76e9e3e613d097ff568372bf
      
https://github.com/qemu/qemu/commit/777abeecc8dc81dd76e9e3e613d097ff568372bf
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-01-04 (Mon, 04 Jan 2021)

  Changed paths:
    M target/mips/cpu.c

  Log Message:
  -----------
  target/mips: Don't use clock_get_ns() in clock period calculation

Currently the MIPS code uses the old clock_get_ns() API to
calculate a time length in nanoseconds:
 cpu->cp0_count_rate * clock_get_ns(MIPS_CPU(cpu)->clock)

This relies on the clock having a period which is an exact number
of nanoseconds.

Switch to the new clock_ticks_to_ns() function, which does the
multiplication internally at a higher precision.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Luc Michel <luc@lmichel.fr>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20201215150929.30311-3-peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


  Commit: 46d73777cb4d77daf85d4477ab644f1f61ddb387
      
https://github.com/qemu/qemu/commit/46d73777cb4d77daf85d4477ab644f1f61ddb387
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-01-04 (Mon, 04 Jan 2021)

  Changed paths:
    M docs/devel/clocks.rst
    M include/hw/clock.h

  Log Message:
  -----------
  clock: Remove clock_get_ns()

Remove the now-unused clock_get_ns() API and the CLOCK_PERIOD_TO_NS()
macro that only it was using.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Luc Michel <luc@lmichel.fr>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20201215150929.30311-4-peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


  Commit: 490751530f871733b7cefd5e3ccdaf62e75efb76
      
https://github.com/qemu/qemu/commit/490751530f871733b7cefd5e3ccdaf62e75efb76
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-01-04 (Mon, 04 Jan 2021)

  Changed paths:
    M docs/devel/clocks.rst
    M hw/core/clock.c
    M include/hw/clock.h
    M softmmu/qdev-monitor.c

  Log Message:
  -----------
  clock: Define and use new clock_display_freq()

It's common to want to print a human-readable indication of a clock's
frequency. Provide a utility function in the clock API to return a
string which is a displayable representation of the frequency,
and use it in qdev-monitor.c.

Before:

  (qemu) info qtree
  [...]
  dev: xilinx,zynq_slcr, id ""
    clock-in "ps_clk" freq_hz=3.333333e+07
    mmio 00000000f8000000/0000000000001000

After:

  dev: xilinx,zynq_slcr, id ""
    clock-in "ps_clk" freq_hz=33.3 MHz
    mmio 00000000f8000000/0000000000001000

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Luc Michel <luc@lmichel.fr>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20201215150929.30311-5-peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


  Commit: 04e7030b481746ed7e6010d9e5c5701ea4a82e2b
      
https://github.com/qemu/qemu/commit/04e7030b481746ed7e6010d9e5c5701ea4a82e2b
  Author: Huacai Chen <chenhuacai@kernel.org>
  Date:   2021-01-04 (Mon, 04 Jan 2021)

  Changed paths:
    M hw/intc/loongson_liointc.c
    A include/hw/intc/loongson_liointc.h

  Log Message:
  -----------
  hw/intc: Rework Loongson LIOINTC

As suggested by Philippe Mathieu-Daudé, rework Loongson's liointc:
1, Move macro definitions to loongson_liointc.h;
2, Remove magic values and use macros instead;
3, Replace dead D() code by trace events.

Suggested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Huacai Chen <chenhuacai@kernel.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20201221110538.3186646-2-chenhuacai@kernel.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


  Commit: fc0777a0b4cee55b73f4ce3d5aa54e478412b26b
      
https://github.com/qemu/qemu/commit/fc0777a0b4cee55b73f4ce3d5aa54e478412b26b
  Author: Huacai Chen <chenhuacai@kernel.org>
  Date:   2021-01-04 (Mon, 04 Jan 2021)

  Changed paths:
    M hw/mips/Kconfig
    A hw/mips/fw_cfg.c
    A hw/mips/fw_cfg.h
    M hw/mips/meson.build

  Log Message:
  -----------
  hw/mips: Implement fw_cfg_arch_key_name()

Implement fw_cfg_arch_key_name(), which returns the name of a
mips-specific key.

Co-developed-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Signed-off-by: Huacai Chen <chenhuacai@kernel.org>
Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20201221110538.3186646-3-chenhuacai@kernel.org>
[PMD: Add FW_CFG_MIPS Kconfig selector]
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


  Commit: 8599f48eae1c20190fe42a9a0c1942a81e788380
      
https://github.com/qemu/qemu/commit/8599f48eae1c20190fe42a9a0c1942a81e788380
  Author: Huacai Chen <chenhuacai@kernel.org>
  Date:   2021-01-04 (Mon, 04 Jan 2021)

  Changed paths:
    M MAINTAINERS
    A hw/mips/loongson3_bootp.c
    A hw/mips/loongson3_bootp.h
    M hw/mips/meson.build

  Log Message:
  -----------
  hw/mips: Add Loongson-3 boot parameter helpers

Preparing to add Loongson-3 machine support, add Loongson-3's LEFI (a
UEFI-like interface for BIOS-Kernel boot parameters) helpers first.

Co-developed-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Signed-off-by: Huacai Chen <chenhuacai@kernel.org>
Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20201221110538.3186646-4-chenhuacai@kernel.org>
[PMD: Fixed typo]
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


  Commit: 296a0d134dfb65837c732254d4645962744e4abd
      
https://github.com/qemu/qemu/commit/296a0d134dfb65837c732254d4645962744e4abd
  Author: Huacai Chen <chenhuacai@kernel.org>
  Date:   2021-01-04 (Mon, 04 Jan 2021)

  Changed paths:
    M MAINTAINERS
    M default-configs/devices/mips64el-softmmu.mak
    M hw/mips/Kconfig
    A hw/mips/loongson3_virt.c
    M hw/mips/meson.build

  Log Message:
  -----------
  hw/mips: Add Loongson-3 machine support

Add Loongson-3 based machine support, it use liointc as the interrupt
controler and use GPEX as the pci controller. Currently it can work with
both TCG and KVM.

As the machine model is not based on any exiting physical hardware, the
name of the machine is "loongson3-virt". It may be superseded in future
by a real machine model. If this happens, then a regular deprecation
procedure shall occur for "loongson3-virt" machine.

We now already have a full functional Linux kernel (based on Linux-5.4.x
LTS) here:

https://github.com/chenhuacai/linux

Of course the upstream kernel is also usable (the kvm host side and
guest side have both been upstream in Linux-5.9):

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

How to use QEMU/Loongson-3?
1, Download kernel source from the above URL;
2, Build a kernel with arch/mips/configs/loongson3_defconfig;
3, Boot a Loongson-3A4000 host with this kernel (for KVM mode);
4, Build QEMU-master with this patchset;
5, modprobe kvm (only necessary for KVM mode);
6, Use QEMU with TCG:
       qemu-system-mips64el -M loongson3-virt,accel=tcg -cpu Loongson-3A1000 
-kernel <path_to_kernel> -append ...
   Use QEMU with KVM:
       qemu-system-mips64el -M loongson3-virt,accel=kvm -cpu Loongson-3A4000 
-kernel <path_to_kernel> -append ...

   The "-cpu" parameter is optional here and QEMU will use the correct type for 
TCG/KVM automatically.

Co-developed-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Signed-off-by: Huacai Chen <chenhuacai@kernel.org>
Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Message-Id: <20201221110538.3186646-5-chenhuacai@kernel.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
[PMD: Select FW_CFG_MIPS in Kconfig]
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


  Commit: 85af88ad791b93525fc0d32015b7205e8a7e36a6
      
https://github.com/qemu/qemu/commit/85af88ad791b93525fc0d32015b7205e8a7e36a6
  Author: Huacai Chen <chenhuacai@kernel.org>
  Date:   2021-01-04 (Mon, 04 Jan 2021)

  Changed paths:
    M docs/system/target-mips.rst

  Log Message:
  -----------
  docs/system: Update MIPS machine documentation

Update MIPS machine documentation to add Loongson-3 based machine description.

Signed-off-by: Huacai Chen <chenhuacai@kernel.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20201221110538.3186646-6-chenhuacai@kernel.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


  Commit: 20528e2d2124dbe908fcd4b3830dc83db1892338
      
https://github.com/qemu/qemu/commit/20528e2d2124dbe908fcd4b3830dc83db1892338
  Author: Jiaxun Yang <jiaxun.yang@flygoat.com>
  Date:   2021-01-04 (Mon, 04 Jan 2021)

  Changed paths:
    M hw/mips/fuloong2e.c
    M hw/mips/malta.c
    M hw/mips/mipssim.c

  Log Message:
  -----------
  hw/mips: Make bootloader addresses unsigned

Address should be unsigned anyway, otherwise it may carry
calculations wrongly.

Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20201215064200.28751-2-jiaxun.yang@flygoat.com>
[PMD: Fixed typo and convert hw/mips/mipssim.c too]
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


  Commit: 850f5f44c1d3bbf1cdbde1260366378fa3dff929
      
https://github.com/qemu/qemu/commit/850f5f44c1d3bbf1cdbde1260366378fa3dff929
  Author: Jiaxun Yang <jiaxun.yang@flygoat.com>
  Date:   2021-01-04 (Mon, 04 Jan 2021)

  Changed paths:
    M hw/mips/malta.c

  Log Message:
  -----------
  hw/mips/malta: Use address translation helper to calculate bootloader_run_addr

So it will sign extend adresses properly.

Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20201215064200.28751-3-jiaxun.yang@flygoat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


  Commit: 01ca815cbbb9019f4b7536d6e87c7f2079c58b54
      
https://github.com/qemu/qemu/commit/01ca815cbbb9019f4b7536d6e87c7f2079c58b54
  Author: Jiaxun Yang <jiaxun.yang@flygoat.com>
  Date:   2021-01-04 (Mon, 04 Jan 2021)

  Changed paths:
    M hw/mips/fuloong2e.c
    M hw/mips/malta.c

  Log Message:
  -----------
  hw/mips: Use address translation helper to handle ENVP_ADDR

It will signed extend vaddr properly.

Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20201215064200.28751-4-jiaxun.yang@flygoat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


  Commit: 679068844348c48b0f193ca0b040c87cc5c01966
      
https://github.com/qemu/qemu/commit/679068844348c48b0f193ca0b040c87cc5c01966
  Author: Jiaxun Yang <jiaxun.yang@flygoat.com>
  Date:   2021-01-04 (Mon, 04 Jan 2021)

  Changed paths:
    M hw/mips/fuloong2e.c

  Log Message:
  -----------
  hw/mips/fuloong2e: Remove define DEBUG_FULOONG2E_INIT

Seems useless....

Fixes: 051c190bce5 ("MIPS: Initial support of fulong mini pc (machine 
construction)")
Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Huacai Chen <chenhuacai@kernel.org>
Message-Id: <20201224031750.52146-2-jiaxun.yang@flygoat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


  Commit: 2137d8f2fdbe052ddb48dab789936594ad65d15b
      
https://github.com/qemu/qemu/commit/2137d8f2fdbe052ddb48dab789936594ad65d15b
  Author: Jiaxun Yang <jiaxun.yang@flygoat.com>
  Date:   2021-01-04 (Mon, 04 Jan 2021)

  Changed paths:
    M hw/mips/fuloong2e.c

  Log Message:
  -----------
  hw/mips/fuloong2e: Replace faulty documentation links

Websites are downing, but GitHub may last forever.
Loongson even doesn't recogonize 2E as their products nowadays..

Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Huacai Chen <chenhuacai@kernel.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20201224031750.52146-3-jiaxun.yang@flygoat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


  Commit: 2a18348eb42aa63146468186f3a6e6cf40a14e5a
      
https://github.com/qemu/qemu/commit/2a18348eb42aa63146468186f3a6e6cf40a14e5a
  Author: Jiaxun Yang <jiaxun.yang@flygoat.com>
  Date:   2021-01-04 (Mon, 04 Jan 2021)

  Changed paths:
    M hw/mips/fuloong2e.c

  Log Message:
  -----------
  hw/mips/fuloong2e: Remove unused env entry

modetty is not handled by kernel and the parameter
here seems unreasonable.

Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Message-Id: <20201224031750.52146-6-jiaxun.yang@flygoat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
[PMD: Do not remove busclock]
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


  Commit: 650abe9f21ed7eef2cdd4a855e48ce5f14e616f0
      
https://github.com/qemu/qemu/commit/650abe9f21ed7eef2cdd4a855e48ce5f14e616f0
  Author: Jiaxun Yang <jiaxun.yang@flygoat.com>
  Date:   2021-01-04 (Mon, 04 Jan 2021)

  Changed paths:
    M hw/mips/fuloong2e.c

  Log Message:
  -----------
  hw/mips/fuloong2e: Correct cpuclock in PROM environment

Missed in 3ca7639ff00 ("hw/mips/fuloong2e: Set CPU frequency
to 533 MHz"), we need to tell the kernel the correct clock.

Fixes: 3ca7639ff00 ("hw/mips/fuloong2e: Set CPU frequency to 533 MHz").
Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Reviewed-by: Huacai Chen <chenhuacai@kernel.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20201224031750.52146-7-jiaxun.yang@flygoat.com>
[PMD: Reworded]
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


  Commit: df8e4ce1f4e03aa908c46633d8b1369c9c0dcdfa
      
https://github.com/qemu/qemu/commit/df8e4ce1f4e03aa908c46633d8b1369c9c0dcdfa
  Author: Jiaxun Yang <jiaxun.yang@flygoat.com>
  Date:   2021-01-04 (Mon, 04 Jan 2021)

  Changed paths:
    M tests/acceptance/boot_linux_console.py

  Log Message:
  -----------
  tests/acceptance: Test boot_linux_console for fuloong2e

The kernel comes from debian archive so it's trusted.

Invoking the test can be done as follows:

  $ avocado --show=app,console run -t machine:fuloong2e tests/acceptance/
   (1/1) 
tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_mips64el_fuloong2e:
  console: [    0.000000] Initializing cgroup subsys cpuset
  console: [    0.000000] Initializing cgroup subsys cpu
  console: [    0.000000] Initializing cgroup subsys cpuacct
  console: [    0.000000] Linux version 3.16.0-6-loongson-2e 
(debian-kernel@lists.debian.org) (gcc version 4.8.4 (Debian 4.8.4-1) ) #1 
Debian 3.16.56-1+deb8u1 (2018-05-08)
  console: [    0.000000] memsize=256, highmemsize=0
  console: [    0.000000] CpuClock = 533080000
  console: [    0.000000] bootconsole [early0] enabled
  console: [    0.000000] CPU0 revision is: 00006302 (ICT Loongson-2)
  console: [    0.000000] FPU revision is: 00000501
  console: [    0.000000] Checking for the multiply/shift bug... no.
  console: [    0.000000] Checking for the daddiu bug... no.
  console: [    0.000000] Determined physical RAM map:
  console: [    0.000000]  memory: 0000000010000000 @ 0000000000000000 (usable)
  console: [    0.000000]  memory: 0000000004000000 @ 0000000010000000 
(reserved)
  console: [    0.000000]  memory: 0000000003ffffff @ 000000001c000001 
(reserved)
  console: [    0.000000] Initrd not found or empty - disabling initrd
  console: [    0.000000] Zone ranges:
  console: [    0.000000]   DMA      [mem 0x00000000-0x00ffffff]
  console: [    0.000000]   Normal   [mem 0x01000000-0x0fffffff]
  console: [    0.000000] Movable zone start for each node
  console: [    0.000000] Early memory node ranges
  console: [    0.000000]   node   0: [mem 0x00000000-0x0fffffff]
  console: [    0.000000] Reserving 0MB of memory at 0MB for crashkernel
  console: [    0.000000] Primary instruction cache 64kB, VIPT, direct mapped, 
linesize 32 bytes.
  console: [    0.000000] Primary data cache 64kB, 4-way, VIPT, no aliases, 
linesize 32 bytes
  console: [    0.000000] Unified secondary cache 512kB 4-way, linesize 32 
bytes.
  console: [    0.000000] Built 1 zonelists in Zone order, mobility grouping 
on.  Total pages: 16327
  console: [    0.000000] Kernel command line: printk.time=0 console=ttyS0
  PASS (2.27 s)

Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Reviewed-by: Huacai Chen <chenhuacai@kernel.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20201224031750.52146-9-jiaxun.yang@flygoat.com>
[PMD: Added command line example]
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


  Commit: 42a37b6289dac64ada7f29db13e34e03949883bd
      
https://github.com/qemu/qemu/commit/42a37b6289dac64ada7f29db13e34e03949883bd
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-01-04 (Mon, 04 Jan 2021)

  Changed paths:
    M MAINTAINERS
    M default-configs/devices/mips64el-softmmu.mak
    M docs/devel/clocks.rst
    M docs/system/target-mips.rst
    M hw/arm/virt.c
    M hw/audio/meson.build
    A hw/audio/via-ac97.c
    M hw/core/clock.c
    M hw/hppa/dino.c
    M hw/i386/xen/xen-hvm.c
    M hw/intc/loongson_liointc.c
    M hw/isa/piix3.c
    M hw/isa/trace-events
    M hw/isa/vt82c686.c
    M hw/mips/Kconfig
    M hw/mips/fuloong2e.c
    A hw/mips/fw_cfg.c
    A hw/mips/fw_cfg.h
    M hw/mips/gt64xxx_pci.c
    A hw/mips/loongson3_bootp.c
    A hw/mips/loongson3_bootp.h
    A hw/mips/loongson3_virt.c
    M hw/mips/malta.c
    M hw/mips/meson.build
    M hw/mips/mipssim.c
    M hw/pci-host/bonito.c
    M hw/pci-host/pnv_phb4.c
    M hw/pci-host/ppce500.c
    M hw/pci-host/uninorth.c
    M hw/ppc/ppc4xx_pci.c
    M hw/sh4/sh_pci.c
    M include/hw/clock.h
    A include/hw/intc/loongson_liointc.h
    M include/hw/isa/vt82c686.h
    M softmmu/qdev-monitor.c
    M target/mips/cpu.c
    M tests/acceptance/boot_linux_console.py

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/philmd-gitlab/tags/mips-20210103' into 
staging

MIPS patches queue

- Use PCI macros (Philippe Mathieu-Daudé)
- Clean up VT82C686B south bridge (BALATON Zoltan)
- Introduce clock_ticks_to_ns() (Peter Maydell)
- Add Loongson-3 machine (Huacai Chen)
- Make addresses used by bootloader unsigned (Jiaxun Yang)
- Clean fuloong2e PROM environment (Jiaxun Yang)
- Add integration test of fuloong2e booting Linux (Jiaxun Yang)

# gpg: Signature made Mon 04 Jan 2021 09:52:03 GMT
# 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-gitlab/tags/mips-20210103: (35 commits)
  tests/acceptance: Test boot_linux_console for fuloong2e
  hw/mips/fuloong2e: Correct cpuclock in PROM environment
  hw/mips/fuloong2e: Remove unused env entry
  hw/mips/fuloong2e: Replace faulty documentation links
  hw/mips/fuloong2e: Remove define DEBUG_FULOONG2E_INIT
  hw/mips: Use address translation helper to handle ENVP_ADDR
  hw/mips/malta: Use address translation helper to calculate bootloader_run_addr
  hw/mips: Make bootloader addresses unsigned
  docs/system: Update MIPS machine documentation
  hw/mips: Add Loongson-3 machine support
  hw/mips: Add Loongson-3 boot parameter helpers
  hw/mips: Implement fw_cfg_arch_key_name()
  hw/intc: Rework Loongson LIOINTC
  clock: Define and use new clock_display_freq()
  clock: Remove clock_get_ns()
  target/mips: Don't use clock_get_ns() in clock period calculation
  clock: Introduce clock_ticks_to_ns()
  vt82c686: Rename superio config related parts
  vt82c686: Use shorter name for local variable holding object state
  vt82c686: Remove unneeded includes and defines
  ...

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


Compare: https://github.com/qemu/qemu/compare/41192db33858...42a37b6289da



reply via email to

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