[PATCH] powerpc: make MAL use the new DCR methods

Eugene Surovegin ebs at ebshome.net
Thu Oct 12 03:47:48 EST 2006


On Wed, Oct 11, 2006 at 03:45:39PM +1000, Benjamin Herrenschmidt wrote:
> This is a test patch to validate the new DCR method code for the
> "native" case. It will ultimately be the first of a pile porting the
> EMAC driver to ARCH=powerpc and non-native DCRs.
> 
> Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
> 
> Index: linux-cell/drivers/net/ibm_emac/ibm_emac_mal.h
> ===================================================================
> --- linux-cell.orig/drivers/net/ibm_emac/ibm_emac_mal.h	2006-10-11 13:01:59.000000000 +1000
> +++ linux-cell/drivers/net/ibm_emac/ibm_emac_mal.h	2006-10-11 14:35:28.000000000 +1000
> @@ -24,6 +24,7 @@
>  #include <linux/netdevice.h>
>  
>  #include <asm/io.h>
> +#include <asm/dcr.h>
>  
>  /*
>   * These MAL "versions" probably aren't the real versions IBM uses for these 
> @@ -191,6 +192,7 @@ struct mal_commac {
>  
>  struct ibm_ocp_mal {
>  	int			dcrbase;
> +	dcr_host_t		dcrhost;
>  
>  	struct list_head	poll_list;
>  	struct net_device	poll_dev;
> @@ -207,12 +209,12 @@ struct ibm_ocp_mal {
>  
>  static inline u32 get_mal_dcrn(struct ibm_ocp_mal *mal, int reg)
>  {
> -	return mfdcr(mal->dcrbase + reg);
> +	return dcr_read(mal->dcrhost, mal->dcrbase + reg);
>  }
>  
>  static inline void set_mal_dcrn(struct ibm_ocp_mal *mal, int reg, u32 val)
>  {
> -	mtdcr(mal->dcrbase + reg, val);
> +	dcr_write(mal->dcrhost, mal->dcrbase + reg, val);
>  }
>  
>  /* Register MAL devices */
> 
> 

Looks fine to me.

Acked-by: Eugene Surovegin <ebs at ebshome.net>



More information about the Linuxppc-dev mailing list