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

Commit 0666eb06 authored by Ursula Braun's avatar Ursula Braun Committed by David S. Miller
Browse files

qeth: support z/VM VSWITCH Port Isolation 



z/VM Virtual Switch Port Isolation allows guests on a VLAN UNAWARE
virtual switch to be isolated from other guests on the VSWITCH.
(See z/VM Apars VM64281 and VM64463).
The Linux qeth driver is affected, because it has to handle new
error codes introduced with the z/VM VSWITCH Port Isolation support.

Signed-off-by: default avatarUrsula Braun <ursula.braun@de.ibm.com>
Signed-off-by: default avatarFrank Blaschka <frank.blaschka@de.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8ac6d452

drivers/s390/net/qeth_core_mpc.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -181,6 +181,8 @@ static struct ipa_rc_msg qeth_ipa_rc_msg[] = { 
	{IPA_RC_L2_ADDR_TABLE_FULL,	"Layer2 address table full"},

	{IPA_RC_L2_ADDR_TABLE_FULL,	"Layer2 address table full"},

	{IPA_RC_L2_DUP_LAYER3_MAC,	"Duplicate with layer 3 MAC"},

	{IPA_RC_L2_DUP_LAYER3_MAC,	"Duplicate with layer 3 MAC"},

	{IPA_RC_L2_GMAC_NOT_FOUND,	"GMAC not found"},

	{IPA_RC_L2_GMAC_NOT_FOUND,	"GMAC not found"},

	{IPA_RC_L2_MAC_NOT_AUTH_BY_HYP,	"L2 mac not authorized by hypervisor"},

	{IPA_RC_L2_MAC_NOT_AUTH_BY_ADP,	"L2 mac not authorized by adapter"},

	{IPA_RC_L2_MAC_NOT_FOUND,	"L2 mac address not found"},

	{IPA_RC_L2_MAC_NOT_FOUND,	"L2 mac address not found"},

	{IPA_RC_L2_INVALID_VLAN_ID,	"L2 invalid vlan id"},

	{IPA_RC_L2_INVALID_VLAN_ID,	"L2 invalid vlan id"},

	{IPA_RC_L2_DUP_VLAN_ID,		"L2 duplicate vlan id"},

	{IPA_RC_L2_DUP_VLAN_ID,		"L2 duplicate vlan id"},

drivers/s390/net/qeth_core_mpc.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -168,6 +168,8 @@ enum qeth_ipa_return_codes { 
	IPA_RC_L2_ADDR_TABLE_FULL	= 0x2006,

	IPA_RC_L2_ADDR_TABLE_FULL	= 0x2006,

	IPA_RC_L2_DUP_LAYER3_MAC	= 0x200a,

	IPA_RC_L2_DUP_LAYER3_MAC	= 0x200a,

	IPA_RC_L2_GMAC_NOT_FOUND	= 0x200b,

	IPA_RC_L2_GMAC_NOT_FOUND	= 0x200b,

	IPA_RC_L2_MAC_NOT_AUTH_BY_HYP	= 0x200c,

	IPA_RC_L2_MAC_NOT_AUTH_BY_ADP	= 0x200d,

	IPA_RC_L2_MAC_NOT_FOUND		= 0x2010,

	IPA_RC_L2_MAC_NOT_FOUND		= 0x2010,

	IPA_RC_L2_INVALID_VLAN_ID	= 0x2015,

	IPA_RC_L2_INVALID_VLAN_ID	= 0x2015,

	IPA_RC_L2_DUP_VLAN_ID		= 0x2016,

	IPA_RC_L2_DUP_VLAN_ID		= 0x2016,

drivers/s390/net/qeth_l2_main.c

+25 −1
Original line number Original line Diff line number Diff line
@@ -130,7 +130,7 @@ static int qeth_l2_send_setgroupmac_cb(struct qeth_card *card, 
	cmd = (struct qeth_ipa_cmd *) data;

	cmd = (struct qeth_ipa_cmd *) data;

	mac = &cmd->data.setdelmac.mac[0];

	mac = &cmd->data.setdelmac.mac[0];

	/* MAC already registered, needed in couple/uncouple case */

	/* MAC already registered, needed in couple/uncouple case */

	if (cmd->hdr.return_code == 0x2005) {

	if (cmd->hdr.return_code ==  IPA_RC_L2_DUP_MAC) {

		QETH_DBF_MESSAGE(2, "Group MAC %pM already existing on %s \n",

		QETH_DBF_MESSAGE(2, "Group MAC %pM already existing on %s \n",

			  mac, QETH_CARD_IFNAME(card));

			  mac, QETH_CARD_IFNAME(card));

		cmd->hdr.return_code = 0;

		cmd->hdr.return_code = 0;
@@ -502,6 +502,30 @@ static int qeth_l2_send_setmac_cb(struct qeth_card *card, 
	if (cmd->hdr.return_code) {

	if (cmd->hdr.return_code) {

		QETH_DBF_TEXT_(TRACE, 2, "L2er%x", cmd->hdr.return_code);

		QETH_DBF_TEXT_(TRACE, 2, "L2er%x", cmd->hdr.return_code);

		card->info.mac_bits &= ~QETH_LAYER2_MAC_REGISTERED;

		card->info.mac_bits &= ~QETH_LAYER2_MAC_REGISTERED;

		switch (cmd->hdr.return_code) {

		case IPA_RC_L2_DUP_MAC:

		case IPA_RC_L2_DUP_LAYER3_MAC:

			dev_warn(&card->gdev->dev,

				"MAC address "

				"%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x "

				"already exists\n",

				card->dev->dev_addr[0], card->dev->dev_addr[1],

				card->dev->dev_addr[2], card->dev->dev_addr[3],

				card->dev->dev_addr[4], card->dev->dev_addr[5]);

			break;

		case IPA_RC_L2_MAC_NOT_AUTH_BY_HYP:

		case IPA_RC_L2_MAC_NOT_AUTH_BY_ADP:

			dev_warn(&card->gdev->dev,

				"MAC address "

				"%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x "

				"is not authorized\n",

				card->dev->dev_addr[0], card->dev->dev_addr[1],

				card->dev->dev_addr[2], card->dev->dev_addr[3],

				card->dev->dev_addr[4], card->dev->dev_addr[5]);

			break;

		default:

			break;

		}

		cmd->hdr.return_code = -EIO;

		cmd->hdr.return_code = -EIO;

	} else {

	} else {

		card->info.mac_bits |= QETH_LAYER2_MAC_REGISTERED;

		card->info.mac_bits |= QETH_LAYER2_MAC_REGISTERED;