> -----Original Message-----
> From: Emil Medve [mailto:emilian.me...@freescale.com]
> Sent: Wednesday, January 28, 2015 8:05 PM
> To: iommu@lists.linux-foundation.org; j...@8bytes.org; jroe...@suse.de;
> Sethi Varun-B16395
> Cc: Medve Emilian-EMMEDVE1
> Subject: [PATCH 02/26] iommu/fsl: Use SVR_* instead of magic numbers
> 
> Signed-off-by: Emil Medve <emilian.me...@freescale.com>
> ---
>  drivers/iommu/fsl_pamu.c | 27 ++++++++++++++-------------
>  1 file changed, 14 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/iommu/fsl_pamu.c b/drivers/iommu/fsl_pamu.c index
> 652c34d..7d9f8a0 100644
> --- a/drivers/iommu/fsl_pamu.c
> +++ b/drivers/iommu/fsl_pamu.c
> @@ -31,6 +31,7 @@
>  #include <linux/genalloc.h>
>  #include <asm/io.h>
>  #include <asm/bitops.h>
> +#include <asm/mpc85xx.h>
>  #include <asm/fsl_guts.h>
> 
>  #include "fsl_pamu.h"
> @@ -999,19 +1000,19 @@ static const struct {
>       u32 svr;
>       u32 port_id;
>  } port_id_map[] __initconst = {
> -     {0x82100010, 0xFF000000},       /* P2040 1.0 */
> -     {0x82100011, 0xFF000000},       /* P2040 1.1 */
> -     {0x82100110, 0xFF000000},       /* P2041 1.0 */
> -     {0x82100111, 0xFF000000},       /* P2041 1.1 */
> -     {0x82110310, 0xFF000000},       /* P3041 1.0 */
> -     {0x82110311, 0xFF000000},       /* P3041 1.1 */
> -     {0x82010020, 0xFFF80000},       /* P4040 2.0 */
> -     {0x82000020, 0xFFF80000},       /* P4080 2.0 */
> -     {0x82210010, 0xFC000000},       /* P5010 1.0 */
> -     {0x82210020, 0xFC000000},       /* P5010 2.0 */
> -     {0x82200010, 0xFC000000},       /* P5020 1.0 */
> -     {0x82050010, 0xFF800000},       /* P5021 1.0 */
> -     {0x82040010, 0xFF800000},       /* P5040 1.0 */
> +     {(SVR_P2040 << 8) | 0x10, 0xFF000000},  /* P2040 1.0 */
> +     {(SVR_P2040 << 8) | 0x11, 0xFF000000},  /* P2040 1.1 */
> +     {(SVR_P2041 << 8) | 0x10, 0xFF000000},  /* P2041 1.0 */
> +     {(SVR_P2041 << 8) | 0x11, 0xFF000000},  /* P2041 1.1 */
> +     {(SVR_P3041 << 8) | 0x10, 0xFF000000},  /* P3041 1.0 */
> +     {(SVR_P3041 << 8) | 0x11, 0xFF000000},  /* P3041 1.1 */
> +     {(SVR_P4040 << 8) | 0x20, 0xFFF80000},  /* P4040 2.0 */
> +     {(SVR_P4080 << 8) | 0x20, 0xFFF80000},  /* P4080 2.0 */
> +     {(SVR_P5010 << 8) | 0x10, 0xFC000000},  /* P5010 1.0 */
> +     {(SVR_P5010 << 8) | 0x20, 0xFC000000},  /* P5010 2.0 */
> +     {(SVR_P5020 << 8) | 0x10, 0xFC000000},  /* P5020 1.0 */
> +     {(SVR_P5021 << 8) | 0x10, 0xFF800000},  /* P5021 1.0 */
> +     {(SVR_P5040 << 8) | 0x10, 0xFF800000},  /* P5040 1.0 */
>  };
> 
>  #define SVR_SECURITY 0x80000 /* The Security (E) bit */
> --
> 2.2.2
Acked-by: Varun Sethi <varun.se...@freescale.com>
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

Reply via email to