NCR5380: Use probe_irq_*() for IRQ probing
Subsystems (2)
PATCH 1/3 NCR5380: Use probe_irq_*() for IRQ probing
Use standard probe_irq_on() and probe_irq_off() functions instead of own implementation.
This prevents warning messages like this in the kernel log:
genirq: Flags mismatch irq 1. 00000000 (NCR-probe) vs. 00000080 (i8042)
Move the IRQ trigger code to a separate function so it can be used for other purposes (testing if the IRQ works).
Also add missing IRQ reset after probe.
--- drivers/scsi/NCR5380.c | 72 +++++++++++++++++----------------------------- drivers/scsi/NCR5380.h | 3 +- drivers/scsi/g_NCR5380.c | 2 +- 3 files changed, 29 insertions(+), 48 deletions(-)
drivers/scsi/NCR5380.c +26 -46
@@ -351,50 +351,13 @@ static void NCR5380_print_phase(struct Scsi_Host *instance) }#endif - -static int probe_irq; - -/** -* probe_intr - helper for IRQ autoprobe -* @irq: interrupt number -* @dev_id: unused -* @regs: unused -* -* Set a flag to indicate the IRQ in question was received. This is -* used by the IRQ probe code. -*/ - -static irqreturn_t probe_intr (int irq,void *dev_id) -{ - probe_irq = irq; -return IRQ_HANDLED ; -} - -/** -* NCR5380_probe_irq - find the IRQ of an NCR5380 -* @instance: NCR5380 controller -* @possible: bitmask of ISA IRQ lines -* -* Autoprobe for the IRQ line used by the NCR5380 by triggering an IRQ -* and then looking to see what interrupt actually turned up. -*/ - -static int __maybe_unused NCR5380_probe_irq (struct Scsi_Host *instance, -int possible) +static void NCR5380_trigger_irq (struct Scsi_Host *instance) {struct NCR5380_hostdata *hostdata =shost_priv (instance); -unsigned long timeout; -int trying_irqs, i, mask; - -for (trying_irqs =0 , i =1 , mask =2 ; i <16 ; ++i, mask <<=1 ) -if ((mask & possible) && (request_irq (i, &probe_intr,0 ,"NCR-probe" ,NULL ) ==0 )) - trying_irqs |= mask; - - timeout = jiffies +msecs_to_jiffies (250 ); - probe_irq =NO_IRQ ; +unsigned long timeout = jiffies +msecs_to_jiffies (2500 );/* -* A interrupt is triggered whenever BSY = false, SEL = true +* An interrupt is triggered whenever BSY = false, SEL = true * and a bit set in the SELECT_ENABLE_REG is asserted on the * SCSI bus. *
@@ -402,23 +365,40 @@ static int __maybe_unused NCR5380_probe_irq(struct Scsi_Host *instance,* (I/O, C/D, and MSG) match those in the TCR, so we must reset that * to zero. */ -NCR5380_write (TARGET_COMMAND_REG ,0 );NCR5380_write (SELECT_ENABLE_REG , hostdata->id_mask);NCR5380_write (OUTPUT_DATA_REG , hostdata->id_mask);NCR5380_write (INITIATOR_COMMAND_REG ,ICR_BASE |ICR_ASSERT_DATA |ICR_ASSERT_SEL ); -while (probe_irq ==NO_IRQ &&time_before (jiffies, timeout)) +while (!(NCR5380_read (BUS_AND_STATUS_REG ) &BASR_IRQ ) && +time_before (jiffies, timeout))schedule_timeout_uninterruptible (1 );NCR5380_write (SELECT_ENABLE_REG ,0 );NCR5380_write (INITIATOR_COMMAND_REG ,ICR_BASE ); +} -for (i =1 , mask =2 ; i <16 ; ++i, mask <<=1 ) -if (trying_irqs & mask) -free_irq (i,NULL ); +/** +* NCR5380_probe_irq - find the IRQ of an NCR5380 +* @instance: NCR5380 controller +* +* Autoprobe for the IRQ line used by the NCR5380 by triggering an IRQ +* and then looking to see what interrupt actually turned up. +*/ + +static int NCR5380_probe_irq (struct Scsi_Host *instance) +{ +struct NCR5380_hostdata *hostdata =shost_priv (instance); +int irqs, irq; + + irqs =probe_irq_on (); +NCR5380_trigger_irq (instance); + irq =probe_irq_off (irqs); +NCR5380_read (RESET_PARITY_INTERRUPT_REG ); +if (irq <0 ) + irq =0 ; -return probe_irq; +return irq; }/**
drivers/scsi/NCR5380.h +2 -1
@@ -290,7 +290,8 @@ static inline struct scsi_cmnd *NCR5380_to_scmd(struct NCR5380_cmd *ncmd_ptr)#define NCR5380_dprint_phase (flg, arg) do {} while (0)#endif -static int NCR5380_probe_irq (struct Scsi_Host *instance,int possible); +static void NCR5380_trigger_irq (struct Scsi_Host *instance); +static int NCR5380_probe_irq (struct Scsi_Host *instance);static int NCR5380_init (struct Scsi_Host *instance,int flags);static int NCR5380_maybe_reset_bus (struct Scsi_Host *);static void NCR5380_exit (struct Scsi_Host *instance);
drivers/scsi/g_NCR5380.c +1 -1
@@ -265,7 +265,7 @@ static int generic_NCR5380_init_one(struct scsi_host_template *tpnt,if (irq !=IRQ_AUTO ) instance->irq = irq;else - instance->irq =NCR5380_probe_irq (instance,0xffff ); + instance->irq =NCR5380_probe_irq (instance);/* Compatibility with documented NCR5380 kernel parameters */ if (instance->irq ==255 )
Signature · 1 line
Ondrej Zary
PATCH 2/3 g_NCR5380: Test the IRQ before accepting it
Trigger an IRQ first with a test IRQ handler to find out if it really works. Disable the IRQ if not.
This prevents hang when incorrect IRQ was specified by user.
--- drivers/scsi/g_NCR5380.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-)
drivers/scsi/g_NCR5380.c +30 -2
@@ -67,6 +67,14 @@MODULE_ALIAS ("g_NCR5380_mmio" );MODULE_LICENSE ("GPL" ); +static bool irq_working; + +static irqreturn_t test_irq (int irq,void *dev_id) +{ + irq_working = true; +return IRQ_HANDLED ; +} +/* * Configure I/O address of 53C400A or DTC436 by writing magic numbers * to ports 0x779 and 0x379.
@@ -275,10 +283,30 @@ static int generic_NCR5380_init_one(struct scsi_host_template *tpnt,/* set IRQ for HP C2502 */ if (board ==BOARD_HP_C2502 )magic_configure (port_idx, instance->irq, magic); -if (request_irq (instance->irq, generic_NCR5380_intr, -0 ,"NCR5380" , instance)) { +/* test if the IRQ is working */ + irq_working = false; +if (request_irq (instance->irq, test_irq, +0 ,"NCR5380-irqtest" ,NULL )) {printk (KERN_WARNING "scsi%d : IRQ%d not free, interrupts disabled\n" , instance->host_no, instance->irq); instance->irq =NO_IRQ ; + }else { +NCR5380_trigger_irq (instance); +NCR5380_read (RESET_PARITY_INTERRUPT_REG ); +free_irq (instance->irq,NULL ); +if (irq_working) { +if (request_irq (instance->irq, + generic_NCR5380_intr,0 , +"NCR5380" , instance)) { +printk (KERN_WARNING "scsi%d : IRQ%d not free, interrupts disabled\n" , + instance->host_no, + instance->irq); + instance->irq =NO_IRQ ; + } + }else { +printk (KERN_WARNING "scsi%d : IRQ%d not working, interrupts disabled\n" , + instance->host_no, instance->irq); + instance->irq =NO_IRQ ; + } } }
Signature · 1 line
Ondrej Zary
Re: [PATCH 2/3] g_NCR5380: Test the IRQ before accepting it
Quoted 53 lines · Ondrej Zary
Trigger an IRQ first with a test IRQ handler to find out if it really works. Disable the IRQ if not.
This prevents hang when incorrect IRQ was specified by user.
Signed-off-by Ondrej Zary <[email protected]>--- drivers/scsi/g_NCR5380.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-)drivers/scsi/g_NCR5380.c +23
-2@@ -67,6 +67,14 @@MODULE_ALIAS ("g_NCR5380_mmio" );MODULE_LICENSE ("GPL" ); +static bool irq_working; + +static irqreturn_t test_irq (int irq,void *dev_id) +{ + irq_working = true; +return IRQ_HANDLED ; +} +/* * Configure I/O address of 53C400A or DTC436 by writing magic numbers * to ports 0x779 and 0x379. @@ -275,10 +283,30 @@ static int generic_NCR5380_init_one(struct scsi_host_template *tpnt,/* set IRQ for HP C2502 */ if (board ==BOARD_HP_C2502 )magic_configure (port_idx, instance->irq, magic); -if (request_irq (instance->irq, generic_NCR5380_intr, -0 ,"NCR5380" , instance)) { +/* test if the IRQ is working */ + irq_working = false; +if (request_irq (instance->irq, test_irq, +0 ,"NCR5380-irqtest" ,NULL )) {printk (KERN_WARNING "scsi%d : IRQ%d not free, interrupts disabled\n" , instance->host_no, instance->irq); instance->irq =NO_IRQ ; + }else { +NCR5380_trigger_irq (instance); +NCR5380_read (RESET_PARITY_INTERRUPT_REG ); +free_irq (instance->irq,NULL ); +if (irq_working) { +if (request_irq (instance->irq, + generic_NCR5380_intr,0 , +"NCR5380" , instance)) { +printk (KERN_WARNING "scsi%d : IRQ%d not free, interrupts disabled\n" , + instance->host_no, + instance->irq);
drivers/scsi/g_NCR5380.c static int generic_NCR5380_init_one(struct scsi_host_template *tpnt, · line 312
Quoted 10 lines
drivers/scsi/g_NCR5380.c +7
-0+ instance->irq =NO_IRQ ; + } + }else { +printk (KERN_WARNING "scsi%d : IRQ%d not working, interrupts disabled\n" , + instance->host_no, instance->irq); + instance->irq =NO_IRQ ; + } } }
If the user omits to specify an irq, you can just default to IRQ_AUTO. This might result in NO_IRQ, which gives the same result as this patch.
And when the user does specify an IRQ, we should trust them. So this compexity doesn't add any value AFAICT. Thanks but no thanks.
Re: [PATCH 2/3] g_NCR5380: Test the IRQ before accepting it
Quoted 57 lines · Finn Thain
Quoted 56 lines · Ondrej Zary
Trigger an IRQ first with a test IRQ handler to find out if it really works. Disable the IRQ if not.
This prevents hang when incorrect IRQ was specified by user.
Signed-off-by Ondrej Zary <[email protected]>--- drivers/scsi/g_NCR5380.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-)drivers/scsi/g_NCR5380.c +8
-0@@ -67,6 +67,14 @@MODULE_ALIAS ("g_NCR5380_mmio" );MODULE_LICENSE ("GPL" ); +static bool irq_working; + +static irqreturn_t test_irq (int irq,void *dev_id) +{ + irq_working = true; +return IRQ_HANDLED ; +} +/* * Configure I/O address of 53C400A or DTC436 by writing magic numbers * to ports 0x779 and 0x379. @@ -275,10 +283,30 @@ static int generic_NCR5380_init_one(struct
scsi_host_template*tpnt, /* set IRQ for HP C2502 */drivers/scsi/g_NCR5380.c +4
-2if (board ==BOARD_HP_C2502 )magic_configure (port_idx, instance->irq, magic); -if (request_irq (instance->irq, generic_NCR5380_intr, -0 ,"NCR5380" , instance)) { +/* test if the IRQ is working */ + irq_working = false; +if (request_irq (instance->irq, test_irq, +0 ,"NCR5380-irqtest" ,NULL )) { printk(KERN_WARNING "scsi%d : IRQ%d not free, interrupts disabled\n",
instance->host_no,instance->irq);instance->irq=NO_IRQ;drivers/scsi/g_NCR5380.c +9
-0+ } else { +NCR5380_trigger_irq (instance ); +NCR5380_read (RESET_PARITY_INTERRUPT_REG ); +free_irq (instance->irq,NULL ); + if (irq_working) { + if (request_irq(instance->irq, + generic_NCR5380_intr, 0, + "NCR5380", instance)) { + printk(KERN_WARNING "scsi%d : IRQ%d not free, interruptsdisabled\n", +
instance->host_no,drivers/scsi/g_NCR5380.c +5
-0+ instance->irq); + instance->irq =NO_IRQ ; + } + } else { + printk(KERN_WARNING "scsi%d : IRQ%d not working, interrupts
Quoted 8 lines
drivers/scsi/g_NCR5380.c static int generic_NCR5380_init_one(struct scsi_host_template *tpnt, · line 311
Quoted 5 lines
disabled\n", +
instance->host_no,instance->irq);drivers/scsi/g_NCR5380.c +2
-0+ instance->irq =NO_IRQ ; + } } }If the user omits to specify an irq, you can just default to
IRQ_AUTO. This might result inNO_IRQ, which gives the same result as this patch.
Looks like a good idea.
Quoted 2 lines
And when the user does specify an IRQ, we should trust them. So this compexity doesn't add any value AFAICT. Thanks but no thanks.
This fixes a real problem: specifying wrong IRQ hangs the machine completely. It's really easy - if the IRQ is free but configured in BIOS as PCI IRQ (not ISA). Everything seems fine except the IRQ will never trigger.
Signature · 1 line
Ondrej Zary
Re: [PATCH 2/3] g_NCR5380: Test the IRQ before accepting it
Quoted 70 lines · Ondrej Zary
Quoted 58 lines · Finn Thain
Quoted 57 lines · Ondrej Zary
Trigger an IRQ first with a test IRQ handler to find out if it really works. Disable the IRQ if not.
This prevents hang when incorrect IRQ was specified by user.
Signed-off-by Ondrej Zary <[email protected]>--- drivers/scsi/g_NCR5380.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-)drivers/scsi/g_NCR5380.c +8
-0@@ -67,6 +67,14 @@MODULE_ALIAS ("g_NCR5380_mmio" );MODULE_LICENSE ("GPL" ); +static bool irq_working; + +static irqreturn_t test_irq (int irq,void *dev_id) +{ + irq_working = true; +return IRQ_HANDLED ; +} +/* * Configure I/O address of 53C400A or DTC436 by writing magic numbers * to ports 0x779 and 0x379. @@ -275,10 +283,30 @@ static int generic_NCR5380_init_one(struct
scsi_host_template*tpnt, /* set IRQ for HP C2502 */drivers/scsi/g_NCR5380.c +4
-2if (board ==BOARD_HP_C2502 )magic_configure (port_idx, instance->irq, magic); -if (request_irq (instance->irq, generic_NCR5380_intr, -0 ,"NCR5380" , instance)) { +/* test if the IRQ is working */ + irq_working = false; +if (request_irq (instance->irq, test_irq, +0 ,"NCR5380-irqtest" ,NULL )) { printk(KERN_WARNING "scsi%d : IRQ%d not free, interrupts disabled\n",
instance->host_no,instance->irq);instance->irq=NO_IRQ;drivers/scsi/g_NCR5380.c +9
-0+ } else { +NCR5380_trigger_irq (instance ); +NCR5380_read (RESET_PARITY_INTERRUPT_REG ); +free_irq (instance->irq,NULL ); + if (irq_working) { + if (request_irq(instance->irq, + generic_NCR5380_intr, 0, + "NCR5380", instance)) { + printk(KERN_WARNING "scsi%d : IRQ%d not free, interruptsdisabled\n", +
instance->host_no,drivers/scsi/g_NCR5380.c +5
-0+ instance->irq); + instance->irq =NO_IRQ ; + } + } else { + printk(KERN_WARNING "scsi%d : IRQ%d not working, interruptsdisabled\n", +
instance->host_no,instance->irq);Quoted 8 lines
drivers/scsi/g_NCR5380.c static int generic_NCR5380_init_one(struct scsi_host_template *tpnt, · line 311
Quoted 4 lines
drivers/scsi/g_NCR5380.c +2
-0+ instance->irq =NO_IRQ ; + } } }If the user omits to specify an irq, you can just default to
IRQ_AUTO. This might result inNO_IRQ, which gives the same result as this patch.Looks like a good idea.
Quoted 10 lines
Quoted 2 lines
And when the user does specify an IRQ, we should trust them. So this compexity doesn't add any value AFAICT. Thanks but no thanks.
This fixes a real problem: specifying wrong IRQ hangs the machine completely.
It's really easy - if the IRQ is free but configured in BIOS as PCI IRQ (not ISA). Everything seems fine except the IRQ will never trigger.
How does that cause a hang? I'd expect scsi command timeouts, but there are any number of module parameters that the user can stuff up which will lead to command timeouts. I expect the same could be said of BIOS settings.
PATCH 3/3 NCR5380: Check for chip presence in NCR5380_init()
In reply to Ondrej ZaryRead back MODE_REG after writing it in NCR5380_init() to check if the chip is really there.
This prevents hang when incorrect I/O address was specified by user.
--- drivers/scsi/NCR5380.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/scsi/NCR5380.c +5 -0
@@ -495,6 +495,11 @@ static int NCR5380_init(struct Scsi_Host *instance, int flags)NCR5380_write (INITIATOR_COMMAND_REG ,ICR_BASE );NCR5380_write (MODE_REG ,MR_BASE ); +/* check if the chip is really there */ +if (NCR5380_read (MODE_REG ) !=MR_BASE ) { +NCR5380_exit (instance); +return -ENODEV ; + }NCR5380_write (TARGET_COMMAND_REG ,0 );NCR5380_write (SELECT_ENABLE_REG ,0 );
Signature · 1 line
Ondrej Zary
Re: [PATCH 3/3] NCR5380: Check for chip presence in NCR5380_init()
Quoted 15 lines · Ondrej Zary
Read back
MODE_REGafter writing it inNCR5380_init()to check if the chip is really there.This prevents hang when incorrect I/O address was specified by user.
Signed-off-by Ondrej Zary <[email protected]>--- drivers/scsi/NCR5380.c | 5 +++++ 1 file changed, 5 insertions(+)drivers/scsi/NCR5380.c +0
-0
drivers/scsi/NCR5380.c static int NCR5380_init(struct Scsi_Host *instance, int flags) · line 502
Quoted 8 lines
drivers/scsi/NCR5380.c +5
-0@@ -495,6 +495,11 @@ static int NCR5380_init(struct Scsi_Host *instance, int flags)NCR5380_write (INITIATOR_COMMAND_REG ,ICR_BASE );NCR5380_write (MODE_REG ,MR_BASE ); +/* check if the chip is really there */ +if (NCR5380_read (MODE_REG ) !=MR_BASE ) { +NCR5380_exit (instance); +return -ENODEV ; + }
This doesn't belong in the core driver. Only the 5380 ISA drivers have configurable base addresses.
Also, MR_BASE == 0, so that test is likely to be ineffectual anyway. This patch doesn't really add any value AFAICT.
Quoted 4 lines
drivers/scsi/NCR5380.c +0
-0NCR5380_write (TARGET_COMMAND_REG ,0 );NCR5380_write (SELECT_ENABLE_REG ,0 );
Re: [PATCH 3/3] NCR5380: Check for chip presence in NCR5380_init()
Quoted 29 lines · Finn Thain
Quoted 15 lines · Ondrej Zary
Read back
MODE_REGafter writing it inNCR5380_init()to check if the chip is really there.This prevents hang when incorrect I/O address was specified by user.
Signed-off-by Ondrej Zary <[email protected]>--- drivers/scsi/NCR5380.c | 5 +++++ 1 file changed, 5 insertions(+)drivers/scsi/NCR5380.c +0
-0drivers/scsi/NCR5380.c static int NCR5380_init(struct Scsi_Host *instance, · line 503
Quoted 9 lines
drivers/scsi/NCR5380.c +5
-0@@ -495,6 +495,11 @@ static int NCR5380_init(struct Scsi_Host *instance, int flags)NCR5380_write (INITIATOR_COMMAND_REG ,ICR_BASE );NCR5380_write (MODE_REG ,MR_BASE ); +/* check if the chip is really there */ +if (NCR5380_read (MODE_REG ) !=MR_BASE ) { +NCR5380_exit (instance); +return -ENODEV ; + }This doesn't belong in the core driver. Only the 5380 ISA drivers have configurable base addresses.
Quoted 2 lines
Also,
MR_BASE== 0, so that test is likely to be ineffectual anyway. This patch doesn't really add any value AFAICT.
This fixes the most common problem: no device present at the specified I/O address, all reads result in 0xff.
Signature · 1 line
Ondrej Zary
Re: [PATCH 3/3] NCR5380: Check for chip presence in NCR5380_init()
Quoted 30 lines · Ondrej Zary
Quoted 29 lines · Finn Thain
Quoted 15 lines · Ondrej Zary
Read back
MODE_REGafter writing it inNCR5380_init()to check if the chip is really there.This prevents hang when incorrect I/O address was specified by user.
Signed-off-by Ondrej Zary <[email protected]>--- drivers/scsi/NCR5380.c | 5 +++++ 1 file changed, 5 insertions(+)drivers/scsi/NCR5380.c +0
-0drivers/scsi/NCR5380.c static int NCR5380_init(struct Scsi_Host *instance, · line 503
Quoted 9 lines
drivers/scsi/NCR5380.c +5
-0@@ -495,6 +495,11 @@ static int NCR5380_init(struct Scsi_Host *instance, int flags)NCR5380_write (INITIATOR_COMMAND_REG ,ICR_BASE );NCR5380_write (MODE_REG ,MR_BASE ); +/* check if the chip is really there */ +if (NCR5380_read (MODE_REG ) !=MR_BASE ) { +NCR5380_exit (instance); +return -ENODEV ; + }This doesn't belong in the core driver. Only the 5380 ISA drivers have configurable base addresses.
Quoted 6 lines
Quoted 2 lines
Also,
MR_BASE== 0, so that test is likely to be ineffectual anyway. This patch doesn't really add any value AFAICT.This fixes the most common problem: no device present at the specified I/O address, all reads result in
0xff.
ISTR that's true for ISA in general, so I guess it would be okay in g_NCR5380.c.
Better do this before NCR5380_init() so you can probe before allocating a scsi host. Just write 0 to MODE_REG or SELECT_ENABLE_REG.
Re: [PATCH 3/3] NCR5380: Check for chip presence in NCR5380_init()
In reply to Ondrej ZaryQuoted 4 lines · Ondrej Zary
Read back
MODE_REGafter writing it inNCR5380_init()to check if the chip is really there.This prevents hang when incorrect I/O address was specified by user.
Do you know whereabouts in the driver the hang happens? Maybe there is a robustness issue there.
Card type detection (and vacant slot detection) is a good idea but I'm not sure how we can detect this chip reliably.
Quoted 23 lines
Signed-off-by Ondrej Zary <[email protected]>--- drivers/scsi/NCR5380.c | 5 +++++ 1 file changed, 5 insertions(+)drivers/scsi/NCR5380.c +5
-0@@ -495,6 +495,11 @@ static int NCR5380_init(struct Scsi_Host *instance, int flags)NCR5380_write (INITIATOR_COMMAND_REG ,ICR_BASE );NCR5380_write (MODE_REG ,MR_BASE ); +/* check if the chip is really there */ +if (NCR5380_read (MODE_REG ) !=MR_BASE ) { +NCR5380_exit (instance); +return -ENODEV ; + }NCR5380_write (TARGET_COMMAND_REG ,0 );NCR5380_write (SELECT_ENABLE_REG ,0 );
Quoted 2 lines · Ondrej Zary
Use standard
probe_irq_on()andprobe_irq_off()functions instead of own implementation.
Thanks for doing this.
Quoted 77 lines
This prevents warning messages like this in the kernel log:
genirq: Flags mismatch irq 1. 00000000 (NCR-probe) vs. 00000080 (i8042)Move the IRQ trigger code to a separate function so it can be used for other purposes (testing if the IRQ works).
Also add missing IRQ reset after probe.
Signed-off-by Ondrej Zary <[email protected]>--- drivers/scsi/NCR5380.c | 72 +++++++++++++++++----------------------------- drivers/scsi/NCR5380.h | 3 +- drivers/scsi/g_NCR5380.c | 2 +- 3 files changed, 29 insertions(+), 48 deletions(-)drivers/scsi/NCR5380.c +3
-40@@ -351,50 +351,13 @@ static void NCR5380_print_phase(struct Scsi_Host *instance) }#endif - -static int probe_irq; - -/** -* probe_intr - helper for IRQ autoprobe -* @irq: interrupt number -* @dev_id: unused -* @regs: unused -* -* Set a flag to indicate the IRQ in question was received. This is -* used by the IRQ probe code. -*/ - -static irqreturn_t probe_intr (int irq,void *dev_id) -{ - probe_irq = irq; -return IRQ_HANDLED ; -} - -/** -* NCR5380_probe_irq - find the IRQ of an NCR5380 -* @instance: NCR5380 controller -* @possible: bitmask of ISA IRQ lines -* -* Autoprobe for the IRQ line used by the NCR5380 by triggering an IRQ -* and then looking to see what interrupt actually turned up. -*/ - -static int __maybe_unused NCR5380_probe_irq (struct Scsi_Host *instance, -int possible) +static void NCR5380_trigger_irq (struct Scsi_Host *instance) {struct NCR5380_hostdata *hostdata =shost_priv (instance); -unsigned long timeout; -int trying_irqs, i, mask; - -for (trying_irqs =0 , i =1 , mask =2 ; i <16 ; ++i, mask <<=1 ) -if ((mask & possible) && (request_irq (i, &probe_intr,0 ,"NCR-probe" ,NULL ) ==0 )) - trying_irqs |= mask; - - timeout = jiffies +msecs_to_jiffies (250 ); - probe_irq =NO_IRQ ; +unsigned long timeout = jiffies +msecs_to_jiffies (2500 );/* -* A interrupt is triggered whenever BSY = false, SEL = true +* An interrupt is triggered whenever BSY = false, SEL = true * and a bit set in the SELECT_ENABLE_REG is asserted on the * SCSI bus. * @@ -402,23 +365,40 @@ static int __maybe_unused NCR5380_probe_irq(struct Scsi_Host *instance,* (I/O, C/D, and MSG) match those in the TCR, so we must reset that * to zero. */
drivers/scsi/NCR5380.c static int __maybe_unused NCR5380_probe_irq(struct Scsi_Host *instance, · line 375
Quoted 10 lines
drivers/scsi/NCR5380.c +2
-2-NCR5380_write (TARGET_COMMAND_REG ,0 );NCR5380_write (SELECT_ENABLE_REG , hostdata->id_mask);NCR5380_write (OUTPUT_DATA_REG , hostdata->id_mask);NCR5380_write (INITIATOR_COMMAND_REG ,ICR_BASE |ICR_ASSERT_DATA |ICR_ASSERT_SEL ); -while (probe_irq ==NO_IRQ &&time_before (jiffies, timeout)) +while (!(NCR5380_read (BUS_AND_STATUS_REG ) &BASR_IRQ ) && +time_before (jiffies, timeout))schedule_timeout_uninterruptible (1 );
You don't need a 2.5 second timeout here. To raise the interrupt the chip should not need more than a bus settle delay (400ns). Calling msleep(1) should be plenty.
Better still, please drop the loop, the delay and the BASR_IRQ test here, and if need be, put the delay in the caller. This routine discards the result of that sequence anyway.
Quoted 11 lines
drivers/scsi/NCR5380.c +4
-3NCR5380_write (SELECT_ENABLE_REG ,0 );NCR5380_write (INITIATOR_COMMAND_REG ,ICR_BASE ); +} -for (i =1 , mask =2 ; i <16 ; ++i, mask <<=1 ) -if (trying_irqs & mask) -free_irq (i,NULL ); +/** +* NCR5380_probe_irq - find the IRQ of an NCR5380 +* @instance: NCR5380 controller
drivers/scsi/NCR5380.c static int __maybe_unused NCR5380_probe_irq(struct Scsi_Host *instance, · line 393
Quoted 10 lines
drivers/scsi/NCR5380.c +10
-0+* +* Autoprobe for the IRQ line used by the NCR5380 by triggering an IRQ +* and then looking to see what interrupt actually turned up. +*/ + +static int NCR5380_probe_irq (struct Scsi_Host *instance) +{ +struct NCR5380_hostdata *hostdata =shost_priv (instance); +int irqs, irq; +
Please rename irqs to irq_mask.
Other drivers like tty/cyclades.c begin with,
/* forget possible initially masked and pending IRQ */ irq = probe_irq_off(probe_irq_on());
Perhaps we need that here too?
drivers/scsi/NCR5380.c static int __maybe_unused NCR5380_probe_irq(struct Scsi_Host *instance, · line 394
Quoted 1 line
drivers/scsi/NCR5380.c +1
-0+ irqs =probe_irq_on ();
You should clear any pending interrupt on the chip before you try to trigger another one.
drivers/scsi/NCR5380.c static int __maybe_unused NCR5380_probe_irq(struct Scsi_Host *instance, · line 395
Quoted 1 line
drivers/scsi/NCR5380.c +1
-0+NCR5380_trigger_irq (instance);
Please do the msleep(1) here.
drivers/scsi/NCR5380.c static int __maybe_unused NCR5380_probe_irq(struct Scsi_Host *instance, · line 399
Quoted 4 lines
drivers/scsi/NCR5380.c +4
-0+ irq =probe_irq_off (irqs); +NCR5380_read (RESET_PARITY_INTERRUPT_REG ); +if (irq <0 ) + irq =0 ;
Please use NO_IRQ instead of 0.
Quoted 11 lines
drivers/scsi/NCR5380.c +1
-1-return probe_irq; +return irq; }/** drivers/scsi/NCR5380.h +0
-0
drivers/scsi/NCR5380.h static inline struct scsi_cmnd *NCR5380_to_scmd(struct NCR5380_cmd *ncmd_ptr) · line 297
Quoted 9 lines
drivers/scsi/NCR5380.h +2
-1@@ -290,7 +290,8 @@ static inline struct scsi_cmnd *NCR5380_to_scmd(struct NCR5380_cmd *ncmd_ptr)#define NCR5380_dprint_phase (flg, arg) do {} while (0)#endif -static int NCR5380_probe_irq (struct Scsi_Host *instance,int possible); +static void NCR5380_trigger_irq (struct Scsi_Host *instance); +static int NCR5380_probe_irq (struct Scsi_Host *instance);static int NCR5380_init (struct Scsi_Host *instance,int flags);static int NCR5380_maybe_reset_bus (struct Scsi_Host *);static void NCR5380_exit (struct Scsi_Host *instance);
Please move NCR5380_probe_irq and NCR5380_trigger_irq implementations and prototypes out of the core driver and into g_NCR5380.c. The reason is, ISA cards are probably the only 5380 cards ever likely to need manual IRQ configuration. It would better to have g_NCR5380 support more ISA cards than to add more ISA drivers, therefore this code isn't likely to be needed in the core driver.
Thanks.
Quoted 14 lines
drivers/scsi/g_NCR5380.c +1
-1@@ -265,7 +265,7 @@ static int generic_NCR5380_init_one(struct scsi_host_template *tpnt,if (irq !=IRQ_AUTO ) instance->irq = irq;else - instance->irq =NCR5380_probe_irq (instance,0xffff ); + instance->irq =NCR5380_probe_irq (instance);/* Compatibility with documented NCR5380 kernel parameters */ if (instance->irq ==255 )
Quoted 91 lines · Finn Thain
Quoted 2 lines · Ondrej Zary
Use standard
probe_irq_on()andprobe_irq_off()functions instead of own implementation.Thanks for doing this.
Quoted 85 lines
This prevents warning messages like this in the kernel log:
genirq: Flags mismatch irq 1. 00000000 (NCR-probe) vs. 00000080 (i8042)Move the IRQ trigger code to a separate function so it can be used for other purposes (testing if the IRQ works).
Also add missing IRQ reset after probe.
Signed-off-by Ondrej Zary <[email protected]>--- drivers/scsi/NCR5380.c | 72 +++++++++++++++++----------------------------- drivers/scsi/NCR5380.h | 3 +- drivers/scsi/g_NCR5380.c | 2 +- 3 files changed, 29 insertions(+), 48 deletions(-)drivers/scsi/NCR5380.c +3
-39@@ -351,50 +351,13 @@ static void NCR5380_print_phase(struct Scsi_Host *instance) }#endif - -static int probe_irq; - -/** -* probe_intr - helper for IRQ autoprobe -* @irq: interrupt number -* @dev_id: unused -* @regs: unused -* -* Set a flag to indicate the IRQ in question was received. This is -* used by the IRQ probe code. -*/ - -static irqreturn_t probe_intr (int irq,void *dev_id) -{ - probe_irq = irq; -return IRQ_HANDLED ; -} - -/** -* NCR5380_probe_irq - find the IRQ of an NCR5380 -* @instance: NCR5380 controller -* @possible: bitmask of ISA IRQ lines -* -* Autoprobe for the IRQ line used by the NCR5380 by triggering an IRQ -* and then looking to see what interrupt actually turned up. -*/ - -static int __maybe_unused NCR5380_probe_irq (struct Scsi_Host *instance, -int possible) +static void NCR5380_trigger_irq (struct Scsi_Host *instance) {struct NCR5380_hostdata *hostdata =shost_priv (instance); -unsigned long timeout; -int trying_irqs, i, mask; - -for (trying_irqs =0 , i =1 , mask =2 ; i <16 ; ++i, mask <<=1 ) -if ((mask & possible) && (request_irq (i, &probe_intr,0 ,"NCR-probe" , NULL) == 0)) - trying_irqs |= mask; - - timeout = jiffies +msecs_to_jiffies (250 ); - probe_irq =NO_IRQ ; +unsigned long timeout = jiffies +msecs_to_jiffies (2500 );/* -* A interrupt is triggered whenever BSY = false, SEL = true +* An interrupt is triggered whenever BSY = false, SEL = true * and a bit set in the SELECT_ENABLE_REG is asserted on the * SCSI bus. * @@ -402,23 +365,40 @@ static int __maybe_unused NCR5380_probe_irq(struct
Scsi_Host*instance, * (I/O, C/D, and MSG) match those in the TCR, so we must reset that * to zero.drivers/scsi/NCR5380.c +0
-1*/ -NCR5380_write (TARGET_COMMAND_REG ,0 );NCR5380_write (SELECT_ENABLE_REG , hostdata->id_mask);NCR5380_write (OUTPUT_DATA_REG , hostdata->id_mask); NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_DATA |
ICR_ASSERT_SEL);
Quoted 8 lines
drivers/scsi/NCR5380.c static int __maybe_unused NCR5380_probe_irq(struct Scsi_Host *instance, · line 375
Quoted 4 lines
drivers/scsi/NCR5380.c +2
-1-while (probe_irq ==NO_IRQ &&time_before (jiffies, timeout)) +while (!(NCR5380_read (BUS_AND_STATUS_REG ) &BASR_IRQ ) && +time_before (jiffies, timeout))schedule_timeout_uninterruptible (1 );You don't need a 2.5 second timeout here. To raise the interrupt the chip should not need more than a bus settle delay (400ns). Calling msleep(1) should be plenty.
Yes, 2.5s is a mistake (leftover from testing), sorry.
Quoted 3 lines
Better still, please drop the loop, the delay and the
BASR_IRQtest here, and if need be, put the delay in the caller. This routine discards the result of that sequence anyway.
Will if work if the following lines are executed before the delay?
Quoted 24 lines
Quoted 11 lines
drivers/scsi/NCR5380.c +4
-3NCR5380_write (SELECT_ENABLE_REG ,0 );NCR5380_write (INITIATOR_COMMAND_REG ,ICR_BASE ); +} -for (i =1 , mask =2 ; i <16 ; ++i, mask <<=1 ) -if (trying_irqs & mask) -free_irq (i,NULL ); +/** +* NCR5380_probe_irq - find the IRQ of an NCR5380 +* @instance: NCR5380 controller drivers/scsi/NCR5380.c static int __maybe_unused NCR5380_probe_irq(struct Scsi_Host *instance, · line 393
Quoted 10 lines
drivers/scsi/NCR5380.c +10
-0+* +* Autoprobe for the IRQ line used by the NCR5380 by triggering an IRQ +* and then looking to see what interrupt actually turned up. +*/ + +static int NCR5380_probe_irq (struct Scsi_Host *instance) +{ +struct NCR5380_hostdata *hostdata =shost_priv (instance); +int irqs, irq; +Please rename irqs to
irq_mask.
Quoted 6 lines
Other drivers like
tty/cyclades.cbegin with,/* forget possible initially masked and pending IRQ */ irq = probe_irq_off(probe_irq_on());Perhaps we need that here too?
Only cyclades and 8250_port do that, other drivers don't. Don't know what exact problem should that solve.
Quoted 46 lines
drivers/scsi/NCR5380.c static int __maybe_unused NCR5380_probe_irq(struct Scsi_Host *instance, · line 394
Quoted 2 lines
drivers/scsi/NCR5380.c +1
-0+ irqs =probe_irq_on ();You should clear any pending interrupt on the chip before you try to trigger another one.
drivers/scsi/NCR5380.c static int __maybe_unused NCR5380_probe_irq(struct Scsi_Host *instance, · line 395
Quoted 1 line
drivers/scsi/NCR5380.c +1
-0+NCR5380_trigger_irq (instance);Please do the msleep(1) here.
drivers/scsi/NCR5380.c static int __maybe_unused NCR5380_probe_irq(struct Scsi_Host *instance, · line 399
Quoted 4 lines
drivers/scsi/NCR5380.c +4
-0+ irq =probe_irq_off (irqs); +NCR5380_read (RESET_PARITY_INTERRUPT_REG ); +if (irq <0 ) + irq =0 ;Please use
NO_IRQinstead of 0.Quoted 19 lines
drivers/scsi/NCR5380.c +1
-1-return probe_irq; +return irq; }/** drivers/scsi/NCR5380.h +2
-1@@ -290,7 +290,8 @@ static inline struct scsi_cmnd *NCR5380_to_scmd(struct NCR5380_cmd *ncmd_ptr) #defineNCR5380_dprint_phase (flg, arg) do {} while (0)#endif -static int NCR5380_probe_irq (struct Scsi_Host *instance,int possible); +static void NCR5380_trigger_irq (struct Scsi_Host *instance); +static int NCR5380_probe_irq (struct Scsi_Host *instance);static int NCR5380_init (struct Scsi_Host *instance,int flags);static int NCR5380_maybe_reset_bus (struct Scsi_Host *);Quoted 1 line
static void
NCR5380_exit(struct Scsi_Host *instance);Please move
NCR5380_probe_irqandNCR5380_trigger_irqimplementations and prototypes out of the core driver and intog_NCR5380.c. The reason is, ISA cards are probably the only 5380 cards ever likely to need manual IRQ configuration. It would better to haveg_NCR5380support more ISA cards than to add more ISA drivers, therefore this code isn't likely to be needed in the core driver.Thanks.
Signature · 1 line
Ondrej Zary
Quoted 101 lines · Ondrej Zary
Quoted 91 lines · Finn Thain
Quoted 2 lines · Ondrej Zary
Use standard
probe_irq_on()andprobe_irq_off()functions instead of own implementation.Thanks for doing this.
Quoted 85 lines
This prevents warning messages like this in the kernel log:
genirq: Flags mismatch irq 1. 00000000 (NCR-probe) vs. 00000080 (i8042)Move the IRQ trigger code to a separate function so it can be used for other purposes (testing if the IRQ works).
Also add missing IRQ reset after probe.
Signed-off-by Ondrej Zary <[email protected]>--- drivers/scsi/NCR5380.c | 72 +++++++++++++++++----------------------------- drivers/scsi/NCR5380.h | 3 +- drivers/scsi/g_NCR5380.c | 2 +- 3 files changed, 29 insertions(+), 48 deletions(-)drivers/scsi/NCR5380.c +3
-39@@ -351,50 +351,13 @@ static void NCR5380_print_phase(struct Scsi_Host *instance) }#endif - -static int probe_irq; - -/** -* probe_intr - helper for IRQ autoprobe -* @irq: interrupt number -* @dev_id: unused -* @regs: unused -* -* Set a flag to indicate the IRQ in question was received. This is -* used by the IRQ probe code. -*/ - -static irqreturn_t probe_intr (int irq,void *dev_id) -{ - probe_irq = irq; -return IRQ_HANDLED ; -} - -/** -* NCR5380_probe_irq - find the IRQ of an NCR5380 -* @instance: NCR5380 controller -* @possible: bitmask of ISA IRQ lines -* -* Autoprobe for the IRQ line used by the NCR5380 by triggering an IRQ -* and then looking to see what interrupt actually turned up. -*/ - -static int __maybe_unused NCR5380_probe_irq (struct Scsi_Host *instance, -int possible) +static void NCR5380_trigger_irq (struct Scsi_Host *instance) {struct NCR5380_hostdata *hostdata =shost_priv (instance); -unsigned long timeout; -int trying_irqs, i, mask; - -for (trying_irqs =0 , i =1 , mask =2 ; i <16 ; ++i, mask <<=1 ) -if ((mask & possible) && (request_irq (i, &probe_intr,0 ,"NCR-probe" , NULL) == 0)) - trying_irqs |= mask; - - timeout = jiffies +msecs_to_jiffies (250 ); - probe_irq =NO_IRQ ; +unsigned long timeout = jiffies +msecs_to_jiffies (2500 );/* -* A interrupt is triggered whenever BSY = false, SEL = true +* An interrupt is triggered whenever BSY = false, SEL = true * and a bit set in the SELECT_ENABLE_REG is asserted on the * SCSI bus. * @@ -402,23 +365,40 @@ static int __maybe_unused NCR5380_probe_irq(struct
Scsi_Host*instance, * (I/O, C/D, and MSG) match those in the TCR, so we must reset that * to zero.drivers/scsi/NCR5380.c +0
-1*/ -NCR5380_write (TARGET_COMMAND_REG ,0 );NCR5380_write (SELECT_ENABLE_REG , hostdata->id_mask);NCR5380_write (OUTPUT_DATA_REG , hostdata->id_mask); NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_DATA |
ICR_ASSERT_SEL);Quoted 8 lines
drivers/scsi/NCR5380.c static int __maybe_unused NCR5380_probe_irq(struct Scsi_Host *instance, · line 375
Quoted 4 lines
drivers/scsi/NCR5380.c +2
-1-while (probe_irq ==NO_IRQ &&time_before (jiffies, timeout)) +while (!(NCR5380_read (BUS_AND_STATUS_REG ) &BASR_IRQ ) && +time_before (jiffies, timeout))schedule_timeout_uninterruptible (1 );You don't need a 2.5 second timeout here. To raise the interrupt the chip should not need more than a bus settle delay (400ns). Calling msleep(1) should be plenty.
Quoted 7 lines
Yes, 2.5s is a mistake (leftover from testing), sorry.
Quoted 3 lines
Better still, please drop the loop, the delay and the
BASR_IRQtest here, and if need be, put the delay in the caller. This routine discards the result of that sequence anyway.Will if work if the following lines are executed before the delay?
I think so... but you're right, it is better if the delay remains here.
Quoted 27 lines
Quoted 27 lines
Quoted 12 lines
drivers/scsi/NCR5380.c +4
-3NCR5380_write (SELECT_ENABLE_REG ,0 );NCR5380_write (INITIATOR_COMMAND_REG ,ICR_BASE ); +} -for (i =1 , mask =2 ; i <16 ; ++i, mask <<=1 ) -if (trying_irqs & mask) -free_irq (i,NULL ); +/** +* NCR5380_probe_irq - find the IRQ of an NCR5380 +* @instance: NCR5380 controller drivers/scsi/NCR5380.c static int __maybe_unused NCR5380_probe_irq(struct Scsi_Host *instance, · line 393
Quoted 10 lines
drivers/scsi/NCR5380.c +10
-0+* +* Autoprobe for the IRQ line used by the NCR5380 by triggering an IRQ +* and then looking to see what interrupt actually turned up. +*/ + +static int NCR5380_probe_irq (struct Scsi_Host *instance) +{ +struct NCR5380_hostdata *hostdata =shost_priv (instance); +int irqs, irq; +Please rename irqs to
irq_mask.Other drivers like
tty/cyclades.cbegin with,
Quoted 7 lines
Quoted 4 lines
/* forget possible initially masked and pending IRQ */ irq = probe_irq_off(probe_irq_on());Perhaps we need that here too?
Only cyclades and 8250_port do that, other drivers don't. Don't know what exact problem should that solve.
OK. I'm no expert on ISA so I'll leave it up to you.
Quoted 51 lines
Quoted 47 lines
drivers/scsi/NCR5380.c static int __maybe_unused NCR5380_probe_irq(struct Scsi_Host *instance, · line 394
Quoted 3 lines
drivers/scsi/NCR5380.c +1
-0+ irqs =probe_irq_on ();You should clear any pending interrupt on the chip before you try to trigger another one.
drivers/scsi/NCR5380.c static int __maybe_unused NCR5380_probe_irq(struct Scsi_Host *instance, · line 395
Quoted 1 line
drivers/scsi/NCR5380.c +1
-0+NCR5380_trigger_irq (instance);Please do the msleep(1) here.
drivers/scsi/NCR5380.c static int __maybe_unused NCR5380_probe_irq(struct Scsi_Host *instance, · line 399
Quoted 4 lines
drivers/scsi/NCR5380.c +4
-0+ irq =probe_irq_off (irqs); +NCR5380_read (RESET_PARITY_INTERRUPT_REG ); +if (irq <0 ) + irq =0 ;Please use
NO_IRQinstead of 0.Quoted 19 lines
drivers/scsi/NCR5380.c +1
-1-return probe_irq; +return irq; }/** drivers/scsi/NCR5380.h +2
-1@@ -290,7 +290,8 @@ static inline struct scsi_cmnd *NCR5380_to_scmd(struct NCR5380_cmd *ncmd_ptr) #defineNCR5380_dprint_phase (flg, arg) do {} while (0)#endif -static int NCR5380_probe_irq (struct Scsi_Host *instance,int possible); +static void NCR5380_trigger_irq (struct Scsi_Host *instance); +static int NCR5380_probe_irq (struct Scsi_Host *instance);static int NCR5380_init (struct Scsi_Host *instance,int flags);static int NCR5380_maybe_reset_bus (struct Scsi_Host *);Quoted 1 line
static void
NCR5380_exit(struct Scsi_Host *instance);Please move
NCR5380_probe_irqandNCR5380_trigger_irqimplementations and prototypes out of the core driver and intog_NCR5380.c. The reason is, ISA cards are probably the only 5380 cards ever likely to need manual IRQ configuration. It would better to haveg_NCR5380support more ISA cards than to add more ISA drivers, therefore this code isn't likely to be needed in the core driver.Thanks.