system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-23 10:14:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

dpt.h:

Browse source 
Bump the lun field in the eata ccb to 5 bits.  We still only
	use 3 of them, but we may use the rest at a later date.

dpt_scsi.c:
	Default to only 32 S/G segments.

	Bzero our CCB array after allocation.
This commit is contained in:
Justin T. Gibbs 1998-09-22 04:55:07 +00:00
parent 53b062d3cc
commit 02f822dd7d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=39553
2 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sys/dev/dpt/dpt.h
View file

@ -40,7 +40,7 @@
*/
#ident "$Id: dpt.h,v 1.2 1998/09/15 08:33:31 gibbs Exp $"
#ident "$Id: dpt.h,v 1.3 1998/09/20 07:19:52 gibbs Exp $"
#ifndef _DPT_H
#define _DPT_H
@ -191,9 +191,6 @@ typedef void *physaddr;
#define MAX_METHOD_2 16 /* Max Devices For Method 2 */
#define MAX_PCI_BUS 16 /* Maximum # Of Busses Allowed */
#define SG_SIZE 64
#define SG_SIZE_BIG 252 /* max. 8096 elements, 64k */
#define DPT_MAX_RETRIES 2
#define READ 0
@ -618,8 +615,7 @@ typedef struct eata_ccb {
u_int8_t cp_id :5, /* SCSI Device ID of target */
cp_channel :3; /* SCSI Channel # of HBA */
u_int8_t cp_LUN :3,
:2,
u_int8_t cp_LUN :5,
cp_luntar :1, /* CP is for target ROUTINE */
cp_dispri :1, /* Grant disconnect privilege */
cp_identify :1; /* Always TRUE */

26
sys/dev/dpt/dpt_scsi.c
View file

@ -43,7 +43,7 @@
* arrays that span controllers (Wow!).
*/
#ident "$Id: dpt_scsi.c,v 1.14 1998/09/15 22:05:40 gibbs Exp $"
#ident "$Id: dpt_scsi.c,v 1.15 1998/09/20 07:19:53 gibbs Exp $"
#define _DPT_C_
@ -357,11 +357,10 @@ dptallocccbs(dpt_softc_t *dpt)
htonl(dptccbvtop(dpt, next_ccb)
+ offsetof(struct dpt_ccb, sense_data));
next_ccb->eata_ccb.cp_busaddr = dpt->dpt_ccb_busend;
next_ccb->state = DCCB_FREE;
next_ccb->tag = dpt->total_dccbs;
SLIST_INSERT_HEAD(&dpt->free_dccb_list, next_ccb, links);
segs += dpt->sgsize;;
segs += dpt->sgsize;
physaddr += (dpt->sgsize * sizeof(dpt_sg_t));
dpt->dpt_ccb_busend += sizeof(*next_ccb);
next_ccb++;
@ -758,7 +757,7 @@ dpt_action(struct cam_sim *sim, union ccb *ccb)
/*
* Explicitly set all flags so that the compiler can
* be smart about setting our bit flags.
* be smart about setting them.
*/
eccb->SCSI_Reset = 0;
eccb->HBA_Init = 0;
@ -1271,15 +1270,14 @@ dpt_init(struct dpt_softc *dpt)
dpt->hostid[1] = conf.scsi_id1;
dpt->hostid[2] = conf.scsi_id2;
if (conf.SG_64K) {
dpt->sgsize = SG_SIZE_BIG;
} else if ((ntohs(conf.SGsiz) < 1)
|| (ntohs(conf.SGsiz) > SG_SIZE)) {
/* Just a sanity check */
dpt->sgsize = SG_SIZE;
} else {
if (conf.SG_64K)
dpt->sgsize = 8192;
else
dpt->sgsize = ntohs(conf.SGsiz);
}
/* We can only get 64k buffers, so don't bother to waste space. */
if (dpt->sgsize < 17 || dpt->sgsize > 32)
dpt->sgsize = 32;
if (dpt->sgsize > dpt_max_segs)
dpt->sgsize = dpt_max_segs;
@ -1328,6 +1326,10 @@ dpt_init(struct dpt_softc *dpt)
+ sizeof(dpt_sp_t),
dptmapmem, &dpt->dpt_ccb_busbase, /*flags*/0);
/* Clear them out. */
bzero(dpt->dpt_dccbs,
(dpt->max_dccbs * sizeof(struct dpt_ccb)) + sizeof(dpt_sp_t));
dpt->dpt_ccb_busend = dpt->dpt_ccb_busbase;
dpt->sp = (dpt_sp_t*)&dpt->dpt_dccbs[dpt->max_dccbs];