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

Commit 56fff0a0 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'fjes' 

Taku Izumi says:

====================
FUJITSU Extended Socket network device driver

This patchsets adds FUJITSU Extended Socket network device driver.
Extended Socket network device is a shared memory based high-speed
network interface between Extended Partitions of PRIMEQUEST 2000 E2
series.

You can get some information about Extended Partition and Extended
Socket by referring the following manual.

http://globalsp.ts.fujitsu.com/dmsp/Publications/public/CA92344-0537.pdf


    3.2.1 Extended Partitioning
    3.2.2 Extended Socke

v2.2 -> v3:
   - Fix up according to David's comment (No functional change)
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4a89ba04 786eec27

drivers/net/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -413,6 +413,13 @@ config VMXNET3 
	  To compile this driver as a module, choose M here: the

	  module will be called vmxnet3.



config FUJITSU_ES

	tristate "FUJITSU Extended Socket Network Device driver"

	depends on ACPI

	help

	  This driver provides support for Extended Socket network device

          on Extended Partitioning of FUJITSU PRIMEQUEST 2000 E2 series.



source "drivers/net/hyperv/Kconfig"



endif # NETDEVICES

drivers/net/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -68,3 +68,5 @@ obj-$(CONFIG_USB_NET_DRIVERS) += usb/ 


obj-$(CONFIG_HYPERV_NET) += hyperv/

obj-$(CONFIG_NTB_NETDEV) += ntb_netdev.o



obj-$(CONFIG_FUJITSU_ES) += fjes/

drivers/net/fjes/Makefile

0 → 100644
+30 −0
Original line number Diff line number Diff line 
################################################################################

#

# FUJITSU Extended Socket Network Device driver

# Copyright (c) 2015 FUJITSU LIMITED

#

# This program is free software; you can redistribute it and/or modify it

# under the terms and conditions of the GNU General Public License,

# version 2, as published by the Free Software Foundation.

#

# This program is distributed in the hope it will be useful, but WITHOUT

# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

# more details.

#

# You should have received a copy of the GNU General Public License along with

# this program; if not, see <http://www.gnu.org/licenses/>.

#

# The full GNU General Public License is included in this distribution in

# the file called "COPYING".

#

################################################################################





#

# Makefile for the FUJITSU Extended Socket network device driver

#



obj-$(CONFIG_FUJITSU_ES) += fjes.o



fjes-objs := fjes_main.o fjes_hw.o fjes_ethtool.o

drivers/net/fjes/fjes.h

0 → 100644
+77 −0
Original line number Diff line number Diff line 
/*

 *  FUJITSU Extended Socket Network Device driver

 *  Copyright (c) 2015 FUJITSU LIMITED

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,

 * version 2, as published by the Free Software Foundation.

 *

 * This program is distributed in the hope it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 *

 * You should have received a copy of the GNU General Public License along with

 * this program; if not, see <http://www.gnu.org/licenses/>.

 *

 * The full GNU General Public License is included in this distribution in

 * the file called "COPYING".

 *

 */



#ifndef FJES_H_

#define FJES_H_



#include <linux/acpi.h>



#include "fjes_hw.h"



#define FJES_ACPI_SYMBOL	"Extended Socket"

#define FJES_MAX_QUEUES		1

#define FJES_TX_RETRY_INTERVAL	(20 * HZ)

#define FJES_TX_RETRY_TIMEOUT	(100)

#define FJES_TX_TX_STALL_TIMEOUT	(FJES_TX_RETRY_INTERVAL / 2)

#define FJES_OPEN_ZONE_UPDATE_WAIT	(300) /* msec */

#define FJES_IRQ_WATCH_DELAY	(HZ)



/* board specific private data structure */

struct fjes_adapter {

	struct net_device *netdev;

	struct platform_device *plat_dev;



	struct napi_struct napi;

	struct rtnl_link_stats64 stats64;



	unsigned int tx_retry_count;

	unsigned long tx_start_jiffies;

	unsigned long rx_last_jiffies;

	bool unset_rx_last;



	struct work_struct force_close_task;

	bool force_reset;

	bool open_guard;



	bool irq_registered;



	struct workqueue_struct *txrx_wq;

	struct workqueue_struct *control_wq;



	struct work_struct tx_stall_task;

	struct work_struct raise_intr_rxdata_task;



	struct work_struct unshare_watch_task;

	unsigned long unshare_watch_bitmask;



	struct delayed_work interrupt_watch_task;

	bool interrupt_watch_enable;



	struct fjes_hw hw;

};



extern char fjes_driver_name[];

extern char fjes_driver_version[];

extern const u32 fjes_support_mtu[];



void fjes_set_ethtool_ops(struct net_device *);



#endif /* FJES_H_ */

