mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-15 10:17:20 +00:00
Code Issues Releases Activity

Remove concept of control device.

Browse Source
This commit is contained in:
Alexander Motin 2015-09-26 12:53:55 +00:00
parent 6bff2b5bff
commit 0b33261bbe
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=288262
1 changed files with 24 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
sys/cam/ctl/ctl.c
View File

@ -3819,14 +3819,8 @@ ctl_init_page_index(struct ctl_lun *lun)
for (i = 0; i < CTL_NUM_MODE_PAGES; i++) {
page_index = &lun->mode_pages.index[i];
/*
* If this is a disk-only mode page, there's no point in
* setting it up. For some pages, we have to have some
* basic information about the disk in order to calculate the
* mode page data.
*/
if ((lun->be_lun->lun_type != T_DIRECT)
&& (page_index->page_flags & CTL_PAGE_FLAG_DISK_ONLY))
if (lun->be_lun->lun_type != T_DIRECT &&
(page_index->page_flags & CTL_PAGE_FLAG_DISK_ONLY))
continue;
switch (page_index->page_code & SMPH_PC_MASK) {
@ -4211,18 +4205,12 @@ ctl_init_log_page_index(struct ctl_lun *lun)
for (i = 0, j = 0, k = 0; i < CTL_NUM_LOG_PAGES; i++) {
page_index = &lun->log_pages.index[i];
/*
* If this is a disk-only mode page, there's no point in
* setting it up. For some pages, we have to have some
* basic information about the disk in order to calculate the
* mode page data.
*/
if ((lun->be_lun->lun_type != T_DIRECT)
&& (page_index->page_flags & CTL_PAGE_FLAG_DISK_ONLY))
if (lun->be_lun->lun_type != T_DIRECT &&
(page_index->page_flags & CTL_PAGE_FLAG_DISK_ONLY))
continue;
if (page_index->page_code == SLS_LOGICAL_BLOCK_PROVISIONING &&
lun->backend->lun_attr == NULL)
lun->backend->lun_attr == NULL)
continue;
if (page_index->page_code != prev) {
@ -4494,9 +4482,8 @@ ctl_alloc_lun(struct ctl_softc *ctl_softc, struct ctl_lun *ctl_lun,
/* Setup statistics gathering */
lun->stats.device_type = be_lun->lun_type;
lun->stats.lun_number = lun_number;
if (lun->stats.device_type == T_DIRECT)
lun->stats.blocksize = be_lun->blocksize;
else
lun->stats.blocksize = be_lun->blocksize;
if (be_lun->blocksize == 0)
lun->stats.flags = CTL_LUN_STATS_NO_BLOCKSIZE;
for (i = 0;i < CTL_MAX_PORTS;i++)
lun->stats.ports[i].targ_port = i;
@ -5899,8 +5886,7 @@ ctl_do_mode_select(union ctl_io *io)
struct scsi_mode_page_header *page_header;
struct ctl_page_index *page_index;
struct ctl_scsiio *ctsio;
int control_dev, page_len;
int page_len_offset, page_len_size;
int page_len, page_len_offset, page_len_size;
union ctl_modepage_info *modepage_info;
struct ctl_lun *lun;
int *len_left, *len_used;
@ -5911,11 +5897,6 @@ ctl_do_mode_select(union ctl_io *io)
page_len = 0;
lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
if (lun->be_lun->lun_type != T_DIRECT)
control_dev = 1;
else
control_dev = 0;
modepage_info = (union ctl_modepage_info *)
ctsio->io_hdr.ctl_private[CTL_PRIV_MODEPAGE].bytes;
len_left = &modepage_info->header.len_left;
@ -5953,8 +5934,8 @@ ctl_do_mode_select(union ctl_io *io)
*/
for (i = 0; i < CTL_NUM_MODE_PAGES; i++) {
if ((control_dev != 0)
&& (lun->mode_pages.index[i].page_flags &
if (lun->be_lun->lun_type != T_DIRECT &&
(lun->mode_pages.index[i].page_flags &
CTL_PAGE_FLAG_DISK_ONLY))
continue;
@ -6251,7 +6232,6 @@ ctl_mode_sense(struct ctl_scsiio *ctsio)
int alloc_len, page_len, header_len, total_len;
struct scsi_mode_block_descr *block_desc;
struct ctl_page_index *page_index;
int control_dev;
dbd = 0;
llba = 0;
@ -6261,12 +6241,6 @@ ctl_mode_sense(struct ctl_scsiio *ctsio)
CTL_DEBUG_PRINT(("ctl_mode_sense\n"));
lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
if (lun->be_lun->lun_type != T_DIRECT)
control_dev = 1;
else
control_dev = 0;
switch (ctsio->cdb[0]) {
case MODE_SENSE_6: {
struct scsi_mode_sense_6 *cdb;
@ -6339,8 +6313,8 @@ ctl_mode_sense(struct ctl_scsiio *ctsio)
}
for (i = 0; i < CTL_NUM_MODE_PAGES; i++) {
if ((control_dev != 0)
&& (lun->mode_pages.index[i].page_flags &
if (lun->be_lun->lun_type != T_DIRECT &&
(lun->mode_pages.index[i].page_flags &
CTL_PAGE_FLAG_DISK_ONLY))
continue;
@ -6379,8 +6353,8 @@ ctl_mode_sense(struct ctl_scsiio *ctsio)
continue;
/* Make sure the page is supported for this dev type */
if ((control_dev != 0)
&& (lun->mode_pages.index[i].page_flags &
if (lun->be_lun->lun_type != T_DIRECT &&
(lun->mode_pages.index[i].page_flags &
CTL_PAGE_FLAG_DISK_ONLY))
continue;
@ -6435,7 +6409,7 @@ ctl_mode_sense(struct ctl_scsiio *ctsio)
header = (struct scsi_mode_hdr_6 *)ctsio->kern_data_ptr;
header->datalen = MIN(total_len - 1, 254);
if (control_dev == 0) {
if (lun->be_lun->lun_type == T_DIRECT) {
header->dev_specific = 0x10; /* DPOFUA */
if ((lun->be_lun->flags & CTL_LUN_FLAG_READONLY) ||
(lun->mode_pages.control_page[CTL_PAGE_CURRENT]
@ -6458,7 +6432,7 @@ ctl_mode_sense(struct ctl_scsiio *ctsio)
datalen = MIN(total_len - 2, 65533);
scsi_ulto2b(datalen, header->datalen);
if (control_dev == 0) {
if (lun->be_lun->lun_type == T_DIRECT) {
header->dev_specific = 0x10; /* DPOFUA */
if ((lun->be_lun->flags & CTL_LUN_FLAG_READONLY) ||
(lun->mode_pages.control_page[CTL_PAGE_CURRENT]
@ -6483,7 +6457,7 @@ ctl_mode_sense(struct ctl_scsiio *ctsio)
* descriptor. Otherwise, just set it to 0.
*/
if (dbd == 0) {
if (control_dev == 0)
if (lun->be_lun->lun_type == T_DIRECT)
scsi_ulto3b(lun->be_lun->blocksize,
block_desc->block_len);
else
@ -6500,9 +6474,8 @@ ctl_mode_sense(struct ctl_scsiio *ctsio)
page_index = &lun->mode_pages.index[i];
if ((control_dev != 0)
&& (page_index->page_flags &
CTL_PAGE_FLAG_DISK_ONLY))
if (lun->be_lun->lun_type != T_DIRECT &&
(page_index->page_flags & CTL_PAGE_FLAG_DISK_ONLY))
continue;
/*
@ -6550,9 +6523,8 @@ ctl_mode_sense(struct ctl_scsiio *ctsio)
continue;
/* Make sure the page is supported for this dev type */
if ((control_dev != 0)
&& (page_index->page_flags &
CTL_PAGE_FLAG_DISK_ONLY))
if (lun->be_lun->lun_type != T_DIRECT &&
(page_index->page_flags & CTL_PAGE_FLAG_DISK_ONLY))
continue;
/*
@ -10109,23 +10081,13 @@ ctl_inquiry_std(struct ctl_scsiio *ctsio)
inq_ptr->additional_length));
inq_ptr->spc3_flags = SPC3_SID_3PC | SPC3_SID_TPGS_IMPLICIT;
/* 16 bit addressing */
if (port_type == CTL_PORT_SCSI)
inq_ptr->spc2_flags = SPC2_SID_ADDR16;
/* XXX set the SID_MultiP bit here if we're actually going to
respond on multiple ports */
inq_ptr->spc2_flags |= SPC2_SID_MultiP;
/* 16 bit data bus, synchronous transfers */
inq_ptr->flags = SID_CmdQue;
if (port_type == CTL_PORT_SCSI)
inq_ptr->flags = SID_WBus16 | SID_Sync;
/*
* XXX KDM do we want to support tagged queueing on the control
* device at all?
*/
if ((lun == NULL)
|| (lun->be_lun->lun_type != T_PROCESSOR))
inq_ptr->flags |= SID_CmdQue;
inq_ptr->flags |= SID_WBus16 | SID_Sync;
/*
* Per SPC-3, unused bytes in ASCII strings are filled with spaces.
* We have 8 bytes for the vendor name, and 16 bytes for the device