* [PATCH] pcmcia: Fix broken abuse of dev->driver_data
@ 2008-09-22 14:58 Alan Cox
2008-09-22 21:56 ` Dominik Brodowski
0 siblings, 1 reply; 17+ messages in thread
From: Alan Cox @ 2008-09-22 14:58 UTC (permalink / raw)
To: torvalds, linux-kernel
From: Alan Cox <alan@redhat.com>
PCMCIA abuses dev->private_data in the probe methods. Unfortunately it
continues to abuse it after calling drv->probe() which leads to crashes and
other nasties (such as bogus probes of multifunction devices) giving errors like
pcmcia: registering new device pcmcia0.1
kernel: 0.1: GetNextTuple: No more items
Extract the passed data before calling the driver probe function that way
we don't blow up when the driver reuses dev->private_data as its right.
As its close to the final release just move the hack so it works out,
hopefully someone will be sufficiently embarrassed to produce a nice rework
for 2.6.28.
Signed-off-by: Alan Cox <alan@redhat.com>
---
drivers/pcmcia/ds.c | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 4174d96..853d342 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -426,6 +426,18 @@ static int pcmcia_device_probe(struct device * dev)
p_dev = to_pcmcia_dev(dev);
p_drv = to_pcmcia_drv(dev->driver);
s = p_dev->socket;
+
+ /* The PCMCIA code passes the match data in via dev->driver_data
+ * which is an ugly hack. Once the driver probe is called it may
+ * and often will overwrite the match data so we must save it first
+ *
+ * handle pseudo multifunction devices:
+ * there are at most two pseudo multifunction devices.
+ * if we're matching against the first, schedule a
+ * call which will then check whether there are two
+ * pseudo devices, and if not, add the second one.
+ */
+ did = p_dev->dev.driver_data;
ds_dbg(1, "trying to bind %s to %s\n", p_dev->dev.bus_id,
p_drv->drv.name);
@@ -455,21 +467,14 @@ static int pcmcia_device_probe(struct device * dev)
goto put_module;
}
- /* handle pseudo multifunction devices:
- * there are at most two pseudo multifunction devices.
- * if we're matching against the first, schedule a
- * call which will then check whether there are two
- * pseudo devices, and if not, add the second one.
- */
- did = p_dev->dev.driver_data;
if (did && (did->match_flags & PCMCIA_DEV_ID_MATCH_DEVICE_NO) &&
(p_dev->socket->device_count == 1) && (p_dev->device_no ==
0)) pcmcia_add_device_later(p_dev->socket, 0);
- put_module:
+put_module:
if (ret)
module_put(p_drv->owner);
- put_dev:
+put_dev:
if (ret)
put_device(dev);
return (ret);
--
<meme>discombobulated echidna</meme>
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH] pcmcia: Fix broken abuse of dev->driver_data
2008-09-22 14:58 [PATCH] pcmcia: Fix broken abuse of dev->driver_data Alan Cox
@ 2008-09-22 21:56 ` Dominik Brodowski
2008-09-22 22:12 ` Alan Cox
0 siblings, 1 reply; 17+ messages in thread
From: Dominik Brodowski @ 2008-09-22 21:56 UTC (permalink / raw)
To: Alan Cox; +Cc: torvalds, linux-kernel, linux-pcmcia
Alan,
(CC: linux-pcmcia added)
Many thanks for finding this bug.
On Mon, Sep 22, 2008 at 03:58:14PM +0100, Alan Cox wrote:
> PCMCIA abuses dev->private_data in the probe methods. Unfortunately it
> continues to abuse it after calling drv->probe() which leads to crashes and
> other nasties (such as bogus probes of multifunction devices) giving errors like
Well, PCMCIA drivers have (struct pcmcia_device *) p_dev->priv available and
use this regularly, so using dev->private_data never has been supported.
Nonetheless, let's add support for using dev->private_data also for PCMCIA
devices and remove p_dev->priv eventually.
> As its close to the final release just move the hack so it works out,
> hopefully someone will be sufficiently embarrassed to produce a nice rework
> for 2.6.28.
Could you remove this from the changelog entry, please?
> @@ -426,6 +426,18 @@ static int pcmcia_device_probe(struct device * dev)
> p_dev = to_pcmcia_dev(dev);
> p_drv = to_pcmcia_drv(dev->driver);
> s = p_dev->socket;
> +
trailing whitespace
> + /* The PCMCIA code passes the match data in via dev->driver_data
> + * which is an ugly hack. Once the driver probe is called it may
> + * and often will overwrite the match data so we must save it first
trailing whitespace
> if (did && (did->match_flags & PCMCIA_DEV_ID_MATCH_DEVICE_NO) &&
> (p_dev->socket->device_count == 1) && (p_dev->device_no ==
> 0)) pcmcia_add_device_later(p_dev->socket, 0);
uh?
>
> - put_module:
> +put_module:
> if (ret)
> module_put(p_drv->owner);
> - put_dev:
> +put_dev:
unrelated -- please do not change it this time.
Best and thanks again,
Dominik
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH] pcmcia: Fix broken abuse of dev->driver_data
2008-09-22 21:56 ` Dominik Brodowski
@ 2008-09-22 22:12 ` Alan Cox
2008-09-22 22:26 ` Dominik Brodowski
2008-10-06 12:18 ` [PATCH 03/19] pcmcia: Whine harder about use of EXCLUSIVE Komuro
0 siblings, 2 replies; 17+ messages in thread
From: Alan Cox @ 2008-09-22 22:12 UTC (permalink / raw)
To: Dominik Brodowski; +Cc: torvalds, linux-kernel, linux-pcmcia
> > +
>
> trailing whitespace
Nod..
> > if (did && (did->match_flags & PCMCIA_DEV_ID_MATCH_DEVICE_NO) &&
> > (p_dev->socket->device_count == 1) && (p_dev->device_no ==
> > 0)) pcmcia_add_device_later(p_dev->socket, 0);
>
> uh?
Looks like a mailer folded it later, but the patch itself seems just fine.
> >
> > - put_module:
> > +put_module:
> > if (ret)
> > module_put(p_drv->owner);
> > - put_dev:
> > +put_dev:
>
> unrelated -- please do not change it this time.
Not sure you can have it both ways - if you don't want stray whitespace
then fixing the labels to conform to coding style seems to go with it ;)
Alan
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH] pcmcia: Fix broken abuse of dev->driver_data
2008-09-22 22:12 ` Alan Cox
@ 2008-09-22 22:26 ` Dominik Brodowski
2008-09-22 23:15 ` Alan Cox
2008-11-01 2:07 ` [BUG REPORT!!!] [PATCH 19/49] pcmcia: remove remaining in-kernel pcmcia_get_configuration_info() users Komuro
2008-10-06 12:18 ` [PATCH 03/19] pcmcia: Whine harder about use of EXCLUSIVE Komuro
1 sibling, 2 replies; 17+ messages in thread
From: Dominik Brodowski @ 2008-09-22 22:26 UTC (permalink / raw)
To: Alan Cox, torvalds; +Cc: linux-pcmcia, linux-kernel
On Mon, Sep 22, 2008 at 11:12:27PM +0100, Alan Cox wrote:
> Nod..
...
> Looks like a mailer folded it later, but the patch itself seems just fine.
*gnah* already applied upstream, including the comment implying that PCMCIA
driver's making use of driver_data were correct, while they were not. At
least the trailing whitespace didn't get merged.
> > >
> > > - put_module:
> > > +put_module:
> > > if (ret)
> > > module_put(p_drv->owner);
> > > - put_dev:
> > > +put_dev:
> >
> > unrelated -- please do not change it this time.
>
> Not sure you can have it both ways - if you don't want stray whitespace
> then fixing the labels to conform to coding style seems to go with it ;)
Well, there's a difference, and I know you know that I know that you know ;)
but you should also know that I already tried to apply the patch as it is,
which implies that I do not object too strongly to the removal of these two
non-characters from ds.c ;)
Thanks,
Dominik
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH] pcmcia: Fix broken abuse of dev->driver_data
2008-09-22 22:26 ` Dominik Brodowski
@ 2008-09-22 23:15 ` Alan Cox
2008-09-23 1:31 ` Komuro
2008-09-26 13:29 ` [PATCH git latest] drivers/net: fixing a datarace related to update_stats() Komuro
2008-11-01 2:07 ` [BUG REPORT!!!] [PATCH 19/49] pcmcia: remove remaining in-kernel pcmcia_get_configuration_info() users Komuro
1 sibling, 2 replies; 17+ messages in thread
From: Alan Cox @ 2008-09-22 23:15 UTC (permalink / raw)
To: Dominik Brodowski; +Cc: torvalds, linux-pcmcia, linux-kernel
> *gnah* already applied upstream, including the comment implying that PCMCIA
> driver's making use of driver_data were correct, while they were not. At
> least the trailing whitespace didn't get merged.
It was correct - dev->private_data for struct device is driver stuff, and
as the same drivers are used for pcmcia and non pcmcia its a bit hard to
argue otherwise.
Anyway tis finally sorted (and boy was it fun to pin down)
Alan
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH] pcmcia: Fix broken abuse of dev->driver_data
2008-09-22 23:15 ` Alan Cox
@ 2008-09-23 1:31 ` Komuro
2008-09-26 13:29 ` [PATCH git latest] drivers/net: fixing a datarace related to update_stats() Komuro
1 sibling, 0 replies; 17+ messages in thread
From: Komuro @ 2008-09-23 1:31 UTC (permalink / raw)
To: Alan Cox; +Cc: Dominik Brodowski, torvalds, linux-pcmcia, linux-kernel
Hi,
>PCMCIA abuses dev->private_data in the probe methods. Unfortunately it
>continues to abuse it after calling drv->probe() which leads to crashes and
>other nasties (such as bogus probes of multifunction devices) giving errors like
>
>pcmcia: registering new device pcmcia0.1
>kernel: 0.1: GetNextTuple: No more items
The pata_pcmcia works now. Thanks!
Best Regards
Komuro
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH git latest] drivers/net: fixing a datarace related to update_stats()
2008-09-22 23:15 ` Alan Cox
2008-09-23 1:31 ` Komuro
@ 2008-09-26 13:29 ` Komuro
2008-09-26 16:06 ` Tammy
2008-09-26 17:31 ` Lin Tan
1 sibling, 2 replies; 17+ messages in thread
From: Komuro @ 2008-09-26 13:29 UTC (permalink / raw)
To: linux-kernel; +Cc: tammy000
Hi,
You need two braces...
- if ((inw(ioaddr+EL3_STATUS) & 0xe000) == 0x2000)
+ if ((inw(ioaddr+EL3_STATUS) & 0xe000) == 0x2000) {
+ spin_lock_irqsave(&lp->lock, flags);
update_stats(dev);
+ spin_unlock_irqrestore(&lp->lock, flags);
+ }
}
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PATCH git latest] drivers/net: fixing a datarace related to update_stats()
2008-09-26 13:29 ` [PATCH git latest] drivers/net: fixing a datarace related to update_stats() Komuro
@ 2008-09-26 16:06 ` Tammy
2008-09-26 17:31 ` Lin Tan
1 sibling, 0 replies; 17+ messages in thread
From: Tammy @ 2008-09-26 16:06 UTC (permalink / raw)
To: Komuro; +Cc: linux-kernel
> You need two braces...
>
> - if ((inw(ioaddr+EL3_STATUS) & 0xe000) == 0x2000)
> + if ((inw(ioaddr+EL3_STATUS) & 0xe000) == 0x2000) {
> + spin_lock_irqsave(&lp->lock, flags);
> update_stats(dev);
> + spin_unlock_irqrestore(&lp->lock, flags);
> + }
> }
>
Thanks a lot. I will resubmit the patch then.
Lin
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PATCH git latest] drivers/net: fixing a datarace related to update_stats()
2008-09-26 13:29 ` [PATCH git latest] drivers/net: fixing a datarace related to update_stats() Komuro
2008-09-26 16:06 ` Tammy
@ 2008-09-26 17:31 ` Lin Tan
1 sibling, 0 replies; 17+ messages in thread
From: Lin Tan @ 2008-09-26 17:31 UTC (permalink / raw)
To: Komuro; +Cc: linux-kernel
[-- Attachment #1: Type: text/plain, Size: 31 bytes --]
Resending the corrected patch.
[-- Attachment #2: update_stats.readytosend --]
[-- Type: text/plain, Size: 1275 bytes --]
Fixing a datarace.
As indicated by the following comment, a lock must be held before calling
function update_stats(). This rule is followed in some cases, but not in
others. For example, the lock is held when the function is called in function
el3_get_stats(), but the lock is NOT held when called in el3_close(). It can
cause potential data races.
/*
...
Caller must hold the lock for this
*/
static void update_stats(struct net_device *dev)
{
...
}
Signed-off-by: Lin Tan <tammy000@gmail.com>
---
--- a/drivers/net/pcmcia/3c589_cs.c 2008-09-25 11:52:42.000000000 -0500
+++ b/drivers/net/pcmcia/3c589_cs.c 2008-09-26 11:07:04.000000000 -0500
@@ -920,6 +920,7 @@
struct el3_private *lp = netdev_priv(dev);
struct pcmcia_device *link = lp->p_dev;
unsigned int ioaddr = dev->base_addr;
+ unsigned long flags;
DEBUG(1, "%s: shutting down ethercard.\n", dev->name);
@@ -946,8 +947,11 @@
outw(0x0f00, ioaddr + WN0_IRQ);
/* Check if the card still exists */
- if ((inw(ioaddr+EL3_STATUS) & 0xe000) == 0x2000)
+ if ((inw(ioaddr+EL3_STATUS) & 0xe000) == 0x2000) {
+ spin_lock_irqsave(&lp->lock, flags);
update_stats(dev);
+ spin_unlock_irqrestore(&lp->lock, flags);
+ }
}
link->open--;
^ permalink raw reply [flat|nested] 17+ messages in thread
* [BUG REPORT!!!] [PATCH 19/49] pcmcia: remove remaining in-kernel pcmcia_get_configuration_info() users
2008-09-22 22:26 ` Dominik Brodowski
2008-09-22 23:15 ` Alan Cox
@ 2008-11-01 2:07 ` Komuro
2008-11-02 8:46 ` Komuro
1 sibling, 1 reply; 17+ messages in thread
From: Komuro @ 2008-11-01 2:07 UTC (permalink / raw)
To: Dominik Brodowski; +Cc: Alan Cox, torvalds, linux-pcmcia, linux-kernel
Dear Dominik
Unfortunately, your path "[PATCH 19/49] pcmcia: remove remaining in-kernel
pcmcia_get_configuration_info() users"
broke the "serial_cs" and other drivers.
You replace "config->BasePort2" to "link->io.BasePort2" at serial_cs.
But link->io.BasePort2, link->io.NumPorts2(etc)
does not contain correct value (it is zero).
Please fix this problem (or reveart the patch).
Best Regards
Komuro
Here is your patch.
>--- a/drivers/serial/serial_cs.c
>+++ b/drivers/serial/serial_cs.c
>@@ -488,23 +488,23 @@ static int simple_config_check_notpicky(struct pcmcia_device *p_dev,
> static int simple_config(struct pcmcia_device *link)
> {
> struct serial_info *info = link->priv;
>- config_info_t config;
>- int i, try;
>+ int i = -ENODEV, try;
>
> /* If the card is already configured, look up the port and irq */
>- i = pcmcia_get_configuration_info(link, &config);
>- if ((i == CS_SUCCESS) && (config.Attributes & CONF_VALID_CLIENT)) {
>+ if (link->function_config) {
> unsigned int port = 0;
>- if ((config.BasePort2 != 0) && (config.NumPorts2 == 8)) {
>- port = config.BasePort2;
>+ if ((link->io.BasePort2 != 0) &&
>+ (link->io.NumPorts2 == 8)) {
>+ port = link->io.BasePort2;
> info->slave = 1;
> } else if ((info->manfid == MANFID_OSITECH) &&
>- (config.NumPorts1 == 0x40)) {
>- port = config.BasePort1 + 0x28;
>+ (link->io.NumPorts1 == 0x40)) {
>+ port = link->io.BasePort1 + 0x28;
> info->slave = 1;
> }
> if (info->slave) {
>- return setup_serial(link, info, port, config.AssignedIRQ);
>+ return setup_serial(link, info, port,
>+ link->irq.AssignedIRQ);
}
}
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [BUG REPORT!!!] [PATCH 19/49] pcmcia: remove remaining in-kernel pcmcia_get_configuration_info() users
2008-11-01 2:07 ` [BUG REPORT!!!] [PATCH 19/49] pcmcia: remove remaining in-kernel pcmcia_get_configuration_info() users Komuro
@ 2008-11-02 8:46 ` Komuro
2008-11-02 9:17 ` Dominik Brodowski
0 siblings, 1 reply; 17+ messages in thread
From: Komuro @ 2008-11-02 8:46 UTC (permalink / raw)
To: linux; +Cc: linux-kernel, Alan Cox, torvalds, linux-pcmcia
Dear Dominik
The reason of this bug is link->io is not copied
to the slave serial_cs device.
My patch below fix this problem.
--- ds.c.orig 2008-11-01 08:59:13.000000000 +0900
+++ ds.c 2008-11-02 17:05:44.000000000 +0900
@@ -668,6 +668,7 @@ struct pcmcia_device * pcmcia_device_add
list_for_each_entry(tmp_dev, &s->devices_list, socket_device_list)
if (p_dev->func == tmp_dev->func) {
p_dev->function_config = tmp_dev->function_config;
+ p_dev->io = tmp_dev->io;
kref_get(&p_dev->function_config->ref);
}
Best Regards
Komuro
> Dear Dominik
>
> Unfortunately, your path "[PATCH 19/49] pcmcia: remove remaining in-kernel
> pcmcia_get_configuration_info() users"
> broke the "serial_cs" and other drivers.
>
> You replace "config->BasePort2" to "link->io.BasePort2" at serial_cs.
>
> But link->io.BasePort2, link->io.NumPorts2(etc)
> does not contain correct value (it is zero).
>
> Please fix this problem (or reveart the patch).
>
>
> Best Regards
> Komuro
>
> Here is your patch.
> >--- a/drivers/serial/serial_cs.c
> >+++ b/drivers/serial/serial_cs.c
> >@@ -488,23 +488,23 @@ static int simple_config_check_notpicky(struct pcmcia_device *p_dev,
> > static int simple_config(struct pcmcia_device *link)
> > {
> > struct serial_info *info = link->priv;
> >- config_info_t config;
> >- int i, try;
> >+ int i = -ENODEV, try;
> >
> > /* If the card is already configured, look up the port and irq */
> >- i = pcmcia_get_configuration_info(link, &config);
> >- if ((i == CS_SUCCESS) && (config.Attributes & CONF_VALID_CLIENT)) {
> >+ if (link->function_config) {
> > unsigned int port = 0;
> >- if ((config.BasePort2 != 0) && (config.NumPorts2 == 8)) {
> >- port = config.BasePort2;
> >+ if ((link->io.BasePort2 != 0) &&
> >+ (link->io.NumPorts2 == 8)) {
> >+ port = link->io.BasePort2;
> > info->slave = 1;
> > } else if ((info->manfid == MANFID_OSITECH) &&
> >- (config.NumPorts1 == 0x40)) {
> >- port = config.BasePort1 + 0x28;
> >+ (link->io.NumPorts1 == 0x40)) {
> >+ port = link->io.BasePort1 + 0x28;
> > info->slave = 1;
> > }
> > if (info->slave) {
> >- return setup_serial(link, info, port, config.AssignedIRQ);
> >+ return setup_serial(link, info, port,
> >+ link->irq.AssignedIRQ);
> }
> }
>
>
>
>
> _______________________________________________
> Linux PCMCIA reimplementation list
> http://lists.infradead.org/mailman/listinfo/linux-pcmcia
--
Komuro <komurojun-mbn@nifty.com>
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [BUG REPORT!!!] [PATCH 19/49] pcmcia: remove remaining in-kernel pcmcia_get_configuration_info() users
2008-11-02 8:46 ` Komuro
@ 2008-11-02 9:17 ` Dominik Brodowski
2008-11-02 10:33 ` Komuro
0 siblings, 1 reply; 17+ messages in thread
From: Dominik Brodowski @ 2008-11-02 9:17 UTC (permalink / raw)
To: Komuro; +Cc: linux-kernel, Alan Cox, torvalds, linux-pcmcia
Dear Komuro,
thanks for tracking this down. Could I get your Signed-off-by line for the
patch you submitted, please?
Thanks,
Dominik
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [BUG REPORT!!!] [PATCH 19/49] pcmcia: remove remaining in-kernel pcmcia_get_configuration_info() users
2008-11-02 9:17 ` Dominik Brodowski
@ 2008-11-02 10:33 ` Komuro
2008-11-02 12:04 ` Dominik Brodowski
0 siblings, 1 reply; 17+ messages in thread
From: Komuro @ 2008-11-02 10:33 UTC (permalink / raw)
To: Dominik Brodowski; +Cc: linux-kernel, Alan Cox, torvalds, linux-pcmcia
drivers/pcmcia/ds.c
setup "io" and "irq" for pseudo multifunction devices.
Signed-off-by: Komuro <komurojun-mbn@nifty.com>
---
--- linux-2.6.28-rc2/drivers/pcmcia/ds.c.orig 2008-11-01 08:59:13.000000000 +0900
+++ linux-2.6.28-rc2/drivers/pcmcia/ds.c 2008-11-02 18:59:18.000000000 +0900
@@ -668,6 +668,8 @@ struct pcmcia_device * pcmcia_device_add
list_for_each_entry(tmp_dev, &s->devices_list, socket_device_list)
if (p_dev->func == tmp_dev->func) {
p_dev->function_config = tmp_dev->function_config;
+ p_dev->io = tmp_dev->io;
+ p_dev->irq = tmp_dev->irq;
kref_get(&p_dev->function_config->ref);
}
^ permalink raw reply [flat|nested] 17+ messages in thread
* RE: [PATCH 03/19] pcmcia: Whine harder about use of EXCLUSIVE
2008-09-22 22:12 ` Alan Cox
2008-09-22 22:26 ` Dominik Brodowski
@ 2008-10-06 12:18 ` Komuro
1 sibling, 0 replies; 17+ messages in thread
From: Komuro @ 2008-10-06 12:18 UTC (permalink / raw)
To: Alan Cox; +Cc: linux-kernel
duplicate warning message in pcmcia_resource.c ....
> /* Make sure the fact the request type was overridden is passed back */
> if (type == IRQF_SHARED && !(req->Attributes & IRQ_TYPE_DYNAMIC_SHARING)) {
> req->Attributes |= IRQ_TYPE_DYNAMIC_SHARING;
> printk(KERN_WARNING "pcmcia: request for exclusive IRQ could not be fulfilled.\n");
> printk(KERN_WARNING "pcmcia: the driver needs updating to supported shared IRQ lines\n");
> }
>diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c
>index 4884a18..8f1c3d4 100644
>--- a/drivers/pcmcia/pcmcia_resource.c
>+++ b/drivers/pcmcia/pcmcia_resource.c
>@@ -738,8 +738,9 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req)
> type = 0;
> if (s->functions > 1) /* All of this ought to be handled higher up */
> type = IRQF_SHARED;
>- if (req->Attributes & IRQ_TYPE_DYNAMIC_SHARING)
>+ else if (req->Attributes & IRQ_TYPE_DYNAMIC_SHARING)
> type = IRQF_SHARED;
>+ else printk(KERN_WARNING "pcmcia: Driver needs updating to support IRQ sharing.\n");
>
> #ifdef CONFIG_PCMCIA_PROBE
Best Regards
Komuro
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 00/19] Alan's Miscellaneous Tree
@ 2008-10-05 16:34 Alan Cox
2008-10-05 16:35 ` [PATCH 03/19] pcmcia: Whine harder about use of EXCLUSIVE Alan Cox
0 siblings, 1 reply; 17+ messages in thread
From: Alan Cox @ 2008-10-05 16:34 UTC (permalink / raw)
To: linux-kernel
This basically comes from trawling the kernel bugzilla for trivial fixes and
stuff that needs doing. These patches I hope to get into 2.6.28 but via the
relevant tree maintainers when applicable.
---
Alan Cox (19):
fdomain_cs: Sort out modules with duplicate description
modinfo: Remove duplicate modinfo from some drivers
cdc-acm: Add another conexant modem to the quirks
mptsas: remove unneeded check
email: sort out a consistent email address for my contributions and stuff
parport: quickfix the proc registration bug
serial_8250: pci_enable_device fail is not fully handled
pxa27x_udc: leak fix
mptlan: Kill unused NAA workaround code
ibmtr: PCMCIA IBMTR is ok on 64bit
mtd: map_rom has NULL erase pointer
qla2xxx: Switch to ROM API
mtd: intel_dc21285 switch to ROM API
hfsplus: O_LARGEFILE checking is missing
aic7xxx: MHz not Mhz for SI unit pedants
ib700wdt: Fix off by one
pcmcia: Whine harder about use of EXCLUSIVE
pcmcia: IRQ_TYPE_EXCLUSIVE is long obsoleted
pcmcia: Fix wireless drivers
Documentation/DocBook/deviceiobook.tmpl | 2 -
Documentation/DocBook/mcabook.tmpl | 2 -
Documentation/DocBook/videobook.tmpl | 2 -
Documentation/DocBook/wanbook.tmpl | 2 -
Documentation/DocBook/z8530book.tmpl | 2 -
Documentation/isdn/CREDITS | 2 -
Documentation/networking/dmfe.txt | 2 -
Documentation/scsi/aacraid.txt | 2 -
Documentation/video4linux/bttv/CONTRIBUTORS | 2 -
arch/m32r/kernel/smp.c | 2 -
arch/m32r/kernel/smpboot.c | 2 -
arch/um/drivers/harddog_kern.c | 3 -
arch/x86/kernel/apm_32.c | 4 +
arch/x86/kernel/cpu/mcheck/mce_32.c | 2 -
arch/x86/kernel/cpu/mcheck/p5.c | 2 -
arch/x86/kernel/cpu/mcheck/p6.c | 2 -
arch/x86/kernel/cpu/mcheck/winchip.c | 2 -
arch/x86/kernel/mpparse.c | 2 -
arch/x86/kernel/smp.c | 2 -
arch/x86/kernel/smpboot.c | 2 -
drivers/ata/ata_generic.c | 2 -
drivers/ata/ata_piix.c | 2 -
drivers/ata/pata_acpi.c | 2 -
drivers/ata/pata_ali.c | 1
drivers/ata/pata_amd.c | 1
drivers/ata/pata_artop.c | 2 -
drivers/ata/pata_atiixp.c | 1
drivers/ata/pata_cmd640.c | 1
drivers/ata/pata_cmd64x.c | 2 -
drivers/ata/pata_cs5530.c | 1
drivers/ata/pata_cs5535.c | 2 -
drivers/ata/pata_cypress.c | 2 -
drivers/ata/pata_efar.c | 2 -
drivers/ata/pata_isapnp.c | 2 -
drivers/ata/pata_it821x.c | 4 +
drivers/ata/pata_jmicron.c | 2 -
drivers/ata/pata_legacy.c | 2 -
drivers/ata/pata_marvell.c | 2 -
drivers/ata/pata_mpiix.c | 2 -
drivers/ata/pata_netcell.c | 2 -
drivers/ata/pata_ninja32.c | 1
drivers/ata/pata_ns87410.c | 1
drivers/ata/pata_ns87415.c | 2 -
drivers/ata/pata_oldpiix.c | 2 -
drivers/ata/pata_opti.c | 1
drivers/ata/pata_optidma.c | 1
drivers/ata/pata_pcmcia.c | 2 -
drivers/ata/pata_pdc202xx_old.c | 2 -
drivers/ata/pata_platform.c | 2 -
drivers/ata/pata_qdi.c | 2 -
drivers/ata/pata_radisys.c | 2 -
drivers/ata/pata_sc1200.c | 2 -
drivers/ata/pata_scc.c | 2 -
drivers/ata/pata_serverworks.c | 1
drivers/ata/pata_sil680.c | 1
drivers/ata/pata_sis.c | 2 -
drivers/ata/pata_sl82c105.c | 1
drivers/ata/pata_triflex.c | 2 -
drivers/ata/pata_via.c | 1
drivers/ata/pata_winbond.c | 2 -
drivers/bluetooth/bluecard_cs.c | 2 -
drivers/bluetooth/bt3c_cs.c | 6 +-
drivers/bluetooth/btuart_cs.c | 6 +-
drivers/bluetooth/dtl1_cs.c | 7 +-
drivers/char/applicom.c | 6 +-
drivers/char/hw_random/amd-rng.c | 2 -
drivers/char/hw_random/geode-rng.c | 2 -
drivers/char/hw_random/intel-rng.c | 2 -
drivers/char/hw_random/via-rng.c | 2 -
drivers/char/isicom.c | 6 +-
drivers/char/mxser.c | 3 +
drivers/char/pcmcia/synclink_cs.c | 2 -
drivers/ide/ide-disk.c | 2 -
drivers/ide/ide-iops.c | 2 -
drivers/ide/ide-proc.c | 2 -
drivers/ide/pci/alim15x3.c | 2 -
drivers/ide/pci/generic.c | 2 -
drivers/ide/pci/hpt366.c | 2 -
drivers/ide/pci/it821x.c | 2 -
drivers/ide/pci/jmicron.c | 2 -
drivers/ide/pci/piix.c | 2 -
drivers/ide/pci/scc_pata.c | 2 -
drivers/ide/pci/siimage.c | 2 -
drivers/input/tablet/wacom_sys.c | 4 +
drivers/input/touchscreen/mk712.c | 2 -
drivers/media/radio/radio-aimslab.c | 2 -
drivers/media/radio/radio-cadet.c | 2 -
drivers/media/radio/radio-gemtek.c | 2 -
drivers/media/radio/radio-rtrack2.c | 2 -
drivers/media/radio/radio-sf16fmi.c | 2 -
drivers/media/video/cpia2/cpia2_core.c | 2 -
drivers/media/video/cpia2/cpia2_usb.c | 2 -
drivers/media/video/cpia2/cpia2_v4l.c | 2 -
drivers/media/video/cx23885/cx23885-video.c | 4 -
drivers/media/video/pms.c | 4 +
drivers/media/video/saa5246a.c | 2 -
drivers/media/video/saa5249.c | 2 -
drivers/media/video/v4l2-common.c | 2 -
drivers/media/video/v4l2-dev.c | 2 -
drivers/media/video/v4l2-ioctl.c | 2 -
drivers/message/fusion/mptlan.c | 108 ---------------------------
drivers/message/fusion/mptsas.c | 5 +
drivers/message/i2o/exec-osm.c | 2 -
drivers/message/i2o/i2o_config.c | 2 -
drivers/message/i2o/iop.c | 2 -
drivers/message/i2o/pci.c | 2 -
drivers/mtd/chips/map_rom.c | 8 ++
drivers/mtd/maps/pci.c | 16 +---
drivers/net/3c501.c | 12 ++-
drivers/net/3c515.c | 2 -
drivers/net/appletalk/cops.c | 2 -
drivers/net/eexpress.c | 2 -
drivers/net/ibmlana.c | 2 -
drivers/net/macmace.c | 2 -
drivers/net/pcmcia/3c589_cs.c | 2 -
drivers/net/pcmcia/Kconfig | 2 -
drivers/net/pcmcia/nmclan_cs.c | 2 -
drivers/net/tlan.c | 3 +
drivers/net/tokenring/smctr.c | 2 -
drivers/net/tulip/dmfe.c | 4 +
drivers/net/via-velocity.c | 2 -
drivers/net/wan/z85230.c | 3 +
drivers/net/wan/z85230.h | 2 -
drivers/net/wireless/airo_cs.c | 2 -
drivers/net/wireless/atmel_cs.c | 2 -
drivers/net/wireless/netwave_cs.c | 2 -
drivers/net/wireless/orinoco_cs.c | 2 -
drivers/net/wireless/ray_cs.c | 2 -
drivers/net/wireless/spectrum_cs.c | 2 -
drivers/net/wireless/wavelan.c | 2 -
drivers/net/wireless/wavelan.p.h | 2 -
drivers/net/wireless/wavelan_cs.c | 2 -
drivers/net/wireless/wl3501_cs.c | 2 -
drivers/parisc/lasi.c | 2 -
drivers/parport/parport_cs.c | 2 -
drivers/parport/share.c | 13 +++
drivers/pci/rom.c | 6 +-
drivers/pcmcia/pcmcia_resource.c | 3 +
drivers/pnp/pnpbios/core.c | 2 -
drivers/scsi/NCR5380.c | 2 -
drivers/scsi/a100u2w.c | 2 -
drivers/scsi/aacraid/aachba.c | 2 -
drivers/scsi/aacraid/commctrl.c | 2 -
drivers/scsi/aacraid/comminit.c | 2 -
drivers/scsi/aacraid/commsup.c | 2 -
drivers/scsi/aacraid/dpcsup.c | 2 -
drivers/scsi/aacraid/linit.c | 2 -
drivers/scsi/aacraid/rkt.c | 2 -
drivers/scsi/aacraid/rx.c | 2 -
drivers/scsi/aacraid/sa.c | 2 -
drivers/scsi/aha1740.c | 2 -
drivers/scsi/aic7xxx/aic79xx_core.c | 2 -
drivers/scsi/aic7xxx/aic79xx_pci.c | 8 +-
drivers/scsi/atp870u.c | 4 +
drivers/scsi/eata_pio.c | 4 +
drivers/scsi/fdomain.c | 4 +
drivers/scsi/ibmmca.c | 2 -
drivers/scsi/in2000.c | 2 -
drivers/scsi/initio.c | 2 -
drivers/scsi/initio.h | 2 -
drivers/scsi/ipr.h | 2 -
drivers/scsi/qla2xxx/qla_init.c | 20 +----
drivers/scsi/qlogicfas408.c | 2 -
drivers/scsi/sym53c416.c | 2 -
drivers/scsi/wd7000.c | 4 +
drivers/serial/8250_pci.c | 4 +
drivers/telephony/phonedev.c | 2 -
drivers/usb/class/cdc-acm.c | 3 +
drivers/usb/gadget/pxa27x_udc.c | 4 +
drivers/usb/serial/ftdi_sio.c | 6 +-
drivers/usb/serial/ir-usb.c | 2 -
drivers/video/sstfb.c | 2 -
drivers/watchdog/acquirewdt.c | 6 +-
drivers/watchdog/advantechwdt.c | 6 +-
drivers/watchdog/bfin_wdt.c | 2 -
drivers/watchdog/eurotechwdt.c | 4 +
drivers/watchdog/ib700wdt.c | 8 +-
drivers/watchdog/indydog.c | 2 -
drivers/watchdog/mpcore_wdt.c | 4 +
drivers/watchdog/omap_wdt.c | 2 -
drivers/watchdog/pcwd_pci.c | 2 -
drivers/watchdog/pcwd_usb.c | 2 -
drivers/watchdog/rc32434_wdt.c | 3 +
drivers/watchdog/s3c2410_wdt.c | 2 -
drivers/watchdog/sa1100_wdt.c | 2 -
drivers/watchdog/sb_wdog.c | 4 +
drivers/watchdog/sbc8360.c | 6 +-
drivers/watchdog/sbc_epx_c3.c | 2 -
drivers/watchdog/smsc37b787_wdt.c | 2 -
drivers/watchdog/softdog.c | 3 -
drivers/watchdog/w83627hf_wdt.c | 6 +-
drivers/watchdog/w83697hf_wdt.c | 4 +
drivers/watchdog/wafer5823wdt.c | 4 +
drivers/watchdog/wdt.c | 4 +
drivers/watchdog/wdt285.c | 3 +
drivers/watchdog/wdt_pci.c | 4 +
fs/coda/psdev.c | 2 -
fs/hfsplus/inode.c | 2 +
fs/nfs/inode.c | 2 -
fs/nfs/super.c | 2 -
fs/proc/array.c | 2 -
include/asm-x86/apicdef.h | 2 -
include/asm-x86/ipi.h | 2 -
include/linux/if_ether.h | 2 -
include/linux/if_fddi.h | 2 -
include/linux/if_hippi.h | 2 -
include/linux/igmp.h | 2 -
include/linux/netdevice.h | 2 -
include/linux/notifier.h | 2 -
include/linux/parport.h | 4 +
include/linux/pci.h | 2 +
include/linux/smp.h | 2 -
include/linux/telephony.h | 2 -
ipc/sem.c | 2 -
mm/mmap.c | 2 -
mm/mprotect.c | 2 -
mm/mremap.c | 2 -
net/802/psnap.c | 2 -
net/appletalk/ddp.c | 4 +
net/core/datagram.c | 2 -
net/core/dev_mcast.c | 2 -
net/core/skbuff.c | 2 -
net/core/stream.c | 2 -
net/ipv4/icmp.c | 2 -
net/ipv4/igmp.c | 2 -
net/ipv4/ip_fragment.c | 2 -
net/ipv4/ip_input.c | 2 -
net/ipv4/ipip.c | 2 -
net/ipv4/ipmr.c | 2 -
net/ipv4/udp.c | 2 -
net/netlink/af_netlink.c | 2 -
net/sunrpc/xprtsock.c | 4 +
net/unix/af_unix.c | 2 -
sound/oss/kahlua.c | 2 -
sound/pci/cs5530.c | 2 -
sound/sound_core.c | 2 -
236 files changed, 318 insertions(+), 419 deletions(-)
--
Signature
^ permalink raw reply [flat|nested] 17+ messages in thread* [PATCH 03/19] pcmcia: Whine harder about use of EXCLUSIVE
2008-10-05 16:34 [PATCH 00/19] Alan's Miscellaneous Tree Alan Cox
@ 2008-10-05 16:35 ` Alan Cox
2008-10-17 21:17 ` Dominik Brodowski
0 siblings, 1 reply; 17+ messages in thread
From: Alan Cox @ 2008-10-05 16:35 UTC (permalink / raw)
To: linux-kernel
The exclusive IRQ line support is a legacy and any remaining drivers that
cannot share interrupts need tidying up so whine harder about them.
Signed-off-by: Alan Cox <alan@redhat.com>
---
drivers/pcmcia/pcmcia_resource.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c
index 4884a18..8f1c3d4 100644
--- a/drivers/pcmcia/pcmcia_resource.c
+++ b/drivers/pcmcia/pcmcia_resource.c
@@ -738,8 +738,9 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req)
type = 0;
if (s->functions > 1) /* All of this ought to be handled higher up */
type = IRQF_SHARED;
- if (req->Attributes & IRQ_TYPE_DYNAMIC_SHARING)
+ else if (req->Attributes & IRQ_TYPE_DYNAMIC_SHARING)
type = IRQF_SHARED;
+ else printk(KERN_WARNING "pcmcia: Driver needs updating to support IRQ sharing.\n");
#ifdef CONFIG_PCMCIA_PROBE
^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2008-11-02 13:37 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-09-22 14:58 [PATCH] pcmcia: Fix broken abuse of dev->driver_data Alan Cox
2008-09-22 21:56 ` Dominik Brodowski
2008-09-22 22:12 ` Alan Cox
2008-09-22 22:26 ` Dominik Brodowski
2008-09-22 23:15 ` Alan Cox
2008-09-23 1:31 ` Komuro
2008-09-26 13:29 ` [PATCH git latest] drivers/net: fixing a datarace related to update_stats() Komuro
2008-09-26 16:06 ` Tammy
2008-09-26 17:31 ` Lin Tan
2008-11-01 2:07 ` [BUG REPORT!!!] [PATCH 19/49] pcmcia: remove remaining in-kernel pcmcia_get_configuration_info() users Komuro
2008-11-02 8:46 ` Komuro
2008-11-02 9:17 ` Dominik Brodowski
2008-11-02 10:33 ` Komuro
2008-11-02 12:04 ` Dominik Brodowski
2008-10-06 12:18 ` [PATCH 03/19] pcmcia: Whine harder about use of EXCLUSIVE Komuro
2008-10-05 16:34 [PATCH 00/19] Alan's Miscellaneous Tree Alan Cox
2008-10-05 16:35 ` [PATCH 03/19] pcmcia: Whine harder about use of EXCLUSIVE Alan Cox
2008-10-17 21:17 ` Dominik Brodowski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®