greybus-dev May 2021

greybus-dev@lists.linaro.org

17 participants
17 discussions

[PATCH] staging: greybus: add declare_ to declaring macros

by Shreyansh Chouhan

Prefixed the names of all the macros that were used for declaring things with 'declare_'. This should help with clarifying about what these macros do. Signed-off-by: Shreyansh Chouhan <chouhan.shreyansh630(a)gmail.com> --- drivers/staging/greybus/loopback.c | 56 +++++++++++++++--------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/drivers/staging/greybus/loopback.c b/drivers/staging/greybus/loopback.c index 2471448ba42a..ddbeb33fa3c1 100644 --- a/drivers/staging/greybus/loopback.c +++ b/drivers/staging/greybus/loopback.c @@ -119,7 +119,7 @@ module_param(kfifo_depth, uint, 0444); #define GB_LOOPBACK_US_WAIT_MAX 1000000 /* interface sysfs attributes */ -#define gb_loopback_ro_attr(field) \ +#define declare_gb_loopback_ro_attr(field) \ static ssize_t field##_show(struct device *dev, \ struct device_attribute *attr, \ char *buf) \ @@ -129,7 +129,7 @@ static ssize_t field##_show(struct device *dev, \ } \ static DEVICE_ATTR_RO(field) -#define gb_loopback_ro_stats_attr(name, field, type) \ +#define declare_gb_loopback_ro_stats_attr(name, field, type) \ static ssize_t name##_##field##_show(struct device *dev, \ struct device_attribute *attr, \ char *buf) \ @@ -142,7 +142,7 @@ static ssize_t name##_##field##_show(struct device *dev, \ } \ static DEVICE_ATTR_RO(name##_##field) -#define gb_loopback_ro_avg_attr(name) \ +#define declare_gb_loopback_ro_avg_attr(name) \ static ssize_t name##_avg_show(struct device *dev, \ struct device_attribute *attr, \ char *buf) \ @@ -162,12 +162,12 @@ static ssize_t name##_avg_show(struct device *dev, \ } \ static DEVICE_ATTR_RO(name##_avg) -#define gb_loopback_stats_attrs(field) \ - gb_loopback_ro_stats_attr(field, min, u); \ - gb_loopback_ro_stats_attr(field, max, u); \ - gb_loopback_ro_avg_attr(field) +#define declare_gb_loopback_stats_attrs(field) \ + declare_gb_loopback_ro_stats_attr(field, min, u); \ + declare_gb_loopback_ro_stats_attr(field, max, u); \ + declare_gb_loopback_ro_avg_attr(field) -#define gb_loopback_attr(field, type) \ +#define declare_gb_loopback_attr(field, type) \ static ssize_t field##_show(struct device *dev, \ struct device_attribute *attr, \ char *buf) \ @@ -193,7 +193,7 @@ static ssize_t field##_store(struct device *dev, \ } \ static DEVICE_ATTR_RW(field) -#define gb_dev_loopback_ro_attr(field, conn) \ +#define declare_gb_dev_loopback_ro_attr(field, conn) \ static ssize_t field##_show(struct device *dev, \ struct device_attribute *attr, \ char *buf) \ @@ -203,7 +203,7 @@ static ssize_t field##_show(struct device *dev, \ } \ static DEVICE_ATTR_RO(field) -#define gb_dev_loopback_rw_attr(field, type) \ +#define declare_gb_dev_loopback_rw_attr(field, type) \ static ssize_t field##_show(struct device *dev, \ struct device_attribute *attr, \ char *buf) \ @@ -268,26 +268,26 @@ static void gb_loopback_check_attr(struct gb_loopback *gb) } /* Time to send and receive one message */ -gb_loopback_stats_attrs(latency); +declare_gb_loopback_stats_attrs(latency); /* Number of requests sent per second on this cport */ -gb_loopback_stats_attrs(requests_per_second); +declare_gb_loopback_stats_attrs(requests_per_second); /* Quantity of data sent and received on this cport */ -gb_loopback_stats_attrs(throughput); +declare_gb_loopback_stats_attrs(throughput); /* Latency across the UniPro link from APBridge's perspective */ -gb_loopback_stats_attrs(apbridge_unipro_latency); +declare_gb_loopback_stats_attrs(apbridge_unipro_latency); /* Firmware induced overhead in the GPBridge */ -gb_loopback_stats_attrs(gbphy_firmware_latency); +declare_gb_loopback_stats_attrs(gbphy_firmware_latency); /* Number of errors encountered during loop */ -gb_loopback_ro_attr(error); +declare_gb_loopback_ro_attr(error); /* Number of requests successfully completed async */ -gb_loopback_ro_attr(requests_completed); +declare_gb_loopback_ro_attr(requests_completed); /* Number of requests timed out async */ -gb_loopback_ro_attr(requests_timedout); +declare_gb_loopback_ro_attr(requests_timedout); /* Timeout minimum in useconds */ -gb_loopback_ro_attr(timeout_min); +declare_gb_loopback_ro_attr(timeout_min); /* Timeout minimum in useconds */ -gb_loopback_ro_attr(timeout_max); +declare_gb_loopback_ro_attr(timeout_max); /* * Type of loopback message to send based on protocol type definitions @@ -297,21 +297,21 @@ gb_loopback_ro_attr(timeout_max); * payload returned in response) * 4 => Send a sink message (message with payload, no payload in response) */ -gb_dev_loopback_rw_attr(type, d); +declare_gb_dev_loopback_rw_attr(type, d); /* Size of transfer message payload: 0-4096 bytes */ -gb_dev_loopback_rw_attr(size, u); +declare_gb_dev_loopback_rw_attr(size, u); /* Time to wait between two messages: 0-1000 ms */ -gb_dev_loopback_rw_attr(us_wait, d); +declare_gb_dev_loopback_rw_attr(us_wait, d); /* Maximum iterations for a given operation: 1-(2^32-1), 0 implies infinite */ -gb_dev_loopback_rw_attr(iteration_max, u); +declare_gb_dev_loopback_rw_attr(iteration_max, u); /* The current index of the for (i = 0; i < iteration_max; i++) loop */ -gb_dev_loopback_ro_attr(iteration_count, false); +declare_gb_dev_loopback_ro_attr(iteration_count, false); /* A flag to indicate synchronous or asynchronous operations */ -gb_dev_loopback_rw_attr(async, u); +declare_gb_dev_loopback_rw_attr(async, u); /* Timeout of an individual asynchronous request */ -gb_dev_loopback_rw_attr(timeout, u); +declare_gb_dev_loopback_rw_attr(timeout, u); /* Maximum number of in-flight operations before back-off */ -gb_dev_loopback_rw_attr(outstanding_operations_max, u); +declare_gb_dev_loopback_rw_attr(outstanding_operations_max, u); static struct attribute *loopback_attrs[] = { &dev_attr_latency_min.attr, -- 2.31.1

