* [PATCH v9 1/5] staging: vc04_services: vchiq_arm: Add new bus type and device type
2023-07-19 16:44 [PATCH v9 0/5] staging: vc04_services: vchiq: Register devices with a custom bus_type Umang Jain
@ 2023-07-19 16:44 ` Umang Jain
2023-07-19 17:51 ` Stefan Wahren
2023-07-19 16:44 ` [PATCH v9 2/5] staging: vc04_services: vchiq_arm: Register vchiq_bus_type Umang Jain
` (4 subsequent siblings)
5 siblings, 1 reply; 13+ messages in thread
From: Umang Jain @ 2023-07-19 16:44 UTC (permalink / raw)
To: linux-staging, linux-rpi-kernel, linux-arm-kernel, linux-media,
linux-kernel
Cc: stefan.wahren, gregkh, f.fainelli, athierry, error27,
dave.stevenson, kieran.bingham, laurent.pinchart, Umang Jain
The devices that the vchiq interface registers (bcm2835-audio,
bcm2835-camera) are implemented and exposed by the VC04 firmware.
The device tree describes the VC04 itself with the resources required
to communicate with it through a mailbox interface. However, the
vchiq interface registers these devices as platform devices. This
also means the specific drivers for these devices are getting
registered as platform drivers. This is not correct and a blatant
abuse of platform device/driver.
Add a new bus type, vchiq_bus_type and device type (struct vchiq_device)
which will be used to migrate child devices that the vchiq interfaces
creates/registers from the platform device/driver.
Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
---
drivers/staging/vc04_services/Makefile | 1 +
.../interface/vchiq_arm/vchiq_device.c | 102 ++++++++++++++++++
.../interface/vchiq_arm/vchiq_device.h | 54 ++++++++++
3 files changed, 157 insertions(+)
create mode 100644 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_device.c
create mode 100644 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_device.h
diff --git a/drivers/staging/vc04_services/Makefile b/drivers/staging/vc04_services/Makefile
index 44794bdf6173..2d071e55e175 100644
--- a/drivers/staging/vc04_services/Makefile
+++ b/drivers/staging/vc04_services/Makefile
@@ -5,6 +5,7 @@ vchiq-objs := \
interface/vchiq_arm/vchiq_core.o \
interface/vchiq_arm/vchiq_arm.o \
interface/vchiq_arm/vchiq_debugfs.o \
+ interface/vchiq_arm/vchiq_device.o \
interface/vchiq_arm/vchiq_connected.o \
ifdef CONFIG_VCHIQ_CDEV
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_device.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_device.c
new file mode 100644
index 000000000000..d7dfe4173579
--- /dev/null
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_device.c
@@ -0,0 +1,102 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * vchiq_device.c - VCHIQ generic device and bus-type
+ *
+ * Copyright (c) 2023 Ideas On Board Oy
+ */
+
+#include <linux/device/bus.h>
+#include <linux/slab.h>
+#include <linux/string.h>
+
+#include "vchiq_device.h"
+
+static int vchiq_bus_type_match(struct device *dev, struct device_driver *drv)
+{
+ if (dev->bus == &vchiq_bus_type &&
+ strcmp(dev_name(dev), drv->name) == 0)
+ return 1;
+
+ return 0;
+}
+
+static int vchiq_bus_uevent(const struct device *dev, struct kobj_uevent_env *env)
+{
+ const struct vchiq_device *device = container_of_const(dev, struct vchiq_device, dev);
+
+ return add_uevent_var(env, "MODALIAS=%s", dev_name(&device->dev));
+}
+
+static int vchiq_bus_probe(struct device *dev)
+{
+ struct vchiq_device *device = to_vchiq_device(dev);
+ struct vchiq_driver *driver = to_vchiq_driver(dev->driver);
+ int ret;
+
+ ret = driver->probe(device);
+ if (ret == 0)
+ return 0;
+
+ return ret;
+}
+
+struct bus_type vchiq_bus_type = {
+ .name = "vchiq-bus",
+ .match = vchiq_bus_type_match,
+ .uevent = vchiq_bus_uevent,
+ .probe = vchiq_bus_probe,
+};
+
+static void vchiq_device_release(struct device *dev)
+{
+ struct vchiq_device *device = to_vchiq_device(dev);
+
+ kfree(device);
+}
+
+struct vchiq_device *
+vchiq_device_register(struct device *parent, const char *name)
+{
+ struct vchiq_device *device;
+ int ret;
+
+ device = kzalloc(sizeof(*device), GFP_KERNEL);
+ if (!device) {
+ dev_err(parent, "Cannot register %s: Insufficient memory\n",
+ name);
+ return NULL;
+ }
+
+ device->dev.init_name = name;
+ device->dev.parent = parent;
+ device->dev.bus = &vchiq_bus_type;
+ device->dev.release = vchiq_device_release;
+
+ ret = device_register(&device->dev);
+ if (ret) {
+ dev_err(parent, "Cannot register %s: %d\n", name, ret);
+ put_device(&device->dev);
+ return NULL;
+ }
+
+ return device;
+}
+
+void vchiq_device_unregister(struct vchiq_device *vchiq_dev)
+{
+ device_unregister(&vchiq_dev->dev);
+}
+
+int vchiq_driver_register(struct vchiq_driver *vchiq_drv)
+{
+ vchiq_drv->driver.bus = &vchiq_bus_type;
+
+ return driver_register(&vchiq_drv->driver);
+}
+EXPORT_SYMBOL_GPL(vchiq_driver_register);
+
+void vchiq_driver_unregister(struct vchiq_driver *vchiq_drv)
+{
+ driver_unregister(&vchiq_drv->driver);
+}
+EXPORT_SYMBOL_GPL(vchiq_driver_unregister);
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_device.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_device.h
new file mode 100644
index 000000000000..7eaaf9a91cda
--- /dev/null
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_device.h
@@ -0,0 +1,54 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (c) 2023 Ideas On Board Oy
+ */
+
+#ifndef _VCHIQ_DEVICE_H
+#define _VCHIQ_DEVICE_H
+
+#include <linux/device.h>
+
+struct vchiq_device {
+ struct device dev;
+};
+
+struct vchiq_driver {
+ int (*probe)(struct vchiq_device *device);
+ void (*remove)(struct vchiq_device *device);
+ int (*resume)(struct vchiq_device *device);
+ int (*suspend)(struct vchiq_device *device,
+ pm_message_t state);
+ struct device_driver driver;
+};
+
+static inline struct vchiq_device *to_vchiq_device(struct device *d)
+{
+ return container_of(d, struct vchiq_device, dev);
+}
+
+static inline struct vchiq_driver *to_vchiq_driver(struct device_driver *d)
+{
+ return container_of(d, struct vchiq_driver, driver);
+}
+
+extern struct bus_type vchiq_bus_type;
+
+struct vchiq_device *
+vchiq_device_register(struct device *parent, const char *name);
+void vchiq_device_unregister(struct vchiq_device *dev);
+
+int vchiq_driver_register(struct vchiq_driver *vchiq_drv);
+void vchiq_driver_unregister(struct vchiq_driver *vchiq_drv);
+
+/**
+ * module_vchiq_driver() - Helper macro for registering a vchiq driver
+ * @__vchiq_driver: vchiq driver struct
+ *
+ * Helper macro for vchiq drivers which do not do anything special in
+ * module init/exit. This eliminates a lot of boilerplate. Each module may only
+ * use this macro once, and calling it replaces module_init() and module_exit()
+ */
+#define module_vchiq_driver(__vchiq_driver) \
+ module_driver(__vchiq_driver, vchiq_driver_register, vchiq_driver_unregister)
+
+#endif /* _VCHIQ_DEVICE_H */
--
2.39.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH v9 1/5] staging: vc04_services: vchiq_arm: Add new bus type and device type
2023-07-19 16:44 ` [PATCH v9 1/5] staging: vc04_services: vchiq_arm: Add new bus type and device type Umang Jain
@ 2023-07-19 17:51 ` Stefan Wahren
0 siblings, 0 replies; 13+ messages in thread
From: Stefan Wahren @ 2023-07-19 17:51 UTC (permalink / raw)
To: Umang Jain, linux-staging, linux-rpi-kernel, linux-arm-kernel,
linux-media, linux-kernel
Cc: gregkh, f.fainelli, athierry, error27, dave.stevenson,
kieran.bingham, laurent.pinchart
Hi Umang,
Am 19.07.23 um 18:44 schrieb Umang Jain:
> The devices that the vchiq interface registers (bcm2835-audio,
> bcm2835-camera) are implemented and exposed by the VC04 firmware.
> The device tree describes the VC04 itself with the resources required
> to communicate with it through a mailbox interface. However, the
> vchiq interface registers these devices as platform devices. This
> also means the specific drivers for these devices are getting
> registered as platform drivers. This is not correct and a blatant
> abuse of platform device/driver.
>
> Add a new bus type, vchiq_bus_type and device type (struct vchiq_device)
> which will be used to migrate child devices that the vchiq interfaces
> creates/registers from the platform device/driver.
>
> Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
> ---
> drivers/staging/vc04_services/Makefile | 1 +
> .../interface/vchiq_arm/vchiq_device.c | 102 ++++++++++++++++++
> .../interface/vchiq_arm/vchiq_device.h | 54 ++++++++++
> 3 files changed, 157 insertions(+)
> create mode 100644 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_device.c
> create mode 100644 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_device.h
>
> diff --git a/drivers/staging/vc04_services/Makefile b/drivers/staging/vc04_services/Makefile
> index 44794bdf6173..2d071e55e175 100644
> --- a/drivers/staging/vc04_services/Makefile
> +++ b/drivers/staging/vc04_services/Makefile
> @@ -5,6 +5,7 @@ vchiq-objs := \
> interface/vchiq_arm/vchiq_core.o \
> interface/vchiq_arm/vchiq_arm.o \
> interface/vchiq_arm/vchiq_debugfs.o \
> + interface/vchiq_arm/vchiq_device.o \
> interface/vchiq_arm/vchiq_connected.o \
>
> ifdef CONFIG_VCHIQ_CDEV
> diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_device.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_device.c
> new file mode 100644
> index 000000000000..d7dfe4173579
> --- /dev/null
> +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_device.c
> @@ -0,0 +1,102 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * vchiq_device.c - VCHIQ generic device and bus-type
> + *
> + * Copyright (c) 2023 Ideas On Board Oy
> + */
> +
> +#include <linux/device/bus.h>
> +#include <linux/slab.h>
> +#include <linux/string.h>
> +
> +#include "vchiq_device.h"
> +
> +static int vchiq_bus_type_match(struct device *dev, struct device_driver *drv)
> +{
> + if (dev->bus == &vchiq_bus_type &&
> + strcmp(dev_name(dev), drv->name) == 0)
> + return 1;
> +
> + return 0;
> +}
> +
> +static int vchiq_bus_uevent(const struct device *dev, struct kobj_uevent_env *env)
> +{
> + const struct vchiq_device *device = container_of_const(dev, struct vchiq_device, dev);
> +
> + return add_uevent_var(env, "MODALIAS=%s", dev_name(&device->dev));
> +}
> +
> +static int vchiq_bus_probe(struct device *dev)
> +{
> + struct vchiq_device *device = to_vchiq_device(dev);
> + struct vchiq_driver *driver = to_vchiq_driver(dev->driver);
> + int ret;
> +
> + ret = driver->probe(device);
> + if (ret == 0)
> + return 0;
> +
> + return ret;
Why not returning the result of probe directly?
> +}
> +
> +struct bus_type vchiq_bus_type = {
> + .name = "vchiq-bus",
> + .match = vchiq_bus_type_match,
> + .uevent = vchiq_bus_uevent,
> + .probe = vchiq_bus_probe,
> +};
> +
> +static void vchiq_device_release(struct device *dev)
> +{
> + struct vchiq_device *device = to_vchiq_device(dev);
> +
> + kfree(device);
> +}
> +
> +struct vchiq_device *
> +vchiq_device_register(struct device *parent, const char *name)
> +{
> + struct vchiq_device *device;
> + int ret;
> +
> + device = kzalloc(sizeof(*device), GFP_KERNEL);
> + if (!device) {
> + dev_err(parent, "Cannot register %s: Insufficient memory\n",
> + name);
> + return NULL;
> + }
> +
> + device->dev.init_name = name;
> + device->dev.parent = parent;
> + device->dev.bus = &vchiq_bus_type;
> + device->dev.release = vchiq_device_release;
Not sure, but maybe a good place to set the DMA mask?
> +
> + ret = device_register(&device->dev);
> + if (ret) {
> + dev_err(parent, "Cannot register %s: %d\n", name, ret);
> + put_device(&device->dev);
> + return NULL;
> + }
> +
> + return device;
> +}
> +
> +void vchiq_device_unregister(struct vchiq_device *vchiq_dev)
> +{
> + device_unregister(&vchiq_dev->dev);
> +}
> +
> +int vchiq_driver_register(struct vchiq_driver *vchiq_drv)
> +{
> + vchiq_drv->driver.bus = &vchiq_bus_type;
> +
> + return driver_register(&vchiq_drv->driver);
> +}
> +EXPORT_SYMBOL_GPL(vchiq_driver_register);
> +
> +void vchiq_driver_unregister(struct vchiq_driver *vchiq_drv)
> +{
> + driver_unregister(&vchiq_drv->driver);
> +}
> +EXPORT_SYMBOL_GPL(vchiq_driver_unregister);
> diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_device.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_device.h
> new file mode 100644
> index 000000000000..7eaaf9a91cda
> --- /dev/null
> +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_device.h
> @@ -0,0 +1,54 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> +/*
> + * Copyright (c) 2023 Ideas On Board Oy
> + */
> +
> +#ifndef _VCHIQ_DEVICE_H
> +#define _VCHIQ_DEVICE_H
> +
> +#include <linux/device.h>
> +
> +struct vchiq_device {
> + struct device dev;
> +};
> +
> +struct vchiq_driver {
> + int (*probe)(struct vchiq_device *device);
> + void (*remove)(struct vchiq_device *device);
> + int (*resume)(struct vchiq_device *device);
> + int (*suspend)(struct vchiq_device *device,
> + pm_message_t state);
> + struct device_driver driver;
> +};
> +
> +static inline struct vchiq_device *to_vchiq_device(struct device *d)
> +{
> + return container_of(d, struct vchiq_device, dev);
> +}
> +
> +static inline struct vchiq_driver *to_vchiq_driver(struct device_driver *d)
> +{
> + return container_of(d, struct vchiq_driver, driver);
> +}
> +
> +extern struct bus_type vchiq_bus_type;
> +
> +struct vchiq_device *
> +vchiq_device_register(struct device *parent, const char *name);
> +void vchiq_device_unregister(struct vchiq_device *dev);
> +
> +int vchiq_driver_register(struct vchiq_driver *vchiq_drv);
> +void vchiq_driver_unregister(struct vchiq_driver *vchiq_drv);
> +
> +/**
> + * module_vchiq_driver() - Helper macro for registering a vchiq driver
> + * @__vchiq_driver: vchiq driver struct
> + *
> + * Helper macro for vchiq drivers which do not do anything special in
> + * module init/exit. This eliminates a lot of boilerplate. Each module may only
> + * use this macro once, and calling it replaces module_init() and module_exit()
> + */
> +#define module_vchiq_driver(__vchiq_driver) \
> + module_driver(__vchiq_driver, vchiq_driver_register, vchiq_driver_unregister)
> +
> +#endif /* _VCHIQ_DEVICE_H */
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v9 2/5] staging: vc04_services: vchiq_arm: Register vchiq_bus_type
2023-07-19 16:44 [PATCH v9 0/5] staging: vc04_services: vchiq: Register devices with a custom bus_type Umang Jain
2023-07-19 16:44 ` [PATCH v9 1/5] staging: vc04_services: vchiq_arm: Add new bus type and device type Umang Jain
@ 2023-07-19 16:44 ` Umang Jain
2023-07-20 5:37 ` Dan Carpenter
2023-07-19 16:44 ` [PATCH v9 3/5] staging: bcm2835-camera: Register bcm2835-camera with vchiq_bus_type Umang Jain
` (3 subsequent siblings)
5 siblings, 1 reply; 13+ messages in thread
From: Umang Jain @ 2023-07-19 16:44 UTC (permalink / raw)
To: linux-staging, linux-rpi-kernel, linux-arm-kernel, linux-media,
linux-kernel
Cc: stefan.wahren, gregkh, f.fainelli, athierry, error27,
dave.stevenson, kieran.bingham, laurent.pinchart, Umang Jain
Register the vchiq_bus_type bus with the vchiq interface.
The bcm2835-camera and bcm2835_audio will be registered to this bus type
going ahead.
Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
.../vc04_services/interface/vchiq_arm/vchiq_arm.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
index aa2313f3bcab..e8d40f891449 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
@@ -12,6 +12,7 @@
#include <linux/cdev.h>
#include <linux/fs.h>
#include <linux/device.h>
+#include <linux/device/bus.h>
#include <linux/mm.h>
#include <linux/highmem.h>
#include <linux/pagemap.h>
@@ -34,6 +35,7 @@
#include "vchiq_ioctl.h"
#include "vchiq_arm.h"
#include "vchiq_debugfs.h"
+#include "vchiq_device.h"
#include "vchiq_connected.h"
#include "vchiq_pagelist.h"
@@ -1870,6 +1872,12 @@ static int __init vchiq_driver_init(void)
{
int ret;
+ ret = bus_register(&vchiq_bus_type);
+ if (ret) {
+ pr_err("Failed to register %s\n", vchiq_bus_type.name);
+ return ret;
+ }
+
ret = platform_driver_register(&vchiq_driver);
if (ret)
pr_err("Failed to register vchiq driver\n");
@@ -1880,6 +1888,7 @@ module_init(vchiq_driver_init);
static void __exit vchiq_driver_exit(void)
{
+ bus_unregister(&vchiq_bus_type);
platform_driver_unregister(&vchiq_driver);
}
module_exit(vchiq_driver_exit);
--
2.39.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH v9 2/5] staging: vc04_services: vchiq_arm: Register vchiq_bus_type
2023-07-19 16:44 ` [PATCH v9 2/5] staging: vc04_services: vchiq_arm: Register vchiq_bus_type Umang Jain
@ 2023-07-20 5:37 ` Dan Carpenter
0 siblings, 0 replies; 13+ messages in thread
From: Dan Carpenter @ 2023-07-20 5:37 UTC (permalink / raw)
To: Umang Jain
Cc: linux-staging, linux-rpi-kernel, linux-arm-kernel, linux-media,
linux-kernel, stefan.wahren, gregkh, f.fainelli, athierry,
error27, dave.stevenson, kieran.bingham, laurent.pinchart
On Wed, Jul 19, 2023 at 10:14:24PM +0530, Umang Jain wrote:
> @@ -1870,6 +1872,12 @@ static int __init vchiq_driver_init(void)
> {
> int ret;
>
> + ret = bus_register(&vchiq_bus_type);
> + if (ret) {
> + pr_err("Failed to register %s\n", vchiq_bus_type.name);
> + return ret;
> + }
> +
> ret = platform_driver_register(&vchiq_driver);
> if (ret)
> pr_err("Failed to register vchiq driver\n");
Call bus_unregister() if platform_driver_register() fails. Otherwise
it probably leads to a use after free or something bad.
> @@ -1880,6 +1888,7 @@ module_init(vchiq_driver_init);
regards,
dan carpenter
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v9 3/5] staging: bcm2835-camera: Register bcm2835-camera with vchiq_bus_type
2023-07-19 16:44 [PATCH v9 0/5] staging: vc04_services: vchiq: Register devices with a custom bus_type Umang Jain
2023-07-19 16:44 ` [PATCH v9 1/5] staging: vc04_services: vchiq_arm: Add new bus type and device type Umang Jain
2023-07-19 16:44 ` [PATCH v9 2/5] staging: vc04_services: vchiq_arm: Register vchiq_bus_type Umang Jain
@ 2023-07-19 16:44 ` Umang Jain
2023-07-19 16:44 ` [PATCH v9 4/5] staging: bcm2835-audio: Register bcm2835-audio " Umang Jain
` (2 subsequent siblings)
5 siblings, 0 replies; 13+ messages in thread
From: Umang Jain @ 2023-07-19 16:44 UTC (permalink / raw)
To: linux-staging, linux-rpi-kernel, linux-arm-kernel, linux-media,
linux-kernel
Cc: stefan.wahren, gregkh, f.fainelli, athierry, error27,
dave.stevenson, kieran.bingham, laurent.pinchart, Umang Jain
Register the bcm2835-camera with the vchiq_bus_type instead of using
platform driver/device.
Also the VCHIQ firmware doesn't support device enumeration, hence
one has to maintain a list of devices to be registered in the interface.
Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
---
.../bcm2835-camera/bcm2835-camera.c | 17 +++++++++--------
.../interface/vchiq_arm/vchiq_arm.c | 11 ++++++++---
2 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
index 346d00df815a..58321856cf1a 100644
--- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
+++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
@@ -24,8 +24,9 @@
#include <media/v4l2-event.h>
#include <media/v4l2-common.h>
#include <linux/delay.h>
-#include <linux/platform_device.h>
+#include "../interface/vchiq_arm/vchiq_arm.h"
+#include "../interface/vchiq_arm/vchiq_device.h"
#include "../vchiq-mmal/mmal-common.h"
#include "../vchiq-mmal/mmal-encodings.h"
#include "../vchiq-mmal/mmal-vchiq.h"
@@ -1841,7 +1842,7 @@ static struct v4l2_format default_v4l2_format = {
.fmt.pix.sizeimage = 1024 * 768,
};
-static int bcm2835_mmal_probe(struct platform_device *pdev)
+static int bcm2835_mmal_probe(struct vchiq_device *device)
{
int ret;
struct bcm2835_mmal_dev *dev;
@@ -1896,7 +1897,7 @@ static int bcm2835_mmal_probe(struct platform_device *pdev)
&camera_instance);
ret = v4l2_device_register(NULL, &dev->v4l2_dev);
if (ret) {
- dev_err(&pdev->dev, "%s: could not register V4L2 device: %d\n",
+ dev_err(&device->dev, "%s: could not register V4L2 device: %d\n",
__func__, ret);
goto free_dev;
}
@@ -1976,7 +1977,7 @@ static int bcm2835_mmal_probe(struct platform_device *pdev)
return ret;
}
-static void bcm2835_mmal_remove(struct platform_device *pdev)
+static void bcm2835_mmal_remove(struct vchiq_device *device)
{
int camera;
struct vchiq_mmal_instance *instance = gdev[0]->instance;
@@ -1988,17 +1989,17 @@ static void bcm2835_mmal_remove(struct platform_device *pdev)
vchiq_mmal_finalise(instance);
}
-static struct platform_driver bcm2835_camera_driver = {
+static struct vchiq_driver bcm2835_camera_driver = {
.probe = bcm2835_mmal_probe,
- .remove_new = bcm2835_mmal_remove,
+ .remove = bcm2835_mmal_remove,
.driver = {
.name = "bcm2835-camera",
},
};
-module_platform_driver(bcm2835_camera_driver)
+module_vchiq_driver(bcm2835_camera_driver)
MODULE_DESCRIPTION("Broadcom 2835 MMAL video capture");
MODULE_AUTHOR("Vincent Sanders");
MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:bcm2835-camera");
+MODULE_ALIAS("bcm2835-camera");
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
index e8d40f891449..d941e9640415 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
@@ -67,8 +67,13 @@ int vchiq_susp_log_level = VCHIQ_LOG_ERROR;
DEFINE_SPINLOCK(msg_queue_spinlock);
struct vchiq_state g_state;
-static struct platform_device *bcm2835_camera;
static struct platform_device *bcm2835_audio;
+/*
+ * The devices implemented in the VCHIQ firmware are not discoverable,
+ * so we need to maintain a list of them in order to register them with
+ * the interface.
+ */
+static struct vchiq_device *bcm2835_camera;
struct vchiq_drvdata {
const unsigned int cache_line_size;
@@ -1840,8 +1845,8 @@ static int vchiq_probe(struct platform_device *pdev)
goto error_exit;
}
- bcm2835_camera = vchiq_register_child(pdev, "bcm2835-camera");
bcm2835_audio = vchiq_register_child(pdev, "bcm2835_audio");
+ bcm2835_camera = vchiq_device_register(&pdev->dev, "bcm2835-camera");
return 0;
@@ -1854,7 +1859,7 @@ static int vchiq_probe(struct platform_device *pdev)
static void vchiq_remove(struct platform_device *pdev)
{
platform_device_unregister(bcm2835_audio);
- platform_device_unregister(bcm2835_camera);
+ vchiq_device_unregister(bcm2835_camera);
vchiq_debugfs_deinit();
vchiq_deregister_chrdev();
}
--
2.39.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH v9 4/5] staging: bcm2835-audio: Register bcm2835-audio with vchiq_bus_type
2023-07-19 16:44 [PATCH v9 0/5] staging: vc04_services: vchiq: Register devices with a custom bus_type Umang Jain
` (2 preceding siblings ...)
2023-07-19 16:44 ` [PATCH v9 3/5] staging: bcm2835-camera: Register bcm2835-camera with vchiq_bus_type Umang Jain
@ 2023-07-19 16:44 ` Umang Jain
2023-07-19 17:55 ` Stefan Wahren
2023-07-19 16:44 ` [PATCH v9 5/5] staging: vc04_services: vchiq_arm: Remove vchiq_register_child() Umang Jain
2023-07-19 16:54 ` [PATCH v9 0/5] staging: vc04_services: vchiq: Register devices with a custom bus_type Umang Jain
5 siblings, 1 reply; 13+ messages in thread
From: Umang Jain @ 2023-07-19 16:44 UTC (permalink / raw)
To: linux-staging, linux-rpi-kernel, linux-arm-kernel, linux-media,
linux-kernel
Cc: stefan.wahren, gregkh, f.fainelli, athierry, error27,
dave.stevenson, kieran.bingham, laurent.pinchart, Umang Jain
Similar to how bcm2385-camera device is registered, register the
bcm2835-audio with vchiq_bus_type as well.
Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
---
.../vc04_services/bcm2835-audio/bcm2835.c | 20 +++++++++----------
.../interface/vchiq_arm/vchiq_arm.c | 6 +++---
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
index 00bc898b0189..70e5e0942743 100644
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
@@ -1,12 +1,12 @@
// SPDX-License-Identifier: GPL-2.0
/* Copyright 2011 Broadcom Corporation. All rights reserved. */
-#include <linux/platform_device.h>
-
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/module.h>
+#include "../interface/vchiq_arm/vchiq_arm.h"
+#include "../interface/vchiq_arm/vchiq_device.h"
#include "bcm2835.h"
static bool enable_hdmi;
@@ -268,9 +268,9 @@ static int snd_add_child_devices(struct device *device, u32 numchans)
return 0;
}
-static int snd_bcm2835_alsa_probe(struct platform_device *pdev)
+static int snd_bcm2835_alsa_probe(struct vchiq_device *device)
{
- struct device *dev = &pdev->dev;
+ struct device *dev = &device->dev;
int err;
if (num_channels <= 0 || num_channels > MAX_SUBSTREAMS) {
@@ -292,32 +292,32 @@ static int snd_bcm2835_alsa_probe(struct platform_device *pdev)
#ifdef CONFIG_PM
-static int snd_bcm2835_alsa_suspend(struct platform_device *pdev,
+static int snd_bcm2835_alsa_suspend(struct vchiq_device *device,
pm_message_t state)
{
return 0;
}
-static int snd_bcm2835_alsa_resume(struct platform_device *pdev)
+static int snd_bcm2835_alsa_resume(struct vchiq_device *device)
{
return 0;
}
#endif
-static struct platform_driver bcm2835_alsa_driver = {
+static struct vchiq_driver bcm2835_alsa_driver = {
.probe = snd_bcm2835_alsa_probe,
#ifdef CONFIG_PM
.suspend = snd_bcm2835_alsa_suspend,
.resume = snd_bcm2835_alsa_resume,
#endif
.driver = {
- .name = "bcm2835_audio",
+ .name = "bcm2835-audio",
},
};
-module_platform_driver(bcm2835_alsa_driver);
+module_vchiq_driver(bcm2835_alsa_driver);
MODULE_AUTHOR("Dom Cobley");
MODULE_DESCRIPTION("Alsa driver for BCM2835 chip");
MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:bcm2835_audio");
+MODULE_ALIAS("bcm2835-audio");
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
index d941e9640415..f7c2dce5ab09 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
@@ -67,12 +67,12 @@ int vchiq_susp_log_level = VCHIQ_LOG_ERROR;
DEFINE_SPINLOCK(msg_queue_spinlock);
struct vchiq_state g_state;
-static struct platform_device *bcm2835_audio;
/*
* The devices implemented in the VCHIQ firmware are not discoverable,
* so we need to maintain a list of them in order to register them with
* the interface.
*/
+static struct vchiq_device *bcm2835_audio;
static struct vchiq_device *bcm2835_camera;
struct vchiq_drvdata {
@@ -1845,7 +1845,7 @@ static int vchiq_probe(struct platform_device *pdev)
goto error_exit;
}
- bcm2835_audio = vchiq_register_child(pdev, "bcm2835_audio");
+ bcm2835_audio = vchiq_device_register(&pdev->dev, "bcm2835-audio");
bcm2835_camera = vchiq_device_register(&pdev->dev, "bcm2835-camera");
return 0;
@@ -1858,7 +1858,7 @@ static int vchiq_probe(struct platform_device *pdev)
static void vchiq_remove(struct platform_device *pdev)
{
- platform_device_unregister(bcm2835_audio);
+ vchiq_device_unregister(bcm2835_audio);
vchiq_device_unregister(bcm2835_camera);
vchiq_debugfs_deinit();
vchiq_deregister_chrdev();
--
2.39.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH v9 4/5] staging: bcm2835-audio: Register bcm2835-audio with vchiq_bus_type
2023-07-19 16:44 ` [PATCH v9 4/5] staging: bcm2835-audio: Register bcm2835-audio " Umang Jain
@ 2023-07-19 17:55 ` Stefan Wahren
0 siblings, 0 replies; 13+ messages in thread
From: Stefan Wahren @ 2023-07-19 17:55 UTC (permalink / raw)
To: Umang Jain, linux-staging, linux-rpi-kernel, linux-arm-kernel,
linux-media, linux-kernel
Cc: gregkh, f.fainelli, athierry, error27, dave.stevenson,
kieran.bingham, laurent.pinchart
Hi Umang,
Am 19.07.23 um 18:44 schrieb Umang Jain:
> Similar to how bcm2385-camera device is registered, register the
> bcm2835-audio with vchiq_bus_type as well.
>
> Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
> ---
> .../vc04_services/bcm2835-audio/bcm2835.c | 20 +++++++++----------
> .../interface/vchiq_arm/vchiq_arm.c | 6 +++---
> 2 files changed, 13 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
> index 00bc898b0189..70e5e0942743 100644
> --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
> +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
> @@ -1,12 +1,12 @@
> // SPDX-License-Identifier: GPL-2.0
> /* Copyright 2011 Broadcom Corporation. All rights reserved. */
>
> -#include <linux/platform_device.h>
> -
> #include <linux/init.h>
> #include <linux/slab.h>
> #include <linux/module.h>
>
> +#include "../interface/vchiq_arm/vchiq_arm.h"
> +#include "../interface/vchiq_arm/vchiq_device.h"
> #include "bcm2835.h"
>
> static bool enable_hdmi;
> @@ -268,9 +268,9 @@ static int snd_add_child_devices(struct device *device, u32 numchans)
> return 0;
> }
>
> -static int snd_bcm2835_alsa_probe(struct platform_device *pdev)
> +static int snd_bcm2835_alsa_probe(struct vchiq_device *device)
> {
> - struct device *dev = &pdev->dev;
> + struct device *dev = &device->dev;
> int err;
>
> if (num_channels <= 0 || num_channels > MAX_SUBSTREAMS) {
> @@ -292,32 +292,32 @@ static int snd_bcm2835_alsa_probe(struct platform_device *pdev)
>
> #ifdef CONFIG_PM
>
> -static int snd_bcm2835_alsa_suspend(struct platform_device *pdev,
> +static int snd_bcm2835_alsa_suspend(struct vchiq_device *device,
> pm_message_t state)
> {
> return 0;
> }
>
> -static int snd_bcm2835_alsa_resume(struct platform_device *pdev)
> +static int snd_bcm2835_alsa_resume(struct vchiq_device *device)
> {
> return 0;
> }
>
> #endif
>
> -static struct platform_driver bcm2835_alsa_driver = {
> +static struct vchiq_driver bcm2835_alsa_driver = {
> .probe = snd_bcm2835_alsa_probe,
> #ifdef CONFIG_PM
> .suspend = snd_bcm2835_alsa_suspend,
> .resume = snd_bcm2835_alsa_resume,
> #endif
> .driver = {
> - .name = "bcm2835_audio",
> + .name = "bcm2835-audio",
At least this change is not mentioned in the commit log.
Thanks
> },
> };
> -module_platform_driver(bcm2835_alsa_driver);
> +module_vchiq_driver(bcm2835_alsa_driver);
>
> MODULE_AUTHOR("Dom Cobley");
> MODULE_DESCRIPTION("Alsa driver for BCM2835 chip");
> MODULE_LICENSE("GPL");
> -MODULE_ALIAS("platform:bcm2835_audio");
> +MODULE_ALIAS("bcm2835-audio");
> diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
> index d941e9640415..f7c2dce5ab09 100644
> --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
> +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
> @@ -67,12 +67,12 @@ int vchiq_susp_log_level = VCHIQ_LOG_ERROR;
> DEFINE_SPINLOCK(msg_queue_spinlock);
> struct vchiq_state g_state;
>
> -static struct platform_device *bcm2835_audio;
> /*
> * The devices implemented in the VCHIQ firmware are not discoverable,
> * so we need to maintain a list of them in order to register them with
> * the interface.
> */
> +static struct vchiq_device *bcm2835_audio;
> static struct vchiq_device *bcm2835_camera;
>
> struct vchiq_drvdata {
> @@ -1845,7 +1845,7 @@ static int vchiq_probe(struct platform_device *pdev)
> goto error_exit;
> }
>
> - bcm2835_audio = vchiq_register_child(pdev, "bcm2835_audio");
> + bcm2835_audio = vchiq_device_register(&pdev->dev, "bcm2835-audio");
> bcm2835_camera = vchiq_device_register(&pdev->dev, "bcm2835-camera");
>
> return 0;
> @@ -1858,7 +1858,7 @@ static int vchiq_probe(struct platform_device *pdev)
>
> static void vchiq_remove(struct platform_device *pdev)
> {
> - platform_device_unregister(bcm2835_audio);
> + vchiq_device_unregister(bcm2835_audio);
> vchiq_device_unregister(bcm2835_camera);
> vchiq_debugfs_deinit();
> vchiq_deregister_chrdev();
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v9 5/5] staging: vc04_services: vchiq_arm: Remove vchiq_register_child()
2023-07-19 16:44 [PATCH v9 0/5] staging: vc04_services: vchiq: Register devices with a custom bus_type Umang Jain
` (3 preceding siblings ...)
2023-07-19 16:44 ` [PATCH v9 4/5] staging: bcm2835-audio: Register bcm2835-audio " Umang Jain
@ 2023-07-19 16:44 ` Umang Jain
2023-07-19 16:54 ` [PATCH v9 0/5] staging: vc04_services: vchiq: Register devices with a custom bus_type Umang Jain
5 siblings, 0 replies; 13+ messages in thread
From: Umang Jain @ 2023-07-19 16:44 UTC (permalink / raw)
To: linux-staging, linux-rpi-kernel, linux-arm-kernel, linux-media,
linux-kernel
Cc: stefan.wahren, gregkh, f.fainelli, athierry, error27,
dave.stevenson, kieran.bingham, laurent.pinchart, Umang Jain
vchiq_register_child() is used to registered child devices as platform
devices. Now that the child devices are migrated to use the
vchiq_bus_type instead, they will be registered to that. Hence, drop
vchiq_register_child() as it is no more required.
Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
.../interface/vchiq_arm/vchiq_arm.c | 22 -------------------
1 file changed, 22 deletions(-)
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
index f7c2dce5ab09..f18f0ebee60b 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
@@ -1776,28 +1776,6 @@ static const struct of_device_id vchiq_of_match[] = {
};
MODULE_DEVICE_TABLE(of, vchiq_of_match);
-static struct platform_device *
-vchiq_register_child(struct platform_device *pdev, const char *name)
-{
- struct platform_device_info pdevinfo;
- struct platform_device *child;
-
- memset(&pdevinfo, 0, sizeof(pdevinfo));
-
- pdevinfo.parent = &pdev->dev;
- pdevinfo.name = name;
- pdevinfo.id = PLATFORM_DEVID_NONE;
- pdevinfo.dma_mask = DMA_BIT_MASK(32);
-
- child = platform_device_register_full(&pdevinfo);
- if (IS_ERR(child)) {
- dev_warn(&pdev->dev, "%s not registered\n", name);
- child = NULL;
- }
-
- return child;
-}
-
static int vchiq_probe(struct platform_device *pdev)
{
struct device_node *fw_node;
--
2.39.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH v9 0/5] staging: vc04_services: vchiq: Register devices with a custom bus_type
2023-07-19 16:44 [PATCH v9 0/5] staging: vc04_services: vchiq: Register devices with a custom bus_type Umang Jain
` (4 preceding siblings ...)
2023-07-19 16:44 ` [PATCH v9 5/5] staging: vc04_services: vchiq_arm: Remove vchiq_register_child() Umang Jain
@ 2023-07-19 16:54 ` Umang Jain
2023-07-19 17:35 ` Stefan Wahren
5 siblings, 1 reply; 13+ messages in thread
From: Umang Jain @ 2023-07-19 16:54 UTC (permalink / raw)
To: linux-staging, linux-rpi-kernel, linux-arm-kernel, linux-media,
linux-kernel
Cc: stefan.wahren, gregkh, f.fainelli, athierry, error27,
dave.stevenson, kieran.bingham, laurent.pinchart
Hi,
One comment,
On 7/19/23 10:14 PM, Umang Jain wrote:
> The patch series added a new bus type vchiq_bus_type and registers
> child devices in order to move them away from using platform
> device/driver.
>
> Patch 1/5 and 2/5 adds a new bus_type and registers them to vchiq
> interface
>
> Patch 3/5 and 4/5 moves the bcm2835-camera and bcm2835-audio
> to the new bus respectively
>
> Patch 5/5 removes a platform registeration helper which is no
> longer required.
>
> Changes in v9:
> - Fix module autoloading
While the autoloading of bcm2835-audio, bcm2835-camera is fixed as part
of this series, there is one WARN coming in when bcm2835-audio is loaded
regarding dma_alloc_attr
dmesg output: https://paste.debian.net/plain/1286359
I am investigating further...
> - Implement bus_type's probe() callback to load drivers
> - Implement bus_type's uevent() to make sure appropriate drivers are
> loaded when device are registed from vchiq.
>
> Changes in v8:
> - Drop dual licensing. Instead use GPL-2.0 only for patch 1/5
>
> Changes in v7:
> (5 out of 6 patches from v6 merged)
> - Split the main patch (6/6) as requested.
> - Use struct vchiq_device * instead of struct device * in
> all bus functions.
> - Drop additional name attribute displayed in sysfs (redundant info)
> - Document vchiq_interface doesn't enumerate device discovery
> - remove EXPORT_SYMBOL_GPL(vchiq_bus_type)
>
> Changes in v6:
> - Split struct device and struct driver wrappers in vchiq_device.[ch]
> - Move vchiq_bus_type definition to vchiq_device.[ch] as well
> - return error on bus_register() failure
> - drop dma_set_mask_and_coherent
> - trivial variable name change
>
> Changes in v5:
> - Fixup missing "staging: " in commits' subject line
> - No code changes from v4
>
> Changes in v4:
> - Introduce patches to drop include directives from Makefile
>
> Changes in v3:
> - Rework entirely to replace platform devices/driver model
>
> -v2:
> https://lore.kernel.org/all/20221222191500.515795-1-umang.jain@ideasonboard.com/
>
> -v1:
> https://lore.kernel.org/all/20221220084404.19280-1-umang.jain@ideasonboard.com/
>
> Umang Jain (5):
> staging: vc04_services: vchiq_arm: Add new bus type and device type
> staging: vc04_services: vchiq_arm: Register vchiq_bus_type
> staging: bcm2835-camera: Register bcm2835-camera with vchiq_bus_type
> staging: bcm2835-audio: Register bcm2835-audio with vchiq_bus_type
> staging: vc04_services: vchiq_arm: Remove vchiq_register_child()
>
> drivers/staging/vc04_services/Makefile | 1 +
> .../vc04_services/bcm2835-audio/bcm2835.c | 20 ++--
> .../bcm2835-camera/bcm2835-camera.c | 17 +--
> .../interface/vchiq_arm/vchiq_arm.c | 48 ++++-----
> .../interface/vchiq_arm/vchiq_device.c | 102 ++++++++++++++++++
> .../interface/vchiq_arm/vchiq_device.h | 54 ++++++++++
> 6 files changed, 196 insertions(+), 46 deletions(-)
> create mode 100644 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_device.c
> create mode 100644 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_device.h
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH v9 0/5] staging: vc04_services: vchiq: Register devices with a custom bus_type
2023-07-19 16:54 ` [PATCH v9 0/5] staging: vc04_services: vchiq: Register devices with a custom bus_type Umang Jain
@ 2023-07-19 17:35 ` Stefan Wahren
2023-07-20 12:08 ` Umang Jain
0 siblings, 1 reply; 13+ messages in thread
From: Stefan Wahren @ 2023-07-19 17:35 UTC (permalink / raw)
To: Umang Jain, linux-staging, linux-rpi-kernel, linux-arm-kernel,
linux-media, linux-kernel
Cc: gregkh, f.fainelli, athierry, error27, dave.stevenson,
kieran.bingham, laurent.pinchart
Hi Umang,
Am 19.07.23 um 18:54 schrieb Umang Jain:
> Hi,
>
> One comment,
>
> On 7/19/23 10:14 PM, Umang Jain wrote:
>> The patch series added a new bus type vchiq_bus_type and registers
>> child devices in order to move them away from using platform
>> device/driver.
>>
>> Patch 1/5 and 2/5 adds a new bus_type and registers them to vchiq
>> interface
>>
>> Patch 3/5 and 4/5 moves the bcm2835-camera and bcm2835-audio
>> to the new bus respectively
>>
>> Patch 5/5 removes a platform registeration helper which is no
>> longer required.
>>
>> Changes in v9:
>> - Fix module autoloading
>
> While the autoloading of bcm2835-audio, bcm2835-camera is fixed as part
> of this series, there is one WARN coming in when bcm2835-audio is loaded
> regarding dma_alloc_attr
>
> dmesg output: https://paste.debian.net/plain/1286359
is it possible that after your patch series no DMA mask like
DMA_BIT_MASK(32) is provided?
>
> I am investigating further...
>> - Implement bus_type's probe() callback to load drivers
>> - Implement bus_type's uevent() to make sure appropriate drivers are
>> loaded when device are registed from vchiq.
>>
>> Changes in v8:
>> - Drop dual licensing. Instead use GPL-2.0 only for patch 1/5
>>
>> Changes in v7:
>> (5 out of 6 patches from v6 merged)
>> - Split the main patch (6/6) as requested.
>> - Use struct vchiq_device * instead of struct device * in
>> all bus functions.
>> - Drop additional name attribute displayed in sysfs (redundant info)
>> - Document vchiq_interface doesn't enumerate device discovery
>> - remove EXPORT_SYMBOL_GPL(vchiq_bus_type)
>>
>> Changes in v6:
>> - Split struct device and struct driver wrappers in vchiq_device.[ch]
>> - Move vchiq_bus_type definition to vchiq_device.[ch] as well
>> - return error on bus_register() failure
>> - drop dma_set_mask_and_coherent
>> - trivial variable name change
>>
>> Changes in v5:
>> - Fixup missing "staging: " in commits' subject line
>> - No code changes from v4
>>
>> Changes in v4:
>> - Introduce patches to drop include directives from Makefile
>>
>> Changes in v3:
>> - Rework entirely to replace platform devices/driver model
>>
>> -v2:
>> https://lore.kernel.org/all/20221222191500.515795-1-umang.jain@ideasonboard.com/
>>
>> -v1:
>> https://lore.kernel.org/all/20221220084404.19280-1-umang.jain@ideasonboard.com/
>>
>> Umang Jain (5):
>> staging: vc04_services: vchiq_arm: Add new bus type and device type
>> staging: vc04_services: vchiq_arm: Register vchiq_bus_type
>> staging: bcm2835-camera: Register bcm2835-camera with vchiq_bus_type
>> staging: bcm2835-audio: Register bcm2835-audio with vchiq_bus_type
>> staging: vc04_services: vchiq_arm: Remove vchiq_register_child()
>>
>> drivers/staging/vc04_services/Makefile | 1 +
>> .../vc04_services/bcm2835-audio/bcm2835.c | 20 ++--
>> .../bcm2835-camera/bcm2835-camera.c | 17 +--
>> .../interface/vchiq_arm/vchiq_arm.c | 48 ++++-----
>> .../interface/vchiq_arm/vchiq_device.c | 102 ++++++++++++++++++
>> .../interface/vchiq_arm/vchiq_device.h | 54 ++++++++++
>> 6 files changed, 196 insertions(+), 46 deletions(-)
>> create mode 100644
>> drivers/staging/vc04_services/interface/vchiq_arm/vchiq_device.c
>> create mode 100644
>> drivers/staging/vc04_services/interface/vchiq_arm/vchiq_device.h
>>
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v9 0/5] staging: vc04_services: vchiq: Register devices with a custom bus_type
2023-07-19 17:35 ` Stefan Wahren
@ 2023-07-20 12:08 ` Umang Jain
2023-07-20 16:16 ` Stefan Wahren
0 siblings, 1 reply; 13+ messages in thread
From: Umang Jain @ 2023-07-20 12:08 UTC (permalink / raw)
To: Stefan Wahren, linux-staging, linux-rpi-kernel, linux-arm-kernel,
linux-media, linux-kernel
Cc: gregkh, f.fainelli, athierry, error27, dave.stevenson,
kieran.bingham, laurent.pinchart
Hi Stefan ,
On 7/19/23 11:05 PM, Stefan Wahren wrote:
> Hi Umang,
>
> Am 19.07.23 um 18:54 schrieb Umang Jain:
>> Hi,
>>
>> One comment,
>>
>> On 7/19/23 10:14 PM, Umang Jain wrote:
>>> The patch series added a new bus type vchiq_bus_type and registers
>>> child devices in order to move them away from using platform
>>> device/driver.
>>>
>>> Patch 1/5 and 2/5 adds a new bus_type and registers them to vchiq
>>> interface
>>>
>>> Patch 3/5 and 4/5 moves the bcm2835-camera and bcm2835-audio
>>> to the new bus respectively
>>>
>>> Patch 5/5 removes a platform registeration helper which is no
>>> longer required.
>>>
>>> Changes in v9:
>>> - Fix module autoloading
>>
>> While the autoloading of bcm2835-audio, bcm2835-camera is fixed as
>> part of this series, there is one WARN coming in when bcm2835-audio
>> is loaded regarding dma_alloc_attr
>>
>> dmesg output: https://paste.debian.net/plain/1286359
>
> is it possible that after your patch series no DMA mask like
> DMA_BIT_MASK(32) is provided?
I am trying to set DMA_BIT_MASK(32) via dma_set_mask_and_coherent() but
it fails with -EIO
>
>>
>> I am investigating further...
>>> - Implement bus_type's probe() callback to load drivers
>>> - Implement bus_type's uevent() to make sure appropriate drivers are
>>> loaded when device are registed from vchiq.
>>>
>>> Changes in v8:
>>> - Drop dual licensing. Instead use GPL-2.0 only for patch 1/5
>>>
>>> Changes in v7:
>>> (5 out of 6 patches from v6 merged)
>>> - Split the main patch (6/6) as requested.
>>> - Use struct vchiq_device * instead of struct device * in
>>> all bus functions.
>>> - Drop additional name attribute displayed in sysfs (redundant info)
>>> - Document vchiq_interface doesn't enumerate device discovery
>>> - remove EXPORT_SYMBOL_GPL(vchiq_bus_type)
>>>
>>> Changes in v6:
>>> - Split struct device and struct driver wrappers in vchiq_device.[ch]
>>> - Move vchiq_bus_type definition to vchiq_device.[ch] as well
>>> - return error on bus_register() failure
>>> - drop dma_set_mask_and_coherent
>>> - trivial variable name change
>>>
>>> Changes in v5:
>>> - Fixup missing "staging: " in commits' subject line
>>> - No code changes from v4
>>>
>>> Changes in v4:
>>> - Introduce patches to drop include directives from Makefile
>>>
>>> Changes in v3:
>>> - Rework entirely to replace platform devices/driver model
>>>
>>> -v2:
>>> https://lore.kernel.org/all/20221222191500.515795-1-umang.jain@ideasonboard.com/
>>>
>>>
>>> -v1:
>>> https://lore.kernel.org/all/20221220084404.19280-1-umang.jain@ideasonboard.com/
>>>
>>>
>>> Umang Jain (5):
>>> staging: vc04_services: vchiq_arm: Add new bus type and device type
>>> staging: vc04_services: vchiq_arm: Register vchiq_bus_type
>>> staging: bcm2835-camera: Register bcm2835-camera with vchiq_bus_type
>>> staging: bcm2835-audio: Register bcm2835-audio with vchiq_bus_type
>>> staging: vc04_services: vchiq_arm: Remove vchiq_register_child()
>>>
>>> drivers/staging/vc04_services/Makefile | 1 +
>>> .../vc04_services/bcm2835-audio/bcm2835.c | 20 ++--
>>> .../bcm2835-camera/bcm2835-camera.c | 17 +--
>>> .../interface/vchiq_arm/vchiq_arm.c | 48 ++++-----
>>> .../interface/vchiq_arm/vchiq_device.c | 102
>>> ++++++++++++++++++
>>> .../interface/vchiq_arm/vchiq_device.h | 54 ++++++++++
>>> 6 files changed, 196 insertions(+), 46 deletions(-)
>>> create mode 100644
>>> drivers/staging/vc04_services/interface/vchiq_arm/vchiq_device.c
>>> create mode 100644
>>> drivers/staging/vc04_services/interface/vchiq_arm/vchiq_device.h
>>>
>>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v9 0/5] staging: vc04_services: vchiq: Register devices with a custom bus_type
2023-07-20 12:08 ` Umang Jain
@ 2023-07-20 16:16 ` Stefan Wahren
0 siblings, 0 replies; 13+ messages in thread
From: Stefan Wahren @ 2023-07-20 16:16 UTC (permalink / raw)
To: Umang Jain, linux-staging, linux-rpi-kernel, linux-arm-kernel,
linux-media, linux-kernel
Cc: gregkh, f.fainelli, athierry, error27, dave.stevenson,
kieran.bingham, laurent.pinchart
Hi Umang,
Am 20.07.23 um 14:08 schrieb Umang Jain:
> Hi Stefan ,
>
>
> On 7/19/23 11:05 PM, Stefan Wahren wrote:
>> Hi Umang,
>>
>> Am 19.07.23 um 18:54 schrieb Umang Jain:
>>> Hi,
>>>
>>> One comment,
>>>
>>> On 7/19/23 10:14 PM, Umang Jain wrote:
>>>> The patch series added a new bus type vchiq_bus_type and registers
>>>> child devices in order to move them away from using platform
>>>> device/driver.
>>>>
>>>> Patch 1/5 and 2/5 adds a new bus_type and registers them to vchiq
>>>> interface
>>>>
>>>> Patch 3/5 and 4/5 moves the bcm2835-camera and bcm2835-audio
>>>> to the new bus respectively
>>>>
>>>> Patch 5/5 removes a platform registeration helper which is no
>>>> longer required.
>>>>
>>>> Changes in v9:
>>>> - Fix module autoloading
>>>
>>> While the autoloading of bcm2835-audio, bcm2835-camera is fixed as
>>> part of this series, there is one WARN coming in when bcm2835-audio
>>> is loaded regarding dma_alloc_attr
>>>
>>> dmesg output: https://paste.debian.net/plain/1286359
>>
>> is it possible that after your patch series no DMA mask like
>> DMA_BIT_MASK(32) is provided?
>
> I am trying to set DMA_BIT_MASK(32) via dma_set_mask_and_coherent() but
> it fails with -EIO
what happens if you assign DMA_BIT_MASK(32) to device->dev.dma_mask
within vchiq_device_register()?
>>
>>>
>>> I am investigating further...
>>>> - Implement bus_type's probe() callback to load drivers
>>>> - Implement bus_type's uevent() to make sure appropriate drivers are
>>>> loaded when device are registed from vchiq.
>>>>
>>>> Changes in v8:
>>>> - Drop dual licensing. Instead use GPL-2.0 only for patch 1/5
>>>>
>>>> Changes in v7:
>>>> (5 out of 6 patches from v6 merged)
>>>> - Split the main patch (6/6) as requested.
>>>> - Use struct vchiq_device * instead of struct device * in
>>>> all bus functions.
>>>> - Drop additional name attribute displayed in sysfs (redundant info)
>>>> - Document vchiq_interface doesn't enumerate device discovery
>>>> - remove EXPORT_SYMBOL_GPL(vchiq_bus_type)
>>>>
>>>> Changes in v6:
>>>> - Split struct device and struct driver wrappers in vchiq_device.[ch]
>>>> - Move vchiq_bus_type definition to vchiq_device.[ch] as well
>>>> - return error on bus_register() failure
>>>> - drop dma_set_mask_and_coherent
>>>> - trivial variable name change
>>>>
>>>> Changes in v5:
>>>> - Fixup missing "staging: " in commits' subject line
>>>> - No code changes from v4
>>>>
>>>> Changes in v4:
>>>> - Introduce patches to drop include directives from Makefile
>>>>
>>>> Changes in v3:
>>>> - Rework entirely to replace platform devices/driver model
>>>>
>>>> -v2:
>>>> https://lore.kernel.org/all/20221222191500.515795-1-umang.jain@ideasonboard.com/
>>>>
>>>> -v1:
>>>> https://lore.kernel.org/all/20221220084404.19280-1-umang.jain@ideasonboard.com/
>>>>
>>>> Umang Jain (5):
>>>> staging: vc04_services: vchiq_arm: Add new bus type and device type
>>>> staging: vc04_services: vchiq_arm: Register vchiq_bus_type
>>>> staging: bcm2835-camera: Register bcm2835-camera with vchiq_bus_type
>>>> staging: bcm2835-audio: Register bcm2835-audio with vchiq_bus_type
>>>> staging: vc04_services: vchiq_arm: Remove vchiq_register_child()
>>>>
>>>> drivers/staging/vc04_services/Makefile | 1 +
>>>> .../vc04_services/bcm2835-audio/bcm2835.c | 20 ++--
>>>> .../bcm2835-camera/bcm2835-camera.c | 17 +--
>>>> .../interface/vchiq_arm/vchiq_arm.c | 48 ++++-----
>>>> .../interface/vchiq_arm/vchiq_device.c | 102
>>>> ++++++++++++++++++
>>>> .../interface/vchiq_arm/vchiq_device.h | 54 ++++++++++
>>>> 6 files changed, 196 insertions(+), 46 deletions(-)
>>>> create mode 100644
>>>> drivers/staging/vc04_services/interface/vchiq_arm/vchiq_device.c
>>>> create mode 100644
>>>> drivers/staging/vc04_services/interface/vchiq_arm/vchiq_device.h
>>>>
>>>
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 13+ messages in thread