Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/100488 _apply patch failure_ Submitter: Tomasz Duszynski Date: Tuesday, October 05 2021 07:46:20 Applied on: CommitID:086d426406bd3f6fac96a15bbd871c7fe714bc2d Apply patch set 100488 failed: Checking patch drivers/common/cnxk/cnxk_telemetry_bphy.c... Checking patch drivers/common/cnxk/meson.build... error: while searching for: # Security common code sources += files('cnxk_security.c') # common DPDK utilities code sources += files('cnxk_utils.c') error: patch failed: drivers/common/cnxk/meson.build:61 Checking patch drivers/raw/cnxk_bphy/cnxk_bphy.c... Hunk #1 succeeded at 288 (offset -53 lines). Hunk #2 succeeded at 303 (offset -53 lines). error: while searching for: return -EINVAL; } return rte_rawdev_pmd_release(rawdev); } error: patch failed: drivers/raw/cnxk_bphy/cnxk_bphy.c:366 Checking patch drivers/raw/cnxk_bphy/cnxk_bphy_irq.h... error: while searching for: struct bphy_device { #define BPHY_QUEUE_CNT 1 struct roc_bphy_irq_chip *irq_chip; struct bphy_mem mem; /* bphy irq interface supports single queue only */ error: patch failed: drivers/raw/cnxk_bphy/cnxk_bphy_irq.h:24 Applied patch drivers/common/cnxk/cnxk_telemetry_bphy.c cleanly. Applying patch drivers/common/cnxk/meson.build with 1 reject... Hunk #1 applied cleanly. Rejected hunk #2. Applying patch drivers/raw/cnxk_bphy/cnxk_bphy.c with 1 reject... Hunk #1 applied cleanly. Hunk #2 applied cleanly. Rejected hunk #3. Applying patch drivers/raw/cnxk_bphy/cnxk_bphy_irq.h with 1 reject... Rejected hunk #1. diff a/drivers/common/cnxk/meson.build b/drivers/common/cnxk/meson.build (rejected hunks) @@ -61,6 +61,11 @@ sources = files( # Security common code sources += files('cnxk_security.c') +# Telemetry common code +sources += files( + 'cnxk_telemetry_bphy.c', +) + # common DPDK utilities code sources += files('cnxk_utils.c') diff a/drivers/raw/cnxk_bphy/cnxk_bphy.c b/drivers/raw/cnxk_bphy/cnxk_bphy.c (rejected hunks) @@ -366,6 +374,9 @@ bphy_rawdev_remove(struct rte_pci_device *pci_dev) return -EINVAL; } + bphy_dev = (struct bphy_device *)rawdev->dev_private; + roc_bphy_dev_fini(&bphy_dev->bphy); + return rte_rawdev_pmd_release(rawdev); } diff a/drivers/raw/cnxk_bphy/cnxk_bphy_irq.h b/drivers/raw/cnxk_bphy/cnxk_bphy_irq.h (rejected hunks) @@ -24,6 +24,7 @@ struct bphy_irq_queue { struct bphy_device { #define BPHY_QUEUE_CNT 1 + struct roc_bphy bphy; struct roc_bphy_irq_chip *irq_chip; struct bphy_mem mem; /* bphy irq interface supports single queue only */ https://lab.dpdk.org/results/dashboard/patchsets/19167/ UNH-IOL DPDK Community Lab