[PATCH 1/8] pcmcia: Add an id to ide-cs.c

[PATCH 1/8] pcmcia: Add an id to ide-cs.c

[Dominik Brodowski]

From: Matt Reimer <mattjreimer@gmail.com>
Date: Thu, 26 Oct 2006 15:56:00 -0700
Subject: [PATCH] pcmcia: Add an id to ide-cs.c

Add an ID entry for:

product info: "TRANSCEND", "TS1GCF80", "", ""
manfid: 0x000a, 0x0000
function: 4 (fixed disk)

Signed-off-by: Matt Reimer <mreimer@vpop.net>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
---
 drivers/ata/pata_pcmcia.c   |    1 +
 drivers/ide/legacy/ide-cs.c |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c
index e93ea27..e587e73 100644
--- a/drivers/ata/pata_pcmcia.c
+++ b/drivers/ata/pata_pcmcia.c
@@ -356,6 +356,7 @@ static struct pcmcia_device_id pcmcia_de
 	PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6),
 	PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003),
 	PCMCIA_DEVICE_PROD_ID1("TRANSCEND    512M   ", 0xd0909443),
+	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS1GCF80", 0x709b1bf1, 0x2a54d4b1),
 	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF120", 0x709b1bf1, 0xf54a91c8),
 	PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852),
 	PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209),
diff --git a/drivers/ide/legacy/ide-cs.c b/drivers/ide/legacy/ide-cs.c
index bef4759..8b04ed4 100644
--- a/drivers/ide/legacy/ide-cs.c
+++ b/drivers/ide/legacy/ide-cs.c
@@ -408,6 +408,7 @@ static struct pcmcia_device_id ide_ids[]
 	PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6),
 	PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003),
 	PCMCIA_DEVICE_PROD_ID1("TRANSCEND    512M   ", 0xd0909443),
+	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS1GCF80", 0x709b1bf1, 0x2a54d4b1),
 	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF120", 0x709b1bf1, 0xf54a91c8),
 	PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852),
 	PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209),
-- 
1.4.4

[PATCH 2/8] pcmcia: yet another IDE ID

[Dominik Brodowski]

From: Marcin Juszkiewicz <openembedded@hrw.one.pl>
Date: Mon, 30 Oct 2006 22:28:09 +0100
Subject: [PATCH] pcmcia: yet another IDE ID

Microdrive reported by one of OpenEmbedded developers.

product info: "WEIDA", "TWTTI", ""
manfid: 0x000a, 0x0000
function: 4 (fixed disk)

(equivalent update to pata_pcmcia.c by Dominik Brodowski)

Signed-off-by: Marcin Juszkiewicz <openembedded@hrw.one.pl>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
---
 drivers/ata/pata_pcmcia.c   |    1 +
 drivers/ide/legacy/ide-cs.c |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c
index e587e73..03f77f3 100644
--- a/drivers/ata/pata_pcmcia.c
+++ b/drivers/ata/pata_pcmcia.c
@@ -359,6 +359,7 @@ static struct pcmcia_device_id pcmcia_de
 	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS1GCF80", 0x709b1bf1, 0x2a54d4b1),
 	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF120", 0x709b1bf1, 0xf54a91c8),
 	PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852),
+	PCMCIA_DEVICE_PROD_ID12("WEIDA", "TWTTI", 0xcc7cf69c, 0x212bb918),
 	PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209),
 	PCMCIA_DEVICE_PROD_ID12("STI", "Flash 5.0", 0xbf2df18d, 0x8cb57a0e),
 	PCMCIA_MFC_DEVICE_PROD_ID12(1, "SanDisk", "ConnectPlus", 0x7a954bd9, 0x74be00c6),
diff --git a/drivers/ide/legacy/ide-cs.c b/drivers/ide/legacy/ide-cs.c
index 8b04ed4..7e8d778 100644
--- a/drivers/ide/legacy/ide-cs.c
+++ b/drivers/ide/legacy/ide-cs.c
@@ -411,6 +411,7 @@ static struct pcmcia_device_id ide_ids[]
 	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS1GCF80", 0x709b1bf1, 0x2a54d4b1),
 	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF120", 0x709b1bf1, 0xf54a91c8),
 	PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852),
+	PCMCIA_DEVICE_PROD_ID12("WEIDA", "TWTTI", 0xcc7cf69c, 0x212bb918),
 	PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209),
 	PCMCIA_DEVICE_PROD_ID12("STI", "Flash 5.0", 0xbf2df18d, 0x8cb57a0e),
 	PCMCIA_MFC_DEVICE_PROD_ID12(1, "SanDisk", "ConnectPlus", 0x7a954bd9, 0x74be00c6),
