Introduce model for IBM's FSI
Subsystems (2)
v7 cover Introduce model for IBM's FSI
Hello,
Please review the patch-set version 7.
I have incorporated review comments from Cedric, Philippe and Thomas.
Ninad Palsule (10):
hw/fsi: Introduce IBM's Local bus
hw/fsi: Introduce IBM's scratchpad
hw/fsi: Introduce IBM's cfam,fsi-slave
hw/fsi: Introduce IBM's FSI
hw/fsi: IBM's On-chip Peripheral Bus
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 | 33 ++++ include/hw/fsi/cfam.h | 34 ++++ include/hw/fsi/engine-scratchpad.h | 27 +++ include/hw/fsi/fsi-master.h | 30 ++++ include/hw/fsi/fsi-slave.h | 29 +++ include/hw/fsi/fsi.h | 36 ++++ include/hw/fsi/lbus.h | 43 +++++ include/hw/fsi/opb.h | 33 ++++ hw/arm/aspeed_ast2600.c | 19 ++ hw/fsi/aspeed-apb2opb.c | 272 +++++++++++++++++++++++++++++ hw/fsi/cfam.c | 173 ++++++++++++++++++ hw/fsi/engine-scratchpad.c | 93 ++++++++++ hw/fsi/fsi-master.c | 161 +++++++++++++++++ hw/fsi/fsi-slave.c | 78 +++++++++ hw/fsi/fsi.c | 25 +++ hw/fsi/lbus.c | 74 ++++++++ hw/fsi/opb.c | 74 ++++++++ tests/qtest/aspeed-fsi-test.c | 205 ++++++++++++++++++++++ hw/Kconfig | 1 + hw/arm/Kconfig | 1 + hw/fsi/Kconfig | 23 +++ hw/fsi/meson.build | 6 + hw/fsi/trace-events | 13 ++ hw/meson.build | 1 + tests/qtest/meson.build | 1 + 31 files changed, 1638 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/engine-scratchpad.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/engine-scratchpad.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 v7 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 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.
---
v2:
- Incorporated Joel's review comments.
v5:
- Incorporated review comments by Cedric. v6:
- Incorporated review comments by Cedric & Daniel. v7:
- Incorporated review comments by Philippe.
--- include/hw/fsi/lbus.h | 43 +++++++++++++++++++++++++ hw/fsi/lbus.c | 74 +++++++++++++++++++++++++++++++++++++++++++ hw/Kconfig | 1 + hw/fsi/Kconfig | 2 ++ hw/fsi/meson.build | 1 + hw/meson.build | 1 + 6 files changed, 122 insertions(+) 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
include/hw/fsi/lbus.h new file +43 -0
@@ -0,0 +1,43 @@ +/* +* 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_SIZE 0x400 + +typedef struct FSILBusDevice { +DeviceState parent; + +MemoryRegion iomem; +uint32_t address; +}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 ; + +DeviceState *lbus_create_device (FSILBus *bus,const char *type,uint32_t addr); +int lbus_add_device (FSILBus *bus,FSILBusDevice *dev); +#endif /* FSI_LBUS_H */
hw/fsi/lbus.c new file +74 -0
74 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/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 v7 01/10] hw/fsi: Introduce IBM's Local bus
Quoted 53 lines · Ninad Palsule
This is a part of patchset where IBM's Flexible Service Interface is introduced.
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.
Signed-off-by Andrew Jeffery <[email protected]>Signed-off-by Ninad Palsule <[email protected]>---
v2:
- Incorporated Joel's review comments.
v5:
- Incorporated review comments by Cedric. v6:
- Incorporated review comments by Cedric & Daniel. v7:
- Incorporated review comments by Philippe.--- include/hw/fsi/lbus.h | 43 +++++++++++++++++++++++++ hw/fsi/lbus.c | 74 +++++++++++++++++++++++++++++++++++++++++++ hw/Kconfig | 1 + hw/fsi/Kconfig | 2 ++ hw/fsi/meson.build | 1 + hw/meson.build | 1 + 6 files changed, 122 insertions(+)create mode 100644
include/hw/fsi/lbus.h
create mode 100644hw/fsi/lbus.c
create mode 100644 hw/fsi/Kconfig
create mode 100644 hw/fsi/meson.buildinclude/hw/fsi/lbus.h new file +13
-0@@ -0,0 +1,43 @@ +/* +* 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"
include/hw/fsi/lbus.h line 23
Quoted 10 lines
include/hw/fsi/lbus.h new file +10
-0+OBJECT_DECLARE_TYPE(FSILBusDevice, FSILBusDeviceClass, FSI_LBUS_DEVICE) + +#define FSI_LBUS_MEM_REGION_SIZE (2 * 1024 * 1024) +#define FSI_LBUSDEV_IOMEM_SIZE 0x400 + +typedef struct FSILBusDevice { + DeviceState parent; + + MemoryRegion iomem; + uint32_t address;
This is address attribute is not useful. Models/HW unit generally do not know where their MMIO regions are mmapped in the address space.
Quoted 48 lines
include/hw/fsi/lbus.h new file +20
-0+} 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 ; + +DeviceState *lbus_create_device (FSILBus *bus,const char *type,uint32_t addr); +int lbus_add_device (FSILBus *bus,FSILBusDevice *dev); +#endif /* FSI_LBUS_H */ hw/fsi/lbus.c new file +22
-0@@ -0,0 +1,74 @@ +/* +* 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_SIZE ); +} + +static const TypeInfo lbus_info = {
hw/fsi/lbus.c line 32
Quoted 10 lines
hw/fsi/lbus.c new file +10
-0+ .name = TYPE_FSI_LBUS, + .parent = TYPE_BUS, + .instance_init = lbus_init, + .instance_size = sizeof(FSILBus), +}; + +static Property lbus_device_props[] = { +DEFINE_PROP_UINT32 ("address" , FSILBusDevice, address,0 ), +DEFINE_PROP_END_OF_LIST (), +};
Please remove lbus_device_props
hw/fsi/lbus.c line 34
Quoted 1 line
hw/fsi/lbus.c new file +1
-0+DeviceState *lbus_create_device (FSILBus *bus,const char *type,uint32_t addr)
This routine is only used once in a realize handler which could propagate a possible error. Please remove.
Quoted 72 lines
hw/fsi/lbus.c new file +40
-0+{ +DeviceState *ds; +BusState *state =BUS (bus); +FSILBusDevice *dev; + + ds =qdev_new (type); +qdev_prop_set_uint32 (ds,"address" , addr); +qdev_realize_and_unref (ds, state, &error_fatal); + + dev =FSI_LBUS_DEVICE (ds); +memory_region_add_subregion (&bus->mr, dev->address, + &dev->iomem); + +return ds; +} + +static void lbus_device_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); + + dc->bus_type =TYPE_FSI_LBUS ; +device_class_set_props (dc, lbus_device_props); +} + +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/meson.build +0
-0
hw/meson.build subdir('virtio') · line 50
Quoted 7 lines
hw/meson.build +1
-0@@ -44,6 +44,7 @@ subdir('virtio') subdir('watchdog') subdir('xen') subdir('xenpv') +subdir('fsi') subdir('alpha') subdir('arm')
The meson.build file is not modified which means the new files are compiled.
Thanks,
C.
Re: [PATCH v7 01/10] hw/fsi: Introduce IBM's Local bus
Hello Cedric,
Quoted 59 lines · Cédric Le Goater
Quoted 58 lines · Ninad Palsule
This is a part of patchset where IBM's Flexible Service Interface is introduced.
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.
Signed-off-by Andrew Jeffery <[email protected]>Signed-off-by Ninad Palsule <[email protected]>---
v2:
- Incorporated Joel's review comments.
v5:
- Incorporated review comments by Cedric.
v6:
- Incorporated review comments by Cedric & Daniel.
v7:
- Incorporated review comments by Philippe.
---
include/hw/fsi/lbus.h| 43 +++++++++++++++++++++++++ hw/fsi/lbus.c | 74 +++++++++++++++++++++++++++++++++++++++++++ hw/Kconfig | 1 +
hw/fsi/Kconfig | 2 ++
hw/fsi/meson.build | 1 +
hw/meson.build | 1 +6 files changed, 122 insertions(+)create mode 100644
include/hw/fsi/lbus.h
create mode 100644hw/fsi/lbus.c
create mode 100644 hw/fsi/Kconfig
create mode 100644 hw/fsi/meson.buildinclude/hw/fsi/lbus.h new file +18
-0@@ -0,0 +1,43 @@ +/* +* 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_SIZE 0x400 +
Quoted 8 lines
include/hw/fsi/lbus.h line 23
Quoted 5 lines
include/hw/fsi/lbus.h new file +5
-0+typedef struct FSILBusDevice { + DeviceState parent; + + MemoryRegion iomem; + uint32_t address;This is address attribute is not useful. Models/HW unit generally do not know where their MMIO regions are mmapped in the address space.
OK, I checked your changes and looks good.
Quoted 55 lines
Quoted 55 lines
include/hw/fsi/lbus.h new file +18
-0+} 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 ; + +DeviceState *lbus_create_device(FSILBus *bus, const char *type,
uint32_taddr);include/hw/fsi/lbus.h new file +2
-0+int lbus_add_device (FSILBus *bus,FSILBusDevice *dev); +#endif /* FSI_LBUS_H */ hw/fsi/lbus.c new file +19
-0@@ -0,0 +1,74 @@ +/* +* 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_SIZE);hw/fsi/lbus.c new file +7
-0+} + +static const TypeInfo lbus_info = { + .name = TYPE_FSI_LBUS, + .parent = TYPE_BUS, + .instance_init = lbus_init, + .instance_size = sizeof(FSILBus),
Quoted 8 lines
hw/fsi/lbus.c line 32
Quoted 6 lines
hw/fsi/lbus.c new file +6
-0+}; + +static Property lbus_device_props[] = { + DEFINE_PROP_UINT32("address", FSILBusDevice, address, 0), + DEFINE_PROP_END_OF_LIST(), +};Please remove
lbus_device_props
ok, I checked your changes and look good.
Quoted 6 lines
Quoted 3 lines
+DeviceState *lbus_create_device(FSILBus *bus, const char *type,
uint32_taddr)This routine is only used once in a realize handler which could propagate a possible error. Please remove.
ok, I checked your changes and look good.
Quoted 73 lines
Quoted 73 lines
hw/fsi/lbus.c new file +40
-0+{ + DeviceState *ds; + BusState *state = BUS(bus); + FSILBusDevice *dev; + + ds = qdev_new(type); + qdev_prop_set_uint32(ds, "address", addr); + qdev_realize_and_unref(ds, state, &error_fatal); + + dev = FSI_LBUS_DEVICE(ds); + memory_region_add_subregion(&bus->mr, dev->address, + &dev->iomem); + + return ds; +} + +static void lbus_device_class_init (ObjectClass *klass,void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + + dc->bus_type = TYPE_FSI_LBUS; + device_class_set_props(dc, lbus_device_props); +} + +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 +0
-0@@ -9,6 +9,7 @@ source core/Kconfigsource 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/meson.build +0
-0@@ -44,6 +44,7 @@ subdir('virtio')
Quoted 8 lines
hw/meson.build subdir('virtio') · line 50
Quoted 6 lines
hw/meson.build +1
-0subdir('watchdog') subdir('xen') subdir('xenpv') +subdir('fsi') subdir('alpha') subdir('arm')The meson.build file is not modified which means the new files are compiled.
Sorry, I missed it.
Thanks for the review and changes.
Regards,
Ninad
Quoted 6 lines
Thanks,
C.
Re: [PATCH v7 01/10] hw/fsi: Introduce IBM's Local bus
In reply to Ninad PalsuleQuoted 98 lines · Ninad Palsule
This is a part of patchset where IBM's Flexible Service Interface is introduced.
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.
Signed-off-by Andrew Jeffery <[email protected]>Signed-off-by Ninad Palsule <[email protected]>---
v2:
- Incorporated Joel's review comments.
v5:
- Incorporated review comments by Cedric. v6:
- Incorporated review comments by Cedric & Daniel. v7:
- Incorporated review comments by Philippe.--- include/hw/fsi/lbus.h | 43 +++++++++++++++++++++++++ hw/fsi/lbus.c | 74 +++++++++++++++++++++++++++++++++++++++++++ hw/Kconfig | 1 + hw/fsi/Kconfig | 2 ++ hw/fsi/meson.build | 1 + hw/meson.build | 1 + 6 files changed, 122 insertions(+)create mode 100644
include/hw/fsi/lbus.h
create mode 100644hw/fsi/lbus.c
create mode 100644 hw/fsi/Kconfig
create mode 100644 hw/fsi/meson.buildinclude/hw/fsi/lbus.h new file +43
-0@@ -0,0 +1,43 @@ +/* +* 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_SIZE 0x400 + +typedef struct FSILBusDevice { +DeviceState parent; + +MemoryRegion iomem; +uint32_t address; +}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 ; + +DeviceState *lbus_create_device (FSILBus *bus,const char *type,uint32_t addr); +int lbus_add_device (FSILBus *bus,FSILBusDevice *dev); +#endif /* FSI_LBUS_H */ hw/fsi/lbus.c new file +9
-0@@ -0,0 +1,74 @@ +/* +* 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"
hw/fsi/lbus.c line 19
Quoted 10 lines
hw/fsi/lbus.c new file +10
-0+#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_SIZE );
That's a bit difficult to understand. What are these two regions ? CAn you explain more the mappings ?
Thanks,
C.
Quoted 94 lines
hw/fsi/lbus.c new file +55
-0+} + +static const TypeInfo lbus_info = { + .name =TYPE_FSI_LBUS , + .parent =TYPE_BUS , + .instance_init = lbus_init, + .instance_size =sizeof (FSILBus), +}; + +static Property lbus_device_props[] = { +DEFINE_PROP_UINT32 ("address" , FSILBusDevice, address,0 ), +DEFINE_PROP_END_OF_LIST (), +}; + +DeviceState *lbus_create_device (FSILBus *bus,const char *type,uint32_t addr) +{ +DeviceState *ds; +BusState *state =BUS (bus); +FSILBusDevice *dev; + + ds =qdev_new (type); +qdev_prop_set_uint32 (ds,"address" , addr); +qdev_realize_and_unref (ds, state, &error_fatal); + + dev =FSI_LBUS_DEVICE (ds); +memory_region_add_subregion (&bus->mr, dev->address, + &dev->iomem); + +return ds; +} + +static void lbus_device_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); + + dc->bus_type =TYPE_FSI_LBUS ; +device_class_set_props (dc, lbus_device_props); +} + +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/meson.build +1
-0@@ -44,6 +44,7 @@ subdir('virtio') subdir('watchdog') subdir('xen') subdir('xenpv') +subdir('fsi') subdir('alpha') subdir('arm')
Re: [PATCH v7 01/10] hw/fsi: Introduce IBM's Local bus
Hello Cedric,
Quoted 106 lines · Cédric Le Goater
Quoted 105 lines · Ninad Palsule
This is a part of patchset where IBM's Flexible Service Interface is introduced.
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.
Signed-off-by Andrew Jeffery <[email protected]>Signed-off-by Ninad Palsule <[email protected]>---
v2:
- Incorporated Joel's review comments.
v5:
- Incorporated review comments by Cedric.
v6:
- Incorporated review comments by Cedric & Daniel.
v7:
- Incorporated review comments by Philippe.
---
include/hw/fsi/lbus.h| 43 +++++++++++++++++++++++++ hw/fsi/lbus.c | 74 +++++++++++++++++++++++++++++++++++++++++++ hw/Kconfig | 1 +
hw/fsi/Kconfig | 2 ++
hw/fsi/meson.build | 1 +
hw/meson.build | 1 +6 files changed, 122 insertions(+)create mode 100644
include/hw/fsi/lbus.h
create mode 100644hw/fsi/lbus.c
create mode 100644 hw/fsi/Kconfig
create mode 100644 hw/fsi/meson.buildinclude/hw/fsi/lbus.h new file +41
-0@@ -0,0 +1,43 @@ +/* +* 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_SIZE 0x400 + +typedef struct FSILBusDevice { + DeviceState parent; + + MemoryRegion iomem; + uint32_t address; +}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 ; + +DeviceState *lbus_create_device(FSILBus *bus, const char *type,
uint32_taddr);include/hw/fsi/lbus.h new file +2
-0+int lbus_add_device (FSILBus *bus,FSILBusDevice *dev); +#endif /* FSI_LBUS_H */ hw/fsi/lbus.c new file +15
-0@@ -0,0 +1,74 @@ +/* +* 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) +{
Quoted 8 lines
Quoted 5 lines
hw/fsi/lbus.c new file +4
-0+ FSILBus *lbus = FSI_LBUS(o); + + memory_region_init(&lbus->mr, OBJECT(lbus), TYPE_FSI_LBUS, + FSI_LBUS_MEM_REGION_SIZE -
FSI_LBUSDEV_IOMEM_SIZE);That's a bit difficult to understand. What are these two regions ? CAn you explain more the mappings ?
Please see the attached file for memory mapping. I realized the FSI_LBUSDEV_IOMEM_SIZE is not a correct subtraction. It should 0xc00 as first 3 pages are used by CFAM so devices get less space.
Thanks for the review and making the changes.
Regards,
Ninad
Quoted 104 lines
Thanks,
C.
Quoted 94 lines
hw/fsi/lbus.c new file +15
-0+} + +static const TypeInfo lbus_info = { + .name = TYPE_FSI_LBUS, + .parent = TYPE_BUS, + .instance_init = lbus_init, + .instance_size = sizeof(FSILBus), +}; + +static Property lbus_device_props[] = { + DEFINE_PROP_UINT32("address", FSILBusDevice, address, 0), + DEFINE_PROP_END_OF_LIST(), +}; + +DeviceState *lbus_create_device(FSILBus *bus, const char *type,
uint32_taddr)hw/fsi/lbus.c new file +40
-0+{ + DeviceState *ds; + BusState *state = BUS(bus); + FSILBusDevice *dev; + + ds = qdev_new(type); + qdev_prop_set_uint32(ds, "address", addr); + qdev_realize_and_unref(ds, state, &error_fatal); + + dev = FSI_LBUS_DEVICE(ds); + memory_region_add_subregion(&bus->mr, dev->address, + &dev->iomem); + + return ds; +} + +static void lbus_device_class_init (ObjectClass *klass,void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + + dc->bus_type = TYPE_FSI_LBUS; + device_class_set_props(dc, lbus_device_props); +} + +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 +0
-0@@ -9,6 +9,7 @@ source core/Kconfigsource 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/meson.build +1
-0@@ -44,6 +44,7 @@ subdir('virtio') subdir('watchdog') subdir('xen') subdir('xenpv') +subdir('fsi') subdir('alpha') subdir('arm')
PATCH v7 2/10 hw/fsi: Introduce IBM's scratchpad
In reply to Ninad PalsuleThis is a part of patchset where scratchpad is introduced.
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.
In this model, The LBUS device is parent for the scratchpad.
---
v2:
- Incorporated Joel's review comments.
v5:
- Incorporated review comments by Cedric.
v6:
- Incorporated review comments by Daniel.
v7:
- Incorporated review comments by Philippe.
- Cleaned up unused bits.
--- meson.build | 1 + hw/fsi/trace.h | 1 + include/hw/fsi/engine-scratchpad.h | 27 +++++++++ include/hw/fsi/fsi.h | 16 +++++ hw/fsi/engine-scratchpad.c | 93 ++++++++++++++++++++++++++++++ hw/fsi/Kconfig | 4 ++ hw/fsi/meson.build | 1 + hw/fsi/trace-events | 2 + 8 files changed, 145 insertions(+) create mode 100644 hw/fsi/trace.h create mode 100644 include/hw/fsi/engine-scratchpad.h create mode 100644 include/hw/fsi/fsi.h create mode 100644 hw/fsi/engine-scratchpad.c create mode 100644 hw/fsi/trace-events
meson.build +1 -0
@@ -3257,6 +3257,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/engine-scratchpad.h new file +27 -0
@@ -0,0 +1,27 @@ +/* +* SPDX-License-Identifier: GPL-2.0-or-later +* Copyright (C) 2023 IBM Corp. +* +* IBM scratchpad engne +*/ +#ifndef FSI_ENGINE_SCRATCHPAD_H +#define FSI_ENGINE_SCRATCHPAD_H + +#include "hw/fsi/lbus.h" +#include "hw/fsi/fsi.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 TYPE_FSI_SCRATCHPAD "fsi.scratchpad" +#define SCRATCHPAD (obj) OBJECT_CHECK(FSIScratchPad, (obj), TYPE_FSI_SCRATCHPAD) + +typedef struct FSIScratchPad { +FSILBusDevice parent; + +uint32_t reg; +}FSIScratchPad ; + +#endif /* FSI_ENGINE_SCRATCHPAD_H */
include/hw/fsi/fsi.h new file +16 -0
@@ -0,0 +1,16 @@ +/* +* 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 "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)) + +#endif
hw/fsi/engine-scratchpad.c new file +93 -0
93 lines not on this page · raw message
hw/fsi/Kconfig +4 -0
@@ -1,2 +1,6 @@ +config FSI_SCRATCHPAD + bool + select FSI_LBUS + 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_SCRATCHPAD', if_true: files('engine-scratchpad.c'))
hw/fsi/trace-events new file +2 -0
@@ -0,0 +1,2 @@ +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
Signature · 1 line
2.39.2
Re: [PATCH v7 02/10] hw/fsi: Introduce IBM's scratchpad
Quoted 42 lines · Ninad Palsule
This is a part of patchset where scratchpad is introduced.
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.
In this model, The LBUS device is parent for the scratchpad.
Signed-off-by Andrew Jeffery <[email protected]>Signed-off-by Ninad Palsule <[email protected]>---
v2:
- Incorporated Joel's review comments.
v5:
- Incorporated review comments by Cedric.
v6:
- Incorporated review comments by Daniel.
v7:
- Incorporated review comments by Philippe.
- Cleaned up unused bits.--- meson.build | 1 + hw/fsi/trace.h | 1 + include/hw/fsi/engine-scratchpad.h | 27 +++++++++ include/hw/fsi/fsi.h | 16 +++++ hw/fsi/engine-scratchpad.c | 93 ++++++++++++++++++++++++++++++ hw/fsi/Kconfig | 4 ++ hw/fsi/meson.build | 1 + hw/fsi/trace-events | 2 + 8 files changed, 145 insertions(+)create mode 100644
hw/fsi/trace.h
create mode 100644include/hw/fsi/engine-scratchpad.hcreate mode 100644include/hw/fsi/fsi.hcreate mode 100644hw/fsi/engine-scratchpad.ccreate mode 100644 hw/fsi/trace-eventsmeson.build +0
-0
meson.build if have_system · line 3260
Quoted 4 lines
meson.build +1
-0@@ -3257,6 +3257,7 @@ if have_system 'hw/char', 'hw/display', 'hw/dma', + 'hw/fsi',
This should be introduced in the first patch.
include/hw/fsi/engine-scratchpad.h
Quoted 15 lines
meson.build +0
-0'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/engine-scratchpad.h new file +0
-0
This model is introduced to early please drop from this patch.
Quoted 37 lines
include/hw/fsi/engine-scratchpad.h new file +27
-0@@ -0,0 +1,27 @@ +/* +* SPDX-License-Identifier: GPL-2.0-or-later +* Copyright (C) 2023 IBM Corp. +* +* IBM scratchpad engne +*/ +#ifndef FSI_ENGINE_SCRATCHPAD_H +#define FSI_ENGINE_SCRATCHPAD_H + +#include "hw/fsi/lbus.h" +#include "hw/fsi/fsi.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 TYPE_FSI_SCRATCHPAD "fsi.scratchpad" +#define SCRATCHPAD (obj) OBJECT_CHECK(FSIScratchPad, (obj), TYPE_FSI_SCRATCHPAD) + +typedef struct FSIScratchPad { +FSILBusDevice parent; + +uint32_t reg; +}FSIScratchPad ; + +#endif /* FSI_ENGINE_SCRATCHPAD_H */ include/hw/fsi/fsi.h new file +3
-0@@ -0,0 +1,16 @@ +/* +* SPDX-License-Identifier: GPL-2.0-or-later +* Copyright (C) 2023 IBM Corp.
include/hw/fsi/fsi.h line 13
Quoted 10 lines
include/hw/fsi/fsi.h new file +10
-0+* +* IBM Flexible Service Interface +*/ +#ifndef FSI_FSI_H +#define FSI_FSI_H + +#include "qemu/bitops.h" + +/* Bitwise operations at the word level. */ +#define BE_BIT (x) BIT(31 - (x))
31 ? BITS_PER_LONG would be better I think.
hw/fsi/engine-scratchpad.c
Quoted 8 lines
include/hw/fsi/fsi.h new file +3
-0+#define BE_GENMASK (hb, lb) MAKE_64BIT_MASK((lb), ((hb) - (lb) + 1)) + +#endif hw/fsi/engine-scratchpad.c new file +0
-0
DRop FSIScratchPad from this patch. It should be introduced later.
However, TYPE_FSI_BUS should be introcuded now because the following patch needs it.
Quoted 99 lines
hw/fsi/engine-scratchpad.c new file +93
-0@@ -0,0 +1,93 @@ +/* +* SPDX-License-Identifier: GPL-2.0-or-later +* Copyright (C) 2023 IBM Corp. +* +* IBM scratchpad engine +*/ + +#include "qemu/osdep.h" + +#include "qapi/error.h" +#include "qemu/log.h" +#include "trace.h" + +#include "hw/fsi/engine-scratchpad.h" + +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); + +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 ; +} + +static void fsi_scratchpad_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); +FSILBusDeviceClass *ldc =FSI_LBUS_DEVICE_CLASS (klass); + + 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 */ +} + +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_scratchpad_register_types (void ) +{ +type_register_static (&fsi_scratchpad_info); +} + +type_init (fsi_scratchpad_register_types);hw/fsi/Kconfig +0
-0
hw/fsi/Kconfig line 6
Quoted 6 lines
hw/fsi/Kconfig +4
-0@@ -1,2 +1,6 @@ +config FSI_SCRATCHPAD + bool + select FSI_LBUS + config FSI_LBUS bool
I am not sure we need all this config option. We will see that at the end when the models are ready.
Thanks,
C.
Quoted 15 lines
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_SCRATCHPAD', if_true: files('engine-scratchpad.c'))hw/fsi/trace-events new file +2
-0@@ -0,0 +1,2 @@ +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
Re: [PATCH v7 02/10] hw/fsi: Introduce IBM's scratchpad
Hello Cedric,
Quoted 38 lines · Cédric Le Goater
Quoted 37 lines · Ninad Palsule
This is a part of patchset where scratchpad is introduced.
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.
In this model, The LBUS device is parent for the scratchpad.
Signed-off-by Andrew Jeffery <[email protected]>Signed-off-by Ninad Palsule <[email protected]>---
v2:
- Incorporated Joel's review comments.
v5:
- Incorporated review comments by Cedric.
v6:
- Incorporated review comments by Daniel.
v7:
- Incorporated review comments by Philippe.
- Cleaned up unused bits.
---
meson.build | 1 +
hw/fsi/trace.h | 1 +include/hw/fsi/engine-scratchpad.h| 27 +++++++++ include/hw/fsi/fsi.h | 16 +++++ hw/fsi/engine-scratchpad.c | 93 ++++++++++++++++++++++++++++++ hw/fsi/Kconfig | 4 ++ hw/fsi/meson.build | 1 + hw/fsi/trace-events | 2 +8 files changed, 145 insertions(+)create mode 100644
hw/fsi/trace.h
create mode 100644include/hw/fsi/engine-scratchpad.hcreate mode 100644include/hw/fsi/fsi.hcreate mode 100644hw/fsi/engine-scratchpad.ccreate mode 100644 hw/fsi/trace-events
Quoted 11 lines
meson.build if have_system · line 3260
Quoted 9 lines
meson.build +1
-0@@ -3257,6 +3257,7 @@ if have_system 'hw/char', 'hw/display', 'hw/dma', + 'hw/fsi',This should be introduced in the first patch.
ok, Thanks for fixing it.
Quoted 10 lines
Quoted 10 lines
meson.build +0
-0'hw/hyperv', 'hw/i2c', 'hw/i386',hw/fsi/trace.h new file +0
-0@@ -0,0 +1 @@
Quoted 8 lines
include/hw/fsi/engine-scratchpad.h
Quoted 6 lines
hw/fsi/trace.h new file +1
-0+#include "trace/trace-hw_fsi.h" include/hw/fsi/engine-scratchpad.h new file +0
-0This model is introduced to early please drop from this patch.
ok, Thanks for fixing it. We should update the commit message. I will send it.
Quoted 63 lines
Quoted 39 lines
include/hw/fsi/engine-scratchpad.h new file +19
-0@@ -0,0 +1,27 @@ +/* +* SPDX-License-Identifier: GPL-2.0-or-later +* Copyright (C) 2023 IBM Corp. +* +* IBM scratchpad engne +*/ +#ifndef FSI_ENGINE_SCRATCHPAD_H +#define FSI_ENGINE_SCRATCHPAD_H + +#include "hw/fsi/lbus.h" +#include "hw/fsi/fsi.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 TYPE_FSI_SCRATCHPAD "fsi.scratchpad" +#define SCRATCHPAD (obj) OBJECT_CHECK(FSIScratchPad, (obj),
TYPE_FSI_SCRATCHPAD)include/hw/fsi/engine-scratchpad.h new file +8
-0+ +typedef struct FSIScratchPad { + FSILBusDevice parent; + + uint32_t reg; +}FSIScratchPad ; + +#endif /* FSI_ENGINE_SCRATCHPAD_H */ include/hw/fsi/fsi.h new file +3
-0@@ -0,0 +1,16 @@ +/* +* SPDX-License-Identifier: GPL-2.0-or-later +* Copyright (C) 2023 IBM Corp. include/hw/fsi/fsi.h line 13
Quoted 10 lines
include/hw/fsi/fsi.h new file +10
-0+* +* IBM Flexible Service Interface +*/ +#ifndef FSI_FSI_H +#define FSI_FSI_H + +#include "qemu/bitops.h" + +/* Bitwise operations at the word level. */ +#define BE_BIT (x) BIT(31 - (x))31 ?
BITS_PER_LONGwould be better I think.hw/fsi/engine-scratchpad.c
Quoted 8 lines
include/hw/fsi/fsi.h new file +3
-0+#define BE_GENMASK (hb, lb) MAKE_64BIT_MASK((lb), ((hb) - (lb) + 1)) + +#endif hw/fsi/engine-scratchpad.c new file +0
-0DRop FSIScratchPad from this patch. It should be introduced later.
Quoted 2 lines
However,
TYPE_FSI_BUSshould be introcuded now because the following patch needs it.
ok, The scratpad is a engine/device which is attached to the LBUS hence it was introduced early. But I am fine with the change. Thanks for the change.
Quoted 105 lines
Quoted 105 lines
hw/fsi/engine-scratchpad.c new file +16
-0@@ -0,0 +1,93 @@ +/* +* SPDX-License-Identifier: GPL-2.0-or-later +* Copyright (C) 2023 IBM Corp. +* +* IBM scratchpad engine +*/ + +#include "qemu/osdep.h" + +#include "qapi/error.h" +#include "qemu/log.h" +#include "trace.h" + +#include "hw/fsi/engine-scratchpad.h" + +static uint64_t fsi_scratchpad_read(void *opaque, hwaddr addr,unsigned size)
hw/fsi/engine-scratchpad.c new file +13
-0+{ + 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_tdata,
+ unsigned size)hw/fsi/engine-scratchpad.c new file +63
-0+{ + 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); + + 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; +} + +static void fsi_scratchpad_class_init (ObjectClass *klass,void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + FSILBusDeviceClass *ldc = FSI_LBUS_DEVICE_CLASS(klass); + + 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 */ +} + +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_scratchpad_register_types (void ) +{ + type_register_static(&fsi_scratchpad_info); +} + +type_init (fsi_scratchpad_register_types);hw/fsi/Kconfig +2
-0@@ -1,2 +1,6 @@ +config FSI_SCRATCHPAD + bool
Quoted 8 lines
Quoted 4 lines
hw/fsi/Kconfig +2
-0+ select FSI_LBUS +config
FSI_LBUS
boolI am not sure we need all this config option. We will see that at the end when the models are ready.
OK
Thanks for the review.
Regards,
Ninad
Quoted 27 lines
Thanks,
C.
Quoted 18 lines
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_SCRATCHPAD', if_true:files('engine-scratchpad.c'))
hw/fsi/trace-events new file +1
-0@@ -0,0 +1,2 @@ +fsi_scratchpad_read(uint64_t addr, uint32_t size) "@0x%" PRIx64 "size=%d"
+fsi_scratchpad_write(uint64_t addr,uint32_tsize,uint64_tdata) "@0x%" PRIx64 " size=%d value=0x%"PRIx64
PATCH v7 3/10 hw/fsi: Introduce IBM's cfam,fsi-slave
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.
---
v2:
- Incorporated Joel's review comments.
v3:
- Incorporated Thomas Huth's review comments.
v5:
- Incorporated review comments by Cedric.
v6:
- Incorporated review comments by Cedric & Daniel
--- include/hw/fsi/cfam.h | 34 ++++++++ include/hw/fsi/fsi-slave.h | 29 +++++++ include/hw/fsi/fsi.h | 20 +++++ hw/fsi/cfam.c | 173 +++++++++++++++++++++++++++++++++++++ hw/fsi/fsi-slave.c | 78 +++++++++++++++++ hw/fsi/Kconfig | 9 ++ hw/fsi/meson.build | 2 + hw/fsi/trace-events | 7 ++ 8 files changed, 352 insertions(+) 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 +34 -0
@@ -0,0 +1,34 @@ +/* +* 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_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; +}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 +20 -0
@@ -8,9 +8,29 @@#define FSI_FSI_H #include "qemu/bitops.h" +#include "hw/qdev-core.h" + +/* +* TODO: Maybe unwind this dependency with const links? Store a +* pointer in FSIBus? +*/ +#include "hw/fsi/cfam.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 ) + +/* TODO: Figure out what's best with a point-to-point bus */ +typedef struct FSISlaveState FSISlaveState ; + +typedef struct FSIBus { +BusState bus; + +/* XXX: It's point-to-point, just instantiate the slave directly for now */ +FSICFAMState slave; +}FSIBus ; +#endif
hw/fsi/cfam.c new file +173 -0
173 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 +9 -0
@@ -1,3 +1,12 @@ +config FSI_CFAM + bool + select FSI + select FSI_SCRATCHPAD + select FSI_LBUS + +config FSI + bool + config FSI_SCRATCHPAD bool select FSI_LBUS
hw/fsi/meson.build +2 -0
@@ -1,2 +1,4 @@ system_ss.add(when: 'CONFIG_FSI_LBUS', if_true: files('lbus.c')) system_ss.add(when: 'CONFIG_FSI_SCRATCHPAD', if_true: files('engine-scratchpad.c')) +system_ss.add(when: 'CONFIG_FSI_CFAM', if_true: files('cfam.c')) +system_ss.add(when: 'CONFIG_FSI', if_true: files('fsi-slave.c'))
hw/fsi/trace-events +7 -0
@@ -1,2 +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 v7 03/10] hw/fsi: Introduce IBM's cfam,fsi-slave
Quoted 49 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.
Signed-off-by Andrew Jeffery <[email protected]>Signed-off-by Ninad Palsule <[email protected]>---
v2:
- Incorporated Joel's review comments.
v3:
- Incorporated Thomas Huth's review comments.
v5:
- Incorporated review comments by Cedric.
v6:
- Incorporated review comments by Cedric & Daniel--- include/hw/fsi/cfam.h | 34 ++++++++ include/hw/fsi/fsi-slave.h | 29 +++++++ include/hw/fsi/fsi.h | 20 +++++ hw/fsi/cfam.c | 173 +++++++++++++++++++++++++++++++++++++ hw/fsi/fsi-slave.c | 78 +++++++++++++++++ hw/fsi/Kconfig | 9 ++ hw/fsi/meson.build | 2 + hw/fsi/trace-events | 7 ++ 8 files changed, 352 insertions(+)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 +3
-0@@ -0,0 +1,34 @@ +/* +* SPDX-License-Identifier: GPL-2.0-or-later +* Copyright (C) 2023 IBM Corp.
include/hw/fsi/cfam.h line 13
Quoted 10 lines
include/hw/fsi/cfam.h new file +10
-0+* +* 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"
Please include here the FSIScratchPad definitions. There is no need for an extra file since the object is only used under FSICFAMState.
Quoted 8 lines
include/hw/fsi/cfam.h new file +8
-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 {
include/hw/fsi/cfam.h line 31
Quoted 10 lines
include/hw/fsi/cfam.h new file +10
-0+/* < private > */ +FSISlaveState parent; + +/* CFAM config address space */ +MemoryRegion config_iomem; + +MemoryRegion mr; +AddressSpace as; + +FSILBus lbus;
Please add :
FSIScratchPad scratchpad;
Quoted 59 lines
include/hw/fsi/cfam.h new file +3
-0+} 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 +8
-0@@ -8,9 +8,29 @@#define FSI_FSI_H #include "qemu/bitops.h" +#include "hw/qdev-core.h" + +/* +* TODO: Maybe unwind this dependency with const links? Store a +* pointer in FSIBus? +*/ +#include "hw/fsi/cfam.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"
include/hw/fsi/fsi.h line 33
Quoted 10 lines
include/hw/fsi/fsi.h +10
-0+OBJECT_DECLARE_SIMPLE_TYPE (FSIBus,FSI_BUS ) + +/* TODO: Figure out what's best with a point-to-point bus */ +typedef struct FSISlaveState FSISlaveState ; + +typedef struct FSIBus { + BusState bus; + + /* XXX: It's point-to-point, just instantiate the slave directly for now */ + FSICFAMState slave;
Drop the FSICFAMState from FSIBus and introduce FSIBus in the previous patch.
Quoted 122 lines
include/hw/fsi/fsi.h +2
-0+} FSIBus; +#endif hw/fsi/cfam.c new file +113
-0@@ -0,0 +1,173 @@ +/* +* 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/fsi/engine-scratchpad.h" + +#include "hw/qdev-properties.h" + +#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 */ +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 */ +break ; +default : +/* The config table contains different engines from 0xc onwards. */ + i =0xc ; + QTAILQ_FOREACH(kid, &cfam->lbus.bus.children, sibling) { +if (i == addr) { +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 ; + } + +/* +* 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 ; + } +} + +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 : +if (data ==CFAM_CONFIG_CHIP_ID_BREAK ) { +bus_cold_reset (BUS (&cfam->lbus)); + } +break ; +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,
hw/fsi/cfam.c line 123
Quoted 10 lines
hw/fsi/cfam.c new file +10
-0+ 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 , +};
Please introduce a instance_init() handler please to initialize the scratchpad object.
Quoted 17 lines
hw/fsi/cfam.c new file +17
-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); + address_space_init(&cfam->as, &cfam->mr, TYPE_FSI_CFAM); + + qbus_init(&cfam->lbus, sizeof(cfam->lbus), TYPE_FSI_LBUS, + DEVICE(cfam), NULL); + + memory_region_init_io(&cfam->config_iomem, OBJECT(cfam), &cfam_config_ops, + cfam, TYPE_FSI_CFAM, 0x400); + + if (!object_property_set_bool(OBJECT(&cfam->lbus), "realized", true,
hw/fsi/cfam.c line 151
Quoted 10 lines
hw/fsi/cfam.c new file +10
-0+ errp)) { +return ; + } + +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 */ +lbus_create_device (&cfam->lbus,TYPE_FSI_SCRATCHPAD ,0 );
the scratchpad object should be realized here with qdev_realize_and_unref() and its FSILBusDevice region mapped under lbus.mr at 0x0
Quoted 5 lines
hw/fsi/cfam.c new file +5
-0+} + +static void fsi_cfam_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass);
hw/fsi/cfam.c line 166
Quoted 10 lines
hw/fsi/cfam.c new file +10
-0+ 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_size =sizeof (FSICFAMState), + .class_init = fsi_cfam_class_init, +};
Please add the scratchpad implementation here.
Thanks,
C.
Quoted 130 lines
hw/fsi/cfam.c new file +6
-0+static void fsi_cfam_register_types (void ) +{ +type_register_static (&fsi_cfam_info); +} + +type_init (fsi_cfam_register_types);hw/fsi/fsi-slave.c new file +78
-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" + +#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)) { +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_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)) { +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, + .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 ); +} + +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 +9
-0@@ -1,3 +1,12 @@ +config FSI_CFAM + bool + select FSI + select FSI_SCRATCHPAD + select FSI_LBUS + +config FSI + bool + config FSI_SCRATCHPAD bool select FSI_LBUShw/fsi/meson.build +2
-0@@ -1,2 +1,4 @@ system_ss.add(when: 'CONFIG_FSI_LBUS', if_true: files('lbus.c')) system_ss.add(when: 'CONFIG_FSI_SCRATCHPAD', if_true: files('engine-scratchpad.c')) +system_ss.add(when: 'CONFIG_FSI_CFAM', if_true: files('cfam.c')) +system_ss.add(when: 'CONFIG_FSI', if_true: files('fsi-slave.c'))hw/fsi/trace-events +7
-0@@ -1,2 +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 v7 03/10] hw/fsi: Introduce IBM's cfam,fsi-slave
Hello Cedric,
Quoted 56 lines · Cédric Le Goater
Quoted 55 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.
Signed-off-by Andrew Jeffery <[email protected]>Signed-off-by Ninad Palsule <[email protected]>---
v2:
- Incorporated Joel's review comments.
v3:
- Incorporated Thomas Huth's review comments.
v5:
- Incorporated review comments by Cedric.
v6:
- Incorporated review comments by Cedric & Daniel
---
include/hw/fsi/cfam.h | 34 ++++++++include/hw/fsi/fsi-slave.h| 29 +++++++ include/hw/fsi/fsi.h | 20 +++++
hw/fsi/cfam.c | 173 +++++++++++++++++++++++++++++++++++++ hw/fsi/fsi-slave.c | 78 +++++++++++++++++ hw/fsi/Kconfig | 9 ++
hw/fsi/meson.build | 2 +
hw/fsi/trace-events | 7 ++8 files changed, 352 insertions(+)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 +9
-0@@ -0,0 +1,34 @@ +/* +* 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 +
Quoted 8 lines
include/hw/fsi/cfam.h line 13
Quoted 4 lines
include/hw/fsi/cfam.h new file +4
-0+#include "exec/memory.h" + +#include "hw/fsi/fsi-slave.h" +#include "hw/fsi/lbus.h" Please include here the FSIScratchPad definitions. There is no need for an extra file since the object is only used under FSICFAMState.
Make sense. Thanks for the change.
Quoted 23 lines
Quoted 10 lines
include/hw/fsi/cfam.h new file +8
-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 {include/hw/fsi/cfam.h line 31
Quoted 10 lines
include/hw/fsi/cfam.h new file +10
-0+ /* < private > */ + FSISlaveState parent; + + /* CFAM config address space */ + MemoryRegion config_iomem; + + MemoryRegion mr; + AddressSpace as; + + FSILBus lbus;Please add :
Quoted 1 line
FSIScratchPad scratchpad;
Scratch pad is device and It is attached to the LBUS but I am fine with the change. Thanks.
Quoted 63 lines
Quoted 63 lines
include/hw/fsi/cfam.h new file +3
-0+} 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 +7
-0@@ -8,9 +8,29 @@ #define FSI_FSI_H #include "qemu/bitops.h" +#include "hw/qdev-core.h" + +/* +* TODO: Maybe unwind this dependency with const links? Store a +* pointer in FSIBus? +*/ +#include "hw/fsi/cfam.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"include/hw/fsi/fsi.h +6
-0+OBJECT_DECLARE_SIMPLE_TYPE (FSIBus,FSI_BUS ) + +/* TODO: Figure out what's best with a point-to-point bus */ +typedef struct FSISlaveState FSISlaveState ; + +typedef struct FSIBus {
Quoted 8 lines
Quoted 5 lines
+ BusState bus;
+
+ /* XXX: It's point-to-point, just instantiate the slave directly for now */
+ FSICFAMState slave;Drop the FSICFAMState from FSIBus and introduce FSIBus in the previous patch.
Thanks for the change.
Quoted 133 lines
Quoted 133 lines
include/hw/fsi/fsi.h +2
-0+} FSIBus; +#endif
hw/fsi/cfam.c new file +27
-0@@ -0,0 +1,173 @@ +/* +* 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/fsi/engine-scratchpad.h" + +#include "hw/qdev-properties.h" + +#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)
hw/fsi/cfam.c new file +25
-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 */ + case 0x08: + return ENGINE_CONFIG_NEXT | /* valid */ + 0x00010000 | /* slots */ + 0x00005000 | /* version */ + ENGINE_CONFIG_TYPE_FSI | /* type */ + 0x0000000a; /* crc */ + break; + default: + /* The config table contains different engines from 0xconwards. */
+ i =0xc;
+QTAILQ_FOREACH(kid, &cfam->lbus.bus.children, sibling){ + if (i == addr) {
+ DeviceState *ds =kid->child;
+ FSILBusDevice *dev =FSI_LBUS_DEVICE(ds); + return FSI_LBUS_DEVICE_GET_CLASS(dev)->config; + }
+ i += size;
+ }hw/fsi/cfam.c new file +7
-0+ + if (i == addr) { + return 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.
+ */
+ returnCFAM_CONFIG_CHIP_ID_BREAK;
+ }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 +41
-0+{ + 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: + if (data == CFAM_CONFIG_CHIP_ID_BREAK) { + bus_cold_reset(BUS(&cfam->lbus)); + } + break; + 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); +} +
Quoted 8 lines
hw/fsi/cfam.c line 123
Quoted 5 lines
hw/fsi/cfam.c new file +5
-0+static const struct MemoryRegionOps fsi_cfam_unimplemented_ops = { + .read = fsi_cfam_unimplemented_read, + .write = fsi_cfam_unimplemented_write, + .endianness = DEVICE_BIG_ENDIAN, +};Please introduce a
instance_init()handler please to initialize the scratchpad object.
ok, Thanks for the change.
Quoted 27 lines
Quoted 27 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); +address_space_init(&cfam->as, &cfam->mr, TYPE_FSI_CFAM);hw/fsi/cfam.c new file +5
-0+ + qbus_init(&cfam->lbus, sizeof(cfam->lbus), TYPE_FSI_LBUS, + DEVICE(cfam), NULL); + + memory_region_init_io(&cfam->config_iomem, OBJECT(cfam),
&cfam_config_ops,
+ cfam,TYPE_FSI_CFAM,0x400);
+
+ if (!object_property_set_bool(OBJECT(&cfam->lbus), "realized", true,
+ errp)) {
+ return;
+ }
+
+memory_region_add_subregion(&cfam->mr, 0, &cfam->config_iomem);
Quoted 8 lines
Quoted 5 lines
+
memory_region_add_subregion(&cfam->mr, 0x800, &slave->iomem); +memory_region_add_subregion(&cfam->mr, 0xc00, &cfam->lbus.mr); +
+ /* Add scratchpad engine */
+lbus_create_device(&cfam->lbus, TYPE_FSI_SCRATCHPAD, 0);the scratchpad object should be realized here with
qdev_realize_and_unref()and its FSILBusDevice region mapped under lbus.mr at0x0
ok, Thanks for the change.
Quoted 10 lines
Quoted 10 lines
hw/fsi/cfam.c new file +9
-0+} + +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; +} +
Quoted 8 lines
hw/fsi/cfam.c line 166
Quoted 6 lines
hw/fsi/cfam.c new file +6
-0+static const TypeInfo fsi_cfam_info = { + .name = TYPE_FSI_CFAM, + .parent = TYPE_FSI_SLAVE, + .instance_size = sizeof(FSICFAMState), + .class_init = fsi_cfam_class_init, +};Please add the scratchpad implementation here.
Thanks for the change.
Thanks for the review. I will update the commit message.
Regards,
Ninad
Quoted 149 lines
Thanks,
C.
Quoted 139 lines
hw/fsi/cfam.c new file +6
-0+static void fsi_cfam_register_types (void ) +{ + type_register_static(&fsi_cfam_info); +} + +type_init (fsi_cfam_register_types);hw/fsi/fsi-slave.c new file +19
-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" + +#define TO_REG (x) ((x) >> 2) + +static uint64_t fsi_slave_read(void *opaque, hwaddr addr, unsignedsize)
hw/fsi/fsi-slave.c new file +8
-0+{ + FSISlaveState *s = FSI_SLAVE(opaque); + + trace_fsi_slave_read(addr, size); + + if (addr + size > sizeof(s->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/fsi-slave.c new file +14
-0+ + return s->regs[TO_REG(addr)]; +} + +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)) { + qemu_log_mask(LOG_GUEST_ERROR, + "%s: Out of bounds write: 0x%"HWADDR_PRIx" for%u\n",
+__func__, addr, size);
+ return;
+ }hw/fsi/fsi-slave.c new file +31
-0+ + s->regs[TO_REG(addr)] = data; +} + +static const struct MemoryRegionOps fsi_slave_ops = { + .read = fsi_slave_read, + .write = fsi_slave_write, + .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); +} + +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 +9
-0@@ -1,3 +1,12 @@ +config FSI_CFAM + bool + select FSI + select FSI_SCRATCHPAD + select FSI_LBUS + +config FSI + bool +config
FSI_SCRATCHPAD
bool
selectFSI_LBUShw/fsi/meson.build +2
-0@@ -1,2 +1,4 @@ system_ss.add(when: 'CONFIG_FSI_LBUS', if_true: files('lbus.c')) system_ss.add(when: 'CONFIG_FSI_SCRATCHPAD', if_true: files('engine-scratchpad.c')) +system_ss.add(when: 'CONFIG_FSI_CFAM', if_true: files('cfam.c')) +system_ss.add(when: 'CONFIG_FSI', if_true: files('fsi-slave.c'))hw/fsi/trace-events +0
-0@@ -1,2 +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_tsize) "@0x%" PRIx64 "
size=%d"
+fsi_cfam_config_write(uint64_t addr,uint32_tsize,uint64_tdata)
"@0x%" PRIx64 " size=%d value=0x%"PRIx64
+fsi_cfam_unimplemented_read(uint64_t addr,uint32_tsize) "@0x%"
PRIx64 " size=%d"
+fsi_cfam_unimplemented_write(uint64_t addr,uint32_tsize,uint64_t
data) "@0x%" PRIx64 " size=%d value=0x%"PRIx64
+fsi_cfam_config_write_noaddr(uint64_t addr,uint32_tsize,uint64_t
data) "@0x%" PRIx64 " size=%d value=0x%"PRIx64hw/fsi/trace-events +2
-0+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 v7 03/10] hw/fsi: Introduce IBM's cfam,fsi-slave
In reply to Ninad PalsuleQuoted 296 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.
Signed-off-by Andrew Jeffery <[email protected]>Signed-off-by Ninad Palsule <[email protected]>---
v2:
- Incorporated Joel's review comments.
v3:
- Incorporated Thomas Huth's review comments.
v5:
- Incorporated review comments by Cedric.
v6:
- Incorporated review comments by Cedric & Daniel--- include/hw/fsi/cfam.h | 34 ++++++++ include/hw/fsi/fsi-slave.h | 29 +++++++ include/hw/fsi/fsi.h | 20 +++++ hw/fsi/cfam.c | 173 +++++++++++++++++++++++++++++++++++++ hw/fsi/fsi-slave.c | 78 +++++++++++++++++ hw/fsi/Kconfig | 9 ++ hw/fsi/meson.build | 2 + hw/fsi/trace-events | 7 ++ 8 files changed, 352 insertions(+)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 +34
-0@@ -0,0 +1,34 @@ +/* +* 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_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; +}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 +20
-0@@ -8,9 +8,29 @@#define FSI_FSI_H #include "qemu/bitops.h" +#include "hw/qdev-core.h" + +/* +* TODO: Maybe unwind this dependency with const links? Store a +* pointer in FSIBus? +*/ +#include "hw/fsi/cfam.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 ) + +/* TODO: Figure out what's best with a point-to-point bus */ +typedef struct FSISlaveState FSISlaveState ; + +typedef struct FSIBus { +BusState bus; + +/* XXX: It's point-to-point, just instantiate the slave directly for now */ +FSICFAMState slave; +}FSIBus ; +#endif hw/fsi/cfam.c new file +141
-0@@ -0,0 +1,173 @@ +/* +* 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/fsi/engine-scratchpad.h" + +#include "hw/qdev-properties.h" + +#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 */ +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 */ +break ; +default : +/* The config table contains different engines from 0xc onwards. */ + i =0xc ; + QTAILQ_FOREACH(kid, &cfam->lbus.bus.children, sibling) { +if (i == addr) { +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 ; + } + +/* +* 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 ; + } +} + +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 : +if (data ==CFAM_CONFIG_CHIP_ID_BREAK ) { +bus_cold_reset (BUS (&cfam->lbus)); + } +break ; +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_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); + address_space_init(&cfam->as, &cfam->mr, TYPE_FSI_CFAM); + + qbus_init(&cfam->lbus, sizeof(cfam->lbus), TYPE_FSI_LBUS, + DEVICE(cfam), NULL); + + memory_region_init_io(&cfam->config_iomem, OBJECT(cfam), &cfam_config_ops, + cfam, TYPE_FSI_CFAM, 0x400); + + if (!object_property_set_bool(OBJECT(&cfam->lbus), "realized", true,
hw/fsi/cfam.c line 151
Quoted 10 lines
hw/fsi/cfam.c new file +10
-0+ errp)) { +return ; + } + +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 */ +lbus_create_device (&cfam->lbus,TYPE_FSI_SCRATCHPAD ,0 );
I am bit lost in the various mappings. Could you please provide more explanations ?
Thanks,
C.
Quoted 146 lines
hw/fsi/cfam.c new file +22
-0+} + +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_size =sizeof (FSICFAMState), + .class_init = fsi_cfam_class_init, +}; + +static void fsi_cfam_register_types (void ) +{ +type_register_static (&fsi_cfam_info); +} + +type_init (fsi_cfam_register_types);hw/fsi/fsi-slave.c new file +78
-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" + +#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)) { +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_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)) { +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, + .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 ); +} + +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 +9
-0@@ -1,3 +1,12 @@ +config FSI_CFAM + bool + select FSI + select FSI_SCRATCHPAD + select FSI_LBUS + +config FSI + bool + config FSI_SCRATCHPAD bool select FSI_LBUShw/fsi/meson.build +2
-0@@ -1,2 +1,4 @@ system_ss.add(when: 'CONFIG_FSI_LBUS', if_true: files('lbus.c')) system_ss.add(when: 'CONFIG_FSI_SCRATCHPAD', if_true: files('engine-scratchpad.c')) +system_ss.add(when: 'CONFIG_FSI_CFAM', if_true: files('cfam.c')) +system_ss.add(when: 'CONFIG_FSI', if_true: files('fsi-slave.c'))hw/fsi/trace-events +7
-0@@ -1,2 +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 v7 03/10] hw/fsi: Introduce IBM's cfam,fsi-slave
Hello Cedric,
Quoted 308 lines · Cédric Le Goater
Quoted 307 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.
Signed-off-by Andrew Jeffery <[email protected]>Signed-off-by Ninad Palsule <[email protected]>---
v2:
- Incorporated Joel's review comments.
v3:
- Incorporated Thomas Huth's review comments.
v5:
- Incorporated review comments by Cedric.
v6:
- Incorporated review comments by Cedric & Daniel
---
include/hw/fsi/cfam.h | 34 ++++++++include/hw/fsi/fsi-slave.h| 29 +++++++ include/hw/fsi/fsi.h | 20 +++++
hw/fsi/cfam.c | 173 +++++++++++++++++++++++++++++++++++++ hw/fsi/fsi-slave.c | 78 +++++++++++++++++ hw/fsi/Kconfig | 9 ++
hw/fsi/meson.build | 2 +
hw/fsi/trace-events | 7 ++8 files changed, 352 insertions(+)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 +34
-0@@ -0,0 +1,34 @@ +/* +* 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_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; +}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 +7
-0@@ -8,9 +8,29 @@ #define FSI_FSI_H #include "qemu/bitops.h" +#include "hw/qdev-core.h" + +/* +* TODO: Maybe unwind this dependency with const links? Store a +* pointer in FSIBus? +*/ +#include "hw/fsi/cfam.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"include/hw/fsi/fsi.h +9
-0+OBJECT_DECLARE_SIMPLE_TYPE (FSIBus,FSI_BUS ) + +/* TODO: Figure out what's best with a point-to-point bus */ +typedef struct FSISlaveState FSISlaveState ; + +typedef struct FSIBus { + BusState bus; + + /* XXX: It's point-to-point, just instantiate the slave directlyfor now */
+ FSICFAMState slave;include/hw/fsi/fsi.h +2
-0+} FSIBus; +#endif
hw/fsi/cfam.c new file +27
-0@@ -0,0 +1,173 @@ +/* +* 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/fsi/engine-scratchpad.h" + +#include "hw/qdev-properties.h" + +#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)
hw/fsi/cfam.c new file +25
-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 */ + case 0x08: + return ENGINE_CONFIG_NEXT | /* valid */ + 0x00010000 | /* slots */ + 0x00005000 | /* version */ + ENGINE_CONFIG_TYPE_FSI | /* type */ + 0x0000000a; /* crc */ + break; + default: + /* The config table contains different engines from 0xconwards. */
+ i =0xc;
+QTAILQ_FOREACH(kid, &cfam->lbus.bus.children, sibling){ + if (i == addr) {
+ DeviceState *ds =kid->child;
+ FSILBusDevice *dev =FSI_LBUS_DEVICE(ds); + return FSI_LBUS_DEVICE_GET_CLASS(dev)->config; + }
+ i += size;
+ }hw/fsi/cfam.c new file +7
-0+ + if (i == addr) { + return 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.
+ */
+ returnCFAM_CONFIG_CHIP_ID_BREAK;
+ }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 +54
-0+{ + 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: + if (data == CFAM_CONFIG_CHIP_ID_BREAK) { + bus_cold_reset(BUS(&cfam->lbus)); + } + break; + 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_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); +address_space_init(&cfam->as, &cfam->mr, TYPE_FSI_CFAM);hw/fsi/cfam.c new file +5
-0+ + qbus_init(&cfam->lbus, sizeof(cfam->lbus), TYPE_FSI_LBUS, + DEVICE(cfam), NULL); + + memory_region_init_io(&cfam->config_iomem, OBJECT(cfam),
&cfam_config_ops,
+ cfam,TYPE_FSI_CFAM,0x400);
+
+ if (!object_property_set_bool(OBJECT(&cfam->lbus), "realized", true,
+ errp)) {
+ return;
+ }
+
+memory_region_add_subregion(&cfam->mr, 0, &cfam->config_iomem);
Quoted 8 lines
Quoted 5 lines
+
memory_region_add_subregion(&cfam->mr, 0x800, &slave->iomem); +memory_region_add_subregion(&cfam->mr, 0xc00, &cfam->lbus.mr); +
+ /* Add scratchpad engine */
+lbus_create_device(&cfam->lbus, TYPE_FSI_SCRATCHPAD, 0);I am bit lost in the various mappings. Could you please provide more explanations ?
Please see the attached file.
Thanks for the review.
Regards,
Ninad
Quoted 163 lines
Thanks,
C.
Quoted 155 lines
hw/fsi/cfam.c new file +22
-0+} + +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_size = sizeof(FSICFAMState), + .class_init = fsi_cfam_class_init, +}; + +static void fsi_cfam_register_types (void ) +{ + type_register_static(&fsi_cfam_info); +} + +type_init (fsi_cfam_register_types);hw/fsi/fsi-slave.c new file +19
-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" + +#define TO_REG (x) ((x) >> 2) + +static uint64_t fsi_slave_read(void *opaque, hwaddr addr, unsignedsize)
hw/fsi/fsi-slave.c new file +8
-0+{ + FSISlaveState *s = FSI_SLAVE(opaque); + + trace_fsi_slave_read(addr, size); + + if (addr + size > sizeof(s->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/fsi-slave.c new file +14
-0+ + return s->regs[TO_REG(addr)]; +} + +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)) { + qemu_log_mask(LOG_GUEST_ERROR, + "%s: Out of bounds write: 0x%"HWADDR_PRIx" for%u\n",
+__func__, addr, size);
+ return;
+ }hw/fsi/fsi-slave.c new file +31
-0+ + s->regs[TO_REG(addr)] = data; +} + +static const struct MemoryRegionOps fsi_slave_ops = { + .read = fsi_slave_read, + .write = fsi_slave_write, + .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); +} + +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 +9
-0@@ -1,3 +1,12 @@ +config FSI_CFAM + bool + select FSI + select FSI_SCRATCHPAD + select FSI_LBUS + +config FSI + bool +config
FSI_SCRATCHPAD
bool
selectFSI_LBUShw/fsi/meson.build +2
-0@@ -1,2 +1,4 @@ system_ss.add(when: 'CONFIG_FSI_LBUS', if_true: files('lbus.c')) system_ss.add(when: 'CONFIG_FSI_SCRATCHPAD', if_true: files('engine-scratchpad.c')) +system_ss.add(when: 'CONFIG_FSI_CFAM', if_true: files('cfam.c')) +system_ss.add(when: 'CONFIG_FSI', if_true: files('fsi-slave.c'))hw/fsi/trace-events +0
-0@@ -1,2 +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_tsize) "@0x%" PRIx64 "
size=%d"
+fsi_cfam_config_write(uint64_t addr,uint32_tsize,uint64_tdata)
"@0x%" PRIx64 " size=%d value=0x%"PRIx64
+fsi_cfam_unimplemented_read(uint64_t addr,uint32_tsize) "@0x%"
PRIx64 " size=%d"
+fsi_cfam_unimplemented_write(uint64_t addr,uint32_tsize,uint64_t
data) "@0x%" PRIx64 " size=%d value=0x%"PRIx64
+fsi_cfam_config_write_noaddr(uint64_t addr,uint32_tsize,uint64_t
data) "@0x%" PRIx64 " size=%d value=0x%"PRIx64hw/fsi/trace-events +2
-0+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
PATCH v7 4/10 hw/fsi: Introduce IBM's FSI
In reply to Ninad PalsuleThis is a part of patchset where IBM's Flexible Service Interface is introduced.
This commit models the FSI bus. CFAM is hanging out of FSI bus. The bus is model such a way that it is embedded inside the 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.
---
v2:
- Incorporated review comments by Joel
v5:
- Incorporated review comments by Cedric.
v6:
- Incorporated review comments by Cedric & Daniel
v7:
- Cleaned up unused bits.
--- include/hw/fsi/fsi-master.h | 30 +++++++ hw/fsi/fsi-master.c | 162 ++++++++++++++++++++++++++++++++++++ hw/fsi/fsi.c | 25 ++++++ hw/fsi/meson.build | 2 +- hw/fsi/trace-events | 2 + 5 files changed, 220 insertions(+), 1 deletion(-) create mode 100644 include/hw/fsi/fsi-master.h create mode 100644 hw/fsi/fsi-master.c create mode 100644 hw/fsi/fsi.c
include/hw/fsi/fsi-master.h new file +30 -0
@@ -0,0 +1,30 @@ +/* +* 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" + +#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 ]; +}FSIMasterState ; + + +#endif /* FSI_FSI_H */
hw/fsi/fsi-master.c new file +162 -0
162 lines not on this page · raw message
hw/fsi/fsi.c new file +25 -0
@@ -0,0 +1,25 @@ +/* +* SPDX-License-Identifier: GPL-2.0-or-later +* Copyright (C) 2023 IBM Corp. +* +* IBM Flexible Service Interface +*/ +#include "qemu/osdep.h" + +#include "qapi/error.h" + +#include "hw/fsi/fsi.h" +#include "hw/fsi/cfam.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/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_SCRATCHPAD', if_true: files('engine-scratchpad.c')) system_ss.add(when: 'CONFIG_FSI_CFAM', if_true: files('cfam.c')) -system_ss.add(when: 'CONFIG_FSI', if_true: files('fsi-slave.c')) +system_ss.add(when: 'CONFIG_FSI', if_true: files('fsi.c','fsi-master.c','fsi-slave.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 v7 04/10] hw/fsi: Introduce IBM's FSI
Quoted 57 lines · Ninad Palsule
This is a part of patchset where IBM's Flexible Service Interface is introduced.
This commit models the FSI bus. CFAM is hanging out of FSI bus. The bus is model such a way that it is embedded inside the 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]>---
v2:
- Incorporated review comments by Joel
v5:
- Incorporated review comments by Cedric.
v6:
- Incorporated review comments by Cedric & Daniel
v7:
- Cleaned up unused bits.--- include/hw/fsi/fsi-master.h | 30 +++++++ hw/fsi/fsi-master.c | 162 ++++++++++++++++++++++++++++++++++++ hw/fsi/fsi.c | 25 ++++++ hw/fsi/meson.build | 2 +- hw/fsi/trace-events | 2 + 5 files changed, 220 insertions(+), 1 deletion(-)create mode 100644
include/hw/fsi/fsi-master.h
create mode 100644hw/fsi/fsi-master.c
create mode 100644hw/fsi/fsi.cinclude/hw/fsi/fsi-master.h new file +16
-0@@ -0,0 +1,30 @@ +/* +* 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" + +#define TYPE_FSI_MASTER "fsi.master" +OBJECT_DECLARE_SIMPLE_TYPE (FSIMasterState,FSI_MASTER ) +
include/hw/fsi/fsi-master.h line 26
Quoted 10 lines
include/hw/fsi/fsi-master.h new file +10
-0+#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];
Move FSICFAMState here.
Quoted 107 lines
include/hw/fsi/fsi-master.h new file +4
-0+} FSIMasterState; + + +#endif /* FSI_FSI_H */ hw/fsi/fsi-master.c new file +97
-0@@ -0,0 +1,162 @@ +/* +* 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) +#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)) { +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 ;
hw/fsi/fsi-master.c line 107
Quoted 10 lines
hw/fsi/fsi-master.c new file +10
-0+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 , +};
Add a instance_init handler to initialize the cfam object.
Quoted 11 lines
hw/fsi/fsi-master.c new file +11
-0+static void fsi_master_realize (DeviceState *dev,Error **errp) +{ +FSIMasterState *s =FSI_MASTER (dev); + +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 ); + +if (!object_property_set_bool (OBJECT (&s->bus),"realized" , true, errp)) {
hw/fsi/fsi-master.c line 129
Quoted 10 lines
hw/fsi/fsi-master.c new file +10
-0+return ; + } + +memory_region_add_subregion (&s->opb2fsi,0 , &s->bus.slave.mr); + +/* Let's add first CFAM */ +object_initialize_child (OBJECT (BUS (&s->bus)),TYPE_FSI_CFAM , &s->bus.slave, +TYPE_FSI_CFAM ); +qdev_set_parent_bus (DEVICE (&s->bus.slave),BUS (&s->bus), &error_abort); +object_property_set_bool (OBJECT (&s->bus.slave),"realized" , true, errp);
This routine needs a lot of cleanup ... :/ I will provide you one.
Quoted 52 lines
hw/fsi/fsi-master.c new file +33
-0+} + +static void fsi_master_reset (DeviceState *dev) +{ +FSIMasterState *s =FSI_MASTER (dev); + +/* 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_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/fsi.c new file +13
-0@@ -0,0 +1,25 @@ +/* +* SPDX-License-Identifier: GPL-2.0-or-later +* Copyright (C) 2023 IBM Corp. +* +* IBM Flexible Service Interface +*/ +#include "qemu/osdep.h" + +#include "qapi/error.h" + +#include "hw/fsi/fsi.h" +#include "hw/fsi/cfam.h" +
hw/fsi/fsi.c line 23
Quoted 10 lines
hw/fsi/fsi.c new file +10
-0+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); +}
This should be introduced in patch 2.
Thanks,
C.
Quoted 21 lines
hw/fsi/fsi.c new file +1
-0+type_init (fsi_bus_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_SCRATCHPAD', if_true: files('engine-scratchpad.c')) system_ss.add(when: 'CONFIG_FSI_CFAM', if_true: files('cfam.c')) -system_ss.add(when: 'CONFIG_FSI', if_true: files('fsi-slave.c')) +system_ss.add(when: 'CONFIG_FSI', if_true: files('fsi.c','fsi-master.c','fsi-slave.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 v7 04/10] hw/fsi: Introduce IBM's FSI
Hello Cedric,
Quoted 62 lines · Cédric Le Goater
Quoted 61 lines · Ninad Palsule
This is a part of patchset where IBM's Flexible Service Interface is introduced.
This commit models the FSI bus. CFAM is hanging out of FSI bus. The bus is model such a way that it is embedded inside the 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]>---
v2:
- Incorporated review comments by Joel
v5:
- Incorporated review comments by Cedric.
v6:
- Incorporated review comments by Cedric & Daniel
v7:
- Cleaned up unused bits.
---
include/hw/fsi/fsi-master.h| 30 +++++++ hw/fsi/fsi-master.c | 162 ++++++++++++++++++++++++++++++++++++ hw/fsi/fsi.c | 25 ++++++ hw/fsi/meson.build | 2 +-
hw/fsi/trace-events | 2 +5 files changed, 220 insertions(+), 1 deletion(-)create mode 100644
include/hw/fsi/fsi-master.h
create mode 100644hw/fsi/fsi-master.c
create mode 100644hw/fsi/fsi.cinclude/hw/fsi/fsi-master.h new file +20
-0@@ -0,0 +1,30 @@ +/* +* 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" + +#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;
Quoted 8 lines
include/hw/fsi/fsi-master.h line 26
Quoted 6 lines
include/hw/fsi/fsi-master.h new file +6
-0+ MemoryRegion iomem; + MemoryRegion opb2fsi; + + FSIBus bus; + + uint32_t regs[FSI_MASTER_NR_REGS];Move FSICFAMState here.
OK, Thanks for the change. We will think about multiple CFAM in future.
Quoted 117 lines
Quoted 117 lines
include/hw/fsi/fsi-master.h new file +4
-0+} FSIMasterState; + + +#endif /* FSI_FSI_H */ hw/fsi/fsi-master.c new file +37
-0@@ -0,0 +1,162 @@ +/* +* 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) +#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, unsignedsize)
hw/fsi/fsi-master.c new file +8
-0+{ + FSIMasterState *s = FSI_MASTER(opaque); + + trace_fsi_master_read(addr, size); + + if (addr + size > sizeof(s->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/fsi-master.c new file +14
-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)) {
+ caseFSI_MENP0:
+ s->regs[FSI_MENP0] = data;
+ break;
+ caseFSI_MENP32:
+ s->regs[FSI_MENP32] = data;
+ break;
+ caseFSI_MSENP0:
+ s->regs[FSI_MENP0] |= data;
+ break;
+ caseFSI_MSENP32:
+ s->regs[FSI_MENP32] |= data;
+ break;
+ caseFSI_MCENP0:
+ s->regs[FSI_MENP0] &= ~data;
+ break;
+ caseFSI_MCENP32:
+ s->regs[FSI_MENP32] &= ~data;
+ break;
+ caseFSI_MRESP0:
+ /* Perform necessary resets leave register 0 to indicate no errors */
+ break;
+ caseFSI_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;
+ }
+}
Quoted 8 lines
hw/fsi/fsi-master.c line 107
Quoted 6 lines
hw/fsi/fsi-master.c new file +6
-0+ +static const struct MemoryRegionOps fsi_master_ops = { + .read = fsi_master_read, + .write = fsi_master_write, + .endianness = DEVICE_BIG_ENDIAN, +};Add a
instance_inithandler to initialize the cfam object.
ok, Thanks for the change.
Quoted 22 lines
Quoted 22 lines
hw/fsi/fsi-master.c new file +9
-0+static void fsi_master_realize (DeviceState *dev,Error **errp) +{ + FSIMasterState *s = FSI_MASTER(dev); + + 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);
+
+ if (!object_property_set_bool(OBJECT(&s->bus), "realized", true, errp)) {
+ return;
+ }hw/fsi/fsi-master.c new file +5
-0+ + memory_region_add_subregion(&s->opb2fsi, 0, &s->bus.slave.mr); + + /* Let's add first CFAM */ + object_initialize_child(OBJECT(BUS(&s->bus)), TYPE_FSI_CFAM,
Quoted 8 lines
Quoted 6 lines
&s->bus.slave,
+TYPE_FSI_CFAM);
+qdev_set_parent_bus(DEVICE(&s->bus.slave), BUS(&s->bus), &error_abort);
+object_property_set_bool(OBJECT(&s->bus.slave), "realized", true, errp);This routine needs a lot of cleanup ... :/ I will provide you one.
ok, Thanks for the change.
Quoted 58 lines
Quoted 58 lines
hw/fsi/fsi-master.c new file +33
-0+} + +static void fsi_master_reset (DeviceState *dev) +{ + FSIMasterState *s = FSI_MASTER(dev); + + /* 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_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/fsi.c new file +18
-0@@ -0,0 +1,25 @@ +/* +* SPDX-License-Identifier: GPL-2.0-or-later +* Copyright (C) 2023 IBM Corp. +* +* IBM Flexible Service Interface +*/ +#include "qemu/osdep.h" + +#include "qapi/error.h" + +#include "hw/fsi/fsi.h" +#include "hw/fsi/cfam.h" + +static const TypeInfo fsi_bus_info = { + .name = TYPE_FSI_BUS, + .parent = TYPE_BUS, + .instance_size = sizeof(FSIBus), +};
Quoted 8 lines
hw/fsi/fsi.c line 23
Quoted 5 lines
hw/fsi/fsi.c new file +5
-0+ +static void fsi_bus_register_types (void ) +{ + type_register_static(&fsi_bus_info); +}This should be introduced in patch 2.
ok, Thanks for the review and changes.
Regards,
Ninad Palsule
Quoted 34 lines
Thanks,
C.
Quoted 24 lines
hw/fsi/fsi.c new file +1
-0+type_init (fsi_bus_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_SCRATCHPAD', if_true: files('engine-scratchpad.c')) system_ss.add(when: 'CONFIG_FSI_CFAM', if_true: files('cfam.c')) -system_ss.add(when: 'CONFIG_FSI', if_true: files('fsi-slave.c')) +system_ss.add(when: 'CONFIG_FSI', if_true:
files('fsi.c','fsi-master.c','fsi-slave.c'))hw/fsi/trace-events +0
-0@@ -7,3 +7,5 @@ fsi_cfam_unimplemented_write(uint64_t addr, uint32_tsize,
uint64_tdata) "@0x%"
fsi_cfam_config_write_noaddr(uint64_t addr, uint32_t size, uint64_t data)"@0x%" PRIx64 " size=%d value=0x%"PRIx64fsi_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%"PRIx64hw/fsi/trace-events +2
-0+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
PATCH v7 5/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.
---
v2:
- Incorporated review comment by Joel.
v5:
- Incorporated review comments by Cedric.
v6:
- Incorporated review comments by Cedric & Daniel
v7:
- Incorporated review comments by Cedric.
--- include/hw/fsi/opb.h | 33 ++++++++++++++++++++ hw/fsi/fsi-master.c | 3 +- hw/fsi/opb.c | 74 ++++++++++++++++++++++++++++++++++++++++++++ hw/fsi/Kconfig | 4 +++ hw/fsi/meson.build | 1 + 5 files changed, 113 insertions(+), 2 deletions(-) create mode 100644 include/hw/fsi/opb.h create mode 100644 hw/fsi/opb.c
include/hw/fsi/opb.h new file +33 -0
@@ -0,0 +1,33 @@ +/* +* 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; + +/* Model OPB as dumb enough just to provide an address-space */ +/* TODO: Maybe don't store device state in the bus? */ +FSIMasterState fsi; +}OPBus ; + +typedef struct OPBusClass { +BusClass parent_class; +}OPBusClass ; + +#endif /* FSI_OPB_H */
hw/fsi/fsi-master.c +1 -2
@@ -11,8 +11,7 @@#include "trace.h" #include "hw/fsi/fsi-master.h" - -#define TYPE_OP_BUS "opb" +#include "hw/fsi/opb.h" #define TO_REG (x) ((x) >> 2)
hw/fsi/opb.c new file +74 -0
74 lines not on this page · raw message
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
@@ -2,3 +2,4 @@ system_ss.add(when: 'CONFIG_FSI_LBUS', if_true: files('lbus.c')) system_ss.add(when: 'CONFIG_FSI_SCRATCHPAD', if_true: files('engine-scratchpad.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'))
Signature · 1 line
2.39.2
Re: [PATCH v7 05/10] hw/fsi: IBM's On-chip Peripheral Bus
Quoted 53 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]>---
v2:
- Incorporated review comment by Joel.
v5:
- Incorporated review comments by Cedric.
v6:
- Incorporated review comments by Cedric & Daniel
v7:
- Incorporated review comments by Cedric.--- include/hw/fsi/opb.h | 33 ++++++++++++++++++++ hw/fsi/fsi-master.c | 3 +- hw/fsi/opb.c | 74 ++++++++++++++++++++++++++++++++++++++++++++ hw/fsi/Kconfig | 4 +++ hw/fsi/meson.build | 1 + 5 files changed, 113 insertions(+), 2 deletions(-)create mode 100644
include/hw/fsi/opb.h
create mode 100644hw/fsi/opb.cinclude/hw/fsi/opb.h new file +16
-0@@ -0,0 +1,33 @@ +/* +* 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 {
include/hw/fsi/opb.h line 26
Quoted 10 lines
include/hw/fsi/opb.h new file +10
-0+/*< private >*/ +BusState bus; + +/*< public >*/ +MemoryRegion mr; +AddressSpace as; + +/* Model OPB as dumb enough just to provide an address-space */ +/* TODO: Maybe don't store device state in the bus? */ +FSIMasterState fsi;
Please remove. FSIMasterState should be introduced later.
Quoted 12 lines
include/hw/fsi/opb.h new file +7
-0+} OPBus; + +typedef struct OPBusClass { +BusClass parent_class; +}OPBusClass ; + +#endif /* FSI_OPB_H */ hw/fsi/fsi-master.c +0
-0
hw/fsi/fsi-master.c line 14
Quoted 6 lines
hw/fsi/fsi-master.c +1
-2@@ -11,8 +11,7 @@#include "trace.h" #include "hw/fsi/fsi-master.h" - -#define TYPE_OP_BUS "opb" +#include "hw/fsi/opb.h"
ouch.
This is an ugly hack because the modeling is broken. OPB should be introduced before tFSIMasterState.
Quoted 19 lines
hw/fsi/fsi-master.c +0
-0#define TO_REG (x) ((x) >> 2)hw/fsi/opb.c new file +11
-0@@ -0,0 +1,74 @@ +/* +* 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"
hw/fsi/opb.c line 21
Quoted 10 lines
hw/fsi/opb.c new file +10
-0+ +#include "hw/fsi/opb.h" + +static void fsi_opb_realize (BusState *bus,Error **errp) +{ +OPBus *opb =OP_BUS (bus); + +memory_region_init_io (&opb->mr,OBJECT (opb),NULL , opb, +NULL ,UINT32_MAX ); +address_space_init (&opb->as, &opb->mr,"opb" );
Please keep the above and put it in a instance_init handler and remove the rest. It should go under AspeedAPB2OPBState.
Quoted 21 lines
hw/fsi/opb.c new file +21
-0+ +if (!object_property_set_bool (OBJECT (&opb->fsi),"realized" , true, errp)) { +return ; + } + +memory_region_add_subregion (&opb->mr,0x80000000 , &opb->fsi.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) +*/
hw/fsi/opb.c line 52
Quoted 10 lines
hw/fsi/opb.c new file +10
-0+memory_region_add_subregion (&opb->mr,0xa0000000 , &opb->fsi.opb2fsi); +} + +static void fsi_opb_init (Object *o) +{ +OPBus *opb =OP_BUS (o); + +object_initialize_child (o,"fsi-master" , &opb->fsi,TYPE_FSI_MASTER ); +qdev_set_parent_bus (DEVICE (&opb->fsi),BUS (o), &error_abort); +}
Drop all of the above.
Thanks,
C.
Quoted 43 lines
hw/fsi/opb.c new file +22
-0+ +static void fsi_opb_class_init (ObjectClass *klass,void *data) +{ +BusClass *bc =BUS_CLASS (klass); + bc->realize = fsi_opb_realize; +} + +static const TypeInfo opb_info = { + .name =TYPE_OP_BUS , + .parent =TYPE_BUS , + .instance_init = fsi_opb_init, + .instance_size =sizeof (OPBus), + .class_init = fsi_opb_class_init, + .class_size =sizeof (OPBusClass), +}; + +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@@ -2,3 +2,4 @@ system_ss.add(when: 'CONFIG_FSI_LBUS', if_true: files('lbus.c')) system_ss.add(when: 'CONFIG_FSI_SCRATCHPAD', if_true: files('engine-scratchpad.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'))
Re: [PATCH v7 05/10] hw/fsi: IBM's On-chip Peripheral Bus
Hello Cedric,
Quoted 58 lines · Cédric Le Goater
Quoted 57 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]>---
v2:
- Incorporated review comment by Joel.
v5:
- Incorporated review comments by Cedric.
v6:
- Incorporated review comments by Cedric & Daniel
v7:
- Incorporated review comments by Cedric.
---
include/hw/fsi/opb.h| 33 ++++++++++++++++++++ hw/fsi/fsi-master.c | 3 +-
hw/fsi/opb.c | 74 ++++++++++++++++++++++++++++++++++++++++++++ hw/fsi/Kconfig | 4 +++
hw/fsi/meson.build | 1 +5 files changed, 113 insertions(+), 2 deletions(-)create mode 100644
include/hw/fsi/opb.h
create mode 100644hw/fsi/opb.cinclude/hw/fsi/opb.h new file +20
-0@@ -0,0 +1,33 @@ +/* +* 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 >*/
Quoted 8 lines
include/hw/fsi/opb.h line 26
Quoted 6 lines
include/hw/fsi/opb.h new file +6
-0+ MemoryRegion mr; + AddressSpace as; + + /* Model OPB as dumb enough just to provide an address-space */ + /* TODO: Maybe don't store device state in the bus? */ + FSIMasterState fsi;Please remove. FSIMasterState should be introduced later.
ok, Thanks for the change. Looks like you moved it from OPBus to AspeedAPB2OPBState. I am fine with the change if it is making model cleaner.
Quoted 21 lines
Quoted 13 lines
include/hw/fsi/opb.h new file +7
-0+} OPBus; + +typedef struct OPBusClass { + BusClass parent_class; +}OPBusClass ; + +#endif /* FSI_OPB_H */ hw/fsi/fsi-master.c +0
-0hw/fsi/fsi-master.c line 13
Quoted 5 lines
hw/fsi/fsi-master.c +1
-2@@ -11,8 +11,7 @@ #include "trace.h" #include "hw/fsi/fsi-master.h" - -#define TYPE_OP_BUS "opb" +#include "hw/fsi/opb.h" ouch.
Quoted 2 lines
This is an ugly hack because the modeling is broken. OPB should be introduced before tFSIMasterState.
OK, Thanks for the change.
Quoted 25 lines
Quoted 25 lines
hw/fsi/fsi-master.c +0
-0#define TO_REG(x) ((x) >> 2)diff --git
a/hw/fsi/opb.cb/hw/fsi/opb.c
new file mode 100644
index 0000000000..04771b4b27hw/fsi/opb.c new file +16
-0@@ -0,0 +1,74 @@ +/* +* 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_realize (BusState *bus,Error **errp) +{
Quoted 8 lines
hw/fsi/opb.c line 21
Quoted 5 lines
hw/fsi/opb.c new file +5
-0+ OPBus *opb = OP_BUS(bus); + + memory_region_init_io(&opb->mr, OBJECT(opb), NULL, opb, + NULL, UINT32_MAX); + address_space_init(&opb->as, &opb->mr, "opb");Please keep the above and put it in a
instance_inithandler and remove the rest. It should go under AspeedAPB2OPBState.
OK, Thanks for the change.
Quoted 34 lines
Quoted 34 lines
hw/fsi/opb.c new file +2
-0+ + if (!object_property_set_bool(OBJECT(&opb->fsi), "realized",true, errp)) {
+ return;
+ }hw/fsi/opb.c new file +6
-0+ + memory_region_add_subregion(&opb->mr, 0x80000000, &opb->fsi.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(&opb->mr, 0xa0000000, &opb->fsi.opb2fsi);hw/fsi/opb.c new file +4
-0+} + +static void fsi_opb_init (Object *o) +{
Quoted 8 lines
Quoted 6 lines
+ OPBus *opb =
OP_BUS(o);
+
+object_initialize_child(o, "fsi-master", &opb->fsi, TYPE_FSI_MASTER);
+qdev_set_parent_bus(DEVICE(&opb->fsi), BUS(o), &error_abort); +}Drop all of the above.
OK, Thanks for the review and change.
Regards,
Ninad
Quoted 53 lines
Thanks,
C.
Quoted 44 lines
hw/fsi/opb.c new file +22
-0+ +static void fsi_opb_class_init (ObjectClass *klass,void *data) +{ + BusClass *bc = BUS_CLASS(klass); + bc->realize = fsi_opb_realize; +} + +static const TypeInfo opb_info = { + .name = TYPE_OP_BUS, + .parent = TYPE_BUS, + .instance_init = fsi_opb_init, + .instance_size = sizeof(OPBus), + .class_init = fsi_opb_class_init, + .class_size = sizeof(OPBusClass), +}; + +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 +0
-0@@ -2,3 +2,4 @@ system_ss.add(when: 'CONFIG_FSI_LBUS', if_true: files('lbus.c')) system_ss.add(when: 'CONFIG_FSI_SCRATCHPAD', if_true: files('engine-scratchpad.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'))
PATCH v7 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.
---
v2:
- Incorporated review comments by Joel
v3:
- Incorporated review comments by Thomas Huth
v4:
- Compile FSI with ASPEED_SOC only.
v5:
- Incorporated review comments by Cedric.
v6:
- Incorporated review comments by Cedric.
v7:
- Incorporated review comments by Cedric.
--- include/hw/fsi/aspeed-apb2opb.h | 33 ++++ hw/fsi/aspeed-apb2opb.c | 272 ++++++++++++++++++++++++++++++++ hw/arm/Kconfig | 1 + hw/fsi/Kconfig | 4 + hw/fsi/meson.build | 1 + hw/fsi/trace-events | 2 + 6 files changed, 313 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 +33 -0
@@ -0,0 +1,33 @@ +/* +* 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 ]; +}AspeedAPB2OPBState ; + +#endif /* FSI_ASPEED_APB2OPB_H */
hw/fsi/aspeed-apb2opb.c new file +272 -0
272 lines not on this page · raw message
hw/arm/Kconfig +1 -0
@@ -555,6 +555,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
@@ -3,3 +3,4 @@ system_ss.add(when: 'CONFIG_FSI_SCRATCHPAD', if_true: files('engine-scratchpad.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 v7 06/10] hw/fsi: Aspeed APB2OPB interface
Quoted 59 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]>---
v2:
- Incorporated review comments by Joel
v3:
- Incorporated review comments by Thomas Huth
v4:
- Compile FSI withASPEED_SOConly.
v5:
- Incorporated review comments by Cedric.
v6:
- Incorporated review comments by Cedric.
v7:
- Incorporated review comments by Cedric.--- include/hw/fsi/aspeed-apb2opb.h | 33 ++++ hw/fsi/aspeed-apb2opb.c | 272 ++++++++++++++++++++++++++++++++ hw/arm/Kconfig | 1 + hw/fsi/Kconfig | 4 + hw/fsi/meson.build | 1 + hw/fsi/trace-events | 2 + 6 files changed, 313 insertions(+)create mode 100644
include/hw/fsi/aspeed-apb2opb.hcreate mode 100644hw/fsi/aspeed-apb2opb.cinclude/hw/fsi/aspeed-apb2opb.h new file +20
-0@@ -0,0 +1,33 @@ +/* +* 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 {
include/hw/fsi/aspeed-apb2opb.h line 30
Quoted 10 lines
include/hw/fsi/aspeed-apb2opb.h new file +10
-0+/*< private >*/ +SysBusDevice parent_obj; + +/*< public >*/ +MemoryRegion iomem; + +uint32_t regs[ASPEED_APB2OPB_NR_REGS ]; +qemu_irq irq; + +OPBus opb[ASPEED_FSI_NUM ];
Please introduce :
FSIMasterState fsi[ASPEED_FSI_NUM];
Quoted 240 lines
include/hw/fsi/aspeed-apb2opb.h new file +3
-0+} AspeedAPB2OPBState; + +#endif /* FSI_ASPEED_APB2OPB_H */ hw/fsi/aspeed-apb2opb.c new file +231
-0@@ -0,0 +1,272 @@ +/* +* 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 , + [APB2OPB_OPB0_READ_BYTE_ENDIAN ] =0x0044eee4 , + [APB2OPB_OPB1_READ_BYTE_ENDIAN ] =0x00117717 +}; + +static void fsi_opb_fsi_master_address (OPBus *opb,hwaddr addr) +{ +memory_region_transaction_begin (); +memory_region_set_address (&opb->fsi.iomem, addr); +memory_region_transaction_commit (); +} + +static void fsi_opb_opb2fsi_address (OPBus *opb,hwaddr addr) +{ +memory_region_transaction_begin (); +memory_region_set_address (&opb->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 ], data &APB2OPB_CONTROL_OFF ); +break ; +case APB2OPB_OPB2FSI : +fsi_opb_opb2fsi_address (&s->opb[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_realize (DeviceState *dev,Error **errp) +{ +SysBusDevice *sbd =SYS_BUS_DEVICE (dev); +AspeedAPB2OPBState *s =ASPEED_APB2OPB (dev); +
hw/fsi/aspeed-apb2opb.c line 241
Quoted 10 lines
hw/fsi/aspeed-apb2opb.c new file +10
-0+qbus_init (&s->opb[0 ],sizeof (s->opb[0 ]),TYPE_OP_BUS , +DEVICE (s),NULL ); +qbus_init (&s->opb[1 ],sizeof (s->opb[1 ]),TYPE_OP_BUS , +DEVICE (s),NULL ); + +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);
Move the fsi mapping previously under the OPBus here.
Thanks,
C.
Quoted 74 lines
hw/fsi/aspeed-apb2opb.c new file +31
-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) +{ +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_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@@ -555,6 +555,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@@ -3,3 +3,4 @@ system_ss.add(when: 'CONFIG_FSI_SCRATCHPAD', if_true: files('engine-scratchpad.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 v7 06/10] hw/fsi: Aspeed APB2OPB interface
Hello Cedric,
Quoted 73 lines · Cédric Le Goater
Quoted 59 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]>---
v2:
- Incorporated review comments by Joel
v3:
- Incorporated review comments by Thomas Huth
v4:
- Compile FSI withASPEED_SOConly.
v5:
- Incorporated review comments by Cedric.
v6:
- Incorporated review comments by Cedric.
v7:
- Incorporated review comments by Cedric.
---
include/hw/fsi/aspeed-apb2opb.h| 33 ++++ hw/fsi/aspeed-apb2opb.c | 272 ++++++++++++++++++++++++++++++++ hw/arm/Kconfig | 1 +
hw/fsi/Kconfig | 4 +
hw/fsi/meson.build | 1 + hw/fsi/trace-events | 2 +6 files changed, 313 insertions(+)create mode 100644
include/hw/fsi/aspeed-apb2opb.hcreate mode 100644hw/fsi/aspeed-apb2opb.cinclude/hw/fsi/aspeed-apb2opb.h new file +20
-0@@ -0,0 +1,33 @@ +/* +* 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 {include/hw/fsi/aspeed-apb2opb.h line 30
Quoted 10 lines
include/hw/fsi/aspeed-apb2opb.h new file +10
-0+ /*< private >*/ + SysBusDevice parent_obj; + + /*< public >*/ + MemoryRegion iomem; + + uint32_t regs[ASPEED_APB2OPB_NR_REGS]; + qemu_irq irq; + + OPBus opb[ASPEED_FSI_NUM];Please introduce :
Quoted 1 line
FSIMasterState fsi[ASPEED_FSI_NUM];
OK, Thanks for the change.
Quoted 258 lines
Quoted 258 lines
include/hw/fsi/aspeed-apb2opb.h new file +3
-0+} AspeedAPB2OPBState; + +#endif /* FSI_ASPEED_APB2OPB_H */ hw/fsi/aspeed-apb2opb.c new file +103
-0@@ -0,0 +1,272 @@ +/* +* 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, + [APB2OPB_OPB0_READ_BYTE_ENDIAN] = 0x0044eee4, + [APB2OPB_OPB1_READ_BYTE_ENDIAN] = 0x00117717 +}; + +static void fsi_opb_fsi_master_address (OPBus *opb,hwaddr addr) +{ + memory_region_transaction_begin(); + memory_region_set_address(&opb->fsi.iomem, addr); + memory_region_transaction_commit(); +} + +static void fsi_opb_opb2fsi_address (OPBus *opb,hwaddr addr) +{ + memory_region_transaction_begin(); + memory_region_set_address(&opb->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], data & APB2OPB_CONTROL_OFF);
+ break;
+ caseAPB2OPB_OPB2FSI:
+fsi_opb_opb2fsi_address(&s->opb[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 +34
-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_realize (DeviceState *dev,Error **errp) +{ + SysBusDevice *sbd = SYS_BUS_DEVICE(dev); + AspeedAPB2OPBState *s = ASPEED_APB2OPB(dev); + + qbus_init(&s->opb[0], sizeof(s->opb[0]), TYPE_OP_BUS, + DEVICE(s), NULL); + qbus_init(&s->opb[1], sizeof(s->opb[1]), TYPE_OP_BUS, + DEVICE(s), NULL); +
Quoted 8 lines
Quoted 5 lines
+
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);Move the fsi mapping previously under the OPBus here.
OK, Thanks for the review and changes.
Regards,
Ninad
Quoted 88 lines
Thanks,
C.
Quoted 79 lines
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 +21
-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_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@@ -555,6 +555,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@@ -3,3 +3,4 @@ system_ss.add(when: 'CONFIG_FSI_SCRATCHPAD', if_true:files('engine-scratchpad.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
PATCH v7 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
@@ -96,6 +97,7 @@ struct AspeedSoCState {UnimplementedDeviceState udc;UnimplementedDeviceState sgpiom;UnimplementedDeviceState jtag[ASPEED_JTAG_NUM ]; +AspeedAPB2OPBState fsi[2 ]; };#define TYPE_ASPEED_SOC "aspeed-soc"
@@ -191,6 +193,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 */ };
@@ -262,6 +266,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 ); + } }/*
@@ -622,6 +630,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
PATCH v7 8/10 hw/fsi: Added qtest
In reply to Ninad PalsuleAdded basic qtests for FSI model.
---
v3:
- Added new qtest as per Cedric's comment.
V4:
- Remove MAINTAINER and documentation changes from this commit
v6:
- Incorporated review comments by Thomas Huth.
v7:
- Incorporated review comments by Thomas Huth & Cedric.
--- 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 v7 9/10 hw/fsi: Added FSI documentation
In reply to Ninad PalsuleDocumentation for IBM FSI model.
---
v4:
- Added separate commit for documentation
v7:
- Incorporated review comments by Cedric.
--- 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,3 +24,4 @@ guest hardware that is specific to QEMU. acpi_erst sev-guest-firmware fw_cfg + fsi
Signature · 1 line
2.39.2
PATCH v7 10/10 hw/fsi: Update MAINTAINER list
In reply to Ninad PalsuleAdded maintainer for IBM FSI model
---
V4:
- Added separate commit for MAINTAINER change.
V5:
- Use * instead of listing all files in dir
--- MAINTAINERS | 8 ++++++++ 1 file changed, 8 insertions(+)
MAINTAINERS +8 -0
@@ -3502,6 +3502,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,
Quoted 4 lines · Ninad Palsule
Hello,
Please review the patch-set version 7.
I have incorporated review comments from Cedric, Philippe and Thomas.
I reworked v7 with the suggestions I made in patches 1-6. Please check :
https://github.com/legoater/qemu/commits/aspeed-8.2
I will have more questions on the mappings because some parts are really unclear.
Thanks,
C.
Quoted 68 lines
Ninad Palsule (10):
hw/fsi: Introduce IBM's Local bus
hw/fsi: Introduce IBM's scratchpad
hw/fsi: Introduce IBM's cfam,fsi-slave
hw/fsi: Introduce IBM's FSI
hw/fsi: IBM's On-chip Peripheral Bus
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 listMAINTAINERS | 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 | 33 ++++ include/hw/fsi/cfam.h | 34 ++++ include/hw/fsi/engine-scratchpad.h | 27 +++ include/hw/fsi/fsi-master.h | 30 ++++ include/hw/fsi/fsi-slave.h | 29 +++ include/hw/fsi/fsi.h | 36 ++++ include/hw/fsi/lbus.h | 43 +++++ include/hw/fsi/opb.h | 33 ++++ hw/arm/aspeed_ast2600.c | 19 ++ hw/fsi/aspeed-apb2opb.c | 272 +++++++++++++++++++++++++++++ hw/fsi/cfam.c | 173 ++++++++++++++++++ hw/fsi/engine-scratchpad.c | 93 ++++++++++ hw/fsi/fsi-master.c | 161 +++++++++++++++++ hw/fsi/fsi-slave.c | 78 +++++++++ hw/fsi/fsi.c | 25 +++ hw/fsi/lbus.c | 74 ++++++++ hw/fsi/opb.c | 74 ++++++++ tests/qtest/aspeed-fsi-test.c | 205 ++++++++++++++++++++++ hw/Kconfig | 1 + hw/arm/Kconfig | 1 + hw/fsi/Kconfig | 23 +++ hw/fsi/meson.build | 6 + hw/fsi/trace-events | 13 ++ hw/meson.build | 1 + tests/qtest/meson.build | 1 + 31 files changed, 1638 insertions(+)create mode 100644
docs/specs/fsi.rst
create mode 100644hw/fsi/trace.h
create mode 100644include/hw/fsi/aspeed-apb2opb.hcreate mode 100644include/hw/fsi/cfam.hcreate mode 100644include/hw/fsi/engine-scratchpad.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/engine-scratchpad.ccreate mode 100644hw/fsi/fsi-master.ccreate mode 100644hw/fsi/fsi-slave.c
create 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 9 lines · Cédric Le Goater
Hello Ninad,
Quoted 4 lines · Ninad Palsule
Hello,
Please review the patch-set version 7.
I have incorporated review comments from Cedric, Philippe and Thomas.
Quoted 7 lines
I reworked v7 with the suggestions I made in patches 1-6. Please check :
https://github.com/legoater/qemu/commits/aspeed-8.2
I will have more questions on the mappings because some parts are really unclear.
Thanks for the changes. I have 2 changes. I will send it as v8.
Regards,
Ninad
Quoted 75 lines
Thanks,
C.
Quoted 68 lines
Ninad Palsule (10):
hw/fsi: Introduce IBM's Local bus
hw/fsi: Introduce IBM's scratchpad
hw/fsi: Introduce IBM's cfam,fsi-slave
hw/fsi: Introduce IBM's FSI
hw/fsi: IBM's On-chip Peripheral Bus
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 listMAINTAINERS | 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 | 33 ++++ include/hw/fsi/cfam.h | 34 ++++include/hw/fsi/engine-scratchpad.h| 27 +++ include/hw/fsi/fsi-master.h | 30 ++++ include/hw/fsi/fsi-slave.h | 29 +++ include/hw/fsi/fsi.h | 36 ++++ include/hw/fsi/lbus.h | 43 +++++ include/hw/fsi/opb.h | 33 ++++ hw/arm/aspeed_ast2600.c | 19 ++ hw/fsi/aspeed-apb2opb.c | 272 +++++++++++++++++++++++++++++ hw/fsi/cfam.c | 173 ++++++++++++++++++ hw/fsi/engine-scratchpad.c | 93 ++++++++++ hw/fsi/fsi-master.c | 161 +++++++++++++++++ hw/fsi/fsi-slave.c | 78 +++++++++ hw/fsi/fsi.c | 25 +++
hw/fsi/lbus.c | 74 ++++++++ hw/fsi/opb.c | 74 ++++++++ tests/qtest/aspeed-fsi-test.c | 205 ++++++++++++++++++++++ hw/Kconfig | 1 +
hw/arm/Kconfig | 1 +
hw/fsi/Kconfig | 23 +++ hw/fsi/meson.build | 6 + hw/fsi/trace-events | 13 ++
hw/meson.build | 1 + tests/qtest/meson.build | 1 +31 files changed, 1638 insertions(+)create mode 100644
docs/specs/fsi.rst
create mode 100644hw/fsi/trace.h
create mode 100644include/hw/fsi/aspeed-apb2opb.hcreate mode 100644include/hw/fsi/cfam.hcreate mode 100644include/hw/fsi/engine-scratchpad.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/engine-scratchpad.ccreate mode 100644hw/fsi/fsi-master.ccreate mode 100644hw/fsi/fsi-slave.c
create 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 9 lines · Cédric Le Goater
Hello Ninad,
Quoted 4 lines · Ninad Palsule
Hello,
Please review the patch-set version 7.
I have incorporated review comments from Cedric, Philippe and Thomas.
Quoted 7 lines
I reworked v7 with the suggestions I made in patches 1-6. Please check :
https://github.com/legoater/qemu/commits/aspeed-8.2
I will have more questions on the mappings because some parts are really unclear.
I forgot to mention in my last mail. If I build against your aspeed-8.2 branch then rainier machine is failing to boot.
The same images are working with qemu master branch.
fsi/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' -net nic -net user,hostfwd=:127.0.0.1:3222-:22,hostfwd=:127.0.0.1:2234-:1234 -trace 'fsi*' |
|
Starting systemd-udevd version 254^
[ 50.630407] /dev/disk/by-partlabel/rofs-a: Can't open blockdev
mount: mounting /dev/disk/by-partlabel/rofs-a on /mnt/rofs failed: No such file or directory/bin/sh: can't access tty; job control turned off
Quoted 75 lines
Thanks,
C.
Quoted 68 lines
Ninad Palsule (10):
hw/fsi: Introduce IBM's Local bus
hw/fsi: Introduce IBM's scratchpad
hw/fsi: Introduce IBM's cfam,fsi-slave
hw/fsi: Introduce IBM's FSI
hw/fsi: IBM's On-chip Peripheral Bus
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 listMAINTAINERS | 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 | 33 ++++ include/hw/fsi/cfam.h | 34 ++++include/hw/fsi/engine-scratchpad.h| 27 +++ include/hw/fsi/fsi-master.h | 30 ++++ include/hw/fsi/fsi-slave.h | 29 +++ include/hw/fsi/fsi.h | 36 ++++ include/hw/fsi/lbus.h | 43 +++++ include/hw/fsi/opb.h | 33 ++++ hw/arm/aspeed_ast2600.c | 19 ++ hw/fsi/aspeed-apb2opb.c | 272 +++++++++++++++++++++++++++++ hw/fsi/cfam.c | 173 ++++++++++++++++++ hw/fsi/engine-scratchpad.c | 93 ++++++++++ hw/fsi/fsi-master.c | 161 +++++++++++++++++ hw/fsi/fsi-slave.c | 78 +++++++++ hw/fsi/fsi.c | 25 +++
hw/fsi/lbus.c | 74 ++++++++ hw/fsi/opb.c | 74 ++++++++ tests/qtest/aspeed-fsi-test.c | 205 ++++++++++++++++++++++ hw/Kconfig | 1 +
hw/arm/Kconfig | 1 +
hw/fsi/Kconfig | 23 +++ hw/fsi/meson.build | 6 + hw/fsi/trace-events | 13 ++
hw/meson.build | 1 + tests/qtest/meson.build | 1 +31 files changed, 1638 insertions(+)create mode 100644
docs/specs/fsi.rst
create mode 100644hw/fsi/trace.h
create mode 100644include/hw/fsi/aspeed-apb2opb.hcreate mode 100644include/hw/fsi/cfam.hcreate mode 100644include/hw/fsi/engine-scratchpad.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/engine-scratchpad.ccreate mode 100644hw/fsi/fsi-master.ccreate mode 100644hw/fsi/fsi-slave.c
create 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
Quoted 23 lines · Ninad Palsule
Hello Cedric,
Quoted 9 lines · Cédric Le Goater
Hello Ninad,
Quoted 4 lines · Ninad Palsule
Hello,
Please review the patch-set version 7.
I have incorporated review comments from Cedric, Philippe and Thomas.Quoted 7 lines
I reworked v7 with the suggestions I made in patches 1-6. Please check :
https://github.com/legoater/qemu/commits/aspeed-8.2
I will have more questions on the mappings because some parts are really unclear.
I forgot to mention in my last mail. If I build against your aspeed-8.2 branch then rainier machine is failing to boot.
The same images are working with qemu master branch.
Quoted 7 lines
fsi/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' -net nic -net user,hostfwd=:127.0.0.1:3222-:22,hostfwd=:127.0.0.1:2234-:1234 -trace 'fsi*'
|
|
Starting systemd-udevd version 254^
[ 50.630407]/dev/disk/by-partlabel/rofs-a: Can't open blockdev
mount: mounting/dev/disk/by-partlabel/rofs-aon/mnt/rofsfailed: No such file or directory/bin/sh: can't access tty; job control turned off
Hello,
Please try with '-M rainier-bmc,boot-emmc=false' to avoid using the boot emmc mode which is the default for the rainier machine.
I just updated the aspeed-8.2 branch to take into account the -kernel option when booting the rainier.
Thanks,
C.
Quoted 32 lines · Cédric Le Goater
Quoted 23 lines · Ninad Palsule
Hello Cedric,
Quoted 9 lines · Cédric Le Goater
Hello Ninad,
Quoted 4 lines · Ninad Palsule
Hello,
Please review the patch-set version 7.
I have incorporated review comments from Cedric, Philippe and Thomas.Quoted 7 lines
I reworked v7 with the suggestions I made in patches 1-6. Please check :
https://github.com/legoater/qemu/commits/aspeed-8.2
I will have more questions on the mappings because some parts are really unclear.
I forgot to mention in my last mail. If I build against your aspeed-8.2 branch then rainier machine is failing to boot.
The same images are working with qemu master branch.
Quoted 7 lines
fsi/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' -net nic -net user,hostfwd=:127.0.0.1:3222-:22,hostfwd=:127.0.0.1:2234-:1234 -trace 'fsi*' |
|
Starting systemd-udevd version 254^
[ 50.630407]/dev/disk/by-partlabel/rofs-a: Can't open blockdev
mount: mounting/dev/disk/by-partlabel/rofs-aon/mnt/rofsfailed: No such file or directory/bin/sh: can't access tty; job control turned off
Quoted 7 lines
Hello,
Please try with '-M rainier-bmc,boot-emmc=false' to avoid using the boot emmc mode which is the default for the rainier machine.
I just updated the aspeed-8.2 branch to take into account the -kernel option when booting the rainier.
Instead, please update your emmc file image which should contain a boot area with u-boot.spl and uboot. See patch "hw/sd: Support boot area in emmc image". Or use '-M rainier-bmc,boot-emmc=false'
Thanks,
C.
Hello Cedric,
Quoted 32 lines · Cédric Le Goater
Quoted 23 lines · Ninad Palsule
Hello Cedric,
Quoted 9 lines · Cédric Le Goater
Hello Ninad,
Quoted 4 lines · Ninad Palsule
Hello,
Please review the patch-set version 7.
I have incorporated review comments from Cedric, Philippe and Thomas.Quoted 7 lines
I reworked v7 with the suggestions I made in patches 1-6. Please check :
https://github.com/legoater/qemu/commits/aspeed-8.2
I will have more questions on the mappings because some parts are really unclear.
I forgot to mention in my last mail. If I build against your aspeed-8.2 branch then rainier machine is failing to boot.
The same images are working with qemu master branch.
Quoted 7 lines
fsi/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' -net nic -net user,hostfwd=:127.0.0.1:3222-:22,hostfwd=:127.0.0.1:2234-:1234 -trace 'fsi*' |
|
Starting systemd-udevd version 254^
[ 50.630407]/dev/disk/by-partlabel/rofs-a: Can't open blockdev
mount: mounting/dev/disk/by-partlabel/rofs-aon/mnt/rofsfailed: No such file or directory/bin/sh: can't access tty; job control turned off
Quoted 7 lines
Hello,
Please try with '-M rainier-bmc,boot-emmc=false' to avoid using the boot emmc mode which is the default for the rainier machine.
I just updated the aspeed-8.2 branch to take into account the -kernel option when booting the rainier.
That worked. Thanks!
Quoted 8 lines
Thanks,
C.