ThinkWiki - User contributions [en]

Category talk:760ED

2006-10-16T11:35:03Z

Fpga:

From the web messages cardbus does not work as no IRQ can be mapped. This is a physical problem because the wires for INTx is not connected. Linux will report IRQ 0 and tell you to use biosirq but it does not help. Only non-cardbus devices work. It is nice if someone can tell us how to fix it?

The Cardbus of the 760ED is working fine if you patch the kernel to route IRQ to a isa interupt.

760ed yenta patch

2006-09-17T13:50:23Z

Fpga:

This is a kernel patch for a IBM Thinkpad [[:Category:760ED|760ED]] notebook.

The pci irq pin of the ti1130 pcmcia bridge is not connected.
To use the cardbus, the kernel has to route the cardbus irq to an isa irq.
This patch detects an valid irq and route cardbus interupts to isa instead
of pci. (If a valid pci irq is detected it should use it and not the isa irq.)

<code><pre><nowiki>
diff -u linux-2.6.15.1/drivers/pcmcia/i82365.h linux-2.6.15.1-jck/drivers/pcmcia/i82365.h
--- linux-2.6.15.1/drivers/pcmcia/i82365.h 2006-01-15 07:16:02.000000000 +0100
+++ linux-2.6.15.1-jck/drivers/pcmcia/i82365.h 2006-02-18 17:34:35.000000000 +0100
@@ -88,13 +88,14 @@
#define I365_IRQ_MASK 0x0F

/* Flags for I365_CSC and I365_CSCINT*/
-#define I365_CSC_BVD1 0x01
-#define I365_CSC_STSCHG 0x01
-#define I365_CSC_BVD2 0x02
-#define I365_CSC_READY 0x04
-#define I365_CSC_DETECT 0x08
-#define I365_CSC_ANY 0x0F
-#define I365_CSC_GPI 0x10
+#define I365_CSC_BVD1 0x01
+#define I365_CSC_STSCHG 0x01
+#define I365_CSC_BVD2 0x02
+#define I365_CSC_READY 0x04
+#define I365_CSC_DETECT 0x08
+#define I365_CSC_ANY 0x0F
+#define I365_CSC_GPI 0x10
+#define I365_CSC_IRQ_MASK 0xF0

/* Flags for I365_ADDRWIN */
#define I365_ENA_IO(map) (0x40 << (map))
diff -u linux-2.6.15.1/drivers/pcmcia/ti113x.h linux-2.6.15.1-jck/drivers/pcmcia/ti113x.h
--- linux-2.6.15.1/drivers/pcmcia/ti113x.h 2006-01-15 07:16:02.000000000 +0100
+++ linux-2.6.15.1-jck/drivers/pcmcia/ti113x.h 2006-03-15 10:13:32.000000000 +0100
@@ -304,6 +304,18 @@
return 0;
}

+static int ti113x_init(struct yenta_socket *socket)
+{
+ u8 new, reg = exca_readb(socket, I365_INTCTL);
+
+ new = reg & ~I365_INTR_ENA;
+ if ( socket->dev->irq ) /* PCI IRQ */
+ new |= I365_INTR_ENA;
+ if (new != reg)
+ exca_writeb(socket, I365_INTCTL, new);
+ return 0;
+}
+
static int ti_override(struct yenta_socket *socket)
{
u8 new, reg = exca_readb(socket, I365_INTCTL);
@@ -317,14 +329,42 @@
return 0;
}

