[SCSI] bfa: ioc attributes fix

This patch fixes the APIs to obtain ioc attributes
- fix API to obtain wwpn, wwnn, and mac.
- add API to get mfg wwpn, wwnn, and mac.
- fix API to obtain wwn of boot target.

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

1 files changed, 14 insertions, 4 deletions

diff --git a/drivers/scsi/bfa/bfa_iocfc.c b/drivers/scsi/bfa/bfa_iocfc.c
index d3f1052744d3..6f54bea356c6 100644
--- a/drivers/scsi/bfa/bfa_iocfc.c
+++ b/drivers/scsi/bfa/bfa_iocfc.c
@@ -861,13 +861,23 @@ bfa_iocfc_is_operational(struct bfa_s *bfa)
  * Return boot target port wwns -- read from boot information in flash.
  */
 void
-bfa_iocfc_get_bootwwns(struct bfa_s *bfa, u8 *nwwns, wwn_t **wwns)
+bfa_iocfc_get_bootwwns(struct bfa_s *bfa, u8 *nwwns, wwn_t *wwns)
 {
-        struct bfa_iocfc_s              *iocfc   = &bfa->iocfc;
-        struct bfi_iocfc_cfgrsp_s       *cfgrsp  = iocfc->cfgrsp;
+        struct bfa_iocfc_s *iocfc = &bfa->iocfc;
+        struct bfi_iocfc_cfgrsp_s *cfgrsp = iocfc->cfgrsp;
+        int i;
+
+        if (cfgrsp->pbc_cfg.boot_enabled && cfgrsp->pbc_cfg.nbluns) {
+                bfa_trc(bfa, cfgrsp->pbc_cfg.nbluns);
+                *nwwns = cfgrsp->pbc_cfg.nbluns;
+                for (i = 0; i < cfgrsp->pbc_cfg.nbluns; i++)
+                        wwns[i] = cfgrsp->pbc_cfg.blun[i].tgt_pwwn;
+
+                return;
+        }
 
         *nwwns = cfgrsp->bootwwns.nwwns;
-        *wwns = cfgrsp->bootwwns.wwn;
+        memcpy(wwns, cfgrsp->bootwwns.wwn, sizeof(cfgrsp->bootwwns.wwn));
 }
 
 void