ppc32 8xx: use io accessor macros instead of direct memory reference
PATCH 1/1 ppc32 8xx: use io accessor macros instead of direct memory reference
Convert core 8xx drivers to use in_xxxbe/in_xxx macros instead of direct memory references.
Other than making IO accesses explicit (which is a plus for readability), a common set of macros provides a unified place for the volatile flag to constraint compiler code reordering.
There are several unlucky places at the moment which lack the volatile flag.
Signed-off-by Marcelo Tosatti <[email protected]>
arch/ppc/8xx_io/commproc.c +10 -10
@@ -73,7 +73,7 @@ cpm_mask_irq(unsigned int irq) {int cpm_vec = irq -CPM_IRQ_OFFSET ; - ((immap_t *)IMAP_ADDR )->im_cpic.cpic_cimr &= ~(1 << cpm_vec); +out_be32 (&((immap_t *)IMAP_ADDR )->im_cpic.cpic_cimr,in_be32 (&((immap_t *)IMAP_ADDR )->im_cpic.cpic_cimr) & ~(1 << cpm_vec)); } static void
@@ -81,7 +81,7 @@ cpm_unmask_irq(unsigned int irq) {int cpm_vec = irq -CPM_IRQ_OFFSET ; - ((immap_t *)IMAP_ADDR )->im_cpic.cpic_cimr |= (1 << cpm_vec); +out_be32 (&((immap_t *)IMAP_ADDR )->im_cpic.cpic_cimr,in_be32 (&((immap_t *)IMAP_ADDR )->im_cpic.cpic_cimr) | (1 << cpm_vec)); } static void
@@ -95,7 +95,7 @@ cpm_eoi(unsigned int irq) {int cpm_vec = irq -CPM_IRQ_OFFSET ; - ((immap_t *)IMAP_ADDR )->im_cpic.cpic_cisr = (1 << cpm_vec); +out_be32 (&((immap_t *)IMAP_ADDR )->im_cpic.cpic_cisr, (1 << cpm_vec)); }struct hw_interrupt_type cpm_pic = {
@@ -133,7 +133,7 @@ m8xx_cpm_reset(void)* manual recommends it. * Bit 25, FAM can also be set to use FEC aggressive mode (860T). */ - imp->im_siu_conf.sc_sdcr =1 ; +out_be32 (&imp->im_siu_conf.sc_sdcr,1 ),/* Reclaim the DP memory for our use. */ m8xx_cpm_dpinit ();
@@ -178,10 +178,10 @@ cpm_interrupt_init(void)/* Initialize the CPM interrupt controller. */ - ((immap_t *)IMAP_ADDR )->im_cpic.cpic_cicr = +out_be32 (&((immap_t *)IMAP_ADDR )->im_cpic.cpic_cicr, (CICR_SCD_SCC4 |CICR_SCC_SCC3 |CICR_SCB_SCC2 |CICR_SCA_SCC1 ) | - ((CPM_INTERRUPT /2 ) <<13 ) |CICR_HP_MASK ; - ((immap_t *)IMAP_ADDR )->im_cpic.cpic_cimr =0 ; + ((CPM_INTERRUPT /2 ) <<13 ) |CICR_HP_MASK ); +out_be32 (&((immap_t *)IMAP_ADDR )->im_cpic.cpic_cimr,0 );/* install the CPM interrupt controller routines for the CPM * interrupt vectors
@@ -198,7 +198,7 @@ cpm_interrupt_init(void)if (setup_irq (CPM_IRQ_OFFSET +CPMVEC_ERROR , &cpm_error_irqaction))panic ("Could not allocate CPM error IRQ!" ); - ((immap_t *)IMAP_ADDR )->im_cpic.cpic_cicr |=CICR_IEN ; +out_be32 (&((immap_t *)IMAP_ADDR )->im_cpic.cpic_cicr,in_be32 (&((immap_t *)IMAP_ADDR )->im_cpic.cpic_cicr) |CICR_IEN ); }/*
@@ -212,8 +212,8 @@ cpm_get_irq(struct pt_regs *regs)/* Get the vector by setting the ACK bit and then reading * the register. */ - ((volatile immap_t *)IMAP_ADDR )->im_cpic.cpic_civr =1 ; - cpm_vec = ((volatile immap_t *)IMAP_ADDR )->im_cpic.cpic_civr; +out_be16 (&((volatile immap_t *)IMAP_ADDR )->im_cpic.cpic_civr,1 ); + cpm_vec =in_be16 (&((volatile immap_t *)IMAP_ADDR )->im_cpic.cpic_civr); cpm_vec >>=11 ;return cpm_vec;
arch/ppc/syslib/m8xx_setup.c +20 -25
97 lines not on this page · raw message
arch/ppc/syslib/m8xx_wdt.c +7 -7
@@ -29,8 +29,8 @@ void m8xx_wdt_reset(void) {volatile immap_t *imap = (volatile immap_t *)IMAP_ADDR ; - imap->im_siu_conf.sc_swsr =0x556c ;/* write magic1 */ - imap->im_siu_conf.sc_swsr =0xaa39 ;/* write magic2 */ +out_be16 (imap->im_siu_conf.sc_swsr,0x556c );/* write magic1 */ +out_be16 (imap->im_siu_conf.sc_swsr,0xaa39 );/* write magic2 */ }static irqreturn_t m8xx_wdt_interrupt (int irq,void *dev,struct pt_regs *regs)
@@ -39,7 +39,7 @@ static irqreturn_t m8xx_wdt_interrupt(inm8xx_wdt_reset (); - imap->im_sit.sit_piscr |=PISCR_PS ;/* clear irq */ +out_be16 (imap->im_sit.sit_piscr,in_be16 (imap->im_sit.sit_piscr |PISCR_PS ));/* clear irq */ return IRQ_HANDLED ; }
@@ -51,7 +51,7 @@ void __init m8xx_wdt_handler_install(bd_u32 sypcr;u32 pitrtclk; - sypcr = imap->im_siu_conf.sc_sypcr; + sypcr =in_be32 (imap->im_siu_conf.sc_sypcr);if (!(sypcr &0x04 )) { printk(KERN_NOTICE "m8xx_wdt: wdt disabled (SYPCR: 0x%08X)\n",
@@ -87,9 +87,9 @@ void __init m8xx_wdt_handler_install(bd_else pitc = pitrtclk * wdt_timeout / binfo->bi_intfreq /2 ; - imap->im_sit.sit_pitc = pitc <<16 ; - imap->im_sit.sit_piscr = - (mk_int_int_mask (PIT_INTERRUPT ) <<8 ) |PISCR_PIE |PISCR_PTE ; +out_be32 (imap->im_sit.sit_pitc, pitc <<16 ); + +out_be16 (imap->im_sit.sit_piscr, (mk_int_int_mask (PIT_INTERRUPT ) <<8 ) |PISCR_PIE |PISCR_PTE );if (setup_irq (PIT_INTERRUPT , &m8xx_wdt_irqaction))panic ("m8xx_wdt: error setting up the watchdog irq!" );
arch/ppc/syslib/ppc8xx_pic.c +7 -10
@@ -6,6 +6,7 @@#include <linux/signal.h> #include <linux/interrupt.h> #include <asm/irq.h> +#include <asm/io.h> #include <asm/8xx_immap.h> #include <asm/mpc8xx.h> #include "ppc8xx_pic.h"
@@ -29,8 +30,7 @@ static void m8xx_mask_irq(unsigned int i word = irq_nr >>5 ; ppc_cached_irq_mask[word] &= ~(1 << (31 -bit)); - ((immap_t *)IMAP_ADDR )->im_siu_conf.sc_simask = - ppc_cached_irq_mask[word]; +out_be32 (&((immap_t *)IMAP_ADDR )->im_siu_conf.sc_simask, ppc_cached_irq_mask[word]); }static void m8xx_unmask_irq (unsigned int irq_nr)
@@ -41,8 +41,7 @@ static void m8xx_unmask_irq(unsigned int word = irq_nr >>5 ; ppc_cached_irq_mask[word] |= (1 << (31 -bit)); - ((immap_t *)IMAP_ADDR )->im_siu_conf.sc_simask = - ppc_cached_irq_mask[word]; +out_be32 (&((immap_t *)IMAP_ADDR )->im_siu_conf.sc_simask, ppc_cached_irq_mask[word]); }static void m8xx_end_irq (unsigned int irq_nr)
@@ -55,8 +54,7 @@ static void m8xx_end_irq(unsigned int ir word = irq_nr >>5 ; ppc_cached_irq_mask[word] |= (1 << (31 -bit)); - ((immap_t *)IMAP_ADDR )->im_siu_conf.sc_simask = - ppc_cached_irq_mask[word]; +out_be32 (&((immap_t *)IMAP_ADDR )->im_siu_conf.sc_simask, ppc_cached_irq_mask[word]); } }
@@ -69,9 +67,8 @@ static void m8xx_mask_and_ack(unsigned i word = irq_nr >>5 ; ppc_cached_irq_mask[word] &= ~(1 << (31 -bit)); - ((immap_t *)IMAP_ADDR )->im_siu_conf.sc_simask = - ppc_cached_irq_mask[word]; - ((immap_t *)IMAP_ADDR )->im_siu_conf.sc_sipend =1 << (31 -bit); +out_be32 (&((immap_t *)IMAP_ADDR )->im_siu_conf.sc_simask, ppc_cached_irq_mask[word]); +out_be32 (&((immap_t *)IMAP_ADDR )->im_siu_conf.sc_sipend,1 << (31 -bit)); }struct hw_interrupt_type ppc8xx_pic = {
@@ -93,7 +90,7 @@ m8xx_get_irq(struct pt_regs *regs)/* For MPC8xx, read the SIVEC register and shift the bits down * to get the irq number. */ - irq = ((immap_t *)IMAP_ADDR )->im_siu_conf.sc_sivec >>26 ; + irq =in_be32 (&((immap_t *)IMAP_ADDR )->im_siu_conf.sc_sivec) >>26 ;/* * When we read the sivec without an interrupt to process, we will