Build fixes for Broadcom DMA Pageops in 2.6
PATCH 1/1 Build fixes for Broadcom DMA Pageops in 2.6
Hello !
Attached patch incorporates build related fixes to the Broadcom DMA Pageops in 2.6. Please review ...
Thanks
Manish Lachwani
Source: MontaVista Software, Inc. | URL | Manish Lachwani <[email protected]>
Type: Defect Fix
Disposition: Submitted to Linux-MIPS
Description:
Build fixes for Broadcom DMA Page Ops
arch/mips/mm/pg-sb1.c +6 -6
@@ -162,7 +162,7 @@void sb1_dma_init (void ) {int cpu =smp_processor_id (); -uint64_t base_val =PHYSADDR (&page_descr[cpu]) |V_DM_DSCR_BASE_RINGSZ (1 ); +uint64_t base_val =CPHYSADDR (&page_descr[cpu]) |V_DM_DSCR_BASE_RINGSZ (1 );__raw_writeq (base_val,IOADDR (A_DM_REGISTER (cpu,R_DM_DSCR_BASE )));
@@ -180,7 +180,7 @@if (KSEGX (page) !=CAC_BASE )return clear_page_cpu (page); - page_descr[cpu].dscr_a =PHYSADDR (page) |M_DM_DSCRA_ZERO_MEM |M_DM_DSCRA_L2C_DEST |M_DM_DSCRA_INTERRUPT ; + page_descr[cpu].dscr_a =CPHYSADDR (page) |M_DM_DSCRA_ZERO_MEM |M_DM_DSCRA_L2C_DEST |M_DM_DSCRA_INTERRUPT ; page_descr[cpu].dscr_b =V_DM_DSCRB_SRC_LENGTH (PAGE_SIZE );__raw_writeq (1 ,IOADDR (A_DM_REGISTER (cpu,R_DM_DSCR_COUNT )));
@@ -195,16 +195,16 @@void copy_page (void *to,void *from) { -unsigned long from_phys =PHYSADDR (from); -unsigned long to_phys =PHYSADDR (to); +unsigned long from_phys =CPHYSADDR (from); +unsigned long to_phys =CPHYSADDR (to);int cpu =smp_processor_id ();/* if either page is above Kseg0, use old way */ if ((KSEGX (to) !=CAC_BASE ) || (KSEGX (from) !=CAC_BASE ))return copy_page_cpu (to, from); - page_descr[cpu].dscr_a =PHYSADDR (to_phys) |M_DM_DSCRA_L2C_DEST |M_DM_DSCRA_INTERRUPT ; - page_descr[cpu].dscr_b =PHYSADDR (from_phys) |V_DM_DSCRB_SRC_LENGTH (PAGE_SIZE ); + page_descr[cpu].dscr_a =CPHYSADDR (to_phys) |M_DM_DSCRA_L2C_DEST |M_DM_DSCRA_INTERRUPT ; + page_descr[cpu].dscr_b =CPHYSADDR (from_phys) |V_DM_DSCRB_SRC_LENGTH (PAGE_SIZE );__raw_writeq (1 ,IOADDR (A_DM_REGISTER (cpu,R_DM_DSCR_COUNT )));/*