Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b4d72c08 authored by Eugene Crosser's avatar Eugene Crosser Committed by David S. Miller
Browse files

qeth: bridgeport support - basic control 



Introduce functions to assign roles and check state of bridgeport-capable
HiperSocket devices, and sysfs attributes providing access to these
functions from userspace. Introduce udev events emitted when the state
of a bridgeport device changes.

Signed-off-by: default avatarEugene Crosser <eugene.crosser@ru.ibm.com>
Signed-off-by: default avatarFrank Blaschka <frank.blaschka@de.ibm.com>
Reviewed-by: default avatarUrsula Braun <ursula.braun@de.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3977458c

Documentation/s390/qeth.txt

0 → 100644
+21 −0
Original line number Diff line number Diff line 
IBM s390 QDIO Ethernet Driver



HiperSockets Bridge Port Support



Uevents



To generate the events the device must be assigned a role of either

a primary or a secondary Bridge Port. For more information, see

"z/VM Connectivity, SC24-6174".



When run on HiperSockets Bridge Capable Port hardware, and the state

of some configured Bridge Port device on the channel changes, a udev

event with ACTION=CHANGE is emitted on behalf of the corresponding

ccwgroup device. The event has the following attributes:



BRIDGEPORT=statechange -  indicates that the Bridge Port device changed

  its state.



ROLE={primary|secondary|none} - the role assigned to the port.



STATE={active|standby|inactive} - the newly assumed state of the port.

drivers/s390/net/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ obj-$(CONFIG_LCS) += lcs.o 
obj-$(CONFIG_CLAW) += claw.o

qeth-y += qeth_core_sys.o qeth_core_main.o qeth_core_mpc.o

obj-$(CONFIG_QETH) += qeth.o

qeth_l2-y += qeth_l2_main.o

qeth_l2-y += qeth_l2_main.o qeth_l2_sys.o

obj-$(CONFIG_QETH_L2) += qeth_l2.o

qeth_l3-y += qeth_l3_main.o qeth_l3_sys.o

obj-$(CONFIG_QETH_L3) += qeth_l3.o

drivers/s390/net/qeth_core.h

+25 −0
Original line number Diff line number Diff line
@@ -156,6 +156,24 @@ struct qeth_ipa_info { 
	__u32 enabled_funcs;

};



/* SETBRIDGEPORT stuff */

enum qeth_sbp_roles {

	QETH_SBP_ROLE_NONE	= 0,

	QETH_SBP_ROLE_PRIMARY	= 1,

	QETH_SBP_ROLE_SECONDARY	= 2,

};



enum qeth_sbp_states {

	QETH_SBP_STATE_INACTIVE	= 0,

	QETH_SBP_STATE_STANDBY	= 1,

	QETH_SBP_STATE_ACTIVE	= 2,

};



struct qeth_sbp_info {

	__u32 supported_funcs;

	enum qeth_sbp_roles role;

};



static inline int qeth_is_ipa_supported(struct qeth_ipa_info *ipa,

		enum qeth_ipa_funcs func)

{
@@ -672,6 +690,7 @@ struct qeth_card_options { 
	struct qeth_ipa_info adp; /*Adapter parameters*/

	struct qeth_routing_info route6;

	struct qeth_ipa_info ipa6;

	struct qeth_sbp_info sbp; /* SETBRIDGEPORT options */

	int fake_broadcast;

	int add_hhlen;

	int layer2;
@@ -857,6 +876,7 @@ extern struct qeth_discipline qeth_l2_discipline; 
extern struct qeth_discipline qeth_l3_discipline;

extern const struct attribute_group *qeth_generic_attr_groups[];

extern const struct attribute_group *qeth_osn_attr_groups[];

extern struct workqueue_struct *qeth_wq;



const char *qeth_get_cardname_short(struct qeth_card *);

int qeth_realloc_buffer_pool(struct qeth_card *, int);
@@ -925,6 +945,11 @@ int qeth_query_card_info(struct qeth_card *card, 
int qeth_send_control_data(struct qeth_card *, int, struct qeth_cmd_buffer *,

	int (*reply_cb)(struct qeth_card *, struct qeth_reply*, unsigned long),

	void *reply_param);

void qeth_bridge_state_change(struct qeth_card *card, struct qeth_ipa_cmd *cmd);

void qeth_bridgeport_query_support(struct qeth_card *card);

int qeth_bridgeport_query_ports(struct qeth_card *card,

	enum qeth_sbp_roles *role, enum qeth_sbp_states *state);

int qeth_bridgeport_setrole(struct qeth_card *card, enum qeth_sbp_roles role);

int qeth_get_priority_queue(struct qeth_card *, struct sk_buff *, int, int);

int qeth_get_elements_no(struct qeth_card *, struct sk_buff *, int);

int qeth_get_elements_for_frags(struct sk_buff *);

drivers/s390/net/qeth_core_main.c

+13 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ static void qeth_clear_output_buffer(struct qeth_qdio_out_q *queue, 
		enum qeth_qdio_buffer_states newbufstate);

static int qeth_init_qdio_out_buf(struct qeth_qdio_out_q *, int);



static struct workqueue_struct *qeth_wq;

struct workqueue_struct *qeth_wq;



static void qeth_close_dev_handler(struct work_struct *work)

{
@@ -615,6 +615,13 @@ static struct qeth_ipa_cmd *qeth_check_ipa_data(struct qeth_card *card, 
					card->info.hwtrap = 2;

				qeth_schedule_recovery(card);

				return NULL;

			case IPA_CMD_SETBRIDGEPORT:

				if (cmd->data.sbp.hdr.command_code ==

					IPA_SBP_BRIDGE_PORT_STATE_CHANGE) {

					qeth_bridge_state_change(card, cmd);

					return NULL;

				} else

					return cmd;

			case IPA_CMD_MODCCID:

				return cmd;

			case IPA_CMD_REGISTER_LOCAL_ADDR:
@@ -4956,12 +4963,17 @@ int qeth_core_hardsetup_card(struct qeth_card *card) 


	card->options.ipa4.supported_funcs = 0;

	card->options.adp.supported_funcs = 0;

	card->options.sbp.supported_funcs = 0;

	card->info.diagass_support = 0;

	qeth_query_ipassists(card, QETH_PROT_IPV4);

	if (qeth_is_supported(card, IPA_SETADAPTERPARMS))

		qeth_query_setadapterparms(card);

	if (qeth_adp_supported(card, IPA_SETADP_SET_DIAG_ASSIST))

		qeth_query_setdiagass(card);

	qeth_bridgeport_query_support(card);

	if (card->options.sbp.supported_funcs)

		dev_info(&card->gdev->dev,

		"The device represents a HiperSockets Bridge Capable Port\n");

	return 0;

out:

	dev_warn(&card->gdev->dev, "The qeth device driver failed to recover "

drivers/s390/net/qeth_core_mpc.c

+1 −0
Original line number Diff line number Diff line
@@ -249,6 +249,7 @@ static struct ipa_cmd_names qeth_ipa_cmd_names[] = { 
	{IPA_CMD_DELIP,		"delip"},

	{IPA_CMD_SETADAPTERPARMS, "setadapterparms"},

	{IPA_CMD_SET_DIAG_ASS,	"set_diag_ass"},

	{IPA_CMD_SETBRIDGEPORT,	"set_bridge_port"},

	{IPA_CMD_CREATE_ADDR,	"create_addr"},

	{IPA_CMD_DESTROY_ADDR,	"destroy_addr"},

	{IPA_CMD_REGISTER_LOCAL_ADDR,	"register_local_addr"},