[Qemu-commits] [qemu/qemu] d23048: hw/block/pflash_cfi01: Removed an unused timer

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: d23048c05cf0a1b9d72b6937a087cb5ed0e14e50
      
https://github.com/qemu/qemu/commit/d23048c05cf0a1b9d72b6937a087cb5ed0e14e50
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2020-05-22 (Fri, 22 May 2020)

  Changed paths:
    M hw/block/pflash_cfi01.c

  Log Message:
  -----------
  hw/block/pflash_cfi01: Removed an unused timer

The 'CFI02' NOR flash was introduced in commit 29133e9a0fff, with
timing modelled. One year later, the CFI01 model was introduced
(commit 05ee37ebf630) based on the CFI02 model. As noted in the
header, "It does not support timings". 12 years later, we never
had to model the device timings. Time to remove the unused timer,
we can still add it back if required.

Suggested-by: Laszlo Ersek <address@hidden>
Reviewed-by: Wei Yang <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
Tested-by: Laszlo Ersek <address@hidden>
[Laszlo Ersek: Regression tested EDK2 OVMF IA32X64, ArmVirtQemu Aarch64
https://lists.gnu.org/archive/html/qemu-devel/2019-07/msg04373.html]
Message-Id: <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: aba53a12bd56902e874b168b07c2ecd7a99e7878
      
https://github.com/qemu/qemu/commit/aba53a12bd56902e874b168b07c2ecd7a99e7878
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2020-05-22 (Fri, 22 May 2020)

  Changed paths:
    M hw/block/pflash_cfi01.c

  Log Message:
  -----------
  hw/block/pflash_cfi01: Document use of non-CFI compliant command '0x00'

The command 0x00 is used by this model since its origin (commit
05ee37ebf630). In this commit the command is described with a
amusing '/* ??? */' comment, probably meaning 'FIXME'.

        switch (cmd) {
        case 0x00: /* ??? */
            ...

This comment survived 12 years because the 0x00 value is indeed
not specified by the CFI open standard (as of this commit).

The 'cmd' field is transfered during migration. To keep the
migration feature working with older QEMU version, we have to
take a lot of care with migrated field. We figured out it is
too late to remove a non-specified value from this model
(this would make migration review very complex). It is however
not too late to improve the documentation.

Add few comments to remember this is a special value related
to QEMU, and we won't find information about it on the CFI
spec.

Reviewed-by: Alistair Francis <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 3072182dc177886edabbdc548b4640bb32d82269
      
https://github.com/qemu/qemu/commit/3072182dc177886edabbdc548b4640bb32d82269
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2020-05-22 (Fri, 22 May 2020)

  Changed paths:
    M hw/block/pflash_cfi01.c

  Log Message:
  -----------
  hw/block/pflash_cfi01: Rename 'reset_flash' label as 'mode_read_array'

Rename the 'reset_flash' as 'mode_read_array' to make explicit we
do not reset the device, we simply set its internal state machine
in the READ_ARRAY mode. We do not reset the status register error
bits, as a device reset would do.

Reviewed-by: John Snow <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 1857b9db49770590483be44eb90993c42b2a5a99
      
https://github.com/qemu/qemu/commit/1857b9db49770590483be44eb90993c42b2a5a99
  Author: Mansour Ahmadi <address@hidden>
  Date:   2020-05-22 (Fri, 22 May 2020)

  Changed paths:
    M hw/block/pflash_cfi01.c
    M hw/block/pflash_cfi02.c

  Log Message:
  -----------
  hw/block/pflash: Check return value of blk_pwrite()

When updating the PFLASH file contents, we should check for a
possible failure of blk_pwrite(). Similar to commit 3a688294e.

Reported-by: Coverity (CID 1357678 CHECKED_RETURN)
Signed-off-by: Mansour Ahmadi <address@hidden>
Message-Id: <address@hidden>
[PMD: Add missing "qemu/error-report.h" include and TODO comment]
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: fea8f3ed739536fca027cf56af7f5576f37ef9cd
      
https://github.com/qemu/qemu/commit/fea8f3ed739536fca027cf56af7f5576f37ef9cd
  Author: Peter Maydell <address@hidden>
  Date:   2020-05-22 (Fri, 22 May 2020)

  Changed paths:
    M hw/block/pflash_cfi01.c
    M hw/block/pflash_cfi02.c

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

- Remove unused timer in CFI01 flash,
- Clean up code documentation,
- Silent a long-standing Coverity warning (2016-07-15).

# gpg: Signature made Fri 22 May 2020 18:43:03 BST
# gpg:                using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE
# gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <address@hidden>" 
[full]
# Primary key fingerprint: FAAB E75E 1291 7221 DCFD  6BB2 E3E3 2C2C DEAD C0DE

* remotes/philmd-gitlab/tags/pflash-next-20200522:
  hw/block/pflash: Check return value of blk_pwrite()
  hw/block/pflash_cfi01: Rename 'reset_flash' label as 'mode_read_array'
  hw/block/pflash_cfi01: Document use of non-CFI compliant command '0x00'
  hw/block/pflash_cfi01: Removed an unused timer

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/1cc9c62e4244...fea8f3ed7395