[PATCH] pcnet_cs: add new id

netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed

* [PATCH] pcnet_cs: add new id
@ 2016-02-11 11:15 Ken Kawasaki
  2016-02-16 21:06 ` David Miller
  0 siblings, 1 reply; 7+ messages in thread
From: Ken Kawasaki @ 2016-02-11 11:15 UTC (permalink / raw)
  To: netdev


add new id (CONTEC C-NET(PC)C-100TX2)

Signed-off-by: Ken Kawasaki <ken_kawasaki@.nifty.com>

---

--- linux-4.4.1/drivers/net/ethernet/8390/pcnet_cs.c.orig	2016-02-11 19:26:02.281108472 +0900
+++ linux-4.4.1/drivers/net/ethernet/8390/pcnet_cs.c	2016-02-11 19:27:21.353595301 +0900
@@ -1501,6 +1501,7 @@ static const struct pcmcia_device_id pcn
 	PCMCIA_DEVICE_MANF_CARD(0x026f, 0x030a),
 	PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1103),
 	PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1121),
+	PCMCIA_DEVICE_MANF_CARD(0xc001, 0x0009),
 	PCMCIA_DEVICE_PROD_ID12("2408LAN", "Ethernet", 0x352fff7f, 0x00b2e941),
 	PCMCIA_DEVICE_PROD_ID1234("Socket", "CF 10/100 Ethernet Card", "Revision B", "05/11/06", 0xb38bcc2e, 0x4de88352, 0xeaca6c8d, 0x7e57c22e),
 	PCMCIA_DEVICE_PROD_ID123("Cardwell", "PCMCIA", "ETHERNET", 0x9533672e, 0x281f1c5d, 0x3ff7175b),

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] pcnet_cs: add new id
  2016-02-11 11:15 [PATCH] pcnet_cs: add new id Ken Kawasaki
@ 2016-02-16 21:06 ` David Miller
  0 siblings, 0 replies; 7+ messages in thread
From: David Miller @ 2016-02-16 21:06 UTC (permalink / raw)
  To: ken_kawasaki; +Cc: netdev

From: Ken Kawasaki <ken_kawasaki@nifty.com>
Date: Thu, 11 Feb 2016 20:15:21 +0900

> add new id (CONTEC C-NET(PC)C-100TX2)
> 
> Signed-off-by: Ken Kawasaki <ken_kawasaki@.nifty.com>

Applied, thanks.

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH] pcnet_cs: add new id
@ 2016-02-11 11:27 Ken Kawasaki
  0 siblings, 0 replies; 7+ messages in thread
From: Ken Kawasaki @ 2016-02-11 11:27 UTC (permalink / raw)
  To: netdev


add new id (CONTEC C-NET(PC)C-100TX2)

Signed-off-by: Ken Kawasaki <ken_kawasaki@nifty.com>

---

--- linux-4.4.1/drivers/net/ethernet/8390/pcnet_cs.c.orig	2016-02-11 19:26:02.281108472 +0900
+++ linux-4.4.1/drivers/net/ethernet/8390/pcnet_cs.c	2016-02-11 19:27:21.353595301 +0900
@@ -1501,6 +1501,7 @@ static const struct pcmcia_device_id pcn
 	PCMCIA_DEVICE_MANF_CARD(0x026f, 0x030a),
 	PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1103),
 	PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1121),
+	PCMCIA_DEVICE_MANF_CARD(0xc001, 0x0009),
 	PCMCIA_DEVICE_PROD_ID12("2408LAN", "Ethernet", 0x352fff7f, 0x00b2e941),
 	PCMCIA_DEVICE_PROD_ID1234("Socket", "CF 10/100 Ethernet Card", "Revision B", "05/11/06", 0xb38bcc2e, 0x4de88352, 0xeaca6c8d, 0x7e57c22e),
 	PCMCIA_DEVICE_PROD_ID123("Cardwell", "PCMCIA", "ETHERNET", 0x9533672e, 0x281f1c5d, 0x3ff7175b),

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH]  axnet_cs: fix phy_id detection for bogus Asix chip.
@ 2009-04-05  0:49 Ken Kawasaki
  2009-06-28  0:09 ` [PATCH] pcnet_cs: add new id (RIOS System PC CARD3 ETHERNET) Ken Kawasaki
  2009-07-05  0:17 ` Ken Kawasaki
  0 siblings, 2 replies; 7+ messages in thread