4 years

Re: [greybus-dev] [PATCH] staging: greybus: fix gb_loopback_stats_attrs definition

by Greg KH

On Fri, May 14, 2021 at 08:42:16PM +0530, Shreyansh Chouhan wrote: > On Fri, May 14, 2021 at 04:30:23PM +0200, Greg KH wrote: > > On Fri, May 14, 2021 at 07:53:57PM +0530, Shreyansh Chouhan wrote: > > > On Fri, May 14, 2021 at 04:05:32PM +0200, Greg KH wrote: > > > > On Fri, May 14, 2021 at 07:18:38PM +0530, Shreyansh Chouhan wrote: > > > > > On Fri, May 14, 2021 at 03:36:25PM +0200, Greg KH wrote: > > > > > > On Fri, May 14, 2021 at 07:00:39PM +0530, Shreyansh Chouhan wrote: > > > > > > > The gb_loopback_stats_attrs macro, (defined in loopback.c,) is a > > > > > > > multiline macro whose statements were not enclosed in a do while > > > > > > > loop. > > > > > > > > > > > > > > This patch adds a do while loop around the statements of the said > > > > > > > macro. > > > > > > > > > > > > > > Signed-off-by: Shreyansh Chouhan <chouhan.shreyansh630(a)gmail.com> > > > > > > > --- > > > > > > > drivers/staging/greybus/loopback.c | 10 ++++++---- > > > > > > > 1 file changed, 6 insertions(+), 4 deletions(-) > > > > > > > > > > > > > > diff --git a/drivers/staging/greybus/loopback.c b/drivers/staging/greybus/loopback.c > > > > > > > index 2471448ba42a..c88ef3e894fa 100644 > > > > > > > --- a/drivers/staging/greybus/loopback.c > > > > > > > +++ b/drivers/staging/greybus/loopback.c > > > > > > > @@ -162,10 +162,12 @@ static ssize_t name##_avg_show(struct device *dev, \ > > > > > > > } \ > > > > > > > static DEVICE_ATTR_RO(name##_avg) > > > > > > > > > > > > > > -#define gb_loopback_stats_attrs(field) \ > > > > > > > - gb_loopback_ro_stats_attr(field, min, u); \ > > > > > > > - gb_loopback_ro_stats_attr(field, max, u); \ > > > > > > > - gb_loopback_ro_avg_attr(field) > > > > > > > +#define gb_loopback_stats_attrs(field) \ > > > > > > > + do { \ > > > > > > > + gb_loopback_ro_stats_attr(field, min, u); \ > > > > > > > + gb_loopback_ro_stats_attr(field, max, u); \ > > > > > > > + gb_loopback_ro_avg_attr(field); \ > > > > > > > + } while (0) > > > > > > > > > > > > > > #define gb_loopback_attr(field, type) \ > > > > > > > static ssize_t field##_show(struct device *dev, \ > > > > > > > -- > > > > > > > 2.31.1 > > > > > > > > > > > > > > > > > > > > > > > > > > Did you test build this change? > > > > > > > > > > I built the module using make -C . M=drivers/staging/greybus to test > > > > > build it. I didn't get any errors. > > > > > > > > Really? Can you provide the full build output for this file with your > > > > change? I don't think you really built this file for the obvious > > > > reasons... > > > > > > I ran make -C . M=drivers/staging/greybus > > > > > > I got a three line output saying: > > > make: Entering directory '/work/linux' > > > MODPOST drivers/staging/greybus//Module.symvers > > > make: Leaving directory '/work/linux' > > > > > > I just tried rebuilding the kernel with CONFIG_GREYBUS=m, and now I can > > > see what you are talking about. Why weren't these errors reported when I > > > ran the previous make command? Does that too check for the config > > > variables even when I specifically asked it to build a module? > > > > You were just asking it to build a subdirectory, not a specific > > individual file, and when you do that it looks at the configuration > > settings. > > > > I see. > > > It's always good to ensure that you actually build the files you modify > > before sending patches out. > > Sorry, I googled about building a single module, and thought running > that command would have built it. Moreover, since the change was so > simple I didn't suspect anything when it got built correctly the first > time around. > > I didn't look at how/where was the macro called and missed a very > obvious error. Now that I have looked at it, the only way I can think of > fixing this is changing the macro to a (inline?) function. Will > that be a desirable change? No, it can't be a function, the code is fine as-is, checkpatch is just a perl script and does not always know what needs to be done. thanks, greg k-h

