[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] f4c155: aspeed: Remove fake RTC device on ast
|
From: |
Richard Henderson |
|
Subject: |
[Qemu-commits] [qemu/qemu] f4c155: aspeed: Remove fake RTC device on ast2500-evb |
|
Date: |
Wed, 22 Jun 2022 07:27:39 -0700 |
Branch: refs/heads/staging
Home: https://github.com/qemu/qemu
Commit: f4c155dddb430abfb1b759670c7cf21ddd20e904
https://github.com/qemu/qemu/commit/f4c155dddb430abfb1b759670c7cf21ddd20e904
Author: Cédric Le Goater <clg@kaod.org>
Date: 2022-06-22 (Wed, 22 Jun 2022)
Changed paths:
M hw/arm/aspeed.c
Log Message:
-----------
aspeed: Remove fake RTC device on ast2500-evb
The board has no such device. It might have been useful for some tests
in the past, it's not anymore and the same can be achieved on the
command line.
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Commit: 341e21fa135a8940b241aae2662122491983d45b
https://github.com/qemu/qemu/commit/341e21fa135a8940b241aae2662122491983d45b
Author: Cédric Le Goater <clg@kaod.org>
Date: 2022-06-22 (Wed, 22 Jun 2022)
Changed paths:
M tests/avocado/boot_linux_console.py
M tests/avocado/machine_aspeed.py
Log Message:
-----------
test/avocado/machine_aspeed.py: Move OpenBMC tests
It's easier to run. Keep test_arm_ast2600_debian() under the
boot_linux_console.py file because it requires the extract_from_deb()
helper. We could remove it when we have tests for the AST2600.
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Commit: f7bc7da0724faff78122ea9f931c9cc37fa89f87
https://github.com/qemu/qemu/commit/f7bc7da0724faff78122ea9f931c9cc37fa89f87
Author: Cédric Le Goater <clg@kaod.org>
Date: 2022-06-22 (Wed, 22 Jun 2022)
Changed paths:
M tests/avocado/machine_aspeed.py
Log Message:
-----------
test/avocado/machine_aspeed.py: Add tests using buildroot images
Buildroot images are smaller than the OpenBMC images and faster to
run. Built from source using :
http://patchwork.ozlabs.org/project/buildroot/list/?series=303465
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Commit: 7a7308eae085837d54f2d98f988e4ffe543a1c6b
https://github.com/qemu/qemu/commit/7a7308eae085837d54f2d98f988e4ffe543a1c6b
Author: Cédric Le Goater <clg@kaod.org>
Date: 2022-06-22 (Wed, 22 Jun 2022)
Changed paths:
M tests/avocado/machine_aspeed.py
Log Message:
-----------
test/avocado/machine_aspeed.py: Add I2C tests to ast2500-evb
Create a named I2C temperature sensor device on the command line,
instantiate device from Linux since it is not part of the device tree,
and check the temperature is correctly reported under sysfs.
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Commit: 61cf757d1577cdd591d5432c9d9223e52828aa2c
https://github.com/qemu/qemu/commit/61cf757d1577cdd591d5432c9d9223e52828aa2c
Author: Cédric Le Goater <clg@kaod.org>
Date: 2022-06-22 (Wed, 22 Jun 2022)
Changed paths:
M tests/avocado/machine_aspeed.py
Log Message:
-----------
test/avocado/machine_aspeed.py: Add I2C tests to ast2600-evb
Create a named I2C temperature sensor device on the command line,
instantiate device from Linux since it is not part of the device tree,
and check the temperature is correctly reported under sysfs.
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Commit: 3302184f7f2450a50ce03b825d87434a621f949f
https://github.com/qemu/qemu/commit/3302184f7f2450a50ce03b825d87434a621f949f
Author: Cédric Le Goater <clg@kaod.org>
Date: 2022-06-22 (Wed, 22 Jun 2022)
Changed paths:
M tests/avocado/machine_aspeed.py
Log Message:
-----------
test/avocado/machine_aspeed.py: Add an I2C RTC test
Add an RTC device and check that the output of the hwclock command
matches the current year.
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Commit: 4a71d6d32e59ecf02c246037198882e59894db3d
https://github.com/qemu/qemu/commit/4a71d6d32e59ecf02c246037198882e59894db3d
Author: Joe Komlodi <komlodi@google.com>
Date: 2022-06-22 (Wed, 22 Jun 2022)
Changed paths:
M include/hw/registerfields.h
Log Message:
-----------
hw/registerfields: Add shared fields macros
Occasionally a peripheral will have different operating modes, where the
MMIO layout changes, but some of the register fields have the same offsets
and behaviors.
To help support this, we add SHARED_FIELD_XX macros that create SHIFT,
LENGTH, and MASK macros for the fields that are shared across registers,
and accessors for these fields.
An example use may look as follows:
There is a peripheral with registers REG_MODE1 and REG_MODE2 at
different addreses, and both have a field FIELD1 initialized by
SHARED_FIELD().
Depending on what mode the peripheral is operating in, the user could
extract FIELD1 via
SHARED_ARRAY_FIELD_EX32(s->regs, R_REG_MODE1, FIELD1)
or
SHARED_ARRAY_FIELD_EX32(s->regs, R_REG_MODE2, FIELD1)
Signed-off-by: Joe Komlodi <komlodi@google.com>
Change-Id: Id3dc53e7d2f8741c95697cbae69a81bb699fa3cb
Message-Id: <20220331043248.2237838-2-komlodi@google.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Commit: 3be3d6ccf2adbc305645d097fb364753e11edb0f
https://github.com/qemu/qemu/commit/3be3d6ccf2adbc305645d097fb364753e11edb0f
Author: Joe Komlodi <komlodi@google.com>
Date: 2022-06-22 (Wed, 22 Jun 2022)
Changed paths:
M hw/i2c/aspeed_i2c.c
Log Message:
-----------
aspeed: i2c: Migrate to registerfields API
This cleans up some of the field accessing, setting, and clearing
bitwise operations, and wraps them in macros instead.
Signed-off-by: Joe Komlodi <komlodi@google.com>
Change-Id: I33018d6325fa04376e7c29dc4a49ab389a8e333a
Message-Id: <20220331043248.2237838-4-komlodi@google.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Commit: 2260fc6ff3ff384bf384118a9be7aa6bec43b45b
https://github.com/qemu/qemu/commit/2260fc6ff3ff384bf384118a9be7aa6bec43b45b
Author: Joe Komlodi <komlodi@google.com>
Date: 2022-06-22 (Wed, 22 Jun 2022)
Changed paths:
M hw/i2c/aspeed_i2c.c
M include/hw/i2c/aspeed_i2c.h
Log Message:
-----------
aspeed: i2c: Use reg array instead of individual vars
Using a register array will allow us to represent old-mode and new-mode
I2C registers by using the same underlying register array, instead of
adding an entire new set of variables to represent new mode.
As part of this, we also do additional cleanup to use ARRAY_FIELD_
macros instead of FIELD_ macros on registers.
Signed-off-by: Joe Komlodi <komlodi@google.com>
Change-Id: Ib94996b17c361b8490c042b43c99d8abc69332e3
[ clg: use of memset in aspeed_i2c_bus_reset() ]
Message-Id: <20220331043248.2237838-5-komlodi@google.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Commit: ba2cccd64e90f342673e3916dd1c0a8911813903
https://github.com/qemu/qemu/commit/ba2cccd64e90f342673e3916dd1c0a8911813903
Author: Joe Komlodi <komlodi@google.com>
Date: 2022-06-22 (Wed, 22 Jun 2022)
Changed paths:
M hw/i2c/aspeed_i2c.c
M include/hw/i2c/aspeed_i2c.h
Log Message:
-----------
aspeed: i2c: Add new mode support
On AST2600, I2C has a secondary mode, called "new mode", which changes
the layout of registers, adds some minor behavior changes, and
introduces a new way to transfer data called "packet mode".
Most of the bit positions of the fields are the same between old and new
mode, so we use SHARED_FIELD_XX macros to reuse most of the code between
the different modes.
For packet mode, most of the command behavior is the same compared to
other modes, but there are some minor changes to how interrupts are
handled compared to other modes.
Signed-off-by: Joe Komlodi <komlodi@google.com>
Change-Id: I072f8301964f623afc74af1fe50c12e5caef199e
Message-Id: <20220331043248.2237838-6-komlodi@google.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Commit: 0efec47b5f25761cdc476099d8b72a1c1233e07b
https://github.com/qemu/qemu/commit/0efec47b5f25761cdc476099d8b72a1c1233e07b
Author: Joe Komlodi <komlodi@google.com>
Date: 2022-06-22 (Wed, 22 Jun 2022)
Changed paths:
M hw/i2c/aspeed_i2c.c
M hw/i2c/trace-events
Log Message:
-----------
aspeed: i2c: Add PKT_DONE IRQ to trace
Signed-off-by: Joe Komlodi <komlodi@google.com>
Change-Id: I566eb09f4b9016e24570572f367627f6594039f5
Message-Id: <20220331043248.2237838-7-komlodi@google.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Commit: e532cd0485dc4dc0983d4cc95083c592223c02c0
https://github.com/qemu/qemu/commit/e532cd0485dc4dc0983d4cc95083c592223c02c0
Author: Joe Komlodi <komlodi@google.com>
Date: 2022-06-22 (Wed, 22 Jun 2022)
Changed paths:
M hw/i2c/aspeed_i2c.c
M include/hw/i2c/aspeed_i2c.h
Log Message:
-----------
aspeed: i2c: Move regs and helpers to header file
Moves register definitions and short commonly used inlined functiosn to
the header file to help tidy up the implementation file.
Signed-off-by: Joe Komlodi <komlodi@google.com>
Change-Id: I34dff7485b6bbe3c9482715ccd94dbd65dc5f324
Message-Id: <20220331043248.2237838-8-komlodi@google.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Commit: b35802ce318572cbe4d26bbffb3d133e81871c6c
https://github.com/qemu/qemu/commit/b35802ce318572cbe4d26bbffb3d133e81871c6c
Author: Cédric Le Goater <clg@kaod.org>
Date: 2022-06-22 (Wed, 22 Jun 2022)
Changed paths:
M hw/i2c/aspeed_i2c.c
M include/hw/i2c/aspeed_i2c.h
Log Message:
-----------
aspeed/i2c: Add ast1030 controller models
Based on :
https://lore.kernel.org/qemu-devel/20220324100439.478317-2-troy_lee@aspeedtech.com/
Cc: Troy Lee <troy_lee@aspeedtech.com>
Cc: Jamin Lin <jamin_lin@aspeedtech.com>
Cc: Steven Lee <steven_lee@aspeedtech.com>
Reviewed-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Commit: 4c70ab168de424e81db11b3fe14cfb1f160dd1b0
https://github.com/qemu/qemu/commit/4c70ab168de424e81db11b3fe14cfb1f160dd1b0
Author: Troy Lee <troy_lee@aspeedtech.com>
Date: 2022-06-22 (Wed, 22 Jun 2022)
Changed paths:
M hw/arm/aspeed.c
M hw/arm/aspeed_ast10x0.c
Log Message:
-----------
aspeed: Add I2C buses to AST1030 model
Instantiate the I2C buses in AST1030 model and create two slave device
for ast1030-evb.
Signed-off-by: Troy Lee <troy_lee@aspeedtech.com>
Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
Signed-off-by: Steven Lee <steven_lee@aspeedtech.com>
Reviewed-by: Joel Stanley <joel@jms.id.au>
[ clg : - adapted to current AST1030 upstream models
- changed AST2600 to AST1030 in comment
- fixed typo in commit log ]
Message-Id: <20220324100439.478317-3-troy_lee@aspeedtech.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Commit: b03ec4ff0621cc981238ca8531cd102eebd4da89
https://github.com/qemu/qemu/commit/b03ec4ff0621cc981238ca8531cd102eebd4da89
Author: Klaus Jensen <k.jensen@samsung.com>
Date: 2022-06-22 (Wed, 22 Jun 2022)
Changed paths:
M hw/i2c/aspeed_i2c.c
M hw/i2c/trace-events
Log Message:
-----------
hw/i2c/aspeed: rework raise interrupt trace event
Build a single string instead of having several parameters on the trace
event.
Suggested-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
[ clg: simplified trace buffer creation ]
Message-Id: <20220601210831.67259-2-its@irrelevant.dk>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Commit: d72a712ce038df621c227c0843354c553fe91b8a
https://github.com/qemu/qemu/commit/d72a712ce038df621c227c0843354c553fe91b8a
Author: Klaus Jensen <k.jensen@samsung.com>
Date: 2022-06-22 (Wed, 22 Jun 2022)
Changed paths:
M hw/i2c/aspeed_i2c.c
M include/hw/i2c/aspeed_i2c.h
Log Message:
-----------
hw/i2c/aspeed: add DEV_ADDR in old register mode
Add support for writing and reading the device address register in old
register mode.
On the AST2400 (only 1 slave address)
* no upper bits
On the AST2500 (2 possible slave addresses),
* bit[31] : Slave Address match indicator
* bit[30] : Slave Address Receiving pending
On the AST2600 (3 possible slave addresses),
* bit[31-30] : Slave Address match indicator
* bit[29] : Slave Address Receiving pending
The model could be more precise to take into account all fields but
since the Linux driver is masking the register value being set, it
should be fine. See commit 3fb2e2aeafb2 ("i2c: aspeed: disable
additional device addresses on ast2[56]xx") from Zeiv. This can be
addressed later.
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
[ clg: add details to commit log ]
Message-Id: <20220601210831.67259-3-its@irrelevant.dk>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Commit: 33e30f11c7f9069417f14461b1d15a5beae4b3e4
https://github.com/qemu/qemu/commit/33e30f11c7f9069417f14461b1d15a5beae4b3e4
Author: Cédric Le Goater <clg@kaod.org>
Date: 2022-06-22 (Wed, 22 Jun 2022)
Changed paths:
M hw/i2c/aspeed_i2c.c
Log Message:
-----------
aspeed/i2c: Enable SLAVE_ADDR_RX_MATCH always
There is no 'slave match interrupt' enable bit in the Interrupt
Control Register. Consider it is always enabled and extend the mask
value 'bus->regs[intr_ctrl_reg]' with the SLAVE_ADDR_RX_MATCH bit when
the interrupt is raised.
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Commit: 87893cb5f53d9dc8d0747ba3040a27896009f996
https://github.com/qemu/qemu/commit/87893cb5f53d9dc8d0747ba3040a27896009f996
Author: Joel Stanley <joel@jms.id.au>
Date: 2022-06-22 (Wed, 22 Jun 2022)
Changed paths:
M hw/misc/aspeed_hace.c
Log Message:
-----------
aspeed/hace: Add missing newlines to unimp messages
Signed-off-by: Joel Stanley <joel@jms.id.au>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Commit: 92a45bde8cf4257f755ce718fbf7db5f2d607a15
https://github.com/qemu/qemu/commit/92a45bde8cf4257f755ce718fbf7db5f2d607a15
Author: Iris Chen <irischenlj@fb.com>
Date: 2022-06-22 (Wed, 22 Jun 2022)
Changed paths:
M tests/qtest/aspeed_smc-test.c
Log Message:
-----------
hw: m25p80: fixing individual test failure when tests are running in isolation
Signed-off-by: Iris Chen <irischenlj@fb.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Commit: 2b049d2c8dc01de750410f8f1a4eac498c04c723
https://github.com/qemu/qemu/commit/2b049d2c8dc01de750410f8f1a4eac498c04c723
Author: Richard Henderson <richard.henderson@linaro.org>
Date: 2022-06-22 (Wed, 22 Jun 2022)
Changed paths:
M hw/arm/aspeed.c
M hw/arm/aspeed_ast10x0.c
M hw/i2c/aspeed_i2c.c
M hw/i2c/trace-events
M hw/misc/aspeed_hace.c
M include/hw/i2c/aspeed_i2c.h
M include/hw/registerfields.h
M tests/avocado/boot_linux_console.py
M tests/avocado/machine_aspeed.py
M tests/qtest/aspeed_smc-test.c
Log Message:
-----------
Merge tag 'pull-aspeed-20220622' of https://github.com/legoater/qemu into
staging
aspeed queue:
* Extra avocado tests using buildroot images
* Conversion of the I2C model to the registerfield interface
* Support for the I2C new register interface on AST2600
* Various I2C enhancements
* I2C support for the AST1030
* Improvement of the Aspeed SMC and m25p80 qtest
# -----BEGIN PGP SIGNATURE-----
#
# iQIzBAABCAAdFiEEoPZlSPBIlev+awtgUaNDx8/77KEFAmKyzCYACgkQUaNDx8/7
# 7KG+Aw/+MM3BlQfzDhjETkznqFbvp+aDcnKYwd/brizUC1y3paPFGc0xzD05x3QC
# 2th44oYS934UwQ78EMkC0uNed/kHh+6aHaBrq/XylIg7Dbq5QeCBXwRGCNW6tgtc
# K3ZSM20QM+XRCjmo9ys792NYPC+8tYpw7idb2AOeum7ic/ZaeT3h1FX1Mr57I3XE
# PYwDEBEd4hJ3DroYzIP9YQvRBNu8/d5VoiNr3GLfNy3zrkhuJ4D4jUAEbHATG7Gb
# k0A6o6bVAL85AUSq/ksceHqzWAnizh1q1o/k9UP83HIt1S3ghgK6RsAu4+9HKlP4
# lZ6MFfx3Nzf8u2y/FlOiuABEBUNsngjNmLo6B/qe/cZk60/nS56qOWSvuzPxqVDO
# lI++SLY6R1D8q36H4eF/vq/AyLnXBxGqeq0DipPcnZVKdVVHUHppNly5efJ/7cWn
# VybobblU48BCgjc/EoMVEy8L/t/uRjY3wmoKkfKLCObRrlcPxSrLPUP8+j8nR0JG
# zDOh+CrxHTUbJGV6qRmZx9m2HQtbtH5k89UxskkUkscvVDqWhxqdFVnTWfXcmyP8
# LqTkEv7IV4ECM1zN5OVK9No46WCi5j24bxO3z7or4e04vgwjM41unV7HAFl8Z0/s
# tyFQUG4dFAKHH7quU0F3qSxnORNyCy5ssEpmobujeifbiFMpNss=
# =OsUe
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed 22 Jun 2022 01:00:38 AM PDT
# gpg: using RSA key A0F66548F04895EBFE6B0B6051A343C7CFFBECA1
# gpg: Good signature from "Cédric Le Goater <clg@kaod.org>" [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: A0F6 6548 F048 95EB FE6B 0B60 51A3 43C7 CFFB ECA1
* tag 'pull-aspeed-20220622' of https://github.com/legoater/qemu:
hw: m25p80: fixing individual test failure when tests are running in isolation
aspeed/hace: Add missing newlines to unimp messages
aspeed/i2c: Enable SLAVE_ADDR_RX_MATCH always
hw/i2c/aspeed: add DEV_ADDR in old register mode
hw/i2c/aspeed: rework raise interrupt trace event
aspeed: Add I2C buses to AST1030 model
aspeed/i2c: Add ast1030 controller models
aspeed: i2c: Move regs and helpers to header file
aspeed: i2c: Add PKT_DONE IRQ to trace
aspeed: i2c: Add new mode support
aspeed: i2c: Use reg array instead of individual vars
aspeed: i2c: Migrate to registerfields API
hw/registerfields: Add shared fields macros
test/avocado/machine_aspeed.py: Add an I2C RTC test
test/avocado/machine_aspeed.py: Add I2C tests to ast2600-evb
test/avocado/machine_aspeed.py: Add I2C tests to ast2500-evb
test/avocado/machine_aspeed.py: Add tests using buildroot images
test/avocado/machine_aspeed.py: Move OpenBMC tests
aspeed: Remove fake RTC device on ast2500-evb
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Compare: https://github.com/qemu/qemu/compare/06c592195100...2b049d2c8dc0
- [Qemu-commits] [qemu/qemu] f4c155: aspeed: Remove fake RTC device on ast2500-evb,
Richard Henderson <=