On Fri, 09 Aug 2024, Thomas Richard wrote:
> Add core MFD driver for the Board Controller found on some Congatec SMARC
> module. This Board Controller provides functions like watchdog, GPIO, and
> I2C busses.
>
> This commit add support only for the conga-SA7 module.
>
> Signed-off-by: Thomas Richard <thomas.richard@xxxxxxxxxxx>
> ---
> drivers/mfd/Kconfig | 12 ++
> drivers/mfd/Makefile | 1 +
> drivers/mfd/cgbc-core.c | 453 +++++++++++++++++++++++++++++++++++++++++++++++
> include/linux/mfd/cgbc.h | 44 +++++
> 4 files changed, 510 insertions(+)
>
> diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
> index bc8be2e593b6..3e0530f30267 100644
> --- a/drivers/mfd/Kconfig
> +++ b/drivers/mfd/Kconfig
> @@ -224,6 +224,18 @@ config MFD_AXP20X_RSB
> components like regulators or the PEK (Power Enable Key) under the
> corresponding menus.
>
> +config MFD_CGBC
> + tristate "Congatec Board Controller"
> + select MFD_CORE
> + depends on X86
> + help
> + This is the core driver of the Board Controller found on some Congatec
> + SMARC modules. The Board Controller provides functions like watchdog,
> + I2C busses, and GPIO controller.
> +
> + To compile this driver as a module, choose M here: the module will be
> + called cgbc-core.
> +
> config MFD_CROS_EC_DEV
> tristate "ChromeOS Embedded Controller multifunction device"
> select MFD_CORE
> diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
> index 02b651cd7535..d5da3fcd691c 100644
> --- a/drivers/mfd/Makefile
> +++ b/drivers/mfd/Makefile
> @@ -13,6 +13,7 @@ obj-$(CONFIG_MFD_SM501) += sm501.o
> obj-$(CONFIG_ARCH_BCM2835) += bcm2835-pm.o
> obj-$(CONFIG_MFD_BCM590XX) += bcm590xx.o
> obj-$(CONFIG_MFD_BD9571MWV) += bd9571mwv.o
> +obj-$(CONFIG_MFD_CGBC) += cgbc-core.o
> obj-$(CONFIG_MFD_CROS_EC_DEV) += cros_ec_dev.o
> obj-$(CONFIG_MFD_CS42L43) += cs42l43.o
> obj-$(CONFIG_MFD_CS42L43_I2C) += cs42l43-i2c.o
> diff --git a/drivers/mfd/cgbc-core.c b/drivers/mfd/cgbc-core.c
> new file mode 100644
> index 000000000000..cca9b1170cc9
> --- /dev/null
> +++ b/drivers/mfd/cgbc-core.c
> @@ -0,0 +1,453 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> +/*
> + * Congatec Board Controller MFD core driver.
No such thing as an MFD.
> + * The x86 Congatec modules have an embedded micro controller named Board
> + * Controller.
I think the '\n' can be dropped without issue.
> + * This Board Controller have a watchdog timer, some GPIOs, and two i2c busses.
"has a"
Consider "Watchdog"
"I2C"
> + *
> + * Copyright (C) 2024 Bootlin
Nit: '\n' here.
> + * Author: Thomas Richard <thomas.richard@xxxxxxxxxxx>
> + */
> +
> +#include <linux/dmi.h>
> +#include <linux/mfd/core.h>
> +#include <linux/mfd/cgbc.h>
> +#include <linux/module.h>
> +#include <linux/platform_device.h>
> +#include <linux/iopoll.h>
> +#include <linux/sysfs.h>
Alphabetical.
> +#define CGBC_MASK_STATUS (BIT(6) | BIT(7))
> +#define CGBC_MASK_DATA_COUNT 0x1F
> +#define CGBC_MASK_ERROR_CODE 0x1F
Not sure if it's just my mailer, but if all of these are not already
aligned, please can you tab them out so that they are.
> +#define CGBC_STATUS_DATA_READY 0x00
> +#define CGBC_STATUS_CMD_READY BIT(6)
> +#define CGBC_STATUS_ERROR (BIT(6) | BIT(7))
> +
> +#define CGBC_CMD_GET_FW_REV 0x21
> +
> +#define CGBC_IO_SESSION_BASE 0x0E20
> +#define CGBC_IO_SESSION_END 0x0E30
> +#define CGBC_IO_CMD_BASE 0x0E00
> +#define CGBC_IO_CMD_END 0x0E10
> +
> +#define CGBC_SESSION_CMD 0x00
> +#define CGBC_SESSION_CMD_IDLE 0x00
> +#define CGBC_SESSION_CMD_REQUEST 0x01
> +#define CGBC_SESSION_DATA 0x01
> +#define CGBC_SESSION_STATUS 0x02
> +#define CGBC_SESSION_STATUS_FREE 0x03
> +#define CGBC_SESSION_ACCESS 0x04
> +#define CGBC_SESSION_ACCESS_GAINED 0x00
> +
> +#define CGBC_SESSION_VALID_MIN 0x02
> +#define CGBC_SESSION_VALID_MAX 0xFE
> +
> +#define CGBC_CMD_STROBE 0x00
> +#define CGBC_CMD_INDEX 0x02
> +#define CGBC_CMD_INDEX_CBM_MAN8 0x00
> +#define CGBC_CMD_INDEX_CBM_AUTO32 0x03
> +#define CGBC_CMD_DATA 0x04
> +#define CGBC_CMD_ACCESS 0x0C
> +
> +struct cgbc_platform_data {
> + const struct resource *ioresource;
> + unsigned int num_ioresource;
> +};
This looks way over engineered.
Why not provide platform_device_info statically in the first place?
> +static struct platform_device *cgbc_pdev;
No avoidable globals.
This stuff should get stored in driver data (ddata)
> +static int cgbc_detect_device(struct cgbc_device_data *cgbc)
> +{
> + u16 status;
> + int ret;
> +
> + ret = readx_poll_timeout(ioread16, cgbc->io_session + CGBC_SESSION_STATUS, status,
> + status == CGBC_SESSION_STATUS_FREE, 0, 500000);
> +
> + if (ret || ioread32(cgbc->io_session + CGBC_SESSION_ACCESS))
> + ret = -ENODEV;
> +
> + return ret;
> +}
This function could do with some commentary.
> +static int cgbc_session_command(struct cgbc_device_data *cgbc, u8 cmd)
> +{
> + int ret;
> + u8 val;
> +
> + ret = readx_poll_timeout(ioread8, cgbc->io_session + CGBC_SESSION_CMD, val,
> + val == CGBC_SESSION_CMD_IDLE, 0, 100000);
> + if (ret)
> + return ret;
> +
> + iowrite8(cmd, cgbc->io_session + CGBC_SESSION_CMD);
> +
> + ret = readx_poll_timeout(ioread8, cgbc->io_session + CGBC_SESSION_CMD, val,
> + val == CGBC_SESSION_CMD_IDLE, 0, 100000);
> + if (ret)
> + return ret;
> +
> + ret = (int)ioread8(cgbc->io_session + CGBC_SESSION_DATA);
> +
> + iowrite8(CGBC_SESSION_STATUS_FREE,
> + cgbc->io_session + CGBC_SESSION_STATUS);
Which char are you using to line-feed? This looks inconsistent.
> +
> + return ret;
> +}
> +
> +static int cgbc_session_request(struct cgbc_device_data *cgbc)
> +{
> + unsigned int ret = cgbc_detect_device(cgbc);
What does cgbc_detect_device() do?
You're not getting the device? Just seeing if it's present?
Please separate the declaration from the assignment when calling
functions.
> + if (ret)
> + return dev_err_probe(cgbc->dev, ret, "device not found\n");
> +
> + cgbc->session = cgbc_session_command(cgbc, CGBC_SESSION_CMD_REQUEST);
> +
> + /* the Board Controller sent us a wrong session handle, we cannot
This is a non-standard multi-line comment.
> + * communicate with it.
> + */
> + if (cgbc->session < CGBC_SESSION_VALID_MIN ||
> + cgbc->session > CGBC_SESSION_VALID_MAX) {
How are you justifying this line-break and then not line-breaking 2
lines down?
> + cgbc->session = 0;
Why are we setting variables before bombing out?
> + return dev_err_probe(cgbc->dev, (cgbc->session < 0) ? cgbc->session : -ECONNREFUSED,
How can (cgbc->session < 0) ever be true?
> + "failed to get a valid session handle\n");
> + }
> +
> + return 0;
> +}
> +
> +static void cgbc_session_release(struct cgbc_device_data *cgbc)
> +{
> + if (cgbc_session_command(cgbc, cgbc->session) != cgbc->session)
What does this do?
Are we checking or doing something? If the latter, then we shouldn't be
doing that in an if() statement. If the former, then what's the point
of the function?
> + dev_err(cgbc->dev, "failed to release session\n");
Why print if there isn't anything you can do about it?
> +}
> +
> +static bool cgbc_command_lock(struct cgbc_device_data *cgbc)
> +{
> + iowrite8(cgbc->session, cgbc->io_cmd + CGBC_CMD_ACCESS);
> +
> + return ioread8(cgbc->io_cmd + CGBC_CMD_ACCESS) == cgbc->session;
> +}
> +
> +static void cgbc_command_unlock(struct cgbc_device_data *cgbc)
> +{
> + iowrite8(cgbc->session, cgbc->io_cmd + CGBC_CMD_ACCESS);
> +}
> +
> +static int __cgbc_command(struct cgbc_device_data *cgbc, u8 *cmd, u8 cmd_size,
> + u8 *data, u8 data_size, u8 *status)
> +{
> + u8 checksum = 0, data_checksum = 0, istatus = 0, val;
> + int mode_change = -1;
> + bool lock;
> + int ret, i;
> +
> + mutex_lock(&cgbc->lock);
> +
> + /* request access */
Start comments with uppercase chars please.
> + ret = readx_poll_timeout(cgbc_command_lock, cgbc, lock, lock, 0, 100000);
> + if (ret)
> + goto out;
> +
> + /* wait board controller is ready */
> + ret = readx_poll_timeout(ioread8, cgbc->io_cmd + CGBC_CMD_STROBE, val,
> + val == CGBC_CMD_STROBE, 0, 100000);
> + if (ret)
> + goto release;
> +
> + /* write command packet */
> + if (cmd_size <= 2) {
> + iowrite8(CGBC_CMD_INDEX_CBM_MAN8,
> + cgbc->io_cmd + CGBC_CMD_INDEX);
> + } else {
> + iowrite8(CGBC_CMD_INDEX_CBM_AUTO32,
> + cgbc->io_cmd + CGBC_CMD_INDEX);
> + if ((cmd_size % 4) != 0x03)
> + mode_change = (cmd_size & 0xFFFC) - 1;
> + }
> +
> + for (i = 0; i < cmd_size; i++) {
> + iowrite8(cmd[i], cgbc->io_cmd + CGBC_CMD_DATA + (i % 4));
> + checksum ^= cmd[i];
> + if (mode_change == i)
> + iowrite8((i + 1) | CGBC_CMD_INDEX_CBM_MAN8,
> + cgbc->io_cmd + CGBC_CMD_INDEX);
> + }
> +
> + /* append checksum byte */
> + iowrite8(checksum, cgbc->io_cmd + CGBC_CMD_DATA + (i % 4));
> +
> + /* perform command strobe */
> + iowrite8(cgbc->session, cgbc->io_cmd + CGBC_CMD_STROBE);
> +
> + /* rewind cmd buffer index */
> + iowrite8(CGBC_CMD_INDEX_CBM_AUTO32,
> + cgbc->io_cmd + CGBC_CMD_INDEX);
> +
> + /* wait command completion */
> + ret = read_poll_timeout(ioread8, val, val == CGBC_CMD_STROBE, 0,
> + 100000, false,
> + cgbc->io_cmd + CGBC_CMD_STROBE);
> + if (ret)
> + goto release;
> +
> + istatus = ioread8(cgbc->io_cmd + CGBC_CMD_DATA);
> + checksum = istatus;
> +
> + /* check command status */
> + switch (istatus & CGBC_MASK_STATUS) {
> + case CGBC_STATUS_DATA_READY:
> + if (istatus > data_size)
> + istatus = data_size;
> + for (i = 0; i < istatus; i++) {
> + data[i] = ioread8(cgbc->io_cmd +
> + CGBC_CMD_DATA + ((i + 1) % 4));
> + checksum ^= data[i];
> + }
> + data_checksum = ioread8(cgbc->io_cmd +
> + CGBC_CMD_DATA + ((i + 1) % 4));
> + istatus &= CGBC_MASK_DATA_COUNT;
> + break;
> + case CGBC_STATUS_ERROR:
> + case CGBC_STATUS_CMD_READY:
> + data_checksum = ioread8(cgbc->io_cmd +
> + CGBC_CMD_DATA + 1);
> + if ((istatus & CGBC_MASK_STATUS) == CGBC_STATUS_ERROR)
> + ret = -EIO;
> + istatus = istatus & CGBC_MASK_ERROR_CODE;
> + break;
> + default:
> + data_checksum = ioread8(cgbc->io_cmd + CGBC_CMD_DATA + 1);
> + istatus &= CGBC_MASK_ERROR_CODE;
> + ret = -EIO;
> + break;
> + }
> +
> + /* checksum verification */
> + if (ret == 0 && data_checksum != checksum)
> + ret = -EIO;
> +
> +release:
> + cgbc_command_unlock(cgbc);
> +
> +out:
> + mutex_unlock(&cgbc->lock);
> +
> + if (status)
> + *status = istatus;
> +
> + return ret;
> +}
> +
> +int cgbc_command(struct cgbc_device_data *cgbc, void *cmd, unsigned int cmd_size,
> + void *data, unsigned int data_size, u8 *status)
What's the point of this abstracted function?
> +{
> + return __cgbc_command(cgbc, (u8 *)cmd, cmd_size, (u8 *)data, data_size, status);
> +}
> +EXPORT_SYMBOL_GPL(cgbc_command);
> +
> +static struct mfd_cell cgbc_devs[] = {
> + { .name = "cgbc-wdt" },
> + { .name = "cgbc-gpio" },
> + { .name = "cgbc-i2c", .id = 1 },
> + { .name = "cgbc-i2c", .id = 2 },
> +};
> +
> +static int cgbc_map(struct cgbc_device_data *cgbc)
> +{
> + struct device *dev = cgbc->dev;
> + struct platform_device *pdev = to_platform_device(dev);
> + struct resource *ioport;
> +
> + ioport = platform_get_resource(pdev, IORESOURCE_IO, 0);
> + if (!ioport)
> + return -EINVAL;
> +
> + cgbc->io_session = devm_ioport_map(dev, ioport->start,
> + resource_size(ioport));
> + if (!cgbc->io_session)
> + return -ENOMEM;
> +
> + ioport = platform_get_resource(pdev, IORESOURCE_IO, 1);
> + if (!ioport)
> + return -EINVAL;
> +
> + cgbc->io_cmd = devm_ioport_map(dev, ioport->start,
> + resource_size(ioport));
> + if (!cgbc->io_cmd)
> + return -ENOMEM;
> +
> + return 0;
> +}
> +
> +static struct resource cgbc_ioresource[] = {
> + {
> + .start = CGBC_IO_SESSION_BASE,
> + .end = CGBC_IO_SESSION_END,
> + .flags = IORESOURCE_IO,
> + },
> + {
> + .start = CGBC_IO_CMD_BASE,
> + .end = CGBC_IO_CMD_END,
> + .flags = IORESOURCE_IO,
> + },
> +};
> +
> +static const struct cgbc_platform_data cgbc_platform_data = {
> + .ioresource = &cgbc_ioresource[0],
> + .num_ioresource = ARRAY_SIZE(cgbc_ioresource),
> +};
> +
> +static int cgbc_create_platform_device(const struct cgbc_platform_data *pdata)
> +{
> + const struct platform_device_info pdevinfo = {
> + .name = "cgbc",
> + .id = PLATFORM_DEVID_NONE,
> + .res = pdata->ioresource,
> + .num_res = pdata->num_ioresource,
> + };
> +
> + cgbc_pdev = platform_device_register_full(&pdevinfo);
> + if (IS_ERR(cgbc_pdev))
> + return PTR_ERR(cgbc_pdev);
> +
> + return 0;
> +}
> +
> +static ssize_t cgbc_version_show(struct device *dev,
> + struct device_attribute *attr, char *buf)
> +{
> + struct cgbc_device_data *cgbc = dev_get_drvdata(dev);
> +
> + return sysfs_emit(buf, "CGBCP%c%c%c\n", cgbc->version.feature,
> + cgbc->version.major, cgbc->version.minor);
> +}
> +
> +static DEVICE_ATTR_RO(cgbc_version);
> +
> +static struct attribute *cgbc_attrs[] = {
> + &dev_attr_cgbc_version.attr,
> + NULL
> +};
> +
> +ATTRIBUTE_GROUPS(cgbc);
> +
> +static int cgbc_get_version(struct cgbc_device_data *cgbc)
> +{
> + u8 cmd = CGBC_CMD_GET_FW_REV;
> + u8 data[4];
> + int ret;
> +
> + ret = cgbc_command(cgbc, &cmd, 1, &data, sizeof(data), NULL);
> + if (ret)
> + return ret;
> +
> + cgbc->version.feature = data[0];
> + cgbc->version.major = data[1];
> + cgbc->version.minor = data[2];
> +
> + return 0;
> +}
> +
> +static int cgbc_init_device(struct cgbc_device_data *cgbc)
> +{
> + int ret;
> +
> + ret = cgbc_session_request(cgbc);
> + if (ret)
> + return ret;
> +
> + ret = cgbc_get_version(cgbc);
> + if (ret)
> + return ret;
> +
> + return mfd_add_devices(cgbc->dev, -1, cgbc_devs,
> + ARRAY_SIZE(cgbc_devs), NULL, 0, NULL);
> +}
> +
> +static int cgbc_probe(struct platform_device *pdev)
> +{
> + struct device *dev = &pdev->dev;
> + struct cgbc_device_data *cgbc;
> + int ret;
> +
> + cgbc = devm_kzalloc(dev, sizeof(*cgbc), GFP_KERNEL);
> + if (!cgbc)
> + return -ENOMEM;
> +
> + cgbc->dev = dev;
> +
> + ret = cgbc_map(cgbc);
> + if (ret)
> + return ret;
> +
> + mutex_init(&cgbc->lock);
> +
> + platform_set_drvdata(pdev, cgbc);
> +
> + return cgbc_init_device(cgbc);
> +}
> +
> +static void cgbc_remove(struct platform_device *pdev)
> +{
> + struct cgbc_device_data *cgbc = platform_get_drvdata(pdev);
> +
> + cgbc_session_release(cgbc);
> +
> + mfd_remove_devices(&pdev->dev);
> +}
> +
> +static struct platform_driver cgbc_driver = {
> + .driver = {
> + .name = "cgbc",
> + .dev_groups = cgbc_groups,
> + },
> + .probe = cgbc_probe,
> + .remove_new = cgbc_remove,
> +};
> +
> +static const struct dmi_system_id cgbc_dmi_table[] __initconst = {
> + {
> + .ident = "SA7",
> + .matches = {
> + DMI_MATCH(DMI_BOARD_VENDOR, "congatec"),
> + DMI_MATCH(DMI_BOARD_NAME, "conga-SA7"),
> + },
> + },
> + {}
> +};
> +MODULE_DEVICE_TABLE(dmi, cgbc_dmi_table);
> +
> +static int __init cgbc_init(void)
> +{
> + const struct dmi_system_id *id;
> + int ret = -ENODEV;
> +
> + id = dmi_first_match(cgbc_dmi_table);
> + if (IS_ERR_OR_NULL(id))
> + return ret;
> +
> + ret = cgbc_create_platform_device(&cgbc_platform_data);
You have no other way to register this device? ACPI/PCI/I2C?
> + if (ret)
> + return ret;
> +
> + return platform_driver_register(&cgbc_driver);
> +}
> +
> +static void __exit cgbc_exit(void)
> +{
> + platform_device_unregister(cgbc_pdev);
> + platform_driver_unregister(&cgbc_driver);
> +}
> +
> +module_init(cgbc_init);
> +module_exit(cgbc_exit);
> +
> +MODULE_DESCRIPTION("Congatec Board Controller Core Driver");
> +MODULE_AUTHOR("Thomas Richard <thomas.richard@xxxxxxxxxxx>");
> +MODULE_LICENSE("GPL");
> +MODULE_ALIAS("platform:cgbc-core");
> diff --git a/include/linux/mfd/cgbc.h b/include/linux/mfd/cgbc.h
> new file mode 100644
> index 000000000000..badbec4c7033
> --- /dev/null
> +++ b/include/linux/mfd/cgbc.h
> @@ -0,0 +1,44 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
> +/*
> + * Congatec Board Controller driver definitions
> + *
> + * Copyright (C) 2024 Bootlin
> + * Author: Thomas Richard <thomas.richard@xxxxxxxxxxx>
> + */
> +
> +#ifndef _LINUX_MFD_CGBC_H_
> +
> +/**
> + * struct cgbc_version - Board Controller device version structure
> + * @feature: Board Controller feature number
> + * @major: Board Controller major revision
> + * @minor: Board Controller minor revision
> + */
> +struct cgbc_version {
> + unsigned char feature;
> + unsigned char major;
> + unsigned char minor;
> +};
> +
> +/**
> + * struct cgbc_device_data - Internal representation of the Board Controller device
> + * @io_session: Pointer to the session IO memory
> + * @io_cmd: Pointer to the command IO memory
> + * @session: Session id returned by the Board Controller
> + * @dev: Pointer to kernel device structure
> + * @cgbc_version: Board Controller version structure
> + * @mutex: Board Controller mutex
> + */
> +struct cgbc_device_data {
> + void __iomem *io_session;
> + void __iomem *io_cmd;
> + u8 session;
> + struct device *dev;
> + struct cgbc_version version;
> + struct mutex lock;
> +};
> +
> +int cgbc_command(struct cgbc_device_data *cgbc, void *cmd, unsigned int cmd_size,
> + void *data, unsigned int data_size, u8 *status);
> +
> +#endif /*_LINUX_MFD_CGBC_H_*/
There's more to review, but I think there is enough to turn around for now.
--
Lee Jones [李琼斯]
