* [PATCH 1/5] scsi: ips: remove function tracing macros
@ 2025-12-20 5:15 Ethan Nelson-Moore
2025-12-20 5:15 ` [PATCH 2/5] scsi: ibmvfc: " Ethan Nelson-Moore
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Ethan Nelson-Moore @ 2025-12-20 5:15 UTC (permalink / raw)
To: linux-scsi; +Cc: Ethan Nelson-Moore
These function tracing macros clutter the code and provide
no value over ftrace. Remove them.
Signed-off-by: Ethan Nelson-Moore <enelsonmoore@gmail.com>
---
drivers/scsi/ips.c | 172 ---------------------------------------------
1 file changed, 172 deletions(-)
diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c
index 3393a288fd23..8a1ad327923a 100644
--- a/drivers/scsi/ips.c
+++ b/drivers/scsi/ips.c
@@ -216,11 +216,9 @@ module_param(ips, charp, 0);
scb->scsi_cmd->sc_data_direction)
#ifdef IPS_DEBUG
-#define METHOD_TRACE(s, i) if (ips_debug >= (i+10)) printk(KERN_NOTICE s "\n");
#define DEBUG(i, s) if (ips_debug >= i) printk(KERN_NOTICE s "\n");
#define DEBUG_VAR(i, s, v...) if (ips_debug >= i) printk(KERN_NOTICE s "\n", v);
#else
-#define METHOD_TRACE(s, i)
#define DEBUG(i, s)
#define DEBUG_VAR(i, s, v...)
#endif
@@ -558,8 +556,6 @@ ips_detect(struct scsi_host_template * SHT)
{
int i;
- METHOD_TRACE("ips_detect", 1);
-
#ifdef MODULE
if (ips)
ips_setup(ips);
@@ -648,8 +644,6 @@ static void ips_release(struct Scsi_Host *sh)
ips_ha_t *ha;
int i;
- METHOD_TRACE("ips_release", 1);
-
scsi_remove_host(sh);
for (i = 0; i < IPS_MAX_ADAPTERS && ips_sh[i] != sh; i++) ;
@@ -779,8 +773,6 @@ int ips_eh_abort(struct scsi_cmnd *SC)
int ret;
struct Scsi_Host *host;
- METHOD_TRACE("ips_eh_abort", 1);
-
if (!SC)
return (FAILED);
@@ -836,8 +828,6 @@ static int __ips_eh_reset(struct scsi_cmnd *SC)
ips_ha_t *ha;
ips_scb_t *scb;
- METHOD_TRACE("ips_eh_reset", 1);
-
#ifdef NO_IPS_RESET
return (FAILED);
#else
@@ -1023,8 +1013,6 @@ static int ips_queue_lck(struct scsi_cmnd *SC)
ips_ha_t *ha;
ips_passthru_t *pt;
- METHOD_TRACE("ips_queue", 1);
-
ha = (ips_ha_t *) SC->device->host->hostdata;
if (!ha)
@@ -1131,8 +1119,6 @@ static int ips_biosparam(struct scsi_device *sdev, struct gendisk *unused,
int sectors;
int cylinders;
- METHOD_TRACE("ips_biosparam", 1);
-
if (!ha)
/* ?!?! host adater info invalid */
return (0);
@@ -1208,8 +1194,6 @@ do_ipsintr(int irq, void *dev_id)
struct Scsi_Host *host;
int irqstatus;
- METHOD_TRACE("do_ipsintr", 2);
-
ha = (ips_ha_t *) dev_id;
if (!ha)
return IRQ_NONE;
@@ -1255,8 +1239,6 @@ ips_intr_copperhead(ips_ha_t * ha)
IPS_STATUS cstatus;
int intrstatus;
- METHOD_TRACE("ips_intr", 2);
-
if (!ha)
return 0;
@@ -1319,8 +1301,6 @@ ips_intr_morpheus(ips_ha_t * ha)
IPS_STATUS cstatus;
int intrstatus;
- METHOD_TRACE("ips_intr_morpheus", 2);
-
if (!ha)
return 0;
@@ -1386,8 +1366,6 @@ ips_info(struct Scsi_Host *SH)
char *bp;
ips_ha_t *ha;
- METHOD_TRACE("ips_info", 1);
-
ha = IPS_HA(SH);
if (!ha)
@@ -1469,8 +1447,6 @@ static int ips_is_passthru(struct scsi_cmnd *SC)
{
unsigned long flags;
- METHOD_TRACE("ips_is_passthru", 1);
-
if (!SC)
return (0);
@@ -1546,8 +1522,6 @@ ips_make_passthru(ips_ha_t *ha, struct scsi_cmnd *SC, ips_scb_t *scb, int intr)
int i, ret;
struct scatterlist *sg = scsi_sglist(SC);
- METHOD_TRACE("ips_make_passthru", 1);
-
scsi_for_each_sg(SC, sg, scsi_sg_count(SC), i)
length += sg->length;
@@ -1884,8 +1858,6 @@ ips_usrcmd(ips_ha_t * ha, ips_passthru_t * pt, ips_scb_t * scb)
IPS_SG_LIST sg_list;
uint32_t cmd_busaddr;
- METHOD_TRACE("ips_usrcmd", 1);
-
if ((!scb) || (!pt) || (!ha))
return (0);
@@ -1971,8 +1943,6 @@ ips_cleanup_passthru(ips_ha_t * ha, ips_scb_t * scb)
{
ips_passthru_t *pt;
- METHOD_TRACE("ips_cleanup_passthru", 1);
-
if ((!scb) || (!scb->scsi_cmd) || (!scsi_sglist(scb->scsi_cmd))) {
DEBUG_VAR(1, "(%s%d) couldn't cleanup after passthru",
ips_name, ha->host_num);
@@ -2009,8 +1979,6 @@ ips_cleanup_passthru(ips_ha_t * ha, ips_scb_t * scb)
static int
ips_host_info(ips_ha_t *ha, struct seq_file *m)
{
- METHOD_TRACE("ips_host_info", 1);
-
seq_puts(m, "\nIBM ServeRAID General Information:\n\n");
if ((le32_to_cpu(ha->nvram->signature) == IPS_NVRAM_P5_SIG) &&
@@ -2127,8 +2095,6 @@ ips_host_info(ips_ha_t *ha, struct seq_file *m)
static void
ips_identify_controller(ips_ha_t * ha)
{
- METHOD_TRACE("ips_identify_controller", 1);
-
switch (ha->pcidev->device) {
case IPS_DEVICEID_COPPERHEAD:
if (ha->pcidev->revision <= IPS_REVID_SERVERAID) {
@@ -2219,8 +2185,6 @@ ips_get_bios_version(ips_ha_t * ha, int intr)
uint8_t subminor;
uint8_t *buffer;
- METHOD_TRACE("ips_get_bios_version", 1);
-
major = 0;
minor = 0;
@@ -2374,8 +2338,6 @@ ips_hainit(ips_ha_t * ha)
{
int i;
- METHOD_TRACE("ips_hainit", 1);
-
if (!ha)
return (0);
@@ -2513,7 +2475,6 @@ ips_next(ips_ha_t * ha, int intr)
ips_copp_wait_item_t *item;
int ret;
struct Scsi_Host *host;
- METHOD_TRACE("ips_next", 1);
if (!ha)
return;
@@ -2737,8 +2698,6 @@ ips_next(ips_ha_t * ha, int intr)
static void
ips_putq_scb_head(ips_scb_queue_t * queue, ips_scb_t * item)
{
- METHOD_TRACE("ips_putq_scb_head", 1);
-
if (!item)
return;
@@ -2767,8 +2726,6 @@ ips_removeq_scb_head(ips_scb_queue_t * queue)
{
ips_scb_t *item;
- METHOD_TRACE("ips_removeq_scb_head", 1);
-
item = queue->head;
if (!item) {
@@ -2802,8 +2759,6 @@ ips_removeq_scb(ips_scb_queue_t * queue, ips_scb_t * item)
{
ips_scb_t *p;
- METHOD_TRACE("ips_removeq_scb", 1);
-
if (!item)
return (NULL);
@@ -2845,8 +2800,6 @@ ips_removeq_scb(ips_scb_queue_t * queue, ips_scb_t * item)
/****************************************************************************/
static void ips_putq_wait_tail(ips_wait_queue_entry_t *queue, struct scsi_cmnd *item)
{
- METHOD_TRACE("ips_putq_wait_tail", 1);
-
if (!item)
return;
@@ -2878,8 +2831,6 @@ static struct scsi_cmnd *ips_removeq_wait_head(ips_wait_queue_entry_t *queue)
{
struct scsi_cmnd *item;
- METHOD_TRACE("ips_removeq_wait_head", 1);
-
item = queue->head;
if (!item) {
@@ -2913,8 +2864,6 @@ static struct scsi_cmnd *ips_removeq_wait(ips_wait_queue_entry_t *queue,
{
struct scsi_cmnd *p;
- METHOD_TRACE("ips_removeq_wait", 1);
-
if (!item)
return (NULL);
@@ -2957,8 +2906,6 @@ static struct scsi_cmnd *ips_removeq_wait(ips_wait_queue_entry_t *queue,
static void
ips_putq_copp_tail(ips_copp_queue_t * queue, ips_copp_wait_item_t * item)
{
- METHOD_TRACE("ips_putq_copp_tail", 1);
-
if (!item)
return;
@@ -2991,8 +2938,6 @@ ips_removeq_copp_head(ips_copp_queue_t * queue)
{
ips_copp_wait_item_t *item;
- METHOD_TRACE("ips_removeq_copp_head", 1);
-
item = queue->head;
if (!item) {
@@ -3026,8 +2971,6 @@ ips_removeq_copp(ips_copp_queue_t * queue, ips_copp_wait_item_t * item)
{
ips_copp_wait_item_t *p;
- METHOD_TRACE("ips_removeq_copp", 1);
-
if (!item)
return (NULL);
@@ -3068,8 +3011,6 @@ ips_removeq_copp(ips_copp_queue_t * queue, ips_copp_wait_item_t * item)
static void
ipsintr_blocking(ips_ha_t * ha, ips_scb_t * scb)
{
- METHOD_TRACE("ipsintr_blocking", 2);
-
ips_freescb(ha, scb);
if (ha->waitflag && ha->cmd_in_progress == scb->cdb[0]) {
ha->waitflag = false;
@@ -3090,8 +3031,6 @@ ipsintr_blocking(ips_ha_t * ha, ips_scb_t * scb)
static void
ipsintr_done(ips_ha_t * ha, ips_scb_t * scb)
{
- METHOD_TRACE("ipsintr_done", 2);
-
if (!scb) {
IPS_PRINTK(KERN_WARNING, ha->pcidev,
"Spurious interrupt; scb NULL.\n");
@@ -3124,8 +3063,6 @@ ips_done(ips_ha_t * ha, ips_scb_t * scb)
{
int ret;
- METHOD_TRACE("ips_done", 1);
-
if (!scb)
return;
@@ -3234,8 +3171,6 @@ ips_map_status(ips_ha_t * ha, ips_scb_t * scb, ips_stat_t * sp)
IPS_DCDB_TABLE_TAPE *tapeDCDB;
IPS_SCSI_INQ_DATA inquiryData;
- METHOD_TRACE("ips_map_status", 1);
-
if (scb->bus) {
DEBUG_VAR(2,
"(%s%d) Physical device error (%d %d %d): %x %x, Sense Key: %x, ASC: %x, ASCQ: %x",
@@ -3369,8 +3304,6 @@ ips_send_wait(ips_ha_t * ha, ips_scb_t * scb, int timeout, int intr)
{
int ret;
- METHOD_TRACE("ips_send_wait", 1);
-
if (intr != IPS_FFDC) { /* Won't be Waiting if this is a Time Stamp */
ha->waitflag = true;
ha->cmd_in_progress = scb->cdb[0];
@@ -3439,8 +3372,6 @@ ips_send_cmd(ips_ha_t * ha, ips_scb_t * scb)
IPS_DCDB_TABLE_TAPE *tapeDCDB;
int TimeOut;
- METHOD_TRACE("ips_send_cmd", 1);
-
ret = IPS_SUCCESS;
if (!scb->scsi_cmd) {
@@ -3821,8 +3752,6 @@ ips_chkstatus(ips_ha_t * ha, IPS_STATUS * pstatus)
int errcode;
IPS_SCSI_INQ_DATA inquiryData;
- METHOD_TRACE("ips_chkstatus", 1);
-
scb = &ha->scbs[pstatus->fields.command_id];
scb->basic_status = basic_status =
pstatus->fields.basic_status & IPS_BASIC_STATUS_MASK;
@@ -3972,8 +3901,6 @@ ips_chkstatus(ips_ha_t * ha, IPS_STATUS * pstatus)
static int
ips_online(ips_ha_t * ha, ips_scb_t * scb)
{
- METHOD_TRACE("ips_online", 1);
-
if (scb->target_id >= IPS_MAX_LD)
return (0);
@@ -4009,8 +3936,6 @@ ips_inquiry(ips_ha_t * ha, ips_scb_t * scb)
{
IPS_SCSI_INQ_DATA inquiry;
- METHOD_TRACE("ips_inquiry", 1);
-
memset(&inquiry, 0, sizeof (IPS_SCSI_INQ_DATA));
inquiry.DeviceType = IPS_SCSI_INQ_TYPE_DASD;
@@ -4044,8 +3969,6 @@ ips_rdcap(ips_ha_t * ha, ips_scb_t * scb)
{
IPS_SCSI_CAPACITY cap;
- METHOD_TRACE("ips_rdcap", 1);
-
if (scsi_bufflen(scb->scsi_cmd) < 8)
return (0);
@@ -4077,8 +4000,6 @@ ips_msense(ips_ha_t * ha, ips_scb_t * scb)
uint32_t cylinders;
IPS_SCSI_MODE_PAGE_DATA mdata;
- METHOD_TRACE("ips_msense", 1);
-
if (le32_to_cpu(ha->enq->ulDriveSize[scb->target_id]) > 0x400000 &&
(ha->enq->ucMiscFlag & 0x8) == 0) {
heads = IPS_NORM_HEADS;
@@ -4165,8 +4086,6 @@ ips_reqsen(ips_ha_t * ha, ips_scb_t * scb)
{
IPS_SCSI_REQSEN reqsen;
- METHOD_TRACE("ips_reqsen", 1);
-
memset(&reqsen, 0, sizeof (IPS_SCSI_REQSEN));
reqsen.ResponseCode =
@@ -4193,8 +4112,6 @@ static void
ips_free(ips_ha_t * ha)
{
- METHOD_TRACE("ips_free", 1);
-
if (ha) {
if (ha->enq) {
dma_free_coherent(&ha->pcidev->dev, sizeof(IPS_ENQ),
@@ -4289,8 +4206,6 @@ ips_allocatescbs(ips_ha_t * ha)
int i;
dma_addr_t command_dma, sg_dma;
- METHOD_TRACE("ips_allocatescbs", 1);
-
/* Allocate memory for the SCBs */
ha->scbs = dma_alloc_coherent(&ha->pcidev->dev,
ha->max_cmds * sizeof (ips_scb_t),
@@ -4350,7 +4265,6 @@ ips_init_scb(ips_ha_t * ha, ips_scb_t * scb)
{
IPS_SG_LIST sg_list;
uint32_t cmd_busaddr, sg_busaddr;
- METHOD_TRACE("ips_init_scb", 1);
if (scb == NULL)
return;
@@ -4395,8 +4309,6 @@ ips_getscb(ips_ha_t * ha)
{
ips_scb_t *scb;
- METHOD_TRACE("ips_getscb", 1);
-
if ((scb = ha->scb_freelist) == NULL) {
return (NULL);
@@ -4426,7 +4338,6 @@ static void
ips_freescb(ips_ha_t * ha, ips_scb_t * scb)
{
- METHOD_TRACE("ips_freescb", 1);
if (scb->flags & IPS_SCB_MAP_SG)
scsi_dma_unmap(scb->scsi_cmd);
else if (scb->flags & IPS_SCB_MAP_SINGLE)
@@ -4455,8 +4366,6 @@ ips_isinit_copperhead(ips_ha_t * ha)
uint8_t scpr;
uint8_t isr;
- METHOD_TRACE("ips_isinit_copperhead", 1);
-
isr = inb(ha->io_addr + IPS_REG_HISR);
scpr = inb(ha->io_addr + IPS_REG_SCPR);
@@ -4481,8 +4390,6 @@ ips_isinit_copperhead_memio(ips_ha_t * ha)
uint8_t isr = 0;
uint8_t scpr;
- METHOD_TRACE("ips_is_init_copperhead_memio", 1);
-
isr = readb(ha->mem_ptr + IPS_REG_HISR);
scpr = readb(ha->mem_ptr + IPS_REG_SCPR);
@@ -4507,8 +4414,6 @@ ips_isinit_morpheus(ips_ha_t * ha)
uint32_t post;
uint32_t bits;
- METHOD_TRACE("ips_is_init_morpheus", 1);
-
if (ips_isintr_morpheus(ha))
ips_flush_and_reset(ha);
@@ -4623,8 +4528,6 @@ ips_poll_for_flush_complete(ips_ha_t * ha)
static void
ips_enable_int_copperhead(ips_ha_t * ha)
{
- METHOD_TRACE("ips_enable_int_copperhead", 1);
-
outb(ha->io_addr + IPS_REG_HISR, IPS_BIT_EI);
inb(ha->io_addr + IPS_REG_HISR); /*Ensure PCI Posting Completes*/
}
@@ -4640,8 +4543,6 @@ ips_enable_int_copperhead(ips_ha_t * ha)
static void
ips_enable_int_copperhead_memio(ips_ha_t * ha)
{
- METHOD_TRACE("ips_enable_int_copperhead_memio", 1);
-
writeb(IPS_BIT_EI, ha->mem_ptr + IPS_REG_HISR);
readb(ha->mem_ptr + IPS_REG_HISR); /*Ensure PCI Posting Completes*/
}
@@ -4659,8 +4560,6 @@ ips_enable_int_morpheus(ips_ha_t * ha)
{
uint32_t Oimr;
- METHOD_TRACE("ips_enable_int_morpheus", 1);
-
Oimr = readl(ha->mem_ptr + IPS_REG_I960_OIMR);
Oimr &= ~0x08;
writel(Oimr, ha->mem_ptr + IPS_REG_I960_OIMR);
@@ -4684,8 +4583,6 @@ ips_init_copperhead(ips_ha_t * ha)
uint8_t PostByte[IPS_MAX_POST_BYTES];
int i, j;
- METHOD_TRACE("ips_init_copperhead", 1);
-
for (i = 0; i < IPS_MAX_POST_BYTES; i++) {
for (j = 0; j < 45; j++) {
Isr = inb(ha->io_addr + IPS_REG_HISR);
@@ -4777,8 +4674,6 @@ ips_init_copperhead_memio(ips_ha_t * ha)
uint8_t PostByte[IPS_MAX_POST_BYTES];
int i, j;
- METHOD_TRACE("ips_init_copperhead_memio", 1);
-
for (i = 0; i < IPS_MAX_POST_BYTES; i++) {
for (j = 0; j < 45; j++) {
Isr = readb(ha->mem_ptr + IPS_REG_HISR);
@@ -4872,8 +4767,6 @@ ips_init_morpheus(ips_ha_t * ha)
uint32_t Oimr;
int i;
- METHOD_TRACE("ips_init_morpheus", 1);
-
/* Wait up to 45 secs for Post */
for (i = 0; i < 45; i++) {
Isr = readl(ha->mem_ptr + IPS_REG_I2O_HIR);
@@ -4985,8 +4878,6 @@ ips_reset_copperhead(ips_ha_t * ha)
{
int reset_counter;
- METHOD_TRACE("ips_reset_copperhead", 1);
-
DEBUG_VAR(1, "(%s%d) ips_reset_copperhead: io addr: %x, irq: %d",
ips_name, ha->host_num, ha->io_addr, ha->pcidev->irq);
@@ -5030,8 +4921,6 @@ ips_reset_copperhead_memio(ips_ha_t * ha)
{
int reset_counter;
- METHOD_TRACE("ips_reset_copperhead_memio", 1);
-
DEBUG_VAR(1, "(%s%d) ips_reset_copperhead_memio: mem addr: %x, irq: %d",
ips_name, ha->host_num, ha->mem_addr, ha->pcidev->irq);
@@ -5076,8 +4965,6 @@ ips_reset_morpheus(ips_ha_t * ha)
int reset_counter;
uint8_t junk;
- METHOD_TRACE("ips_reset_morpheus", 1);
-
DEBUG_VAR(1, "(%s%d) ips_reset_morpheus: mem addr: %x, irq: %d",
ips_name, ha->host_num, ha->mem_addr, ha->pcidev->irq);
@@ -5119,8 +5006,6 @@ ips_statinit(ips_ha_t * ha)
{
uint32_t phys_status_start;
- METHOD_TRACE("ips_statinit", 1);
-
ha->adapt->p_status_start = ha->adapt->status;
ha->adapt->p_status_end = ha->adapt->status + IPS_MAX_CMDS;
ha->adapt->p_status_tail = ha->adapt->status;
@@ -5150,8 +5035,6 @@ ips_statinit_memio(ips_ha_t * ha)
{
uint32_t phys_status_start;
- METHOD_TRACE("ips_statinit_memio", 1);
-
ha->adapt->p_status_start = ha->adapt->status;
ha->adapt->p_status_end = ha->adapt->status + IPS_MAX_CMDS;
ha->adapt->p_status_tail = ha->adapt->status;
@@ -5178,8 +5061,6 @@ ips_statinit_memio(ips_ha_t * ha)
static uint32_t
ips_statupd_copperhead(ips_ha_t * ha)
{
- METHOD_TRACE("ips_statupd_copperhead", 1);
-
if (ha->adapt->p_status_tail != ha->adapt->p_status_end) {
ha->adapt->p_status_tail++;
ha->adapt->hw_status_tail += sizeof (IPS_STATUS);
@@ -5206,8 +5087,6 @@ ips_statupd_copperhead(ips_ha_t * ha)
static uint32_t
ips_statupd_copperhead_memio(ips_ha_t * ha)
{
- METHOD_TRACE("ips_statupd_copperhead_memio", 1);
-
if (ha->adapt->p_status_tail != ha->adapt->p_status_end) {
ha->adapt->p_status_tail++;
ha->adapt->hw_status_tail += sizeof (IPS_STATUS);
@@ -5235,8 +5114,6 @@ ips_statupd_morpheus(ips_ha_t * ha)
{
uint32_t val;
- METHOD_TRACE("ips_statupd_morpheus", 1);
-
val = readl(ha->mem_ptr + IPS_REG_I2O_OUTMSGQ);
return (val);
@@ -5257,8 +5134,6 @@ ips_issue_copperhead(ips_ha_t * ha, ips_scb_t * scb)
uint32_t TimeOut;
uint32_t val;
- METHOD_TRACE("ips_issue_copperhead", 1);
-
if (scb->scsi_cmd) {
DEBUG_VAR(2, "(%s%d) ips_issue: cmd 0x%X id %d (%d %d %d)",
ips_name,
@@ -5311,8 +5186,6 @@ ips_issue_copperhead_memio(ips_ha_t * ha, ips_scb_t * scb)
uint32_t TimeOut;
uint32_t val;
- METHOD_TRACE("ips_issue_copperhead_memio", 1);
-
if (scb->scsi_cmd) {
DEBUG_VAR(2, "(%s%d) ips_issue: cmd 0x%X id %d (%d %d %d)",
ips_name,
@@ -5362,8 +5235,6 @@ static int
ips_issue_i2o(ips_ha_t * ha, ips_scb_t * scb)
{
- METHOD_TRACE("ips_issue_i2o", 1);
-
if (scb->scsi_cmd) {
DEBUG_VAR(2, "(%s%d) ips_issue: cmd 0x%X id %d (%d %d %d)",
ips_name,
@@ -5394,8 +5265,6 @@ static int
ips_issue_i2o_memio(ips_ha_t * ha, ips_scb_t * scb)
{
- METHOD_TRACE("ips_issue_i2o_memio", 1);
-
if (scb->scsi_cmd) {
DEBUG_VAR(2, "(%s%d) ips_issue: cmd 0x%X id %d (%d %d %d)",
ips_name,
@@ -5427,8 +5296,6 @@ ips_isintr_copperhead(ips_ha_t * ha)
{
uint8_t Isr;
- METHOD_TRACE("ips_isintr_copperhead", 2);
-
Isr = inb(ha->io_addr + IPS_REG_HISR);
if (Isr == 0xFF)
@@ -5460,8 +5327,6 @@ ips_isintr_copperhead_memio(ips_ha_t * ha)
{
uint8_t Isr;
- METHOD_TRACE("ips_isintr_memio", 2);
-
Isr = readb(ha->mem_ptr + IPS_REG_HISR);
if (Isr == 0xFF)
@@ -5493,8 +5358,6 @@ ips_isintr_morpheus(ips_ha_t * ha)
{
uint32_t Isr;
- METHOD_TRACE("ips_isintr_morpheus", 2);
-
Isr = readl(ha->mem_ptr + IPS_REG_I2O_HIR);
if (Isr & IPS_BIT_I2O_OPQI)
@@ -5518,8 +5381,6 @@ ips_wait(ips_ha_t * ha, int time, int intr)
int ret;
int done;
- METHOD_TRACE("ips_wait", 1);
-
ret = IPS_FAILURE;
done = false;
@@ -5573,8 +5434,6 @@ ips_wait(ips_ha_t * ha, int time, int intr)
static int
ips_write_driver_status(ips_ha_t * ha, int intr)
{
- METHOD_TRACE("ips_write_driver_status", 1);
-
if (!ips_readwrite_page5(ha, false, intr)) {
IPS_PRINTK(KERN_WARNING, ha->pcidev,
"unable to read NVRAM page 5.\n");
@@ -5641,8 +5500,6 @@ ips_read_adapter_status(ips_ha_t * ha, int intr)
ips_scb_t *scb;
int ret;
- METHOD_TRACE("ips_read_adapter_status", 1);
-
scb = &ha->scbs[ha->max_cmds - 1];
ips_init_scb(ha, scb);
@@ -5684,8 +5541,6 @@ ips_read_subsystem_parameters(ips_ha_t * ha, int intr)
ips_scb_t *scb;
int ret;
- METHOD_TRACE("ips_read_subsystem_parameters", 1);
-
scb = &ha->scbs[ha->max_cmds - 1];
ips_init_scb(ha, scb);
@@ -5729,8 +5584,6 @@ ips_read_config(ips_ha_t * ha, int intr)
int i;
int ret;
- METHOD_TRACE("ips_read_config", 1);
-
/* set defaults for initiator IDs */
for (i = 0; i < 4; i++)
ha->conf->init_id[i] = 7;
@@ -5786,8 +5639,6 @@ ips_readwrite_page5(ips_ha_t * ha, int write, int intr)
ips_scb_t *scb;
int ret;
- METHOD_TRACE("ips_readwrite_page5", 1);
-
scb = &ha->scbs[ha->max_cmds - 1];
ips_init_scb(ha, scb);
@@ -5836,8 +5687,6 @@ ips_clear_adapter(ips_ha_t * ha, int intr)
ips_scb_t *scb;
int ret;
- METHOD_TRACE("ips_clear_adapter", 1);
-
scb = &ha->scbs[ha->max_cmds - 1];
ips_init_scb(ha, scb);
@@ -5898,8 +5747,6 @@ ips_ffdc_reset(ips_ha_t * ha, int intr)
{
ips_scb_t *scb;
- METHOD_TRACE("ips_ffdc_reset", 1);
-
scb = &ha->scbs[ha->max_cmds - 1];
ips_init_scb(ha, scb);
@@ -5932,8 +5779,6 @@ ips_ffdc_time(ips_ha_t * ha)
{
ips_scb_t *scb;
- METHOD_TRACE("ips_ffdc_time", 1);
-
DEBUG_VAR(1, "(%s%d) Sending time update.", ips_name, ha->host_num);
scb = &ha->scbs[ha->max_cmds - 1];
@@ -5967,8 +5812,6 @@ ips_fix_ffdc_time(ips_ha_t * ha, ips_scb_t * scb, time64_t current_time)
{
struct tm tm;
- METHOD_TRACE("ips_fix_ffdc_time", 1);
-
time64_to_tm(current_time, 0, &tm);
scb->cmd.ffdc.hour = tm.tm_hour;
@@ -5998,8 +5841,6 @@ ips_erase_bios(ips_ha_t * ha)
int timeout;
uint8_t status = 0;
- METHOD_TRACE("ips_erase_bios", 1);
-
status = 0;
/* Clear the status register */
@@ -6110,8 +5951,6 @@ ips_erase_bios_memio(ips_ha_t * ha)
int timeout;
uint8_t status;
- METHOD_TRACE("ips_erase_bios_memio", 1);
-
status = 0;
/* Clear the status register */
@@ -6224,8 +6063,6 @@ ips_program_bios(ips_ha_t * ha, char *buffer, uint32_t buffersize,
int timeout;
uint8_t status = 0;
- METHOD_TRACE("ips_program_bios", 1);
-
status = 0;
for (i = 0; i < buffersize; i++) {
@@ -6315,8 +6152,6 @@ ips_program_bios_memio(ips_ha_t * ha, char *buffer, uint32_t buffersize,
int timeout;
uint8_t status = 0;
- METHOD_TRACE("ips_program_bios_memio", 1);
-
status = 0;
for (i = 0; i < buffersize; i++) {
@@ -6405,8 +6240,6 @@ ips_verify_bios(ips_ha_t * ha, char *buffer, uint32_t buffersize,
uint8_t checksum;
int i;
- METHOD_TRACE("ips_verify_bios", 1);
-
/* test 1st byte */
outl(0, ha->io_addr + IPS_REG_FLAP);
if (ha->pcidev->revision == IPS_REVID_TROMBONE64)
@@ -6454,8 +6287,6 @@ ips_verify_bios_memio(ips_ha_t * ha, char *buffer, uint32_t buffersize,
uint8_t checksum;
int i;
- METHOD_TRACE("ips_verify_bios_memio", 1);
-
/* test 1st byte */
writel(0, ha->mem_ptr + IPS_REG_FLAP);
if (ha->pcidev->revision == IPS_REVID_TROMBONE64)
@@ -6762,7 +6593,6 @@ ips_insert_device(struct pci_dev *pci_dev, const struct pci_device_id *ent)
int index = -1;
int rc;
- METHOD_TRACE("ips_insert_device", 1);
rc = pci_enable_device(pci_dev);
if (rc)
return rc;
@@ -6825,7 +6655,6 @@ ips_init_phase1(struct pci_dev *pci_dev, int *indexPtr)
char __iomem *mem_ptr;
uint32_t IsDead;
- METHOD_TRACE("ips_init_phase1", 1);
index = IPS_MAX_ADAPTERS;
for (j = 0; j < IPS_MAX_ADAPTERS; j++) {
if (ips_ha[j] == NULL) {
@@ -7032,7 +6861,6 @@ ips_init_phase2(int index)
ha = ips_ha[index];
- METHOD_TRACE("ips_init_phase2", 1);
if (!ha->active) {
ips_ha[index] = NULL;
return -1;
--
2.43.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/5] scsi: ibmvfc: remove function tracing macros
2025-12-20 5:15 [PATCH 1/5] scsi: ips: remove function tracing macros Ethan Nelson-Moore
@ 2025-12-20 5:15 ` Ethan Nelson-Moore
2025-12-20 5:16 ` [PATCH 3/5] scsi: aic94xx: remove unused ENTER/EXIT macros Ethan Nelson-Moore
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: Ethan Nelson-Moore @ 2025-12-20 5:15 UTC (permalink / raw)
To: linux-scsi; +Cc: Ethan Nelson-Moore
These function tracing macros clutter the code and provide
no value over ftrace. Remove them.
Signed-off-by: Ethan Nelson-Moore <enelsonmoore@gmail.com>
---
drivers/scsi/ibmvscsi/ibmvfc.c | 53 ----------------------------------
drivers/scsi/ibmvscsi/ibmvfc.h | 3 --
2 files changed, 56 deletions(-)
diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c
index 228daffb286d..946d15125b43 100644
--- a/drivers/scsi/ibmvscsi/ibmvfc.c
+++ b/drivers/scsi/ibmvscsi/ibmvfc.c
@@ -680,7 +680,6 @@ static void ibmvfc_link_down(struct ibmvfc_host *vhost,
{
struct ibmvfc_target *tgt;
- ENTER;
scsi_block_requests(vhost->host);
list_for_each_entry(tgt, &vhost->targets, queue)
ibmvfc_del_tgt(tgt);
@@ -688,7 +687,6 @@ static void ibmvfc_link_down(struct ibmvfc_host *vhost,
ibmvfc_set_host_action(vhost, IBMVFC_HOST_ACTION_TGT_DEL);
vhost->events_to_log |= IBMVFC_AE_LINKDOWN;
wake_up(&vhost->work_wait_q);
- LEAVE;
}
/**
@@ -792,7 +790,6 @@ static int ibmvfc_init_event_pool(struct ibmvfc_host *vhost,
int i;
struct ibmvfc_event_pool *pool = &queue->evt_pool;
- ENTER;
if (!queue->total_depth)
return 0;
@@ -836,7 +833,6 @@ static int ibmvfc_init_event_pool(struct ibmvfc_host *vhost,
list_add_tail(&evt->queue_list, &queue->free);
}
- LEAVE;
return 0;
}
@@ -852,7 +848,6 @@ static void ibmvfc_free_event_pool(struct ibmvfc_host *vhost,
int i;
struct ibmvfc_event_pool *pool = &queue->evt_pool;
- ENTER;
for (i = 0; i < pool->size; ++i) {
list_del(&pool->events[i].queue_list);
BUG_ON(atomic_read(&pool->events[i].free) != 1);
@@ -866,7 +861,6 @@ static void ibmvfc_free_event_pool(struct ibmvfc_host *vhost,
dma_free_coherent(vhost->dev,
pool->size * sizeof(*pool->iu_storage),
pool->iu_storage, pool->iu_token);
- LEAVE;
}
/**
@@ -2069,7 +2063,6 @@ static int ibmvfc_bsg_timeout(struct bsg_job *job)
unsigned long flags;
int rc;
- ENTER;
spin_lock_irqsave(vhost->host->host_lock, flags);
if (vhost->aborting_passthru || vhost->state != IBMVFC_ACTIVE) {
__ibmvfc_reset_host(vhost);
@@ -2106,7 +2099,6 @@ static int ibmvfc_bsg_timeout(struct bsg_job *job)
spin_unlock_irqrestore(vhost->host->host_lock, flags);
- LEAVE;
return rc;
}
@@ -2127,7 +2119,6 @@ static int ibmvfc_bsg_plogi(struct ibmvfc_host *vhost, unsigned int port_id)
unsigned long flags;
int rc = 0, issue_login = 1;
- ENTER;
spin_lock_irqsave(vhost->host->host_lock, flags);
list_for_each_entry(tgt, &vhost->targets, queue) {
if (tgt->scsi_id == port_id) {
@@ -2171,7 +2162,6 @@ static int ibmvfc_bsg_plogi(struct ibmvfc_host *vhost, unsigned int port_id)
ibmvfc_free_event(evt);
unlock_out:
spin_unlock_irqrestore(vhost->host->host_lock, flags);
- LEAVE;
return rc;
}
@@ -2196,7 +2186,6 @@ static int ibmvfc_bsg_request(struct bsg_job *job)
int rc = 0, req_seg, rsp_seg, issue_login = 0;
u32 fc_flags, rsp_len;
- ENTER;
bsg_reply->reply_payload_rcv_len = 0;
if (rport)
port_id = rport->port_id;
@@ -2324,7 +2313,6 @@ static int ibmvfc_bsg_request(struct bsg_job *job)
dma_unmap_sg(vhost->dev, job->reply_payload.sg_list,
job->reply_payload.sg_cnt, DMA_FROM_DEVICE);
mutex_unlock(&vhost->passthru_mutex);
- LEAVE;
return rc;
}
@@ -2495,7 +2483,6 @@ static int ibmvfc_wait_for_ops(struct ibmvfc_host *vhost, void *device,
signed long timeout = IBMVFC_ABORT_WAIT_TIMEOUT * HZ;
struct ibmvfc_queue *queues;
- ENTER;
if (vhost->mq_enabled && vhost->using_channels) {
queues = vhost->scsi_scrqs.scrqs;
q_size = vhost->scsi_scrqs.active_queues;
@@ -2544,13 +2531,11 @@ static int ibmvfc_wait_for_ops(struct ibmvfc_host *vhost, void *device,
spin_unlock_irqrestore(vhost->host->host_lock, flags);
if (wait)
dev_err(vhost->dev, "Timed out waiting for aborted commands\n");
- LEAVE;
return wait ? FAILED : SUCCESS;
}
}
} while (wait);
- LEAVE;
return SUCCESS;
}
@@ -2606,7 +2591,6 @@ static int ibmvfc_cancel_all_mq(struct scsi_device *sdev, int type)
LIST_HEAD(cancelq);
u16 status;
- ENTER;
spin_lock_irqsave(vhost->host->host_lock, flags);
num_hwq = vhost->scsi_scrqs.active_queues;
for (i = 0; i < num_hwq; i++) {
@@ -2671,7 +2655,6 @@ static int ibmvfc_cancel_all_mq(struct scsi_device *sdev, int type)
return -EIO;
sdev_printk(KERN_INFO, sdev, "Successfully cancelled outstanding commands\n");
- LEAVE;
return 0;
}
@@ -2684,7 +2667,6 @@ static int ibmvfc_cancel_all_sq(struct scsi_device *sdev, int type)
unsigned long flags;
u16 status;
- ENTER;
found_evt = NULL;
spin_lock_irqsave(vhost->host->host_lock, flags);
spin_lock(&vhost->crq.l_lock);
@@ -2937,7 +2919,6 @@ static int ibmvfc_eh_abort_handler(struct scsi_cmnd *cmd)
int cancel_rc, block_rc;
int rc = FAILED;
- ENTER;
block_rc = fc_block_scsi_eh(cmd);
ibmvfc_wait_while_resetting(vhost);
if (block_rc != FAST_IO_FAIL) {
@@ -2952,7 +2933,6 @@ static int ibmvfc_eh_abort_handler(struct scsi_cmnd *cmd)
if (block_rc == FAST_IO_FAIL && rc != FAILED)
rc = FAST_IO_FAIL;
- LEAVE;
return rc;
}
@@ -2970,7 +2950,6 @@ static int ibmvfc_eh_device_reset_handler(struct scsi_cmnd *cmd)
int cancel_rc, block_rc, reset_rc = 0;
int rc = FAILED;
- ENTER;
block_rc = fc_block_scsi_eh(cmd);
ibmvfc_wait_while_resetting(vhost);
if (block_rc != FAST_IO_FAIL) {
@@ -2985,7 +2964,6 @@ static int ibmvfc_eh_device_reset_handler(struct scsi_cmnd *cmd)
if (block_rc == FAST_IO_FAIL && rc != FAILED)
rc = FAST_IO_FAIL;
- LEAVE;
return rc;
}
@@ -3020,7 +2998,6 @@ static int ibmvfc_eh_target_reset_handler(struct scsi_cmnd *cmd)
unsigned long cancel_rc = 0;
bool tgt_reset = false;
- ENTER;
block_rc = fc_block_rport(rport);
ibmvfc_wait_while_resetting(vhost);
if (block_rc != FAST_IO_FAIL) {
@@ -3049,7 +3026,6 @@ static int ibmvfc_eh_target_reset_handler(struct scsi_cmnd *cmd)
if (block_rc == FAST_IO_FAIL && rc != FAILED)
rc = FAST_IO_FAIL;
- LEAVE;
return rc;
}
@@ -3086,7 +3062,6 @@ static void ibmvfc_terminate_rport_io(struct fc_rport *rport)
unsigned long rc, flags;
unsigned int found;
- ENTER;
shost_for_each_device(sdev, shost) {
dev_rport = starget_to_rport(scsi_target(sdev));
if (dev_rport != rport)
@@ -3119,7 +3094,6 @@ static void ibmvfc_terminate_rport_io(struct fc_rport *rport)
}
spin_unlock_irqrestore(shost->host_lock, flags);
- LEAVE;
}
static const struct ibmvfc_async_desc ae_desc [] = {
@@ -5800,7 +5774,6 @@ static int ibmvfc_alloc_queue(struct ibmvfc_host *vhost,
struct device *dev = vhost->dev;
size_t fmt_size;
- ENTER;
spin_lock_init(&queue->_lock);
queue->q_lock = &queue->_lock;
@@ -5869,7 +5842,6 @@ static int ibmvfc_init_crq(struct ibmvfc_host *vhost)
struct vio_dev *vdev = to_vio_dev(dev);
struct ibmvfc_queue *crq = &vhost->crq;
- ENTER;
if (ibmvfc_alloc_queue(vhost, crq, IBMVFC_CRQ_FMT))
return -ENOMEM;
@@ -5901,7 +5873,6 @@ static int ibmvfc_init_crq(struct ibmvfc_host *vhost)
goto req_irq_failed;
}
- LEAVE;
return retrc;
req_irq_failed:
@@ -5923,7 +5894,6 @@ static int ibmvfc_register_channel(struct ibmvfc_host *vhost,
struct ibmvfc_queue *scrq = &channels->scrqs[index];
int rc = -ENOMEM;
- ENTER;
rc = h_reg_sub_crq(vdev->unit_address, scrq->msg_token, PAGE_SIZE,
&scrq->cookie, &scrq->hw_irq);
@@ -5971,7 +5941,6 @@ static int ibmvfc_register_channel(struct ibmvfc_host *vhost,
scrq->hwq_id = index;
- LEAVE;
return 0;
irq_failed:
@@ -5979,7 +5948,6 @@ static int ibmvfc_register_channel(struct ibmvfc_host *vhost,
rc = plpar_hcall_norets(H_FREE_SUB_CRQ, vdev->unit_address, scrq->cookie);
} while (rc == H_BUSY || H_IS_LONG_BUSY(rc));
reg_failed:
- LEAVE;
return rc;
}
@@ -5992,7 +5960,6 @@ static void ibmvfc_deregister_channel(struct ibmvfc_host *vhost,
struct ibmvfc_queue *scrq = &channels->scrqs[index];
long rc;
- ENTER;
free_irq(scrq->irq, scrq);
irq_dispose_mapping(scrq->irq);
@@ -6010,7 +5977,6 @@ static void ibmvfc_deregister_channel(struct ibmvfc_host *vhost,
memset(scrq->msgs.crq, 0, PAGE_SIZE);
scrq->cur = 0;
- LEAVE;
}
static void ibmvfc_reg_sub_crqs(struct ibmvfc_host *vhost,
@@ -6018,7 +5984,6 @@ static void ibmvfc_reg_sub_crqs(struct ibmvfc_host *vhost,
{
int i, j;
- ENTER;
if (!vhost->mq_enabled || !channels->scrqs)
return;
@@ -6031,7 +5996,6 @@ static void ibmvfc_reg_sub_crqs(struct ibmvfc_host *vhost,
}
}
- LEAVE;
}
static void ibmvfc_dereg_sub_crqs(struct ibmvfc_host *vhost,
@@ -6039,14 +6003,12 @@ static void ibmvfc_dereg_sub_crqs(struct ibmvfc_host *vhost,
{
int i;
- ENTER;
if (!vhost->mq_enabled || !channels->scrqs)
return;
for (i = 0; i < channels->max_queues; i++)
ibmvfc_deregister_channel(vhost, channels, i);
- LEAVE;
}
static int ibmvfc_alloc_channels(struct ibmvfc_host *vhost,
@@ -6082,7 +6044,6 @@ static int ibmvfc_alloc_channels(struct ibmvfc_host *vhost,
static void ibmvfc_init_sub_crqs(struct ibmvfc_host *vhost)
{
- ENTER;
if (!vhost->mq_enabled)
return;
@@ -6094,7 +6055,6 @@ static void ibmvfc_init_sub_crqs(struct ibmvfc_host *vhost)
ibmvfc_reg_sub_crqs(vhost, &vhost->scsi_scrqs);
- LEAVE;
}
static void ibmvfc_release_channels(struct ibmvfc_host *vhost,
@@ -6117,14 +6077,12 @@ static void ibmvfc_release_channels(struct ibmvfc_host *vhost,
static void ibmvfc_release_sub_crqs(struct ibmvfc_host *vhost)
{
- ENTER;
if (!vhost->scsi_scrqs.scrqs)
return;
ibmvfc_dereg_sub_crqs(vhost, &vhost->scsi_scrqs);
ibmvfc_release_channels(vhost, &vhost->scsi_scrqs);
- LEAVE;
}
static void ibmvfc_free_disc_buf(struct device *dev, struct ibmvfc_channels *channels)
@@ -6144,7 +6102,6 @@ static void ibmvfc_free_mem(struct ibmvfc_host *vhost)
{
struct ibmvfc_queue *async_q = &vhost->async_crq;
- ENTER;
mempool_destroy(vhost->tgt_pool);
kfree(vhost->trace);
ibmvfc_free_disc_buf(vhost->dev, &vhost->scsi_scrqs);
@@ -6154,7 +6111,6 @@ static void ibmvfc_free_mem(struct ibmvfc_host *vhost)
vhost->channel_setup_buf, vhost->channel_setup_dma);
dma_pool_destroy(vhost->sg_pool);
ibmvfc_free_queue(vhost, async_q);
- LEAVE;
}
static int ibmvfc_alloc_disc_buf(struct device *dev, struct ibmvfc_channels *channels)
@@ -6184,7 +6140,6 @@ static int ibmvfc_alloc_mem(struct ibmvfc_host *vhost)
struct ibmvfc_queue *async_q = &vhost->async_crq;
struct device *dev = vhost->dev;
- ENTER;
if (ibmvfc_alloc_queue(vhost, async_q, IBMVFC_ASYNC_FMT)) {
dev_err(dev, "Couldn't allocate/map async queue.\n");
goto nomem;
@@ -6234,7 +6189,6 @@ static int ibmvfc_alloc_mem(struct ibmvfc_host *vhost)
goto free_tgt_pool;
}
- LEAVE;
return 0;
free_tgt_pool:
@@ -6251,7 +6205,6 @@ static int ibmvfc_alloc_mem(struct ibmvfc_host *vhost)
unmap_async_crq:
ibmvfc_free_queue(vhost, async_q);
nomem:
- LEAVE;
return -ENOMEM;
}
@@ -6269,7 +6222,6 @@ static void ibmvfc_rport_add_thread(struct work_struct *work)
unsigned long flags;
int did_work;
- ENTER;
spin_lock_irqsave(vhost->host->host_lock, flags);
do {
did_work = 0;
@@ -6304,7 +6256,6 @@ static void ibmvfc_rport_add_thread(struct work_struct *work)
if (vhost->state == IBMVFC_ACTIVE)
vhost->scan_complete = 1;
spin_unlock_irqrestore(vhost->host->host_lock, flags);
- LEAVE;
}
/**
@@ -6324,7 +6275,6 @@ static int ibmvfc_probe(struct vio_dev *vdev, const struct vio_device_id *id)
unsigned int online_cpus = num_online_cpus();
unsigned int max_scsi_queues = min((unsigned int)IBMVFC_MAX_SCSI_QUEUES, online_cpus);
- ENTER;
shost = scsi_host_alloc(&driver_template, sizeof(*vhost));
if (!shost) {
dev_err(dev, "Couldn't allocate host data\n");
@@ -6415,7 +6365,6 @@ static int ibmvfc_probe(struct vio_dev *vdev, const struct vio_device_id *id)
free_scsi_host:
scsi_host_put(shost);
out:
- LEAVE;
return rc;
}
@@ -6432,7 +6381,6 @@ static void ibmvfc_remove(struct vio_dev *vdev)
LIST_HEAD(purge);
unsigned long flags;
- ENTER;
ibmvfc_remove_trace_file(&vhost->host->shost_dev.kobj, &ibmvfc_trace_attr);
spin_lock_irqsave(vhost->host->host_lock, flags);
@@ -6457,7 +6405,6 @@ static void ibmvfc_remove(struct vio_dev *vdev)
list_del(&vhost->queue);
spin_unlock(&ibmvfc_driver_lock);
scsi_host_put(vhost->host);
- LEAVE;
}
/**
diff --git a/drivers/scsi/ibmvscsi/ibmvfc.h b/drivers/scsi/ibmvscsi/ibmvfc.h
index c73ed2314ad0..8cb639c271fb 100644
--- a/drivers/scsi/ibmvscsi/ibmvfc.h
+++ b/drivers/scsi/ibmvscsi/ibmvfc.h
@@ -942,9 +942,6 @@ struct ibmvfc_host {
dev_err((vhost)->dev, ##__VA_ARGS__); \
} while (0)
-#define ENTER DBG_CMD(printk(KERN_INFO IBMVFC_NAME": Entering %s\n", __func__))
-#define LEAVE DBG_CMD(printk(KERN_INFO IBMVFC_NAME": Leaving %s\n", __func__))
-
#ifdef CONFIG_SCSI_IBMVFC_TRACE
#define ibmvfc_create_trace_file(kobj, attr) sysfs_create_bin_file(kobj, attr)
#define ibmvfc_remove_trace_file(kobj, attr) sysfs_remove_bin_file(kobj, attr)
--
2.43.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/5] scsi: aic94xx: remove unused ENTER/EXIT macros
2025-12-20 5:15 [PATCH 1/5] scsi: ips: remove function tracing macros Ethan Nelson-Moore
2025-12-20 5:15 ` [PATCH 2/5] scsi: ibmvfc: " Ethan Nelson-Moore
@ 2025-12-20 5:16 ` Ethan Nelson-Moore
2025-12-20 5:16 ` [PATCH 4/5] scsi: ipr: remove function tracing macros Ethan Nelson-Moore
2025-12-20 5:16 ` [PATCH 5/5] scsi: qla1280: " Ethan Nelson-Moore
3 siblings, 0 replies; 7+ messages in thread
From: Ethan Nelson-Moore @ 2025-12-20 5:16 UTC (permalink / raw)
To: linux-scsi; +Cc: Ethan Nelson-Moore
Also remove the ASD_ENTER_EXIT definition which enables them.
Signed-off-by: Ethan Nelson-Moore <enelsonmoore@gmail.com>
---
drivers/scsi/aic94xx/Makefile | 2 +-
drivers/scsi/aic94xx/aic94xx.h | 10 ----------
2 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/drivers/scsi/aic94xx/Makefile b/drivers/scsi/aic94xx/Makefile
index db9fbe3a8e4c..a6894138dfcf 100644
--- a/drivers/scsi/aic94xx/Makefile
+++ b/drivers/scsi/aic94xx/Makefile
@@ -6,7 +6,7 @@
# Copyright (C) 2005 Luben Tuikov <luben_tuikov@adaptec.com>
#
-ccflags-$(CONFIG_AIC94XX_DEBUG) := -DASD_DEBUG -DASD_ENTER_EXIT
+ccflags-$(CONFIG_AIC94XX_DEBUG) := -DASD_DEBUG
obj-$(CONFIG_SCSI_AIC94XX) += aic94xx.o
aic94xx-y += aic94xx_init.o \
diff --git a/drivers/scsi/aic94xx/aic94xx.h b/drivers/scsi/aic94xx/aic94xx.h
index f595bc2ee45e..722fdd7cee11 100644
--- a/drivers/scsi/aic94xx/aic94xx.h
+++ b/drivers/scsi/aic94xx/aic94xx.h
@@ -20,16 +20,6 @@
#define asd_printk(fmt, ...) printk(KERN_NOTICE ASD_DRIVER_NAME ": " fmt, ## __VA_ARGS__)
-#ifdef ASD_ENTER_EXIT
-#define ENTER printk(KERN_NOTICE "%s: ENTER %s\n", ASD_DRIVER_NAME, \
- __func__)
-#define EXIT printk(KERN_NOTICE "%s: --EXIT %s\n", ASD_DRIVER_NAME, \
- __func__)
-#else
-#define ENTER
-#define EXIT
-#endif
-
#ifdef ASD_DEBUG
#define ASD_DPRINTK asd_printk
#else
--
2.43.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 4/5] scsi: ipr: remove function tracing macros
2025-12-20 5:15 [PATCH 1/5] scsi: ips: remove function tracing macros Ethan Nelson-Moore
2025-12-20 5:15 ` [PATCH 2/5] scsi: ibmvfc: " Ethan Nelson-Moore
2025-12-20 5:16 ` [PATCH 3/5] scsi: aic94xx: remove unused ENTER/EXIT macros Ethan Nelson-Moore
@ 2025-12-20 5:16 ` Ethan Nelson-Moore
2025-12-20 5:16 ` [PATCH 5/5] scsi: qla1280: " Ethan Nelson-Moore
3 siblings, 0 replies; 7+ messages in thread
From: Ethan Nelson-Moore @ 2025-12-20 5:16 UTC (permalink / raw)
To: linux-scsi; +Cc: Ethan Nelson-Moore
These function tracing macros clutter the code and provide
no value over ftrace. Remove them.
Signed-off-by: Ethan Nelson-Moore <enelsonmoore@gmail.com>
---
drivers/scsi/ipr.c | 127 ---------------------------------------------
drivers/scsi/ipr.h | 3 --
2 files changed, 130 deletions(-)
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index dbd58a7e7bc1..725bfd5d6e28 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -856,7 +856,6 @@ static void ipr_fail_all_ops(struct ipr_ioa_cfg *ioa_cfg)
struct ipr_cmnd *ipr_cmd, *temp;
struct ipr_hrr_queue *hrrq;
- ENTER;
for_each_hrrq(hrrq, ioa_cfg) {
spin_lock(&hrrq->_lock);
list_for_each_entry_safe(ipr_cmd,
@@ -878,7 +877,6 @@ static void ipr_fail_all_ops(struct ipr_ioa_cfg *ioa_cfg)
}
spin_unlock(&hrrq->_lock);
}
- LEAVE;
}
/**
@@ -2593,7 +2591,6 @@ static void ipr_timeout(struct timer_list *t)
unsigned long lock_flags = 0;
struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
- ENTER;
spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
ioa_cfg->errors_logged++;
@@ -2607,7 +2604,6 @@ static void ipr_timeout(struct timer_list *t)
ipr_initiate_ioa_reset(ioa_cfg, IPR_SHUTDOWN_NONE);
spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
- LEAVE;
}
/**
@@ -2626,7 +2622,6 @@ static void ipr_oper_timeout(struct timer_list *t)
unsigned long lock_flags = 0;
struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
- ENTER;
spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
ioa_cfg->errors_logged++;
@@ -2643,7 +2638,6 @@ static void ipr_oper_timeout(struct timer_list *t)
}
spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
- LEAVE;
}
/**
@@ -3058,8 +3052,6 @@ static void ipr_get_ioa_dump(struct ipr_ioa_cfg *ioa_cfg, struct ipr_dump *dump)
int valid = 1;
int i;
- ENTER;
-
spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
if (ioa_cfg->sdt_state != READ_DUMP) {
@@ -3198,7 +3190,6 @@ static void ipr_get_ioa_dump(struct ipr_ioa_cfg *ioa_cfg, struct ipr_dump *dump)
driver_dump->hdr.len += ioa_dump->hdr.len;
wmb();
ioa_cfg->sdt_state = DUMP_OBTAINED;
- LEAVE;
}
#else
@@ -3219,7 +3210,6 @@ static void ipr_release_dump(struct kref *kref)
unsigned long lock_flags = 0;
int i;
- ENTER;
spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
ioa_cfg->dump = NULL;
ioa_cfg->sdt_state = INACTIVE;
@@ -3230,7 +3220,6 @@ static void ipr_release_dump(struct kref *kref)
vfree(dump->ioa_dump.ioa_data);
kfree(dump);
- LEAVE;
}
static void ipr_add_remove_thread(struct work_struct *work)
@@ -3243,7 +3232,6 @@ static void ipr_add_remove_thread(struct work_struct *work)
u8 bus, target, lun;
int did_work;
- ENTER;
spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
restart:
@@ -3289,7 +3277,6 @@ static void ipr_add_remove_thread(struct work_struct *work)
ioa_cfg->scan_done = 1;
spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
kobject_uevent(&ioa_cfg->host->shost_dev.kobj, KOBJ_CHANGE);
- LEAVE;
}
/**
@@ -3310,7 +3297,6 @@ static void ipr_worker_thread(struct work_struct *work)
struct ipr_ioa_cfg *ioa_cfg =
container_of(work, struct ipr_ioa_cfg, work_q);
- ENTER;
spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
if (ioa_cfg->sdt_state == READ_DUMP) {
@@ -3349,7 +3335,6 @@ static void ipr_worker_thread(struct work_struct *work)
schedule_work(&ioa_cfg->scsi_add_work_q);
spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
- LEAVE;
}
#ifdef CONFIG_SCSI_IPR_TRACE
@@ -4330,8 +4315,6 @@ static int ipr_free_dump(struct ipr_ioa_cfg *ioa_cfg)
struct ipr_dump *dump;
unsigned long lock_flags = 0;
- ENTER;
-
spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
dump = ioa_cfg->dump;
if (!dump) {
@@ -4344,7 +4327,6 @@ static int ipr_free_dump(struct ipr_ioa_cfg *ioa_cfg)
kref_put(&dump->kref, ipr_release_dump);
- LEAVE;
return 0;
}
@@ -4912,7 +4894,6 @@ static int ipr_wait_for_ops(struct ipr_ioa_cfg *ioa_cfg, void *device,
signed long timeout = IPR_ABORT_TASK_TIMEOUT;
DECLARE_COMPLETION_ONSTACK(comp);
- ENTER;
do {
wait = 0;
@@ -4952,13 +4933,11 @@ static int ipr_wait_for_ops(struct ipr_ioa_cfg *ioa_cfg, void *device,
if (wait)
dev_err(&ioa_cfg->pdev->dev, "Timed out waiting for aborted commands\n");
- LEAVE;
return wait ? FAILED : SUCCESS;
}
}
} while (wait);
- LEAVE;
return SUCCESS;
}
@@ -4968,7 +4947,6 @@ static int ipr_eh_host_reset(struct scsi_cmnd *cmd)
unsigned long lock_flags = 0;
int rc = SUCCESS;
- ENTER;
ioa_cfg = (struct ipr_ioa_cfg *) cmd->device->host->hostdata;
spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
@@ -4993,7 +4971,6 @@ static int ipr_eh_host_reset(struct scsi_cmnd *cmd)
}
spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
- LEAVE;
return rc;
}
@@ -5018,7 +4995,6 @@ static int ipr_device_reset(struct ipr_ioa_cfg *ioa_cfg,
struct ipr_cmd_pkt *cmd_pkt;
u32 ioasc;
- ENTER;
ipr_cmd = ipr_get_free_ipr_cmnd(ioa_cfg);
ioarcb = &ipr_cmd->ioarcb;
cmd_pkt = &ioarcb->cmd_pkt;
@@ -5034,7 +5010,6 @@ static int ipr_device_reset(struct ipr_ioa_cfg *ioa_cfg,
ioasc = be32_to_cpu(ipr_cmd->s.ioasa.hdr.ioasc);
list_add_tail(&ipr_cmd->queue, &ipr_cmd->hrrq->hrrq_free_q);
- LEAVE;
return IPR_IOASC_SENSE_KEY(ioasc) ? -EIO : 0;
}
@@ -5055,7 +5030,6 @@ static int __ipr_eh_dev_reset(struct scsi_cmnd *scsi_cmd)
struct ipr_resource_entry *res;
int rc = 0;
- ENTER;
ioa_cfg = (struct ipr_ioa_cfg *) scsi_cmd->device->host->hostdata;
res = scsi_cmd->device->hostdata;
@@ -5076,7 +5050,6 @@ static int __ipr_eh_dev_reset(struct scsi_cmnd *scsi_cmd)
res->resetting_device = 0;
res->reset_occurred = 1;
- LEAVE;
return rc ? FAILED : SUCCESS;
}
@@ -5116,7 +5089,6 @@ static void ipr_bus_reset_done(struct ipr_cmnd *ipr_cmd)
struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
struct ipr_resource_entry *res;
- ENTER;
if (!ioa_cfg->sis64)
list_for_each_entry(res, &ioa_cfg->used_res_q, queue) {
if (res->res_handle == ipr_cmd->ioarcb.res_handle) {
@@ -5135,7 +5107,6 @@ static void ipr_bus_reset_done(struct ipr_cmnd *ipr_cmd)
ipr_cmd->sibling->done(ipr_cmd->sibling);
list_add_tail(&ipr_cmd->queue, &ipr_cmd->hrrq->hrrq_free_q);
- LEAVE;
}
/**
@@ -5157,7 +5128,6 @@ static void ipr_abort_timeout(struct timer_list *t)
struct ipr_cmd_pkt *cmd_pkt;
unsigned long lock_flags = 0;
- ENTER;
spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
if (ipr_cmd->completion.done || ioa_cfg->in_reset_reload) {
spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
@@ -5176,7 +5146,6 @@ static void ipr_abort_timeout(struct timer_list *t)
ipr_do_req(reset_cmd, ipr_bus_reset_done, ipr_timeout, IPR_DEVICE_RESET_TIMEOUT);
spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
- LEAVE;
}
/**
@@ -5198,7 +5167,6 @@ static int ipr_cancel_op(struct scsi_cmnd *scsi_cmd)
int i, op_found = 0;
struct ipr_hrr_queue *hrrq;
- ENTER;
ioa_cfg = (struct ipr_ioa_cfg *)scsi_cmd->device->host->hostdata;
res = scsi_cmd->device->hostdata;
@@ -5263,7 +5231,6 @@ static int ipr_cancel_op(struct scsi_cmnd *scsi_cmd)
if (!ipr_is_naca_model(res))
res->needs_sync_complete = 1;
- LEAVE;
return IPR_IOASC_SENSE_KEY(ioasc) ? FAILED : SUCCESS;
}
@@ -5303,8 +5270,6 @@ static int ipr_eh_abort(struct scsi_cmnd *scsi_cmd)
int rc;
struct ipr_ioa_cfg *ioa_cfg;
- ENTER;
-
ioa_cfg = (struct ipr_ioa_cfg *) scsi_cmd->device->host->hostdata;
spin_lock_irqsave(scsi_cmd->device->host->host_lock, flags);
@@ -5313,7 +5278,6 @@ static int ipr_eh_abort(struct scsi_cmnd *scsi_cmd)
if (rc == SUCCESS)
rc = ipr_wait_for_ops(ioa_cfg, scsi_cmd->device, ipr_match_lun);
- LEAVE;
return rc;
}
@@ -6430,7 +6394,6 @@ static int ipr_ioa_bringdown_done(struct ipr_cmnd *ipr_cmd)
struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
int i;
- ENTER;
if (!ioa_cfg->hrrq[IPR_INIT_HRRQ].removing_ioa) {
ipr_trace;
ioa_cfg->scsi_unblock = 1;
@@ -6448,7 +6411,6 @@ static int ipr_ioa_bringdown_done(struct ipr_cmnd *ipr_cmd)
list_add_tail(&ipr_cmd->queue, &ipr_cmd->hrrq->hrrq_free_q);
wake_up_all(&ioa_cfg->reset_wait_q);
- LEAVE;
return IPR_RC_JOB_RETURN;
}
@@ -6470,7 +6432,6 @@ static int ipr_ioa_reset_done(struct ipr_cmnd *ipr_cmd)
struct ipr_resource_entry *res;
int j;
- ENTER;
ioa_cfg->in_reset_reload = 0;
for (j = 0; j < ioa_cfg->hrrq_num; j++) {
spin_lock(&ioa_cfg->hrrq[j]._lock);
@@ -6510,7 +6471,6 @@ static int ipr_ioa_reset_done(struct ipr_cmnd *ipr_cmd)
ioa_cfg->scsi_unblock = 1;
schedule_work(&ioa_cfg->work_q);
- LEAVE;
return IPR_RC_JOB_RETURN;
}
@@ -6578,11 +6538,9 @@ static int ipr_set_supported_devs(struct ipr_cmnd *ipr_cmd)
if (!ioa_cfg->sis64)
ipr_cmd->job_step = ipr_set_supported_devs;
- LEAVE;
return IPR_RC_JOB_RETURN;
}
- LEAVE;
return IPR_RC_JOB_CONTINUE;
}
@@ -6775,7 +6733,6 @@ static int ipr_ioafp_mode_select_page28(struct ipr_cmnd *ipr_cmd)
struct ipr_mode_pages *mode_pages = &ioa_cfg->vpd_cbs->mode_pages;
int length;
- ENTER;
ipr_scsi_bus_speed_limit(ioa_cfg);
ipr_check_term_power(ioa_cfg, mode_pages);
ipr_modify_ioafp_mode_page_28(ioa_cfg, mode_pages);
@@ -6791,7 +6748,6 @@ static int ipr_ioafp_mode_select_page28(struct ipr_cmnd *ipr_cmd)
struct ipr_resource_entry, queue);
ipr_do_req(ipr_cmd, ipr_reset_ioa_job, ipr_timeout, IPR_INTERNAL_TIMEOUT);
- LEAVE;
return IPR_RC_JOB_RETURN;
}
@@ -6883,7 +6839,6 @@ static int ipr_ioafp_mode_sense_page28(struct ipr_cmnd *ipr_cmd)
{
struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
- ENTER;
ipr_build_mode_sense(ipr_cmd, cpu_to_be32(IPR_IOA_RES_HANDLE),
0x28, ioa_cfg->vpd_cbs_dma +
offsetof(struct ipr_misc_cbs, mode_pages),
@@ -6894,7 +6849,6 @@ static int ipr_ioafp_mode_sense_page28(struct ipr_cmnd *ipr_cmd)
ipr_do_req(ipr_cmd, ipr_reset_ioa_job, ipr_timeout, IPR_INTERNAL_TIMEOUT);
- LEAVE;
return IPR_RC_JOB_RETURN;
}
@@ -6914,7 +6868,6 @@ static int ipr_ioafp_mode_select_page24(struct ipr_cmnd *ipr_cmd)
struct ipr_mode_page24 *mode_page;
int length;
- ENTER;
mode_page = ipr_get_mode_page(mode_pages, 0x24,
sizeof(struct ipr_mode_page24));
@@ -6931,7 +6884,6 @@ static int ipr_ioafp_mode_select_page24(struct ipr_cmnd *ipr_cmd)
ipr_cmd->job_step = ipr_ioafp_mode_sense_page28;
ipr_do_req(ipr_cmd, ipr_reset_ioa_job, ipr_timeout, IPR_INTERNAL_TIMEOUT);
- LEAVE;
return IPR_RC_JOB_RETURN;
}
@@ -6971,7 +6923,6 @@ static int ipr_ioafp_mode_sense_page24(struct ipr_cmnd *ipr_cmd)
{
struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
- ENTER;
ipr_build_mode_sense(ipr_cmd, cpu_to_be32(IPR_IOA_RES_HANDLE),
0x24, ioa_cfg->vpd_cbs_dma +
offsetof(struct ipr_misc_cbs, mode_pages),
@@ -6982,7 +6933,6 @@ static int ipr_ioafp_mode_sense_page24(struct ipr_cmnd *ipr_cmd)
ipr_do_req(ipr_cmd, ipr_reset_ioa_job, ipr_timeout, IPR_INTERNAL_TIMEOUT);
- LEAVE;
return IPR_RC_JOB_RETURN;
}
@@ -7006,7 +6956,6 @@ static int ipr_init_res_table(struct ipr_cmnd *ipr_cmd)
int entries, found, flag, i;
LIST_HEAD(old_res);
- ENTER;
if (ioa_cfg->sis64)
flag = ioa_cfg->u.cfg_table64->hdr64.flags;
else
@@ -7075,7 +7024,6 @@ static int ipr_init_res_table(struct ipr_cmnd *ipr_cmd)
else
ipr_cmd->job_step = ipr_ioafp_mode_sense_page28;
- LEAVE;
return IPR_RC_JOB_CONTINUE;
}
@@ -7096,7 +7044,6 @@ static int ipr_ioafp_query_ioa_cfg(struct ipr_cmnd *ipr_cmd)
struct ipr_inquiry_page3 *ucode_vpd = &ioa_cfg->vpd_cbs->page3_data;
struct ipr_inquiry_cap *cap = &ioa_cfg->vpd_cbs->cap;
- ENTER;
if (cap->cap & IPR_CAP_DUAL_IOA_RAID)
ioa_cfg->dual_raid = 1;
dev_info(&ioa_cfg->pdev->dev, "Adapter firmware version: %02X%02X%02X%02X\n",
@@ -7117,7 +7064,6 @@ static int ipr_ioafp_query_ioa_cfg(struct ipr_cmnd *ipr_cmd)
ipr_do_req(ipr_cmd, ipr_reset_ioa_job, ipr_timeout, IPR_INTERNAL_TIMEOUT);
- LEAVE;
return IPR_RC_JOB_RETURN;
}
@@ -7156,8 +7102,6 @@ static int ipr_ioafp_set_caching_parameters(struct ipr_cmnd *ipr_cmd)
struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
struct ipr_inquiry_pageC4 *pageC4 = &ioa_cfg->vpd_cbs->pageC4_data;
- ENTER;
-
ipr_cmd->job_step = ipr_ioafp_query_ioa_cfg;
if (pageC4->cache_cap[0] & IPR_CAP_SYNC_CACHE) {
@@ -7171,11 +7115,9 @@ static int ipr_ioafp_set_caching_parameters(struct ipr_cmnd *ipr_cmd)
ipr_do_req(ipr_cmd, ipr_reset_ioa_job, ipr_timeout,
IPR_SET_SUP_DEVICE_TIMEOUT);
- LEAVE;
return IPR_RC_JOB_RETURN;
}
- LEAVE;
return IPR_RC_JOB_CONTINUE;
}
@@ -7197,7 +7139,6 @@ static void ipr_ioafp_inquiry(struct ipr_cmnd *ipr_cmd, u8 flags, u8 page,
{
struct ipr_ioarcb *ioarcb = &ipr_cmd->ioarcb;
- ENTER;
ioarcb->cmd_pkt.request_type = IPR_RQTYPE_SCSICDB;
ioarcb->res_handle = cpu_to_be32(IPR_IOA_RES_HANDLE);
@@ -7209,7 +7150,6 @@ static void ipr_ioafp_inquiry(struct ipr_cmnd *ipr_cmd, u8 flags, u8 page,
ipr_init_ioadl(ipr_cmd, dma_addr, xfer_len, IPR_IOADL_FLAGS_READ_LAST);
ipr_do_req(ipr_cmd, ipr_reset_ioa_job, ipr_timeout, IPR_INTERNAL_TIMEOUT);
- LEAVE;
}
/**
@@ -7249,7 +7189,6 @@ static int ipr_ioafp_pageC4_inquiry(struct ipr_cmnd *ipr_cmd)
struct ipr_inquiry_page0 *page0 = &ioa_cfg->vpd_cbs->page0_data;
struct ipr_inquiry_pageC4 *pageC4 = &ioa_cfg->vpd_cbs->pageC4_data;
- ENTER;
ipr_cmd->job_step = ipr_ioafp_set_caching_parameters;
memset(pageC4, 0, sizeof(*pageC4));
@@ -7262,7 +7201,6 @@ static int ipr_ioafp_pageC4_inquiry(struct ipr_cmnd *ipr_cmd)
return IPR_RC_JOB_RETURN;
}
- LEAVE;
return IPR_RC_JOB_CONTINUE;
}
@@ -7282,7 +7220,6 @@ static int ipr_ioafp_cap_inquiry(struct ipr_cmnd *ipr_cmd)
struct ipr_inquiry_page0 *page0 = &ioa_cfg->vpd_cbs->page0_data;
struct ipr_inquiry_cap *cap = &ioa_cfg->vpd_cbs->cap;
- ENTER;
ipr_cmd->job_step = ipr_ioafp_pageC4_inquiry;
memset(cap, 0, sizeof(*cap));
@@ -7293,7 +7230,6 @@ static int ipr_ioafp_cap_inquiry(struct ipr_cmnd *ipr_cmd)
return IPR_RC_JOB_RETURN;
}
- LEAVE;
return IPR_RC_JOB_CONTINUE;
}
@@ -7311,15 +7247,12 @@ static int ipr_ioafp_page3_inquiry(struct ipr_cmnd *ipr_cmd)
{
struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
- ENTER;
-
ipr_cmd->job_step = ipr_ioafp_cap_inquiry;
ipr_ioafp_inquiry(ipr_cmd, 1, 3,
ioa_cfg->vpd_cbs_dma + offsetof(struct ipr_misc_cbs, page3_data),
sizeof(struct ipr_inquiry_page3));
- LEAVE;
return IPR_RC_JOB_RETURN;
}
@@ -7338,8 +7271,6 @@ static int ipr_ioafp_page0_inquiry(struct ipr_cmnd *ipr_cmd)
struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
char type[5];
- ENTER;
-
/* Grab the type out of the VPD and store it away */
memcpy(type, ioa_cfg->vpd_cbs->ioa_vpd.std_inq_data.vpids.product_id, 4);
type[4] = '\0';
@@ -7351,7 +7282,6 @@ static int ipr_ioafp_page0_inquiry(struct ipr_cmnd *ipr_cmd)
ioa_cfg->vpd_cbs_dma + offsetof(struct ipr_misc_cbs, page0_data),
sizeof(struct ipr_inquiry_page0));
- LEAVE;
return IPR_RC_JOB_RETURN;
}
@@ -7368,14 +7298,12 @@ static int ipr_ioafp_std_inquiry(struct ipr_cmnd *ipr_cmd)
{
struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
- ENTER;
ipr_cmd->job_step = ipr_ioafp_page0_inquiry;
ipr_ioafp_inquiry(ipr_cmd, 0, 0,
ioa_cfg->vpd_cbs_dma + offsetof(struct ipr_misc_cbs, ioa_vpd),
sizeof(struct ipr_ioa_vpd));
- LEAVE;
return IPR_RC_JOB_RETURN;
}
@@ -7395,7 +7323,6 @@ static int ipr_ioafp_identify_hrrq(struct ipr_cmnd *ipr_cmd)
struct ipr_ioarcb *ioarcb = &ipr_cmd->ioarcb;
struct ipr_hrr_queue *hrrq;
- ENTER;
ipr_cmd->job_step = ipr_ioafp_std_inquiry;
if (ioa_cfg->identify_hrrq_index == 0)
dev_info(&ioa_cfg->pdev->dev, "Starting IOA initialization sequence.\n");
@@ -7453,11 +7380,9 @@ static int ipr_ioafp_identify_hrrq(struct ipr_cmnd *ipr_cmd)
if (++ioa_cfg->identify_hrrq_index < ioa_cfg->hrrq_num)
ipr_cmd->job_step = ipr_ioafp_identify_hrrq;
- LEAVE;
return IPR_RC_JOB_RETURN;
}
- LEAVE;
return IPR_RC_JOB_CONTINUE;
}
@@ -7508,7 +7433,6 @@ static void ipr_reset_start_timer(struct ipr_cmnd *ipr_cmd,
unsigned long timeout)
{
- ENTER;
list_add_tail(&ipr_cmd->queue, &ipr_cmd->hrrq->hrrq_pending_q);
ipr_cmd->done = ipr_reset_ioa_job;
@@ -7624,7 +7548,6 @@ static int ipr_reset_enable_ioa(struct ipr_cmnd *ipr_cmd)
volatile u64 maskval;
int i;
- ENTER;
ipr_cmd->job_step = ipr_ioafp_identify_hrrq;
ipr_init_ioa_mem(ioa_cfg);
@@ -7673,7 +7596,6 @@ static int ipr_reset_enable_ioa(struct ipr_cmnd *ipr_cmd)
add_timer(&ipr_cmd->timer);
list_add_tail(&ipr_cmd->queue, &ipr_cmd->hrrq->hrrq_pending_q);
- LEAVE;
return IPR_RC_JOB_RETURN;
}
@@ -7797,13 +7719,11 @@ static int ipr_reset_get_unit_check_job(struct ipr_cmnd *ipr_cmd)
{
struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
- ENTER;
ioa_cfg->ioa_unit_checked = 0;
ipr_get_unit_check_buffer(ioa_cfg);
ipr_cmd->job_step = ipr_reset_alert;
ipr_reset_start_timer(ipr_cmd, 0);
- LEAVE;
return IPR_RC_JOB_RETURN;
}
@@ -7811,8 +7731,6 @@ static int ipr_dump_mailbox_wait(struct ipr_cmnd *ipr_cmd)
{
struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
- ENTER;
-
if (ioa_cfg->sdt_state != GET_DUMP)
return IPR_RC_JOB_RETURN;
@@ -7839,7 +7757,6 @@ static int ipr_dump_mailbox_wait(struct ipr_cmnd *ipr_cmd)
IPR_CHECK_FOR_RESET_TIMEOUT);
}
- LEAVE;
return IPR_RC_JOB_RETURN;
}
@@ -7882,7 +7799,6 @@ static int ipr_reset_restore_cfg_space(struct ipr_cmnd *ipr_cmd)
{
struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
- ENTER;
pci_restore_state(ioa_cfg->pdev);
if (ipr_set_pcix_cmd_reg(ioa_cfg)) {
@@ -7922,7 +7838,6 @@ static int ipr_reset_restore_cfg_space(struct ipr_cmnd *ipr_cmd)
ipr_cmd->job_step = ipr_reset_enable_ioa;
}
- LEAVE;
return IPR_RC_JOB_CONTINUE;
}
@@ -7939,12 +7854,10 @@ static int ipr_reset_bist_done(struct ipr_cmnd *ipr_cmd)
{
struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
- ENTER;
if (ioa_cfg->cfg_locked)
pci_cfg_access_unlock(ioa_cfg->pdev);
ioa_cfg->cfg_locked = 0;
ipr_cmd->job_step = ipr_reset_restore_cfg_space;
- LEAVE;
return IPR_RC_JOB_CONTINUE;
}
@@ -7962,7 +7875,6 @@ static int ipr_reset_start_bist(struct ipr_cmnd *ipr_cmd)
struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
int rc = PCIBIOS_SUCCESSFUL;
- ENTER;
if (ioa_cfg->ipr_chip->bist_method == IPR_MMIO)
writel(IPR_UPROCI_SIS64_START_BIST,
ioa_cfg->regs.set_uproc_interrupt_reg32);
@@ -7982,7 +7894,6 @@ static int ipr_reset_start_bist(struct ipr_cmnd *ipr_cmd)
rc = IPR_RC_JOB_CONTINUE;
}
- LEAVE;
return rc;
}
@@ -7997,10 +7908,8 @@ static int ipr_reset_start_bist(struct ipr_cmnd *ipr_cmd)
**/
static int ipr_reset_slot_reset_done(struct ipr_cmnd *ipr_cmd)
{
- ENTER;
ipr_cmd->job_step = ipr_reset_bist_done;
ipr_reset_start_timer(ipr_cmd, IPR_WAIT_FOR_BIST_TIMEOUT);
- LEAVE;
return IPR_RC_JOB_RETURN;
}
@@ -8018,7 +7927,6 @@ static void ipr_reset_reset_work(struct work_struct *work)
struct pci_dev *pdev = ioa_cfg->pdev;
unsigned long lock_flags = 0;
- ENTER;
pci_set_pcie_reset_state(pdev, pcie_warm_reset);
msleep(jiffies_to_msecs(IPR_PCI_RESET_TIMEOUT));
pci_set_pcie_reset_state(pdev, pcie_deassert_reset);
@@ -8027,7 +7935,6 @@ static void ipr_reset_reset_work(struct work_struct *work)
if (ioa_cfg->reset_cmd == ipr_cmd)
ipr_reset_ioa_job(ipr_cmd);
spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
- LEAVE;
}
/**
@@ -8043,11 +7950,9 @@ static int ipr_reset_slot_reset(struct ipr_cmnd *ipr_cmd)
{
struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
- ENTER;
INIT_WORK(&ipr_cmd->work, ipr_reset_reset_work);
queue_work(ioa_cfg->reset_work_q, &ipr_cmd->work);
ipr_cmd->job_step = ipr_reset_slot_reset_done;
- LEAVE;
return IPR_RC_JOB_RETURN;
}
@@ -8165,7 +8070,6 @@ static int ipr_reset_alert(struct ipr_cmnd *ipr_cmd)
u16 cmd_reg;
int rc;
- ENTER;
rc = pci_read_config_word(ioa_cfg->pdev, PCI_COMMAND, &cmd_reg);
if ((rc == PCIBIOS_SUCCESSFUL) && (cmd_reg & PCI_COMMAND_MEMORY)) {
@@ -8179,7 +8083,6 @@ static int ipr_reset_alert(struct ipr_cmnd *ipr_cmd)
ipr_cmd->u.time_left = IPR_WAIT_FOR_RESET_TIMEOUT;
ipr_reset_start_timer(ipr_cmd, IPR_CHECK_FOR_RESET_TIMEOUT);
- LEAVE;
return IPR_RC_JOB_RETURN;
}
@@ -8196,10 +8099,8 @@ static int ipr_reset_quiesce_done(struct ipr_cmnd *ipr_cmd)
{
struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
- ENTER;
ipr_cmd->job_step = ipr_ioa_bringdown_done;
ipr_mask_and_clear_interrupts(ioa_cfg, ~IPR_PCII_IOA_TRANS_TO_OPER);
- LEAVE;
return IPR_RC_JOB_CONTINUE;
}
@@ -8221,7 +8122,6 @@ static int ipr_reset_cancel_hcam_done(struct ipr_cmnd *ipr_cmd)
int rc = IPR_RC_JOB_CONTINUE;
int count = 0;
- ENTER;
ipr_cmd->job_step = ipr_reset_quiesce_done;
for_each_hrrq(hrrq, ioa_cfg) {
@@ -8239,7 +8139,6 @@ static int ipr_reset_cancel_hcam_done(struct ipr_cmnd *ipr_cmd)
break;
}
- LEAVE;
return rc;
}
@@ -8260,7 +8159,6 @@ static int ipr_reset_cancel_hcam(struct ipr_cmnd *ipr_cmd)
struct ipr_cmnd *hcam_cmd;
struct ipr_hrr_queue *hrrq = &ioa_cfg->hrrq[IPR_INIT_HRRQ];
- ENTER;
ipr_cmd->job_step = ipr_reset_cancel_hcam_done;
if (!hrrq->ioa_is_dead) {
@@ -8295,7 +8193,6 @@ static int ipr_reset_cancel_hcam(struct ipr_cmnd *ipr_cmd)
} else
ipr_cmd->job_step = ipr_reset_alert;
- LEAVE;
return rc;
}
@@ -8335,7 +8232,6 @@ static int ipr_reset_ucode_download(struct ipr_cmnd *ipr_cmd)
struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
struct ipr_sglist *sglist = ioa_cfg->ucode_sglist;
- ENTER;
ipr_cmd->job_step = ipr_reset_alert;
if (!sglist)
@@ -8358,7 +8254,6 @@ static int ipr_reset_ucode_download(struct ipr_cmnd *ipr_cmd)
ipr_do_req(ipr_cmd, ipr_reset_ioa_job, ipr_timeout,
IPR_WRITE_BUFFER_TIMEOUT);
- LEAVE;
return IPR_RC_JOB_RETURN;
}
@@ -8380,7 +8275,6 @@ static int ipr_reset_shutdown_ioa(struct ipr_cmnd *ipr_cmd)
unsigned long timeout;
int rc = IPR_RC_JOB_CONTINUE;
- ENTER;
if (shutdown_type == IPR_SHUTDOWN_QUIESCE)
ipr_cmd->job_step = ipr_reset_cancel_hcam;
else if (shutdown_type != IPR_SHUTDOWN_NONE &&
@@ -8406,7 +8300,6 @@ static int ipr_reset_shutdown_ioa(struct ipr_cmnd *ipr_cmd)
} else
ipr_cmd->job_step = ipr_reset_alert;
- LEAVE;
return rc;
}
@@ -8711,7 +8604,6 @@ static void ipr_probe_ioa_part2(struct ipr_ioa_cfg *ioa_cfg)
{
unsigned long host_lock_flags = 0;
- ENTER;
spin_lock_irqsave(ioa_cfg->host->host_lock, host_lock_flags);
dev_dbg(&ioa_cfg->pdev->dev, "ioa_cfg adx: 0x%p\n", ioa_cfg);
ioa_cfg->probe_done = 1;
@@ -8723,7 +8615,6 @@ static void ipr_probe_ioa_part2(struct ipr_ioa_cfg *ioa_cfg)
IPR_SHUTDOWN_NONE);
spin_unlock_irqrestore(ioa_cfg->host->host_lock, host_lock_flags);
- LEAVE;
}
/**
@@ -8827,7 +8718,6 @@ static void ipr_free_all_resources(struct ipr_ioa_cfg *ioa_cfg)
{
struct pci_dev *pdev = ioa_cfg->pdev;
- ENTER;
ipr_free_irqs(ioa_cfg);
if (ioa_cfg->reset_work_q)
destroy_workqueue(ioa_cfg->reset_work_q);
@@ -8836,7 +8726,6 @@ static void ipr_free_all_resources(struct ipr_ioa_cfg *ioa_cfg)
ipr_free_mem(ioa_cfg);
scsi_host_put(ioa_cfg->host);
pci_disable_device(pdev);
- LEAVE;
}
/**
@@ -8962,7 +8851,6 @@ static int ipr_alloc_mem(struct ipr_ioa_cfg *ioa_cfg)
struct pci_dev *pdev = ioa_cfg->pdev;
int i, rc = -ENOMEM;
- ENTER;
ioa_cfg->res_entries = kcalloc(ioa_cfg->max_devs_supported,
sizeof(struct ipr_resource_entry),
GFP_KERNEL);
@@ -9035,7 +8923,6 @@ static int ipr_alloc_mem(struct ipr_ioa_cfg *ioa_cfg)
rc = 0;
out:
- LEAVE;
return rc;
out_free_hostrcb_dma:
@@ -9319,8 +9206,6 @@ static int ipr_test_msi(struct ipr_ioa_cfg *ioa_cfg, struct pci_dev *pdev)
unsigned long lock_flags = 0;
int irq = pci_irq_vector(pdev, 0);
- ENTER;
-
spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
init_waitqueue_head(&ioa_cfg->msi_wait_q);
ioa_cfg->msi_received = 0;
@@ -9353,8 +9238,6 @@ static int ipr_test_msi(struct ipr_ioa_cfg *ioa_cfg, struct pci_dev *pdev)
free_irq(irq, ioa_cfg);
- LEAVE;
-
return rc;
}
@@ -9377,8 +9260,6 @@ static int ipr_probe_ioa(struct pci_dev *pdev,
unsigned long lock_flags, driver_lock_flags;
unsigned int irq_flag;
- ENTER;
-
dev_info(&pdev->dev, "Found IOA with IRQ: %d\n", pdev->irq);
host = scsi_host_alloc(&driver_template, sizeof(*ioa_cfg));
@@ -9616,7 +9497,6 @@ static int ipr_probe_ioa(struct pci_dev *pdev,
list_add_tail(&ioa_cfg->queue, &ipr_ioa_head);
spin_unlock_irqrestore(&ipr_driver_lock, driver_lock_flags);
- LEAVE;
out:
return rc;
@@ -9655,13 +9535,11 @@ static int ipr_probe_ioa(struct pci_dev *pdev,
static void ipr_initiate_ioa_bringdown(struct ipr_ioa_cfg *ioa_cfg,
enum ipr_shutdown_type shutdown_type)
{
- ENTER;
if (ioa_cfg->sdt_state == WAIT_FOR_DUMP)
ioa_cfg->sdt_state = ABORT_DUMP;
ioa_cfg->reset_retries = 0;
ioa_cfg->in_ioa_bringdown = 1;
ipr_initiate_ioa_reset(ioa_cfg, shutdown_type);
- LEAVE;
}
/**
@@ -9679,7 +9557,6 @@ static void __ipr_remove(struct pci_dev *pdev)
struct ipr_ioa_cfg *ioa_cfg = pci_get_drvdata(pdev);
int i;
unsigned long driver_lock_flags;
- ENTER;
spin_lock_irqsave(ioa_cfg->host->host_lock, host_lock_flags);
while (ioa_cfg->in_reset_reload) {
@@ -9714,7 +9591,6 @@ static void __ipr_remove(struct pci_dev *pdev)
ipr_free_all_resources(ioa_cfg);
- LEAVE;
}
/**
@@ -9730,8 +9606,6 @@ static void ipr_remove(struct pci_dev *pdev)
{
struct ipr_ioa_cfg *ioa_cfg = pci_get_drvdata(pdev);
- ENTER;
-
ipr_remove_trace_file(&ioa_cfg->host->shost_dev.kobj,
&ipr_trace_attr);
ipr_remove_dump_file(&ioa_cfg->host->shost_dev.kobj,
@@ -9742,7 +9616,6 @@ static void ipr_remove(struct pci_dev *pdev)
__ipr_remove(pdev);
- LEAVE;
}
/**
diff --git a/drivers/scsi/ipr.h b/drivers/scsi/ipr.h
index fde7145835de..55bf2e36298c 100644
--- a/drivers/scsi/ipr.h
+++ b/drivers/scsi/ipr.h
@@ -1764,9 +1764,6 @@ struct ipr_ucode_image_header {
#define ipr_trace ipr_dbg("%s: %s: Line: %d\n",\
__FILE__, __func__, __LINE__)
-#define ENTER IPR_DBG_CMD(printk(KERN_INFO IPR_NAME": Entering %s\n", __func__))
-#define LEAVE IPR_DBG_CMD(printk(KERN_INFO IPR_NAME": Leaving %s\n", __func__))
-
#define ipr_err_separator \
ipr_err("----------------------------------------------------------\n")
--
2.43.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 5/5] scsi: qla1280: remove function tracing macros
2025-12-20 5:15 [PATCH 1/5] scsi: ips: remove function tracing macros Ethan Nelson-Moore
` (2 preceding siblings ...)
2025-12-20 5:16 ` [PATCH 4/5] scsi: ipr: remove function tracing macros Ethan Nelson-Moore
@ 2025-12-20 5:16 ` Ethan Nelson-Moore
2025-12-21 5:45 ` kernel test robot
2025-12-22 12:55 ` kernel test robot
3 siblings, 2 replies; 7+ messages in thread
From: Ethan Nelson-Moore @ 2025-12-20 5:16 UTC (permalink / raw)
To: linux-scsi; +Cc: Ethan Nelson-Moore
These function tracing macros clutter the code and provide
no value over ftrace. Remove them.
Signed-off-by: Ethan Nelson-Moore <enelsonmoore@gmail.com>
---
drivers/scsi/qla1280.c | 75 ------------------------------------------
1 file changed, 75 deletions(-)
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index 26c312a48a19..15f0df1ff63f 100644
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -561,12 +561,6 @@ static int ql_debug_level = 1;
#define qla1280_print_scsi_cmd(a, b) do{}while(0)
#endif
-#define ENTER(x) dprintk(3, "qla1280 : Entering %s()\n", x);
-#define LEAVE(x) dprintk(3, "qla1280 : Leaving %s()\n", x);
-#define ENTER_INTR(x) dprintk(4, "qla1280 : Entering %s()\n", x);
-#define LEAVE_INTR(x) dprintk(4, "qla1280 : Leaving %s()\n", x);
-
-
static int qla1280_read_nvram(struct scsi_qla_host *ha)
{
uint16_t *wptr;
@@ -574,8 +568,6 @@ static int qla1280_read_nvram(struct scsi_qla_host *ha)
int cnt, i;
struct nvram *nv;
- ENTER("qla1280_read_nvram");
-
if (driver_setup.no_nvram)
return 1;
@@ -641,7 +633,6 @@ static int qla1280_read_nvram(struct scsi_qla_host *ha)
nv->bus[i].max_queue_depth = cpu_to_le16(nv->bus[i].max_queue_depth);
}
dprintk(1, "qla1280_read_nvram: Completed Reading NVRAM\n");
- LEAVE("qla1280_read_nvram");
return chksum;
}
@@ -817,8 +808,6 @@ qla1280_error_action(struct scsi_cmnd *cmd, enum action action)
int wait_for_target = -1;
DECLARE_COMPLETION_ONSTACK(wait);
- ENTER("qla1280_error_action");
-
ha = (struct scsi_qla_host *)(CMD_HOST(cmd)->hostdata);
sp = scsi_cmd_priv(cmd);
bus = SCSI_BUS_32(cmd);
@@ -938,7 +927,6 @@ qla1280_error_action(struct scsi_cmnd *cmd, enum action action)
dprintk(1, "RESET returning %d\n", result);
- LEAVE("qla1280_error_action");
return result;
}
@@ -1075,7 +1063,6 @@ qla1280_intr_handler(int irq, void *dev_id)
u16 data;
int handled = 0;
- ENTER_INTR ("qla1280_intr_handler");
ha = (struct scsi_qla_host *)dev_id;
spin_lock(ha->host->host_lock);
@@ -1098,7 +1085,6 @@ qla1280_intr_handler(int irq, void *dev_id)
qla1280_enable_intrs(ha);
- LEAVE_INTR("qla1280_intr_handler");
return IRQ_RETVAL(handled);
}
@@ -1236,8 +1222,6 @@ qla1280_done(struct scsi_qla_host *ha)
int bus, target;
struct scsi_cmnd *cmd;
- ENTER("qla1280_done");
-
done_q = &ha->done_q;
while (!list_empty(done_q)) {
@@ -1274,7 +1258,6 @@ qla1280_done(struct scsi_qla_host *ha)
else
complete(sp->wait);
}
- LEAVE("qla1280_done");
}
/*
@@ -1303,8 +1286,6 @@ qla1280_return_status(struct response * sts, struct scsi_cmnd *cp)
};
#endif /* DEBUG_QLA1280_INTR */
- ENTER("qla1280_return_status");
-
#if DEBUG_QLA1280_INTR
/*
dprintk(1, "qla1280_return_status: compl status = 0x%04x\n",
@@ -1374,8 +1355,6 @@ qla1280_return_status(struct response * sts, struct scsi_cmnd *cp)
reason[host_status], scsi_status);
#endif
- LEAVE("qla1280_return_status");
-
return (scsi_status & 0xff) | (host_status << 16);
}
@@ -1401,8 +1380,6 @@ qla1280_initialize_adapter(struct scsi_qla_host *ha)
int bus;
unsigned long flags;
- ENTER("qla1280_initialize_adapter");
-
/* Clear adapter flags. */
ha->flags.online = 0;
ha->flags.disable_host_adapter = 0;
@@ -1470,7 +1447,6 @@ qla1280_initialize_adapter(struct scsi_qla_host *ha)
if (status)
dprintk(2, "qla1280_initialize_adapter: **** FAILED ****\n");
- LEAVE("qla1280_initialize_adapter");
return status;
}
@@ -1879,8 +1855,6 @@ qla1280_init_rings(struct scsi_qla_host *ha)
uint16_t mb[MAILBOX_REGISTER_COUNT];
int status = 0;
- ENTER("qla1280_init_rings");
-
/* Clear outstanding commands array. */
memset(ha->outstanding_cmds, 0,
sizeof(struct srb *) * MAX_OUTSTANDING_COMMANDS);
@@ -1919,7 +1893,6 @@ qla1280_init_rings(struct scsi_qla_host *ha)
if (status)
dprintk(2, "qla1280_init_rings: **** FAILED ****\n");
- LEAVE("qla1280_init_rings");
return status;
}
@@ -2156,8 +2129,6 @@ qla1280_nvram_config(struct scsi_qla_host *ha)
int bus, target, status = 0;
uint16_t mb[MAILBOX_REGISTER_COUNT];
- ENTER("qla1280_nvram_config");
-
if (ha->nvram_valid) {
/* Always force AUTO sense for LINUX SCSI */
for (bus = 0; bus < MAX_BUSES; bus++)
@@ -2288,7 +2259,6 @@ qla1280_nvram_config(struct scsi_qla_host *ha)
if (status)
dprintk(2, "qla1280_nvram_config: **** FAILED ****\n");
- LEAVE("qla1280_nvram_config");
return status;
}
@@ -2419,8 +2389,6 @@ qla1280_mailbox_command(struct scsi_qla_host *ha, uint8_t mr, uint16_t *mb)
uint16_t __iomem *mptr;
DECLARE_COMPLETION_ONSTACK(wait);
- ENTER("qla1280_mailbox_command");
-
if (ha->mailbox_wait) {
printk(KERN_ERR "Warning mailbox wait already in use!\n");
}
@@ -2487,7 +2455,6 @@ qla1280_mailbox_command(struct scsi_qla_host *ha, uint8_t mr, uint16_t *mb)
dprintk(2, "qla1280_mailbox_command: **** FAILED, mailbox0 = "
"0x%x ****\n", mb[0]);
- LEAVE("qla1280_mailbox_command");
return status;
}
@@ -2505,8 +2472,6 @@ qla1280_poll(struct scsi_qla_host *ha)
uint16_t data;
LIST_HEAD(done_q);
- /* ENTER("qla1280_poll"); */
-
/* Check for pending interrupts. */
data = RD_REG_WORD(®->istatus);
if (data & RISC_INT)
@@ -2520,7 +2485,6 @@ qla1280_poll(struct scsi_qla_host *ha)
if (!list_empty(&done_q))
qla1280_done(ha);
- /* LEAVE("qla1280_poll"); */
}
/*
@@ -2600,8 +2564,6 @@ qla1280_device_reset(struct scsi_qla_host *ha, int bus, int target)
uint16_t mb[MAILBOX_REGISTER_COUNT];
int status;
- ENTER("qla1280_device_reset");
-
mb[0] = MBC_ABORT_TARGET;
mb[1] = (bus ? (target | BIT_7) : target) << 8;
mb[2] = 1;
@@ -2613,7 +2575,6 @@ qla1280_device_reset(struct scsi_qla_host *ha, int bus, int target)
if (status)
dprintk(2, "qla1280_device_reset: **** FAILED ****\n");
- LEAVE("qla1280_device_reset");
return status;
}
@@ -2635,8 +2596,6 @@ qla1280_abort_command(struct scsi_qla_host *ha, struct srb * sp, int handle)
unsigned int bus, target, lun;
int status;
- ENTER("qla1280_abort_command");
-
bus = SCSI_BUS_32(sp->cmd);
target = SCSI_TCN_32(sp->cmd);
lun = SCSI_LUN_32(sp->cmd);
@@ -2654,8 +2613,6 @@ qla1280_abort_command(struct scsi_qla_host *ha, struct srb * sp, int handle)
sp->flags &= ~SRB_ABORT_PENDING;
}
-
- LEAVE("qla1280_abort_command");
return status;
}
@@ -2671,8 +2628,6 @@ qla1280_reset_adapter(struct scsi_qla_host *ha)
{
struct device_reg __iomem *reg = ha->iobase;
- ENTER("qla1280_reset_adapter");
-
/* Disable ISP chip */
ha->flags.online = 0;
WRT_REG_WORD(®->ictrl, ISP_RESET);
@@ -2680,7 +2635,6 @@ qla1280_reset_adapter(struct scsi_qla_host *ha)
HC_RESET_RISC | HC_RELEASE_RISC | HC_DISABLE_BIOS);
RD_REG_WORD(®->id_l); /* Flush PCI write */
- LEAVE("qla1280_reset_adapter");
}
/*
@@ -2699,8 +2653,6 @@ qla1280_marker(struct scsi_qla_host *ha, int bus, int id, int lun, u8 type)
{
struct mrk_entry *pkt;
- ENTER("qla1280_marker");
-
/* Get request packet. */
if ((pkt = (struct mrk_entry *) qla1280_req_pkt(ha))) {
pkt->entry_type = MARKER_TYPE;
@@ -2713,7 +2665,6 @@ qla1280_marker(struct scsi_qla_host *ha, int bus, int id, int lun, u8 type)
qla1280_isp_cmd(ha);
}
- LEAVE("qla1280_marker");
}
@@ -2744,8 +2695,6 @@ qla1280_64bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)
int seg_cnt;
u8 dir;
- ENTER("qla1280_64bit_start_scsi:");
-
/* Calculate number of entries and segments required. */
req_cnt = 1;
seg_cnt = scsi_dma_map(cmd);
@@ -2997,8 +2946,6 @@ qla1280_32bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)
int seg_cnt;
u8 dir;
- ENTER("qla1280_32bit_start_scsi");
-
dprintk(1, "32bit_start: cmd=%p sp=%p CDB=%x\n", cmd, sp,
cmd->cmnd[0]);
@@ -3207,8 +3154,6 @@ qla1280_32bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)
if (status)
dprintk(2, "qla1280_32bit_start_scsi: **** FAILED ****\n");
- LEAVE("qla1280_32bit_start_scsi");
-
return status;
}
#endif
@@ -3232,8 +3177,6 @@ qla1280_req_pkt(struct scsi_qla_host *ha)
int cnt;
uint32_t timer;
- ENTER("qla1280_req_pkt");
-
/*
* This can be called from interrupt context, damn it!!!
*/
@@ -3297,8 +3240,6 @@ qla1280_isp_cmd(struct scsi_qla_host *ha)
{
struct device_reg __iomem *reg = ha->iobase;
- ENTER("qla1280_isp_cmd");
-
dprintk(5, "qla1280_isp_cmd: IOCB data:\n");
qla1280_dump_buffer(5, (char *)ha->request_ring_ptr,
REQUEST_ENTRY_SIZE);
@@ -3316,7 +3257,6 @@ qla1280_isp_cmd(struct scsi_qla_host *ha)
*/
WRT_REG_WORD(®->mailbox4, ha->req_ring_index);
- LEAVE("qla1280_isp_cmd");
}
/****************************************************************************/
@@ -3342,8 +3282,6 @@ qla1280_isr(struct scsi_qla_host *ha, struct list_head *done_q)
uint32_t index;
u16 istatus;
- ENTER("qla1280_isr");
-
istatus = RD_REG_WORD(®->istatus);
if (!(istatus & (RISC_INT | PCI_INT)))
return;
@@ -3541,7 +3479,6 @@ qla1280_isr(struct scsi_qla_host *ha, struct list_head *done_q)
}
out:
- LEAVE("qla1280_isr");
}
/*
@@ -3556,8 +3493,6 @@ qla1280_rst_aen(struct scsi_qla_host *ha)
{
uint8_t bus;
- ENTER("qla1280_rst_aen");
-
if (ha->flags.online && !ha->flags.reset_active &&
!ha->flags.abort_isp_active) {
ha->flags.reset_active = 1;
@@ -3575,7 +3510,6 @@ qla1280_rst_aen(struct scsi_qla_host *ha)
}
}
- LEAVE("qla1280_rst_aen");
}
@@ -3599,8 +3533,6 @@ qla1280_status_entry(struct scsi_qla_host *ha, struct response *pkt,
uint16_t scsi_status = le16_to_cpu(pkt->scsi_status);
uint16_t comp_status = le16_to_cpu(pkt->comp_status);
- ENTER("qla1280_status_entry");
-
/* Validate handle. */
if (handle < MAX_OUTSTANDING_COMMANDS)
sp = ha->outstanding_cmds[handle];
@@ -3669,7 +3601,6 @@ qla1280_status_entry(struct scsi_qla_host *ha, struct response *pkt,
/* Place command on done queue. */
list_add_tail(&sp->list, done_q);
out:
- LEAVE("qla1280_status_entry");
}
/*
@@ -3688,8 +3619,6 @@ qla1280_error_entry(struct scsi_qla_host *ha, struct response *pkt,
struct srb *sp;
uint32_t handle = le32_to_cpu(pkt->handle);
- ENTER("qla1280_error_entry");
-
if (pkt->entry_status & BIT_3)
dprintk(2, "qla1280_error_entry: BAD PAYLOAD flag error\n");
else if (pkt->entry_status & BIT_2)
@@ -3732,7 +3661,6 @@ qla1280_error_entry(struct scsi_qla_host *ha, struct response *pkt,
}
#endif
- LEAVE("qla1280_error_entry");
}
/*
@@ -3754,8 +3682,6 @@ qla1280_abort_isp(struct scsi_qla_host *ha)
int cnt;
int bus;
- ENTER("qla1280_abort_isp");
-
if (ha->flags.abort_isp_active || !ha->flags.online)
goto out;
@@ -3807,7 +3733,6 @@ qla1280_abort_isp(struct scsi_qla_host *ha)
dprintk(2, "qla1280_abort_isp: **** FAILED ****\n");
}
- LEAVE("qla1280_abort_isp");
return status;
}
--
2.43.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 5/5] scsi: qla1280: remove function tracing macros
2025-12-20 5:16 ` [PATCH 5/5] scsi: qla1280: " Ethan Nelson-Moore
@ 2025-12-21 5:45 ` kernel test robot
2025-12-22 12:55 ` kernel test robot
1 sibling, 0 replies; 7+ messages in thread
From: kernel test robot @ 2025-12-21 5:45 UTC (permalink / raw)
To: Ethan Nelson-Moore, linux-scsi; +Cc: llvm, oe-kbuild-all, Ethan Nelson-Moore
Hi Ethan,
kernel test robot noticed the following build warnings:
[auto build test WARNING on mkp-scsi/for-next]
[also build test WARNING on linus/master v6.19-rc1 next-20251219]
[cannot apply to jejb-scsi/for-next powerpc/next powerpc/fixes]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Ethan-Nelson-Moore/scsi-ibmvfc-remove-function-tracing-macros/20251220-131816
base: https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git for-next
patch link: https://lore.kernel.org/r/20251220051602.28029-5-enelsonmoore%40gmail.com
patch subject: [PATCH 5/5] scsi: qla1280: remove function tracing macros
config: loongarch-allmodconfig (https://download.01.org/0day-ci/archive/20251221/202512211352.0h7atuvQ-lkp@intel.com/config)
compiler: clang version 19.1.7 (https://github.com/llvm/llvm-project cd708029e0b2869e80abe31ddb175f7c35361f90)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20251221/202512211352.0h7atuvQ-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202512211352.0h7atuvQ-lkp@intel.com/
All warnings (new ones prefixed by >>):
drivers/scsi/qla1280.c:1688:15: warning: variable 'num' set but not used [-Wunused-but-set-variable]
1688 | int err = 0, num, i;
| ^
>> drivers/scsi/qla1280.c:3482:1: warning: label at end of compound statement is a C23 extension [-Wc23-extensions]
3482 | }
| ^
drivers/scsi/qla1280.c:3604:1: warning: label at end of compound statement is a C23 extension [-Wc23-extensions]
3604 | }
| ^
3 warnings generated.
vim +3482 drivers/scsi/qla1280.c
^1da177e4c3f41 Linus Torvalds 2005-04-16 3265
^1da177e4c3f41 Linus Torvalds 2005-04-16 3266 /****************************************************************************
^1da177e4c3f41 Linus Torvalds 2005-04-16 3267 * qla1280_isr
^1da177e4c3f41 Linus Torvalds 2005-04-16 3268 * Calls I/O done on command completion.
^1da177e4c3f41 Linus Torvalds 2005-04-16 3269 *
^1da177e4c3f41 Linus Torvalds 2005-04-16 3270 * Input:
^1da177e4c3f41 Linus Torvalds 2005-04-16 3271 * ha = adapter block pointer.
^1da177e4c3f41 Linus Torvalds 2005-04-16 3272 * done_q = done queue.
^1da177e4c3f41 Linus Torvalds 2005-04-16 3273 ****************************************************************************/
^1da177e4c3f41 Linus Torvalds 2005-04-16 3274 static void
^1da177e4c3f41 Linus Torvalds 2005-04-16 3275 qla1280_isr(struct scsi_qla_host *ha, struct list_head *done_q)
^1da177e4c3f41 Linus Torvalds 2005-04-16 3276 {
^1da177e4c3f41 Linus Torvalds 2005-04-16 3277 struct device_reg __iomem *reg = ha->iobase;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3278 struct response *pkt;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3279 struct srb *sp = NULL;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3280 uint16_t mailbox[MAILBOX_REGISTER_COUNT];
^1da177e4c3f41 Linus Torvalds 2005-04-16 3281 uint16_t *wptr;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3282 uint32_t index;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3283 u16 istatus;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3284
^1da177e4c3f41 Linus Torvalds 2005-04-16 3285 istatus = RD_REG_WORD(®->istatus);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3286 if (!(istatus & (RISC_INT | PCI_INT)))
^1da177e4c3f41 Linus Torvalds 2005-04-16 3287 return;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3288
^1da177e4c3f41 Linus Torvalds 2005-04-16 3289 /* Save mailbox register 5 */
^1da177e4c3f41 Linus Torvalds 2005-04-16 3290 mailbox[5] = RD_REG_WORD(®->mailbox5);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3291
^1da177e4c3f41 Linus Torvalds 2005-04-16 3292 /* Check for mailbox interrupt. */
^1da177e4c3f41 Linus Torvalds 2005-04-16 3293
^1da177e4c3f41 Linus Torvalds 2005-04-16 3294 mailbox[0] = RD_REG_WORD_dmasync(®->semaphore);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3295
^1da177e4c3f41 Linus Torvalds 2005-04-16 3296 if (mailbox[0] & BIT_0) {
^1da177e4c3f41 Linus Torvalds 2005-04-16 3297 /* Get mailbox data. */
^1da177e4c3f41 Linus Torvalds 2005-04-16 3298 /* dprintk(1, "qla1280_isr: In Get mailbox data \n"); */
^1da177e4c3f41 Linus Torvalds 2005-04-16 3299
^1da177e4c3f41 Linus Torvalds 2005-04-16 3300 wptr = &mailbox[0];
^1da177e4c3f41 Linus Torvalds 2005-04-16 3301 *wptr++ = RD_REG_WORD(®->mailbox0);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3302 *wptr++ = RD_REG_WORD(®->mailbox1);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3303 *wptr = RD_REG_WORD(®->mailbox2);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3304 if (mailbox[0] != MBA_SCSI_COMPLETION) {
^1da177e4c3f41 Linus Torvalds 2005-04-16 3305 wptr++;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3306 *wptr++ = RD_REG_WORD(®->mailbox3);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3307 *wptr++ = RD_REG_WORD(®->mailbox4);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3308 wptr++;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3309 *wptr++ = RD_REG_WORD(®->mailbox6);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3310 *wptr = RD_REG_WORD(®->mailbox7);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3311 }
^1da177e4c3f41 Linus Torvalds 2005-04-16 3312
^1da177e4c3f41 Linus Torvalds 2005-04-16 3313 /* Release mailbox registers. */
^1da177e4c3f41 Linus Torvalds 2005-04-16 3314
^1da177e4c3f41 Linus Torvalds 2005-04-16 3315 WRT_REG_WORD(®->semaphore, 0);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3316 WRT_REG_WORD(®->host_cmd, HC_CLR_RISC_INT);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3317
^1da177e4c3f41 Linus Torvalds 2005-04-16 3318 dprintk(5, "qla1280_isr: mailbox interrupt mailbox[0] = 0x%x",
^1da177e4c3f41 Linus Torvalds 2005-04-16 3319 mailbox[0]);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3320
^1da177e4c3f41 Linus Torvalds 2005-04-16 3321 /* Handle asynchronous event */
^1da177e4c3f41 Linus Torvalds 2005-04-16 3322 switch (mailbox[0]) {
^1da177e4c3f41 Linus Torvalds 2005-04-16 3323 case MBA_SCSI_COMPLETION: /* Response completion */
^1da177e4c3f41 Linus Torvalds 2005-04-16 3324 dprintk(5, "qla1280_isr: mailbox SCSI response "
^1da177e4c3f41 Linus Torvalds 2005-04-16 3325 "completion\n");
^1da177e4c3f41 Linus Torvalds 2005-04-16 3326
^1da177e4c3f41 Linus Torvalds 2005-04-16 3327 if (ha->flags.online) {
^1da177e4c3f41 Linus Torvalds 2005-04-16 3328 /* Get outstanding command index. */
^1da177e4c3f41 Linus Torvalds 2005-04-16 3329 index = mailbox[2] << 16 | mailbox[1];
^1da177e4c3f41 Linus Torvalds 2005-04-16 3330
^1da177e4c3f41 Linus Torvalds 2005-04-16 3331 /* Validate handle. */
^1da177e4c3f41 Linus Torvalds 2005-04-16 3332 if (index < MAX_OUTSTANDING_COMMANDS)
^1da177e4c3f41 Linus Torvalds 2005-04-16 3333 sp = ha->outstanding_cmds[index];
^1da177e4c3f41 Linus Torvalds 2005-04-16 3334 else
^1da177e4c3f41 Linus Torvalds 2005-04-16 3335 sp = NULL;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3336
^1da177e4c3f41 Linus Torvalds 2005-04-16 3337 if (sp) {
^1da177e4c3f41 Linus Torvalds 2005-04-16 3338 /* Free outstanding command slot. */
^1da177e4c3f41 Linus Torvalds 2005-04-16 3339 ha->outstanding_cmds[index] = NULL;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3340
^1da177e4c3f41 Linus Torvalds 2005-04-16 3341 /* Save ISP completion status */
^1da177e4c3f41 Linus Torvalds 2005-04-16 3342 CMD_RESULT(sp->cmd) = 0;
413e6e18b483de Michael Reed 2009-04-08 3343 CMD_HANDLE(sp->cmd) = COMPLETED_HANDLE;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3344
^1da177e4c3f41 Linus Torvalds 2005-04-16 3345 /* Place block on done queue */
^1da177e4c3f41 Linus Torvalds 2005-04-16 3346 list_add_tail(&sp->list, done_q);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3347 } else {
^1da177e4c3f41 Linus Torvalds 2005-04-16 3348 /*
^1da177e4c3f41 Linus Torvalds 2005-04-16 3349 * If we get here we have a real problem!
^1da177e4c3f41 Linus Torvalds 2005-04-16 3350 */
^1da177e4c3f41 Linus Torvalds 2005-04-16 3351 printk(KERN_WARNING
fd65e5e93cbd9d Michael Reed 2009-04-08 3352 "qla1280: ISP invalid handle\n");
^1da177e4c3f41 Linus Torvalds 2005-04-16 3353 }
^1da177e4c3f41 Linus Torvalds 2005-04-16 3354 }
^1da177e4c3f41 Linus Torvalds 2005-04-16 3355 break;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3356
^1da177e4c3f41 Linus Torvalds 2005-04-16 3357 case MBA_BUS_RESET: /* SCSI Bus Reset */
^1da177e4c3f41 Linus Torvalds 2005-04-16 3358 ha->flags.reset_marker = 1;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3359 index = mailbox[6] & BIT_0;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3360 ha->bus_settings[index].reset_marker = 1;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3361
^1da177e4c3f41 Linus Torvalds 2005-04-16 3362 printk(KERN_DEBUG "qla1280_isr(): index %i "
^1da177e4c3f41 Linus Torvalds 2005-04-16 3363 "asynchronous BUS_RESET\n", index);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3364 break;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3365
^1da177e4c3f41 Linus Torvalds 2005-04-16 3366 case MBA_SYSTEM_ERR: /* System Error */
^1da177e4c3f41 Linus Torvalds 2005-04-16 3367 printk(KERN_WARNING
^1da177e4c3f41 Linus Torvalds 2005-04-16 3368 "qla1280: ISP System Error - mbx1=%xh, mbx2="
^1da177e4c3f41 Linus Torvalds 2005-04-16 3369 "%xh, mbx3=%xh\n", mailbox[1], mailbox[2],
^1da177e4c3f41 Linus Torvalds 2005-04-16 3370 mailbox[3]);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3371 break;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3372
^1da177e4c3f41 Linus Torvalds 2005-04-16 3373 case MBA_REQ_TRANSFER_ERR: /* Request Transfer Error */
^1da177e4c3f41 Linus Torvalds 2005-04-16 3374 printk(KERN_WARNING
^1da177e4c3f41 Linus Torvalds 2005-04-16 3375 "qla1280: ISP Request Transfer Error\n");
^1da177e4c3f41 Linus Torvalds 2005-04-16 3376 break;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3377
^1da177e4c3f41 Linus Torvalds 2005-04-16 3378 case MBA_RSP_TRANSFER_ERR: /* Response Transfer Error */
^1da177e4c3f41 Linus Torvalds 2005-04-16 3379 printk(KERN_WARNING
^1da177e4c3f41 Linus Torvalds 2005-04-16 3380 "qla1280: ISP Response Transfer Error\n");
^1da177e4c3f41 Linus Torvalds 2005-04-16 3381 break;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3382
^1da177e4c3f41 Linus Torvalds 2005-04-16 3383 case MBA_WAKEUP_THRES: /* Request Queue Wake-up */
^1da177e4c3f41 Linus Torvalds 2005-04-16 3384 dprintk(2, "qla1280_isr: asynchronous WAKEUP_THRES\n");
^1da177e4c3f41 Linus Torvalds 2005-04-16 3385 break;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3386
^1da177e4c3f41 Linus Torvalds 2005-04-16 3387 case MBA_TIMEOUT_RESET: /* Execution Timeout Reset */
^1da177e4c3f41 Linus Torvalds 2005-04-16 3388 dprintk(2,
^1da177e4c3f41 Linus Torvalds 2005-04-16 3389 "qla1280_isr: asynchronous TIMEOUT_RESET\n");
^1da177e4c3f41 Linus Torvalds 2005-04-16 3390 break;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3391
^1da177e4c3f41 Linus Torvalds 2005-04-16 3392 case MBA_DEVICE_RESET: /* Bus Device Reset */
^1da177e4c3f41 Linus Torvalds 2005-04-16 3393 printk(KERN_INFO "qla1280_isr(): asynchronous "
^1da177e4c3f41 Linus Torvalds 2005-04-16 3394 "BUS_DEVICE_RESET\n");
^1da177e4c3f41 Linus Torvalds 2005-04-16 3395
^1da177e4c3f41 Linus Torvalds 2005-04-16 3396 ha->flags.reset_marker = 1;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3397 index = mailbox[6] & BIT_0;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3398 ha->bus_settings[index].reset_marker = 1;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3399 break;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3400
^1da177e4c3f41 Linus Torvalds 2005-04-16 3401 case MBA_BUS_MODE_CHANGE:
^1da177e4c3f41 Linus Torvalds 2005-04-16 3402 dprintk(2,
^1da177e4c3f41 Linus Torvalds 2005-04-16 3403 "qla1280_isr: asynchronous BUS_MODE_CHANGE\n");
^1da177e4c3f41 Linus Torvalds 2005-04-16 3404 break;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3405
^1da177e4c3f41 Linus Torvalds 2005-04-16 3406 default:
^1da177e4c3f41 Linus Torvalds 2005-04-16 3407 /* dprintk(1, "qla1280_isr: default case of switch MB \n"); */
^1da177e4c3f41 Linus Torvalds 2005-04-16 3408 if (mailbox[0] < MBA_ASYNC_EVENT) {
^1da177e4c3f41 Linus Torvalds 2005-04-16 3409 wptr = &mailbox[0];
^1da177e4c3f41 Linus Torvalds 2005-04-16 3410 memcpy((uint16_t *) ha->mailbox_out, wptr,
^1da177e4c3f41 Linus Torvalds 2005-04-16 3411 MAILBOX_REGISTER_COUNT *
^1da177e4c3f41 Linus Torvalds 2005-04-16 3412 sizeof(uint16_t));
^1da177e4c3f41 Linus Torvalds 2005-04-16 3413
^1da177e4c3f41 Linus Torvalds 2005-04-16 3414 if(ha->mailbox_wait != NULL)
^1da177e4c3f41 Linus Torvalds 2005-04-16 3415 complete(ha->mailbox_wait);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3416 }
^1da177e4c3f41 Linus Torvalds 2005-04-16 3417 break;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3418 }
^1da177e4c3f41 Linus Torvalds 2005-04-16 3419 } else {
^1da177e4c3f41 Linus Torvalds 2005-04-16 3420 WRT_REG_WORD(®->host_cmd, HC_CLR_RISC_INT);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3421 }
^1da177e4c3f41 Linus Torvalds 2005-04-16 3422
^1da177e4c3f41 Linus Torvalds 2005-04-16 3423 /*
^1da177e4c3f41 Linus Torvalds 2005-04-16 3424 * We will receive interrupts during mailbox testing prior to
^1da177e4c3f41 Linus Torvalds 2005-04-16 3425 * the card being marked online, hence the double check.
^1da177e4c3f41 Linus Torvalds 2005-04-16 3426 */
^1da177e4c3f41 Linus Torvalds 2005-04-16 3427 if (!(ha->flags.online && !ha->mailbox_wait)) {
^1da177e4c3f41 Linus Torvalds 2005-04-16 3428 dprintk(2, "qla1280_isr: Response pointer Error\n");
^1da177e4c3f41 Linus Torvalds 2005-04-16 3429 goto out;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3430 }
^1da177e4c3f41 Linus Torvalds 2005-04-16 3431
^1da177e4c3f41 Linus Torvalds 2005-04-16 3432 if (mailbox[5] >= RESPONSE_ENTRY_CNT)
^1da177e4c3f41 Linus Torvalds 2005-04-16 3433 goto out;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3434
^1da177e4c3f41 Linus Torvalds 2005-04-16 3435 while (ha->rsp_ring_index != mailbox[5]) {
^1da177e4c3f41 Linus Torvalds 2005-04-16 3436 pkt = ha->response_ring_ptr;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3437
^1da177e4c3f41 Linus Torvalds 2005-04-16 3438 dprintk(5, "qla1280_isr: ha->rsp_ring_index = 0x%x, mailbox[5]"
^1da177e4c3f41 Linus Torvalds 2005-04-16 3439 " = 0x%x\n", ha->rsp_ring_index, mailbox[5]);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3440 dprintk(5,"qla1280_isr: response packet data\n");
^1da177e4c3f41 Linus Torvalds 2005-04-16 3441 qla1280_dump_buffer(5, (char *)pkt, RESPONSE_ENTRY_SIZE);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3442
^1da177e4c3f41 Linus Torvalds 2005-04-16 3443 if (pkt->entry_type == STATUS_TYPE) {
^1da177e4c3f41 Linus Torvalds 2005-04-16 3444 if ((le16_to_cpu(pkt->scsi_status) & 0xff)
^1da177e4c3f41 Linus Torvalds 2005-04-16 3445 || pkt->comp_status || pkt->entry_status) {
^1da177e4c3f41 Linus Torvalds 2005-04-16 3446 dprintk(2, "qla1280_isr: ha->rsp_ring_index = "
^1da177e4c3f41 Linus Torvalds 2005-04-16 3447 "0x%x mailbox[5] = 0x%x, comp_status "
^1da177e4c3f41 Linus Torvalds 2005-04-16 3448 "= 0x%x, scsi_status = 0x%x\n",
^1da177e4c3f41 Linus Torvalds 2005-04-16 3449 ha->rsp_ring_index, mailbox[5],
^1da177e4c3f41 Linus Torvalds 2005-04-16 3450 le16_to_cpu(pkt->comp_status),
^1da177e4c3f41 Linus Torvalds 2005-04-16 3451 le16_to_cpu(pkt->scsi_status));
^1da177e4c3f41 Linus Torvalds 2005-04-16 3452 }
^1da177e4c3f41 Linus Torvalds 2005-04-16 3453 } else {
^1da177e4c3f41 Linus Torvalds 2005-04-16 3454 dprintk(2, "qla1280_isr: ha->rsp_ring_index = "
^1da177e4c3f41 Linus Torvalds 2005-04-16 3455 "0x%x, mailbox[5] = 0x%x\n",
^1da177e4c3f41 Linus Torvalds 2005-04-16 3456 ha->rsp_ring_index, mailbox[5]);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3457 dprintk(2, "qla1280_isr: response packet data\n");
^1da177e4c3f41 Linus Torvalds 2005-04-16 3458 qla1280_dump_buffer(2, (char *)pkt,
^1da177e4c3f41 Linus Torvalds 2005-04-16 3459 RESPONSE_ENTRY_SIZE);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3460 }
^1da177e4c3f41 Linus Torvalds 2005-04-16 3461
^1da177e4c3f41 Linus Torvalds 2005-04-16 3462 if (pkt->entry_type == STATUS_TYPE || pkt->entry_status) {
^1da177e4c3f41 Linus Torvalds 2005-04-16 3463 dprintk(2, "status: Cmd %p, handle %i\n",
^1da177e4c3f41 Linus Torvalds 2005-04-16 3464 ha->outstanding_cmds[pkt->handle]->cmd,
^1da177e4c3f41 Linus Torvalds 2005-04-16 3465 pkt->handle);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3466 if (pkt->entry_type == STATUS_TYPE)
^1da177e4c3f41 Linus Torvalds 2005-04-16 3467 qla1280_status_entry(ha, pkt, done_q);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3468 else
^1da177e4c3f41 Linus Torvalds 2005-04-16 3469 qla1280_error_entry(ha, pkt, done_q);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3470 /* Adjust ring index. */
^1da177e4c3f41 Linus Torvalds 2005-04-16 3471 ha->rsp_ring_index++;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3472 if (ha->rsp_ring_index == RESPONSE_ENTRY_CNT) {
^1da177e4c3f41 Linus Torvalds 2005-04-16 3473 ha->rsp_ring_index = 0;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3474 ha->response_ring_ptr = ha->response_ring;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3475 } else
^1da177e4c3f41 Linus Torvalds 2005-04-16 3476 ha->response_ring_ptr++;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3477 WRT_REG_WORD(®->mailbox5, ha->rsp_ring_index);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3478 }
^1da177e4c3f41 Linus Torvalds 2005-04-16 3479 }
^1da177e4c3f41 Linus Torvalds 2005-04-16 3480
^1da177e4c3f41 Linus Torvalds 2005-04-16 3481 out:
^1da177e4c3f41 Linus Torvalds 2005-04-16 @3482 }
^1da177e4c3f41 Linus Torvalds 2005-04-16 3483
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 5/5] scsi: qla1280: remove function tracing macros
2025-12-20 5:16 ` [PATCH 5/5] scsi: qla1280: " Ethan Nelson-Moore
2025-12-21 5:45 ` kernel test robot
@ 2025-12-22 12:55 ` kernel test robot
1 sibling, 0 replies; 7+ messages in thread
From: kernel test robot @ 2025-12-22 12:55 UTC (permalink / raw)
To: Ethan Nelson-Moore, linux-scsi; +Cc: llvm, oe-kbuild-all, Ethan Nelson-Moore
Hi Ethan,
kernel test robot noticed the following build warnings:
[auto build test WARNING on mkp-scsi/for-next]
[also build test WARNING on linus/master v6.19-rc2 next-20251219]
[cannot apply to jejb-scsi/for-next powerpc/next powerpc/fixes]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Ethan-Nelson-Moore/scsi-ibmvfc-remove-function-tracing-macros/20251220-131816
base: https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git for-next
patch link: https://lore.kernel.org/r/20251220051602.28029-5-enelsonmoore%40gmail.com
patch subject: [PATCH 5/5] scsi: qla1280: remove function tracing macros
config: riscv-allyesconfig (https://download.01.org/0day-ci/archive/20251222/202512222058.wa5qcdm2-lkp@intel.com/config)
compiler: clang version 16.0.6 (https://github.com/llvm/llvm-project 7cbf1a2591520c2491aa35339f227775f4d3adf6)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20251222/202512222058.wa5qcdm2-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202512222058.wa5qcdm2-lkp@intel.com/
All warnings (new ones prefixed by >>):
drivers/scsi/qla1280.c:1688:15: warning: variable 'num' set but not used [-Wunused-but-set-variable]
int err = 0, num, i;
^
>> drivers/scsi/qla1280.c:3482:1: warning: label at end of compound statement is a C2x extension [-Wc2x-extensions]
}
^
drivers/scsi/qla1280.c:3604:1: warning: label at end of compound statement is a C2x extension [-Wc2x-extensions]
}
^
3 warnings generated.
vim +3482 drivers/scsi/qla1280.c
^1da177e4c3f41 Linus Torvalds 2005-04-16 3265
^1da177e4c3f41 Linus Torvalds 2005-04-16 3266 /****************************************************************************
^1da177e4c3f41 Linus Torvalds 2005-04-16 3267 * qla1280_isr
^1da177e4c3f41 Linus Torvalds 2005-04-16 3268 * Calls I/O done on command completion.
^1da177e4c3f41 Linus Torvalds 2005-04-16 3269 *
^1da177e4c3f41 Linus Torvalds 2005-04-16 3270 * Input:
^1da177e4c3f41 Linus Torvalds 2005-04-16 3271 * ha = adapter block pointer.
^1da177e4c3f41 Linus Torvalds 2005-04-16 3272 * done_q = done queue.
^1da177e4c3f41 Linus Torvalds 2005-04-16 3273 ****************************************************************************/
^1da177e4c3f41 Linus Torvalds 2005-04-16 3274 static void
^1da177e4c3f41 Linus Torvalds 2005-04-16 3275 qla1280_isr(struct scsi_qla_host *ha, struct list_head *done_q)
^1da177e4c3f41 Linus Torvalds 2005-04-16 3276 {
^1da177e4c3f41 Linus Torvalds 2005-04-16 3277 struct device_reg __iomem *reg = ha->iobase;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3278 struct response *pkt;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3279 struct srb *sp = NULL;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3280 uint16_t mailbox[MAILBOX_REGISTER_COUNT];
^1da177e4c3f41 Linus Torvalds 2005-04-16 3281 uint16_t *wptr;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3282 uint32_t index;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3283 u16 istatus;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3284
^1da177e4c3f41 Linus Torvalds 2005-04-16 3285 istatus = RD_REG_WORD(®->istatus);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3286 if (!(istatus & (RISC_INT | PCI_INT)))
^1da177e4c3f41 Linus Torvalds 2005-04-16 3287 return;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3288
^1da177e4c3f41 Linus Torvalds 2005-04-16 3289 /* Save mailbox register 5 */
^1da177e4c3f41 Linus Torvalds 2005-04-16 3290 mailbox[5] = RD_REG_WORD(®->mailbox5);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3291
^1da177e4c3f41 Linus Torvalds 2005-04-16 3292 /* Check for mailbox interrupt. */
^1da177e4c3f41 Linus Torvalds 2005-04-16 3293
^1da177e4c3f41 Linus Torvalds 2005-04-16 3294 mailbox[0] = RD_REG_WORD_dmasync(®->semaphore);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3295
^1da177e4c3f41 Linus Torvalds 2005-04-16 3296 if (mailbox[0] & BIT_0) {
^1da177e4c3f41 Linus Torvalds 2005-04-16 3297 /* Get mailbox data. */
^1da177e4c3f41 Linus Torvalds 2005-04-16 3298 /* dprintk(1, "qla1280_isr: In Get mailbox data \n"); */
^1da177e4c3f41 Linus Torvalds 2005-04-16 3299
^1da177e4c3f41 Linus Torvalds 2005-04-16 3300 wptr = &mailbox[0];
^1da177e4c3f41 Linus Torvalds 2005-04-16 3301 *wptr++ = RD_REG_WORD(®->mailbox0);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3302 *wptr++ = RD_REG_WORD(®->mailbox1);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3303 *wptr = RD_REG_WORD(®->mailbox2);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3304 if (mailbox[0] != MBA_SCSI_COMPLETION) {
^1da177e4c3f41 Linus Torvalds 2005-04-16 3305 wptr++;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3306 *wptr++ = RD_REG_WORD(®->mailbox3);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3307 *wptr++ = RD_REG_WORD(®->mailbox4);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3308 wptr++;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3309 *wptr++ = RD_REG_WORD(®->mailbox6);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3310 *wptr = RD_REG_WORD(®->mailbox7);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3311 }
^1da177e4c3f41 Linus Torvalds 2005-04-16 3312
^1da177e4c3f41 Linus Torvalds 2005-04-16 3313 /* Release mailbox registers. */
^1da177e4c3f41 Linus Torvalds 2005-04-16 3314
^1da177e4c3f41 Linus Torvalds 2005-04-16 3315 WRT_REG_WORD(®->semaphore, 0);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3316 WRT_REG_WORD(®->host_cmd, HC_CLR_RISC_INT);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3317
^1da177e4c3f41 Linus Torvalds 2005-04-16 3318 dprintk(5, "qla1280_isr: mailbox interrupt mailbox[0] = 0x%x",
^1da177e4c3f41 Linus Torvalds 2005-04-16 3319 mailbox[0]);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3320
^1da177e4c3f41 Linus Torvalds 2005-04-16 3321 /* Handle asynchronous event */
^1da177e4c3f41 Linus Torvalds 2005-04-16 3322 switch (mailbox[0]) {
^1da177e4c3f41 Linus Torvalds 2005-04-16 3323 case MBA_SCSI_COMPLETION: /* Response completion */
^1da177e4c3f41 Linus Torvalds 2005-04-16 3324 dprintk(5, "qla1280_isr: mailbox SCSI response "
^1da177e4c3f41 Linus Torvalds 2005-04-16 3325 "completion\n");
^1da177e4c3f41 Linus Torvalds 2005-04-16 3326
^1da177e4c3f41 Linus Torvalds 2005-04-16 3327 if (ha->flags.online) {
^1da177e4c3f41 Linus Torvalds 2005-04-16 3328 /* Get outstanding command index. */
^1da177e4c3f41 Linus Torvalds 2005-04-16 3329 index = mailbox[2] << 16 | mailbox[1];
^1da177e4c3f41 Linus Torvalds 2005-04-16 3330
^1da177e4c3f41 Linus Torvalds 2005-04-16 3331 /* Validate handle. */
^1da177e4c3f41 Linus Torvalds 2005-04-16 3332 if (index < MAX_OUTSTANDING_COMMANDS)
^1da177e4c3f41 Linus Torvalds 2005-04-16 3333 sp = ha->outstanding_cmds[index];
^1da177e4c3f41 Linus Torvalds 2005-04-16 3334 else
^1da177e4c3f41 Linus Torvalds 2005-04-16 3335 sp = NULL;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3336
^1da177e4c3f41 Linus Torvalds 2005-04-16 3337 if (sp) {
^1da177e4c3f41 Linus Torvalds 2005-04-16 3338 /* Free outstanding command slot. */
^1da177e4c3f41 Linus Torvalds 2005-04-16 3339 ha->outstanding_cmds[index] = NULL;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3340
^1da177e4c3f41 Linus Torvalds 2005-04-16 3341 /* Save ISP completion status */
^1da177e4c3f41 Linus Torvalds 2005-04-16 3342 CMD_RESULT(sp->cmd) = 0;
413e6e18b483de Michael Reed 2009-04-08 3343 CMD_HANDLE(sp->cmd) = COMPLETED_HANDLE;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3344
^1da177e4c3f41 Linus Torvalds 2005-04-16 3345 /* Place block on done queue */
^1da177e4c3f41 Linus Torvalds 2005-04-16 3346 list_add_tail(&sp->list, done_q);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3347 } else {
^1da177e4c3f41 Linus Torvalds 2005-04-16 3348 /*
^1da177e4c3f41 Linus Torvalds 2005-04-16 3349 * If we get here we have a real problem!
^1da177e4c3f41 Linus Torvalds 2005-04-16 3350 */
^1da177e4c3f41 Linus Torvalds 2005-04-16 3351 printk(KERN_WARNING
fd65e5e93cbd9d Michael Reed 2009-04-08 3352 "qla1280: ISP invalid handle\n");
^1da177e4c3f41 Linus Torvalds 2005-04-16 3353 }
^1da177e4c3f41 Linus Torvalds 2005-04-16 3354 }
^1da177e4c3f41 Linus Torvalds 2005-04-16 3355 break;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3356
^1da177e4c3f41 Linus Torvalds 2005-04-16 3357 case MBA_BUS_RESET: /* SCSI Bus Reset */
^1da177e4c3f41 Linus Torvalds 2005-04-16 3358 ha->flags.reset_marker = 1;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3359 index = mailbox[6] & BIT_0;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3360 ha->bus_settings[index].reset_marker = 1;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3361
^1da177e4c3f41 Linus Torvalds 2005-04-16 3362 printk(KERN_DEBUG "qla1280_isr(): index %i "
^1da177e4c3f41 Linus Torvalds 2005-04-16 3363 "asynchronous BUS_RESET\n", index);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3364 break;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3365
^1da177e4c3f41 Linus Torvalds 2005-04-16 3366 case MBA_SYSTEM_ERR: /* System Error */
^1da177e4c3f41 Linus Torvalds 2005-04-16 3367 printk(KERN_WARNING
^1da177e4c3f41 Linus Torvalds 2005-04-16 3368 "qla1280: ISP System Error - mbx1=%xh, mbx2="
^1da177e4c3f41 Linus Torvalds 2005-04-16 3369 "%xh, mbx3=%xh\n", mailbox[1], mailbox[2],
^1da177e4c3f41 Linus Torvalds 2005-04-16 3370 mailbox[3]);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3371 break;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3372
^1da177e4c3f41 Linus Torvalds 2005-04-16 3373 case MBA_REQ_TRANSFER_ERR: /* Request Transfer Error */
^1da177e4c3f41 Linus Torvalds 2005-04-16 3374 printk(KERN_WARNING
^1da177e4c3f41 Linus Torvalds 2005-04-16 3375 "qla1280: ISP Request Transfer Error\n");
^1da177e4c3f41 Linus Torvalds 2005-04-16 3376 break;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3377
^1da177e4c3f41 Linus Torvalds 2005-04-16 3378 case MBA_RSP_TRANSFER_ERR: /* Response Transfer Error */
^1da177e4c3f41 Linus Torvalds 2005-04-16 3379 printk(KERN_WARNING
^1da177e4c3f41 Linus Torvalds 2005-04-16 3380 "qla1280: ISP Response Transfer Error\n");
^1da177e4c3f41 Linus Torvalds 2005-04-16 3381 break;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3382
^1da177e4c3f41 Linus Torvalds 2005-04-16 3383 case MBA_WAKEUP_THRES: /* Request Queue Wake-up */
^1da177e4c3f41 Linus Torvalds 2005-04-16 3384 dprintk(2, "qla1280_isr: asynchronous WAKEUP_THRES\n");
^1da177e4c3f41 Linus Torvalds 2005-04-16 3385 break;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3386
^1da177e4c3f41 Linus Torvalds 2005-04-16 3387 case MBA_TIMEOUT_RESET: /* Execution Timeout Reset */
^1da177e4c3f41 Linus Torvalds 2005-04-16 3388 dprintk(2,
^1da177e4c3f41 Linus Torvalds 2005-04-16 3389 "qla1280_isr: asynchronous TIMEOUT_RESET\n");
^1da177e4c3f41 Linus Torvalds 2005-04-16 3390 break;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3391
^1da177e4c3f41 Linus Torvalds 2005-04-16 3392 case MBA_DEVICE_RESET: /* Bus Device Reset */
^1da177e4c3f41 Linus Torvalds 2005-04-16 3393 printk(KERN_INFO "qla1280_isr(): asynchronous "
^1da177e4c3f41 Linus Torvalds 2005-04-16 3394 "BUS_DEVICE_RESET\n");
^1da177e4c3f41 Linus Torvalds 2005-04-16 3395
^1da177e4c3f41 Linus Torvalds 2005-04-16 3396 ha->flags.reset_marker = 1;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3397 index = mailbox[6] & BIT_0;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3398 ha->bus_settings[index].reset_marker = 1;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3399 break;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3400
^1da177e4c3f41 Linus Torvalds 2005-04-16 3401 case MBA_BUS_MODE_CHANGE:
^1da177e4c3f41 Linus Torvalds 2005-04-16 3402 dprintk(2,
^1da177e4c3f41 Linus Torvalds 2005-04-16 3403 "qla1280_isr: asynchronous BUS_MODE_CHANGE\n");
^1da177e4c3f41 Linus Torvalds 2005-04-16 3404 break;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3405
^1da177e4c3f41 Linus Torvalds 2005-04-16 3406 default:
^1da177e4c3f41 Linus Torvalds 2005-04-16 3407 /* dprintk(1, "qla1280_isr: default case of switch MB \n"); */
^1da177e4c3f41 Linus Torvalds 2005-04-16 3408 if (mailbox[0] < MBA_ASYNC_EVENT) {
^1da177e4c3f41 Linus Torvalds 2005-04-16 3409 wptr = &mailbox[0];
^1da177e4c3f41 Linus Torvalds 2005-04-16 3410 memcpy((uint16_t *) ha->mailbox_out, wptr,
^1da177e4c3f41 Linus Torvalds 2005-04-16 3411 MAILBOX_REGISTER_COUNT *
^1da177e4c3f41 Linus Torvalds 2005-04-16 3412 sizeof(uint16_t));
^1da177e4c3f41 Linus Torvalds 2005-04-16 3413
^1da177e4c3f41 Linus Torvalds 2005-04-16 3414 if(ha->mailbox_wait != NULL)
^1da177e4c3f41 Linus Torvalds 2005-04-16 3415 complete(ha->mailbox_wait);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3416 }
^1da177e4c3f41 Linus Torvalds 2005-04-16 3417 break;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3418 }
^1da177e4c3f41 Linus Torvalds 2005-04-16 3419 } else {
^1da177e4c3f41 Linus Torvalds 2005-04-16 3420 WRT_REG_WORD(®->host_cmd, HC_CLR_RISC_INT);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3421 }
^1da177e4c3f41 Linus Torvalds 2005-04-16 3422
^1da177e4c3f41 Linus Torvalds 2005-04-16 3423 /*
^1da177e4c3f41 Linus Torvalds 2005-04-16 3424 * We will receive interrupts during mailbox testing prior to
^1da177e4c3f41 Linus Torvalds 2005-04-16 3425 * the card being marked online, hence the double check.
^1da177e4c3f41 Linus Torvalds 2005-04-16 3426 */
^1da177e4c3f41 Linus Torvalds 2005-04-16 3427 if (!(ha->flags.online && !ha->mailbox_wait)) {
^1da177e4c3f41 Linus Torvalds 2005-04-16 3428 dprintk(2, "qla1280_isr: Response pointer Error\n");
^1da177e4c3f41 Linus Torvalds 2005-04-16 3429 goto out;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3430 }
^1da177e4c3f41 Linus Torvalds 2005-04-16 3431
^1da177e4c3f41 Linus Torvalds 2005-04-16 3432 if (mailbox[5] >= RESPONSE_ENTRY_CNT)
^1da177e4c3f41 Linus Torvalds 2005-04-16 3433 goto out;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3434
^1da177e4c3f41 Linus Torvalds 2005-04-16 3435 while (ha->rsp_ring_index != mailbox[5]) {
^1da177e4c3f41 Linus Torvalds 2005-04-16 3436 pkt = ha->response_ring_ptr;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3437
^1da177e4c3f41 Linus Torvalds 2005-04-16 3438 dprintk(5, "qla1280_isr: ha->rsp_ring_index = 0x%x, mailbox[5]"
^1da177e4c3f41 Linus Torvalds 2005-04-16 3439 " = 0x%x\n", ha->rsp_ring_index, mailbox[5]);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3440 dprintk(5,"qla1280_isr: response packet data\n");
^1da177e4c3f41 Linus Torvalds 2005-04-16 3441 qla1280_dump_buffer(5, (char *)pkt, RESPONSE_ENTRY_SIZE);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3442
^1da177e4c3f41 Linus Torvalds 2005-04-16 3443 if (pkt->entry_type == STATUS_TYPE) {
^1da177e4c3f41 Linus Torvalds 2005-04-16 3444 if ((le16_to_cpu(pkt->scsi_status) & 0xff)
^1da177e4c3f41 Linus Torvalds 2005-04-16 3445 || pkt->comp_status || pkt->entry_status) {
^1da177e4c3f41 Linus Torvalds 2005-04-16 3446 dprintk(2, "qla1280_isr: ha->rsp_ring_index = "
^1da177e4c3f41 Linus Torvalds 2005-04-16 3447 "0x%x mailbox[5] = 0x%x, comp_status "
^1da177e4c3f41 Linus Torvalds 2005-04-16 3448 "= 0x%x, scsi_status = 0x%x\n",
^1da177e4c3f41 Linus Torvalds 2005-04-16 3449 ha->rsp_ring_index, mailbox[5],
^1da177e4c3f41 Linus Torvalds 2005-04-16 3450 le16_to_cpu(pkt->comp_status),
^1da177e4c3f41 Linus Torvalds 2005-04-16 3451 le16_to_cpu(pkt->scsi_status));
^1da177e4c3f41 Linus Torvalds 2005-04-16 3452 }
^1da177e4c3f41 Linus Torvalds 2005-04-16 3453 } else {
^1da177e4c3f41 Linus Torvalds 2005-04-16 3454 dprintk(2, "qla1280_isr: ha->rsp_ring_index = "
^1da177e4c3f41 Linus Torvalds 2005-04-16 3455 "0x%x, mailbox[5] = 0x%x\n",
^1da177e4c3f41 Linus Torvalds 2005-04-16 3456 ha->rsp_ring_index, mailbox[5]);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3457 dprintk(2, "qla1280_isr: response packet data\n");
^1da177e4c3f41 Linus Torvalds 2005-04-16 3458 qla1280_dump_buffer(2, (char *)pkt,
^1da177e4c3f41 Linus Torvalds 2005-04-16 3459 RESPONSE_ENTRY_SIZE);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3460 }
^1da177e4c3f41 Linus Torvalds 2005-04-16 3461
^1da177e4c3f41 Linus Torvalds 2005-04-16 3462 if (pkt->entry_type == STATUS_TYPE || pkt->entry_status) {
^1da177e4c3f41 Linus Torvalds 2005-04-16 3463 dprintk(2, "status: Cmd %p, handle %i\n",
^1da177e4c3f41 Linus Torvalds 2005-04-16 3464 ha->outstanding_cmds[pkt->handle]->cmd,
^1da177e4c3f41 Linus Torvalds 2005-04-16 3465 pkt->handle);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3466 if (pkt->entry_type == STATUS_TYPE)
^1da177e4c3f41 Linus Torvalds 2005-04-16 3467 qla1280_status_entry(ha, pkt, done_q);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3468 else
^1da177e4c3f41 Linus Torvalds 2005-04-16 3469 qla1280_error_entry(ha, pkt, done_q);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3470 /* Adjust ring index. */
^1da177e4c3f41 Linus Torvalds 2005-04-16 3471 ha->rsp_ring_index++;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3472 if (ha->rsp_ring_index == RESPONSE_ENTRY_CNT) {
^1da177e4c3f41 Linus Torvalds 2005-04-16 3473 ha->rsp_ring_index = 0;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3474 ha->response_ring_ptr = ha->response_ring;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3475 } else
^1da177e4c3f41 Linus Torvalds 2005-04-16 3476 ha->response_ring_ptr++;
^1da177e4c3f41 Linus Torvalds 2005-04-16 3477 WRT_REG_WORD(®->mailbox5, ha->rsp_ring_index);
^1da177e4c3f41 Linus Torvalds 2005-04-16 3478 }
^1da177e4c3f41 Linus Torvalds 2005-04-16 3479 }
^1da177e4c3f41 Linus Torvalds 2005-04-16 3480
^1da177e4c3f41 Linus Torvalds 2005-04-16 3481 out:
^1da177e4c3f41 Linus Torvalds 2005-04-16 @3482 }
^1da177e4c3f41 Linus Torvalds 2005-04-16 3483
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2025-12-22 12:56 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-12-20 5:15 [PATCH 1/5] scsi: ips: remove function tracing macros Ethan Nelson-Moore
2025-12-20 5:15 ` [PATCH 2/5] scsi: ibmvfc: " Ethan Nelson-Moore
2025-12-20 5:16 ` [PATCH 3/5] scsi: aic94xx: remove unused ENTER/EXIT macros Ethan Nelson-Moore
2025-12-20 5:16 ` [PATCH 4/5] scsi: ipr: remove function tracing macros Ethan Nelson-Moore
2025-12-20 5:16 ` [PATCH 5/5] scsi: qla1280: " Ethan Nelson-Moore
2025-12-21 5:45 ` kernel test robot
2025-12-22 12:55 ` kernel test robot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox