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

Commit a7b4d509 authored by Dean Nelson's avatar Dean Nelson Committed by Linus Torvalds
Browse files

sgi-xp: enable XPNET to handle more than 64 partitions



Enable XPNET to support more than 64 partitions.

Signed-off-by: default avatarDean Nelson <dcn@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 185c3a1b
Loading
Loading
Loading
Loading
+94 −119
Original line number Original line Diff line number Diff line
@@ -21,7 +21,6 @@
 */
 */


#include <linux/module.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/ioport.h>
@@ -32,8 +31,6 @@
#include <linux/mii.h>
#include <linux/mii.h>
#include <linux/smp.h>
#include <linux/smp.h>
#include <linux/string.h>
#include <linux/string.h>
#include <asm/sn/io.h>
#include <asm/sn/sn_sal.h>
#include <asm/atomic.h>
#include <asm/atomic.h>
#include "xp.h"
#include "xp.h"


@@ -104,7 +101,6 @@ struct xpnet_message {
 * then be released.
 * then be released.
 */
 */
struct xpnet_pending_msg {
struct xpnet_pending_msg {
	struct list_head free_list;
	struct sk_buff *skb;
	struct sk_buff *skb;
	atomic_t use_count;
	atomic_t use_count;
};
};
@@ -120,7 +116,7 @@ struct net_device *xpnet_device;
 * When we are notified of other partitions activating, we add them to
 * When we are notified of other partitions activating, we add them to
 * our bitmask of partitions to which we broadcast.
 * our bitmask of partitions to which we broadcast.
 */
 */
static u64 xpnet_broadcast_partitions;
static unsigned long *xpnet_broadcast_partitions;
/* protect above */
/* protect above */
static DEFINE_SPINLOCK(xpnet_broadcast_lock);
static DEFINE_SPINLOCK(xpnet_broadcast_lock);


@@ -140,16 +136,13 @@ static DEFINE_SPINLOCK(xpnet_broadcast_lock);
#define XPNET_DEF_MTU (0x8000UL)
#define XPNET_DEF_MTU (0x8000UL)


/*
/*
 * The partition id is encapsulated in the MAC address.  The following
 * The partid is encapsulated in the MAC address beginning in the following
 * define locates the octet the partid is in.
 * octet and it consists of two octets.
 */
 */
#define XPNET_PARTID_OCTET	1
#define XPNET_PARTID_OCTET	2
#define XPNET_LICENSE_OCTET	2

/* Define the XPNET debug device structures to be used with dev_dbg() et al */


/*
 * Define the XPNET debug device structure that is to be used with dev_dbg(),
 * dev_err(), dev_warn(), and dev_info().
 */
struct device_driver xpnet_dbg_name = {
struct device_driver xpnet_dbg_name = {
	.name = "xpnet"
	.name = "xpnet"
};
};
@@ -283,8 +276,6 @@ static void
xpnet_connection_activity(enum xp_retval reason, short partid, int channel,
xpnet_connection_activity(enum xp_retval reason, short partid, int channel,
			  void *data, void *key)
			  void *data, void *key)
{
{
	long bp;

	DBUG_ON(partid < 0 || partid >= xp_max_npartitions);
	DBUG_ON(partid < 0 || partid >= xp_max_npartitions);
	DBUG_ON(channel != XPC_NET_CHANNEL);
	DBUG_ON(channel != XPC_NET_CHANNEL);


@@ -297,31 +288,28 @@ xpnet_connection_activity(enum xp_retval reason, short partid, int channel,


	case xpConnected:	/* connection completed to a partition */
	case xpConnected:	/* connection completed to a partition */
		spin_lock_bh(&xpnet_broadcast_lock);
		spin_lock_bh(&xpnet_broadcast_lock);
		xpnet_broadcast_partitions |= 1UL << (partid - 1);
		__set_bit(partid, xpnet_broadcast_partitions);
		bp = xpnet_broadcast_partitions;
		spin_unlock_bh(&xpnet_broadcast_lock);
		spin_unlock_bh(&xpnet_broadcast_lock);


		netif_carrier_on(xpnet_device);
		netif_carrier_on(xpnet_device);


		dev_dbg(xpnet, "%s connection created to partition %d; "
		dev_dbg(xpnet, "%s connected to partition %d\n",
			"xpnet_broadcast_partitions=0x%lx\n",
			xpnet_device->name, partid);
			xpnet_device->name, partid, bp);
		break;
		break;


	default:
	default:
		spin_lock_bh(&xpnet_broadcast_lock);
		spin_lock_bh(&xpnet_broadcast_lock);
		xpnet_broadcast_partitions &= ~(1UL << (partid - 1));
		__clear_bit(partid, xpnet_broadcast_partitions);
		bp = xpnet_broadcast_partitions;
		spin_unlock_bh(&xpnet_broadcast_lock);
		spin_unlock_bh(&xpnet_broadcast_lock);


		if (bp == 0)
		if (bitmap_empty((unsigned long *)xpnet_broadcast_partitions,
				 xp_max_npartitions)) {
			netif_carrier_off(xpnet_device);
			netif_carrier_off(xpnet_device);
		}


		dev_dbg(xpnet, "%s disconnected from partition %d; "
		dev_dbg(xpnet, "%s disconnected from partition %d\n",
			"xpnet_broadcast_partitions=0x%lx\n",
			xpnet_device->name, partid);
			xpnet_device->name, partid, bp);
		break;
		break;

	}
	}
}
}


@@ -424,36 +412,72 @@ xpnet_send_completed(enum xp_retval reason, short partid, int channel,
	}
	}
}
}


static void
xpnet_send(struct sk_buff *skb, struct xpnet_pending_msg *queued_msg,
	   u64 start_addr, u64 end_addr, u16 embedded_bytes, int dest_partid)
{
	u8 msg_buffer[XPNET_MSG_SIZE];
	struct xpnet_message *msg = (struct xpnet_message *)&msg_buffer;
	enum xp_retval ret;

	msg->embedded_bytes = embedded_bytes;
	if (unlikely(embedded_bytes != 0)) {
		msg->version = XPNET_VERSION_EMBED;
		dev_dbg(xpnet, "calling memcpy(0x%p, 0x%p, 0x%lx)\n",
			&msg->data, skb->data, (size_t)embedded_bytes);
		skb_copy_from_linear_data(skb, &msg->data,
					  (size_t)embedded_bytes);
	} else {
		msg->version = XPNET_VERSION;
	}
	msg->magic = XPNET_MAGIC;
	msg->size = end_addr - start_addr;
	msg->leadin_ignore = (u64)skb->data - start_addr;
	msg->tailout_ignore = end_addr - (u64)skb_tail_pointer(skb);
	msg->buf_pa = __pa(start_addr);

	dev_dbg(xpnet, "sending XPC message to %d:%d\n"
		KERN_DEBUG "msg->buf_pa=0x%lx, msg->size=%u, "
		"msg->leadin_ignore=%u, msg->tailout_ignore=%u\n",
		dest_partid, XPC_NET_CHANNEL, msg->buf_pa, msg->size,
		msg->leadin_ignore, msg->tailout_ignore);

	atomic_inc(&queued_msg->use_count);

	ret = xpc_send_notify(dest_partid, XPC_NET_CHANNEL, XPC_NOWAIT, msg,
			      XPNET_MSG_SIZE, xpnet_send_completed, queued_msg);
	if (unlikely(ret != xpSuccess))
		atomic_dec(&queued_msg->use_count);
}

/*
/*
 * Network layer has formatted a packet (skb) and is ready to place it
 * Network layer has formatted a packet (skb) and is ready to place it
 * "on the wire".  Prepare and send an xpnet_message to all partitions
 * "on the wire".  Prepare and send an xpnet_message to all partitions
 * which have connected with us and are targets of this packet.
 * which have connected with us and are targets of this packet.
 *
 *
 * MAC-NOTE:  For the XPNET driver, the MAC address contains the
 * MAC-NOTE:  For the XPNET driver, the MAC address contains the
 * destination partition_id.  If the destination partition id word
 * destination partid.  If the destination partid octets are 0xffff,
 * is 0xff, this packet is to broadcast to all partitions.
 * this packet is to be broadcast to all connected partitions.
 */
 */
