[Skiboot] [PATCH 03/10] centaur: Add API to enable/disable the sensor cache
Benjamin Herrenschmidt
benh at kernel.crashing.org
Tue Jun 23 14:25:53 AEST 2015
The i2c driver will need to use them to avoid conflicts between
i2c accesses initiated by the host and by the sensor cache.
Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
---
hw/centaur.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
include/centaur.h | 4 ++++
2 files changed, 63 insertions(+)
diff --git a/hw/centaur.c b/hw/centaur.c
index 6504e92..24d2836 100644
--- a/hw/centaur.c
+++ b/hw/centaur.c
@@ -21,6 +21,7 @@
#include <centaur.h>
#include <lock.h>
#include <fsi-master.h>
+#include <timebase.h>
/*
* Centaur chip IDs are using the XSCOM "partID" encoding
@@ -52,6 +53,12 @@
#define FSI_STATUS_ABORT 0x00100000
#define FSI_STATUS_ERRORS 0x00007000
+/* Some Centaur XSCOMs we care about */
+#define SCAC_CONFIG_REG 0x020115ce
+#define SCAC_CONFIG_SET 0x020115cf
+#define SCAC_CONFIG_CLR 0x020115d0
+#define SCAC_ENABLE_MSK PPC_BIT(0)
+
static int64_t centaur_fsiscom_complete(struct centaur_chip *centaur)
{
int64_t rc;
@@ -296,6 +303,58 @@ static bool centaur_add(uint32_t part_id, uint32_t mchip, uint32_t meng,
return true;
}
+/* Returns how long to wait for logic to stop in TB ticks or a negative
+ * value on error
+ */
+int64_t centaur_disable_sensor_cache(uint32_t part_id)
+{
+ struct centaur_chip *centaur = get_centaur(part_id);
+ int64_t rc = 0;
+ uint64_t ctrl;
+
+ if (!centaur)
+ return false;
+
+ lock(¢aur->lock);
+ centaur->scache_disable_count++;
+ if (centaur->scache_disable_count == 1) {
+ centaur->scache_was_enabled = false;
+ rc = centaur_fsiscom_read(centaur, SCAC_CONFIG_REG, &ctrl);
+ if (rc)
+ goto bail;
+ centaur->scache_was_enabled = !!(ctrl & SCAC_ENABLE_MSK);
+ rc = centaur_fsiscom_write(centaur, SCAC_CONFIG_CLR, SCAC_ENABLE_MSK);
+ if (rc)
+ goto bail;
+ rc = msecs_to_tb(30);
+ }
+ bail:
+ unlock(¢aur->lock);
+ return rc;
+}
+
+int64_t centaur_enable_sensor_cache(uint32_t part_id)
+{
+ struct centaur_chip *centaur = get_centaur(part_id);
+ int64_t rc = 0;
+
+ if (!centaur)
+ return false;
+
+ lock(¢aur->lock);
+ if (centaur->scache_disable_count == 0) {
+ prerror("CENTAUR: Cache count going negative !\n");
+ backtrace();
+ goto bail;
+ }
+ centaur->scache_disable_count--;
+ if (centaur->scache_disable_count == 0 && centaur->scache_was_enabled)
+ rc = centaur_fsiscom_write(centaur, SCAC_CONFIG_SET, SCAC_ENABLE_MSK);
+ bail:
+ unlock(¢aur->lock);
+ return rc;
+}
+
void centaur_init(void)
{
struct dt_node *cn;
diff --git a/include/centaur.h b/include/centaur.h
index 457afd7..5412475 100644
--- a/include/centaur.h
+++ b/include/centaur.h
@@ -28,9 +28,13 @@ struct centaur_chip {
uint32_t fsi_master_chip_id;
uint32_t fsi_master_port;
uint32_t fsi_master_engine;
+ uint32_t scache_disable_count;
+ bool scache_was_enabled;
struct lock lock;
};
+extern int64_t centaur_disable_sensor_cache(uint32_t part_id);
+extern int64_t centaur_enable_sensor_cache(uint32_t part_id);
extern int64_t centaur_xscom_read(uint32_t id, uint64_t pcb_addr, uint64_t *val) __warn_unused_result;
extern int64_t centaur_xscom_write(uint32_t id, uint64_t pcb_addr, uint64_t val) __warn_unused_result;
--
2.1.4
More information about the Skiboot
mailing list