4 years

Re: [greybus-dev] [PATCH] staging: greybus: fix gb_loopback_stats_attrs definition

by Greg KH

On Fri, May 14, 2021 at 07:53:57PM +0530, Shreyansh Chouhan wrote: > On Fri, May 14, 2021 at 04:05:32PM +0200, Greg KH wrote: > > On Fri, May 14, 2021 at 07:18:38PM +0530, Shreyansh Chouhan wrote: > > > On Fri, May 14, 2021 at 03:36:25PM +0200, Greg KH wrote: > > > > On Fri, May 14, 2021 at 07:00:39PM +0530, Shreyansh Chouhan wrote: > > > > > The gb_loopback_stats_attrs macro, (defined in loopback.c,) is a > > > > > multiline macro whose statements were not enclosed in a do while > > > > > loop. > > > > > > > > > > This patch adds a do while loop around the statements of the said > > > > > macro. > > > > > > > > > > Signed-off-by: Shreyansh Chouhan <chouhan.shreyansh630(a)gmail.com> > > > > > --- > > > > > drivers/staging/greybus/loopback.c | 10 ++++++---- > > > > > 1 file changed, 6 insertions(+), 4 deletions(-) > > > > > > > > > > diff --git a/drivers/staging/greybus/loopback.c b/drivers/staging/greybus/loopback.c > > > > > index 2471448ba42a..c88ef3e894fa 100644 > > > > > --- a/drivers/staging/greybus/loopback.c > > > > > +++ b/drivers/staging/greybus/loopback.c > > > > > @@ -162,10 +162,12 @@ static ssize_t name##_avg_show(struct device *dev, \ > > > > > } \ > > > > > static DEVICE_ATTR_RO(name##_avg) > > > > > > > > > > -#define gb_loopback_stats_attrs(field) \ > > > > > - gb_loopback_ro_stats_attr(field, min, u); \ > > > > > - gb_loopback_ro_stats_attr(field, max, u); \ > > > > > - gb_loopback_ro_avg_attr(field) > > > > > +#define gb_loopback_stats_attrs(field) \ > > > > > + do { \ > > > > > + gb_loopback_ro_stats_attr(field, min, u); \ > > > > > + gb_loopback_ro_stats_attr(field, max, u); \ > > > > > + gb_loopback_ro_avg_attr(field); \ > > > > > + } while (0) > > > > > > > > > > #define gb_loopback_attr(field, type) \ > > > > > static ssize_t field##_show(struct device *dev, \ > > > > > -- > > > > > 2.31.1 > > > > > > > > > > > > > > > > > > Did you test build this change? > > > > > > I built the module using make -C . M=drivers/staging/greybus to test > > > build it. I didn't get any errors. > > > > Really? Can you provide the full build output for this file with your > > change? I don't think you really built this file for the obvious > > reasons... > > I ran make -C . M=drivers/staging/greybus > > I got a three line output saying: > make: Entering directory '/work/linux' > MODPOST drivers/staging/greybus//Module.symvers > make: Leaving directory '/work/linux' > > I just tried rebuilding the kernel with CONFIG_GREYBUS=m, and now I can > see what you are talking about. Why weren't these errors reported when I > ran the previous make command? Does that too check for the config > variables even when I specifically asked it to build a module? You were just asking it to build a subdirectory, not a specific individual file, and when you do that it looks at the configuration settings. It's always good to ensure that you actually build the files you modify before sending patches out. thanks, greg k-h

