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>
scom_map_t (*map)(struct device_node *ctrl_dev, u64 reg, u64 count);
void (*unmap)(scom_map_t map);
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;
};
extern const struct scom_controller *scom_controller;
*
* Returns 0 (success) or a negative error code
*/
*
* 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)
*
* Returns 0 (success) or a negative error code
*/
*
* 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);
}
{
return scom_controller->write(map, reg, value);
}
*/
struct opal_scom_map {
uint32_t chip;
*/
struct opal_scom_map {
uint32_t chip;
};
static scom_map_t opal_scom_map(struct device_node *dev, u64 reg, u64 count)
};
static scom_map_t opal_scom_map(struct device_node *dev, u64 reg, u64 count)
-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;
{
struct opal_scom_map *m = map;
int64_t rc;
return opal_xscom_err_xlate(rc);
}
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;
{
struct opal_scom_map *m = map;
int64_t rc;
-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;
{
u64 __iomem *addr = (u64 __iomem *)map;
-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;
{
u64 __iomem *addr = (u64 __iomem *)map;