Introduce model for IBM's FSI
Subsystems (2)
v8 cover Introduce model for IBM's FSI
Hello,
Please review the patch-set version 8.
I have incorporated review comments from Cedric.
- Fixed checkpatch failures.
- Fixed commit messages.
- Fixed LBUS memory map size.
Ninad Palsule (10):
hw/fsi: Introduce IBM's Local bus
hw/fsi: Introduce IBM's FSI Bus
hw/fsi: Introduce IBM's cfam,fsi-slave,scratchpad hw/fsi: IBM's On-chip Peripheral Bus hw/fsi: Introduce IBM's FSI master hw/fsi: Aspeed APB2OPB interface
hw/arm: Hook up FSI module in AST2600 hw/fsi: Added qtest
hw/fsi: Added FSI documentation
hw/fsi: Update MAINTAINER list
MAINTAINERS | 8 + docs/specs/fsi.rst | 138 ++++++++++++++ docs/specs/index.rst | 1 + meson.build | 1 + hw/fsi/trace.h | 1 + include/hw/arm/aspeed_soc.h | 4 + include/hw/fsi/aspeed-apb2opb.h | 34 ++++ include/hw/fsi/cfam.h | 45 +++++ include/hw/fsi/fsi-master.h | 32 ++++ include/hw/fsi/fsi-slave.h | 29 +++ include/hw/fsi/fsi.h | 24 +++ include/hw/fsi/lbus.h | 40 ++++ include/hw/fsi/opb.h | 25 +++ hw/arm/aspeed_ast2600.c | 19 ++ hw/fsi/aspeed-apb2opb.c | 316 ++++++++++++++++++++++++++++++++ hw/fsi/cfam.c | 261 ++++++++++++++++++++++++++ hw/fsi/fsi-master.c | 165 +++++++++++++++++ hw/fsi/fsi-slave.c | 78 ++++++++ hw/fsi/fsi.c | 22 +++ hw/fsi/lbus.c | 51 ++++++ hw/fsi/opb.c | 36 ++++ tests/qtest/aspeed-fsi-test.c | 205 +++++++++++++++++++++ hw/Kconfig | 1 + hw/arm/Kconfig | 1 + hw/fsi/Kconfig | 21 +++ hw/fsi/meson.build | 5 + hw/fsi/trace-events | 13 ++ hw/meson.build | 1 + tests/qtest/meson.build | 1 + 29 files changed, 1578 insertions(+) create mode 100644 docs/specs/fsi.rst create mode 100644 hw/fsi/trace.h create mode 100644 include/hw/fsi/aspeed-apb2opb.h create mode 100644 include/hw/fsi/cfam.h create mode 100644 include/hw/fsi/fsi-master.h create mode 100644 include/hw/fsi/fsi-slave.h create mode 100644 include/hw/fsi/fsi.h create mode 100644 include/hw/fsi/lbus.h create mode 100644 include/hw/fsi/opb.h create mode 100644 hw/fsi/aspeed-apb2opb.c create mode 100644 hw/fsi/cfam.c create mode 100644 hw/fsi/fsi-master.c create mode 100644 hw/fsi/fsi-slave.c create mode 100644 hw/fsi/fsi.c create mode 100644 hw/fsi/lbus.c create mode 100644 hw/fsi/opb.c create mode 100644 tests/qtest/aspeed-fsi-test.c create mode 100644 hw/fsi/Kconfig create mode 100644 hw/fsi/meson.build create mode 100644 hw/fsi/trace-events
Signature · 1 line
2.39.2
PATCH v8 1/10 hw/fsi: Introduce IBM's Local bus
This is a part of patchset where IBM's Flexible Service Interface is introduced.
The LBUS is modelled to maintain mapped memory for the devices. The memory is mapped after CFAM config, peek table and FSI slave registers.
[ clg: - removed lbus_add_device() bc unused
- removed lbus_create_device() bc used only once
- removed "address" property
- updated meson.build to build fsi dir
- included an empty hw/fsi/trace-events ]
--- meson.build | 1 + hw/fsi/trace.h | 1 + include/hw/fsi/lbus.h | 40 +++++++++++++++++++++++++++++++++ hw/fsi/lbus.c | 51 +++++++++++++++++++++++++++++++++++++++++++ hw/Kconfig | 1 + hw/fsi/Kconfig | 2 ++ hw/fsi/meson.build | 1 + hw/fsi/trace-events | 1 + hw/meson.build | 1 + 9 files changed, 99 insertions(+) create mode 100644 hw/fsi/trace.h create mode 100644 include/hw/fsi/lbus.h create mode 100644 hw/fsi/lbus.c create mode 100644 hw/fsi/Kconfig create mode 100644 hw/fsi/meson.build create mode 100644 hw/fsi/trace-events
meson.build +1 -0
@@ -3298,6 +3298,7 @@ if have_system 'hw/char', 'hw/display', 'hw/dma', + 'hw/fsi', 'hw/hyperv', 'hw/i2c', 'hw/i386',
hw/fsi/trace.h new file +1 -0
@@ -0,0 +1 @@ +#include "trace/trace-hw_fsi.h"
include/hw/fsi/lbus.h new file +40 -0
@@ -0,0 +1,40 @@ +/* +* SPDX-License-Identifier: GPL-2.0-or-later +* Copyright (C) 2023 IBM Corp. +* +* IBM Local bus and connected device structures. +*/ +#ifndef FSI_LBUS_H +#define FSI_LBUS_H + +#include "exec/memory.h" +#include "hw/qdev-core.h" + +#define TYPE_FSI_LBUS_DEVICE "fsi.lbus.device" +OBJECT_DECLARE_TYPE(FSILBusDevice, FSILBusDeviceClass, FSI_LBUS_DEVICE) + +#define FSI_LBUS_MEM_REGION_SIZE (2 * 1024 * 1024) +#define FSI_LBUSDEV_IOMEM_START 0xc00/* 3K used by CFAM config etc */ + +typedef struct FSILBusDevice { +DeviceState parent; + +MemoryRegion iomem; +}FSILBusDevice ; + +typedef struct FSILBusDeviceClass { +DeviceClass parent; + +uint32_t config; +}FSILBusDeviceClass ; + +#define TYPE_FSI_LBUS "fsi.lbus" +OBJECT_DECLARE_SIMPLE_TYPE(FSILBus, FSI_LBUS) + +typedef struct FSILBus { +BusState bus; + +MemoryRegion mr; +}FSILBus ; + +#endif /* FSI_LBUS_H */
hw/fsi/lbus.c new file +51 -0
51 lines not on this page · raw message
hw/Kconfig +1 -0
@@ -9,6 +9,7 @@ source core/Kconfig source cxl/Kconfig source display/Kconfig source dma/Kconfig +source fsi/Kconfig source gpio/Kconfig source hyperv/Kconfig source i2c/Kconfig
hw/fsi/Kconfig new file +2 -0
@@ -0,0 +1,2 @@ +config FSI_LBUS + bool
hw/fsi/meson.build new file +1 -0
@@ -0,0 +1 @@ +system_ss.add(when: 'CONFIG_FSI_LBUS', if_true: files('lbus.c'))
hw/fsi/trace-events new file +1 -0
@@ -0,0 +1 @@ +
hw/meson.build +1 -0
@@ -44,6 +44,7 @@ subdir('virtio') subdir('watchdog') subdir('xen') subdir('xenpv') +subdir('fsi') subdir('alpha') subdir('arm')
Signature · 1 line
2.39.2
Re: [PATCH v8 01/10] hw/fsi: Introduce IBM's Local bus
Quoted 64 lines · Ninad Palsule
This is a part of patchset where IBM's Flexible Service Interface is introduced.
The LBUS is modelled to maintain mapped memory for the devices. The memory is mapped after CFAM config, peek table and FSI slave registers.
Signed-off-by Andrew Jeffery <[email protected]>Signed-off-by Ninad Palsule <[email protected]>[ clg: - removed
lbus_add_device()bc unused
- removedlbus_create_device()bc used only once
- removed "address" property
- updated meson.build to build fsi dir
- included an empty hw/fsi/trace-events ]Signed-off-by Cédric Le Goater <[email protected]>--- meson.build | 1 + hw/fsi/trace.h | 1 + include/hw/fsi/lbus.h | 40 +++++++++++++++++++++++++++++++++ hw/fsi/lbus.c | 51 +++++++++++++++++++++++++++++++++++++++++++ hw/Kconfig | 1 + hw/fsi/Kconfig | 2 ++ hw/fsi/meson.build | 1 + hw/fsi/trace-events | 1 + hw/meson.build | 1 + 9 files changed, 99 insertions(+)create mode 100644
hw/fsi/trace.h
create mode 100644include/hw/fsi/lbus.h
create mode 100644hw/fsi/lbus.c
create mode 100644 hw/fsi/Kconfig
create mode 100644 hw/fsi/meson.build
create mode 100644 hw/fsi/trace-eventsmeson.build +1
-0@@ -3298,6 +3298,7 @@ if have_system 'hw/char', 'hw/display', 'hw/dma', + 'hw/fsi', 'hw/hyperv', 'hw/i2c', 'hw/i386',hw/fsi/trace.h new file +1
-0@@ -0,0 +1 @@ +#include "trace/trace-hw_fsi.h" include/hw/fsi/lbus.h new file +7
-0@@ -0,0 +1,40 @@ +/* +* SPDX-License-Identifier: GPL-2.0-or-later +* Copyright (C) 2023 IBM Corp. +* +* IBM Local bus and connected device structures. +*/ +#ifndef FSI_LBUS_H
include/hw/fsi/lbus.h line 17
Quoted 10 lines
include/hw/fsi/lbus.h new file +10
-0+#define FSI_LBUS_H + +#include "exec/memory.h" +#include "hw/qdev-core.h" + +#define TYPE_FSI_LBUS_DEVICE "fsi.lbus.device" +OBJECT_DECLARE_TYPE(FSILBusDevice, FSILBusDeviceClass, FSI_LBUS_DEVICE) + +#define FSI_LBUS_MEM_REGION_SIZE (2 * 1024 * 1024) +#define FSI_LBUSDEV_IOMEM_START 0xc00/* 3K used by CFAM config etc */
I don't think sizing the local bus MMIO region exactly to the size of the CFAM MMIO region is necessary. The upper LBUS/CFAM addresses might not even be backed by device registers.
I would simplify with :
#define FSI_LBUS_MEM_REGION_SIZE (1 * MiB)
and forget about the offset.
Thanks,
C.
Quoted 126 lines
include/hw/fsi/lbus.h new file +23
-0+ +typedef struct FSILBusDevice { +DeviceState parent; + +MemoryRegion iomem; +}FSILBusDevice ; + +typedef struct FSILBusDeviceClass { +DeviceClass parent; + +uint32_t config; +}FSILBusDeviceClass ; + +#define TYPE_FSI_LBUS "fsi.lbus" +OBJECT_DECLARE_SIMPLE_TYPE(FSILBus, FSI_LBUS) + +typedef struct FSILBus { +BusState bus; + +MemoryRegion mr; +}FSILBus ; + +#endif /* FSI_LBUS_H */ hw/fsi/lbus.c new file +51
-0@@ -0,0 +1,51 @@ +/* +* SPDX-License-Identifier: GPL-2.0-or-later +* Copyright (C) 2023 IBM Corp. +* +* IBM Local bus where FSI slaves are connected +*/ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "hw/fsi/lbus.h" + +#include "hw/qdev-properties.h" + +static void lbus_init (Object *o) +{ +FSILBus *lbus =FSI_LBUS (o); + +memory_region_init (&lbus->mr,OBJECT (lbus),TYPE_FSI_LBUS , +FSI_LBUS_MEM_REGION_SIZE -FSI_LBUSDEV_IOMEM_START ); +} + +static const TypeInfo lbus_info = { + .name =TYPE_FSI_LBUS , + .parent =TYPE_BUS , + .instance_init = lbus_init, + .instance_size =sizeof (FSILBus), +}; + +static void lbus_device_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); + + dc->bus_type =TYPE_FSI_LBUS ; +} + +static const TypeInfo lbus_device_type_info = { + .name =TYPE_FSI_LBUS_DEVICE , + .parent =TYPE_DEVICE , + .instance_size =sizeof (FSILBusDevice), + .abstract = true, + .class_init = lbus_device_class_init, + .class_size =sizeof (FSILBusDeviceClass), +}; + +static void lbus_register_types (void ) +{ +type_register_static (&lbus_info); +type_register_static (&lbus_device_type_info); +} + +type_init (lbus_register_types);hw/Kconfig +1
-0@@ -9,6 +9,7 @@ source core/Kconfig source cxl/Kconfig source display/Kconfig source dma/Kconfig +source fsi/Kconfig source gpio/Kconfig source hyperv/Kconfig source i2c/Kconfighw/fsi/Kconfig new file +2
-0@@ -0,0 +1,2 @@ +config FSI_LBUS + boolhw/fsi/meson.build new file +1
-0@@ -0,0 +1 @@ +system_ss.add(when: 'CONFIG_FSI_LBUS', if_true: files('lbus.c'))hw/fsi/trace-events new file +1
-0@@ -0,0 +1 @@ +hw/meson.build +1
-0@@ -44,6 +44,7 @@ subdir('virtio') subdir('watchdog') subdir('xen') subdir('xenpv') +subdir('fsi') subdir('alpha') subdir('arm')
Re: [PATCH v8 01/10] hw/fsi: Introduce IBM's Local bus
Hello Cedric,
Quoted 81 lines · Cédric Le Goater
Quoted 74 lines · Ninad Palsule
This is a part of patchset where IBM's Flexible Service Interface is introduced.
The LBUS is modelled to maintain mapped memory for the devices. The memory is mapped after CFAM config, peek table and FSI slave registers.
Signed-off-by Andrew Jeffery <[email protected]>Signed-off-by Ninad Palsule <[email protected]>[ clg: - removed
lbus_add_device()bc unused
- removedlbus_create_device()bc used only once
- removed "address" property
- updated meson.build to build fsi dir
- included an empty hw/fsi/trace-events ]Signed-off-by Cédric Le Goater <[email protected]>---
meson.build | 1 +
hw/fsi/trace.h | 1 +
include/hw/fsi/lbus.h| 40 +++++++++++++++++++++++++++++++++ hw/fsi/lbus.c | 51 +++++++++++++++++++++++++++++++++++++++++++ hw/Kconfig | 1 +
hw/fsi/Kconfig | 2 ++
hw/fsi/meson.build | 1 +
hw/fsi/trace-events | 1 +
hw/meson.build | 1 +9 files changed, 99 insertions(+)create mode 100644
hw/fsi/trace.h
create mode 100644include/hw/fsi/lbus.h
create mode 100644hw/fsi/lbus.c
create mode 100644 hw/fsi/Kconfig
create mode 100644 hw/fsi/meson.build
create mode 100644 hw/fsi/trace-eventsmeson.build +1
-0@@ -3298,6 +3298,7 @@ if have_system 'hw/char', 'hw/display', 'hw/dma', + 'hw/fsi', 'hw/hyperv', 'hw/i2c', 'hw/i386',hw/fsi/trace.h new file +1
-0@@ -0,0 +1 @@ +#include "trace/trace-hw_fsi.h" include/hw/fsi/lbus.h new file +17
-0@@ -0,0 +1,40 @@ +/* +* SPDX-License-Identifier: GPL-2.0-or-later +* Copyright (C) 2023 IBM Corp. +* +* IBM Local bus and connected device structures. +*/ +#ifndef FSI_LBUS_H +#define FSI_LBUS_H + +#include "exec/memory.h" +#include "hw/qdev-core.h" + +#define TYPE_FSI_LBUS_DEVICE "fsi.lbus.device" +OBJECT_DECLARE_TYPE(FSILBusDevice, FSILBusDeviceClass, FSI_LBUS_DEVICE) + +#define FSI_LBUS_MEM_REGION_SIZE (2 * 1024 * 1024) +#define FSI_LBUSDEV_IOMEM_START 0xc00/* 3K used by CFAM config Quoted 1 line
etc */
I don't think sizing the local bus MMIO region exactly to the size of the CFAM MMIO region is necessary. The upper LBUS/CFAM addresses might not even be backed by device registers.
Quoted 6 lines
I would simplify with :
#define FSI_LBUS_MEM_REGION_SIZE (1 * MiB)
and forget about the offset.
ok, I made it as 1MB.
Thanks for the review.
Regards,
Ninad
PATCH v8 2/10 hw/fsi: Introduce IBM's FSI Bus
In reply to Ninad PalsuleThis is a part of patchset where FSI bus is introduced.
The FSI bus is a simple bus where FSI master is attached.
[ clg: - removed include/hw/fsi/engine-scratchpad.h and
hw/fsi/engine-scratchpad.c
- dropped FSI_SCRATCHPAD
- included FSIBus definition
- dropped hw/fsi/trace-events changes ]
--- include/hw/fsi/fsi.h | 19 +++++++++++++++++++ hw/fsi/fsi.c | 22 ++++++++++++++++++++++ hw/fsi/Kconfig | 3 +++ hw/fsi/meson.build | 1 + 4 files changed, 45 insertions(+) create mode 100644 include/hw/fsi/fsi.h create mode 100644 hw/fsi/fsi.c
include/hw/fsi/fsi.h new file +19 -0
@@ -0,0 +1,19 @@ +/* +* SPDX-License-Identifier: GPL-2.0-or-later +* Copyright (C) 2023 IBM Corp. +* +* IBM Flexible Service Interface +*/ +#ifndef FSI_FSI_H +#define FSI_FSI_H + +#include "hw/qdev-core.h" + +#define TYPE_FSI_BUS "fsi.bus" +OBJECT_DECLARE_SIMPLE_TYPE(FSIBus, FSI_BUS) + +typedef struct FSIBus { +BusState bus; +}FSIBus ; + +#endif
hw/fsi/fsi.c new file +22 -0
@@ -0,0 +1,22 @@ +/* +* SPDX-License-Identifier: GPL-2.0-or-later +* Copyright (C) 2023 IBM Corp. +* +* IBM Flexible Service Interface +*/ +#include "qemu/osdep.h" + +#include "hw/fsi/fsi.h" + +static const TypeInfo fsi_bus_info = { + .name =TYPE_FSI_BUS , + .parent =TYPE_BUS , + .instance_size =sizeof (FSIBus), +}; + +static void fsi_bus_register_types (void ) +{ +type_register_static (&fsi_bus_info); +} + +type_init (fsi_bus_register_types);
hw/fsi/Kconfig +3 -0
@@ -1,2 +1,5 @@ +config FSI + bool + config FSI_LBUS bool
hw/fsi/meson.build +1 -0
@@ -1 +1,2 @@ system_ss.add(when: 'CONFIG_FSI_LBUS', if_true: files('lbus.c')) +system_ss.add(when: 'CONFIG_FSI', if_true: files('fsi.c'))
Signature · 1 line
2.39.2
PATCH v8 3/10 hw/fsi: Introduce IBM's cfam,fsi-slave,scratchpad
In reply to Ninad PalsuleThis is a part of patchset where IBM's Flexible Service Interface is introduced.
The Common FRU Access Macro (CFAM), an address space containing various "engines" that drive accesses on busses internal and external to the POWER chip. Examples include the SBEFIFO and I2C masters. The engines hang off of an internal Local Bus (LBUS) which is described by the CFAM configuration block.
The FSI slave: The slave is the terminal point of the FSI bus for FSI symbols addressed to it. Slaves can be cascaded off of one another. The slave's configuration registers appear in address space of the CFAM to which it is attached.
The scratchpad provides a set of non-functional registers. The firmware is free to use them, hardware does not support any special management support. The scratchpad registers can be read or written from LBUS slave. The scratch pad is managed under FSI CFAM state.
[ clg: - moved object FSIScratchPad under FSICFAMState
- moved FSIScratchPad code under cfam.c
- introduced fsi_cfam_instance_init()
- reworked fsi_cfam_realize() ]
--- include/hw/fsi/cfam.h | 45 +++++++ include/hw/fsi/fsi-slave.h | 29 +++++ include/hw/fsi/fsi.h | 5 + hw/fsi/cfam.c | 261 +++++++++++++++++++++++++++++++++++++ hw/fsi/fsi-slave.c | 78 +++++++++++ hw/fsi/Kconfig | 8 ++ hw/fsi/meson.build | 3 +- hw/fsi/trace-events | 10 +- 8 files changed, 437 insertions(+), 2 deletions(-) create mode 100644 include/hw/fsi/cfam.h create mode 100644 include/hw/fsi/fsi-slave.h create mode 100644 hw/fsi/cfam.c create mode 100644 hw/fsi/fsi-slave.c
include/hw/fsi/cfam.h new file +45 -0
@@ -0,0 +1,45 @@ +/* +* SPDX-License-Identifier: GPL-2.0-or-later +* Copyright (C) 2023 IBM Corp. +* +* IBM Common FRU Access Macro +*/ +#ifndef FSI_CFAM_H +#define FSI_CFAM_H + +#include "exec/memory.h" + +#include "hw/fsi/fsi-slave.h" +#include "hw/fsi/lbus.h" + + +#define TYPE_FSI_SCRATCHPAD "fsi.scratchpad" +#define SCRATCHPAD (obj) OBJECT_CHECK(FSIScratchPad, (obj), TYPE_FSI_SCRATCHPAD) + +typedef struct FSIScratchPad { +FSILBusDevice parent; + +uint32_t reg; +}FSIScratchPad ; + +#define TYPE_FSI_CFAM "cfam" +#define FSI_CFAM (obj) OBJECT_CHECK(FSICFAMState, (obj), TYPE_FSI_CFAM) + +/* P9-ism */ +#define CFAM_CONFIG_NR_REGS 0x28 + +typedef struct FSICFAMState { +/* < private > */ +FSISlaveState parent; + +/* CFAM config address space */ +MemoryRegion config_iomem; + +MemoryRegion mr; +AddressSpace as; + +FSILBus lbus; +FSIScratchPad scratchpad; +}FSICFAMState ; + +#endif /* FSI_CFAM_H */
include/hw/fsi/fsi-slave.h new file +29 -0
@@ -0,0 +1,29 @@ +/* +* SPDX-License-Identifier: GPL-2.0-or-later +* Copyright (C) 2023 IBM Corp. +* +* IBM Flexible Service Interface slave +*/ +#ifndef FSI_FSI_SLAVE_H +#define FSI_FSI_SLAVE_H + +#include "exec/memory.h" +#include "hw/qdev-core.h" + +#include "hw/fsi/lbus.h" + +#include <stdint.h> + +#define TYPE_FSI_SLAVE "fsi.slave" +OBJECT_DECLARE_SIMPLE_TYPE(FSISlaveState, FSI_SLAVE) + +#define FSI_SLAVE_CONTROL_NR_REGS ((0x40 >> 2) + 1) + +typedef struct FSISlaveState { +DeviceState parent; + +MemoryRegion iomem; +uint32_t regs[FSI_SLAVE_CONTROL_NR_REGS ]; +}FSISlaveState ; + +#endif /* FSI_FSI_H */
include/hw/fsi/fsi.h +5 -0
@@ -8,6 +8,11 @@#define FSI_FSI_H #include "hw/qdev-core.h" +#include "qemu/bitops.h" + +/* Bitwise operations at the word level. */ +#define BE_BIT (x) BIT(31 - (x)) +#define BE_GENMASK (hb, lb) MAKE_64BIT_MASK((lb), ((hb) - (lb) + 1))#define TYPE_FSI_BUS "fsi.bus"OBJECT_DECLARE_SIMPLE_TYPE (FSIBus,FSI_BUS )
hw/fsi/cfam.c new file +261 -0
261 lines not on this page · raw message
hw/fsi/fsi-slave.c new file +78 -0
78 lines not on this page · raw message
hw/fsi/Kconfig +8 -0
@@ -1,3 +1,11 @@ +config FSI_CFAM + bool + select FSI + select FSI_LBUS + +config FSI + bool + config FSI bool
hw/fsi/meson.build +2 -1
@@ -1,2 +1,3 @@ system_ss.add(when: 'CONFIG_FSI_LBUS', if_true: files('lbus.c')) -system_ss.add(when: 'CONFIG_FSI', if_true: files('fsi.c')) +system_ss.add(when: 'CONFIG_FSI_CFAM', if_true: files('cfam.c')) +system_ss.add(when: 'CONFIG_FSI', if_true: files('fsi.c','fsi-slave.c'))
hw/fsi/trace-events +9 -1
@@ -1 +1,9 @@ - +fsi_scratchpad_read(uint64_t addr, uint32_t size) "@0x%" PRIx64 " size=%d" +fsi_scratchpad_write(uint64_t addr, uint32_t size, uint64_t data) "@0x%" PRIx64 " size=%d value=0x%"PRIx64 +fsi_cfam_config_read(uint64_t addr, uint32_t size) "@0x%" PRIx64 " size=%d" +fsi_cfam_config_write(uint64_t addr, uint32_t size, uint64_t data) "@0x%" PRIx64 " size=%d value=0x%"PRIx64 +fsi_cfam_unimplemented_read(uint64_t addr, uint32_t size) "@0x%" PRIx64 " size=%d" +fsi_cfam_unimplemented_write(uint64_t addr, uint32_t size, uint64_t data) "@0x%" PRIx64 " size=%d value=0x%"PRIx64 +fsi_cfam_config_write_noaddr(uint64_t addr, uint32_t size, uint64_t data) "@0x%" PRIx64 " size=%d value=0x%"PRIx64 +fsi_slave_read(uint64_t addr, uint32_t size) "@0x%" PRIx64 " size=%d" +fsi_slave_write(uint64_t addr, uint32_t size, uint64_t data) "@0x%" PRIx64 " size=%d value=0x%"PRIx64
Signature · 1 line
2.39.2
Re: [PATCH v8 03/10] hw/fsi: Introduce IBM's cfam,fsi-slave,scratchpad
Quoted 60 lines · Ninad Palsule
This is a part of patchset where IBM's Flexible Service Interface is introduced.
The Common FRU Access Macro (CFAM), an address space containing various "engines" that drive accesses on busses internal and external to the POWER chip. Examples include the SBEFIFO and I2C masters. The engines hang off of an internal Local Bus (LBUS) which is described by the CFAM configuration block.
The FSI slave: The slave is the terminal point of the FSI bus for FSI symbols addressed to it. Slaves can be cascaded off of one another. The slave's configuration registers appear in address space of the CFAM to which it is attached.
The scratchpad provides a set of non-functional registers. The firmware is free to use them, hardware does not support any special management support. The scratchpad registers can be read or written from LBUS slave. The scratch pad is managed under FSI CFAM state.
Signed-off-by Andrew Jeffery <[email protected]>Signed-off-by Ninad Palsule <[email protected]>[ clg: - moved object FSIScratchPad under FSICFAMState
- moved FSIScratchPad code undercfam.c
- introducedfsi_cfam_instance_init()
- reworkedfsi_cfam_realize()]Signed-off-by Cédric Le Goater <[email protected]>--- include/hw/fsi/cfam.h | 45 +++++++ include/hw/fsi/fsi-slave.h | 29 +++++ include/hw/fsi/fsi.h | 5 + hw/fsi/cfam.c | 261 +++++++++++++++++++++++++++++++++++++ hw/fsi/fsi-slave.c | 78 +++++++++++ hw/fsi/Kconfig | 8 ++ hw/fsi/meson.build | 3 +- hw/fsi/trace-events | 10 +- 8 files changed, 437 insertions(+), 2 deletions(-)create mode 100644
include/hw/fsi/cfam.h
create mode 100644include/hw/fsi/fsi-slave.h
create mode 100644hw/fsi/cfam.c
create mode 100644hw/fsi/fsi-slave.cinclude/hw/fsi/cfam.h new file +13
-0@@ -0,0 +1,45 @@ +/* +* SPDX-License-Identifier: GPL-2.0-or-later +* Copyright (C) 2023 IBM Corp. +* +* IBM Common FRU Access Macro +*/ +#ifndef FSI_CFAM_H +#define FSI_CFAM_H + +#include "exec/memory.h" + +#include "hw/fsi/fsi-slave.h" +#include "hw/fsi/lbus.h"
include/hw/fsi/cfam.h line 23
Quoted 10 lines
include/hw/fsi/cfam.h new file +10
-0+ + +#define TYPE_FSI_SCRATCHPAD "fsi.scratchpad" +#define SCRATCHPAD (obj) OBJECT_CHECK(FSIScratchPad, (obj), TYPE_FSI_SCRATCHPAD) + +typedef struct FSIScratchPad { +FSILBusDevice parent; + +uint32_t reg; +}FSIScratchPad ;
We could extend to 4 regs possibly.
Quoted 6 lines
include/hw/fsi/cfam.h new file +6
-0+ +#define TYPE_FSI_CFAM "cfam" +#define FSI_CFAM (obj) OBJECT_CHECK(FSICFAMState, (obj), TYPE_FSI_CFAM) + +/* P9-ism */ +#define CFAM_CONFIG_NR_REGS 0x28
include/hw/fsi/cfam.h line 39
Quoted 10 lines
include/hw/fsi/cfam.h new file +10
-0+ +typedef struct FSICFAMState { + /* < private > */ + FSISlaveState parent; + + /* CFAM config address space */ + MemoryRegion config_iomem; + + MemoryRegion mr; + AddressSpace as;
The address space is not used. please remove.
Quoted 17 lines
include/hw/fsi/cfam.h new file +6
-0+ +FSILBus lbus; + FSIScratchPad scratchpad; +} FSICFAMState; + +#endif /* FSI_CFAM_H */ include/hw/fsi/fsi-slave.h new file +5
-0@@ -0,0 +1,29 @@ +/* +* SPDX-License-Identifier: GPL-2.0-or-later +* Copyright (C) 2023 IBM Corp. +* +* IBM Flexible Service Interface slave
include/hw/fsi/fsi-slave.h line 15
Quoted 10 lines
include/hw/fsi/fsi-slave.h new file +10
-0+*/ +#ifndef FSI_FSI_SLAVE_H +#define FSI_FSI_SLAVE_H + +#include "exec/memory.h" +#include "hw/qdev-core.h" + +#include "hw/fsi/lbus.h" + +#include <stdint.h>
Not needed. Please remove.
Quoted 78 lines
include/hw/fsi/fsi-slave.h new file +13
-0+#define TYPE_FSI_SLAVE "fsi.slave" +OBJECT_DECLARE_SIMPLE_TYPE(FSISlaveState, FSI_SLAVE) + +#define FSI_SLAVE_CONTROL_NR_REGS ((0x40 >> 2) + 1) + +typedef struct FSISlaveState { +DeviceState parent; + +MemoryRegion iomem; +uint32_t regs[FSI_SLAVE_CONTROL_NR_REGS ]; +}FSISlaveState ; + +#endif /* FSI_FSI_H */ include/hw/fsi/fsi.h +5
-0@@ -8,6 +8,11 @@#define FSI_FSI_H #include "hw/qdev-core.h" +#include "qemu/bitops.h" + +/* Bitwise operations at the word level. */ +#define BE_BIT (x) BIT(31 - (x)) +#define BE_GENMASK (hb, lb) MAKE_64BIT_MASK((lb), ((hb) - (lb) + 1))#define TYPE_FSI_BUS "fsi.bus"OBJECT_DECLARE_SIMPLE_TYPE (FSIBus,FSI_BUS )hw/fsi/cfam.c new file +43
-0@@ -0,0 +1,261 @@ +/* +* SPDX-License-Identifier: GPL-2.0-or-later +* Copyright (C) 2023 IBM Corp. +* +* IBM Common FRU Access Macro +*/ + +#include "qemu/osdep.h" + +#include "qapi/error.h" +#include "trace.h" + +#include "hw/fsi/cfam.h" +#include "hw/fsi/fsi.h" + +#include "hw/qdev-properties.h" + +#define ENGINE_CONFIG_NEXT BE_BIT(0) +#define ENGINE_CONFIG_TYPE_PEEK (0x02 << 4) +#define ENGINE_CONFIG_TYPE_FSI (0x03 << 4) +#define ENGINE_CONFIG_TYPE_SCRATCHPAD (0x06 << 4) + +#define TO_REG (x) ((x) >> 2) + +#define CFAM_ENGINE_CONFIG TO_REG(0x04) + +#define CFAM_CONFIG_CHIP_ID TO_REG(0x00) +#define CFAM_CONFIG_CHIP_ID_P9 0xc0022d15 +#define CFAM_CONFIG_CHIP_ID_BREAK 0xc0de0000 + +static uint64_t fsi_cfam_config_read (void *opaque,hwaddr addr,unsigned size) +{ +FSICFAMState *cfam =FSI_CFAM (opaque); +BusChild *kid; +int i; + +trace_fsi_cfam_config_read (addr, size); + +switch (addr) { +case 0x00 : +return CFAM_CONFIG_CHIP_ID_P9 ; +case 0x04 : + return ENGINE_CONFIG_NEXT | /* valid */
hw/fsi/cfam.c line 53
Quoted 10 lines
hw/fsi/cfam.c new file +10
-0+0x00010000 |/* slots */ +0x00001000 |/* version */ +ENGINE_CONFIG_TYPE_PEEK |/* type */ +0x0000000c ;/* crc */ +case 0x08 : +return ENGINE_CONFIG_NEXT |/* valid */ +0x00010000 |/* slots */ +0x00005000 |/* version */ +ENGINE_CONFIG_TYPE_FSI |/* type */ +0x0000000a ;/* crc */
Please introduce a macro to build these register values.
Quoted 6 lines
hw/fsi/cfam.c new file +6
-0+break ; +default : +/* The config table contains different engines from 0xc onwards. */ + i =0xc ; + QTAILQ_FOREACH(kid, &cfam->lbus.bus.children, sibling) { +if (i == addr) {
hw/fsi/cfam.c line 69
Quoted 10 lines
hw/fsi/cfam.c new file +10
-0+DeviceState *ds = kid->child; +FSILBusDevice *dev =FSI_LBUS_DEVICE (ds); +return FSI_LBUS_DEVICE_GET_CLASS (dev)->config; + } + i += size; + } + +if (i == addr) { +return 0 ; + }
If I understand correctly, the register 0xC contains some static config value for the first device engine, the scratchpad device mapped at 0xC00, and following registers would do the same for other devices if they were modelled.
This is certtainly hardwired in HW, so I would simplify to :
case 0xC: return ldc->config default: /* log not implemented */
And extend the list when more devices are modeled.
hw/fsi/cfam.c line 76
Quoted 6 lines
hw/fsi/cfam.c new file +6
-0+/* +* As per FSI specification, This is a magic value at address 0 of +* given FSI port. This causes FSI master to send BREAK command for +* initialization and recovery. +*/ +return CFAM_CONFIG_CHIP_ID_BREAK ;
This looks weird. I don't understant to which offset this value belongs.
hw/fsi/cfam.c line 89
Quoted 13 lines
hw/fsi/cfam.c new file +13
-0+ } +} + +static void fsi_cfam_config_write (void *opaque,hwaddr addr,uint64_t data, +unsigned size) +{ +FSICFAMState *cfam =FSI_CFAM (opaque); + +trace_fsi_cfam_config_write (addr, size, data); + +switch (TO_REG (addr)) { +case CFAM_CONFIG_CHIP_ID : +case CFAM_CONFIG_CHIP_ID +4 :
Couldn't we introduce a proper define for this reg ? and can we write to the config space ? This break command seems to be sent to the FSI master, according to Linux. Why is it handled in the CFAM config space ?
hw/fsi/cfam.c line 93
Quoted 4 lines
hw/fsi/cfam.c new file +4
-0+if (data ==CFAM_CONFIG_CHIP_ID_BREAK ) { +bus_cold_reset (BUS (&cfam->lbus)); + } +break ;
alignment is not good.
Quoted 41 lines
hw/fsi/cfam.c new file +41
-0+default : +trace_fsi_cfam_config_write_noaddr (addr, size, data); + } +} + +static const struct MemoryRegionOps cfam_config_ops = { + .read = fsi_cfam_config_read, + .write = fsi_cfam_config_write, + .valid.max_access_size =4 , + .valid.min_access_size =4 , + .impl.max_access_size =4 , + .impl.min_access_size =4 , + .endianness =DEVICE_BIG_ENDIAN , +}; + +static uint64_t fsi_cfam_unimplemented_read (void *opaque,hwaddr addr, +unsigned size) +{ +trace_fsi_cfam_unimplemented_read (addr, size); + +return 0 ; +} + +static void fsi_cfam_unimplemented_write (void *opaque,hwaddr addr, +uint64_t data,unsigned size) +{ +trace_fsi_cfam_unimplemented_write (addr, size, data); +} + +static const struct MemoryRegionOps fsi_cfam_unimplemented_ops = { + .read = fsi_cfam_unimplemented_read, + .write = fsi_cfam_unimplemented_write, + .endianness =DEVICE_BIG_ENDIAN , +}; + +static void fsi_cfam_instance_init (Object *obj) +{ +FSICFAMState *s =FSI_CFAM (obj); + +object_initialize_child (obj,"scratchpad" , &s->scratchpad, +TYPE_FSI_SCRATCHPAD );
hw/fsi/cfam.c line 144
Quoted 10 lines
hw/fsi/cfam.c new file +10
-0+} + +static void fsi_cfam_realize (DeviceState *dev,Error **errp) +{ +FSICFAMState *cfam =FSI_CFAM (dev); +FSISlaveState *slave =FSI_SLAVE (dev); + +/* Each slave has a 2MiB address space */ +memory_region_init_io (&cfam->mr,OBJECT (cfam), &fsi_cfam_unimplemented_ops, + cfam,TYPE_FSI_CFAM ,2 *1024 *1024 );
2 * MiB
Quoted 4 lines
hw/fsi/cfam.c new file +4
-0+address_space_init (&cfam->as, &cfam->mr,TYPE_FSI_CFAM ); + +qbus_init (&cfam->lbus,sizeof (cfam->lbus),TYPE_FSI_LBUS ,DEVICE (cfam), +NULL );
hw/fsi/cfam.c line 158
Quoted 10 lines
hw/fsi/cfam.c new file +10
-0+ +memory_region_init_io (&cfam->config_iomem,OBJECT (cfam), &cfam_config_ops, + cfam,TYPE_FSI_CFAM ".config" ,0x400 ); + +memory_region_add_subregion (&cfam->mr,0 , &cfam->config_iomem); +memory_region_add_subregion (&cfam->mr,0x800 , &slave->iomem); +memory_region_add_subregion (&cfam->mr,0xc00 , &cfam->lbus.mr); + +/* Add scratchpad engine */ + if (!qdev_realize_and_unref(DEVICE(&cfam->scratchpad), BUS(&cfam->lbus),
cfam->scratchpad is not allocated. We should use qdev_realize instead.
hw/fsi/cfam.c line 163
Quoted 5 lines
hw/fsi/cfam.c new file +5
-0+ errp)) { +return ; + } + +/* TODO: clarify scratchpad mapping */
You can remove the TODO now. All Local bus devices are mapped at offset 0xc00.
Quoted 55 lines
hw/fsi/cfam.c new file +55
-0+FSILBusDevice *fsi_dev =FSI_LBUS_DEVICE (&cfam->scratchpad); +memory_region_add_subregion (&cfam->lbus.mr,0 , &fsi_dev->iomem); +} + +static void fsi_cfam_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); + dc->bus_type =TYPE_FSI_BUS ; + dc->realize = fsi_cfam_realize; +} + +static const TypeInfo fsi_cfam_info = { + .name =TYPE_FSI_CFAM , + .parent =TYPE_FSI_SLAVE , + .instance_init = fsi_cfam_instance_init, + .instance_size =sizeof (FSICFAMState), + .class_init = fsi_cfam_class_init, +}; + +static uint64_t fsi_scratchpad_read (void *opaque,hwaddr addr,unsigned size) +{ +FSIScratchPad *s =SCRATCHPAD (opaque); + +trace_fsi_scratchpad_read (addr, size); + +if (addr) { +return 0 ; + } + +return s->reg; +} + +static void fsi_scratchpad_write (void *opaque,hwaddr addr,uint64_t data, +unsigned size) +{ +FSIScratchPad *s =SCRATCHPAD (opaque); + +trace_fsi_scratchpad_write (addr, size, data); + +if (addr) { +return ; + } + + s->reg = data; +} + +static const struct MemoryRegionOps scratchpad_ops = { + .read = fsi_scratchpad_read, + .write = fsi_scratchpad_write, + .endianness =DEVICE_BIG_ENDIAN , +}; + +static void fsi_scratchpad_realize (DeviceState *dev,Error **errp) +{ +FSILBusDevice *ldev =FSI_LBUS_DEVICE (dev);
hw/fsi/cfam.c line 228
Quoted 10 lines
hw/fsi/cfam.c new file +10
-0+ +memory_region_init_io (&ldev->iomem,OBJECT (ldev), &scratchpad_ops, + ldev,TYPE_FSI_SCRATCHPAD ,0x400 ); +} + +static void fsi_scratchpad_reset (DeviceState *dev) +{ +FSIScratchPad *s =SCRATCHPAD (dev); + + s->reg =0 ;
Just one reg ! Too easy :) let's have a few more.
Quoted 6 lines
hw/fsi/cfam.c new file +6
-0+} + +static void fsi_scratchpad_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); +FSILBusDeviceClass *ldc =FSI_LBUS_DEVICE_CLASS (klass);
hw/fsi/cfam.c line 244
Quoted 10 lines
hw/fsi/cfam.c new file +10
-0+ + dc->realize = fsi_scratchpad_realize; + dc->reset = fsi_scratchpad_reset; + + ldc->config = +ENGINE_CONFIG_NEXT |/* valid */ +0x00010000 |/* slots */ +0x00001000 |/* version */ +ENGINE_CONFIG_TYPE_SCRATCHPAD |/* type */ +0x00000007 ;/* crc */
This class and attribute do not look useful. Please use a macro to build the value and return it in the CFAM config read operation.
Quoted 38 lines
hw/fsi/cfam.c new file +17
-0+} + +static const TypeInfo fsi_scratchpad_info = { + .name =TYPE_FSI_SCRATCHPAD , + .parent =TYPE_FSI_LBUS_DEVICE , + .instance_size =sizeof (FSIScratchPad), + .class_init = fsi_scratchpad_class_init, + .class_size =sizeof (FSILBusDeviceClass), +}; + +static void fsi_cfam_register_types (void ) +{ +type_register_static (&fsi_scratchpad_info); +type_register_static (&fsi_cfam_info); +} + +type_init (fsi_cfam_register_types);hw/fsi/fsi-slave.c new file +15
-0@@ -0,0 +1,78 @@ +/* +* SPDX-License-Identifier: GPL-2.0-or-later +* Copyright (C) 2023 IBM Corp. +* +* IBM Flexible Service Interface slave +*/ + +#include "qemu/osdep.h" + +#include "qapi/error.h" +#include "qemu/log.h" +#include "trace.h" + +#include "hw/fsi/fsi-slave.h" +#include "hw/fsi/fsi.h"
hw/fsi/fsi-slave.c line 25
Quoted 10 lines
hw/fsi/fsi-slave.c new file +10
-0+ +#define TO_REG (x) ((x) >> 2) + +static uint64_t fsi_slave_read (void *opaque,hwaddr addr,unsigned size) +{ +FSISlaveState *s =FSI_SLAVE (opaque); + +trace_fsi_slave_read (addr, size); + +if (addr + size >sizeof (s->regs)) {
This test is mixing memory region offsets and memop size. These are two fields of different nature. So this is quite incorrect !
Ideally, we should have a switch statement with handlers for implemented registers and a default for the rest. Please see the aspeed_scu model for an example.
Quoted 7 lines
hw/fsi/fsi-slave.c new file +7
-0+qemu_log_mask (LOG_GUEST_ERROR , +"%s: Out of bounds read: 0x%" HWADDR_PRIx" for %u\n" , + __func__, addr, size); +return 0 ; + } + +return s->regs[TO_REG (addr)];
hw/fsi/fsi-slave.c line 42
Quoted 10 lines
hw/fsi/fsi-slave.c new file +10
-0+} + +static void fsi_slave_write (void *opaque,hwaddr addr,uint64_t data, +unsigned size) +{ +FSISlaveState *s =FSI_SLAVE (opaque); + +trace_fsi_slave_write (addr, size, data); + +if (addr + size >sizeof (s->regs)) {
Same here.
Quoted 12 lines
hw/fsi/fsi-slave.c new file +12
-0+qemu_log_mask (LOG_GUEST_ERROR , +"%s: Out of bounds write: 0x%" HWADDR_PRIx" for %u\n" , + __func__, addr, size); +return ; + } + + s->regs[TO_REG (addr)] = data; +} + +static const struct MemoryRegionOps fsi_slave_ops = { + .read = fsi_slave_read, + .write = fsi_slave_write,
hw/fsi/fsi-slave.c line 64
Quoted 10 lines
hw/fsi/fsi-slave.c new file +10
-0+ .endianness = DEVICE_BIG_ENDIAN, +}; + +static void fsi_slave_init (Object *o) +{ +FSISlaveState *s =FSI_SLAVE (o); + +memory_region_init_io (&s->iomem,OBJECT (s), &fsi_slave_ops, + s,TYPE_FSI_SLAVE ,0x400 ); +}
No reset handler ?
Thanks,
C.
Quoted 53 lines
hw/fsi/fsi-slave.c new file +13
-0+static const TypeInfo fsi_slave_info = { + .name =TYPE_FSI_SLAVE , + .parent =TYPE_DEVICE , + .instance_init = fsi_slave_init, + .instance_size =sizeof (FSISlaveState), +}; + +static void fsi_slave_register_types (void ) +{ +type_register_static (&fsi_slave_info); +} + +type_init (fsi_slave_register_types);hw/fsi/Kconfig +8
-0@@ -1,3 +1,11 @@ +config FSI_CFAM + bool + select FSI + select FSI_LBUS + +config FSI + bool + config FSI boolhw/fsi/meson.build +2
-1@@ -1,2 +1,3 @@ system_ss.add(when: 'CONFIG_FSI_LBUS', if_true: files('lbus.c')) -system_ss.add(when: 'CONFIG_FSI', if_true: files('fsi.c')) +system_ss.add(when: 'CONFIG_FSI_CFAM', if_true: files('cfam.c')) +system_ss.add(when: 'CONFIG_FSI', if_true: files('fsi.c','fsi-slave.c'))hw/fsi/trace-events +9
-1@@ -1 +1,9 @@ - +fsi_scratchpad_read(uint64_t addr, uint32_t size) "@0x%" PRIx64 " size=%d" +fsi_scratchpad_write(uint64_t addr, uint32_t size, uint64_t data) "@0x%" PRIx64 " size=%d value=0x%"PRIx64 +fsi_cfam_config_read(uint64_t addr, uint32_t size) "@0x%" PRIx64 " size=%d" +fsi_cfam_config_write(uint64_t addr, uint32_t size, uint64_t data) "@0x%" PRIx64 " size=%d value=0x%"PRIx64 +fsi_cfam_unimplemented_read(uint64_t addr, uint32_t size) "@0x%" PRIx64 " size=%d" +fsi_cfam_unimplemented_write(uint64_t addr, uint32_t size, uint64_t data) "@0x%" PRIx64 " size=%d value=0x%"PRIx64 +fsi_cfam_config_write_noaddr(uint64_t addr, uint32_t size, uint64_t data) "@0x%" PRIx64 " size=%d value=0x%"PRIx64 +fsi_slave_read(uint64_t addr, uint32_t size) "@0x%" PRIx64 " size=%d" +fsi_slave_write(uint64_t addr, uint32_t size, uint64_t data) "@0x%" PRIx64 " size=%d value=0x%"PRIx64
Re: [PATCH v8 03/10] hw/fsi: Introduce IBM's cfam,fsi-slave,scratchpad
Hello Cedric,
Quoted 4 lines
Quoted 4 lines
include/hw/fsi/cfam.h new file +3
-0+ +#define TYPE_FSI_SCRATCHPAD "fsi.scratchpad" +#define SCRATCHPAD (obj) OBJECT_CHECK(FSIScratchPad, (obj),
TYPE_FSI_SCRATCHPAD)
Quoted 8 lines
include/hw/fsi/cfam.h line 23
Quoted 6 lines
include/hw/fsi/cfam.h new file +6
-0+ +typedef struct FSIScratchPad { + FSILBusDevice parent; + + uint32_t reg; +}FSIScratchPad ;We could extend to 4 regs possibly.
OK, Added 4 registers.
Quoted 11 lines
Quoted 11 lines
include/hw/fsi/cfam.h new file +10
-0+ +#define TYPE_FSI_CFAM "cfam" +#define FSI_CFAM (obj) OBJECT_CHECK(FSICFAMState, (obj), TYPE_FSI_CFAM) + +/* P9-ism */ +#define CFAM_CONFIG_NR_REGS 0x28 + +typedef struct FSICFAMState { + /* < private > */ + FSISlaveState parent;
Quoted 8 lines
include/hw/fsi/cfam.h line 39
Quoted 6 lines
include/hw/fsi/cfam.h new file +6
-0+ + /* CFAM config address space */ + MemoryRegion config_iomem; + + MemoryRegion mr; + AddressSpace as;The address space is not used. please remove.
Removed address space.
Quoted 10 lines
include/hw/fsi/fsi-slave.h line 15
Quoted 8 lines
include/hw/fsi/fsi-slave.h new file +6
-0+#include "exec/memory.h" +#include "hw/qdev-core.h" + +#include "hw/fsi/lbus.h" + +#include <stdint.h> Not needed. Please remove.
Removed the header file.
Quoted 20 lines
Quoted 20 lines
(quoted diff) +2
-0+ +static uint64_t fsi_cfam_config_read(void *opaque, hwaddr addr,unsigned size)
hw/fsi/cfam.c new file +16
-0+{ + FSICFAMState *cfam = FSI_CFAM(opaque); + BusChild *kid; + int i; + + trace_fsi_cfam_config_read(addr, size); + + switch (addr) { + case 0x00: + return CFAM_CONFIG_CHIP_ID_P9; + case 0x04: + return ENGINE_CONFIG_NEXT | /* valid */ + 0x00010000 | /* slots */ + 0x00001000 | /* version */ + ENGINE_CONFIG_TYPE_PEEK | /* type */ + 0x0000000c; /* crc */
Quoted 8 lines
Quoted 6 lines
+ case
0x08:
+ return ENGINE_CONFIG_NEXT | /* valid */ + 0x00010000 | /* slots */ + 0x00005000 | /* version */ + ENGINE_CONFIG_TYPE_FSI | /* type */ + 0x0000000a; /* crc */Please introduce a macro to build these register values.
Added macros
Quoted 24 lines
Quoted 10 lines
+ break;
+ default:
+ /* The config table contains different engines from0xconwards. */
+ i =0xc;
+QTAILQ_FOREACH(kid, &cfam->lbus.bus.children, sibling){ + if (i == addr) {
+ DeviceState *ds =kid->child;
+ FSILBusDevice *dev =FSI_LBUS_DEVICE(ds);Quoted 8 lines
+ return FSI_LBUS_DEVICE_GET_CLASS(dev)->config; + }
+ i += size;
+ }
+
+ if (i == addr) {
+ return 0;
+ }If I understand correctly, the register
0xCcontains some static config value for the first device engine, the scratchpad device mapped at0xC00, and following registers would do the same for other devices if they were modelled.
Quoted 8 lines
This is certtainly hardwired in HW, so I would simplify to :
case
0xC:
returnldc->config
default:
/* log not implemented */And extend the list when more devices are modeled.
Simplified as per your suggestion.
Quoted 11 lines
Quoted 9 lines
+ /*
+ * As per FSI specification, This is a magic value at address 0 of
+ * given FSI port. This causes FSI master to send BREAK command for
+ * initialization and recovery.
+ */
+ returnCFAM_CONFIG_CHIP_ID_BREAK;This looks weird. I don't understant to which offset this value belongs.
Yes, Removed it for now. We are handling break command in the config write.
Quoted 11 lines
Quoted 11 lines
+ }
hw/fsi/cfam.c new file +3
-0+} + +static void fsi_cfam_config_write(void *opaque, hwaddr addr,
uint64_tdata,
+ unsigned size)hw/fsi/cfam.c new file +4
-0+{ + FSICFAMState *cfam = FSI_CFAM(opaque); + + trace_fsi_cfam_config_write(addr, size, data);
Quoted 8 lines
Quoted 4 lines
+
+ switch (TO_REG(addr)) {
+ caseCFAM_CONFIG_CHIP_ID:
+ caseCFAM_CONFIG_CHIP_ID+ 4:Couldn't we introduce a proper define for this reg ? and can we write to the config space ? This break command seems to be sent to the FSI master, according to Linux. Why is it handled in the CFAM config space ?
Added new PEEK_STATUS register. The BREAK command is send by FSI-master to FSI-slave and FSI-slave is embedded into CFAM hence we are handling it here.
Quoted 7 lines
Quoted 5 lines
+ if (data ==
CFAM_CONFIG_CHIP_ID_BREAK) {
+ bus_cold_reset(BUS(&cfam->lbus));
+ }
+ break;alignment is not good.
Fixed the alignment.
Quoted 13 lines
Quoted 11 lines
hw/fsi/cfam.c new file +7
-0+static void fsi_cfam_realize (DeviceState *dev,Error **errp) +{ + FSICFAMState *cfam = FSI_CFAM(dev); + FSISlaveState *slave = FSI_SLAVE(dev); + + /* Each slave has a 2MiB address space */ + memory_region_init_io(&cfam->mr, OBJECT(cfam),
&fsi_cfam_unimplemented_ops,
+ cfam,TYPE_FSI_CFAM, 2 * 1024 * 1024);2 * MiB
Now using MiB.
Quoted 7 lines
Quoted 5 lines
+
+ /* Add scratchpad engine */
+ if (!qdev_realize_and_unref(DEVICE(&cfam->scratchpad),BUS(&cfam->lbus),
cfam->scratchpadis not allocated. We should useqdev_realizeinstead.
Fixed it.
Quoted 6 lines
Quoted 3 lines
+ /* TODO: clarify scratchpad mapping */
You can remove the TODO now. All Local bus devices are mapped at offset
0xc00.
Removed it.
Quoted 9 lines
hw/fsi/cfam.c line 228
Quoted 7 lines
hw/fsi/cfam.c new file +5
-0+static void fsi_scratchpad_reset (DeviceState *dev) +{ + FSIScratchPad *s = SCRATCHPAD(dev); + + s->reg = 0;Just one reg ! Too easy :) let's have a few more.
Now clear 4 registers.
Quoted 10 lines
Quoted 9 lines
+
ldc->config=
+ ENGINE_CONFIG_NEXT | /* valid */ + 0x00010000 | /* slots */ + 0x00001000 | /* version */ +ENGINE_CONFIG_TYPE_SCRATCHPAD| /* type */ + 0x00000007; /* crc */
Quoted 2 lines
This class and attribute do not look useful. Please use a macro to build the value and return it in the CFAM config read operation.
Added macro for SCARTCHPAD config value but keeping the class as new devices need it.
Quoted 16 lines
hw/fsi/fsi-slave.c line 25
Quoted 12 lines
(quoted diff) +2
-0+ +static uint64_t fsi_slave_read(void *opaque, hwaddr addr, unsignedsize)
hw/fsi/fsi-slave.c new file +6
-0+{ + FSISlaveState *s = FSI_SLAVE(opaque); + + trace_fsi_slave_read(addr, size); + + if (addr + size > sizeof(s->regs)) {This test is mixing memory region offsets and memop size. These are two fields of different nature. So this is quite incorrect !
Quoted 3 lines
Ideally, we should have a switch statement with handlers for implemented registers and a default for the rest. Please see the
aspeed_scumodel for an example.
I have fixed the limit check but registers are simply used as a memory region hence did not add switch statement.
Quoted 13 lines
Quoted 13 lines
+ qemu_log_mask(LOG_GUEST_ERROR,
+ "%s: Out of bounds read: 0x%"HWADDR_PRIx" for %u\n",
+__func__, addr, size);
+ return 0;
+ }hw/fsi/fsi-slave.c new file +6
-0+ + return s->regs[TO_REG(addr)]; +} + +static void fsi_slave_write (void *opaque,hwaddr addr,uint64_t data, + unsigned size)
Quoted 8 lines
hw/fsi/fsi-slave.c line 42
Quoted 6 lines
hw/fsi/fsi-slave.c new file +6
-0+{ + FSISlaveState *s = FSI_SLAVE(opaque); + + trace_fsi_slave_write(addr, size, data); + + if (addr + size > sizeof(s->regs)) {Same here.
Fixed the limit check.
Quoted 12 lines
hw/fsi/fsi-slave.c line 64
Quoted 9 lines
hw/fsi/fsi-slave.c new file +8
-0+ +static void fsi_slave_init (Object *o) +{ + FSISlaveState *s = FSI_SLAVE(o); + + memory_region_init_io(&s->iomem, OBJECT(s), &fsi_slave_ops, + s, TYPE_FSI_SLAVE, 0x400); +}No reset handler ?
Added reset handler.
Thanks for the review.
Regards,
Ninad
PATCH v8 4/10 hw/fsi: IBM's On-chip Peripheral Bus
In reply to Ninad PalsuleThis is a part of patchset where IBM's Flexible Service Interface is introduced.
The On-Chip Peripheral Bus (OPB): A low-speed bus typically found in POWER processors. This now makes an appearance in the ASPEED SoC due to tight integration of the FSI master IP with the OPB, mainly the existence of an MMIO-mapping of the CFAM address straight onto a sub-region of the OPB address space.
[ clg: - removed FSIMasterState object and fsi_opb_realize()
- simplified OPBus ]
--- include/hw/fsi/opb.h | 25 +++++++++++++++++++++++++ hw/fsi/opb.c | 36 ++++++++++++++++++++++++++++++++++++ hw/fsi/Kconfig | 4 ++++ hw/fsi/meson.build | 1 + 4 files changed, 66 insertions(+) create mode 100644 include/hw/fsi/opb.h create mode 100644 hw/fsi/opb.c
include/hw/fsi/opb.h new file +25 -0
@@ -0,0 +1,25 @@ +/* +* SPDX-License-Identifier: GPL-2.0-or-later +* Copyright (C) 2023 IBM Corp. +* +* IBM On-Chip Peripheral Bus +*/ +#ifndef FSI_OPB_H +#define FSI_OPB_H + +#include "exec/memory.h" +#include "hw/fsi/fsi-master.h" + +#define TYPE_OP_BUS "opb" +OBJECT_DECLARE_SIMPLE_TYPE(OPBus, OP_BUS) + +typedef struct OPBus { +/*< private >*/ +BusState bus; + +/*< public >*/ +MemoryRegion mr; +AddressSpace as; +}OPBus ; + +#endif /* FSI_OPB_H */
hw/fsi/opb.c new file +36 -0
@@ -0,0 +1,36 @@ +/* +* SPDX-License-Identifier: GPL-2.0-or-later +* Copyright (C) 2023 IBM Corp. +* +* IBM On-chip Peripheral Bus +*/ + +#include "qemu/osdep.h" + +#include "qapi/error.h" +#include "qemu/log.h" + +#include "hw/fsi/opb.h" + +static void fsi_opb_init (Object *o) +{ +OPBus *opb =OP_BUS (o); + +memory_region_init_io (&opb->mr,OBJECT (opb),NULL , opb, +NULL ,UINT32_MAX ); +address_space_init (&opb->as, &opb->mr,"opb" ); +} + +static const TypeInfo opb_info = { + .name =TYPE_OP_BUS , + .parent =TYPE_BUS , + .instance_init = fsi_opb_init, + .instance_size =sizeof (OPBus), +}; + +static void fsi_opb_register_types (void ) +{ +type_register_static (&opb_info); +} + +type_init (fsi_opb_register_types);
hw/fsi/Kconfig +4 -0
@@ -1,3 +1,7 @@ +config FSI_OPB + bool + select FSI_CFAM + config FSI_CFAM bool select FSI
hw/fsi/meson.build +1 -0
@@ -1,3 +1,4 @@ system_ss.add(when: 'CONFIG_FSI_LBUS', if_true: files('lbus.c')) system_ss.add(when: 'CONFIG_FSI_CFAM', if_true: files('cfam.c')) system_ss.add(when: 'CONFIG_FSI', if_true: files('fsi.c','fsi-slave.c')) +system_ss.add(when: 'CONFIG_FSI_OPB', if_true: files('opb.c'))
Signature · 1 line
2.39.2
Re: [PATCH v8 04/10] hw/fsi: IBM's On-chip Peripheral Bus
Quoted 71 lines · Ninad Palsule
This is a part of patchset where IBM's Flexible Service Interface is introduced.
The On-Chip Peripheral Bus (OPB): A low-speed bus typically found in POWER processors. This now makes an appearance in the ASPEED SoC due to tight integration of the FSI master IP with the OPB, mainly the existence of an MMIO-mapping of the CFAM address straight onto a sub-region of the OPB address space.
Signed-off-by Andrew Jeffery <[email protected]>Signed-off-by Ninad Palsule <[email protected]>Reviewed-by Joel Stanley <[email protected]>[ clg: - removed FSIMasterState object and
fsi_opb_realize()
- simplified OPBus ]Signed-off-by Cédric Le Goater <[email protected]>--- include/hw/fsi/opb.h | 25 +++++++++++++++++++++++++ hw/fsi/opb.c | 36 ++++++++++++++++++++++++++++++++++++ hw/fsi/Kconfig | 4 ++++ hw/fsi/meson.build | 1 + 4 files changed, 66 insertions(+)create mode 100644
include/hw/fsi/opb.h
create mode 100644hw/fsi/opb.cinclude/hw/fsi/opb.h new file +25
-0@@ -0,0 +1,25 @@ +/* +* SPDX-License-Identifier: GPL-2.0-or-later +* Copyright (C) 2023 IBM Corp. +* +* IBM On-Chip Peripheral Bus +*/ +#ifndef FSI_OPB_H +#define FSI_OPB_H + +#include "exec/memory.h" +#include "hw/fsi/fsi-master.h" + +#define TYPE_OP_BUS "opb" +OBJECT_DECLARE_SIMPLE_TYPE(OPBus, OP_BUS) + +typedef struct OPBus { +/*< private >*/ +BusState bus; + +/*< public >*/ +MemoryRegion mr; +AddressSpace as; +}OPBus ; + +#endif /* FSI_OPB_H */ hw/fsi/opb.c new file +10
-0@@ -0,0 +1,36 @@ +/* +* SPDX-License-Identifier: GPL-2.0-or-later +* Copyright (C) 2023 IBM Corp. +* +* IBM On-chip Peripheral Bus +*/ + +#include "qemu/osdep.h" + +#include "qapi/error.h"
hw/fsi/opb.c line 20
Quoted 10 lines
hw/fsi/opb.c new file +10
-0+#include "qemu/log.h" + +#include "hw/fsi/opb.h" + +static void fsi_opb_init (Object *o) +{ +OPBus *opb =OP_BUS (o); + +memory_region_init_io (&opb->mr,OBJECT (opb),NULL , opb, +NULL ,UINT32_MAX );
Let's give the region some name.
Thanks,
C.
Quoted 37 lines
hw/fsi/opb.c new file +16
-0+address_space_init (&opb->as, &opb->mr,"opb" ); +} + +static const TypeInfo opb_info = { + .name =TYPE_OP_BUS , + .parent =TYPE_BUS , + .instance_init = fsi_opb_init, + .instance_size =sizeof (OPBus), +}; + +static void fsi_opb_register_types (void ) +{ +type_register_static (&opb_info); +} + +type_init (fsi_opb_register_types);hw/fsi/Kconfig +4
-0@@ -1,3 +1,7 @@ +config FSI_OPB + bool + select FSI_CFAM + config FSI_CFAM bool select FSIhw/fsi/meson.build +1
-0@@ -1,3 +1,4 @@ system_ss.add(when: 'CONFIG_FSI_LBUS', if_true: files('lbus.c')) system_ss.add(when: 'CONFIG_FSI_CFAM', if_true: files('cfam.c')) system_ss.add(when: 'CONFIG_FSI', if_true: files('fsi.c','fsi-slave.c')) +system_ss.add(when: 'CONFIG_FSI_OPB', if_true: files('opb.c'))
Re: [PATCH v8 04/10] hw/fsi: IBM's On-chip Peripheral Bus
Hello Cedric,
Quoted 76 lines · Cédric Le Goater
Quoted 75 lines · Ninad Palsule
This is a part of patchset where IBM's Flexible Service Interface is introduced.
The On-Chip Peripheral Bus (OPB): A low-speed bus typically found in POWER processors. This now makes an appearance in the ASPEED SoC due to tight integration of the FSI master IP with the OPB, mainly the existence of an MMIO-mapping of the CFAM address straight onto a sub-region of the OPB address space.
Signed-off-by Andrew Jeffery <[email protected]>Signed-off-by Ninad Palsule <[email protected]>Reviewed-by Joel Stanley <[email protected]>[ clg: - removed FSIMasterState object and
fsi_opb_realize()
- simplified OPBus ]Signed-off-by Cédric Le Goater <[email protected]>---
include/hw/fsi/opb.h| 25 +++++++++++++++++++++++++ hw/fsi/opb.c | 36 ++++++++++++++++++++++++++++++++++++ hw/fsi/Kconfig | 4 ++++
hw/fsi/meson.build | 1 +4 files changed, 66 insertions(+)create mode 100644
include/hw/fsi/opb.h
create mode 100644hw/fsi/opb.cinclude/hw/fsi/opb.h new file +25
-0@@ -0,0 +1,25 @@ +/* +* SPDX-License-Identifier: GPL-2.0-or-later +* Copyright (C) 2023 IBM Corp. +* +* IBM On-Chip Peripheral Bus +*/ +#ifndef FSI_OPB_H +#define FSI_OPB_H + +#include "exec/memory.h" +#include "hw/fsi/fsi-master.h" + +#define TYPE_OP_BUS "opb" +OBJECT_DECLARE_SIMPLE_TYPE(OPBus, OP_BUS) + +typedef struct OPBus { + /*< private >*/ + BusState bus; + + /*< public >*/ + MemoryRegion mr; + AddressSpace as; +}OPBus ; + +#endif /* FSI_OPB_H */ hw/fsi/opb.c new file +14
-0@@ -0,0 +1,36 @@ +/* +* SPDX-License-Identifier: GPL-2.0-or-later +* Copyright (C) 2023 IBM Corp. +* +* IBM On-chip Peripheral Bus +*/ + +#include "qemu/osdep.h" + +#include "qapi/error.h" +#include "qemu/log.h" + +#include "hw/fsi/opb.h" +
Quoted 8 lines
hw/fsi/opb.c line 20
Quoted 6 lines
hw/fsi/opb.c new file +6
-0+static void fsi_opb_init (Object *o) +{ + OPBus *opb = OP_BUS(o); + + memory_region_init_io(&opb->mr, OBJECT(opb), NULL, opb, + NULL, UINT32_MAX);Let's give the region some name.
Added "fsi.opb" name.
Thanks for the review.
Regards,
Ninad
PATCH v8 5/10 hw/fsi: Introduce IBM's FSI master
In reply to Ninad PalsuleThis is a part of patchset where IBM's Flexible Service Interface is introduced.
This commit models the FSI master. CFAM is hanging out of FSI master which is a bus controller.
The FSI master: A controller in the platform service processor (e.g. BMC) driving CFAM engine accesses into the POWER chip. At the hardware level FSI is a bit-based protocol supporting synchronous and DMA-driven accesses of engines in a CFAM.
[ clg: - move FSICFAMState object under FSIMasterState
- introduced fsi_master_init()
- reworked fsi_master_realize()
- dropped FSIBus definition ]
--- include/hw/fsi/fsi-master.h | 32 +++++++ hw/fsi/fsi-master.c | 165 ++++++++++++++++++++++++++++++++++++ hw/fsi/meson.build | 2 +- hw/fsi/trace-events | 2 + 4 files changed, 200 insertions(+), 1 deletion(-) create mode 100644 include/hw/fsi/fsi-master.h create mode 100644 hw/fsi/fsi-master.c
include/hw/fsi/fsi-master.h new file +32 -0
@@ -0,0 +1,32 @@ +/* +* SPDX-License-Identifier: GPL-2.0-or-later +* Copyright (C) 2019 IBM Corp. +* +* IBM Flexible Service Interface Master +*/ +#ifndef FSI_FSI_MASTER_H +#define FSI_FSI_MASTER_H + +#include "exec/memory.h" +#include "hw/qdev-core.h" +#include "hw/fsi/fsi.h" +#include "hw/fsi/cfam.h" + +#define TYPE_FSI_MASTER "fsi.master" +OBJECT_DECLARE_SIMPLE_TYPE(FSIMasterState, FSI_MASTER) + +#define FSI_MASTER_NR_REGS ((0x2e0 >> 2) + 1) + +typedef struct FSIMasterState { +DeviceState parent; +MemoryRegion iomem; +MemoryRegion opb2fsi; + +FSIBus bus; + +uint32_t regs[FSI_MASTER_NR_REGS ]; +FSICFAMState cfam; +}FSIMasterState ; + + +#endif /* FSI_FSI_H */
hw/fsi/fsi-master.c new file +165 -0
165 lines not on this page · raw message
hw/fsi/meson.build +1 -1
@@ -1,4 +1,4 @@ system_ss.add(when: 'CONFIG_FSI_LBUS', if_true: files('lbus.c')) system_ss.add(when: 'CONFIG_FSI_CFAM', if_true: files('cfam.c')) -system_ss.add(when: 'CONFIG_FSI', if_true: files('fsi.c','fsi-slave.c')) +system_ss.add(when: 'CONFIG_FSI', if_true: files('fsi.c','fsi-master.c','fsi-slave.c')) system_ss.add(when: 'CONFIG_FSI_OPB', if_true: files('opb.c'))
hw/fsi/trace-events +2 -0
@@ -7,3 +7,5 @@ fsi_cfam_unimplemented_write(uint64_t addr, uint32_t size, uint64_t data) "@0x%" fsi_cfam_config_write_noaddr(uint64_t addr, uint32_t size, uint64_t data) "@0x%" PRIx64 " size=%d value=0x%"PRIx64 fsi_slave_read(uint64_t addr, uint32_t size) "@0x%" PRIx64 " size=%d" fsi_slave_write(uint64_t addr, uint32_t size, uint64_t data) "@0x%" PRIx64 " size=%d value=0x%"PRIx64 +fsi_master_read(uint64_t addr, uint32_t size) "@0x%" PRIx64 " size=%d" +fsi_master_write(uint64_t addr, uint32_t size, uint64_t data) "@0x%" PRIx64 " size=%d value=0x%"PRIx64
Signature · 1 line
2.39.2
Re: [PATCH v8 05/10] hw/fsi: Introduce IBM's FSI master
Quoted 104 lines · Ninad Palsule
This is a part of patchset where IBM's Flexible Service Interface is introduced.
This commit models the FSI master. CFAM is hanging out of FSI master which is a bus controller.
The FSI master: A controller in the platform service processor (e.g. BMC) driving CFAM engine accesses into the POWER chip. At the hardware level FSI is a bit-based protocol supporting synchronous and DMA-driven accesses of engines in a CFAM.
Signed-off-by Andrew Jeffery <[email protected]>Signed-off-by Ninad Palsule <[email protected]>Reviewed-by Joel Stanley <[email protected]>[ clg: - move FSICFAMState object under FSIMasterState
- introducedfsi_master_init()
- reworkedfsi_master_realize()
- dropped FSIBus definition ]Signed-off-by Cédric Le Goater <[email protected]>--- include/hw/fsi/fsi-master.h | 32 +++++++ hw/fsi/fsi-master.c | 165 ++++++++++++++++++++++++++++++++++++ hw/fsi/meson.build | 2 +- hw/fsi/trace-events | 2 + 4 files changed, 200 insertions(+), 1 deletion(-)create mode 100644
include/hw/fsi/fsi-master.h
create mode 100644hw/fsi/fsi-master.cinclude/hw/fsi/fsi-master.h new file +32
-0@@ -0,0 +1,32 @@ +/* +* SPDX-License-Identifier: GPL-2.0-or-later +* Copyright (C) 2019 IBM Corp. +* +* IBM Flexible Service Interface Master +*/ +#ifndef FSI_FSI_MASTER_H +#define FSI_FSI_MASTER_H + +#include "exec/memory.h" +#include "hw/qdev-core.h" +#include "hw/fsi/fsi.h" +#include "hw/fsi/cfam.h" + +#define TYPE_FSI_MASTER "fsi.master" +OBJECT_DECLARE_SIMPLE_TYPE(FSIMasterState, FSI_MASTER) + +#define FSI_MASTER_NR_REGS ((0x2e0 >> 2) + 1) + +typedef struct FSIMasterState { +DeviceState parent; +MemoryRegion iomem; +MemoryRegion opb2fsi; + +FSIBus bus; + +uint32_t regs[FSI_MASTER_NR_REGS ]; +FSICFAMState cfam; +}FSIMasterState ; + + +#endif /* FSI_FSI_H */ hw/fsi/fsi-master.c new file +33
-0@@ -0,0 +1,165 @@ +/* +* SPDX-License-Identifier: GPL-2.0-or-later +* Copyright (C) 2023 IBM Corp. +* +* IBM Flexible Service Interface master +*/ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "qemu/log.h" +#include "trace.h" + +#include "hw/fsi/fsi-master.h" + +#define TYPE_OP_BUS "opb" + +#define TO_REG (x) ((x) >> 2) + +#define FSI_MENP0 TO_REG(0x010) +#define FSI_MENP32 TO_REG(0x014) +#define FSI_MSENP0 TO_REG(0x018) +#define FSI_MLEVP0 TO_REG(0x018) +#define FSI_MSENP32 TO_REG(0x01c) +#define FSI_MLEVP32 TO_REG(0x01c) +#define FSI_MCENP0 TO_REG(0x020) +#define FSI_MREFP0 TO_REG(0x020) +#define FSI_MCENP32 TO_REG(0x024) +#define FSI_MREFP32 TO_REG(0x024) + +#define FSI_MVER TO_REG(0x074) +#define FSI_MRESP0 TO_REG(0x0d0) + +#define FSI_MRESB0 TO_REG(0x1d0)
hw/fsi/fsi-master.c line 43
Quoted 10 lines
hw/fsi/fsi-master.c new file +10
-0+#define FSI_MRESB0_RESET_GENERAL BE_BIT(0) +#define FSI_MRESB0_RESET_ERROR BE_BIT(1) + +static uint64_t fsi_master_read (void *opaque,hwaddr addr,unsigned size) +{ +FSIMasterState *s =FSI_MASTER (opaque); + +trace_fsi_master_read (addr, size); + +if (addr + size >sizeof (s->regs)) {
See comment on patch 3
Quoted 83 lines
hw/fsi/fsi-master.c new file +83
-0+qemu_log_mask (LOG_GUEST_ERROR , +"%s: Out of bounds read: 0x%" HWADDR_PRIx" for %u\n" , + __func__, addr, size); +return 0 ; + } + +return s->regs[TO_REG (addr)]; +} + +static void fsi_master_write (void *opaque,hwaddr addr,uint64_t data, +unsigned size) +{ +FSIMasterState *s =FSI_MASTER (opaque); + +trace_fsi_master_write (addr, size, data); + +if (addr + size >sizeof (s->regs)) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: Out of bounds write: %" HWADDR_PRIx" for %u\n" , + __func__, addr, size); +return ; + } + +switch (TO_REG (addr)) { +case FSI_MENP0 : + s->regs[FSI_MENP0 ] = data; +break ; +case FSI_MENP32 : + s->regs[FSI_MENP32 ] = data; +break ; +case FSI_MSENP0 : + s->regs[FSI_MENP0 ] |= data; +break ; +case FSI_MSENP32 : + s->regs[FSI_MENP32 ] |= data; +break ; +case FSI_MCENP0 : + s->regs[FSI_MENP0 ] &= ~data; +break ; +case FSI_MCENP32 : + s->regs[FSI_MENP32 ] &= ~data; +break ; +case FSI_MRESP0 : +/* Perform necessary resets leave register 0 to indicate no errors */ +break ; +case FSI_MRESB0 : +if (data &FSI_MRESB0_RESET_GENERAL ) { +device_cold_reset (DEVICE (opaque)); + } +if (data &FSI_MRESB0_RESET_ERROR ) { +/* FIXME: this seems dubious */ +device_cold_reset (DEVICE (opaque)); + } +break ; +default : + s->regs[TO_REG (addr)] = data; + } +} + +static const struct MemoryRegionOps fsi_master_ops = { + .read = fsi_master_read, + .write = fsi_master_write, + .endianness =DEVICE_BIG_ENDIAN , +}; + +static void fsi_master_init (Object *o) +{ +FSIMasterState *s =FSI_MASTER (o); + +object_initialize_child (o,"cfam" , &s->cfam,TYPE_FSI_CFAM ); + +qbus_init (&s->bus,sizeof (s->bus),TYPE_FSI_BUS ,DEVICE (s),NULL ); + +memory_region_init_io (&s->iomem,OBJECT (s), &fsi_master_ops, s, +TYPE_FSI_MASTER ,0x10000000 ); +memory_region_init (&s->opb2fsi,OBJECT (s),"fsi.opb2fsi" ,0x10000000 ); +} + +static void fsi_master_realize (DeviceState *dev,Error **errp) +{ +FSIMasterState *s =FSI_MASTER (dev); + +if (!qdev_realize (DEVICE (&s->cfam),BUS (&s->bus), errp)) {
hw/fsi/fsi-master.c line 136
Quoted 10 lines
hw/fsi/fsi-master.c new file +10
-0+return ; + } + +/* address ? */ +memory_region_add_subregion (&s->opb2fsi,0 , &s->cfam.mr); +} + +static void fsi_master_reset (DeviceState *dev) +{ +FSIMasterState *s =FSI_MASTER (dev);
Don't we want to set all values to some default ?
Thanks,
C.
Quoted 48 lines
hw/fsi/fsi-master.c new file +28
-0+/* ASPEED default */ + s->regs[FSI_MVER ] =0xe0050101 ; +} + +static void fsi_master_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); + + dc->bus_type =TYPE_OP_BUS ; + dc->desc ="FSI Master" ; + dc->realize = fsi_master_realize; + dc->reset = fsi_master_reset; +} + +static const TypeInfo fsi_master_info = { + .name =TYPE_FSI_MASTER , + .parent =TYPE_DEVICE , + .instance_init = fsi_master_init, + .instance_size =sizeof (FSIMasterState), + .class_init = fsi_master_class_init, +}; + +static void fsi_register_types (void ) +{ +type_register_static (&fsi_master_info); +} + +type_init (fsi_register_types);hw/fsi/meson.build +1
-1@@ -1,4 +1,4 @@ system_ss.add(when: 'CONFIG_FSI_LBUS', if_true: files('lbus.c')) system_ss.add(when: 'CONFIG_FSI_CFAM', if_true: files('cfam.c')) -system_ss.add(when: 'CONFIG_FSI', if_true: files('fsi.c','fsi-slave.c')) +system_ss.add(when: 'CONFIG_FSI', if_true: files('fsi.c','fsi-master.c','fsi-slave.c')) system_ss.add(when: 'CONFIG_FSI_OPB', if_true: files('opb.c'))hw/fsi/trace-events +2
-0@@ -7,3 +7,5 @@ fsi_cfam_unimplemented_write(uint64_t addr, uint32_t size, uint64_t data) "@0x%" fsi_cfam_config_write_noaddr(uint64_t addr, uint32_t size, uint64_t data) "@0x%" PRIx64 " size=%d value=0x%"PRIx64 fsi_slave_read(uint64_t addr, uint32_t size) "@0x%" PRIx64 " size=%d" fsi_slave_write(uint64_t addr, uint32_t size, uint64_t data) "@0x%" PRIx64 " size=%d value=0x%"PRIx64 +fsi_master_read(uint64_t addr, uint32_t size) "@0x%" PRIx64 " size=%d" +fsi_master_write(uint64_t addr, uint32_t size, uint64_t data) "@0x%" PRIx64 " size=%d value=0x%"PRIx64
Re: [PATCH v8 05/10] hw/fsi: Introduce IBM's FSI master
Hello Cedric,
Quoted 10 lines
hw/fsi/fsi-master.c line 43
Quoted 8 lines
+static
uint64_tfsi_master_read(void *opaque, hwaddr addr, unsigned size)hw/fsi/fsi-master.c new file +6
-0+{ + FSIMasterState *s = FSI_MASTER(opaque); + + trace_fsi_master_read(addr, size); + + if (addr + size > sizeof(s->regs)) {See comment on patch 3
I fixed it.
Quoted 11 lines
Quoted 11 lines
+ qemu_log_mask(LOG_GUEST_ERROR,
+ "%s: Out of bounds read: 0x%"HWADDR_PRIx" for %u\n",
+__func__, addr, size);
+ return 0;
+ }hw/fsi/fsi-master.c new file +4
-0+ + return s->regs[TO_REG(addr)]; +} +
Quoted 8 lines
hw/fsi/fsi-master.c line 60
Quoted 8 lines
hw/fsi/fsi-master.c new file +8
-0+static void fsi_master_write (void *opaque,hwaddr addr,uint64_t data, + unsigned size) +{ + FSIMasterState *s = FSI_MASTER(opaque); + + trace_fsi_master_write(addr, size, data); + + if (addr + size > sizeof(s->regs)) {
I fixed it.
Quoted 11 lines
hw/fsi/fsi-master.c line 136
Quoted 9 lines
hw/fsi/fsi-master.c new file +8
-0+ + /* address ? */ + memory_region_add_subregion(&s->opb2fsi, 0, &s->cfam.mr); +} + +static void fsi_master_reset (DeviceState *dev) +{ + FSIMasterState *s = FSI_MASTER(dev);Don't we want to set all values to some default ?
Initialize all other registers to 0 as FSI spec expect them to be zero except MVER and MLEVP0. I don't have reset value for MLEVP0 for ast2600. This is related to HOT plug detection so setting it to 0 for now.
Thanks for the review.
Regards,
Ninad
PATCH v8 6/10 hw/fsi: Aspeed APB2OPB interface
In reply to Ninad PalsuleThis is a part of patchset where IBM's Flexible Service Interface is introduced.
An APB-to-OPB bridge enabling access to the OPB from the ARM core in the AST2600. Hardware limitations prevent the OPB from being directly mapped into APB, so all accesses are indirect through the bridge.
[ clg: - moved FSIMasterState under AspeedAPB2OPBState
- modified fsi_opb_fsi_master_address() and fsi_opb_opb2fsi_address()
- instroduced fsi_aspeed_apb2opb_init()
- reworked fsi_aspeed_apb2opb_realize() ]
--- include/hw/fsi/aspeed-apb2opb.h | 34 ++++ hw/fsi/aspeed-apb2opb.c | 316 ++++++++++++++++++++++++++++++++ hw/arm/Kconfig | 1 + hw/fsi/Kconfig | 4 + hw/fsi/meson.build | 1 + hw/fsi/trace-events | 2 + 6 files changed, 358 insertions(+) create mode 100644 include/hw/fsi/aspeed-apb2opb.h create mode 100644 hw/fsi/aspeed-apb2opb.c
include/hw/fsi/aspeed-apb2opb.h new file +34 -0
@@ -0,0 +1,34 @@ +/* +* SPDX-License-Identifier: GPL-2.0-or-later +* Copyright (C) 2023 IBM Corp. +* +* ASPEED APB2OPB Bridge +*/ +#ifndef FSI_ASPEED_APB2OPB_H +#define FSI_ASPEED_APB2OPB_H + +#include "hw/sysbus.h" +#include "hw/fsi/opb.h" + +#define TYPE_ASPEED_APB2OPB "aspeed.apb2opb" +OBJECT_DECLARE_SIMPLE_TYPE(AspeedAPB2OPBState, ASPEED_APB2OPB) + +#define ASPEED_APB2OPB_NR_REGS ((0xe8 >> 2) + 1) + +#define ASPEED_FSI_NUM 2 + +typedef struct AspeedAPB2OPBState { +/*< private >*/ +SysBusDevice parent_obj; + +/*< public >*/ +MemoryRegion iomem; + +uint32_t regs[ASPEED_APB2OPB_NR_REGS ]; +qemu_irq irq; + +OPBus opb[ASPEED_FSI_NUM ]; +FSIMasterState fsi[ASPEED_FSI_NUM ]; +}AspeedAPB2OPBState ; + +#endif /* FSI_ASPEED_APB2OPB_H */
hw/fsi/aspeed-apb2opb.c new file +316 -0
316 lines not on this page · raw message
hw/arm/Kconfig +1 -0
@@ -559,6 +559,7 @@ config ASPEED_SOC select LED select PMBUS select MAX31785 + select FSI_APB2OPB_ASPEED config MPS2 bool
hw/fsi/Kconfig +4 -0
@@ -1,3 +1,7 @@ +config FSI_APB2OPB_ASPEED + bool + select FSI_OPB + config FSI_OPB bool select FSI_CFAM
hw/fsi/meson.build +1 -0
@@ -2,3 +2,4 @@ system_ss.add(when: 'CONFIG_FSI_LBUS', if_true: files('lbus.c')) system_ss.add(when: 'CONFIG_FSI_CFAM', if_true: files('cfam.c')) system_ss.add(when: 'CONFIG_FSI', if_true: files('fsi.c','fsi-master.c','fsi-slave.c')) system_ss.add(when: 'CONFIG_FSI_OPB', if_true: files('opb.c')) +system_ss.add(when: 'CONFIG_FSI_APB2OPB_ASPEED', if_true: files('aspeed-apb2opb.c'))
hw/fsi/trace-events +2 -0
@@ -9,3 +9,5 @@ fsi_slave_read(uint64_t addr, uint32_t size) "@0x%" PRIx64 " size=%d" fsi_slave_write(uint64_t addr, uint32_t size, uint64_t data) "@0x%" PRIx64 " size=%d value=0x%"PRIx64 fsi_master_read(uint64_t addr, uint32_t size) "@0x%" PRIx64 " size=%d" fsi_master_write(uint64_t addr, uint32_t size, uint64_t data) "@0x%" PRIx64 " size=%d value=0x%"PRIx64 +fsi_aspeed_apb2opb_read(uint64_t addr, uint32_t size) "@0x%" PRIx64 " size=%d" +fsi_aspeed_apb2opb_write(uint64_t addr, uint32_t size, uint64_t data) "@0x%" PRIx64 " size=%d value=0x%"PRIx64
Signature · 1 line
2.39.2
Re: [PATCH v8 06/10] hw/fsi: Aspeed APB2OPB interface
Quoted 142 lines · Ninad Palsule
This is a part of patchset where IBM's Flexible Service Interface is introduced.
An APB-to-OPB bridge enabling access to the OPB from the ARM core in the AST2600. Hardware limitations prevent the OPB from being directly mapped into APB, so all accesses are indirect through the bridge.
Signed-off-by Andrew Jeffery <[email protected]>Signed-off-by Ninad Palsule <[email protected]>[ clg: - moved FSIMasterState under AspeedAPB2OPBState
- modifiedfsi_opb_fsi_master_address()andfsi_opb_opb2fsi_address()
- instroducedfsi_aspeed_apb2opb_init()
- reworkedfsi_aspeed_apb2opb_realize()]Signed-off-by Cédric Le Goater <[email protected]>--- include/hw/fsi/aspeed-apb2opb.h | 34 ++++ hw/fsi/aspeed-apb2opb.c | 316 ++++++++++++++++++++++++++++++++ hw/arm/Kconfig | 1 + hw/fsi/Kconfig | 4 + hw/fsi/meson.build | 1 + hw/fsi/trace-events | 2 + 6 files changed, 358 insertions(+)create mode 100644
include/hw/fsi/aspeed-apb2opb.hcreate mode 100644hw/fsi/aspeed-apb2opb.cinclude/hw/fsi/aspeed-apb2opb.h new file +34
-0@@ -0,0 +1,34 @@ +/* +* SPDX-License-Identifier: GPL-2.0-or-later +* Copyright (C) 2023 IBM Corp. +* +* ASPEED APB2OPB Bridge +*/ +#ifndef FSI_ASPEED_APB2OPB_H +#define FSI_ASPEED_APB2OPB_H + +#include "hw/sysbus.h" +#include "hw/fsi/opb.h" + +#define TYPE_ASPEED_APB2OPB "aspeed.apb2opb" +OBJECT_DECLARE_SIMPLE_TYPE(AspeedAPB2OPBState, ASPEED_APB2OPB) + +#define ASPEED_APB2OPB_NR_REGS ((0xe8 >> 2) + 1) + +#define ASPEED_FSI_NUM 2 + +typedef struct AspeedAPB2OPBState { +/*< private >*/ +SysBusDevice parent_obj; + +/*< public >*/ +MemoryRegion iomem; + +uint32_t regs[ASPEED_APB2OPB_NR_REGS ]; +qemu_irq irq; + +OPBus opb[ASPEED_FSI_NUM ]; +FSIMasterState fsi[ASPEED_FSI_NUM ]; +}AspeedAPB2OPBState ; + +#endif /* FSI_ASPEED_APB2OPB_H */ hw/fsi/aspeed-apb2opb.c new file +70
-0@@ -0,0 +1,316 @@ +/* +* SPDX-License-Identifier: GPL-2.0-or-later +* Copyright (C) 2023 IBM Corp. +* +* ASPEED APB-OPB FSI interface +*/ + +#include "qemu/osdep.h" +#include "qemu/log.h" +#include "qom/object.h" +#include "qapi/error.h" +#include "trace.h" + +#include "hw/fsi/aspeed-apb2opb.h" +#include "hw/qdev-core.h" + +#define TO_REG (x) (x >> 2) + +#define APB2OPB_VERSION TO_REG(0x00) +#define APB2OPB_TRIGGER TO_REG(0x04) + +#define APB2OPB_CONTROL TO_REG(0x08) +#define APB2OPB_CONTROL_OFF BE_GENMASK(31, 13) + +#define APB2OPB_OPB2FSI TO_REG(0x0c) +#define APB2OPB_OPB2FSI_OFF BE_GENMASK(31, 22) + +#define APB2OPB_OPB0_SEL TO_REG(0x10) +#define APB2OPB_OPB1_SEL TO_REG(0x28) +#define APB2OPB_OPB_SEL_EN BIT(0) + +#define APB2OPB_OPB0_MODE TO_REG(0x14) +#define APB2OPB_OPB1_MODE TO_REG(0x2c) +#define APB2OPB_OPB_MODE_RD BIT(0) + +#define APB2OPB_OPB0_XFER TO_REG(0x18) +#define APB2OPB_OPB1_XFER TO_REG(0x30) +#define APB2OPB_OPB_XFER_FULL BIT(1) +#define APB2OPB_OPB_XFER_HALF BIT(0) + +#define APB2OPB_OPB0_ADDR TO_REG(0x1c) +#define APB2OPB_OPB0_WRITE_DATA TO_REG(0x20) + +#define APB2OPB_OPB1_ADDR TO_REG(0x34) +#define APB2OPB_OPB1_WRITE_DATA TO_REG(0x38) + +#define APB2OPB_IRQ_STS TO_REG(0x48) +#define APB2OPB_IRQ_STS_OPB1_TX_ACK BIT(17) +#define APB2OPB_IRQ_STS_OPB0_TX_ACK BIT(16) + +#define APB2OPB_OPB0_WRITE_WORD_ENDIAN TO_REG(0x4c) +#define APB2OPB_OPB0_WRITE_WORD_ENDIAN_BE 0x0011101b +#define APB2OPB_OPB0_WRITE_BYTE_ENDIAN TO_REG(0x50) +#define APB2OPB_OPB0_WRITE_BYTE_ENDIAN_BE 0x0c330f3f +#define APB2OPB_OPB1_WRITE_WORD_ENDIAN TO_REG(0x54) +#define APB2OPB_OPB1_WRITE_BYTE_ENDIAN TO_REG(0x58) +#define APB2OPB_OPB0_READ_BYTE_ENDIAN TO_REG(0x5c) +#define APB2OPB_OPB1_READ_BYTE_ENDIAN TO_REG(0x60) +#define APB2OPB_OPB0_READ_WORD_ENDIAN_BE 0x00030b1b + +#define APB2OPB_OPB0_READ_DATA TO_REG(0x84) +#define APB2OPB_OPB1_READ_DATA TO_REG(0x90) + +/* +* The following magic values came from AST2600 data sheet +* The register values are defined under section "FSI controller" +* as initial values. +*/ +static const uint32_t aspeed_apb2opb_reset[ASPEED_APB2OPB_NR_REGS ] = { + [APB2OPB_VERSION ] =0x000000a1 ,
hw/fsi/aspeed-apb2opb.c line 80
Quoted 10 lines
hw/fsi/aspeed-apb2opb.c new file +10
-0+ [APB2OPB_OPB0_WRITE_WORD_ENDIAN] = 0x0044eee4, + [APB2OPB_OPB0_WRITE_BYTE_ENDIAN] = 0x0055aaff, + [APB2OPB_OPB1_WRITE_WORD_ENDIAN] = 0x00117717, + [APB2OPB_OPB1_WRITE_BYTE_ENDIAN] = 0xffaa5500, + [APB2OPB_OPB0_READ_BYTE_ENDIAN] = 0x0044eee4, + [APB2OPB_OPB1_READ_BYTE_ENDIAN] = 0x00117717 +}; + +static void fsi_opb_fsi_master_address (OPBus *opb,FSIMasterState * fsi, +hwaddr addr)
opb parameter is not useful anymore.
hw/fsi/aspeed-apb2opb.c line 88
Quoted 8 lines
hw/fsi/aspeed-apb2opb.c new file +8
-0+{ +memory_region_transaction_begin (); +memory_region_set_address (&fsi->iomem, addr); +memory_region_transaction_commit (); +} + +static void fsi_opb_opb2fsi_address (OPBus *opb,FSIMasterState * fsi, +hwaddr addr)
same here.
Quoted 162 lines
hw/fsi/aspeed-apb2opb.c new file +162
-0+{ +memory_region_transaction_begin (); +memory_region_set_address (&fsi->opb2fsi, addr); +memory_region_transaction_commit (); +} + +static uint64_t fsi_aspeed_apb2opb_read (void *opaque,hwaddr addr, +unsigned size) +{ +AspeedAPB2OPBState *s =ASPEED_APB2OPB (opaque); +unsigned int reg =TO_REG (addr); + +trace_fsi_aspeed_apb2opb_read (addr, size); + +if (reg >=ASPEED_APB2OPB_NR_REGS ) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: Out of bounds read: 0x%" HWADDR_PRIx" for %u\n" , + __func__, addr, size); +return 0 ; + } + +return s->regs[reg]; +} + +static void fsi_aspeed_apb2opb_write (void *opaque,hwaddr addr,uint64_t data, +unsigned size) +{ +AspeedAPB2OPBState *s =ASPEED_APB2OPB (opaque); +unsigned int reg =TO_REG (addr); + +trace_fsi_aspeed_apb2opb_write (addr, size, data); + +if (reg >=ASPEED_APB2OPB_NR_REGS ) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: Out of bounds write: %" HWADDR_PRIx" for %u\n" , + __func__, addr, size); +return ; + } + +switch (reg) { +case APB2OPB_CONTROL : +fsi_opb_fsi_master_address (&s->opb[0 ], &s->fsi[0 ], + data &APB2OPB_CONTROL_OFF ); +break ; +case APB2OPB_OPB2FSI : +fsi_opb_opb2fsi_address (&s->opb[0 ], &s->fsi[0 ], + data &APB2OPB_OPB2FSI_OFF ); +break ; +case APB2OPB_OPB0_WRITE_WORD_ENDIAN : +if (data !=APB2OPB_OPB0_WRITE_WORD_ENDIAN_BE ) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: Bridge needs to be driven as BE (0x%x)\n" , + __func__,APB2OPB_OPB0_WRITE_WORD_ENDIAN_BE ); + } +break ; +case APB2OPB_OPB0_WRITE_BYTE_ENDIAN : +if (data !=APB2OPB_OPB0_WRITE_BYTE_ENDIAN_BE ) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: Bridge needs to be driven as BE (0x%x)\n" , + __func__,APB2OPB_OPB0_WRITE_BYTE_ENDIAN_BE ); + } +break ; +case APB2OPB_OPB0_READ_BYTE_ENDIAN : +if (data !=APB2OPB_OPB0_READ_WORD_ENDIAN_BE ) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: Bridge needs to be driven as BE (0x%x)\n" , + __func__,APB2OPB_OPB0_READ_WORD_ENDIAN_BE ); + } +break ; +case APB2OPB_TRIGGER : + { +uint32_t opb, op_mode, op_size, op_addr, op_data; +MemTxResult result; +bool is_write; +int index; +AddressSpace *as; + +assert ((s->regs[APB2OPB_OPB0_SEL ] &APB2OPB_OPB_SEL_EN ) ^ + (s->regs[APB2OPB_OPB1_SEL ] &APB2OPB_OPB_SEL_EN )); + +if (s->regs[APB2OPB_OPB0_SEL ] &APB2OPB_OPB_SEL_EN ) { + opb =0 ; + op_mode = s->regs[APB2OPB_OPB0_MODE ]; + op_size = s->regs[APB2OPB_OPB0_XFER ]; + op_addr = s->regs[APB2OPB_OPB0_ADDR ]; + op_data = s->regs[APB2OPB_OPB0_WRITE_DATA ]; + }else if (s->regs[APB2OPB_OPB1_SEL ] &APB2OPB_OPB_SEL_EN ) { + opb =1 ; + op_mode = s->regs[APB2OPB_OPB1_MODE ]; + op_size = s->regs[APB2OPB_OPB1_XFER ]; + op_addr = s->regs[APB2OPB_OPB1_ADDR ]; + op_data = s->regs[APB2OPB_OPB1_WRITE_DATA ]; + }else { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: Invalid operation: 0x%" HWADDR_PRIx" for %u\n" , + __func__, addr, size); +return ; + } + +if (op_size & ~(APB2OPB_OPB_XFER_HALF |APB2OPB_OPB_XFER_FULL )) { +qemu_log_mask (LOG_GUEST_ERROR , +"OPB transaction failed: Unrecognized access width: %d\n" , + op_size); +return ; + } + + op_size +=1 ; + is_write = !(op_mode &APB2OPB_OPB_MODE_RD ); + index = opb ?APB2OPB_OPB1_READ_DATA :APB2OPB_OPB0_READ_DATA ; + as = &s->opb[opb].as; + + result =address_space_rw (as, op_addr,MEMTXATTRS_UNSPECIFIED , + &op_data, op_size, is_write); +if (result !=MEMTX_OK ) { +qemu_log_mask (LOG_GUEST_ERROR ,"%s: OPB %s failed @%08x\n" , + __func__, is_write ?"write" :"read" , op_addr); +return ; + } + +if (!is_write) { + s->regs[index] = op_data; + } + + s->regs[APB2OPB_IRQ_STS ] |= opb ?APB2OPB_IRQ_STS_OPB1_TX_ACK + :APB2OPB_IRQ_STS_OPB0_TX_ACK ; +break ; + } + } + + s->regs[reg] = data; +} + +static const struct MemoryRegionOps aspeed_apb2opb_ops = { + .read = fsi_aspeed_apb2opb_read, + .write = fsi_aspeed_apb2opb_write, + .valid.max_access_size =4 , + .valid.min_access_size =4 , + .impl.max_access_size =4 , + .impl.min_access_size =4 , + .endianness =DEVICE_LITTLE_ENDIAN , +}; + +static void fsi_aspeed_apb2opb_init (Object *o) +{ +AspeedAPB2OPBState *s =ASPEED_APB2OPB (o); +int i; + +for (i =0 ; i <ASPEED_FSI_NUM ; i++) { +qbus_init (&s->opb[i],sizeof (s->opb[i]),TYPE_OP_BUS ,DEVICE (s), +NULL ); + } + +for (i =0 ; i <ASPEED_FSI_NUM ; i++) { +object_initialize_child (o,"fsi-master[*]" , &s->fsi[i], +TYPE_FSI_MASTER ); + } +} + +static void fsi_aspeed_apb2opb_realize (DeviceState *dev,Error **errp) +{ +SysBusDevice *sbd =SYS_BUS_DEVICE (dev); +AspeedAPB2OPBState *s =ASPEED_APB2OPB (dev);
hw/fsi/aspeed-apb2opb.c line 260
Quoted 10 lines
hw/fsi/aspeed-apb2opb.c new file +10
-0+int i; + +sysbus_init_irq (sbd, &s->irq); + +memory_region_init_io (&s->iomem,OBJECT (s), &aspeed_apb2opb_ops, s, +TYPE_ASPEED_APB2OPB ,0x1000 ); +sysbus_init_mmio (sbd, &s->iomem); + + for (i = 0; i < ASPEED_FSI_NUM; i++) { + if (!qdev_realize_and_unref(DEVICE(&s->fsi[i]), BUS(&s->opb[i]),
s->fsi[i] is not allocated. We should use qdev_realize instead.
Thanks,
C.
Quoted 99 lines
hw/fsi/aspeed-apb2opb.c new file +56
-0+ errp)) { +return ; + } + +memory_region_add_subregion (&s->opb[i].mr,0x80000000 , + &s->fsi[i].iomem); + +/* OPB2FSI region */ +/* +* Avoid endianness issues by mapping each slave's memory region +* directly. Manually bridging multiple address-spaces causes endian +* swapping headaches as memory_region_dispatch_read() and +* memory_region_dispatch_write() correct the endianness based on the +* target machine endianness and not relative to the device endianness +* on either side of the bridge. +*/ +/* +* XXX: This is a bit hairy and will need to be fixed when I sort out +* the bus/slave relationship and any changes to the CFAM modelling +* (multiple slaves, LBUS) +*/ +memory_region_add_subregion (&s->opb[i].mr,0xa0000000 , + &s->fsi[i].opb2fsi); + } +} + +static void fsi_aspeed_apb2opb_reset (DeviceState *dev) +{ +AspeedAPB2OPBState *s =ASPEED_APB2OPB (dev); + +memcpy (s->regs, aspeed_apb2opb_reset,ASPEED_APB2OPB_NR_REGS ); +} + +static void fsi_aspeed_apb2opb_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); + + dc->desc ="ASPEED APB2OPB Bridge" ; + dc->realize = fsi_aspeed_apb2opb_realize; + dc->reset = fsi_aspeed_apb2opb_reset; +} + +static const TypeInfo aspeed_apb2opb_info = { + .name =TYPE_ASPEED_APB2OPB , + .parent =TYPE_SYS_BUS_DEVICE , + .instance_init = fsi_aspeed_apb2opb_init, + .instance_size =sizeof (AspeedAPB2OPBState), + .class_init = fsi_aspeed_apb2opb_class_init, +}; + +static void aspeed_apb2opb_register_types (void ) +{ +type_register_static (&aspeed_apb2opb_info); +} + +type_init (aspeed_apb2opb_register_types);hw/arm/Kconfig +1
-0@@ -559,6 +559,7 @@ config ASPEED_SOC select LED select PMBUS select MAX31785 + select FSI_APB2OPB_ASPEED config MPS2 boolhw/fsi/Kconfig +4
-0@@ -1,3 +1,7 @@ +config FSI_APB2OPB_ASPEED + bool + select FSI_OPB + config FSI_OPB bool select FSI_CFAMhw/fsi/meson.build +1
-0@@ -2,3 +2,4 @@ system_ss.add(when: 'CONFIG_FSI_LBUS', if_true: files('lbus.c')) system_ss.add(when: 'CONFIG_FSI_CFAM', if_true: files('cfam.c')) system_ss.add(when: 'CONFIG_FSI', if_true: files('fsi.c','fsi-master.c','fsi-slave.c')) system_ss.add(when: 'CONFIG_FSI_OPB', if_true: files('opb.c')) +system_ss.add(when: 'CONFIG_FSI_APB2OPB_ASPEED', if_true: files('aspeed-apb2opb.c'))hw/fsi/trace-events +2
-0@@ -9,3 +9,5 @@ fsi_slave_read(uint64_t addr, uint32_t size) "@0x%" PRIx64 " size=%d" fsi_slave_write(uint64_t addr, uint32_t size, uint64_t data) "@0x%" PRIx64 " size=%d value=0x%"PRIx64 fsi_master_read(uint64_t addr, uint32_t size) "@0x%" PRIx64 " size=%d" fsi_master_write(uint64_t addr, uint32_t size, uint64_t data) "@0x%" PRIx64 " size=%d value=0x%"PRIx64 +fsi_aspeed_apb2opb_read(uint64_t addr, uint32_t size) "@0x%" PRIx64 " size=%d" +fsi_aspeed_apb2opb_write(uint64_t addr, uint32_t size, uint64_t data) "@0x%" PRIx64 " size=%d value=0x%"PRIx64
Re: [PATCH v8 06/10] hw/fsi: Aspeed APB2OPB interface
Hello Cedric,
Quoted 147 lines · Cédric Le Goater
Quoted 146 lines · Ninad Palsule
This is a part of patchset where IBM's Flexible Service Interface is introduced.
An APB-to-OPB bridge enabling access to the OPB from the ARM core in the AST2600. Hardware limitations prevent the OPB from being directly mapped into APB, so all accesses are indirect through the bridge.
Signed-off-by Andrew Jeffery <[email protected]>Signed-off-by Ninad Palsule <[email protected]>[ clg: - moved FSIMasterState under AspeedAPB2OPBState
- modifiedfsi_opb_fsi_master_address()andfsi_opb_opb2fsi_address()
- instroducedfsi_aspeed_apb2opb_init()
- reworkedfsi_aspeed_apb2opb_realize()]Signed-off-by Cédric Le Goater <[email protected]>---
include/hw/fsi/aspeed-apb2opb.h| 34 ++++ hw/fsi/aspeed-apb2opb.c | 316 ++++++++++++++++++++++++++++++++ hw/arm/Kconfig | 1 +
hw/fsi/Kconfig | 4 +
hw/fsi/meson.build | 1 + hw/fsi/trace-events | 2 +6 files changed, 358 insertions(+)create mode 100644
include/hw/fsi/aspeed-apb2opb.hcreate mode 100644hw/fsi/aspeed-apb2opb.cinclude/hw/fsi/aspeed-apb2opb.h new file +34
-0@@ -0,0 +1,34 @@ +/* +* SPDX-License-Identifier: GPL-2.0-or-later +* Copyright (C) 2023 IBM Corp. +* +* ASPEED APB2OPB Bridge +*/ +#ifndef FSI_ASPEED_APB2OPB_H +#define FSI_ASPEED_APB2OPB_H + +#include "hw/sysbus.h" +#include "hw/fsi/opb.h" + +#define TYPE_ASPEED_APB2OPB "aspeed.apb2opb" +OBJECT_DECLARE_SIMPLE_TYPE(AspeedAPB2OPBState, ASPEED_APB2OPB) + +#define ASPEED_APB2OPB_NR_REGS ((0xe8 >> 2) + 1) + +#define ASPEED_FSI_NUM 2 + +typedef struct AspeedAPB2OPBState { + /*< private >*/ + SysBusDevice parent_obj; + + /*< public >*/ + MemoryRegion iomem; + + uint32_t regs[ASPEED_APB2OPB_NR_REGS]; + qemu_irq irq; + + OPBus opb[ASPEED_FSI_NUM]; + FSIMasterState fsi[ASPEED_FSI_NUM]; +}AspeedAPB2OPBState ; + +#endif /* FSI_ASPEED_APB2OPB_H */ hw/fsi/aspeed-apb2opb.c new file +74
-0@@ -0,0 +1,316 @@ +/* +* SPDX-License-Identifier: GPL-2.0-or-later +* Copyright (C) 2023 IBM Corp. +* +* ASPEED APB-OPB FSI interface +*/ + +#include "qemu/osdep.h" +#include "qemu/log.h" +#include "qom/object.h" +#include "qapi/error.h" +#include "trace.h" + +#include "hw/fsi/aspeed-apb2opb.h" +#include "hw/qdev-core.h" + +#define TO_REG (x) (x >> 2) + +#define APB2OPB_VERSION TO_REG(0x00) +#define APB2OPB_TRIGGER TO_REG(0x04) + +#define APB2OPB_CONTROL TO_REG(0x08) +#define APB2OPB_CONTROL_OFF BE_GENMASK(31, 13) + +#define APB2OPB_OPB2FSI TO_REG(0x0c) +#define APB2OPB_OPB2FSI_OFF BE_GENMASK(31, 22) + +#define APB2OPB_OPB0_SEL TO_REG(0x10) +#define APB2OPB_OPB1_SEL TO_REG(0x28) +#define APB2OPB_OPB_SEL_EN BIT(0) + +#define APB2OPB_OPB0_MODE TO_REG(0x14) +#define APB2OPB_OPB1_MODE TO_REG(0x2c) +#define APB2OPB_OPB_MODE_RD BIT(0) + +#define APB2OPB_OPB0_XFER TO_REG(0x18) +#define APB2OPB_OPB1_XFER TO_REG(0x30) +#define APB2OPB_OPB_XFER_FULL BIT(1) +#define APB2OPB_OPB_XFER_HALF BIT(0) + +#define APB2OPB_OPB0_ADDR TO_REG(0x1c) +#define APB2OPB_OPB0_WRITE_DATA TO_REG(0x20) + +#define APB2OPB_OPB1_ADDR TO_REG(0x34) +#define APB2OPB_OPB1_WRITE_DATA TO_REG(0x38) + +#define APB2OPB_IRQ_STS TO_REG(0x48) +#define APB2OPB_IRQ_STS_OPB1_TX_ACK BIT(17) +#define APB2OPB_IRQ_STS_OPB0_TX_ACK BIT(16) + +#define APB2OPB_OPB0_WRITE_WORD_ENDIAN TO_REG(0x4c) +#define APB2OPB_OPB0_WRITE_WORD_ENDIAN_BE 0x0011101b +#define APB2OPB_OPB0_WRITE_BYTE_ENDIAN TO_REG(0x50) +#define APB2OPB_OPB0_WRITE_BYTE_ENDIAN_BE 0x0c330f3f +#define APB2OPB_OPB1_WRITE_WORD_ENDIAN TO_REG(0x54) +#define APB2OPB_OPB1_WRITE_BYTE_ENDIAN TO_REG(0x58) +#define APB2OPB_OPB0_READ_BYTE_ENDIAN TO_REG(0x5c) +#define APB2OPB_OPB1_READ_BYTE_ENDIAN TO_REG(0x60) +#define APB2OPB_OPB0_READ_WORD_ENDIAN_BE 0x00030b1b + +#define APB2OPB_OPB0_READ_DATA TO_REG(0x84) +#define APB2OPB_OPB1_READ_DATA TO_REG(0x90) + +/* +* The following magic values came from AST2600 data sheet +* The register values are defined under section "FSI controller" +* as initial values. +*/ +static const uint32_t aspeed_apb2opb_reset[ASPEED_APB2OPB_NR_REGS ] = { + [APB2OPB_VERSION] = 0x000000a1, + [APB2OPB_OPB0_WRITE_WORD_ENDIAN] = 0x0044eee4, + [APB2OPB_OPB0_WRITE_BYTE_ENDIAN] = 0x0055aaff, + [APB2OPB_OPB1_WRITE_WORD_ENDIAN] = 0x00117717, + [APB2OPB_OPB1_WRITE_BYTE_ENDIAN] = 0xffaa5500,
Quoted 8 lines
hw/fsi/aspeed-apb2opb.c line 80
Quoted 6 lines
hw/fsi/aspeed-apb2opb.c new file +6
-0+ [APB2OPB_OPB0_READ_BYTE_ENDIAN] = 0x0044eee4, + [APB2OPB_OPB1_READ_BYTE_ENDIAN] = 0x00117717 +}; + +static void fsi_opb_fsi_master_address (OPBus *opb,FSIMasterState * fsi, + hwaddr addr)opb parameter is not useful anymore.
Removed.
Quoted 11 lines
hw/fsi/aspeed-apb2opb.c line 88
Quoted 9 lines
hw/fsi/aspeed-apb2opb.c new file +8
-0+{ + memory_region_transaction_begin(); + memory_region_set_address(&fsi->iomem, addr); + memory_region_transaction_commit(); +} + +static void fsi_opb_opb2fsi_address (OPBus *opb,FSIMasterState * fsi, + hwaddr addr)same here.
Removed.
Quoted 180 lines
Quoted 180 lines
hw/fsi/aspeed-apb2opb.c new file +17
-0+{ + memory_region_transaction_begin(); + memory_region_set_address(&fsi->opb2fsi, addr); + memory_region_transaction_commit(); +} + +static uint64_t fsi_aspeed_apb2opb_read(void *opaque, hwaddr addr, + unsigned size) +{ + AspeedAPB2OPBState *s = ASPEED_APB2OPB(opaque); + unsigned int reg = TO_REG(addr); + + trace_fsi_aspeed_apb2opb_read(addr, size); + + if (reg >= ASPEED_APB2OPB_NR_REGS) { + qemu_log_mask(LOG_GUEST_ERROR, + "%s: Out of bounds read: 0x%"HWADDR_PRIx" for%u\n",
+__func__, addr, size);
+ return 0;
+ }hw/fsi/aspeed-apb2opb.c new file +5
-0+ + return s->regs[reg]; +} + +static void fsi_aspeed_apb2opb_write(void *opaque, hwaddr addr,
uint64_tdata,
+ unsigned size)hw/fsi/aspeed-apb2opb.c new file +9
-0+{ + AspeedAPB2OPBState *s = ASPEED_APB2OPB(opaque); + unsigned int reg = TO_REG(addr); + + trace_fsi_aspeed_apb2opb_write(addr, size, data); + + if (reg >= ASPEED_APB2OPB_NR_REGS) { + qemu_log_mask(LOG_GUEST_ERROR, + "%s: Out of bounds write: %"HWADDR_PRIx" for%u\n",
+__func__, addr, size);
+ return;
+ }
+
+ switch (reg) {
+ caseAPB2OPB_CONTROL:
+fsi_opb_fsi_master_address(&s->opb[0], &s->fsi[0], + data & APB2OPB_CONTROL_OFF);
+ break;
+ caseAPB2OPB_OPB2FSI:
+ fsi_opb_opb2fsi_address(&s->opb[0], &s->fsi[0],
+ data &APB2OPB_OPB2FSI_OFF);
+ break;
+ caseAPB2OPB_OPB0_WRITE_WORD_ENDIAN:
+ if (data !=APB2OPB_OPB0_WRITE_WORD_ENDIAN_BE) {
+ qemu_log_mask(LOG_GUEST_ERROR,
+ "%s: Bridge needs to be driven as BE (0x%x)\n",
+__func__,APB2OPB_OPB0_WRITE_WORD_ENDIAN_BE); + }
+ break;
+ caseAPB2OPB_OPB0_WRITE_BYTE_ENDIAN:
+ if (data !=APB2OPB_OPB0_WRITE_BYTE_ENDIAN_BE) {
+ qemu_log_mask(LOG_GUEST_ERROR,
+ "%s: Bridge needs to be driven as BE (0x%x)\n",
+__func__,APB2OPB_OPB0_WRITE_BYTE_ENDIAN_BE); + }
+ break;
+ caseAPB2OPB_OPB0_READ_BYTE_ENDIAN:
+ if (data !=APB2OPB_OPB0_READ_WORD_ENDIAN_BE) {
+ qemu_log_mask(LOG_GUEST_ERROR,
+ "%s: Bridge needs to be driven as BE (0x%x)\n",
+__func__,APB2OPB_OPB0_READ_WORD_ENDIAN_BE); + }
+ break;
+ caseAPB2OPB_TRIGGER:
+ {
+uint32_topb,op_mode,op_size,op_addr,op_data;
+ MemTxResult result;
+ boolis_write;
+ int index;
+ AddressSpace *as;hw/fsi/aspeed-apb2opb.c new file +19
-0+ + assert((s->regs[APB2OPB_OPB0_SEL] & APB2OPB_OPB_SEL_EN) ^ + (s->regs[APB2OPB_OPB1_SEL] & APB2OPB_OPB_SEL_EN)); + + if (s->regs[APB2OPB_OPB0_SEL] & APB2OPB_OPB_SEL_EN) { + opb = 0; + op_mode = s->regs[APB2OPB_OPB0_MODE]; + op_size = s->regs[APB2OPB_OPB0_XFER]; + op_addr = s->regs[APB2OPB_OPB0_ADDR]; + op_data = s->regs[APB2OPB_OPB0_WRITE_DATA]; + } else if (s->regs[APB2OPB_OPB1_SEL] & APB2OPB_OPB_SEL_EN) { + opb = 1; + op_mode = s->regs[APB2OPB_OPB1_MODE]; + op_size = s->regs[APB2OPB_OPB1_XFER]; + op_addr = s->regs[APB2OPB_OPB1_ADDR]; + op_data = s->regs[APB2OPB_OPB1_WRITE_DATA]; + } else { + qemu_log_mask(LOG_GUEST_ERROR, + "%s: Invalid operation: 0x%"HWADDR_PRIx"for %u\n",
+__func__, addr, size);
+ return;
+ }
+
+ if (op_size& ~(APB2OPB_OPB_XFER_HALF |APB2OPB_OPB_XFER_FULL)) {
+ qemu_log_mask(LOG_GUEST_ERROR,
+ "OPB transaction failed: Unrecognized access width: %d\n",
+op_size);
+ return;
+ }hw/fsi/aspeed-apb2opb.c new file +11
-0+ + op_size += 1; + is_write = !(op_mode & APB2OPB_OPB_MODE_RD); + index = opb ? APB2OPB_OPB1_READ_DATA : APB2OPB_OPB0_READ_DATA; + as = &s->opb[opb].as; + + result = address_space_rw(as, op_addr, MEMTXATTRS_UNSPECIFIED, + &op_data, op_size, is_write); + if (result != MEMTX_OK) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: OPB %s failed @%08x\n", + __func__, is_write ? "write" : "read",
op_addr);
+ return;
+ }hw/fsi/aspeed-apb2opb.c new file +31
-0+ + if (!is_write) { + s->regs[index] = op_data; + } + + s->regs[APB2OPB_IRQ_STS] |= opb ? APB2OPB_IRQ_STS_OPB1_TX_ACK + : APB2OPB_IRQ_STS_OPB0_TX_ACK; + break; + } + } + + s->regs[reg] = data; +} + +static const struct MemoryRegionOps aspeed_apb2opb_ops = { + .read = fsi_aspeed_apb2opb_read, + .write = fsi_aspeed_apb2opb_write, + .valid.max_access_size = 4, + .valid.min_access_size = 4, + .impl.max_access_size = 4, + .impl.min_access_size = 4, + .endianness = DEVICE_LITTLE_ENDIAN, +}; + +static void fsi_aspeed_apb2opb_init (Object *o) +{ + AspeedAPB2OPBState *s = ASPEED_APB2OPB(o); + int i; + + for (i = 0; i < ASPEED_FSI_NUM; i++) { + qbus_init(&s->opb[i], sizeof(s->opb[i]), TYPE_OP_BUS,DEVICE(s),
+ NULL);
+ }hw/fsi/aspeed-apb2opb.c new file +17
-0+ + for (i = 0; i < ASPEED_FSI_NUM; i++) { + object_initialize_child(o, "fsi-master[*]", &s->fsi[i], + TYPE_FSI_MASTER); + } +} + +static void fsi_aspeed_apb2opb_realize (DeviceState *dev,Error **errp) +{ + SysBusDevice *sbd = SYS_BUS_DEVICE(dev); + AspeedAPB2OPBState *s = ASPEED_APB2OPB(dev); + int i; + + sysbus_init_irq(sbd, &s->irq); + + memory_region_init_io(&s->iomem, OBJECT(s), &aspeed_apb2opb_ops, s, + TYPE_ASPEED_APB2OPB, 0x1000);
Quoted 8 lines
Quoted 5 lines
+
sysbus_init_mmio(sbd, &s->iomem);
+
+ for (i = 0; i <ASPEED_FSI_NUM; i++) {
+ if (!qdev_realize_and_unref(DEVICE(&s->fsi[i]),BUS(&s->opb[i]),s->fsi[i] is not allocated. We should use
qdev_realizeinstead.
I am not sure I understood this. FSIMasterState fsi[ASPEED_FSI_NUM]; is embedded inside structure AspeedAPB2OPBState so it must be allocated, right?
Thanks for the review.
Regards,
Ninad
Quoted 119 lines
Thanks,
C.
Quoted 110 lines
+ errp)) {
+ return;
+ }hw/fsi/aspeed-apb2opb.c new file +7
-0+ + memory_region_add_subregion(&s->opb[i].mr, 0x80000000, + &s->fsi[i].iomem); + + /* OPB2FSI region */ + /* +* Avoid endianness issues by mapping each slave's memory region
+ * directly. Manually bridging multiple address-spaces causes endian
+ * swapping headaches asmemory_region_dispatch_read()and + *memory_region_dispatch_write()correct the endianness based on the
+ * target machine endianness and not relative to the device endianness
+ * on either side of the bridge.
+ */
+ /*
+ * XXX: This is a bit hairy and will need to be fixed when I sort out
+ * the bus/slave relationship and any changes to the CFAM modelling
+ * (multiple slaves, LBUS)
+ */
+memory_region_add_subregion(&s->opb[i].mr, 0xa0000000, + &s->fsi[i].opb2fsi);
+ }hw/fsi/aspeed-apb2opb.c new file +10
-0+} + +static void fsi_aspeed_apb2opb_reset (DeviceState *dev) +{ + AspeedAPB2OPBState *s = ASPEED_APB2OPB(dev); + + memcpy(s->regs, aspeed_apb2opb_reset, ASPEED_APB2OPB_NR_REGS); +} + +static void fsi_aspeed_apb2opb_class_init(ObjectClass *klass, void*data)
hw/fsi/aspeed-apb2opb.c new file +22
-0+{ + DeviceClass *dc = DEVICE_CLASS(klass); + + dc->desc = "ASPEED APB2OPB Bridge"; + dc->realize = fsi_aspeed_apb2opb_realize; + dc->reset = fsi_aspeed_apb2opb_reset; +} + +static const TypeInfo aspeed_apb2opb_info = { + .name = TYPE_ASPEED_APB2OPB, + .parent = TYPE_SYS_BUS_DEVICE, + .instance_init = fsi_aspeed_apb2opb_init, + .instance_size = sizeof(AspeedAPB2OPBState), + .class_init = fsi_aspeed_apb2opb_class_init, +}; + +static void aspeed_apb2opb_register_types (void ) +{ + type_register_static(&aspeed_apb2opb_info); +} + +type_init (aspeed_apb2opb_register_types);hw/arm/Kconfig +0
-0@@ -559,6 +559,7 @@ config ASPEED_SOCselect LED
select PMBUS
select MAX31785
+ selectFSI_APB2OPB_ASPEED
config MPS2
boolhw/fsi/Kconfig +4
-0@@ -1,3 +1,7 @@ +config FSI_APB2OPB_ASPEED + bool + select FSI_OPB +config
FSI_OPB
bool
selectFSI_CFAMhw/fsi/meson.build +0
-0@@ -2,3 +2,4 @@ system_ss.add(when: 'CONFIG_FSI_LBUS', if_true: files('lbus.c')) system_ss.add(when: 'CONFIG_FSI_CFAM', if_true: files('cfam.c')) system_ss.add(when: 'CONFIG_FSI', if_true: files('fsi.c','fsi-master.c','fsi-slave.c'))
system_ss.add(when: 'CONFIG_FSI_OPB', if_true: files('opb.c'))+system_ss.add(when: 'CONFIG_FSI_APB2OPB_ASPEED',if_true:
files('aspeed-apb2opb.c'))hw/fsi/trace-events +0
-0@@ -9,3 +9,5 @@ fsi_slave_read(uint64_t addr, uint32_t size) "@0x%"PRIx64 " size=%d"
fsi_slave_write(uint64_t addr, uint32_t size, uint64_t data)"@0x%" PRIx64 " size=%d value=0x%"PRIx64fsi_master_read(uint64_t addr, uint32_t size)"@0x%" PRIx64 " size=%d"fsi_master_write(uint64_t addr, uint32_t size, uint64_t data)"@0x%" PRIx64 " size=%d value=0x%"PRIx64 +fsi_aspeed_apb2opb_read(uint64_t addr,uint32_tsize) "@0x%" PRIx64
" size=%d"
+fsi_aspeed_apb2opb_write(uint64_t addr,uint32_tsize,uint64_t
data) "@0x%" PRIx64 " size=%d value=0x%"PRIx64
Re: [PATCH v8 06/10] hw/fsi: Aspeed APB2OPB interface
Hello Ninad,
Quoted 18 lines
Quoted 9 lines
Quoted 9 lines
hw/fsi/aspeed-apb2opb.c new file +9
-0+static void fsi_aspeed_apb2opb_realize (DeviceState *dev,Error **errp) +{ + SysBusDevice *sbd = SYS_BUS_DEVICE(dev); + AspeedAPB2OPBState *s = ASPEED_APB2OPB(dev); + int i; + + sysbus_init_irq(sbd, &s->irq); + + memory_region_init_io(&s->iomem, OBJECT(s), &aspeed_apb2opb_ops, s,Quoted 8 lines
Quoted 5 lines
+
TYPE_ASPEED_APB2OPB,0x1000);
+sysbus_init_mmio(sbd, &s->iomem);
+
+ for (i = 0; i <ASPEED_FSI_NUM; i++) {
+ if (!qdev_realize_and_unref(DEVICE(&s->fsi[i]),BUS(&s->opb[i]),s->fsi[i] is not allocated. We should use
qdev_realizeinstead.
Quoted 1 line
I am not sure I understood this. FSIMasterState fsi[ASPEED_FSI_NUM]; is inside structure AspeedAPB2OPBState so it must be allocated, right?
See the documentation :
https://www.qemu.org/docs/master/devel/qdev-api.html#c.qdev_realize_and_unref
Thanks,
C.
Re: [PATCH v8 06/10] hw/fsi: Aspeed APB2OPB interface
Hello Cedric,
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 3 lines
+ for (i = 0; i <
ASPEED_FSI_NUM; i++) {
+ if (!qdev_realize_and_unref(DEVICE(&s->fsi[i]),BUS(&s->opb[i]),
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
s->fsi[i] is not allocated. We should use
qdev_realizeinstead.I am not sure I understood this. FSIMasterState fsi[ASPEED_FSI_NUM]; is inside structure AspeedAPB2OPBState so it must be allocated, right?
See the documentation :
https://www.qemu.org/docs/master/devel/qdev-api.html#c.qdev_realize_and_unref
Fixed it. Thanks for the review.
Regards,
Ninad
PATCH v8 7/10 hw/arm: Hook up FSI module in AST2600
In reply to Ninad PalsuleThis patchset introduces IBM's Flexible Service Interface(FSI).
Time for some fun with inter-processor buses. FSI allows a service processor access to the internal buses of a host POWER processor to perform configuration or debugging.
FSI has long existed in POWER processes and so comes with some baggage, including how it has been integrated into the ASPEED SoC.
Working backwards from the POWER processor, the fundamental pieces of interest for the implementation are:
1. The Common FRU Access Macro (CFAM), an address space containing various "engines" that drive accesses on buses internal and external to the POWER chip. Examples include the SBEFIFO and I2C masters. The engines hang off of an internal Local Bus (LBUS) which is described by the CFAM configuration block.
2. The FSI slave: The slave is the terminal point of the FSI bus for FSI symbols addressed to it. Slaves can be cascaded off of one another. The slave's configuration registers appear in address space of the CFAM to which it is attached.
3. The FSI master: A controller in the platform service processor (e.g. BMC) driving CFAM engine accesses into the POWER chip. At the hardware level FSI is a bit-based protocol supporting synchronous and DMA-driven accesses of engines in a CFAM.
4. The On-Chip Peripheral Bus (OPB): A low-speed bus typically found in POWER processors. This now makes an appearance in the ASPEED SoC due to tight integration of the FSI master IP with the OPB, mainly the existence of an MMIO-mapping of the CFAM address straight onto a sub-region of the OPB address space.
5. An APB-to-OPB bridge enabling access to the OPB from the ARM core in the AST2600. Hardware limitations prevent the OPB from being directly mapped into APB, so all accesses are indirect through the bridge.
The implementation appears as following in the qemu device tree:
(qemu) info qtree
bus: main-system-bus
type System
...
dev: aspeed.apb2opb, id ""
gpio-out "sysbus-irq" 1
mmio 000000001e79b000/0000000000001000
bus: opb.1
type opb
dev: fsi.master, id ""
bus: fsi.bus.1
type fsi.bus
dev: cfam.config, id ""
dev: cfam, id ""
bus: fsi.lbus.1
type lbus
dev: scratchpad, id ""
address = 0 (0x0)
bus: opb.0
type opb
dev: fsi.master, id ""
bus: fsi.bus.0
type fsi.bus
dev: cfam.config, id ""
dev: cfam, id ""
bus: fsi.lbus.0
type lbus
dev: scratchpad, id ""
address = 0 (0x0)
The LBUS is modelled to maintain the qdev bus hierarchy and to take advantage of the object model to automatically generate the CFAM configuration block. The configuration block presents engines in the order they are attached to the CFAM's LBUS. Engine implementations should subclass the LBusDevice and set the 'config' member of LBusDeviceClass to match the engine's type.
CFAM designs offer a lot of flexibility, for instance it is possible for a CFAM to be simultaneously driven from multiple FSI links. The modeling is not so complete; it's assumed that each CFAM is attached to a single FSI slave (as a consequence the CFAM subclasses the FSI slave).
As for FSI, its symbols and wire-protocol are not modelled at all. This is not necessary to get FSI off the ground thanks to the mapping of the CFAM address space onto the OPB address space - the models follow this directly and map the CFAM memory region into the OPB's memory region. Future work includes supporting more advanced accesses that drive the FSI master directly rather than indirectly via the CFAM mapping, which will require implementing the FSI state machine and methods for each of the FSI symbols on the slave. Further down the track we can also look at supporting the bitbanged SoftFSI drivers in Linux by extending the FSI slave model to resolve sequences of GPIO IRQs into FSI symbols, and calling the associated symbol method on the slave to map the access onto the CFAM.
Testing:
Tested by reading cfam config address 0 on rainier machine type.
root@p10bmc:~# pdbg -a getcfam 0x0
p0: 0x0 = 0xc0022d15--- include/hw/arm/aspeed_soc.h | 4 ++++ hw/arm/aspeed_ast2600.c | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+)
include/hw/arm/aspeed_soc.h +4 -0
@@ -36,6 +36,7 @@#include "hw/misc/aspeed_lpc.h" #include "hw/misc/unimp.h" #include "hw/misc/aspeed_peci.h" +#include "hw/fsi/aspeed-apb2opb.h" #include "hw/char/serial.h" #define ASPEED_SPIS_NUM 2
@@ -90,6 +91,7 @@ struct AspeedSoCState {UnimplementedDeviceState udc;UnimplementedDeviceState sgpiom;UnimplementedDeviceState jtag[ASPEED_JTAG_NUM ]; +AspeedAPB2OPBState fsi[2 ]; };#define TYPE_ASPEED_SOC "aspeed-soc"
@@ -214,6 +216,8 @@ enum {ASPEED_DEV_SGPIOM ,ASPEED_DEV_JTAG0 ,ASPEED_DEV_JTAG1 , +ASPEED_DEV_FSI1 , + ASPEED_DEV_FSI2, };#define ASPEED_SOC_SPI_BOOT_ADDR 0x0
hw/arm/aspeed_ast2600.c +19 -0
@@ -75,6 +75,8 @@ static const hwaddr aspeed_soc_ast2600_memmap[] = { [ASPEED_DEV_UART12] = 0x1E790600, [ASPEED_DEV_UART13] = 0x1E790700, [ASPEED_DEV_VUART] = 0x1E787000, + [ASPEED_DEV_FSI1] = 0x1E79B000, + [ASPEED_DEV_FSI2] = 0x1E79B100, [ASPEED_DEV_I3C] = 0x1E7A0000, [ASPEED_DEV_SDRAM] = 0x80000000, };
@@ -132,6 +134,8 @@ static const int aspeed_soc_ast2600_irqmap[] = { [ASPEED_DEV_ETH4] = 33, [ASPEED_DEV_KCS] = 138, /* 138 -> 142 */ [ASPEED_DEV_DP] = 62, + [ASPEED_DEV_FSI1] = 100, + [ASPEED_DEV_FSI2] = 101, [ASPEED_DEV_I3C] = 102, /* 102 -> 107 */ };
@@ -264,6 +268,10 @@ static void aspeed_soc_ast2600_init(Object *obj)object_initialize_child (obj,"emmc-boot-controller" , &s->emmc_boot_controller,TYPE_UNIMPLEMENTED_DEVICE ); + +for (i =0 ; i <ASPEED_FSI_NUM ; i++) { +object_initialize_child (obj,"fsi[*]" , &s->fsi[i],TYPE_ASPEED_APB2OPB ); + } }/*
@@ -625,6 +633,17 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev, Error **errp)return ; }aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->sbc),0 , sc->memmap[ASPEED_DEV_SBC ]); + +/* FSI */ +for (i =0 ; i <ASPEED_FSI_NUM ; i++) { +if (!sysbus_realize (SYS_BUS_DEVICE (&s->fsi[i]), errp)) { +return ; + } +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->fsi[i]),0 , + sc->memmap[ASPEED_DEV_FSI1 + i]); +sysbus_connect_irq (SYS_BUS_DEVICE (&s->fsi[i]),0 , +aspeed_soc_get_irq (s,ASPEED_DEV_FSI1 + i)); + } }static void aspeed_soc_ast2600_class_init (ObjectClass *oc,void *data)
Signature · 1 line
2.39.2
Re: [PATCH v8 07/10] hw/arm: Hook up FSI module in AST2600
Quoted 101 lines · Ninad Palsule
This patchset introduces IBM's Flexible Service Interface(FSI).
Time for some fun with inter-processor buses. FSI allows a service processor access to the internal buses of a host POWER processor to perform configuration or debugging.
FSI has long existed in POWER processes and so comes with some baggage, including how it has been integrated into the ASPEED SoC.
Working backwards from the POWER processor, the fundamental pieces of interest for the implementation are:
1. The Common FRU Access Macro (CFAM), an address space containing various "engines" that drive accesses on buses internal and external to the POWER chip. Examples include the SBEFIFO and I2C masters. The engines hang off of an internal Local Bus (LBUS) which is described by the CFAM configuration block.
2. The FSI slave: The slave is the terminal point of the FSI bus for FSI symbols addressed to it. Slaves can be cascaded off of one another. The slave's configuration registers appear in address space of the CFAM to which it is attached.
3. The FSI master: A controller in the platform service processor (e.g. BMC) driving CFAM engine accesses into the POWER chip. At the hardware level FSI is a bit-based protocol supporting synchronous and DMA-driven accesses of engines in a CFAM.
4. The On-Chip Peripheral Bus (OPB): A low-speed bus typically found in POWER processors. This now makes an appearance in the ASPEED SoC due to tight integration of the FSI master IP with the OPB, mainly the existence of an MMIO-mapping of the CFAM address straight onto a sub-region of the OPB address space.
5. An APB-to-OPB bridge enabling access to the OPB from the ARM core in the AST2600. Hardware limitations prevent the OPB from being directly mapped into APB, so all accesses are indirect through the bridge.
The implementation appears as following in the qemu device tree:
(qemu) info qtree
bus: main-system-bus
type System
...
dev: aspeed.apb2opb, id ""
gpio-out "sysbus-irq" 1
mmio 000000001e79b000/0000000000001000
bus: opb.1
type opb
dev: fsi.master, id ""
bus: fsi.bus.1
type fsi.bus
dev: cfam.config, id ""
dev: cfam, id ""
bus: fsi.lbus.1
type lbus
dev: scratchpad, id ""
address = 0 (0x0)
bus: opb.0
type opb
dev: fsi.master, id ""
bus: fsi.bus.0
type fsi.bus
dev: cfam.config, id ""
dev: cfam, id ""
bus: fsi.lbus.0
type lbus
dev: scratchpad, id ""
address = 0 (0x0)The LBUS is modelled to maintain the qdev bus hierarchy and to take advantage of the object model to automatically generate the CFAM configuration block. The configuration block presents engines in the order they are attached to the CFAM's LBUS. Engine implementations should subclass the LBusDevice and set the 'config' member of LBusDeviceClass to match the engine's type.
CFAM designs offer a lot of flexibility, for instance it is possible for a CFAM to be simultaneously driven from multiple FSI links. The modeling is not so complete; it's assumed that each CFAM is attached to a single FSI slave (as a consequence the CFAM subclasses the FSI slave).
As for FSI, its symbols and wire-protocol are not modelled at all. This is not necessary to get FSI off the ground thanks to the mapping of the CFAM address space onto the OPB address space - the models follow this directly and map the CFAM memory region into the OPB's memory region. Future work includes supporting more advanced accesses that drive the FSI master directly rather than indirectly via the CFAM mapping, which will require implementing the FSI state machine and methods for each of the FSI symbols on the slave. Further down the track we can also look at supporting the bitbanged SoftFSI drivers in Linux by extending the FSI slave model to resolve sequences of GPIO IRQs into FSI symbols, and calling the associated symbol method on the slave to map the access onto the CFAM.
Testing:
Tested by reading cfam config address 0 on rainier machine type. root@p10bmc:~# pdbg -a getcfam 0x0 p0: 0x0 = 0xc0022d15
Quoted 4 lines
Signed-off-by Andrew Jeffery <[email protected]>Signed-off-by Ninad Palsule <[email protected]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>Signed-off-by Cédric Le Goater <[email protected]>
Thanks,
C.
Quoted 85 lines
--- include/hw/arm/aspeed_soc.h | 4 ++++ hw/arm/aspeed_ast2600.c | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+)include/hw/arm/aspeed_soc.h +4
-0@@ -36,6 +36,7 @@#include "hw/misc/aspeed_lpc.h" #include "hw/misc/unimp.h" #include "hw/misc/aspeed_peci.h" +#include "hw/fsi/aspeed-apb2opb.h" #include "hw/char/serial.h" #define ASPEED_SPIS_NUM 2@@ -90,6 +91,7 @@ struct AspeedSoCState {UnimplementedDeviceState udc;UnimplementedDeviceState sgpiom;UnimplementedDeviceState jtag[ASPEED_JTAG_NUM ]; +AspeedAPB2OPBState fsi[2 ]; };#define TYPE_ASPEED_SOC "aspeed-soc"@@ -214,6 +216,8 @@ enum {ASPEED_DEV_SGPIOM ,ASPEED_DEV_JTAG0 ,ASPEED_DEV_JTAG1 , +ASPEED_DEV_FSI1 , + ASPEED_DEV_FSI2, };#define ASPEED_SOC_SPI_BOOT_ADDR 0x0hw/arm/aspeed_ast2600.c +19
-0@@ -75,6 +75,8 @@ static const hwaddr aspeed_soc_ast2600_memmap[] = { [ASPEED_DEV_UART12] = 0x1E790600, [ASPEED_DEV_UART13] = 0x1E790700, [ASPEED_DEV_VUART] = 0x1E787000, + [ASPEED_DEV_FSI1] = 0x1E79B000, + [ASPEED_DEV_FSI2] = 0x1E79B100, [ASPEED_DEV_I3C] = 0x1E7A0000, [ASPEED_DEV_SDRAM] = 0x80000000, };@@ -132,6 +134,8 @@ static const int aspeed_soc_ast2600_irqmap[] = { [ASPEED_DEV_ETH4] = 33, [ASPEED_DEV_KCS] = 138, /* 138 -> 142 */ [ASPEED_DEV_DP] = 62, + [ASPEED_DEV_FSI1] = 100, + [ASPEED_DEV_FSI2] = 101, [ASPEED_DEV_I3C] = 102, /* 102 -> 107 */ };@@ -264,6 +268,10 @@ static void aspeed_soc_ast2600_init(Object *obj)object_initialize_child (obj,"emmc-boot-controller" , &s->emmc_boot_controller,TYPE_UNIMPLEMENTED_DEVICE ); + +for (i =0 ; i <ASPEED_FSI_NUM ; i++) { +object_initialize_child (obj,"fsi[*]" , &s->fsi[i],TYPE_ASPEED_APB2OPB ); + } }/* @@ -625,6 +633,17 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev, Error **errp)return ; }aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->sbc),0 , sc->memmap[ASPEED_DEV_SBC ]); + +/* FSI */ +for (i =0 ; i <ASPEED_FSI_NUM ; i++) { +if (!sysbus_realize (SYS_BUS_DEVICE (&s->fsi[i]), errp)) { +return ; + } +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->fsi[i]),0 , + sc->memmap[ASPEED_DEV_FSI1 + i]); +sysbus_connect_irq (SYS_BUS_DEVICE (&s->fsi[i]),0 , +aspeed_soc_get_irq (s,ASPEED_DEV_FSI1 + i)); + } }static void aspeed_soc_ast2600_class_init (ObjectClass *oc,void *data)
PATCH v8 8/10 hw/fsi: Added qtest
In reply to Ninad PalsuleAdded basic qtests for FSI model.
--- tests/qtest/aspeed-fsi-test.c | 205 ++++++++++++++++++++++++++++++++++ tests/qtest/meson.build | 1 + 2 files changed, 206 insertions(+) create mode 100644 tests/qtest/aspeed-fsi-test.c
tests/qtest/aspeed-fsi-test.c new file +205 -0
@@ -0,0 +1,205 @@ +/* +* QTest testcases for IBM's Flexible Service Interface (FSI) +* +* Copyright (c) 2023 IBM Corporation +* +* Authors: +* Ninad Palsule <[email protected]> +* +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory. +*/ + +#include "qemu/osdep.h" +#include <glib/gstdio.h> + +#include "qemu/module.h" +#include "libqtest-single.h" + +/* Registers from ast2600 specifications */ +#define ASPEED_FSI_ENGINER_TRIGGER 0x04 +#define ASPEED_FSI_OPB0_BUS_SELECT 0x10 +#define ASPEED_FSI_OPB1_BUS_SELECT 0x28 +#define ASPEED_FSI_OPB0_RW_DIRECTION 0x14 +#define ASPEED_FSI_OPB1_RW_DIRECTION 0x2c +#define ASPEED_FSI_OPB0_XFER_SIZE 0x18 +#define ASPEED_FSI_OPB1_XFER_SIZE 0x30 +#define ASPEED_FSI_OPB0_BUS_ADDR 0x1c +#define ASPEED_FSI_OPB1_BUS_ADDR 0x34 +#define ASPEED_FSI_INTRRUPT_CLEAR 0x40 +#define ASPEED_FSI_INTRRUPT_STATUS 0x48 +#define ASPEED_FSI_OPB0_BUS_STATUS 0x80 +#define ASPEED_FSI_OPB1_BUS_STATUS 0x8c +#define ASPEED_FSI_OPB0_READ_DATA 0x84 +#define ASPEED_FSI_OPB1_READ_DATA 0x90 + +/* +* FSI Base addresses from the ast2600 specifications. +*/ +#define AST2600_OPB_FSI0_BASE_ADDR 0x1e79b000 +#define AST2600_OPB_FSI1_BASE_ADDR 0x1e79b100 + +static uint32_t aspeed_fsi_base_addr; + +static uint32_t aspeed_fsi_readl (QTestState *s,uint32_t reg) +{ +return qtest_readl (s, aspeed_fsi_base_addr + reg); +} + +static void aspeed_fsi_writel (QTestState *s,uint32_t reg,uint32_t val) +{ +qtest_writel (s, aspeed_fsi_base_addr + reg, val); +} + +/* Setup base address and select register */ +static void test_fsi_setup (QTestState *s,uint32_t base_addr) +{ +uint32_t curval; + + aspeed_fsi_base_addr = base_addr; + +/* Set the base select register */ +if (base_addr ==AST2600_OPB_FSI0_BASE_ADDR ) { +/* Unselect FSI1 */ +aspeed_fsi_writel (s,ASPEED_FSI_OPB1_BUS_SELECT ,0x0 ); + curval =aspeed_fsi_readl (s,ASPEED_FSI_OPB1_BUS_SELECT ); + g_assert_cmpuint(curval, ==, 0x0); + +/* Select FSI0 */ +aspeed_fsi_writel (s,ASPEED_FSI_OPB0_BUS_SELECT ,0x1 ); + curval =aspeed_fsi_readl (s,ASPEED_FSI_OPB0_BUS_SELECT ); + g_assert_cmpuint(curval, ==, 0x1); + }else if (base_addr ==AST2600_OPB_FSI1_BASE_ADDR ) { +/* Unselect FSI0 */ +aspeed_fsi_writel (s,ASPEED_FSI_OPB0_BUS_SELECT ,0x0 ); + curval =aspeed_fsi_readl (s,ASPEED_FSI_OPB0_BUS_SELECT ); + g_assert_cmpuint(curval, ==, 0x0); + +/* Select FSI1 */ +aspeed_fsi_writel (s,ASPEED_FSI_OPB1_BUS_SELECT ,0x1 ); + curval =aspeed_fsi_readl (s,ASPEED_FSI_OPB1_BUS_SELECT ); + g_assert_cmpuint(curval, ==, 0x1); + }else { +g_assert_not_reached (); + } +} + +static void test_fsi_reg_change (QTestState *s,uint32_t reg,uint32_t newval) +{ +uint32_t base; +uint32_t curval; + + base =aspeed_fsi_readl (s, reg); +aspeed_fsi_writel (s, reg, newval); + curval =aspeed_fsi_readl (s, reg); + g_assert_cmpuint(curval, ==, newval); +aspeed_fsi_writel (s, reg, base); + curval =aspeed_fsi_readl (s, reg); + g_assert_cmpuint(curval, ==, base); +} + +static void test_fsi0_master_regs (const void *data) +{ +QTestState *s = (QTestState *)data; + +test_fsi_setup (s,AST2600_OPB_FSI0_BASE_ADDR ); + +test_fsi_reg_change (s,ASPEED_FSI_OPB0_RW_DIRECTION ,0xF3F4F514 ); +test_fsi_reg_change (s,ASPEED_FSI_OPB0_XFER_SIZE ,0xF3F4F518 ); +test_fsi_reg_change (s,ASPEED_FSI_OPB0_BUS_ADDR ,0xF3F4F51c ); +test_fsi_reg_change (s,ASPEED_FSI_INTRRUPT_CLEAR ,0xF3F4F540 ); +test_fsi_reg_change (s,ASPEED_FSI_INTRRUPT_STATUS ,0xF3F4F548 ); +test_fsi_reg_change (s,ASPEED_FSI_OPB0_BUS_STATUS ,0xF3F4F580 ); +test_fsi_reg_change (s,ASPEED_FSI_OPB0_READ_DATA ,0xF3F4F584 ); +} + +static void test_fsi1_master_regs (const void *data) +{ +QTestState *s = (QTestState *)data; + +test_fsi_setup (s,AST2600_OPB_FSI1_BASE_ADDR ); + +test_fsi_reg_change (s,ASPEED_FSI_OPB1_RW_DIRECTION ,0xF3F4F514 ); +test_fsi_reg_change (s,ASPEED_FSI_OPB1_XFER_SIZE ,0xF3F4F518 ); +test_fsi_reg_change (s,ASPEED_FSI_OPB1_BUS_ADDR ,0xF3F4F51c ); +test_fsi_reg_change (s,ASPEED_FSI_INTRRUPT_CLEAR ,0xF3F4F540 ); +test_fsi_reg_change (s,ASPEED_FSI_INTRRUPT_STATUS ,0xF3F4F548 ); +test_fsi_reg_change (s,ASPEED_FSI_OPB1_BUS_STATUS ,0xF3F4F580 ); +test_fsi_reg_change (s,ASPEED_FSI_OPB1_READ_DATA ,0xF3F4F584 ); +} + +static void test_fsi0_getcfam_addr0 (const void *data) +{ +QTestState *s = (QTestState *)data; +uint32_t curval; + +test_fsi_setup (s,AST2600_OPB_FSI0_BASE_ADDR ); + +/* Master access direction read */ +aspeed_fsi_writel (s,ASPEED_FSI_OPB0_RW_DIRECTION ,0x1 ); +/* word */ +aspeed_fsi_writel (s,ASPEED_FSI_OPB0_XFER_SIZE ,0x3 ); +/* Address */ +aspeed_fsi_writel (s,ASPEED_FSI_OPB0_BUS_ADDR ,0xa0000000 ); +aspeed_fsi_writel (s,ASPEED_FSI_INTRRUPT_CLEAR ,0x1 ); +aspeed_fsi_writel (s,ASPEED_FSI_ENGINER_TRIGGER ,0x1 ); + + curval =aspeed_fsi_readl (s,ASPEED_FSI_INTRRUPT_STATUS ); + g_assert_cmpuint(curval, ==, 0x10000); + curval =aspeed_fsi_readl (s,ASPEED_FSI_OPB0_BUS_STATUS ); + g_assert_cmpuint(curval, ==, 0x0); + curval =aspeed_fsi_readl (s,ASPEED_FSI_OPB0_READ_DATA ); + g_assert_cmpuint(curval, ==, 0x152d02c0); +} + +static void test_fsi1_getcfam_addr0 (const void *data) +{ +QTestState *s = (QTestState *)data; +uint32_t curval; + +test_fsi_setup (s,AST2600_OPB_FSI1_BASE_ADDR ); + +/* Master access direction read */ +aspeed_fsi_writel (s,ASPEED_FSI_OPB1_RW_DIRECTION ,0x1 ); + +aspeed_fsi_writel (s,ASPEED_FSI_OPB1_XFER_SIZE ,0x3 ); +aspeed_fsi_writel (s,ASPEED_FSI_OPB1_BUS_ADDR ,0xa0000000 ); +aspeed_fsi_writel (s,ASPEED_FSI_INTRRUPT_CLEAR ,0x1 ); +aspeed_fsi_writel (s,ASPEED_FSI_ENGINER_TRIGGER ,0x1 ); + + curval =aspeed_fsi_readl (s,ASPEED_FSI_INTRRUPT_STATUS ); + g_assert_cmpuint(curval, ==, 0x20000); + curval =aspeed_fsi_readl (s,ASPEED_FSI_OPB1_BUS_STATUS ); + g_assert_cmpuint(curval, ==, 0x0); + curval =aspeed_fsi_readl (s,ASPEED_FSI_OPB1_READ_DATA ); + g_assert_cmpuint(curval, ==, 0x152d02c0); +} + +int main (int argc,char **argv) +{ +int ret =-1 ; +QTestState *s; + +g_test_init (&argc, &argv,NULL ); + + s =qtest_init ("-machine ast2600-evb " ); + +/* Tests for OPB/FSI0 */ +qtest_add_data_func ("/aspeed-fsi-test/test_fsi0_master_regs" , s, + test_fsi0_master_regs); + +qtest_add_data_func ("/aspeed-fsi-test/test_fsi0_getcfam_addr0" , s, + test_fsi0_getcfam_addr0); + +/* Tests for OPB/FSI1 */ +qtest_add_data_func ("/aspeed-fsi-test/test_fsi1_master_regs" , s, + test_fsi1_master_regs); + +qtest_add_data_func ("/aspeed-fsi-test/test_fsi1_getcfam_addr0" , s, + test_fsi1_getcfam_addr0); + + ret =g_test_run (); +qtest_quit (s); + +return ret; +}
tests/qtest/meson.build +1 -0
@@ -207,6 +207,7 @@ qtests_arm = \ (config_all_devices.has_key('CONFIG_TPM_TIS_I2C') ? ['tpm-tis-i2c-test'] : []) + \ (config_all_devices.has_key('CONFIG_VEXPRESS') ? ['test-arm-mptimer'] : []) + \ (config_all_devices.has_key('CONFIG_MICROBIT') ? ['microbit-test'] : []) + \ + (config_all_devices.has_key('CONFIG_FSI_APB2OPB_ASPEED') ? ['aspeed-fsi-test'] : []) + \ ['arm-cpu-features', 'boot-serial-test']
Signature · 1 line
2.39.2
PATCH v8 9/10 hw/fsi: Added FSI documentation
In reply to Ninad PalsuleDocumentation for IBM FSI model.
--- docs/specs/fsi.rst | 138 +++++++++++++++++++++++++++++++++++++++++++ docs/specs/index.rst | 1 + 2 files changed, 139 insertions(+) create mode 100644 docs/specs/fsi.rst
docs/specs/fsi.rst new file +138 -0
@@ -0,0 +1,138 @@ +====================================== +IBM's Flexible Service Interface (FSI) +====================================== + +The QEMU FSI emulation implements hardware interfaces between ASPEED SOC, FSI +master/slave and the end engine. + +FSI is a point-to-point two wire interface which is capable of supporting +distances of up to 4 meters. FSI interfaces have been used successfully for +many years in IBM servers to attach IBM Flexible Support Processors(FSP) to +CPUs and IBM ASICs. + +FSI allows a service processor access to the internal buses of a host POWER +processor to perform configuration or debugging. FSI has long existed in POWER +processes and so comes with some baggage, including how it has been integrated +into the ASPEED SoC. + +Working backwards from the POWER processor, the fundamental pieces of interest +for the implementation are: (see the `FSI specification`_ for more details) + +1. The Common FRU Access Macro (CFAM), an address space containing various + "engines" that drive accesses on buses internal and external to the POWER + chip. Examples include the SBEFIFO and I2C masters. The engines hang off of + an internal Local Bus (LBUS) which is described by the CFAM configuration + block. + +2. The FSI slave: The slave is the terminal point of the FSI bus for FSI + symbols addressed to it. Slaves can be cascaded off of one another. The + slave's configuration registers appear in address space of the CFAM to + which it is attached. + +3. The FSI master: A controller in the platform service processor (e.g. BMC) + driving CFAM engine accesses into the POWER chip. At the hardware level + FSI is a bit-based protocol supporting synchronous and DMA-driven accesses + of engines in a CFAM. + +4. The On-Chip Peripheral Bus (OPB): A low-speed bus typically found in POWER + processors. This now makes an appearance in the ASPEED SoC due to tight + integration of the FSI master IP with the OPB, mainly the existence of an + MMIO-mapping of the CFAM address straight onto a sub-region of the OPB + address space. + +5. An APB-to-OPB bridge enabling access to the OPB from the ARM core in the + AST2600. Hardware limitations prevent the OPB from being directly mapped + into APB, so all accesses are indirect through the bridge. + +The LBUS is modelled to maintain the qdev bus hierarchy and to take advantages +of the object model to automatically generate the CFAM configuration block. +The configuration block presents engines in the order they are attached to the +CFAM's LBUS. Engine implementations should subclass the LBusDevice and set the +'config' member of LBusDeviceClass to match the engine's type. + +CFAM designs offer a lot of flexibility, for instance it is possible for a +CFAM to be simultaneously driven from multiple FSI links. The modeling is not +so complete; it's assumed that each CFAM is attached to a single FSI slave (as +a consequence the CFAM subclasses the FSI slave). + +As for FSI, its symbols and wire-protocol are not modelled at all. This is not +necessary to get FSI off the ground thanks to the mapping of the CFAM address +space onto the OPB address space - the models follow this directly and map the +CFAM memory region into the OPB's memory region. + +QEMU files related to FSI interface: + - ``hw/fsi/aspeed-apb2opb.c`` + - ``include/hw/fsi/aspeed-apb2opb.h`` + - ``hw/fsi/opb.c`` + - ``include/hw/fsi/opb.h`` + - ``hw/fsi/fsi.c`` + - ``include/hw/fsi/fsi.h`` + - ``hw/fsi/fsi-master.c`` + - ``include/hw/fsi/fsi-master.h`` + - ``hw/fsi/fsi-slave.c`` + - ``include/hw/fsi/fsi-slave.h`` + - ``hw/fsi/cfam.c`` + - ``include/hw/fsi/cfam.h`` + - ``hw/fsi/engine-scratchpad.c`` + - ``include/hw/fsi/engine-scratchpad.h`` + - ``include/hw/fsi/lbus.h`` + +The following commands start the rainier machine with built-in FSI model. +There are no model specific arguments. + +.. code-block:: console + + qemu-system-arm -M rainier-bmc -nographic \ + -kernel fitImage-linux.bin \ + -dtb aspeed-bmc-ibm-rainier.dtb \ + -initrd obmc-phosphor-initramfs.rootfs.cpio.xz \ + -drive file=obmc-phosphor-image.rootfs.wic.qcow2,if=sd,index=2 \ + -append "rootwait console=ttyS4,115200n8 root=PARTLABEL=rofs-a" + +The implementation appears as following in the qemu device tree: + +.. code-block:: console + + (qemu) info qtree + bus: main-system-bus + type System + ... + dev: aspeed.apb2opb, id "" + gpio-out "sysbus-irq" 1 + mmio 000000001e79b000/0000000000001000 + bus: opb.1 + type opb + dev: fsi.master, id "" + bus: fsi.bus.1 + type fsi.bus + dev: cfam.config, id "" + dev: cfam, id "" + bus: lbus.1 + type lbus + dev: scratchpad, id "" + address = 0 (0x0) + bus: opb.0 + type opb + dev: fsi.master, id "" + bus: fsi.bus.0 + type fsi.bus + dev: cfam.config, id "" + dev: cfam, id "" + bus: lbus.0 + type lbus + dev: scratchpad, id "" + address = 0 (0x0) + +pdbg is a simple application to allow debugging of the host POWER processors +from the BMC. (see the `pdbg source repository`_ for more details) + +.. code-block:: console + + root@p10bmc:~# pdbg -a getcfam 0x0 + p0: 0x0 = 0xc0022d15 + +.. _FSI specification: + https://openpowerfoundation.org/specifications/fsi/ + +.. _pdbg source repository: + https://github.com/open-power/pdbg
docs/specs/index.rst +1 -0
@@ -24,6 +24,7 @@ guest hardware that is specific to QEMU. acpi_erst sev-guest-firmware fw_cfg + fsi vmw_pvscsi-spec edu ivshmem-spec
Signature · 1 line
2.39.2
PATCH v8 10/10 hw/fsi: Update MAINTAINER list
In reply to Ninad PalsuleAdded maintainer for IBM FSI model
--- MAINTAINERS | 8 ++++++++ 1 file changed, 8 insertions(+)
MAINTAINERS +8 -0
@@ -3558,6 +3558,14 @@ F: tests/qtest/adm1272-test.c F: tests/qtest/max34451-test.c F: tests/qtest/isl_pmbus_vr-test.c +FSI +M: Ninad Palsule <[email protected]> +S: Maintained +F: hw/fsi/* +F: include/hw/fsi/* +F: docs/specs/fsi.rst +F: tests/qtest/fsi-test.c + Firmware schema specifications M: Philippe Mathieu-Daudé <[email protected]> R: Daniel P. Berrange <[email protected]>
Signature · 1 line
2.39.2
Hello Ninad,
Here are comments on the file organization and configs.
Quoted 20 lines · Ninad Palsule
Hello,
Please review the patch-set version 8.
I have incorporated review comments from Cedric.
- Fixed checkpatch failures.
- Fixed commit messages.
- Fixed LBUS memory map size.Ninad Palsule (10):
hw/fsi: Introduce IBM's Local bus
hw/fsi: Introduce IBM's FSI Bus
hw/fsi: Introduce IBM's cfam,fsi-slave,scratchpad hw/fsi: IBM's On-chip Peripheral Bus hw/fsi: Introduce IBM's FSI master hw/fsi: Aspeed APB2OPB interface
hw/arm: Hook up FSI module in AST2600 hw/fsi: Added qtest
hw/fsi: Added FSI documentation
hw/fsi: Update MAINTAINER list
Quoted 7 lines
MAINTAINERS | 8 + docs/specs/fsi.rst | 138 ++++++++++++++ docs/specs/index.rst | 1 + meson.build | 1 + hw/fsi/trace.h | 1 + include/hw/arm/aspeed_soc.h | 4 + include/hw/fsi/aspeed-apb2opb.h | 34 ++++
aspeed-apb2opb is a HW logic bridging the FSI world and Aspeed. It doesn't belong to the FSI susbsytem. Since we don't have a directory for platform specific devices, I think the model shoud go under hw/misc/.
Quoted 1 line
include/hw/fsi/cfam.h | 45 +++++
scratchpad is the only lbus device and it is quite generic, we could move it to lbus files. It would be nice to implement more than one reg.
Quoted 3 lines
include/hw/fsi/fsi-master.h | 32 ++++ include/hw/fsi/fsi-slave.h | 29 +++ include/hw/fsi/fsi.h | 24 +++
I would move the definitions and implementation of the fsi bus and the fsi slave under the fsi.h and fsi.c files
Quoted 2 lines
include/hw/fsi/lbus.h | 40 ++++ include/hw/fsi/opb.h | 25 +++
opb is quite minimal now and I think it could be hidden under aspeed-apb2opb.
Quoted 4 lines
hw/arm/aspeed_ast2600.c | 19 ++ hw/fsi/aspeed-apb2opb.c | 316 ++++++++++++++++++++++++++++++++ hw/fsi/cfam.c | 261 ++++++++++++++++++++++++++ hw/fsi/fsi-master.c | 165 +++++++++++++++++
Quoted 8 lines
hw/fsi/fsi-slave.c | 78 ++++++++ hw/fsi/fsi.c | 22 +++ hw/fsi/lbus.c | 51 ++++++ hw/fsi/opb.c | 36 ++++ tests/qtest/aspeed-fsi-test.c | 205 +++++++++++++++++++++ hw/Kconfig | 1 + hw/arm/Kconfig | 1 + hw/fsi/Kconfig | 21 +++
one CONFIG_FSI option and one CONFIG_FSI_APB2OPB should be enough. CONFIG_FSI_APB2OPB should select FSI and depends on CONFIG_ASPEED_SOC.
Thanks,
C.
Quoted 26 lines
hw/fsi/meson.build | 5 + hw/fsi/trace-events | 13 ++ hw/meson.build | 1 + tests/qtest/meson.build | 1 + 29 files changed, 1578 insertions(+)create mode 100644
docs/specs/fsi.rstcreate mode 100644hw/fsi/trace.h
create mode 100644include/hw/fsi/aspeed-apb2opb.hcreate mode 100644include/hw/fsi/cfam.hcreate mode 100644include/hw/fsi/fsi-master.hcreate mode 100644include/hw/fsi/fsi-slave.hcreate mode 100644include/hw/fsi/fsi.hcreate mode 100644include/hw/fsi/lbus.hcreate mode 100644include/hw/fsi/opb.hcreate mode 100644hw/fsi/aspeed-apb2opb.ccreate mode 100644hw/fsi/cfam.c
create mode 100644hw/fsi/fsi-master.ccreate mode 100644hw/fsi/fsi-slave.ccreate mode 100644hw/fsi/fsi.c
create mode 100644hw/fsi/lbus.c
create mode 100644hw/fsi/opb.c
create mode 100644tests/qtest/aspeed-fsi-test.ccreate mode 100644 hw/fsi/Kconfig
create mode 100644 hw/fsi/meson.build create mode 100644 hw/fsi/trace-events
Hello Cedric,
Quoted 6 lines
Quoted 1 line
include/hw/fsi/aspeed-apb2opb.h| 34 ++++aspeed-apb2opb is a HW logic bridging the FSI world and Aspeed. It doesn't belong to the FSI susbsytem. Since we don't have a directory for platform specific devices, I think the model shoud go under hw/misc/.
Moved it to hw/misc directory
Quoted 6 lines
Quoted 2 lines
include/hw/fsi/cfam.h | 45 +++++
scratchpad is the only lbus device and it is quite generic, we could move it to lbus files. It would be nice to implement more than one reg.
Moved scratchpad to lbus files.
Quoted 8 lines
Quoted 5 lines
include/hw/fsi/fsi-master.h | 32 ++++
include/hw/fsi/fsi-slave.h | 29 +++
include/hw/fsi/fsi.h | 24 +++I would move the definitions and implementation of the fsi bus and the fsi slave under the
fsi.handfsi.cfiles
Moved fsi-slave to fsi files.
Quoted 7 lines
Quoted 4 lines
include/hw/fsi/lbus.h | 40 ++++
include/hw/fsi/opb.h | 25 +++opb is quite minimal now and I think it could be hidden under aspeed-apb2opb.
Moved opb to aspeed-apb2opb files.
Quoted 5 lines
Quoted 2 lines
hw/fsi/Kconfig | 21 +++
one
CONFIG_FSIoption and oneCONFIG_FSI_APB2OPBshould be enough.CONFIG_FSI_APB2OPBshould select FSI and depends onCONFIG_ASPEED_SOC.
Reduced number of configs as you suggested.
Thanks for the review.
Regards,
Ninad