diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-10-10 04:18:02 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-11-05 22:13:49 -0500 |
commit | d7a88c7eb46acb486922822eec3224c0bcab29dc (patch) | |
tree | 8f52d8786168579b156cf982a61c7e51e4799405 /arch/powerpc/platforms | |
parent | 44790a0b93d8481a8dc5bf6aa600941627b56d56 (diff) |
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 <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/platforms')
-rw-r--r-- | arch/powerpc/platforms/powernv/opal-xscom.c | 6 | ||||
-rw-r--r-- | arch/powerpc/platforms/wsp/scom_wsp.c | 4 |
2 files changed, 5 insertions, 5 deletions
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 @@ | |||
27 | */ | 27 | */ |
28 | struct opal_scom_map { | 28 | struct opal_scom_map { |
29 | uint32_t chip; | 29 | uint32_t chip; |
30 | uint32_t addr; | 30 | uint64_t addr; |
31 | }; | 31 | }; |
32 | 32 | ||
33 | static scom_map_t opal_scom_map(struct device_node *dev, u64 reg, u64 count) | 33 | 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) | |||
71 | } | 71 | } |
72 | } | 72 | } |
73 | 73 | ||
74 | static int opal_scom_read(scom_map_t map, u32 reg, u64 *value) | 74 | static int opal_scom_read(scom_map_t map, u64 reg, u64 *value) |
75 | { | 75 | { |
76 | struct opal_scom_map *m = map; | 76 | struct opal_scom_map *m = map; |
77 | int64_t rc; | 77 | int64_t rc; |
@@ -80,7 +80,7 @@ static int opal_scom_read(scom_map_t map, u32 reg, u64 *value) | |||
80 | return opal_xscom_err_xlate(rc); | 80 | return opal_xscom_err_xlate(rc); |
81 | } | 81 | } |
82 | 82 | ||
83 | static int opal_scom_write(scom_map_t map, u32 reg, u64 value) | 83 | static int opal_scom_write(scom_map_t map, u64 reg, u64 value) |
84 | { | 84 | { |
85 | struct opal_scom_map *m = map; | 85 | struct opal_scom_map *m = map; |
86 | int64_t rc; | 86 | 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) | |||
50 | iounmap((void *)map); | 50 | iounmap((void *)map); |
51 | } | 51 | } |
52 | 52 | ||
53 | static int wsp_scom_read(scom_map_t map, u32 reg, u64 *value) | 53 | static int wsp_scom_read(scom_map_t map, u64 reg, u64 *value) |
54 | { | 54 | { |
55 | u64 __iomem *addr = (u64 __iomem *)map; | 55 | u64 __iomem *addr = (u64 __iomem *)map; |
56 | 56 | ||
@@ -59,7 +59,7 @@ static int wsp_scom_read(scom_map_t map, u32 reg, u64 *value) | |||
59 | return 0; | 59 | return 0; |
60 | } | 60 | } |
61 | 61 | ||
62 | static int wsp_scom_write(scom_map_t map, u32 reg, u64 value) | 62 | static int wsp_scom_write(scom_map_t map, u64 reg, u64 value) |
63 | { | 63 | { |
64 | u64 __iomem *addr = (u64 __iomem *)map; | 64 | u64 __iomem *addr = (u64 __iomem *)map; |
65 | 65 | ||