habanalabs: replace __cpu_to_le32/64 with cpu_to_le32/64
PATCH 1/2 habanalabs: replace __cpu_to_le32/64 with cpu_to_le32/64
In some files the code use __cpu_to_le32/64 while in other it use cpu_to_le32/64. Replace all __cpu_to_le32/64 instances with cpu_to_le32/64 for consistency.
Signed-off-by Oded Gabbay <[email protected]>
--- drivers/misc/habanalabs/debugfs.c | 12 ++++++------ drivers/misc/habanalabs/hw_queue.c | 8 ++++---- drivers/misc/habanalabs/hwmon.c | 14 +++++++------- drivers/misc/habanalabs/irq.c | 2 +- drivers/misc/habanalabs/sysfs.c | 18 +++++++++--------- 5 files changed, 27 insertions(+), 27 deletions(-)
drivers/misc/habanalabs/debugfs.c +6 -6
@@ -29,7 +29,7 @@ static int hl_debugfs_i2c_read(struct hl_device *hdev, u8 i2c_bus, u8 i2c_addr,memset (&pkt,0 ,sizeof (pkt)); - pkt.ctl =__cpu_to_le32 (ARMCP_PACKET_I2C_RD << + pkt.ctl =cpu_to_le32 (ARMCP_PACKET_I2C_RD <<ARMCP_PKT_CTL_OPCODE_SHIFT ); pkt.i2c_bus = i2c_bus; pkt.i2c_addr = i2c_addr;
@@ -55,12 +55,12 @@ static int hl_debugfs_i2c_write(struct hl_device *hdev, u8 i2c_bus, u8 i2c_addr,memset (&pkt,0 ,sizeof (pkt)); - pkt.ctl =__cpu_to_le32 (ARMCP_PACKET_I2C_WR << + pkt.ctl =cpu_to_le32 (ARMCP_PACKET_I2C_WR <<ARMCP_PKT_CTL_OPCODE_SHIFT ); pkt.i2c_bus = i2c_bus; pkt.i2c_addr = i2c_addr; pkt.i2c_reg = i2c_reg; - pkt.value =__cpu_to_le64 (val); + pkt.value =cpu_to_le64 (val); rc = hdev->asic_funcs->send_cpu_message (hdev, (u32 *) &pkt,sizeof (pkt),HL_DEVICE_TIMEOUT_USEC ,NULL );
@@ -81,10 +81,10 @@ static void hl_debugfs_led_set(struct hl_device *hdev, u8 led, u8 state)memset (&pkt,0 ,sizeof (pkt)); - pkt.ctl =__cpu_to_le32 (ARMCP_PACKET_LED_SET << + pkt.ctl =cpu_to_le32 (ARMCP_PACKET_LED_SET <<ARMCP_PKT_CTL_OPCODE_SHIFT ); - pkt.led_index =__cpu_to_le32 (led); - pkt.value =__cpu_to_le64 (state); + pkt.led_index =cpu_to_le32 (led); + pkt.value =cpu_to_le64 (state); rc = hdev->asic_funcs->send_cpu_message (hdev, (u32 *) &pkt,sizeof (pkt),HL_DEVICE_TIMEOUT_USEC ,NULL );
drivers/misc/habanalabs/hw_queue.c +4 -4
@@ -80,9 +80,9 @@ static void ext_queue_submit_bd(struct hl_device *hdev, struct hl_hw_queue *q, bd = (struct hl_bd *) (uintptr_t ) q->kernel_address; bd +=hl_pi_2_offset (q->pi); - bd->ctl =__cpu_to_le32 (ctl); - bd->len =__cpu_to_le32 (len); - bd->ptr =__cpu_to_le64 (ptr); + bd->ctl =cpu_to_le32 (ctl); + bd->len =cpu_to_le32 (len); + bd->ptr =cpu_to_le64 (ptr); q->pi =hl_queue_inc_ptr (q->pi); hdev->asic_funcs->ring_doorbell (hdev, q->hw_queue_id, q->pi);
@@ -249,7 +249,7 @@ static void ext_hw_queue_schedule_job(struct hl_cs_job *job) len = job->job_cb_size; ptr = cb->bus_address; - cq_pkt.data = __cpu_to_le32( + cq_pkt.data = cpu_to_le32( ((q->pi << CQ_ENTRY_SHADOW_INDEX_SHIFT) & CQ_ENTRY_SHADOW_INDEX_MASK) | (1 << CQ_ENTRY_SHADOW_INDEX_VALID_SHIFT) |
drivers/misc/habanalabs/hwmon.c +7 -7
@@ -273,7 +273,7 @@ long hl_get_temperature(struct hl_device *hdev, int sensor_index, u32 attr)memset (&pkt,0 ,sizeof (pkt)); - pkt.ctl =__cpu_to_le32 (ARMCP_PACKET_TEMPERATURE_GET << + pkt.ctl =cpu_to_le32 (ARMCP_PACKET_TEMPERATURE_GET <<ARMCP_PKT_CTL_OPCODE_SHIFT ); pkt.sensor_index =__cpu_to_le16 (sensor_index); pkt.type =__cpu_to_le16 (attr);
@@ -299,7 +299,7 @@ long hl_get_voltage(struct hl_device *hdev, int sensor_index, u32 attr)memset (&pkt,0 ,sizeof (pkt)); - pkt.ctl =__cpu_to_le32 (ARMCP_PACKET_VOLTAGE_GET << + pkt.ctl =cpu_to_le32 (ARMCP_PACKET_VOLTAGE_GET <<ARMCP_PKT_CTL_OPCODE_SHIFT ); pkt.sensor_index =__cpu_to_le16 (sensor_index); pkt.type =__cpu_to_le16 (attr);
@@ -325,7 +325,7 @@ long hl_get_current(struct hl_device *hdev, int sensor_index, u32 attr)memset (&pkt,0 ,sizeof (pkt)); - pkt.ctl =__cpu_to_le32 (ARMCP_PACKET_CURRENT_GET << + pkt.ctl =cpu_to_le32 (ARMCP_PACKET_CURRENT_GET <<ARMCP_PKT_CTL_OPCODE_SHIFT ); pkt.sensor_index =__cpu_to_le16 (sensor_index); pkt.type =__cpu_to_le16 (attr);
@@ -351,7 +351,7 @@ long hl_get_fan_speed(struct hl_device *hdev, int sensor_index, u32 attr)memset (&pkt,0 ,sizeof (pkt)); - pkt.ctl =__cpu_to_le32 (ARMCP_PACKET_FAN_SPEED_GET << + pkt.ctl =cpu_to_le32 (ARMCP_PACKET_FAN_SPEED_GET <<ARMCP_PKT_CTL_OPCODE_SHIFT ); pkt.sensor_index =__cpu_to_le16 (sensor_index); pkt.type =__cpu_to_le16 (attr);
@@ -377,7 +377,7 @@ long hl_get_pwm_info(struct hl_device *hdev, int sensor_index, u32 attr)memset (&pkt,0 ,sizeof (pkt)); - pkt.ctl =__cpu_to_le32 (ARMCP_PACKET_PWM_GET << + pkt.ctl =cpu_to_le32 (ARMCP_PACKET_PWM_GET <<ARMCP_PKT_CTL_OPCODE_SHIFT ); pkt.sensor_index =__cpu_to_le16 (sensor_index); pkt.type =__cpu_to_le16 (attr);
@@ -403,11 +403,11 @@ void hl_set_pwm_info(struct hl_device *hdev, int sensor_index, u32 attr,memset (&pkt,0 ,sizeof (pkt)); - pkt.ctl =__cpu_to_le32 (ARMCP_PACKET_PWM_SET << + pkt.ctl =cpu_to_le32 (ARMCP_PACKET_PWM_SET <<ARMCP_PKT_CTL_OPCODE_SHIFT ); pkt.sensor_index =__cpu_to_le16 (sensor_index); pkt.type =__cpu_to_le16 (attr); - pkt.value =__cpu_to_le64 (value); + pkt.value =cpu_to_le64 (value); rc = hdev->asic_funcs->send_cpu_message (hdev, (u32 *) &pkt,sizeof (pkt),SENSORS_PKT_TIMEOUT ,NULL );
drivers/misc/habanalabs/irq.c +1 -1
@@ -195,7 +195,7 @@ irqreturn_t hl_irq_handler_eq(int irq, void *arg) skip_irq:/* Clear EQ entry ready bit */ eq_entry->hdr.ctl = -__cpu_to_le32 (__le32_to_cpu (eq_entry->hdr.ctl) & +cpu_to_le32 (__le32_to_cpu (eq_entry->hdr.ctl) & ~EQ_CTL_READY_MASK ); eq->ci =hl_eq_inc_ptr (eq->ci);
drivers/misc/habanalabs/sysfs.c +9 -9
@@ -21,12 +21,12 @@ long hl_get_frequency(struct hl_device *hdev, u32 pll_index, bool curr)memset (&pkt,0 ,sizeof (pkt));if (curr) - pkt.ctl =__cpu_to_le32 (ARMCP_PACKET_FREQUENCY_CURR_GET << + pkt.ctl =cpu_to_le32 (ARMCP_PACKET_FREQUENCY_CURR_GET <<ARMCP_PKT_CTL_OPCODE_SHIFT );else - pkt.ctl =__cpu_to_le32 (ARMCP_PACKET_FREQUENCY_GET << + pkt.ctl =cpu_to_le32 (ARMCP_PACKET_FREQUENCY_GET <<ARMCP_PKT_CTL_OPCODE_SHIFT ); - pkt.pll_index =__cpu_to_le32 (pll_index); + pkt.pll_index =cpu_to_le32 (pll_index); rc = hdev->asic_funcs->send_cpu_message (hdev, (u32 *) &pkt,sizeof (pkt),SET_CLK_PKT_TIMEOUT , &result);
@@ -48,10 +48,10 @@ void hl_set_frequency(struct hl_device *hdev, u32 pll_index, u64 freq)memset (&pkt,0 ,sizeof (pkt)); - pkt.ctl =__cpu_to_le32 (ARMCP_PACKET_FREQUENCY_SET << + pkt.ctl =cpu_to_le32 (ARMCP_PACKET_FREQUENCY_SET <<ARMCP_PKT_CTL_OPCODE_SHIFT ); - pkt.pll_index =__cpu_to_le32 (pll_index); - pkt.value =__cpu_to_le64 (freq); + pkt.pll_index =cpu_to_le32 (pll_index); + pkt.value =cpu_to_le64 (freq); rc = hdev->asic_funcs->send_cpu_message (hdev, (u32 *) &pkt,sizeof (pkt),SET_CLK_PKT_TIMEOUT ,NULL );
@@ -70,7 +70,7 @@ u64 hl_get_max_power(struct hl_device *hdev)memset (&pkt,0 ,sizeof (pkt)); - pkt.ctl =__cpu_to_le32 (ARMCP_PACKET_MAX_POWER_GET << + pkt.ctl =cpu_to_le32 (ARMCP_PACKET_MAX_POWER_GET <<ARMCP_PKT_CTL_OPCODE_SHIFT ); rc = hdev->asic_funcs->send_cpu_message(hdev, (u32 *) &pkt, sizeof(pkt),
@@ -91,9 +91,9 @@ void hl_set_max_power(struct hl_device *hdev, u64 value)memset (&pkt,0 ,sizeof (pkt)); - pkt.ctl =__cpu_to_le32 (ARMCP_PACKET_MAX_POWER_SET << + pkt.ctl =cpu_to_le32 (ARMCP_PACKET_MAX_POWER_SET <<ARMCP_PKT_CTL_OPCODE_SHIFT ); - pkt.value =__cpu_to_le64 (value); + pkt.value =cpu_to_le64 (value); rc = hdev->asic_funcs->send_cpu_message (hdev, (u32 *) &pkt,sizeof (pkt),SET_PWR_PKT_TIMEOUT ,NULL );
Signature · 1 line
2.17.1
PATCH 2/2 habanalabs: replace __le32_to_cpu with le32_to_cpu
In some files the driver uses __le32_to_cpu while in other it uses le32_to_cpu. Replace all __le32_to_cpu instances with le32_to_cpu for consistency.
Signed-off-by Oded Gabbay <[email protected]>
--- drivers/misc/habanalabs/habanalabs_ioctl.c | 2 +- drivers/misc/habanalabs/hw_queue.c | 2 +- drivers/misc/habanalabs/hwmon.c | 6 +++--- drivers/misc/habanalabs/irq.c | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-)
drivers/misc/habanalabs/habanalabs_ioctl.c +1 -1
@@ -65,7 +65,7 @@ static int hw_ip_info(struct hl_device *hdev, struct hl_info_args *args) hw_ip.num_of_events = prop->num_of_events;memcpy (hw_ip.armcp_version, prop->armcp_info.armcp_version,VERSION_MAX_LEN ); - hw_ip.armcp_cpld_version =__le32_to_cpu (prop->armcp_info.cpld_version); + hw_ip.armcp_cpld_version =le32_to_cpu (prop->armcp_info.cpld_version); hw_ip.psoc_pci_pll_nr = prop->psoc_pci_pll_nr; hw_ip.psoc_pci_pll_nf = prop->psoc_pci_pll_nf; hw_ip.psoc_pci_pll_od = prop->psoc_pci_pll_od;
drivers/misc/habanalabs/hw_queue.c +1 -1
@@ -267,7 +267,7 @@ static void ext_hw_queue_schedule_job(struct hl_cs_job *job) hdev->asic_funcs->add_end_of_cb_packets (hdev, cb->kernel_address, len, cq_addr, -__le32_to_cpu (cq_pkt.data), +le32_to_cpu (cq_pkt.data), q->hw_queue_id); q->shadow_queue[hl_pi_2_offset (q->pi)] = job;
drivers/misc/habanalabs/hwmon.c +3 -3
@@ -26,7 +26,7 @@ int hl_build_hwmon_channel_info(struct hl_device *hdev,int rc, i, j;for (i =0 ; i <ARMCP_MAX_SENSORS ; i++) { - type =__le32_to_cpu (sensors_arr[i].type); + type =le32_to_cpu (sensors_arr[i].type);if ((type ==0 ) && (sensors_arr[i].flags ==0 ))break ;
@@ -58,10 +58,10 @@ int hl_build_hwmon_channel_info(struct hl_device *hdev, }for (i =0 ; i < arr_size ; i++) { - type =__le32_to_cpu (sensors_arr[i].type); + type =le32_to_cpu (sensors_arr[i].type); curr_arr = sensors_by_type[type]; curr_arr[sensors_by_type_next_index[type]++] = -__le32_to_cpu (sensors_arr[i].flags); +le32_to_cpu (sensors_arr[i].flags); } channels_info = kcalloc(num_active_sensor_types + 1,
drivers/misc/habanalabs/irq.c +2 -2
@@ -161,7 +161,7 @@ irqreturn_t hl_irq_handler_eq(int irq, void *arg)while (1 ) {bool entry_ready = - ((__le32_to_cpu (eq_base[eq->ci].hdr.ctl) & + ((le32_to_cpu (eq_base[eq->ci].hdr.ctl) &EQ_CTL_READY_MASK ) >>EQ_CTL_READY_SHIFT );if (!entry_ready)
@@ -195,7 +195,7 @@ irqreturn_t hl_irq_handler_eq(int irq, void *arg) skip_irq:/* Clear EQ entry ready bit */ eq_entry->hdr.ctl = -cpu_to_le32 (__le32_to_cpu (eq_entry->hdr.ctl) & +cpu_to_le32 (le32_to_cpu (eq_entry->hdr.ctl) & ~EQ_CTL_READY_MASK ); eq->ci =hl_eq_inc_ptr (eq->ci);
Signature · 1 line
2.17.1