drivers/net/fjes/fjes_ethtool.c

0 → 100644
+137 −0
Original line number Diff line number Diff line 
/*

 *  FUJITSU Extended Socket Network Device driver

 *  Copyright (c) 2015 FUJITSU LIMITED

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,

 * version 2, as published by the Free Software Foundation.

 *

 * This program is distributed in the hope it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 *

 * You should have received a copy of the GNU General Public License along with

 * this program; if not, see <http://www.gnu.org/licenses/>.

 *

 * The full GNU General Public License is included in this distribution in

 * the file called "COPYING".

 *

 */



/* ethtool support for fjes */



#include <linux/vmalloc.h>

#include <linux/netdevice.h>

#include <linux/ethtool.h>

#include <linux/platform_device.h>



#include "fjes.h"



struct fjes_stats {

	char stat_string[ETH_GSTRING_LEN];

	int sizeof_stat;

	int stat_offset;

};



#define FJES_STAT(name, stat) { \

	.stat_string = name, \

	.sizeof_stat = FIELD_SIZEOF(struct fjes_adapter, stat), \

	.stat_offset = offsetof(struct fjes_adapter, stat) \

}



static const struct fjes_stats fjes_gstrings_stats[] = {

	FJES_STAT("rx_packets", stats64.rx_packets),

	FJES_STAT("tx_packets", stats64.tx_packets),

	FJES_STAT("rx_bytes", stats64.rx_bytes),

	FJES_STAT("tx_bytes", stats64.rx_bytes),

	FJES_STAT("rx_dropped", stats64.rx_dropped),

	FJES_STAT("tx_dropped", stats64.tx_dropped),

};



static void fjes_get_ethtool_stats(struct net_device *netdev,

				   struct ethtool_stats *stats, u64 *data)

{

	struct fjes_adapter *adapter = netdev_priv(netdev);

	char *p;

	int i;



	for (i = 0; i < ARRAY_SIZE(fjes_gstrings_stats); i++) {

		p = (char *)adapter + fjes_gstrings_stats[i].stat_offset;

		data[i] = (fjes_gstrings_stats[i].sizeof_stat == sizeof(u64))

			? *(u64 *)p : *(u32 *)p;

	}

}



static void fjes_get_strings(struct net_device *netdev,

			     u32 stringset, u8 *data)

{

	u8 *p = data;

	int i;



	switch (stringset) {

	case ETH_SS_STATS:

		for (i = 0; i < ARRAY_SIZE(fjes_gstrings_stats); i++) {

			memcpy(p, fjes_gstrings_stats[i].stat_string,

			       ETH_GSTRING_LEN);

			p += ETH_GSTRING_LEN;

		}

		break;

	}

}



static int fjes_get_sset_count(struct net_device *netdev, int sset)

{

	switch (sset) {

	case ETH_SS_STATS:

		return ARRAY_SIZE(fjes_gstrings_stats);

	default:

		return -EOPNOTSUPP;

	}

}



static void fjes_get_drvinfo(struct net_device *netdev,

			     struct ethtool_drvinfo *drvinfo)

{

	struct fjes_adapter *adapter = netdev_priv(netdev);

	struct platform_device *plat_dev;



	plat_dev = adapter->plat_dev;



	strlcpy(drvinfo->driver, fjes_driver_name, sizeof(drvinfo->driver));

	strlcpy(drvinfo->version, fjes_driver_version,

		sizeof(drvinfo->version));



	strlcpy(drvinfo->fw_version, "none", sizeof(drvinfo->fw_version));

	snprintf(drvinfo->bus_info, sizeof(drvinfo->bus_info),

		 "platform:%s", plat_dev->name);

	drvinfo->regdump_len = 0;

	drvinfo->eedump_len = 0;

}



static int fjes_get_settings(struct net_device *netdev,

			     struct ethtool_cmd *ecmd)

{

	ecmd->supported = 0;

	ecmd->advertising = 0;

	ecmd->duplex = DUPLEX_FULL;

	ecmd->autoneg = AUTONEG_DISABLE;

	ecmd->transceiver = XCVR_DUMMY1;

	ecmd->port = PORT_NONE;

	ethtool_cmd_speed_set(ecmd, 20000);	/* 20Gb/s */



	return 0;

}



static const struct ethtool_ops fjes_ethtool_ops = {

		.get_settings		= fjes_get_settings,

		.get_drvinfo		= fjes_get_drvinfo,

		.get_ethtool_stats = fjes_get_ethtool_stats,

		.get_strings      = fjes_get_strings,

		.get_sset_count   = fjes_get_sset_count,

};



void fjes_set_ethtool_ops(struct net_device *netdev)

{

	netdev->ethtool_ops = &fjes_ethtool_ops;

}