[SCSI] bfa: enable basic PBC support

The patch includes the driver side changes to enable basic PBC (PreBoot
Configuration) feature.
- Data structure changes and new definitions for PBC.
- APIs to access PBC info.
- Remove unused code.

Signed-off-by: Jing Huang <huangj@brocade.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

6 files changed, 97 insertions, 21 deletions

diff --git a/drivers/scsi/bfa/include/bfi/bfi_iocfc.h b/drivers/scsi/bfa/include/bfi/bfi_iocfc.h
index c3760df72575..ccdfcc5d7e0b 100644
--- a/drivers/scsi/bfa/include/bfi/bfi_iocfc.h
+++ b/drivers/scsi/bfa/include/bfi/bfi_iocfc.h
@@ -19,6 +19,7 @@
 #define __BFI_IOCFC_H__
 
 #include "bfi.h"
+#include <bfi/bfi_pbc.h>
 #include <defs/bfa_defs_ioc.h>
 #include <defs/bfa_defs_iocfc.h>
 #include <defs/bfa_defs_boot.h>
@@ -78,6 +79,7 @@ struct bfi_iocfc_cfgrsp_s {
         struct bfa_iocfc_fwcfg_s        fwcfg;
         struct bfa_iocfc_intr_attr_s    intr_attr;
         struct bfi_iocfc_bootwwns       bootwwns;
+        struct bfi_pbc_s                pbc_cfg;
 };
 
 /**
diff --git a/drivers/scsi/bfa/include/bfi/bfi_pbc.h b/drivers/scsi/bfa/include/bfi/bfi_pbc.h
new file mode 100644
index 000000000000..88a4154c30c0
--- /dev/null
+++ b/drivers/scsi/bfa/include/bfi/bfi_pbc.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2005-2010 Brocade Communications Systems, Inc.
+ * All rights reserved
+ * www.brocade.com
+ *
+ * Linux driver for Brocade Fibre Channel Host Bus Adapter.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License (GPL) Version 2 as
+ * published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that 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.
+ */
+
+#ifndef __BFI_PBC_H__
+#define __BFI_PBC_H__
+
+#pragma pack(1)
+
+#define BFI_PBC_MAX_BLUNS       8
+#define BFI_PBC_MAX_VPORTS      16
+
+#define BFI_PBC_PORT_DISABLED    2
+/**
+ * PBC boot lun configuration
+ */
+struct bfi_pbc_blun_s {
+        wwn_t           tgt_pwwn;
+        lun_t           tgt_lun;
+};
+
+/**
+ * PBC virtual port configuration
+ */
+struct bfi_pbc_vport_s {
+        wwn_t           vp_pwwn;
+        wwn_t           vp_nwwn;
+};
+
+/**
+ * BFI pre-boot configuration information
+ */
+struct bfi_pbc_s {
+        u8              port_enabled;
+        u8              boot_enabled;
+        u8              nbluns;
+        u8              nvports;
+        u8              port_speed;
+        u8              rsvd_a;
+        u16             hss;
+        wwn_t           pbc_pwwn;
+        wwn_t           pbc_nwwn;
+        struct bfi_pbc_blun_s blun[BFI_PBC_MAX_BLUNS];
+        struct bfi_pbc_vport_s vport[BFI_PBC_MAX_VPORTS];
+};
+
+#pragma pack()
+
+#endif /* __BFI_PBC_H__ */
diff --git a/drivers/scsi/bfa/include/defs/bfa_defs_adapter.h b/drivers/scsi/bfa/include/defs/bfa_defs_adapter.h
index 8c208fc8e329..aea0360d67d5 100644
--- a/drivers/scsi/bfa/include/defs/bfa_defs_adapter.h
+++ b/drivers/scsi/bfa/include/defs/bfa_defs_adapter.h
@@ -39,7 +39,7 @@ enum {
 struct bfa_adapter_attr_s {
         char            manufacturer[BFA_ADAPTER_MFG_NAME_LEN];
         char            serial_num[BFA_ADAPTER_SERIAL_NUM_LEN];
-        u32     rsvd1;
+        u32             card_type;
         char            model[BFA_ADAPTER_MODEL_NAME_LEN];
         char            model_descr[BFA_ADAPTER_MODEL_DESCR_LEN];
         wwn_t           pwwn;
@@ -60,6 +60,7 @@ struct bfa_adapter_attr_s {
         u8         pcie_lanes_orig;
         u8         pcie_lanes;
         u8              cna_capable;
+        u8         is_mezz;
 };
 
 /**
diff --git a/drivers/scsi/bfa/include/defs/bfa_defs_boot.h b/drivers/scsi/bfa/include/defs/bfa_defs_boot.h
index 6f4aa5283545..0fca10b6ad10 100644
--- a/drivers/scsi/bfa/include/defs/bfa_defs_boot.h
+++ b/drivers/scsi/bfa/include/defs/bfa_defs_boot.h
@@ -24,6 +24,8 @@
 
 enum {
         BFA_BOOT_BOOTLUN_MAX = 4,       /*  maximum boot lun per IOC */
+        BFA_PREBOOT_BOOTLUN_MAX = 8,    /*  maximum preboot lun per IOC */
+
 };
 
 #define BOOT_CFG_REV1   1
@@ -67,5 +69,13 @@ struct bfa_boot_cfg_s {
         struct bfa_boot_bootlun_s blun_disc[BFA_BOOT_BOOTLUN_MAX];
 };
 
+struct bfa_boot_pbc_s {
+        u8         enable;         /* enable/disable SAN boot */
+        u8         speed;          /* boot speed settings */
+        u8         topology;       /* boot topology setting */
+        u8         rsvd1;
+        u32        nbluns;         /* number of boot luns */
+        struct bfa_boot_bootlun_s pblun[BFA_PREBOOT_BOOTLUN_MAX];
+};
 
 #endif /* __BFA_DEFS_BOOT_H__ */
diff --git a/drivers/scsi/bfa/include/defs/bfa_defs_mfg.h b/drivers/scsi/bfa/include/defs/bfa_defs_mfg.h
index bfb50eb2124d..d22fb7909643 100644
--- a/drivers/scsi/bfa/include/defs/bfa_defs_mfg.h
+++ b/drivers/scsi/bfa/include/defs/bfa_defs_mfg.h
@@ -45,26 +45,6 @@
 #define BFA_MFG_CHKSUM_SIZE                     16
 
 /**
- * Manufacturing block encrypted version
- */
-#define BFA_MFG_ENC_VER                         2
-
-/**
- * Manufacturing block version 1 length
- */
-#define BFA_MFG_VER1_LEN                        128
-
-/**
- * Manufacturing block header length
- */
-#define BFA_MFG_HDR_LEN                         4
-
-/**
- * Checksum size
- */
-#define BFA_MFG_CHKSUM_SIZE                     16
-
-/**
  * Manufacturing block format
  */
 #define BFA_MFG_SERIALNUM_SIZE                  11
@@ -98,6 +78,24 @@ enum {
  */
 #define bfa_mfg_type2port_num(card_type) (((card_type) / 10) % 10)
 
+/**
+ * Check if Mezz card
+ */
+#define bfa_mfg_is_mezz(type) (( \
+        (type) == BFA_MFG_TYPE_JAYHAWK || \
+        (type) == BFA_MFG_TYPE_WANCHESE))
+
+/**
+ * Check if card type valid
+ */
+#define bfa_mfg_is_card_type_valid(type) (( \
+        (type) == BFA_MFG_TYPE_FC8P2 || \
+        (type) == BFA_MFG_TYPE_FC8P1 || \
+        (type) == BFA_MFG_TYPE_FC4P2 || \
+        (type) == BFA_MFG_TYPE_FC4P1 || \
+        (type) == BFA_MFG_TYPE_CNA10P2 || \
+        (type) == BFA_MFG_TYPE_CNA10P1 || \
+        bfa_mfg_is_mezz(type)))
 
 /**
  * All numerical fields are in big-endian format.
diff --git a/drivers/scsi/bfa/include/defs/bfa_defs_pport.h b/drivers/scsi/bfa/include/defs/bfa_defs_pport.h
index 26e5cc78095d..de6181cf9677 100644
--- a/drivers/scsi/bfa/include/defs/bfa_defs_pport.h
+++ b/drivers/scsi/bfa/include/defs/bfa_defs_pport.h
@@ -38,6 +38,7 @@ enum bfa_pport_states {
         BFA_PPORT_ST_IOCDOWN            = 10,
         BFA_PPORT_ST_IOCDIS             = 11,
         BFA_PPORT_ST_FWMISMATCH         = 12,
+        BFA_PPORT_ST_PREBOOT_DISABLED   = 13,
         BFA_PPORT_ST_MAX_STATE,
 };
 
@@ -203,6 +204,8 @@ struct bfa_pport_attr_s {
          */
         wwn_t           nwwn;           /*  node wwn */
         wwn_t           pwwn;           /*  port wwn */
+        wwn_t           factorynwwn;    /*  factory node wwn */
+        wwn_t           factorypwwn;    /*  factory port wwn */
         enum fc_cos     cos_supported;  /*  supported class of services */
         u32        rsvd;
         struct fc_symname_s    port_symname;    /*  port symbolic name */