Skip to content

Commit 211134c

Browse files
bvanasschemartinkpetersen
bvanassche
authored and
martinkpetersen
committed
scsi: fdomain: Move the SCSI pointer to private command data
Set .cmd_size in the SCSI host template instead of using the SCSI pointer from struct scsi_cmnd. This patch prepares for removal of the SCSI pointer from struct scsi_cmnd. Link: https://lore.kernel.org/r/20220218195117.25689-21-bvanassche@acm.org Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com> Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com> Reviewed-by: Hannes Reinecke <hare@suse.de> Signed-off-by: Bart Van Assche <bvanassche@acm.org> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent dfae398 commit 211134c

File tree

1 file changed

+36
-28
lines changed

1 file changed

+36
-28
lines changed

‎drivers/scsi/fdomain.c‎

Lines changed: 36 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,11 @@ struct fdomain {
115115
struct work_struct work;
116116
};
117117

118+
static struct scsi_pointer *fdomain_scsi_pointer(struct scsi_cmnd *cmd)
119+
{
120+
return scsi_cmd_priv(cmd);
121+
}
122+
118123
static inline void fdomain_make_bus_idle(struct fdomain *fd)
119124
{
120125
outb(0, fd->base + REG_BCTL);
@@ -263,20 +268,21 @@ static void fdomain_work(struct work_struct *work)
263268
struct Scsi_Host *sh = container_of((void *)fd, struct Scsi_Host,
264269
hostdata);
265270
struct scsi_cmnd *cmd = fd->cur_cmd;
271+
struct scsi_pointer *scsi_pointer = fdomain_scsi_pointer(cmd);
266272
unsigned long flags;
267273
int status;
268274
int done = 0;
269275

270276
spin_lock_irqsave(sh->host_lock, flags);
271277

272-
if (cmd->SCp.phase & in_arbitration) {
278+
if (scsi_pointer->phase & in_arbitration) {
273279
status = inb(fd->base + REG_ASTAT);
274280
if (!(status & ASTAT_ARB)) {
275281
set_host_byte(cmd, DID_BUS_BUSY);
276282
fdomain_finish_cmd(fd);
277283
goto out;
278284
}
279-
cmd->SCp.phase = in_selection;
285+
scsi_pointer->phase = in_selection;
280286

281287
outb(ICTL_SEL | FIFO_COUNT, fd->base + REG_ICTL);
282288
outb(BCTL_BUSEN | BCTL_SEL, fd->base + REG_BCTL);
@@ -285,7 +291,7 @@ static void fdomain_work(struct work_struct *work)
285291
/* Stop arbitration and enable parity */
286292
outb(ACTL_IRQEN | PARITY_MASK, fd->base + REG_ACTL);
287293
goto out;
288-
} else if (cmd->SCp.phase & in_selection) {
294+
} else if (scsi_pointer->phase & in_selection) {
289295
status = inb(fd->base + REG_BSTAT);
290296
if (!(status & BSTAT_BSY)) {
291297
/* Try again, for slow devices */
@@ -297,75 +303,75 @@ static void fdomain_work(struct work_struct *work)
297303
/* Stop arbitration and enable parity */
298304
outb(ACTL_IRQEN | PARITY_MASK, fd->base + REG_ACTL);
299305
}
300-
cmd->SCp.phase = in_other;
306+
scsi_pointer->phase = in_other;
301307
outb(ICTL_FIFO | ICTL_REQ | FIFO_COUNT, fd->base + REG_ICTL);
302308
outb(BCTL_BUSEN, fd->base + REG_BCTL);
303309
goto out;
304310
}
305311

306-
/* cur_cmd->SCp.phase == in_other: this is the body of the routine */
312+
/* fdomain_scsi_pointer(cur_cmd)->phase == in_other: this is the body of the routine */
307313
status = inb(fd->base + REG_BSTAT);
308314

309315
if (status & BSTAT_REQ) {
310316
switch (status & (BSTAT_MSG | BSTAT_CMD | BSTAT_IO)) {
311317
case BSTAT_CMD: /* COMMAND OUT */
312-
outb(cmd->cmnd[cmd->SCp.sent_command++],
318+
outb(cmd->cmnd[scsi_pointer->sent_command++],
313319
fd->base + REG_SCSI_DATA);
314320
break;
315321
case 0: /* DATA OUT -- tmc18c50/tmc18c30 only */
316-
if (fd->chip != tmc1800 && !cmd->SCp.have_data_in) {
317-
cmd->SCp.have_data_in = -1;
322+
if (fd->chip != tmc1800 && !scsi_pointer->have_data_in) {
323+
scsi_pointer->have_data_in = -1;
318324
outb(ACTL_IRQEN | ACTL_FIFOWR | ACTL_FIFOEN |
319325
PARITY_MASK, fd->base + REG_ACTL);
320326
}
321327
break;
322328
case BSTAT_IO: /* DATA IN -- tmc18c50/tmc18c30 only */
323-
if (fd->chip != tmc1800 && !cmd->SCp.have_data_in) {
324-
cmd->SCp.have_data_in = 1;
329+
if (fd->chip != tmc1800 && !scsi_pointer->have_data_in) {
330+
scsi_pointer->have_data_in = 1;
325331
outb(ACTL_IRQEN | ACTL_FIFOEN | PARITY_MASK,
326332
fd->base + REG_ACTL);
327333
}
328334
break;
329335
case BSTAT_CMD | BSTAT_IO: /* STATUS IN */
330-
cmd->SCp.Status = inb(fd->base + REG_SCSI_DATA);
336+
scsi_pointer->Status = inb(fd->base + REG_SCSI_DATA);
331337
break;
332338
case BSTAT_MSG | BSTAT_CMD: /* MESSAGE OUT */
333339
outb(MESSAGE_REJECT, fd->base + REG_SCSI_DATA);
334340
break;
335341
case BSTAT_MSG | BSTAT_CMD | BSTAT_IO: /* MESSAGE IN */
336-
cmd->SCp.Message = inb(fd->base + REG_SCSI_DATA);
337-
if (cmd->SCp.Message == COMMAND_COMPLETE)
342+
scsi_pointer->Message = inb(fd->base + REG_SCSI_DATA);
343+
if (scsi_pointer->Message == COMMAND_COMPLETE)
338344
++done;
339345
break;
340346
}
341347
}
342348

343-
if (fd->chip == tmc1800 && !cmd->SCp.have_data_in &&
344-
cmd->SCp.sent_command >= cmd->cmd_len) {
349+
if (fd->chip == tmc1800 && !scsi_pointer->have_data_in &&
350+
scsi_pointer->sent_command >= cmd->cmd_len) {
345351
if (cmd->sc_data_direction == DMA_TO_DEVICE) {
346-
cmd->SCp.have_data_in = -1;
352+
scsi_pointer->have_data_in = -1;
347353
outb(ACTL_IRQEN | ACTL_FIFOWR | ACTL_FIFOEN |
348354
PARITY_MASK, fd->base + REG_ACTL);
349355
} else {
350-
cmd->SCp.have_data_in = 1;
356+
scsi_pointer->have_data_in = 1;
351357
outb(ACTL_IRQEN | ACTL_FIFOEN | PARITY_MASK,
352358
fd->base + REG_ACTL);
353359
}
354360
}
355361

356-
if (cmd->SCp.have_data_in == -1) /* DATA OUT */
362+
if (scsi_pointer->have_data_in == -1) /* DATA OUT */
357363
fdomain_write_data(cmd);
358364

359-
if (cmd->SCp.have_data_in == 1) /* DATA IN */
365+
if (scsi_pointer->have_data_in == 1) /* DATA IN */
360366
fdomain_read_data(cmd);
361367

362368
if (done) {
363-
set_status_byte(cmd, cmd->SCp.Status);
369+
set_status_byte(cmd, scsi_pointer->Status);
364370
set_host_byte(cmd, DID_OK);
365-
scsi_msg_to_host_byte(cmd, cmd->SCp.Message);
371+
scsi_msg_to_host_byte(cmd, scsi_pointer->Message);
366372
fdomain_finish_cmd(fd);
367373
} else {
368-
if (cmd->SCp.phase & disconnect) {
374+
if (scsi_pointer->phase & disconnect) {
369375
outb(ICTL_FIFO | ICTL_SEL | ICTL_REQ | FIFO_COUNT,
370376
fd->base + REG_ICTL);
371377
outb(0, fd->base + REG_BCTL);
@@ -398,14 +404,15 @@ static irqreturn_t fdomain_irq(int irq, void *dev_id)
398404

399405
static int fdomain_queue(struct Scsi_Host *sh, struct scsi_cmnd *cmd)
400406
{
407+
struct scsi_pointer *scsi_pointer = fdomain_scsi_pointer(cmd);
401408
struct fdomain *fd = shost_priv(cmd->device->host);
402409
unsigned long flags;
403410

404-
cmd->SCp.Status = 0;
405-
cmd->SCp.Message = 0;
406-
cmd->SCp.have_data_in = 0;
407-
cmd->SCp.sent_command = 0;
408-
cmd->SCp.phase = in_arbitration;
411+
scsi_pointer->Status = 0;
412+
scsi_pointer->Message = 0;
413+
scsi_pointer->have_data_in = 0;
414+
scsi_pointer->sent_command = 0;
415+
scsi_pointer->phase = in_arbitration;
409416
scsi_set_resid(cmd, scsi_bufflen(cmd));
410417

411418
spin_lock_irqsave(sh->host_lock, flags);
@@ -440,7 +447,7 @@ static int fdomain_abort(struct scsi_cmnd *cmd)
440447
spin_lock_irqsave(sh->host_lock, flags);
441448

442449
fdomain_make_bus_idle(fd);
443-
fd->cur_cmd->SCp.phase |= aborted;
450+
fdomain_scsi_pointer(fd->cur_cmd)->phase |= aborted;
444451

445452
/* Aborts are not done well. . . */
446453
set_host_byte(fd->cur_cmd, DID_ABORT);
@@ -501,6 +508,7 @@ static struct scsi_host_template fdomain_template = {
501508
.this_id = 7,
502509
.sg_tablesize = 64,
503510
.dma_boundary = PAGE_SIZE - 1,
511+
.cmd_size = sizeof(struct scsi_pointer),
504512
};
505513

506514
struct Scsi_Host *fdomain_create(int base, int irq, int this_id,

0 commit comments

Comments
 (0)