* [PULL 00/16] ppc queue
@ 2023-02-05 10:04 Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 01/16] tests/migration: add sysprof-capture-4 as dependency for stress binary Daniel Henrique Barboza
` (16 more replies)
0 siblings, 17 replies; 18+ messages in thread
From: Daniel Henrique Barboza @ 2023-02-05 10:04 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-ppc, danielhb413, peter.maydell
The following changes since commit ceabf6e500570ecfb311d8896c4ba9da8cf21f2a:
Merge tag 'linux-user-for-8.0-pull-request' of https://gitlab.com/laurent_vivier/qemu into staging (2023-02-04 17:17:15 +0000)
are available in the Git repository at:
https://gitlab.com/danielhb/qemu.git tags/pull-ppc-20230205
for you to fetch changes up to bd591dc1b3c39b7f73b8d9f20be6e9001c905238:
hw/display/sm501: Code style fix (2023-02-05 06:40:28 -0300)
----------------------------------------------------------------
ppc patch queue for 2023-02-05:
This queue includes patches that aren't PPC specific but benefit/impact
PPC machines, such as the changes to guestperf.py, mv64361 and sm501. As
for PPC specific changes we have e500 and PNV_PHB5 fixes.
----------------------------------------------------------------
BALATON Zoltan (5):
ppc/pegasos2: Improve readability of VIA south bridge creation
hw/ppc/pegasos2: Fix a typo in a comment
hw/display/sm501: Remove parenthesis around constant macro definitions
hw/display/sm501: Remove unneeded casts from void pointer
hw/display/sm501: Code style fix
Bernhard Beschow (5):
hw/pci-host/mv64361: Reuse pci_swizzle_map_irq_fn
hw/ppc: Set machine->fdt in e500 machines
hw/ppc/e500{, plat}: Drop redundant checks for presence of platform bus
hw/ppc/e500.c: Avoid hardcoding parent device in create_devtree_etsec()
hw/ppc/e500.c: Attach eSDHC unimplemented region to ccsr_addr_space
Frederic Barrat (4):
ppc/pnv/pci: Cleanup PnvPHBPecState structure
ppc/pnv/pci: Remove duplicate definition of PNV_PHB5_DEVICE_ID
ppc/pnv/pci: Update PHB5 version register
ppc/pnv/pci: Fix PHB xscom registers memory region name
Murilo Opsfelder Araujo (2):
tests/migration: add sysprof-capture-4 as dependency for stress binary
tests/migration: add support for ppc64le for guestperf.py
hw/display/sm501.c | 419 ++++++++++++++++++------------------
hw/pci-host/mv64361.c | 7 +-
hw/pci-host/pnv_phb4.c | 2 +-
hw/ppc/e500.c | 24 ++-
hw/ppc/e500plat.c | 9 +-
hw/ppc/pegasos2.c | 16 +-
include/hw/pci-host/pnv_phb4.h | 5 +-
tests/migration/guestperf/engine.py | 28 ++-
tests/migration/meson.build | 4 +-
9 files changed, 268 insertions(+), 246 deletions(-)
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PULL 01/16] tests/migration: add sysprof-capture-4 as dependency for stress binary
2023-02-05 10:04 [PULL 00/16] ppc queue Daniel Henrique Barboza
@ 2023-02-05 10:04 ` Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 02/16] tests/migration: add support for ppc64le for guestperf.py Daniel Henrique Barboza
` (15 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Daniel Henrique Barboza @ 2023-02-05 10:04 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-ppc, danielhb413, peter.maydell, Murilo Opsfelder Araujo,
Juan Quintela
From: Murilo Opsfelder Araujo <muriloo@linux.ibm.com>
`make tests/migration/stress` fails with:
FAILED: tests/migration/stress
cc -m64 -mlittle-endian -o tests/migration/stress tests/migration/stress.p/stress.c.o -Wl,--as-needed -Wl,--no-undefined -pie -Wl,--warn-common -Wl,-z,relro -Wl,-z,now -fstack-protector-strong -static -pthread -Wl,--start-group -lgthread-2.0 -lglib-2.0 -Wl,--end-group
/usr/bin/ld: /usr/lib/gcc/ppc64le-redhat-linux/11/../../../../lib64/libglib-2.0.a(gutils.c.o): in function `.annobin_gutils.c':
(.text+0x3b4): warning: Using 'getpwuid' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking
/usr/bin/ld: (.text+0x178): warning: Using 'getpwnam_r' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking
/usr/bin/ld: (.text+0x1bc): warning: Using 'getpwuid_r' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking
/usr/bin/ld: /usr/lib/gcc/ppc64le-redhat-linux/11/../../../../lib64/libglib-2.0.a(gthread.c.o):(.toc+0x0): undefined reference to `sysprof_clock'
/usr/bin/ld: /usr/lib/gcc/ppc64le-redhat-linux/11/../../../../lib64/libglib-2.0.a(gtrace.c.o): in function `.annobin_gtrace.c':
(.text+0x24): undefined reference to `sysprof_collector_mark_vprintf'
/usr/bin/ld: /usr/lib/gcc/ppc64le-redhat-linux/11/../../../../lib64/libglib-2.0.a(gtrace.c.o): in function `g_trace_define_int64_counter':
(.text+0x8c): undefined reference to `sysprof_collector_request_counters'
/usr/bin/ld: (.text+0x108): undefined reference to `sysprof_collector_define_counters'
/usr/bin/ld: /usr/lib/gcc/ppc64le-redhat-linux/11/../../../../lib64/libglib-2.0.a(gtrace.c.o): in function `g_trace_set_int64_counter':
(.text+0x23c): undefined reference to `sysprof_collector_set_counters'
/usr/bin/ld: /usr/lib/gcc/ppc64le-redhat-linux/11/../../../../lib64/libglib-2.0.a(gspawn.c.o):(.toc+0x0): undefined reference to `sysprof_clock'
/usr/bin/ld: /usr/lib/gcc/ppc64le-redhat-linux/11/../../../../lib64/libglib-2.0.a(gmain.c.o):(.toc+0x0): undefined reference to `sysprof_clock'
collect2: error: ld returned 1 exit status
ninja: build stopped: subcommand failed.
make: *** [Makefile:162: run-ninja] Error 1
Add sysprof-capture-4 as dependency for stress binary.
Tested on:
- CentOS Stream 9 ppc64le
- Fedora 36 x86_64
Signed-off-by: Murilo Opsfelder Araujo <muriloo@linux.ibm.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20220809002451.91541-2-muriloo@linux.ibm.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
tests/migration/meson.build | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tests/migration/meson.build b/tests/migration/meson.build
index f215ee7d3a..dd562355a1 100644
--- a/tests/migration/meson.build
+++ b/tests/migration/meson.build
@@ -1,7 +1,9 @@
+sysprof = dependency('sysprof-capture-4', required: false)
+
stress = executable(
'stress',
files('stress.c'),
- dependencies: [glib],
+ dependencies: [glib, sysprof],
link_args: ['-static'],
build_by_default: false,
)
--
2.39.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PULL 02/16] tests/migration: add support for ppc64le for guestperf.py
2023-02-05 10:04 [PULL 00/16] ppc queue Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 01/16] tests/migration: add sysprof-capture-4 as dependency for stress binary Daniel Henrique Barboza
@ 2023-02-05 10:04 ` Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 03/16] ppc/pegasos2: Improve readability of VIA south bridge creation Daniel Henrique Barboza
` (14 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Daniel Henrique Barboza @ 2023-02-05 10:04 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-ppc, danielhb413, peter.maydell, Murilo Opsfelder Araujo,
Juan Quintela
From: Murilo Opsfelder Araujo <muriloo@linux.ibm.com>
Add support for ppc64le for guestperf.py. On ppc, console is usually
hvc0 and serial device for pseries machine is spapr-vty.
Signed-off-by: Murilo Opsfelder Araujo <muriloo@linux.ibm.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20220809002451.91541-3-muriloo@linux.ibm.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
tests/migration/guestperf/engine.py | 28 +++++++++++++++++++++++++---
1 file changed, 25 insertions(+), 3 deletions(-)
diff --git a/tests/migration/guestperf/engine.py b/tests/migration/guestperf/engine.py
index 59fca2c70b..cc06fac592 100644
--- a/tests/migration/guestperf/engine.py
+++ b/tests/migration/guestperf/engine.py
@@ -281,6 +281,26 @@ def _migrate(self, hardware, scenario, src, dst, connect_uri):
resp = src.command("stop")
paused = True
+ def _is_ppc64le(self):
+ _, _, _, _, machine = os.uname()
+ if machine == "ppc64le":
+ return True
+ return False
+
+ def _get_guest_console_args(self):
+ if self._is_ppc64le():
+ return "console=hvc0"
+ else:
+ return "console=ttyS0"
+
+ def _get_qemu_serial_args(self):
+ if self._is_ppc64le():
+ return ["-chardev", "stdio,id=cdev0",
+ "-device", "spapr-vty,chardev=cdev0"]
+ else:
+ return ["-chardev", "stdio,id=cdev0",
+ "-device", "isa-serial,chardev=cdev0"]
+
def _get_common_args(self, hardware, tunnelled=False):
args = [
"noapic",
@@ -289,8 +309,10 @@ def _get_common_args(self, hardware, tunnelled=False):
"noreplace-smp",
"cgroup_disable=memory",
"pci=noearly",
- "console=ttyS0",
]
+
+ args.append(self._get_guest_console_args())
+
if self._debug:
args.append("debug")
else:
@@ -308,12 +330,12 @@ def _get_common_args(self, hardware, tunnelled=False):
"-kernel", self._kernel,
"-initrd", self._initrd,
"-append", cmdline,
- "-chardev", "stdio,id=cdev0",
- "-device", "isa-serial,chardev=cdev0",
"-m", str((hardware._mem * 1024) + 512),
"-smp", str(hardware._cpus),
]
+ argv.extend(self._get_qemu_serial_args())
+
if self._debug:
argv.extend(["-device", "sga"])
--
2.39.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PULL 03/16] ppc/pegasos2: Improve readability of VIA south bridge creation
2023-02-05 10:04 [PULL 00/16] ppc queue Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 01/16] tests/migration: add sysprof-capture-4 as dependency for stress binary Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 02/16] tests/migration: add support for ppc64le for guestperf.py Daniel Henrique Barboza
@ 2023-02-05 10:04 ` Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 04/16] hw/pci-host/mv64361: Reuse pci_swizzle_map_irq_fn Daniel Henrique Barboza
` (13 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Daniel Henrique Barboza @ 2023-02-05 10:04 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-ppc, danielhb413, peter.maydell, BALATON Zoltan,
Philippe Mathieu-Daudé
From: BALATON Zoltan <balaton@eik.bme.hu>
Slightly improve readability of creating the south btidge by cnamging
type of a local variable to avoid some casts within function arguments
which makes some lines shorter and easier to read.
Also remove an unneded line break.
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230117214545.5E191746369@zero.eik.bme.hu>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
hw/ppc/pegasos2.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/hw/ppc/pegasos2.c b/hw/ppc/pegasos2.c
index f46d4bf51d..1a13632ba6 100644
--- a/hw/ppc/pegasos2.c
+++ b/hw/ppc/pegasos2.c
@@ -102,7 +102,8 @@ static void pegasos2_init(MachineState *machine)
CPUPPCState *env;
MemoryRegion *rom = g_new(MemoryRegion, 1);
PCIBus *pci_bus;
- PCIDevice *dev, *via;
+ Object *via;
+ PCIDevice *dev;
I2CBus *i2c_bus;
const char *fwname = machine->firmware ?: PROM_FILENAME;
char *filename;
@@ -159,19 +160,18 @@ static void pegasos2_init(MachineState *machine)
pci_bus = mv64361_get_pci_bus(pm->mv, 1);
/* VIA VT8231 South Bridge (multifunction PCI device) */
- via = pci_create_simple_multifunction(pci_bus, PCI_DEVFN(12, 0), true,
- TYPE_VT8231_ISA);
+ via = OBJECT(pci_create_simple_multifunction(pci_bus, PCI_DEVFN(12, 0),
+ true, TYPE_VT8231_ISA));
object_property_add_alias(OBJECT(machine), "rtc-time",
- object_resolve_path_component(OBJECT(via),
- "rtc"),
+ object_resolve_path_component(via, "rtc"),
"date");
qdev_connect_gpio_out(DEVICE(via), 0,
qdev_get_gpio_in_named(pm->mv, "gpp", 31));
- dev = PCI_DEVICE(object_resolve_path_component(OBJECT(via), "ide"));
+ dev = PCI_DEVICE(object_resolve_path_component(via, "ide"));
pci_ide_create_devs(dev);
- dev = PCI_DEVICE(object_resolve_path_component(OBJECT(via), "pm"));
+ dev = PCI_DEVICE(object_resolve_path_component(via, "pm"));
i2c_bus = I2C_BUS(qdev_get_child_bus(DEVICE(dev), "i2c"));
spd_data = spd_data_generate(DDR, machine->ram_size);
smbus_eeprom_init_one(i2c_bus, 0x57, spd_data);
--
2.39.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PULL 04/16] hw/pci-host/mv64361: Reuse pci_swizzle_map_irq_fn
2023-02-05 10:04 [PULL 00/16] ppc queue Daniel Henrique Barboza
` (2 preceding siblings ...)
2023-02-05 10:04 ` [PULL 03/16] ppc/pegasos2: Improve readability of VIA south bridge creation Daniel Henrique Barboza
@ 2023-02-05 10:04 ` Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 05/16] hw/ppc: Set machine->fdt in e500 machines Daniel Henrique Barboza
` (12 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Daniel Henrique Barboza @ 2023-02-05 10:04 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-ppc, danielhb413, peter.maydell, Bernhard Beschow,
Philippe Mathieu-Daudé,
BALATON Zoltan
From: Bernhard Beschow <shentey@gmail.com>
mv64361_pcihost_map_irq() is a reimplementation of
pci_swizzle_map_irq_fn(). Resolve this redundancy.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu>
Message-Id: <20230106113927.8603-1-shentey@gmail.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
hw/pci-host/mv64361.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/hw/pci-host/mv64361.c b/hw/pci-host/mv64361.c
index 015b92bd5f..f43f33fbd9 100644
--- a/hw/pci-host/mv64361.c
+++ b/hw/pci-host/mv64361.c
@@ -72,11 +72,6 @@ struct MV64361PCIState {
uint64_t remap[5];
};
-static int mv64361_pcihost_map_irq(PCIDevice *pci_dev, int n)
-{
- return (n + PCI_SLOT(pci_dev->devfn)) % PCI_NUM_PINS;
-}
-
static void mv64361_pcihost_set_irq(void *opaque, int n, int level)
{
MV64361PCIState *s = opaque;
@@ -97,7 +92,7 @@ static void mv64361_pcihost_realize(DeviceState *dev, Error **errp)
g_free(name);
name = g_strdup_printf("pci.%d", s->index);
h->bus = pci_register_root_bus(dev, name, mv64361_pcihost_set_irq,
- mv64361_pcihost_map_irq, dev,
+ pci_swizzle_map_irq_fn, dev,
&s->mem, &s->io, 0, 4, TYPE_PCI_BUS);
g_free(name);
pci_create_simple(h->bus, 0, TYPE_MV64361_PCI_BRIDGE);
--
2.39.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PULL 05/16] hw/ppc: Set machine->fdt in e500 machines
2023-02-05 10:04 [PULL 00/16] ppc queue Daniel Henrique Barboza
` (3 preceding siblings ...)
2023-02-05 10:04 ` [PULL 04/16] hw/pci-host/mv64361: Reuse pci_swizzle_map_irq_fn Daniel Henrique Barboza
@ 2023-02-05 10:04 ` Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 06/16] hw/ppc/e500{, plat}: Drop redundant checks for presence of platform bus Daniel Henrique Barboza
` (11 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Daniel Henrique Barboza @ 2023-02-05 10:04 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-ppc, danielhb413, peter.maydell, Bernhard Beschow
From: Bernhard Beschow <shentey@gmail.com>
This enables support for the 'dumpdtb' QMP/HMP command for all
e500 machines.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Message-Id: <20230125130024.158721-2-shentey@gmail.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
hw/ppc/e500.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index 9fa1f8e6cf..7239993acc 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -659,9 +659,14 @@ done:
if (!dry_run) {
qemu_fdt_dumpdtb(fdt, fdt_size);
cpu_physical_memory_write(addr, fdt, fdt_size);
+
+ /* Set machine->fdt for 'dumpdtb' QMP/HMP command */
+ g_free(machine->fdt);
+ machine->fdt = fdt;
+ } else {
+ g_free(fdt);
}
ret = fdt_size;
- g_free(fdt);
out:
g_free(pci_map);
--
2.39.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PULL 06/16] hw/ppc/e500{, plat}: Drop redundant checks for presence of platform bus
2023-02-05 10:04 [PULL 00/16] ppc queue Daniel Henrique Barboza
` (4 preceding siblings ...)
2023-02-05 10:04 ` [PULL 05/16] hw/ppc: Set machine->fdt in e500 machines Daniel Henrique Barboza
@ 2023-02-05 10:04 ` Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 07/16] hw/ppc/e500.c: Avoid hardcoding parent device in create_devtree_etsec() Daniel Henrique Barboza
` (10 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Daniel Henrique Barboza @ 2023-02-05 10:04 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-ppc, danielhb413, peter.maydell, Bernhard Beschow
From: Bernhard Beschow <shentey@gmail.com>
This is a follow-up on commit 47a0b1dff7e9 'hw/ppc/mpc8544ds: Add
platform bus': Both mpc85xx boards now have a platform bus
unconditionally.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Message-Id: <20230125130024.158721-3-shentey@gmail.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
hw/ppc/e500.c | 5 ++---
hw/ppc/e500plat.c | 9 +++------
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index 7239993acc..48288c0b41 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -643,9 +643,8 @@ static int ppce500_load_device_tree(PPCE500MachineState *pms,
}
g_free(soc);
- if (pms->pbus_dev) {
- platform_bus_create_devtree(pms, fdt, mpic);
- }
+ platform_bus_create_devtree(pms, fdt, mpic);
+
g_free(mpic);
pmc->fixup_devtree(fdt);
diff --git a/hw/ppc/e500plat.c b/hw/ppc/e500plat.c
index 44bf874b0f..3032bd3f6d 100644
--- a/hw/ppc/e500plat.c
+++ b/hw/ppc/e500plat.c
@@ -46,13 +46,10 @@ static void e500plat_machine_device_plug_cb(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp)
{
PPCE500MachineState *pms = PPCE500_MACHINE(hotplug_dev);
+ MachineClass *mc = MACHINE_GET_CLASS(pms);
- if (pms->pbus_dev) {
- MachineClass *mc = MACHINE_GET_CLASS(pms);
-
- if (device_is_dynamic_sysbus(mc, dev)) {
- platform_bus_link_device(pms->pbus_dev, SYS_BUS_DEVICE(dev));
- }
+ if (device_is_dynamic_sysbus(mc, dev)) {
+ platform_bus_link_device(pms->pbus_dev, SYS_BUS_DEVICE(dev));
}
}
--
2.39.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PULL 07/16] hw/ppc/e500.c: Avoid hardcoding parent device in create_devtree_etsec()
2023-02-05 10:04 [PULL 00/16] ppc queue Daniel Henrique Barboza
` (5 preceding siblings ...)
2023-02-05 10:04 ` [PULL 06/16] hw/ppc/e500{, plat}: Drop redundant checks for presence of platform bus Daniel Henrique Barboza
@ 2023-02-05 10:04 ` Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 08/16] hw/ppc/e500.c: Attach eSDHC unimplemented region to ccsr_addr_space Daniel Henrique Barboza
` (9 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Daniel Henrique Barboza @ 2023-02-05 10:04 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-ppc, danielhb413, peter.maydell, Bernhard Beschow
From: Bernhard Beschow <shentey@gmail.com>
The "platform" node is available through data->node, so use that instead
of making assumptions about the parent device.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Message-Id: <20230125130024.158721-4-shentey@gmail.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
hw/ppc/e500.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index 48288c0b41..e3b29d1d97 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -241,7 +241,7 @@ static int create_devtree_etsec(SysBusDevice *sbdev, PlatformDevtreeData *data)
int irq0 = platform_bus_get_irqn(pbus, sbdev, 0);
int irq1 = platform_bus_get_irqn(pbus, sbdev, 1);
int irq2 = platform_bus_get_irqn(pbus, sbdev, 2);
- gchar *node = g_strdup_printf("/platform/ethernet@%"PRIx64, mmio0);
+ gchar *node = g_strdup_printf("%s/ethernet@%"PRIx64, data->node, mmio0);
gchar *group = g_strdup_printf("%s/queue-group", node);
void *fdt = data->fdt;
--
2.39.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PULL 08/16] hw/ppc/e500.c: Attach eSDHC unimplemented region to ccsr_addr_space
2023-02-05 10:04 [PULL 00/16] ppc queue Daniel Henrique Barboza
` (6 preceding siblings ...)
2023-02-05 10:04 ` [PULL 07/16] hw/ppc/e500.c: Avoid hardcoding parent device in create_devtree_etsec() Daniel Henrique Barboza
@ 2023-02-05 10:04 ` Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 09/16] ppc/pnv/pci: Cleanup PnvPHBPecState structure Daniel Henrique Barboza
` (8 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Daniel Henrique Barboza @ 2023-02-05 10:04 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-ppc, danielhb413, peter.maydell, Bernhard Beschow,
Philippe Mathieu-Daudé
From: Bernhard Beschow <shentey@gmail.com>
Makes the unimplemented region move together with the CCSR address space
if moved by a bootloader. Moving the CCSR address space isn't
implemented yet but this patch is a preparation for it.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230125130024.158721-5-shentey@gmail.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
hw/ppc/e500.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index e3b29d1d97..117c9c08ed 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -1022,9 +1022,13 @@ void ppce500_init(MachineState *machine)
/* eSDHC */
if (pmc->has_esdhc) {
- create_unimplemented_device("esdhc",
- pmc->ccsrbar_base + MPC85XX_ESDHC_REGS_OFFSET,
- MPC85XX_ESDHC_REGS_SIZE);
+ dev = qdev_new(TYPE_UNIMPLEMENTED_DEVICE);
+ qdev_prop_set_string(dev, "name", "esdhc");
+ qdev_prop_set_uint64(dev, "size", MPC85XX_ESDHC_REGS_SIZE);
+ s = SYS_BUS_DEVICE(dev);
+ sysbus_realize_and_unref(s, &error_fatal);
+ memory_region_add_subregion(ccsr_addr_space, MPC85XX_ESDHC_REGS_OFFSET,
+ sysbus_mmio_get_region(s, 0));
/*
* Compatible with:
--
2.39.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PULL 09/16] ppc/pnv/pci: Cleanup PnvPHBPecState structure
2023-02-05 10:04 [PULL 00/16] ppc queue Daniel Henrique Barboza
` (7 preceding siblings ...)
2023-02-05 10:04 ` [PULL 08/16] hw/ppc/e500.c: Attach eSDHC unimplemented region to ccsr_addr_space Daniel Henrique Barboza
@ 2023-02-05 10:04 ` Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 10/16] ppc/pnv/pci: Remove duplicate definition of PNV_PHB5_DEVICE_ID Daniel Henrique Barboza
` (7 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Daniel Henrique Barboza @ 2023-02-05 10:04 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-ppc, danielhb413, peter.maydell, Frederic Barrat,
Cédric Le Goater
From: Frederic Barrat <fbarrat@linux.ibm.com>
Remove unused structure member 'system_memory'.
Signed-off-by: Frederic Barrat <fbarrat@linux.ibm.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Message-Id: <20230127122848.550083-2-fbarrat@linux.ibm.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
include/hw/pci-host/pnv_phb4.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/include/hw/pci-host/pnv_phb4.h b/include/hw/pci-host/pnv_phb4.h
index 1f3237c9d5..17aef08f91 100644
--- a/include/hw/pci-host/pnv_phb4.h
+++ b/include/hw/pci-host/pnv_phb4.h
@@ -173,8 +173,6 @@ struct PnvPhb4PecState {
uint32_t index;
uint32_t chip_id;
- MemoryRegion *system_memory;
-
/* Nest registers, excuding per-stack */
#define PHB4_PEC_NEST_REGS_COUNT 0xf
uint64_t nest_regs[PHB4_PEC_NEST_REGS_COUNT];
--
2.39.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PULL 10/16] ppc/pnv/pci: Remove duplicate definition of PNV_PHB5_DEVICE_ID
2023-02-05 10:04 [PULL 00/16] ppc queue Daniel Henrique Barboza
` (8 preceding siblings ...)
2023-02-05 10:04 ` [PULL 09/16] ppc/pnv/pci: Cleanup PnvPHBPecState structure Daniel Henrique Barboza
@ 2023-02-05 10:04 ` Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 11/16] ppc/pnv/pci: Update PHB5 version register Daniel Henrique Barboza
` (6 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Daniel Henrique Barboza @ 2023-02-05 10:04 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-ppc, danielhb413, peter.maydell, Frederic Barrat,
Cédric Le Goater
From: Frederic Barrat <fbarrat@linux.ibm.com>
PNV_PHB5_DEVICE_ID is defined in two different headers. The definition
in hw/pci-host/pnv_phb4.h was left out in a previous rework.
Remaining definition is in hw/pci-host/pnv_phb.h.
Signed-off-by: Frederic Barrat <fbarrat@linux.ibm.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Message-Id: <20230127122848.550083-3-fbarrat@linux.ibm.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
include/hw/pci-host/pnv_phb4.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/include/hw/pci-host/pnv_phb4.h b/include/hw/pci-host/pnv_phb4.h
index 17aef08f91..761525686e 100644
--- a/include/hw/pci-host/pnv_phb4.h
+++ b/include/hw/pci-host/pnv_phb4.h
@@ -215,7 +215,6 @@ struct PnvPhb4PecClass {
OBJECT_CHECK(PnvPhb4, (obj), TYPE_PNV_PHB5)
#define PNV_PHB5_VERSION 0x000000a500000001ull
-#define PNV_PHB5_DEVICE_ID 0x0652
#define TYPE_PNV_PHB5_PEC "pnv-phb5-pec"
#define PNV_PHB5_PEC(obj) \
--
2.39.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PULL 11/16] ppc/pnv/pci: Update PHB5 version register
2023-02-05 10:04 [PULL 00/16] ppc queue Daniel Henrique Barboza
` (9 preceding siblings ...)
2023-02-05 10:04 ` [PULL 10/16] ppc/pnv/pci: Remove duplicate definition of PNV_PHB5_DEVICE_ID Daniel Henrique Barboza
@ 2023-02-05 10:04 ` Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 12/16] ppc/pnv/pci: Fix PHB xscom registers memory region name Daniel Henrique Barboza
` (5 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Daniel Henrique Barboza @ 2023-02-05 10:04 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-ppc, danielhb413, peter.maydell, Frederic Barrat,
Cédric Le Goater
From: Frederic Barrat <fbarrat@linux.ibm.com>
Update register value per its P10 DD2 definition.
Signed-off-by: Frederic Barrat <fbarrat@linux.ibm.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Message-Id: <20230127122848.550083-4-fbarrat@linux.ibm.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
include/hw/pci-host/pnv_phb4.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/hw/pci-host/pnv_phb4.h b/include/hw/pci-host/pnv_phb4.h
index 761525686e..28d61b96c7 100644
--- a/include/hw/pci-host/pnv_phb4.h
+++ b/include/hw/pci-host/pnv_phb4.h
@@ -214,7 +214,7 @@ struct PnvPhb4PecClass {
#define PNV_PHB5(obj) \
OBJECT_CHECK(PnvPhb4, (obj), TYPE_PNV_PHB5)
-#define PNV_PHB5_VERSION 0x000000a500000001ull
+#define PNV_PHB5_VERSION 0x000000a500000002ull
#define TYPE_PNV_PHB5_PEC "pnv-phb5-pec"
#define PNV_PHB5_PEC(obj) \
--
2.39.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PULL 12/16] ppc/pnv/pci: Fix PHB xscom registers memory region name
2023-02-05 10:04 [PULL 00/16] ppc queue Daniel Henrique Barboza
` (10 preceding siblings ...)
2023-02-05 10:04 ` [PULL 11/16] ppc/pnv/pci: Update PHB5 version register Daniel Henrique Barboza
@ 2023-02-05 10:04 ` Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 13/16] hw/ppc/pegasos2: Fix a typo in a comment Daniel Henrique Barboza
` (4 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Daniel Henrique Barboza @ 2023-02-05 10:04 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-ppc, danielhb413, peter.maydell, Frederic Barrat,
Cédric Le Goater
From: Frederic Barrat <fbarrat@linux.ibm.com>
The name is for the region mapping the PHB xscom registers. It was
apparently a bad cut-and-paste from the per-stack pci xscom area just
above, so we had two regions with the same name.
Signed-off-by: Frederic Barrat <fbarrat@linux.ibm.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Message-Id: <20230127122848.550083-5-fbarrat@linux.ibm.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
hw/pci-host/pnv_phb4.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/pci-host/pnv_phb4.c b/hw/pci-host/pnv_phb4.c
index ccbde841fc..542f9e2932 100644
--- a/hw/pci-host/pnv_phb4.c
+++ b/hw/pci-host/pnv_phb4.c
@@ -1497,7 +1497,7 @@ static void pnv_phb4_xscom_realize(PnvPHB4 *phb)
PHB4_PEC_PCI_STK_REGS_COUNT);
/* PHB pass-through */
- snprintf(name, sizeof(name), "xscom-pec-%d.%d-pci-phb-%d",
+ snprintf(name, sizeof(name), "xscom-pec-%d.%d-phb-%d",
pec->chip_id, pec->index, stack_no);
pnv_xscom_region_init(&phb->phb_regs_mr, OBJECT(phb),
&pnv_phb4_xscom_ops, phb, name, 0x40);
--
2.39.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PULL 13/16] hw/ppc/pegasos2: Fix a typo in a comment
2023-02-05 10:04 [PULL 00/16] ppc queue Daniel Henrique Barboza
` (11 preceding siblings ...)
2023-02-05 10:04 ` [PULL 12/16] ppc/pnv/pci: Fix PHB xscom registers memory region name Daniel Henrique Barboza
@ 2023-02-05 10:04 ` Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 14/16] hw/display/sm501: Remove parenthesis around constant macro definitions Daniel Henrique Barboza
` (3 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Daniel Henrique Barboza @ 2023-02-05 10:04 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-ppc, danielhb413, peter.maydell, BALATON Zoltan,
Stefan Weil, Philippe Mathieu-Daudé
From: BALATON Zoltan <balaton@eik.bme.hu>
Reported-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230203194312.33834745712@zero.eik.bme.hu>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
hw/ppc/pegasos2.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/ppc/pegasos2.c b/hw/ppc/pegasos2.c
index 1a13632ba6..a9563f4fb2 100644
--- a/hw/ppc/pegasos2.c
+++ b/hw/ppc/pegasos2.c
@@ -564,7 +564,7 @@ static void dt_isa(PCIBus *bus, PCIDevice *d, FDTInfo *fi)
qemu_fdt_setprop_string(fi->fdt, fi->path, "device_type", "isa");
qemu_fdt_setprop_string(fi->fdt, fi->path, "name", "isa");
- /* addional devices */
+ /* additional devices */
g_string_printf(name, "%s/lpt@i3bc", fi->path);
qemu_fdt_add_subnode(fi->fdt, name->str);
qemu_fdt_setprop_cell(fi->fdt, name->str, "clock-frequency", 0);
--
2.39.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PULL 14/16] hw/display/sm501: Remove parenthesis around constant macro definitions
2023-02-05 10:04 [PULL 00/16] ppc queue Daniel Henrique Barboza
` (12 preceding siblings ...)
2023-02-05 10:04 ` [PULL 13/16] hw/ppc/pegasos2: Fix a typo in a comment Daniel Henrique Barboza
@ 2023-02-05 10:04 ` Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 15/16] hw/display/sm501: Remove unneeded casts from void pointer Daniel Henrique Barboza
` (2 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Daniel Henrique Barboza @ 2023-02-05 10:04 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-ppc, danielhb413, peter.maydell, BALATON Zoltan,
Philippe Mathieu-Daudé
From: BALATON Zoltan <balaton@eik.bme.hu>
No need to wrap constants in parenthesis.
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <9194546b73b05e7098761ec62b2dfd0699b97b65.1674333199.git.balaton@eik.bme.hu>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
hw/display/sm501.c | 394 ++++++++++++++++++++++-----------------------
1 file changed, 197 insertions(+), 197 deletions(-)
diff --git a/hw/display/sm501.c b/hw/display/sm501.c
index 52e42585af..0cbd1fecd5 100644
--- a/hw/display/sm501.c
+++ b/hw/display/sm501.c
@@ -50,10 +50,10 @@
/* System Configuration area */
/* System config base */
-#define SM501_SYS_CONFIG (0x000000)
+#define SM501_SYS_CONFIG 0x000000
/* config 1 */
-#define SM501_SYSTEM_CONTROL (0x000000)
+#define SM501_SYSTEM_CONTROL 0x000000
#define SM501_SYSCTRL_PANEL_TRISTATE (1 << 0)
#define SM501_SYSCTRL_MEM_TRISTATE (1 << 1)
@@ -72,13 +72,13 @@
/* miscellaneous control */
-#define SM501_MISC_CONTROL (0x000004)
+#define SM501_MISC_CONTROL 0x000004
-#define SM501_MISC_BUS_SH (0x0)
-#define SM501_MISC_BUS_PCI (0x1)
-#define SM501_MISC_BUS_XSCALE (0x2)
-#define SM501_MISC_BUS_NEC (0x6)
-#define SM501_MISC_BUS_MASK (0x7)
+#define SM501_MISC_BUS_SH 0x0
+#define SM501_MISC_BUS_PCI 0x1
+#define SM501_MISC_BUS_XSCALE 0x2
+#define SM501_MISC_BUS_NEC 0x6
+#define SM501_MISC_BUS_MASK 0x7
#define SM501_MISC_VR_62MB (1 << 3)
#define SM501_MISC_CDR_RESET (1 << 7)
@@ -103,22 +103,22 @@
-#define SM501_GPIO31_0_CONTROL (0x000008)
-#define SM501_GPIO63_32_CONTROL (0x00000C)
-#define SM501_DRAM_CONTROL (0x000010)
+#define SM501_GPIO31_0_CONTROL 0x000008
+#define SM501_GPIO63_32_CONTROL 0x00000C
+#define SM501_DRAM_CONTROL 0x000010
/* command list */
-#define SM501_ARBTRTN_CONTROL (0x000014)
+#define SM501_ARBTRTN_CONTROL 0x000014
/* command list */
-#define SM501_COMMAND_LIST_STATUS (0x000024)
+#define SM501_COMMAND_LIST_STATUS 0x000024
/* interrupt debug */
-#define SM501_RAW_IRQ_STATUS (0x000028)
-#define SM501_RAW_IRQ_CLEAR (0x000028)
-#define SM501_IRQ_STATUS (0x00002C)
-#define SM501_IRQ_MASK (0x000030)
-#define SM501_DEBUG_CONTROL (0x000034)
+#define SM501_RAW_IRQ_STATUS 0x000028
+#define SM501_RAW_IRQ_CLEAR 0x000028
+#define SM501_IRQ_STATUS 0x00002C
+#define SM501_IRQ_MASK 0x000030
+#define SM501_DEBUG_CONTROL 0x000034
/* power management */
#define SM501_POWERMODE_P2X_SRC (1 << 29)
@@ -126,74 +126,74 @@
#define SM501_POWERMODE_M_SRC (1 << 12)
#define SM501_POWERMODE_M1_SRC (1 << 4)
-#define SM501_CURRENT_GATE (0x000038)
-#define SM501_CURRENT_CLOCK (0x00003C)
-#define SM501_POWER_MODE_0_GATE (0x000040)
-#define SM501_POWER_MODE_0_CLOCK (0x000044)
-#define SM501_POWER_MODE_1_GATE (0x000048)
-#define SM501_POWER_MODE_1_CLOCK (0x00004C)
-#define SM501_SLEEP_MODE_GATE (0x000050)
-#define SM501_POWER_MODE_CONTROL (0x000054)
+#define SM501_CURRENT_GATE 0x000038
+#define SM501_CURRENT_CLOCK 0x00003C
+#define SM501_POWER_MODE_0_GATE 0x000040
+#define SM501_POWER_MODE_0_CLOCK 0x000044
+#define SM501_POWER_MODE_1_GATE 0x000048
+#define SM501_POWER_MODE_1_CLOCK 0x00004C
+#define SM501_SLEEP_MODE_GATE 0x000050
+#define SM501_POWER_MODE_CONTROL 0x000054
/* power gates for units within the 501 */
-#define SM501_GATE_HOST (0)
-#define SM501_GATE_MEMORY (1)
-#define SM501_GATE_DISPLAY (2)
-#define SM501_GATE_2D_ENGINE (3)
-#define SM501_GATE_CSC (4)
-#define SM501_GATE_ZVPORT (5)
-#define SM501_GATE_GPIO (6)
-#define SM501_GATE_UART0 (7)
-#define SM501_GATE_UART1 (8)
-#define SM501_GATE_SSP (10)
-#define SM501_GATE_USB_HOST (11)
-#define SM501_GATE_USB_GADGET (12)
-#define SM501_GATE_UCONTROLLER (17)
-#define SM501_GATE_AC97 (18)
+#define SM501_GATE_HOST 0
+#define SM501_GATE_MEMORY 1
+#define SM501_GATE_DISPLAY 2
+#define SM501_GATE_2D_ENGINE 3
+#define SM501_GATE_CSC 4
+#define SM501_GATE_ZVPORT 5
+#define SM501_GATE_GPIO 6
+#define SM501_GATE_UART0 7
+#define SM501_GATE_UART1 8
+#define SM501_GATE_SSP 10
+#define SM501_GATE_USB_HOST 11
+#define SM501_GATE_USB_GADGET 12
+#define SM501_GATE_UCONTROLLER 17
+#define SM501_GATE_AC97 18
/* panel clock */
-#define SM501_CLOCK_P2XCLK (24)
+#define SM501_CLOCK_P2XCLK 24
/* crt clock */
-#define SM501_CLOCK_V2XCLK (16)
+#define SM501_CLOCK_V2XCLK 16
/* main clock */
-#define SM501_CLOCK_MCLK (8)
+#define SM501_CLOCK_MCLK 8
/* SDRAM controller clock */
-#define SM501_CLOCK_M1XCLK (0)
+#define SM501_CLOCK_M1XCLK 0
/* config 2 */
-#define SM501_PCI_MASTER_BASE (0x000058)
-#define SM501_ENDIAN_CONTROL (0x00005C)
-#define SM501_DEVICEID (0x000060)
+#define SM501_PCI_MASTER_BASE 0x000058
+#define SM501_ENDIAN_CONTROL 0x00005C
+#define SM501_DEVICEID 0x000060
/* 0x050100A0 */
-#define SM501_DEVICEID_SM501 (0x05010000)
-#define SM501_DEVICEID_IDMASK (0xffff0000)
-#define SM501_DEVICEID_REVMASK (0x000000ff)
+#define SM501_DEVICEID_SM501 0x05010000
+#define SM501_DEVICEID_IDMASK 0xffff0000
+#define SM501_DEVICEID_REVMASK 0x000000ff
-#define SM501_PLLCLOCK_COUNT (0x000064)
-#define SM501_MISC_TIMING (0x000068)
-#define SM501_CURRENT_SDRAM_CLOCK (0x00006C)
+#define SM501_PLLCLOCK_COUNT 0x000064
+#define SM501_MISC_TIMING 0x000068
+#define SM501_CURRENT_SDRAM_CLOCK 0x00006C
-#define SM501_PROGRAMMABLE_PLL_CONTROL (0x000074)
+#define SM501_PROGRAMMABLE_PLL_CONTROL 0x000074
/* GPIO base */
-#define SM501_GPIO (0x010000)
-#define SM501_GPIO_DATA_LOW (0x00)
-#define SM501_GPIO_DATA_HIGH (0x04)
-#define SM501_GPIO_DDR_LOW (0x08)
-#define SM501_GPIO_DDR_HIGH (0x0C)
-#define SM501_GPIO_IRQ_SETUP (0x10)
-#define SM501_GPIO_IRQ_STATUS (0x14)
-#define SM501_GPIO_IRQ_RESET (0x14)
+#define SM501_GPIO 0x010000
+#define SM501_GPIO_DATA_LOW 0x00
+#define SM501_GPIO_DATA_HIGH 0x04
+#define SM501_GPIO_DDR_LOW 0x08
+#define SM501_GPIO_DDR_HIGH 0x0C
+#define SM501_GPIO_IRQ_SETUP 0x10
+#define SM501_GPIO_IRQ_STATUS 0x14
+#define SM501_GPIO_IRQ_RESET 0x14
/* I2C controller base */
-#define SM501_I2C (0x010040)
-#define SM501_I2C_BYTE_COUNT (0x00)
-#define SM501_I2C_CONTROL (0x01)
-#define SM501_I2C_STATUS (0x02)
-#define SM501_I2C_RESET (0x02)
-#define SM501_I2C_SLAVE_ADDRESS (0x03)
-#define SM501_I2C_DATA (0x04)
+#define SM501_I2C 0x010040
+#define SM501_I2C_BYTE_COUNT 0x00
+#define SM501_I2C_CONTROL 0x01
+#define SM501_I2C_STATUS 0x02
+#define SM501_I2C_RESET 0x02
+#define SM501_I2C_SLAVE_ADDRESS 0x03
+#define SM501_I2C_DATA 0x04
#define SM501_I2C_CONTROL_START (1 << 2)
#define SM501_I2C_CONTROL_ENABLE (1 << 0)
@@ -204,25 +204,25 @@
#define SM501_I2C_RESET_ERROR (1 << 2)
/* SSP base */
-#define SM501_SSP (0x020000)
+#define SM501_SSP 0x020000
/* Uart 0 base */
-#define SM501_UART0 (0x030000)
+#define SM501_UART0 0x030000
/* Uart 1 base */
-#define SM501_UART1 (0x030020)
+#define SM501_UART1 0x030020
/* USB host port base */
-#define SM501_USB_HOST (0x040000)
+#define SM501_USB_HOST 0x040000
/* USB slave/gadget base */
-#define SM501_USB_GADGET (0x060000)
+#define SM501_USB_GADGET 0x060000
/* USB slave/gadget data port base */
-#define SM501_USB_GADGET_DATA (0x070000)
+#define SM501_USB_GADGET_DATA 0x070000
/* Display controller/video engine base */
-#define SM501_DC (0x080000)
+#define SM501_DC 0x080000
/* common defines for the SM501 address registers */
#define SM501_ADDR_FLIP (1 << 31)
@@ -237,12 +237,12 @@
#define SM501_FIFO_11 (0x3 << 16)
/* common registers for panel and the crt */
-#define SM501_OFF_DC_H_TOT (0x000)
-#define SM501_OFF_DC_V_TOT (0x008)
-#define SM501_OFF_DC_H_SYNC (0x004)
-#define SM501_OFF_DC_V_SYNC (0x00C)
+#define SM501_OFF_DC_H_TOT 0x000
+#define SM501_OFF_DC_V_TOT 0x008
+#define SM501_OFF_DC_H_SYNC 0x004
+#define SM501_OFF_DC_V_SYNC 0x00C
-#define SM501_DC_PANEL_CONTROL (0x000)
+#define SM501_DC_PANEL_CONTROL 0x000
#define SM501_DC_PANEL_CONTROL_FPEN (1 << 27)
#define SM501_DC_PANEL_CONTROL_BIAS (1 << 26)
@@ -277,65 +277,65 @@
#define SM501_DC_PANEL_CONTROL_32BPP (2 << 0)
-#define SM501_DC_PANEL_PANNING_CONTROL (0x004)
-#define SM501_DC_PANEL_COLOR_KEY (0x008)
-#define SM501_DC_PANEL_FB_ADDR (0x00C)
-#define SM501_DC_PANEL_FB_OFFSET (0x010)
-#define SM501_DC_PANEL_FB_WIDTH (0x014)
-#define SM501_DC_PANEL_FB_HEIGHT (0x018)
-#define SM501_DC_PANEL_TL_LOC (0x01C)
-#define SM501_DC_PANEL_BR_LOC (0x020)
-#define SM501_DC_PANEL_H_TOT (0x024)
-#define SM501_DC_PANEL_H_SYNC (0x028)
-#define SM501_DC_PANEL_V_TOT (0x02C)
-#define SM501_DC_PANEL_V_SYNC (0x030)
-#define SM501_DC_PANEL_CUR_LINE (0x034)
-
-#define SM501_DC_VIDEO_CONTROL (0x040)
-#define SM501_DC_VIDEO_FB0_ADDR (0x044)
-#define SM501_DC_VIDEO_FB_WIDTH (0x048)
-#define SM501_DC_VIDEO_FB0_LAST_ADDR (0x04C)
-#define SM501_DC_VIDEO_TL_LOC (0x050)
-#define SM501_DC_VIDEO_BR_LOC (0x054)
-#define SM501_DC_VIDEO_SCALE (0x058)
-#define SM501_DC_VIDEO_INIT_SCALE (0x05C)
-#define SM501_DC_VIDEO_YUV_CONSTANTS (0x060)
-#define SM501_DC_VIDEO_FB1_ADDR (0x064)
-#define SM501_DC_VIDEO_FB1_LAST_ADDR (0x068)
-
-#define SM501_DC_VIDEO_ALPHA_CONTROL (0x080)
-#define SM501_DC_VIDEO_ALPHA_FB_ADDR (0x084)
-#define SM501_DC_VIDEO_ALPHA_FB_OFFSET (0x088)
-#define SM501_DC_VIDEO_ALPHA_FB_LAST_ADDR (0x08C)
-#define SM501_DC_VIDEO_ALPHA_TL_LOC (0x090)
-#define SM501_DC_VIDEO_ALPHA_BR_LOC (0x094)
-#define SM501_DC_VIDEO_ALPHA_SCALE (0x098)
-#define SM501_DC_VIDEO_ALPHA_INIT_SCALE (0x09C)
-#define SM501_DC_VIDEO_ALPHA_CHROMA_KEY (0x0A0)
-#define SM501_DC_VIDEO_ALPHA_COLOR_LOOKUP (0x0A4)
-
-#define SM501_DC_PANEL_HWC_BASE (0x0F0)
-#define SM501_DC_PANEL_HWC_ADDR (0x0F0)
-#define SM501_DC_PANEL_HWC_LOC (0x0F4)
-#define SM501_DC_PANEL_HWC_COLOR_1_2 (0x0F8)
-#define SM501_DC_PANEL_HWC_COLOR_3 (0x0FC)
+#define SM501_DC_PANEL_PANNING_CONTROL 0x004
+#define SM501_DC_PANEL_COLOR_KEY 0x008
+#define SM501_DC_PANEL_FB_ADDR 0x00C
+#define SM501_DC_PANEL_FB_OFFSET 0x010
+#define SM501_DC_PANEL_FB_WIDTH 0x014
+#define SM501_DC_PANEL_FB_HEIGHT 0x018
+#define SM501_DC_PANEL_TL_LOC 0x01C
+#define SM501_DC_PANEL_BR_LOC 0x020
+#define SM501_DC_PANEL_H_TOT 0x024
+#define SM501_DC_PANEL_H_SYNC 0x028
+#define SM501_DC_PANEL_V_TOT 0x02C
+#define SM501_DC_PANEL_V_SYNC 0x030
+#define SM501_DC_PANEL_CUR_LINE 0x034
+
+#define SM501_DC_VIDEO_CONTROL 0x040
+#define SM501_DC_VIDEO_FB0_ADDR 0x044
+#define SM501_DC_VIDEO_FB_WIDTH 0x048
+#define SM501_DC_VIDEO_FB0_LAST_ADDR 0x04C
+#define SM501_DC_VIDEO_TL_LOC 0x050
+#define SM501_DC_VIDEO_BR_LOC 0x054
+#define SM501_DC_VIDEO_SCALE 0x058
+#define SM501_DC_VIDEO_INIT_SCALE 0x05C
+#define SM501_DC_VIDEO_YUV_CONSTANTS 0x060
+#define SM501_DC_VIDEO_FB1_ADDR 0x064
+#define SM501_DC_VIDEO_FB1_LAST_ADDR 0x068
+
+#define SM501_DC_VIDEO_ALPHA_CONTROL 0x080
+#define SM501_DC_VIDEO_ALPHA_FB_ADDR 0x084
+#define SM501_DC_VIDEO_ALPHA_FB_OFFSET 0x088
+#define SM501_DC_VIDEO_ALPHA_FB_LAST_ADDR 0x08C
+#define SM501_DC_VIDEO_ALPHA_TL_LOC 0x090
+#define SM501_DC_VIDEO_ALPHA_BR_LOC 0x094
+#define SM501_DC_VIDEO_ALPHA_SCALE 0x098
+#define SM501_DC_VIDEO_ALPHA_INIT_SCALE 0x09C
+#define SM501_DC_VIDEO_ALPHA_CHROMA_KEY 0x0A0
+#define SM501_DC_VIDEO_ALPHA_COLOR_LOOKUP 0x0A4
+
+#define SM501_DC_PANEL_HWC_BASE 0x0F0
+#define SM501_DC_PANEL_HWC_ADDR 0x0F0
+#define SM501_DC_PANEL_HWC_LOC 0x0F4
+#define SM501_DC_PANEL_HWC_COLOR_1_2 0x0F8
+#define SM501_DC_PANEL_HWC_COLOR_3 0x0FC
#define SM501_HWC_EN (1 << 31)
-#define SM501_OFF_HWC_ADDR (0x00)
-#define SM501_OFF_HWC_LOC (0x04)
-#define SM501_OFF_HWC_COLOR_1_2 (0x08)
-#define SM501_OFF_HWC_COLOR_3 (0x0C)
+#define SM501_OFF_HWC_ADDR 0x00
+#define SM501_OFF_HWC_LOC 0x04
+#define SM501_OFF_HWC_COLOR_1_2 0x08
+#define SM501_OFF_HWC_COLOR_3 0x0C
-#define SM501_DC_ALPHA_CONTROL (0x100)
-#define SM501_DC_ALPHA_FB_ADDR (0x104)
-#define SM501_DC_ALPHA_FB_OFFSET (0x108)
-#define SM501_DC_ALPHA_TL_LOC (0x10C)
-#define SM501_DC_ALPHA_BR_LOC (0x110)
-#define SM501_DC_ALPHA_CHROMA_KEY (0x114)
-#define SM501_DC_ALPHA_COLOR_LOOKUP (0x118)
+#define SM501_DC_ALPHA_CONTROL 0x100
+#define SM501_DC_ALPHA_FB_ADDR 0x104
+#define SM501_DC_ALPHA_FB_OFFSET 0x108
+#define SM501_DC_ALPHA_TL_LOC 0x10C
+#define SM501_DC_ALPHA_BR_LOC 0x110
+#define SM501_DC_ALPHA_CHROMA_KEY 0x114
+#define SM501_DC_ALPHA_COLOR_LOOKUP 0x118
-#define SM501_DC_CRT_CONTROL (0x200)
+#define SM501_DC_CRT_CONTROL 0x200
#define SM501_DC_CRT_CONTROL_TVP (1 << 15)
#define SM501_DC_CRT_CONTROL_CP (1 << 14)
@@ -353,89 +353,89 @@
#define SM501_DC_CRT_CONTROL_16BPP (1 << 0)
#define SM501_DC_CRT_CONTROL_32BPP (2 << 0)
-#define SM501_DC_CRT_FB_ADDR (0x204)
-#define SM501_DC_CRT_FB_OFFSET (0x208)
-#define SM501_DC_CRT_H_TOT (0x20C)
-#define SM501_DC_CRT_H_SYNC (0x210)
-#define SM501_DC_CRT_V_TOT (0x214)
-#define SM501_DC_CRT_V_SYNC (0x218)
-#define SM501_DC_CRT_SIGNATURE_ANALYZER (0x21C)
-#define SM501_DC_CRT_CUR_LINE (0x220)
-#define SM501_DC_CRT_MONITOR_DETECT (0x224)
+#define SM501_DC_CRT_FB_ADDR 0x204
+#define SM501_DC_CRT_FB_OFFSET 0x208
+#define SM501_DC_CRT_H_TOT 0x20C
+#define SM501_DC_CRT_H_SYNC 0x210
+#define SM501_DC_CRT_V_TOT 0x214
+#define SM501_DC_CRT_V_SYNC 0x218
+#define SM501_DC_CRT_SIGNATURE_ANALYZER 0x21C
+#define SM501_DC_CRT_CUR_LINE 0x220
+#define SM501_DC_CRT_MONITOR_DETECT 0x224
-#define SM501_DC_CRT_HWC_BASE (0x230)
-#define SM501_DC_CRT_HWC_ADDR (0x230)
-#define SM501_DC_CRT_HWC_LOC (0x234)
-#define SM501_DC_CRT_HWC_COLOR_1_2 (0x238)
-#define SM501_DC_CRT_HWC_COLOR_3 (0x23C)
+#define SM501_DC_CRT_HWC_BASE 0x230
+#define SM501_DC_CRT_HWC_ADDR 0x230
+#define SM501_DC_CRT_HWC_LOC 0x234
+#define SM501_DC_CRT_HWC_COLOR_1_2 0x238
+#define SM501_DC_CRT_HWC_COLOR_3 0x23C
-#define SM501_DC_PANEL_PALETTE (0x400)
+#define SM501_DC_PANEL_PALETTE 0x400
-#define SM501_DC_VIDEO_PALETTE (0x800)
+#define SM501_DC_VIDEO_PALETTE 0x800
-#define SM501_DC_CRT_PALETTE (0xC00)
+#define SM501_DC_CRT_PALETTE 0xC00
/* Zoom Video port base */
-#define SM501_ZVPORT (0x090000)
+#define SM501_ZVPORT 0x090000
/* AC97/I2S base */
-#define SM501_AC97 (0x0A0000)
+#define SM501_AC97 0x0A0000
/* 8051 micro controller base */
-#define SM501_UCONTROLLER (0x0B0000)
+#define SM501_UCONTROLLER 0x0B0000
/* 8051 micro controller SRAM base */
-#define SM501_UCONTROLLER_SRAM (0x0C0000)
+#define SM501_UCONTROLLER_SRAM 0x0C0000
/* DMA base */
-#define SM501_DMA (0x0D0000)
+#define SM501_DMA 0x0D0000
/* 2d engine base */
-#define SM501_2D_ENGINE (0x100000)
-#define SM501_2D_SOURCE (0x00)
-#define SM501_2D_DESTINATION (0x04)
-#define SM501_2D_DIMENSION (0x08)
-#define SM501_2D_CONTROL (0x0C)
-#define SM501_2D_PITCH (0x10)
-#define SM501_2D_FOREGROUND (0x14)
-#define SM501_2D_BACKGROUND (0x18)
-#define SM501_2D_STRETCH (0x1C)
-#define SM501_2D_COLOR_COMPARE (0x20)
-#define SM501_2D_COLOR_COMPARE_MASK (0x24)
-#define SM501_2D_MASK (0x28)
-#define SM501_2D_CLIP_TL (0x2C)
-#define SM501_2D_CLIP_BR (0x30)
-#define SM501_2D_MONO_PATTERN_LOW (0x34)
-#define SM501_2D_MONO_PATTERN_HIGH (0x38)
-#define SM501_2D_WINDOW_WIDTH (0x3C)
-#define SM501_2D_SOURCE_BASE (0x40)
-#define SM501_2D_DESTINATION_BASE (0x44)
-#define SM501_2D_ALPHA (0x48)
-#define SM501_2D_WRAP (0x4C)
-#define SM501_2D_STATUS (0x50)
-
-#define SM501_CSC_Y_SOURCE_BASE (0xC8)
-#define SM501_CSC_CONSTANTS (0xCC)
-#define SM501_CSC_Y_SOURCE_X (0xD0)
-#define SM501_CSC_Y_SOURCE_Y (0xD4)
-#define SM501_CSC_U_SOURCE_BASE (0xD8)
-#define SM501_CSC_V_SOURCE_BASE (0xDC)
-#define SM501_CSC_SOURCE_DIMENSION (0xE0)
-#define SM501_CSC_SOURCE_PITCH (0xE4)
-#define SM501_CSC_DESTINATION (0xE8)
-#define SM501_CSC_DESTINATION_DIMENSION (0xEC)
-#define SM501_CSC_DESTINATION_PITCH (0xF0)
-#define SM501_CSC_SCALE_FACTOR (0xF4)
-#define SM501_CSC_DESTINATION_BASE (0xF8)
-#define SM501_CSC_CONTROL (0xFC)
+#define SM501_2D_ENGINE 0x100000
+#define SM501_2D_SOURCE 0x00
+#define SM501_2D_DESTINATION 0x04
+#define SM501_2D_DIMENSION 0x08
+#define SM501_2D_CONTROL 0x0C
+#define SM501_2D_PITCH 0x10
+#define SM501_2D_FOREGROUND 0x14
+#define SM501_2D_BACKGROUND 0x18
+#define SM501_2D_STRETCH 0x1C
+#define SM501_2D_COLOR_COMPARE 0x20
+#define SM501_2D_COLOR_COMPARE_MASK 0x24
+#define SM501_2D_MASK 0x28
+#define SM501_2D_CLIP_TL 0x2C
+#define SM501_2D_CLIP_BR 0x30
+#define SM501_2D_MONO_PATTERN_LOW 0x34
+#define SM501_2D_MONO_PATTERN_HIGH 0x38
+#define SM501_2D_WINDOW_WIDTH 0x3C
+#define SM501_2D_SOURCE_BASE 0x40
+#define SM501_2D_DESTINATION_BASE 0x44
+#define SM501_2D_ALPHA 0x48
+#define SM501_2D_WRAP 0x4C
+#define SM501_2D_STATUS 0x50
+
+#define SM501_CSC_Y_SOURCE_BASE 0xC8
+#define SM501_CSC_CONSTANTS 0xCC
+#define SM501_CSC_Y_SOURCE_X 0xD0
+#define SM501_CSC_Y_SOURCE_Y 0xD4
+#define SM501_CSC_U_SOURCE_BASE 0xD8
+#define SM501_CSC_V_SOURCE_BASE 0xDC
+#define SM501_CSC_SOURCE_DIMENSION 0xE0
+#define SM501_CSC_SOURCE_PITCH 0xE4
+#define SM501_CSC_DESTINATION 0xE8
+#define SM501_CSC_DESTINATION_DIMENSION 0xEC
+#define SM501_CSC_DESTINATION_PITCH 0xF0
+#define SM501_CSC_SCALE_FACTOR 0xF4
+#define SM501_CSC_DESTINATION_BASE 0xF8
+#define SM501_CSC_CONTROL 0xFC
/* 2d engine data port base */
-#define SM501_2D_ENGINE_DATA (0x110000)
+#define SM501_2D_ENGINE_DATA 0x110000
/* end of register definitions */
-#define SM501_HWC_WIDTH (64)
-#define SM501_HWC_HEIGHT (64)
+#define SM501_HWC_WIDTH 64
+#define SM501_HWC_HEIGHT 64
/* SM501 local memory size taken from "linux/drivers/mfd/sm501.c" */
static const uint32_t sm501_mem_local_size[] = {
--
2.39.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PULL 15/16] hw/display/sm501: Remove unneeded casts from void pointer
2023-02-05 10:04 [PULL 00/16] ppc queue Daniel Henrique Barboza
` (13 preceding siblings ...)
2023-02-05 10:04 ` [PULL 14/16] hw/display/sm501: Remove parenthesis around constant macro definitions Daniel Henrique Barboza
@ 2023-02-05 10:04 ` Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 16/16] hw/display/sm501: Code style fix Daniel Henrique Barboza
2023-02-06 11:37 ` [PULL 00/16] ppc queue Peter Maydell
16 siblings, 0 replies; 18+ messages in thread
From: Daniel Henrique Barboza @ 2023-02-05 10:04 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-ppc, danielhb413, peter.maydell, BALATON Zoltan,
Philippe Mathieu-Daudé
From: BALATON Zoltan <balaton@eik.bme.hu>
This is not needed in C.
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <58f599387dd0739ea1880bfb678872c0be26bf1b.1674333199.git.balaton@eik.bme.hu>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
hw/display/sm501.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/hw/display/sm501.c b/hw/display/sm501.c
index 0cbd1fecd5..1e17072452 100644
--- a/hw/display/sm501.c
+++ b/hw/display/sm501.c
@@ -868,7 +868,7 @@ static void sm501_2d_operation(SM501State *s)
static uint64_t sm501_system_config_read(void *opaque, hwaddr addr,
unsigned size)
{
- SM501State *s = (SM501State *)opaque;
+ SM501State *s = opaque;
uint32_t ret = 0;
switch (addr) {
@@ -928,7 +928,7 @@ static uint64_t sm501_system_config_read(void *opaque, hwaddr addr,
static void sm501_system_config_write(void *opaque, hwaddr addr,
uint64_t value, unsigned size)
{
- SM501State *s = (SM501State *)opaque;
+ SM501State *s = opaque;
trace_sm501_system_config_write((uint32_t)addr, (uint32_t)value);
switch (addr) {
@@ -996,7 +996,7 @@ static const MemoryRegionOps sm501_system_config_ops = {
static uint64_t sm501_i2c_read(void *opaque, hwaddr addr, unsigned size)
{
- SM501State *s = (SM501State *)opaque;
+ SM501State *s = opaque;
uint8_t ret = 0;
switch (addr) {
@@ -1023,7 +1023,7 @@ static uint64_t sm501_i2c_read(void *opaque, hwaddr addr, unsigned size)
static void sm501_i2c_write(void *opaque, hwaddr addr, uint64_t value,
unsigned size)
{
- SM501State *s = (SM501State *)opaque;
+ SM501State *s = opaque;
trace_sm501_i2c_write((uint32_t)addr, (uint32_t)value);
switch (addr) {
@@ -1092,7 +1092,7 @@ static const MemoryRegionOps sm501_i2c_ops = {
static uint32_t sm501_palette_read(void *opaque, hwaddr addr)
{
- SM501State *s = (SM501State *)opaque;
+ SM501State *s = opaque;
trace_sm501_palette_read((uint32_t)addr);
@@ -1106,7 +1106,7 @@ static uint32_t sm501_palette_read(void *opaque, hwaddr addr)
static void sm501_palette_write(void *opaque, hwaddr addr,
uint32_t value)
{
- SM501State *s = (SM501State *)opaque;
+ SM501State *s = opaque;
trace_sm501_palette_write((uint32_t)addr, value);
@@ -1121,7 +1121,7 @@ static void sm501_palette_write(void *opaque, hwaddr addr,
static uint64_t sm501_disp_ctrl_read(void *opaque, hwaddr addr,
unsigned size)
{
- SM501State *s = (SM501State *)opaque;
+ SM501State *s = opaque;
uint32_t ret = 0;
switch (addr) {
@@ -1234,7 +1234,7 @@ static uint64_t sm501_disp_ctrl_read(void *opaque, hwaddr addr,
static void sm501_disp_ctrl_write(void *opaque, hwaddr addr,
uint64_t value, unsigned size)
{
- SM501State *s = (SM501State *)opaque;
+ SM501State *s = opaque;
trace_sm501_disp_ctrl_write((uint32_t)addr, (uint32_t)value);
switch (addr) {
@@ -1379,7 +1379,7 @@ static const MemoryRegionOps sm501_disp_ctrl_ops = {
static uint64_t sm501_2d_engine_read(void *opaque, hwaddr addr,
unsigned size)
{
- SM501State *s = (SM501State *)opaque;
+ SM501State *s = opaque;
uint32_t ret = 0;
switch (addr) {
@@ -1457,7 +1457,7 @@ static uint64_t sm501_2d_engine_read(void *opaque, hwaddr addr,
static void sm501_2d_engine_write(void *opaque, hwaddr addr,
uint64_t value, unsigned size)
{
- SM501State *s = (SM501State *)opaque;
+ SM501State *s = opaque;
trace_sm501_2d_engine_write((uint32_t)addr, (uint32_t)value);
switch (addr) {
@@ -1644,7 +1644,7 @@ static void draw_hwc_line_32(uint8_t *d, const uint8_t *s, int width,
static void sm501_update_display(void *opaque)
{
- SM501State *s = (SM501State *)opaque;
+ SM501State *s = opaque;
DisplaySurface *surface = qemu_console_surface(s->con);
DirtyBitmapSnapshot *snap;
int y, c_x = 0, c_y = 0;
--
2.39.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PULL 16/16] hw/display/sm501: Code style fix
2023-02-05 10:04 [PULL 00/16] ppc queue Daniel Henrique Barboza
` (14 preceding siblings ...)
2023-02-05 10:04 ` [PULL 15/16] hw/display/sm501: Remove unneeded casts from void pointer Daniel Henrique Barboza
@ 2023-02-05 10:04 ` Daniel Henrique Barboza
2023-02-06 11:37 ` [PULL 00/16] ppc queue Peter Maydell
16 siblings, 0 replies; 18+ messages in thread
From: Daniel Henrique Barboza @ 2023-02-05 10:04 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-ppc, danielhb413, peter.maydell, BALATON Zoltan,
Philippe Mathieu-Daudé
From: BALATON Zoltan <balaton@eik.bme.hu>
Fix checkpatch warning about multi-line comment.
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <8801292992a304609e1eac680fe36b515592b926.1674333199.git.balaton@eik.bme.hu>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
hw/display/sm501.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/hw/display/sm501.c b/hw/display/sm501.c
index 1e17072452..e1d0591d36 100644
--- a/hw/display/sm501.c
+++ b/hw/display/sm501.c
@@ -1768,7 +1768,8 @@ static const GraphicHwOps sm501_ops = {
static void sm501_reset(SM501State *s)
{
s->system_control = 0x00100000; /* 2D engine FIFO empty */
- /* Bits 17 (SH), 7 (CDR), 6:5 (Test), 2:0 (Bus) are all supposed
+ /*
+ * Bits 17 (SH), 7 (CDR), 6:5 (Test), 2:0 (Bus) are all supposed
* to be determined at reset by GPIO lines which set config bits.
* We hardwire them:
* SH = 0 : Hitachi Ready Polarity == Active Low
--
2.39.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PULL 00/16] ppc queue
2023-02-05 10:04 [PULL 00/16] ppc queue Daniel Henrique Barboza
` (15 preceding siblings ...)
2023-02-05 10:04 ` [PULL 16/16] hw/display/sm501: Code style fix Daniel Henrique Barboza
@ 2023-02-06 11:37 ` Peter Maydell
16 siblings, 0 replies; 18+ messages in thread
From: Peter Maydell @ 2023-02-06 11:37 UTC (permalink / raw)
To: Daniel Henrique Barboza; +Cc: qemu-devel, qemu-ppc
On Sun, 5 Feb 2023 at 10:04, Daniel Henrique Barboza
<danielhb413@gmail.com> wrote:
>
> The following changes since commit ceabf6e500570ecfb311d8896c4ba9da8cf21f2a:
>
> Merge tag 'linux-user-for-8.0-pull-request' of https://gitlab.com/laurent_vivier/qemu into staging (2023-02-04 17:17:15 +0000)
>
> are available in the Git repository at:
>
> https://gitlab.com/danielhb/qemu.git tags/pull-ppc-20230205
>
> for you to fetch changes up to bd591dc1b3c39b7f73b8d9f20be6e9001c905238:
>
> hw/display/sm501: Code style fix (2023-02-05 06:40:28 -0300)
>
> ----------------------------------------------------------------
> ppc patch queue for 2023-02-05:
>
> This queue includes patches that aren't PPC specific but benefit/impact
> PPC machines, such as the changes to guestperf.py, mv64361 and sm501. As
> for PPC specific changes we have e500 and PNV_PHB5 fixes.
>
> ----------------------------------------------------------------
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/8.0
for any user-visible changes.
-- PMM
^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2023-02-06 11:38 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-05 10:04 [PULL 00/16] ppc queue Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 01/16] tests/migration: add sysprof-capture-4 as dependency for stress binary Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 02/16] tests/migration: add support for ppc64le for guestperf.py Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 03/16] ppc/pegasos2: Improve readability of VIA south bridge creation Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 04/16] hw/pci-host/mv64361: Reuse pci_swizzle_map_irq_fn Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 05/16] hw/ppc: Set machine->fdt in e500 machines Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 06/16] hw/ppc/e500{, plat}: Drop redundant checks for presence of platform bus Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 07/16] hw/ppc/e500.c: Avoid hardcoding parent device in create_devtree_etsec() Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 08/16] hw/ppc/e500.c: Attach eSDHC unimplemented region to ccsr_addr_space Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 09/16] ppc/pnv/pci: Cleanup PnvPHBPecState structure Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 10/16] ppc/pnv/pci: Remove duplicate definition of PNV_PHB5_DEVICE_ID Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 11/16] ppc/pnv/pci: Update PHB5 version register Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 12/16] ppc/pnv/pci: Fix PHB xscom registers memory region name Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 13/16] hw/ppc/pegasos2: Fix a typo in a comment Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 14/16] hw/display/sm501: Remove parenthesis around constant macro definitions Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 15/16] hw/display/sm501: Remove unneeded casts from void pointer Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 16/16] hw/display/sm501: Code style fix Daniel Henrique Barboza
2023-02-06 11:37 ` [PULL 00/16] ppc queue Peter Maydell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.