-- 
1.4.4

Re: [PATCH 2/8] pcmcia: yet another IDE ID

[Alan]

On Sun, 19 Nov 2006 11:39:23 -0500
Dominik Brodowski <linux@dominikbrodowski.net> wrote:


Acked-by: Alan Cox <alan@redhat.com>

to both

Re: [PATCH 1/8] pcmcia: Add an id to ide-cs.c

[Russell King]

On Sun, Nov 19, 2006 at 11:38:51AM -0500, Dominik Brodowski wrote:
> 
> From: Matt Reimer <mattjreimer@gmail.com>
> Date: Thu, 26 Oct 2006 15:56:00 -0700
> Subject: [PATCH] pcmcia: Add an id to ide-cs.c
> 
> Add an ID entry for:
> 
> product info: "TRANSCEND", "TS1GCF80", "", ""
> manfid: 0x000a, 0x0000
> function: 4 (fixed disk)

Erm, silly question: isn't this supposed to be matched by the following:

static struct pcmcia_device_id ide_ids[] = {
        PCMCIA_DEVICE_FUNC_ID(4),

or are we going to be ignoring the function ID and only matching using
the manfid and product info strings?

-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:  2.6 Serial core

Re: [PATCH 1/8] pcmcia: Add an id to ide-cs.c

[Dominik Brodowski]

Hi,

On Mon, Nov 20, 2006 at 09:53:49AM +0000, Russell King wrote:
> On Sun, Nov 19, 2006 at 11:38:51AM -0500, Dominik Brodowski wrote:
> > 
> > From: Matt Reimer <mattjreimer@gmail.com>
> > Date: Thu, 26 Oct 2006 15:56:00 -0700
> > Subject: [PATCH] pcmcia: Add an id to ide-cs.c
> > 
> > Add an ID entry for:
> > 
> > product info: "TRANSCEND", "TS1GCF80", "", ""
> > manfid: 0x000a, 0x0000
> > function: 4 (fixed disk)
> 
> Erm, silly question: isn't this supposed to be matched by the following:
> 
> static struct pcmcia_device_id ide_ids[] = {
>         PCMCIA_DEVICE_FUNC_ID(4),
> 
> or are we going to be ignoring the function ID and only matching using
> the manfid and product info strings?

As the matching by func_id is fuzzy and gives false positives, this is a
multiple-step process:

a) the kernel checks all built-in and previously loaded modules for
   prod_id and manf_id matches

b) userspace (udev/hotplug + modprobe) loads appropriate modules (including
   those which are only matched by func_id

c) during the module initialization (e.g. modprobe hasn't returned yet) the
   kernel checks the modules based on prod_id and manf_id matches

d) after all these modprobe calls return, userspace writes "1" into
   /sys/$devpath/allow_func_id_match. Then, the kernel re-checks all
   built-in and previously loaded modules for func_id "fuzzy" matches.

It is self-evident that steps b)-d) only work once userspace is ready. As
PCMCIA drivers should be able to work even before that, manf_id and prod_id
table entries do make sense even if func_id matching works.

Thanks,
	Dominik

Re: [PATCH 1/8] pcmcia: Add an id to ide-cs.c

[Russell King]

On Mon, Nov 20, 2006 at 12:43:33PM -0500, Dominik Brodowski wrote:
> As the matching by func_id is fuzzy and gives false positives, this is a
> multiple-step process:
> 
> a) the kernel checks all built-in and previously loaded modules for
>    prod_id and manf_id matches
> 
> b) userspace (udev/hotplug + modprobe) loads appropriate modules (including
>    those which are only matched by func_id
> 
> c) during the module initialization (e.g. modprobe hasn't returned yet) the
>    kernel checks the modules based on prod_id and manf_id matches
> 
> d) after all these modprobe calls return, userspace writes "1" into
>    /sys/$devpath/allow_func_id_match. Then, the kernel re-checks all
>    built-in and previously loaded modules for func_id "fuzzy" matches.
> 
> It is self-evident that steps b)-d) only work once userspace is ready. As
> PCMCIA drivers should be able to work even before that, manf_id and prod_id
> table entries do make sense even if func_id matching works.

However, it doesn't scale.  You're going to be forever adding entry
after entry after entry to drivers.  It's a never-ending job.

Of course, it's really up to you whether you want this task. 8)

-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:  2.6 Serial core