qed: Wait for ready indication before rereading the shmem
PATCH 1/14 qed: Wait for ready indication before rereading the shmem
From: Tomer Tayar <[email protected]>
[ Upstream commit f00d25f3154b676fcea4502a25b94bd7f142ca74 ]
The MFW might be reset and re-update its shared memory.
Upon the detection of such a reset the driver rereads this memory, but it has to wait till the data is valid.
This patch adds the missing wait for a data ready indication.
--- drivers/net/ethernet/qlogic/qed/qed_mcp.c | 50 +++++++++++++++++++---- 1 file changed, 41 insertions(+), 9 deletions(-)
drivers/net/ethernet/qlogic/qed/qed_mcp.c +41 -9
@@ -97,18 +97,57 @@ int qed_mcp_free(struct qed_hwfn *p_hwfn)return 0 ; } +/* Maximum of 1 sec to wait for the SHMEM ready indication */ +#define QED_MCP_SHMEM_RDY_MAX_RETRIES 20 +#define QED_MCP_SHMEM_RDY_ITER_MS 50 +static int qed_load_mcp_offsets (struct qed_hwfn *p_hwfn,struct qed_ptt *p_ptt) {struct qed_mcp_info *p_info = p_hwfn->mcp_info; +u8 cnt =QED_MCP_SHMEM_RDY_MAX_RETRIES ; +u8 msec =QED_MCP_SHMEM_RDY_ITER_MS ;u32 drv_mb_offsize, mfw_mb_offsize;u32 mcp_pf_id =MCP_PF_ID (p_hwfn); p_info->public_base =qed_rd (p_hwfn, p_ptt,MISC_REG_SHARED_MEM_ADDR ); -if (!p_info->public_base) -return 0 ; +if (!p_info->public_base) { +DP_NOTICE (p_hwfn, +"The address of the MCP scratch-pad is not configured\n" ); +return -EINVAL ; + } p_info->public_base |=GRCBASE_MCP ; +/* Get the MFW MB address and number of supported messages */ + mfw_mb_offsize =qed_rd (p_hwfn, p_ptt, +SECTION_OFFSIZE_ADDR (p_info->public_base, +PUBLIC_MFW_MB )); + p_info->mfw_mb_addr =SECTION_ADDR (mfw_mb_offsize, mcp_pf_id); + p_info->mfw_mb_length = (u16 )qed_rd (p_hwfn, p_ptt, + p_info->mfw_mb_addr + + offsetof(struct public_mfw_mb , + sup_msgs)); + +/* The driver can notify that there was an MCP reset, and might read the +* SHMEM values before the MFW has completed initializing them. +* To avoid this, the "sup_msgs" field in the MFW mailbox is used as a +* data ready indication. +*/ +while (!p_info->mfw_mb_length && --cnt) { +msleep (msec); + p_info->mfw_mb_length = + (u16 )qed_rd (p_hwfn, p_ptt, + p_info->mfw_mb_addr + + offsetof(struct public_mfw_mb , sup_msgs)); + } + +if (!cnt) { +DP_NOTICE (p_hwfn, +"Failed to get the SHMEM ready notification after %d msec\n" , +QED_MCP_SHMEM_RDY_MAX_RETRIES * msec); +return -EBUSY ; + } +/* Calculate the driver and MFW mailbox address */ drv_mb_offsize = qed_rd(p_hwfn, p_ptt, SECTION_OFFSIZE_ADDR(p_info->public_base,
@@ -118,13 +157,6 @@ static int qed_load_mcp_offsets(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt)"drv_mb_offsiz = 0x%x, drv_mb_addr = 0x%x mcp_pf_id = 0x%x\n" , drv_mb_offsize, p_info->drv_mb_addr, mcp_pf_id); -/* Set the MFW MB address */ - mfw_mb_offsize =qed_rd (p_hwfn, p_ptt, -SECTION_OFFSIZE_ADDR (p_info->public_base, -PUBLIC_MFW_MB )); - p_info->mfw_mb_addr =SECTION_ADDR (mfw_mb_offsize, mcp_pf_id); - p_info->mfw_mb_length = (u16 )qed_rd (p_hwfn, p_ptt, p_info->mfw_mb_addr); -/* Get the current driver mailbox sequence before sending * the first command */
Signature · 1 line
2.17.1
PATCH 2/14 qed: Wait for MCP halt and resume commands to take place
From: Tomer Tayar <[email protected]>
[ Upstream commit 76271809f49056f079e202bf6513d17b0d6dd34d ]
Successive iterations of halting and resuming the management chip (MCP) might fail, since currently the driver doesn't wait for these operations to actually take place.
This patch prevents the driver from moving forward before the operations are reflected in the state register.
--- drivers/net/ethernet/qlogic/qed/qed_mcp.c | 46 +++++++++++++++---- .../net/ethernet/qlogic/qed/qed_reg_addr.h | 1 + 2 files changed, 39 insertions(+), 8 deletions(-)
drivers/net/ethernet/qlogic/qed/qed_mcp.c +38 -8
@@ -1230,31 +1230,61 @@ qed_mcp_send_drv_version(struct qed_hwfn *p_hwfn,return rc; } +/* A maximal 100 msec waiting time for the MCP to halt */ +#define QED_MCP_HALT_SLEEP_MS 10 +#define QED_MCP_HALT_MAX_RETRIES 10 +int qed_mcp_halt (struct qed_hwfn *p_hwfn,struct qed_ptt *p_ptt) { -u32 resp =0 , param =0 ; +u32 resp =0 , param =0 , cpu_state, cnt =0 ;int rc; rc =qed_mcp_cmd (p_hwfn, p_ptt,DRV_MSG_CODE_MCP_HALT ,0 , &resp, ¶m); -if (rc) +if (rc) {DP_ERR (p_hwfn,"MCP response failure, aborting\n" ); +return rc; + } -return rc; +do { +msleep (QED_MCP_HALT_SLEEP_MS ); + cpu_state =qed_rd (p_hwfn, p_ptt,MCP_REG_CPU_STATE ); +if (cpu_state &MCP_REG_CPU_STATE_SOFT_HALTED ) +break ; + }while (++cnt <QED_MCP_HALT_MAX_RETRIES ); + +if (cnt ==QED_MCP_HALT_MAX_RETRIES ) { +DP_NOTICE (p_hwfn, +"Failed to halt the MCP [CPU_MODE = 0x%08x, CPU_STATE = 0x%08x]\n" , +qed_rd (p_hwfn, p_ptt,MCP_REG_CPU_MODE ), cpu_state); +return -EBUSY ; + } + +return 0 ; } +#define QED_MCP_RESUME_SLEEP_MS 10 +int qed_mcp_resume (struct qed_hwfn *p_hwfn,struct qed_ptt *p_ptt) { -u32 value, cpu_mode; +u32 cpu_mode, cpu_state;qed_wr (p_hwfn, p_ptt,MCP_REG_CPU_STATE ,0xffffffff ); - value =qed_rd (p_hwfn, p_ptt,MCP_REG_CPU_MODE ); - value &= ~MCP_REG_CPU_MODE_SOFT_HALT ; -qed_wr (p_hwfn, p_ptt,MCP_REG_CPU_MODE , value); cpu_mode =qed_rd (p_hwfn, p_ptt,MCP_REG_CPU_MODE ); + cpu_mode &= ~MCP_REG_CPU_MODE_SOFT_HALT ; +qed_wr (p_hwfn, p_ptt,MCP_REG_CPU_MODE , cpu_mode); +msleep (QED_MCP_RESUME_SLEEP_MS ); + cpu_state =qed_rd (p_hwfn, p_ptt,MCP_REG_CPU_STATE ); -return (cpu_mode &MCP_REG_CPU_MODE_SOFT_HALT ) ? -EAGAIN :0 ; +if (cpu_state &MCP_REG_CPU_STATE_SOFT_HALTED ) { +DP_NOTICE (p_hwfn, +"Failed to resume the MCP [CPU_MODE = 0x%08x, CPU_STATE = 0x%08x]\n" , + cpu_mode, cpu_state); +return -EBUSY ; + } + +return 0 ; } int qed_mcp_set_led(struct qed_hwfn *p_hwfn,
drivers/net/ethernet/qlogic/qed/qed_reg_addr.h +1 -0
@@ -510,6 +510,7 @@ 0#define MCP_REG_CPU_STATE \ 0xe05004UL +#define MCP_REG_CPU_STATE_SOFT_HALTED (0x1UL << 10)#define MCP_REG_CPU_EVENT_MASK \ 0xe05008UL#define PGLUE_B_REG_PF_BAR0_SIZE \
Signature · 1 line
2.17.1
PATCH 3/14 thermal: of-thermal: disable passive polling when thermal zone is disabled
In reply to Sasha LevinFrom: Anson Huang <[email protected]>
[ Upstream commit 152395fd03d4ce1e535a75cdbf58105e50587611 ]
When thermal zone is in passive mode, disabling its mode from sysfs is NOT taking effect at all, it is still polling the temperature of the disabled thermal zone and handling all thermal trips, it makes user confused. The disabling operation should disable the thermal zone behavior completely, for both active and passive mode, this patch clears the passive_delay when thermal zone is disabled and restores it when it is enabled.
--- drivers/thermal/of-thermal.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/thermal/of-thermal.c +5 -2
@@ -278,10 +278,13 @@ static int of_thermal_set_mode(struct thermal_zone_device *tz,mutex_lock (&tz->lock); -if (mode ==THERMAL_DEVICE_ENABLED ) +if (mode ==THERMAL_DEVICE_ENABLED ) { tz->polling_delay = data->polling_delay; -else + tz->passive_delay = data->passive_delay; + }else { tz->polling_delay =0 ; + tz->passive_delay =0 ; + }mutex_unlock (&tz->lock);
Signature · 1 line
2.17.1
PATCH 4/14 net: hns: fix length and page_offset overflow when CONFIG_ARM64_64K_PAGES
In reply to Sasha LevinFrom: Huazhong Tan <[email protected]>
[ Upstream commit 3ed614dce3ca9912d22be215ff0f11104b69fe62 ]
When enable the config item "CONFIG_ARM64_64K_PAGES", the size of PAGE_SIZE is 65536(64K). But the type of length and page_offset are u16, they will overflow. So change them to u32.
--- drivers/net/ethernet/hisilicon/hns/hnae.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/hisilicon/hns/hnae.h +3 -3
@@ -213,10 +213,10 @@ struct hnae_desc_cb {/* priv data for the desc, e.g. skb when use with ip stack*/ void *priv; -u16 page_offset; -u16 reuse_flag; +u32 page_offset; +u32 length;/* length of the buffer */ -u16 length;/* length of the buffer */ +u16 reuse_flag;/* desc type, used by the ring user to mark the type of the priv data */ u16 type;
Signature · 1 line
2.17.1
PATCH 5/14 net: hns: fix skb->truesize underestimation
In reply to Sasha LevinFrom: Huazhong Tan <[email protected]>
[ Upstream commit b1ccd4c0ab6ef499f47dd84ed4920502a7147bba ]
skb->truesize is not meant to be tracking amount of used bytes in a skb, but amount of reserved/consumed bytes in memory.
For instance, if we use a single byte in last page fragment, we have to account the full size of the fragment.
So skb_add_rx_frag needs to calculate the length of the entire buffer into turesize.
--- drivers/net/ethernet/hisilicon/hns/hns_enet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/hisilicon/hns/hns_enet.c +1 -1
@@ -529,7 +529,7 @@ static void hns_nic_reuse_page(struct sk_buff *skb, int i, }skb_add_rx_frag (skb, i, desc_cb->priv, desc_cb->page_offset + pull_len, - size - pull_len, truesize - pull_len); + size - pull_len, truesize);/* avoid re-using remote pages,flag default unreuse */ if (unlikely (page_to_nid (desc_cb->priv) !=numa_node_id ()))
Signature · 1 line
2.17.1
PATCH 6/14 e1000: check on netif_running() before calling e1000_up()
In reply to Sasha LevinFrom: Bo Chen <[email protected]>
[ Upstream commit cf1acec008f8d7761aa3fd7c4bca7e17b2d2512d ]
When the device is not up, the call to 'e1000_up()' from the error handling path of 'e1000_set_ringparam()' causes a kernel oops with a null-pointer dereference. The null-pointer dereference is triggered in function 'e1000_alloc_rx_buffers()' at line 'buffer_info = &rx_ring->buffer_info[i]'.
This bug was reported by COD, a tool for testing kernel module binaries I am building. This bug was also detected by KFI from Dr. Kai Cong.
This patch fixes the bug by checking on 'netif_running()' before calling 'e1000_up()' in 'e1000_set_ringparam()'.
--- drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/e1000/e1000_ethtool.c +2 -1
@@ -665,7 +665,8 @@ static int e1000_set_ringparam(struct net_device *netdev, err_alloc_rx:kfree (txdr); err_alloc_tx: -e1000_up (adapter); +if (netif_running (adapter->netdev)) +e1000_up (adapter); err_setup:clear_bit (__E1000_RESETTING, &adapter->flags);return err;
Signature · 1 line
2.17.1
PATCH 7/14 e1000: ensure to free old tx/rx rings in set_ringparam()
In reply to Sasha LevinFrom: Bo Chen <[email protected]>
[ Upstream commit ee400a3f1bfe7004a3e14b81c38ccc5583c26295 ]
In 'e1000_set_ringparam()', the tx_ring and rx_ring are updated with new value and the old tx/rx rings are freed only when the device is up. There are resource leaks on old tx/rx rings when the device is not up. This bug is reported by COD, a tool for testing kernel module binaries I am building.
This patch fixes the bug by always calling 'kfree()' on old tx/rx rings in 'e1000_set_ringparam()'.
--- drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/e1000/e1000_ethtool.c +2 -2
@@ -645,14 +645,14 @@ static int e1000_set_ringparam(struct net_device *netdev, adapter->tx_ring = tx_old;e1000_free_all_rx_resources (adapter);e1000_free_all_tx_resources (adapter); -kfree (tx_old); -kfree (rx_old); adapter->rx_ring = rxdr; adapter->tx_ring = txdr; err =e1000_up (adapter);if (err) goto err_setup; } +kfree (tx_old); +kfree (rx_old);clear_bit (__E1000_RESETTING, &adapter->flags);return 0 ;
Signature · 1 line
2.17.1
PATCH 8/14 hwmon: (ina2xx) fix sysfs shunt resistor read access
In reply to Sasha LevinFrom: Lothar Felten <[email protected]>
[ Upstream commit 3ad867001c91657c46dcf6656d52eb6080286fd5 ]
fix the sysfs shunt resistor read access: return the shunt resistor value, not the calibration register contents.
update email address
--- Documentation/hwmon/ina2xx | 2 +- drivers/hwmon/ina2xx.c | 13 +++++++++++-- include/linux/platform_data/ina2xx.h | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-)
Documentation/hwmon/ina2xx +1 -1
@@ -32,7 +32,7 @@ Supported chips: Datasheet: Publicly available at the Texas Instruments website http://www.ti.com/ -Author: Lothar Felten <[email protected]> +Author: Lothar Felten <[email protected]> Description -----------
drivers/hwmon/ina2xx.c +11 -2
@@ -17,7 +17,7 @@* Bi-directional Current/Power Monitor with I2C Interface * Datasheet: http://www.ti.com/product/ina230 * -* Copyright (C) 2012 Lothar Felten <[email protected]> +* Copyright (C) 2012 Lothar Felten <[email protected]> * Thanks to Jan Volkering * * This program is free software; you can redistribute it and/or modify
@@ -328,6 +328,15 @@ static int ina2xx_set_shunt(struct ina2xx_data *data, long val)return 0 ; } +static ssize_t ina2xx_show_shunt (struct device *dev, +struct device_attribute *da, +char *buf) +{ +struct ina2xx_data *data =dev_get_drvdata (dev); + +return snprintf (buf,PAGE_SIZE ,"%li\n" , data->rshunt); +} +static ssize_t ina2xx_store_shunt (struct device *dev,struct device_attribute *da,const char *buf,size_t count)
@@ -402,7 +411,7 @@ static SENSOR_DEVICE_ATTR(power1_input, S_IRUGO, ina2xx_show_value, NULL,/* shunt resistance */ static SENSOR_DEVICE_ATTR(shunt_resistor, S_IRUGO | S_IWUSR, - ina2xx_show_value, ina2xx_store_shunt, + ina2xx_show_shunt, ina2xx_store_shunt, INA2XX_CALIBRATION);/* update interval (ina226 only) */
include/linux/platform_data/ina2xx.h +1 -1
@@ -1,7 +1,7 @@/* * Driver for Texas Instruments INA219, INA226 power monitor chips * -* Copyright (C) 2012 Lothar Felten <[email protected]> +* Copyright (C) 2012 Lothar Felten <[email protected]> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as
Signature · 1 line
2.17.1
PATCH 9/14 hwmon: (adt7475) Make adt7475_read_word() return errors
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit f196dec6d50abb2e65fb54a0621b2f1b4d922995 ]
The adt7475_read_word() function was meant to return negative error codes on failure.
--- drivers/hwmon/adt7475.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
drivers/hwmon/adt7475.c +9 -5
@@ -274,14 +274,18 @@ static inline u16 volt2reg(int channel, long volt, u8 bypass_attn)return clamp_val (reg,0 ,1023 ) & (0xff <<2 ); } -static u16 adt7475_read_word (struct i2c_client *client,int reg) +static int adt7475_read_word (struct i2c_client *client,int reg) { -u16 val; +int val1, val2; - val =i2c_smbus_read_byte_data (client, reg); - val |= (i2c_smbus_read_byte_data (client, reg +1 ) <<8 ); + val1 =i2c_smbus_read_byte_data (client, reg); +if (val1 <0 ) +return val1; + val2 =i2c_smbus_read_byte_data (client, reg +1 ); +if (val2 <0 ) +return val2; -return val; +return val1 | (val2 <<8 ); }static void adt7475_write_word (struct i2c_client *client,int reg,u16 val)
Signature · 1 line
2.17.1
PATCH 10/14 drm/amdgpu: Enable/disable gfx PG feature in rlc safe mode
In reply to Sasha LevinFrom: Rex Zhu <[email protected]>
[ Upstream commit 8ef23364b654d44244400d79988e677e504b21ba ]
This is required by gfx hw and can fix the rlc hang when do s3 stree test on Cz/St.
--- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +10 -1
@@ -5551,6 +5551,11 @@ static int gfx_v8_0_set_powergating_state(void *handle,if (!(adev->pg_flags &AMD_PG_SUPPORT_GFX_PG ))return 0 ; +if (adev->pg_flags & (AMD_PG_SUPPORT_GFX_SMG | +AMD_PG_SUPPORT_RLC_SMU_HS | +AMD_PG_SUPPORT_CP | +AMD_PG_SUPPORT_GFX_DMG )) + adev->gfx.rlc.funcs->enter_safe_mode (adev);switch (adev->asic_type) {case CHIP_CARRIZO :case CHIP_STONEY :
@@ -5586,7 +5591,11 @@ static int gfx_v8_0_set_powergating_state(void *handle,default :break ; } - +if (adev->pg_flags & (AMD_PG_SUPPORT_GFX_SMG | +AMD_PG_SUPPORT_RLC_SMU_HS | +AMD_PG_SUPPORT_CP | +AMD_PG_SUPPORT_GFX_DMG )) + adev->gfx.rlc.funcs->exit_safe_mode (adev);return 0 ; }
Signature · 1 line
2.17.1
PATCH 11/14 drm/amdgpu: Update power state at the end of smu hw_init.
In reply to Sasha LevinFrom: Rex Zhu <[email protected]>
[ Upstream commit 2ab4d0e74256fc49b7b270f63c1d1e47c2455abc ]
For SI/Kv, the power state is managed by function amdgpu_pm_compute_clocks.
when dpm enabled, we should call amdgpu_pm_compute_clocks to update current power state instand of set boot state.
this change can fix the oops when kfd driver was enabled on Kv.
--- drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 4 +--- drivers/gpu/drm/amd/amdgpu/si_dpm.c | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/kv_dpm.c +1 -3
@@ -1350,8 +1350,6 @@ static int kv_dpm_enable(struct amdgpu_device *adev)return ret; } -kv_update_current_ps (adev, adev->pm.dpm.boot_ps); -if (adev->irq.installed &&amdgpu_is_internal_thermal_sensor (adev->pm.int_thermal_type)) { ret =kv_set_thermal_temperature_range (adev,KV_TEMP_RANGE_MIN ,KV_TEMP_RANGE_MAX );
@@ -3086,7 +3084,7 @@ static int kv_dpm_hw_init(void *handle)else adev->pm.dpm_enabled = true;mutex_unlock (&adev->pm.mutex); - +amdgpu_pm_compute_clocks (adev);return ret; }
drivers/gpu/drm/amd/amdgpu/si_dpm.c +1 -2
@@ -6959,7 +6959,6 @@ static int si_dpm_enable(struct amdgpu_device *adev)si_enable_auto_throttle_source (adev,AMDGPU_DPM_AUTO_THROTTLE_SRC_THERMAL , true);si_thermal_start_thermal_controller (adev); -ni_update_current_ps (adev, boot_ps);return 0 ; }
@@ -7836,7 +7835,7 @@ static int si_dpm_hw_init(void *handle)else adev->pm.dpm_enabled = true;mutex_unlock (&adev->pm.mutex); - +amdgpu_pm_compute_clocks (adev);return ret; }
Signature · 1 line
2.17.1
PATCH 12/14 arm/arm64: smccc-1.1: Make return values unsigned long
In reply to Sasha LevinFrom: Marc Zyngier <[email protected]>
[ Upstream commit 1d8f574708a3fb6f18c85486d0c5217df893c0cf ]
An unfortunate consequence of having a strong typing for the input values to the SMC call is that it also affects the type of the return values, limiting r0 to 32 bits and r{1,2,3} to whatever was passed as an input.
Let's turn everything into "unsigned long", which satisfies the requirements of both architectures, and allows for the full range of return values.
--- include/linux/arm-smccc.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
include/linux/arm-smccc.h +10 -10
@@ -199,31 +199,31 @@ asmlinkage void __arm_smccc_hvc(unsigned long a0, unsigned long a1,#define __declare_arg_0 (a0, res) \ struct arm_smccc_res *___res = res; \ - register u32 r0 asm("r0") = a0; \ + register unsigned long r0 asm("r0") = (u32)a0; \ register unsigned long r1 asm("r1"); \ register unsigned long r2 asm("r2"); \ register unsigned long r3 asm("r3")#define __declare_arg_1 (a0, a1, res) \ struct arm_smccc_res *___res = res; \ - register u32 r0 asm("r0") = a0; \ - register typeof(a1) r1 asm("r1") = a1; \ + register unsigned long r0 asm("r0") = (u32)a0; \ + register unsigned long r1 asm("r1") = a1; \ register unsigned long r2 asm("r2"); \ register unsigned long r3 asm("r3")#define __declare_arg_2 (a0, a1, a2, res) \ struct arm_smccc_res *___res = res; \ - register u32 r0 asm("r0") = a0; \ - register typeof(a1) r1 asm("r1") = a1; \ - register typeof(a2) r2 asm("r2") = a2; \ + register unsigned long r0 asm("r0") = (u32)a0; \ + register unsigned long r1 asm("r1") = a1; \ + register unsigned long r2 asm("r2") = a2; \ register unsigned long r3 asm("r3")#define __declare_arg_3 (a0, a1, a2, a3, res) \ struct arm_smccc_res *___res = res; \ - register u32 r0 asm("r0") = a0; \ - register typeof(a1) r1 asm("r1") = a1; \ - register typeof(a2) r2 asm("r2") = a2; \ - register typeof(a3) r3 asm("r3") = a3 + register unsigned long r0 asm("r0") = (u32)a0; \ + register unsigned long r1 asm("r1") = a1; \ + register unsigned long r2 asm("r2") = a2; \ + register unsigned long r3 asm("r3") = a3#define __declare_arg_4 (a0, a1, a2, a3, a4, res) \ __declare_arg_3(a0, a1, a2, a3, res); \
Signature · 1 line
2.17.1
PATCH 13/14 arm/arm64: smccc-1.1: Handle function result as parameters
In reply to Sasha LevinFrom: Marc Zyngier <[email protected]>
[ Upstream commit 755a8bf5579d22eb5636685c516d8dede799e27b ]
If someone has the silly idea to write something along those lines:
extern u64 foo(void);
void bar(struct arm_smccc_res *res)
{
arm_smccc_1_1_smc(0xbad, foo(), res);
}they are in for a surprise, as this gets compiled as:
0000000000000588 <bar>: 588: a9be7bfd stp x29, x30, [sp, #-32]! 58c: 910003fd mov x29, sp 590: f9000bf3 str x19, [sp, #16] 594: aa0003f3 mov x19, x0 598: aa1e03e0 mov x0, x30 59c: 94000000 bl 0 <_mcount> 5a0: 94000000 bl 0 <foo> 5a4: aa0003e1 mov x1, x0 5a8: d4000003 smc #0x0 5ac: b4000073 cbz x19, 5b8 <bar+0x30> 5b0: a9000660 stp x0, x1, [x19] 5b4: a9010e62 stp x2, x3, [x19, #16] 5b8: f9400bf3 ldr x19, [sp, #16] 5bc: a8c27bfd ldp x29, x30, [sp], #32 5c0: d65f03c0 ret 5c4: d503201f nop
The call to foo "overwrites" the x0 register for the return value, and we end up calling the wrong secure service.
A solution is to evaluate all the parameters before assigning anything to specific registers, leading to the expected result:
0000000000000588 <bar>: 588: a9be7bfd stp x29, x30, [sp, #-32]! 58c: 910003fd mov x29, sp 590: f9000bf3 str x19, [sp, #16] 594: aa0003f3 mov x19, x0 598: aa1e03e0 mov x0, x30 59c: 94000000 bl 0 <_mcount> 5a0: 94000000 bl 0 <foo> 5a4: aa0003e1 mov x1, x0 5a8: d28175a0 mov x0, #0xbad 5ac: d4000003 smc #0x0 5b0: b4000073 cbz x19, 5bc <bar+0x34> 5b4: a9000660 stp x0, x1, [x19] 5b8: a9010e62 stp x2, x3, [x19, #16] 5bc: f9400bf3 ldr x19, [sp, #16] 5c0: a8c27bfd ldp x29, x30, [sp], #32 5c4: d65f03c0 ret
--- include/linux/arm-smccc.h | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-)
include/linux/arm-smccc.h +20 -10
@@ -205,41 +205,51 @@ asmlinkage void __arm_smccc_hvc(unsigned long a0, unsigned long a1, register unsigned long r3 asm("r3")#define __declare_arg_1 (a0, a1, res) \ + typeof(a1) __a1 = a1; \ struct arm_smccc_res *___res = res; \ register unsigned long r0 asm("r0") = (u32)a0; \ - register unsigned long r1 asm("r1") = a1; \ + register unsigned long r1 asm("r1") = __a1; \ register unsigned long r2 asm("r2"); \ register unsigned long r3 asm("r3")#define __declare_arg_2 (a0, a1, a2, res) \ + typeof(a1) __a1 = a1; \ + typeof(a2) __a2 = a2; \ struct arm_smccc_res *___res = res; \ register unsigned long r0 asm("r0") = (u32)a0; \ - register unsigned long r1 asm("r1") = a1; \ - register unsigned long r2 asm("r2") = a2; \ + register unsigned long r1 asm("r1") = __a1; \ + register unsigned long r2 asm("r2") = __a2; \ register unsigned long r3 asm("r3")#define __declare_arg_3 (a0, a1, a2, a3, res) \ + typeof(a1) __a1 = a1; \ + typeof(a2) __a2 = a2; \ + typeof(a3) __a3 = a3; \ struct arm_smccc_res *___res = res; \ register unsigned long r0 asm("r0") = (u32)a0; \ - register unsigned long r1 asm("r1") = a1; \ - register unsigned long r2 asm("r2") = a2; \ - register unsigned long r3 asm("r3") = a3 + register unsigned long r1 asm("r1") = __a1; \ + register unsigned long r2 asm("r2") = __a2; \ + register unsigned long r3 asm("r3") = __a3#define __declare_arg_4 (a0, a1, a2, a3, a4, res) \ + typeof(a4) __a4 = a4; \ __declare_arg_3(a0, a1, a2, a3, res); \ - register typeof(a4) r4 asm("r4") = a4 + register unsigned long r4 asm("r4") = __a4#define __declare_arg_5 (a0, a1, a2, a3, a4, a5, res) \ + typeof(a5) __a5 = a5; \ __declare_arg_4(a0, a1, a2, a3, a4, res); \ - register typeof(a5) r5 asm("r5") = a5 + register unsigned long r5 asm("r5") = __a5#define __declare_arg_6 (a0, a1, a2, a3, a4, a5, a6, res) \ + typeof(a6) __a6 = a6; \ __declare_arg_5(a0, a1, a2, a3, a4, a5, res); \ - register typeof(a6) r6 asm("r6") = a6 + register unsigned long r6 asm("r6") = __a6#define __declare_arg_7 (a0, a1, a2, a3, a4, a5, a6, a7, res) \ + typeof(a7) __a7 = a7; \ __declare_arg_6(a0, a1, a2, a3, a4, a5, a6, res); \ - register typeof(a7) r7 asm("r7") = a7 + register unsigned long r7 asm("r7") = __a7#define ___declare_args (count, ...) __declare_arg_ ## count(__VA_ARGS__)#define __declare_args (count, ...) ___declare_args(count, __VA_ARGS__)
Signature · 1 line
2.17.1
PATCH 14/14 i2c: i801: Allow ACPI AML access I/O ports not reserved for SMBus
In reply to Sasha LevinFrom: Mika Westerberg <[email protected]>
[ Upstream commit 7fd6d98b89f382d414e1db528e29a67bbd749457 ]
Commit 7ae81952cda ("i2c: i801: Allow ACPI SystemIO OpRegion to conflict with PCI BAR") made it possible for AML code to access SMBus I/O ports by installing custom SystemIO OpRegion handler and blocking i80i driver access upon first AML read/write to this OpRegion.
However, while ThinkPad T560 does have SystemIO OpRegion declared under the SMBus device, it does not access any of the SMBus registers:
Device (SMBU)
{
...
OperationRegion (SMBP, PCI_Config, 0x50, 0x04)
Field (SMBP, DWordAcc, NoLock, Preserve)
{
, 5,
TCOB, 11,
Offset (0x04)
}
Name (TCBV, 0x00)
Method (TCBS, 0, NotSerialized)
{
If ((TCBV == 0x00))
{
TCBV = (\_SB.PCI0.SMBU.TCOB << 0x05)
}
Return (TCBV) /* \_SB_.PCI0.SMBU.TCBV */
}
OperationRegion (TCBA, SystemIO, TCBS (), 0x10)
Field (TCBA, ByteAcc, NoLock, Preserve)
{
Offset (0x04),
, 9,
CPSC, 1
}
}Problem with the current approach is that it blocks all I/O port access and because this system has touchpad connected to the SMBus controller after first AML access (happens during suspend/resume cycle) the touchpad fails to work anymore.
Fix this so that we allow ACPI AML I/O port access if it does not touch the region reserved for the SMBus.
--- drivers/i2c/busses/i2c-i801.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/i2c/busses/i2c-i801.c +8 -1
@@ -1403,6 +1403,13 @@ static void i801_add_tco(struct i801_priv *priv) }#ifdef CONFIG_ACPI +static bool i801_acpi_is_smbus_ioport (const struct i801_priv *priv, +acpi_physical_address address) +{ +return address >= priv->smba && + address <=pci_resource_end (priv->pci_dev,SMBBAR ); +} +static acpi_status i801_acpi_io_handler (u32 function,acpi_physical_address address,u32 bits,u64 *value,void *handler_context,void *region_context)
@@ -1418,7 +1425,7 @@ i801_acpi_io_handler(u32 function, acpi_physical_address address, u32 bits,*/ mutex_lock (&priv->acpi_lock); -if (!priv->acpi_reserved) { +if (!priv->acpi_reserved &&i801_acpi_is_smbus_ioport (priv, address)) { priv->acpi_reserved = true;dev_warn (&pdev->dev,"BIOS is accessing SMBus registers\n" );
Signature · 1 line
2.17.1