diff options
| author | David L Stevens | 2014-09-30 01:47:59 +0200 |
|---|---|---|
| committer | David S. Miller | 2014-09-30 23:17:08 +0200 |
| commit | 163a4e7473061388bba0899a1a063bae44e1715a (patch) | |
| tree | cee8585401e0efb14d3ea54c436b403f144c4513 /arch/sparc/kernel | |
| parent | sparc64: Fix hibernation code refrence to PAGE_OFFSET. (diff) | |
| download | kernel-qcow2-linux-163a4e7473061388bba0899a1a063bae44e1715a.tar.gz kernel-qcow2-linux-163a4e7473061388bba0899a1a063bae44e1715a.tar.xz kernel-qcow2-linux-163a4e7473061388bba0899a1a063bae44e1715a.zip | |
sparc: VIO protocol version 1.6
Add VIO protocol version 1.6 interfaces.
Signed-off-by: David L Stevens <david.stevens@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel')
| -rw-r--r-- | arch/sparc/kernel/viohs.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/arch/sparc/kernel/viohs.c b/arch/sparc/kernel/viohs.c index 9c5fbd0b8a04..526fcb5d8ce9 100644 --- a/arch/sparc/kernel/viohs.c +++ b/arch/sparc/kernel/viohs.c @@ -426,6 +426,13 @@ static int process_dreg_info(struct vio_driver_state *vio, if (vio->dr_state & VIO_DR_STATE_RXREG) goto send_nack; + /* v1.6 and higher, ACK with desired, supported mode, or NACK */ + if (vio_version_after_eq(vio, 1, 6)) { + if (!(pkt->options & VIO_TX_DRING)) + goto send_nack; + pkt->options = VIO_TX_DRING; + } + BUG_ON(vio->desc_buf); vio->desc_buf = kzalloc(pkt->descr_size, GFP_ATOMIC); @@ -453,8 +460,11 @@ static int process_dreg_info(struct vio_driver_state *vio, pkt->tag.stype = VIO_SUBTYPE_ACK; pkt->dring_ident = ++dr->ident; - viodbg(HS, "SEND DRING_REG ACK ident[%llx]\n", - (unsigned long long) pkt->dring_ident); + viodbg(HS, "SEND DRING_REG ACK ident[%llx] " + "ndesc[%u] dsz[%u] opt[0x%x] ncookies[%u]\n", + (unsigned long long) pkt->dring_ident, + pkt->num_descr, pkt->descr_size, pkt->options, + pkt->num_cookies); len = (sizeof(*pkt) + (dr->ncookies * sizeof(struct ldc_trans_cookie))); |