Skip to contentSkip to conversation

mac68k: start CUDA early

PATCH Applied Finn Thain 3 participants 4 messages Nov 3, 2009 – Dec 23, 2009

Subsystems (3)
lore
Share & tools
lore

Finn Thain

author
#0 lore raw

PATCH 10/13 mac68k: start CUDA early

The valkyriefb driver needs the CUDA to work in order to set the video mode at boot. Initialising the device earlier, and bring the m68k code closer to the powermac code.

---
 arch/m68k/mac/config.c       |    6 ++++
 drivers/macintosh/via-cuda.c |   57 +++++++++++++++++++++++++++----------------
 2 files changed, 43 insertions(+), 20 deletions(-)
arch/m68k/mac/config.c +6 -0
Index: linux-2.6.31/arch/m68k/mac/config.c
===================================================================
@@ -23,6 +23,8 @@
 #include <linux/init.h>
 #include <linux/vt_kern.h>
 #include <linux/platform_device.h>
+#include <linux/adb.h>
+#include <linux/cuda.h>
 
 #define BOOTINFO_COMPAT_1_0
 #include <asm/setup.h>
@@ -889,6 +891,10 @@ static void __init mac_identify(void)
 	oss_init();
 	psc_init();
 	baboon_init();
+
+#ifdef CONFIG_ADB_CUDA
+	find_via_cuda();
+#endif
 }
 
 static void __init mac_report_hardware(void)
drivers/macintosh/via-cuda.c +37 -20

108 lines not on this page · raw message

#1 lore raw
Quoted 5 lines · Finn Thain

The valkyriefb driver needs the CUDA to work in order to set the video mode at boot. Initialising the device earlier, and bring the m68k code closer to the powermac code.

Hi Finn !

Quoted 10 lines
drivers/macintosh/via-cuda.c +0 -3
@@ -224,20 +249,9 @@ cuda_probe(void)
 static int __init
 cuda_init(void)
 {
-#ifdef CONFIG_PPC
     if (via == NULL)
 	return -ENODEV;
     return 0;
-#else 
-    int err = cuda_init_via();

drivers/macintosh/via-cuda.c cuda_probe(void) · line 256

Quoted 10 lines
drivers/macintosh/via-cuda.c +0 -8
-    if (err) {
-	printk(KERN_ERR "cuda_init_via() failed\n");
-	return -ENODEV;
-    }
-    out_8(&via[IER], IER_SET|SR_INT); /* enable interrupt from SR */
-
-    return via_cuda_start();
-#endif
 }
 #endif /* CONFIG_ADB */

Can't we just get rid of cuda_init() completely ?

Quoted 4 lines
drivers/macintosh/via-cuda.c +0 -0
@@ -430,9 +444,12 @@ cuda_poll(void)
     /* cuda_interrupt only takes a normal lock, we disable
      * interrupts here to avoid re-entering and thus deadlocking.
      */

drivers/macintosh/via-cuda.c cuda_poll(void) · line 453

Quoted 10 lines
drivers/macintosh/via-cuda.c +6 -3
-    disable_irq(cuda_irq);
-    cuda_interrupt(0, NULL);
-    enable_irq(cuda_irq);
+    if (cuda_fully_inited) {
+	disable_irq(cuda_irq);
+	cuda_interrupt(0, NULL);
+	enable_irq(cuda_irq);
+    } else
+	cuda_interrupt(0, NULL);
 }

Wouldn't it be better that way ?

	if (cuda_irq)
		disable_irq(cuda_irq);
	cuda_interrupt(0, NULL);
	if (cuda_irq)
		enable_irq(cuda_irq);

Cheers,
Ben.

author
#2 lore raw

PATCH 10/13 mac68k: start CUDA early, take 2

The valkyriefb driver needs the CUDA to work in order to set the video mode at boot. So initialise the device earlier, and bring the m68k code closer to the powermac code.

Take 2 was changed as per Benjamin Herrenschmidt's review.

