From owner-svn-src-head@freebsd.org Sun Mar 1 17:27:37 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5494E2468CE; Sun, 1 Mar 2020 17:27:37 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48VqwS6dcZz4cJl; Sun, 1 Mar 2020 17:27:36 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 15F136FDF; Sun, 1 Mar 2020 17:27:36 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 021HRZ29076739; Sun, 1 Mar 2020 17:27:35 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 021HRZex076736; Sun, 1 Mar 2020 17:27:35 GMT (envelope-from imp@FreeBSD.org) Message-Id: <202003011727.021HRZex076736@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sun, 1 Mar 2020 17:27:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r358487 - head/sys/dev/isci X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/sys/dev/isci X-SVN-Commit-Revision: 358487 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Mar 2020 17:27:37 -0000 Author: imp Date: Sun Mar 1 17:27:35 2020 New Revision: 358487 URL: https://svnweb.freebsd.org/changeset/base/358487 Log: Remove support for FreeBSD 8 systems. These workarounds and ways of rescanning devices are no longer done. Modified: head/sys/dev/isci/isci.h head/sys/dev/isci/isci_controller.c head/sys/dev/isci/isci_io_request.c Modified: head/sys/dev/isci/isci.h ============================================================================== --- head/sys/dev/isci/isci.h Sun Mar 1 17:27:30 2020 (r358486) +++ head/sys/dev/isci/isci.h Sun Mar 1 17:27:35 2020 (r358487) @@ -303,10 +303,8 @@ void isci_request_construct(struct ISCI_REQUEST *reque void isci_io_request_execute_scsi_io(union ccb *ccb, struct ISCI_CONTROLLER *controller); -#if __FreeBSD_version >= 900026 void isci_io_request_execute_smp_io( union ccb *ccb, struct ISCI_CONTROLLER *controller); -#endif void isci_io_request_timeout(void *); Modified: head/sys/dev/isci/isci_controller.c ============================================================================== --- head/sys/dev/isci/isci_controller.c Sun Mar 1 17:27:30 2020 (r358486) +++ head/sys/dev/isci/isci_controller.c Sun Mar 1 17:27:35 2020 (r358487) @@ -583,21 +583,6 @@ void isci_controller_domain_discovery_complete( /* Unfreeze simq to allow initial scan to proceed. */ xpt_release_simq(isci_controller->sim, TRUE); -#if __FreeBSD_version < 800000 - /* When driver is loaded after boot, we need to - * explicitly rescan here for versions <8.0, because - * CAM only automatically scans new buses at boot - * time. - */ - union ccb *ccb = xpt_alloc_ccb_nowait(); - - xpt_create_path(&ccb->ccb_h.path, NULL, - cam_sim_path(isci_controller->sim), - CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD); - - xpt_rescan(ccb); -#endif - if (next_index < driver->controller_count) { /* There are more controllers that need to * start. So start the next one. @@ -689,9 +674,7 @@ void isci_action(struct cam_sim *sim, union ccb *ccb) cpi->hba_eng_cnt = 0; cpi->max_target = SCI_MAX_REMOTE_DEVICES - 1; cpi->max_lun = ISCI_MAX_LUN; -#if __FreeBSD_version >= 800102 cpi->maxio = isci_io_request_get_max_io_size(); -#endif cpi->unit_number = cam_sim_unit(sim); cpi->bus_id = bus; cpi->initiator_id = SCI_MAX_REMOTE_DEVICES; @@ -752,11 +735,9 @@ void isci_action(struct cam_sim *sim, union ccb *ccb) } isci_io_request_execute_scsi_io(ccb, controller); break; -#if __FreeBSD_version >= 900026 case XPT_SMP_IO: isci_io_request_execute_smp_io(ccb, controller); break; -#endif case XPT_SET_TRAN_SETTINGS: ccb->ccb_h.status &= ~CAM_STATUS_MASK; ccb->ccb_h.status |= CAM_REQ_CMP; Modified: head/sys/dev/isci/isci_io_request.c ============================================================================== --- head/sys/dev/isci/isci_io_request.c Sun Mar 1 17:27:30 2020 (r358486) +++ head/sys/dev/isci/isci_io_request.c Sun Mar 1 17:27:35 2020 (r358487) @@ -102,7 +102,6 @@ isci_io_request_complete(SCI_CONTROLLER_HANDLE_T scif_ switch (completion_status) { case SCI_IO_SUCCESS: case SCI_IO_SUCCESS_COMPLETE_BEFORE_START: -#if __FreeBSD_version >= 900026 if (ccb->ccb_h.func_code == XPT_SMP_IO) { void *smp_response = scif_io_request_get_response_iu_address( @@ -111,7 +110,6 @@ isci_io_request_complete(SCI_CONTROLLER_HANDLE_T scif_ memcpy(ccb->smpio.smp_response, smp_response, ccb->smpio.smp_response_len); } -#endif ccb->ccb_h.status |= CAM_REQ_CMP; break; @@ -802,7 +800,6 @@ isci_io_request_timeout(void *arg) mtx_unlock(&controller->lock); } -#if __FreeBSD_version >= 900026 /** * @brief This callback method gets the size of and pointer to the buffer * (if any) containing the request buffer for an SMP request. @@ -990,4 +987,3 @@ isci_io_request_execute_smp_io(union ccb *ccb, SBT_1MS * ccb->ccb_h.timeout, 0, isci_io_request_timeout, request, 0); } -#endif