diff options
| author | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2012-10-29 18:22:46 +0000 |
|---|---|---|
| committer | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2012-10-29 18:22:46 +0000 |
| commit | edc951f00d362568d65ddb8392e22997e83e2d81 (patch) | |
| tree | e470c6af7a0fa4184e6dbb6f0e794148aa86670c | |
| parent | bdd6cb3b208227cc5bb98d24c6b2a44666658b2e (diff) | |
don't split mq sge paddr into low and high parts
| -rw-r--r-- | sys/dev/pci/oce.c | 5 | ||||
| -rw-r--r-- | sys/dev/pci/ocereg.h | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sys/dev/pci/oce.c b/sys/dev/pci/oce.c index 8c1945157ae..ed8146c04e9 100644 --- a/sys/dev/pci/oce.c +++ b/sys/dev/pci/oce.c @@ -1,4 +1,4 @@ -/* $OpenBSD: oce.c,v 1.22 2012/10/29 18:22:11 mikeb Exp $ */ +/* $OpenBSD: oce.c,v 1.23 2012/10/29 18:22:45 mikeb Exp $ */ /* * Copyright (c) 2012 Mike Belopuhov @@ -265,8 +265,7 @@ oce_cmd(struct oce_softc *sc, int subsys, int opcode, int version, mbx->u0.s.sge_count = 1; oce_dma_sync(&sgl, BUS_DMASYNC_PREWRITE); bcopy(payload, epayload, length); - mbx->payload.u0.u1.sgl[0].pa_lo = ADDR_LO(sgl.paddr); - mbx->payload.u0.u1.sgl[0].pa_hi = ADDR_HI(sgl.paddr); + mbx->payload.u0.u1.sgl[0].paddr = sgl.paddr; mbx->payload.u0.u1.sgl[0].length = length; hdr = OCE_DMAPTR(&sgl, struct mbx_hdr); } else { diff --git a/sys/dev/pci/ocereg.h b/sys/dev/pci/ocereg.h index 833cf2bfa99..d7d181c26d8 100644 --- a/sys/dev/pci/ocereg.h +++ b/sys/dev/pci/ocereg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ocereg.h,v 1.13 2012/10/29 18:22:11 mikeb Exp $ */ +/* $OpenBSD: ocereg.h,v 1.14 2012/10/29 18:22:45 mikeb Exp $ */ /*- * Copyright (C) 2012 Emulex @@ -230,8 +230,7 @@ struct oce_eqe { /* MQ scatter gather entry. Array of these make an SGL */ struct oce_mq_sge { - uint32_t pa_lo; - uint32_t pa_hi; + uint64_t paddr; uint32_t length; } __packed; |