s390: add PAV support to the dasd driver.
Subsystems (2)
PATCH 18/24 s390: add PAV support to the dasd driver.
From: Horst Hummel <[email protected]>
[S390] add PAV support to the dasd driver.
Add support for parallel-access-volumes to the dasd driver. This allows concurrent access to dasd devices with multiple channel programs.
Signed-off-by Horst Hummel <[email protected]>
Signed-off-by Martin Schwidefsky <[email protected]>
---
drivers/s390/block/dasd.c | 51 ++++++-------- drivers/s390/block/dasd_devmap.c | 81 ++++++++++++++++++++-- drivers/s390/block/dasd_eckd.c | 140 ++++++++++++++++++++++++++++++--------- drivers/s390/block/dasd_eckd.h | 16 +++- drivers/s390/block/dasd_fba.c | 20 ----- drivers/s390/block/dasd_int.h | 2 include/asm-s390/dasd.h | 8 +- 7 files changed, 228 insertions(+), 90 deletions(-)
drivers/s390/block/dasd.c +23 -28
@@ -1855,15 +1855,34 @@ dasd_generic_probe (struct ccw_device *c {int ret; + ret =ccw_device_set_options (cdev,CCWDEV_DO_PATHGROUP ); +if (ret) { +printk (KERN_WARNING +"dasd_generic_probe: could not set ccw-device options " +"for %s\n" , cdev->dev.bus_id); +return ret; + } ret =dasd_add_sysfs_files (cdev);if (ret) {printk (KERN_WARNING "dasd_generic_probe: could not add sysfs entries " "for %s\n" , cdev->dev.bus_id); - }else { - cdev->handler = &dasd_int_handler; +return ret; } + cdev->handler = &dasd_int_handler; +/* +* Automatically online either all dasd devices (dasd_autodetect) +* or all devices specified with dasd= parameters during +* initial probe. +*/ +if ((dasd_get_feature (cdev,DASD_FEATURE_INITIAL_ONLINE ) >0 ) || + (dasd_autodetect &&dasd_busid_known (cdev->dev.bus_id) !=0 )) + ret =ccw_device_set_online (cdev); +if (ret) +printk (KERN_WARNING +"dasd_generic_probe: could not initially online " +"ccw-device %s\n" , cdev->dev.bus_id);return ret; }
@@ -1911,6 +1930,8 @@ dasd_generic_set_online (struct ccw_devistruct dasd_device *device;int rc; +/* first online clears initial online feature flag */ +dasd_set_feature (cdev,DASD_FEATURE_INITIAL_ONLINE ,0 ); device =dasd_create_device (cdev);if (IS_ERR (device))return PTR_ERR (device);
@@ -2065,31 +2086,6 @@ dasd_generic_notify(struct ccw_device *creturn ret; } -/* -* Automatically online either all dasd devices (dasd_autodetect) or -* all devices specified with dasd= parameters. -*/ -static int -__dasd_auto_online (struct device *dev,void *data) -{ -struct ccw_device *cdev; - - cdev =to_ccwdev (dev); -if (dasd_autodetect ||dasd_busid_known (cdev->dev.bus_id) ==0 ) -ccw_device_set_online (cdev); -return 0 ; -} - -void -dasd_generic_auto_online (struct ccw_driver *dasd_discipline_driver) -{ -struct device_driver *drv; - - drv =get_driver (&dasd_discipline_driver->driver); -driver_for_each_device (drv,NULL ,NULL , __dasd_auto_online); -put_driver (drv); -} -static int __init dasd_init (void )
@@ -2170,5 +2166,4 @@ EXPORT_SYMBOL_GPL(dasd_generic_remove);EXPORT_SYMBOL_GPL (dasd_generic_notify);EXPORT_SYMBOL_GPL (dasd_generic_set_online);EXPORT_SYMBOL_GPL (dasd_generic_set_offline); -EXPORT_SYMBOL_GPL (dasd_generic_auto_online);
drivers/s390/block/dasd_devmap.c +72 -9
168 lines not on this page · raw message
drivers/s390/block/dasd_eckd.c +110 -30
188 lines not on this page · raw message
drivers/s390/block/dasd_eckd.h +14 -2
@@ -41,9 +41,10 @@#define DASD_ECKD_CCW_RESERVE 0xB4/* -*Perform Subsystem Function / Sub-Orders +* Perform Subsystem Function / Sub-Orders */ -#define PSF_ORDER_PRSSD 0x18 +#define PSF_ORDER_PRSSD 0x18 +#define PSF_ORDER_SSC 0x1D/***************************************************************************** * SECTION: Type Definitions
@@ -353,4 +354,15 @@ struct dasd_psf_prssd_data {unsigned char varies[9 ]; } __attribute__ ((packed)); +/* +* Perform Subsystem Function - Set Subsystem Characteristics +*/ +struct dasd_psf_ssc_data { +unsigned char order; +unsigned char flags; +unsigned char cu_type[4 ]; +unsigned char suborder; +unsigned char reserved[59 ]; +} __attribute__((packed)); +#endif /* DASD_ECKD_H */
drivers/s390/block/dasd_fba.c +3 -17
@@ -56,19 +56,13 @@ static struct ccw_driver dasd_fba_driverstatic int dasd_fba_probe (struct ccw_device *cdev) { -int ret; - - ret =dasd_generic_probe (cdev, &dasd_fba_discipline); -if (ret) -return ret; -ccw_device_set_options (cdev,CCWDEV_DO_PATHGROUP ); -return 0 ; +return dasd_generic_probe (cdev, &dasd_fba_discipline); }static int dasd_fba_set_online (struct ccw_device *cdev) { -return dasd_generic_set_online (cdev, &dasd_fba_discipline); +return dasd_generic_set_online (cdev, &dasd_fba_discipline); }static struct ccw_driver dasd_fba_driver = {
@@ -569,16 +563,8 @@ static struct dasd_discipline dasd_fba_dstatic int __init dasd_fba_init (void ) { -int ret; -ASCEBC (dasd_fba_discipline.ebcname,4 ); - - ret =ccw_driver_register (&dasd_fba_driver); -if (ret) -return ret; - -dasd_generic_auto_online (&dasd_fba_driver); -return 0 ; +return ccw_driver_register (&dasd_fba_driver); }static void __exit
drivers/s390/block/dasd_int.h +1 -1
@@ -513,12 +513,12 @@ void dasd_generic_remove (struct ccw_devint dasd_generic_set_online (struct ccw_device *,struct dasd_discipline *);int dasd_generic_set_offline (struct ccw_device *cdev);int dasd_generic_notify (struct ccw_device *,int ); -void dasd_generic_auto_online (struct ccw_driver *);/* externals in dasd_devmap.c */ extern int dasd_max_devindex;extern int dasd_probeonly;extern int dasd_autodetect; +extern int dasd_nopav;int dasd_devmap_init (void );void dasd_devmap_exit (void );
include/asm-s390/dasd.h +5 -3
@@ -68,10 +68,12 @@ typedef struct dasd_information2_t {* 0x00: default features * 0x01: readonly (ro) * 0x02: use diag discipline (diag) +* 0x04: set the device initially online (internal use only) */ -#define DASD_FEATURE_DEFAULT 0 -#define DASD_FEATURE_READONLY 1 -#define DASD_FEATURE_USEDIAG 2 +#define DASD_FEATURE_DEFAULT 0x00 +#define DASD_FEATURE_READONLY 0x01 +#define DASD_FEATURE_USEDIAG 0x02 +#define DASD_FEATURE_INITIAL_ONLINE 0x04#define DASD_PARTN_BITS 2