Skip to content

L
linux
Commit f787e3cf authored by David S. Miller's avatar David S. Miller
Browse files
Options

Merge branch 's390-next' 

Karsten Graul says:

====================
s390/net: updates 2021-09-14

Please apply the following patches to netdev's net-next tree.

Stop using the wrappers in include/linux/pci-dma-compat.h,
and fix warnings about incorrect kernel-doc comments.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a9d5e3d7 a1ac1b6e
Expand all Show whitespace changes
Inline Side-by-side
Showing with 168 additions and 167 deletions
drivers/s390/net/ctcm_fsms.c
View file @ f787e3cf
...@@ -182,7 +182,7 @@ static void ctcmpc_chx_attnbusy(fsm_instance *, int, void *); ...@@ -182,7 +182,7 @@ static void ctcmpc_chx_attnbusy(fsm_instance *, int, void *);
static void ctcmpc_chx_resend(fsm_instance *, int, void *); static void ctcmpc_chx_resend(fsm_instance *, int, void *);
static void ctcmpc_chx_send_sweep(fsm_instance *fsm, int event, void *arg); static void ctcmpc_chx_send_sweep(fsm_instance *fsm, int event, void *arg);
/** /*
* Check return code of a preceding ccw_device call, halt_IO etc... * Check return code of a preceding ccw_device call, halt_IO etc...
* *
* ch : The channel, the error belongs to. * ch : The channel, the error belongs to.
...@@ -223,7 +223,7 @@ void ctcm_purge_skb_queue(struct sk_buff_head *q) ...@@ -223,7 +223,7 @@ void ctcm_purge_skb_queue(struct sk_buff_head *q)
} }
} }
/** /*
* NOP action for statemachines * NOP action for statemachines
*/ */
static void ctcm_action_nop(fsm_instance *fi, int event, void *arg) static void ctcm_action_nop(fsm_instance *fi, int event, void *arg)
...@@ -234,7 +234,7 @@ static void ctcm_action_nop(fsm_instance *fi, int event, void *arg) ...@@ -234,7 +234,7 @@ static void ctcm_action_nop(fsm_instance *fi, int event, void *arg)
* Actions for channel - statemachines. * Actions for channel - statemachines.
*/ */
/** /*
* Normal data has been send. Free the corresponding * Normal data has been send. Free the corresponding
* skb (it's in io_queue), reset dev->tbusy and * skb (it's in io_queue), reset dev->tbusy and
* revert to idle state. * revert to idle state.
...@@ -322,7 +322,7 @@ static void chx_txdone(fsm_instance *fi, int event, void *arg) ...@@ -322,7 +322,7 @@ static void chx_txdone(fsm_instance *fi, int event, void *arg)
ctcm_clear_busy_do(dev); ctcm_clear_busy_do(dev);
} }
/** /*
* Initial data is sent. * Initial data is sent.
* Notify device statemachine that we are up and * Notify device statemachine that we are up and
* running. * running.
...@@ -344,7 +344,7 @@ void ctcm_chx_txidle(fsm_instance *fi, int event, void *arg) ...@@ -344,7 +344,7 @@ void ctcm_chx_txidle(fsm_instance *fi, int event, void *arg)
fsm_event(priv->fsm, DEV_EVENT_TXUP, ch->netdev); fsm_event(priv->fsm, DEV_EVENT_TXUP, ch->netdev);
} }
/** /*
* Got normal data, check for sanity, queue it up, allocate new buffer * Got normal data, check for sanity, queue it up, allocate new buffer
* trigger bottom half, and initiate next read. * trigger bottom half, and initiate next read.
* *
...@@ -421,7 +421,7 @@ static void chx_rx(fsm_instance *fi, int event, void *arg) ...@@ -421,7 +421,7 @@ static void chx_rx(fsm_instance *fi, int event, void *arg)
ctcm_ccw_check_rc(ch, rc, "normal RX"); ctcm_ccw_check_rc(ch, rc, "normal RX");
} }
/** /*
* Initialize connection by sending a __u16 of value 0. * Initialize connection by sending a __u16 of value 0.
* *
* fi An instance of a channel statemachine. * fi An instance of a channel statemachine.
...@@ -497,7 +497,7 @@ static void chx_firstio(fsm_instance *fi, int event, void *arg) ...@@ -497,7 +497,7 @@ static void chx_firstio(fsm_instance *fi, int event, void *arg)
} }
} }
/** /*
* Got initial data, check it. If OK, * Got initial data, check it. If OK,
* notify device statemachine that we are up and * notify device statemachine that we are up and
* running. * running.
...@@ -538,7 +538,7 @@ static void chx_rxidle(fsm_instance *fi, int event, void *arg) ...@@ -538,7 +538,7 @@ static void chx_rxidle(fsm_instance *fi, int event, void *arg)
} }
} }
/** /*
* Set channel into extended mode. * Set channel into extended mode.
* *
* fi An instance of a channel statemachine. * fi An instance of a channel statemachine.
...@@ -578,7 +578,7 @@ static void ctcm_chx_setmode(fsm_instance *fi, int event, void *arg) ...@@ -578,7 +578,7 @@ static void ctcm_chx_setmode(fsm_instance *fi, int event, void *arg)
ch->retry = 0; ch->retry = 0;
} }
/** /*
* Setup channel. * Setup channel.
* *
* fi An instance of a channel statemachine. * fi An instance of a channel statemachine.
...@@ -641,7 +641,7 @@ static void ctcm_chx_start(fsm_instance *fi, int event, void *arg) ...@@ -641,7 +641,7 @@ static void ctcm_chx_start(fsm_instance *fi, int event, void *arg)
} }
} }
/** /*
* Shutdown a channel. * Shutdown a channel.
* *
* fi An instance of a channel statemachine. * fi An instance of a channel statemachine.
...@@ -682,7 +682,7 @@ static void ctcm_chx_haltio(fsm_instance *fi, int event, void *arg) ...@@ -682,7 +682,7 @@ static void ctcm_chx_haltio(fsm_instance *fi, int event, void *arg)
} }
} }
/** /*
* Cleanup helper for chx_fail and chx_stopped * Cleanup helper for chx_fail and chx_stopped
* cleanup channels queue and notify interface statemachine. * cleanup channels queue and notify interface statemachine.
* *
...@@ -728,7 +728,7 @@ static void ctcm_chx_cleanup(fsm_instance *fi, int state, ...@@ -728,7 +728,7 @@ static void ctcm_chx_cleanup(fsm_instance *fi, int state,
} }
} }
/** /*
* A channel has successfully been halted. * A channel has successfully been halted.
* Cleanup it's queue and notify interface statemachine. * Cleanup it's queue and notify interface statemachine.
* *
...@@ -741,7 +741,7 @@ static void ctcm_chx_stopped(fsm_instance *fi, int event, void *arg) ...@@ -741,7 +741,7 @@ static void ctcm_chx_stopped(fsm_instance *fi, int event, void *arg)
ctcm_chx_cleanup(fi, CTC_STATE_STOPPED, arg); ctcm_chx_cleanup(fi, CTC_STATE_STOPPED, arg);
} }
/** /*
* A stop command from device statemachine arrived and we are in * A stop command from device statemachine arrived and we are in
* not operational mode. Set state to stopped. * not operational mode. Set state to stopped.
* *
...@@ -754,7 +754,7 @@ static void ctcm_chx_stop(fsm_instance *fi, int event, void *arg) ...@@ -754,7 +754,7 @@ static void ctcm_chx_stop(fsm_instance *fi, int event, void *arg)
fsm_newstate(fi, CTC_STATE_STOPPED); fsm_newstate(fi, CTC_STATE_STOPPED);
} }
/** /*
* A machine check for no path, not operational status or gone device has * A machine check for no path, not operational status or gone device has
* happened. * happened.
* Cleanup queue and notify interface statemachine. * Cleanup queue and notify interface statemachine.
...@@ -768,7 +768,7 @@ static void ctcm_chx_fail(fsm_instance *fi, int event, void *arg) ...@@ -768,7 +768,7 @@ static void ctcm_chx_fail(fsm_instance *fi, int event, void *arg)
ctcm_chx_cleanup(fi, CTC_STATE_NOTOP, arg); ctcm_chx_cleanup(fi, CTC_STATE_NOTOP, arg);
} }
/** /*
* Handle error during setup of channel. * Handle error during setup of channel.
* *
* fi An instance of a channel statemachine. * fi An instance of a channel statemachine.
...@@ -817,7 +817,7 @@ static void ctcm_chx_setuperr(fsm_instance *fi, int event, void *arg) ...@@ -817,7 +817,7 @@ static void ctcm_chx_setuperr(fsm_instance *fi, int event, void *arg)
} }
} }
/** /*
* Restart a channel after an error. * Restart a channel after an error.
* *
* fi An instance of a channel statemachine. * fi An instance of a channel statemachine.
...@@ -858,7 +858,7 @@ static void ctcm_chx_restart(fsm_instance *fi, int event, void *arg) ...@@ -858,7 +858,7 @@ static void ctcm_chx_restart(fsm_instance *fi, int event, void *arg)
} }
} }
/** /*
* Handle error during RX initial handshake (exchange of * Handle error during RX initial handshake (exchange of
* 0-length block header) * 0-length block header)
* *
...@@ -893,7 +893,7 @@ static void ctcm_chx_rxiniterr(fsm_instance *fi, int event, void *arg) ...@@ -893,7 +893,7 @@ static void ctcm_chx_rxiniterr(fsm_instance *fi, int event, void *arg)
} }
} }
/** /*
* Notify device statemachine if we gave up initialization * Notify device statemachine if we gave up initialization
* of RX channel. * of RX channel.
* *
...@@ -914,7 +914,7 @@ static void ctcm_chx_rxinitfail(fsm_instance *fi, int event, void *arg) ...@@ -914,7 +914,7 @@ static void ctcm_chx_rxinitfail(fsm_instance *fi, int event, void *arg)
fsm_event(priv->fsm, DEV_EVENT_RXDOWN, dev); fsm_event(priv->fsm, DEV_EVENT_RXDOWN, dev);
} }
/** /*
* Handle RX Unit check remote reset (remote disconnected) * Handle RX Unit check remote reset (remote disconnected)
* *
* fi An instance of a channel statemachine. * fi An instance of a channel statemachine.
...@@ -946,7 +946,7 @@ static void ctcm_chx_rxdisc(fsm_instance *fi, int event, void *arg) ...@@ -946,7 +946,7 @@ static void ctcm_chx_rxdisc(fsm_instance *fi, int event, void *arg)
ccw_device_halt(ch2->cdev, 0); ccw_device_halt(ch2->cdev, 0);
} }
/** /*
* Handle error during TX channel initialization. * Handle error during TX channel initialization.
* *
* fi An instance of a channel statemachine. * fi An instance of a channel statemachine.
...@@ -978,7 +978,7 @@ static void ctcm_chx_txiniterr(fsm_instance *fi, int event, void *arg) ...@@ -978,7 +978,7 @@ static void ctcm_chx_txiniterr(fsm_instance *fi, int event, void *arg)
} }
} }
/** /*
* Handle TX timeout by retrying operation. * Handle TX timeout by retrying operation.
* *
* fi An instance of a channel statemachine. * fi An instance of a channel statemachine.
...@@ -1050,7 +1050,7 @@ static void ctcm_chx_txretry(fsm_instance *fi, int event, void *arg) ...@@ -1050,7 +1050,7 @@ static void ctcm_chx_txretry(fsm_instance *fi, int event, void *arg)
return; return;
} }
/** /*
* Handle fatal errors during an I/O command. * Handle fatal errors during an I/O command.
* *
* fi An instance of a channel statemachine. * fi An instance of a channel statemachine.
...@@ -1198,7 +1198,7 @@ int ch_fsm_len = ARRAY_SIZE(ch_fsm); ...@@ -1198,7 +1198,7 @@ int ch_fsm_len = ARRAY_SIZE(ch_fsm);
* Actions for mpc channel statemachine. * Actions for mpc channel statemachine.
*/ */
/** /*
* Normal data has been send. Free the corresponding * Normal data has been send. Free the corresponding
* skb (it's in io_queue), reset dev->tbusy and * skb (it's in io_queue), reset dev->tbusy and
* revert to idle state. * revert to idle state.
...@@ -1361,7 +1361,7 @@ static void ctcmpc_chx_txdone(fsm_instance *fi, int event, void *arg) ...@@ -1361,7 +1361,7 @@ static void ctcmpc_chx_txdone(fsm_instance *fi, int event, void *arg)
return; return;
} }
/** /*
* Got normal data, check for sanity, queue it up, allocate new buffer * Got normal data, check for sanity, queue it up, allocate new buffer
* trigger bottom half, and initiate next read. * trigger bottom half, and initiate next read.
* *
...@@ -1464,7 +1464,7 @@ static void ctcmpc_chx_rx(fsm_instance *fi, int event, void *arg) ...@@ -1464,7 +1464,7 @@ static void ctcmpc_chx_rx(fsm_instance *fi, int event, void *arg)
} }
/** /*
* Initialize connection by sending a __u16 of value 0. * Initialize connection by sending a __u16 of value 0.
* *
* fi An instance of a channel statemachine. * fi An instance of a channel statemachine.
...@@ -1516,7 +1516,7 @@ static void ctcmpc_chx_firstio(fsm_instance *fi, int event, void *arg) ...@@ -1516,7 +1516,7 @@ static void ctcmpc_chx_firstio(fsm_instance *fi, int event, void *arg)
return; return;
} }
/** /*
* Got initial data, check it. If OK, * Got initial data, check it. If OK,
* notify device statemachine that we are up and * notify device statemachine that we are up and
* running. * running.
...@@ -2043,7 +2043,7 @@ int mpc_ch_fsm_len = ARRAY_SIZE(ctcmpc_ch_fsm); ...@@ -2043,7 +2043,7 @@ int mpc_ch_fsm_len = ARRAY_SIZE(ctcmpc_ch_fsm);
* Actions for interface - statemachine. * Actions for interface - statemachine.
*/ */
/** /*
* Startup channels by sending CTC_EVENT_START to each channel. * Startup channels by sending CTC_EVENT_START to each channel.
* *
* fi An instance of an interface statemachine. * fi An instance of an interface statemachine.
...@@ -2068,7 +2068,7 @@ static void dev_action_start(fsm_instance *fi, int event, void *arg) ...@@ -2068,7 +2068,7 @@ static void dev_action_start(fsm_instance *fi, int event, void *arg)
} }
} }
/** /*
* Shutdown channels by sending CTC_EVENT_STOP to each channel. * Shutdown channels by sending CTC_EVENT_STOP to each channel.
* *
* fi An instance of an interface statemachine. * fi An instance of an interface statemachine.
...@@ -2122,7 +2122,7 @@ static void dev_action_restart(fsm_instance *fi, int event, void *arg) ...@@ -2122,7 +2122,7 @@ static void dev_action_restart(fsm_instance *fi, int event, void *arg)
DEV_EVENT_START, dev); DEV_EVENT_START, dev);
} }
/** /*
* Called from channel statemachine * Called from channel statemachine
* when a channel is up and running. * when a channel is up and running.
* *
...@@ -2183,7 +2183,7 @@ static void dev_action_chup(fsm_instance *fi, int event, void *arg) ...@@ -2183,7 +2183,7 @@ static void dev_action_chup(fsm_instance *fi, int event, void *arg)
} }
} }
/** /*
* Called from device statemachine * Called from device statemachine
* when a channel has been shutdown. * when a channel has been shutdown.
* *
......
drivers/s390/net/ctcm_main.c
View file @ f787e3cf
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
/* Some common global variables */ /* Some common global variables */
/** /*
* The root device for ctcm group devices * The root device for ctcm group devices
*/ */
static struct device *ctcm_root_dev; static struct device *ctcm_root_dev;
...@@ -65,7 +65,7 @@ static struct device *ctcm_root_dev; ...@@ -65,7 +65,7 @@ static struct device *ctcm_root_dev;
*/ */
struct channel *channels; struct channel *channels;
/** /*
* Unpack a just received skb and hand it over to * Unpack a just received skb and hand it over to
* upper layers. * upper layers.
* *
...@@ -180,7 +180,7 @@ void ctcm_unpack_skb(struct channel *ch, struct sk_buff *pskb) ...@@ -180,7 +180,7 @@ void ctcm_unpack_skb(struct channel *ch, struct sk_buff *pskb)
} }
} }
/** /*
* Release a specific channel in the channel list. * Release a specific channel in the channel list.
* *
* ch Pointer to channel struct to be released. * ch Pointer to channel struct to be released.
...@@ -192,7 +192,7 @@ static void channel_free(struct channel *ch) ...@@ -192,7 +192,7 @@ static void channel_free(struct channel *ch)
fsm_newstate(ch->fsm, CTC_STATE_IDLE); fsm_newstate(ch->fsm, CTC_STATE_IDLE);
} }
/** /*
* Remove a specific channel in the channel list. * Remove a specific channel in the channel list.
* *
* ch Pointer to channel struct to be released. * ch Pointer to channel struct to be released.
...@@ -240,7 +240,7 @@ static void channel_remove(struct channel *ch) ...@@ -240,7 +240,7 @@ static void channel_remove(struct channel *ch)
chid, ok ? "OK" : "failed"); chid, ok ? "OK" : "failed");
} }
/** /*
* Get a specific channel from the channel list. * Get a specific channel from the channel list.
* *
* type Type of channel we are interested in. * type Type of channel we are interested in.
...@@ -300,7 +300,7 @@ static long ctcm_check_irb_error(struct ccw_device *cdev, struct irb *irb) ...@@ -300,7 +300,7 @@ static long ctcm_check_irb_error(struct ccw_device *cdev, struct irb *irb)
} }
/** /*
* Check sense of a unit check. * Check sense of a unit check.
* *
* ch The channel, the sense code belongs to. * ch The channel, the sense code belongs to.
...@@ -414,7 +414,7 @@ int ctcm_ch_alloc_buffer(struct channel *ch) ...@@ -414,7 +414,7 @@ int ctcm_ch_alloc_buffer(struct channel *ch)
* Interface API for upper network layers * Interface API for upper network layers
*/ */
/** /*
* Open an interface. * Open an interface.
* Called from generic network layer when ifconfig up is run. * Called from generic network layer when ifconfig up is run.
* *
...@@ -432,7 +432,7 @@ int ctcm_open(struct net_device *dev) ...@@ -432,7 +432,7 @@ int ctcm_open(struct net_device *dev)
return 0; return 0;
} }
/** /*
* Close an interface. * Close an interface.
* Called from generic network layer when ifconfig down is run. * Called from generic network layer when ifconfig down is run.
* *
...@@ -451,7 +451,7 @@ int ctcm_close(struct net_device *dev) ...@@ -451,7 +451,7 @@ int ctcm_close(struct net_device *dev)
} }
/** /*
* Transmit a packet. * Transmit a packet.
* This is a helper function for ctcm_tx(). * This is a helper function for ctcm_tx().
* *
...@@ -822,7 +822,7 @@ static int ctcmpc_transmit_skb(struct channel *ch, struct sk_buff *skb) ...@@ -822,7 +822,7 @@ static int ctcmpc_transmit_skb(struct channel *ch, struct sk_buff *skb)
return rc; return rc;
} }
/** /*
* Start transmission of a packet. * Start transmission of a packet.
* Called from generic network device layer. * Called from generic network device layer.
* *
...@@ -975,7 +975,7 @@ static int ctcmpc_tx(struct sk_buff *skb, struct net_device *dev) ...@@ -975,7 +975,7 @@ static int ctcmpc_tx(struct sk_buff *skb, struct net_device *dev)
} }
/** /*
* Sets MTU of an interface. * Sets MTU of an interface.
* *
* dev Pointer to interface struct. * dev Pointer to interface struct.
...@@ -1007,7 +1007,7 @@ static int ctcm_change_mtu(struct net_device *dev, int new_mtu) ...@@ -1007,7 +1007,7 @@ static int ctcm_change_mtu(struct net_device *dev, int new_mtu)
return 0; return 0;
} }
/** /*
* Returns interface statistics of a device. * Returns interface statistics of a device.
* *
* dev Pointer to interface struct. * dev Pointer to interface struct.
...@@ -1144,7 +1144,7 @@ static struct net_device *ctcm_init_netdevice(struct ctcm_priv *priv) ...@@ -1144,7 +1144,7 @@ static struct net_device *ctcm_init_netdevice(struct ctcm_priv *priv)
return dev; return dev;
} }
/** /*
* Main IRQ handler. * Main IRQ handler.
* *
* cdev The ccw_device the interrupt is for. * cdev The ccw_device the interrupt is for.
...@@ -1257,7 +1257,7 @@ static const struct device_type ctcm_devtype = { ...@@ -1257,7 +1257,7 @@ static const struct device_type ctcm_devtype = {
.groups = ctcm_attr_groups, .groups = ctcm_attr_groups,
}; };
/** /*
* Add ctcm specific attributes. * Add ctcm specific attributes.
* Add ctcm private data. * Add ctcm private data.
* *
...@@ -1293,7 +1293,7 @@ static int ctcm_probe_device(struct ccwgroup_device *cgdev) ...@@ -1293,7 +1293,7 @@ static int ctcm_probe_device(struct ccwgroup_device *cgdev)
return 0; return 0;
} }
/** /*
* Add a new channel to the list of channels. * Add a new channel to the list of channels.
* Keeps the channel list sorted. * Keeps the channel list sorted.
* *
...@@ -1343,7 +1343,7 @@ static int add_channel(struct ccw_device *cdev, enum ctcm_channel_types type, ...@@ -1343,7 +1343,7 @@ static int add_channel(struct ccw_device *cdev, enum ctcm_channel_types type,
snprintf(ch->id, CTCM_ID_SIZE, "ch-%s", dev_name(&cdev->dev)); snprintf(ch->id, CTCM_ID_SIZE, "ch-%s", dev_name(&cdev->dev));
ch->type = type; ch->type = type;
/** /*
* "static" ccws are used in the following way: * "static" ccws are used in the following way:
* *
* ccw[0..2] (Channel program for generic I/O): * ccw[0..2] (Channel program for generic I/O):
...@@ -1471,7 +1471,7 @@ static enum ctcm_channel_types get_channel_type(struct ccw_device_id *id) ...@@ -1471,7 +1471,7 @@ static enum ctcm_channel_types get_channel_type(struct ccw_device_id *id)
return type; return type;
} }
/** /*
* *
* Setup an interface. * Setup an interface.
* *
...@@ -1595,7 +1595,7 @@ static int ctcm_new_device(struct ccwgroup_device *cgdev) ...@@ -1595,7 +1595,7 @@ static int ctcm_new_device(struct ccwgroup_device *cgdev)
return result; return result;
} }
/** /*
* Shutdown an interface. * Shutdown an interface.
* *
* cgdev Device to be shut down. * cgdev Device to be shut down.
...@@ -1738,7 +1738,7 @@ static void print_banner(void) ...@@ -1738,7 +1738,7 @@ static void print_banner(void)
pr_info("CTCM driver initialized\n"); pr_info("CTCM driver initialized\n");
} }
/** /*
* Initialize module. * Initialize module.
* This is called just after the module is loaded. * This is called just after the module is loaded.
* *
......
drivers/s390/net/ctcm_mpc.c
View file @ f787e3cf
...@@ -1016,7 +1016,7 @@ void mpc_channel_action(struct channel *ch, int direction, int action) ...@@ -1016,7 +1016,7 @@ void mpc_channel_action(struct channel *ch, int direction, int action)
CTCM_PR_DEBUG("exit %s: ch=0x%p id=%s\n", __func__, ch, ch->id); CTCM_PR_DEBUG("exit %s: ch=0x%p id=%s\n", __func__, ch, ch->id);
} }
/** /*
* Unpack a just received skb and hand it over to * Unpack a just received skb and hand it over to
* upper layers. * upper layers.
* special MPC version of unpack_skb. * special MPC version of unpack_skb.
...@@ -1211,7 +1211,7 @@ static void ctcmpc_unpack_skb(struct channel *ch, struct sk_buff *pskb) ...@@ -1211,7 +1211,7 @@ static void ctcmpc_unpack_skb(struct channel *ch, struct sk_buff *pskb)
__func__, dev->name, ch, ch->id); __func__, dev->name, ch, ch->id);
} }
/** /*
* tasklet helper for mpc's skb unpacking. * tasklet helper for mpc's skb unpacking.
* *
* ch The channel to work on. * ch The channel to work on.
...@@ -1320,7 +1320,7 @@ struct mpc_group *ctcmpc_init_mpc_group(struct ctcm_priv *priv) ...@@ -1320,7 +1320,7 @@ struct mpc_group *ctcmpc_init_mpc_group(struct ctcm_priv *priv)
* CTCM_PROTO_MPC only * CTCM_PROTO_MPC only
*/ */
/** /*
* NOP action for statemachines * NOP action for statemachines
*/ */
static void mpc_action_nop(fsm_instance *fi, int event, void *arg) static void mpc_action_nop(fsm_instance *fi, int event, void *arg)
...@@ -1426,7 +1426,7 @@ static void mpc_action_go_inop(fsm_instance *fi, int event, void *arg) ...@@ -1426,7 +1426,7 @@ static void mpc_action_go_inop(fsm_instance *fi, int event, void *arg)
} }
} }
/** /*
* Handle mpc group action timeout. * Handle mpc group action timeout.
* MPC Group Station FSM action * MPC Group Station FSM action
* CTCM_PROTO_MPC only * CTCM_PROTO_MPC only
......
drivers/s390/net/fsm.c
View file @ f787e3cf
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/** /*
* A generic FSM based on fsm used in isdn4linux * A generic FSM based on fsm used in isdn4linux
* *
*/ */
......
drivers/s390/net/ism_drv.c
View file @ f787e3cf
...@@ -555,7 +555,7 @@ static int ism_probe(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -555,7 +555,7 @@ static int ism_probe(struct pci_dev *pdev, const struct pci_device_id *id)
if (ret) if (ret)
goto err_disable; goto err_disable;
ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(64)); ret = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
if (ret) if (ret)
goto err_resource; goto err_resource;
......
drivers/s390/net/lcs.c
View file @ f787e3cf
This diff is collapsed.
drivers/s390/net/netiucv.c
View file @ f787e3cf
...@@ -58,7 +58,7 @@ MODULE_AUTHOR ...@@ -58,7 +58,7 @@ MODULE_AUTHOR
("(C) 2001 IBM Corporation by Fritz Elfert (felfert@millenux.com)"); ("(C) 2001 IBM Corporation by Fritz Elfert (felfert@millenux.com)");
MODULE_DESCRIPTION ("Linux for S/390 IUCV network driver"); MODULE_DESCRIPTION ("Linux for S/390 IUCV network driver");
/** /*
* Debug Facility stuff * Debug Facility stuff
*/ */
#define IUCV_DBF_SETUP_NAME "iucv_setup" #define IUCV_DBF_SETUP_NAME "iucv_setup"
...@@ -107,7 +107,7 @@ DECLARE_PER_CPU(char[256], iucv_dbf_txt_buf); ...@@ -107,7 +107,7 @@ DECLARE_PER_CPU(char[256], iucv_dbf_txt_buf);
debug_sprintf_event(iucv_dbf_trace, level, text ); \ debug_sprintf_event(iucv_dbf_trace, level, text ); \
} while (0) } while (0)
/** /*
* some more debug stuff * some more debug stuff
*/ */
#define PRINTK_HEADER " iucv: " /* for debugging */ #define PRINTK_HEADER " iucv: " /* for debugging */
...@@ -118,7 +118,7 @@ static struct device_driver netiucv_driver = { ...@@ -118,7 +118,7 @@ static struct device_driver netiucv_driver = {
.bus = &iucv_bus, .bus = &iucv_bus,
}; };
/** /*
* Per connection profiling data * Per connection profiling data
*/ */
struct connection_profile { struct connection_profile {
...@@ -133,7 +133,7 @@ struct connection_profile { ...@@ -133,7 +133,7 @@ struct connection_profile {
unsigned long tx_max_pending; unsigned long tx_max_pending;
}; };
/** /*
* Representation of one iucv connection * Representation of one iucv connection
*/ */
struct iucv_connection { struct iucv_connection {
...@@ -154,13 +154,13 @@ struct iucv_connection { ...@@ -154,13 +154,13 @@ struct iucv_connection {
char userdata[17]; char userdata[17];
}; };
/** /*
* Linked list of all connection structs. * Linked list of all connection structs.
*/ */
static LIST_HEAD(iucv_connection_list); static LIST_HEAD(iucv_connection_list);
static DEFINE_RWLOCK(iucv_connection_rwlock); static DEFINE_RWLOCK(iucv_connection_rwlock);
/** /*
* Representation of event-data for the * Representation of event-data for the
* connection state machine. * connection state machine.
*/ */
...@@ -169,7 +169,7 @@ struct iucv_event { ...@@ -169,7 +169,7 @@ struct iucv_event {
void *data; void *data;
}; };
/** /*
* Private part of the network device structure * Private part of the network device structure
*/ */
struct netiucv_priv { struct netiucv_priv {
...@@ -180,7 +180,7 @@ struct netiucv_priv { ...@@ -180,7 +180,7 @@ struct netiucv_priv {
struct device *dev; struct device *dev;
}; };
/** /*
* Link level header for a packet. * Link level header for a packet.
*/ */
struct ll_header { struct ll_header {
...@@ -195,7 +195,7 @@ struct ll_header { ...@@ -195,7 +195,7 @@ struct ll_header {
#define NETIUCV_QUEUELEN_DEFAULT 50 #define NETIUCV_QUEUELEN_DEFAULT 50
#define NETIUCV_TIMEOUT_5SEC 5000 #define NETIUCV_TIMEOUT_5SEC 5000
/** /*
* Compatibility macros for busy handling * Compatibility macros for busy handling
* of network devices. * of network devices.
*/ */
...@@ -223,7 +223,7 @@ static u8 iucvMagic_ebcdic[16] = { ...@@ -223,7 +223,7 @@ static u8 iucvMagic_ebcdic[16] = {
0xF0, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40 0xF0, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40
}; };
/** /*
* Convert an iucv userId to its printable * Convert an iucv userId to its printable
* form (strip whitespace at end). * form (strip whitespace at end).
* *
...@@ -262,7 +262,7 @@ static char *netiucv_printuser(struct iucv_connection *conn) ...@@ -262,7 +262,7 @@ static char *netiucv_printuser(struct iucv_connection *conn)
return netiucv_printname(conn->userid, 8); return netiucv_printname(conn->userid, 8);
} }
/** /*
* States of the interface statemachine. * States of the interface statemachine.
*/ */
enum dev_states { enum dev_states {
...@@ -270,7 +270,7 @@ enum dev_states { ...@@ -270,7 +270,7 @@ enum dev_states {
DEV_STATE_STARTWAIT, DEV_STATE_STARTWAIT,
DEV_STATE_STOPWAIT, DEV_STATE_STOPWAIT,
DEV_STATE_RUNNING, DEV_STATE_RUNNING,
/** /*
* MUST be always the last element!! * MUST be always the last element!!
*/ */
NR_DEV_STATES NR_DEV_STATES
...@@ -283,7 +283,7 @@ static const char *dev_state_names[] = { ...@@ -283,7 +283,7 @@ static const char *dev_state_names[] = {
"Running", "Running",
}; };
/** /*
* Events of the interface statemachine. * Events of the interface statemachine.
*/ */
enum dev_events { enum dev_events {
...@@ -291,7 +291,7 @@ enum dev_events { ...@@ -291,7 +291,7 @@ enum dev_events {
DEV_EVENT_STOP, DEV_EVENT_STOP,
DEV_EVENT_CONUP, DEV_EVENT_CONUP,
DEV_EVENT_CONDOWN, DEV_EVENT_CONDOWN,
/** /*
* MUST be always the last element!! * MUST be always the last element!!
*/ */
NR_DEV_EVENTS NR_DEV_EVENTS
...@@ -304,11 +304,11 @@ static const char *dev_event_names[] = { ...@@ -304,11 +304,11 @@ static const char *dev_event_names[] = {
"Connection down", "Connection down",
}; };
/** /*
* Events of the connection statemachine * Events of the connection statemachine
*/ */
enum conn_events { enum conn_events {
/** /*
* Events, representing callbacks from * Events, representing callbacks from
* lowlevel iucv layer) * lowlevel iucv layer)
*/ */
...@@ -320,23 +320,23 @@ enum conn_events { ...@@ -320,23 +320,23 @@ enum conn_events {
CONN_EVENT_RX, CONN_EVENT_RX,
CONN_EVENT_TXDONE, CONN_EVENT_TXDONE,
/** /*
* Events, representing errors return codes from * Events, representing errors return codes from
* calls to lowlevel iucv layer * calls to lowlevel iucv layer
*/ */
/** /*
* Event, representing timer expiry. * Event, representing timer expiry.
*/ */
CONN_EVENT_TIMER, CONN_EVENT_TIMER,
/** /*
* Events, representing commands from upper levels. * Events, representing commands from upper levels.
*/ */
CONN_EVENT_START, CONN_EVENT_START,
CONN_EVENT_STOP, CONN_EVENT_STOP,
/** /*
* MUST be always the last element!! * MUST be always the last element!!
*/ */
NR_CONN_EVENTS, NR_CONN_EVENTS,
...@@ -357,55 +357,55 @@ static const char *conn_event_names[] = { ...@@ -357,55 +357,55 @@ static const char *conn_event_names[] = {
"Stop", "Stop",
}; };
/** /*
* States of the connection statemachine. * States of the connection statemachine.
*/ */
enum conn_states { enum conn_states {
/** /*
* Connection not assigned to any device, * Connection not assigned to any device,
* initial state, invalid * initial state, invalid
*/ */
CONN_STATE_INVALID, CONN_STATE_INVALID,
/** /*
* Userid assigned but not operating * Userid assigned but not operating
*/ */
CONN_STATE_STOPPED, CONN_STATE_STOPPED,
/** /*
* Connection registered, * Connection registered,
* no connection request sent yet, * no connection request sent yet,
* no connection request received * no connection request received
*/ */
CONN_STATE_STARTWAIT, CONN_STATE_STARTWAIT,
/** /*
* Connection registered and connection request sent, * Connection registered and connection request sent,
* no acknowledge and no connection request received yet. * no acknowledge and no connection request received yet.
*/ */
CONN_STATE_SETUPWAIT, CONN_STATE_SETUPWAIT,
/** /*
* Connection up and running idle * Connection up and running idle
*/ */
CONN_STATE_IDLE, CONN_STATE_IDLE,
/** /*
* Data sent, awaiting CONN_EVENT_TXDONE * Data sent, awaiting CONN_EVENT_TXDONE
*/ */
CONN_STATE_TX, CONN_STATE_TX,
/** /*
* Error during registration. * Error during registration.
*/ */
CONN_STATE_REGERR, CONN_STATE_REGERR,
/** /*
* Error during registration. * Error during registration.
*/ */
CONN_STATE_CONNERR, CONN_STATE_CONNERR,
/** /*
* MUST be always the last element!! * MUST be always the last element!!
*/ */
NR_CONN_STATES, NR_CONN_STATES,
...@@ -424,7 +424,7 @@ static const char *conn_state_names[] = { ...@@ -424,7 +424,7 @@ static const char *conn_state_names[] = {
}; };
/** /*
* Debug Facility Stuff * Debug Facility Stuff
*/ */
static debug_info_t *iucv_dbf_setup = NULL; static debug_info_t *iucv_dbf_setup = NULL;
...@@ -556,7 +556,7 @@ static void netiucv_callback_connres(struct iucv_path *path, u8 *ipuser) ...@@ -556,7 +556,7 @@ static void netiucv_callback_connres(struct iucv_path *path, u8 *ipuser)
fsm_event(conn->fsm, CONN_EVENT_CONN_RES, conn); fsm_event(conn->fsm, CONN_EVENT_CONN_RES, conn);
} }
/** /*
* NOP action for statemachines * NOP action for statemachines
*/ */
static void netiucv_action_nop(fsm_instance *fi, int event, void *arg) static void netiucv_action_nop(fsm_instance *fi, int event, void *arg)
...@@ -567,7 +567,7 @@ static void netiucv_action_nop(fsm_instance *fi, int event, void *arg) ...@@ -567,7 +567,7 @@ static void netiucv_action_nop(fsm_instance *fi, int event, void *arg)
* Actions of the connection statemachine * Actions of the connection statemachine
*/ */
/** /*
* netiucv_unpack_skb * netiucv_unpack_skb
* @conn: The connection where this skb has been received. * @conn: The connection where this skb has been received.
* @pskb: The received skb. * @pskb: The received skb.
...@@ -993,7 +993,7 @@ static const int CONN_FSM_LEN = sizeof(conn_fsm) / sizeof(fsm_node); ...@@ -993,7 +993,7 @@ static const int CONN_FSM_LEN = sizeof(conn_fsm) / sizeof(fsm_node);
* Actions for interface - statemachine. * Actions for interface - statemachine.
*/ */
/** /*
* dev_action_start * dev_action_start
* @fi: An instance of an interface statemachine. * @fi: An instance of an interface statemachine.
* @event: The event, just happened. * @event: The event, just happened.
...@@ -1012,7 +1012,7 @@ static void dev_action_start(fsm_instance *fi, int event, void *arg) ...@@ -1012,7 +1012,7 @@ static void dev_action_start(fsm_instance *fi, int event, void *arg)
fsm_event(privptr->conn->fsm, CONN_EVENT_START, privptr->conn); fsm_event(privptr->conn->fsm, CONN_EVENT_START, privptr->conn);
} }
/** /*
* Shutdown connection by sending CONN_EVENT_STOP to it. * Shutdown connection by sending CONN_EVENT_STOP to it.
* *
* @param fi An instance of an interface statemachine. * @param fi An instance of an interface statemachine.
...@@ -1034,7 +1034,7 @@ dev_action_stop(fsm_instance *fi, int event, void *arg) ...@@ -1034,7 +1034,7 @@ dev_action_stop(fsm_instance *fi, int event, void *arg)
fsm_event(privptr->conn->fsm, CONN_EVENT_STOP, &ev); fsm_event(privptr->conn->fsm, CONN_EVENT_STOP, &ev);
} }
/** /*
* Called from connection statemachine * Called from connection statemachine
* when a connection is up and running. * when a connection is up and running.
* *
...@@ -1067,7 +1067,7 @@ dev_action_connup(fsm_instance *fi, int event, void *arg) ...@@ -1067,7 +1067,7 @@ dev_action_connup(fsm_instance *fi, int event, void *arg)
} }
} }
/** /*
* Called from connection statemachine * Called from connection statemachine
* when a connection has been shutdown. * when a connection has been shutdown.
* *
...@@ -1107,7 +1107,7 @@ static const fsm_node dev_fsm[] = { ...@@ -1107,7 +1107,7 @@ static const fsm_node dev_fsm[] = {
static const int DEV_FSM_LEN = sizeof(dev_fsm) / sizeof(fsm_node); static const int DEV_FSM_LEN = sizeof(dev_fsm) / sizeof(fsm_node);
/** /*
* Transmit a packet. * Transmit a packet.
* This is a helper function for netiucv_tx(). * This is a helper function for netiucv_tx().
* *
...@@ -1144,7 +1144,7 @@ static int netiucv_transmit_skb(struct iucv_connection *conn, ...@@ -1144,7 +1144,7 @@ static int netiucv_transmit_skb(struct iucv_connection *conn,
spin_unlock_irqrestore(&conn->collect_lock, saveflags); spin_unlock_irqrestore(&conn->collect_lock, saveflags);
} else { } else {
struct sk_buff *nskb = skb; struct sk_buff *nskb = skb;
/** /*
* Copy the skb to a new allocated skb in lowmem only if the * Copy the skb to a new allocated skb in lowmem only if the
* data is located above 2G in memory or tailroom is < 2. * data is located above 2G in memory or tailroom is < 2.
*/ */
...@@ -1164,7 +1164,7 @@ static int netiucv_transmit_skb(struct iucv_connection *conn, ...@@ -1164,7 +1164,7 @@ static int netiucv_transmit_skb(struct iucv_connection *conn,
} }
copied = 1; copied = 1;
} }
/** /*
* skb now is below 2G and has enough room. Add headers. * skb now is below 2G and has enough room. Add headers.
*/ */
header.next = nskb->len + NETIUCV_HDRLEN; header.next = nskb->len + NETIUCV_HDRLEN;
...@@ -1194,7 +1194,7 @@ static int netiucv_transmit_skb(struct iucv_connection *conn, ...@@ -1194,7 +1194,7 @@ static int netiucv_transmit_skb(struct iucv_connection *conn,
if (copied) if (copied)
dev_kfree_skb(nskb); dev_kfree_skb(nskb);
else { else {
/** /*
* Remove our headers. They get added * Remove our headers. They get added
* again on retransmit. * again on retransmit.
*/ */
...@@ -1217,7 +1217,7 @@ static int netiucv_transmit_skb(struct iucv_connection *conn, ...@@ -1217,7 +1217,7 @@ static int netiucv_transmit_skb(struct iucv_connection *conn,
* Interface API for upper network layers * Interface API for upper network layers
*/ */
/** /*
* Open an interface. * Open an interface.
* Called from generic network layer when ifconfig up is run. * Called from generic network layer when ifconfig up is run.
* *
...@@ -1233,7 +1233,7 @@ static int netiucv_open(struct net_device *dev) ...@@ -1233,7 +1233,7 @@ static int netiucv_open(struct net_device *dev)
return 0; return 0;
} }
/** /*
* Close an interface. * Close an interface.
* Called from generic network layer when ifconfig down is run. * Called from generic network layer when ifconfig down is run.
* *
...@@ -1249,7 +1249,7 @@ static int netiucv_close(struct net_device *dev) ...@@ -1249,7 +1249,7 @@ static int netiucv_close(struct net_device *dev)
return 0; return 0;
} }
/** /*
* Start transmission of a packet. * Start transmission of a packet.
* Called from generic network device layer. * Called from generic network device layer.
* *
...@@ -1266,7 +1266,7 @@ static int netiucv_tx(struct sk_buff *skb, struct net_device *dev) ...@@ -1266,7 +1266,7 @@ static int netiucv_tx(struct sk_buff *skb, struct net_device *dev)
int rc; int rc;
IUCV_DBF_TEXT(trace, 4, __func__); IUCV_DBF_TEXT(trace, 4, __func__);
/** /*
* Some sanity checks ... * Some sanity checks ...
*/ */
if (skb == NULL) { if (skb == NULL) {
...@@ -1282,7 +1282,7 @@ static int netiucv_tx(struct sk_buff *skb, struct net_device *dev) ...@@ -1282,7 +1282,7 @@ static int netiucv_tx(struct sk_buff *skb, struct net_device *dev)
return NETDEV_TX_OK; return NETDEV_TX_OK;
} }
/** /*
* If connection is not running, try to restart it * If connection is not running, try to restart it
* and throw away packet. * and throw away packet.
*/ */
...@@ -1304,7 +1304,7 @@ static int netiucv_tx(struct sk_buff *skb, struct net_device *dev) ...@@ -1304,7 +1304,7 @@ static int netiucv_tx(struct sk_buff *skb, struct net_device *dev)
return rc ? NETDEV_TX_BUSY : NETDEV_TX_OK; return rc ? NETDEV_TX_BUSY : NETDEV_TX_OK;
} }
/** /*
* netiucv_stats * netiucv_stats
* @dev: Pointer to interface struct. * @dev: Pointer to interface struct.
* *
...@@ -1745,7 +1745,7 @@ static void netiucv_unregister_device(struct device *dev) ...@@ -1745,7 +1745,7 @@ static void netiucv_unregister_device(struct device *dev)
device_unregister(dev); device_unregister(dev);
} }
/** /*
* Allocate and initialize a new connection structure. * Allocate and initialize a new connection structure.
* Add it to the list of netiucv connections; * Add it to the list of netiucv connections;
*/ */
...@@ -1802,7 +1802,7 @@ static struct iucv_connection *netiucv_new_connection(struct net_device *dev, ...@@ -1802,7 +1802,7 @@ static struct iucv_connection *netiucv_new_connection(struct net_device *dev,
return NULL; return NULL;
} }
/** /*
* Release a connection structure and remove it from the * Release a connection structure and remove it from the
* list of netiucv connections. * list of netiucv connections.
*/ */
...@@ -1826,7 +1826,7 @@ static void netiucv_remove_connection(struct iucv_connection *conn) ...@@ -1826,7 +1826,7 @@ static void netiucv_remove_connection(struct iucv_connection *conn)
kfree_skb(conn->tx_buff); kfree_skb(conn->tx_buff);
} }
/** /*
* Release everything of a net device. * Release everything of a net device.
*/ */
static void netiucv_free_netdevice(struct net_device *dev) static void netiucv_free_netdevice(struct net_device *dev)
...@@ -1848,7 +1848,7 @@ static void netiucv_free_netdevice(struct net_device *dev) ...@@ -1848,7 +1848,7 @@ static void netiucv_free_netdevice(struct net_device *dev)
} }
} }
/** /*
* Initialize a net device. (Called from kernel in alloc_netdev()) * Initialize a net device. (Called from kernel in alloc_netdev())
*/ */
static const struct net_device_ops netiucv_netdev_ops = { static const struct net_device_ops netiucv_netdev_ops = {
...@@ -1873,7 +1873,7 @@ static void netiucv_setup_netdevice(struct net_device *dev) ...@@ -1873,7 +1873,7 @@ static void netiucv_setup_netdevice(struct net_device *dev)
dev->netdev_ops = &netiucv_netdev_ops; dev->netdev_ops = &netiucv_netdev_ops;
} }
/** /*
* Allocate and initialize everything of a net device. * Allocate and initialize everything of a net device.
*/ */
static struct net_device *netiucv_init_netdevice(char *username, char *userdata) static struct net_device *netiucv_init_netdevice(char *username, char *userdata)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7