system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-18 14:23:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix inappropriate data type for two bus_dmamap_t variables that were causing

Browse source 
PAE to insta-panic on startup.  Remove one unused variable that was
commented out.

Reviewed by:	ambrisko@
Obtained from:	jhb@ peter@ bz@ and countless others during BSDCAN
MFC after:	3 days
This commit is contained in:
Sean Bruno 2012-05-12 03:30:50 +00:00
parent 50d922a02e
commit 7d96f12c8c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=235318
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sys/dev/mfi/mfi_cam.c
View file

@ -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

5
sys/dev/mfi/mfivar.h
View file

@ -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_dmamap_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_dmamap_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;