Add bnx2 iSCSI support.
Subsystems (5)
cover Add bnx2 iSCSI support.
New Broadcom iSCSI driver for review. Compared to the last version we posted in 2008, we've changed it to use a separate and private MAC address/IP address for iSCSI. We are creating a UIO interface to handle the non-offloaded packets such as ARP, etc. in user space. Thanks.
A message that is not in the archive (sent off-list or not yet received): 1240532563-23048-1-git-send-email-mchan-dY08KVG/lbpWk0Htik3J/[email protected]
PATCH 2/4 cnic: Add new CNIC driver.
The CNIC driver controls BNX2 hardware rings and resources used by iSCSI. Most hardware resources for iSCSI are separate from those used for ethernet networking.
iSCSI uses a separate MAC address and IP address. The CNIC driver creates a UIO interface to handle the non-offloaded packets such as ARP, etc in userspace.
--- drivers/net/Kconfig | 11 + drivers/net/Makefile | 1 + drivers/net/cnic.c | 2696 +++++++++++++++++++++++++++++++++++++++++++++++ drivers/net/cnic.h | 300 ++++++ drivers/net/cnic_defs.h | 569 ++++++++++ drivers/net/cnic_if.h | 320 ++++++ 6 files changed, 3897 insertions(+), 0 deletions(-) create mode 100644 drivers/net/cnic.c create mode 100644 drivers/net/cnic.h create mode 100644 drivers/net/cnic_defs.h create mode 100644 drivers/net/cnic_if.h
drivers/net/Kconfig +11 -0
@@ -2264,6 +2264,17 @@ config BNX2 To compile this driver as a module, choose M here: the module will be called bnx2. This is recommended. +config CNIC + tristate "Broadcom CNIC support" + depends on BNX2 + depends on UIO + help + This driver supports offload features of Broadcom NetXtremeII + gigabit Ethernet cards. + + To compile this driver as a module, choose M here: the module + will be called cnic. This is recommended. + config SPIDER_NET tristate "Spider Gigabit Ethernet driver" depends on PCI && (PPC_IBM_CELL_BLADE || PPC_CELLEB)
drivers/net/Makefile +1 -0
@@ -73,6 +73,7 @@ obj-$(CONFIG_STNIC) += stnic.o 8390.o obj-$(CONFIG_FEALNX) += fealnx.o obj-$(CONFIG_TIGON3) += tg3.o obj-$(CONFIG_BNX2) += bnx2.o +obj-$(CONFIG_CNIC) += cnic.o obj-$(CONFIG_BNX2X) += bnx2x.o bnx2x-objs := bnx2x_main.o bnx2x_link.o spidernet-y += spider_net.o spider_net_ethtool.o
drivers/net/cnic.c new file +2696 -0
2,696 lines not on this page · raw message
drivers/net/cnic.h new file +300 -0
280 lines not on this page · raw message
drivers/net/cnic_defs.h new file +569 -0
569 lines not on this page · raw message
drivers/net/cnic_if.h new file +320 -0
320 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.5.6.GIT
Part of the diff is not shown here. View the raw message.
PATCH 4/4 bnx2i: Add bnx2i iSCSI driver.
In reply to a message not in the archiveNew iSCSI driver for BNX2 devices. The driver interfaces with the CNIC driver to access the hardware.
--- drivers/scsi/Kconfig | 1 + drivers/scsi/Makefile | 1 + drivers/scsi/bnx2i/57xx_iscsi_constants.h | 155 ++ drivers/scsi/bnx2i/57xx_iscsi_hsi.h | 1509 ++++++++++++++++++ drivers/scsi/bnx2i/Kconfig | 7 + drivers/scsi/bnx2i/Makefile | 3 + drivers/scsi/bnx2i/bnx2i.h | 776 +++++++++ drivers/scsi/bnx2i/bnx2i_hwi.c | 2446 +++++++++++++++++++++++++++++ drivers/scsi/bnx2i/bnx2i_init.c | 454 ++++++ drivers/scsi/bnx2i/bnx2i_iscsi.c | 2101 +++++++++++++++++++++++++ drivers/scsi/bnx2i/bnx2i_sysfs.c | 142 ++ 11 files changed, 7595 insertions(+), 0 deletions(-) create mode 100644 drivers/scsi/bnx2i/57xx_iscsi_constants.h create mode 100644 drivers/scsi/bnx2i/57xx_iscsi_hsi.h create mode 100644 drivers/scsi/bnx2i/Kconfig create mode 100644 drivers/scsi/bnx2i/Makefile create mode 100644 drivers/scsi/bnx2i/bnx2i.h create mode 100644 drivers/scsi/bnx2i/bnx2i_hwi.c create mode 100644 drivers/scsi/bnx2i/bnx2i_init.c create mode 100644 drivers/scsi/bnx2i/bnx2i_iscsi.c create mode 100644 drivers/scsi/bnx2i/bnx2i_sysfs.c
drivers/scsi/Kconfig +1 -0
@@ -1374,6 +1374,7 @@ config SCSI_QLOGICPTI source "drivers/scsi/qla2xxx/Kconfig" source "drivers/scsi/qla4xxx/Kconfig" +source "drivers/scsi/bnx2i/Kconfig" config SCSI_LPFC tristate "Emulex LightPulse Fibre Channel Support"
drivers/scsi/Makefile +1 -0
@@ -84,6 +84,7 @@ obj-$(CONFIG_PCMCIA_QLOGIC) += qlogicfas408.o obj-$(CONFIG_SCSI_QLOGIC_1280) += qla1280.o obj-$(CONFIG_SCSI_QLA_FC) += qla2xxx/ obj-$(CONFIG_SCSI_QLA_ISCSI) += qla4xxx/ +obj-$(CONFIG_SCSI_BNX2_ISCSI) += bnx2i/ obj-$(CONFIG_SCSI_LPFC) += lpfc/ obj-$(CONFIG_SCSI_PAS16) += pas16.o obj-$(CONFIG_SCSI_T128) += t128.o
drivers/scsi/bnx2i/57xx_iscsi_constants.h new file +155 -0
155 lines not on this page · raw message
drivers/scsi/bnx2i/57xx_iscsi_hsi.h new file +1509 -0
1,509 lines not on this page · raw message
drivers/scsi/bnx2i/Kconfig new file +7 -0
@@ -0,0 +1,7 @@ +config SCSI_BNX2_ISCSI + tristate "Broadcom NetXtreme II iSCSI support" + #select CNIC + select SCSI_ISCSI_ATTRS + ---help--- + This driver supports iSCSI offload for the Broadcom NetXtreme II + devices.
drivers/scsi/bnx2i/Makefile new file +3 -0
@@ -0,0 +1,3 @@ +bnx2i-y := bnx2i_init.o bnx2i_hwi.o bnx2i_iscsi.o bnx2i_sysfs.o + +obj-$(CONFIG_SCSI_BNX2_ISCSI) += bnx2i.o
drivers/scsi/bnx2i/bnx2i.h new file +776 -0
776 lines not on this page · raw message
drivers/scsi/bnx2i/bnx2i_hwi.c new file +2446 -0
536 lines not on this page · raw message
drivers/scsi/bnx2i/bnx2i_init.c new file +454 -0
454 lines not on this page · raw message
drivers/scsi/bnx2i/bnx2i_iscsi.c new file +2101 -0
2,101 lines not on this page · raw message
drivers/scsi/bnx2i/bnx2i_sysfs.c new file +142 -0
142 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.5.6.GIT
Part of the diff is not shown here. View the raw message.
A message that is not in the archive (sent off-list or not yet received): 1240532563-23048-5-git-send-email-mchan-dY08KVG/lbpWk0Htik3J/[email protected]
bnx2 iSCSI patches
Some of the patches did not make it to the netdev or open-iscsi list. The patchset is available at the links below for review. Thanks.
http://www.broadcom.com/docs/linux/0001-bnx2-Add-support-for-CNIC-driver.patch
http://www.broadcom.com/docs/linux/0002-cnic-Add-new-CNIC-driver.patch
http://www.broadcom.com/docs/linux/0003-bnx2i-Add-bnx2i-iSCSI-driver.patch
http://www.broadcom.com/docs/linux/0004-iscsi-class-libiscsi-Add-net-config.patch
PATCH 1/4 bnx2: Add support for CNIC driver.
In reply to Michael ChanAdd interface and functions to support a new CNIC driver to drive the hardware for iSCSI offload.
--- drivers/net/bnx2.c | 193 +++++++++++++++++++++++++++++++++++++++++++++++++++- drivers/net/bnx2.h | 18 +++++ 2 files changed, 208 insertions(+), 3 deletions(-)
drivers/net/bnx2.c +190 -3
@@ -49,6 +49,10 @@#include <linux/firmware.h> #include <linux/log2.h> +#if defined(CONFIG_CNIC ) || defined(CONFIG_CNIC_MODULE ) +#define BCM_CNIC 1 +#include "cnic_if.h" +#endif #include "bnx2.h" #include "bnx2_fw.h"
@@ -315,6 +319,158 @@ bnx2_ctx_wr(struct bnx2 *bp, u32 cid_addr, u32 offset, u32 val)spin_unlock_bh (&bp->indirect_lock); } +#ifdef BCM_CNIC +static int +bnx2_drv_ctl (struct net_device *dev,struct drv_ctl_info *info) +{ +struct bnx2 *bp =netdev_priv (dev); +struct drv_ctl_io *io = &info->data.io; + +switch (info->cmd) { +case DRV_CTL_IO_WR_CMD : +bnx2_reg_wr_ind (bp, io->offset, io->data); +break ; +case DRV_CTL_IO_RD_CMD : + io->data =bnx2_reg_rd_ind (bp, io->offset); +break ; +case DRV_CTL_CTX_WR_CMD : +bnx2_ctx_wr (bp, io->cid_addr, io->offset, io->data); +break ; +default : +return -EINVAL ; + } +return 0 ; +} + +static void bnx2_setup_cnic_irq_info (struct bnx2 *bp) +{ +struct cnic_eth_dev *cp = &bp->cnic_eth_dev; +struct bnx2_napi *bnapi = &bp->bnx2_napi[0 ]; +int sb_id; + +if (bp->flags &BNX2_FLAG_USING_MSIX ) { + cp->drv_state |=CNIC_DRV_STATE_USING_MSIX ; + bnapi->cnic_present =0 ; + sb_id = bp->irq_nvecs; + cp->irq_arr[0 ].irq_flags |=CNIC_IRQ_FL_MSIX ; + }else { + cp->drv_state &= ~CNIC_DRV_STATE_USING_MSIX ; + bnapi->cnic_tag = bnapi->last_status_idx; + bnapi->cnic_present =1 ; + sb_id =0 ; + cp->irq_arr[0 ].irq_flags &= ~CNIC_IRQ_FL_MSIX ; + } + + cp->irq_arr[0 ].vector = bp->irq_tbl[sb_id].vector; + cp->irq_arr[0 ].status_blk = (void *) + ((unsigned long ) bnapi->status_blk.msi + + (BNX2_SBLK_MSIX_ALIGN_SIZE * sb_id)); + cp->irq_arr[0 ].status_blk_num = sb_id; + cp->num_irq =1 ; +} + +static int bnx2_register_cnic (struct net_device *dev,struct cnic_ops *ops, +void *data) +{ +struct bnx2 *bp =netdev_priv (dev); +struct cnic_eth_dev *cp = &bp->cnic_eth_dev; + +if (ops ==NULL ) +return -EINVAL ; + +if (cp->drv_state &CNIC_DRV_STATE_REGD ) +return -EBUSY ; + + bp->cnic_data = data; +rcu_assign_pointer (bp->cnic_ops, ops); + + cp->num_irq =0 ; + cp->drv_state =CNIC_DRV_STATE_REGD ; + +bnx2_setup_cnic_irq_info (bp); + +return 0 ; +} + +static int bnx2_unregister_cnic (struct net_device *dev) +{ +struct bnx2 *bp =netdev_priv (dev); +struct bnx2_napi *bnapi = &bp->bnx2_napi[0 ]; +struct cnic_eth_dev *cp = &bp->cnic_eth_dev; + + cp->drv_state =0 ; + bnapi->cnic_present =0 ; +rcu_assign_pointer (bp->cnic_ops,NULL ); +synchronize_rcu (); +return 0 ; +} + +struct cnic_eth_dev *bnx2_cnic_probe (struct net_device *dev) +{ +struct bnx2 *bp =netdev_priv (dev); +struct cnic_eth_dev *cp = &bp->cnic_eth_dev; + + cp->drv_owner =THIS_MODULE ; + cp->chip_id = bp->chip_id; + cp->pdev = bp->pdev; + cp->io_base = bp->regview; + cp->drv_ctl = bnx2_drv_ctl; + cp->drv_register_cnic = bnx2_register_cnic; + cp->drv_unregister_cnic = bnx2_unregister_cnic; + +return cp; +} +EXPORT_SYMBOL (bnx2_cnic_probe); + +static void +bnx2_cnic_stop (struct bnx2 *bp) +{ +struct cnic_ops *c_ops; +struct cnic_ctl_info info; + +rcu_read_lock (); + c_ops =rcu_dereference (bp->cnic_ops); +if (c_ops) { + info.cmd =CNIC_CTL_STOP_CMD ; + c_ops->cnic_ctl (bp->cnic_data, &info); + } +rcu_read_unlock (); +} + +static void +bnx2_cnic_start (struct bnx2 *bp) +{ +struct cnic_ops *c_ops; +struct cnic_ctl_info info; + +rcu_read_lock (); + c_ops =rcu_dereference (bp->cnic_ops); +if (c_ops) { +if (!(bp->flags &BNX2_FLAG_USING_MSIX )) { +struct bnx2_napi *bnapi = &bp->bnx2_napi[0 ]; + + bnapi->cnic_tag = bnapi->last_status_idx; + } + info.cmd =CNIC_CTL_START_CMD ; + c_ops->cnic_ctl (bp->cnic_data, &info); + } +rcu_read_unlock (); +} + +#else + +static void +bnx2_cnic_stop (struct bnx2 *bp) +{ +} + +static void +bnx2_cnic_start (struct bnx2 *bp) +{ +} + +#endif +static int bnx2_read_phy (struct bnx2 *bp,u32 reg,u32 *val) {
@@ -488,6 +644,7 @@ bnx2_napi_enable(struct bnx2 *bp)static void bnx2_netif_stop (struct bnx2 *bp) { +bnx2_cnic_stop (bp);bnx2_disable_int_sync (bp);if (netif_running (bp->dev)) {bnx2_napi_disable (bp);
@@ -504,6 +661,7 @@ bnx2_netif_start(struct bnx2 *bp)netif_tx_wake_all_queues (bp->dev);bnx2_napi_enable (bp);bnx2_enable_int (bp); +bnx2_cnic_start (bp); } } }
@@ -3162,6 +3320,11 @@ bnx2_has_work(struct bnx2_napi *bnapi)if (bnx2_has_fast_work (bnapi))return 1 ; +#ifdef BCM_CNIC +if (bnapi->cnic_present && (bnapi->cnic_tag != sblk->status_idx)) +return 1 ; +#endif +if ((sblk->status_attn_bits &STATUS_ATTN_EVENTS ) != (sblk->status_attn_bits_ack &STATUS_ATTN_EVENTS ))return 1 ;
@@ -3191,6 +3354,23 @@ bnx2_chk_missed_msi(struct bnx2 *bp) bp->idle_chk_status_idx = bnapi->last_status_idx; } +#ifdef BCM_CNIC +static void bnx2_poll_cnic (struct bnx2 *bp,struct bnx2_napi *bnapi) +{ +struct cnic_ops *c_ops; + +if (!bnapi->cnic_present) +return ; + +rcu_read_lock (); + c_ops =rcu_dereference (bp->cnic_ops); +if (c_ops) + bnapi->cnic_tag = c_ops->cnic_handler (bp->cnic_data, + bnapi->status_blk.msi); +rcu_read_unlock (); +} +#endif +static void bnx2_poll_link (struct bnx2 *bp,struct bnx2_napi *bnapi) {struct status_block *sblk = bnapi->status_blk.msi;
@@ -3265,6 +3445,10 @@ static int bnx2_poll(struct napi_struct *napi, int budget) work_done =bnx2_poll_work (bp, bnapi, work_done, budget); +#ifdef BCM_CNIC +bnx2_poll_cnic (bp, bnapi); +#endif +/* bnapi->last_status_idx is used below to tell the hw how * much work has been processed, so we must read it before * checking for more work.
@@ -4630,8 +4814,11 @@ bnx2_init_chip(struct bnx2 *bp) val =REG_RD (bp,BNX2_MQ_CONFIG ); val &= ~BNX2_MQ_CONFIG_KNL_BYP_BLK_SIZE ; val |=BNX2_MQ_CONFIG_KNL_BYP_BLK_SIZE_256 ; -if (CHIP_ID (bp) ==CHIP_ID_5709_A0 ||CHIP_ID (bp) ==CHIP_ID_5709_A1 ) - val |=BNX2_MQ_CONFIG_HALT_DIS ; +if (CHIP_NUM (bp) ==CHIP_NUM_5709 ) { + val |=BNX2_MQ_CONFIG_BIN_MQ_MODE ; +if (CHIP_REV (bp) == CHIP_REV_Ax) + val |=BNX2_MQ_CONFIG_HALT_DIS ; + }REG_WR (bp,BNX2_MQ_CONFIG , val);
@@ -7469,7 +7656,7 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)INIT_WORK (&bp->reset_task, bnx2_reset_task); dev->base_addr = dev->mem_start =pci_resource_start (pdev,0 ); - mem_len =MB_GET_CID_ADDR (TX_TSS_CID +TX_MAX_TSS_RINGS ); + mem_len =MB_GET_CID_ADDR (TX_TSS_CID +TX_MAX_TSS_RINGS +1 ); dev->mem_end = dev->mem_start + mem_len; dev->irq = pdev->irq;
drivers/net/bnx2.h +18 -0
@@ -361,6 +361,9 @@ struct l2_fhdr {#define BNX2_L2CTX_CTX_TYPE_CTX_BD_CHN_TYPE_VALUE (1<<28)#define BNX2_L2CTX_HOST_BDIDX 0x00000004 +#define BNX2_L2CTX_STATUSB_NUM_SHIFT 16 +#define BNX2_L2CTX_STATUSB_NUM (sb_id) \ + (((sb_id) > 0) ? (((sb_id) + 7) << BNX2_L2CTX_STATUSB_NUM_SHIFT) : 0)#define BNX2_L2CTX_HOST_BSEQ 0x00000008#define BNX2_L2CTX_NX_BSEQ 0x0000000c#define BNX2_L2CTX_NX_BDHADDR_HI 0x00000010
@@ -5900,6 +5903,7 @@ struct l2_fhdr {#define BNX2_RXP_FTQ_CTL_CUR_DEPTH (0x3ffL<<22)#define BNX2_RXP_SCRATCH 0x000e0000 +#define BNX2_RXP_SCRATCH_RXP_FLOOD 0x000e0024#define BNX2_RXP_SCRATCH_RSS_TBL_SZ 0x000e0038#define BNX2_RXP_SCRATCH_RSS_TBL 0x000e003c#define BNX2_RXP_SCRATCH_RSS_TBL_MAX_ENTRIES 128
@@ -6678,6 +6682,11 @@ struct bnx2_napi {u32 last_status_idx;u32 int_num; +#ifdef BCM_CNIC +u32 cnic_tag; +int cnic_present; +#endif +struct bnx2_rx_ring_info rx_ring;struct bnx2_tx_ring_info tx_ring; };
@@ -6727,6 +6736,11 @@ struct bnx2 {int tx_ring_size;u32 tx_wake_thresh; +#ifdef BCM_CNIC +struct cnic_ops *cnic_ops; +void *cnic_data; +#endif +/* End of fields used in the performance code paths. */ unsigned int current_interval;
@@ -6885,6 +6899,10 @@ struct bnx2 {u32 idle_chk_status_idx; +#ifdef BCM_CNIC +struct cnic_eth_dev cnic_eth_dev; +#endif +const struct firmware *mips_firmware;const struct firmware *rv2p_firmware; };
Signature · 1 line
1.5.6.GIT
PATCH 3/4 iscsi class, libiscsi: Add net config.
In reply to Michael ChanAdd ISCSI_NETLINK messages to set/get iSCSI network parameters and vendor specific information.
--- drivers/scsi/scsi_transport_iscsi.c | 87 ++++++++++++++++++++++++++++++++++- include/scsi/iscsi_if.h | 45 ++++++++++++++++++ include/scsi/scsi_transport_iscsi.h | 58 +++++++++++++++++++++++ 3 files changed, 188 insertions(+), 2 deletions(-)
drivers/scsi/scsi_transport_iscsi.c +85 -2
@@ -995,6 +995,36 @@ int iscsi_recv_pdu(struct iscsi_cls_conn *conn, struct iscsi_hdr *hdr, }EXPORT_SYMBOL_GPL (iscsi_recv_pdu); + +extern int iscsi_vendor_priv_mesg (struct Scsi_Host *shost,uint16_t priv_op, +char *data,uint16_t data_size) +{ +struct nlmsghdr *nlh; +struct sk_buff *skb; +struct iscsi_uevent *ev; +int len =NLMSG_SPACE (sizeof (*ev) + data_size); + + skb =alloc_skb (len,GFP_ATOMIC ); +if (!skb) { +printk (KERN_ERR "can not deliver vendor private message:OOM\n" ); +return -ENOMEM ; + } + + nlh =__nlmsg_put (skb,0 ,0 ,0 , (len -sizeof (*nlh)),0 ); + ev =NLMSG_DATA (nlh); +memset (ev,0 ,sizeof (*ev)); + ev->type =ISCSI_KEVENT_PRIVATE_MESG ; + ev->r.vendor_priv.host_no = shost->host_no; + ev->r.vendor_priv.priv_op = priv_op; + ev->r.vendor_priv.mesg_size = data_size; + +memcpy ((char *)ev +sizeof (*ev), data, data_size); + +return iscsi_broadcast_skb (skb,GFP_KERNEL ); +} +EXPORT_SYMBOL_GPL (iscsi_vendor_priv_mesg); + +void iscsi_conn_error_event (struct iscsi_cls_conn *conn,enum iscsi_err error) {struct nlmsghdr *nlh;
@@ -1332,7 +1362,6 @@ iscsi_tgt_dscvr(struct iscsi_transport *transport,return -ENODEV ; } - dst_addr = (struct sockaddr *)((char *)ev +sizeof (*ev)); err = transport->tgt_dscvr (shost, ev->u.tgt_dscvr.type, ev->u.tgt_dscvr.enable, dst_addr);
@@ -1364,6 +1393,52 @@ iscsi_set_host_param(struct iscsi_transport *transport,return err; } + +static int +iscsi_set_host_net_cfg (struct iscsi_transport *transport, +struct iscsi_uevent *ev,int msg_type) +{ +char *data = (char *)ev +sizeof (*ev); +struct Scsi_Host *shost; +int err; + +if (!transport->set_net_config) +return -ENOSYS ; + + shost =scsi_host_lookup (ev->u.set_net_config.host_no); +if (!shost) { +printk (KERN_ERR "set_net_config could not find host no %u\n" , + ev->u.set_host_param.host_no); +return -ENODEV ; + } + + err = transport->set_net_config (shost, data, ev->u.set_net_config.len); +scsi_host_put (shost); +return err; +} + +static int +iscsi_vendor_priv_msg (struct iscsi_transport *transport, +struct iscsi_uevent *ev) +{ +struct Scsi_Host *shost; +int err; + + shost =scsi_host_lookup (ev->u.vendor_priv.host_no); +if (!shost) { +printk (KERN_ERR "target discovery could not find host no %u\n" , + ev->u.tgt_dscvr.host_no); +return -ENODEV ; + } + + err = transport->nl_priv_recv (shost, ev->u.vendor_priv.priv_op, + ev->u.vendor_priv.status, + (char *)((char *)ev +sizeof (*ev)), + ev->u.vendor_priv.mesg_size); +scsi_host_put (shost); +return err; +} +static int iscsi_if_recv_msg (struct sk_buff *skb,struct nlmsghdr *nlh) {
@@ -1383,7 +1458,8 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)if (!try_module_get (transport->owner))return -EINVAL ; - priv->daemon_pid =NETLINK_CREDS (skb)->pid; +if (nlh->nlmsg_type !=ISCSI_UEVENT_PRIVATE_MESG ) + priv->daemon_pid =NETLINK_CREDS (skb)->pid;switch (nlh->nlmsg_type) {case ISCSI_UEVENT_CREATE_SESSION :
@@ -1477,6 +1553,13 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)case ISCSI_UEVENT_SET_HOST_PARAM : err =iscsi_set_host_param (transport, ev);break ; +case ISCSI_UEVENT_SET_NET_CONFIG : +case ISCSI_UEVENT_GET_NET_CONFIG : + err =iscsi_set_host_net_cfg (transport, ev, nlh->nlmsg_type); +break ; +case ISCSI_UEVENT_PRIVATE_MESG : + err =iscsi_vendor_priv_msg (transport, ev); +break ;default : err = -ENOSYS ;break ;
include/scsi/iscsi_if.h +45 -0
73 lines not on this page · raw message
include/scsi/scsi_transport_iscsi.h +58 -0
82 lines not on this page · raw message
Signature · 1 line
1.5.6.GIT
From: "Michael Chan" <[email protected]>
Date: Thu, 23 Apr 2009 17:22:39 -0700
Quoted 5 lines
New Broadcom iSCSI driver for review. Compared to the last version we posted in 2008, we've changed it to use a separate and private MAC address/IP address for iSCSI. We are creating a UIO interface to handle the non-offloaded packets such as ARP, etc. in user space. Thanks.
I'm fine with the drivers/net portions.
We have to figure out how to merge this though :-)
I'm happy with it going in via the SCSI tree or similar, all of it. So feel free to add:
We'll sort out the merge issues as needed.