From: Ken Kawasaki @ 2009-04-05  0:49 UTC (permalink / raw)
  To: netdev



axnet_cs:

(1) Some Asix phy return bogus value except 0 or 0xffff.
    Skip this phy_id.

(2) Some Asix chip need to set "select Internal PHY" bit
    at AX88190_init.

Signed-off-by: Ken Kawasaki <ken_kawasaki@spring.nifty.jp>

---

--- linux-2.6.29-git1/drivers/net/pcmcia/axnet_cs.c.orig	2009-03-29 11:55:26.000000000 +0900
+++ linux-2.6.29-git1/drivers/net/pcmcia/axnet_cs.c	2009-03-29 12:01:40.000000000 +0900
@@ -339,7 +339,7 @@ static int axnet_config(struct pcmcia_de
 {
     struct net_device *dev = link->priv;
     axnet_dev_t *info = PRIV(dev);
-    int i, j, last_ret, last_fn;
+    int i, j, j2, last_ret, last_fn;
 
     DEBUG(0, "axnet_config(0x%p)\n", link);
 
@@ -388,6 +388,8 @@ static int axnet_config(struct pcmcia_de
 
     for (i = 0; i < 32; i++) {
 	j = mdio_read(dev->base_addr + AXNET_MII_EEP, i, 1);
+	j2 = mdio_read(dev->base_addr + AXNET_MII_EEP, i, 2);
+	if (j == j2) continue;
 	if ((j != 0) && (j != 0xffff)) break;
     }
 
@@ -398,6 +400,8 @@ static int axnet_config(struct pcmcia_de
  	pcmcia_access_configuration_register(link, &reg);
 	for (i = 0; i < 32; i++) {
 	    j = mdio_read(dev->base_addr + AXNET_MII_EEP, i, 1);
+	    j2 = mdio_read(dev->base_addr + AXNET_MII_EEP, i, 2);
+	    if (j == j2) continue;
 	    if ((j != 0) && (j != 0xffff)) break;
 	}
     }
@@ -1767,6 +1771,9 @@ static void AX88190_init(struct net_devi
 	ei_local->tx1 = ei_local->tx2 = 0;
 	ei_local->txing = 0;
 
+	if (info->flags & IS_AX88790)	/* select Internal PHY */
+		outb(0x10, e8390_base + AXNET_GPIO);
+
 	if (startp) 
 	{
 		outb_p(0xff,  e8390_base + EN0_ISR);



^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH] pcnet_cs: add new id (RIOS System PC CARD3 ETHERNET)
  2009-04-05  0:49 [PATCH] axnet_cs: fix phy_id detection for bogus Asix chip Ken Kawasaki
@ 2009-06-28  0:09 ` Ken Kawasaki
  2009-06-30 14:19   ` [PATCH] pcnet_cs: add new id David Miller
  2009-07-05  0:17 ` Ken Kawasaki
  1 sibling, 1 reply; 7+ messages in thread
From: Ken Kawasaki @ 2009-06-28  0:09 UTC (permalink / raw)
  To: netdev


pcnet_cs:

(1) add new id (RIOS System PC CARD3 ETHERNET).

(2) add odd location support for write_asic function.

(3) change default setting of use_shmem to 0.
    because shared memory does not work on some PC.

Signed-off-by: Ken Kawasaki <ken_kawasaki@spring.nifty.jp>

---

--- linux-2.6.31-rc1/drivers/net/pcmcia/pcnet_cs.c.orig	2009-06-27 10:15:47.000000000 +0900
+++ linux-2.6.31-rc1/drivers/net/pcmcia/pcnet_cs.c	2009-06-27 10:40:34.000000000 +0900
@@ -95,7 +95,7 @@ INT_MODULE_PARM(use_big_buf,	1);	/* use 
 INT_MODULE_PARM(mem_speed,	0);	/* shared mem speed, in ns */
 INT_MODULE_PARM(delay_output,	0);	/* pause after xmit? */
 INT_MODULE_PARM(delay_time,	4);	/* in usec */
-INT_MODULE_PARM(use_shmem,	-1);	/* use shared memory? */
+INT_MODULE_PARM(use_shmem,	0);	/* use shared memory? */
 INT_MODULE_PARM(full_duplex,	0);	/* full duplex? */
 
 /* Ugh!  Let the user hardwire the hardware address for queer cards */
@@ -886,9 +886,10 @@ static void write_asic(unsigned int ioad
 		outb_p(EE_ASIC|EE_CS|EE_DI|dataval, ee_addr);
 	}
 	// sync
-	outb(EE_ASIC|EE_CS, ee_addr);
-	outb(EE_ASIC|EE_CS|EE_CK, ee_addr);
-	outb(EE_ASIC|EE_CS, ee_addr);
+	dataval = (location & 1) ? EE_DO : 0;
+	outb(EE_ASIC|EE_CS|dataval, ee_addr);
+	outb(EE_ASIC|EE_CS|dataval|EE_CK, ee_addr);
+	outb(EE_ASIC|EE_CS|dataval, ee_addr);
 
 	for (i = 15; i >= 0; i--) {
 		dataval = (asic_data & (1 << i)) ? EE_ADOT : 0;
@@ -1727,6 +1728,7 @@ static struct pcmcia_device_id pcnet_ids
 	PCMCIA_DEVICE_PROD_ID12("PRETEC", "Ethernet CompactLAN 10BaseT 3.3V", 0xebf91155, 0x7f5a4f50),
 	PCMCIA_DEVICE_PROD_ID12("Psion Dacom", "Gold Card Ethernet", 0xf5f025c2, 0x3a30e110),
 	PCMCIA_DEVICE_PROD_ID12("=RELIA==", "Ethernet", 0xcdd0644a, 0x00b2e941),
+	PCMCIA_DEVICE_PROD_ID12("RIOS Systems Co.", "PC CARD3 ETHERNET", 0x7dd33481, 0x10b41826),
 	PCMCIA_DEVICE_PROD_ID12("RP", "1625B Ethernet NE2000 Compatible", 0xe3e66e22, 0xb96150df),
 	PCMCIA_DEVICE_PROD_ID12("RPTI", "EP400 Ethernet NE2000 Compatible", 0xdc6f88fd, 0x4a7e2ae0),
 	PCMCIA_DEVICE_PROD_ID12("RPTI", "EP401 Ethernet NE2000 Compatible", 0xdc6f88fd, 0x4bcbd7fd),

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] pcnet_cs: add new id
  2009-06-28  0:09 ` [PATCH] pcnet_cs: add new id (RIOS System PC CARD3 ETHERNET) Ken Kawasaki
@ 2009-06-30 14:19   ` David Miller
  2009-07-05  8:34     ` Ken Kawasaki
  0 siblings, 1 reply; 7+ messages in thread
From: David Miller @ 2009-06-30 14:19 UTC (permalink / raw)
  To: ken_kawasaki; +Cc: netdev

From: Ken Kawasaki <ken_kawasaki@spring.nifty.jp>
Date: Sun, 28 Jun 2009 09:09:39 +0900

> 
> pcnet_cs:
> 
> (1) add new id (RIOS System PC CARD3 ETHERNET).
> 
> (2) add odd location support for write_asic function.
> 
> (3) change default setting of use_shmem to 0.
>     because shared memory does not work on some PC.
> 
> Signed-off-by: Ken Kawasaki <ken_kawasaki@spring.nifty.jp>

These are three seperate changes, could you split this up
into three seperate patches?

Thank you.

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] pcnet_cs: add new id
  2009-06-30 14:19   ` [PATCH] pcnet_cs: add new id David Miller
@ 2009-07-05  8:34     ` Ken Kawasaki
  0 siblings, 0 replies; 7+ messages in thread
From: Ken Kawasaki @ 2009-07-05  8:34 UTC (permalink / raw)
  To: David Miller; +Cc: netdev

On Tue, 30 Jun 2009 07:19:55 -0700 (PDT)
David Miller <davem@davemloft.net> wrote:

> > (3) change default setting of use_shmem to 0.
> >     because shared memory does not work on some PC.

Sorry, I cancel the use_shmem patch. (for re-test).


Ken.

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH] pcnet_cs: add new id
  2009-04-05  0:49 [PATCH] axnet_cs: fix phy_id detection for bogus Asix chip Ken Kawasaki
  2009-06-28  0:09 ` [PATCH] pcnet_cs: add new id (RIOS System PC CARD3 ETHERNET) Ken Kawasaki
@ 2009-07-05  0:17 ` Ken Kawasaki
  2009-07-06  2:02   ` David Miller
  1 sibling, 1 reply; 7+ messages in thread
From: Ken Kawasaki @ 2009-07-05  0:17 UTC (permalink / raw)
  To: netdev


add new id (RIOS System PC CARD3 ETHERNET).

Signed-off-by: Ken Kawasaki <ken_kawasaki@spring.nifty.jp>

---

--- linux-2.6.31-rc1/drivers/net/pcmcia/pcnet_cs.c.orig	2009-06-27 10:15:47.000000000 +0900
+++ linux-2.6.31-rc1/drivers/net/pcmcia/pcnet_cs.c	2009-07-04 14:19:21.000000000 +0900
@@ -1727,6 +1727,7 @@ static struct pcmcia_device_id pcnet_ids
 	PCMCIA_DEVICE_PROD_ID12("PRETEC", "Ethernet CompactLAN 10BaseT 3.3V", 0xebf91155, 0x7f5a4f50),
 	PCMCIA_DEVICE_PROD_ID12("Psion Dacom", "Gold Card Ethernet", 0xf5f025c2, 0x3a30e110),
 	PCMCIA_DEVICE_PROD_ID12("=RELIA==", "Ethernet", 0xcdd0644a, 0x00b2e941),
+	PCMCIA_DEVICE_PROD_ID12("RIOS Systems Co.", "PC CARD3 ETHERNET", 0x7dd33481, 0x10b41826),
 	PCMCIA_DEVICE_PROD_ID12("RP", "1625B Ethernet NE2000 Compatible", 0xe3e66e22, 0xb96150df),
 	PCMCIA_DEVICE_PROD_ID12("RPTI", "EP400 Ethernet NE2000 Compatible", 0xdc6f88fd, 0x4a7e2ae0),
 	PCMCIA_DEVICE_PROD_ID12("RPTI", "EP401 Ethernet NE2000 Compatible", 0xdc6f88fd, 0x4bcbd7fd),

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] pcnet_cs: add new id
  2009-07-05  0:17 ` Ken Kawasaki
@ 2009-07-06  2:02   ` David Miller
  0 siblings, 0 replies; 7+ messages in thread
From: David Miller @ 2009-07-06  2:02 UTC (permalink / raw)
  To: ken_kawasaki; +Cc: netdev

From: Ken Kawasaki <ken_kawasaki@spring.nifty.jp>
Date: Sun, 5 Jul 2009 09:17:10 +0900

> 
> add new id (RIOS System PC CARD3 ETHERNET).
> 
> Signed-off-by: Ken Kawasaki <ken_kawasaki@spring.nifty.jp>

Applied.

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2016-02-16 21:06 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-11 11:15 [PATCH] pcnet_cs: add new id Ken Kawasaki
2016-02-16 21:06 ` David Miller
  -- strict thread matches above, loose matches on Subject: below --
2016-02-11 11:27 Ken Kawasaki
2009-04-05  0:49 [PATCH] axnet_cs: fix phy_id detection for bogus Asix chip Ken Kawasaki
2009-06-28  0:09 ` [PATCH] pcnet_cs: add new id (RIOS System PC CARD3 ETHERNET) Ken Kawasaki
2009-06-30 14:19   ` [PATCH] pcnet_cs: add new id David Miller
2009-07-05  8:34     ` Ken Kawasaki
2009-07-05  0:17 ` Ken Kawasaki
2009-07-06  2:02   ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).