* [PATCH skeleton v3 00/19] Set default LED status, add GPIO define
@ 2015-11-20 1:00 OpenBMC Patches
2015-11-20 1:00 ` [PATCH skeleton v3 01/19] LED test OpenBMC Patches
` (18 more replies)
0 siblings, 19 replies; 20+ messages in thread
From: OpenBMC Patches @ 2015-11-20 1:00 UTC (permalink / raw)
To: openbmc
Please omit Nov 07 commit, and add Nov 19 commit3
https://github.com/openbmc/skeleton/pull/16
Ken (18):
LED test
LED test 2
LED test3
Remove ;
Force fan duty to 100%
Workarounf for fan PWM 100%
Remove git 1e751075d5a11736df67c40ead5a8375141269d3
Set default LED status, add GPIO define
Init BMC_THROTTLE GPIO to high
LED test
LED test 2
LED test3
Remove ;
Force fan duty to 100%
Workarounf for fan PWM 100%
Remove git 1e751075d5a11736df67c40ead5a8375141269d3
Set default LED status, add GPIO define
Init BMC_THROTTLE GPIO to high
Norman James (1):
add bmc flash capability
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH skeleton v3 01/19] LED test
2015-11-20 1:00 [PATCH skeleton v3 00/19] Set default LED status, add GPIO define OpenBMC Patches
@ 2015-11-20 1:00 ` OpenBMC Patches
2015-11-20 1:00 ` [PATCH skeleton v3 02/19] LED test 2 OpenBMC Patches
` (17 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: OpenBMC Patches @ 2015-11-20 1:00 UTC (permalink / raw)
To: openbmc; +Cc: Ken
From: Ken <ken.sk.lai@mail.foxconn.com>
---
bin/Barreleye.py | 1 +
objects/led_controller.c | 16 +++++++++++++---
2 files changed, 14 insertions(+), 3 deletions(-)
mode change 100644 => 100755 objects/led_controller.c
diff --git a/bin/Barreleye.py b/bin/Barreleye.py
index 65a6aa4..98d7321 100755
--- a/bin/Barreleye.py
+++ b/bin/Barreleye.py
@@ -408,6 +408,7 @@ GPIO_CONFIG['BMC_READY'] = { 'gpio_pin': 'H2', 'direction': 'out' }
GPIO_CONFIG['POWER_BUTTON'] = { 'gpio_pin': 'E0', 'direction': 'both' }
GPIO_CONFIG['PCIE_RESET'] = { 'gpio_pin': 'B5', 'direction': 'out' }
GPIO_CONFIG['USB_RESET'] = { 'gpio_pin': 'B6', 'direction': 'out' }
+GPIO_CONFIG['BEEP'] = { 'gpio_pin': 'N7', 'direction': 'out' }
GPIO_CONFIG['SLOT0_RISER_PRESENT'] = { 'gpio_pin': 'N0', 'direction': 'in' }
GPIO_CONFIG['SLOT1_RISER_PRESENT'] = { 'gpio_pin': 'N1', 'direction': 'in' }
GPIO_CONFIG['SLOT2_RISER_PRESENT'] = { 'gpio_pin': 'N2', 'direction': 'in' }
diff --git a/objects/led_controller.c b/objects/led_controller.c
old mode 100644
new mode 100755
index 8c3fa3c..5bb4542
--- a/objects/led_controller.c
+++ b/objects/led_controller.c
@@ -10,11 +10,12 @@ static const gchar* dbus_name = "org.openbmc.control.led";
static GDBusObjectManagerServer *manager = NULL;
-#define NUM_GPIO 2
+#define NUM_GPIO 3
GPIO led_gpio[NUM_GPIO] = {
(GPIO){"IDENTIFY"},
- (GPIO){"BMC_READY"}
+ (GPIO){"BMC_READY"},
+ (GPIO){"BEEP"}
};
@@ -67,21 +68,30 @@ on_set_off (Led *led,
return TRUE;
}
+int tmp=0;
void init_led(Led* led, GPIO* mygpio)
{
int rc = GPIO_OK;
+ int i=5;
+ tmp++;
do {
uint8_t val;
rc = gpio_open(mygpio);
if (rc != GPIO_OK) { break; }
rc = gpio_read(mygpio,&val);
if (rc != GPIO_OK) { break; }
+ led_set_state(led,"off");
if (val == 0) {
led_set_state(led,"on");
} else {
led_set_state(led,"off");
}
- } while(0);
+ i--;
+ } while(i!=0);
+
+if(tmp==3)
+ led_set_state(led,"off");
+
gpio_close(mygpio);
if (rc != GPIO_OK) {
g_print("ERROR led controller: GPIO error %s (rc=%d)\n",
--
2.6.3
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH skeleton v3 02/19] LED test 2
2015-11-20 1:00 [PATCH skeleton v3 00/19] Set default LED status, add GPIO define OpenBMC Patches
2015-11-20 1:00 ` [PATCH skeleton v3 01/19] LED test OpenBMC Patches
@ 2015-11-20 1:00 ` OpenBMC Patches
2015-11-20 1:00 ` [PATCH skeleton v3 03/19] LED test3 OpenBMC Patches
` (16 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: OpenBMC Patches @ 2015-11-20 1:00 UTC (permalink / raw)
To: openbmc; +Cc: Ken
From: Ken <ken.sk.lai@mail.foxconn.com>
---
bin/Barreleye.py | 5 +++++
objects/led_controller.c | 9 +++++----
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/bin/Barreleye.py b/bin/Barreleye.py
index 98d7321..783aa88 100755
--- a/bin/Barreleye.py
+++ b/bin/Barreleye.py
@@ -51,6 +51,11 @@ ENTER_STATE_CALLBACK = {
'obj_name' : '/org/openbmc/control/led/BMC_READY',
'interface_name' : 'org.openbmc.Led',
},
+ 'setOn' : {
+ 'bus_name' : 'org.openbmc.control.led',
+ 'obj_name' : '/org/openbmc/control/led/BEEP',
+ 'interface_name' : 'org.openbmc.Led',
+ },
'init' : {
'bus_name' : 'org.openbmc.control.Flash',
'obj_name' : '/org/openbmc/control/flash/bios',
diff --git a/objects/led_controller.c b/objects/led_controller.c
index 5bb4542..6f773c9 100755
--- a/objects/led_controller.c
+++ b/objects/led_controller.c
@@ -68,13 +68,14 @@ on_set_off (Led *led,
return TRUE;
}
-int tmp=0;
+//int tmp=0;
void init_led(Led* led, GPIO* mygpio)
{
int rc = GPIO_OK;
int i=5;
- tmp++;
+// tmp++;
do {
+ sleep(2);
uint8_t val;
rc = gpio_open(mygpio);
if (rc != GPIO_OK) { break; }
@@ -89,8 +90,8 @@ void init_led(Led* led, GPIO* mygpio)
i--;
} while(i!=0);
-if(tmp==3)
- led_set_state(led,"off");
+//if(tmp==3)
+// led_set_state(led,"off");
gpio_close(mygpio);
if (rc != GPIO_OK) {
--
2.6.3
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH skeleton v3 03/19] LED test3
2015-11-20 1:00 [PATCH skeleton v3 00/19] Set default LED status, add GPIO define OpenBMC Patches
2015-11-20 1:00 ` [PATCH skeleton v3 01/19] LED test OpenBMC Patches
2015-11-20 1:00 ` [PATCH skeleton v3 02/19] LED test 2 OpenBMC Patches
@ 2015-11-20 1:00 ` OpenBMC Patches
2015-11-20 1:00 ` [PATCH skeleton v3 04/19] Remove ; OpenBMC Patches
` (15 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: OpenBMC Patches @ 2015-11-20 1:00 UTC (permalink / raw)
To: openbmc; +Cc: Ken
From: Ken <ken.sk.lai@mail.foxconn.com>
---
objects/led_controller.c | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/objects/led_controller.c b/objects/led_controller.c
index 6f773c9..24cfc19 100755
--- a/objects/led_controller.c
+++ b/objects/led_controller.c
@@ -68,30 +68,23 @@ on_set_off (Led *led,
return TRUE;
}
-//int tmp=0;
+
void init_led(Led* led, GPIO* mygpio)
{
- int rc = GPIO_OK;
- int i=5;
-// tmp++;
+ int rc = GPIO_OK;;
do {
- sleep(2);
uint8_t val;
rc = gpio_open(mygpio);
if (rc != GPIO_OK) { break; }
rc = gpio_read(mygpio,&val);
if (rc != GPIO_OK) { break; }
- led_set_state(led,"off");
if (val == 0) {
led_set_state(led,"on");
} else {
led_set_state(led,"off");
}
- i--;
- } while(i!=0);
+ } while(0);
-//if(tmp==3)
-// led_set_state(led,"off");
gpio_close(mygpio);
if (rc != GPIO_OK) {
--
2.6.3
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH skeleton v3 04/19] Remove ;
2015-11-20 1:00 [PATCH skeleton v3 00/19] Set default LED status, add GPIO define OpenBMC Patches
` (2 preceding siblings ...)
2015-11-20 1:00 ` [PATCH skeleton v3 03/19] LED test3 OpenBMC Patches
@ 2015-11-20 1:00 ` OpenBMC Patches
2015-11-20 1:00 ` [PATCH skeleton v3 05/19] Force fan duty to 100% OpenBMC Patches
` (14 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: OpenBMC Patches @ 2015-11-20 1:00 UTC (permalink / raw)
To: openbmc; +Cc: Ken
From: Ken <ken.sk.lai@mail.foxconn.com>
---
objects/led_controller.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/objects/led_controller.c b/objects/led_controller.c
index 24cfc19..34945e1 100755
--- a/objects/led_controller.c
+++ b/objects/led_controller.c
@@ -71,7 +71,8 @@ on_set_off (Led *led,
void init_led(Led* led, GPIO* mygpio)
{
- int rc = GPIO_OK;;
+ int rc = GPIO_OK;
+
do {
uint8_t val;
rc = gpio_open(mygpio);
--
2.6.3
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH skeleton v3 05/19] Force fan duty to 100%
2015-11-20 1:00 [PATCH skeleton v3 00/19] Set default LED status, add GPIO define OpenBMC Patches
` (3 preceding siblings ...)
2015-11-20 1:00 ` [PATCH skeleton v3 04/19] Remove ; OpenBMC Patches
@ 2015-11-20 1:00 ` OpenBMC Patches
2015-11-20 1:00 ` [PATCH skeleton v3 06/19] Workarounf for fan PWM 100% OpenBMC Patches
` (13 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: OpenBMC Patches @ 2015-11-20 1:00 UTC (permalink / raw)
To: openbmc; +Cc: Ken
From: Ken <ken.sk.lai@mail.foxconn.com>
---
bin/Barreleye.py | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/bin/Barreleye.py b/bin/Barreleye.py
index 783aa88..0e92e83 100755
--- a/bin/Barreleye.py
+++ b/bin/Barreleye.py
@@ -6,6 +6,11 @@ FLASH_DOWNLOAD_PATH = "/tmp"
GPIO_BASE = 320
SYSTEM_NAME = "Barreleye"
+import sys
+import gobject
+import dbus
+import dbus.service
+import dbus.mainloop.glib
## System states
## state can change to next state in 2 ways:
@@ -423,6 +428,15 @@ GPIO_CONFIG['SLOT2_PRESENT'] = { 'gpio_pin': 'N5', 'direction': 'in' }
GPIO_CONFIG['MEZZ0_PRESENT'] = { 'gpio_pin': 'O0', 'direction': 'in' }
GPIO_CONFIG['MEZZ1_PRESENT'] = { 'gpio_pin': 'O1', 'direction': 'in' }
+
+bus = dbus.SystemBus()
+
+for i in range(1,6):
+ print i
+ obj = bus.get_object("org.openbmc,sensors,hwmon","/org/openbmc/sensors/speed/fan"+str(i))
+ intf = dbus.Interface (obj,"org.openbmc.SensorValue")
+ intf.setValue(dbus.UInt32(255))
+
def convertGpio(name):
name = name.upper()
c = name[0:1]
--
2.6.3
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH skeleton v3 06/19] Workarounf for fan PWM 100%
2015-11-20 1:00 [PATCH skeleton v3 00/19] Set default LED status, add GPIO define OpenBMC Patches
` (4 preceding siblings ...)
2015-11-20 1:00 ` [PATCH skeleton v3 05/19] Force fan duty to 100% OpenBMC Patches
@ 2015-11-20 1:00 ` OpenBMC Patches
2015-11-20 1:00 ` [PATCH skeleton v3 07/19] Remove git 1e751075d5a11736df67c40ead5a8375141269d3 OpenBMC Patches
` (12 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: OpenBMC Patches @ 2015-11-20 1:00 UTC (permalink / raw)
To: openbmc; +Cc: Ken
From: Ken <ken.sk.lai@mail.foxconn.com>
---
bin/startup_hacks.sh | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/bin/startup_hacks.sh b/bin/startup_hacks.sh
index 5868e8a..603fc1c 100755
--- a/bin/startup_hacks.sh
+++ b/bin/startup_hacks.sh
@@ -11,3 +11,12 @@ echo 0x2e > /sys/bus/i2c/devices/i2c-6/delete_device
echo nct7904 0x2e > /sys/bus/i2c/devices/i2c-6/new_device
echo nct7904 0x2d > /sys/bus/i2c/devices/i2c-6/new_device
+echo 255 > /sys/class/hwmon/hwmon1/pwm1
+echo 255 > /sys/class/hwmon/hwmon1/pwm2
+echo 255 > /sys/class/hwmon/hwmon1/pwm3
+echo 255 > /sys/class/hwmon/hwmon1/pwm4
+
+echo 255 > /sys/class/hwmon/hwmon2/pwm1
+echo 255 > /sys/class/hwmon/hwmon2/pwm2
+echo 255 > /sys/class/hwmon/hwmon2/pwm3
+echo 255 > /sys/class/hwmon/hwmon2/pwm4
--
2.6.3
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH skeleton v3 07/19] Remove git 1e751075d5a11736df67c40ead5a8375141269d3
2015-11-20 1:00 [PATCH skeleton v3 00/19] Set default LED status, add GPIO define OpenBMC Patches
` (5 preceding siblings ...)
2015-11-20 1:00 ` [PATCH skeleton v3 06/19] Workarounf for fan PWM 100% OpenBMC Patches
@ 2015-11-20 1:00 ` OpenBMC Patches
2015-11-20 1:00 ` [PATCH skeleton v3 08/19] Set default LED status, add GPIO define OpenBMC Patches
` (11 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: OpenBMC Patches @ 2015-11-20 1:00 UTC (permalink / raw)
To: openbmc; +Cc: Ken
From: Ken <ken.sk.lai@mail.foxconn.com>
---
bin/Barreleye.py | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/bin/Barreleye.py b/bin/Barreleye.py
index 0e92e83..64decbf 100755
--- a/bin/Barreleye.py
+++ b/bin/Barreleye.py
@@ -6,12 +6,6 @@ FLASH_DOWNLOAD_PATH = "/tmp"
GPIO_BASE = 320
SYSTEM_NAME = "Barreleye"
-import sys
-import gobject
-import dbus
-import dbus.service
-import dbus.mainloop.glib
-
## System states
## state can change to next state in 2 ways:
## - a process emits a GotoSystemState signal with state name to goto
@@ -428,15 +422,6 @@ GPIO_CONFIG['SLOT2_PRESENT'] = { 'gpio_pin': 'N5', 'direction': 'in' }
GPIO_CONFIG['MEZZ0_PRESENT'] = { 'gpio_pin': 'O0', 'direction': 'in' }
GPIO_CONFIG['MEZZ1_PRESENT'] = { 'gpio_pin': 'O1', 'direction': 'in' }
-
-bus = dbus.SystemBus()
-
-for i in range(1,6):
- print i
- obj = bus.get_object("org.openbmc,sensors,hwmon","/org/openbmc/sensors/speed/fan"+str(i))
- intf = dbus.Interface (obj,"org.openbmc.SensorValue")
- intf.setValue(dbus.UInt32(255))
-
def convertGpio(name):
name = name.upper()
c = name[0:1]
--
2.6.3
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH skeleton v3 08/19] Set default LED status, add GPIO define
2015-11-20 1:00 [PATCH skeleton v3 00/19] Set default LED status, add GPIO define OpenBMC Patches
` (6 preceding siblings ...)
2015-11-20 1:00 ` [PATCH skeleton v3 07/19] Remove git 1e751075d5a11736df67c40ead5a8375141269d3 OpenBMC Patches
@ 2015-11-20 1:00 ` OpenBMC Patches
2015-11-20 1:00 ` [PATCH skeleton v3 09/19] Init BMC_THROTTLE GPIO to high OpenBMC Patches
` (10 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: OpenBMC Patches @ 2015-11-20 1:00 UTC (permalink / raw)
To: openbmc; +Cc: Ken
From: Ken <ken.sk.lai@mail.foxconn.com>
---
bin/Barreleye.py | 17 +++++++++++++++++
objects/led_controller.c | 5 +++--
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/bin/Barreleye.py b/bin/Barreleye.py
index a1e7688..615b977 100755
--- a/bin/Barreleye.py
+++ b/bin/Barreleye.py
@@ -6,6 +6,12 @@ FLASH_DOWNLOAD_PATH = "/tmp"
GPIO_BASE = 320
SYSTEM_NAME = "Barreleye"
+import sys
+import gobject
+import dbus
+import dbus.service
+import dbus.mainloop.glib
+
## System states
## state can change to next state in 2 ways:
## - a process emits a GotoSystemState signal with state name to goto
@@ -472,9 +478,12 @@ GPIO_CONFIG['PGOOD'] = { 'gpio_pin': 'C7', 'direction': 'in' }
GPIO_CONFIG['IDENTIFY'] = { 'gpio_pin': 'R5', 'direction': 'out' }
GPIO_CONFIG['BMC_READY'] = { 'gpio_pin': 'H2', 'direction': 'out' }
GPIO_CONFIG['POWER_BUTTON'] = { 'gpio_pin': 'E0', 'direction': 'both' }
+GPIO_CONFIG['RESET_BUTTON'] = { 'gpio_pin': 'E2', 'direction': 'both' }
GPIO_CONFIG['PCIE_RESET'] = { 'gpio_pin': 'B5', 'direction': 'out' }
GPIO_CONFIG['USB_RESET'] = { 'gpio_pin': 'B6', 'direction': 'out' }
GPIO_CONFIG['BEEP'] = { 'gpio_pin': 'N7', 'direction': 'out' }
+GPIO_CONFIG['BMC_TROTTLE'] = { 'gpio_pin': 'J3', 'direction': 'out' }
+GPIO_CONFIG['BMC_HEARTBEAT'] = { 'gpio_pin': 'R4', 'direction': 'out' }
GPIO_CONFIG['SLOT0_RISER_PRESENT'] = { 'gpio_pin': 'N0', 'direction': 'in' }
GPIO_CONFIG['SLOT1_RISER_PRESENT'] = { 'gpio_pin': 'N1', 'direction': 'in' }
GPIO_CONFIG['SLOT2_RISER_PRESENT'] = { 'gpio_pin': 'N2', 'direction': 'in' }
@@ -484,6 +493,14 @@ GPIO_CONFIG['SLOT2_PRESENT'] = { 'gpio_pin': 'N5', 'direction': 'in' }
GPIO_CONFIG['MEZZ0_PRESENT'] = { 'gpio_pin': 'O0', 'direction': 'in' }
GPIO_CONFIG['MEZZ1_PRESENT'] = { 'gpio_pin': 'O1', 'direction': 'in' }
+
+## bus = dbus.SystemBus()
+## for i in range(1,6):
+## print i
+## obj = bus.get_object("org.openbmc,sensors,hwmon","/org/openbmc/sensors/speed/fan"+str(i))
+## intf = dbus.Interface (obj,"org.openbmc.SensorValue")
+## intf.setValue(dbus.UInt32(255))
+
def convertGpio(name):
name = name.upper()
c = name[0:1]
diff --git a/objects/led_controller.c b/objects/led_controller.c
index 34945e1..383e9ea 100755
--- a/objects/led_controller.c
+++ b/objects/led_controller.c
@@ -10,12 +10,13 @@ static const gchar* dbus_name = "org.openbmc.control.led";
static GDBusObjectManagerServer *manager = NULL;
-#define NUM_GPIO 3
+#define NUM_GPIO 4
GPIO led_gpio[NUM_GPIO] = {
(GPIO){"IDENTIFY"},
(GPIO){"BMC_READY"},
- (GPIO){"BEEP"}
+ (GPIO){"BEEP"},
+ (GPIO){"BMC_HEARTBEAT"}
};
--
2.6.3
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH skeleton v3 09/19] Init BMC_THROTTLE GPIO to high
2015-11-20 1:00 [PATCH skeleton v3 00/19] Set default LED status, add GPIO define OpenBMC Patches
` (7 preceding siblings ...)
2015-11-20 1:00 ` [PATCH skeleton v3 08/19] Set default LED status, add GPIO define OpenBMC Patches
@ 2015-11-20 1:00 ` OpenBMC Patches
2015-11-20 1:00 ` [PATCH skeleton v3 10/19] add bmc flash capability OpenBMC Patches
` (9 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: OpenBMC Patches @ 2015-11-20 1:00 UTC (permalink / raw)
To: openbmc; +Cc: Ken
From: Ken <ken.sk.lai@mail.foxconn.com>
---
objects/control_host_obj.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/objects/control_host_obj.c b/objects/control_host_obj.c
index 672ef85..9297e52 100644
--- a/objects/control_host_obj.c
+++ b/objects/control_host_obj.c
@@ -21,6 +21,7 @@ GPIO fsi_data = (GPIO){ "FSI_DATA" };
GPIO fsi_clk = (GPIO){ "FSI_CLK" };
GPIO fsi_enable = (GPIO){ "FSI_ENABLE" };
GPIO cronus_sel = (GPIO){ "CRONUS_SEL" };
+GPIO Throttle = (GPIO){ "BMC_TROTTLE" };
/* Bit bang patterns */
@@ -82,6 +83,9 @@ on_boot (ControlHost *host,
{
int rc = GPIO_OK;
+ rc = gpio_open(&Throttle);
+ rc = gpio_write(&Throttle,1);
+
if (control_host_get_debug_mode(host)==1)
{
g_print("Enabling debug mode; not booting host\n");
@@ -165,7 +169,7 @@ on_boot (ControlHost *host,
gpio_close(&fsi_data);
gpio_close(&fsi_enable);
gpio_close(&cronus_sel);
-
+ gpio_close(&Throttle);
control_host_emit_booted(host);
return TRUE;
}
--
2.6.3
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH skeleton v3 10/19] add bmc flash capability
2015-11-20 1:00 [PATCH skeleton v3 00/19] Set default LED status, add GPIO define OpenBMC Patches
` (8 preceding siblings ...)
2015-11-20 1:00 ` [PATCH skeleton v3 09/19] Init BMC_THROTTLE GPIO to high OpenBMC Patches
@ 2015-11-20 1:00 ` OpenBMC Patches
2015-11-20 1:00 ` [PATCH skeleton v3 11/19] LED test OpenBMC Patches
` (8 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: OpenBMC Patches @ 2015-11-20 1:00 UTC (permalink / raw)
To: openbmc
From: Norman James <njames@us.ibm.com>
---
bin/obmcutil | 48 +-
includes/openbmc.h | 11 +-
objects/control_bmc_barreleye.c | 15 +-
objects/pflash/ast-sf-ctrl.c | 1753 +++++++++++++++++++++------------------
objects/pflash/ast.h | 168 ++--
5 files changed, 1069 insertions(+), 926 deletions(-)
diff --git a/bin/obmcutil b/bin/obmcutil
index 7cf0d93..35a9a08 100755
--- a/bin/obmcutil
+++ b/bin/obmcutil
@@ -13,10 +13,10 @@ import json
def fix_byte(it,key,parent):
if (isinstance(it,dbus.Array)):
for i in range(0,len(it)):
- traverse_it(it[i],i,it)
+ fix_byte(it[i],i,it)
elif (isinstance(it, dict)):
for key in it.keys():
- traverse_it(it[key],key,it)
+ fix_byte(it[key],key,it)
elif (isinstance(it,dbus.Byte)):
if (key != None):
parent[key] = int(it)
@@ -28,7 +28,7 @@ def printDict(name,data):
if (isinstance(data, dict)):
print ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
print name
- for p in data:
+ for p in sorted(data.keys()):
printDict(p,data[p])
else:
print name+" = "+str(data)
@@ -82,7 +82,7 @@ dbus_objects = {
'interface_name' : 'org.openbmc.control.Chassis',
'method' : 'powerOff',
},
- 'getsystemstate' : {
+ 'state' : {
'bus_name' : 'org.openbmc.managers.System',
'object_name' : '/org/openbmc/managers/System',
'interface_name' : 'org.openbmc.managers.System',
@@ -93,17 +93,28 @@ dbus_objects = {
'object_name' : '/org/openbmc/sensor/virtual/BootProgress',
'interface_name' : 'org.openbmc.SensorValue'
},
- 'updatebios' : {
+ 'biosupdate' : {
'bus_name' : 'org.openbmc.control.Flash',
'object_name' : '/org/openbmc/control/flash/bios',
'interface_name' : 'org.openbmc.Flash',
'method' : 'updateViaTftp',
},
- 'bios' : {
+ 'biosflash' : {
'bus_name' : 'org.openbmc.control.Flash',
'object_name' : '/org/openbmc/control/flash/bios',
'interface_name' : 'org.openbmc.Flash',
},
+ 'bmcupdate' : {
+ 'bus_name' : 'org.openbmc.control.Flash',
+ 'object_name' : '/org/openbmc/control/flash/bmc',
+ 'interface_name' : 'org.openbmc.Flash',
+ 'method' : 'updateViaTftp',
+ },
+ 'bmcflash' : {
+ 'bus_name' : 'org.openbmc.control.Flash',
+ 'object_name' : '/org/openbmc/control/flash/bmc',
+ 'interface_name' : 'org.openbmc.Flash',
+ },
'getinventory' : {
'bus_name' : 'org.openbmc.managers.Inventory',
'object_name' : '/org/openbmc/inventory',
@@ -116,23 +127,16 @@ dbus_objects = {
'interface_name' : 'org.openbmc.Object.Enumerate',
'method' : 'enumerate'
},
- 'inventorytest' : {
- 'bus_name' : 'org.openbmc.managers.Inventory',
- 'object_name' : '/org/openbmc/inventory/system/chassis/motherboard/cpu0',
- 'interface_name' : 'org.openbmc.InventoryItem',
- 'method' : 'update'
- },
-
}
bus = dbus.SystemBus()
-if (len(sys.argv) == 1):
+if (len(sys.argv) == 1 or sys.argv[1] == "-h"):
print "Usage: obmcutil [command] [[method] [*args]]"
print "\tIf [method] is blank, then all properties are printed\n"
print "Available commands:"
- for name in dbus_objects:
+ for name in sorted(dbus_objects.keys()):
m = ""
if (dbus_objects[name].has_key('method') == True):
m=" ("+dbus_objects[name]['interface_name']+"->"+dbus_objects[name]['method']+")"
@@ -165,16 +169,10 @@ if (method_name == ""):
else:
methd = obj.get_dbus_method(method_name,intf_name)
try:
- ## too hard to do dicts from command line
- ## hack just to test fru update function
- if (method_name == "update"):
- tmp = { 'manufacturer' : sys.argv[0], 'part_num' : '3Nxxxx' }
- methd(tmp)
- else:
- data = methd(*sys.argv)
- fix_byte(data)
- pydata = json.loads(json.dumps(data))
- printDict("",pydata)
+ data = methd(*sys.argv)
+ fix_byte(data,None,None)
+ pydata = json.loads(json.dumps(data))
+ printDict("",pydata)
except Exception as e:
print e
r = introspect(bus_name,obj_path,intf_name,method_name)
diff --git a/includes/openbmc.h b/includes/openbmc.h
index d0882c3..a6d420b 100644
--- a/includes/openbmc.h
+++ b/includes/openbmc.h
@@ -24,6 +24,11 @@ static inline void devmem(void* addr, uint32_t val)
asm volatile("" : : : "memory");
*(volatile uint32_t *)addr = val;
}
+static inline uint32_t devmem_read(void* addr)
+{
+ asm volatile("" : : : "memory");
+ return *(volatile uint32_t *)addr;
+}
//static inline devmem(uint32_t reg, uint32_t val)
//{
// printf("devmem 0x%08x = 0x%08x\n",reg,val);
@@ -33,8 +38,12 @@ static inline void devmem(void* addr, uint32_t val)
#else
static inline devmem(uint32_t val, uint32_t reg)
{
-
}
+static inline uint32_t devmem_read(void* addr)
+{
+ return 0;
+}
+
#endif
typedef struct {
diff --git a/objects/control_bmc_barreleye.c b/objects/control_bmc_barreleye.c
index cd6ae3a..ec7bc2a 100644
--- a/objects/control_bmc_barreleye.c
+++ b/objects/control_bmc_barreleye.c
@@ -73,13 +73,19 @@ void reg_init()
devmem(bmcreg+0x00,0x00000000); //Set Baud rate divisor -> 13 (Baud 115200)
devmem(bmcreg+0x04,0x00000000); //Set Baud rate divisor -> 13 (Baud 115200)
devmem(bmcreg+0x08,0x000000c1); //Disable Parity, 1 stop bit, 8 bits
- //bmcreg = memmap(mem_fd,COM_BASE);
- //devmem(bmcreg+0x9C,0x08060000); //Set UART routing
+ bmcreg = memmap(mem_fd,COM_BASE);
+ devmem(bmcreg+0x9C,0x00000000); //Set UART routing
bmcreg = memmap(mem_fd,SCU_BASE);
- devmem(bmcreg+0x00,0x9f82fce7);
+ devmem(bmcreg+0x00,0x9e82fce7);
+ //devmem(bmcreg+0x00,0x9f82fce7); // B2?
devmem(bmcreg+0x04,0x0370e677);
- devmem(bmcreg+0x20,0xcfc8f7ff);
+
+ // do not modify state of power pin, otherwise
+ // if this is a reboot, host will shutdown
+ uint32_t reg_20 = devmem_read(bmcreg+0x20);
+ reg_20 = reg_20 & 0x00000002;
+ devmem(bmcreg+0x20,0xcfc8f7fd | reg_20);
devmem(bmcreg+0x24,0xc738f20a);
devmem(bmcreg+0x80,0x0031ffaf);
@@ -150,6 +156,7 @@ gboolean go(gpointer user_data)
Control* control = object_get_control((Object*)cmd->user_data);
#ifdef __arm__
reg_init();
+
init_i2c_driver(6,"nct7904",0x2d,false);
init_i2c_driver(6,"nct7904",0x2d,true);
init_i2c_driver(6,"nct7904",0x2d,false);
diff --git a/objects/pflash/ast-sf-ctrl.c b/objects/pflash/ast-sf-ctrl.c
index b154682..bf5d372 100644
--- a/objects/pflash/ast-sf-ctrl.c
+++ b/objects/pflash/ast-sf-ctrl.c
@@ -1,830 +1,923 @@
-#include <stdint.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <libflash/libflash.h>
-#include <libflash/libflash-priv.h>
-
-#include "ast.h"
-
-#ifndef __unused
-#define __unused __attribute__((unused))
-#endif
-
-#define CALIBRATE_BUF_SIZE 16384
-
-struct ast_sf_ctrl {
- /* We have 2 controllers, one for the BMC flash, one for the PNOR */
- uint8_t type;
-
- /* Address and previous value of the ctrl register */
- uint32_t ctl_reg;
-
- /* Control register value for normal commands */
- uint32_t ctl_val;
-
- /* Control register value for (fast) reads */
- uint32_t ctl_read_val;
-
- /* Flash read timing register */
- uint32_t fread_timing_reg;
- uint32_t fread_timing_val;
-
- /* Address of the flash mapping */
- uint32_t flash;
-
- /* Current 4b mode */
- bool mode_4b;
-
- /* Callbacks */
- struct spi_flash_ctrl ops;
-};
-
-static uint32_t ast_ahb_freq;
-
-static const uint32_t ast_ct_hclk_divs[] = {
- 0xf, /* HCLK */
- 0x7, /* HCLK/2 */
- 0xe, /* HCLK/3 */
- 0x6, /* HCLK/4 */
- 0xd, /* HCLK/5 */
-};
-
-static int ast_sf_start_cmd(struct ast_sf_ctrl *ct, uint8_t cmd)
-{
- /* Switch to user mode, CE# dropped */
- ast_ahb_writel(ct->ctl_val | 7, ct->ctl_reg);
-
- /* user mode, CE# active */
- ast_ahb_writel(ct->ctl_val | 3, ct->ctl_reg);
-
- /* write cmd */
- return ast_copy_to_ahb(ct->flash, &cmd, 1);
-}
-
-static void ast_sf_end_cmd(struct ast_sf_ctrl *ct)
-{
- /* clear CE# */
- ast_ahb_writel(ct->ctl_val | 7, ct->ctl_reg);
-
- /* Switch back to read mode */
- ast_ahb_writel(ct->ctl_read_val, ct->ctl_reg);
-}
-
-static int ast_sf_send_addr(struct ast_sf_ctrl *ct, uint32_t addr)
-{
- const void *ap;
-
- /* Layout address MSB first in memory */
- addr = cpu_to_be32(addr);
-
- /* Send the right amount of bytes */
- ap = (char *)&addr;
-
- if (ct->mode_4b)
- return ast_copy_to_ahb(ct->flash, ap, 4);
- else
- return ast_copy_to_ahb(ct->flash, ap + 1, 3);
-}
-
-static int ast_sf_cmd_rd(struct spi_flash_ctrl *ctrl, uint8_t cmd,
- bool has_addr, uint32_t addr, void *buffer,
- uint32_t size)
-{
- struct ast_sf_ctrl *ct = container_of(ctrl, struct ast_sf_ctrl, ops);
- int rc;
-
- rc = ast_sf_start_cmd(ct, cmd);
- if (rc)
- goto bail;
- if (has_addr) {
- rc = ast_sf_send_addr(ct, addr);
- if (rc)
- goto bail;
- }
- if (buffer && size)
- rc = ast_copy_from_ahb(buffer, ct->flash, size);
- bail:
- ast_sf_end_cmd(ct);
- return rc;
-}
-
-static int ast_sf_cmd_wr(struct spi_flash_ctrl *ctrl, uint8_t cmd,
- bool has_addr, uint32_t addr, const void *buffer,
- uint32_t size)
-{
- struct ast_sf_ctrl *ct = container_of(ctrl, struct ast_sf_ctrl, ops);
- int rc;
-
- rc = ast_sf_start_cmd(ct, cmd);
- if (rc)
- goto bail;
- if (has_addr) {
- rc = ast_sf_send_addr(ct, addr);
- if (rc)
- goto bail;
- }
- if (buffer && size)
- rc = ast_copy_to_ahb(ct->flash, buffer, size);
- bail:
- ast_sf_end_cmd(ct);
- return rc;
-}
-
-static int ast_sf_set_4b(struct spi_flash_ctrl *ctrl, bool enable)
-{
- struct ast_sf_ctrl *ct = container_of(ctrl, struct ast_sf_ctrl, ops);
-
- if (ct->type != AST_SF_TYPE_PNOR)
- return enable ? FLASH_ERR_4B_NOT_SUPPORTED : 0;
-
- /*
- * We update the "old" value as well since when quitting
- * we don't restore the mode of the flash itself so we need
- * to leave the controller in a compatible setup
- */
- if (enable) {
- ct->ctl_val |= 0x2000;
- ct->ctl_read_val |= 0x2000;
- } else {
- ct->ctl_val &= ~0x2000;
- ct->ctl_read_val &= ~0x2000;
- }
- ct->mode_4b = enable;
-
- /* Update read mode */
- ast_ahb_writel(ct->ctl_read_val, ct->ctl_reg);
-
- return 0;
-}
-
-static int ast_sf_read(struct spi_flash_ctrl *ctrl, uint32_t pos,
- void *buf, uint32_t len)
-{
- struct ast_sf_ctrl *ct = container_of(ctrl, struct ast_sf_ctrl, ops);
-
- /*
- * We are in read mode by default. We don't yet support fancy
- * things like fast read or X2 mode
- */
- return ast_copy_from_ahb(buf, ct->flash + pos, len);
-}
-
-static void ast_get_ahb_freq(void)
-{
- static const uint32_t cpu_freqs_24_48[] = {
- 384000000,
- 360000000,
- 336000000,
- 408000000
- };
- static const uint32_t cpu_freqs_25[] = {
- 400000000,
- 375000000,
- 350000000,
- 425000000
- };
- static const uint32_t ahb_div[] = { 1, 2, 4, 3 };
- uint32_t strap, cpu_clk, div;
-
- if (ast_ahb_freq)
- return;
-
- /* HW strapping gives us the CPU freq and AHB divisor */
- strap = ast_ahb_readl(SCU_HW_STRAPPING);
- if (strap & 0x00800000) {
- FL_DBG("AST: CLKIN 25Mhz\n");
- cpu_clk = cpu_freqs_25[(strap >> 8) & 3];
- } else {
- FL_DBG("AST: CLKIN 24/48Mhz\n");
- cpu_clk = cpu_freqs_24_48[(strap >> 8) & 3];
- }
- FL_DBG("AST: CPU frequency: %d Mhz\n", cpu_clk / 1000000);
- div = ahb_div[(strap >> 10) & 3];
- ast_ahb_freq = cpu_clk / div;
- FL_DBG("AST: AHB frequency: %d Mhz\n", ast_ahb_freq / 1000000);
-}
-
-static int ast_sf_check_reads(struct ast_sf_ctrl *ct,
- const uint8_t *golden_buf, uint8_t *test_buf)
-{
- int i, rc;
-
- for (i = 0; i < 10; i++) {
- rc = ast_copy_from_ahb(test_buf, ct->flash, CALIBRATE_BUF_SIZE);
- if (rc)
- return rc;
- if (memcmp(test_buf, golden_buf, CALIBRATE_BUF_SIZE) != 0)
- return FLASH_ERR_VERIFY_FAILURE;
- }
- return 0;
-}
-
-static int ast_sf_calibrate_reads(struct ast_sf_ctrl *ct, uint32_t hdiv,
- const uint8_t *golden_buf, uint8_t *test_buf)
-{
- int i, rc;
- int good_pass = -1, pass_count = 0;
- uint32_t shift = (hdiv - 1) << 2;
- uint32_t mask = ~(0xfu << shift);
-
-#define FREAD_TPASS(i) (((i) / 2) | (((i) & 1) ? 0 : 8))
-
- /* Try HCLK delay 0..5, each one with/without delay and look for a
- * good pair.
- */
- for (i = 0; i < 12; i++) {
- bool pass;
-
- ct->fread_timing_val &= mask;
- ct->fread_timing_val |= FREAD_TPASS(i) << shift;
- ast_ahb_writel(ct->fread_timing_val, ct->fread_timing_reg);
- rc = ast_sf_check_reads(ct, golden_buf, test_buf);
- if (rc && rc != FLASH_ERR_VERIFY_FAILURE)
- return rc;
- pass = (rc == 0);
- FL_DBG(" * [%08x] %d HCLK delay, %dns DI delay : %s\n",
- ct->fread_timing_val, i/2, (i & 1) ? 0 : 4, pass ? "PASS" : "FAIL");
- if (pass) {
- pass_count++;
- if (pass_count == 3) {
- good_pass = i - 1;
- break;
- }
- } else
- pass_count = 0;
- }
-
- /* No good setting for this frequency */
- if (good_pass < 0)
- return FLASH_ERR_VERIFY_FAILURE;
-
- /* We have at least one pass of margin, let's use first pass */
- ct->fread_timing_val &= mask;
- ct->fread_timing_val |= FREAD_TPASS(good_pass) << shift;
- ast_ahb_writel(ct->fread_timing_val, ct->fread_timing_reg);
- FL_DBG("AST: * -> good is pass %d [0x%08x]\n",
- good_pass, ct->fread_timing_val);
- return 0;
-}
-
-static bool ast_calib_data_usable(const uint8_t *test_buf, uint32_t size)
-{
- const uint32_t *tb32 = (const uint32_t *)test_buf;
- uint32_t i, cnt = 0;
-
- /* We check if we have enough words that are neither all 0
- * nor all 1's so the calibration can be considered valid.
- *
- * I use an arbitrary threshold for now of 64
- */
- size >>= 2;
- for (i = 0; i < size; i++) {
- if (tb32[i] != 0 && tb32[i] != 0xffffffff)
- cnt++;
- }
- return cnt >= 64;
-}
-
-static int ast_sf_optimize_reads(struct ast_sf_ctrl *ct, struct flash_info *info,
- uint32_t max_freq)
-{
- uint8_t *golden_buf, *test_buf;
- int i, rc, best_div = -1;
- uint32_t save_read_val = ct->ctl_read_val;
-
- test_buf = malloc(CALIBRATE_BUF_SIZE * 2);
- golden_buf = test_buf + CALIBRATE_BUF_SIZE;
-
- /* We start with the dumbest setting and read some data */
- ct->ctl_read_val = (ct->ctl_read_val & 0x2000) |
- (0x00 << 28) | /* Single bit */
- (0x00 << 24) | /* CE# max */
- (0x03 << 16) | /* use normal reads */
- (0x00 << 8) | /* HCLK/16 */
- (0x00 << 6) | /* no dummy cycle */
- (0x00); /* normal read */
- ast_ahb_writel(ct->ctl_read_val, ct->ctl_reg);
-
- rc = ast_copy_from_ahb(golden_buf, ct->flash, CALIBRATE_BUF_SIZE);
- if (rc) {
- free(test_buf);
- return rc;
- }
-
- /* Establish our read mode with freq field set to 0 */
- ct->ctl_read_val = save_read_val & 0xfffff0ff;
-
- /* Check if calibration data is suitable */
- if (!ast_calib_data_usable(golden_buf, CALIBRATE_BUF_SIZE)) {
- FL_INF("AST: Calibration area too uniform, "
- "using low speed\n");
- ast_ahb_writel(ct->ctl_read_val, ct->ctl_reg);
- free(test_buf);
- return 0;
- }
-
- /* Now we iterate the HCLK dividers until we find our breaking point */
- for (i = 5; i > 0; i--) {
- uint32_t tv, freq;
-
- /* Compare timing to max */
- freq = ast_ahb_freq / i;
- if (freq >= max_freq)
- continue;
-
- /* Set the timing */
- tv = ct->ctl_read_val | (ast_ct_hclk_divs[i - 1] << 8);
- ast_ahb_writel(tv, ct->ctl_reg);
- FL_DBG("AST: Trying HCLK/%d...\n", i);
- rc = ast_sf_calibrate_reads(ct, i, golden_buf, test_buf);
-
- /* Some other error occurred, bail out */
- if (rc && rc != FLASH_ERR_VERIFY_FAILURE) {
- free(test_buf);
- return rc;
- }
- if (rc == 0)
- best_div = i;
- }
- free(test_buf);
-
- /* Nothing found ? */
- if (best_div < 0)
- FL_ERR("AST: No good frequency, using dumb slow\n");
- else {
- FL_DBG("AST: Found good read timings at HCLK/%d\n", best_div);
- ct->ctl_read_val |= (ast_ct_hclk_divs[best_div - 1] << 8);
- }
- ast_ahb_writel(ct->ctl_read_val, ct->ctl_reg);
-
- return 0;
-}
-
-static int ast_sf_get_hclk(uint32_t *ctl_val, uint32_t max_freq)
-{
- int i;
-
- /* It appears that running commands at HCLK/2 on some micron
- * chips results in occasionally reads of bogus status (that
- * or unrelated chip hangs).
- *
- * Since we cannot calibrate properly the reads for commands,
- * instead, let's limit our SPI frequency to HCLK/4 to stay
- * on the safe side of things
- */
-#define MIN_CMD_FREQ 4
- for (i = MIN_CMD_FREQ; i <= 5; i++) {
- uint32_t freq = ast_ahb_freq / i;
- if (freq >= max_freq)
- continue;
- *ctl_val |= (ast_ct_hclk_divs[i - 1] << 8);
- return i;
- }
- return 0;
-}
-
-static int ast_sf_setup_macronix(struct ast_sf_ctrl *ct, struct flash_info *info)
-{
- int rc, div;
- uint8_t srcr[2];
-
- /*
- * Those Macronix chips support dual reads at 104Mhz
- * and dual IO at 84Mhz with 4 dummies.
- *
- * Our calibration algo should give us something along
- * the lines of HCLK/3 (HCLK/2 seems to work sometimes
- * but appears to be fairly unreliable) which is 64Mhz
- *
- * So we chose dual IO mode.
- *
- * The CE# inactive width for reads must be 7ns, we set it
- * to 3T which is about 15ns at the fastest speed we support
- * HCLK/2) as I've had issue with smaller values.
- *
- * For write and program it's 30ns so let's set the value
- * for normal ops to 6T.
- *
- * Preserve the current 4b mode.
- */
- FL_DBG("AST: Setting up Macronix...\n");
-
- /*
- * Read the status and config registers
- */
- rc = ast_sf_cmd_rd(&ct->ops, CMD_RDSR, false, 0, &srcr[0], 1);
- if (rc != 0) {
- FL_ERR("AST: Failed to read status\n");
- return rc;
- }
- rc = ast_sf_cmd_rd(&ct->ops, CMD_RDCR, false, 0, &srcr[1], 1);
- if (rc != 0) {
- FL_ERR("AST: Failed to read configuration\n");
- return rc;
- }
-
- FL_DBG("AST: Macronix SR:CR: 0x%02x:%02x\n", srcr[0], srcr[1]);
-
- /* Switch to 8 dummy cycles to enable 104Mhz operations */
- srcr[1] = (srcr[1] & 0x3f) | 0x80;
-
- rc = fl_wren(&ct->ops);
- if (rc) {
- FL_ERR("AST: Failed to WREN for Macronix config\n");
- return rc;
- }
-
- rc = ast_sf_cmd_wr(&ct->ops, CMD_WRSR, false, 0, srcr, 2);
- if (rc != 0) {
- FL_ERR("AST: Failed to write Macronix config\n");
- return rc;
- }
- rc = fl_sync_wait_idle(&ct->ops);;
- if (rc != 0) {
- FL_ERR("AST: Failed waiting for config write\n");
- return rc;
- }
-
- FL_DBG("AST: Macronix SR:CR: 0x%02x:%02x\n", srcr[0], srcr[1]);
-
- /* Use 2READ */
- ct->ctl_read_val = (ct->ctl_read_val & 0x2000) |
- (0x03 << 28) | /* Dual IO */
- (0x0d << 24) | /* CE# width 3T */
- (0xbb << 16) | /* 2READ command */
- (0x00 << 8) | /* HCLK/16 (optimize later) */
- (0x02 << 6) | /* 2 bytes dummy cycle (8 clocks) */
- (0x01); /* fast read */
-
- /* Configure SPI flash read timing */
- rc = ast_sf_optimize_reads(ct, info, 104000000);
- if (rc) {
- FL_ERR("AST: Failed to setup proper read timings, rc=%d\n", rc);
- return rc;
- }
-
- /*
- * For other commands and writes also increase the SPI clock
- * to HCLK/2 since the chip supports up to 133Mhz and set
- * CE# inactive to 6T. We request a timing that is 20% below
- * the limit of the chip, so about 106Mhz which should fit.
- */
- ct->ctl_val = (ct->ctl_val & 0x2000) |
- (0x00 << 28) | /* Single bit */
- (0x0a << 24) | /* CE# width 6T (b1010) */
- (0x00 << 16) | /* no command */
- (0x00 << 8) | /* HCLK/16 (done later) */
- (0x00 << 6) | /* no dummy cycle */
- (0x00); /* normal read */
-
- div = ast_sf_get_hclk(&ct->ctl_val, 106000000);
- FL_DBG("AST: Command timing set to HCLK/%d\n", div);
-
- /* Update chip with current read config */
- ast_ahb_writel(ct->ctl_read_val, ct->ctl_reg);
- return 0;
-}
-
-static int ast_sf_setup_winbond(struct ast_sf_ctrl *ct, struct flash_info *info)
-{
- int rc, div;
-
- FL_DBG("AST: Setting up Windbond...\n");
-
- /*
- * This Windbond chip support dual reads at 104Mhz
- * with 8 dummy cycles.
- *
- * The CE# inactive width for reads must be 10ns, we set it
- * to 3T which is about 15.6ns.
- */
- ct->ctl_read_val = (ct->ctl_read_val & 0x2000) |
- (0x02 << 28) | /* Dual bit data only */
- (0x0e << 24) | /* CE# width 2T (b1110) */
- (0x3b << 16) | /* DREAD command */
- (0x00 << 8) | /* HCLK/16 */
- (0x01 << 6) | /* 1-byte dummy cycle */
- (0x01); /* fast read */
-
- /* Configure SPI flash read timing */
- rc = ast_sf_optimize_reads(ct, info, 104000000);
- if (rc) {
- FL_ERR("AST: Failed to setup proper read timings, rc=%d\n", rc);
- return rc;
- }
-
- /*
- * For other commands and writes also increase the SPI clock
- * to HCLK/2 since the chip supports up to 133Mhz. CE# inactive
- * for write and erase is 50ns so let's set it to 10T.
- */
- ct->ctl_val = (ct->ctl_read_val & 0x2000) |
- (0x00 << 28) | /* Single bit */
- (0x06 << 24) | /* CE# width 10T (b0110) */
- (0x00 << 16) | /* no command */
- (0x00 << 8) | /* HCLK/16 */
- (0x00 << 6) | /* no dummy cycle */
- (0x01); /* fast read */
-
- div = ast_sf_get_hclk(&ct->ctl_val, 106000000);
- FL_DBG("AST: Command timing set to HCLK/%d\n", div);
-
- /* Update chip with current read config */
- ast_ahb_writel(ct->ctl_read_val, ct->ctl_reg);
- return 0;
-}
-
-static int ast_sf_setup_micron(struct ast_sf_ctrl *ct, struct flash_info *info)
-{
- uint8_t vconf, ext_id[6];
- int rc, div;
-
- FL_DBG("AST: Setting up Micron...\n");
-
- /*
- * Read the extended chip ID to try to detect old vs. new
- * flashes since old Micron flashes have a lot of issues
- */
- rc = ast_sf_cmd_rd(&ct->ops, CMD_RDID, false, 0, ext_id, 6);
- if (rc != 0) {
- FL_ERR("AST: Failed to read Micron ext ID, sticking to dumb speed\n");
- return 0;
- }
- /* Check ID matches expectations */
- if (ext_id[0] != ((info->id >> 16) & 0xff) ||
- ext_id[1] != ((info->id >> 8) & 0xff) ||
- ext_id[2] != ((info->id ) & 0xff)) {
- FL_ERR("AST: Micron ext ID mismatch, sticking to dumb speed\n");
- return 0;
- }
- FL_DBG("AST: Micron ext ID byte: 0x%02x\n", ext_id[4]);
-
- /* Check for old (<45nm) chips, don't try to be fancy on those */
- if (!(ext_id[4] & 0x40)) {
- FL_DBG("AST: Old chip, using dumb timings\n");
- goto dumb;
- }
-
- /*
- * Read the micron specific volatile configuration reg
- */
- rc = ast_sf_cmd_rd(&ct->ops, CMD_MIC_RDVCONF, false, 0, &vconf, 1);
- if (rc != 0) {
- FL_ERR("AST: Failed to read Micron vconf, sticking to dumb speed\n");
- goto dumb;
- }
- FL_DBG("AST: Micron VCONF: 0x%02x\n", vconf);
-
- /* Switch to 8 dummy cycles (we might be able to operate with 4
- * but let's keep some margin
- */
- vconf = (vconf & 0x0f) | 0x80;
-
- rc = ast_sf_cmd_wr(&ct->ops, CMD_MIC_WRVCONF, false, 0, &vconf, 1);
- if (rc != 0) {
- FL_ERR("AST: Failed to write Micron vconf, "
- " sticking to dumb speed\n");
- goto dumb;
- }
- rc = fl_sync_wait_idle(&ct->ops);;
- if (rc != 0) {
- FL_ERR("AST: Failed waiting for config write\n");
- return rc;
- }
- FL_DBG("AST: Updated to : 0x%02x\n", vconf);
-
- /*
- * Try to do full dual IO, with 8 dummy cycles it supports 133Mhz
- *
- * The CE# inactive width for reads must be 20ns, we set it
- * to 4T which is about 20.8ns.
- */
- ct->ctl_read_val = (ct->ctl_read_val & 0x2000) |
- (0x03 << 28) | /* Single bit */
- (0x0c << 24) | /* CE# 4T */
- (0xbb << 16) | /* 2READ command */
- (0x00 << 8) | /* HCLK/16 (optimize later) */
- (0x02 << 6) | /* 8 dummy cycles (2 bytes) */
- (0x01); /* fast read */
-
- /* Configure SPI flash read timing */
- rc = ast_sf_optimize_reads(ct, info, 133000000);
- if (rc) {
- FL_ERR("AST: Failed to setup proper read timings, rc=%d\n", rc);
- return rc;
- }
-
- /*
- * For other commands and writes also increase the SPI clock
- * to HCLK/2 since the chip supports up to 133Mhz. CE# inactive
- * for write and erase is 50ns so let's set it to 10T.
- */
- ct->ctl_val = (ct->ctl_read_val & 0x2000) |
- (0x00 << 28) | /* Single bit */
- (0x06 << 24) | /* CE# width 10T (b0110) */
- (0x00 << 16) | /* no command */
- (0x00 << 8) | /* HCLK/16 */
- (0x00 << 6) | /* no dummy cycle */
- (0x00); /* norm read */
-
- div = ast_sf_get_hclk(&ct->ctl_val, 133000000);
- FL_DBG("AST: Command timing set to HCLK/%d\n", div);
-
- /* Update chip with current read config */
- ast_ahb_writel(ct->ctl_read_val, ct->ctl_reg);
-
- return 0;
-
- dumb:
- ct->ctl_val = ct->ctl_read_val = (ct->ctl_read_val & 0x2000) |
- (0x00 << 28) | /* Single bit */
- (0x00 << 24) | /* CE# max */
- (0x03 << 16) | /* use normal reads */
- (0x06 << 8) | /* HCLK/4 */
- (0x00 << 6) | /* no dummy cycle */
- (0x00); /* normal read */
-
- /* Update chip with current read config */
- ast_ahb_writel(ct->ctl_read_val, ct->ctl_reg);
-
- return 0;
-}
-
-static int ast_sf_setup(struct spi_flash_ctrl *ctrl, uint32_t *tsize)
-{
- struct ast_sf_ctrl *ct = container_of(ctrl, struct ast_sf_ctrl, ops);
- struct flash_info *info = ctrl->finfo;
-
- (void)tsize;
-
- /*
- * Configure better timings and read mode for known
- * flash chips
- */
- switch(info->id) {
- case 0xc22019: /* MX25L25635F */
- case 0xc2201a: /* MX66L51235F */
- return ast_sf_setup_macronix(ct, info);
- case 0xef4018: /* W25Q128BV */
- return ast_sf_setup_winbond(ct, info);
- case 0x20ba20: /* MT25Qx512xx */
- return ast_sf_setup_micron(ct, info);
- }
- /* No special tuning */
- return 0;
-}
-
-static bool ast_sf_init_pnor(struct ast_sf_ctrl *ct)
-{
- uint32_t reg;
-
- ct->ctl_reg = PNOR_SPI_FCTL_CTRL;
- ct->fread_timing_reg = PNOR_SPI_FREAD_TIMING;
- ct->flash = PNOR_FLASH_BASE;
-
- /* Enable writing to the controller */
- reg = ast_ahb_readl(PNOR_SPI_FCTL_CONF);
- if (reg == 0xffffffff) {
- FL_ERR("AST_SF: Failed read from controller config\n");
- return false;
- }
- ast_ahb_writel(reg | 1, PNOR_SPI_FCTL_CONF);
-
- /*
- * Snapshot control reg and sanitize it for our
- * use, switching to 1-bit mode, clearing user
- * mode if set, etc...
- *
- * Also configure SPI clock to something safe
- * like HCLK/8 (24Mhz)
- */
- ct->ctl_val = ast_ahb_readl(ct->ctl_reg);
- if (ct->ctl_val == 0xffffffff) {
- FL_ERR("AST_SF: Failed read from controller control\n");
- return false;
- }
-
- ct->ctl_val = (ct->ctl_val & 0x2000) |
- (0x00 << 28) | /* Single bit */
- (0x00 << 24) | /* CE# width 16T */
- (0x00 << 16) | /* no command */
- (0x04 << 8) | /* HCLK/8 */
- (0x00 << 6) | /* no dummy cycle */
- (0x00); /* normal read */
-
- /* Initial read mode is default */
- ct->ctl_read_val = ct->ctl_val;
-
- /* Initial read timings all 0 */
- ct->fread_timing_val = 0;
-
- /* Configure for read */
- ast_ahb_writel(ct->ctl_read_val, ct->ctl_reg);
- ast_ahb_writel(ct->fread_timing_val, ct->fread_timing_reg);
-
- if (ct->ctl_val & 0x2000)
- ct->mode_4b = true;
- else
- ct->mode_4b = false;
-
- return true;
-}
-
-static bool ast_sf_init_bmc(struct ast_sf_ctrl *ct)
-{
- ct->ctl_reg = BMC_SPI_FCTL_CTRL;
- ct->fread_timing_reg = BMC_SPI_FREAD_TIMING;
- ct->flash = BMC_FLASH_BASE;
-
- /*
- * Snapshot control reg and sanitize it for our
- * use, switching to 1-bit mode, clearing user
- * mode if set, etc...
- *
- * Also configure SPI clock to something safe
- * like HCLK/8 (24Mhz)
- */
- ct->ctl_val =
- (0x00 << 28) | /* Single bit */
- (0x00 << 24) | /* CE# width 16T */
- (0x00 << 16) | /* no command */
- (0x04 << 8) | /* HCLK/8 */
- (0x00 << 6) | /* no dummy cycle */
- (0x00); /* normal read */
-
- /* Initial read mode is default */
- ct->ctl_read_val = ct->ctl_val;
-
- /* Initial read timings all 0 */
- ct->fread_timing_val = 0;
-
- /* Configure for read */
- ast_ahb_writel(ct->ctl_read_val, ct->ctl_reg);
- ast_ahb_writel(ct->fread_timing_val, ct->fread_timing_reg);
-
- ct->mode_4b = false;
-
- return true;
-}
-
-int ast_sf_open(uint8_t type, struct spi_flash_ctrl **ctrl)
-{
- struct ast_sf_ctrl *ct;
-
- if (type != AST_SF_TYPE_PNOR && type != AST_SF_TYPE_BMC)
- return -EINVAL;
-
- *ctrl = NULL;
- ct = malloc(sizeof(*ct));
- if (!ct) {
- FL_ERR("AST_SF: Failed to allocate\n");
- return -ENOMEM;
- }
- memset(ct, 0, sizeof(*ct));
- ct->type = type;
- ct->ops.cmd_wr = ast_sf_cmd_wr;
- ct->ops.cmd_rd = ast_sf_cmd_rd;
- ct->ops.set_4b = ast_sf_set_4b;
- ct->ops.read = ast_sf_read;
- ct->ops.setup = ast_sf_setup;
-
- ast_get_ahb_freq();
-
- if (type == AST_SF_TYPE_PNOR) {
- if (!ast_sf_init_pnor(ct))
- goto fail;
- } else {
- if (!ast_sf_init_bmc(ct))
- goto fail;
- }
-
- *ctrl = &ct->ops;
-
- return 0;
- fail:
- free(ct);
- return -EIO;
-}
-
-void ast_sf_close(struct spi_flash_ctrl *ctrl)
-{
- struct ast_sf_ctrl *ct = container_of(ctrl, struct ast_sf_ctrl, ops);
-
- /* Restore control reg to read */
- ast_ahb_writel(ct->ctl_read_val, ct->ctl_reg);
-
- /* Additional cleanup */
- if (ct->type == AST_SF_TYPE_PNOR) {
- uint32_t reg = ast_ahb_readl(PNOR_SPI_FCTL_CONF);
- if (reg != 0xffffffff)
- ast_ahb_writel(reg & ~1, PNOR_SPI_FCTL_CONF);
- }
-
- /* Free the whole lot */
- free(ct);
-}
-
+/* Copyright 2013-2014 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <stdint.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <libflash/libflash.h>
+#include <libflash/libflash-priv.h>
+
+#include "ast.h"
+
+#ifndef __unused
+#define __unused __attribute__((unused))
+#endif
+
+#define CALIBRATE_BUF_SIZE 16384
+
+struct ast_sf_ctrl {
+ /* We have 2 controllers, one for the BMC flash, one for the PNOR */
+ uint8_t type;
+
+ /* Address and previous value of the ctrl register */
+ uint32_t ctl_reg;
+
+ /* Control register value for normal commands */
+ uint32_t ctl_val;
+
+ /* Control register value for (fast) reads */
+ uint32_t ctl_read_val;
+
+ /* Flash read timing register */
+ uint32_t fread_timing_reg;
+ uint32_t fread_timing_val;
+
+ /* Address of the flash mapping */
+ uint32_t flash;
+
+ /* Current 4b mode */
+ bool mode_4b;
+
+ /* Callbacks */
+ struct spi_flash_ctrl ops;
+};
+
+static uint32_t ast_ahb_freq;
+
+static const uint32_t ast_ct_hclk_divs[] = {
+ 0xf, /* HCLK */
+ 0x7, /* HCLK/2 */
+ 0xe, /* HCLK/3 */
+ 0x6, /* HCLK/4 */
+ 0xd, /* HCLK/5 */
+};
+
+static int ast_sf_start_cmd(struct ast_sf_ctrl *ct, uint8_t cmd)
+{
+ /* Switch to user mode, CE# dropped */
+ ast_ahb_writel(ct->ctl_val | 7, ct->ctl_reg);
+
+ /* user mode, CE# active */
+ ast_ahb_writel(ct->ctl_val | 3, ct->ctl_reg);
+
+ /* write cmd */
+ return ast_copy_to_ahb(ct->flash, &cmd, 1);
+}
+
+static void ast_sf_end_cmd(struct ast_sf_ctrl *ct)
+{
+ /* clear CE# */
+ ast_ahb_writel(ct->ctl_val | 7, ct->ctl_reg);
+
+ /* Switch back to read mode */
+ ast_ahb_writel(ct->ctl_read_val, ct->ctl_reg);
+}
+
+static int ast_sf_send_addr(struct ast_sf_ctrl *ct, uint32_t addr)
+{
+ const void *ap;
+
+ /* Layout address MSB first in memory */
+ addr = cpu_to_be32(addr);
+
+ /* Send the right amount of bytes */
+ ap = (char *)&addr;
+
+ if (ct->mode_4b)
+ return ast_copy_to_ahb(ct->flash, ap, 4);
+ else
+ return ast_copy_to_ahb(ct->flash, ap + 1, 3);
+}
+
+static int ast_sf_cmd_rd(struct spi_flash_ctrl *ctrl, uint8_t cmd,
+ bool has_addr, uint32_t addr, void *buffer,
+ uint32_t size)
+{
+ struct ast_sf_ctrl *ct = container_of(ctrl, struct ast_sf_ctrl, ops);
+ int rc;
+
+ rc = ast_sf_start_cmd(ct, cmd);
+ if (rc)
+ goto bail;
+ if (has_addr) {
+ rc = ast_sf_send_addr(ct, addr);
+ if (rc)
+ goto bail;
+ }
+ if (buffer && size)
+ rc = ast_copy_from_ahb(buffer, ct->flash, size);
+ bail:
+ ast_sf_end_cmd(ct);
+ return rc;
+}
+
+static int ast_sf_cmd_wr(struct spi_flash_ctrl *ctrl, uint8_t cmd,
+ bool has_addr, uint32_t addr, const void *buffer,
+ uint32_t size)
+{
+ struct ast_sf_ctrl *ct = container_of(ctrl, struct ast_sf_ctrl, ops);
+ int rc;
+
+ rc = ast_sf_start_cmd(ct, cmd);
+ if (rc)
+ goto bail;
+ if (has_addr) {
+ rc = ast_sf_send_addr(ct, addr);
+ if (rc)
+ goto bail;
+ }
+ if (buffer && size)
+ rc = ast_copy_to_ahb(ct->flash, buffer, size);
+ bail:
+ ast_sf_end_cmd(ct);
+ return rc;
+}
+
+static int ast_sf_set_4b(struct spi_flash_ctrl *ctrl, bool enable)
+{
+ struct ast_sf_ctrl *ct = container_of(ctrl, struct ast_sf_ctrl, ops);
+ uint32_t ce_ctrl = 0;
+
+ if (ct->type == AST_SF_TYPE_BMC && ct->ops.finfo->size > 0x1000000)
+ ce_ctrl = ast_ahb_readl(BMC_SPI_FCTL_CE_CTRL);
+
+ /*
+ * We update the "old" value as well since when quitting
+ * we don't restore the mode of the flash itself so we need
+ * to leave the controller in a compatible setup
+ */
+ if (enable) {
+ ct->ctl_val |= 0x2000;
+ ct->ctl_read_val |= 0x2000;
+ ce_ctrl |= 0x1;
+ } else {
+ ct->ctl_val &= ~0x2000;
+ ct->ctl_read_val &= ~0x2000;
+ ce_ctrl &= ~0x1;
+ }
+ ct->mode_4b = enable;
+
+ /* Update read mode */
+ ast_ahb_writel(ct->ctl_read_val, ct->ctl_reg);
+
+ if (ce_ctrl)
+ ast_ahb_writel(ce_ctrl, BMC_SPI_FCTL_CE_CTRL);
+
+ return 0;
+}
+
+static int ast_sf_read(struct spi_flash_ctrl *ctrl, uint32_t pos,
+ void *buf, uint32_t len)
+{
+ struct ast_sf_ctrl *ct = container_of(ctrl, struct ast_sf_ctrl, ops);
+
+ /*
+ * We are in read mode by default. We don't yet support fancy
+ * things like fast read or X2 mode
+ */
+ return ast_copy_from_ahb(buf, ct->flash + pos, len);
+}
+
+static void ast_get_ahb_freq(void)
+{
+ static const uint32_t cpu_freqs_24_48[] = {
+ 384000000,
+ 360000000,
+ 336000000,
+ 408000000
+ };
+ static const uint32_t cpu_freqs_25[] = {
+ 400000000,
+ 375000000,
+ 350000000,
+ 425000000
+ };
+ static const uint32_t ahb_div[] = { 1, 2, 4, 3 };
+ uint32_t strap, cpu_clk, div;
+
+ if (ast_ahb_freq)
+ return;
+
+ /* HW strapping gives us the CPU freq and AHB divisor */
+ strap = ast_ahb_readl(SCU_HW_STRAPPING);
+ if (strap & 0x00800000) {
+ FL_DBG("AST: CLKIN 25Mhz\n");
+ cpu_clk = cpu_freqs_25[(strap >> 8) & 3];
+ } else {
+ FL_DBG("AST: CLKIN 24/48Mhz\n");
+ cpu_clk = cpu_freqs_24_48[(strap >> 8) & 3];
+ }
+ FL_DBG("AST: CPU frequency: %d Mhz\n", cpu_clk / 1000000);
+ div = ahb_div[(strap >> 10) & 3];
+ ast_ahb_freq = cpu_clk / div;
+ FL_DBG("AST: AHB frequency: %d Mhz\n", ast_ahb_freq / 1000000);
+}
+
+static int ast_sf_check_reads(struct ast_sf_ctrl *ct,
+ const uint8_t *golden_buf, uint8_t *test_buf)
+{
+ int i, rc;
+
+ for (i = 0; i < 10; i++) {
+ rc = ast_copy_from_ahb(test_buf, ct->flash, CALIBRATE_BUF_SIZE);
+ if (rc)
+ return rc;
+ if (memcmp(test_buf, golden_buf, CALIBRATE_BUF_SIZE) != 0)
+ return FLASH_ERR_VERIFY_FAILURE;
+ }
+ return 0;
+}
+
+static int ast_sf_calibrate_reads(struct ast_sf_ctrl *ct, uint32_t hdiv,
+ const uint8_t *golden_buf, uint8_t *test_buf)
+{
+ int i, rc;
+ int good_pass = -1, pass_count = 0;
+ uint32_t shift = (hdiv - 1) << 2;
+ uint32_t mask = ~(0xfu << shift);
+
+#define FREAD_TPASS(i) (((i) / 2) | (((i) & 1) ? 0 : 8))
+
+ /* Try HCLK delay 0..5, each one with/without delay and look for a
+ * good pair.
+ */
+ for (i = 0; i < 12; i++) {
+ bool pass;
+
+ ct->fread_timing_val &= mask;
+ ct->fread_timing_val |= FREAD_TPASS(i) << shift;
+ ast_ahb_writel(ct->fread_timing_val, ct->fread_timing_reg);
+ rc = ast_sf_check_reads(ct, golden_buf, test_buf);
+ if (rc && rc != FLASH_ERR_VERIFY_FAILURE)
+ return rc;
+ pass = (rc == 0);
+ FL_DBG(" * [%08x] %d HCLK delay, %dns DI delay : %s\n",
+ ct->fread_timing_val, i/2, (i & 1) ? 0 : 4, pass ? "PASS" : "FAIL");
+ if (pass) {
+ pass_count++;
+ if (pass_count == 3) {
+ good_pass = i - 1;
+ break;
+ }
+ } else
+ pass_count = 0;
+ }
+
+ /* No good setting for this frequency */
+ if (good_pass < 0)
+ return FLASH_ERR_VERIFY_FAILURE;
+
+ /* We have at least one pass of margin, let's use first pass */
+ ct->fread_timing_val &= mask;
+ ct->fread_timing_val |= FREAD_TPASS(good_pass) << shift;
+ ast_ahb_writel(ct->fread_timing_val, ct->fread_timing_reg);
+ FL_DBG("AST: * -> good is pass %d [0x%08x]\n",
+ good_pass, ct->fread_timing_val);
+ return 0;
+}
+
+static bool ast_calib_data_usable(const uint8_t *test_buf, uint32_t size)
+{
+ const uint32_t *tb32 = (const uint32_t *)test_buf;
+ uint32_t i, cnt = 0;
+
+ /* We check if we have enough words that are neither all 0
+ * nor all 1's so the calibration can be considered valid.
+ *
+ * I use an arbitrary threshold for now of 64
+ */
+ size >>= 2;
+ for (i = 0; i < size; i++) {
+ if (tb32[i] != 0 && tb32[i] != 0xffffffff)
+ cnt++;
+ }
+ return cnt >= 64;
+}
+
+static int ast_sf_optimize_reads(struct ast_sf_ctrl *ct,
+ struct flash_info *info __unused,
+ uint32_t max_freq)
+{
+ uint8_t *golden_buf, *test_buf;
+ int i, rc, best_div = -1;
+ uint32_t save_read_val = ct->ctl_read_val;
+
+ test_buf = malloc(CALIBRATE_BUF_SIZE * 2);
+ golden_buf = test_buf + CALIBRATE_BUF_SIZE;
+
+ /* We start with the dumbest setting and read some data */
+ ct->ctl_read_val = (ct->ctl_read_val & 0x2000) |
+ (0x00 << 28) | /* Single bit */
+ (0x00 << 24) | /* CE# max */
+ (0x03 << 16) | /* use normal reads */
+ (0x00 << 8) | /* HCLK/16 */
+ (0x00 << 6) | /* no dummy cycle */
+ (0x00); /* normal read */
+ ast_ahb_writel(ct->ctl_read_val, ct->ctl_reg);
+
+ rc = ast_copy_from_ahb(golden_buf, ct->flash, CALIBRATE_BUF_SIZE);
+ if (rc) {
+ free(test_buf);
+ return rc;
+ }
+
+ /* Establish our read mode with freq field set to 0 */
+ ct->ctl_read_val = save_read_val & 0xfffff0ff;
+
+ /* Check if calibration data is suitable */
+ if (!ast_calib_data_usable(golden_buf, CALIBRATE_BUF_SIZE)) {
+ FL_INF("AST: Calibration area too uniform, "
+ "using low speed\n");
+ ast_ahb_writel(ct->ctl_read_val, ct->ctl_reg);
+ free(test_buf);
+ return 0;
+ }
+
+ /* Now we iterate the HCLK dividers until we find our breaking point */
+ for (i = 5; i > 0; i--) {
+ uint32_t tv, freq;
+
+ /* Compare timing to max */
+ freq = ast_ahb_freq / i;
+ if (freq >= max_freq)
+ continue;
+
+ /* Set the timing */
+ tv = ct->ctl_read_val | (ast_ct_hclk_divs[i - 1] << 8);
+ ast_ahb_writel(tv, ct->ctl_reg);
+ FL_DBG("AST: Trying HCLK/%d...\n", i);
+ rc = ast_sf_calibrate_reads(ct, i, golden_buf, test_buf);
+
+ /* Some other error occurred, bail out */
+ if (rc && rc != FLASH_ERR_VERIFY_FAILURE) {
+ free(test_buf);
+ return rc;
+ }
+ if (rc == 0)
+ best_div = i;
+ }
+ free(test_buf);
+
+ /* Nothing found ? */
+ if (best_div < 0)
+ FL_ERR("AST: No good frequency, using dumb slow\n");
+ else {
+ FL_DBG("AST: Found good read timings at HCLK/%d\n", best_div);
+ ct->ctl_read_val |= (ast_ct_hclk_divs[best_div - 1] << 8);
+ }
+ ast_ahb_writel(ct->ctl_read_val, ct->ctl_reg);
+
+ return 0;
+}
+
+static int ast_sf_get_hclk(uint32_t *ctl_val, uint32_t max_freq)
+{
+ int i;
+
+ /* It appears that running commands at HCLK/2 on some micron
+ * chips results in occasionally reads of bogus status (that
+ * or unrelated chip hangs).
+ *
+ * Since we cannot calibrate properly the reads for commands,
+ * instead, let's limit our SPI frequency to HCLK/4 to stay
+ * on the safe side of things
+ */
+#define MIN_CMD_FREQ 4
+ for (i = MIN_CMD_FREQ; i <= 5; i++) {
+ uint32_t freq = ast_ahb_freq / i;
+ if (freq >= max_freq)
+ continue;
+ *ctl_val |= (ast_ct_hclk_divs[i - 1] << 8);
+ return i;
+ }
+ return 0;
+}
+
+static int ast_sf_setup_macronix(struct ast_sf_ctrl *ct, struct flash_info *info)
+{
+ int rc, div __unused;
+ uint8_t srcr[2];
+
+ /*
+ * Those Macronix chips support dual reads at 104Mhz
+ * and dual IO at 84Mhz with 4 dummies.
+ *
+ * Our calibration algo should give us something along
+ * the lines of HCLK/3 (HCLK/2 seems to work sometimes
+ * but appears to be fairly unreliable) which is 64Mhz
+ *
+ * So we chose dual IO mode.
+ *
+ * The CE# inactive width for reads must be 7ns, we set it
+ * to 3T which is about 15ns at the fastest speed we support
+ * HCLK/2) as I've had issue with smaller values.
+ *
+ * For write and program it's 30ns so let's set the value
+ * for normal ops to 6T.
+ *
+ * Preserve the current 4b mode.
+ */
+ FL_DBG("AST: Setting up Macronix...\n");
+
+ /*
+ * Read the status and config registers
+ */
+ rc = ast_sf_cmd_rd(&ct->ops, CMD_RDSR, false, 0, &srcr[0], 1);
+ if (rc != 0) {
+ FL_ERR("AST: Failed to read status\n");
+ return rc;
+ }
+ rc = ast_sf_cmd_rd(&ct->ops, CMD_RDCR, false, 0, &srcr[1], 1);
+ if (rc != 0) {
+ FL_ERR("AST: Failed to read configuration\n");
+ return rc;
+ }
+
+ FL_DBG("AST: Macronix SR:CR: 0x%02x:%02x\n", srcr[0], srcr[1]);
+
+ /* Switch to 8 dummy cycles to enable 104Mhz operations */
+ srcr[1] = (srcr[1] & 0x3f) | 0x80;
+
+ rc = fl_wren(&ct->ops);
+ if (rc) {
+ FL_ERR("AST: Failed to WREN for Macronix config\n");
+ return rc;
+ }
+
+ rc = ast_sf_cmd_wr(&ct->ops, CMD_WRSR, false, 0, srcr, 2);
+ if (rc != 0) {
+ FL_ERR("AST: Failed to write Macronix config\n");
+ return rc;
+ }
+ rc = fl_sync_wait_idle(&ct->ops);;
+ if (rc != 0) {
+ FL_ERR("AST: Failed waiting for config write\n");
+ return rc;
+ }
+
+ FL_DBG("AST: Macronix SR:CR: 0x%02x:%02x\n", srcr[0], srcr[1]);
+
+ /* Use 2READ */
+ ct->ctl_read_val = (ct->ctl_read_val & 0x2000) |
+ (0x03 << 28) | /* Dual IO */
+ (0x0d << 24) | /* CE# width 3T */
+ (0xbb << 16) | /* 2READ command */
+ (0x00 << 8) | /* HCLK/16 (optimize later) */
+ (0x02 << 6) | /* 2 bytes dummy cycle (8 clocks) */
+ (0x01); /* fast read */
+
+ /* Configure SPI flash read timing */
+ rc = ast_sf_optimize_reads(ct, info, 104000000);
+ if (rc) {
+ FL_ERR("AST: Failed to setup proper read timings, rc=%d\n", rc);
+ return rc;
+ }
+
+ /*
+ * For other commands and writes also increase the SPI clock
+ * to HCLK/2 since the chip supports up to 133Mhz and set
+ * CE# inactive to 6T. We request a timing that is 20% below
+ * the limit of the chip, so about 106Mhz which should fit.
+ */
+ ct->ctl_val = (ct->ctl_val & 0x2000) |
+ (0x00 << 28) | /* Single bit */
+ (0x0a << 24) | /* CE# width 6T (b1010) */
+ (0x00 << 16) | /* no command */
+ (0x00 << 8) | /* HCLK/16 (done later) */
+ (0x00 << 6) | /* no dummy cycle */
+ (0x00); /* normal read */
+
+ div = ast_sf_get_hclk(&ct->ctl_val, 106000000);
+ FL_DBG("AST: Command timing set to HCLK/%d\n", div);
+
+ /* Update chip with current read config */
+ ast_ahb_writel(ct->ctl_read_val, ct->ctl_reg);
+ return 0;
+}
+
+static int ast_sf_setup_winbond(struct ast_sf_ctrl *ct, struct flash_info *info)
+{
+ int rc, div __unused;
+
+ FL_DBG("AST: Setting up Windbond...\n");
+
+ /*
+ * This Windbond chip support dual reads at 104Mhz
+ * with 8 dummy cycles.
+ *
+ * The CE# inactive width for reads must be 10ns, we set it
+ * to 3T which is about 15.6ns.
+ */
+ ct->ctl_read_val = (ct->ctl_read_val & 0x2000) |
+ (0x02 << 28) | /* Dual bit data only */
+ (0x0e << 24) | /* CE# width 2T (b1110) */
+ (0x3b << 16) | /* DREAD command */
+ (0x00 << 8) | /* HCLK/16 */
+ (0x01 << 6) | /* 1-byte dummy cycle */
+ (0x01); /* fast read */
+
+ /* Configure SPI flash read timing */
+ rc = ast_sf_optimize_reads(ct, info, 104000000);
+ if (rc) {
+ FL_ERR("AST: Failed to setup proper read timings, rc=%d\n", rc);
+ return rc;
+ }
+
+ /*
+ * For other commands and writes also increase the SPI clock
+ * to HCLK/2 since the chip supports up to 133Mhz. CE# inactive
+ * for write and erase is 50ns so let's set it to 10T.
+ */
+ ct->ctl_val = (ct->ctl_read_val & 0x2000) |
+ (0x00 << 28) | /* Single bit */
+ (0x06 << 24) | /* CE# width 10T (b0110) */
+ (0x00 << 16) | /* no command */
+ (0x00 << 8) | /* HCLK/16 */
+ (0x00 << 6) | /* no dummy cycle */
+ (0x01); /* fast read */
+
+ div = ast_sf_get_hclk(&ct->ctl_val, 106000000);
+ FL_DBG("AST: Command timing set to HCLK/%d\n", div);
+
+ /* Update chip with current read config */
+ ast_ahb_writel(ct->ctl_read_val, ct->ctl_reg);
+ return 0;
+}
+
+static int ast_sf_setup_micron(struct ast_sf_ctrl *ct, struct flash_info *info)
+{
+ uint8_t vconf, ext_id[6];
+ int rc, div __unused;
+
+ FL_DBG("AST: Setting up Micron...\n");
+
+ /*
+ * Read the extended chip ID to try to detect old vs. new
+ * flashes since old Micron flashes have a lot of issues
+ */
+ rc = ast_sf_cmd_rd(&ct->ops, CMD_RDID, false, 0, ext_id, 6);
+ if (rc != 0) {
+ FL_ERR("AST: Failed to read Micron ext ID, sticking to dumb speed\n");
+ return 0;
+ }
+ /* Check ID matches expectations */
+ if (ext_id[0] != ((info->id >> 16) & 0xff) ||
+ ext_id[1] != ((info->id >> 8) & 0xff) ||
+ ext_id[2] != ((info->id ) & 0xff)) {
+ FL_ERR("AST: Micron ext ID mismatch, sticking to dumb speed\n");
+ return 0;
+ }
+ FL_DBG("AST: Micron ext ID byte: 0x%02x\n", ext_id[4]);
+
+ /* Check for old (<45nm) chips, don't try to be fancy on those */
+ if (!(ext_id[4] & 0x40)) {
+ FL_DBG("AST: Old chip, using dumb timings\n");
+ goto dumb;
+ }
+
+ /*
+ * Read the micron specific volatile configuration reg
+ */
+ rc = ast_sf_cmd_rd(&ct->ops, CMD_MIC_RDVCONF, false, 0, &vconf, 1);
+ if (rc != 0) {
+ FL_ERR("AST: Failed to read Micron vconf, sticking to dumb speed\n");
+ goto dumb;
+ }
+ FL_DBG("AST: Micron VCONF: 0x%02x\n", vconf);
+
+ /* Switch to 8 dummy cycles (we might be able to operate with 4
+ * but let's keep some margin
+ */
+ vconf = (vconf & 0x0f) | 0x80;
+
+ rc = ast_sf_cmd_wr(&ct->ops, CMD_MIC_WRVCONF, false, 0, &vconf, 1);
+ if (rc != 0) {
+ FL_ERR("AST: Failed to write Micron vconf, "
+ " sticking to dumb speed\n");
+ goto dumb;
+ }
+ rc = fl_sync_wait_idle(&ct->ops);;
+ if (rc != 0) {
+ FL_ERR("AST: Failed waiting for config write\n");
+ return rc;
+ }
+ FL_DBG("AST: Updated to : 0x%02x\n", vconf);
+
+ /*
+ * Try to do full dual IO, with 8 dummy cycles it supports 133Mhz
+ *
+ * The CE# inactive width for reads must be 20ns, we set it
+ * to 4T which is about 20.8ns.
+ */
+ ct->ctl_read_val = (ct->ctl_read_val & 0x2000) |
+ (0x03 << 28) | /* Single bit */
+ (0x0c << 24) | /* CE# 4T */
+ (0xbb << 16) | /* 2READ command */
+ (0x00 << 8) | /* HCLK/16 (optimize later) */
+ (0x02 << 6) | /* 8 dummy cycles (2 bytes) */
+ (0x01); /* fast read */
+
+ /* Configure SPI flash read timing */
+ rc = ast_sf_optimize_reads(ct, info, 133000000);
+ if (rc) {
+ FL_ERR("AST: Failed to setup proper read timings, rc=%d\n", rc);
+ return rc;
+ }
+
+ /*
+ * For other commands and writes also increase the SPI clock
+ * to HCLK/2 since the chip supports up to 133Mhz. CE# inactive
+ * for write and erase is 50ns so let's set it to 10T.
+ */
+ ct->ctl_val = (ct->ctl_read_val & 0x2000) |
+ (0x00 << 28) | /* Single bit */
+ (0x06 << 24) | /* CE# width 10T (b0110) */
+ (0x00 << 16) | /* no command */
+ (0x00 << 8) | /* HCLK/16 */
+ (0x00 << 6) | /* no dummy cycle */
+ (0x00); /* norm read */
+
+ div = ast_sf_get_hclk(&ct->ctl_val, 133000000);
+ FL_DBG("AST: Command timing set to HCLK/%d\n", div);
+
+ /* Update chip with current read config */
+ ast_ahb_writel(ct->ctl_read_val, ct->ctl_reg);
+
+ return 0;
+
+ dumb:
+ ct->ctl_val = ct->ctl_read_val = (ct->ctl_read_val & 0x2000) |
+ (0x00 << 28) | /* Single bit */
+ (0x00 << 24) | /* CE# max */
+ (0x03 << 16) | /* use normal reads */
+ (0x06 << 8) | /* HCLK/4 */
+ (0x00 << 6) | /* no dummy cycle */
+ (0x00); /* normal read */
+
+ /* Update chip with current read config */
+ ast_ahb_writel(ct->ctl_read_val, ct->ctl_reg);
+
+ return 0;
+}
+
+static int ast_sf_setup(struct spi_flash_ctrl *ctrl, uint32_t *tsize)
+{
+ struct ast_sf_ctrl *ct = container_of(ctrl, struct ast_sf_ctrl, ops);
+ struct flash_info *info = ctrl->finfo;
+
+ (void)tsize;
+
+ /*
+ * Configure better timings and read mode for known
+ * flash chips
+ */
+ switch(info->id) {
+ case 0xc22018: /* MX25L12835F */
+ case 0xc22019: /* MX25L25635F */
+ case 0xc2201a: /* MX66L51235F */
+ return ast_sf_setup_macronix(ct, info);
+ case 0xef4018: /* W25Q128BV */
+ return ast_sf_setup_winbond(ct, info);
+ case 0x20ba20: /* MT25Qx512xx */
+ return ast_sf_setup_micron(ct, info);
+ }
+ /* No special tuning */
+ return 0;
+}
+
+static bool ast_sf_init_pnor(struct ast_sf_ctrl *ct)
+{
+ uint32_t reg;
+
+ ct->ctl_reg = PNOR_SPI_FCTL_CTRL;
+ ct->fread_timing_reg = PNOR_SPI_FREAD_TIMING;
+ ct->flash = PNOR_FLASH_BASE;
+
+ /* Enable writing to the controller */
+ reg = ast_ahb_readl(PNOR_SPI_FCTL_CONF);
+ if (reg == 0xffffffff) {
+ FL_ERR("AST_SF: Failed read from controller config\n");
+ return false;
+ }
+ ast_ahb_writel(reg | 1, PNOR_SPI_FCTL_CONF);
+
+ /*
+ * Snapshot control reg and sanitize it for our
+ * use, switching to 1-bit mode, clearing user
+ * mode if set, etc...
+ *
+ * Also configure SPI clock to something safe
+ * like HCLK/8 (24Mhz)
+ */
+ ct->ctl_val = ast_ahb_readl(ct->ctl_reg);
+ if (ct->ctl_val == 0xffffffff) {
+ FL_ERR("AST_SF: Failed read from controller control\n");
+ return false;
+ }
+
+ ct->ctl_val = (ct->ctl_val & 0x2000) |
+ (0x00 << 28) | /* Single bit */
+ (0x00 << 24) | /* CE# width 16T */
+ (0x00 << 16) | /* no command */
+ (0x04 << 8) | /* HCLK/8 */
+ (0x00 << 6) | /* no dummy cycle */
+ (0x00); /* normal read */
+
+ /* Initial read mode is default */
+ ct->ctl_read_val = ct->ctl_val;
+
+ /* Initial read timings all 0 */
+ ct->fread_timing_val = 0;
+
+ /* Configure for read */
+ ast_ahb_writel(ct->ctl_read_val, ct->ctl_reg);
+ ast_ahb_writel(ct->fread_timing_val, ct->fread_timing_reg);
+
+ if (ct->ctl_val & 0x2000)
+ ct->mode_4b = true;
+ else
+ ct->mode_4b = false;
+
+ return true;
+}
+
+static bool ast_sf_init_bmc(struct ast_sf_ctrl *ct)
+{
+ ct->ctl_reg = BMC_SPI_FCTL_CTRL;
+ ct->fread_timing_reg = BMC_SPI_FREAD_TIMING;
+ ct->flash = BMC_FLASH_BASE;
+
+ /*
+ * Snapshot control reg and sanitize it for our
+ * use, switching to 1-bit mode, clearing user
+ * mode if set, etc...
+ *
+ * Also configure SPI clock to something safe
+ * like HCLK/8 (24Mhz)
+ */
+ ct->ctl_val =
+ (0x00 << 28) | /* Single bit */
+ (0x00 << 24) | /* CE# width 16T */
+ (0x00 << 16) | /* no command */
+ (0x04 << 8) | /* HCLK/8 */
+ (0x00 << 6) | /* no dummy cycle */
+ (0x00); /* normal read */
+
+ /* Initial read mode is default */
+ ct->ctl_read_val = ct->ctl_val;
+
+ /* Initial read timings all 0 */
+ ct->fread_timing_val = 0;
+
+ /* Configure for read */
+ ast_ahb_writel(ct->ctl_read_val, ct->ctl_reg);
+ ast_ahb_writel(ct->fread_timing_val, ct->fread_timing_reg);
+
+ ct->mode_4b = false;
+
+ return true;
+}
+
+static int ast_mem_set4b(struct spi_flash_ctrl *ctrl __unused,
+ bool enable __unused)
+{
+ return 0;
+}
+
+static int ast_mem_setup(struct spi_flash_ctrl *ctrl __unused,
+ uint32_t *tsize __unused)
+{
+ return 0;
+}
+
+static int ast_mem_chipid(struct spi_flash_ctrl *ctrl __unused, uint8_t *id_buf,
+ uint32_t *id_size)
+{
+ if (*id_size < 3)
+ return -1;
+
+ id_buf[0] = 0xaa;
+ id_buf[1] = 0x55;
+ id_buf[2] = 0xaa;
+ *id_size = 3;
+ return 0;
+}
+
+static int ast_mem_write(struct spi_flash_ctrl *ctrl, uint32_t pos,
+ const void *buf, uint32_t len)
+{
+ struct ast_sf_ctrl *ct = container_of(ctrl, struct ast_sf_ctrl, ops);
+
+ /*
+ * This only works when the ahb is pointed at system memory.
+ */
+ return ast_copy_to_ahb(ct->flash + pos, buf, len);
+}
+
+static int ast_mem_erase(struct spi_flash_ctrl *ctrl, uint32_t addr, uint32_t size)
+{
+ struct ast_sf_ctrl *ct = container_of(ctrl, struct ast_sf_ctrl, ops);
+ uint32_t pos, len, end = addr + size;
+ uint64_t zero = 0;
+ int ret;
+
+ for (pos = addr; pos < end; pos += sizeof(zero)) {
+ if (pos + sizeof(zero) > end)
+ len = end - pos;
+ else
+ len = sizeof(zero);
+
+ ret = ast_copy_to_ahb(ct->flash + pos, &zero, len);
+ if (ret)
+ return ret;
+ }
+
+ return 0;
+}
+
+int ast_sf_open(uint8_t type, struct spi_flash_ctrl **ctrl)
+{
+ struct ast_sf_ctrl *ct;
+
+ if (type != AST_SF_TYPE_PNOR && type != AST_SF_TYPE_BMC
+ && type != AST_SF_TYPE_MEM)
+ return -EINVAL;
+
+ *ctrl = NULL;
+ ct = malloc(sizeof(*ct));
+ if (!ct) {
+ FL_ERR("AST_SF: Failed to allocate\n");
+ return -ENOMEM;
+ }
+ memset(ct, 0, sizeof(*ct));
+ ct->type = type;
+
+ if (type == AST_SF_TYPE_MEM) {
+ ct->ops.cmd_wr = NULL;
+ ct->ops.cmd_rd = NULL;
+ ct->ops.read = ast_sf_read;
+ ct->ops.set_4b = ast_mem_set4b;
+ ct->ops.write = ast_mem_write;
+ ct->ops.erase = ast_mem_erase;
+ ct->ops.setup = ast_mem_setup;
+ ct->ops.chip_id = ast_mem_chipid;
+ ct->flash = PNOR_FLASH_BASE;
+ } else {
+ ct->ops.cmd_wr = ast_sf_cmd_wr;
+ ct->ops.cmd_rd = ast_sf_cmd_rd;
+ ct->ops.set_4b = ast_sf_set_4b;
+ ct->ops.read = ast_sf_read;
+ ct->ops.setup = ast_sf_setup;
+ }
+
+ ast_get_ahb_freq();
+
+ if (type == AST_SF_TYPE_PNOR) {
+ if (!ast_sf_init_pnor(ct))
+ goto fail;
+ } else if (type == AST_SF_TYPE_BMC) {
+ if (!ast_sf_init_bmc(ct))
+ goto fail;
+ }
+
+ *ctrl = &ct->ops;
+
+ return 0;
+ fail:
+ free(ct);
+ return -EIO;
+}
+
+void ast_sf_close(struct spi_flash_ctrl *ctrl)
+{
+ struct ast_sf_ctrl *ct = container_of(ctrl, struct ast_sf_ctrl, ops);
+
+ /* Restore control reg to read */
+ ast_ahb_writel(ct->ctl_read_val, ct->ctl_reg);
+
+ /* Additional cleanup */
+ if (ct->type == AST_SF_TYPE_PNOR) {
+ uint32_t reg = ast_ahb_readl(PNOR_SPI_FCTL_CONF);
+ if (reg != 0xffffffff)
+ ast_ahb_writel(reg & ~1, PNOR_SPI_FCTL_CONF);
+ }
+
+ /* Free the whole lot */
+ free(ct);
+}
diff --git a/objects/pflash/ast.h b/objects/pflash/ast.h
index 848a364..c7bf0cb 100644
--- a/objects/pflash/ast.h
+++ b/objects/pflash/ast.h
@@ -1,66 +1,102 @@
-#ifndef __AST_H
-#define __AST_H
-
-/*
- * AHB bus registers
- */
-
-/* SPI Flash controller #1 (BMC) */
-#define BMC_SPI_FCTL_BASE 0x1E620000
-#define BMC_SPI_FCTL_CTRL (BMC_SPI_FCTL_BASE + 0x10)
-#define BMC_SPI_FREAD_TIMING (BMC_SPI_FCTL_BASE + 0x94)
-#define BMC_FLASH_BASE 0x20000000
-
-/* SPI Flash controller #2 (PNOR) */
-#define PNOR_SPI_FCTL_BASE 0x1E630000
-#define PNOR_SPI_FCTL_CONF (PNOR_SPI_FCTL_BASE + 0x00)
-#define PNOR_SPI_FCTL_CTRL (PNOR_SPI_FCTL_BASE + 0x04)
-#define PNOR_SPI_FREAD_TIMING (PNOR_SPI_FCTL_BASE + 0x14)
-#define PNOR_FLASH_BASE 0x30000000
-
-/* LPC registers */
-#define LPC_BASE 0x1e789000
-#define LPC_HICR6 (LPC_BASE + 0x80)
-#define LPC_HICR7 (LPC_BASE + 0x88)
-#define LPC_HICR8 (LPC_BASE + 0x8c)
-
-/* SCU registers */
-#define SCU_BASE 0x1e6e2000
-#define SCU_HW_STRAPPING (SCU_BASE + 0x70)
-
-/*
- * AHB Accessors
- */
-#ifndef __SKIBOOT__
-#include "io.h"
-#else
-
-/*
- * Register accessors, return byteswapped values
- * (IE. LE registers)
- */
-void ast_ahb_writel(uint32_t val, uint32_t reg);
-uint32_t ast_ahb_readl(uint32_t reg);
-
-/*
- * copy to/from accessors. Cannot cross IDSEL boundaries (256M)
- */
-int ast_copy_to_ahb(uint32_t reg, const void *src, uint32_t len);
-int ast_copy_from_ahb(void *dst, uint32_t reg, uint32_t len);
-
-void ast_io_init(void);
-
-#endif /* __SKIBOOT__ */
-
-/*
- * SPI Flash controllers
- */
-#define AST_SF_TYPE_PNOR 0
-#define AST_SF_TYPE_BMC 1
-
-struct spi_flash_ctrl;
-int ast_sf_open(uint8_t type, struct spi_flash_ctrl **ctrl);
-void ast_sf_close(struct spi_flash_ctrl *ctrl);
-
-
-#endif /* __AST_H */
+/* Copyright 2013-2014 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __AST_H
+#define __AST_H
+
+/*
+ * AHB bus registers
+ */
+
+/* SPI Flash controller #1 (BMC) */
+#define BMC_SPI_FCTL_BASE 0x1E620000
+#define BMC_SPI_FCTL_CE_CTRL (BMC_SPI_FCTL_BASE + 0x04)
+#define BMC_SPI_FCTL_CTRL (BMC_SPI_FCTL_BASE + 0x10)
+#define BMC_SPI_FREAD_TIMING (BMC_SPI_FCTL_BASE + 0x94)
+#define BMC_FLASH_BASE 0x20000000
+
+/* SPI Flash controller #2 (PNOR) */
+#define PNOR_SPI_FCTL_BASE 0x1E630000
+#define PNOR_SPI_FCTL_CONF (PNOR_SPI_FCTL_BASE + 0x00)
+#define PNOR_SPI_FCTL_CTRL (PNOR_SPI_FCTL_BASE + 0x04)
+#define PNOR_SPI_FREAD_TIMING (PNOR_SPI_FCTL_BASE + 0x14)
+#define PNOR_FLASH_BASE 0x30000000
+
+/* LPC registers */
+#define LPC_BASE 0x1e789000
+#define LPC_HICR6 (LPC_BASE + 0x80)
+#define LPC_HICR7 (LPC_BASE + 0x88)
+#define LPC_HICR8 (LPC_BASE + 0x8c)
+#define LPC_iBTCR0 (LPC_BASE + 0x140)
+
+/* VUART1 */
+#define VUART1_BASE 0x1e787000
+#define VUART1_GCTRLA (VUART1_BASE + 0x20)
+#define VUART1_GCTRLB (VUART1_BASE + 0x24)
+#define VUART1_ADDRL (VUART1_BASE + 0x28)
+#define VUART1_ADDRH (VUART1_BASE + 0x2c)
+
+/* SCU registers */
+#define SCU_BASE 0x1e6e2000
+#define SCU_HW_STRAPPING (SCU_BASE + 0x70)
+
+/*
+ * AHB Accessors
+ */
+#ifndef __SKIBOOT__
+#include "io.h"
+#else
+
+/*
+ * Register accessors, return byteswapped values
+ * (IE. LE registers)
+ */
+void ast_ahb_writel(uint32_t val, uint32_t reg);
+uint32_t ast_ahb_readl(uint32_t reg);
+
+/*
+ * copy to/from accessors. Cannot cross IDSEL boundaries (256M)
+ */
+int ast_copy_to_ahb(uint32_t reg, const void *src, uint32_t len);
+int ast_copy_from_ahb(void *dst, uint32_t reg, uint32_t len);
+
+void ast_io_init(void);
+bool ast_is_ahb_lpc_pnor(void);
+
+/* UART configuration */
+
+bool ast_is_vuart1_enabled(void);
+void ast_setup_vuart1(uint16_t io_base, uint8_t irq);
+void ast_setup_sio_uart1(uint16_t io_base, uint8_t irq);
+void ast_disable_sio_uart1(void);
+
+/* BT configuration */
+void ast_setup_ibt(uint16_t io_base, uint8_t irq);
+
+#endif /* __SKIBOOT__ */
+
+/*
+ * SPI Flash controllers
+ */
+#define AST_SF_TYPE_PNOR 0
+#define AST_SF_TYPE_BMC 1
+#define AST_SF_TYPE_MEM 2
+
+struct spi_flash_ctrl;
+int ast_sf_open(uint8_t type, struct spi_flash_ctrl **ctrl);
+void ast_sf_close(struct spi_flash_ctrl *ctrl);
+
+
+#endif /* __AST_H */
--
2.6.3
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH skeleton v3 11/19] LED test
2015-11-20 1:00 [PATCH skeleton v3 00/19] Set default LED status, add GPIO define OpenBMC Patches
` (9 preceding siblings ...)
2015-11-20 1:00 ` [PATCH skeleton v3 10/19] add bmc flash capability OpenBMC Patches
@ 2015-11-20 1:00 ` OpenBMC Patches
2015-11-20 1:00 ` [PATCH skeleton v3 12/19] LED test 2 OpenBMC Patches
` (7 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: OpenBMC Patches @ 2015-11-20 1:00 UTC (permalink / raw)
To: openbmc; +Cc: Ken
From: Ken <ken.sk.lai@mail.foxconn.com>
---
bin/Barreleye.py | 1 +
objects/led_controller.c | 16 +++++++++++++---
2 files changed, 14 insertions(+), 3 deletions(-)
mode change 100644 => 100755 objects/led_controller.c
diff --git a/bin/Barreleye.py b/bin/Barreleye.py
index 3782766..9f3d1d1 100755
--- a/bin/Barreleye.py
+++ b/bin/Barreleye.py
@@ -470,6 +470,7 @@ GPIO_CONFIG['BMC_READY'] = { 'gpio_pin': 'H2', 'direction': 'out' }
GPIO_CONFIG['POWER_BUTTON'] = { 'gpio_pin': 'E0', 'direction': 'both' }
GPIO_CONFIG['PCIE_RESET'] = { 'gpio_pin': 'B5', 'direction': 'out' }
GPIO_CONFIG['USB_RESET'] = { 'gpio_pin': 'B6', 'direction': 'out' }
+GPIO_CONFIG['BEEP'] = { 'gpio_pin': 'N7', 'direction': 'out' }
GPIO_CONFIG['SLOT0_RISER_PRESENT'] = { 'gpio_pin': 'N0', 'direction': 'in' }
GPIO_CONFIG['SLOT1_RISER_PRESENT'] = { 'gpio_pin': 'N1', 'direction': 'in' }
GPIO_CONFIG['SLOT2_RISER_PRESENT'] = { 'gpio_pin': 'N2', 'direction': 'in' }
diff --git a/objects/led_controller.c b/objects/led_controller.c
old mode 100644
new mode 100755
index 8c3fa3c..5bb4542
--- a/objects/led_controller.c
+++ b/objects/led_controller.c
@@ -10,11 +10,12 @@ static const gchar* dbus_name = "org.openbmc.control.led";
static GDBusObjectManagerServer *manager = NULL;
-#define NUM_GPIO 2
+#define NUM_GPIO 3
GPIO led_gpio[NUM_GPIO] = {
(GPIO){"IDENTIFY"},
- (GPIO){"BMC_READY"}
+ (GPIO){"BMC_READY"},
+ (GPIO){"BEEP"}
};
@@ -67,21 +68,30 @@ on_set_off (Led *led,
return TRUE;
}
+int tmp=0;
void init_led(Led* led, GPIO* mygpio)
{
int rc = GPIO_OK;
+ int i=5;
+ tmp++;
do {
uint8_t val;
rc = gpio_open(mygpio);
if (rc != GPIO_OK) { break; }
rc = gpio_read(mygpio,&val);
if (rc != GPIO_OK) { break; }
+ led_set_state(led,"off");
if (val == 0) {
led_set_state(led,"on");
} else {
led_set_state(led,"off");
}
- } while(0);
+ i--;
+ } while(i!=0);
+
+if(tmp==3)
+ led_set_state(led,"off");
+
gpio_close(mygpio);
if (rc != GPIO_OK) {
g_print("ERROR led controller: GPIO error %s (rc=%d)\n",
--
2.6.3
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH skeleton v3 12/19] LED test 2
2015-11-20 1:00 [PATCH skeleton v3 00/19] Set default LED status, add GPIO define OpenBMC Patches
` (10 preceding siblings ...)
2015-11-20 1:00 ` [PATCH skeleton v3 11/19] LED test OpenBMC Patches
@ 2015-11-20 1:00 ` OpenBMC Patches
2015-11-20 1:00 ` [PATCH skeleton v3 13/19] LED test3 OpenBMC Patches
` (6 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: OpenBMC Patches @ 2015-11-20 1:00 UTC (permalink / raw)
To: openbmc; +Cc: Ken
From: Ken <ken.sk.lai@mail.foxconn.com>
---
bin/Barreleye.py | 5 +++++
objects/led_controller.c | 9 +++++----
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/bin/Barreleye.py b/bin/Barreleye.py
index 9f3d1d1..14fe54a 100755
--- a/bin/Barreleye.py
+++ b/bin/Barreleye.py
@@ -61,6 +61,11 @@ ENTER_STATE_CALLBACK = {
'obj_name' : '/org/openbmc/control/led/BMC_READY',
'interface_name' : 'org.openbmc.Led',
},
+ 'setOn' : {
+ 'bus_name' : 'org.openbmc.control.led',
+ 'obj_name' : '/org/openbmc/control/led/BEEP',
+ 'interface_name' : 'org.openbmc.Led',
+ },
'init' : {
'bus_name' : 'org.openbmc.control.Flash',
'obj_name' : '/org/openbmc/control/flash/bios',
diff --git a/objects/led_controller.c b/objects/led_controller.c
index 5bb4542..6f773c9 100755
--- a/objects/led_controller.c
+++ b/objects/led_controller.c
@@ -68,13 +68,14 @@ on_set_off (Led *led,
return TRUE;
}
-int tmp=0;
+//int tmp=0;
void init_led(Led* led, GPIO* mygpio)
{
int rc = GPIO_OK;
int i=5;
- tmp++;
+// tmp++;
do {
+ sleep(2);
uint8_t val;
rc = gpio_open(mygpio);
if (rc != GPIO_OK) { break; }
@@ -89,8 +90,8 @@ void init_led(Led* led, GPIO* mygpio)
i--;
} while(i!=0);
-if(tmp==3)
- led_set_state(led,"off");
+//if(tmp==3)
+// led_set_state(led,"off");
gpio_close(mygpio);
if (rc != GPIO_OK) {
--
2.6.3
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH skeleton v3 13/19] LED test3
2015-11-20 1:00 [PATCH skeleton v3 00/19] Set default LED status, add GPIO define OpenBMC Patches
` (11 preceding siblings ...)
2015-11-20 1:00 ` [PATCH skeleton v3 12/19] LED test 2 OpenBMC Patches
@ 2015-11-20 1:00 ` OpenBMC Patches
2015-11-20 1:00 ` [PATCH skeleton v3 14/19] Remove ; OpenBMC Patches
` (5 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: OpenBMC Patches @ 2015-11-20 1:00 UTC (permalink / raw)
To: openbmc; +Cc: Ken
From: Ken <ken.sk.lai@mail.foxconn.com>
---
objects/led_controller.c | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/objects/led_controller.c b/objects/led_controller.c
index 6f773c9..24cfc19 100755
--- a/objects/led_controller.c
+++ b/objects/led_controller.c
@@ -68,30 +68,23 @@ on_set_off (Led *led,
return TRUE;
}
-//int tmp=0;
+
void init_led(Led* led, GPIO* mygpio)
{
- int rc = GPIO_OK;
- int i=5;
-// tmp++;
+ int rc = GPIO_OK;;
do {
- sleep(2);
uint8_t val;
rc = gpio_open(mygpio);
if (rc != GPIO_OK) { break; }
rc = gpio_read(mygpio,&val);
if (rc != GPIO_OK) { break; }
- led_set_state(led,"off");
if (val == 0) {
led_set_state(led,"on");
} else {
led_set_state(led,"off");
}
- i--;
- } while(i!=0);
+ } while(0);
-//if(tmp==3)
-// led_set_state(led,"off");
gpio_close(mygpio);
if (rc != GPIO_OK) {
--
2.6.3
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH skeleton v3 14/19] Remove ;
2015-11-20 1:00 [PATCH skeleton v3 00/19] Set default LED status, add GPIO define OpenBMC Patches
` (12 preceding siblings ...)
2015-11-20 1:00 ` [PATCH skeleton v3 13/19] LED test3 OpenBMC Patches
@ 2015-11-20 1:00 ` OpenBMC Patches
2015-11-20 1:00 ` [PATCH skeleton v3 15/19] Force fan duty to 100% OpenBMC Patches
` (4 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: OpenBMC Patches @ 2015-11-20 1:00 UTC (permalink / raw)
To: openbmc; +Cc: Ken
From: Ken <ken.sk.lai@mail.foxconn.com>
---
objects/led_controller.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/objects/led_controller.c b/objects/led_controller.c
index 24cfc19..34945e1 100755
--- a/objects/led_controller.c
+++ b/objects/led_controller.c
@@ -71,7 +71,8 @@ on_set_off (Led *led,
void init_led(Led* led, GPIO* mygpio)
{
- int rc = GPIO_OK;;
+ int rc = GPIO_OK;
+
do {
uint8_t val;
rc = gpio_open(mygpio);
--
2.6.3
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH skeleton v3 15/19] Force fan duty to 100%
2015-11-20 1:00 [PATCH skeleton v3 00/19] Set default LED status, add GPIO define OpenBMC Patches
` (13 preceding siblings ...)
2015-11-20 1:00 ` [PATCH skeleton v3 14/19] Remove ; OpenBMC Patches
@ 2015-11-20 1:00 ` OpenBMC Patches
2015-11-20 1:00 ` [PATCH skeleton v3 16/19] Workarounf for fan PWM 100% OpenBMC Patches
` (3 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: OpenBMC Patches @ 2015-11-20 1:00 UTC (permalink / raw)
To: openbmc; +Cc: Ken
From: Ken <ken.sk.lai@mail.foxconn.com>
---
bin/Barreleye.py | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/bin/Barreleye.py b/bin/Barreleye.py
index 14fe54a..2f7bf49 100755
--- a/bin/Barreleye.py
+++ b/bin/Barreleye.py
@@ -6,6 +6,11 @@ FLASH_DOWNLOAD_PATH = "/tmp"
GPIO_BASE = 320
SYSTEM_NAME = "Barreleye"
+import sys
+import gobject
+import dbus
+import dbus.service
+import dbus.mainloop.glib
## System states
## state can change to next state in 2 ways:
@@ -485,6 +490,15 @@ GPIO_CONFIG['SLOT2_PRESENT'] = { 'gpio_pin': 'N5', 'direction': 'in' }
GPIO_CONFIG['MEZZ0_PRESENT'] = { 'gpio_pin': 'O0', 'direction': 'in' }
GPIO_CONFIG['MEZZ1_PRESENT'] = { 'gpio_pin': 'O1', 'direction': 'in' }
+
+bus = dbus.SystemBus()
+
+for i in range(1,6):
+ print i
+ obj = bus.get_object("org.openbmc,sensors,hwmon","/org/openbmc/sensors/speed/fan"+str(i))
+ intf = dbus.Interface (obj,"org.openbmc.SensorValue")
+ intf.setValue(dbus.UInt32(255))
+
def convertGpio(name):
name = name.upper()
c = name[0:1]
--
2.6.3
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH skeleton v3 16/19] Workarounf for fan PWM 100%
2015-11-20 1:00 [PATCH skeleton v3 00/19] Set default LED status, add GPIO define OpenBMC Patches
` (14 preceding siblings ...)
2015-11-20 1:00 ` [PATCH skeleton v3 15/19] Force fan duty to 100% OpenBMC Patches
@ 2015-11-20 1:00 ` OpenBMC Patches
2015-11-20 1:00 ` [PATCH skeleton v3 17/19] Remove git 1e751075d5a11736df67c40ead5a8375141269d3 OpenBMC Patches
` (2 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: OpenBMC Patches @ 2015-11-20 1:00 UTC (permalink / raw)
To: openbmc; +Cc: Ken
From: Ken <ken.sk.lai@mail.foxconn.com>
---
bin/startup_hacks.sh | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/bin/startup_hacks.sh b/bin/startup_hacks.sh
index 18582ae..214e08d 100755
--- a/bin/startup_hacks.sh
+++ b/bin/startup_hacks.sh
@@ -2,3 +2,24 @@
systemctl stop serial-getty@ttyS0
+<<<<<<< HEAD
+=======
+echo nct7904 0x2e > /sys/bus/i2c/devices/i2c-6/new_device
+echo nct7904 0x2d > /sys/bus/i2c/devices/i2c-6/new_device
+
+echo 0x2d > /sys/bus/i2c/devices/i2c-6/delete_device
+echo 0x2e > /sys/bus/i2c/devices/i2c-6/delete_device
+
+echo nct7904 0x2e > /sys/bus/i2c/devices/i2c-6/new_device
+echo nct7904 0x2d > /sys/bus/i2c/devices/i2c-6/new_device
+
+echo 255 > /sys/class/hwmon/hwmon1/pwm1
+echo 255 > /sys/class/hwmon/hwmon1/pwm2
+echo 255 > /sys/class/hwmon/hwmon1/pwm3
+echo 255 > /sys/class/hwmon/hwmon1/pwm4
+
+echo 255 > /sys/class/hwmon/hwmon2/pwm1
+echo 255 > /sys/class/hwmon/hwmon2/pwm2
+echo 255 > /sys/class/hwmon/hwmon2/pwm3
+echo 255 > /sys/class/hwmon/hwmon2/pwm4
+>>>>>>> Workarounf for fan PWM 100%
--
2.6.3
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH skeleton v3 17/19] Remove git 1e751075d5a11736df67c40ead5a8375141269d3
2015-11-20 1:00 [PATCH skeleton v3 00/19] Set default LED status, add GPIO define OpenBMC Patches
` (15 preceding siblings ...)
2015-11-20 1:00 ` [PATCH skeleton v3 16/19] Workarounf for fan PWM 100% OpenBMC Patches
@ 2015-11-20 1:00 ` OpenBMC Patches
2015-11-20 1:00 ` [PATCH skeleton v3 18/19] Set default LED status, add GPIO define OpenBMC Patches
2015-11-20 1:00 ` [PATCH skeleton v3 19/19] Init BMC_THROTTLE GPIO to high OpenBMC Patches
18 siblings, 0 replies; 20+ messages in thread
From: OpenBMC Patches @ 2015-11-20 1:00 UTC (permalink / raw)
To: openbmc; +Cc: Ken
From: Ken <ken.sk.lai@mail.foxconn.com>
---
bin/Barreleye.py | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/bin/Barreleye.py b/bin/Barreleye.py
index 2f7bf49..a1e7688 100755
--- a/bin/Barreleye.py
+++ b/bin/Barreleye.py
@@ -6,12 +6,6 @@ FLASH_DOWNLOAD_PATH = "/tmp"
GPIO_BASE = 320
SYSTEM_NAME = "Barreleye"
-import sys
-import gobject
-import dbus
-import dbus.service
-import dbus.mainloop.glib
-
## System states
## state can change to next state in 2 ways:
## - a process emits a GotoSystemState signal with state name to goto
@@ -490,15 +484,6 @@ GPIO_CONFIG['SLOT2_PRESENT'] = { 'gpio_pin': 'N5', 'direction': 'in' }
GPIO_CONFIG['MEZZ0_PRESENT'] = { 'gpio_pin': 'O0', 'direction': 'in' }
GPIO_CONFIG['MEZZ1_PRESENT'] = { 'gpio_pin': 'O1', 'direction': 'in' }
-
-bus = dbus.SystemBus()
-
-for i in range(1,6):
- print i
- obj = bus.get_object("org.openbmc,sensors,hwmon","/org/openbmc/sensors/speed/fan"+str(i))
- intf = dbus.Interface (obj,"org.openbmc.SensorValue")
- intf.setValue(dbus.UInt32(255))
-
def convertGpio(name):
name = name.upper()
c = name[0:1]
--
2.6.3
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH skeleton v3 18/19] Set default LED status, add GPIO define
2015-11-20 1:00 [PATCH skeleton v3 00/19] Set default LED status, add GPIO define OpenBMC Patches
` (16 preceding siblings ...)
2015-11-20 1:00 ` [PATCH skeleton v3 17/19] Remove git 1e751075d5a11736df67c40ead5a8375141269d3 OpenBMC Patches
@ 2015-11-20 1:00 ` OpenBMC Patches
2015-11-20 1:00 ` [PATCH skeleton v3 19/19] Init BMC_THROTTLE GPIO to high OpenBMC Patches
18 siblings, 0 replies; 20+ messages in thread
From: OpenBMC Patches @ 2015-11-20 1:00 UTC (permalink / raw)
To: openbmc; +Cc: Ken
From: Ken <ken.sk.lai@mail.foxconn.com>
---
bin/Barreleye.py | 17 +++++++++++++++++
objects/led_controller.c | 5 +++--
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/bin/Barreleye.py b/bin/Barreleye.py
index a1e7688..615b977 100755
--- a/bin/Barreleye.py
+++ b/bin/Barreleye.py
@@ -6,6 +6,12 @@ FLASH_DOWNLOAD_PATH = "/tmp"
GPIO_BASE = 320
SYSTEM_NAME = "Barreleye"
+import sys
+import gobject
+import dbus
+import dbus.service
+import dbus.mainloop.glib
+
## System states
## state can change to next state in 2 ways:
## - a process emits a GotoSystemState signal with state name to goto
@@ -472,9 +478,12 @@ GPIO_CONFIG['PGOOD'] = { 'gpio_pin': 'C7', 'direction': 'in' }
GPIO_CONFIG['IDENTIFY'] = { 'gpio_pin': 'R5', 'direction': 'out' }
GPIO_CONFIG['BMC_READY'] = { 'gpio_pin': 'H2', 'direction': 'out' }
GPIO_CONFIG['POWER_BUTTON'] = { 'gpio_pin': 'E0', 'direction': 'both' }
+GPIO_CONFIG['RESET_BUTTON'] = { 'gpio_pin': 'E2', 'direction': 'both' }
GPIO_CONFIG['PCIE_RESET'] = { 'gpio_pin': 'B5', 'direction': 'out' }
GPIO_CONFIG['USB_RESET'] = { 'gpio_pin': 'B6', 'direction': 'out' }
GPIO_CONFIG['BEEP'] = { 'gpio_pin': 'N7', 'direction': 'out' }
+GPIO_CONFIG['BMC_TROTTLE'] = { 'gpio_pin': 'J3', 'direction': 'out' }
+GPIO_CONFIG['BMC_HEARTBEAT'] = { 'gpio_pin': 'R4', 'direction': 'out' }
GPIO_CONFIG['SLOT0_RISER_PRESENT'] = { 'gpio_pin': 'N0', 'direction': 'in' }
GPIO_CONFIG['SLOT1_RISER_PRESENT'] = { 'gpio_pin': 'N1', 'direction': 'in' }
GPIO_CONFIG['SLOT2_RISER_PRESENT'] = { 'gpio_pin': 'N2', 'direction': 'in' }
@@ -484,6 +493,14 @@ GPIO_CONFIG['SLOT2_PRESENT'] = { 'gpio_pin': 'N5', 'direction': 'in' }
GPIO_CONFIG['MEZZ0_PRESENT'] = { 'gpio_pin': 'O0', 'direction': 'in' }
GPIO_CONFIG['MEZZ1_PRESENT'] = { 'gpio_pin': 'O1', 'direction': 'in' }
+
+## bus = dbus.SystemBus()
+## for i in range(1,6):
+## print i
+## obj = bus.get_object("org.openbmc,sensors,hwmon","/org/openbmc/sensors/speed/fan"+str(i))
+## intf = dbus.Interface (obj,"org.openbmc.SensorValue")
+## intf.setValue(dbus.UInt32(255))
+
def convertGpio(name):
name = name.upper()
c = name[0:1]
diff --git a/objects/led_controller.c b/objects/led_controller.c
index 34945e1..383e9ea 100755
--- a/objects/led_controller.c
+++ b/objects/led_controller.c
@@ -10,12 +10,13 @@ static const gchar* dbus_name = "org.openbmc.control.led";
static GDBusObjectManagerServer *manager = NULL;
-#define NUM_GPIO 3
+#define NUM_GPIO 4
GPIO led_gpio[NUM_GPIO] = {
(GPIO){"IDENTIFY"},
(GPIO){"BMC_READY"},
- (GPIO){"BEEP"}
+ (GPIO){"BEEP"},
+ (GPIO){"BMC_HEARTBEAT"}
};
--
2.6.3
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH skeleton v3 19/19] Init BMC_THROTTLE GPIO to high
2015-11-20 1:00 [PATCH skeleton v3 00/19] Set default LED status, add GPIO define OpenBMC Patches
` (17 preceding siblings ...)
2015-11-20 1:00 ` [PATCH skeleton v3 18/19] Set default LED status, add GPIO define OpenBMC Patches
@ 2015-11-20 1:00 ` OpenBMC Patches
18 siblings, 0 replies; 20+ messages in thread
From: OpenBMC Patches @ 2015-11-20 1:00 UTC (permalink / raw)
To: openbmc; +Cc: Ken
From: Ken <ken.sk.lai@mail.foxconn.com>
---
objects/control_host_obj.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/objects/control_host_obj.c b/objects/control_host_obj.c
index 672ef85..9297e52 100644
--- a/objects/control_host_obj.c
+++ b/objects/control_host_obj.c
@@ -21,6 +21,7 @@ GPIO fsi_data = (GPIO){ "FSI_DATA" };
GPIO fsi_clk = (GPIO){ "FSI_CLK" };
GPIO fsi_enable = (GPIO){ "FSI_ENABLE" };
GPIO cronus_sel = (GPIO){ "CRONUS_SEL" };
+GPIO Throttle = (GPIO){ "BMC_TROTTLE" };
/* Bit bang patterns */
@@ -82,6 +83,9 @@ on_boot (ControlHost *host,
{
int rc = GPIO_OK;
+ rc = gpio_open(&Throttle);
+ rc = gpio_write(&Throttle,1);
+
if (control_host_get_debug_mode(host)==1)
{
g_print("Enabling debug mode; not booting host\n");
@@ -165,7 +169,7 @@ on_boot (ControlHost *host,
gpio_close(&fsi_data);
gpio_close(&fsi_enable);
gpio_close(&cronus_sel);
-
+ gpio_close(&Throttle);
control_host_emit_booted(host);
return TRUE;
}
--
2.6.3
^ permalink raw reply related [flat|nested] 20+ messages in thread
end of thread, other threads:[~2015-11-20 1:00 UTC | newest]
Thread overview: 20+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-11-20 1:00 [PATCH skeleton v3 00/19] Set default LED status, add GPIO define OpenBMC Patches
2015-11-20 1:00 ` [PATCH skeleton v3 01/19] LED test OpenBMC Patches
2015-11-20 1:00 ` [PATCH skeleton v3 02/19] LED test 2 OpenBMC Patches
2015-11-20 1:00 ` [PATCH skeleton v3 03/19] LED test3 OpenBMC Patches
2015-11-20 1:00 ` [PATCH skeleton v3 04/19] Remove ; OpenBMC Patches
2015-11-20 1:00 ` [PATCH skeleton v3 05/19] Force fan duty to 100% OpenBMC Patches
2015-11-20 1:00 ` [PATCH skeleton v3 06/19] Workarounf for fan PWM 100% OpenBMC Patches
2015-11-20 1:00 ` [PATCH skeleton v3 07/19] Remove git 1e751075d5a11736df67c40ead5a8375141269d3 OpenBMC Patches
2015-11-20 1:00 ` [PATCH skeleton v3 08/19] Set default LED status, add GPIO define OpenBMC Patches
2015-11-20 1:00 ` [PATCH skeleton v3 09/19] Init BMC_THROTTLE GPIO to high OpenBMC Patches
2015-11-20 1:00 ` [PATCH skeleton v3 10/19] add bmc flash capability OpenBMC Patches
2015-11-20 1:00 ` [PATCH skeleton v3 11/19] LED test OpenBMC Patches
2015-11-20 1:00 ` [PATCH skeleton v3 12/19] LED test 2 OpenBMC Patches
2015-11-20 1:00 ` [PATCH skeleton v3 13/19] LED test3 OpenBMC Patches
2015-11-20 1:00 ` [PATCH skeleton v3 14/19] Remove ; OpenBMC Patches
2015-11-20 1:00 ` [PATCH skeleton v3 15/19] Force fan duty to 100% OpenBMC Patches
2015-11-20 1:00 ` [PATCH skeleton v3 16/19] Workarounf for fan PWM 100% OpenBMC Patches
2015-11-20 1:00 ` [PATCH skeleton v3 17/19] Remove git 1e751075d5a11736df67c40ead5a8375141269d3 OpenBMC Patches
2015-11-20 1:00 ` [PATCH skeleton v3 18/19] Set default LED status, add GPIO define OpenBMC Patches
2015-11-20 1:00 ` [PATCH skeleton v3 19/19] Init BMC_THROTTLE GPIO to high OpenBMC Patches
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.