Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7039d3a1 authored by Peter Oberparleiter's avatar Peter Oberparleiter Committed by Martin Schwidefsky
Browse files

[S390] dasd: Add ipldev parameter. 



Specifying 'ipldev' in the dasd= kernel parameter will automatically
activate the boot device for use by the dasd driver.

Signed-off-by: default avatarPeter Oberparleiter <peter.oberparleiter@de.ibm.com>
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 4dfd5c45

drivers/s390/block/dasd_devmap.c

+17 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 


#include <asm/debug.h>

#include <asm/uaccess.h>

#include <asm/ipl.h>



/* This is ugly... */

#define PRINTK_HEADER "dasd_devmap:"
@@ -133,6 +134,8 @@ dasd_call_setup(char *str) 
__setup ("dasd=", dasd_call_setup);

#endif	/* #ifndef MODULE */



#define	DASD_IPLDEV	"ipldev"



/*

 * Read a device busid/devno from a string.

 */
@@ -141,6 +144,20 @@ dasd_busid(char **str, int *id0, int *id1, int *devno) 
{

	int val, old_style;



	/* Interpret ipldev busid */

	if (strncmp(DASD_IPLDEV, *str, strlen(DASD_IPLDEV)) == 0) {

		if (ipl_info.type != IPL_TYPE_CCW) {

			MESSAGE(KERN_ERR, "%s", "ipl device is not a ccw "

				"device");

			return -EINVAL;

		}

		*id0 = 0;

		*id1 = ipl_info.data.ccw.dev_id.ssid;

		*devno = ipl_info.data.ccw.dev_id.devno;

		*str += strlen(DASD_IPLDEV);



		return 0;

	}

	/* check for leading '0x' */

	old_style = 0;

	if ((*str)[0] == '0' && (*str)[1] == 'x') {