htirq: generalization
cover htirq: generalization
In reply to a message not in the archiveOk. I think this is what we need to do to generalize the htirq code so that we can use it on hardware that doesn't connect the standard configuration registers to control of the htirq.
Bryan please take a look and see if you can use these to fix the ipath hypertransport card driver.
Eric
PATCH 1/2 htirq: Refactor so we only have one function that writes to the chip.
This refactoring actually optimizes the code a little by caching the value that we think the device is programmed with instead of reading it back from the hardware. Which simplifies the code a little and should speed things up a bit.
This patch introduces the concept of a ht_irq_msg and modifies the architecture read/write routines to update this code.
There is a minor consistency fix here as well as x86_64 forgot to initialize the htirq as masked.
--- arch/i386/kernel/io_apic.c | 26 +++++++-------- arch/x86_64/kernel/io_apic.c | 31 +++++++++--------- drivers/pci/htirq.c | 72 ++++++++++++++---------------------------- include/linux/htirq.h | 11 ++++-- 4 files changed, 58 insertions(+), 82 deletions(-)
arch/i386/kernel/io_apic.c +12 -14
@@ -2624,18 +2624,16 @@ #ifdef CONFIG_SMPstatic void target_ht_irq (unsigned int irq,unsigned int dest) { -u32 low, high; - low =read_ht_irq_low (irq); - high =read_ht_irq_high (irq); +struct ht_irq_msg msg; +fetch_ht_irq_msg (irq, &msg); - low &= ~(HT_IRQ_LOW_DEST_ID_MASK ); - high &= ~(HT_IRQ_HIGH_DEST_ID_MASK ); + msg.address_lo &= ~(HT_IRQ_LOW_DEST_ID_MASK ); + msg.address_hi &= ~(HT_IRQ_HIGH_DEST_ID_MASK ); - low |=HT_IRQ_LOW_DEST_ID (dest); - high |=HT_IRQ_HIGH_DEST_ID (dest); + msg.address_lo |=HT_IRQ_LOW_DEST_ID (dest); + msg.address_hi |=HT_IRQ_HIGH_DEST_ID (dest); -write_ht_irq_low (irq, low); -write_ht_irq_high (irq, high); +write_ht_irq_msg (irq, &msg); }static void set_ht_irq_affinity (unsigned int irq,cpumask_t mask)
@@ -2673,7 +2671,7 @@ int arch_setup_ht_irq(unsigned int irq, vector =assign_irq_vector (irq);if (vector >=0 ) { -u32 low, high; +struct ht_irq_msg msg;unsigned dest;cpumask_t tmp;
@@ -2681,9 +2679,10 @@ int arch_setup_ht_irq(unsigned int irq,cpu_set (vector >>8 , tmp); dest =cpu_mask_to_apicid (tmp); - high =HT_IRQ_HIGH_DEST_ID (dest); + msg.address_hi =HT_IRQ_HIGH_DEST_ID (dest); - low =HT_IRQ_LOW_BASE | + msg.address_lo = +HT_IRQ_LOW_BASE |HT_IRQ_LOW_DEST_ID (dest) | HT_IRQ_LOW_VECTOR(vector) | ((INT_DEST_MODE == 0) ?
@@ -2695,8 +2694,7 @@ int arch_setup_ht_irq(unsigned int irq, HT_IRQ_LOW_MT_ARBITRATED) |HT_IRQ_LOW_IRQ_MASKED ; -write_ht_irq_low (irq, low); -write_ht_irq_high (irq, high); +write_ht_irq_msg (irq, &msg);set_irq_chip_and_handler_name (irq, &ht_irq_chip, handle_edge_irq,"edge" );
arch/x86_64/kernel/io_apic.c +15 -16
@@ -1889,18 +1889,16 @@ #ifdef CONFIG_SMPstatic void target_ht_irq (unsigned int irq,unsigned int dest,u8 vector) { -u32 low, high; - low =read_ht_irq_low (irq); - high =read_ht_irq_high (irq); +struct ht_irq_msg msg; +fetch_ht_irq_msg (irq, &msg); - low &= ~(HT_IRQ_LOW_VECTOR_MASK |HT_IRQ_LOW_DEST_ID_MASK ); - high &= ~(HT_IRQ_HIGH_DEST_ID_MASK ); + msg.address_lo &= ~(HT_IRQ_LOW_VECTOR_MASK |HT_IRQ_LOW_DEST_ID_MASK ); + msg.address_hi &= ~(HT_IRQ_HIGH_DEST_ID_MASK ); - low |=HT_IRQ_LOW_VECTOR (vector) |HT_IRQ_LOW_DEST_ID (dest); - high |=HT_IRQ_HIGH_DEST_ID (dest); + msg.address_lo |=HT_IRQ_LOW_VECTOR (vector) |HT_IRQ_LOW_DEST_ID (dest); + msg.address_hi |=HT_IRQ_HIGH_DEST_ID (dest); -write_ht_irq_low (irq, low); -write_ht_irq_high (irq, high); +write_ht_irq_msg (irq, &msg); }static void set_ht_irq_affinity (unsigned int irq,cpumask_t mask)
@@ -1921,7 +1919,7 @@ static void set_ht_irq_affinity(unsigned dest =cpu_mask_to_apicid (tmp); -target_ht_irq (irq, dest, vector &0xff ); +target_ht_irq (irq, dest, vector); set_native_irq_info(irq, mask); }#endif
@@ -1944,14 +1942,15 @@ int arch_setup_ht_irq(unsigned int irq, vector =assign_irq_vector (irq,TARGET_CPUS , &tmp);if (vector >=0 ) { -u32 low, high; +struct ht_irq_msg msg;unsigned dest; dest =cpu_mask_to_apicid (tmp); - high =HT_IRQ_HIGH_DEST_ID (dest); + msg.address_hi =HT_IRQ_HIGH_DEST_ID (dest); - low =HT_IRQ_LOW_BASE | + msg.address_lo = +HT_IRQ_LOW_BASE |HT_IRQ_LOW_DEST_ID (dest) | HT_IRQ_LOW_VECTOR(vector) | ((INT_DEST_MODE == 0) ?
@@ -1960,10 +1959,10 @@ int arch_setup_ht_irq(unsigned int irq,HT_IRQ_LOW_RQEOI_EDGE | ((INT_DELIVERY_MODE != dest_LowestPrio) ?HT_IRQ_LOW_MT_FIXED : -HT_IRQ_LOW_MT_ARBITRATED ); +HT_IRQ_LOW_MT_ARBITRATED ) | +HT_IRQ_LOW_IRQ_MASKED ; -write_ht_irq_low (irq, low); -write_ht_irq_high (irq, high); +write_ht_irq_msg (irq, &msg);set_irq_chip_and_handler_name (irq, &ht_irq_chip, handle_edge_irq,"edge" );
drivers/pci/htirq.c +24 -48
112 lines not on this page · raw message
include/linux/htirq.h +7 -4
@@ -1,11 +1,14 @@#ifndef LINUX_HTIRQ_H #define LINUX_HTIRQ_H +struct ht_irq_msg { +u32 address_lo;/* low 32 bits of the ht irq message */ +u32 address_hi;/* high 32 bits of the it irq message */ +}; +/* Helper functions.. */ -void write_ht_irq_low (unsigned int irq,u32 data); -void write_ht_irq_high (unsigned int irq,u32 data); -u32 read_ht_irq_low (unsigned int irq); -u32 read_ht_irq_high (unsigned int irq); +void fetch_ht_irq_msg (unsigned int irq,struct ht_irq_msg *msg); +void write_ht_irq_msg (unsigned int irq,struct ht_irq_msg *msg);void mask_ht_irq (unsigned int irq);void unmask_ht_irq (unsigned int irq);
Signature · 1 line
1.4.2.rc3.g7e18e-dirty
Re: [PATCH 1/2] htirq: Refactor so we only have one function that writes to the chip.
Quoted 1 line · Eric W. Biederman
Signed-off-by Eric W. Biederman <[email protected]>
RFC PATCH 2/2 htirq: Allow buggy drivers of buggy hardware to write the registers.
In reply to Eric W. BiedermanCc [email protected], <[email protected]>
Date: Fri, 03 Nov 2006 14:46:30 -0700
Message-ID: <[email protected]>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
This patch adds a variant of ht_create_irq __ht_create_irq that takes an aditional parameter update that is a function that is called whenever we want to write to a drivers htirq configuration registers.
This is needed to support the ipath_iba6110 because it's registers in the proper location are not actually conected to the hardware that controlls interrupt delivery.
--- drivers/pci/htirq.c | 46 +++++++++++++++++++++++++++++++++------------- include/linux/htirq.h | 4 ++++ 2 files changed, 37 insertions(+), 13 deletions(-)
drivers/pci/htirq.c +33 -13
@@ -25,6 +25,8 @@ static DEFINE_SPINLOCK(ht_irq_lock);struct ht_irq_cfg {struct pci_dev *dev; +/* Update callback used to cope with buggy hardware */ +ht_irq_update_t *update;unsigned pos;unsigned idx;struct ht_irq_msg msg;
@@ -36,14 +38,17 @@ void write_ht_irq_msg(unsigned int irq,struct ht_irq_cfg *cfg =get_irq_data (irq);unsigned long flags;spin_lock_irqsave (&ht_irq_lock, flags); -if (cfg->msg.address_lo != msg->address_lo) { -pci_write_config_byte (cfg->dev, cfg->pos +2 , cfg->idx); -pci_write_config_dword (cfg->dev, cfg->pos +4 , msg->address_lo); - } -if (cfg->msg.address_hi != msg->address_hi) { -pci_write_config_byte (cfg->dev, cfg->pos +2 , cfg->idx +1 ); -pci_write_config_dword (cfg->dev, cfg->pos +4 , msg->address_hi); - } +if (!likely (cfg->update)) { +if (cfg->msg.address_lo != msg->address_lo) { +pci_write_config_byte (cfg->dev, cfg->pos +2 , cfg->idx); +pci_write_config_dword (cfg->dev, cfg->pos +4 , msg->address_lo); + } +if (cfg->msg.address_hi != msg->address_hi) { +pci_write_config_byte (cfg->dev, cfg->pos +2 , cfg->idx +1 ); +pci_write_config_dword (cfg->dev, cfg->pos +4 , msg->address_hi); + } + }else + cfg->update (irq, msg);spin_unlock_irqrestore (&ht_irq_lock, flags); cfg->msg = *msg; }
@@ -79,16 +84,14 @@ void unmask_ht_irq(unsigned int irq) }/** -* ht_create_irq - create an irq and attach it to a device. +* __ht_create_irq - create an irq and attach it to a device. * @dev: The hypertransport device to find the irq capability on. * @idx: Which of the possible irqs to attach to. -* -* ht_create_irq is needs to be called for all hypertransport devices -* that generate irqs. +* @update: Function to be called when changing the htirq message * * The irq number of the new irq or a negative error value is returned. */ -int ht_create_irq (struct pci_dev *dev,int idx) +int __ht_create_irq (struct pci_dev *dev,int idx,ht_irq_update_t *update) {struct ht_irq_cfg *cfg;unsigned long flags;
@@ -123,6 +126,7 @@ int ht_create_irq(struct pci_dev *dev, ireturn -ENOMEM ; cfg->dev = dev; + cfg->update = update; cfg->pos = pos; cfg->idx =0x10 + (idx *2 );/* Initialize msg to a value that will never match the first write. */
@@ -145,6 +149,21 @@ int ht_create_irq(struct pci_dev *dev, i }/** +* ht_create_irq - create an irq and attach it to a device. +* @dev: The hypertransport device to find the irq capability on. +* @idx: Which of the possible irqs to attach to. +* +* ht_create_irq needs to be called for all hypertransport devices +* that generate irqs. +* +* The irq number of the new irq or a negative error value is returned. +*/ +int ht_create_irq (struct pci_dev *dev,int idx) +{ +return __ht_create_irq (dev, idx,NULL ); +} + +/** * ht_destroy_irq - destroy an irq created with ht_create_irq * * This reverses ht_create_irq removing the specified irq from
@@ -162,5 +181,6 @@ void ht_destroy_irq(unsigned int irq)kfree (cfg); } +EXPORT_SYMBOL (__ht_create_irq);EXPORT_SYMBOL (ht_create_irq);EXPORT_SYMBOL (ht_destroy_irq);
include/linux/htirq.h +4 -0
@@ -15,4 +15,8 @@ void unmask_ht_irq(unsigned int irq);/* The arch hook for getting things started */ int arch_setup_ht_irq (unsigned int irq,struct pci_dev *dev); +/* For drivers of buggy hardware */ +typedef void (ht_irq_update_t )(int irq,struct ht_irq_msg *); +int __ht_create_irq (struct pci_dev *dev,int idx,ht_irq_update_t *update); +#endif /* LINUX_HTIRQ_H */
Signature · 1 line
1.4.2.rc3.g7e18e-dirty
Re: [RFC][PATCH 2/2] htirq: Allow buggy drivers of buggy hardware to write the registers.
why not create one standard update function. and use that us default for cfg->update
YH
Re: [RFC][PATCH 2/2] htirq: Allow buggy drivers of buggy hardware to write the registers.
Quoted 2 lines · Yinghai Lu
why not create one standard update function. and use that us default for
cfg->update
It is faster and clearer what the normal case is not to have an update function. In practice I only ever expect one card to actually use the update function.
Eric
Re: [RFC][PATCH 2/2] htirq: Allow buggy drivers of buggy hardware to write the registers.
if (!likely(cfg->update)) {
or
if (likely(!cfg->update)) {
YH
Re: [RFC][PATCH 2/2] htirq: Allow buggy drivers of buggy hardware to write the registers.
Quoted 5 lines · Yinghai Lu
if (!likely(cfg->update)) {
or
if (
likely(!cfg->update)) {
Yes. Except that the current state of affairs is that the only merged driver needs this :)
Eric