Skip to content

Commit fa8a545

Browse files
shemmingerdavid-marchand
shemminger
authored and
david-marchand
committed
raw/cnxk: use a dynamic logtype
Driver should not be using PMD logtype, they should have their own logtype. Signed-off-by: Stephen Hemminger <[email protected]>
1 parent 6758365 commit fa8a545

File tree

7 files changed

+48
-37
lines changed

7 files changed

+48
-37
lines changed

‎drivers/raw/cnxk_bphy/cnxk_bphy.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ cnxk_bphy_irq_enqueue_bufs(struct rte_rawdev *dev,
251251

252252
/* get rid of last response if any */
253253
if (qp->rsp) {
254-
RTE_LOG(WARNING, PMD, "Previous response got overwritten\n");
254+
CNXK_BPHY_LOG(WARNING, "Previous response got overwritten");
255255
rte_free(qp->rsp);
256256
}
257257
qp->rsp = rsp;
@@ -410,3 +410,4 @@ static struct rte_pci_driver cnxk_bphy_rawdev_pmd = {
410410
RTE_PMD_REGISTER_PCI(bphy_rawdev_pci_driver, cnxk_bphy_rawdev_pmd);
411411
RTE_PMD_REGISTER_PCI_TABLE(bphy_rawdev_pci_driver, pci_bphy_map);
412412
RTE_PMD_REGISTER_KMOD_DEP(bphy_rawdev_pci_driver, "vfio-pci");
413+
RTE_LOG_REGISTER_SUFFIX(cnxk_logtype_bphy, bphy, INFO);

‎drivers/raw/cnxk_bphy/cnxk_bphy_cgx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ cnxk_bphy_cgx_process_buf(struct cnxk_bphy_cgx *cgx, unsigned int queue,
189189

190190
/* get rid of last response if any */
191191
if (qp->rsp) {
192-
RTE_LOG(WARNING, PMD, "Previous response got overwritten\n");
192+
CNXK_BPHY_LOG(WARNING, "Previous response got overwritten");
193193
rte_free(qp->rsp);
194194
}
195195
qp->rsp = rsp;

‎drivers/raw/cnxk_bphy/cnxk_bphy_cgx_test.c

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -57,90 +57,89 @@ cnxk_bphy_cgx_dev_selftest(uint16_t dev_id)
5757
if (ret)
5858
break;
5959
if (descs != 1) {
60-
RTE_LOG(ERR, PMD, "Wrong number of descs reported\n");
60+
CNXK_BPHY_LOG(ERR, "Wrong number of descs reported");
6161
ret = -ENODEV;
6262
break;
6363
}
6464

65-
RTE_LOG(INFO, PMD, "Testing queue %d\n", i);
65+
CNXK_BPHY_LOG(INFO, "Testing queue %d", i);
6666

6767
ret = rte_pmd_bphy_cgx_stop_rxtx(dev_id, i);
6868
if (ret) {
69-
RTE_LOG(ERR, PMD, "Failed to stop rx/tx\n");
69+
CNXK_BPHY_LOG(ERR, "Failed to stop rx/tx");
7070
break;
7171
}
7272

7373
ret = rte_pmd_bphy_cgx_start_rxtx(dev_id, i);
7474
if (ret) {
75-
RTE_LOG(ERR, PMD, "Failed to start rx/tx\n");
75+
CNXK_BPHY_LOG(ERR, "Failed to start rx/tx");
7676
break;
7777
}
7878

7979
ret = rte_pmd_bphy_cgx_set_link_state(dev_id, i, false);
8080
if (ret) {
81-
RTE_LOG(ERR, PMD, "Failed to set link down\n");
81+
CNXK_BPHY_LOG(ERR, "Failed to set link down");
8282
break;
8383
}
8484

8585
ret = cnxk_bphy_cgx_link_cond(dev_id, i, 0);
8686
if (ret != 0)
87-
RTE_LOG(ERR, PMD,
88-
"Timed out waiting for a link down\n");
87+
CNXK_BPHY_LOG(ERR, "Timed out waiting for a link down");
8988

9089
ret = rte_pmd_bphy_cgx_set_link_state(dev_id, i, true);
9190
if (ret) {
92-
RTE_LOG(ERR, PMD, "Failed to set link up\n");
91+
CNXK_BPHY_LOG(ERR, "Failed to set link up");
9392
break;
9493
}
9594

9695
ret = cnxk_bphy_cgx_link_cond(dev_id, i, 1);
9796
if (ret != 1)
98-
RTE_LOG(ERR, PMD, "Timed out waiting for a link up\n");
97+
CNXK_BPHY_LOG(ERR, "Timed out waiting for a link up");
9998

10099
ret = rte_pmd_bphy_cgx_intlbk_enable(dev_id, i);
101100
if (ret) {
102-
RTE_LOG(ERR, PMD, "Failed to enable internal lbk\n");
101+
CNXK_BPHY_LOG(ERR, "Failed to enable internal lbk");
103102
break;
104103
}
105104

106105
ret = rte_pmd_bphy_cgx_intlbk_disable(dev_id, i);
107106
if (ret) {
108-
RTE_LOG(ERR, PMD, "Failed to disable internal lbk\n");
107+
CNXK_BPHY_LOG(ERR, "Failed to disable internal lbk");
109108
break;
110109
}
111110

112111
ret = rte_pmd_bphy_cgx_ptp_rx_enable(dev_id, i);
113112
/* ptp not available on RPM */
114113
if (ret < 0 && ret != -ENOTSUP) {
115-
RTE_LOG(ERR, PMD, "Failed to enable ptp\n");
114+
CNXK_BPHY_LOG(ERR, "Failed to enable ptp");
116115
break;
117116
}
118117
ret = 0;
119118

120119
ret = rte_pmd_bphy_cgx_ptp_rx_disable(dev_id, i);
121120
/* ptp not available on RPM */
122121
if (ret < 0 && ret != -ENOTSUP) {
123-
RTE_LOG(ERR, PMD, "Failed to disable ptp\n");
122+
CNXK_BPHY_LOG(ERR, "Failed to disable ptp");
124123
break;
125124
}
126125
ret = 0;
127126

128127
ret = rte_pmd_bphy_cgx_get_supported_fec(dev_id, i, &fec);
129128
if (ret) {
130-
RTE_LOG(ERR, PMD, "Failed to get supported FEC\n");
129+
CNXK_BPHY_LOG(ERR, "Failed to get supported FEC");
131130
break;
132131
}
133132

134133
ret = rte_pmd_bphy_cgx_set_fec(dev_id, i, fec);
135134
if (ret) {
136-
RTE_LOG(ERR, PMD, "Failed to set FEC to %d\n", fec);
135+
CNXK_BPHY_LOG(ERR, "Failed to set FEC to %d", fec);
137136
break;
138137
}
139138

140139
fec = CNXK_BPHY_CGX_ETH_LINK_FEC_NONE;
141140
ret = rte_pmd_bphy_cgx_set_fec(dev_id, i, fec);
142141
if (ret) {
143-
RTE_LOG(ERR, PMD, "Failed to disable FEC\n");
142+
CNXK_BPHY_LOG(ERR, "Failed to disable FEC");
144143
break;
145144
}
146145
}

‎drivers/raw/cnxk_bphy/rte_pmd_bphy.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@
2626
extern "C" {
2727
#endif
2828

29+
extern int cnxk_logtype_bphy;
30+
31+
#define CNXK_BPHY_LOG(level, fmt, args...) \
32+
rte_log(RTE_LOG_ ## level, cnxk_logtype_bphy, \
33+
"%s(): " fmt "\n", __func__, ## args)
34+
2935
/** Available message types */
3036
enum cnxk_bphy_cgx_msg_type {
3137
/** Type used to obtain link information */

‎drivers/raw/cnxk_gpio/cnxk_gpio.c

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -215,13 +215,13 @@ cnxk_gpio_parse_allowlist(struct cnxk_gpiochip *gpiochip, char *allowlist)
215215
errno = 0;
216216
val = strtol(token, NULL, 10);
217217
if (errno) {
218-
RTE_LOG(ERR, PMD, "failed to parse %s\n", token);
218+
CNXK_GPIO_LOG(ERR, "failed to parse %s", token);
219219
ret = -errno;
220220
goto out;
221221
}
222222

223223
if (val < 0 || val >= gpiochip->num_gpios) {
224-
RTE_LOG(ERR, PMD, "gpio%d out of 0-%d range\n", val,
224+
CNXK_GPIO_LOG(ERR, "gpio%d out of 0-%d range", val,
225225
gpiochip->num_gpios - 1);
226226
ret = -EINVAL;
227227
goto out;
@@ -231,7 +231,7 @@ cnxk_gpio_parse_allowlist(struct cnxk_gpiochip *gpiochip, char *allowlist)
231231
if (list[i] != val)
232232
continue;
233233

234-
RTE_LOG(WARNING, PMD, "gpio%d already allowed\n", val);
234+
CNXK_GPIO_LOG(WARNING, "gpio%d already allowed", val);
235235
break;
236236
}
237237
if (i == queue)
@@ -398,7 +398,7 @@ cnxk_gpio_queue_setup(struct rte_rawdev *dev, uint16_t queue_id,
398398
return ret;
399399
}
400400
} else {
401-
RTE_LOG(WARNING, PMD, "using existing gpio%d\n", gpio->num);
401+
CNXK_GPIO_LOG(WARNING, "using existing gpio%d", gpio->num);
402402
}
403403

404404
gpiochip->gpios[num] = gpio;
@@ -647,7 +647,7 @@ cnxk_gpio_process_buf(struct cnxk_gpio *gpio, struct rte_rawdev_buf *rbuf)
647647

648648
/* get rid of last response if any */
649649
if (gpio->rsp) {
650-
RTE_LOG(WARNING, PMD, "previous response got overwritten\n");
650+
CNXK_GPIO_LOG(WARNING, "previous response got overwritten");
651651
rte_free(gpio->rsp);
652652
}
653653
gpio->rsp = rsp;
@@ -741,7 +741,7 @@ cnxk_gpio_probe(struct rte_vdev_device *dev)
741741
cnxk_gpio_format_name(name, sizeof(name));
742742
rawdev = rte_rawdev_pmd_allocate(name, sizeof(*gpiochip), rte_socket_id());
743743
if (!rawdev) {
744-
RTE_LOG(ERR, PMD, "failed to allocate %s rawdev\n", name);
744+
CNXK_GPIO_LOG(ERR, "failed to allocate %s rawdev", name);
745745
return -ENOMEM;
746746
}
747747

@@ -770,28 +770,28 @@ cnxk_gpio_probe(struct rte_vdev_device *dev)
770770
snprintf(buf, sizeof(buf), "%s/gpiochip%d/base", CNXK_GPIO_CLASS_PATH, gpiochip->num);
771771
ret = cnxk_gpio_read_attr_int(buf, &gpiochip->base);
772772
if (ret) {
773-
RTE_LOG(ERR, PMD, "failed to read %s\n", buf);
773+
CNXK_GPIO_LOG(ERR, "failed to read %s", buf);
774774
goto out;
775775
}
776776

777777
/* read number of available gpios */
778778
snprintf(buf, sizeof(buf), "%s/gpiochip%d/ngpio", CNXK_GPIO_CLASS_PATH, gpiochip->num);
779779
ret = cnxk_gpio_read_attr_int(buf, &gpiochip->num_gpios);
780780
if (ret) {
781-
RTE_LOG(ERR, PMD, "failed to read %s\n", buf);
781+
CNXK_GPIO_LOG(ERR, "failed to read %s", buf);
782782
goto out;
783783
}
784784
gpiochip->num_queues = gpiochip->num_gpios;
785785

786786
ret = cnxk_gpio_parse_allowlist(gpiochip, params->allowlist);
787787
if (ret) {
788-
RTE_LOG(ERR, PMD, "failed to parse allowed gpios\n");
788+
CNXK_GPIO_LOG(ERR, "failed to parse allowed gpios");
789789
goto out;
790790
}
791791

792792
gpiochip->gpios = rte_calloc(NULL, gpiochip->num_gpios, sizeof(struct cnxk_gpio *), 0);
793793
if (!gpiochip->gpios) {
794-
RTE_LOG(ERR, PMD, "failed to allocate gpios memory\n");
794+
CNXK_GPIO_LOG(ERR, "failed to allocate gpios memory");
795795
ret = -ENOMEM;
796796
goto out;
797797
}
@@ -851,3 +851,4 @@ RTE_PMD_REGISTER_VDEV(cnxk_gpio, cnxk_gpio_drv);
851851
RTE_PMD_REGISTER_PARAM_STRING(cnxk_gpio,
852852
"gpiochip=<int> "
853853
"allowlist=<list>");
854+
RTE_LOG_REGISTER_SUFFIX(cnxk_logtype_gpio, gpio, INFO);

‎drivers/raw/cnxk_gpio/cnxk_gpio.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
#ifndef _CNXK_GPIO_H_
66
#define _CNXK_GPIO_H_
77

8+
extern int cnxk_logtype_gpio;
9+
10+
#define CNXK_GPIO_LOG(level, fmt, args...) \
11+
rte_log(RTE_LOG_ ## level, cnxk_logtype_gpio, fmt "\n", ## args)
12+
813
struct cnxk_gpiochip;
914

1015
struct cnxk_gpio {

‎drivers/raw/cnxk_gpio/cnxk_gpio_selftest.c

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ cnxk_gpio_read_attr(char *attr, char *val)
5656

5757
#define CNXK_GPIO_ERR_STR(err, str, ...) do { \
5858
if (err) { \
59-
RTE_LOG(ERR, PMD, "%s:%d: " str " (%d)\n", __func__, __LINE__, \
59+
CNXK_GPIO_LOG(ERR, "%s:%d: " str " (%d)", __func__, __LINE__, \
6060
##__VA_ARGS__, err); \
6161
goto out; \
6262
} \
@@ -330,30 +330,29 @@ cnxk_gpio_selftest(uint16_t dev_id)
330330
for (i = 0; i < queues; i++) {
331331
ret = rte_rawdev_queue_conf_get(dev_id, i, &conf, sizeof(conf));
332332
if (ret) {
333-
RTE_LOG(ERR, PMD,
334-
"failed to read queue configuration (%d)\n",
333+
CNXK_GPIO_LOG(ERR, "failed to read queue configuration (%d)",
335334
ret);
336335
goto out;
337336
}
338337

339-
RTE_LOG(INFO, PMD, "testing queue%d (gpio%d)\n", i, conf.gpio);
338+
CNXK_GPIO_LOG(INFO, "testing queue%d (gpio%d)", i, conf.gpio);
340339

341340
if (conf.size != 1) {
342-
RTE_LOG(ERR, PMD, "wrong queue size received\n");
341+
CNXK_GPIO_LOG(ERR, "wrong queue size received");
343342
ret = -EIO;
344343
goto out;
345344
}
346345

347346
ret = rte_rawdev_queue_setup(dev_id, i, NULL, 0);
348347
if (ret) {
349-
RTE_LOG(ERR, PMD, "failed to setup queue (%d)\n", ret);
348+
CNXK_GPIO_LOG(ERR, "failed to setup queue (%d)", ret);
350349
goto out;
351350
}
352351

353352
gpio = gpiochip->gpios[conf.gpio];
354353
snprintf(buf, sizeof(buf), CNXK_GPIO_PATH_FMT, gpio->num);
355354
if (!cnxk_gpio_attr_exists(buf)) {
356-
RTE_LOG(ERR, PMD, "%s does not exist\n", buf);
355+
CNXK_GPIO_LOG(ERR, "%s does not exist", buf);
357356
ret = -ENOENT;
358357
goto release;
359358
}
@@ -371,13 +370,13 @@ cnxk_gpio_selftest(uint16_t dev_id)
371370
ret2 = ret;
372371
ret = rte_rawdev_queue_release(dev_id, i);
373372
if (ret) {
374-
RTE_LOG(ERR, PMD, "failed to release queue (%d)\n",
373+
CNXK_GPIO_LOG(ERR, "failed to release queue (%d)",
375374
ret);
376375
break;
377376
}
378377

379378
if (cnxk_gpio_attr_exists(buf)) {
380-
RTE_LOG(ERR, PMD, "%s still exists\n", buf);
379+
CNXK_GPIO_LOG(ERR, "%s still exists", buf);
381380
ret = -EIO;
382381
break;
383382
}

0 commit comments

Comments
 (0)