Author: sbruno
Date: Wed May 16 22:19:22 2012
New Revision: 235525
URL: http://svn.freebsd.org/changeset/base/235525
Log:
MFC r235318, r235321
Fix inappropriate data type for two bus_dmamap_t variables that were causing
PAE to insta-panic on startup. Remove one unused variable that was
commented out.
Modified:
stable/9/sys/dev/mfi/mfi_cam.c
stable/9/sys/dev/mfi/mfivar.h
Directory Properties:
stable/9/sys/ (props changed)
Modified: stable/9/sys/dev/mfi/mfi_cam.c
==============================================================================
--- stable/9/sys/dev/mfi/mfi_cam.c Wed May 16 22:13:02 2012
(r235524)
+++ stable/9/sys/dev/mfi/mfi_cam.c Wed May 16 22:19:22 2012
(r235525)
@@ -293,8 +293,8 @@ mfip_start(void *data)
pt->header.data_len = csio->dxfer_len;
pt->header.sense_len = MFI_SENSE_LEN;
pt->header.cdb_len = csio->cdb_len;
- pt->sense_addr_lo = cm->cm_sense_busaddr;
- pt->sense_addr_hi = 0;
+ pt->sense_addr_lo = (uint32_t)cm->cm_sense_busaddr;
+ pt->sense_addr_hi = (uint32_t)((uint64_t)cm->cm_sense_busaddr >> 32);
if (ccbh->flags & CAM_CDB_POINTER)
bcopy(csio->cdb_io.cdb_ptr, &pt->cdb[0], csio->cdb_len);
else
Modified: stable/9/sys/dev/mfi/mfivar.h
==============================================================================
--- stable/9/sys/dev/mfi/mfivar.h Wed May 16 22:13:02 2012
(r235524)
+++ stable/9/sys/dev/mfi/mfivar.h Wed May 16 22:19:22 2012
(r235525)
@@ -176,7 +176,7 @@ struct mfi_softc {
// Start: LSIP200113393
bus_dma_tag_t verbuf_h_dmat;
bus_dmamap_t verbuf_h_dmamap;
- uint32_t verbuf_h_busaddr;
+ bus_addr_t verbuf_h_busaddr;
uint32_t *verbuf;
void *kbuff_arr[MAX_IOCTL_SGE];
bus_dma_tag_t mfi_kbuff_arr_dmat[2];
@@ -232,7 +232,7 @@ struct mfi_softc {
bus_dma_tag_t mfi_sense_dmat;
bus_dmamap_t mfi_sense_dmamap;
- uint32_t mfi_sense_busaddr;
+ bus_addr_t mfi_sense_busaddr;
struct mfi_sense *mfi_sense;
struct resource *mfi_irq;
@@ -319,7 +319,6 @@ struct mfi_softc {
uint8_t * request_message_pool;
uint8_t * request_message_pool_align;
uint8_t * request_desc_pool;
- //uint32_t request_desc_busaddr;
bus_addr_t request_msg_busaddr;
bus_addr_t reply_frame_busaddr;
bus_addr_t sg_frame_busaddr;
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
