diff options
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/libfc/Makefile | 3 | ||||
-rw-r--r-- | drivers/scsi/libfc/fc_exch.c | 29 | ||||
-rw-r--r-- | drivers/scsi/libfc/fc_npiv.c | 86 |
3 files changed, 117 insertions, 1 deletions
diff --git a/drivers/scsi/libfc/Makefile b/drivers/scsi/libfc/Makefile index 2be549c1db77..4bb23ac86a5c 100644 --- a/drivers/scsi/libfc/Makefile +++ b/drivers/scsi/libfc/Makefile | |||
@@ -10,4 +10,5 @@ libfc-objs := \ | |||
10 | fc_frame.o \ | 10 | fc_frame.o \ |
11 | fc_lport.o \ | 11 | fc_lport.o \ |
12 | fc_rport.o \ | 12 | fc_rport.o \ |
13 | fc_fcp.o | 13 | fc_fcp.o \ |
14 | fc_npiv.o | ||
diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c index ee6031e24c14..751a485685d9 100644 --- a/drivers/scsi/libfc/fc_exch.c +++ b/drivers/scsi/libfc/fc_exch.c | |||
@@ -1134,6 +1134,15 @@ static void fc_exch_recv_req(struct fc_lport *lp, struct fc_exch_mgr *mp, | |||
1134 | u32 f_ctl; | 1134 | u32 f_ctl; |
1135 | enum fc_pf_rjt_reason reject; | 1135 | enum fc_pf_rjt_reason reject; |
1136 | 1136 | ||
1137 | /* We can have the wrong fc_lport at this point with NPIV, which is a | ||
1138 | * problem now that we know a new exchange needs to be allocated | ||
1139 | */ | ||
1140 | lp = fc_vport_id_lookup(lp, ntoh24(fh->fh_d_id)); | ||
1141 | if (!lp) { | ||
1142 | fc_frame_free(fp); | ||
1143 | return; | ||
1144 | } | ||
1145 | |||
1137 | fr_seq(fp) = NULL; | 1146 | fr_seq(fp) = NULL; |
1138 | reject = fc_seq_lookup_recip(lp, mp, fp); | 1147 | reject = fc_seq_lookup_recip(lp, mp, fp); |
1139 | if (reject == FC_RJT_NONE) { | 1148 | if (reject == FC_RJT_NONE) { |
@@ -1900,6 +1909,26 @@ void fc_exch_mgr_del(struct fc_exch_mgr_anchor *ema) | |||
1900 | } | 1909 | } |
1901 | EXPORT_SYMBOL(fc_exch_mgr_del); | 1910 | EXPORT_SYMBOL(fc_exch_mgr_del); |
1902 | 1911 | ||
1912 | /** | ||
1913 | * fc_exch_mgr_list_clone() - share all exchange manager objects | ||
1914 | * @src: source lport to clone exchange managers from | ||
1915 | * @dst: new lport that takes references to all the exchange managers | ||
1916 | */ | ||
1917 | int fc_exch_mgr_list_clone(struct fc_lport *src, struct fc_lport *dst) | ||
1918 | { | ||
1919 | struct fc_exch_mgr_anchor *ema, *tmp; | ||
1920 | |||
1921 | list_for_each_entry(ema, &src->ema_list, ema_list) { | ||
1922 | if (!fc_exch_mgr_add(dst, ema->mp, ema->match)) | ||
1923 | goto err; | ||
1924 | } | ||
1925 | return 0; | ||
1926 | err: | ||
1927 | list_for_each_entry_safe(ema, tmp, &dst->ema_list, ema_list) | ||
1928 | fc_exch_mgr_del(ema); | ||
1929 | return -ENOMEM; | ||
1930 | } | ||
1931 | |||
1903 | struct fc_exch_mgr *fc_exch_mgr_alloc(struct fc_lport *lp, | 1932 | struct fc_exch_mgr *fc_exch_mgr_alloc(struct fc_lport *lp, |
1904 | enum fc_class class, | 1933 | enum fc_class class, |
1905 | u16 min_xid, u16 max_xid, | 1934 | u16 min_xid, u16 max_xid, |
diff --git a/drivers/scsi/libfc/fc_npiv.c b/drivers/scsi/libfc/fc_npiv.c new file mode 100644 index 000000000000..39f02c09a8d9 --- /dev/null +++ b/drivers/scsi/libfc/fc_npiv.c | |||
@@ -0,0 +1,86 @@ | |||
1 | /* | ||
2 | * Copyright(c) 2009 Intel Corporation. All rights reserved. | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify it | ||
5 | * under the terms and conditions of the GNU General Public License, | ||
6 | * version 2, as published by the Free Software Foundation. | ||
7 | * | ||
8 | * This program is distributed in the hope it will be useful, but WITHOUT | ||
9 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
10 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
11 | * more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public License along with | ||
14 | * this program; if not, write to the Free Software Foundation, Inc., | ||
15 | * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. | ||
16 | * | ||
17 | * Maintained at www.Open-FCoE.org | ||
18 | */ | ||
19 | |||
20 | /* | ||
21 | * NPIV VN_Port helper functions for libfc | ||
22 | */ | ||
23 | |||
24 | #include <scsi/libfc.h> | ||
25 | |||
26 | /** | ||
27 | * fc_vport_create() - Create a new NPIV vport instance | ||
28 | * @vport: fc_vport structure from scsi_transport_fc | ||
29 | * @privsize: driver private data size to allocate along with the Scsi_Host | ||
30 | */ | ||
31 | |||
32 | struct fc_lport *libfc_vport_create(struct fc_vport *vport, int privsize) | ||
33 | { | ||
34 | struct Scsi_Host *shost = vport_to_shost(vport); | ||
35 | struct fc_lport *n_port = shost_priv(shost); | ||
36 | struct fc_lport *vn_port; | ||
37 | |||
38 | vn_port = libfc_host_alloc(shost->hostt, privsize); | ||
39 | if (!vn_port) | ||
40 | goto err_out; | ||
41 | if (fc_exch_mgr_list_clone(n_port, vn_port)) | ||
42 | goto err_put; | ||
43 | |||
44 | vn_port->vport = vport; | ||
45 | vport->dd_data = vn_port; | ||
46 | |||
47 | mutex_lock(&n_port->lp_mutex); | ||
48 | list_add_tail(&vn_port->list, &n_port->vports); | ||
49 | mutex_unlock(&n_port->lp_mutex); | ||
50 | |||
51 | return vn_port; | ||
52 | |||
53 | err_put: | ||
54 | scsi_host_put(vn_port->host); | ||
55 | err_out: | ||
56 | return NULL; | ||
57 | } | ||
58 | EXPORT_SYMBOL(libfc_vport_create); | ||
59 | |||
60 | /** | ||
61 | * fc_vport_id_lookup() - find NPIV lport that matches a given fabric ID | ||
62 | * @n_port: Top level N_Port which may have multiple NPIV VN_Ports | ||
63 | * @port_id: Fabric ID to find a match for | ||
64 | * | ||
65 | * Returns: matching lport pointer or NULL if there is no match | ||
66 | */ | ||
67 | struct fc_lport *fc_vport_id_lookup(struct fc_lport *n_port, u32 port_id) | ||
68 | { | ||
69 | struct fc_lport *lport = NULL; | ||
70 | struct fc_lport *vn_port; | ||
71 | |||
72 | if (fc_host_port_id(n_port->host) == port_id) | ||
73 | return n_port; | ||
74 | |||
75 | mutex_lock(&n_port->lp_mutex); | ||
76 | list_for_each_entry(vn_port, &n_port->vports, list) { | ||
77 | if (fc_host_port_id(vn_port->host) == port_id) { | ||
78 | lport = vn_port; | ||
79 | break; | ||
80 | } | ||
81 | } | ||
82 | mutex_unlock(&n_port->lp_mutex); | ||
83 | |||
84 | return lport; | ||
85 | } | ||
86 | |||