Merge pull request #978 from acctalex/as9817_64_scm_bmc

[Edgecore][as9817-64d][as9817-64o] Fixed spi_busy_reg's pcie addr issue

Author: sonoble

packages/platforms/accton/x86-64/as9817-64/src/modules/x86-64-accton-as9817-64-fan.c

@@ -32,6 +32,7 @@
 #include <linux/ipmi.h>
 #include <linux/ipmi_smi.h>
 #include <linux/platform_device.h>
+#include <linux/string_helpers.h>
 
 #define DRVNAME "as9817_64_fan"
 #define ACCTON_IPMI_NETFN 0x34
@@ -312,23 +313,41 @@ static int ipmi_send_message(struct ipmi_data *ipmi, unsigned char cmd,
 {
     int status = 0, retry = 0;
 
+    char *cmdline = kstrdup_quotable_cmdline(current, GFP_KERNEL);
+
+    int i = 0;
+    char raw_cmd[20] = "";
+    sprintf(raw_cmd, "0x%02x", cmd);
+    if(tx_len) {
+        for(i = 0; i < tx_len; i++)
+            sprintf(raw_cmd + strlen(raw_cmd), " 0x%02x", tx_data[i]);
+    }
+
     for (retry = 0; retry <= IPMI_ERR_RETRY_TIMES; retry++) {
-        status = _ipmi_send_message(ipmi,cmd, tx_data, tx_len, rx_data, rx_len);
+        status = _ipmi_send_message(ipmi,cmd, tx_data, tx_len, rx_data, 
+                                    rx_len);
         if (unlikely(status != 0)) {
-            dev_err(&data->pdev->dev, "ipmi_send_message_%d err status(%d)\r\n",
-                                        retry, status);
+            dev_err(&data->pdev->dev, 
+                    "ipmi_send_message_%d err status(%d)[%s] raw_cmd=[%s] tx_msgid=(%02x)\r\n",
+                    retry, status, cmdline ? cmdline : "", raw_cmd, 
+                    (int)ipmi->tx_msgid);
             continue;
         }
 
         if (unlikely(ipmi->rx_result != 0)) {
-            dev_err(&data->pdev->dev, "ipmi_send_message_%d err result(%d)\r\n",
-                                        retry, ipmi->rx_result);
+            dev_err(&data->pdev->dev, 
+                    "ipmi_send_message_%d err result(%d)[%s] raw_cmd=[%s] tx_msgid=(%02x)\r\n",
+                    retry, ipmi->rx_result, cmdline ? cmdline : "", raw_cmd, 
+                    (int)ipmi->tx_msgid);
             continue;
         }
 
         break;
     }
 
+    if (cmdline) 
+        kfree(cmdline);
+    
     return status;
 }
 

packages/platforms/accton/x86-64/as9817-64/src/modules/x86-64-accton-as9817-64-fpga.c

@@ -130,6 +130,7 @@ do {                                                \
  *       structure & variable declare
  * *********************************************/
 typedef struct pci_fpga_device_s {
+    void  __iomem *data_base_addr0;
     void  __iomem *data_base_addr1;
     void  __iomem *data_base_addr2;
     resource_size_t data_region1;
@@ -149,6 +150,7 @@ struct as9817_64_fpga_data {
 static struct platform_device *pdev = NULL;
 extern spinlock_t cpld_access_lock;
 extern int wait_spi(u32 mask, unsigned long timeout);
+extern void __iomem *spi_busy_reg;
 
 /***********************************************
  *       enum define
@@ -595,7 +597,7 @@ static struct attribute_mapping attribute_mappings[] = {
     [MODULE_RX_LOS_65 ... MODULE_RX_LOS_66] = {MODULE_RX_LOS_65, SFP_RXLOSS_REG, 0},
 };
 
-static inline unsigned int fpga_read(void __iomem *addr, u32 spi_mask)
+static inline unsigned int fpga_read(const void __iomem *addr, u32 spi_mask)
 {
     wait_spi(spi_mask, usecs_to_jiffies(20));
     return ioread8(addr);
@@ -714,7 +716,7 @@ static ssize_t status_read(struct device *dev, struct device_attribute *da, char
     struct as9817_64_fpga_data *fpga_ctl = dev_get_drvdata(dev);
     ssize_t ret = -EINVAL;
     u16 reg;
-    u8 major, minor, reg_val = 0;
+    u8 major, minor, reg_val;
     u8 bits_shift;
 
     switch(attr->index)
@@ -778,12 +780,12 @@ static ssize_t status_write(struct device *dev, struct device_attribute *da,
 {
     struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
     struct as9817_64_fpga_data *fpga_ctl = dev_get_drvdata(dev);
-    void __iomem *addr = 0;
+    void __iomem *addr;
     int status;
     u16 reg;
     u8 input;
     u8 reg_val, bit_mask, should_set_bit;
-    u32 spi_mask = 0;
+    u32 spi_mask;
 
     status = kstrtou8(buf, 10, &input);
     if (status) {
@@ -956,7 +958,6 @@ static int as9817_64_pcie_fpga_stat_probe(struct platform_device *pdev)
     int i;
     int status = 0, err = 0;
     unsigned long bar_base;
-    void  __iomem *data_base_addr0;
     unsigned int val;
 
     fpga_ctl = devm_kzalloc(dev, sizeof(struct as9817_64_fpga_data), GFP_KERNEL);
@@ -986,14 +987,14 @@ static int as9817_64_pcie_fpga_stat_probe(struct platform_device *pdev)
     /*
      * Detect platform for changing the setting behavior of LP mode.
      */
-    data_base_addr0 = pci_iomap(pcidev, BAR0_NUM, 0);
-    if (data_base_addr0 == NULL) {
+    fpga_ctl->pci_fpga_dev.data_base_addr0 = pci_iomap(pcidev, BAR0_NUM, 0);
+    if (fpga_ctl->pci_fpga_dev.data_base_addr0 == NULL) {
         dev_err(dev, "Failed to map BAR0\n");
         status = -EIO;
         goto exit_pci_disable;
     }
 
-    val = ioread8(data_base_addr0 + FPGA_BOARD_INFO_REG);
+    val = ioread8(fpga_ctl->pci_fpga_dev.data_base_addr0 + FPGA_BOARD_INFO_REG);
     switch (val & 0x0C)
     {
         case 0x00: /* OSFP */
@@ -1013,7 +1014,15 @@ static int as9817_64_pcie_fpga_stat_probe(struct platform_device *pdev)
 	    dev_warn(dev, "Unknown platform detected\n");
             break;
     }
-    pci_iounmap(pcidev, data_base_addr0);
+
+    /*
+     * The register address of SPI Busy is 0x33.
+     * It can not only read one byte. It needs to read four bytes from 0x30.
+     * The value is obtained by '(ioread32(spi_busy_reg) >> 24) & 0xFF'.
+     */
+    spi_busy_reg = fpga_ctl->pci_fpga_dev.data_base_addr0 + 0x30;
+
+
 
     /*
      * Cannot use 'pci_request_regions(pcidev, DRVNAME)'
@@ -1024,7 +1033,7 @@ static int as9817_64_pcie_fpga_stat_probe(struct platform_device *pdev)
     if (fpga_ctl->pci_fpga_dev.data_base_addr1 == NULL) {
         dev_err(dev, "Failed to map BAR1\n");
         status = -EIO;
-        goto exit_pci_disable;
+        goto exit_pci_iounmap0;
     }
     fpga_ctl->pci_fpga_dev.data_region1 = pci_resource_start(pcidev, BAR1_NUM) + CPLD1_PCIE_START_OFFSET;
     ret = request_mem_region(fpga_ctl->pci_fpga_dev.data_region1, REGION_LEN, DRVNAME"_cpld1");
@@ -1104,6 +1113,9 @@ static int as9817_64_pcie_fpga_stat_probe(struct platform_device *pdev)
     release_mem_region(fpga_ctl->pci_fpga_dev.data_region1, REGION_LEN);
 exit_pci_iounmap1:
     pci_iounmap(fpga_ctl->pci_fpga_dev.pci_dev, fpga_ctl->pci_fpga_dev.data_base_addr1);
+exit_pci_iounmap0:
+    spi_busy_reg = NULL;
+    pci_iounmap(fpga_ctl->pci_fpga_dev.pci_dev, fpga_ctl->pci_fpga_dev.data_base_addr0);
 exit_pci_disable:
     pci_disable_device(fpga_ctl->pci_fpga_dev.pci_dev);
 
@@ -1122,6 +1134,8 @@ static int as9817_64_pcie_fpga_stat_remove(struct platform_device *pdev)
         for (i = 0; i < PORT_NUM; i++) {
             platform_device_unregister(fpga_ctl->pci_fpga_dev.fpga_i2c[i]);
         }
+        spi_busy_reg = NULL;
+        pci_iounmap(fpga_ctl->pci_fpga_dev.pci_dev, fpga_ctl->pci_fpga_dev.data_base_addr0);
         pci_iounmap(fpga_ctl->pci_fpga_dev.pci_dev, fpga_ctl->pci_fpga_dev.data_base_addr1);
         pci_iounmap(fpga_ctl->pci_fpga_dev.pci_dev, fpga_ctl->pci_fpga_dev.data_base_addr2);
         release_mem_region(fpga_ctl->pci_fpga_dev.data_region1, REGION_LEN);

packages/platforms/accton/x86-64/as9817-64/src/modules/x86-64-accton-as9817-64-i2c-ocores.c

@@ -110,9 +110,8 @@ do {                                                \
     spin_unlock(lock);                              \
 } while (0)
 
-#define SPI_BUSY_ADDR                       (0xb3320000 + 0x30)
-#define IOREMAP_SIZE                        (0x04)
-static void __iomem    *spi_busy_reg=NULL;
+void __iomem    *spi_busy_reg=NULL;
+EXPORT_SYMBOL(spi_busy_reg);
 int wait_spi(u32 mask, unsigned long timeout) {
     u32 data;
     u32 ri = 0;
@@ -941,24 +940,11 @@ static int __init ocores_i2c_as9817_64_init(void)
 
     spin_lock_init(&cpld_access_lock);
 
-    /*
-     * The register address of SPI Busy is 0x33.
-     * It can not only read one byte. It needs to read four bytes from 0x30.
-     * The value is obtained by '(ioread32(spi_busy_reg) >> 24) & 0xFF'.
-     */
-    spi_busy_reg = ioremap(SPI_BUSY_ADDR, IOREMAP_SIZE);
-    if (!spi_busy_reg) {
-        pr_err("could not remap spi_busy_reg memory\n");
-        return -ENOMEM;
-    }
-
     return 0;
 }
 static void __exit ocores_i2c_as9817_64_exit(void)
 {
     platform_driver_unregister(&ocores_i2c_driver);
-
-    iounmap(spi_busy_reg);
 }
 
 module_init(ocores_i2c_as9817_64_init);

packages/platforms/accton/x86-64/as9817-64/src/modules/x86-64-accton-as9817-64-leds.c

@@ -30,6 +30,7 @@
 #include <linux/ipmi.h>
 #include <linux/ipmi_smi.h>
 #include <linux/platform_device.h>
+#include <linux/string_helpers.h>
 
 #define DRVNAME "as9817_64_led"
 #define ACCTON_IPMI_NETFN 0x34
@@ -238,23 +239,40 @@ static int ipmi_send_message(struct ipmi_data *ipmi, unsigned char cmd,
 {
     int status = 0, retry = 0;
 
+    char *cmdline = kstrdup_quotable_cmdline(current, GFP_KERNEL);
+
+    int i = 0;
+    char raw_cmd[20] = "";
+    sprintf(raw_cmd, "0x%02x", cmd);
+    if(tx_len){
+        for(i = 0; i < tx_len; i++)
+            sprintf(raw_cmd + strlen(raw_cmd), " 0x%02x", tx_data[i]);
+    }
+
     for (retry = 0; retry <= IPMI_ERR_RETRY_TIMES; retry++) {
         status = _ipmi_send_message(ipmi, cmd, tx_data, tx_len, rx_data, rx_len);
         if (unlikely(status != 0)) {
-            dev_err(&data->pdev->dev, "ipmi_send_message_%d err status(%d)\r\n",
-                                        retry, status);
+            dev_err(&data->pdev->dev, 
+                    "ipmi_send_message_%d err status(%d)[%s] raw_cmd=[%s] tx_msgid=(%02x)\r\n",
+                    retry, status, cmdline ? cmdline : "", raw_cmd, 
+                    (int)ipmi->tx_msgid);
             continue;
         }
 
         if (unlikely(ipmi->rx_result != 0)) {
-            dev_err(&data->pdev->dev, "ipmi_send_message_%d err result(%d)\r\n",
-                                        retry, ipmi->rx_result);
+            dev_err(&data->pdev->dev, 
+                    "ipmi_send_message_%d err result(%d)[%s] raw_cmd=[%s] tx_msgid=(%02x)\r\n",
+                    retry, ipmi->rx_result, cmdline ? cmdline : "", raw_cmd, 
+                    (int)ipmi->tx_msgid);
             continue;
         }
 
         break;
     }
 
+    if (cmdline) 
+        kfree(cmdline);
+
     return status;
 }