fpga: add initial KUnit tests for the subsystem
v2 cover fpga: add initial KUnit tests for the subsystem
This patch set introduces initial KUnit test suites for the FPGA subsystem.
Tests can be run using:
[user@localhost linux]$ ./tools/testing/kunit/kunit.py run --kunitconfig=drivers/fpga/tests
v2:
- Restructured code into multiple suites to test components in isolation
- Reduced code duplication using init and exit methods
- Using a get_bridges() method to build the list of bridges just before programming
- Regions and Bridges are organized topologically
- Changed bitstream/bit to images
- Allocate images dynamically
- Renamed fpga-tests to fpga-test
- Simplified Kconfig
- Add license info to the fpga-test module
Marco Pagani (4):
fpga: add fake FPGA manager
fpga: add fake FPGA bridge
fpga: add fake FPGA region
fpga: add initial KUnit test suites
drivers/fpga/Kconfig | 2 + drivers/fpga/Makefile | 3 + drivers/fpga/tests/.kunitconfig | 5 + drivers/fpga/tests/Kconfig | 11 + drivers/fpga/tests/Makefile | 6 + drivers/fpga/tests/fake-fpga-bridge.c | 228 ++++++++++++ drivers/fpga/tests/fake-fpga-bridge.h | 36 ++ drivers/fpga/tests/fake-fpga-mgr.c | 369 +++++++++++++++++++ drivers/fpga/tests/fake-fpga-mgr.h | 42 +++ drivers/fpga/tests/fake-fpga-region.c | 219 +++++++++++ drivers/fpga/tests/fake-fpga-region.h | 38 ++ drivers/fpga/tests/fpga-test.c | 501 ++++++++++++++++++++++++++ 12 files changed, 1460 insertions(+) create mode 100644 drivers/fpga/tests/.kunitconfig create mode 100644 drivers/fpga/tests/Kconfig create mode 100644 drivers/fpga/tests/Makefile create mode 100644 drivers/fpga/tests/fake-fpga-bridge.c create mode 100644 drivers/fpga/tests/fake-fpga-bridge.h create mode 100644 drivers/fpga/tests/fake-fpga-mgr.c create mode 100644 drivers/fpga/tests/fake-fpga-mgr.h create mode 100644 drivers/fpga/tests/fake-fpga-region.c create mode 100644 drivers/fpga/tests/fake-fpga-region.h create mode 100644 drivers/fpga/tests/fpga-test.c
Signature · 1 line
2.39.2
RFC PATCH v2 1/4 fpga: add fake FPGA manager
Add fake FPGA manager platform driver with support functions. The driver checks the programming sequence using KUnit expectations. This module is part of the KUnit tests for the FPGA subsystem.
--- drivers/fpga/tests/fake-fpga-mgr.c | 369 +++++++++++++++++++++++++++++ drivers/fpga/tests/fake-fpga-mgr.h | 42 ++++ 2 files changed, 411 insertions(+) create mode 100644 drivers/fpga/tests/fake-fpga-mgr.c create mode 100644 drivers/fpga/tests/fake-fpga-mgr.h
drivers/fpga/tests/fake-fpga-mgr.c new file +369 -0
@@ -0,0 +1,369 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Driver for the fake FPGA manager +* +* Copyright (C) 2023 Red Hat, Inc. +* +* Author: Marco Pagani <[email protected]> +*/ + +#include <linux/types.h> +#include <linux/device.h> +#include <linux/platform_device.h> +#include <linux/fpga/fpga-mgr.h> +#include <kunit/test.h> + +#include "fake-fpga-mgr.h" + +#define FAKE_FPGA_MGR_DEV_NAME "fake_fpga_mgr" + +#define FAKE_HEADER_BYTE 0x3f +#define FAKE_HEADER_SIZE FPGA_IMG_BLOCK + +struct fake_mgr_priv { +int rcfg_count; +bool op_parse_header; +bool op_write_init; +bool op_write; +bool op_write_sg; +bool op_write_complete; +struct kunit *test; +}; + +struct fake_mgr_data { +struct kunit *test; +}; + +static void check_header (struct kunit *test,const u8 *buf); + +static enum fpga_mgr_states op_state (struct fpga_manager *mgr) +{ +struct fake_mgr_priv *priv; + + priv = mgr->priv; + +if (priv->test) +kunit_info (priv->test,"Fake FPGA manager: state\n" ); + +return FPGA_MGR_STATE_UNKNOWN ; +} + +static u64 op_status (struct fpga_manager *mgr) +{ +struct fake_mgr_priv *priv; + + priv = mgr->priv; + +if (priv->test) +kunit_info (priv->test,"Fake FPGA manager: status\n" ); + +return 0 ; +} + +static int op_parse_header (struct fpga_manager *mgr,struct fpga_image_info *info, +const char *buf,size_t count) +{ +struct fake_mgr_priv *priv; + + priv = mgr->priv; + +if (priv->test) { +kunit_info (priv->test,"Fake FPGA manager: parse_header\n" ); + +KUNIT_EXPECT_EQ (priv->test, mgr->state, +FPGA_MGR_STATE_PARSE_HEADER ); + +check_header (priv->test, buf); + } + + priv->op_parse_header = true; + +return 0 ; +} + +static int op_write_init (struct fpga_manager *mgr,struct fpga_image_info *info, +const char *buf,size_t count) +{ +struct fake_mgr_priv *priv; + + priv = mgr->priv; + +if (priv->test) { +kunit_info (priv->test,"Fake FPGA manager: write_init\n" ); + +KUNIT_EXPECT_EQ (priv->test, mgr->state, +FPGA_MGR_STATE_WRITE_INIT ); + } + + priv->op_write_init = true; + +return 0 ; +} + +static int op_write (struct fpga_manager *mgr,const char *buf,size_t count) +{ +struct fake_mgr_priv *priv; + + priv = mgr->priv; + +if (priv->test) { +kunit_info (priv->test,"Fake FPGA manager: write\n" ); + +KUNIT_EXPECT_EQ (priv->test, mgr->state, +FPGA_MGR_STATE_WRITE ); + } + + priv->op_write = true; + +return 0 ; +} + +static int op_write_sg (struct fpga_manager *mgr,struct sg_table *sgt) +{ +struct fake_mgr_priv *priv; + + priv = mgr->priv; + +if (priv->test) { +kunit_info (priv->test,"Fake FPGA manager: write_sg\n" ); + +KUNIT_EXPECT_EQ (priv->test, mgr->state, +FPGA_MGR_STATE_WRITE ); + } + + priv->op_write_sg = true; + +return 0 ; +} + +static int op_write_complete (struct fpga_manager *mgr,struct fpga_image_info *info) +{ +struct fake_mgr_priv *priv; + + priv = mgr->priv; + +if (priv->test) { +kunit_info (priv->test,"Fake FPGA manager: write_complete\n" ); + +KUNIT_EXPECT_EQ (priv->test, mgr->state, +FPGA_MGR_STATE_WRITE_COMPLETE ); + } + + priv->op_write_complete = true; + priv->rcfg_count++; + +return 0 ; +} + +static void op_fpga_remove (struct fpga_manager *mgr) +{ +struct fake_mgr_priv *priv; + + priv = mgr->priv; + +if (priv->test) +kunit_info (priv->test,"Fake FPGA manager: remove\n" ); +} + +static const struct fpga_manager_ops fake_fpga_mgr_ops = { + .initial_header_size =FAKE_HEADER_SIZE , + .skip_header = false, + .state = op_state, + .status = op_status, + .parse_header = op_parse_header, + .write_init = op_write_init, + .write = op_write, + .write_sg = op_write_sg, + .write_complete = op_write_complete, + .fpga_remove = op_fpga_remove, +}; + +/** +* fake_fpga_mgr_register() - register a fake FPGA manager. +* @mgr_ctx: fake FPGA manager context data structure. +* @test: KUnit test context object. +* +* Return: 0 if registration succeeded, an error code otherwise. +*/ +int fake_fpga_mgr_register (struct fake_fpga_mgr *mgr_ctx,struct kunit *test) +{ +struct fake_mgr_data pdata; +int ret; + + pdata.test = test; + + mgr_ctx->pdev =platform_device_alloc (FAKE_FPGA_MGR_DEV_NAME , +PLATFORM_DEVID_AUTO ); +if (IS_ERR_OR_NULL (mgr_ctx->pdev)) { +pr_err ("Fake FPGA manager device allocation failed\n" ); +return -ENOMEM ; + } + +platform_device_add_data (mgr_ctx->pdev, &pdata,sizeof (pdata)); + + ret =platform_device_add (mgr_ctx->pdev); +if (ret) { +pr_err ("Fake FPGA manager device add failed\n" ); +platform_device_put (mgr_ctx->pdev); +return ret; + } + + mgr_ctx->mgr =platform_get_drvdata (mgr_ctx->pdev); + +if (test) +kunit_info (test,"Fake FPGA manager registered\n" ); + +return 0 ; +} +EXPORT_SYMBOL_GPL (fake_fpga_mgr_register); + +/** +* fake_fpga_mgr_unregister() - unregister a fake FPGA manager. +* @mgr_ctx: fake FPGA manager context data structure. +*/ +void fake_fpga_mgr_unregister (struct fake_fpga_mgr *mgr_ctx) +{ +struct fake_mgr_priv *priv; +struct kunit *test; + +if (!mgr_ctx) +return ; + + priv = mgr_ctx->mgr->priv; + test = priv->test; + +if (mgr_ctx->pdev) { +platform_device_unregister (mgr_ctx->pdev); +if (test) +kunit_info (test,"Fake FPGA manager unregistered\n" ); + } +} +EXPORT_SYMBOL_GPL (fake_fpga_mgr_unregister); + +/** +* fake_fpga_mgr_get_rcfg_count() - get the number of reconfigurations. +* @mgr_ctx: fake FPGA manager context data structure. +* +* Return: number of reconfigurations. +*/ +int fake_fpga_mgr_get_rcfg_count (const struct fake_fpga_mgr *mgr_ctx) +{ +struct fake_mgr_priv *priv; + + priv = mgr_ctx->mgr->priv; + +return priv->rcfg_count; +} +EXPORT_SYMBOL_GPL (fake_fpga_mgr_get_rcfg_count); + +/** +* fake_fpga_mgr_fill_header() - fill an image buffer with the test header. +* @buf: image buffer. +*/ +void fake_fpga_mgr_fill_header (u8 *buf) +{ +int i; + +for (i =0 ; i <FAKE_HEADER_SIZE ; i++) + buf[i] =FAKE_HEADER_BYTE ; +} +EXPORT_SYMBOL_GPL (fake_fpga_mgr_fill_header); + +static void check_header (struct kunit *test,const u8 *buf) +{ +int i; + +for (i =0 ; i <FAKE_HEADER_SIZE ; i++) +KUNIT_EXPECT_EQ (test, buf[i],FAKE_HEADER_BYTE ); +} + +static void clear_op_flags (struct fake_mgr_priv *priv) +{ + priv->op_parse_header = false; + priv->op_write_init = false; + priv->op_write = false; + priv->op_write_sg = false; + priv->op_write_complete = false; +} + +/** +* fake_fpga_mgr_check_write_buf() - check if programming using a buffer succeeded. +* @mgr_ctx: fake FPGA manager context data structure. +*/ +void fake_fpga_mgr_check_write_buf (struct fake_fpga_mgr *mgr_ctx) +{ +struct fake_mgr_priv *priv; + + priv = mgr_ctx->mgr->priv; + +if (priv->test) { +KUNIT_EXPECT_EQ (priv->test, priv->op_parse_header, true); +KUNIT_EXPECT_EQ (priv->test, priv->op_write_init, true); +KUNIT_EXPECT_EQ (priv->test, priv->op_write, true); +KUNIT_EXPECT_EQ (priv->test, priv->op_write_complete, true); + } + +clear_op_flags (priv); +} +EXPORT_SYMBOL_GPL (fake_fpga_mgr_check_write_buf); + +/** +* fake_fpga_mgr_check_write_sgt() - check if programming using a s.g. table succeeded. +* @mgr_ctx: fake FPGA manager context data structure. +*/ +void fake_fpga_mgr_check_write_sgt (struct fake_fpga_mgr *mgr_ctx) +{ +struct fake_mgr_priv *priv; + + priv = mgr_ctx->mgr->priv; + +if (priv->test) { +KUNIT_EXPECT_EQ (priv->test, priv->op_parse_header, true); +KUNIT_EXPECT_EQ (priv->test, priv->op_write_init, true); +KUNIT_EXPECT_EQ (priv->test, priv->op_write_sg, true); +KUNIT_EXPECT_EQ (priv->test, priv->op_write_complete, true); + } + +clear_op_flags (priv); +} +EXPORT_SYMBOL_GPL (fake_fpga_mgr_check_write_sgt); + +static int fake_fpga_mgr_probe (struct platform_device *pdev) +{ +struct device *dev; +struct fake_mgr_priv *priv; +struct fake_mgr_data *pdata; +struct fpga_manager *mgr; + + dev = &pdev->dev; + pdata =dev_get_platdata (dev); + + priv =devm_kzalloc (dev,sizeof (*priv),GFP_KERNEL ); +if (!priv) +return -ENOMEM ; + +if (pdata) + priv->test = pdata->test; + + mgr =devm_fpga_mgr_register (dev,"Fake FPGA Manager" , + &fake_fpga_mgr_ops, priv); +if (IS_ERR (mgr)) +return PTR_ERR (mgr); + +platform_set_drvdata (pdev, mgr); + +return 0 ; +} + +static struct platform_driver fake_fpga_mgr_drv = { + .driver = { + .name =FAKE_FPGA_MGR_DEV_NAME + }, + .probe = fake_fpga_mgr_probe, +}; + +module_platform_driver (fake_fpga_mgr_drv); + +MODULE_AUTHOR ("Marco Pagani <[email protected]>" ); +MODULE_DESCRIPTION ("Fake FPGA Manager" ); +MODULE_LICENSE ("GPL v2" );
drivers/fpga/tests/fake-fpga-mgr.h new file +42 -0
42 lines not on this page · raw message
Signature · 1 line
2.39.2
RFC PATCH v2 2/4 fpga: add fake FPGA bridge
In reply to Marco PaganiAdd fake FPGA bridge driver with support functions. The driver includes a counter for the number of switching cycles. This module is part of the KUnit tests for the FPGA subsystem.
--- drivers/fpga/tests/fake-fpga-bridge.c | 228 ++++++++++++++++++++++++++ drivers/fpga/tests/fake-fpga-bridge.h | 36 ++++ 2 files changed, 264 insertions(+) create mode 100644 drivers/fpga/tests/fake-fpga-bridge.c create mode 100644 drivers/fpga/tests/fake-fpga-bridge.h
drivers/fpga/tests/fake-fpga-bridge.c new file +228 -0
@@ -0,0 +1,228 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Driver for the fake FPGA bridge +* +* Copyright (C) 2023 Red Hat, Inc. +* +* Author: Marco Pagani <[email protected]> +*/ + +#include <linux/types.h> +#include <linux/device.h> +#include <linux/platform_device.h> +#include <linux/fpga/fpga-bridge.h> +#include <kunit/test.h> + +#include "fake-fpga-bridge.h" + +#define FAKE_FPGA_BRIDGE_DEV_NAME "fake_fpga_bridge" + +struct fake_bridge_priv { +int id; +bool enable; +int cycles_count; +struct kunit *test; +}; + +struct fake_bridge_data { +struct kunit *test; +}; + +static int op_enable_show (struct fpga_bridge *bridge) +{ +struct fake_bridge_priv *priv; + + priv = bridge->priv; + +if (priv->test) +kunit_info (priv->test,"Fake FPGA bridge %d: enable_show\n" , + priv->id); + +return priv->enable; +} + +static int op_enable_set (struct fpga_bridge *bridge,bool enable) +{ +struct fake_bridge_priv *priv; + + priv = bridge->priv; + +if (enable && !priv->enable) + priv->cycles_count++; + + priv->enable = enable; + +if (priv->test) +kunit_info (priv->test,"Fake FPGA bridge %d: enable_set: %d\n" , + priv->id, enable); + +return 0 ; +} + +static void op_remove (struct fpga_bridge *bridge) +{ +struct fake_bridge_priv *priv; + + priv = bridge->priv; + +if (priv->test) +kunit_info (priv->test,"Fake FPGA bridge: remove\n" ); +} + +static const struct fpga_bridge_ops fake_fpga_bridge_ops = { + .enable_show = op_enable_show, + .enable_set = op_enable_set, + .fpga_bridge_remove = op_remove, +}; + +/** +* fake_fpga_bridge_register() - register a fake FPGA bridge. +* @bridge_ctx: fake FPGA bridge context data structure. +* @parent: parent device. +* @test: KUnit test context object. +* +* Return: 0 if registration succeeded, an error code otherwise. +*/ +int fake_fpga_bridge_register (struct fake_fpga_bridge *bridge_ctx, +struct device *parent,struct kunit *test) +{ +struct fake_bridge_data pdata; +struct fake_bridge_priv *priv; +int ret; + + pdata.test = test; + + bridge_ctx->pdev =platform_device_alloc (FAKE_FPGA_BRIDGE_DEV_NAME , +PLATFORM_DEVID_AUTO ); +if (IS_ERR (bridge_ctx->pdev)) { +pr_err ("Fake FPGA bridge device allocation failed\n" ); +return -ENOMEM ; + } + + bridge_ctx->pdev->dev.parent = parent; +platform_device_add_data (bridge_ctx->pdev, &pdata,sizeof (pdata)); + + ret =platform_device_add (bridge_ctx->pdev); +if (ret) { +pr_err ("Fake FPGA bridge device add failed\n" ); +platform_device_put (bridge_ctx->pdev); +return ret; + } + + bridge_ctx->bridge =platform_get_drvdata (bridge_ctx->pdev); + +if (test) { + priv = bridge_ctx->bridge->priv; +kunit_info (test,"Fake FPGA bridge %d registered\n" , priv->id); + } + +return 0 ; +} +EXPORT_SYMBOL_GPL (fake_fpga_bridge_register); + +/** +* fake_fpga_bridge_unregister() - unregister a fake FPGA bridge. +* @bridge_ctx: fake FPGA bridge context data structure. +*/ +void fake_fpga_bridge_unregister (struct fake_fpga_bridge *bridge_ctx) +{ +struct fake_bridge_priv *priv; +struct kunit *test; +int id; + +if (!bridge_ctx) +return ; + + priv = bridge_ctx->bridge->priv; + test = priv->test; + id = priv->id; + +if (bridge_ctx->pdev) { +platform_device_unregister (bridge_ctx->pdev); +if (test) +kunit_info (test,"Fake FPGA bridge %d unregistered\n" , id); + } +} +EXPORT_SYMBOL_GPL (fake_fpga_bridge_unregister); + +/** +* fake_fpga_bridge_get_state() - get state of a fake FPGA bridge. +* @bridge_ctx: fake FPGA bridge context data structure. +* +* Return: 1 if the bridge is enabled, 0 if disabled. +*/ +int fake_fpga_bridge_get_state (const struct fake_fpga_bridge *bridge_ctx) +{ +return bridge_ctx->bridge->br_ops->enable_show (bridge_ctx->bridge); +} +EXPORT_SYMBOL_GPL (fake_fpga_bridge_get_state); + +/** +* fake_fpga_bridge_get_cycles_count() - get the number of switching cycles. +* @bridge_ctx: fake FPGA bridge context data structure. +* +* Return: number of switching cycles. +*/ +int fake_fpga_bridge_get_cycles_count (const struct fake_fpga_bridge *bridge_ctx) +{ +struct fake_bridge_priv *priv; + + priv = bridge_ctx->bridge->priv; + +return priv->cycles_count; +} +EXPORT_SYMBOL_GPL (fake_fpga_bridge_get_cycles_count); + +static int fake_fpga_bridge_probe (struct platform_device *pdev) +{ +struct device *dev; +struct fpga_bridge *bridge; +struct fake_bridge_data *pdata; +struct fake_bridge_priv *priv; +static int id_count; + + dev = &pdev->dev; + pdata =dev_get_platdata (dev); + + priv =devm_kzalloc (dev,sizeof (*priv),GFP_KERNEL ); +if (!priv) +return -ENOMEM ; + + priv->id = id_count++; + priv->enable = true; + +if (pdata) + priv->test = pdata->test; + + bridge =fpga_bridge_register (dev,"Fake FPGA Bridge" , + &fake_fpga_bridge_ops, priv); +if (IS_ERR (bridge)) +return PTR_ERR (bridge); + +platform_set_drvdata (pdev, bridge); + +return 0 ; +} + +static int fake_fpga_bridge_remove (struct platform_device *pdev) +{ +struct fpga_bridge *bridge =platform_get_drvdata (pdev); + +fpga_bridge_unregister (bridge); + +return 0 ; +} + +static struct platform_driver fake_fpga_bridge_drv = { + .driver = { + .name =FAKE_FPGA_BRIDGE_DEV_NAME + }, + .probe = fake_fpga_bridge_probe, + .remove = fake_fpga_bridge_remove, +}; + +module_platform_driver (fake_fpga_bridge_drv); + +MODULE_AUTHOR ("Marco Pagani <[email protected]>" ); +MODULE_DESCRIPTION ("Fake FPGA Bridge" ); +MODULE_LICENSE ("GPL v2" );
drivers/fpga/tests/fake-fpga-bridge.h new file +36 -0
@@ -0,0 +1,36 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Header file for the fake FPGA bridge +* +* Copyright (C) 2023 Red Hat, Inc. +* +* Author: Marco Pagani <[email protected]> +*/ + +#ifndef __FPGA_FAKE_BRIDGE_H +#define __FPGA_FAKE_BRIDGE_H + +#include <linux/platform_device.h> +#include <kunit/test.h> + +/** +* struct fake_fpga_bridge - fake FPGA bridge context data structure +* +* @bridge: FPGA bridge. +* @pdev: platform device of the FPGA bridge. +*/ +struct fake_fpga_bridge { +struct fpga_bridge *bridge; +struct platform_device *pdev; +}; + +int fake_fpga_bridge_register (struct fake_fpga_bridge *bridge_ctx, +struct device *parent,struct kunit *test); + +void fake_fpga_bridge_unregister (struct fake_fpga_bridge *bridge_ctx); + +int fake_fpga_bridge_get_state (const struct fake_fpga_bridge *bridge_ctx); + +int fake_fpga_bridge_get_cycles_count (const struct fake_fpga_bridge *bridge_ctx); + +#endif /* __FPGA_FAKE_BRIDGE_H */
Signature · 1 line
2.39.2
Xu Yilun
maintainerRe: [RFC PATCH v2 2/4] fpga: add fake FPGA bridge
Quoted 47 lines · Marco Pagani
Add fake FPGA bridge driver with support functions. The driver includes a counter for the number of switching cycles. This module is part of the KUnit tests for the FPGA subsystem.
Signed-off-by Marco Pagani <[email protected]>--- drivers/fpga/tests/fake-fpga-bridge.c | 228 ++++++++++++++++++++++++++ drivers/fpga/tests/fake-fpga-bridge.h | 36 ++++ 2 files changed, 264 insertions(+) create mode 100644 drivers/fpga/tests/fake-fpga-bridge.c create mode 100644 drivers/fpga/tests/fake-fpga-bridge.hdrivers/fpga/tests/fake-fpga-bridge.c new file +29
-0@@ -0,0 +1,228 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Driver for the fake FPGA bridge +* +* Copyright (C) 2023 Red Hat, Inc. +* +* Author: Marco Pagani <[email protected]> +*/ + +#include <linux/types.h> +#include <linux/device.h> +#include <linux/platform_device.h> +#include <linux/fpga/fpga-bridge.h> +#include <kunit/test.h> + +#include "fake-fpga-bridge.h" + +#define FAKE_FPGA_BRIDGE_DEV_NAME "fake_fpga_bridge" + +struct fake_bridge_priv { +int id; +bool enable; +int cycles_count; +struct kunit *test; +}; + +struct fake_bridge_data { +struct kunit *test; +};
drivers/fpga/tests/fake-fpga-bridge.c line 39
Quoted 10 lines
drivers/fpga/tests/fake-fpga-bridge.c new file +10
-0+ +static int op_enable_show (struct fpga_bridge *bridge) +{ +struct fake_bridge_priv *priv; + + priv = bridge->priv; + +if (priv->test) +kunit_info (priv->test,"Fake FPGA bridge %d: enable_show\n" , + priv->id);
Why check the kunit pointer every time? I remember you mentioned that the fake fpga modules are expected to be used out of Kunit test, so the priv->test may be NULL? I suggest you work on these usecases in separate patchsets. For now just check priv->test on probe is fine.
Quoted 38 lines
drivers/fpga/tests/fake-fpga-bridge.c new file +38
-0+ +return priv->enable; +} + +static int op_enable_set (struct fpga_bridge *bridge,bool enable) +{ +struct fake_bridge_priv *priv; + + priv = bridge->priv; + +if (enable && !priv->enable) + priv->cycles_count++; + + priv->enable = enable; + +if (priv->test) +kunit_info (priv->test,"Fake FPGA bridge %d: enable_set: %d\n" , + priv->id, enable); + +return 0 ; +} + +static void op_remove (struct fpga_bridge *bridge) +{ +struct fake_bridge_priv *priv; + + priv = bridge->priv; + +if (priv->test) +kunit_info (priv->test,"Fake FPGA bridge: remove\n" ); +} + +static const struct fpga_bridge_ops fake_fpga_bridge_ops = { + .enable_show = op_enable_show, + .enable_set = op_enable_set, + .fpga_bridge_remove = op_remove, +}; +
drivers/fpga/tests/fake-fpga-bridge.c line 87
Quoted 10 lines
drivers/fpga/tests/fake-fpga-bridge.c new file +10
-0+/** +* fake_fpga_bridge_register() - register a fake FPGA bridge. +* @bridge_ctx: fake FPGA bridge context data structure. +* @parent: parent device. +* @test: KUnit test context object. +* +* Return: 0 if registration succeeded, an error code otherwise. +*/ +int fake_fpga_bridge_register (struct fake_fpga_bridge *bridge_ctx, +struct device *parent,struct kunit *test)
struct fake_fpga_bridge *fake_fpga_bridge_register(struct device *parent, ...)
Is it better?
Thanks,
Yilun
Quoted 186 lines
drivers/fpga/tests/fake-fpga-bridge.c new file +141
-0+{ +struct fake_bridge_data pdata; +struct fake_bridge_priv *priv; +int ret; + + pdata.test = test; + + bridge_ctx->pdev =platform_device_alloc (FAKE_FPGA_BRIDGE_DEV_NAME , +PLATFORM_DEVID_AUTO ); +if (IS_ERR (bridge_ctx->pdev)) { +pr_err ("Fake FPGA bridge device allocation failed\n" ); +return -ENOMEM ; + } + + bridge_ctx->pdev->dev.parent = parent; +platform_device_add_data (bridge_ctx->pdev, &pdata,sizeof (pdata)); + + ret =platform_device_add (bridge_ctx->pdev); +if (ret) { +pr_err ("Fake FPGA bridge device add failed\n" ); +platform_device_put (bridge_ctx->pdev); +return ret; + } + + bridge_ctx->bridge =platform_get_drvdata (bridge_ctx->pdev); + +if (test) { + priv = bridge_ctx->bridge->priv; +kunit_info (test,"Fake FPGA bridge %d registered\n" , priv->id); + } + +return 0 ; +} +EXPORT_SYMBOL_GPL (fake_fpga_bridge_register); + +/** +* fake_fpga_bridge_unregister() - unregister a fake FPGA bridge. +* @bridge_ctx: fake FPGA bridge context data structure. +*/ +void fake_fpga_bridge_unregister (struct fake_fpga_bridge *bridge_ctx) +{ +struct fake_bridge_priv *priv; +struct kunit *test; +int id; + +if (!bridge_ctx) +return ; + + priv = bridge_ctx->bridge->priv; + test = priv->test; + id = priv->id; + +if (bridge_ctx->pdev) { +platform_device_unregister (bridge_ctx->pdev); +if (test) +kunit_info (test,"Fake FPGA bridge %d unregistered\n" , id); + } +} +EXPORT_SYMBOL_GPL (fake_fpga_bridge_unregister); + +/** +* fake_fpga_bridge_get_state() - get state of a fake FPGA bridge. +* @bridge_ctx: fake FPGA bridge context data structure. +* +* Return: 1 if the bridge is enabled, 0 if disabled. +*/ +int fake_fpga_bridge_get_state (const struct fake_fpga_bridge *bridge_ctx) +{ +return bridge_ctx->bridge->br_ops->enable_show (bridge_ctx->bridge); +} +EXPORT_SYMBOL_GPL (fake_fpga_bridge_get_state); + +/** +* fake_fpga_bridge_get_cycles_count() - get the number of switching cycles. +* @bridge_ctx: fake FPGA bridge context data structure. +* +* Return: number of switching cycles. +*/ +int fake_fpga_bridge_get_cycles_count (const struct fake_fpga_bridge *bridge_ctx) +{ +struct fake_bridge_priv *priv; + + priv = bridge_ctx->bridge->priv; + +return priv->cycles_count; +} +EXPORT_SYMBOL_GPL (fake_fpga_bridge_get_cycles_count); + +static int fake_fpga_bridge_probe (struct platform_device *pdev) +{ +struct device *dev; +struct fpga_bridge *bridge; +struct fake_bridge_data *pdata; +struct fake_bridge_priv *priv; +static int id_count; + + dev = &pdev->dev; + pdata =dev_get_platdata (dev); + + priv =devm_kzalloc (dev,sizeof (*priv),GFP_KERNEL ); +if (!priv) +return -ENOMEM ; + + priv->id = id_count++; + priv->enable = true; + +if (pdata) + priv->test = pdata->test; + + bridge =fpga_bridge_register (dev,"Fake FPGA Bridge" , + &fake_fpga_bridge_ops, priv); +if (IS_ERR (bridge)) +return PTR_ERR (bridge); + +platform_set_drvdata (pdev, bridge); + +return 0 ; +} + +static int fake_fpga_bridge_remove (struct platform_device *pdev) +{ +struct fpga_bridge *bridge =platform_get_drvdata (pdev); + +fpga_bridge_unregister (bridge); + +return 0 ; +} + +static struct platform_driver fake_fpga_bridge_drv = { + .driver = { + .name =FAKE_FPGA_BRIDGE_DEV_NAME + }, + .probe = fake_fpga_bridge_probe, + .remove = fake_fpga_bridge_remove, +}; + +module_platform_driver (fake_fpga_bridge_drv); + +MODULE_AUTHOR ("Marco Pagani <[email protected]>" ); +MODULE_DESCRIPTION ("Fake FPGA Bridge" ); +MODULE_LICENSE ("GPL v2" );drivers/fpga/tests/fake-fpga-bridge.h new file +36
-0@@ -0,0 +1,36 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Header file for the fake FPGA bridge +* +* Copyright (C) 2023 Red Hat, Inc. +* +* Author: Marco Pagani <[email protected]> +*/ + +#ifndef __FPGA_FAKE_BRIDGE_H +#define __FPGA_FAKE_BRIDGE_H + +#include <linux/platform_device.h> +#include <kunit/test.h> + +/** +* struct fake_fpga_bridge - fake FPGA bridge context data structure +* +* @bridge: FPGA bridge. +* @pdev: platform device of the FPGA bridge. +*/ +struct fake_fpga_bridge { +struct fpga_bridge *bridge; +struct platform_device *pdev; +}; + +int fake_fpga_bridge_register (struct fake_fpga_bridge *bridge_ctx, +struct device *parent,struct kunit *test); + +void fake_fpga_bridge_unregister (struct fake_fpga_bridge *bridge_ctx); + +int fake_fpga_bridge_get_state (const struct fake_fpga_bridge *bridge_ctx); + +int fake_fpga_bridge_get_cycles_count (const struct fake_fpga_bridge *bridge_ctx); + +#endif /* __FPGA_FAKE_BRIDGE_H */ Signature · 1 line
2.39.2
Re: [RFC PATCH v2 2/4] fpga: add fake FPGA bridge
Quoted 55 lines · Xu Yilun
Quoted 54 lines · Marco Pagani
Add fake FPGA bridge driver with support functions. The driver includes a counter for the number of switching cycles. This module is part of the KUnit tests for the FPGA subsystem.
Signed-off-by Marco Pagani <[email protected]>--- drivers/fpga/tests/fake-fpga-bridge.c | 228 ++++++++++++++++++++++++++ drivers/fpga/tests/fake-fpga-bridge.h | 36 ++++ 2 files changed, 264 insertions(+) create mode 100644 drivers/fpga/tests/fake-fpga-bridge.c create mode 100644 drivers/fpga/tests/fake-fpga-bridge.hdrivers/fpga/tests/fake-fpga-bridge.c new file +36
-0@@ -0,0 +1,228 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Driver for the fake FPGA bridge +* +* Copyright (C) 2023 Red Hat, Inc. +* +* Author: Marco Pagani <[email protected]> +*/ + +#include <linux/types.h> +#include <linux/device.h> +#include <linux/platform_device.h> +#include <linux/fpga/fpga-bridge.h> +#include <kunit/test.h> + +#include "fake-fpga-bridge.h" + +#define FAKE_FPGA_BRIDGE_DEV_NAME "fake_fpga_bridge" + +struct fake_bridge_priv { +int id; +bool enable; +int cycles_count; +struct kunit *test; +}; + +struct fake_bridge_data { +struct kunit *test; +}; + +static int op_enable_show (struct fpga_bridge *bridge) +{ +struct fake_bridge_priv *priv; + + priv = bridge->priv; +
Quoted 9 lines
drivers/fpga/tests/fake-fpga-bridge.c line 39
Quoted 3 lines
drivers/fpga/tests/fake-fpga-bridge.c new file +3
-0+if (priv->test) +kunit_info (priv->test,"Fake FPGA bridge %d: enable_show\n" , + priv->id);Why check the kunit pointer every time? I remember you mentioned that the fake fpga modules are expected to be used out of Kunit test, so the
priv->testmay be NULL? I suggest you work on these usecases in separate patchsets. For now just checkpriv->teston probe is fine.
The idea was to provide additional info messages, tied with the test, if the fake bridge is registered with a test instance. If you believe these prints are unnecessary, I can remove them or replace them with generic dev_info().
Quoted 51 lines
Quoted 38 lines
drivers/fpga/tests/fake-fpga-bridge.c new file +38
-0+ +return priv->enable; +} + +static int op_enable_set (struct fpga_bridge *bridge,bool enable) +{ +struct fake_bridge_priv *priv; + + priv = bridge->priv; + +if (enable && !priv->enable) + priv->cycles_count++; + + priv->enable = enable; + +if (priv->test) +kunit_info (priv->test,"Fake FPGA bridge %d: enable_set: %d\n" , + priv->id, enable); + +return 0 ; +} + +static void op_remove (struct fpga_bridge *bridge) +{ +struct fake_bridge_priv *priv; + + priv = bridge->priv; + +if (priv->test) +kunit_info (priv->test,"Fake FPGA bridge: remove\n" ); +} + +static const struct fpga_bridge_ops fake_fpga_bridge_ops = { + .enable_show = op_enable_show, + .enable_set = op_enable_set, + .fpga_bridge_remove = op_remove, +}; +drivers/fpga/tests/fake-fpga-bridge.c line 87
Quoted 10 lines
drivers/fpga/tests/fake-fpga-bridge.c new file +10
-0+/** +* fake_fpga_bridge_register() - register a fake FPGA bridge. +* @bridge_ctx: fake FPGA bridge context data structure. +* @parent: parent device. +* @test: KUnit test context object. +* +* Return: 0 if registration succeeded, an error code otherwise. +*/ +int fake_fpga_bridge_register (struct fake_fpga_bridge *bridge_ctx, +struct device *parent,struct kunit *test)struct
fake_fpga_bridge*fake_fpga_bridge_register(struct device *parent, ...)
Quoted 4 lines
Is it better?
Thanks,
Yilun
Agreed, it is better. I'll change the registration functions for the fake bridge, manager, and region in the next version.
Quoted 179 lines
Quoted 179 lines
drivers/fpga/tests/fake-fpga-bridge.c new file +141
-0+{ +struct fake_bridge_data pdata; +struct fake_bridge_priv *priv; +int ret; + + pdata.test = test; + + bridge_ctx->pdev =platform_device_alloc (FAKE_FPGA_BRIDGE_DEV_NAME , +PLATFORM_DEVID_AUTO ); +if (IS_ERR (bridge_ctx->pdev)) { +pr_err ("Fake FPGA bridge device allocation failed\n" ); +return -ENOMEM ; + } + + bridge_ctx->pdev->dev.parent = parent; +platform_device_add_data (bridge_ctx->pdev, &pdata,sizeof (pdata)); + + ret =platform_device_add (bridge_ctx->pdev); +if (ret) { +pr_err ("Fake FPGA bridge device add failed\n" ); +platform_device_put (bridge_ctx->pdev); +return ret; + } + + bridge_ctx->bridge =platform_get_drvdata (bridge_ctx->pdev); + +if (test) { + priv = bridge_ctx->bridge->priv; +kunit_info (test,"Fake FPGA bridge %d registered\n" , priv->id); + } + +return 0 ; +} +EXPORT_SYMBOL_GPL (fake_fpga_bridge_register); + +/** +* fake_fpga_bridge_unregister() - unregister a fake FPGA bridge. +* @bridge_ctx: fake FPGA bridge context data structure. +*/ +void fake_fpga_bridge_unregister (struct fake_fpga_bridge *bridge_ctx) +{ +struct fake_bridge_priv *priv; +struct kunit *test; +int id; + +if (!bridge_ctx) +return ; + + priv = bridge_ctx->bridge->priv; + test = priv->test; + id = priv->id; + +if (bridge_ctx->pdev) { +platform_device_unregister (bridge_ctx->pdev); +if (test) +kunit_info (test,"Fake FPGA bridge %d unregistered\n" , id); + } +} +EXPORT_SYMBOL_GPL (fake_fpga_bridge_unregister); + +/** +* fake_fpga_bridge_get_state() - get state of a fake FPGA bridge. +* @bridge_ctx: fake FPGA bridge context data structure. +* +* Return: 1 if the bridge is enabled, 0 if disabled. +*/ +int fake_fpga_bridge_get_state (const struct fake_fpga_bridge *bridge_ctx) +{ +return bridge_ctx->bridge->br_ops->enable_show (bridge_ctx->bridge); +} +EXPORT_SYMBOL_GPL (fake_fpga_bridge_get_state); + +/** +* fake_fpga_bridge_get_cycles_count() - get the number of switching cycles. +* @bridge_ctx: fake FPGA bridge context data structure. +* +* Return: number of switching cycles. +*/ +int fake_fpga_bridge_get_cycles_count (const struct fake_fpga_bridge *bridge_ctx) +{ +struct fake_bridge_priv *priv; + + priv = bridge_ctx->bridge->priv; + +return priv->cycles_count; +} +EXPORT_SYMBOL_GPL (fake_fpga_bridge_get_cycles_count); + +static int fake_fpga_bridge_probe (struct platform_device *pdev) +{ +struct device *dev; +struct fpga_bridge *bridge; +struct fake_bridge_data *pdata; +struct fake_bridge_priv *priv; +static int id_count; + + dev = &pdev->dev; + pdata =dev_get_platdata (dev); + + priv =devm_kzalloc (dev,sizeof (*priv),GFP_KERNEL ); +if (!priv) +return -ENOMEM ; + + priv->id = id_count++; + priv->enable = true; + +if (pdata) + priv->test = pdata->test; + + bridge =fpga_bridge_register (dev,"Fake FPGA Bridge" , + &fake_fpga_bridge_ops, priv); +if (IS_ERR (bridge)) +return PTR_ERR (bridge); + +platform_set_drvdata (pdev, bridge); + +return 0 ; +} + +static int fake_fpga_bridge_remove (struct platform_device *pdev) +{ +struct fpga_bridge *bridge =platform_get_drvdata (pdev); + +fpga_bridge_unregister (bridge); + +return 0 ; +} + +static struct platform_driver fake_fpga_bridge_drv = { + .driver = { + .name =FAKE_FPGA_BRIDGE_DEV_NAME + }, + .probe = fake_fpga_bridge_probe, + .remove = fake_fpga_bridge_remove, +}; + +module_platform_driver (fake_fpga_bridge_drv); + +MODULE_AUTHOR ("Marco Pagani <[email protected]>" ); +MODULE_DESCRIPTION ("Fake FPGA Bridge" ); +MODULE_LICENSE ("GPL v2" );drivers/fpga/tests/fake-fpga-bridge.h new file +31
-0@@ -0,0 +1,36 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Header file for the fake FPGA bridge +* +* Copyright (C) 2023 Red Hat, Inc. +* +* Author: Marco Pagani <[email protected]> +*/ + +#ifndef __FPGA_FAKE_BRIDGE_H +#define __FPGA_FAKE_BRIDGE_H + +#include <linux/platform_device.h> +#include <kunit/test.h> + +/** +* struct fake_fpga_bridge - fake FPGA bridge context data structure +* +* @bridge: FPGA bridge. +* @pdev: platform device of the FPGA bridge. +*/ +struct fake_fpga_bridge { +struct fpga_bridge *bridge; +struct platform_device *pdev; +}; + +int fake_fpga_bridge_register (struct fake_fpga_bridge *bridge_ctx, +struct device *parent,struct kunit *test); + +void fake_fpga_bridge_unregister (struct fake_fpga_bridge *bridge_ctx); +
Quoted 8 lines
Quoted 8 lines
drivers/fpga/tests/fake-fpga-bridge.h new file +5
-0+int fake_fpga_bridge_get_state (const struct fake_fpga_bridge *bridge_ctx); + +int fake_fpga_bridge_get_cycles_count (const struct fake_fpga_bridge *bridge_ctx); + +#endif /* __FPGA_FAKE_BRIDGE_H */ Signature · 1 line
2.39.2
Thanks,
Marco
Xu Yilun
maintainerRe: [RFC PATCH v2 2/4] fpga: add fake FPGA bridge
Quoted 68 lines · Marco Pagani
Quoted 55 lines · Xu Yilun
Quoted 54 lines · Marco Pagani
Add fake FPGA bridge driver with support functions. The driver includes a counter for the number of switching cycles. This module is part of the KUnit tests for the FPGA subsystem.
Signed-off-by Marco Pagani <[email protected]>--- drivers/fpga/tests/fake-fpga-bridge.c | 228 ++++++++++++++++++++++++++ drivers/fpga/tests/fake-fpga-bridge.h | 36 ++++ 2 files changed, 264 insertions(+) create mode 100644 drivers/fpga/tests/fake-fpga-bridge.c create mode 100644 drivers/fpga/tests/fake-fpga-bridge.hdrivers/fpga/tests/fake-fpga-bridge.c new file +36
-0@@ -0,0 +1,228 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Driver for the fake FPGA bridge +* +* Copyright (C) 2023 Red Hat, Inc. +* +* Author: Marco Pagani <[email protected]> +*/ + +#include <linux/types.h> +#include <linux/device.h> +#include <linux/platform_device.h> +#include <linux/fpga/fpga-bridge.h> +#include <kunit/test.h> + +#include "fake-fpga-bridge.h" + +#define FAKE_FPGA_BRIDGE_DEV_NAME "fake_fpga_bridge" + +struct fake_bridge_priv { +int id; +bool enable; +int cycles_count; +struct kunit *test; +}; + +struct fake_bridge_data { +struct kunit *test; +}; + +static int op_enable_show (struct fpga_bridge *bridge) +{ +struct fake_bridge_priv *priv; + + priv = bridge->priv; +Quoted 9 lines
drivers/fpga/tests/fake-fpga-bridge.c line 39
Quoted 3 lines
drivers/fpga/tests/fake-fpga-bridge.c new file +3
-0+if (priv->test) +kunit_info (priv->test,"Fake FPGA bridge %d: enable_show\n" , + priv->id);Why check the kunit pointer every time? I remember you mentioned that the fake fpga modules are expected to be used out of Kunit test, so the
priv->testmay be NULL? I suggest you work on these usecases in separate patchsets. For now just checkpriv->teston probe is fine.
Quoted 3 lines
The idea was to provide additional info messages, tied with the test, if the fake bridge is registered with a test instance. If you believe these prints are unnecessary, I can remove them or replace them with generic
dev_info().
OK, on second thought, it's good to me.
Thanks,
Yilun
RFC PATCH v2 3/4 fpga: add fake FPGA region
In reply to Marco PaganiAdd fake FPGA region platform driver with support functions. This module is part of the KUnit tests for the FPGA subsystem.
--- drivers/fpga/tests/fake-fpga-region.c | 219 ++++++++++++++++++++++++++ drivers/fpga/tests/fake-fpga-region.h | 38 +++++ 2 files changed, 257 insertions(+) create mode 100644 drivers/fpga/tests/fake-fpga-region.c create mode 100644 drivers/fpga/tests/fake-fpga-region.h
drivers/fpga/tests/fake-fpga-region.c new file +219 -0
@@ -0,0 +1,219 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Driver for the fake FPGA region +* +* Copyright (C) 2023 Red Hat, Inc. +* +* Author: Marco Pagani <[email protected]> +*/ + +#include <linux/device.h> +#include <linux/list.h> +#include <linux/platform_device.h> +#include <linux/fpga/fpga-mgr.h> +#include <linux/fpga/fpga-region.h> +#include <linux/fpga/fpga-bridge.h> +#include <kunit/test.h> + +#include "fake-fpga-region.h" + +#define FAKE_FPGA_REGION_DEV_NAME "fake_fpga_region" + +struct fake_region_priv { +int id; +struct kunit *test; +struct list_head bridge_list; +}; + +struct fake_region_data { +struct fpga_manager *mgr; +struct kunit *test; +}; + +/** +* fake_fpga_region_register() - register a fake FPGA region. +* @region_ctx: fake FPGA region context data structure. +* @mgr: associated FPGA manager. +* @parent: parent device. +* @test: KUnit test context object. +* +* Return: 0 if registration succeeded, an error code otherwise. +*/ +int fake_fpga_region_register (struct fake_fpga_region *region_ctx, +struct fpga_manager *mgr,struct device *parent, +struct kunit *test) +{ +struct fake_region_data pdata; +struct fake_region_priv *priv; +int ret; + + pdata.mgr = mgr; + pdata.test = test; + + region_ctx->pdev =platform_device_alloc (FAKE_FPGA_REGION_DEV_NAME , +PLATFORM_DEVID_AUTO ); +if (IS_ERR (region_ctx->pdev)) { +pr_err ("Fake FPGA region device allocation failed\n" ); +return -ENOMEM ; + } + + region_ctx->pdev->dev.parent = parent; +platform_device_add_data (region_ctx->pdev, &pdata,sizeof (pdata)); + + ret =platform_device_add (region_ctx->pdev); +if (ret) { +pr_err ("Fake FPGA region device add failed\n" ); +platform_device_put (region_ctx->pdev); +return ret; + } + + region_ctx->region =platform_get_drvdata (region_ctx->pdev); + +if (test) { + priv = region_ctx->region->priv; +kunit_info (test,"Fake FPGA region %d registered\n" , priv->id); + } + +return 0 ; +} +EXPORT_SYMBOL_GPL (fake_fpga_region_register); + +/** +* fake_fpga_region_unregister() - unregister a fake FPGA region. +* @region_ctx: fake FPGA region context data structure. +*/ +void fake_fpga_region_unregister (struct fake_fpga_region *region_ctx) +{ +struct fake_region_priv *priv; +struct kunit *test; +int id; + +if (!region_ctx) +return ; + + priv = region_ctx->region->priv; + test = priv->test; + id = priv->id; + +if (region_ctx->pdev) { +platform_device_unregister (region_ctx->pdev); +if (test) +kunit_info (test,"Fake FPGA region %d unregistered\n" , id); + } +} +EXPORT_SYMBOL_GPL (fake_fpga_region_unregister); + +/** +* fake_fpga_region_add_bridge() - add a bridge to a fake FPGA region. +* @region_ctx: fake FPGA region context data structure. +* @bridge: FPGA bridge. +* +* Return: 0 if registration succeeded, an error code otherwise. +*/ +void fake_fpga_region_add_bridge (struct fake_fpga_region *region_ctx, +struct fpga_bridge *bridge) +{ +struct fake_region_priv *priv; + + priv = region_ctx->region->priv; + +/* Add bridge to the list of bridges in the private context */ +list_add (&bridge->node, &priv->bridge_list); + +if (priv->test) +kunit_info (priv->test,"Bridge added to fake FPGA region %d\n" , + priv->id); +} +EXPORT_SYMBOL_GPL (fake_fpga_region_add_bridge); + +static int fake_region_get_bridges (struct fpga_region *region) +{ +struct fake_region_priv *priv; +struct fpga_bridge *bridge, *tmp; +int ret; + + priv = region->priv; + +list_for_each_entry_safe (bridge, tmp, &priv->bridge_list, node) { +list_del (&bridge->node); + ret =fpga_bridge_get_to_list (bridge->dev.parent, + region->info, + ®ion->bridge_list); +if (ret) +break ; + } + +return ret; +} + +static int fake_fpga_region_probe (struct platform_device *pdev) +{ +struct device *dev; +struct fpga_region *region; +struct fpga_manager *mgr; +struct fake_region_data *pdata; +struct fake_region_priv *priv; +struct fpga_region_info info; +static int id_count; + + dev = &pdev->dev; + pdata =dev_get_platdata (dev); + +if (!pdata) { +dev_err (&pdev->dev,"Missing platform data\n" ); +return -EINVAL ; + } + + priv =devm_kzalloc (dev,sizeof (*priv),GFP_KERNEL ); +if (!priv) +return -ENOMEM ; + + mgr =fpga_mgr_get (pdata->mgr->dev.parent); +if (IS_ERR (mgr)) +return PTR_ERR (mgr); + +INIT_LIST_HEAD (&priv->bridge_list); + priv->id = id_count++; + priv->test = pdata->test; + +memset (&info,0 ,sizeof (info)); + info.priv = priv; + info.mgr = mgr; + info.get_bridges = fake_region_get_bridges; + + region =fpga_region_register_full (dev, &info); +if (IS_ERR (region)) { +fpga_mgr_put (mgr); +return PTR_ERR (region); + } + +platform_set_drvdata (pdev, region); + +return 0 ; +} + +static int fake_fpga_region_remove (struct platform_device *pdev) +{ +struct fpga_region *region =platform_get_drvdata (pdev); +struct fpga_manager *mgr = region->mgr; + +fpga_mgr_put (mgr); +fpga_bridges_put (®ion->bridge_list); +fpga_region_unregister (region); + +return 0 ; +} + +static struct platform_driver fake_fpga_region_drv = { + .driver = { + .name =FAKE_FPGA_REGION_DEV_NAME + }, + .probe = fake_fpga_region_probe, + .remove = fake_fpga_region_remove, +}; + +module_platform_driver (fake_fpga_region_drv); + +MODULE_AUTHOR ("Marco Pagani <[email protected]>" ); +MODULE_DESCRIPTION ("Fake FPGA Bridge" ); +MODULE_LICENSE ("GPL v2" );
drivers/fpga/tests/fake-fpga-region.h new file +38 -0
@@ -0,0 +1,38 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Header file for the fake FPGA region +* +* Copyright (C) 2023 Red Hat, Inc. +* +* Author: Marco Pagani <[email protected]> +*/ + +#ifndef __FPGA_FAKE_RGN_H +#define __FPGA_FAKE_RGN_H + +#include <linux/platform_device.h> +#include <kunit/test.h> +#include <linux/fpga/fpga-mgr.h> +#include <linux/fpga/fpga-bridge.h> + +/** +* struct fake_fpga_region - fake FPGA region context data structure +* +* @region: FPGA region. +* @pdev: platform device of the FPGA region. +*/ +struct fake_fpga_region { +struct fpga_region *region; +struct platform_device *pdev; +}; + +int fake_fpga_region_register (struct fake_fpga_region *region_ctx, +struct fpga_manager *mgr,struct device *parent, +struct kunit *test); + +void fake_fpga_region_add_bridge (struct fake_fpga_region *region_ctx, +struct fpga_bridge *bridge); + +void fake_fpga_region_unregister (struct fake_fpga_region *region_ctx); + +#endif /* __FPGA_FAKE_RGN_H */
Signature · 1 line
2.39.2
Xu Yilun
maintainerRe: [RFC PATCH v2 3/4] fpga: add fake FPGA region
Quoted 145 lines · Marco Pagani
Add fake FPGA region platform driver with support functions. This module is part of the KUnit tests for the FPGA subsystem.
Signed-off-by Marco Pagani <[email protected]>--- drivers/fpga/tests/fake-fpga-region.c | 219 ++++++++++++++++++++++++++ drivers/fpga/tests/fake-fpga-region.h | 38 +++++ 2 files changed, 257 insertions(+) create mode 100644 drivers/fpga/tests/fake-fpga-region.c create mode 100644 drivers/fpga/tests/fake-fpga-region.hdrivers/fpga/tests/fake-fpga-region.c new file +128
-0@@ -0,0 +1,219 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Driver for the fake FPGA region +* +* Copyright (C) 2023 Red Hat, Inc. +* +* Author: Marco Pagani <[email protected]> +*/ + +#include <linux/device.h> +#include <linux/list.h> +#include <linux/platform_device.h> +#include <linux/fpga/fpga-mgr.h> +#include <linux/fpga/fpga-region.h> +#include <linux/fpga/fpga-bridge.h> +#include <kunit/test.h> + +#include "fake-fpga-region.h" + +#define FAKE_FPGA_REGION_DEV_NAME "fake_fpga_region" + +struct fake_region_priv { +int id; +struct kunit *test; +struct list_head bridge_list; +}; + +struct fake_region_data { +struct fpga_manager *mgr; +struct kunit *test; +}; + +/** +* fake_fpga_region_register() - register a fake FPGA region. +* @region_ctx: fake FPGA region context data structure. +* @mgr: associated FPGA manager. +* @parent: parent device. +* @test: KUnit test context object. +* +* Return: 0 if registration succeeded, an error code otherwise. +*/ +int fake_fpga_region_register (struct fake_fpga_region *region_ctx, +struct fpga_manager *mgr,struct device *parent, +struct kunit *test) +{ +struct fake_region_data pdata; +struct fake_region_priv *priv; +int ret; + + pdata.mgr = mgr; + pdata.test = test; + + region_ctx->pdev =platform_device_alloc (FAKE_FPGA_REGION_DEV_NAME , +PLATFORM_DEVID_AUTO ); +if (IS_ERR (region_ctx->pdev)) { +pr_err ("Fake FPGA region device allocation failed\n" ); +return -ENOMEM ; + } + + region_ctx->pdev->dev.parent = parent; +platform_device_add_data (region_ctx->pdev, &pdata,sizeof (pdata)); + + ret =platform_device_add (region_ctx->pdev); +if (ret) { +pr_err ("Fake FPGA region device add failed\n" ); +platform_device_put (region_ctx->pdev); +return ret; + } + + region_ctx->region =platform_get_drvdata (region_ctx->pdev); + +if (test) { + priv = region_ctx->region->priv; +kunit_info (test,"Fake FPGA region %d registered\n" , priv->id); + } + +return 0 ; +} +EXPORT_SYMBOL_GPL (fake_fpga_region_register); + +/** +* fake_fpga_region_unregister() - unregister a fake FPGA region. +* @region_ctx: fake FPGA region context data structure. +*/ +void fake_fpga_region_unregister (struct fake_fpga_region *region_ctx) +{ +struct fake_region_priv *priv; +struct kunit *test; +int id; + +if (!region_ctx) +return ; + + priv = region_ctx->region->priv; + test = priv->test; + id = priv->id; + +if (region_ctx->pdev) { +platform_device_unregister (region_ctx->pdev); +if (test) +kunit_info (test,"Fake FPGA region %d unregistered\n" , id); + } +} +EXPORT_SYMBOL_GPL (fake_fpga_region_unregister); + +/** +* fake_fpga_region_add_bridge() - add a bridge to a fake FPGA region. +* @region_ctx: fake FPGA region context data structure. +* @bridge: FPGA bridge. +* +* Return: 0 if registration succeeded, an error code otherwise. +*/ +void fake_fpga_region_add_bridge (struct fake_fpga_region *region_ctx, +struct fpga_bridge *bridge) +{ +struct fake_region_priv *priv; + + priv = region_ctx->region->priv; + +/* Add bridge to the list of bridges in the private context */ +list_add (&bridge->node, &priv->bridge_list); + +if (priv->test) +kunit_info (priv->test,"Bridge added to fake FPGA region %d\n" , + priv->id); +} +EXPORT_SYMBOL_GPL (fake_fpga_region_add_bridge); +
drivers/fpga/tests/fake-fpga-region.c line 138
Quoted 10 lines
drivers/fpga/tests/fake-fpga-region.c new file +10
-0+static int fake_region_get_bridges (struct fpga_region *region) +{ +struct fake_region_priv *priv; +struct fpga_bridge *bridge, *tmp; +int ret; + + priv = region->priv; + +list_for_each_entry_safe (bridge, tmp, &priv->bridge_list, node) { +list_del (&bridge->node);
I think the fake_fpga_region user just need to call fake_fpga_region_add_bridge() once on init, and may call fpga_bridges_put() at any time after fpga_region_program_fpga(), then you may lose the track of the bridges, which breaks the next fpga_region_program_fpga().
Thanks,
Yilun
Quoted 128 lines
drivers/fpga/tests/fake-fpga-region.c new file +81
-0+ ret =fpga_bridge_get_to_list (bridge->dev.parent, + region->info, + ®ion->bridge_list); +if (ret) +break ; + } + +return ret; +} + +static int fake_fpga_region_probe (struct platform_device *pdev) +{ +struct device *dev; +struct fpga_region *region; +struct fpga_manager *mgr; +struct fake_region_data *pdata; +struct fake_region_priv *priv; +struct fpga_region_info info; +static int id_count; + + dev = &pdev->dev; + pdata =dev_get_platdata (dev); + +if (!pdata) { +dev_err (&pdev->dev,"Missing platform data\n" ); +return -EINVAL ; + } + + priv =devm_kzalloc (dev,sizeof (*priv),GFP_KERNEL ); +if (!priv) +return -ENOMEM ; + + mgr =fpga_mgr_get (pdata->mgr->dev.parent); +if (IS_ERR (mgr)) +return PTR_ERR (mgr); + +INIT_LIST_HEAD (&priv->bridge_list); + priv->id = id_count++; + priv->test = pdata->test; + +memset (&info,0 ,sizeof (info)); + info.priv = priv; + info.mgr = mgr; + info.get_bridges = fake_region_get_bridges; + + region =fpga_region_register_full (dev, &info); +if (IS_ERR (region)) { +fpga_mgr_put (mgr); +return PTR_ERR (region); + } + +platform_set_drvdata (pdev, region); + +return 0 ; +} + +static int fake_fpga_region_remove (struct platform_device *pdev) +{ +struct fpga_region *region =platform_get_drvdata (pdev); +struct fpga_manager *mgr = region->mgr; + +fpga_mgr_put (mgr); +fpga_bridges_put (®ion->bridge_list); +fpga_region_unregister (region); + +return 0 ; +} + +static struct platform_driver fake_fpga_region_drv = { + .driver = { + .name =FAKE_FPGA_REGION_DEV_NAME + }, + .probe = fake_fpga_region_probe, + .remove = fake_fpga_region_remove, +}; + +module_platform_driver (fake_fpga_region_drv); + +MODULE_AUTHOR ("Marco Pagani <[email protected]>" ); +MODULE_DESCRIPTION ("Fake FPGA Bridge" ); +MODULE_LICENSE ("GPL v2" );drivers/fpga/tests/fake-fpga-region.h new file +38
-0@@ -0,0 +1,38 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Header file for the fake FPGA region +* +* Copyright (C) 2023 Red Hat, Inc. +* +* Author: Marco Pagani <[email protected]> +*/ + +#ifndef __FPGA_FAKE_RGN_H +#define __FPGA_FAKE_RGN_H + +#include <linux/platform_device.h> +#include <kunit/test.h> +#include <linux/fpga/fpga-mgr.h> +#include <linux/fpga/fpga-bridge.h> + +/** +* struct fake_fpga_region - fake FPGA region context data structure +* +* @region: FPGA region. +* @pdev: platform device of the FPGA region. +*/ +struct fake_fpga_region { +struct fpga_region *region; +struct platform_device *pdev; +}; + +int fake_fpga_region_register (struct fake_fpga_region *region_ctx, +struct fpga_manager *mgr,struct device *parent, +struct kunit *test); + +void fake_fpga_region_add_bridge (struct fake_fpga_region *region_ctx, +struct fpga_bridge *bridge); + +void fake_fpga_region_unregister (struct fake_fpga_region *region_ctx); + +#endif /* __FPGA_FAKE_RGN_H */ Signature · 1 line
2.39.2
Re: [RFC PATCH v2 3/4] fpga: add fake FPGA region
Quoted 163 lines · Xu Yilun
Quoted 145 lines · Marco Pagani
Add fake FPGA region platform driver with support functions. This module is part of the KUnit tests for the FPGA subsystem.
Signed-off-by Marco Pagani <[email protected]>--- drivers/fpga/tests/fake-fpga-region.c | 219 ++++++++++++++++++++++++++ drivers/fpga/tests/fake-fpga-region.h | 38 +++++ 2 files changed, 257 insertions(+) create mode 100644 drivers/fpga/tests/fake-fpga-region.c create mode 100644 drivers/fpga/tests/fake-fpga-region.hdrivers/fpga/tests/fake-fpga-region.c new file +128
-0@@ -0,0 +1,219 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Driver for the fake FPGA region +* +* Copyright (C) 2023 Red Hat, Inc. +* +* Author: Marco Pagani <[email protected]> +*/ + +#include <linux/device.h> +#include <linux/list.h> +#include <linux/platform_device.h> +#include <linux/fpga/fpga-mgr.h> +#include <linux/fpga/fpga-region.h> +#include <linux/fpga/fpga-bridge.h> +#include <kunit/test.h> + +#include "fake-fpga-region.h" + +#define FAKE_FPGA_REGION_DEV_NAME "fake_fpga_region" + +struct fake_region_priv { +int id; +struct kunit *test; +struct list_head bridge_list; +}; + +struct fake_region_data { +struct fpga_manager *mgr; +struct kunit *test; +}; + +/** +* fake_fpga_region_register() - register a fake FPGA region. +* @region_ctx: fake FPGA region context data structure. +* @mgr: associated FPGA manager. +* @parent: parent device. +* @test: KUnit test context object. +* +* Return: 0 if registration succeeded, an error code otherwise. +*/ +int fake_fpga_region_register (struct fake_fpga_region *region_ctx, +struct fpga_manager *mgr,struct device *parent, +struct kunit *test) +{ +struct fake_region_data pdata; +struct fake_region_priv *priv; +int ret; + + pdata.mgr = mgr; + pdata.test = test; + + region_ctx->pdev =platform_device_alloc (FAKE_FPGA_REGION_DEV_NAME , +PLATFORM_DEVID_AUTO ); +if (IS_ERR (region_ctx->pdev)) { +pr_err ("Fake FPGA region device allocation failed\n" ); +return -ENOMEM ; + } + + region_ctx->pdev->dev.parent = parent; +platform_device_add_data (region_ctx->pdev, &pdata,sizeof (pdata)); + + ret =platform_device_add (region_ctx->pdev); +if (ret) { +pr_err ("Fake FPGA region device add failed\n" ); +platform_device_put (region_ctx->pdev); +return ret; + } + + region_ctx->region =platform_get_drvdata (region_ctx->pdev); + +if (test) { + priv = region_ctx->region->priv; +kunit_info (test,"Fake FPGA region %d registered\n" , priv->id); + } + +return 0 ; +} +EXPORT_SYMBOL_GPL (fake_fpga_region_register); + +/** +* fake_fpga_region_unregister() - unregister a fake FPGA region. +* @region_ctx: fake FPGA region context data structure. +*/ +void fake_fpga_region_unregister (struct fake_fpga_region *region_ctx) +{ +struct fake_region_priv *priv; +struct kunit *test; +int id; + +if (!region_ctx) +return ; + + priv = region_ctx->region->priv; + test = priv->test; + id = priv->id; + +if (region_ctx->pdev) { +platform_device_unregister (region_ctx->pdev); +if (test) +kunit_info (test,"Fake FPGA region %d unregistered\n" , id); + } +} +EXPORT_SYMBOL_GPL (fake_fpga_region_unregister); + +/** +* fake_fpga_region_add_bridge() - add a bridge to a fake FPGA region. +* @region_ctx: fake FPGA region context data structure. +* @bridge: FPGA bridge. +* +* Return: 0 if registration succeeded, an error code otherwise. +*/ +void fake_fpga_region_add_bridge (struct fake_fpga_region *region_ctx, +struct fpga_bridge *bridge) +{ +struct fake_region_priv *priv; + + priv = region_ctx->region->priv; + +/* Add bridge to the list of bridges in the private context */ +list_add (&bridge->node, &priv->bridge_list); + +if (priv->test) +kunit_info (priv->test,"Bridge added to fake FPGA region %d\n" , + priv->id); +} +EXPORT_SYMBOL_GPL (fake_fpga_region_add_bridge); +drivers/fpga/tests/fake-fpga-region.c line 138
Quoted 10 lines
drivers/fpga/tests/fake-fpga-region.c new file +10
-0+static int fake_region_get_bridges (struct fpga_region *region) +{ +struct fake_region_priv *priv; +struct fpga_bridge *bridge, *tmp; +int ret; + + priv = region->priv; + +list_for_each_entry_safe (bridge, tmp, &priv->bridge_list, node) { +list_del (&bridge->node);I think the
fake_fpga_regionuser just need to callfake_fpga_region_add_bridge()once on init, and may callfpga_bridges_put()at any time afterfpga_region_program_fpga(), then you may lose the track of the bridges, which breaks the nextfpga_region_program_fpga().
Quoted 3 lines
Thanks,
Yilun
That's right, fake_fpga_region_add_bridge() is intended to be called once (for each bridge) just after registering the region. I should have added this to the kernel-doc description of the function.
When a fake region is unregistered, its bridges are released using fpga_bridges_put() by the remove method of the platform driver.
In the fpga_test_static_cfg test case, the base region is configured twice. Then, when the base region is unregistered by the exit method of the test suite, the base bridge is released.
Here's the raw test output with dev_dbg() prints of the FPGA bridge enabled:
# Subtest: fpga
1..2
# fpga_test_static_cfg: Fake FPGA manager: state
# fpga_test_static_cfg: Fake FPGA manager registered
# fpga_test_static_cfg: Fake FPGA bridge 3 registered
# fpga_test_static_cfg: Fake FPGA region 0 registered
# fpga_test_static_cfg: Bridge added to fake FPGA region 0
# fpga_test_static_cfg: FPGA base system built
# fpga_test_static_cfg: Fake FPGA bridge 3: enable_show
# fpga_test_static_cfg: FPGA image allocated in a buffer, size: 16384fpga_bridge br0: get <---fpga_bridge br0: disable
# fpga_test_static_cfg: Fake FPGA bridge 3: enable_set: 0
# fpga_test_static_cfg: Fake FPGA manager: parse_header
# fpga_test_static_cfg: Fake FPGA manager: write_init
# fpga_test_static_cfg: Fake FPGA manager: write
# fpga_test_static_cfg: Fake FPGA manager: write_completefpga_bridge br0: enable
# fpga_test_static_cfg: Fake FPGA bridge 3: enable_set: 1
# fpga_test_static_cfg: Fake FPGA bridge 3: enable_show
# fpga_test_static_cfg: FPGA configuration completed using a buffer image # fpga_test_static_cfg: FPGA image allocated in a scatter gather table, size: 16384fpga_bridge br0: disable
# fpga_test_static_cfg: Fake FPGA bridge 3: enable_set: 0
# fpga_test_static_cfg: Fake FPGA manager: parse_header
# fpga_test_static_cfg: Fake FPGA manager: write_init
# fpga_test_static_cfg: Fake FPGA manager: write_sg
# fpga_test_static_cfg: Fake FPGA manager: write_completefpga_bridge br0: enable
# fpga_test_static_cfg: Fake FPGA bridge 3: enable_set: 1
# fpga_test_static_cfg: Fake FPGA bridge 3: enable_show
# fpga_test_static_cfg: FPGA configuration completed using scatter gather table imagefpga_bridge br0: put <---
# fpga_test_static_cfg: Fake FPGA region 0 unregistered
# fpga_test_static_cfg: Fake FPGA bridge: remove
# fpga_test_static_cfg: Fake FPGA bridge 3 unregisteredfpga_manager fpga0: fpga_mgr_unregister Fake FPGA Manager
# fpga_test_static_cfg: Fake FPGA manager: remove
# fpga_test_static_cfg: Fake FPGA manager unregistered
ok 1 fpga_test_static_cfg
In my understanding, of-region uses a similar approach by releasing bridges only when the overlay is removed.
Quoted 120 lines
Quoted 120 lines
drivers/fpga/tests/fake-fpga-region.c new file +81
-0+ ret =fpga_bridge_get_to_list (bridge->dev.parent, + region->info, + ®ion->bridge_list); +if (ret) +break ; + } + +return ret; +} + +static int fake_fpga_region_probe (struct platform_device *pdev) +{ +struct device *dev; +struct fpga_region *region; +struct fpga_manager *mgr; +struct fake_region_data *pdata; +struct fake_region_priv *priv; +struct fpga_region_info info; +static int id_count; + + dev = &pdev->dev; + pdata =dev_get_platdata (dev); + +if (!pdata) { +dev_err (&pdev->dev,"Missing platform data\n" ); +return -EINVAL ; + } + + priv =devm_kzalloc (dev,sizeof (*priv),GFP_KERNEL ); +if (!priv) +return -ENOMEM ; + + mgr =fpga_mgr_get (pdata->mgr->dev.parent); +if (IS_ERR (mgr)) +return PTR_ERR (mgr); + +INIT_LIST_HEAD (&priv->bridge_list); + priv->id = id_count++; + priv->test = pdata->test; + +memset (&info,0 ,sizeof (info)); + info.priv = priv; + info.mgr = mgr; + info.get_bridges = fake_region_get_bridges; + + region =fpga_region_register_full (dev, &info); +if (IS_ERR (region)) { +fpga_mgr_put (mgr); +return PTR_ERR (region); + } + +platform_set_drvdata (pdev, region); + +return 0 ; +} + +static int fake_fpga_region_remove (struct platform_device *pdev) +{ +struct fpga_region *region =platform_get_drvdata (pdev); +struct fpga_manager *mgr = region->mgr; + +fpga_mgr_put (mgr); +fpga_bridges_put (®ion->bridge_list); +fpga_region_unregister (region); + +return 0 ; +} + +static struct platform_driver fake_fpga_region_drv = { + .driver = { + .name =FAKE_FPGA_REGION_DEV_NAME + }, + .probe = fake_fpga_region_probe, + .remove = fake_fpga_region_remove, +}; + +module_platform_driver (fake_fpga_region_drv); + +MODULE_AUTHOR ("Marco Pagani <[email protected]>" ); +MODULE_DESCRIPTION ("Fake FPGA Bridge" ); +MODULE_LICENSE ("GPL v2" );drivers/fpga/tests/fake-fpga-region.h new file +33
-0@@ -0,0 +1,38 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Header file for the fake FPGA region +* +* Copyright (C) 2023 Red Hat, Inc. +* +* Author: Marco Pagani <[email protected]> +*/ + +#ifndef __FPGA_FAKE_RGN_H +#define __FPGA_FAKE_RGN_H + +#include <linux/platform_device.h> +#include <kunit/test.h> +#include <linux/fpga/fpga-mgr.h> +#include <linux/fpga/fpga-bridge.h> + +/** +* struct fake_fpga_region - fake FPGA region context data structure +* +* @region: FPGA region. +* @pdev: platform device of the FPGA region. +*/ +struct fake_fpga_region { +struct fpga_region *region; +struct platform_device *pdev; +}; + +int fake_fpga_region_register (struct fake_fpga_region *region_ctx, +struct fpga_manager *mgr,struct device *parent, +struct kunit *test); + +void fake_fpga_region_add_bridge(struct fake_fpga_region *region_ctx,
Quoted 9 lines
Quoted 8 lines
drivers/fpga/tests/fake-fpga-region.h new file +5
-0+ struct fpga_bridge *bridge); + +void fake_fpga_region_unregister (struct fake_fpga_region *region_ctx); + +#endif /* __FPGA_FAKE_RGN_H */ Signature · 1 line
2.39.2
Thanks,
Marco
Xu Yilun
maintainerRe: [RFC PATCH v2 3/4] fpga: add fake FPGA region
Quoted 170 lines · Marco Pagani
Quoted 163 lines · Xu Yilun
Quoted 145 lines · Marco Pagani
Add fake FPGA region platform driver with support functions. This module is part of the KUnit tests for the FPGA subsystem.
Signed-off-by Marco Pagani <[email protected]>--- drivers/fpga/tests/fake-fpga-region.c | 219 ++++++++++++++++++++++++++ drivers/fpga/tests/fake-fpga-region.h | 38 +++++ 2 files changed, 257 insertions(+) create mode 100644 drivers/fpga/tests/fake-fpga-region.c create mode 100644 drivers/fpga/tests/fake-fpga-region.hdrivers/fpga/tests/fake-fpga-region.c new file +128
-0@@ -0,0 +1,219 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Driver for the fake FPGA region +* +* Copyright (C) 2023 Red Hat, Inc. +* +* Author: Marco Pagani <[email protected]> +*/ + +#include <linux/device.h> +#include <linux/list.h> +#include <linux/platform_device.h> +#include <linux/fpga/fpga-mgr.h> +#include <linux/fpga/fpga-region.h> +#include <linux/fpga/fpga-bridge.h> +#include <kunit/test.h> + +#include "fake-fpga-region.h" + +#define FAKE_FPGA_REGION_DEV_NAME "fake_fpga_region" + +struct fake_region_priv { +int id; +struct kunit *test; +struct list_head bridge_list; +}; + +struct fake_region_data { +struct fpga_manager *mgr; +struct kunit *test; +}; + +/** +* fake_fpga_region_register() - register a fake FPGA region. +* @region_ctx: fake FPGA region context data structure. +* @mgr: associated FPGA manager. +* @parent: parent device. +* @test: KUnit test context object. +* +* Return: 0 if registration succeeded, an error code otherwise. +*/ +int fake_fpga_region_register (struct fake_fpga_region *region_ctx, +struct fpga_manager *mgr,struct device *parent, +struct kunit *test) +{ +struct fake_region_data pdata; +struct fake_region_priv *priv; +int ret; + + pdata.mgr = mgr; + pdata.test = test; + + region_ctx->pdev =platform_device_alloc (FAKE_FPGA_REGION_DEV_NAME , +PLATFORM_DEVID_AUTO ); +if (IS_ERR (region_ctx->pdev)) { +pr_err ("Fake FPGA region device allocation failed\n" ); +return -ENOMEM ; + } + + region_ctx->pdev->dev.parent = parent; +platform_device_add_data (region_ctx->pdev, &pdata,sizeof (pdata)); + + ret =platform_device_add (region_ctx->pdev); +if (ret) { +pr_err ("Fake FPGA region device add failed\n" ); +platform_device_put (region_ctx->pdev); +return ret; + } + + region_ctx->region =platform_get_drvdata (region_ctx->pdev); + +if (test) { + priv = region_ctx->region->priv; +kunit_info (test,"Fake FPGA region %d registered\n" , priv->id); + } + +return 0 ; +} +EXPORT_SYMBOL_GPL (fake_fpga_region_register); + +/** +* fake_fpga_region_unregister() - unregister a fake FPGA region. +* @region_ctx: fake FPGA region context data structure. +*/ +void fake_fpga_region_unregister (struct fake_fpga_region *region_ctx) +{ +struct fake_region_priv *priv; +struct kunit *test; +int id; + +if (!region_ctx) +return ; + + priv = region_ctx->region->priv; + test = priv->test; + id = priv->id; + +if (region_ctx->pdev) { +platform_device_unregister (region_ctx->pdev); +if (test) +kunit_info (test,"Fake FPGA region %d unregistered\n" , id); + } +} +EXPORT_SYMBOL_GPL (fake_fpga_region_unregister); + +/** +* fake_fpga_region_add_bridge() - add a bridge to a fake FPGA region. +* @region_ctx: fake FPGA region context data structure. +* @bridge: FPGA bridge. +* +* Return: 0 if registration succeeded, an error code otherwise. +*/ +void fake_fpga_region_add_bridge (struct fake_fpga_region *region_ctx, +struct fpga_bridge *bridge) +{ +struct fake_region_priv *priv; + + priv = region_ctx->region->priv; + +/* Add bridge to the list of bridges in the private context */ +list_add (&bridge->node, &priv->bridge_list); + +if (priv->test) +kunit_info (priv->test,"Bridge added to fake FPGA region %d\n" , + priv->id); +} +EXPORT_SYMBOL_GPL (fake_fpga_region_add_bridge); +drivers/fpga/tests/fake-fpga-region.c line 138
Quoted 10 lines
drivers/fpga/tests/fake-fpga-region.c new file +10
-0+static int fake_region_get_bridges (struct fpga_region *region) +{ +struct fake_region_priv *priv; +struct fpga_bridge *bridge, *tmp; +int ret; + + priv = region->priv; + +list_for_each_entry_safe (bridge, tmp, &priv->bridge_list, node) { +list_del (&bridge->node);I think the
fake_fpga_regionuser just need to callfake_fpga_region_add_bridge()once on init, and may callfpga_bridges_put()at any time afterfpga_region_program_fpga(), then you may lose the track of the bridges, which breaks the nextfpga_region_program_fpga().Quoted 3 lines
Thanks,
Yilun
Quoted 6 lines
That's right,
fake_fpga_region_add_bridge()is intended to be called once (for each bridge) just after registering the region. I should have added this to the kernel-doc description of the function.When a fake region is unregistered, its bridges are released using
fpga_bridges_put()by the remove method of the platform driver.
Please check the kernel-doc:
/**
* fpga_region_program_fpga - program FPGA
*
* @region: FPGA region
*
* Program an FPGA using fpga image info (region->info).
* If the region has a get_bridges function, the exclusive reference for the
* bridges will be held if programming succeeds. This is intended to prevent
* reprogramming the region until the caller considers it safe to do so.
* The caller will need to call fpga_bridges_put() before attempting to
* reprogram the region.
*
* Return 0 for success or negative error code.
*/
int fpga_region_program_fpga(struct fpga_region *region)
That means the fpga test should call fpga_bridges_put() before a second fpga_region_program_fpga().
Quoted 49 lines
In the
fpga_test_static_cfgtest case, the base region is configured twice. Then, when the base region is unregistered by the exit method of the test suite, the base bridge is released.Here's the raw test output with
dev_dbg()prints of the FPGA bridge enabled:# Subtest: fpga
1..2
#fpga_test_static_cfg: Fake FPGA manager: state
#fpga_test_static_cfg: Fake FPGA manager registered
#fpga_test_static_cfg: Fake FPGA bridge 3 registered
#fpga_test_static_cfg: Fake FPGA region 0 registered
#fpga_test_static_cfg: Bridge added to fake FPGA region 0
#fpga_test_static_cfg: FPGA base system built
#fpga_test_static_cfg: Fake FPGA bridge 3:enable_show
#fpga_test_static_cfg: FPGA image allocated in a buffer, size: 16384fpga_bridgebr0: get <---fpga_bridgebr0: disable
#fpga_test_static_cfg: Fake FPGA bridge 3:enable_set: 0
#fpga_test_static_cfg: Fake FPGA manager:parse_header
#fpga_test_static_cfg: Fake FPGA manager:write_init
#fpga_test_static_cfg: Fake FPGA manager: write
#fpga_test_static_cfg: Fake FPGA manager:write_completefpga_bridgebr0: enable
#fpga_test_static_cfg: Fake FPGA bridge 3:enable_set: 1
#fpga_test_static_cfg: Fake FPGA bridge 3:enable_show
#fpga_test_static_cfg: FPGA configuration completed using a buffer image #fpga_test_static_cfg: FPGA image allocated in a scatter gather table, size: 16384fpga_bridgebr0: disable
#fpga_test_static_cfg: Fake FPGA bridge 3:enable_set: 0
#fpga_test_static_cfg: Fake FPGA manager:parse_header
#fpga_test_static_cfg: Fake FPGA manager:write_init
#fpga_test_static_cfg: Fake FPGA manager:write_sg
#fpga_test_static_cfg: Fake FPGA manager:write_completefpga_bridgebr0: enable
#fpga_test_static_cfg: Fake FPGA bridge 3:enable_set: 1
#fpga_test_static_cfg: Fake FPGA bridge 3:enable_show
#fpga_test_static_cfg: FPGA configuration completed using scatter gather table imagefpga_bridgebr0: put <---
#fpga_test_static_cfg: Fake FPGA region 0 unregistered
#fpga_test_static_cfg: Fake FPGA bridge: remove
#fpga_test_static_cfg: Fake FPGA bridge 3 unregisteredfpga_managerfpga0:fpga_mgr_unregisterFake FPGA Manager
#fpga_test_static_cfg: Fake FPGA manager: remove
#fpga_test_static_cfg: Fake FPGA manager unregistered
ok 1fpga_test_static_cfg
Quoted 2 lines
In my understanding, of-region uses a similar approach by releasing bridges only when the overlay is removed.
The overlay removal is not equal to the of-fpga-region removal. Actually the overlay could be applied & removed multiple times, and fpga_region_program_fpga & fpga_bridges_put() are called each time.
Thanks,
Yilun
Quoted 135 lines
Quoted 122 lines
Quoted 122 lines
drivers/fpga/tests/fake-fpga-region.c new file +81
-0+ ret =fpga_bridge_get_to_list (bridge->dev.parent, + region->info, + ®ion->bridge_list); +if (ret) +break ; + } + +return ret; +} + +static int fake_fpga_region_probe (struct platform_device *pdev) +{ +struct device *dev; +struct fpga_region *region; +struct fpga_manager *mgr; +struct fake_region_data *pdata; +struct fake_region_priv *priv; +struct fpga_region_info info; +static int id_count; + + dev = &pdev->dev; + pdata =dev_get_platdata (dev); + +if (!pdata) { +dev_err (&pdev->dev,"Missing platform data\n" ); +return -EINVAL ; + } + + priv =devm_kzalloc (dev,sizeof (*priv),GFP_KERNEL ); +if (!priv) +return -ENOMEM ; + + mgr =fpga_mgr_get (pdata->mgr->dev.parent); +if (IS_ERR (mgr)) +return PTR_ERR (mgr); + +INIT_LIST_HEAD (&priv->bridge_list); + priv->id = id_count++; + priv->test = pdata->test; + +memset (&info,0 ,sizeof (info)); + info.priv = priv; + info.mgr = mgr; + info.get_bridges = fake_region_get_bridges; + + region =fpga_region_register_full (dev, &info); +if (IS_ERR (region)) { +fpga_mgr_put (mgr); +return PTR_ERR (region); + } + +platform_set_drvdata (pdev, region); + +return 0 ; +} + +static int fake_fpga_region_remove (struct platform_device *pdev) +{ +struct fpga_region *region =platform_get_drvdata (pdev); +struct fpga_manager *mgr = region->mgr; + +fpga_mgr_put (mgr); +fpga_bridges_put (®ion->bridge_list); +fpga_region_unregister (region); + +return 0 ; +} + +static struct platform_driver fake_fpga_region_drv = { + .driver = { + .name =FAKE_FPGA_REGION_DEV_NAME + }, + .probe = fake_fpga_region_probe, + .remove = fake_fpga_region_remove, +}; + +module_platform_driver (fake_fpga_region_drv); + +MODULE_AUTHOR ("Marco Pagani <[email protected]>" ); +MODULE_DESCRIPTION ("Fake FPGA Bridge" ); +MODULE_LICENSE ("GPL v2" );drivers/fpga/tests/fake-fpga-region.h new file +33
-0@@ -0,0 +1,38 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Header file for the fake FPGA region +* +* Copyright (C) 2023 Red Hat, Inc. +* +* Author: Marco Pagani <[email protected]> +*/ + +#ifndef __FPGA_FAKE_RGN_H +#define __FPGA_FAKE_RGN_H + +#include <linux/platform_device.h> +#include <kunit/test.h> +#include <linux/fpga/fpga-mgr.h> +#include <linux/fpga/fpga-bridge.h> + +/** +* struct fake_fpga_region - fake FPGA region context data structure +* +* @region: FPGA region. +* @pdev: platform device of the FPGA region. +*/ +struct fake_fpga_region { +struct fpga_region *region; +struct platform_device *pdev; +}; + +int fake_fpga_region_register (struct fake_fpga_region *region_ctx, +struct fpga_manager *mgr,struct device *parent, +struct kunit *test); + +void fake_fpga_region_add_bridge(struct fake_fpga_region *region_ctx,Quoted 9 lines
Quoted 8 lines
drivers/fpga/tests/fake-fpga-region.h new file +5
-0+ struct fpga_bridge *bridge); + +void fake_fpga_region_unregister (struct fake_fpga_region *region_ctx); + +#endif /* __FPGA_FAKE_RGN_H */ Signature · 1 line
2.39.2Thanks,
Marco
RFC PATCH v2 4/4 fpga: add initial KUnit test suites
In reply to Marco PaganiIntroduce initial KUnit tests for the FPGA subsystem. Tests are organized into three test suites. The first suite tests the FPGA Manager. The second suite tests the FPGA Bridge. Finally, the last test suite models a complete FPGA platform and tests static and partial reconfiguration.
--- drivers/fpga/Kconfig | 2 + drivers/fpga/Makefile | 3 + drivers/fpga/tests/.kunitconfig | 5 + drivers/fpga/tests/Kconfig | 11 + drivers/fpga/tests/Makefile | 6 + drivers/fpga/tests/fpga-test.c | 501 ++++++++++++++++++++++++++++++++ 6 files changed, 528 insertions(+) create mode 100644 drivers/fpga/tests/.kunitconfig create mode 100644 drivers/fpga/tests/Kconfig create mode 100644 drivers/fpga/tests/Makefile create mode 100644 drivers/fpga/tests/fpga-test.c
drivers/fpga/Kconfig +2 -0
@@ -276,4 +276,6 @@ config FPGA_MGR_LATTICE_SYSCONFIG_SPI FPGA manager driver support for Lattice FPGAs programming over slave SPI sysCONFIG interface. +source "drivers/fpga/tests/Kconfig" + endif # FPGA
drivers/fpga/Makefile +3 -0
@@ -55,3 +55,6 @@ obj-$(CONFIG_FPGA_DFL_NIOS_INTEL_PAC_N3000) += dfl-n3000-nios.o # Drivers for FPGAs which implement DFL obj-$(CONFIG_FPGA_DFL_PCI) += dfl-pci.o + +# KUnit tests +obj-$(CONFIG_FPGA_KUNIT_TESTS) += tests/
drivers/fpga/tests/.kunitconfig new file +5 -0
@@ -0,0 +1,5 @@ +CONFIG_KUNIT=y +CONFIG_FPGA=y +CONFIG_FPGA_REGION=y +CONFIG_FPGA_BRIDGE=y +CONFIG_FPGA_KUNIT_TESTS=y
drivers/fpga/tests/Kconfig new file +11 -0
@@ -0,0 +1,11 @@ +config FPGA_KUNIT_TESTS + tristate "KUnit test for the FPGA subsystem" if !KUNIT_ALL_TESTS + depends on FPGA && FPGA_REGION && FPGA_BRIDGE && KUNIT + default KUNIT_ALL_TESTS + help + This builds unit tests for the FPGA subsystem + + For more information on KUnit and unit tests in general, + please refer to the KUnit documentation in Documentation/dev-tools/kunit/. + + If unsure, say N.
drivers/fpga/tests/Makefile new file +6 -0
@@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0 + +obj-$(CONFIG_FPGA_KUNIT_TESTS) += fake-fpga-mgr.o +obj-$(CONFIG_FPGA_KUNIT_TESTS) += fake-fpga-region.o +obj-$(CONFIG_FPGA_KUNIT_TESTS) += fake-fpga-bridge.o +obj-$(CONFIG_FPGA_KUNIT_TESTS) += fpga-test.o
drivers/fpga/tests/fpga-test.c new file +501 -0
501 lines not on this page · raw message
Signature · 1 line
2.39.2
kernel test robot
build botRe: [RFC PATCH v2 4/4] fpga: add initial KUnit test suites
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in…
Hi Marco,
[FYI, it's a private test report for your RFC patch.]
[auto build test WARNING on linus/master]
[also build test WARNING on v6.3-rc1 next-20230310]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Marco-Pagani/fpga-add-fake-FPGA-manager/20230311-010757 patch link: https://lore.kernel.org/r/20230310170412.708363-5-marpagan%40redhat.com patch subject: [RFC PATCH v2 4/4] fpga: add initial KUnit test suites config: x86_64-randconfig-a014 (https://download.01.org/0day-ci/archive/20230311/[email protected]/config) compiler: clang version 14.0.6 (https://github.com/llvm/llvm-project f28c006a5895fc0e329fe15fead81e37457cb1d1)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/6af16afaf84ee6f061e6953eebca1a786c5be576
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Marco-Pagani/fpga-add-fake-FPGA-manager/20230311-010757 git checkout 6af16afaf84ee6f061e6953eebca1a786c5be576
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=x86_64 olddefconfig COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <[email protected]>
| Link: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All warnings (new ones prefixed by >>):
drivers/clk/.kunitconfig: warning: ignored by one of the .gitignore files
>> drivers/fpga/tests/.kunitconfig: warning: ignored by one of the .gitignore files
drivers/gpu/drm/tests/.kunitconfig: warning: ignored by one of the .gitignore files drivers/gpu/drm/vc4/tests/.kunitconfig: warning: ignored by one of the .gitignore files drivers/hid/.kunitconfig: warning: ignored by one of the .gitignore files fs/ext4/.kunitconfig: warning: ignored by one of the .gitignore files fs/fat/.kunitconfig: warning: ignored by one of the .gitignore files kernel/kcsan/.kunitconfig: warning: ignored by one of the .gitignore files lib/kunit/.kunitconfig: warning: ignored by one of the .gitignore files mm/kfence/.kunitconfig: warning: ignored by one of the .gitignore files net/sunrpc/.kunitconfig: warning: ignored by one of the .gitignore files tools/testing/selftests/arm64/tags/.gitignore: warning: ignored by one of the .gitignore files tools/testing/selftests/arm64/tags/Makefile: warning: ignored by one of the .gitignore files tools/testing/selftests/arm64/tags/run_tags_test.sh: warning: ignored by one of the .gitignore files tools/testing/selftests/arm64/tags/tags_test.c: warning: ignored by one of the .gitignore files tools/testing/selftests/kvm/.gitignore: warning: ignored by one of the .gitignore files tools/testing/selftests/kvm/Makefile: warning: ignored by one of the .gitignore files tools/testing/selftests/kvm/config: warning: ignored by one of the .gitignore files tools/testing/selftests/kvm/settings: warning: ignored by one of the .gitignore files
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests