Commit 0b992b89 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 's390-qeth-next' 



Julian Wiedmann says:

====================
s390/qeth: updates 2020-03-27

please apply the following patch series for qeth to netdev's net-next
tree.

Spring clean edition:
- remove one sysfs attribute that was never put in use,
- make support for OSN and OSX devices optional, and
- probe for removal of the obsolete OSN support.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4bd27ee6 fb64de1b

drivers/s390/net/Kconfig

+17 −0
Original line number Diff line number Diff line
@@ -91,6 +91,23 @@ config QETH_L3 
	  To compile as a module choose M. The module name is qeth_l3.

	  If unsure, choose Y.



config QETH_OSN

	def_bool !HAVE_MARCH_Z14_FEATURES

	prompt "qeth OSN device support"

	depends on QETH

	help

	  This enables the qeth driver to support devices in OSN mode.

	  This feature will be removed in 2021.

	  If unsure, choose N.



config QETH_OSX

	def_bool !HAVE_MARCH_Z15_FEATURES

	prompt "qeth OSX device support"

	depends on QETH

	help

	  This enables the qeth driver to support devices in OSX mode.

	  If unsure, choose N.



config CCWGROUP

	tristate

	default (LCS || CTCM || QETH)

drivers/s390/net/qeth_core.h

+0 −1
Original line number Diff line number Diff line
@@ -710,7 +710,6 @@ struct qeth_card_options { 
	struct qeth_ipa_caps adp; /* Adapter parameters */

	struct qeth_sbp_info sbp; /* SETBRIDGEPORT options */

	struct qeth_vnicc_info vnicc; /* VNICC options */

	int fake_broadcast;

	enum qeth_discipline_id layer;

	enum qeth_ipa_isolation_modes isolation;

	enum qeth_ipa_isolation_modes prev_isolation;

drivers/s390/net/qeth_core_main.c

+4 −0
Original line number Diff line number Diff line
@@ -4951,12 +4951,16 @@ static struct ccw_device_id qeth_ids[] = { 
					.driver_info = QETH_CARD_TYPE_OSD},

	{CCW_DEVICE_DEVTYPE(0x1731, 0x05, 0x1732, 0x05),

					.driver_info = QETH_CARD_TYPE_IQD},

#ifdef CONFIG_QETH_OSN

	{CCW_DEVICE_DEVTYPE(0x1731, 0x06, 0x1732, 0x06),

					.driver_info = QETH_CARD_TYPE_OSN},

#endif

	{CCW_DEVICE_DEVTYPE(0x1731, 0x02, 0x1732, 0x03),

					.driver_info = QETH_CARD_TYPE_OSM},

#ifdef CONFIG_QETH_OSX

	{CCW_DEVICE_DEVTYPE(0x1731, 0x02, 0x1732, 0x02),

					.driver_info = QETH_CARD_TYPE_OSX},

#endif

	{},

};

MODULE_DEVICE_TABLE(ccw, qeth_ids);

drivers/s390/net/qeth_core_mpc.h

+11 −0
Original line number Diff line number Diff line
@@ -74,8 +74,19 @@ enum qeth_card_types { 
#define IS_IQD(card)	((card)->info.type == QETH_CARD_TYPE_IQD)

#define IS_OSD(card)	((card)->info.type == QETH_CARD_TYPE_OSD)

#define IS_OSM(card)	((card)->info.type == QETH_CARD_TYPE_OSM)



#ifdef CONFIG_QETH_OSN

#define IS_OSN(card)	((card)->info.type == QETH_CARD_TYPE_OSN)

#else

#define IS_OSN(card)	false

#endif



#ifdef CONFIG_QETH_OSX

#define IS_OSX(card)	((card)->info.type == QETH_CARD_TYPE_OSX)

#else

#define IS_OSX(card)	false

#endif



#define IS_VM_NIC(card)	((card)->info.is_vm_nic)



#define QETH_MPC_DIFINFO_LEN_INDICATES_LINK_TYPE 0x18

drivers/s390/net/qeth_l2_main.c

+5 −0
Original line number Diff line number Diff line
@@ -587,6 +587,9 @@ static int qeth_l2_probe_device(struct ccwgroup_device *gdev) 
	struct qeth_card *card = dev_get_drvdata(&gdev->dev);

	int rc;



	if (IS_OSN(card))

		dev_notice(&gdev->dev, "OSN support will be dropped in 2021\n");



	qeth_l2_vnicc_set_defaults(card);

	mutex_init(&card->sbp_lock);
@@ -869,6 +872,7 @@ struct qeth_discipline qeth_l2_discipline = { 
};

EXPORT_SYMBOL_GPL(qeth_l2_discipline);



#ifdef CONFIG_QETH_OSN

static void qeth_osn_assist_cb(struct qeth_card *card,

			       struct qeth_cmd_buffer *iob,

			       unsigned int data_length)
@@ -945,6 +949,7 @@ void qeth_osn_deregister(struct net_device *dev) 
	return;

}

EXPORT_SYMBOL(qeth_osn_deregister);

#endif



/* SETBRIDGEPORT support, async notifications */

CRA Git | Maintained and supported by SUSTech CRA and CCSE