0d440d081c
Many exported headers rely on definitions found in rte_config.h without
including it, as shown by the following command:
grep -L '^#include <rte_config.h>' -- \
$(grep -Rl \
$(sed -n '/^#define \([^ ]\+\).*$/{s//\1/;H;};${x;s/\n//;s/\n/\\|/g;p;}' \
build/include/rte_config.h) \
-- build/include/)
We cannot assume external applications will include rte_config.h on their
own, neither directly nor through a -include parameter like DPDK does
internally.
This not only causes obvious compilation failures that can be reproduced
with check-includes.sh such as:
[...]/rte_memory.h:88:43: error: ‘RTE_CACHE_LINE_SIZE’ was not declared in
this scope
#define __rte_cache_aligned __rte_aligned(RTE_CACHE_LINE_SIZE)
^
It also results in less visible issues, for instance rte_hash_crc.h relying
on RTE_ARCH_X86_64's presence to provide dedicated inline functions.
This patch partially reverts the commit below and adds missing include
lines to the remaining files.
Fixes: f1a7a5c5f4 ("remove include of generated config header")
Cc: stable@dpdk.org
Signed-off-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>
Acked-by: Thomas Monjalon <thomas@monjalon.net>
138 lines
2.8 KiB
C
138 lines
2.8 KiB
C
/* SPDX-License-Identifier: BSD-3-Clause
|
|
* Copyright(c) 2016-2017 Cavium, Inc
|
|
*/
|
|
|
|
#ifndef _RTE_EVENTDEV_PMD_PCI_H_
|
|
#define _RTE_EVENTDEV_PMD_PCI_H_
|
|
|
|
/** @file
|
|
* RTE Eventdev PCI PMD APIs
|
|
*
|
|
* @note
|
|
* These API are from event PCI PMD only and user applications should not call
|
|
* them directly.
|
|
*/
|
|
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
#include <string.h>
|
|
|
|
#include <rte_config.h>
|
|
#include <rte_eal.h>
|
|
#include <rte_lcore.h>
|
|
#include <rte_pci.h>
|
|
#include <rte_bus_pci.h>
|
|
|
|
#include "rte_eventdev_pmd.h"
|
|
|
|
typedef int (*eventdev_pmd_pci_callback_t)(struct rte_eventdev *dev);
|
|
|
|
/**
|
|
* @internal
|
|
* Wrapper for use by pci drivers as a .probe function to attach to a event
|
|
* interface.
|
|
*/
|
|
static inline int
|
|
rte_event_pmd_pci_probe(struct rte_pci_driver *pci_drv,
|
|
struct rte_pci_device *pci_dev,
|
|
size_t private_data_size,
|
|
eventdev_pmd_pci_callback_t devinit)
|
|
{
|
|
struct rte_eventdev *eventdev;
|
|
|
|
char eventdev_name[RTE_EVENTDEV_NAME_MAX_LEN];
|
|
|
|
int retval;
|
|
|
|
if (devinit == NULL)
|
|
return -EINVAL;
|
|
|
|
rte_pci_device_name(&pci_dev->addr, eventdev_name,
|
|
sizeof(eventdev_name));
|
|
|
|
eventdev = rte_event_pmd_allocate(eventdev_name,
|
|
pci_dev->device.numa_node);
|
|
if (eventdev == NULL)
|
|
return -ENOMEM;
|
|
|
|
if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
|
|
eventdev->data->dev_private =
|
|
rte_zmalloc_socket(
|
|
"eventdev private structure",
|
|
private_data_size,
|
|
RTE_CACHE_LINE_SIZE,
|
|
rte_socket_id());
|
|
|
|
if (eventdev->data->dev_private == NULL)
|
|
rte_panic("Cannot allocate memzone for private "
|
|
"device data");
|
|
}
|
|
|
|
eventdev->dev = &pci_dev->device;
|
|
|
|
/* Invoke PMD device initialization function */
|
|
retval = devinit(eventdev);
|
|
if (retval == 0)
|
|
return 0;
|
|
|
|
RTE_EDEV_LOG_ERR("driver %s: (vendor_id=0x%x device_id=0x%x)"
|
|
" failed", pci_drv->driver.name,
|
|
(unsigned int) pci_dev->id.vendor_id,
|
|
(unsigned int) pci_dev->id.device_id);
|
|
|
|
rte_event_pmd_release(eventdev);
|
|
|
|
return -ENXIO;
|
|
}
|
|
|
|
|
|
/**
|
|
* @internal
|
|
* Wrapper for use by pci drivers as a .remove function to detach a event
|
|
* interface.
|
|
*/
|
|
static inline int
|
|
rte_event_pmd_pci_remove(struct rte_pci_device *pci_dev,
|
|
eventdev_pmd_pci_callback_t devuninit)
|
|
{
|
|
struct rte_eventdev *eventdev;
|
|
char eventdev_name[RTE_EVENTDEV_NAME_MAX_LEN];
|
|
int ret = 0;
|
|
|
|
if (pci_dev == NULL)
|
|
return -EINVAL;
|
|
|
|
rte_pci_device_name(&pci_dev->addr, eventdev_name,
|
|
sizeof(eventdev_name));
|
|
|
|
eventdev = rte_event_pmd_get_named_dev(eventdev_name);
|
|
if (eventdev == NULL)
|
|
return -ENODEV;
|
|
|
|
ret = rte_event_dev_close(eventdev->data->dev_id);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
/* Invoke PMD device un-init function */
|
|
if (devuninit)
|
|
ret = devuninit(eventdev);
|
|
if (ret)
|
|
return ret;
|
|
|
|
/* Free event device */
|
|
rte_event_pmd_release(eventdev);
|
|
|
|
eventdev->dev = NULL;
|
|
|
|
return 0;
|
|
}
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif /* _RTE_EVENTDEV_PMD_PCI_H_ */
|