4 years

Re: [greybus-dev] [PATCH] staging: greybus: fix gb_loopback_stats_attrs definition

by Greg KH

On Fri, May 14, 2021 at 07:18:38PM +0530, Shreyansh Chouhan wrote: > On Fri, May 14, 2021 at 03:36:25PM +0200, Greg KH wrote: > > On Fri, May 14, 2021 at 07:00:39PM +0530, Shreyansh Chouhan wrote: > > > The gb_loopback_stats_attrs macro, (defined in loopback.c,) is a > > > multiline macro whose statements were not enclosed in a do while > > > loop. > > > > > > This patch adds a do while loop around the statements of the said > > > macro. > > > > > > Signed-off-by: Shreyansh Chouhan <chouhan.shreyansh630(a)gmail.com> > > > --- > > > drivers/staging/greybus/loopback.c | 10 ++++++---- > > > 1 file changed, 6 insertions(+), 4 deletions(-) > > > > > > diff --git a/drivers/staging/greybus/loopback.c b/drivers/staging/greybus/loopback.c > > > index 2471448ba42a..c88ef3e894fa 100644 > > > --- a/drivers/staging/greybus/loopback.c > > > +++ b/drivers/staging/greybus/loopback.c > > > @@ -162,10 +162,12 @@ static ssize_t name##_avg_show(struct device *dev, \ > > > } \ > > > static DEVICE_ATTR_RO(name##_avg) > > > > > > -#define gb_loopback_stats_attrs(field) \ > > > - gb_loopback_ro_stats_attr(field, min, u); \ > > > - gb_loopback_ro_stats_attr(field, max, u); \ > > > - gb_loopback_ro_avg_attr(field) > > > +#define gb_loopback_stats_attrs(field) \ > > > + do { \ > > > + gb_loopback_ro_stats_attr(field, min, u); \ > > > + gb_loopback_ro_stats_attr(field, max, u); \ > > > + gb_loopback_ro_avg_attr(field); \ > > > + } while (0) > > > > > > #define gb_loopback_attr(field, type) \ > > > static ssize_t field##_show(struct device *dev, \ > > > -- > > > 2.31.1 > > > > > > > > > > Did you test build this change? > > I built the module using make -C . M=drivers/staging/greybus to test > build it. I didn't get any errors. Really? Can you provide the full build output for this file with your change? I don't think you really built this file for the obvious reasons... thanks, greg k-h

