Date: Sun, 14 Nov 2010 05:05:42 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r215280 - head/sys/dev/arcmsr Message-ID: <201011140505.oAE55glh070917@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: delphij Date: Sun Nov 14 05:05:41 2010 New Revision: 215280 URL: http://svn.freebsd.org/changeset/base/215280 Log: Workaround build for PAE case for now - revert the PHYS case to previous panic behavior. I have a real fix that changes the sg dma tag allocation to be limited to the under 4GB address space but would prefer to have review before committing. Modified: head/sys/dev/arcmsr/arcmsr.c Modified: head/sys/dev/arcmsr/arcmsr.c ============================================================================== --- head/sys/dev/arcmsr/arcmsr.c Sun Nov 14 05:01:40 2010 (r215279) +++ head/sys/dev/arcmsr/arcmsr.c Sun Nov 14 05:05:41 2010 (r215280) @@ -2470,11 +2470,15 @@ static void arcmsr_action(struct cam_sim splx(s); } else { /* Buffer is physical */ +#ifdef PAE + panic("arcmsr: CAM_DATA_PHYS not supported"); +#else struct bus_dma_segment seg; seg.ds_addr = (bus_addr_t)pccb->csio.data_ptr; seg.ds_len = pccb->csio.dxfer_len; arcmsr_execute_srb(srb, &seg, 1, 0); +#endif } } else { /* Scatter/gather list */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201011140505.oAE55glh070917>