hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[S390] cio: move options to io_sch_private 

Move the options member from struct subchannel to
io_subchannel_private since it's I/O subchannel specific.
Also remove the unused cio_get_options function.

Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Sebastian Ott 2011-03-15 17:08:25 +01:00 committed by Martin Schwidefsky
parent dbda8ce540
commit c513d07a2d
3 changed files with 17 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,29 +84,14 @@ out_unregister:
arch_initcall (cio_debug_init); arch_initcall (cio_debug_init);
int int cio_set_options(struct subchannel *sch, int flags)
cio_set_options (struct subchannel *sch, int flags)
{ {
sch->options.suspend = (flags & DOIO_ALLOW_SUSPEND) != 0; struct io_subchannel_private *priv = to_io_private(sch);
sch->options.prefetch = (flags & DOIO_DENY_PREFETCH) != 0;
sch->options.inter = (flags & DOIO_SUPPRESS_INTER) != 0;
return 0;
}
/* FIXME: who wants to use this? */ priv->options.suspend = (flags & DOIO_ALLOW_SUSPEND) != 0;
int priv->options.prefetch = (flags & DOIO_DENY_PREFETCH) != 0;
cio_get_options (struct subchannel *sch) priv->options.inter = (flags & DOIO_SUPPRESS_INTER) != 0;
{ return 0;
int flags;
flags = 0;
if (sch->options.suspend)
flags |= DOIO_ALLOW_SUSPEND;
if (sch->options.prefetch)
flags |= DOIO_DENY_PREFETCH;
if (sch->options.inter)
flags |= DOIO_SUPPRESS_INTER;
return flags;
} }
static int static int
@ -139,21 +124,21 @@ cio_start_key (struct subchannel *sch, /* subchannel structure */
__u8 lpm, /* logical path mask */ __u8 lpm, /* logical path mask */
__u8 key) /* storage key */ __u8 key) /* storage key */
{ {
struct io_subchannel_private *priv = to_io_private(sch);
union orb *orb = &priv->orb;
int ccode; int ccode;
union orb *orb;
CIO_TRACE_EVENT(5, "stIO"); CIO_TRACE_EVENT(5, "stIO");
CIO_TRACE_EVENT(5, dev_name(&sch->dev)); CIO_TRACE_EVENT(5, dev_name(&sch->dev));
orb = &to_io_private(sch)->orb;
memset(orb, 0, sizeof(union orb)); memset(orb, 0, sizeof(union orb));
/* sch is always under 2G. */ /* sch is always under 2G. */
orb->cmd.intparm = (u32)(addr_t)sch; orb->cmd.intparm = (u32)(addr_t)sch;
orb->cmd.fmt = 1; orb->cmd.fmt = 1;
orb->cmd.pfch = sch->options.prefetch == 0; orb->cmd.pfch = priv->options.prefetch == 0;
orb->cmd.spnd = sch->options.suspend; orb->cmd.spnd = priv->options.suspend;
orb->cmd.ssic = sch->options.suspend && sch->options.inter; orb->cmd.ssic = priv->options.suspend && priv->options.inter;
orb->cmd.lpm = (lpm != 0) ? lpm : sch->lpm; orb->cmd.lpm = (lpm != 0) ? lpm : sch->lpm;
#ifdef CONFIG_64BIT #ifdef CONFIG_64BIT
/* /*

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

@ -84,13 +84,6 @@ struct subchannel {
SUBCHANNEL_TYPE_MSG = 2, SUBCHANNEL_TYPE_MSG = 2,
SUBCHANNEL_TYPE_ADM = 3, SUBCHANNEL_TYPE_ADM = 3,
} st; /* subchannel type */ } st; /* subchannel type */
struct {
unsigned int suspend:1; /* allow suspend */
unsigned int prefetch:1;/* deny prefetch */
unsigned int inter:1; /* suppress intermediate interrupts */
} __attribute__ ((packed)) options;
__u8 vpm; /* verified path mask */ __u8 vpm; /* verified path mask */
__u8 lpm; /* logical path mask */ __u8 lpm; /* logical path mask */
__u8 opm; /* operational path mask */ __u8 opm; /* operational path mask */
@ -118,7 +111,6 @@ extern int cio_start (struct subchannel *, struct ccw1 *, __u8);
extern int cio_start_key (struct subchannel *, struct ccw1 *, __u8, __u8); extern int cio_start_key (struct subchannel *, struct ccw1 *, __u8, __u8);
extern int cio_cancel (struct subchannel *); extern int cio_cancel (struct subchannel *);
extern int cio_set_options (struct subchannel *, int); extern int cio_set_options (struct subchannel *, int);
extern int cio_get_options (struct subchannel *);
extern int cio_update_schib(struct subchannel *sch); extern int cio_update_schib(struct subchannel *sch);
extern int cio_commit_config(struct subchannel *sch); extern int cio_commit_config(struct subchannel *sch);

7
drivers/s390/cio/io_sch.h
View File

@ -10,7 +10,12 @@
struct io_subchannel_private { struct io_subchannel_private {
union orb orb; /* operation request block */ union orb orb; /* operation request block */
struct ccw1 sense_ccw; /* static ccw for sense command */ struct ccw1 sense_ccw; /* static ccw for sense command */
} __attribute__ ((aligned(8))); struct {
unsigned int suspend:1; /* allow suspend */
unsigned int prefetch:1;/* deny prefetch */
unsigned int inter:1; /* suppress intermediate interrupts */
} __packed options;
} __aligned(8);
#define to_io_private(n) ((struct io_subchannel_private *)n->private) #define to_io_private(n) ((struct io_subchannel_private *)n->private)
#define sch_get_cdev(n) (dev_get_drvdata(&n->dev)) #define sch_get_cdev(n) (dev_get_drvdata(&n->dev))