Merge branch 'master' into ESAT-213-fix

sifive · Feb 20, 2020 · 885f4c4 · 885f4c4
2 parents 95a00c7 + 514495f
commit 885f4c4
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/scripts/autoconf_wrapper b/scripts/autoconf_wrapper
@@ -2,7 +2,7 @@
 
 set -e
 
-if [ "$#" -ne 7 ]; then
+if [ "$#" -ne 5 ]; then
   echo "Illegal number of parameters" >&2
   exit 1
 fi

diff --git a/src/drivers/riscv_plic0.c b/src/drivers/riscv_plic0.c
@@ -221,7 +221,7 @@ __metal_driver_riscv_plic0_get_threshold(struct metal_interrupt *controller) {
 metal_affinity
 __metal_driver_riscv_plic0_affinity_enable(struct metal_interrupt *controller,
                                            metal_affinity bitmask, int id) {
-    metal_affinity ret;
+    metal_affinity ret = {0};
     int context;
 
     struct __metal_driver_riscv_plic0 *plic = (void *)(controller);
@@ -244,7 +244,7 @@ __metal_driver_riscv_plic0_affinity_enable(struct metal_interrupt *controller,
 metal_affinity
 __metal_driver_riscv_plic0_affinity_disable(struct metal_interrupt *controller,
                                             metal_affinity bitmask, int id) {
-    metal_affinity ret;
+    metal_affinity ret = {0};
     int context;
 
     struct __metal_driver_riscv_plic0 *plic = (void *)(controller);
@@ -267,7 +267,7 @@ __metal_driver_riscv_plic0_affinity_disable(struct metal_interrupt *controller,
 metal_affinity __metal_driver_riscv_plic0_affinity_set_threshold(
     struct metal_interrupt *controller, metal_affinity bitmask,
     unsigned int threshold) {
-    metal_affinity ret;
+    metal_affinity ret = {0};
     int context;
 
     for_each_metal_affinity(context, bitmask) {

diff --git a/src/drivers/sifive_fe310-g000_pll.c b/src/drivers/sifive_fe310-g000_pll.c
@@ -173,7 +173,7 @@ void __metal_driver_sifive_fe310_g000_pll_init(
 
     /* If we're running off of the PLL, switch off before we start configuring
      * it*/
-    if ((__METAL_ACCESS_ONCE(pllcfg) & PLL_SEL) == 0)
+    if ((__METAL_ACCESS_ONCE(pllcfg) & PLL_SEL) != 0)
         __METAL_ACCESS_ONCE(pllcfg) &= ~(PLL_SEL);
 
     /* Make sure we're running off of the external oscillator for stability */

diff --git a/src/i2c.c b/src/i2c.c
@@ -19,9 +19,10 @@ extern inline int metal_i2c_get_baud_rate(struct metal_i2c *i2c);
 extern inline int metal_i2c_set_baud_rate(struct metal_i2c *i2c, int baud_rate);
 
 struct metal_i2c *metal_i2c_get_device(int device_num) {
-    if (device_num >= __METAL_DT_MAX_I2CS) {
-        return NULL;
+#if __METAL_DT_MAX_I2CS > 0
+    if (device_num < __METAL_DT_MAX_I2CS) {
+        return (struct metal_i2c *)__metal_i2c_table[device_num];
     }
-
-    return (struct metal_i2c *)__metal_i2c_table[device_num];
+#endif
+    return NULL;
 }
diff --git a/src/privilege.c b/src/privilege.c
@@ -22,17 +22,17 @@ void metal_privilege_drop_to_mode(enum metal_privilege_mode mode,
     __asm__ volatile("csrr %0, mstatus" : "=r"(mstatus));
 
     /* Set xPIE bits based on current xIE bits */
-    if (mstatus && (1 << METAL_MSTATUS_MIE_OFFSET)) {
+    if (mstatus & (1 << METAL_MSTATUS_MIE_OFFSET)) {
         mstatus |= (1 << METAL_MSTATUS_MPIE_OFFSET);
     } else {
         mstatus &= ~(1 << METAL_MSTATUS_MPIE_OFFSET);
     }
-    if (mstatus && (1 << METAL_MSTATUS_SIE_OFFSET)) {
+    if (mstatus & (1 << METAL_MSTATUS_SIE_OFFSET)) {
         mstatus |= (1 << METAL_MSTATUS_SPIE_OFFSET);
     } else {
         mstatus &= ~(1 << METAL_MSTATUS_SPIE_OFFSET);
     }
-    if (mstatus && (1 << METAL_MSTATUS_UIE_OFFSET)) {
+    if (mstatus & (1 << METAL_MSTATUS_UIE_OFFSET)) {
         mstatus |= (1 << METAL_MSTATUS_UPIE_OFFSET);
     } else {
         mstatus &= ~(1 << METAL_MSTATUS_UPIE_OFFSET);