+static void ti113x_use_isa_irq(struct yenta_socket *socket)
+{
+ int isa_irq;
+ u8 intctl;
+ u32 isa_irq_mask;
+
+ /* get a free isa int */
+ isa_irq_mask = 0;
+ if (isa_probe)
+ isa_irq_mask = yenta_probe_irq(socket, 0x0ef8); /* 0x0ef8 => only common isa irqs */
+ if ( !(isa_irq_mask & 0xFFFF) ) return; /* no useable isa irq found */
+ for(isa_irq = -1 ; isa_irq_mask ; isa_irq++ ) /* choose highest available */
+ isa_irq_mask >>= 1;
+
+ exca_writeb(socket, I365_CSCINT, (isa_irq << 4) ); /* CSC */
+
+ socket->cb_irq = isa_irq;
+
+ intctl = exca_readb(socket, I365_INTCTL);
+ intctl &= ~(I365_INTR_ENA | I365_IRQ_MASK); /* CSC Enable */
+ exca_writeb(socket, I365_INTCTL, intctl );
+
+ printk(KERN_INFO "Yenta TI113x: using isa irq %d\n", isa_irq);
+}
+
static int ti113x_override(struct yenta_socket *socket)
{
u8 cardctl;

cardctl = config_readb(socket, TI113X_CARD_CONTROL);
cardctl &= ~(TI113X_CCR_PCI_IRQ_ENA | TI113X_CCR_PCI_IREQ | TI113X_CCR_PCI_CSC);
- if (socket->cb_irq)
+ if (socket->dev->irq)
cardctl |= TI113X_CCR_PCI_IRQ_ENA | TI113X_CCR_PCI_CSC | TI113X_CCR_PCI_IREQ;
+ else
+ ti113x_use_isa_irq(socket);
+
config_writeb(socket, TI113X_CARD_CONTROL, cardctl);

return ti_override(socket);
diff -u linux-2.6.15.1/drivers/pcmcia/yenta_socket.c linux-2.6.15.1-jck/drivers/pcmcia/yenta_socket.c
--- linux-2.6.15.1/drivers/pcmcia/yenta_socket.c 2006-01-15 07:16:02.000000000 +0100
+++ linux-2.6.15.1-jck/drivers/pcmcia/yenta_socket.c 2006-03-12 01:05:34.000000000 +0100
@@ -50,7 +50,7 @@
#define to_ns(cycles) ((cycles)*120)

static int yenta_probe_cb_irq(struct yenta_socket *socket);
-
+static unsigned int yenta_probe_irq(struct yenta_socket *socket, u32 isa_irq_mask);

static unsigned int override_bios;
module_param(override_bios, uint, 0000);
@@ -379,9 +379,12 @@

/* ISA interrupt control? */
intr = exca_readb(socket, I365_INTCTL);
- intr = (intr & ~0xf);
- if (!socket->cb_irq) {
- intr |= state->io_irq;
+ intr &= ~(I365_IRQ_MASK);
+ if (!socket->dev->irq) { /* is there a valid pci irq ? */
+ if(socket->cb_irq)
+ intr |= socket->cb_irq;
+ else
+ intr |= socket->io_irq;
bridge |= CB_BRIDGE_INTR;
}
exca_writeb(socket, I365_INTCTL, intr);
@@ -391,7 +394,7 @@
reg = exca_readb(socket, I365_INTCTL) & (I365_RING_ENA | I365_INTR_ENA);
reg |= (state->flags & SS_RESET) ? 0 : I365_PC_RESET;
reg |= (state->flags & SS_IOCARD) ? I365_PC_IOCARD : 0;
- if (state->io_irq != socket->cb_irq) {
+ if (state->io_irq) {
reg |= state->io_irq;
bridge |= CB_BRIDGE_INTR;
}
@@ -404,8 +407,10 @@
if (exca_readb(socket, I365_POWER) != reg)
exca_writeb(socket, I365_POWER, reg);

- /* CSC interrupt: no ISA irq for CSC */
- reg = I365_CSC_DETECT;
+ reg = exca_readb(socket, I365_CSCINT); /*keep isa IRQs for CSC*/
+ reg &= I365_CSC_IRQ_MASK;
+ reg |= I365_CSC_DETECT;
+
if (state->flags & SS_IOCARD) {
if (state->csc_mask & SS_STSCHG) reg |= I365_CSC_STSCHG;
} else {
@@ -868,7 +873,7 @@
.override = ti113x_override,
.save_state = ti_save_state,
.restore_state = ti_restore_state,
- .sock_init = ti_init,
+ .sock_init = ti113x_init,
},
[CARDBUS_TYPE_TI12XX] = {
.override = ti12xx_override,
@@ -922,6 +927,7 @@
int i;
unsigned long val;
u32 mask;
+ u8 reg;

/*
* Probe for usable interrupts using the force
@@ -929,6 +935,7 @@
*/
cb_writel(socket, CB_SOCKET_EVENT, -1);
cb_writel(socket, CB_SOCKET_MASK, CB_CSTSMASK);
+ reg = exca_readb(socket, I365_CSCINT); /* save */
exca_writeb(socket, I365_CSCINT, 0);
val = probe_irq_on() & isa_irq_mask;
for (i = 1; i < 16; i++) {
@@ -940,7 +947,7 @@
cb_writel(socket, CB_SOCKET_EVENT, -1);
}
cb_writel(socket, CB_SOCKET_MASK, 0);
- exca_writeb(socket, I365_CSCINT, 0);
+ exca_writeb(socket, I365_CSCINT, reg); /* restore */

mask = probe_irq_mask(val) & 0xffff;

@@ -971,6 +978,8 @@
/* probes the PCI interrupt, use only on override functions */
static int yenta_probe_cb_irq(struct yenta_socket *socket)
{
+ u8 reg;
+
if (!socket->cb_irq)
return -1;

@@ -982,7 +991,9 @@
}

/* generate interrupt, wait */
- exca_writeb(socket, I365_CSCINT, I365_CSC_STSCHG);
+ reg = exca_readb(socket, I365_CSCINT); /* save */
+ exca_writeb(socket, I365_CSCINT, reg | I365_CSC_STSCHG);
+
cb_writel(socket, CB_SOCKET_EVENT, -1);
cb_writel(socket, CB_SOCKET_MASK, CB_CSTSMASK);
cb_writel(socket, CB_SOCKET_FORCE, CB_FCARDSTS);
@@ -991,7 +1002,7 @@

/* disable interrupts */
cb_writel(socket, CB_SOCKET_MASK, 0);
- exca_writeb(socket, I365_CSCINT, 0);
+ exca_writeb(socket, I365_CSCINT, reg); /* restore */
cb_writel(socket, CB_SOCKET_EVENT, -1);
exca_readb(socket, I365_CSC);

</nowiki></pre></code>

{{HELP|
It is untested if these changes are not breaking other ti pcmcia bridges.
( Maybe someone can test this patch on other hardware.
And please review the changes, especially those in yenta_socket.c )
}}

[[Category:760ED]]

Installation instructions for the ThinkPad 760

2006-09-17T13:36:59Z

Fpga:

Specific installation notes for the ThinkPad {{760C}}, {{760CD}}, {{760E}}, {{760ED}}, {{760EL}}, {{760ELD}}, {{760L}}, {{760LD}}, {{760XD}} and {{760XL}}.

==General Notes==
One of the main pitfalls to installing Linux on this ThinkPad line is the lack of bootable CD-ROM support. Though it is possible to install using a set of startup floppies, being sure to get one for PCMCIA support and another for network drivers, it tends to be more of a headache than it is worth. Using a utility like sbootmgr (available from the Slackware server [ftp://ftp.slackware.com/pub/slackware/slackware-current/isolinux/sbootmgr here], the [http://btmgr.webframe.org/ homepage] of the software is curiously out-of-date) makes this headache virtually disappear. Simply write the image to a floppy drive, and boot up. Highlight the hard disk in the Main Boot menu screen that appears. Then hit Tab to enter the Main Menu, head down to System Settings, press Enter, select Install Smart BootManager, and answer Y. Turn your computer off, swap the CD-ROM into it, insert the Linux distro of your choice, and boot up. Smart BootManager will start up, and you'll need to head back into the System Settings menu and Rescan All Partitions to add the new bootable CD-ROM to sbootmgr's list. After you've done this, your CD-ROM will be in the menu, which you can then boot from, by highlighting it, heading back into the menu, and selecting "Boot It."

Granted, a CD-ROM was an option on some of the models in this line, so if you don't have one, you'll either have to get one from eBay (about $20) or fall back on using a network install.

==Distro specific Instructions==

==External Sources==
===ThinkPad 760E===
*[http://www.geocities.com/SiliconValley/9111/ibmtp760/index.html Slackware 4.0 on a ThinkPad 760E]

===ThinkPad 760ED===
*[http://www.qsl.net/n0nb/linux/tp760ed.html Nate Bargmann's Debian on a ThinkPad 760ED page]
*[http://web.archive.org/web/20040604223902/http://www.eecs.lehigh.edu/~tboult/linux/thinkpad760ed.html Red Hat 4.2 on a ThinkPad 760ED/760XD]
*[[760ed yenta patch]] for Kernel 2.6.15.1 to use the cardbus with interrupts
===ThinkPad 760EL===
*[http://www.geocities.com/SiliconValley/9111/ibmtp760/thinkpad.html Harald Milz's Linux on a ThinkPad 760EL page]
*[http://patter.mine.nu/thinkpad.html Debian on a ThinkPad 760EL]
*[http://personal.riverusers.com/~thegrendel/laptop.html Mandrake 6.1 on a ThinkPad 760EL]
*[http://www.btinternet.com/~zeltanet/zeltanet/thinkpad760el_linux.htm Mandrake 7.0 on a ThinkPad 760EL]
*[http://www.geocities.com/dueze/thinkpad760el.html Slackware 7.1 on a ThinkPad 760EL]
*[http://stephe_2.tripod.com/thinkpad/ Stephe's Red Hat 7.0 on a ThinkPad 760EL page]

===ThinkPad 760XL===
*[http://www.grnet.com/sc/linux/tp760xl/ Mike Mol's Debian Woody on a ThinkPad 760XL page]
*[http://www.monkeynoodle.org/comp/hardware/760xl.html Red Hat 5.2 on a ThinkPad 760XL]

760ed yenta patch

2006-09-17T13:11:55Z

Fpga:

This is a kernel patch for a IBM Thinkpad 760ED notebook.

The pci irq pin of the ti1130 pcmcia bridge is not connected.
To use the cardbus, the irq has to be routed to an isa irq.
This patch detects an valid irq and route cardbus interupts to isa instead
of pci. (If a valid pci irq is detected it should use it and not the isa irq.)

<code><pre><nowiki>
diff -u linux-2.6.15.1/drivers/pcmcia/i82365.h linux-2.6.15.1-jck/drivers/pcmcia/i82365.h
--- linux-2.6.15.1/drivers/pcmcia/i82365.h 2006-01-15 07:16:02.000000000 +0100
+++ linux-2.6.15.1-jck/drivers/pcmcia/i82365.h 2006-02-18 17:34:35.000000000 +0100
@@ -88,13 +88,14 @@
#define I365_IRQ_MASK 0x0F

/* Flags for I365_CSC and I365_CSCINT*/
-#define I365_CSC_BVD1 0x01
-#define I365_CSC_STSCHG 0x01
-#define I365_CSC_BVD2 0x02
-#define I365_CSC_READY 0x04
-#define I365_CSC_DETECT 0x08
-#define I365_CSC_ANY 0x0F
-#define I365_CSC_GPI 0x10
+#define I365_CSC_BVD1 0x01
+#define I365_CSC_STSCHG 0x01
+#define I365_CSC_BVD2 0x02
+#define I365_CSC_READY 0x04
+#define I365_CSC_DETECT 0x08
+#define I365_CSC_ANY 0x0F
+#define I365_CSC_GPI 0x10
+#define I365_CSC_IRQ_MASK 0xF0

/* Flags for I365_ADDRWIN */
#define I365_ENA_IO(map) (0x40 << (map))
diff -u linux-2.6.15.1/drivers/pcmcia/ti113x.h linux-2.6.15.1-jck/drivers/pcmcia/ti113x.h
--- linux-2.6.15.1/drivers/pcmcia/ti113x.h 2006-01-15 07:16:02.000000000 +0100
+++ linux-2.6.15.1-jck/drivers/pcmcia/ti113x.h 2006-03-15 10:13:32.000000000 +0100
@@ -304,6 +304,18 @@
return 0;
}

+static int ti113x_init(struct yenta_socket *socket)
+{
+ u8 new, reg = exca_readb(socket, I365_INTCTL);
+
+ new = reg & ~I365_INTR_ENA;
+ if ( socket->dev->irq ) /* PCI IRQ */
+ new |= I365_INTR_ENA;
+ if (new != reg)
+ exca_writeb(socket, I365_INTCTL, new);
+ return 0;
+}
+
static int ti_override(struct yenta_socket *socket)
{
u8 new, reg = exca_readb(socket, I365_INTCTL);
@@ -317,14 +329,42 @@
return 0;
}

+static void ti113x_use_isa_irq(struct yenta_socket *socket)
+{
+ int isa_irq;
+ u8 intctl;
+ u32 isa_irq_mask;
+
+ /* get a free isa int */
+ isa_irq_mask = 0;
+ if (isa_probe)
+ isa_irq_mask = yenta_probe_irq(socket, 0x0ef8); /* 0x0ef8 => only common isa irqs */
+ if ( !(isa_irq_mask & 0xFFFF) ) return; /* no useable isa irq found */
+ for(isa_irq = -1 ; isa_irq_mask ; isa_irq++ ) /* choose highest available */
+ isa_irq_mask >>= 1;
+
+ exca_writeb(socket, I365_CSCINT, (isa_irq << 4) ); /* CSC */
+
+ socket->cb_irq = isa_irq;
+
+ intctl = exca_readb(socket, I365_INTCTL);
+ intctl &= ~(I365_INTR_ENA | I365_IRQ_MASK); /* CSC Enable */
+ exca_writeb(socket, I365_INTCTL, intctl );
+
+ printk(KERN_INFO "Yenta TI113x: using isa irq %d\n", isa_irq);
+}
+
static int ti113x_override(struct yenta_socket *socket)
{
u8 cardctl;

cardctl = config_readb(socket, TI113X_CARD_CONTROL);
cardctl &= ~(TI113X_CCR_PCI_IRQ_ENA | TI113X_CCR_PCI_IREQ | TI113X_CCR_PCI_CSC);
- if (socket->cb_irq)
+ if (socket->dev->irq)
cardctl |= TI113X_CCR_PCI_IRQ_ENA | TI113X_CCR_PCI_CSC | TI113X_CCR_PCI_IREQ;
+ else
+ ti113x_use_isa_irq(socket);
+
config_writeb(socket, TI113X_CARD_CONTROL, cardctl);

return ti_override(socket);
diff -u linux-2.6.15.1/drivers/pcmcia/yenta_socket.c linux-2.6.15.1-jck/drivers/pcmcia/yenta_socket.c
--- linux-2.6.15.1/drivers/pcmcia/yenta_socket.c 2006-01-15 07:16:02.000000000 +0100
+++ linux-2.6.15.1-jck/drivers/pcmcia/yenta_socket.c 2006-03-12 01:05:34.000000000 +0100
@@ -50,7 +50,7 @@
#define to_ns(cycles) ((cycles)*120)

static int yenta_probe_cb_irq(struct yenta_socket *socket);
-
+static unsigned int yenta_probe_irq(struct yenta_socket *socket, u32 isa_irq_mask);

static unsigned int override_bios;
module_param(override_bios, uint, 0000);
@@ -379,9 +379,12 @@

/* ISA interrupt control? */
intr = exca_readb(socket, I365_INTCTL);
- intr = (intr & ~0xf);
- if (!socket->cb_irq) {
- intr |= state->io_irq;
+ intr &= ~(I365_IRQ_MASK);
+ if (!socket->dev->irq) { /* is there a valid pci irq ? */
+ if(socket->cb_irq)
+ intr |= socket->cb_irq;
+ else
+ intr |= socket->io_irq;
bridge |= CB_BRIDGE_INTR;
}
exca_writeb(socket, I365_INTCTL, intr);
@@ -391,7 +394,7 @@
reg = exca_readb(socket, I365_INTCTL) & (I365_RING_ENA | I365_INTR_ENA);
reg |= (state->flags & SS_RESET) ? 0 : I365_PC_RESET;
reg |= (state->flags & SS_IOCARD) ? I365_PC_IOCARD : 0;
- if (state->io_irq != socket->cb_irq) {
+ if (state->io_irq) {
reg |= state->io_irq;
bridge |= CB_BRIDGE_INTR;
}
@@ -404,8 +407,10 @@
if (exca_readb(socket, I365_POWER) != reg)
exca_writeb(socket, I365_POWER, reg);

- /* CSC interrupt: no ISA irq for CSC */
- reg = I365_CSC_DETECT;
+ reg = exca_readb(socket, I365_CSCINT); /*keep isa IRQs for CSC*/
+ reg &= I365_CSC_IRQ_MASK;
+ reg |= I365_CSC_DETECT;
+
if (state->flags & SS_IOCARD) {
if (state->csc_mask & SS_STSCHG) reg |= I365_CSC_STSCHG;
} else {
@@ -868,7 +873,7 @@
.override = ti113x_override,
.save_state = ti_save_state,
.restore_state = ti_restore_state,
- .sock_init = ti_init,
+ .sock_init = ti113x_init,
},
[CARDBUS_TYPE_TI12XX] = {
.override = ti12xx_override,
@@ -922,6 +927,7 @@
int i;
unsigned long val;
u32 mask;
+ u8 reg;

/*
* Probe for usable interrupts using the force
@@ -929,6 +935,7 @@
*/
cb_writel(socket, CB_SOCKET_EVENT, -1);
cb_writel(socket, CB_SOCKET_MASK, CB_CSTSMASK);
+ reg = exca_readb(socket, I365_CSCINT); /* save */
exca_writeb(socket, I365_CSCINT, 0);
val = probe_irq_on() & isa_irq_mask;
for (i = 1; i < 16; i++) {
@@ -940,7 +947,7 @@
cb_writel(socket, CB_SOCKET_EVENT, -1);
}
cb_writel(socket, CB_SOCKET_MASK, 0);
- exca_writeb(socket, I365_CSCINT, 0);
+ exca_writeb(socket, I365_CSCINT, reg); /* restore */

mask = probe_irq_mask(val) & 0xffff;

@@ -971,6 +978,8 @@
/* probes the PCI interrupt, use only on override functions */
static int yenta_probe_cb_irq(struct yenta_socket *socket)
{
+ u8 reg;
+
if (!socket->cb_irq)
return -1;

@@ -982,7 +991,9 @@
}

/* generate interrupt, wait */
- exca_writeb(socket, I365_CSCINT, I365_CSC_STSCHG);
+ reg = exca_readb(socket, I365_CSCINT); /* save */
+ exca_writeb(socket, I365_CSCINT, reg | I365_CSC_STSCHG);
+
cb_writel(socket, CB_SOCKET_EVENT, -1);
cb_writel(socket, CB_SOCKET_MASK, CB_CSTSMASK);
cb_writel(socket, CB_SOCKET_FORCE, CB_FCARDSTS);
@@ -991,7 +1002,7 @@

/* disable interrupts */
cb_writel(socket, CB_SOCKET_MASK, 0);
- exca_writeb(socket, I365_CSCINT, 0);
+ exca_writeb(socket, I365_CSCINT, reg); /* restore */
cb_writel(socket, CB_SOCKET_EVENT, -1);
exca_readb(socket, I365_CSC);

</nowiki></pre></code>

{{HELP|
It is untested if these changes are not breaking other ti pcmcia bridges.
( Maybe someone can test this patch on other hardware.
And please review the changes, especially those in yenta_socket.c )
}}

760ed yenta patch

2006-09-17T13:01:57Z

Fpga:

This is a kernel patch for a IBM Thinkpad 760ED notebook.

The pci irq pin of the ti1130 pcmcia bridge is not connected.
To use the cardbus, the irq has to be routed to an isa irq.
This patch detects an valid irq and route cardbus interupts to isa instead
of pci. (If a valid pci irq is detected it should use it and not the isa irq.)

<code><nowiki>
diff -u linux-2.6.15.1/drivers/pcmcia/i82365.h linux-2.6.15.1-jck/drivers/pcmcia/i82365.h
--- linux-2.6.15.1/drivers/pcmcia/i82365.h 2006-01-15 07:16:02.000000000 +0100
+++ linux-2.6.15.1-jck/drivers/pcmcia/i82365.h 2006-02-18 17:34:35.000000000 +0100
@@ -88,13 +88,14 @@
#define I365_IRQ_MASK 0x0F

/* Flags for I365_CSC and I365_CSCINT*/
-#define I365_CSC_BVD1 0x01
-#define I365_CSC_STSCHG 0x01
-#define I365_CSC_BVD2 0x02
-#define I365_CSC_READY 0x04
-#define I365_CSC_DETECT 0x08
-#define I365_CSC_ANY 0x0F
-#define I365_CSC_GPI 0x10
+#define I365_CSC_BVD1 0x01
+#define I365_CSC_STSCHG 0x01
+#define I365_CSC_BVD2 0x02
+#define I365_CSC_READY 0x04
+#define I365_CSC_DETECT 0x08
+#define I365_CSC_ANY 0x0F
+#define I365_CSC_GPI 0x10
+#define I365_CSC_IRQ_MASK 0xF0

/* Flags for I365_ADDRWIN */
#define I365_ENA_IO(map) (0x40 << (map))
diff -u linux-2.6.15.1/drivers/pcmcia/ti113x.h linux-2.6.15.1-jck/drivers/pcmcia/ti113x.h
--- linux-2.6.15.1/drivers/pcmcia/ti113x.h 2006-01-15 07:16:02.000000000 +0100
+++ linux-2.6.15.1-jck/drivers/pcmcia/ti113x.h 2006-03-15 10:13:32.000000000 +0100
@@ -304,6 +304,18 @@
return 0;
}

+static int ti113x_init(struct yenta_socket *socket)
+{
+ u8 new, reg = exca_readb(socket, I365_INTCTL);
+
+ new = reg & ~I365_INTR_ENA;
+ if ( socket->dev->irq ) /* PCI IRQ */
+ new |= I365_INTR_ENA;
+ if (new != reg)
+ exca_writeb(socket, I365_INTCTL, new);
+ return 0;
+}
+
static int ti_override(struct yenta_socket *socket)
{
u8 new, reg = exca_readb(socket, I365_INTCTL);
@@ -317,14 +329,42 @@
return 0;
}

+static void ti113x_use_isa_irq(struct yenta_socket *socket)
+{
+ int isa_irq;
+ u8 intctl;
+ u32 isa_irq_mask;
+
+ /* get a free isa int */
+ isa_irq_mask = 0;
+ if (isa_probe)
+ isa_irq_mask = yenta_probe_irq(socket, 0x0ef8); /* 0x0ef8 => only common isa irqs */
+ if ( !(isa_irq_mask & 0xFFFF) ) return; /* no useable isa irq found */
+ for(isa_irq = -1 ; isa_irq_mask ; isa_irq++ ) /* choose highest available */
+ isa_irq_mask >>= 1;
+
+ exca_writeb(socket, I365_CSCINT, (isa_irq << 4) ); /* CSC */
+
+ socket->cb_irq = isa_irq;
+
+ intctl = exca_readb(socket, I365_INTCTL);
+ intctl &= ~(I365_INTR_ENA | I365_IRQ_MASK); /* CSC Enable */
+ exca_writeb(socket, I365_INTCTL, intctl );
+
+ printk(KERN_INFO "Yenta TI113x: using isa irq %d\n", isa_irq);
+}
+
static int ti113x_override(struct yenta_socket *socket)
{
u8 cardctl;

cardctl = config_readb(socket, TI113X_CARD_CONTROL);
cardctl &= ~(TI113X_CCR_PCI_IRQ_ENA | TI113X_CCR_PCI_IREQ | TI113X_CCR_PCI_CSC);
- if (socket->cb_irq)
+ if (socket->dev->irq)
cardctl |= TI113X_CCR_PCI_IRQ_ENA | TI113X_CCR_PCI_CSC | TI113X_CCR_PCI_IREQ;
+ else
+ ti113x_use_isa_irq(socket);
+
config_writeb(socket, TI113X_CARD_CONTROL, cardctl);

return ti_override(socket);
diff -u linux-2.6.15.1/drivers/pcmcia/yenta_socket.c linux-2.6.15.1-jck/drivers/pcmcia/yenta_socket.c
--- linux-2.6.15.1/drivers/pcmcia/yenta_socket.c 2006-01-15 07:16:02.000000000 +0100
+++ linux-2.6.15.1-jck/drivers/pcmcia/yenta_socket.c 2006-03-12 01:05:34.000000000 +0100
@@ -50,7 +50,7 @@
#define to_ns(cycles) ((cycles)*120)

static int yenta_probe_cb_irq(struct yenta_socket *socket);
-
+static unsigned int yenta_probe_irq(struct yenta_socket *socket, u32 isa_irq_mask);

static unsigned int override_bios;
module_param(override_bios, uint, 0000);
@@ -379,9 +379,12 @@

/* ISA interrupt control? */
intr = exca_readb(socket, I365_INTCTL);
- intr = (intr & ~0xf);
- if (!socket->cb_irq) {
- intr |= state->io_irq;
+ intr &= ~(I365_IRQ_MASK);
+ if (!socket->dev->irq) { /* is there a valid pci irq ? */
+ if(socket->cb_irq)
+ intr |= socket->cb_irq;
+ else
+ intr |= socket->io_irq;
bridge |= CB_BRIDGE_INTR;
}
exca_writeb(socket, I365_INTCTL, intr);
@@ -391,7 +394,7 @@
reg = exca_readb(socket, I365_INTCTL) & (I365_RING_ENA | I365_INTR_ENA);
reg |= (state->flags & SS_RESET) ? 0 : I365_PC_RESET;
reg |= (state->flags & SS_IOCARD) ? I365_PC_IOCARD : 0;
- if (state->io_irq != socket->cb_irq) {
+ if (state->io_irq) {
reg |= state->io_irq;
bridge |= CB_BRIDGE_INTR;
}
@@ -404,8 +407,10 @@
if (exca_readb(socket, I365_POWER) != reg)
exca_writeb(socket, I365_POWER, reg);

- /* CSC interrupt: no ISA irq for CSC */
- reg = I365_CSC_DETECT;
+ reg = exca_readb(socket, I365_CSCINT); /*keep isa IRQs for CSC*/
+ reg &= I365_CSC_IRQ_MASK;
+ reg |= I365_CSC_DETECT;
+
if (state->flags & SS_IOCARD) {
if (state->csc_mask & SS_STSCHG) reg |= I365_CSC_STSCHG;
} else {
@@ -868,7 +873,7 @@
.override = ti113x_override,
.save_state = ti_save_state,
.restore_state = ti_restore_state,
- .sock_init = ti_init,
+ .sock_init = ti113x_init,
},
[CARDBUS_TYPE_TI12XX] = {
.override = ti12xx_override,
@@ -922,6 +927,7 @@
int i;
unsigned long val;
u32 mask;
+ u8 reg;

/*
* Probe for usable interrupts using the force
@@ -929,6 +935,7 @@
*/
cb_writel(socket, CB_SOCKET_EVENT, -1);
cb_writel(socket, CB_SOCKET_MASK, CB_CSTSMASK);
+ reg = exca_readb(socket, I365_CSCINT); /* save */
exca_writeb(socket, I365_CSCINT, 0);
val = probe_irq_on() & isa_irq_mask;
for (i = 1; i < 16; i++) {
@@ -940,7 +947,7 @@
cb_writel(socket, CB_SOCKET_EVENT, -1);
}
cb_writel(socket, CB_SOCKET_MASK, 0);
- exca_writeb(socket, I365_CSCINT, 0);
+ exca_writeb(socket, I365_CSCINT, reg); /* restore */

mask = probe_irq_mask(val) & 0xffff;

@@ -971,6 +978,8 @@
/* probes the PCI interrupt, use only on override functions */
static int yenta_probe_cb_irq(struct yenta_socket *socket)
{
+ u8 reg;
+
if (!socket->cb_irq)
return -1;

@@ -982,7 +991,9 @@
}

/* generate interrupt, wait */
- exca_writeb(socket, I365_CSCINT, I365_CSC_STSCHG);
+ reg = exca_readb(socket, I365_CSCINT); /* save */
+ exca_writeb(socket, I365_CSCINT, reg | I365_CSC_STSCHG);
+
cb_writel(socket, CB_SOCKET_EVENT, -1);
cb_writel(socket, CB_SOCKET_MASK, CB_CSTSMASK);
cb_writel(socket, CB_SOCKET_FORCE, CB_FCARDSTS);
@@ -991,7 +1002,7 @@

/* disable interrupts */
cb_writel(socket, CB_SOCKET_MASK, 0);
- exca_writeb(socket, I365_CSCINT, 0);
+ exca_writeb(socket, I365_CSCINT, reg); /* restore */
cb_writel(socket, CB_SOCKET_EVENT, -1);
exca_readb(socket, I365_CSC);

</nowiki></code>

It is untested if these changes are not breaking other ti pcmcia bridges.
( Maybe someone can test this patch on other hardware.
And please review the changes, especially those in yenta_socket.c )

760ed yenta patch

2006-09-17T12:59:59Z

Fpga:

This is a kernel patch for a IBM Thinkpad 760ED notebook.

The pci irq pin of the ti1130 pcmcia bridge is not connected.
To use the cardbus, the irq has to be routed to an isa irq.
This patch detects an valid irq and route cardbus interupts to isa instead
of pci. (If a valid pci irq is detected it should use it and not the isa irq.)

<code>
diff -u linux-2.6.15.1/drivers/pcmcia/i82365.h linux-2.6.15.1-jck/drivers/pcmcia/i82365.h
--- linux-2.6.15.1/drivers/pcmcia/i82365.h 2006-01-15 07:16:02.000000000 +0100
+++ linux-2.6.15.1-jck/drivers/pcmcia/i82365.h 2006-02-18 17:34:35.000000000 +0100
@@ -88,13 +88,14 @@
#define I365_IRQ_MASK 0x0F

/* Flags for I365_CSC and I365_CSCINT*/
-#define I365_CSC_BVD1 0x01
-#define I365_CSC_STSCHG 0x01
-#define I365_CSC_BVD2 0x02
-#define I365_CSC_READY 0x04
-#define I365_CSC_DETECT 0x08
-#define I365_CSC_ANY 0x0F
-#define I365_CSC_GPI 0x10
+#define I365_CSC_BVD1 0x01
+#define I365_CSC_STSCHG 0x01
+#define I365_CSC_BVD2 0x02
+#define I365_CSC_READY 0x04
+#define I365_CSC_DETECT 0x08
+#define I365_CSC_ANY 0x0F
+#define I365_CSC_GPI 0x10
+#define I365_CSC_IRQ_MASK 0xF0

/* Flags for I365_ADDRWIN */
#define I365_ENA_IO(map) (0x40 << (map))
diff -u linux-2.6.15.1/drivers/pcmcia/ti113x.h linux-2.6.15.1-jck/drivers/pcmcia/ti113x.h
--- linux-2.6.15.1/drivers/pcmcia/ti113x.h 2006-01-15 07:16:02.000000000 +0100
+++ linux-2.6.15.1-jck/drivers/pcmcia/ti113x.h 2006-03-15 10:13:32.000000000 +0100
@@ -304,6 +304,18 @@
return 0;
}

+static int ti113x_init(struct yenta_socket *socket)
+{
+ u8 new, reg = exca_readb(socket, I365_INTCTL);
+
+ new = reg & ~I365_INTR_ENA;
+ if ( socket->dev->irq ) /* PCI IRQ */
+ new |= I365_INTR_ENA;
+ if (new != reg)
+ exca_writeb(socket, I365_INTCTL, new);
+ return 0;
+}
+
static int ti_override(struct yenta_socket *socket)
{
u8 new, reg = exca_readb(socket, I365_INTCTL);
@@ -317,14 +329,42 @@
return 0;
}

+static void ti113x_use_isa_irq(struct yenta_socket *socket)
+{
+ int isa_irq;
+ u8 intctl;
+ u32 isa_irq_mask;
+
+ /* get a free isa int */
+ isa_irq_mask = 0;
+ if (isa_probe)
+ isa_irq_mask = yenta_probe_irq(socket, 0x0ef8); /* 0x0ef8 => only common isa irqs */
+ if ( !(isa_irq_mask & 0xFFFF) ) return; /* no useable isa irq found */
+ for(isa_irq = -1 ; isa_irq_mask ; isa_irq++ ) /* choose highest available */
+ isa_irq_mask >>= 1;
+
+ exca_writeb(socket, I365_CSCINT, (isa_irq << 4) ); /* CSC */
+
+ socket->cb_irq = isa_irq;
+
+ intctl = exca_readb(socket, I365_INTCTL);
+ intctl &= ~(I365_INTR_ENA | I365_IRQ_MASK); /* CSC Enable */
+ exca_writeb(socket, I365_INTCTL, intctl );
+
+ printk(KERN_INFO "Yenta TI113x: using isa irq %d\n", isa_irq);
+}
+
static int ti113x_override(struct yenta_socket *socket)
{
u8 cardctl;

cardctl = config_readb(socket, TI113X_CARD_CONTROL);
cardctl &= ~(TI113X_CCR_PCI_IRQ_ENA | TI113X_CCR_PCI_IREQ | TI113X_CCR_PCI_CSC);
- if (socket->cb_irq)
+ if (socket->dev->irq)
cardctl |= TI113X_CCR_PCI_IRQ_ENA | TI113X_CCR_PCI_CSC | TI113X_CCR_PCI_IREQ;
+ else
+ ti113x_use_isa_irq(socket);
+
config_writeb(socket, TI113X_CARD_CONTROL, cardctl);

return ti_override(socket);
diff -u linux-2.6.15.1/drivers/pcmcia/yenta_socket.c linux-2.6.15.1-jck/drivers/pcmcia/yenta_socket.c
--- linux-2.6.15.1/drivers/pcmcia/yenta_socket.c 2006-01-15 07:16:02.000000000 +0100
+++ linux-2.6.15.1-jck/drivers/pcmcia/yenta_socket.c 2006-03-12 01:05:34.000000000 +0100
@@ -50,7 +50,7 @@
#define to_ns(cycles) ((cycles)*120)

static int yenta_probe_cb_irq(struct yenta_socket *socket);
-
+static unsigned int yenta_probe_irq(struct yenta_socket *socket, u32 isa_irq_mask);

static unsigned int override_bios;
module_param(override_bios, uint, 0000);
@@ -379,9 +379,12 @@

/* ISA interrupt control? */
intr = exca_readb(socket, I365_INTCTL);
- intr = (intr & ~0xf);
- if (!socket->cb_irq) {
- intr |= state->io_irq;
+ intr &= ~(I365_IRQ_MASK);
+ if (!socket->dev->irq) { /* is there a valid pci irq ? */
+ if(socket->cb_irq)
+ intr |= socket->cb_irq;
+ else
+ intr |= socket->io_irq;
bridge |= CB_BRIDGE_INTR;
}
exca_writeb(socket, I365_INTCTL, intr);
@@ -391,7 +394,7 @@
reg = exca_readb(socket, I365_INTCTL) & (I365_RING_ENA | I365_INTR_ENA);
reg |= (state->flags & SS_RESET) ? 0 : I365_PC_RESET;
reg |= (state->flags & SS_IOCARD) ? I365_PC_IOCARD : 0;
- if (state->io_irq != socket->cb_irq) {
+ if (state->io_irq) {
reg |= state->io_irq;
bridge |= CB_BRIDGE_INTR;
}
@@ -404,8 +407,10 @@
if (exca_readb(socket, I365_POWER) != reg)
exca_writeb(socket, I365_POWER, reg);

- /* CSC interrupt: no ISA irq for CSC */
- reg = I365_CSC_DETECT;
+ reg = exca_readb(socket, I365_CSCINT); /*keep isa IRQs for CSC*/
+ reg &= I365_CSC_IRQ_MASK;
+ reg |= I365_CSC_DETECT;
+
if (state->flags & SS_IOCARD) {
if (state->csc_mask & SS_STSCHG) reg |= I365_CSC_STSCHG;
} else {
@@ -868,7 +873,7 @@
.override = ti113x_override,
.save_state = ti_save_state,
.restore_state = ti_restore_state,
- .sock_init = ti_init,
+ .sock_init = ti113x_init,
},
[CARDBUS_TYPE_TI12XX] = {
.override = ti12xx_override,
@@ -922,6 +927,7 @@
int i;
unsigned long val;
u32 mask;
+ u8 reg;

/*
* Probe for usable interrupts using the force
@@ -929,6 +935,7 @@
*/
cb_writel(socket, CB_SOCKET_EVENT, -1);
cb_writel(socket, CB_SOCKET_MASK, CB_CSTSMASK);
+ reg = exca_readb(socket, I365_CSCINT); /* save */
exca_writeb(socket, I365_CSCINT, 0);
val = probe_irq_on() & isa_irq_mask;
for (i = 1; i < 16; i++) {
@@ -940,7 +947,7 @@
cb_writel(socket, CB_SOCKET_EVENT, -1);
}
cb_writel(socket, CB_SOCKET_MASK, 0);
- exca_writeb(socket, I365_CSCINT, 0);
+ exca_writeb(socket, I365_CSCINT, reg); /* restore */

mask = probe_irq_mask(val) & 0xffff;

@@ -971,6 +978,8 @@
/* probes the PCI interrupt, use only on override functions */
static int yenta_probe_cb_irq(struct yenta_socket *socket)
{
+ u8 reg;
+
if (!socket->cb_irq)
return -1;

@@ -982,7 +991,9 @@
}

/* generate interrupt, wait */
- exca_writeb(socket, I365_CSCINT, I365_CSC_STSCHG);
+ reg = exca_readb(socket, I365_CSCINT); /* save */
+ exca_writeb(socket, I365_CSCINT, reg | I365_CSC_STSCHG);
+
cb_writel(socket, CB_SOCKET_EVENT, -1);
cb_writel(socket, CB_SOCKET_MASK, CB_CSTSMASK);
cb_writel(socket, CB_SOCKET_FORCE, CB_FCARDSTS);
@@ -991,7 +1002,7 @@

/* disable interrupts */
cb_writel(socket, CB_SOCKET_MASK, 0);
- exca_writeb(socket, I365_CSCINT, 0);
+ exca_writeb(socket, I365_CSCINT, reg); /* restore */
cb_writel(socket, CB_SOCKET_EVENT, -1);
exca_readb(socket, I365_CSC);

</code>

It is untested if these changes are not breaking other ti pcmcia bridges.
( Maybe someone can test this patch on other hardware.
And please review the changes, especially those in yenta_socket.c )

760ed yenta patch

2006-09-17T12:59:38Z

Fpga:

This is a kernel patch for a IBM Thinkpad 760ED notebook.

The pci irq pin of the ti1130 pcmcia bridge is not connected.
To use the cardbus, the irq has to be routed to an isa irq.
This patch detects an valid irq and route cardbus interupts to isa instead
of pci. (If a valid pci irq is detected it should use it and not the isa irq.)

<nowiki>
diff -u linux-2.6.15.1/drivers/pcmcia/i82365.h linux-2.6.15.1-jck/drivers/pcmcia/i82365.h
--- linux-2.6.15.1/drivers/pcmcia/i82365.h 2006-01-15 07:16:02.000000000 +0100
+++ linux-2.6.15.1-jck/drivers/pcmcia/i82365.h 2006-02-18 17:34:35.000000000 +0100
@@ -88,13 +88,14 @@
#define I365_IRQ_MASK 0x0F

/* Flags for I365_CSC and I365_CSCINT*/
-#define I365_CSC_BVD1 0x01
-#define I365_CSC_STSCHG 0x01
-#define I365_CSC_BVD2 0x02
-#define I365_CSC_READY 0x04
-#define I365_CSC_DETECT 0x08
-#define I365_CSC_ANY 0x0F
-#define I365_CSC_GPI 0x10
+#define I365_CSC_BVD1 0x01
+#define I365_CSC_STSCHG 0x01
+#define I365_CSC_BVD2 0x02
+#define I365_CSC_READY 0x04
+#define I365_CSC_DETECT 0x08
+#define I365_CSC_ANY 0x0F
+#define I365_CSC_GPI 0x10
+#define I365_CSC_IRQ_MASK 0xF0

/* Flags for I365_ADDRWIN */
#define I365_ENA_IO(map) (0x40 << (map))
diff -u linux-2.6.15.1/drivers/pcmcia/ti113x.h linux-2.6.15.1-jck/drivers/pcmcia/ti113x.h
--- linux-2.6.15.1/drivers/pcmcia/ti113x.h 2006-01-15 07:16:02.000000000 +0100
+++ linux-2.6.15.1-jck/drivers/pcmcia/ti113x.h 2006-03-15 10:13:32.000000000 +0100
@@ -304,6 +304,18 @@
return 0;
}

+static int ti113x_init(struct yenta_socket *socket)
+{
+ u8 new, reg = exca_readb(socket, I365_INTCTL);
+
+ new = reg & ~I365_INTR_ENA;
+ if ( socket->dev->irq ) /* PCI IRQ */
+ new |= I365_INTR_ENA;
+ if (new != reg)
+ exca_writeb(socket, I365_INTCTL, new);
+ return 0;
+}
+
static int ti_override(struct yenta_socket *socket)
{
u8 new, reg = exca_readb(socket, I365_INTCTL);
@@ -317,14 +329,42 @@
return 0;
}

+static void ti113x_use_isa_irq(struct yenta_socket *socket)
+{
+ int isa_irq;
+ u8 intctl;
+ u32 isa_irq_mask;
+
+ /* get a free isa int */
+ isa_irq_mask = 0;
+ if (isa_probe)
+ isa_irq_mask = yenta_probe_irq(socket, 0x0ef8); /* 0x0ef8 => only common isa irqs */
+ if ( !(isa_irq_mask & 0xFFFF) ) return; /* no useable isa irq found */
+ for(isa_irq = -1 ; isa_irq_mask ; isa_irq++ ) /* choose highest available */
+ isa_irq_mask >>= 1;
+
+ exca_writeb(socket, I365_CSCINT, (isa_irq << 4) ); /* CSC */
+
+ socket->cb_irq = isa_irq;
+
+ intctl = exca_readb(socket, I365_INTCTL);
+ intctl &= ~(I365_INTR_ENA | I365_IRQ_MASK); /* CSC Enable */
+ exca_writeb(socket, I365_INTCTL, intctl );
+
+ printk(KERN_INFO "Yenta TI113x: using isa irq %d\n", isa_irq);
+}
+
static int ti113x_override(struct yenta_socket *socket)
{
u8 cardctl;

cardctl = config_readb(socket, TI113X_CARD_CONTROL);
cardctl &= ~(TI113X_CCR_PCI_IRQ_ENA | TI113X_CCR_PCI_IREQ | TI113X_CCR_PCI_CSC);
- if (socket->cb_irq)
+ if (socket->dev->irq)
cardctl |= TI113X_CCR_PCI_IRQ_ENA | TI113X_CCR_PCI_CSC | TI113X_CCR_PCI_IREQ;
+ else
+ ti113x_use_isa_irq(socket);
+
config_writeb(socket, TI113X_CARD_CONTROL, cardctl);

return ti_override(socket);
diff -u linux-2.6.15.1/drivers/pcmcia/yenta_socket.c linux-2.6.15.1-jck/drivers/pcmcia/yenta_socket.c
--- linux-2.6.15.1/drivers/pcmcia/yenta_socket.c 2006-01-15 07:16:02.000000000 +0100
+++ linux-2.6.15.1-jck/drivers/pcmcia/yenta_socket.c 2006-03-12 01:05:34.000000000 +0100
@@ -50,7 +50,7 @@
#define to_ns(cycles) ((cycles)*120)

static int yenta_probe_cb_irq(struct yenta_socket *socket);
-
+static unsigned int yenta_probe_irq(struct yenta_socket *socket, u32 isa_irq_mask);

static unsigned int override_bios;
module_param(override_bios, uint, 0000);
@@ -379,9 +379,12 @@

/* ISA interrupt control? */
intr = exca_readb(socket, I365_INTCTL);
- intr = (intr & ~0xf);
- if (!socket->cb_irq) {
- intr |= state->io_irq;
+ intr &= ~(I365_IRQ_MASK);
+ if (!socket->dev->irq) { /* is there a valid pci irq ? */
+ if(socket->cb_irq)
+ intr |= socket->cb_irq;
+ else
+ intr |= socket->io_irq;
bridge |= CB_BRIDGE_INTR;
}
exca_writeb(socket, I365_INTCTL, intr);
@@ -391,7 +394,7 @@
reg = exca_readb(socket, I365_INTCTL) & (I365_RING_ENA | I365_INTR_ENA);
reg |= (state->flags & SS_RESET) ? 0 : I365_PC_RESET;
reg |= (state->flags & SS_IOCARD) ? I365_PC_IOCARD : 0;
- if (state->io_irq != socket->cb_irq) {
+ if (state->io_irq) {
reg |= state->io_irq;
bridge |= CB_BRIDGE_INTR;
}
@@ -404,8 +407,10 @@
if (exca_readb(socket, I365_POWER) != reg)
exca_writeb(socket, I365_POWER, reg);

- /* CSC interrupt: no ISA irq for CSC */
- reg = I365_CSC_DETECT;
+ reg = exca_readb(socket, I365_CSCINT); /*keep isa IRQs for CSC*/
+ reg &= I365_CSC_IRQ_MASK;
+ reg |= I365_CSC_DETECT;
+
if (state->flags & SS_IOCARD) {
if (state->csc_mask & SS_STSCHG) reg |= I365_CSC_STSCHG;
} else {
@@ -868,7 +873,7 @@
.override = ti113x_override,
.save_state = ti_save_state,
.restore_state = ti_restore_state,
- .sock_init = ti_init,
+ .sock_init = ti113x_init,
},
[CARDBUS_TYPE_TI12XX] = {
.override = ti12xx_override,
@@ -922,6 +927,7 @@
int i;
unsigned long val;
u32 mask;
+ u8 reg;

/*
* Probe for usable interrupts using the force
@@ -929,6 +935,7 @@
*/
cb_writel(socket, CB_SOCKET_EVENT, -1);
cb_writel(socket, CB_SOCKET_MASK, CB_CSTSMASK);
+ reg = exca_readb(socket, I365_CSCINT); /* save */
exca_writeb(socket, I365_CSCINT, 0);
val = probe_irq_on() & isa_irq_mask;
for (i = 1; i < 16; i++) {
@@ -940,7 +947,7 @@
cb_writel(socket, CB_SOCKET_EVENT, -1);
}
cb_writel(socket, CB_SOCKET_MASK, 0);
- exca_writeb(socket, I365_CSCINT, 0);
+ exca_writeb(socket, I365_CSCINT, reg); /* restore */

mask = probe_irq_mask(val) & 0xffff;

@@ -971,6 +978,8 @@
/* probes the PCI interrupt, use only on override functions */
static int yenta_probe_cb_irq(struct yenta_socket *socket)
{
+ u8 reg;
+
if (!socket->cb_irq)
return -1;

@@ -982,7 +991,9 @@
}

/* generate interrupt, wait */
- exca_writeb(socket, I365_CSCINT, I365_CSC_STSCHG);
+ reg = exca_readb(socket, I365_CSCINT); /* save */
+ exca_writeb(socket, I365_CSCINT, reg | I365_CSC_STSCHG);
+
cb_writel(socket, CB_SOCKET_EVENT, -1);
cb_writel(socket, CB_SOCKET_MASK, CB_CSTSMASK);
cb_writel(socket, CB_SOCKET_FORCE, CB_FCARDSTS);
@@ -991,7 +1002,7 @@

/* disable interrupts */
cb_writel(socket, CB_SOCKET_MASK, 0);
- exca_writeb(socket, I365_CSCINT, 0);
+ exca_writeb(socket, I365_CSCINT, reg); /* restore */
cb_writel(socket, CB_SOCKET_EVENT, -1);
exca_readb(socket, I365_CSC);

</nowiki>

It is untested if these changes are not breaking other ti pcmcia bridges.
( Maybe someone can test this patch on other hardware.
And please review the changes, especially those in yenta_socket.c )

Category talk:760ED

2006-08-28T18:44:10Z

Fpga:

Installation instructions for the ThinkPad 760

2006-03-17T21:45:30Z

Fpga: /* ThinkPad 760ED */

Specific installation notes for the ThinkPad {{760C}}, {{760CD}}, {{760E}}, {{760ED}}, {{760EL}}, {{760ELD}}, {{760L}}, {{760LD}}, {{760XD}} and {{760XL}}.

==General Notes==
One of the main pitfalls to installing Linux on this ThinkPad line is the lack of bootable CD-ROM support. Though it is possible to install using a set of startup floppies, being sure to get one for PCMCIA support and another for network drivers, it tends to be more of a headache than it is worth. Using a utility like sbootmgr (available from the Slackware server [ftp://ftp.slackware.com/pub/slackware/slackware-current/isolinux/sbootmgr here], the [http://btmgr.webframe.org/ homepage] of the software is curiously out-of-date) makes this headache virtually disappear. Simply write the image to a floppy drive, and boot up. Highlight the hard disk in the Main Boot menu screen that appears. Then hit Tab to enter the Main Menu, head down to System Settings, press Enter, select Install Smart BootManager, and answer Y. Turn your computer off, swap the CD-ROM into it, insert the Linux distro of your choice, and boot up. Smart BootManager will start up, and you'll need to head back into the System Settings menu and Rescan All Partitions to add the new bootable CD-ROM to sbootmgr's list. After you've done this, your CD-ROM will be in the menu, which you can then boot from, by highlighting it, heading back into the menu, and selecting "Boot It."

Granted, a CD-ROM was an option on some of the models in this line, so if you don't have one, you'll either have to get one from eBay (about $20) or fall back on using a network install.

==Distro specific Instructions==

==External Sources==
===ThinkPad 760E===
*[http://www.geocities.com/SiliconValley/9111/ibmtp760/index.html Slackware 4.0 on a ThinkPad 760E]

===ThinkPad 760ED===
*[http://www.qsl.net/n0nb/linux/tp760ed.html Nate Bargmann's Debian on a ThinkPad 760ED page]
*[http://web.archive.org/web/20040604223902/http://www.eecs.lehigh.edu/~tboult/linux/thinkpad760ed.html Red Hat 4.2 on a ThinkPad 760ED/760XD]
*[http://lists.infradead.org/pipermail/linux-pcmcia/2006-March/003347.html PCMCIA Patch for Kernel 2.6.15.1]

===ThinkPad 760EL===
*[http://www.geocities.com/SiliconValley/9111/ibmtp760/thinkpad.html Harald Milz's Linux on a ThinkPad 760EL page]
*[http://patter.mine.nu/thinkpad.html Debian on a ThinkPad 760EL]
*[http://personal.riverusers.com/~thegrendel/laptop.html Mandrake 6.1 on a ThinkPad 760EL]
*[http://www.btinternet.com/~zeltanet/zeltanet/thinkpad760el_linux.htm Mandrake 7.0 on a ThinkPad 760EL]
*[http://www.geocities.com/dueze/thinkpad760el.html Slackware 7.1 on a ThinkPad 760EL]
*[http://stephe_2.tripod.com/thinkpad/ Stephe's Red Hat 7.0 on a ThinkPad 760EL page]

===ThinkPad 760XL===
*[http://www.grnet.com/sc/linux/tp760xl/ Mike Mol's Debian Woody on a ThinkPad 760XL page]
*[http://www.monkeynoodle.org/comp/hardware/760xl.html Red Hat 5.2 on a ThinkPad 760XL]