4 years

Re: [greybus-dev] [PATCH] staging: greybus: fix gb_loopback_stats_attrs definition

by Greg KH

On Fri, May 14, 2021 at 07:00:39PM +0530, Shreyansh Chouhan wrote: > The gb_loopback_stats_attrs macro, (defined in loopback.c,) is a > multiline macro whose statements were not enclosed in a do while > loop. > > This patch adds a do while loop around the statements of the said > macro. > > Signed-off-by: Shreyansh Chouhan <chouhan.shreyansh630(a)gmail.com> > --- > drivers/staging/greybus/loopback.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/drivers/staging/greybus/loopback.c b/drivers/staging/greybus/loopback.c > index 2471448ba42a..c88ef3e894fa 100644 > --- a/drivers/staging/greybus/loopback.c > +++ b/drivers/staging/greybus/loopback.c > @@ -162,10 +162,12 @@ static ssize_t name##_avg_show(struct device *dev, \ > } \ > static DEVICE_ATTR_RO(name##_avg) > > -#define gb_loopback_stats_attrs(field) \ > - gb_loopback_ro_stats_attr(field, min, u); \ > - gb_loopback_ro_stats_attr(field, max, u); \ > - gb_loopback_ro_avg_attr(field) > +#define gb_loopback_stats_attrs(field) \ > + do { \ > + gb_loopback_ro_stats_attr(field, min, u); \ > + gb_loopback_ro_stats_attr(field, max, u); \ > + gb_loopback_ro_avg_attr(field); \ > + } while (0) > > #define gb_loopback_attr(field, type) \ > static ssize_t field##_show(struct device *dev, \ > -- > 2.31.1 > > Did you test build this change?

4 years

[PATCH -next] staging: greybus: audio: Add missing MODULE_DEVICE_TABLE

by Zou Wei

