leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[S390] cio: Base message subchannel handling.

Browse Source 
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
This commit is contained in:
Cornelia Huck 2008-07-14 09:58:48 +02:00 committed by Heiko Carstens
parent 44a1c19e3b
commit b3a686f47a
3 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/s390/cio/cio.c
View File

@ -498,13 +498,8 @@ int cio_create_sch_lock(struct subchannel *sch)
return 0; return 0;
} }
static int cio_validate_io_subchannel(struct subchannel *sch) static int cio_check_devno_blacklisted(struct subchannel *sch)
{ {
/* Initialization for io subchannels. */
if (!css_sch_is_valid(&sch->schib))
return -ENODEV;
/* Devno is valid. */
if (is_blacklisted(sch->schid.ssid, sch->schib.pmcw.dev)) { if (is_blacklisted(sch->schid.ssid, sch->schib.pmcw.dev)) {
/* /*
* This device must not be known to Linux. So we simply * This device must not be known to Linux. So we simply
@ -518,6 +513,26 @@ static int cio_validate_io_subchannel(struct subchannel *sch)
return 0; return 0;
} }
static int cio_validate_io_subchannel(struct subchannel *sch)
{
/* Initialization for io subchannels. */
if (!css_sch_is_valid(&sch->schib))
return -ENODEV;
/* Devno is valid. */
return cio_check_devno_blacklisted(sch);
}
static int cio_validate_msg_subchannel(struct subchannel *sch)
{
/* Initialization for message subchannels. */
if (!css_sch_is_valid(&sch->schib))
return -ENODEV;
/* Devno is valid. */
return cio_check_devno_blacklisted(sch);
}
/** /**
* cio_validate_subchannel - basic validation of subchannel * cio_validate_subchannel - basic validation of subchannel
* @sch: subchannel structure to be filled out * @sch: subchannel structure to be filled out
@ -573,6 +588,9 @@ int cio_validate_subchannel(struct subchannel *sch, struct subchannel_id schid)
case SUBCHANNEL_TYPE_IO: case SUBCHANNEL_TYPE_IO:
err = cio_validate_io_subchannel(sch); err = cio_validate_io_subchannel(sch);
break; break;
case SUBCHANNEL_TYPE_MSG:
err = cio_validate_msg_subchannel(sch);
break;
default: default:
err = 0; err = 0;
} }

2
drivers/s390/cio/cio.h
View File

@ -14,7 +14,7 @@
struct pmcw { struct pmcw {
u32 intparm; /* interruption parameter */ u32 intparm; /* interruption parameter */
u32 qf : 1; /* qdio facility */ u32 qf : 1; /* qdio facility */
u32 res0 : 1; /* reserved zeros */ u32 w : 1;
u32 isc : 3; /* interruption sublass */ u32 isc : 3; /* interruption sublass */
u32 res5 : 3; /* reserved zeros */ u32 res5 : 3; /* reserved zeros */
u32 ena : 1; /* enabled */ u32 ena : 1; /* enabled */

2
drivers/s390/cio/css.c
View File

@ -332,6 +332,8 @@ int css_sch_is_valid(struct schib *schib)
{ {
if ((schib->pmcw.st == SUBCHANNEL_TYPE_IO) && !schib->pmcw.dnv) if ((schib->pmcw.st == SUBCHANNEL_TYPE_IO) && !schib->pmcw.dnv)
return 0; return 0;
if ((schib->pmcw.st == SUBCHANNEL_TYPE_MSG) && !schib->pmcw.w)
return 0;
return 1; return 1;
} }
EXPORT_SYMBOL_GPL(css_sch_is_valid); EXPORT_SYMBOL_GPL(css_sch_is_valid);