Re: [PATCH 07/11] drivers/pcmcia: include module.h for modular xxs1500_ss code
On Thu, Apr 30, 2015 at 09:47:43PM -0400, Paul Gortmaker wrote: This file is built off of a tristate Kconfig option and also contains modular function calls so it should explicitly include module.h to avoid compile breakage during header shuffles done in the future. Cc: Wolfram Sang w...@the-dreams.de Cc: linux-pcmcia@lists.infradead.org Signed-off-by: Paul Gortmaker paul.gortma...@windriver.com Acked-by: Wolfram Sang w...@the-dreams.de signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: [PATCH] pcmcia: convert drivers/pcmcia/* to use module_platform_driver()
On Sun, Nov 27, 2011 at 12:53:06PM +0800, Axel Lin wrote: This patch converts the drivers in drivers/pcmcia/* to use the module_platform_driver() macro which makes the code smaller and a bit simpler. Acked-by: Wolfram Sang w.s...@pengutronix.de -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: [PATCH 47/62] pcmcia: irq: Remove IRQF_DISABLED
On Wed, Sep 07, 2011 at 04:10:44PM +0800, Yong Zhang wrote: This flag is a NOOP and can be removed now. Signed-off-by: Yong Zhang yong.zha...@gmail.com Acked-by: Wolfram Sang w.s...@pengutronix.de -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: [Bug 27852] New: Gentoo QA noticies
Hi, I got few warnings when installing pcmciautils with notice to file you a bug report. The first one (type punned pointers) annoyed me also once, now you made me fix it :) I also fixed the third one (always true), although I think this warning is a bit aggressive. Additional error-checking is not necessarily a bad programming practice, I'd say. I leave the second one (implicit declaration) to those more familiar with lexers. Patch series with a few more cleanups will come shortly. Thanks, Wolfram -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
[PATCH 0/6] Cleanups for pcmciatools
Some cleanups triggered by Alexander Mansurov, thanks for that. Wolfram Sang (6): Makefile: let plain 'make' be like 'make all' again lex: disable unused options read-cis: fix type-punning pointers read-cis: Remove the now pointless macros read-cis: Remove a forward declaration and some whitespaces pccardctl: remove superfluous check Makefile |6 ++- src/cistpl.h | 16 src/lex_config.l |1 + src/pccardctl.c |3 -- src/read-cis.c | 105 -- 5 files changed, 60 insertions(+), 71 deletions(-) -- 1.7.2.3 ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
[PATCH 1/6] Makefile: let plain 'make' be like 'make all' again
That behaviour was broken by c96724af1baaa926cbcc8d8e5b19fd5ba339d962
(Makefile: add short help target). Also, update the helptext accordingly.
Signed-off-by: Wolfram Sang w.s...@pengutronix.de
---
Makefile |6 --
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 240b748..0b7edbe 100644
--- a/Makefile
+++ b/Makefile
@@ -20,9 +20,11 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
+default: all
+
help:
- @echo Common targets:
- @echo all- build the standard set of utilities
+ @echo Common targets ('*' is default):
+ @echo * all- build the standard set of utilities
@echo debugtools - build the debugging utilities
# Set this to 'false' if you do not need the socket-startup script
--
1.7.2.3
___
Linux PCMCIA reimplementation list
http://lists.infradead.org/mailman/listinfo/linux-pcmcia
[PATCH 3/6] read-cis: fix type-punning pointers
Use the proper type instead of int. Fixes:
src/read-cis.c:62: warning: dereferencing type-punned pointer will break
strict-aliasing rules
src/read-cis.c:62: warning: dereferencing type-punned pointer will break
strict-aliasing rules
src/read-cis.c:85: warning: dereferencing type-punned pointer will break
strict-aliasing rules
src/read-cis.c:87: warning: dereferencing type-punned pointer will break
strict-aliasing rules
[...]
Reported-by: Alexander Mansurov alexander.mansu...@gmail.com
Signed-off-by: Wolfram Sang w.s...@pengutronix.de
---
src/cistpl.h | 16
src/read-cis.c | 20 ++--
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/cistpl.h b/src/cistpl.h
index 8b833ab..79dd0a2 100644
--- a/src/cistpl.h
+++ b/src/cistpl.h
@@ -552,10 +552,17 @@ typedef union cisparse_t {
cistpl_format_tformat;
} cisparse_t;
+typedef struct tuple_flags {
+unsigned int link_space:4;
+unsigned int has_link:1;
+unsigned int mfc_fn:3;
+unsigned int space:4;
+} tuple_flags;
+
typedef struct tuple_t {
unsigned int Attributes;
unsigned char DesiredTuple;
-unsigned int Flags; /* internal use */
+tuple_flagsFlags; /* internal use */
unsigned int LinkOffset; /* internal use */
unsigned int CISOffset; /* internal use */
unsigned char TupleCode;
@@ -586,13 +593,6 @@ typedef struct cisdump_t {
unsigned char Data[CISTPL_MAX_CIS_SIZE];
} cisdump_t;
-typedef struct tuple_flags {
-unsigned int link_space:4;
-unsigned int has_link:1;
-unsigned int mfc_fn:3;
-unsigned int space:4;
-} tuple_flags;
-
#define BIND_FN_ALL0xff
int read_out_cis (unsigned int socket_no, FILE *fd);
diff --git a/src/read-cis.c b/src/read-cis.c
index 43cc1cc..7c51825 100644
--- a/src/read-cis.c
+++ b/src/read-cis.c
@@ -36,10 +36,10 @@ static unsigned char cis_copy[MAX_TUPLES];
static unsigned int cis_length = MAX_TUPLES;
-#define SPACE(f) (((tuple_flags *)((f)))-space)
-#define HAS_LINK(f)(((tuple_flags *)((f)))-has_link)
-#define LINK_SPACE(f) (((tuple_flags *)((f)))-link_space)
-#define MFC_FN(f) (((tuple_flags *)((f)))-mfc_fn)
+#define SPACE(f) ((f).space)
+#define HAS_LINK(f)((f).has_link)
+#define LINK_SPACE(f) ((f).link_space)
+#define MFC_FN(f) ((f).mfc_fn)
static void read_cis(int attr, unsigned int addr, unsigned int len, void *ptr)
@@ -55,12 +55,12 @@ int pcmcia_get_next_tuple(unsigned int function, tuple_t
*tuple);
int pcmcia_get_first_tuple(unsigned int function, tuple_t *tuple)
{
- tuple-TupleLink = tuple-Flags = 0;
- {
- /* Assume presence of a LONGLINK_C to address 0 */
- tuple-CISOffset = tuple-LinkOffset = 0;
- SPACE(tuple-Flags) = HAS_LINK(tuple-Flags) = 1;
- }
+ tuple-TupleLink = 0;
+ LINK_SPACE(tuple-Flags) = MFC_FN(tuple-Flags) = 0;
+ /* Assume presence of a LONGLINK_C to address 0 */
+ tuple-CISOffset = tuple-LinkOffset = 0;
+ SPACE(tuple-Flags) = HAS_LINK(tuple-Flags) = 1;
+
if ((functions 1)
!(tuple-Attributes TUPLE_RETURN_COMMON)) {
unsigned char req = tuple-DesiredTuple;
--
1.7.2.3
___
Linux PCMCIA reimplementation list
http://lists.infradead.org/mailman/listinfo/linux-pcmcia
[PATCH 2/6] lex: disable unused options
Eliminates two warnings.
Signed-off-by: Wolfram Sang w.s...@pengutronix.de
---
src/lex_config.l |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/lex_config.l b/src/lex_config.l
index 746edc1..7b4d627 100644
--- a/src/lex_config.l
+++ b/src/lex_config.l
@@ -1,5 +1,6 @@
/* Special state for handling include files */
%x src
+%option noinput nounput
%{
/*
--
1.7.2.3
___
Linux PCMCIA reimplementation list
http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: from 2.4 Card Services to 2.6 linux-pcmcia
Hi, In the frame of a European Space Agency project, I am in charge of porting a third-party PCMCIA driver (for a very specific and rare card) from kernel 2.4 (Card Services) to kernel 2.6 (linux-pcmcia and PCMCIA utils). Rare cards are interesting for the kernel, too :) Is it possible to send it to us after the conversion? Kind regards, Wolfram -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: [PATCH 4/5] Add an utility to parse CIS files to readable form
On Fri, Sep 24, 2010 at 08:49:24PM +0400, Dmitry Eremin-Solenikov wrote: Import from pcmcia-cs project a dump_cis utility. It reads machine-readable CIS file and output text representation (which can be processed by mkcis utility). Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com pcmciautils also include dump_cis (make debugtools). As this version is probably better maintained, we probably should not introduce a split here? Regards, Wolfram -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: [PATCH 2/5] Add mkcis - a program that can create .cis from text description
We should be concentrating on the linux-firmware.git repository instead. Should I redo this patch serie against linux-firmware.git (probably with just putting .ct files near .cis)? \o/ That was on my todo-list for somewhen, too. Thanks! -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: dump_cis
at the moment I'm developing a CardBus-Card and I would like to use the dump_$something , especially the dump_cis tool to debug my Card, but it seems like the tools are not in the pccardctl-package Get the sourcecode and run make debugtools - voila! -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: Questions about ioport-assignments
sorry, lines seems to be align. but some devices with lines=10, it means max io-port = 0x3ff. This would lead to consider the CIS of the card broken and override it? (And the fact that it used to work was just Linux doing the assignment wrong back then?) Regards, Wolfram -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: [PATCH 1/2] drivers/mtd/maps/pcmciamtd.c: fixing obvious errors
On Mon, Apr 12, 2010 at 07:49:15PM +0400, Alexander Kurz wrote: Hello folks, this is an attempt, to reanimate the pcmciamtd driver. Nice :) @@ -652,7 +651,6 @@ static int pcmciamtd_config(struct pcmcia_device *link) link-dev_node = dev-node; return 0; - failed: err(CS Error, exiting); pcmciamtd_release(link); return -ENODEV; I'd suggest keeping 'failed', removing the 'err'-statement and using 'goto failed' in error cases. Currently, pcmciamtd_release() is used many times on errors. Regards, Wolfram -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: [PATCH 2/2] drivers/mtd/maps/pcmciamtd.c: coding style cleanups
On Mon, Apr 12, 2010 at 07:51:12PM +0400, Alexander Kurz wrote:
From df0e6529165643058e87595f40258a08bc01fec5 Mon Sep 17 00:00:00 2001
From: Alexander Kurz li...@kbdbabel.org
Date: Sun, 11 Apr 2010 23:07:19 +0200
Subject: [PATCH 2/2] drivers/mtd/maps/pcmciamtd.c: coding style cleanups
Signed-off-by: Alexander Kurz li...@kbdbabel.org
---
drivers/mtd/maps/pcmciamtd.c | 55 +
1 files changed, 33 insertions(+), 22 deletions(-)
diff --git a/drivers/mtd/maps/pcmciamtd.c b/drivers/mtd/maps/pcmciamtd.c
index 2dbe939..0db1ac4 100644
--- a/drivers/mtd/maps/pcmciamtd.c
+++ b/drivers/mtd/maps/pcmciamtd.c
@@ -40,10 +40,7 @@ MODULE_PARM_DESC(debug, Set Debug Level 0=quiet,
5=noisy);
static const int debug = 0;
#endif
-#define err(format, arg...) printk(KERN_ERR pcmciamtd: format \n , ##
arg)
#define info(format, arg...) printk(KERN_INFO pcmciamtd: format \n , ##
arg)
-#define warn(format, arg...) printk(KERN_WARNING pcmciamtd: format \n ,
## arg)
-
#define DRIVER_DESC PCMCIA Flash memory card driver
@@ -100,7 +97,9 @@ module_param(mem_type, int, 0);
MODULE_PARM_DESC(mem_type, Set Memory type (0=Flash, 1=RAM, 2=ROM,
default=0));
-/* read/write{8,16} copy_{from,to} routines with window remapping to access
whole card */
+/* read/write{8,16} copy_{from,to} routines with window remapping
+ * to access whole card
+ */
When you are touching these anyway: CodingStyle suggests
/*
* Multi
* line comment
*/
Regards,
Wolfram
--
Pengutronix e.K. | Wolfram Sang|
Industrial Linux Solutions | http://www.pengutronix.de/ |
signature.asc
Description: Digital signature
___
Linux PCMCIA reimplementation list
http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: [RFC] [PATCH] pcmcia/yenta ti113x route irq to isa
Many thanks! I've split it up into three parts and only made a few cleanups. It would be great if you (and others) could check those out. The commit-messages of part 1+2 could be a bit more explicit about what that part actually does. -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: [git pull] more PCMCIA updates for 2.6.34 (including ioctl deprecation)
Do any graphical environments even support the ancient user space pcmcica helper stuff ? I can't find any evidence they do but I realise Russell you get to deal with assorted crazy ARM embedded setups. FWIW, a few months ago I searched the web for the warning about the usage of the deprectaed pcmcia-ioctls. The vast majority came from Debian's discover which seems to be no issue according to: http://article.gmane.org/gmane.linux.kernel/885286 The other occurences I found have been fixed meanwhile. (I understand that I might have missed rare cases this way) Regards, Wolfram -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: [RFC v4] PCMCIA locking updates for 2.6.34
thanks for testing! Might increasing some of the *_delay parameters in cs.c improve the situation? Will try to check. Of course, for the locking-patches you can now add my: Tested-by: Wolfram Sang w.s...@pengutronix.de -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: [RFC v4] PCMCIA locking updates for 2.6.34
On Sun, Jan 24, 2010 at 06:30:00PM +0100, Dominik Brodowski wrote: Hey, The v4 of the locking pathes are available in the git repository -- along with a few other fixes and improvements -- at: git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git#locking Only those patches which changed (and which are marked with * below) will be sent out to the PCMCIA list. Changes since v3: - avoid prod_id memleak - use pccardd for any requery work, not the workqueue Okay, I tested your current locking-branch. Changing PCMCIA-Cards works flawlessly. However: 1) Insert a PCMCIA-network-card (I have two, doesn't matter which) 2) Remove it again 3) Insert a CardBus-Wireless card (Netgear WG511 in my case) gives me a hard lockup! Nothing is printed, keyboard and mouse are dead. Powercycling is the only option, then. I don't have any other cardbus-cards at the moment, but might get some next week. Maybe this gives some more insight to the pattern... Note, that the CardBus card works fine if I tried the above steps with a CF-card instead of a network-card. It is also working if it is the first card inserted after a reboot. Let me know if I can provide more information. Regards, Wolfram -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: [RFC v3] PCMCIA locking updates for 2.6.34
The slot continues to work, though. It does not happen every time I release the card. I could not trigger it a second time up to now. Update: Just happens once after a cold-boot. -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: [RFC v3] PCMCIA locking updates for 2.6.34
Hi Dominik Well, as we're seeing real issues relating to the lack of locking, 2.6.33 is still some time away, and 2.6.34 is even further away, I tend to aim for 2.6.34, unless any further major problems appear. Ah, okay, I agree. The v3 of the locking pathes are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git#locking and will be send out to this list. Complete series: Tested-by: Wolfram Sang w.s...@pengutronix.de No lockdep-warnings anymore whatever I tried. kmemleak reports something, but this is a different issue (haven't even checked if this is a false positive). I just put it here as I stumbled over it during this test-run: unreferenced object 0xb5c644a0 (size 32): comm pccardd, pid 1298, jiffies 20 (age 1400.050s) hex dump (first 32 bytes): 20 00 a7 a6 20 a4 a5 9e d6 a4 87 f4 9c b4 c5 96 ... ... 2e 62 6a a6 27 23 e2 ca 62 e2 a2 62 6e c2 ae ee .bj.'#..b..bn... backtrace: [8052ece1] kmemleak_alloc+0x61/0xb0 [801c4b8a] __kmalloc+0x1ba/0x1f0 [c1db240c] pcmcia_device_query+0x26c/0x320 [pcmcia] [c1db33b8] pcmcia_device_add+0x368/0x490 [pcmcia] [c1db359a] pcmcia_card_add+0xba/0x1e0 [pcmcia] [c1db373e] ds_event+0x7e/0x230 [pcmcia] [c186157a] send_event+0xba/0x160 [pcmcia_core] [c18623a6] socket_insert+0x156/0x1b0 [pcmcia_core] [c1862865] pccardd+0x2c5/0x3a0 [pcmcia_core] [8014b374] kthread+0x74/0x80 [801031ba] kernel_thread_helper+0x6/0x10 [] 0x Regards, Wolfram -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: [RFC] PCMCIA locking updates for 2.6.34
[ 187.348306] [c1cbfc61] read_cis_cache+0x131/0x210 [pcmcia] [ 187.348312] [8015da50] ? mark_held_locks+0x60/0x80 [ 187.348322] [c1cbff83] pccard_get_next_tuple+0x1b3/0x480 [pcmcia] [ 187.348328] [8015dcec] ? trace_hardirqs_on_caller+0x11c/0x160 [ 187.348338] [c1cc02dc] pccard_get_first_tuple+0x8c/0xe0 [pcmcia] [ 187.348348] [c1cc06db] pccard_validate_cis+0x13b/0x340 [pcmcia] [ 187.348354] [8053bead] ? mutex_unlock+0xd/0x10 [ 187.348364] [c1cbb464] pcmcia_card_add+0x34/0x1e0 [pcmcia] [ 187.348370] [8053c869] ? mutex_lock_nested+0x1f9/0x2a0 [ 187.348376] [8015da50] ? mark_held_locks+0x60/0x80 [ 187.348382] [8053be2c] ? __mutex_unlock_slowpath+0xac/0x120 [ 187.348388] [8015dcec] ? trace_hardirqs_on_caller+0x11c/0x160 [ 187.348394] [8015dd3b] ? trace_hardirqs_on+0xb/0x10 [ 187.348403] [c1cbb7be] ds_event+0x7e/0x230 [pcmcia] [ 187.348412] [c187357a] send_event+0xba/0x160 [pcmcia_core] [ 187.348419] [8015dcec] ? trace_hardirqs_on_caller+0x11c/0x160 [ 187.348425] [8015dd3b] ? trace_hardirqs_on+0xb/0x10 [ 187.348433] [c1873d01] socket_insert+0x111/0x1e0 [pcmcia_core] [ 187.348443] [c1874955] pccardd+0x205/0x2b0 [pcmcia_core] [ 187.348452] [c1874750] ? pccardd+0x0/0x2b0 [pcmcia_core] [ 187.348458] [8014b374] kthread+0x74/0x80 [ 187.348464] [8014b300] ? kthread+0x0/0x80 [ 187.348470] [801031ba] kernel_thread_helper+0x6/0x10 Does the new locking work for you? I'd wonder why... Regards, Wolfram -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: [PATCH] ide/ide-cs: fix order of releasing resources
bzolnier: - release resources in ide_release() to fix ordering of events - remove stale FIXME note while at it Ok this does look better, Wolfram can you test this? Works as expected. -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: [RFC] PCMCIA locking updates for 2.6.34
Hi Dominik, On Sat, Jan 16, 2010 at 01:41:43PM +0100, Dominik Brodowski wrote: on top of what had already been discussed for 2.6.34, here are 12 patches trying to fix the locking mess the PCMCIA subsystem used to be. As a side-effect, the PCMCIA ioctl will be disabled for all except the ARM architecture, and even there you need !SMP and !PREEMPT. Hopefully, we'll be able to remove the ioctl from ARM too. Everything is available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git#locking I pulled and tested this branch. Sadly, it doesn't work for me. If I insert a (previously working) network card, io-resources get allocated, but the driver does not even print its success-string. Luckily, I had hung-task detection enabled: [ 54.276728] pcmcia_socket pcmcia_socket0: pccard: PCMCIA card inserted into slot 0 [ 54.276747] pcmcia_socket pcmcia_socket0: cs: memory probe 0x0d4000-0x0d: clean. [ 54.288227] pcmcia_socket pcmcia_socket0: cs: memory probe 0x6000-0x60ff: clean. [ 54.318694] pcmcia_socket pcmcia_socket0: cs: memory probe 0xa000-0xa0ff: clean. [ 54.349945] pcmcia_socket pcmcia_socket0: cs: memory probe 0xffd1-0xffde: clean. [ 54.381320] pcmcia 0.0: pcmcia: registering new device pcmcia0.0 [ 240.110047] INFO: task modprobe:2669 blocked for more than 120 seconds. [ 240.110056] echo 0 /proc/sys/kernel/hung_task_timeout_secs disables this message. [ 240.110065] modprobe D bf05c428 0 2669 1 0x [ 240.110078] bd823c40 0086 c1d6637d bf05c428 bf800140 bf87d890 bf05c534 bf87d890 [ 240.110096] bf05c538 bd823c64 8050eac3 bf05c538 bf05c538 bf87d890 bf05c534 [ 240.110112] bf03d020 bf05c428 bd823c74 8050ed2e bf03d020 bf03d000 bd823cac c1d66e58 [ 240.110128] Call Trace: [ 240.110155] [c1d6637d] ? alloc_io_space+0x32d/0x3a0 [pcmcia] [ 240.110170] [8050eac3] __mutex_lock_slowpath+0x53/0x90 [ 240.110181] [8050ed2e] mutex_lock+0x1e/0x30 [ 240.110195] [c1d66e58] pcmcia_request_io+0x28/0x420 [pcmcia] [ 240.110204] [8050ed23] ? mutex_lock+0x13/0x30 [ 240.110218] [c1d69b23] ? read_cis_cache+0xa3/0x200 [pcmcia] [ 240.110239] [c1b60f30] pcnet_confcheck+0x110/0x174 [pcnet_cs] [ 240.110253] [c1d65f49] pcmcia_do_loop_config+0x69/0x80 [pcmcia] [ 240.110267] [c1d6a47d] pccard_loop_tuple+0xed/0x150 [pcmcia] [ 240.110282] [c1d65ee0] ? pcmcia_do_loop_config+0x0/0x80 [pcmcia] [ 240.110296] [c1d666a9] pcmcia_loop_config+0xb9/0xd0 [pcmcia] [ 240.110310] [c1d65ee0] ? pcmcia_do_loop_config+0x0/0x80 [pcmcia] [ 240.110327] [c1b60e20] ? pcnet_confcheck+0x0/0x174 [pcnet_cs] [ 240.110344] [c1b6016d] pcnet_probe+0x9d/0xbf0 [pcnet_cs] [ 240.110358] [c1d69b23] ? read_cis_cache+0xa3/0x200 [pcmcia] [ 240.110373] [c1d6a31f] ? pccard_read_tuple+0xaf/0x120 [pcmcia] [ 240.110388] [80292491] ? ida_get_new_above+0x81/0x1f0 [ 240.110402] [c1d63de8] pcmcia_device_probe+0xf8/0x2b0 [pcmcia] [ 240.110412] [8050ed23] ? mutex_lock+0x13/0x30 [ 240.110425] [803bae00] ? driver_sysfs_add+0x50/0x70 [ 240.110435] [803baf73] driver_probe_device+0x93/0x280 [ 240.110445] [802934d9] ? kobject_add_internal+0xb9/0x240 [ 240.110456] [803bb1e9] __driver_attach+0x89/0x90 [ 240.110466] [803ba683] bus_for_each_dev+0x53/0x80 [ 240.110476] [803bad4e] driver_attach+0x1e/0x20 [ 240.110486] [803bb160] ? __driver_attach+0x0/0x90 [ 240.110495] [803b9f17] bus_add_driver+0x207/0x300 [ 240.110510] [c1d63a40] ? pcmcia_device_remove+0x0/0x1e0 [pcmcia] [ 240.110520] [803bb4ca] driver_register+0x7a/0x170 [ 240.110535] [c1d65bd4] pcmcia_register_driver+0xb4/0x170 [pcmcia] [ 240.110549] [8016d1c5] ? tracepoint_module_notify+0x25/0x30 [ 240.110561] [8014c64d] ? notifier_call_chain+0x3d/0x80 [ 240.110578] [c1b6f000] ? init_pcnet_cs+0x0/0xf [pcnet_cs] [ 240.110596] [c1b6f00d] init_pcnet_cs+0xd/0xf [pcnet_cs] [ 240.110606] [80101118] do_one_initcall+0x28/0x180 [ 240.110617] [8014cb4f] ? blocking_notifier_call_chain+0x1f/0x30 [ 240.110630] [8015f00f] sys_init_module+0xaf/0x210 [ 240.110640] [80102bd0] sysenter_do_call+0x12/0x26 A deadlock? At this stage, the pcmcia-host is stuck. Card removal is detected, but the resources don't get freed. Let me know if I can provide more info or can do more testing. Regards, Wolfram -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: [PATCH] ide/ide-cs: fix order of releasing resources
bzolnier: - release resources in ide_release() to fix ordering of events - remove stale FIXME note while at it Ok this does look better, Wolfram can you test this? ACK, looks better. I will test it, might not happen before Sunday, though. -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: Questions about ioport-assignments
Thanks for your assistance, guys! Very much appreciated. I will be busy until Sunday, so I can't do much testing and debugging until then. It seems the card tries to request the ioport 0x300, but alloc_io_space (in pcmcia_resource.c) added 0xc000 accidentally . then ioport becomes 0xc300. That's strange. I attach the output of dump_cis: Socket 0 offset 0x02, tuple 0x01, link 0x02 00 ff dev_info no_info offset 0x06, tuple 0x15, link 0x13 04 01 44 2d 4c 69 6e 6b 00 44 4d 46 35 36 30 54 58 00 ff vers_1 4.1, D-Link, DMF560TX offset 0x1b, tuple 0x20, link 0x04 43 01 ab c0 manfid 0x0143, 0xc0ab offset 0x21, tuple 0x21, link 0x02 00 00 funcid multi_function offset 0x25, tuple 0x1a, link 0x05 01 1b e0 ff 67 config base 0xffe0 mask 0x0067 last_index 0x1b offset 0x2c, tuple 0x1b, link 0x16 c3 41 99 79 55 3d 86 46 26 4c ea 61 f8 02 07 00 03 1f f0 38 9e 28 cftable_entry 0x03 [default] [rdybsy] [audio] [pwrdown] Vcc Vnom 5V Istatic 35mA Iavg 170mA Ipeak 200mA Idown 4500uA io 0x02f8-0x02ff, 0x0300-0x031f [lines=10] [8bit] [16bit] [range] irq mask 0x9e38 [level] [pulse] [shared] offset 0x44, tuple 0x1b, link 0x0a 05 08 ea 61 e8 03 07 00 03 1f cftable_entry 0x05 io 0x03e8-0x03ef, 0x0300-0x031f [lines=10] [8bit] [16bit] [range] offset 0x50, tuple 0x1b, link 0x0a 07 08 ea 61 e8 02 07 00 03 1f cftable_entry 0x07 io 0x02e8-0x02ef, 0x0300-0x031f [lines=10] [8bit] [16bit] [range] offset 0x5c, tuple 0x1b, link 0x0a 09 08 ea 61 f8 02 07 20 03 1f cftable_entry 0x09 io 0x02f8-0x02ff, 0x0320-0x033f [lines=10] [8bit] [16bit] [range] offset 0x68, tuple 0x1b, link 0x0a 0b 08 ea 61 e8 03 07 20 03 1f cftable_entry 0x0b io 0x03e8-0x03ef, 0x0320-0x033f [lines=10] [8bit] [16bit] [range] offset 0x74, tuple 0x1b, link 0x0a 0d 08 ea 61 e8 02 07 20 03 1f cftable_entry 0x0d io 0x02e8-0x02ef, 0x0320-0x033f [lines=10] [8bit] [16bit] [range] offset 0x80, tuple 0x1b, link 0x0a 0f 08 ea 61 f8 02 07 40 03 1f cftable_entry 0x0f io 0x02f8-0x02ff, 0x0340-0x035f [lines=10] [8bit] [16bit] [range] offset 0x8c, tuple 0x1b, link 0x0a 11 08 ea 61 e8 03 07 40 03 1f cftable_entry 0x11 io 0x03e8-0x03ef, 0x0340-0x035f [lines=10] [8bit] [16bit] [range] offset 0x98, tuple 0x1b, link 0x0a 13 08 ea 61 e8 02 07 40 03 1f cftable_entry 0x13 io 0x02e8-0x02ef, 0x0340-0x035f [lines=10] [8bit] [16bit] [range] offset 0xa4, tuple 0x1b, link 0x0a 15 08 ea 61 f8 02 07 20 02 1f cftable_entry 0x15 io 0x02f8-0x02ff, 0x0220-0x023f [lines=10] [8bit] [16bit] [range] offset 0xb0, tuple 0x1b, link 0x0a 17 08 ea 61 e8 03 07 20 02 1f cftable_entry 0x17 io 0x03e8-0x03ef, 0x0220-0x023f [lines=10] [8bit] [16bit] [range] offset 0xbc, tuple 0x1b, link 0x0a 19 08 ea 61 e8 02 07 20 02 1f cftable_entry 0x19 io 0x02e8-0x02ef, 0x0220-0x023f [lines=10] [8bit] [16bit] [range] offset 0xc8, tuple 0x1b, link 0x0a 1b 08 ea 61 f8 02 07 40 02 0f cftable_entry 0x1b io 0x02f8-0x02ff, 0x0240-0x024f [lines=10] [8bit] [16bit] [range] As you see, there is no entry with io=0x. But lines is always 10, so the alignment is always 1 10 = 0x400. As I understood, 0xc000 matches this alignment requirement and the 0x300 from the first entry gets added to this. I thought this is all valid and the card should find its registers, but it doesn't :( But I may be really missing a point here... so I think alloc_io_space should be fixed. I was wondering that, too... Thanks again, Wolfram -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: [PATCH] pcmcia: make Open Firmware device id constant
On Tue, Jan 12, 2010 at 08:56:13AM +0100, Németh Márton wrote: From: Márton Németh nm...@freemail.hu The match_table field of the struct of_device_id is constant in linux/of_platform.h so it is worth to make the initialization data also constant. [...] Signed-off-by: Márton Németh nm...@freemail.hu Cc: Julia Lawall ju...@diku.dk Cc: co...@diku.dk Acked-by: Wolfram Sang w.s...@pengutronix.de -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
[PATCH] ide/ide-cs: fix order of releasing resources
ide_detach() called first ide_release() and then release_region(). This
produced the following warnings:
Trying to free nonexistent resource c10e-c10e
Trying to free nonexistent resource c100-c107
This is true, because the callchain inside ide_release() is:
ide_release - pcmcia_disable_device - pcmcia_release_io
So, the whole io-block is already gone for release_region(). To fix
this, just swap the order of releasing (and remove the now obsolete
shadowing).
Signed-off-by: Wolfram Sang w.s...@pengutronix.de
Cc: Dominik Brodowski li...@dominikbrodowski.net
Cc: Bartlomiej Zolnierkiewicz bzoln...@gmail.com
Cc: David S. Miller da...@davemloft.net
---
drivers/ide/ide-cs.c |8 ++--
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/ide/ide-cs.c b/drivers/ide/ide-cs.c
index dd63963..43ed330 100644
--- a/drivers/ide/ide-cs.c
+++ b/drivers/ide/ide-cs.c
@@ -122,18 +122,14 @@ static void ide_detach(struct pcmcia_device *link)
{
ide_info_t *info = link-priv;
ide_hwif_t *hwif = info-host-ports[0];
-unsigned long data_addr, ctl_addr;
dev_dbg(link-dev, ide_detach(0x%p)\n, link);
-data_addr = hwif-io_ports.data_addr;
-ctl_addr = hwif-io_ports.ctl_addr;
+release_region(hwif-io_ports.ctl_addr, 1);
+release_region(hwif-io_ports.data_addr, 8);
ide_release(link);
-release_region(ctl_addr, 1);
-release_region(data_addr, 8);
-
kfree(info);
} /* ide_detach */
--
1.6.3.3
___
Linux PCMCIA reimplementation list
http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: [PATCH V2] pcmcia/yenta: add module parameter for O2 speedups
Hi, (1) The default setting of O2_6933 should be on? It was set to off because of this bug-report: http://www.mail-archive.com/linux-pcmcia@lists.infradead.org/msg02048.html The patch went through this list multiple times and there were no complaints. (2) How about the name enable_prefetch instead of o2_speedup? Hmm, prefetch is only for read, for write it is called burst, so I took this name. Also, I'd think it should have o2 somewhere in the name, as it doesn't do anything on other controllers. I also didn't find existing parameters doing something similar, otherwise I would have tried to group them. Regards, Wolfram -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: [RFC] PCMCIA patches for 2.6.34
On Wed, Jan 06, 2010 at 07:30:27PM +0100, Wolfram Sang wrote: thanks for testing -- I think module insertion removal, combined with card insertion ejection or suspend / resume might be the most likely error path this time; though I couldn't create any issues here on my test box... I did the suggested testing now and everything still behaves like the 2.6.30-distro kernel from Debian. Cool work! This also means, I discovered something I never noticed before. This happens when I remove CF-cards (same for both types I have lying here): [ 150.313371] pcmcia_socket pcmcia_socket0: pccard: PCMCIA card inserted into slot 0 [ 150.314593] pcmcia 0.0: pcmcia: registering new device pcmcia0.0 [ 150.392217] Probing IDE interface ide2... [ 150.667050] hde: SanDisk SDCFH-128, CFA DISK drive [ 151.306831] ide2 at 0xc100-0xc107,0xc10e on irq 11 [ 151.306939] hde: max request size: 128KiB [ 151.306948] hde: 250880 sectors (128 MB) w/1KiB Cache, CHS=980/8/32 [ 151.307042] hde: hde1 [ 151.327094] ide-cs: hde: Vpp = 0.0 [ 154.778843] pcmcia_socket pcmcia_socket0: pccard: card ejected from slot 0 [ 154.779280] Trying to free nonexistent resource c10e-c10e [ 154.779289] Trying to free nonexistent resource c100-c107 The last two lines sound like a problem. Is it known? (I repeat: This is not a regression of your patches, it also happens with 2.6.30.) Ping? (This time without dropped CC :)) Has anyone seen this message? Is it intended? -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: [RFC] more PCMCIA patches for 2.6.34
On Wed, Jan 06, 2010 at 04:40:53PM +0100, Dominik Brodowski wrote: Hey, the next step turned out to be a bit easier than assumed, so here are some more patches relating to the PCMCIA subsystem, and intended for 2.6.34. I'm interested in your input to this patch series. They'll be sent to the PCMCIA list shortly. All patches are available in the master branch at git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git (or will be available there shortly). pcmcia: move cistpl.c into pcmcia module pcmcia: remove remaining rsrc_mgr indirections pcmcia: do not use resource manager on !PCMCIA Whole series: Tested-by: Wolfram Sang w.s...@pengutronix.de -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: [Bug 15014] New: Poor performance on O2 Micro carbus bridge (OZ6933)
I agree with the be on the safe side statement, but... :) Hmm, I'm thinking about a module parameter which can force this on/off while the default behaviour is the currently implemented one. Regards, Wolfram -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: [RFC] PCMCIA patches for 2.6.34
Hi Dominik, here are some patches relating to the PCMCIA subsystem, and intended for 2.6.34. I'm interested in your input to this patch series. They'll be sent to the PCMCIA list shortly, with CC to other lists if deemed Looks interesting, I will pull your master(?)-branch this evening and give it a test. Any hints on what to try/look for especially? Suspend/Resume seems one candidate next to the usual I'll try a bunch of cards... Regards, Wolfram -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: [RFC] PCMCIA patches for 2.6.34
thanks for testing -- I think module insertion removal, combined with card insertion ejection or suspend / resume might be the most likely error path this time; though I couldn't create any issues here on my test box... I did the suggested testing now and everything still behaves like the 2.6.30-distro kernel from Debian. Cool work! This also means, I discovered something I never noticed before. This happens when I remove CF-cards (same for both types I have lying here): [ 150.313371] pcmcia_socket pcmcia_socket0: pccard: PCMCIA card inserted into slot 0 [ 150.314593] pcmcia 0.0: pcmcia: registering new device pcmcia0.0 [ 150.392217] Probing IDE interface ide2... [ 150.667050] hde: SanDisk SDCFH-128, CFA DISK drive [ 151.306831] ide2 at 0xc100-0xc107,0xc10e on irq 11 [ 151.306939] hde: max request size: 128KiB [ 151.306948] hde: 250880 sectors (128 MB) w/1KiB Cache, CHS=980/8/32 [ 151.307042] hde: hde1 [ 151.327094] ide-cs: hde: Vpp = 0.0 [ 154.778843] pcmcia_socket pcmcia_socket0: pccard: card ejected from slot 0 [ 154.779280] Trying to free nonexistent resource c10e-c10e [ 154.779289] Trying to free nonexistent resource c100-c107 The last two lines sound like a problem. Is it known? (I repeat: This is not a regression of your patches, it also happens with 2.6.30.) Regards, Wolfram -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: pcmciautils -- pending patches?
From 2a7642bf0607a31f08a8cda4b6babfaf639bcfb6 Mon Sep 17 00:00:00 2001 From: Colin Watson cjwat...@debian.org Date: Tue, 5 Jan 2010 12:11:13 + Subject: [PATCH 3/3] Use architecture-specific config.opts if it exists Originally by Per Olofsson pe...@debian.org. Signed-off-by: Colin Watson cjwat...@debian.org --- Makefile |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index f4acfb3..e7ff190 100644 --- a/Makefile +++ b/Makefile @@ -297,6 +297,9 @@ uninstall-tools: install-config: $(INSTALL) -d $(DESTDIR)$(pcmciaconfdir) $(INSTALL_DATA) -D config/config.opts $(DESTDIR)$(pcmciaconfdir)/config.opts + if [ -f config/config.opts.$(ARCH) ]; then Missing backslash? Or maybe better: add an arch-extension for the standard config.opts and drop the above 'if' completely? + $(INSTALL_DATA) -D config/config.opts.$(ARCH) $(DESTDIR)$(pcmciaconfdir)/config.opts; \ + fi uninstall-config: #- rm -f $(DESTDIR)$(pcmciaconfdir)/config.opts -- 1.6.5.7 Regards, Wolfram -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: IBM Bluetooth PC Card II - configuration problem
I have attaches a modified version of the patch. If possible, please put them inline (without line-wraps ;)) Please give me some ideas on how I could determine what causes this inconclusive behaviour. Maybe the bluetooth-list can provide some hints? Perhaps a summary posted to both lists can give some new insights. Regards, Wolfram -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Latest pull request?
Hi Dominik, do I miss something or were the patches from the last pull-request not posted to this list? Regards, Wolfram -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: Re: [BUG? kernel 2.6.32-git10] 3com 3c562 multifunction card does not work
The mac address of 3c562 becomes ff:ff:ff:ff:ff:ff and no startup message appear for serial. This card works with kernel-2.6.32-git7. It seems the pcmcia card can't access the io-range 0x100-0x3ff, so serial can't allocate io-port resource. That sounds familiar. I think I had a card with a similar phenomenon, but that was months ago... Maybe I'll have time this week to dig this card out of wherever it is now :) -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: [BUG? kernel 2.6.32-git10] 3com 3c562 multifunction card does not work
3com 3c562 multifunction card does not work with kernel 2.6.32-git10. The mac address of 3c562 becomes ff:ff:ff:ff:ff:ff and no startup message appear for serial. This card works with kernel-2.6.32-git7. Sounds like a good candidate for git-bisect :) -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: [PATCH 13/13] pcmcia: rework the irq_req_t typedef
Hi Dominik,
diff --git a/include/pcmcia/cs.h b/include/pcmcia/cs.h
index afc2bfb..39376e6 100644
--- a/include/pcmcia/cs.h
+++ b/include/pcmcia/cs.h
@@ -126,7 +126,7 @@ typedef struct irq_req_t {
#define IRQ_TYPE_TIME0x01
#define IRQ_TYPE_DYNAMIC_SHARING 0x02
#define IRQ_FORCED_PULSE 0x04
-#define IRQ_FIRST_SHARED 0x08
+//#define IRQ_FIRST_SHARED 0x08
//#define IRQ_HANDLE_PRESENT 0x10
Note: //-comments are discouraged according to CodingStyle.
#define IRQ_PULSE_ALLOCATED 0x100
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.c
b/sound/pcmcia/pdaudiocf/pdaudiocf.c
index 7717e01..b908c72 100644
--- a/sound/pcmcia/pdaudiocf/pdaudiocf.c
+++ b/sound/pcmcia/pdaudiocf/pdaudiocf.c
@@ -143,7 +143,7 @@ static int snd_pdacf_probe(struct pcmcia_device *link)
link-io.NumPorts1 = 16;
link-irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_FORCED_PULSE;
- // link-irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED;
+ // link-irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
Ditto. Plus, wouldn't it be easier to just drop this line? I couldn't find an
explanation for this comment, it even contradicts with the line above.
Regards,
Wolfram
--
Pengutronix e.K. | Wolfram Sang|
Industrial Linux Solutions | http://www.pengutronix.de/ |
signature.asc
Description: Digital signature
___
Linux PCMCIA reimplementation list
http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: Re: Re: [PATCH] pcmcia: cs.c : load pcmcia module automatically.
+ /* + * Let's try to get the PCMCIA module for 16-bit PCMCIA support. + * If it fails, it doesn't matter -- we still havae 32-bit CardBus + * support to offer, so this is not a failure mode. + */ + request_module_nowait(pcmcia); + Typo: havae -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: [PATCH 16/16] pcmcia: use dev_dbg and dev_print in pd6729.c
Well, one can use dev_* here. So, next try:
From: Dominik Brodowski li...@dominikbrodowski.net
Date: Sat, 24 Oct 2009 18:07:16 +0200
Subject: [PATCH 16/16] pcmcia: use dev_dbg and dev_print in pd6729.c
As suggested by Wolfram Sang w.s...@pengutronix.de, use dev_dbg(),
and dev_{err,warn,info}() in pd6729.c, and add some \n suggested by
Komuro komurojun-...@nifty.com. In the ISR, use pr_devel() and
dev_vdbg() as they are only compiled if DEBUG (or, for dev_vdbg(),
VERBOSE_DEBUG) are set explicitly.
CC: Wolfram Sang w.s...@pengutronix.de
CC: Komuro komurojun-...@nifty.com
Signed-off-by: Dominik Brodowski li...@dominikbrodowski.net
Acked-by: Wolfram Sang w.s...@pengutronix.de
--
Pengutronix e.K. | Wolfram Sang|
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-5064 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- |
signature.asc
Description: Digital signature
___
Linux PCMCIA reimplementation list
http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: [PATCH 16/16] pcmcia: use dev_dbg and dev_print in pd6729.c
On Sun, Oct 25, 2009 at 12:23:27PM +0100, Dominik Brodowski wrote:
New attempt:
From: Dominik Brodowski li...@dominikbrodowski.net
Date: Sat, 24 Oct 2009 18:07:16 +0200
Subject: [PATCH 16/16] pcmcia: use dev_dbg and dev_print in pd6729.c
As suggested by Wolfram Sang w.s...@pengutronix.de, use dev_dbg(),
and dev_{err,warn,info}() in pd6729.c, and add some \n suggested by
Komuro komurojun-...@nifty.com. In the ISR, use pr_devel() and
dev_vdbg() as they are only compiled if DEBUG (or, for dev_vdbg(),
VERBOSE_DEBUG) are set explicitly.
One issue left, after that you could add my
Acked-by: Wolfram Sang w.s...@pengutronix.de
CC: Wolfram Sang w.s...@pengutronix.de
CC: Komuro komurojun-...@nifty.com
Signed-off-by: Dominik Brodowski li...@dominikbrodowski.net
---
drivers/pcmcia/pd6729.c | 70
+--
drivers/pcmcia/pd6729.h |7 -
2 files changed, 37 insertions(+), 40 deletions(-)
diff --git a/drivers/pcmcia/pd6729.c b/drivers/pcmcia/pd6729.c
index 70a3346..cbb1e43 100644
--- a/drivers/pcmcia/pd6729.c
+++ b/drivers/pcmcia/pd6729.c
@@ -213,7 +213,8 @@ static irqreturn_t pd6729_interrupt(int irq, void *dev)
if (csc I365_CSC_DETECT) {
events |= SS_DETECT;
- dprintk(Card detected in socket %i!\n, i);
+ dev_vdbg(socket[i].socket.dev,
+ Card detected in socket %i!\n, i);
}
if (indirect_read(socket[i], I365_INTCTL)
@@ -331,11 +332,11 @@ static int pd6729_set_socket(struct pcmcia_socket
*sock, socket_state_t *state)
reg = I365_PWR_NORESET; /* default: disable resetdrv on resume */
if (state-flags SS_PWR_AUTO) {
- dprintk(Auto power\n);
+ dev_dbg(sock-dev, Auto power\n);
reg |= I365_PWR_AUTO; /* automatic power mngmnt */
}
if (state-flags SS_OUTPUT_ENA) {
- dprintk(Power Enabled\n);
+ dev_dbg(sock-dev, Power Enabled\n);
reg |= I365_PWR_OUT;/* enable power */
}
@@ -343,40 +344,44 @@ static int pd6729_set_socket(struct pcmcia_socket
*sock, socket_state_t *state)
case 0:
break;
case 33:
- dprintk(setting voltage to Vcc to 3.3V on socket %i\n,
+ dev_dbg(sock-dev,
+ setting voltage to Vcc to 3.3V on socket %i\n,
socket-number);
reg |= I365_VCC_5V;
indirect_setbit(socket, PD67_MISC_CTL_1, PD67_MC1_VCC_3V);
break;
case 50:
- dprintk(setting voltage to Vcc to 5V on socket %i\n,
+ dev_dbg(sock-dev,
+ setting voltage to Vcc to 5V on socket %i\n,
socket-number);
reg |= I365_VCC_5V;
indirect_resetbit(socket, PD67_MISC_CTL_1, PD67_MC1_VCC_3V);
break;
default:
- dprintk(pd6729: pd6729_set_socket called with
- invalid VCC power value: %i\n,
- state-Vcc);
+ dev_dbg(sock-dev,
+ pd6729_set_socket called with invalid VCC power
+ value: %i\n, state-Vcc);
return -EINVAL;
}
switch (state-Vpp) {
case 0:
- dprintk(not setting Vpp on socket %i\n, socket-number);
+ dev_dbg(sock-dev, not setting Vpp on socket %i\n,
+ socket-number);
break;
case 33:
case 50:
- dprintk(setting Vpp to Vcc for socket %i\n, socket-number);
+ dev_dbg(sock-dev, setting Vpp to Vcc for socket %i\n,
+ socket-number);
reg |= I365_VPP1_5V;
break;
case 120:
- dprintk(setting Vpp to 12.0\n);
+ dev_dbg(sock-dev, setting Vpp to 12.0\n);
reg |= I365_VPP1_12V;
break;
default:
- dprintk(pd6729: pd6729_set_socket called with invalid VPP
power value: %i\n,
- state-Vpp);
+ dev_dbg(sock-dev, pd6729: pd6729_set_socket called with
+ invalid VPP power value: %i\n, state-Vpp);
return -EINVAL;
}
@@ -438,7 +443,7 @@ static int pd6729_set_io_map(struct pcmcia_socket *sock,
/* Check error conditions */
if (map 1) {
- dprintk(pd6729_set_io_map with invalid map);
+ dev_dbg(sock-dev, pd6729_set_io_map with invalid map\n);
return -EINVAL;
}
@@ -446,7 +451,7 @@ static int pd6729_set_io_map(struct pcmcia_socket *sock,
if (indirect_read(socket, I365_ADDRWIN) I365_ENA_IO(map))
indirect_resetbit(socket, I365_ADDRWIN, I365_ENA_IO(map));
- /* dprintk
Re: [PATCH] pcmcia: does not load the pd6729 driver, if io_base is 0
On Sat, Oct 24, 2009 at 08:07:39AM +0900, Komuro wrote:
The CL-PD6729 chip in some docking station is not initialized properly under
Linux.
in that case, does not load the pd6729 driver.
Signed-off-by: Komuro komurojun-...@nifty.com
---
--- linux-2.6.31/drivers/pcmcia/pd6729.c.orig 2009-09-12 11:14:37.0
+0900
+++ linux-2.6.31/drivers/pcmcia/pd6729.c 2009-09-12 11:40:01.0
+0900
@@ -641,6 +641,12 @@
if ((ret = pci_enable_device(dev)))
goto err_out_free_mem;
+ if ((unsigned long long)pci_resource_start(dev, 0) == 0) {
Maybe
+ if (!pci_resource_start(dev, 0)) {
to save the cast and use the more common way to check for a NULL-pointer.
+ printk(KERN_INFO pd6729: failed to load the driver.
+ since the io_base is 0.\n);
I'd strongly suggest dev_err or dev_warn here.
+ goto err_out_free_mem;
+ }
+
printk(KERN_INFO pd6729: Cirrus PD6729 PCI to PCMCIA Bridge
at 0x%llx on irq %d\n,
(unsigned long long)pci_resource_start(dev, 0), dev-irq);
___
Linux PCMCIA reimplementation list
http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Regards,
Wolfram
--
Pengutronix e.K. | Wolfram Sang|
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-5064 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- |
signature.asc
Description: Digital signature
___
Linux PCMCIA reimplementation list
http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: [PATCH 16/16] pcmcia: use dev_dbg and dev_print in pd6729.c
On Sat, Oct 24, 2009 at 09:43:06PM +0200, Dominik Brodowski wrote:
As suggested by Wolfram Sang w.s...@pengutronix.de, use dev_dbg() and
dev_printk() in pd6729.c.
I'd also include dev_err, dev_warn and dev_info :)
CC: Wolfram Sang w.s...@pengutronix.de
Signed-off-by: Dominik Brodowski li...@dominikbrodowski.net
---
drivers/pcmcia/pd6729.c | 69
++-
drivers/pcmcia/pd6729.h |7 -
2 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/drivers/pcmcia/pd6729.c b/drivers/pcmcia/pd6729.c
index 70a3346..509a648 100644
--- a/drivers/pcmcia/pd6729.c
+++ b/drivers/pcmcia/pd6729.c
@@ -213,7 +213,8 @@ static irqreturn_t pd6729_interrupt(int irq, void *dev)
if (csc I365_CSC_DETECT) {
events |= SS_DETECT;
- dprintk(Card detected in socket %i!\n, i);
+ dev_dbg(socket[i].socket.dev,
+ Card detected in socket %i!\n, i);
Dunno, in days of dynamic_printk it might be better to skip debug outputs in
ISRs, no?
}
if (indirect_read(socket[i], I365_INTCTL)
@@ -331,11 +332,11 @@ static int pd6729_set_socket(struct pcmcia_socket
*sock, socket_state_t *state)
reg = I365_PWR_NORESET; /* default: disable resetdrv on resume */
if (state-flags SS_PWR_AUTO) {
- dprintk(Auto power\n);
+ dev_dbg(sock-dev, Auto power\n);
reg |= I365_PWR_AUTO; /* automatic power mngmnt */
}
if (state-flags SS_OUTPUT_ENA) {
- dprintk(Power Enabled\n);
+ dev_dbg(sock-dev, Power Enabled\n);
reg |= I365_PWR_OUT;/* enable power */
}
@@ -343,40 +344,44 @@ static int pd6729_set_socket(struct pcmcia_socket
*sock, socket_state_t *state)
case 0:
break;
case 33:
- dprintk(setting voltage to Vcc to 3.3V on socket %i\n,
+ dev_dbg(sock-dev,
+ setting voltage to Vcc to 3.3V on socket %i\n,
socket-number);
reg |= I365_VCC_5V;
indirect_setbit(socket, PD67_MISC_CTL_1, PD67_MC1_VCC_3V);
break;
case 50:
- dprintk(setting voltage to Vcc to 5V on socket %i\n,
+ dev_dbg(sock-dev,
+ setting voltage to Vcc to 5V on socket %i\n,
socket-number);
reg |= I365_VCC_5V;
indirect_resetbit(socket, PD67_MISC_CTL_1, PD67_MC1_VCC_3V);
break;
default:
- dprintk(pd6729: pd6729_set_socket called with
- invalid VCC power value: %i\n,
- state-Vcc);
+ dev_dbg(sock-dev,
+ pd6729_set_socket called with invalid VCC power
+ value: %i\n, state-Vcc);
return -EINVAL;
}
switch (state-Vpp) {
case 0:
- dprintk(not setting Vpp on socket %i\n, socket-number);
+ dev_dbg(sock-dev, not setting Vpp on socket %i\n,
+ socket-number);
break;
case 33:
case 50:
- dprintk(setting Vpp to Vcc for socket %i\n, socket-number);
+ dev_dbg(sock-dev, setting Vpp to Vcc for socket %i\n,
+ socket-number);
reg |= I365_VPP1_5V;
break;
case 120:
- dprintk(setting Vpp to 12.0\n);
+ dev_dbg(sock-dev, setting Vpp to 12.0\n);
reg |= I365_VPP1_12V;
break;
default:
- dprintk(pd6729: pd6729_set_socket called with invalid VPP
power value: %i\n,
- state-Vpp);
+ dev_dbg(sock-dev, pd6729: pd6729_set_socket called with
+ invalid VPP power value: %i\n, state-Vpp);
return -EINVAL;
}
@@ -438,7 +443,7 @@ static int pd6729_set_io_map(struct pcmcia_socket *sock,
/* Check error conditions */
if (map 1) {
- dprintk(pd6729_set_io_map with invalid map);
+ dev_dbg(sock-dev, pd6729_set_io_map with invalid map);
return -EINVAL;
}
@@ -446,7 +451,7 @@ static int pd6729_set_io_map(struct pcmcia_socket *sock,
if (indirect_read(socket, I365_ADDRWIN) I365_ENA_IO(map))
indirect_resetbit(socket, I365_ADDRWIN, I365_ENA_IO(map));
- /* dprintk(set_io_map: Setting range to %x - %x\n,
+ /* dev_dbg(sock-dev, set_io_map: Setting range to %x - %x\n,
io-start, io-stop);*/
/* write the new values */
@@ -529,12 +534,12 @@ static int pd6729_set_mem_map(struct pcmcia_socket
*sock,
if (mem-flags MAP_WRPROT)
i |= I365_MEM_WRPROT;
if (mem-flags MAP_ATTRIB
Re: [PATCH] pcmcia: fix controller printk format warnings
On Sun, Oct 11, 2009 at 06:50:09PM -0700, Randy Dunlap wrote: From: Randy Dunlap randy.dun...@oracle.com Fix new pcmcia printk format warnings: [This has now moved from linux-next to mainline. Originally sent 2009-SEP-17.] drivers/pcmcia/i82365.c:1055: warning: format '%#x' expects type 'unsigned int', but argument 6 has type 'phys_addr_t' drivers/pcmcia/i82365.c:1055: warning: format '%#x' expects type 'unsigned int', but argument 7 has type 'phys_addr_t' drivers/pcmcia/tcic.c:734: warning: format '%#x' expects type 'unsigned int', but argument 6 has type 'phys_addr_t' drivers/pcmcia/tcic.c:734: warning: format '%#x' expects type 'unsigned int', but argument 7 has type 'phys_addr_t' Signed-off-by: Randy Dunlap randy.dun...@oracle.com Acked-by: Wolfram Sang w.s...@pengutronix.de -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
[PATCH] pcmcia: Fix possible printk format warnings
Fix more possible warnings introduced by my commit 1d80766554322236aee50d6023693b3210b9cf38 as fixed by the previous patch from Randy Dunlap. Not tested due to no hardware. Signed-off-by: Wolfram Sang w.s...@pengutronix.de Cc: Dominik Brodowski li...@dominikbrodowski.net --- drivers/pcmcia/m32r_cfc.c| 10 ++ drivers/pcmcia/m32r_pcc.c| 10 ++ drivers/pcmcia/m8xx_pcmcia.c | 15 +-- drivers/pcmcia/soc_common.c |5 +++-- 4 files changed, 24 insertions(+), 16 deletions(-) diff --git a/drivers/pcmcia/m32r_cfc.c b/drivers/pcmcia/m32r_cfc.c index d1d89c4..7dfbee1 100644 --- a/drivers/pcmcia/m32r_cfc.c +++ b/drivers/pcmcia/m32r_cfc.c @@ -537,8 +537,9 @@ static int _pcc_set_io_map(u_short sock, struct pccard_io_map *io) u_char map; debug(3, m32r_cfc: SetIOMap(%d, %d, %#2.2x, %d ns, - %#lx-%#lx)\n, sock, io-map, io-flags, - io-speed, io-start, io-stop); + %#llx-%#llx)\n, sock, io-map, io-flags, + io-speed, (unsigned long long)io-start, + (unsigned long long)io-stop); map = io-map; return 0; @@ -554,8 +555,9 @@ static int _pcc_set_mem_map(u_short sock, struct pccard_mem_map *mem) pcc_socket_t *t = socket[sock]; debug(3, m32r_cfc: SetMemMap(%d, %d, %#2.2x, %d ns, -%#lx, %#x)\n, sock, map, mem-flags, -mem-speed, mem-static_start, mem-card_start); +%#llx, %#x)\n, sock, map, mem-flags, +mem-speed, (unsigned long long)mem-static_start, +mem-card_start); /* * sanity check diff --git a/drivers/pcmcia/m32r_pcc.c b/drivers/pcmcia/m32r_pcc.c index a065583..c6524f9 100644 --- a/drivers/pcmcia/m32r_pcc.c +++ b/drivers/pcmcia/m32r_pcc.c @@ -492,8 +492,9 @@ static int _pcc_set_io_map(u_short sock, struct pccard_io_map *io) u_char map; debug(3, m32r-pcc: SetIOMap(%d, %d, %#2.2x, %d ns, - %#x-%#x)\n, sock, io-map, io-flags, - io-speed, io-start, io-stop); + %#llx-%#llx)\n, sock, io-map, io-flags, + io-speed, (unsigned long long)io-start, + (unsigned long long)io-stop); map = io-map; return 0; @@ -515,8 +516,9 @@ static int _pcc_set_mem_map(u_short sock, struct pccard_mem_map *mem) #endif debug(3, m32r-pcc: SetMemMap(%d, %d, %#2.2x, %d ns, -%#lx, %#x)\n, sock, map, mem-flags, -mem-speed, mem-static_start, mem-card_start); +%#llx, %#x)\n, sock, map, mem-flags, +mem-speed, (unsigned long long)mem-static_start, +mem-card_start); /* * sanity check diff --git a/drivers/pcmcia/m8xx_pcmcia.c b/drivers/pcmcia/m8xx_pcmcia.c index c69f2c4..403559b 100644 --- a/drivers/pcmcia/m8xx_pcmcia.c +++ b/drivers/pcmcia/m8xx_pcmcia.c @@ -975,8 +975,9 @@ static int m8xx_set_io_map(struct pcmcia_socket *sock, struct pccard_io_map *io) #define M8XX_BASE (PCMCIA_IO_WIN_BASE + io-start) dprintk(SetIOMap(%d, %d, %#2.2x, %d ns, - %#4.4x-%#4.4x)\n, lsock, io-map, io-flags, - io-speed, io-start, io-stop); + %#4.4llx-%#4.4llx)\n, lsock, io-map, io-flags, + io-speed, (unsigned long long)io-start, + (unsigned long long)io-stop); if ((io-map = PCMCIA_IO_WIN_NO) || (io-start 0x) || (io-stop 0x) || (io-stop io-start)) @@ -1055,8 +1056,9 @@ static int m8xx_set_mem_map(struct pcmcia_socket *sock, pcmconf8xx_t *pcmcia = s-pcmcia; dprintk(SetMemMap(%d, %d, %#2.2x, %d ns, - %#5.5lx, %#5.5x)\n, lsock, mem-map, mem-flags, - mem-speed, mem-static_start, mem-card_start); + %#5.5llx, %#5.5x)\n, lsock, mem-map, mem-flags, + mem-speed, (unsigned long long)mem-static_start, + mem-card_start); if ((mem-map = PCMCIA_MEM_WIN_NO) // || ((mem-s) = PCMCIA_MEM_WIN_SIZE) @@ -1107,8 +1109,9 @@ static int m8xx_set_mem_map(struct pcmcia_socket *sock, } dprintk(SetMemMap(%d, %d, %#2.2x, %d ns, - %#5.5lx, %#5.5x)\n, lsock, mem-map, mem-flags, - mem-speed, mem-static_start, mem-card_start); + %#5.5llx, %#5.5x)\n, lsock, mem-map, mem-flags, + mem-speed, (unsigned long long)mem-static_start, + mem-card_start); /* copy the struct and modify the copy */ diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c index 163cf98..ef7e9e5 100644 --- a/drivers/pcmcia/soc_common.c +++ b/drivers/pcmcia/soc_common.c @@ -336,8 +336,9 @@ soc_common_pcmcia_set_io_map(struct pcmcia_socket *sock, struct pccard_io_map *m struct soc_pcmcia_socket *skt = to_soc_pcmcia_socket(sock); unsigned short speed = map-speed; - debug(skt, 2, map %u speed %u
[PATCH] pcmcia: drop already defined PCI_IDs
Out of 10 PCI_IDs found in the PCMCIA subsystem, only two were not defined in pci_ids.h. Move them and drop the duplicates. Successfully build-tested. Signed-off-by: Wolfram Sang w.s...@pengutronix.de Cc: Dominik Brodowski li...@dominikbrodowski.net Cc: Jesse Barnes jbar...@virtuousgeek.org --- drivers/pcmcia/cirrus.h | 10 -- drivers/pcmcia/o2micro.h | 22 -- include/linux/pci_ids.h |2 ++ 3 files changed, 2 insertions(+), 32 deletions(-) diff --git a/drivers/pcmcia/cirrus.h b/drivers/pcmcia/cirrus.h index ecd4fc7..446a457 100644 --- a/drivers/pcmcia/cirrus.h +++ b/drivers/pcmcia/cirrus.h @@ -30,16 +30,6 @@ #ifndef _LINUX_CIRRUS_H #define _LINUX_CIRRUS_H -#ifndef PCI_VENDOR_ID_CIRRUS -#define PCI_VENDOR_ID_CIRRUS 0x1013 -#endif -#ifndef PCI_DEVICE_ID_CIRRUS_6729 -#define PCI_DEVICE_ID_CIRRUS_6729 0x1100 -#endif -#ifndef PCI_DEVICE_ID_CIRRUS_6832 -#define PCI_DEVICE_ID_CIRRUS_6832 0x1110 -#endif - #define PD67_MISC_CTL_10x16/* Misc control 1 */ #define PD67_FIFO_CTL 0x17/* FIFO control */ #define PD67_MISC_CTL_20x1E/* Misc control 2 */ diff --git a/drivers/pcmcia/o2micro.h b/drivers/pcmcia/o2micro.h index 72188c4..624442f 100644 --- a/drivers/pcmcia/o2micro.h +++ b/drivers/pcmcia/o2micro.h @@ -30,28 +30,6 @@ #ifndef _LINUX_O2MICRO_H #define _LINUX_O2MICRO_H -#ifndef PCI_VENDOR_ID_O2 -#define PCI_VENDOR_ID_O2 0x1217 -#endif -#ifndef PCI_DEVICE_ID_O2_6729 -#define PCI_DEVICE_ID_O2_6729 0x6729 -#endif -#ifndef PCI_DEVICE_ID_O2_6730 -#define PCI_DEVICE_ID_O2_6730 0x673a -#endif -#ifndef PCI_DEVICE_ID_O2_6832 -#define PCI_DEVICE_ID_O2_6832 0x6832 -#endif -#ifndef PCI_DEVICE_ID_O2_6836 -#define PCI_DEVICE_ID_O2_6836 0x6836 -#endif -#ifndef PCI_DEVICE_ID_O2_6812 -#define PCI_DEVICE_ID_O2_6812 0x6872 -#endif -#ifndef PCI_DEVICE_ID_O2_6933 -#define PCI_DEVICE_ID_O2_6933 0x6933 -#endif - /* Additional PCI configuration registers */ #define O2_MUX_CONTROL 0x90/* 32 bit */ diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index f490e7a..857cc34 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -1632,6 +1632,8 @@ #define PCI_DEVICE_ID_O2_6730 0x673a #define PCI_DEVICE_ID_O2_6832 0x6832 #define PCI_DEVICE_ID_O2_6836 0x6836 +#define PCI_DEVICE_ID_O2_6812 0x6872 +#define PCI_DEVICE_ID_O2_6933 0x6933 #define PCI_VENDOR_ID_3DFX 0x121a #define PCI_DEVICE_ID_3DFX_VOODOO 0x0001 -- 1.6.3.3 ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: [PATCH] pcmcia: fix controller printk format warnings
On Sun, Oct 11, 2009 at 06:50:09PM -0700, Randy Dunlap wrote: From: Randy Dunlap randy.dun...@oracle.com Fix new pcmcia printk format warnings: [This has now moved from linux-next to mainline. Originally sent 2009-SEP-17.] My plan was to pick it for pcmcia-l2 and ask Greg to pull it next week (after ELC-E) together with my follow-up patch. If this is not fast enough, just let me know someone else picked it and I'll handle my patch seperately. Regards, Wolfram -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: PCMCIA bring up fails on ide_register()
My Linux code is based on revision 2.6.14.2; there are two slots for PCMCIA card, slot 0 and slot 1. Now I have one ATA Flash card in slot 1. Does it also happen with a recent kernel? Regards, Wolfram -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: PCMCIA bring up fails on ide_register()
I don't know. We just use Linux 2.6.14.2 as our code base to develop our code. Well, there were many changes meanwhile both to PCI and PCMCIA. Don't be surprised when nobody wants to debug something which might be fixed already ;) The root cause of this error I guess is, Host trying to access ATA/IDE command/status registers, but Linux does not get the right address, my mean is Linux mapping to the wrong location. Yup, looks like it. Regards, Wolfram -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: [PATCH 1/2] PM / PCMCIA: Drop second argument of pcmcia_socket_dev_suspend()
On Sat, Sep 26, 2009 at 01:25:11AM +0200, Rafael J. Wysocki wrote: From: Rafael J. Wysocki r...@sisk.pl pcmcia_socket_dev_suspend() doesn't use its second argument, so it may be dropped safely. This change is necessary for the subsequent yenta suspend/resume fix. Signed-off-by: Rafael J. Wysocki r...@sisk.pl --- drivers/pcmcia/at91_cf.c|2 +- drivers/pcmcia/au1000_generic.c |2 +- drivers/pcmcia/bfin_cf_pcmcia.c |2 +- drivers/pcmcia/cs.c |2 +- drivers/pcmcia/i82092.c |2 +- drivers/pcmcia/i82365.c |2 +- drivers/pcmcia/m32r_cfc.c |2 +- drivers/pcmcia/m32r_pcc.c |2 +- drivers/pcmcia/m8xx_pcmcia.c|2 +- drivers/pcmcia/omap_cf.c|2 +- drivers/pcmcia/pd6729.c |2 +- drivers/pcmcia/pxa2xx_base.c|2 +- drivers/pcmcia/sa1100_generic.c |2 +- drivers/pcmcia/sa_generic.c |2 +- drivers/pcmcia/tcic.c |2 +- drivers/pcmcia/vrc4171_card.c |2 +- include/pcmcia/ss.h |2 +- Hmm, you are not converting yenta_socket here. Won't that break building the kernel (git bisect)? Regards, Wolfram -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: [PATCH] MIPS: BCM63xx: Add PCMCIA Cardbus support.
On Fri, Sep 18, 2009 at 01:21:31PM +0200, Maxime Bizon wrote:
Hi Wolfram Greg,
It seems Dominik is busy, and you're the one acking pcmcia patch at the
moment so I'm sending this to you.
This is a pcmcia/cardbus driver for the bcm63xx mips SOCs, it was
already posted twice:
last year:
http://lists.infradead.org/pipermail/linux-pcmcia/2008-October/005942.html
three months ago:
http://lists.infradead.org/pipermail/linux-pcmcia/2009-July/006196.html
and got no review.
Could you please have a look at it ?
Okay, here is a fast review. If you fix the mentioned points (or give me good
reasons why not ;)), then you might add my
Reviewed-by: Wolfram Sang w.s...@pengutronix.de
I am fine with Ralf picking this up.
Thanks !
Signed-off-by: Maxime Bizon mbi...@freebox.fr
Signed-off-by: Ralf Baechle r...@linux-mips.org
---
diff --git a/arch/mips/bcm63xx/Makefile b/arch/mips/bcm63xx/Makefile
index cff75de..c146d1e 100644
--- a/arch/mips/bcm63xx/Makefile
+++ b/arch/mips/bcm63xx/Makefile
@@ -1,5 +1,5 @@
obj-y+= clk.o cpu.o cs.o gpio.o irq.o prom.o setup.o timer.o
\
-dev-dsp.o dev-enet.o dev-uart.o
+dev-dsp.o dev-enet.o dev-pcmcia.o dev-uart.o
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
obj-y+= boards/
diff --git a/arch/mips/bcm63xx/boards/board_bcm963xx.c
b/arch/mips/bcm63xx/boards/board_bcm963xx.c
index d3fdf27..e3e6205 100644
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -24,6 +24,7 @@
#include bcm63xx_dev_pci.h
#include bcm63xx_dev_enet.h
#include bcm63xx_dev_dsp.h
+#include bcm63xx_dev_pcmcia.h
#include bcm63xx_dev_uart.h
#include board_bcm963xx.h
@@ -796,6 +797,9 @@ int __init board_register_devices(void)
bcm63xx_uart_register();
+ if (board.has_pccard)
+ bcm63xx_pcmcia_register();
+
if (board.has_enet0
!board_get_mac_address(board.enet0.mac_addr))
bcm63xx_enet_register(0, board.enet0);
diff --git a/arch/mips/bcm63xx/dev-pcmcia.c b/arch/mips/bcm63xx/dev-pcmcia.c
new file mode 100644
index 000..40ec4bc
--- /dev/null
+++ b/arch/mips/bcm63xx/dev-pcmcia.c
@@ -0,0 +1,135 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file COPYING in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2008 Maxime Bizon mbi...@freebox.fr
+ */
+
+#include linux/init.h
+#include linux/kernel.h
+#include asm/bootinfo.h
+#include linux/platform_device.h
+#include bcm63xx_cs.h
+#include bcm63xx_cpu.h
+#include bcm63xx_dev_pcmcia.h
+#include bcm63xx_io.h
+#include bcm63xx_regs.h
+
+static struct resource pcmcia_resources[] = {
+ /* pcmcia registers */
+ {
+ .start = -1, /* filled at runtime */
+ .end= -1, /* filled at runtime */
+ .flags = IORESOURCE_MEM,
+ },
+
+ /* pcmcia memory zone resources */
+ {
+ .start = BCM_PCMCIA_COMMON_BASE_PA,
+ .end= BCM_PCMCIA_COMMON_END_PA,
+ .flags = IORESOURCE_MEM,
+ },
+ {
+ .start = BCM_PCMCIA_ATTR_BASE_PA,
+ .end= BCM_PCMCIA_ATTR_END_PA,
+ .flags = IORESOURCE_MEM,
+ },
+ {
+ .start = BCM_PCMCIA_IO_BASE_PA,
+ .end= BCM_PCMCIA_IO_END_PA,
+ .flags = IORESOURCE_MEM,
+ },
+
+ /* PCMCIA irq */
+ {
+ .start = -1, /* filled at runtime */
+ .flags = IORESOURCE_IRQ,
+ },
+
+ /* declare PCMCIA IO resource also */
+ {
+ .start = BCM_PCMCIA_IO_BASE_PA,
+ .end= BCM_PCMCIA_IO_END_PA,
+ .flags = IORESOURCE_IO,
+ },
+};
+
+static struct bcm63xx_pcmcia_platform_data pd;
+
+static struct platform_device bcm63xx_pcmcia_device = {
+ .name = bcm63xx_pcmcia,
+ .id = 0,
+ .num_resources = ARRAY_SIZE(pcmcia_resources),
+ .resource = pcmcia_resources,
+ .dev= {
+ .platform_data = pd,
+ },
+};
+
+static int __init config_pcmcia_cs(unsigned int cs,
+u32 base, unsigned int size)
+{
+ int ret;
+
+ ret = bcm63xx_set_cs_status(cs, 0);
+ if (!ret)
+ ret = bcm63xx_set_cs_base(cs, base, size);
+ if (!ret)
+ ret = bcm63xx_set_cs_status(cs, 1);
+ return ret;
+}
+
+static const __initdata unsigned int pcmcia_cs[3][3] = {
+ /* cs, base address, size */
+ { MPI_CS_PCMCIA_COMMON, BCM_PCMCIA_COMMON_BASE_PA,
+ BCM_PCMCIA_COMMON_SIZE },
+
+ { MPI_CS_PCMCIA_ATTR, BCM_PCMCIA_ATTR_BASE_PA
Re: [PATCH] MIPS: BCM63xx: Add PCMCIA Cardbus support.
Hi, Maxime, On Fri, Sep 18, 2009 at 01:21:31PM +0200, Maxime Bizon wrote: It seems Dominik is busy, and you're the one acking pcmcia patch at the moment so I'm sending this to you. I can't make it for 2.6.32, but will try to get it queued for 2.6.33. What about the second FIXME in the driver BTW? Regards, Wolfram -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: [PATCH -next] pcmcia: fix controller printk warnings
On Thu, Sep 17, 2009 at 02:14:23PM -0700, Randy Dunlap wrote: From: Randy Dunlap randy.dun...@oracle.com Fix new pcmcia printk format warnings: drivers/pcmcia/i82365.c:1055: warning: format '%#x' expects type 'unsigned int', but argument 6 has type 'phys_addr_t' drivers/pcmcia/i82365.c:1055: warning: format '%#x' expects type 'unsigned int', but argument 7 has type 'phys_addr_t' drivers/pcmcia/tcic.c:734: warning: format '%#x' expects type 'unsigned int', but argument 6 has type 'phys_addr_t' drivers/pcmcia/tcic.c:734: warning: format '%#x' expects type 'unsigned int', but argument 7 has type 'phys_addr_t' Signed-off-by: Randy Dunlap randy.dun...@oracle.com Acked-by: Wolfram Sang w.s...@pengutronix.de I spotted another four drivers needing a similar patch (soc_common, m32r_* and m8xx_pcmcia). Do you want to add them, shall I make a patch on top of this one or incorporate all into one patch? --- drivers/pcmcia/i82365.c |4 ++-- drivers/pcmcia/tcic.c |4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) --- linux-next-20090917.orig/drivers/pcmcia/tcic.c +++ linux-next-20090917/drivers/pcmcia/tcic.c @@ -732,8 +732,8 @@ static int tcic_set_io_map(struct pcmcia u_short base, len, ioctl; debug(1, SetIOMap(%d, %d, %#2.2x, %d ns, - %#x-%#x)\n, psock, io-map, io-flags, - io-speed, io-start, io-stop); + %#llx-%#llx)\n, psock, io-map, io-flags, io-speed, + (unsigned long long)io-start, (unsigned long long)io-stop); if ((io-map 1) || (io-start 0x) || (io-stop 0x) || (io-stop io-start)) return -EINVAL; tcic_setw(TCIC_ADDR+2, TCIC_ADR2_INDREG | (psock TCIC_SS_SHFT)); --- linux-next-20090917.orig/drivers/pcmcia/i82365.c +++ linux-next-20090917/drivers/pcmcia/i82365.c @@ -1053,8 +1053,8 @@ static int i365_set_io_map(u_short sock, u_char map, ioctl; debug(1, SetIOMap(%d, %d, %#2.2x, %d ns, - %#x-%#x)\n, sock, io-map, io-flags, - io-speed, io-start, io-stop); + %#llx-%#llx)\n, sock, io-map, io-flags, io-speed, + (unsigned long long)io-start, (unsigned long long)io-stop); map = io-map; if ((map 1) || (io-start 0x) || (io-stop 0x) || (io-stop io-start)) return -EINVAL; -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: How to supply firmware for PCMCIA cards (e.g. TAMAROCK)?
Hi, Now I'm a bit confused since tamarack.cis is neither provided by the kernel nor by pcmciautils. Did I oversee something, or is this a topic that requires attention? I noticed some .cis have been added to firmware/cis/ in the kernel recently, but not this one. Probably due to no hardware for testing. As the cis used to be shipped with pcmcia-cs, I guess it is GPL and thus distributable. You can try preparing a patch like [1], so that the card will get recognized again. But unlike the poster in [1], please cc this list ;) Regards, Wolfram [1] http://article.gmane.org/gmane.linux.network/125924 -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: Pull request for pcmcia-l2
The following changes since commit 4be3bd7849165e7efa6b0b35a23d6a3598d97465: Linus Torvalds (1): Linux 2.6.31-rc4 are available in the git repository at: git://git.pengutronix.de/git/wsa/linux-2.6.git pcmcia-l2 Thanks, all pulled and pushed out to Linus now. Thanks a lot! Regards, Wolfram -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: Pull request for pcmcia-l2
On Thu, Sep 03, 2009 at 10:15:35PM +0200, Wolfram Sang wrote: Hello Dominik and Greg, as discussed earlier, the pull request for my L2-cache branch for pcmcia is for Dominik in first place, so he can push the patches to Linus. In case Dominik does not react until the merge window, Greg said he would take care of the patches then. Greg, as Dominik did not update his tree up to now, could you pull instead? Regards, Wolfram -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: Pull request for pcmcia-l2
Greg, as Dominik did not update his tree up to now, could you pull instead?
{sigh}
Sure, will do, can you resend me the information?
Here it is. (Sorry if all is so troublesome; I'll try to talk to Dominik again
to improve the situation)
The following changes since commit 4be3bd7849165e7efa6b0b35a23d6a3598d97465:
Linus Torvalds (1):
Linux 2.6.31-rc4
are available in the git repository at:
git://git.pengutronix.de/git/wsa/linux-2.6.git pcmcia-l2
Joe Perches (1):
drivers/pcmcia/pcmcia_resource.c: Remove unnecessary semicolons
Philipp Zabel (1):
pcmcia: dtl1_cs: fix pcmcia_loop_config logic
Roel Kluin (1):
drivers/pcmcia: Make static
Steven A. Falco (1):
Use phys_addr_t for physical addresses
Tomas Kovacik (1):
pcmcia: disable prefetch/burst for OZ6933
Wolfram Sang (3):
pcmcia: fix incorrect argument order to list_add_tail()
pcmcia: drop non-existant includes
pcmcia: document return value of pcmcia_loop_config
drivers/bluetooth/dtl1_cs.c |2 +-
drivers/pcmcia/au1000_pb1x00.c |1 -
drivers/pcmcia/au1000_xxs1500.c |1 -
drivers/pcmcia/ds.c |3 +--
drivers/pcmcia/o2micro.h |4
drivers/pcmcia/pcmcia_ioctl.c|2 +-
drivers/pcmcia/pcmcia_resource.c |6 +++---
include/pcmcia/ss.h |4 ++--
8 files changed, 12 insertions(+), 11 deletions(-)
Regards,
Wolfram
--
Pengutronix e.K. | Wolfram Sang|
Industrial Linux Solutions | http://www.pengutronix.de/ |
signature.asc
Description: Digital signature
___
Linux PCMCIA reimplementation list
http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: possible bug in pd6729
Hi John, On Thu, Sep 10, 2009 at 07:50:35PM -0500, John G. Heim wrote: The only real problem is that that error message keeps coming up on the console. I can show you that too. I've done a text screen cap and I'll paste that in below under the output from dmesg. Well, there are more problems. Can you also attach the output from lspci -vvv? BTW which laptop are we talking about? I seem to have missed that. Which BIOS version do you use? Is this the latest one? Here is the output from dmesg: [0.00] Initializing cgroup subsys cpu [0.00] Linux version 2.6.26-1-486 (Debian 2.6.26-13lenny2) Any chance to try a newer kernel? 2.6.31 would be great, but Debian also has 2.6.30 images for lenny (in backports). (da...@debian.org) (gcc version 4.1.3 20080704 (prerelease) (Debian 4.1.2-25)) #1 Fri Mar 13 17:25:45 UTC 2009 Please take care that such logs are not line-wrapped. It makes them hard to read. [0.340810] PCI: Probing PCI hardware [0.348021] PCI: Probing PCI hardware (bus 00) [0.355624] PCI: Cannot allocate resource region 7 of bridge :00:11.0 [0.360143] PCI: Cannot allocate resource region 8 of bridge :00:11.0 [0.368023] PCI: Cannot allocate resource region 0 of device :01:0a.0 [0.372023] system 00:04: iomem range 0x0-0x9ff could not be reserved [0.376047] system 00:04: iomem range 0xe00-0xfff could not be reserved [0.412205] system 00:05: ioport range 0x4d0-0x4d1 has been reserved [0.450273] system 00:05: iomem range 0xfffe-0x could not be reserved [0.495111] system 00:05: iomem range 0xcc000-0xcc7ff has been reserved [0.542842] PCI: Failed to allocate I/O resource #0:4...@0 for :01:0a.0 [0.583049] PCI: Bridge: :00:11.0 [0.605027] IO window: disabled. [0.625433] MEM window: disabled. [0.646356] PREFETCH window: disabled. [0.669912] PCI: Setting latency timer of device :00:11.0 to 64 That does not look good. [ 50.280553] PCI: No IRQ known for interrupt pin A of device :00:13.0. Please try using pci=biosirq. Did you try that? [ 50.288828] pd6729: Cirrus PD6729 PCI to PCMCIA Bridge at 0xfcfc on irq 0 [ 50.293024] pd6729: ISA irqs = 3,5,7,9,10,11 polling status changes. [ 50.676487] PCI: No IRQ known for interrupt pin A of device :01:0a.0. Please try using pci=biosirq. [ 50.688869] pd6729: Cirrus PD6729 PCI to PCMCIA Bridge at 0x0 on irq 0 [ 50.693063] pd6729: ISA irqs = 3,5,7,9,10,11 polling status changes. Ouch! There is really something wrong with the PCI-Setup. Regards, Wolfram -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: possible bug in pd6729
:00:13.0. Please try using pci=3Dbiosirq. Did you try that? I don't know what it means. I tried googling it but all I got was a lot of other log dumps with the same message. I hate to make excuses but I am also blind and its difficult for me to scan long web pages with 100s of lines of log dumps. Ah, okay. Well, it is just a kernel parameter. So you could try adding 'pci=biosirq' to the kernel command line and check if it works better now. While I was trying to give you the diagnostic stuff you asked for, I found a workaround of sorts. I booted with a serial Would you mind sending the 'lspci -vvv' output nevertheless? It might be useful for debugging similar cases. Regards, Wolfram -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: [PATCH] pcmcia: add CNF-CDROM-ID for ide
On Fri, Aug 14, 2009 at 01:09:38PM -0700, David Miller wrote: From: Wolfram Sang w.s...@pengutronix.de Date: Fri, 7 Aug 2009 13:17:50 +0200 Fixes this report: http://article.gmane.org/gmane.linux.kernel.pcmcia.devel/2228/ Reported-by: John McGrath j...@john-mcgrath.com Signed-off-by: Wolfram Sang w.s...@pengutronix.de Applied, thank you. I just noticed that it is not in rc9. Is it possible to get it into .31? Otherwise the ide and pata driver would diverge for this kernel version. Rgeards, Wolfram -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: yenta_socket: PCMCIA-Cards are not recognised by kernel
Uh oh. Which BIOS version do you have? The configuration interface displays: IBET41WW, 05/12/99. I know this isn't the newest version, but I don't have a floppy device for the laptop. I'll try to brun a dos cd with el torito folppy emulation, maybe i can upgrade it this way. Given the various issues this laptop has, this is worthwhile, me thinks. Strange, I'dont use a docking station. I have not even got one. Okay, then it is just a bay. To make sure: Do regular PC Cards (non-CardBus) work with/without the docking station? (I would assume that...) With regular PC Cards you mean 16 bit cards, don't you? I have only those one wlan card, but i can try to organisate one. Yup, I mean those. That would sort out that the TI-Controller is broken. But there is more likely something wrong with the PCI-setup. Regards, Wolfram -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: yenta_socket: PCMCIA-Cards are not recognised by kernel
On Thu, Sep 03, 2009 at 10:16:54PM +0200, Frans Pop wrote: On Thursday 03 September 2009, Wolfram Sang wrote: I read the thread in which you tried. I will have my try, too. This time, I want to convert the existing users first and then throw the interface away. To me, it looks like there is only one prominent user left, Debian's discover. Even though the PCMCIA-information it collects is hardly useful, I converted it: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=382425 Still working on getting any response from the maintainers :) I'm a Debian Developer and one of the developers of Debian's installation system. My suggestion would be to simply ignore discover. It is not used anymore and the fact that it's un(der)maintained does not surprise me. Thanks for this clarification! Hopefully it will help the process. Regards, Wolfram -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: yenta_socket: PCMCIA-Cards are not recognised by kernel
For this laptop at all there are a lot of problems with newer linux kernels. Some people got it working with serveral hacks in the config file of the pcmcia_cs suite, but all those tips only fit with pcmcia_cs and so to the 2.4 kernel. If you're interessted in those sources, i could search the URLs again in my browser history. Yes, maybe those explain the problem; that would definately help ;) Maybe it also relevant what I read on a german bsd-board. In FreeBSD 4.10 it worked perfectly on this laptop, but since 4.11 the slots won't get an interrupt assigned. I don't now very much about hardware and driver development, but I'am sure that it has to do something with the assigned ressources (and maybe with the interrupt). Well, the PCI config space (which lspci needs) should be visible without an assigned IRQ. Regards, Wolfram -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: yenta_socket: PCMCIA-Cards are not recognised by kernel
Original message with lspci and dmesg output for .24 is at: http://lkml.org/lkml/2009/9/2/199 For a start: That line pcmcia: Detected deprecated PCMCIA ioctl usage from process: hwsetup. has not much to do with pcmcia_cs. It is just that hwsetup uses a deprecated interface (new one is sysfs). Is this message still showing up with the newer gentoo-version? I seem to recall that hwsetup got fixed meanwhile, but I may be wrong here. What about these lines? PCI: Probing PCI hardware sysfs: duplicate filename 'bridge' can not be created WARNING: at fs/sysfs/dir.c:424 sysfs_add_one() Pid: 1, comm: swapper Not tainted 2.6.24-gentoo-r7 #1 [c0187ceb] sysfs_add_one+0x54/0xb8 [c01888da] sysfs_create_link+0xaf/0xfd [c02c8020] pci_bus_add_devices+0xba/0xff [c037ac1d] pcibios_scan_root+0x25/0x80 [c011ab3d] printk+0x1b/0x1f [c052822f] pci_legacy_init+0x53/0xe1 [c0505769] kernel_init+0x154/0x2b6 [c0102546] ret_from_fork+0x6/0x20 [c0505615] kernel_init+0x0/0x2b6 [c0505615] kernel_init+0x0/0x2b6 [c0103877] kernel_thread_helper+0x7/0x10 === pci :00:02.0: Error creating sysfs bridge symlink, continuing... sysfs: duplicate filename 'bridge' can not be created WARNING: at fs/sysfs/dir.c:424 sysfs_add_one() Pid: 1, comm: swapper Not tainted 2.6.24-gentoo-r7 #1 [c0187ceb] sysfs_add_one+0x54/0xb8 [c01888da] sysfs_create_link+0xaf/0xfd [c02c8020] pci_bus_add_devices+0xba/0xff [c052822f] pci_legacy_init+0x53/0xe1 [c0505769] kernel_init+0x154/0x2b6 [c0102546] ret_from_fork+0x6/0x20 [c0505615] kernel_init+0x0/0x2b6 [c0505615] kernel_init+0x0/0x2b6 [c0103877] kernel_thread_helper+0x7/0x10 === pci :00:02.1: Error creating sysfs bridge symlink, continuing... Do they still show up with the latest kernel? Is this a known problem with this laptop? So much for a glimpse, maybe I'll have a bit more time tomorrow... Regards, Wolfram -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: yenta_socket: PCMCIA-Cards are not recognised by kernel
the pcmcia ioctl has been listed as removable since 2005: http://lkml.org/lkml/2007/5/1/124 and is still listed that way in Doc/feature-removal-schedule.txt, you can't say i didn't try. I read the thread in which you tried. I will have my try, too. This time, I want to convert the existing users first and then throw the interface away. To me, it looks like there is only one prominent user left, Debian's discover. Even though the PCMCIA-information it collects is hardly useful, I converted it: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=382425 Still working on getting any response from the maintainers :) Regards, Wolfram -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Pull request for pcmcia-l2
Hello Dominik and Greg, as discussed earlier, the pull request for my L2-cache branch for pcmcia is for Dominik in first place, so he can push the patches to Linus. In case Dominik does not react until the merge window, Greg said he would take care of the patches then. The following changes since commit 4be3bd7849165e7efa6b0b35a23d6a3598d97465: Linus Torvalds (1): Linux 2.6.31-rc4 are available in the git repository at: git://git.pengutronix.de/git/wsa/linux-2.6.git pcmcia-l2 Joe Perches (1): drivers/pcmcia/pcmcia_resource.c: Remove unnecessary semicolons Philipp Zabel (1): pcmcia: dtl1_cs: fix pcmcia_loop_config logic Roel Kluin (1): drivers/pcmcia: Make static Steven A. Falco (1): Use phys_addr_t for physical addresses Tomas Kovacik (1): pcmcia: disable prefetch/burst for OZ6933 Wolfram Sang (3): pcmcia: fix incorrect argument order to list_add_tail() pcmcia: drop non-existant includes pcmcia: document return value of pcmcia_loop_config drivers/bluetooth/dtl1_cs.c |2 +- drivers/pcmcia/au1000_pb1x00.c |1 - drivers/pcmcia/au1000_xxs1500.c |1 - drivers/pcmcia/ds.c |3 +-- drivers/pcmcia/o2micro.h |4 drivers/pcmcia/pcmcia_ioctl.c|2 +- drivers/pcmcia/pcmcia_resource.c |6 +++--- include/pcmcia/ss.h |4 ++-- 8 files changed, 12 insertions(+), 11 deletions(-) Regards, Wolfram -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: [PATCH] - Cleanup patch for sa1100_jornada pcmcia driver
;
+ }
+ break;
+
+ default:
+ return -1;
+ }
+
+ if (state-Vpp != state-Vcc state-Vpp != 0) {
+ printk(KERN_ERR %s(): slot cannot support VPP %u\n,
+ __func__, state-Vpp);
The continuing line needs more indent. Also, dev_err?
+ return -1;
+ }
+
+ ret = sa_pcmcia_configure_socket(skt, state);
+ if (ret == 0) {
+ unsigned long flags;
+
+ local_irq_save(flags);
+ sa_set_io(SA_DEV(skt-dev), pa_dwr_mask, pa_dwr_set);
+ local_irq_restore(flags);
The above block needs to be indented one tab more.
+ }
+
+ return ret;
}
static struct pcmcia_low_level jornada720_pcmcia_ops = {
- .owner = THIS_MODULE,
- .hw_init = jornada720_pcmcia_hw_init,
- .hw_shutdown = sa_pcmcia_hw_shutdown,
- .socket_state= sa_pcmcia_socket_state,
- .configure_socket= jornada720_pcmcia_configure_socket,
-
- .socket_init = sa_pcmcia_socket_init,
- .socket_suspend = sa_pcmcia_socket_suspend,
+ .owner = THIS_MODULE,
+ .hw_init= jornada720_pcmcia_hw_init,
+ .hw_shutdown= sa_pcmcia_hw_shutdown,
+ .socket_state = sa_pcmcia_socket_state,
+ .configure_socket = jornada720_pcmcia_configure_socket,
+
+ .socket_init= sa_pcmcia_socket_init,
+ .socket_suspend = sa_pcmcia_socket_suspend,
};
int __devinit pcmcia_jornada720_init(struct device *dev)
Other than that, the code looks _much_ better after your patch.
Regards,
Wolfram
--
Pengutronix e.K. | Wolfram Sang|
Industrial Linux Solutions | http://www.pengutronix.de/ |
___
Linux PCMCIA reimplementation list
http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: hard freezes with hdsp with cardbus/pci adapter card
Hi Tim, hm, actually, i think the issue is related to the pci latency of the cardbus controller. Looks like it: http://lkml.indiana.edu/hypermail/linux/kernel/0404.1/0602.html Do you know if the increased latency is needed for all bridges, not just ENE? (I'd assume so...) Regards, Wolfram -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: hard freezes with hdsp with cardbus/pci adapter card
i have the suspicion, that it is related to the combination of the hdsp with the cardbus controller of the adapter card ... Full bootlog please. -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
[PATCH] pcmcia: add CNF-CDROM-ID for ide
Fixes this report:
http://article.gmane.org/gmane.linux.kernel.pcmcia.devel/2228/
Reported-by: John McGrath j...@john-mcgrath.com
Signed-off-by: Wolfram Sang w.s...@pengutronix.de
---
drivers/ide/ide-cs.c |1 +
1 file changed, 1 insertion(+), 0 deletions(-)
diff --git a/drivers/ide/ide-cs.c b/drivers/ide/ide-cs.c
index 527908f..063b933 100644
--- a/drivers/ide/ide-cs.c
+++ b/drivers/ide/ide-cs.c
@@ -408,6 +408,7 @@ static struct pcmcia_device_id ide_ids[] = {
PCMCIA_DEVICE_PROD_ID123(PCMCIA, IDE CARD, F1, 0x281f1c5d,
0x1907960c, 0xf7fde8b9),
PCMCIA_DEVICE_PROD_ID12(ARGOSY, CD-ROM, 0x78f308dc, 0x66536591),
PCMCIA_DEVICE_PROD_ID12(ARGOSY, PnPIDE, 0x78f308dc, 0x0c694728),
+ PCMCIA_DEVICE_PROD_ID12(CNF , CD-ROM, 0x46d7db81, 0x66536591),
PCMCIA_DEVICE_PROD_ID12(CNF CD-M, CD-ROM, 0x7d93b852, 0x66536591),
PCMCIA_DEVICE_PROD_ID12(Creative Technology Ltd., PCMCIA CD-ROM
Interface Card, 0xff8c8a45, 0xfe8020c4),
PCMCIA_DEVICE_PROD_ID12(Digital Equipment Corporation., Digital
Mobile Media CD-ROM, 0x17692a66, 0xef1dcbde),
--
1.6.3.1
___
Linux PCMCIA reimplementation list
http://lists.infradead.org/mailman/listinfo/linux-pcmcia
pcmciautils: out-of-array-bug
Hi Dominik, this bug report[1] fixes two places which might exceed the fn[]-array. Looking at the git-repos, just one of the two made it upstream. [1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=406251 Regards, Wolfram -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: pcmciautils: out-of-array-bug
thanks for noting this. What about the attached patch, which I intend to merge into pcmciautils at the next opportunity. Well, I personally like the ternary operator from the original patch a bit better, but that's just taste. Main thing is that it should work now :) Acked-by: Wolfram Sang w.s...@pengutronix.de -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
[PATCH] serial/pcmcia: add ID for Advantech card
Add ID as reported in:
http://lists.infradead.org/pipermail/linux-pcmcia/2009-May/006127.html
Reported-by: Kenneth Moorman kmoor...@transy.edu
Signed-off-by: Wolfram Sang w.s...@pengutronix.de
Cc: Greg KH gre...@suse.de
---
As this just adds an ID, it might be nice to have in 2.6.31 already. Greg, could
you pick it up perhaps? Otherwise I'll queue it up in my pcmcia-l2-branch which
Dominik hopefully pulls for 2.6.32.
drivers/serial/serial_cs.c |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c
index 79c9c5f..6ecb51b 100644
--- a/drivers/serial/serial_cs.c
+++ b/drivers/serial/serial_cs.c
@@ -884,6 +884,7 @@ static struct pcmcia_device_id serial_ids[] = {
PCMCIA_DEVICE_CIS_MANF_CARD(0x0192, 0xa555, SW_555_SER.cis), /*
Sierra Aircard 555 CDMA 1xrtt Modem -- pre update */
PCMCIA_DEVICE_CIS_MANF_CARD(0x013f, 0xa555, SW_555_SER.cis), /*
Sierra Aircard 555 CDMA 1xrtt Modem -- post update */
PCMCIA_DEVICE_CIS_PROD_ID12(MultiTech, PCMCIA 56K DataFax,
0x842047ee, 0xc2efcf03, MT5634ZLX.cis),
+ PCMCIA_DEVICE_CIS_PROD_ID12(ADVANTECH, COMpad-32/85B-2, 0x96913a85,
0x27ab5437, COMpad2.cis),
PCMCIA_DEVICE_CIS_PROD_ID12(ADVANTECH, COMpad-32/85B-4, 0x96913a85,
0xcec8f102, COMpad4.cis),
PCMCIA_DEVICE_CIS_PROD_ID123(ADVANTECH, COMpad-32/85, 1.0,
0x96913a85, 0x8fbe92ae, 0x0877b627, COMpad2.cis),
PCMCIA_DEVICE_CIS_PROD_ID2(RS-COM 2P, 0xad20b156, RS-COM-2P.cis),
--
1.6.3.1
___
Linux PCMCIA reimplementation list
http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Status L2-branch
Hello, this is how the l2-cache branch looks now. I picked up every odd fix I could find since Dominik's last pull request (+2 patches going via different trees). If you found something which could be interesting for this branch, please point me to it; otherwise it's pretty final for 2.6.32, I assume. All the best, Wolfram The following changes since commit 658874f05d040ca96eb5ba9b1c30ce0ff287d762: Linus Torvalds (1): Merge branch 'i2c-fixes-rc4' of git://aeryn.fluff.org.uk/bjdooks/linux are available in the git repository at: git://git.pengutronix.de/git/wsa/linux-2.6.git pcmcia-l2 Joe Perches (1): drivers/pcmcia/pcmcia_resource.c: Remove unnecessary semicolons Philipp Zabel (1): pcmcia: dtl1_cs: fix pcmcia_loop_config logic Roel Kluin (1): drivers/pcmcia: Make static Steven A. Falco (1): Use phys_addr_t for physical addresses Tomas Kovacik (1): pcmcia: disable prefetch/burst for OZ6933 Wolfram Sang (3): pcmcia: fix incorrect argument order to list_add_tail() pcmcia: drop non-existant includes pcmcia: document return value of pcmcia_loop_config drivers/bluetooth/dtl1_cs.c |2 +- drivers/pcmcia/au1000_pb1x00.c |1 - drivers/pcmcia/au1000_xxs1500.c |1 - drivers/pcmcia/ds.c |3 +-- drivers/pcmcia/o2micro.h |4 drivers/pcmcia/pcmcia_ioctl.c|2 +- drivers/pcmcia/pcmcia_resource.c |6 +++--- include/pcmcia/ss.h |4 ++-- 8 files changed, 12 insertions(+), 11 deletions(-) -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: Problem with exclusive interrupt in hostap_cs
As Dominik was missing and there was no action on the linux-pcmcia list, I took advantage of the fact that this is a wireless device and submitted the patch to John Linville. It is commit e4a01604b8e5656f3a059f52b3e8f2560740c057 in the wireless-testing tree and was sent to DaveM on July 24 for linux-next. It will be in 2.6.32. Great. IMHO the netdev-tree was the more apropriate one anyhow. It seems it got into linux-next shortly after I checked, so sorry for the noise! Regards, Wolfram -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: Pcmcia: 16 bit card does not work in 2.6.18+ kernel
And how can I make it run? Hmm, drivers/pcmcia/ti113x.h seems to be the place to analyse. I'd think a way to start is to check the codepath taken there and verify it with the datasheet. Regards, Wolfram -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: Problem with exclusive interrupt in hostap_cs
Hi Larry,
Larry Finger wrote:
I took a second look at the code and found that other drivers are using the
routine prism2_interrupt() with shared interrupts, thus the patch below should
be all that is needed.
I trust that you will be able to build the patched driver.
Larry
Index: wireless-testing/drivers/net/wireless/hostap/hostap_cs.c
===
--- wireless-testing.orig/drivers/net/wireless/hostap/hostap_cs.c
+++ wireless-testing/drivers/net/wireless/hostap/hostap_cs.c
@@ -666,7 +666,8 @@ static int prism2_config(struct pcmcia_d
* irq structure is initialized.
*/
if (link-conf.Attributes CONF_ENABLE_IRQ) {
- link-irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;
+ link-irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING |
+ IRQ_HANDLE_PRESENT;
link-irq.IRQInfo1 = IRQ_LEVEL_ID;
link-irq.Handler = prism2_interrupt;
link-irq.Instance = dev;
Do you think this could be queued up by now? Looks okay to me...
Regards,
Wolfram
--
Pengutronix e.K. | Wolfram Sang|
Industrial Linux Solutions | http://www.pengutronix.de/ |
___
Linux PCMCIA reimplementation list
http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Re: L2-cache-branch for pcmcia - interesting?
Hi Dominik, sorry for being so lazy in the past few months. Don't worry. From what I read so far, you did quite a lot in the past, so thanks for that at first place. I assume a break is needed once in a while to regain some energy :) Will try to get back to managing the PCMCIA queue in a few days or weeks Take your time. Next merge window would be nice, though, but that's still a bit ahead... appreciate it if you could keep the L2-cache (great idea!) so that these patches do not get lost. Will do. Next update is tomorrow, then I have collected everything which seems apropriate to me (and pinged some other patches which need to go via other trees). There are still two complete drivers missing, we have to see what to do with those. Anyone up for this task? If you want to assist me in making sure that PCMCIA doesn't become dead code, that'd be great, too... Well, I can continue doing the L2-branch, if that helps already :) Regrads, Wolfram -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
[PATCH] pcmcia: disable prefetch/burst for OZ6933
From: Tomas Kovacik n...@nodomain.sk Problems have been reported, so disable prefetch/burst, to be on the safe side. Cc: Tomas Kovacik n...@nodomain.sk Signed-off-by: Wolfram Sang w.s...@pengutronix.de --- Tomas: I would need your Signed-off-by-line. Can you please post one? drivers/pcmcia/o2micro.h |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/drivers/pcmcia/o2micro.h b/drivers/pcmcia/o2micro.h index 5554015..72188c4 100644 --- a/drivers/pcmcia/o2micro.h +++ b/drivers/pcmcia/o2micro.h @@ -48,6 +48,9 @@ #ifndef PCI_DEVICE_ID_O2_6812 #define PCI_DEVICE_ID_O2_6812 0x6872 #endif +#ifndef PCI_DEVICE_ID_O2_6933 +#define PCI_DEVICE_ID_O2_6933 0x6933 +#endif /* Additional PCI configuration registers */ @@ -154,6 +157,7 @@ static int o2micro_override(struct yenta_socket *socket) case PCI_DEVICE_ID_O2_6812: case PCI_DEVICE_ID_O2_6832: case PCI_DEVICE_ID_O2_6836: + case PCI_DEVICE_ID_O2_6933: dev_printk(KERN_INFO, socket-dev-dev, Yenta O2: old bridge, disabling read prefetch/write burst\n); -- 1.6.3.1 ___ Linux PCMCIA reimplementation list http://lists.infradead.org/mailman/listinfo/linux-pcmcia
[PATCH] pcmcia: fix incorrect argument order to list_add_tail()
Commit a56bc69a182f501582557af7fad5bc882b1c856c fixed a wrong usage of
list_add_tail() within store_new_id() for PCI. Port the fix to PCMCIA,
which adapted this function from PCI.
Signed-off-by: Wolfram Sang w.s...@pengutronix.de
Cc: Dominik Brodowski li...@dominikbrodowski.net
Cc: Greg Kroah-Hartman gre...@suse.de
---
drivers/pcmcia/ds.c |3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 304ff6d..9f300d3 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -236,7 +236,6 @@ pcmcia_store_new_id(struct device_driver *driver, const
char *buf, size_t count)
if (!dynid)
return -ENOMEM;
- INIT_LIST_HEAD(dynid-node);
dynid-id.match_flags = match_flags;
dynid-id.manf_id = manf_id;
dynid-id.card_id = card_id;
@@ -246,7 +245,7 @@ pcmcia_store_new_id(struct device_driver *driver, const
char *buf, size_t count)
memcpy(dynid-id.prod_id_hash, prod_id_hash, sizeof(__u32) * 4);
spin_lock(pdrv-dynids.lock);
- list_add_tail(pdrv-dynids.list, dynid-node);
+ list_add_tail(dynid-node, pdrv-dynids.list);
spin_unlock(pdrv-dynids.lock);
if (get_driver(pdrv-drv)) {
--
1.6.3.3
___
Linux PCMCIA reimplementation list
http://lists.infradead.org/mailman/listinfo/linux-pcmcia