static int
static int
xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
{
{
	struct xpnet_pending_msg *queued_msg;
	struct xpnet_pending_msg *queued_msg;
	enum xp_retval ret;
	u8 msg_buffer[XPNET_MSG_SIZE];
	struct xpnet_message *msg = (struct xpnet_message *)&msg_buffer[0];
	u64 start_addr, end_addr;
	u64 start_addr, end_addr;
	long dp;
	u8 second_mac_octet;
	short dest_partid;
	short dest_partid;
	struct xpnet_dev_private *priv;
	struct xpnet_dev_private *priv = (struct xpnet_dev_private *)dev->priv;
	u16 embedded_bytes;
	u16 embedded_bytes = 0;

	priv = (struct xpnet_dev_private *)dev->priv;


	dev_dbg(xpnet, ">skb->head=0x%p skb->data=0x%p skb->tail=0x%p "
	dev_dbg(xpnet, ">skb->head=0x%p skb->data=0x%p skb->tail=0x%p "
		"skb->end=0x%p skb->len=%d\n", (void *)skb->head,
		"skb->end=0x%p skb->len=%d\n", (void *)skb->head,
		(void *)skb->data, skb_tail_pointer(skb), skb_end_pointer(skb),
		(void *)skb->data, skb_tail_pointer(skb), skb_end_pointer(skb),
		skb->len);
		skb->len);


	if (skb->data[0] == 0x33) {
		dev_kfree_skb(skb);
		return 0;	/* nothing needed to be done */
	}

	/*
	/*
	 * The xpnet_pending_msg tracks how many outstanding
	 * The xpnet_pending_msg tracks how many outstanding
	 * xpc_send_notifies are relying on this skb.  When none
	 * xpc_send_notifies are relying on this skb.  When none
@@ -465,7 +489,6 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
			 "packet\n", sizeof(struct xpnet_pending_msg));
			 "packet\n", sizeof(struct xpnet_pending_msg));


		priv->stats.tx_errors++;
		priv->stats.tx_errors++;

		return -ENOMEM;
		return -ENOMEM;
	}
	}


@@ -474,7 +497,6 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
	end_addr = L1_CACHE_ALIGN((u64)skb_tail_pointer(skb));
	end_addr = L1_CACHE_ALIGN((u64)skb_tail_pointer(skb));


	/* calculate how many bytes to embed in the XPC message */
	/* calculate how many bytes to embed in the XPC message */
	embedded_bytes = 0;
	if (unlikely(skb->len <= XPNET_MSG_DATA_MAX)) {
	if (unlikely(skb->len <= XPNET_MSG_DATA_MAX)) {
		/* skb->data does fit so embed */
		/* skb->data does fit so embed */
		embedded_bytes = skb->len;
		embedded_bytes = skb->len;
@@ -490,78 +512,28 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
	atomic_set(&queued_msg->use_count, 1);
	atomic_set(&queued_msg->use_count, 1);
	queued_msg->skb = skb;
	queued_msg->skb = skb;


	second_mac_octet = skb->data[XPNET_PARTID_OCTET];
	if (skb->data[0] == 0xff) {
	if (second_mac_octet == 0xff) {
		/* we are being asked to broadcast to all partitions */
		/* we are being asked to broadcast to all partitions */
		dp = xpnet_broadcast_partitions;
		for_each_bit(dest_partid, xpnet_broadcast_partitions,
	} else if (second_mac_octet != 0) {
			     xp_max_npartitions) {
		dp = xpnet_broadcast_partitions &
		    (1UL << (second_mac_octet - 1));
	} else {
		/* 0 is an invalid partid.  Ignore */
		dp = 0;
	}
	dev_dbg(xpnet, "destination Partitions mask (dp) = 0x%lx\n", dp);

	/*
	 * If we wanted to allow promiscuous mode to work like an
	 * unswitched network, this would be a good point to OR in a
	 * mask of partitions which should be receiving all packets.
	 */

	/*
	 * Main send loop.
	 */
	for (dest_partid = 0; dp && dest_partid < xp_max_npartitions;
	     dest_partid++) {


		if (!(dp & (1UL << (dest_partid - 1)))) {
			xpnet_send(skb, queued_msg, start_addr, end_addr,
			/* not destined for this partition */
				   embedded_bytes, dest_partid);
			continue;
		}
		}

		/* remove this partition from the destinations mask */
		dp &= ~(1UL << (dest_partid - 1));

		/* found a partition to send to */

		msg->embedded_bytes = embedded_bytes;
		if (unlikely(embedded_bytes != 0)) {
			msg->version = XPNET_VERSION_EMBED;
			dev_dbg(xpnet, "calling memcpy(0x%p, 0x%p, 0x%lx)\n",
				&msg->data, skb->data, (size_t)embedded_bytes);
			skb_copy_from_linear_data(skb, &msg->data,
						  (size_t)embedded_bytes);
	} else {
	} else {
			msg->version = XPNET_VERSION;
		dest_partid = (short)skb->data[XPNET_PARTID_OCTET + 1];
		}
		dest_partid |= (short)skb->data[XPNET_PARTID_OCTET + 0] << 8;
		msg->magic = XPNET_MAGIC;
		msg->size = end_addr - start_addr;
		msg->leadin_ignore = (u64)skb->data - start_addr;
		msg->tailout_ignore = end_addr - (u64)skb_tail_pointer(skb);
		msg->buf_pa = __pa(start_addr);

		dev_dbg(xpnet, "sending XPC message to %d:%d\n"
			KERN_DEBUG "msg->buf_pa=0x%lx, msg->size=%u, "
			"msg->leadin_ignore=%u, msg->tailout_ignore=%u\n",
			dest_partid, XPC_NET_CHANNEL, msg->buf_pa, msg->size,
			msg->leadin_ignore, msg->tailout_ignore);


		atomic_inc(&queued_msg->use_count);
		if (dest_partid >= 0 &&
		    dest_partid < xp_max_npartitions &&
		    test_bit(dest_partid, xpnet_broadcast_partitions) != 0) {


		ret = xpc_send_notify(dest_partid, XPC_NET_CHANNEL, XPC_NOWAIT,
			xpnet_send(skb, queued_msg, start_addr, end_addr,
				      &msg, sizeof(msg) + embedded_bytes - 1,
				   embedded_bytes, dest_partid);
				      xpnet_send_completed, queued_msg);
		if (unlikely(ret != xpSuccess)) {
			atomic_dec(&queued_msg->use_count);
			continue;
		}
		}
	}
	}


	if (atomic_dec_return(&queued_msg->use_count) == 0) {
	if (atomic_dec_return(&queued_msg->use_count) == 0) {
		dev_dbg(xpnet, "no partitions to receive packet destined for "
			"%d\n", dest_partid);

		dev_kfree_skb(skb);
		dev_kfree_skb(skb);
		kfree(queued_msg);
		kfree(queued_msg);
	}
	}
@@ -589,23 +561,28 @@ xpnet_dev_tx_timeout(struct net_device *dev)
static int __init
static int __init
xpnet_init(void)
xpnet_init(void)
{
{
	int i;
	int result;
	u32 license_num;
	int result = -ENOMEM;


	if (!ia64_platform_is("sn2"))
	if (!is_shub() && !is_uv())
		return -ENODEV;
		return -ENODEV;


	dev_info(xpnet, "registering network device %s\n", XPNET_DEVICE_NAME);
	dev_info(xpnet, "registering network device %s\n", XPNET_DEVICE_NAME);


	xpnet_broadcast_partitions = kzalloc(BITS_TO_LONGS(xp_max_npartitions) *
					     sizeof(long), GFP_KERNEL);
	if (xpnet_broadcast_partitions == NULL)
		return -ENOMEM;

	/*
	/*
	 * use ether_setup() to init the majority of our device
	 * use ether_setup() to init the majority of our device
	 * structure and then override the necessary pieces.
	 * structure and then override the necessary pieces.
	 */
	 */
	xpnet_device = alloc_netdev(sizeof(struct xpnet_dev_private),
	xpnet_device = alloc_netdev(sizeof(struct xpnet_dev_private),
				    XPNET_DEVICE_NAME, ether_setup);
				    XPNET_DEVICE_NAME, ether_setup);
	if (xpnet_device == NULL)
	if (xpnet_device == NULL) {
		kfree(xpnet_broadcast_partitions);
		return -ENOMEM;
		return -ENOMEM;
	}


	netif_carrier_off(xpnet_device);
	netif_carrier_off(xpnet_device);


@@ -623,14 +600,10 @@ xpnet_init(void)
	 * MAC addresses.  We chose the first octet of the MAC to be unlikely
	 * MAC addresses.  We chose the first octet of the MAC to be unlikely
	 * to collide with any vendor's officially issued MAC.
	 * to collide with any vendor's officially issued MAC.
	 */
	 */
	xpnet_device->dev_addr[0] = 0xfe;
	xpnet_device->dev_addr[0] = 0x02;     /* locally administered, no OUI */
	xpnet_device->dev_addr[XPNET_PARTID_OCTET] = sn_partition_id;

	license_num = sn_partition_serial_number_val();
	xpnet_device->dev_addr[XPNET_PARTID_OCTET + 1] = sn_partition_id;
	for (i = 3; i >= 0; i--) {
	xpnet_device->dev_addr[XPNET_PARTID_OCTET + 0] = (sn_partition_id >> 8);
		xpnet_device->dev_addr[XPNET_LICENSE_OCTET + i] =
		    license_num & 0xff;
		license_num = license_num >> 8;
	}


	/*
	/*
	 * ether_setup() sets this to a multicast device.  We are
	 * ether_setup() sets this to a multicast device.  We are
@@ -646,8 +619,10 @@ xpnet_init(void)
	xpnet_device->features = NETIF_F_NO_CSUM;
	xpnet_device->features = NETIF_F_NO_CSUM;


	result = register_netdev(xpnet_device);
	result = register_netdev(xpnet_device);
	if (result != 0)
	if (result != 0) {
		free_netdev(xpnet_device);
		free_netdev(xpnet_device);
		kfree(xpnet_broadcast_partitions);
	}


	return result;
	return result;
}
}
@@ -661,8 +636,8 @@ xpnet_exit(void)
		 xpnet_device[0].name);
		 xpnet_device[0].name);


	unregister_netdev(xpnet_device);
	unregister_netdev(xpnet_device);

	free_netdev(xpnet_device);
	free_netdev(xpnet_device);
	kfree(xpnet_broadcast_partitions);
}
}


module_exit(xpnet_exit);
module_exit(xpnet_exit);