powerpc/macio: Rework hotplug media bay support
Subsystems (4)
PATCH 3/5 powerpc/macio: Rework hotplug media bay support
The hotplug mediabay has tendrils deep into drivers/ide code which makes a libata port reather difficult. In addition it's ugly and could be done better.
This reworks the interface between the mediabay and the rest of the world so that:
- Any macio_driver can now have a mediabay_event callback
which will be called when that driver sits on a mediabay and it's been either plugged or unplugged. The device type is passed as an argument. We can now move all the IDE cruft into the IDE driver itself
- A check_media_bay() function can be used to take a peek
at the type of device currently in the bay if any, a cleaner variant of the previous function with the same name.
- A pair of lock/unlock functions are exposed to allow the
IDE driver to block the hotplug callbacks during the initial setup and probing of the bay in order to avoid nasty race conditions.
- The mediabay code no longer needs to spin on the status
register of the IDE interface when it detects an IDE device, this is done just fine by the IDE code itself
Overall, less code, simpler, and allows for another driver than our old drivers/ide based one.
---
arch/powerpc/include/asm/macio.h | 3 arch/powerpc/include/asm/mediabay.h | 29 +-- drivers/block/swim3.c | 39 +--- drivers/ide/pmac.c | 87 ++++++--- drivers/macintosh/mediabay.c | 328 +++++++++++++----------------------- 5 files changed, 213 insertions(+), 273 deletions(-)
arch/powerpc/include/asm/macio.h +3 -0
@@ -134,6 +134,9 @@ struct macio_driverint (*resume)(struct macio_dev * dev);int (*shutdown)(struct macio_dev * dev); +#ifdef CONFIG_PMAC_MEDIABAY +void (*mediabay_event)(struct macio_dev * dev,int mb_state); +#endif struct device_driver driver; };#define to_macio_driver (drv) container_of(drv,struct macio_driver, driver)
arch/powerpc/include/asm/mediabay.h +17 -12
@@ -17,26 +17,31 @@#define MB_POWER 6/* media bay contains a Power device (???) */ #define MB_NO 7/* media bay contains nothing */ -/* Number of bays in the machine or 0 */ -extern int media_bay_count; +struct macio_dev ; -#ifdef CONFIG_BLK_DEV_IDE_PMAC -#include <linux/ide.h> +#ifdef CONFIG_PMAC_MEDIABAY -int check_media_bay_by_base (unsigned long base,int what); -/* called by IDE PMAC host driver to register IDE controller for media bay */ -int media_bay_set_ide_infos (struct device_node *which_bay,unsigned long base, -int irq,ide_hwif_t *hwif); - -int check_media_bay (struct device_node *which_bay,int what); +/* Check the content type of the bay, returns MB_NO if the bay is still +* transitionning +*/ +extern int check_media_bay (struct macio_dev *bay); + +/* The ATA driver uses the calls below to temporarily hold on the +* media bay callbacks while initializing the interface +*/ +extern void lock_media_bay (struct macio_dev *bay); +extern void unlock_media_bay (struct macio_dev *bay);#else -static inline int check_media_bay (struct device_node *which_bay,int what) +static inline int check_media_bay (struct macio_dev *bay) { -return -ENODEV ; +return MB_NO ; } +static inline void lock_media_bay (struct macio_dev *bay) { } +static inline void unlock_media_bay (struct macio_dev *bay) { } +#endif #endif /* __KERNEL__ */
drivers/macintosh/mediabay.c +122 -206
456 lines not on this page · raw message
drivers/ide/pmac.c +55 -32
165 lines not on this page · raw message
drivers/block/swim3.c +16 -23
@@ -200,7 +200,7 @@ struct floppy_state {int ejected;wait_queue_head_t wait;int wanted; -struct device_node * media_bay;/* NULL when not in bay */ +struct macio_dev *mdev;char dbdma_cmd_space[5 *sizeof (struct dbdma_cmd )]; };
@@ -303,14 +303,13 @@ static int swim3_readbit(struct floppy_sstatic void do_fd_request (struct request_queue * q) {int i; -for (i=0 ;i<floppy_count;i++) - { -#ifdef CONFIG_PMAC_MEDIABAY -if (floppy_states[i].media_bay && -check_media_bay (floppy_states[i].media_bay,MB_FD )) + +for (i=0 ; i<floppy_count; i++) { +struct floppy_state *fs = &floppy_states[i]; +if (fs->mdev->media_bay && +check_media_bay (fs->mdev->media_bay) !=MB_FD )continue ; -#endif /* CONFIG_PMAC_MEDIABAY */ -start_request (&floppy_states[i]); +start_request (fs); } }
@@ -849,10 +848,9 @@ static int floppy_ioctl(struct block_devif ((cmd &0x80 ) && !capable (CAP_SYS_ADMIN ))return -EPERM ; -#ifdef CONFIG_PMAC_MEDIABAY -if (fs->media_bay &&check_media_bay (fs->media_bay,MB_FD )) +if (fs->mdev->media_bay && +check_media_bay (fs->mdev->media_bay) !=MB_FD )return -ENXIO ; -#endif switch (cmd) {case FDEJECT :
@@ -876,10 +874,9 @@ static int floppy_open(struct block_deviint n, err =0 ;if (fs->ref_count ==0 ) { -#ifdef CONFIG_PMAC_MEDIABAY -if (fs->media_bay &&check_media_bay (fs->media_bay,MB_FD )) +if (fs->mdev->media_bay && +check_media_bay (fs->mdev->media_bay) !=MB_FD )return -ENXIO ; -#endif out_8 (&sw->setup,S_IBM_DRIVE |S_FCLK_DIV2 );out_8 (&sw->control_bic,0xff );out_8 (&sw->mode,0x95 );
@@ -963,10 +960,9 @@ static int floppy_revalidate(struct gendstruct swim3 __iomem *sw;int ret, n; -#ifdef CONFIG_PMAC_MEDIABAY -if (fs->media_bay &&check_media_bay (fs->media_bay,MB_FD )) +if (fs->mdev->media_bay && +check_media_bay (fs->mdev->media_bay) !=MB_FD )return -ENXIO ; -#endif sw = fs->swim3;grab_drive (fs, revalidating,0 );
@@ -1009,7 +1005,6 @@ static const struct block_device_operatistatic int swim3_add_device (struct macio_dev *mdev,int index) {struct device_node *swim = mdev->ofdev.node; -struct device_node *mediabay;struct floppy_state *fs = &floppy_states[index];int rc = -EBUSY ;
@@ -1036,9 +1031,7 @@ static int swim3_add_device(struct macio }dev_set_drvdata (&mdev->ofdev.dev, fs); - mediabay = (strcasecmp (swim->parent->type,"media-bay" ) ==0 ) ? - swim->parent :NULL ; -if (mediabay ==NULL ) +if (mdev->media_bay ==NULL )pmac_call_feature (PMAC_FTR_SWIM3_ENABLE , swim,0 ,1 );memset (fs,0 ,sizeof (*fs));
@@ -1068,7 +1061,7 @@ static int swim3_add_device(struct macio fs->secpercyl =36 ; fs->secpertrack =18 ; fs->total_secs =2880 ; - fs->media_bay = mediabay; + fs->mdev = mdev;init_waitqueue_head (&fs->wait); fs->dma_cmd = (struct dbdma_cmd *)DBDMA_ALIGN (fs->dbdma_cmd_space);
@@ -1093,7 +1086,7 @@ static int swim3_add_device(struct macioinit_timer (&fs->timeout);printk (KERN_INFO "fd%d: SWIM3 floppy controller %s\n" , floppy_count, - mediabay ?"in media bay" :"" ); + mdev->media_bay ?"in media bay" :"" );return 0 ;