From d7a88c7eb46acb486922822eec3224c0bcab29dc Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Thu, 10 Oct 2013 19:18:02 +1100 Subject: [PATCH] powerpc/scom: Enable 64-bit addresses On P8, XSCOM addresses has a special "indirect" form that requires more than 32-bits, so let's use u64 everywhere in the code instead of u32. Signed-off-by: Benjamin Herrenschmidt --- arch/powerpc/include/asm/scom.h | 8 ++++---- arch/powerpc/platforms/powernv/opal-xscom.c | 6 +++--- arch/powerpc/platforms/wsp/scom_wsp.c | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/powerpc/include/asm/scom.h b/arch/powerpc/include/asm/scom.h index 07dcdcfdaefc..f5cde45b1161 100644 --- a/arch/powerpc/include/asm/scom.h +++ b/arch/powerpc/include/asm/scom.h @@ -54,8 +54,8 @@ struct scom_controller { scom_map_t (*map)(struct device_node *ctrl_dev, u64 reg, u64 count); void (*unmap)(scom_map_t map); - int (*read)(scom_map_t map, u32 reg, u64 *value); - int (*write)(scom_map_t map, u32 reg, u64 value); + int (*read)(scom_map_t map, u64 reg, u64 *value); + int (*write)(scom_map_t map, u64 reg, u64 value); }; extern const struct scom_controller *scom_controller; @@ -137,7 +137,7 @@ static inline void scom_unmap(scom_map_t map) * * Returns 0 (success) or a negative error code */ -static inline int scom_read(scom_map_t map, u32 reg, u64 *value) +static inline int scom_read(scom_map_t map, u64 reg, u64 *value) { int rc; @@ -155,7 +155,7 @@ static inline int scom_read(scom_map_t map, u32 reg, u64 *value) * * Returns 0 (success) or a negative error code */ -static inline int scom_write(scom_map_t map, u32 reg, u64 value) +static inline int scom_write(scom_map_t map, u64 reg, u64 value) { return scom_controller->write(map, reg, value); } diff --git a/arch/powerpc/platforms/powernv/opal-xscom.c b/arch/powerpc/platforms/powernv/opal-xscom.c index 3ed5c6498324..09a90d8897ba 100644 --- a/arch/powerpc/platforms/powernv/opal-xscom.c +++ b/arch/powerpc/platforms/powernv/opal-xscom.c @@ -27,7 +27,7 @@ */ struct opal_scom_map { uint32_t chip; - uint32_t addr; + uint64_t addr; }; static scom_map_t opal_scom_map(struct device_node *dev, u64 reg, u64 count) @@ -71,7 +71,7 @@ static int opal_xscom_err_xlate(int64_t rc) } } -static int opal_scom_read(scom_map_t map, u32 reg, u64 *value) +static int opal_scom_read(scom_map_t map, u64 reg, u64 *value) { struct opal_scom_map *m = map; int64_t rc; @@ -80,7 +80,7 @@ static int opal_scom_read(scom_map_t map, u32 reg, u64 *value) return opal_xscom_err_xlate(rc); } -static int opal_scom_write(scom_map_t map, u32 reg, u64 value) +static int opal_scom_write(scom_map_t map, u64 reg, u64 value) { struct opal_scom_map *m = map; int64_t rc; diff --git a/arch/powerpc/platforms/wsp/scom_wsp.c b/arch/powerpc/platforms/wsp/scom_wsp.c index 54172c4a8a64..8928507affea 100644 --- a/arch/powerpc/platforms/wsp/scom_wsp.c +++ b/arch/powerpc/platforms/wsp/scom_wsp.c @@ -50,7 +50,7 @@ static void wsp_scom_unmap(scom_map_t map) iounmap((void *)map); } -static int wsp_scom_read(scom_map_t map, u32 reg, u64 *value) +static int wsp_scom_read(scom_map_t map, u64 reg, u64 *value) { u64 __iomem *addr = (u64 __iomem *)map; @@ -59,7 +59,7 @@ static int wsp_scom_read(scom_map_t map, u32 reg, u64 *value) return 0; } -static int wsp_scom_write(scom_map_t map, u32 reg, u64 value) +static int wsp_scom_write(scom_map_t map, u64 reg, u64 value) { u64 __iomem *addr = (u64 __iomem *)map; -- 2.20.1