This patch adds missing MODULE_DEVICE_TABLE definition which generates correct modalias for automatic loading of this driver when it is built as an external module. Reported-by: Hulk Robot <hulkci(a)huawei.com> Signed-off-by: Zou Wei <zou_wei(a)huawei.com> --- drivers/staging/greybus/audio_codec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/staging/greybus/audio_codec.c b/drivers/staging/greybus/audio_codec.c index b589cf6..6fa9781 100644 --- a/drivers/staging/greybus/audio_codec.c +++ b/drivers/staging/greybus/audio_codec.c @@ -1086,6 +1086,7 @@ static const struct of_device_id greybus_asoc_machine_of_match[] = { { .compatible = "toshiba,apb-dummy-codec", }, {}, }; +MODULE_DEVICE_TABLE(of, greybus_asoc_machine_of_match); static struct platform_driver gbaudio_codec_driver = { .driver = { -- 2.6.2

4 years

[PATCH] Staging: greybus: tools: loopback_test: fixed coding style issues

by Thais Camacho

Fixed warnings found by checkpatch.pl script Signed-off-by: Thais Camacho <thaiscamachoo(a)gmail.com> --- drivers/staging/greybus/tools/loopback_test.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/drivers/staging/greybus/tools/loopback_test.c b/drivers/staging/greybus/tools/loopback_test.c index 867bf289df2e..553883b2bfa3 100644 --- a/drivers/staging/greybus/tools/loopback_test.c +++ b/drivers/staging/greybus/tools/loopback_test.c @@ -239,7 +239,6 @@ static void show_loopback_devices(struct loopback_test *t) for (i = 0; i < t->device_count; i++) printf("device[%d] = %s\n", i, t->devices[i].name); - } int open_sysfs(const char *sys_pfx, const char *node, int flags) @@ -274,7 +273,6 @@ float read_sysfs_float_fd(int fd, const char *sys_pfx, const char *node) char buf[SYSFS_MAX_INT]; if (read(fd, buf, sizeof(buf)) < 0) { - fprintf(stderr, "unable to read from %s%s %s\n", sys_pfx, node, strerror(errno)); close(fd); @@ -367,7 +365,6 @@ static int get_results(struct loopback_test *t) r->apbridge_unipro_latency_max - r->apbridge_unipro_latency_min; r->gbphy_firmware_latency_jitter = r->gbphy_firmware_latency_max - r->gbphy_firmware_latency_min; - } /*calculate the aggregate results of all enabled devices */ @@ -407,7 +404,6 @@ static int get_results(struct loopback_test *t) r->apbridge_unipro_latency_max - r->apbridge_unipro_latency_min; r->gbphy_firmware_latency_jitter = r->gbphy_firmware_latency_max - r->gbphy_firmware_latency_min; - } return 0; @@ -536,7 +532,6 @@ static int log_results(struct loopback_test *t) fprintf(stderr, "unable to open %s for appendation\n", file_name); abort(); } - } for (i = 0; i < t->device_count; i++) { if (!device_enabled(t, i)) @@ -550,10 +545,8 @@ static int log_results(struct loopback_test *t) if (ret == -1) fprintf(stderr, "unable to write %d bytes to csv.\n", len); } - } - if (t->aggregate_output) { len = format_output(t, &t->aggregate_results, "aggregate", data, sizeof(data), &tm); @@ -675,11 +668,13 @@ static int open_poll_files(struct loopback_test *t) static int close_poll_files(struct loopback_test *t) { int i; + for (i = 0; i < t->poll_count; i++) close(t->fds[i].fd); return 0; } + static int is_complete(struct loopback_test *t) { int iteration_count; @@ -740,7 +735,6 @@ static int wait_for_complete(struct loopback_test *t) ts = &t->poll_timeout; while (1) { - ret = ppoll(t->fds, t->poll_count, ts, &mask_old); if (ret <= 0) { stop_tests(t); @@ -780,7 +774,6 @@ static void prepare_devices(struct loopback_test *t) if (t->stop_all || device_enabled(t, i)) write_sysfs_val(t->devices[i].sysfs_entry, "type", 0); - for (i = 0; i < t->device_count; i++) { if (!device_enabled(t, i)) continue; @@ -823,13 +816,12 @@ static int start(struct loopback_test *t) return 0; } - void loopback_run(struct loopback_test *t) { int i; int ret; - for (i = 0; dict[i].name != NULL; i++) { + for (i = 0; dict[i].name; i++) { if (strstr(dict[i].name, t->test_name)) t->test_id = dict[i].type; } @@ -852,7 +844,6 @@ void loopback_run(struct loopback_test *t) if (ret) goto err; - get_results(t); log_results(t); @@ -861,7 +852,6 @@ void loopback_run(struct loopback_test *t) err: printf("Error running test\n"); - return; } static int sanity_check(struct loopback_test *t) @@ -881,10 +871,8 @@ static int sanity_check(struct loopback_test *t) fprintf(stderr, "Bad device mask %x\n", (1 << i)); return -1; } - } - return 0; } -- 2.20.1

4 years, 1 month

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

greybus-dev May 2021