summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/dev/isp/isp.c21
-rw-r--r--sys/dev/isp/isp_freebsd.h2
-rw-r--r--sys/dev/isp/ispmbox.h9
-rw-r--r--sys/dev/isp/ispreg.h2
-rw-r--r--sys/dev/isp/ispvar.h3
5 files changed, 4 insertions, 33 deletions
diff --git a/sys/dev/isp/isp.c b/sys/dev/isp/isp.c
index e551baaf61cfe..cebd81a49d69a 100644
--- a/sys/dev/isp/isp.c
+++ b/sys/dev/isp/isp.c
@@ -737,11 +737,8 @@ isp_init(ispsoftc_t *isp)
icbp->icb_maxfrmlen = ICB_DFLT_FRMLEN;
}
- icbp->icb_execthrottle = DEFAULT_EXEC_THROTTLE(isp);
- if (icbp->icb_execthrottle < 1 && !IS_26XX(isp)) {
- isp_prt(isp, ISP_LOGERR, "bad execution throttle of %d- using %d", DEFAULT_EXEC_THROTTLE(isp), ICB_DFLT_THROTTLE);
- icbp->icb_execthrottle = ICB_DFLT_THROTTLE;
- }
+ if (!IS_26XX(isp))
+ icbp->icb_execthrottle = 0xffff;
/*
* Set target exchange count. Take half if we are supporting both roles.
@@ -4425,7 +4422,6 @@ isp_setdfltfcparm(ispsoftc_t *isp, int chan)
* Establish some default parameters.
*/
fcp->role = DEFAULT_ROLE(isp, chan);
- fcp->isp_maxalloc = ICB_DFLT_ALLOC;
fcp->isp_retry_delay = ICB_DFLT_RDELAY;
fcp->isp_retry_count = ICB_DFLT_RCOUNT;
fcp->isp_loopid = DEFAULT_LOOPID(isp, chan);
@@ -4594,16 +4590,14 @@ isp_parse_nvram_2400(ispsoftc_t *isp, uint8_t *nvram_data)
uint64_t wwn;
isp_prt(isp, ISP_LOGDEBUG0,
- "NVRAM 0x%08x%08x 0x%08x%08x exchg_cnt %d maxframelen %d",
+ "NVRAM 0x%08x%08x 0x%08x%08x maxframelen %d",
(uint32_t) (ISP2400_NVRAM_NODE_NAME(nvram_data) >> 32),
(uint32_t) (ISP2400_NVRAM_NODE_NAME(nvram_data)),
(uint32_t) (ISP2400_NVRAM_PORT_NAME(nvram_data) >> 32),
(uint32_t) (ISP2400_NVRAM_PORT_NAME(nvram_data)),
- ISP2400_NVRAM_EXCHANGE_COUNT(nvram_data),
ISP2400_NVRAM_MAXFRAMELENGTH(nvram_data));
isp_prt(isp, ISP_LOGDEBUG0,
- "NVRAM execthr %d loopid %d fwopt1 0x%x fwopt2 0x%x fwopt3 0x%x",
- ISP2400_NVRAM_EXECUTION_THROTTLE(nvram_data),
+ "NVRAM loopid %d fwopt1 0x%x fwopt2 0x%x fwopt3 0x%x",
ISP2400_NVRAM_HARDLOOPID(nvram_data),
ISP2400_NVRAM_FIRMWARE_OPTIONS1(nvram_data),
ISP2400_NVRAM_FIRMWARE_OPTIONS2(nvram_data),
@@ -4624,9 +4618,6 @@ isp_parse_nvram_2400(ispsoftc_t *isp, uint8_t *nvram_data)
}
fcp->isp_wwnn_nvram = wwn;
- if (ISP2400_NVRAM_EXCHANGE_COUNT(nvram_data)) {
- fcp->isp_maxalloc = ISP2400_NVRAM_EXCHANGE_COUNT(nvram_data);
- }
if ((isp->isp_confopts & ISP_CFG_OWNFSZ) == 0) {
DEFAULT_FRAMESIZE(isp) =
ISP2400_NVRAM_MAXFRAMELENGTH(nvram_data);
@@ -4634,10 +4625,6 @@ isp_parse_nvram_2400(ispsoftc_t *isp, uint8_t *nvram_data)
if ((isp->isp_confopts & ISP_CFG_OWNLOOPID) == 0) {
fcp->isp_loopid = ISP2400_NVRAM_HARDLOOPID(nvram_data);
}
- if ((isp->isp_confopts & ISP_CFG_OWNEXCTHROTTLE) == 0) {
- DEFAULT_EXEC_THROTTLE(isp) =
- ISP2400_NVRAM_EXECUTION_THROTTLE(nvram_data);
- }
fcp->isp_fwoptions = ISP2400_NVRAM_FIRMWARE_OPTIONS1(nvram_data);
fcp->isp_xfwoptions = ISP2400_NVRAM_FIRMWARE_OPTIONS2(nvram_data);
fcp->isp_zfwoptions = ISP2400_NVRAM_FIRMWARE_OPTIONS3(nvram_data);
diff --git a/sys/dev/isp/isp_freebsd.h b/sys/dev/isp/isp_freebsd.h
index 2ea4882ca65e1..ed4d95cecbfd7 100644
--- a/sys/dev/isp/isp_freebsd.h
+++ b/sys/dev/isp/isp_freebsd.h
@@ -280,7 +280,6 @@ struct isposinfo {
* misc- needs to be sorted better XXXXXX
*/
int framesize;
- int exec_throttle;
int cont_max;
#ifdef ISP_TARGET_MODE
@@ -545,7 +544,6 @@ default: \
#define XS_SENSE_VALID(xs) (((xs)->ccb_h.status & CAM_AUTOSNS_VALID) != 0)
#define DEFAULT_FRAMESIZE(isp) isp->isp_osinfo.framesize
-#define DEFAULT_EXEC_THROTTLE(isp) isp->isp_osinfo.exec_throttle
#define DEFAULT_ROLE(isp, chan) ISP_FC_PC(isp, chan)->def_role
diff --git a/sys/dev/isp/ispmbox.h b/sys/dev/isp/ispmbox.h
index 7d07fc7fc8340..86ef445d15e31 100644
--- a/sys/dev/isp/ispmbox.h
+++ b/sys/dev/isp/ispmbox.h
@@ -653,13 +653,6 @@ typedef struct {
#define RQSTF_LOGOUT 0x2000
/*
- * Miscellaneous
- */
-#ifndef ISP_EXEC_THROTTLE
-#define ISP_EXEC_THROTTLE 16
-#endif
-
-/*
* About Firmware returns an 'attribute' word.
*/
#define ISP2400_FW_ATTR_CLASS2 0x0001
@@ -769,8 +762,6 @@ typedef struct {
#define ICB_MIN_FRMLEN 256
#define ICB_MAX_FRMLEN 2112
#define ICB_DFLT_FRMLEN 1024
-#define ICB_DFLT_ALLOC 256
-#define ICB_DFLT_THROTTLE 16
#define ICB_DFLT_RDELAY 5
#define ICB_DFLT_RCOUNT 3
diff --git a/sys/dev/isp/ispreg.h b/sys/dev/isp/ispreg.h
index 556626e3bafb9..5d04ad2b44004 100644
--- a/sys/dev/isp/ispreg.h
+++ b/sys/dev/isp/ispreg.h
@@ -219,8 +219,6 @@ typedef struct {
#define ISP2400_NVRAM_VERSION(c) ((c)[4] | ((c)[5] << 8))
#define ISP2400_NVRAM_MAXFRAMELENGTH(c) (((c)[12]) | ((c)[13] << 8))
-#define ISP2400_NVRAM_EXECUTION_THROTTLE(c) (((c)[14]) | ((c)[15] << 8))
-#define ISP2400_NVRAM_EXCHANGE_COUNT(c) (((c)[16]) | ((c)[17] << 8))
#define ISP2400_NVRAM_HARDLOOPID(c) ((c)[18] | ((c)[19] << 8))
#define ISP2400_NVRAM_PORT_NAME(c) (\
diff --git a/sys/dev/isp/ispvar.h b/sys/dev/isp/ispvar.h
index a9f90266fb04a..dbf4a67c64452 100644
--- a/sys/dev/isp/ispvar.h
+++ b/sys/dev/isp/ispvar.h
@@ -359,7 +359,6 @@ typedef struct {
uint16_t isp_loopid; /* hard loop id */
uint16_t isp_sns_hdl; /* N-port handle for SNS */
uint16_t isp_lasthdl; /* only valid for channel 0 */
- uint16_t isp_maxalloc;
uint16_t isp_fabric_params;
uint16_t isp_login_hdl; /* Logging in handle */
uint8_t isp_retry_delay;
@@ -541,7 +540,6 @@ struct ispsoftc {
#define ISP_CFG_FCTAPE 0x200 /* enable FC-Tape */
#define ISP_CFG_OWNFSZ 0x400 /* override NVRAM frame size */
#define ISP_CFG_OWNLOOPID 0x800 /* override NVRAM loopid */
-#define ISP_CFG_OWNEXCTHROTTLE 0x1000 /* override NVRAM execution throttle */
#define ISP_CFG_4GB 0x2000 /* force 4Gb connection (24XX only) */
#define ISP_CFG_8GB 0x4000 /* force 8Gb connection (25XX only) */
#define ISP_CFG_16GB 0x8000 /* force 16Gb connection (26XX only) */
@@ -893,7 +891,6 @@ void isp_async(ispsoftc_t *, ispasync_t, ...);
* XS_SENSE_VALID(xs) indicates whether sense is valid
*
* DEFAULT_FRAMESIZE(ispsoftc_t *) Default Frame Size
- * DEFAULT_EXEC_THROTTLE(ispsoftc_t *) Default Execution Throttle
*
* DEFAULT_ROLE(ispsoftc_t *, int) Get Default Role for a channel
* DEFAULT_LOOPID(ispsoftc_t *, int) Default FC Loop ID
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-02 08:25:27 +0000