---
 arch/m68k/mac/config.c       |    6 +++
 drivers/macintosh/adb.c      |    6 ++-
 drivers/macintosh/via-cuda.c |   74 +++++++++++++++++++++++--------------------
 3 files changed, 51 insertions(+), 35 deletions(-)
arch/m68k/mac/config.c +6 -0
Index: linux-2.6.31/arch/m68k/mac/config.c
===================================================================
@@ -23,6 +23,8 @@
 #include <linux/init.h>
 #include <linux/vt_kern.h>
 #include <linux/platform_device.h>
+#include <linux/adb.h>
+#include <linux/cuda.h>
 
 #define BOOTINFO_COMPAT_1_0
 #include <asm/setup.h>
@@ -889,6 +891,10 @@ static void __init mac_identify(void)
 	oss_init();
 	psc_init();
 	baboon_init();
+
+#ifdef CONFIG_ADB_CUDA
+	find_via_cuda();
+#endif
 }
 
 static void __init mac_report_hardware(void)
drivers/macintosh/via-cuda.c +41 -33

130 lines not on this page · raw message

drivers/macintosh/adb.c +4 -2
Index: linux-2.6.31/drivers/macintosh/adb.c
===================================================================
@@ -317,9 +317,11 @@ static int __init adb_init(void)
 			break;
 		}
 	}
