Mac ADB IOP driver fixes
Subsystems (2)
cover Mac ADB IOP driver fixes
The adb-iop driver was never finished. Some deficiencies have become apparent over the years. For example,
- Mouse and/or keyboard may stop working if used together
- SRQ autopoll list cannot be changed
- Some bugs were found by inspection
This patch series contains fixes for the known bugs in the driver, plus a few clean-ups.
Finn Thain (8):
macintosh/adb-iop: Remove dead and redundant code macintosh/adb-iop: Correct comment text macintosh/adb-iop: Adopt bus reset algorithm from via-macii driver macintosh/adb-iop: Access current_req and adb_iop_state when inside
lock
macintosh/adb-iop: Resolve static checker warnings macintosh/adb-iop: Implement idle -> sending state transition macintosh/adb-iop: Implement sending -> idle state transition macintosh/adb-iop: Implement SRQ autopolling
arch/m68k/include/asm/adb_iop.h | 1 + drivers/macintosh/adb-iop.c | 186 +++++++++++++++----------------- 2 files changed, 86 insertions(+), 101 deletions(-)
Signature · 1 line
2.26.2
PATCH 1/8 macintosh/adb-iop: Remove dead and redundant code
--- drivers/macintosh/adb-iop.c | 29 ----------------------------- 1 file changed, 29 deletions(-)
drivers/macintosh/adb-iop.c +0 -29
@@ -18,24 +18,16 @@#include <linux/mm.h> #include <linux/delay.h> #include <linux/init.h> -#include <linux/proc_fs.h> #include <asm/macintosh.h> #include <asm/macints.h> #include <asm/mac_iop.h> -#include <asm/mac_oss.h> #include <asm/adb_iop.h> #include <linux/adb.h> -/*#define DEBUG_ADB_IOP*/ -static struct adb_request *current_req;static struct adb_request *last_req; -#if 0 -static unsigned char reply_buff[16 ]; -static unsigned char *reply_ptr; -#endif static enum adb_iop_state { idle,
@@ -104,22 +96,11 @@ static void adb_iop_listen(struct iop_msg *msg)struct adb_iopmsg *amsg = (struct adb_iopmsg *)msg->message;struct adb_request *req;unsigned long flags; -#ifdef DEBUG_ADB_IOP -int i; -#endif local_irq_save (flags); req = current_req; -#ifdef DEBUG_ADB_IOP -printk ("adb_iop_listen %p: rcvd packet, %d bytes: %02X %02X" , req, - (uint )amsg->count +2 , (uint )amsg->flags, (uint )amsg->cmd); -for (i =0 ; i < amsg->count; i++) -printk (" %02X" , (uint )amsg->data[i]); -printk ("\n" ); -#endif -/* Handle a timeout. Timeout packets seem to occur even after */ /* we've gotten a valid reply to a TALK, so I'm assuming that */ /* a "timeout" is actually more like an "end-of-data" signal. */
@@ -163,9 +144,6 @@ static void adb_iop_start(void)unsigned long flags;struct adb_request *req;struct adb_iopmsg amsg; -#ifdef DEBUG_ADB_IOP -int i; -#endif /* get the packet to send */ req = current_req;
@@ -174,13 +152,6 @@ static void adb_iop_start(void)local_irq_save (flags); -#ifdef DEBUG_ADB_IOP -printk ("adb_iop_start %p: sending packet, %d bytes:" , req, req->nbytes); -for (i =0 ; i < req->nbytes; i++) -printk (" %02X" , (uint )req->data[i]); -printk ("\n" ); -#endif -/* The IOP takes MacII-style packets, so */ /* strip the initial ADB_PACKET byte. */
Signature · 1 line
2.26.2
PATCH 2/8 macintosh/adb-iop: Correct comment text
In reply to Finn ThainThis patch improves comment style and corrects some misunderstandings in the text.
--- drivers/macintosh/adb-iop.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-)
drivers/macintosh/adb-iop.c +13 -16
@@ -101,11 +101,10 @@ static void adb_iop_listen(struct iop_msg *msg) req = current_req; -/* Handle a timeout. Timeout packets seem to occur even after */ -/* we've gotten a valid reply to a TALK, so I'm assuming that */ -/* a "timeout" is actually more like an "end-of-data" signal. */ -/* We need to send back a timeout packet to the IOP to shut */ -/* it up, plus complete the current request, if any. */ +/* Handle a timeout. Timeout packets seem to occur even after +* we've gotten a valid reply to a TALK, presumably because of +* autopolling. +*/ if (amsg->flags &ADB_IOP_TIMEOUT ) { msg->reply[0 ] =ADB_IOP_TIMEOUT |ADB_IOP_AUTOPOLL ;
@@ -115,9 +114,6 @@ static void adb_iop_listen(struct iop_msg *msg)adb_iop_end_req (req, idle); } }else { -/* TODO: is it possible for more than one chunk of data */ -/* to arrive before the timeout? If so we need to */ -/* use reply_ptr here like the other drivers do. */ if ((adb_iop_state == awaiting_reply) && (amsg->flags &ADB_IOP_EXPLICIT )) { req->reply_len = amsg->count +1 ;
@@ -152,23 +148,24 @@ static void adb_iop_start(void)local_irq_save (flags); -/* The IOP takes MacII-style packets, so */ -/* strip the initial ADB_PACKET byte. */ - +/* The IOP takes MacII-style packets, so strip the initial +* ADB_PACKET byte. +*/ amsg.flags =ADB_IOP_EXPLICIT ; amsg.count = req->nbytes -2 ; -/* amsg.data immediately follows amsg.cmd, effectively making */ -/* amsg.cmd a pointer to the beginning of a full ADB packet. */ +/* amsg.data immediately follows amsg.cmd, effectively making +* &amsg.cmd a pointer to the beginning of a full ADB packet. +*/ memcpy (&amsg.cmd, req->data +1 , req->nbytes -1 ); req->sent =1 ; adb_iop_state = sending;local_irq_restore (flags); -/* Now send it. The IOP manager will call adb_iop_complete */ -/* when the packet has been sent. */ - +/* Now send it. The IOP manager will call adb_iop_complete +* when the message has been sent. +*/ iop_send_message (ADB_IOP ,ADB_CHAN , req,sizeof (amsg), (__u8 *)&amsg, adb_iop_complete); }
Signature · 1 line
2.26.2
PATCH 3/8 macintosh/adb-iop: Adopt bus reset algorithm from via-macii driver
In reply to Finn ThainThis algorithm is slightly shorter and avoids the surprising adb_iop_start() call in adb_iop_poll().
--- drivers/macintosh/adb-iop.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-)
drivers/macintosh/adb-iop.c +8 -13
@@ -238,24 +238,19 @@ int adb_iop_autopoll(int devs)void adb_iop_poll (void ) { -if (adb_iop_state == idle) -adb_iop_start ();iop_ism_irq_poll (ADB_IOP ); }int adb_iop_reset_bus (void ) { -struct adb_request req = { - .reply_expected =0 , - .nbytes =2 , - .data = {ADB_PACKET ,0 }, - }; - -adb_iop_write (&req); -while (!req.complete) { -adb_iop_poll (); -schedule (); - } +struct adb_request req; + +/* Command = 0, Address = ignored */ +adb_request (&req,NULL ,ADBREQ_NOSEND ,1 ,ADB_BUSRESET ); +adb_iop_send_request (&req,1 ); + +/* Don't want any more requests during the Global Reset low time. */ +mdelay (3 );return 0 ; }
Signature · 1 line
2.26.2
PATCH 4/8 macintosh/adb-iop: Access current_req and adb_iop_state when inside lock
In reply to Finn ThainDrop the redundant local_irq_save/restore() from adb_iop_start() because the caller has to do it anyway. This is the pattern used in via-macii.
--- drivers/macintosh/adb-iop.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
drivers/macintosh/adb-iop.c +5 -8
@@ -137,7 +137,6 @@ static void adb_iop_listen(struct iop_msg *msg)static void adb_iop_start (void ) { -unsigned long flags;struct adb_request *req;struct adb_iopmsg amsg;
@@ -146,8 +145,6 @@ static void adb_iop_start(void)if (!req)return ; -local_irq_save (flags); -/* The IOP takes MacII-style packets, so strip the initial * ADB_PACKET byte. */
@@ -161,7 +158,6 @@ static void adb_iop_start(void) req->sent =1 ; adb_iop_state = sending; -local_irq_restore (flags);/* Now send it. The IOP manager will call adb_iop_complete * when the message has been sent.
@@ -208,13 +204,13 @@ static int adb_iop_write(struct adb_request *req)return -EINVAL ; } -local_irq_save (flags); - req->next =NULL ; req->sent =0 ; req->complete =0 ; req->reply_len =0 ; +local_irq_save (flags); +if (current_req !=0 ) { last_req->next = req; last_req = req;
@@ -223,10 +219,11 @@ static int adb_iop_write(struct adb_request *req) last_req = req; } -local_irq_restore (flags); -if (adb_iop_state == idle)adb_iop_start (); + +local_irq_restore (flags); +return 0 ; }
Signature · 1 line
2.26.2
PATCH 5/8 macintosh/adb-iop: Resolve static checker warnings
In reply to Finn Thaindrivers/macintosh/adb-iop.c:215:28: warning: Using plain integer as NULL pointer drivers/macintosh/adb-iop.c:170:5: warning: symbol 'adb_iop_probe' was not declared. Should it be static? drivers/macintosh/adb-iop.c:177:5: warning: symbol 'adb_iop_init' was not declared. Should it be static? drivers/macintosh/adb-iop.c:184:5: warning: symbol 'adb_iop_send_request' was not declared. Should it be static? drivers/macintosh/adb-iop.c:230:5: warning: symbol 'adb_iop_autopoll' was not declared. Should it be static? drivers/macintosh/adb-iop.c:236:6: warning: symbol 'adb_iop_poll' was not declared. Should it be static? drivers/macintosh/adb-iop.c:241:5: warning: symbol 'adb_iop_reset_bus' was not declared. Should it be static?
--- drivers/macintosh/adb-iop.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/macintosh/adb-iop.c +7 -7
@@ -166,21 +166,21 @@ static void adb_iop_start(void) adb_iop_complete); } -int adb_iop_probe (void ) +static int adb_iop_probe (void ) {if (!iop_ism_present)return -ENODEV ;return 0 ; } -int adb_iop_init (void ) +static int adb_iop_init (void ) {pr_info ("adb: IOP ISM driver v0.4 for Unified ADB\n" );iop_listen (ADB_IOP ,ADB_CHAN , adb_iop_listen,"ADB" );return 0 ; } -int adb_iop_send_request (struct adb_request *req,int sync) +static int adb_iop_send_request (struct adb_request *req,int sync) {int err;
@@ -211,7 +211,7 @@ static int adb_iop_write(struct adb_request *req)local_irq_save (flags); -if (current_req !=0 ) { +if (current_req) { last_req->next = req; last_req = req; }else {
@@ -227,18 +227,18 @@ static int adb_iop_write(struct adb_request *req)return 0 ; } -int adb_iop_autopoll (int devs) +static int adb_iop_autopoll (int devs) {/* TODO: how do we enable/disable autopoll? */ return 0 ; } -void adb_iop_poll (void ) +static void adb_iop_poll (void ) {iop_ism_irq_poll (ADB_IOP ); } -int adb_iop_reset_bus (void ) +static int adb_iop_reset_bus (void ) {struct adb_request req;
Signature · 1 line
2.26.2
PATCH 6/8 macintosh/adb-iop: Implement idle -> sending state transition
In reply to Finn ThainIn the present algorithm, the 'idle' state transition does not take place until there's a bus timeout. Once idle, the driver does not automatically proceed with the next request.
Change the algorithm so that queued ADB requests will be sent as soon as the driver becomes idle. This is to take place after the current IOP message is completed.
--- drivers/macintosh/adb-iop.c | 43 +++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 19 deletions(-)
drivers/macintosh/adb-iop.c +24 -19
@@ -54,13 +54,19 @@ struct adb_driver adb_iop_driver = { .reset_bus = adb_iop_reset_bus }; -static void adb_iop_end_req (struct adb_request *req,int state) +static void adb_iop_done (void ) { +struct adb_request *req = current_req; + + adb_iop_state = idle; + req->complete =1 ; current_req = req->next;if (req->done) (*req->done)(req); - adb_iop_state = state; + +if (adb_iop_state == idle) +adb_iop_start (); }/*
@@ -94,37 +100,36 @@ static void adb_iop_complete(struct iop_msg *msg)static void adb_iop_listen (struct iop_msg *msg) {struct adb_iopmsg *amsg = (struct adb_iopmsg *)msg->message; -struct adb_request *req;unsigned long flags; +bool req_done = false;local_irq_save (flags); - req = current_req; -/* Handle a timeout. Timeout packets seem to occur even after * we've gotten a valid reply to a TALK, presumably because of * autopolling. */ -if (amsg->flags &ADB_IOP_TIMEOUT ) { - msg->reply[0 ] =ADB_IOP_TIMEOUT |ADB_IOP_AUTOPOLL ; - msg->reply[1 ] =0 ; - msg->reply[2 ] =0 ; -if (req && (adb_iop_state != idle)) { -adb_iop_end_req (req, idle); - } - }else { -if ((adb_iop_state == awaiting_reply) && - (amsg->flags &ADB_IOP_EXPLICIT )) { +if (amsg->flags &ADB_IOP_EXPLICIT ) { +if (adb_iop_state == awaiting_reply) { +struct adb_request *req = current_req; + req->reply_len = amsg->count +1 ;memcpy (req->reply, &amsg->cmd, req->reply_len); - }else { -adb_input (&amsg->cmd, amsg->count +1 , - amsg->flags &ADB_IOP_AUTOPOLL ); + + req_done = true; } -memcpy (msg->reply, msg->message,IOP_MSG_LEN ); + }else if (!(amsg->flags &ADB_IOP_TIMEOUT )) { +adb_input (&amsg->cmd, amsg->count +1 , + amsg->flags &ADB_IOP_AUTOPOLL ); } + + msg->reply[0 ] =ADB_IOP_AUTOPOLL ;iop_complete_message (msg); + +if (req_done) +adb_iop_done (); +local_irq_restore (flags); }
Signature · 1 line
2.26.2
PATCH 7/8 macintosh/adb-iop: Implement sending -> idle state transition
In reply to Finn ThainOn leaving the 'sending' state, proceed to the 'idle' state if no reply is expected. Drop redundant test for adb_iop_state == sending && current_req.
--- drivers/macintosh/adb-iop.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/macintosh/adb-iop.c +3 -4
@@ -77,15 +77,14 @@ static void adb_iop_done(void)static void adb_iop_complete (struct iop_msg *msg) { -struct adb_request *req;unsigned long flags;local_irq_save (flags); - req = current_req; -if ((adb_iop_state == sending) && req && req->reply_expected) { +if (current_req->reply_expected) adb_iop_state = awaiting_reply; - } +else +adb_iop_done ();local_irq_restore (flags); }
Signature · 1 line
2.26.2
PATCH 8/8 macintosh/adb-iop: Implement SRQ autopolling
In reply to Finn ThainThe adb_driver.autopoll method is needed during ADB bus scan and device address assignment. Implement this method so that the IOP's list of device addresses can be updated. When the list is empty, disable SRQ autopolling.
--- arch/m68k/include/asm/adb_iop.h | 1 + drivers/macintosh/adb-iop.c | 32 ++++++++++++++++++++++++++------ 2 files changed, 27 insertions(+), 6 deletions(-)
arch/m68k/include/asm/adb_iop.h +1 -0
@@ -29,6 +29,7 @@#define ADB_IOP_EXPLICIT 0x80/* nonzero if explicit command */ #define ADB_IOP_AUTOPOLL 0x40/* auto/SRQ polling enabled */ +#define ADB_IOP_SET_AUTOPOLL 0x20/* set autopoll device list */ #define ADB_IOP_SRQ 0x04/* SRQ detected */ #define ADB_IOP_TIMEOUT 0x02/* nonzero if timeout */
drivers/macintosh/adb-iop.c +26 -6
@@ -7,10 +7,6 @@* 1999-07-01 (jmt) - First implementation for new driver architecture. * * 1999-07-31 (jmt) - First working version. -* -* TODO: -* -* o Implement SRQ handling. */ #include <linux/types.h>
@@ -28,6 +24,7 @@static struct adb_request *current_req;static struct adb_request *last_req; +static unsigned int autopoll_devs; static enum adb_iop_state { idle,
@@ -123,7 +120,7 @@ static void adb_iop_listen(struct iop_msg *msg) amsg->flags & ADB_IOP_AUTOPOLL); } - msg->reply[0 ] =ADB_IOP_AUTOPOLL ; + msg->reply[0 ] = autopoll_devs ?ADB_IOP_AUTOPOLL :0 ;iop_complete_message (msg);if (req_done)
@@ -231,9 +228,32 @@ static int adb_iop_write(struct adb_request *req)return 0 ; } +static void adb_iop_set_ap_complete (struct iop_msg *msg) +{ +struct adb_iopmsg *amsg = (struct adb_iopmsg *)msg->message; + + autopoll_devs = (amsg->data[1 ] <<8 ) | amsg->data[0 ]; +} +static int adb_iop_autopoll (int devs) { -/* TODO: how do we enable/disable autopoll? */ +struct adb_iopmsg amsg; +unsigned long flags; +unsigned int mask = (unsigned int )devs &0xFFFE ; + +local_irq_save (flags); + + amsg.flags =ADB_IOP_SET_AUTOPOLL | (mask ?ADB_IOP_AUTOPOLL :0 ); + amsg.count =2 ; + amsg.cmd =0 ; + amsg.data[0 ] = mask &0xFF ; + amsg.data[1 ] = (mask >>8 ) &0xFF ; + +iop_send_message (ADB_IOP ,ADB_CHAN ,NULL ,sizeof (amsg), (__u8 *)&amsg, + adb_iop_set_ap_complete); + +local_irq_restore (flags); +return 0 ; }
Signature · 1 line
2.26.2
Re: [PATCH 8/8] macintosh/adb-iop: Implement SRQ autopolling
Hi Finn,
Quoted 9 lines · Finn Thain
The adb_driver.autopoll method is needed during ADB bus scan and device address assignment. Implement this method so that the IOP's list of device addresses can be updated. When the list is empty, disable SRQ autopolling.
Cc Joshua Thompson <[email protected]>Cc Geert Uytterhoeven <[email protected]>Tested-by Stan Johnson <[email protected]>Signed-off-by Finn Thain <[email protected]>
Thanks for your patch!
Quoted 2 lines
arch/m68k/include/asm/adb_iop.h | 1 + drivers/macintosh/adb-iop.c | 32 ++++++++++++++++++++++++++------
As this header file is used by a single source file only, perhaps it should just be absorbed by the latter?
Then you no longer need my Acked-by for future changes ;-)
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Re: [PATCH 8/8] macintosh/adb-iop: Implement SRQ autopolling
Quoted 5 lines · Geert Uytterhoeven
Quoted 1 line
arch/m68k/include/asm/adb_iop.h | 1 +As this header file is used by a single source file only, perhaps it should just be absorbed by the latter?
Then you no longer need my Acked-by for future changes ;-)
While I don't really feel involved in this specific change (although I was one of the testers when the driver was first written), I am a little curious about the current coding standards. This header is pretty much just a declaration of the hardware interface, of which there are many in this directory. Is it better to just define all the offsets and bits for hardware registers inside the driver? We used to always put them in headers like this, but is that not the current standard? Would it be cleaner to put such headers in the directory with the driver effectively making them private? I seem to see quite a bit of that as well.
Thank you for your advice.
Brad Boyer
[email protected]
Geert Uytterhoeven
maintainerRe: [PATCH 8/8] macintosh/adb-iop: Implement SRQ autopolling
Hi Brad,
Quoted 6 lines · Brad Boyer
Quoted 4 lines · Geert Uytterhoeven
Quoted 1 line
arch/m68k/include/asm/adb_iop.h | 1 +As this header file is used by a single source file only, perhaps it should just be absorbed by the latter?
Then you no longer need my Acked-by for future changes ;-)
Quoted 9 lines
While I don't really feel involved in this specific change (although I was one of the testers when the driver was first written), I am a little curious about the current coding standards. This header is pretty much just a declaration of the hardware interface, of which there are many in this directory. Is it better to just define all the offsets and bits for hardware registers inside the driver? We used to always put them in headers like this, but is that not the current standard? Would it be cleaner to put such headers in the directory with the driver effectively making them private? I seem to see quite a bit of that as well.
The idea behind header files is to share definitions among multipe source files, right? It seems there is only one user of this header file, so no sharing is involved, and thus these definitions are de-facto private to the driver. Hence, the hardware declarations could be absorbed by the driver source file.
In this case having two separate files makes maintenance more difficult, as the two files belong to different maintainer spaces (drivers/macintosh/ and arch/m68k/).
In general, moving header files to the driver directory is an option, if nothing outside the driver directory needs it.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Re: [PATCH 8/8] macintosh/adb-iop: Implement SRQ autopolling
In reply to Geert UytterhoevenQuoted 8 lines · Geert Uytterhoeven
Hi Finn,
Quoted 5 lines · Finn Thain
The adb_driver.autopoll method is needed during ADB bus scan and device address assignment. Implement this method so that the IOP's list of device addresses can be updated. When the list is empty, disable SRQ autopolling.
Quoted 9 lines
Quoted 4 lines
Cc Joshua Thompson <[email protected]>Cc Geert Uytterhoeven <[email protected]>Tested-by Stan Johnson <[email protected]>Signed-off-by Finn Thain <[email protected]>Thanks for your patch!
Thanks for your tag.
Quoted 5 lines
Quoted 2 lines
arch/m68k/include/asm/adb_iop.h | 1 + drivers/macintosh/adb-iop.c | 32 ++++++++++++++++++++++++++------As this header file is used by a single source file only, perhaps it should just be absorbed by the latter?
Sure, it could be absorbed by both asm/mac_iop.h and drivers/macintosh/adb-iop.c but I don't see the point...
Quoted 2 lines
Then you no longer need my Acked-by for future changes ;-)
But you shouldn't need to ack this kind of change in the first place.
IMHO, the arch/m68k/mac maintainer should be the one to ack changes to both arch/m68k/include/asm/adb_iop.h and drivers/macintosh/adb-iop.c.
Not that I'm complaining (thanks again for your ack!)
Geert Uytterhoeven
maintainerRe: [PATCH 8/8] macintosh/adb-iop: Implement SRQ autopolling
Hi Finn,
Quoted 10 lines · Finn Thain
Quoted 6 lines · Geert Uytterhoeven
Quoted 2 lines · Finn Thain
arch/m68k/include/asm/adb_iop.h | 1 + drivers/macintosh/adb-iop.c | 32 ++++++++++++++++++++++++++------As this header file is used by a single source file only, perhaps it should just be absorbed by the latter?
Sure, it could be absorbed by both
asm/mac_iop.handdrivers/macintosh/adb-iop.cbut I don't see the point...
asm/mac_iop.h doesn't include asm/adb_iop.h (at least not in my tree, but perhaps you have plans to change that?), so there's only a single user.
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Re: [PATCH 8/8] macintosh/adb-iop: Implement SRQ autopolling
Quoted 7 lines · Geert Uytterhoeven
Quoted 3 lines
Sure, it could be absorbed by both
asm/mac_iop.handdrivers/macintosh/adb-iop.c[...]
asm/mac_iop.hdoesn't includeasm/adb_iop.h(at least not in my tree, but perhaps you have plans to change that?), so there's only a single user.
What I meant by "both" was that part of asm/adb_iop.h could be absorbed by drivers/macintosh.adb-iop.c and the rest by asm/mac_iop.h. (And some of it could be tossed out.) I suspect that much of arch/m68k/include/asm could get the same treatment. But I doubt that there is any pay off, because the headers rarely change where they relate to hardware characteristics.
Michael Ellerman
AppliedQuoted 8 lines · Finn Thain
The adb-iop driver was never finished. Some deficiencies have become apparent over the years. For example,
- Mouse and/or keyboard may stop working if used together
- SRQ autopoll list cannot be changed
[...]
Applied to powerpc/next.
[1/8] macintosh/adb-iop: Remove dead and redundant code
https://git.kernel.org/powerpc/c/8384c82ab0860cd7db2ce4ec403e574f4ee54b6e [2/8] macintosh/adb-iop: Correct comment text https://git.kernel.org/powerpc/c/ff785e179faf4bb06a2f73b8dcde6dabb66a83d2 [3/8] macintosh/adb-iop: Adopt bus reset algorithm from via-macii driver https://git.kernel.org/powerpc/c/303511edb859b1fbf48b3c1d1d53b33a6ebd2a2b [4/8] macintosh/adb-iop: Access current_req and adb_iop_state when inside lock https://git.kernel.org/powerpc/c/aac840eca8fec02d594560647130d4e4447e10d9 [5/8] macintosh/adb-iop: Resolve static checker warnings https://git.kernel.org/powerpc/c/56b732edda96b1942fff974fd298ea2a2c543b94 [6/8] macintosh/adb-iop: Implement idle -> sending state transition https://git.kernel.org/powerpc/c/32226e81704398317e1cc5a82d24c0ef3cc25e5e [7/8] macintosh/adb-iop: Implement sending -> idle state transition https://git.kernel.org/powerpc/c/e2954e5f727fad126258e83259b513988973c166 [8/8] macintosh/adb-iop: Implement SRQ autopolling https://git.kernel.org/powerpc/c/c66da95a39ec2bb95544c3def974d96e8c178f57
cheers