From d912d3cbcdeff64dcbe903aba63c6afcc90d8276 Mon Sep 17 00:00:00 2001 From: mav Date: Mon, 30 Nov 2015 21:46:21 +0000 Subject: [PATCH] MFC r291162: Generate fake ISPASYNC_CHANGE_PDB on fake login on pre-24xx. This makes port scanner fix absent port ID for added initiator. git-svn-id: svn://svn.freebsd.org/base/stable/10@291522 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sys/dev/isp/isp_freebsd.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sys/dev/isp/isp_freebsd.c b/sys/dev/isp/isp_freebsd.c index f7efbed34..4745ff577 100644 --- a/sys/dev/isp/isp_freebsd.c +++ b/sys/dev/isp/isp_freebsd.c @@ -2354,6 +2354,7 @@ isp_handle_platform_atio(ispsoftc_t *isp, at_entry_t *aep) static void isp_handle_platform_atio2(ispsoftc_t *isp, at2_entry_t *aep) { + fcparam *fcp; lun_id_t lun; fcportdb_t *lp; tstate_t *tptr; @@ -2374,6 +2375,7 @@ isp_handle_platform_atio2(ispsoftc_t *isp, at2_entry_t *aep) return; } + fcp = FCPARAM(isp, 0); if (ISP_CAP_SCCFW(isp)) { lun = aep->at_scclun; #if __FreeBSD_version < 1000700 @@ -2444,7 +2446,7 @@ isp_handle_platform_atio2(ispsoftc_t *isp, at2_entry_t *aep) SLIST_REMOVE_HEAD(&tptr->atios, sim_links.sle); tptr->atio_count--; isp_prt(isp, ISP_LOGTDEBUG2, "Take FREE ATIO count now %d", tptr->atio_count); - atiop->ccb_h.target_id = FCPARAM(isp, 0)->isp_loopid; + atiop->ccb_h.target_id = fcp->isp_loopid; atiop->ccb_h.target_lun = lun; /* @@ -2467,6 +2469,10 @@ isp_handle_platform_atio2(ispsoftc_t *isp, at2_entry_t *aep) (((uint64_t) aep->at_wwpn[3]) << 0); isp_add_wwn_entry(isp, 0, wwpn, INI_NONE, nphdl, PORT_ANY, 0); + if (fcp->isp_loopstate > LOOP_LTEST_DONE) + fcp->isp_loopstate = LOOP_LTEST_DONE; + isp_async(isp, ISPASYNC_CHANGE_NOTIFY, 0, + ISPASYNC_CHANGE_PDB, nphdl, 0x06, 0xff); isp_find_pdb_by_handle(isp, 0, nphdl, &lp); } atiop->init_id = FC_PORTDB_TGT(isp, 0, lp); -- 2.45.0