-	if ((adb_controller == NULL) || adb_controller->init()) {
-		printk(KERN_WARNING "Warning: no ADB interface detected\n");
+	if (adb_controller != NULL && adb_controller->init &&
+	    adb_controller->init())
 		adb_controller = NULL;
+	if (adb_controller == NULL) {
+		printk(KERN_WARNING "Warning: no ADB interface detected\n");
 	} else {
 #ifdef CONFIG_PPC
 		if (machine_is_compatible("AAPL,PowerBook1998") ||
#3 lore raw

Re: [PATCH 10/13] mac68k: start CUDA early, take 2

On Tue, Nov 17, 2009 at 10:03, Finn Thain <[email protected]> wrot= e:

Quoted 5 lines

The valkyriefb driver needs the CUDA to work in order to set the video mode at boot. So initialise the device earlier, and bring the m68k code closer to the powermac code.

Take 2 was changed as per Benjamin Herrenschmidt's review.

Ben, OK for you?

Quoted 6 lines

---
=C2=A0arch/m68k/mac/config.c =C2=A0 =C2=A0 =C2=A0 | =C2=A0 =C2=A06 +++ =C2=A0drivers/macintosh/adb.c =C2=A0 =C2=A0 =C2=A0| =C2=A0 =C2=A06 ++- =C2=A0drivers/macintosh/via-cuda.c | =C2=A0 74 +++++++++++++++++++++++---=

-----------------

Quoted 4 lines

=C2=A03 files changed, 51 insertions(+), 35 deletions(-)

Index: linux-2.6.31/arch/m68k/mac/config.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D

Quoted 1 line

--- linux-2.6.31.orig/arch/m68k/mac/config.c =C2=A0 =C2=A02009-11-17 17:1=

1:47.000000000 +1100

Quoted 1 line

+++ linux-2.6.31/arch/m68k/mac/config.c 2009-11-17 17:11:47.000000000 +11=

00

Quoted 20 lines
(quoted diff) +0 -0
@@ -23,6 +23,8 @@

=C2=A0#include <linux/init.h>
=C2=A0#include <linux/vt_kern.h>
=C2=A0#include <linux/platform_device.h>

arch/m68k/mac/config.c +2 -0
+#include <linux/adb.h>
+#include <linux/cuda.h>

=C2=A0#define BOOTINFO_COMPAT_1_0
=C2=A0#include <asm/setup.h>

(quoted diff) +4 -0
@@ -889,6 +891,10 @@ static void __init mac_identify(void)
 =C2=A0 =C2=A0 =C2=A0 =C2=A0oss_init();
 =C2=A0 =C2=A0 =C2=A0 =C2=A0psc_init();
 =C2=A0 =C2=A0 =C2=A0 =C2=A0baboon_init();
+
+#ifdef CONFIG_ADB_CUDA
+ =C2=A0 =C2=A0 =C2=A0 find_via_cuda();
+#endif
 =C2=A0}
 
 =C2=A0static void __init mac_report_hardware(void)
Quoted 2 lines

Index: linux-2.6.31/drivers/macintosh/via-cuda.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D

Quoted 1 line

--- linux-2.6.31.orig/drivers/macintosh/via-cuda.c =C2=A0 =C2=A0 =C2=A020=

09-11-17 17:07:58.000000000 +1100

Quoted 1 line

+++ linux-2.6.31/drivers/macintosh/via-cuda.c =C2=A0 2009-11-17 17:11:47.=

000000000 +1100

Quoted 40 lines
(quoted diff) +0 -0
@@ -89,7 +89,6 @@ static int cuda_fully_inited;
 

=C2=A0#ifdef CONFIG_ADB
=C2=A0static int cuda_probe(void);
-static int cuda_init(void);
=C2=A0static int cuda_send_request(struct adb_request *req, int sync); =C2=A0static int cuda_adb_autopoll(int devs);
=C2=A0static int cuda_reset_adb_bus(void);

(quoted diff) +0 -0
@@ -107,17 +106,42 @@ int cuda_request(struct adb_request *req
 

=C2=A0#ifdef CONFIG_ADB
=C2=A0struct adb_driver via_cuda_driver =3D {
- =C2=A0 =C2=A0 =C2=A0 "CUDA",
- =C2=A0 =C2=A0 =C2=A0 cuda_probe,
- =C2=A0 =C2=A0 =C2=A0 cuda_init,
- =C2=A0 =C2=A0 =C2=A0 cuda_send_request,
- =C2=A0 =C2=A0 =C2=A0 cuda_adb_autopoll,
- =C2=A0 =C2=A0 =C2=A0 cuda_poll,
- =C2=A0 =C2=A0 =C2=A0 cuda_reset_adb_bus
+ =C2=A0 =C2=A0 =C2=A0 .name =C2=A0 =C2=A0 =C2=A0 =C2=A0 =3D "CUDA",
+ =C2=A0 =C2=A0 =C2=A0 .probe =C2=A0 =C2=A0 =C2=A0 =C2=A0=3D cuda_probe,
+ =C2=A0 =C2=A0 =C2=A0 .send_request =3D cuda_send_request,
+ =C2=A0 =C2=A0 =C2=A0 .autopoll =C2=A0 =C2=A0 =3D cuda_adb_autopoll,
+ =C2=A0 =C2=A0 =C2=A0 .poll =C2=A0 =C2=A0 =C2=A0 =C2=A0 =3D cuda_poll,
+ =C2=A0 =C2=A0 =C2=A0 .reset_bus =C2=A0 =C2=A0=3D cuda_reset_adb_bus, =C2=A0};
=C2=A0#endif /* CONFIG_ADB */

(quoted diff) +11 -1
-#ifdef CONFIG_PPC
+#ifdef CONFIG_MAC
+int __init find_via_cuda(void)
+{
+ =C2=A0 =C2=A0struct adb_request req;
+ =C2=A0 =C2=A0int err;
+
+ =C2=A0 =C2=A0if (macintosh_config->adb_type !=3D MAC_ADB_CUDA)
+ =C2=A0 =C2=A0 =C2=A0 return 0;
+
+ =C2=A0 =C2=A0via =3D via1;
+ =C2=A0 =C2=A0cuda_state =3D idle;

Review

Quoted 10 lines
(quoted diff) +10 -0
+
+ =C2=A0 =C2=A0err =3D cuda_init_via();
+ =C2=A0 =C2=A0if (err) {
+ =C2=A0 =C2=A0 =C2=A0 printk(KERN_ERR "cuda_init_via() failed\n");
+ =C2=A0 =C2=A0 =C2=A0 via =3D NULL;
+ =C2=A0 =C2=A0 =C2=A0 return 0;
+ =C2=A0 =C2=A0}
+
+ =C2=A0 =C2=A0/* enable autopoll */
+ =C2=A0 =C2=A0cuda_request(&req, NULL, 3, CUDA_PACKET, CUDA_AUTOPOLL, 1)=

;

Quoted 24 lines

+ =C2=A0 =C2=A0while (!req.complete)
+ =C2=A0 =C2=A0 =C2=A0 cuda_poll();

drivers/macintosh/via-cuda.c +4 -0
+
+ =C2=A0 =C2=A0return 1;
+}
+#else

=C2=A0int __init find_via_cuda(void)
=C2=A0{
=C2=A0 =C2=A0 struct adb_request req;

(quoted diff) +1 -1
@@ -175,7 +199,7 @@ int __init find_via_cuda(void)
 =C2=A0 =C2=A0 vias =3D NULL;
 =C2=A0 =C2=A0 return 0;
 =C2=A0}
-#endif /* CONFIG_PPC */
+#endif /* !defined CONFIG_MAC */
 
 =C2=A0static int __init via_cuda_start(void)
 =C2=A0{
@@ -184,14 +208,14 @@ static int __init via_cuda_start(void)
 

=C2=A0#ifdef CONFIG_MAC
=C2=A0 =C2=A0 cuda_irq =3D IRQ_MAC_ADB;

drivers/macintosh/via-cuda.c +1 -1
-#else /* CONFIG_MAC */
+#else
Quoted 3 lines

=C2=A0 =C2=A0 cuda_irq =3D irq_of_parse_and_map(vias, 0); =C2=A0 =C2=A0 if (cuda_irq =3D=3D NO_IRQ) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0printk(KERN_ERR "via-cuda: can't map interrupt=

s for %s\n",

Quoted 7 lines

=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 vias->full_name); =C2=A0 =C2=A0 =C2=A0 =C2=A0return -ENODEV;
=C2=A0 =C2=A0 }

drivers/macintosh/via-cuda.c +1 -1
-#endif /* CONFIG_MAC */
+#endif

=C2=A0 =C2=A0 if (request_irq(cuda_irq, cuda_interrupt, 0, "ADB", cuda_in=

terrupt)) {

Quoted 1 line

=C2=A0 =C2=A0 =C2=A0 =C2=A0printk(KERN_ERR "via-cuda: can't request irq %=

d\n", cuda_irq);

Quoted 15 lines
(quoted diff) +0 -0
@@ -216,28 +240,10 @@ cuda_probe(void)

=C2=A0#else
=C2=A0 =C2=A0 if (macintosh_config->adb_type !=3D MAC_ADB_CUDA) =C2=A0 =C2=A0 =C2=A0 =C2=A0return -ENODEV;
- =C2=A0 =C2=A0via =3D via1;
=C2=A0#endif
- =C2=A0 =C2=A0return 0;

drivers/macintosh/via-cuda.c +0 -6
-}
-
-static int __init
-cuda_init(void)
-{
-#ifdef CONFIG_PPC

=C2=A0 =C2=A0 if (via =3D=3D NULL)
=C2=A0 =C2=A0 =C2=A0 =C2=A0return -ENODEV;

Quoted 8 lines

=C2=A0 =C2=A0 return 0;
-#else
- =C2=A0 =C2=A0int err =3D cuda_init_via();
- =C2=A0 =C2=A0if (err) {
- =C2=A0 =C2=A0 =C2=A0 printk(KERN_ERR "cuda_init_via() failed\n");
- =C2=A0 =C2=A0 =C2=A0 return -ENODEV;
- =C2=A0 =C2=A0}
- =C2=A0 =C2=A0out_8(&via[IER], IER_SET|SR_INT); /* enable interrupt from=

SR */

Quoted 9 lines
drivers/macintosh/via-cuda.c +0 -3
-
- =C2=A0 =C2=A0return via_cuda_start();
-#endif

=C2=A0}
=C2=A0#endif /* CONFIG_ADB */

(quoted diff) +0 -0
@@ -430,9 +436,11 @@ cuda_poll(void)

=C2=A0 =C2=A0 /* cuda_interrupt only takes a normal lock, we disable =C2=A0 =C2=A0 =C2=A0* interrupts here to avoid re-entering and thus deadl=

ocking.

Quoted 12 lines

=C2=A0 =C2=A0 =C2=A0*/
- =C2=A0 =C2=A0disable_irq(cuda_irq);
+ =C2=A0 =C2=A0if (cuda_irq)
+ =C2=A0 =C2=A0 =C2=A0 disable_irq(cuda_irq);
=C2=A0 =C2=A0 cuda_interrupt(0, NULL);
- =C2=A0 =C2=A0enable_irq(cuda_irq);
+ =C2=A0 =C2=A0if (cuda_irq)
+ =C2=A0 =C2=A0 =C2=A0 enable_irq(cuda_irq);
=C2=A0}

=C2=A0static irqreturn_t

Review cuda_interrupt(int irq, void *arg) · line 449

Quoted 4 lines
(quoted diff) +0 -1
@@ -446,7 +454,7 @@ cuda_interrupt(int irq, void *arg)
 
 =C2=A0 =C2=A0 spin_lock(&cuda_lock);
 
- =C2=A0 =C2=A0/* On powermacs, this handler is registered for the VIA IR=

Q. But it uses

Review cuda_interrupt(int irq, void *arg) · line 457

Quoted 1 line
(quoted diff) +1 -0
+ =C2=A0 =C2=A0/* On powermacs, this handler is registered for the VIA IR=

Q. But they use

Quoted 1 line

=C2=A0 =C2=A0 =C2=A0* just the shift register IRQ -- other VIA interrupt =

sources are disabled.

Quoted 1 line

=C2=A0 =C2=A0 =C2=A0* On m68k macs, the VIA IRQ sources are dispatched in=

dividually. Unless

Quoted 1 line

=C2=A0 =C2=A0 =C2=A0* we are polling, the shift register IRQ flag has alr=

eady been cleared.

Quoted 2 lines

Index: linux-2.6.31/drivers/macintosh/adb.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D

Quoted 1 line

--- linux-2.6.31.orig/drivers/macintosh/adb.c =C2=A0 2009-11-17 17:07:58.=

000000000 +1100

Quoted 1 line

+++ linux-2.6.31/drivers/macintosh/adb.c =C2=A0 =C2=A0 =C2=A0 =C2=A02009-=

11-17 17:11:47.000000000 +1100

Quoted 2 lines
(quoted diff) +0 -0
@@ -317,9 +317,11 @@ static int __init adb_init(void)

=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=

=A0 =C2=A0break;

Quoted 3 lines

=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0} =C2=A0 =C2=A0 =C2=A0 =C2=A0}
- =C2=A0 =C2=A0 =C2=A0 if ((adb_controller =3D=3D NULL) || adb_controller=

->init()) {

Quoted 1 line

- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 printk(KERN_WARNING "W=

arning: no ADB interface detected\n");

Quoted 1 line

+ =C2=A0 =C2=A0 =C2=A0 if (adb_controller !=3D NULL && adb_controller->in=

it &&

Quoted 2 lines

+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 adb_controller->init()) =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0adb_controller =3D=

NULL;

Quoted 2 lines

+ =C2=A0 =C2=A0 =C2=A0 if (adb_controller =3D=3D NULL) {
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 printk(KERN_WARNING "W=

arning: no ADB interface detected\n");

Quoted 3 lines

=C2=A0 =C2=A0 =C2=A0 =C2=A0} else {
=C2=A0#ifdef CONFIG_PPC
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (machine_is_com=

patible("AAPL,PowerBook1998") ||

Quoted 1 line

--=20
Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k= .org

In personal conversations with technical people, I call myself a hacker. Bu= t
when I'm talking to journalists I just say "programmer" or something like t= hat.
-- Linus Torvalds