michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: Enable PM settings on network devices

Browse source 
By changing the various *NET_DEVICE* macros. It is up to the device
drivers to either set a proper PM function or, if not supported or PM
disabled, to use device_pm_control_nop relevantly.

All existing macro calls are updated. Since no PM support was added so
far, device_pm_control_nop is used as the default everywhere.

Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
This commit is contained in:
Tomasz Bursztyka 2020-02-25 10:45:25 +01:00 • committed by Jukka Rissanen
commit 4ae72db135
67 changed files with 197 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

14
include/net/ethernet.h
View file

@ -616,6 +616,8 @@ static inline bool net_eth_get_vlan_status(struct net_if *iface)
* @param drv_name The name this instance of the driver exposes to
* the system.
* @param init_fn Address to the init function of the driver.
* @param pm_control_fn Pointer to device_pm_control function.
* Can be empty function (device_pm_control_nop) if not implemented.
* @param data Pointer to the device's configuration data.
* @param cfg_info The address to the structure containing the
* configuration information for this instance of the driver.
@ -625,18 +627,18 @@ static inline bool net_eth_get_vlan_status(struct net_if *iface)
* @param mtu Maximum transfer unit in bytes for this network interface.
*/
#if defined(CONFIG_NET_VLAN)
#define ETH_NET_DEVICE_INIT(dev_name, drv_name, init_fn, \
data, cfg_info, prio, api, mtu) \
DEVICE_AND_API_INIT(dev_name, drv_name, init_fn, data, \
cfg_info, POST_KERNEL, prio, api); \
#define ETH_NET_DEVICE_INIT(dev_name, drv_name, init_fn, pm_control_fn, \
data, cfg_info, prio, api, mtu) \
DEVICE_DEFINE(dev_name, drv_name, init_fn, pm_control_fn, data, \
cfg_info, POST_KERNEL, prio, api); \
NET_L2_DATA_INIT(dev_name, 0, NET_L2_GET_CTX_TYPE(ETHERNET_L2)); \
NET_IF_INIT(dev_name, 0, ETHERNET_L2, mtu, NET_VLAN_MAX_COUNT)
#else /* CONFIG_NET_VLAN */
#define ETH_NET_DEVICE_INIT(dev_name, drv_name, init_fn, \
#define ETH_NET_DEVICE_INIT(dev_name, drv_name, init_fn, pm_control_fn, \
data, cfg_info, prio, api, mtu) \
NET_DEVICE_INIT(dev_name, drv_name, init_fn, \
NET_DEVICE_INIT(dev_name, drv_name, init_fn, pm_control_fn, \
data, cfg_info, prio, api, ETHERNET_L2, \
NET_L2_GET_CTX_TYPE(ETHERNET_L2), mtu)

35
include/net/net_if.h
View file

@ -2170,6 +2170,8 @@ struct net_if_api {
* @param drv_name The name this instance of the driver exposes to
* the system.
* @param init_fn Address to the init function of the driver.
* @param pm_control_fn Pointer to device_pm_control function.
* Can be empty function (device_pm_control_nop) if not implemented.
* @param data Pointer to the device's configuration data.
* @param cfg_info The address to the structure containing the
* configuration information for this instance of the driver.
@ -2180,12 +2182,12 @@ struct net_if_api {
* @param l2_ctx_type Type of L2 context data.
* @param mtu Maximum transfer unit in bytes for this network interface.
*/
#define NET_DEVICE_INIT(dev_name, drv_name, init_fn, \
data, cfg_info, prio, api, l2, \
l2_ctx_type, mtu) \
DEVICE_AND_API_INIT(dev_name, drv_name, init_fn, data, \
cfg_info, POST_KERNEL, prio, api); \
NET_L2_DATA_INIT(dev_name, 0, l2_ctx_type); \
#define NET_DEVICE_INIT(dev_name, drv_name, init_fn, pm_control_fn, \
data, cfg_info, prio, api, l2, \
l2_ctx_type, mtu) \
DEVICE_DEFINE(dev_name, drv_name, init_fn, pm_control_fn, data, \
cfg_info, POST_KERNEL, prio, api); \
NET_L2_DATA_INIT(dev_name, 0, l2_ctx_type); \
NET_IF_INIT(dev_name, 0, l2, mtu, NET_IF_MAX_CONFIGS)
/**
@ -2201,6 +2203,8 @@ struct net_if_api {
* the system.
* @param instance Instance identifier.
* @param init_fn Address to the init function of the driver.
* @param pm_control_fn Pointer to device_pm_control function.
* Can be empty function (device_pm_control_nop) if not implemented.
* @param data Pointer to the device's configuration data.
* @param cfg_info The address to the structure containing the
* configuration information for this instance of the driver.
@ -2212,10 +2216,10 @@ struct net_if_api {
* @param mtu Maximum transfer unit in bytes for this network interface.
*/
#define NET_DEVICE_INIT_INSTANCE(dev_name, drv_name, instance, init_fn, \
data, cfg_info, prio, api, l2, \
l2_ctx_type, mtu) \
DEVICE_AND_API_INIT(dev_name, drv_name, init_fn, data, \
cfg_info, POST_KERNEL, prio, api); \
pm_control_fn, data, cfg_info, prio, \
api, l2, l2_ctx_type, mtu) \
DEVICE_DEFINE(dev_name, drv_name, init_fn, pm_control_fn, data, \
cfg_info, POST_KERNEL, prio, api); \
NET_L2_DATA_INIT(dev_name, instance, l2_ctx_type); \
NET_IF_INIT(dev_name, instance, l2, mtu, NET_IF_MAX_CONFIGS)
@ -2230,6 +2234,8 @@ struct net_if_api {
* @param drv_name The name this instance of the driver exposes to
* the system.
* @param init_fn Address to the init function of the driver.
* @param pm_control_fn Pointer to device_pm_control function.
* Can be empty function (device_pm_control_nop) if not implemented.
* @param data Pointer to the device's configuration data.
* @param cfg_info The address to the structure containing the
* configuration information for this instance of the driver.
@ -2238,10 +2244,11 @@ struct net_if_api {
* used by the driver. Can be NULL.
* @param mtu Maximum transfer unit in bytes for this network interface.
*/
#define NET_DEVICE_OFFLOAD_INIT(dev_name, drv_name, init_fn, \
data, cfg_info, prio, api, mtu) \
DEVICE_AND_API_INIT(dev_name, drv_name, init_fn, data, \
cfg_info, POST_KERNEL, prio, api); \
#define NET_DEVICE_OFFLOAD_INIT(dev_name, drv_name, init_fn, \
pm_control_fn, data, cfg_info, prio, \
api, mtu) \
DEVICE_DEFINE(dev_name, drv_name, init_fn, pm_control_fn, data, \
cfg_info, POST_KERNEL, prio, api); \
NET_IF_OFFLOAD_INIT(dev_name, 0, mtu)
#ifdef __cplusplus