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

Commit d1eb16e6 authored by Sebastian Ott's avatar Sebastian Ott Committed by Martin Schwidefsky
Browse files

s390/cio: add condev keyword to cio_ignore 



Provide a 'condev' keyword to cio_ignore to (un)ignore the
CCW console device.

Reviewed-by: default avatarPeter Oberparleiter <peter.oberparleiter@de.ibm.com>
Signed-off-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 0e6c83d1

Documentation/s390/CommonIO

+6 −5
Original line number Original line Diff line number Diff line
@@ -10,7 +10,7 @@ Command line parameters 




* cio_ignore = device[,device[,..]]

* cio_ignore = device[,device[,..]]





	device := {all | [!]ipldev | [!]<devno> | [!]<devno>-<devno>}

	device := {all | [!]ipldev | [!]condev | [!]<devno> | [!]<devno>-<devno>}





  The given devices will be ignored by the common I/O-layer; no detection

  The given devices will be ignored by the common I/O-layer; no detection

  and device sensing will be done on any of those devices. The subchannel to 

  and device sensing will be done on any of those devices. The subchannel to
@@ -24,10 +24,11 @@ Command line parameters 
  device numbers (0xabcd or abcd, for 2.4 backward compatibility). If you

  device numbers (0xabcd or abcd, for 2.4 backward compatibility). If you

  give a device number 0xabcd, it will be interpreted as 0.0.abcd.

  give a device number 0xabcd, it will be interpreted as 0.0.abcd.





  You can use the 'all' keyword to ignore all devices. The 'ipldev' keyword can

  You can use the 'all' keyword to ignore all devices. The 'ipldev' and 'condev'

  be used to refer to the CCW based boot device (this is probably useful only

  keywords can be used to refer to the CCW based boot device and CCW console

  when combined with the '!' operator). The '!' operator will cause the I/O-layer

  device respectively (these are probably useful only when combined with the '!'

  to _not_ ignore a device. The command line is parsed from left to right.

  operator). The '!' operator will cause the I/O-layer to _not_ ignore a device.

  The command line is parsed from left to right.





  For example, 

  For example, 

	cio_ignore=0.0.0023-0.0.0042,0.0.4711

	cio_ignore=0.0.0023-0.0.0042,0.0.4711

drivers/s390/cio/blacklist.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -189,6 +189,13 @@ static int blacklist_parse_parameters(char *str, range_action action, 
			to_cssid = from_cssid;

			to_cssid = from_cssid;

			to_ssid = from_ssid;

			to_ssid = from_ssid;

			to = from;

			to = from;

		} else if (strcmp(parm, "condev") == 0) {

			if (console_devno == -1)

				continue;



			from_cssid = to_cssid = 0;

			from_ssid = to_ssid = 0;

			from = to = console_devno;

		} else {

		} else {

			rc = parse_busid(strsep(&parm, "-"), &from_cssid,

			rc = parse_busid(strsep(&parm, "-"), &from_cssid,

					 &from_ssid, &from, msgtrigger);

					 &from_ssid, &from, msgtrigger);