iio: adc: max9611: explicitly cast gain_selectors
Subsystems (33)
Sasha Levin
maintainerPATCH 12/205 soc/tegra: pmc: Fix pad voltage configuration for Tegra186
In reply to Sasha LevinFrom: Aapo Vienamo <[email protected]>
[ Upstream commit 13136a47a061c01c91df78b37f7708dd5ce7035f ]
Implement support for the PMC_IMPL_E_33V_PWR register which replaces PMC_PWR_DET register interface of the SoC generations preceding Tegra186. Also add the voltage bit offsets to the tegra186_io_pads[] table and the AO_HV pad.
--- drivers/soc/tegra/pmc.c | 55 +++++++++++++++++++++++++++++------------ include/soc/tegra/pmc.h | 1 + 2 files changed, 40 insertions(+), 16 deletions(-)
drivers/soc/tegra/pmc.c +39 -16
@@ -65,6 +65,8 @@#define PWRGATE_STATUS 0x38 +#define PMC_IMPL_E_33V_PWR 0x40 +#define PMC_PWR_DET 0x48#define PMC_SCRATCH0_MODE_RECOVERY BIT(31)
@@ -154,6 +156,7 @@ struct tegra_pmc_soc {bool has_tsense_reset;bool has_gpu_clamps;bool needs_mbist_war; +bool has_impl_33v_pwr;const struct tegra_io_pad_soc *io_pads;unsigned int num_io_pads;
@@ -1067,20 +1070,31 @@ int tegra_io_pad_set_voltage(enum tegra_io_pad id,mutex_lock (&pmc->powergates_lock); -/* write-enable PMC_PWR_DET_VALUE[pad->voltage] */ - value =tegra_pmc_readl (PMC_PWR_DET ); - value |=BIT (pad->voltage); -tegra_pmc_writel (value,PMC_PWR_DET ); +if (pmc->soc->has_impl_33v_pwr) { + value =tegra_pmc_readl (PMC_IMPL_E_33V_PWR ); -/* update I/O voltage */ - value =tegra_pmc_readl (PMC_PWR_DET_VALUE ); +if (voltage ==TEGRA_IO_PAD_1800000UV ) + value &= ~BIT (pad->voltage); +else + value |=BIT (pad->voltage); -if (voltage ==TEGRA_IO_PAD_1800000UV ) - value &= ~BIT (pad->voltage); -else +tegra_pmc_writel (value,PMC_IMPL_E_33V_PWR ); + }else { +/* write-enable PMC_PWR_DET_VALUE[pad->voltage] */ + value =tegra_pmc_readl (PMC_PWR_DET ); value |=BIT (pad->voltage); +tegra_pmc_writel (value,PMC_PWR_DET ); + +/* update I/O voltage */ + value =tegra_pmc_readl (PMC_PWR_DET_VALUE ); -tegra_pmc_writel (value,PMC_PWR_DET_VALUE ); +if (voltage ==TEGRA_IO_PAD_1800000UV ) + value &= ~BIT (pad->voltage); +else + value |=BIT (pad->voltage); + +tegra_pmc_writel (value,PMC_PWR_DET_VALUE ); + }mutex_unlock (&pmc->powergates_lock);
@@ -1102,7 +1116,10 @@ int tegra_io_pad_get_voltage(enum tegra_io_pad id)if (pad->voltage ==UINT_MAX )return -ENOTSUPP ; - value =tegra_pmc_readl (PMC_PWR_DET_VALUE ); +if (pmc->soc->has_impl_33v_pwr) + value =tegra_pmc_readl (PMC_IMPL_E_33V_PWR ); +else + value =tegra_pmc_readl (PMC_PWR_DET_VALUE );if ((value &BIT (pad->voltage)) ==0 )return TEGRA_IO_PAD_1800000UV ;
@@ -1561,6 +1578,7 @@ static const struct tegra_pmc_soc tegra30_pmc_soc = { .cpu_powergates = tegra30_cpu_powergates, .has_tsense_reset = true, .has_gpu_clamps = false, + .has_impl_33v_pwr = false, .num_io_pads = 0, .io_pads = NULL, .regs = &tegra20_pmc_regs,
@@ -1603,6 +1621,7 @@ static const struct tegra_pmc_soc tegra114_pmc_soc = { .cpu_powergates = tegra114_cpu_powergates, .has_tsense_reset = true, .has_gpu_clamps = false, + .has_impl_33v_pwr = false, .num_io_pads = 0, .io_pads = NULL, .regs = &tegra20_pmc_regs,
@@ -1683,6 +1702,7 @@ static const struct tegra_pmc_soc tegra124_pmc_soc = { .cpu_powergates = tegra124_cpu_powergates, .has_tsense_reset = true, .has_gpu_clamps = true, + .has_impl_33v_pwr = false, .num_io_pads = ARRAY_SIZE(tegra124_io_pads), .io_pads = tegra124_io_pads, .regs = &tegra20_pmc_regs,
@@ -1772,6 +1792,7 @@ static const struct tegra_pmc_soc tegra210_pmc_soc = { .cpu_powergates = tegra210_cpu_powergates, .has_tsense_reset = true, .has_gpu_clamps = true, + .has_impl_33v_pwr = false, .needs_mbist_war = true, .num_io_pads = ARRAY_SIZE(tegra210_io_pads), .io_pads = tegra210_io_pads,
@@ -1800,7 +1821,7 @@ static const struct tegra_io_pad_soc tegra186_io_pads[] = { { .id = TEGRA_IO_PAD_HDMI_DP0, .dpd = 28, .voltage = UINT_MAX }, { .id = TEGRA_IO_PAD_HDMI_DP1, .dpd = 29, .voltage = UINT_MAX }, { .id = TEGRA_IO_PAD_PEX_CNTRL, .dpd = 32, .voltage = UINT_MAX }, - { .id = TEGRA_IO_PAD_SDMMC2_HV, .dpd = 34, .voltage = UINT_MAX }, + { .id = TEGRA_IO_PAD_SDMMC2_HV, .dpd = 34, .voltage = 5 }, { .id = TEGRA_IO_PAD_SDMMC4, .dpd = 36, .voltage = UINT_MAX }, { .id = TEGRA_IO_PAD_CAM, .dpd = 38, .voltage = UINT_MAX }, { .id = TEGRA_IO_PAD_DSIB, .dpd = 40, .voltage = UINT_MAX },
@@ -1812,12 +1833,13 @@ static const struct tegra_io_pad_soc tegra186_io_pads[] = { { .id = TEGRA_IO_PAD_CSIF, .dpd = 46, .voltage = UINT_MAX }, { .id = TEGRA_IO_PAD_SPI, .dpd = 47, .voltage = UINT_MAX }, { .id = TEGRA_IO_PAD_UFS, .dpd = 49, .voltage = UINT_MAX }, - { .id = TEGRA_IO_PAD_DMIC_HV, .dpd = 52, .voltage = UINT_MAX }, + { .id = TEGRA_IO_PAD_DMIC_HV, .dpd = 52, .voltage = 2 }, { .id = TEGRA_IO_PAD_EDP, .dpd = 53, .voltage = UINT_MAX }, - { .id = TEGRA_IO_PAD_SDMMC1_HV, .dpd = 55, .voltage = UINT_MAX }, - { .id = TEGRA_IO_PAD_SDMMC3_HV, .dpd = 56, .voltage = UINT_MAX }, + { .id = TEGRA_IO_PAD_SDMMC1_HV, .dpd = 55, .voltage = 4 }, + { .id = TEGRA_IO_PAD_SDMMC3_HV, .dpd = 56, .voltage = 6 }, { .id = TEGRA_IO_PAD_CONN, .dpd = 60, .voltage = UINT_MAX }, - { .id = TEGRA_IO_PAD_AUDIO_HV, .dpd = 61, .voltage = UINT_MAX }, + { .id = TEGRA_IO_PAD_AUDIO_HV, .dpd = 61, .voltage = 1 }, + { .id = TEGRA_IO_PAD_AO_HV, .dpd = UINT_MAX, .voltage = 0 }, }; static const struct tegra_pmc_regs tegra186_pmc_regs = {
@@ -1870,6 +1892,7 @@ static const struct tegra_pmc_soc tegra186_pmc_soc = { .cpu_powergates = NULL, .has_tsense_reset = false, .has_gpu_clamps = false, + .has_impl_33v_pwr = true, .num_io_pads = ARRAY_SIZE(tegra186_io_pads), .io_pads = tegra186_io_pads, .regs = &tegra186_pmc_regs,
include/soc/tegra/pmc.h +1 -0
@@ -134,6 +134,7 @@ enum tegra_io_pad {TEGRA_IO_PAD_USB2 ,TEGRA_IO_PAD_USB3 ,TEGRA_IO_PAD_USB_BIAS , + TEGRA_IO_PAD_AO_HV, };/* deprecated, use TEGRA_IO_PAD_{HDMI,LVDS} instead */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 13/205 arm64: dts: tegra210-p2180: Correct sdmmc4 vqmmc-supply
In reply to Sasha LevinFrom: Aapo Vienamo <[email protected]>
[ Upstream commit 6ff7705da8806de45ca1490194f0b4eb07725804 ]
On p2180 sdmmc4 is powered from a fixed 1.8 V regulator.
--- arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi +1 -0
@@ -282,6 +282,7 @@ status = "okay"; bus-width = <8>; non-removable; + vqmmc-supply = <&vdd_1v8>; }; clocks {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 15/205 ARM: dts: rcar: Correct SATA device sizes to 2 MiB
In reply to Sasha LevinFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 441f61e3aa9e7386731ce1405044d484bd81f911 ]
Update the SATA device nodes on R-Car H1, H2, and M2-W to use a 2 MiB I/O space, as specified in Rev.1.0 of the R-Car H1 and R-Car Gen2 hardware user manuals.
See also commit e9f0089b2d8a3d45 ("arm64: dts: r8a7795: Correct SATA device size to 2MiB").
--- arch/arm/boot/dts/r8a7779.dtsi | 2 +- arch/arm/boot/dts/r8a7790.dtsi | 4 ++-- arch/arm/boot/dts/r8a7791.dtsi | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)
arch/arm/boot/dts/r8a7779.dtsi +1 -1
@@ -344,7 +344,7 @@ sata: sata@fc600000 { compatible = "renesas,sata-r8a7779", "renesas,rcar-sata"; - reg = <0xfc600000 0x2000>; + reg = <0xfc600000 0x200000>; interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp1_clks R8A7779_CLK_SATA>; power-domains = <&sysc R8A7779_PD_ALWAYS_ON>;
arch/arm/boot/dts/r8a7790.dtsi +2 -2
@@ -1559,7 +1559,7 @@ sata0: sata@ee300000 { compatible = "renesas,sata-r8a7790", "renesas,rcar-gen2-sata"; - reg = <0 0xee300000 0 0x2000>; + reg = <0 0xee300000 0 0x200000>; interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>; clocks = <&cpg CPG_MOD 815>; power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
@@ -1570,7 +1570,7 @@ sata1: sata@ee500000 { compatible = "renesas,sata-r8a7790", "renesas,rcar-gen2-sata"; - reg = <0 0xee500000 0 0x2000>; + reg = <0 0xee500000 0 0x200000>; interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>; clocks = <&cpg CPG_MOD 814>; power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
arch/arm/boot/dts/r8a7791.dtsi +2 -2
@@ -1543,7 +1543,7 @@ sata0: sata@ee300000 { compatible = "renesas,sata-r8a7791", "renesas,rcar-gen2-sata"; - reg = <0 0xee300000 0 0x2000>; + reg = <0 0xee300000 0 0x200000>; interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>; clocks = <&cpg CPG_MOD 815>; power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
@@ -1554,7 +1554,7 @@ sata1: sata@ee500000 { compatible = "renesas,sata-r8a7791", "renesas,rcar-gen2-sata"; - reg = <0 0xee500000 0 0x2000>; + reg = <0 0xee500000 0 0x200000>; interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>; clocks = <&cpg CPG_MOD 814>; power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 19/205 remoteproc/davinci: Use %zx for formating size_t
In reply to Sasha LevinFrom: Bjorn Andersson <[email protected]>
[ Upstream commit 1e28dbbeced6152b9ea7c417ff8cef3f7dcf0f19 ]
da8xx_rproc_mem size is of type size_t, so use %zx to format the debug print of it to avoid a compile warning.
--- drivers/remoteproc/da8xx_remoteproc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/remoteproc/da8xx_remoteproc.c +1 -1
@@ -226,7 +226,7 @@ static int da8xx_rproc_get_internal_memories(struct platform_device *pdev, res->start &DA8XX_RPROC_LOCAL_ADDRESS_MASK ; drproc->mem[i].size =resource_size (res); -dev_dbg (dev,"memory %8s: bus addr %pa size 0x%x va %p da 0x%x\n" , +dev_dbg (dev,"memory %8s: bus addr %pa size 0x%zx va %p da 0x%x\n" , mem_names[i], &drproc->mem[i].bus_addr, drproc->mem[i].size, drproc->mem[i].cpu_addr, drproc->mem[i].dev_addr);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 32/205 gfs2: Don't set GFS2_RDF_UPTODATE when the lvb is updated
In reply to Sasha LevinFrom: Bob Peterson <[email protected]>
[ Upstream commit 4f36cb36c9d14340bb200d2ad9117b03ce992cfe ]
The GFS2_RDF_UPTODATE flag in the rgrp is used to determine when a rgrp buffer is valid. It's cleared when the glock is invalidated, signifying that the buffer data is now invalid. But before this patch, function update_rgrp_lvb was setting the flag when it determined it had a valid lvb. But that's an invalid assumption:
just because you have a valid lvb doesn't mean you have valid buffers. After all, another node may have made the lvb valid, and this node just fetched it from the glock via dlm.
Consider this scenario:
1. The file system is mounted with RGRPLVB option.
2. In gfs2_inplace_reserve it locks the rgrp glock EX, but thanks to GL_SKIP, it skips the gfs2_rgrp_bh_get.
3. Since loops == 0 and the allocation target (ap->target) is bigger than the largest known chunk of blocks in the rgrp (rs->rs_rbm.rgd->rd_extfail_pt) it skips that rgrp and bypasses the call to gfs2_rgrp_bh_get there as well.
4. update_rgrp_lvb sees the lvb MAGIC number is valid, so bypasses gfs2_rgrp_bh_get, but it still sets sets GFS2_RDF_UPTODATE due to this invalid assumption.
5. The next time update_rgrp_lvb is called, it sees the bit is set and just returns 0, assuming both the lvb and rgrp are both uptodate. But since this is a smaller allocation, or space has been freed by another node, thus adjusting the lvb values, it decides to use the rgrp for allocations, with invalid rd_free due to the fact it was never updated.
This patch changes update_rgrp_lvb so it doesn't set the UPTODATE flag anymore. That way, it has no choice but to fetch the latest values.
--- fs/gfs2/rgrp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/gfs2/rgrp.c +1 -1
@@ -1227,7 +1227,7 @@ static int update_rgrp_lvb(struct gfs2_rgrpd *rgd) rl_flags =be32_to_cpu (rgd->rd_rgl->rl_flags); rl_flags &= ~GFS2_RDF_MASK ; rgd->rd_flags &=GFS2_RDF_MASK ; - rgd->rd_flags |= (rl_flags |GFS2_RDF_UPTODATE |GFS2_RDF_CHECK ); + rgd->rd_flags |= (rl_flags |GFS2_RDF_CHECK );if (rgd->rd_rgl->rl_unlinked ==0 ) rgd->rd_flags &= ~GFS2_RDF_CHECK ; rgd->rd_free =be32_to_cpu (rgd->rd_rgl->rl_free);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 85/205 qxl: fix null-pointer crash during suspend
In reply to Sasha LevinFrom: Peter Wu <[email protected]>
[ Upstream commit 7948a2b15873319d1bff4d37c09b9f2bf87b9021 ]
"crtc->helper_private" is not initialized by the QXL driver and thus the "crtc_funcs->disable" call would crash (resulting in suspend failure). Fix this by converting the suspend/resume functions to use the drm_mode_config_helper_* helpers.
Tested system sleep with QEMU 3.0 using "echo mem > /sys/power/state". During suspend the following message is visible from QEMU:
spice/server/display-channel.c:2425:display_channel_validate_surface: canvas address is 0x7fd05da68308 for 0 (and is NULL) spice/server/display-channel.c:2426:display_channel_validate_surface: failed on 0
This seems to be triggered by QXL_IO_NOTIFY_CMD after QXL_IO_DESTROY_PRIMARY_ASYNC, but aside from the warning things still seem to work (tested with both the GTK and -spice options).
--- drivers/gpu/drm/qxl/qxl_drv.c | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-)
drivers/gpu/drm/qxl/qxl_drv.c +5 -21
@@ -136,20 +136,11 @@ static int qxl_drm_freeze(struct drm_device *dev) {struct pci_dev *pdev = dev->pdev;struct qxl_device *qdev = dev->dev_private; -struct drm_crtc *crtc; - -drm_kms_helper_poll_disable (dev); - -console_lock (); -qxl_fbdev_set_suspend (qdev,1 ); -console_unlock (); +int ret; -/* unpin the front buffers */ -list_for_each_entry (crtc, &dev->mode_config.crtc_list, head) { -const struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private; -if (crtc->enabled) - (*crtc_funcs->disable)(crtc); - } + ret =drm_mode_config_helper_suspend (dev); +if (ret) +return ret;qxl_destroy_monitors_object (qdev);qxl_surf_evict (qdev);
@@ -175,14 +166,7 @@ static int qxl_drm_resume(struct drm_device *dev, bool thaw) }qxl_create_monitors_object (qdev); -drm_helper_resume_force_mode (dev); - -console_lock (); -qxl_fbdev_set_suspend (qdev,0 ); -console_unlock (); - -drm_kms_helper_poll_enable (dev); -return 0 ; +return drm_mode_config_helper_resume (dev); }static int qxl_pm_suspend (struct device *dev)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 85/205 qxl: fix null-pointer crash during suspend
In reply to Sasha LevinFrom: Peter Wu <[email protected]>
[ Upstream commit 7948a2b15873319d1bff4d37c09b9f2bf87b9021 ]
"crtc->helper_private" is not initialized by the QXL driver and thus the "crtc_funcs->disable" call would crash (resulting in suspend failure). Fix this by converting the suspend/resume functions to use the drm_mode_config_helper_* helpers.
Tested system sleep with QEMU 3.0 using "echo mem > /sys/power/state". During suspend the following message is visible from QEMU:
spice/server/display-channel.c:2425:display_channel_validate_surface: canvas address is 0x7fd05da68308 for 0 (and is NULL) spice/server/display-channel.c:2426:display_channel_validate_surface: failed on 0
This seems to be triggered by QXL_IO_NOTIFY_CMD after QXL_IO_DESTROY_PRIMARY_ASYNC, but aside from the warning things still seem to work (tested with both the GTK and -spice options).
--- drivers/gpu/drm/qxl/qxl_drv.c | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-)
drivers/gpu/drm/qxl/qxl_drv.c +5 -21
@@ -136,20 +136,11 @@ static int qxl_drm_freeze(struct drm_device *dev) {struct pci_dev *pdev = dev->pdev;struct qxl_device *qdev = dev->dev_private; -struct drm_crtc *crtc; - -drm_kms_helper_poll_disable (dev); - -console_lock (); -qxl_fbdev_set_suspend (qdev,1 ); -console_unlock (); +int ret; -/* unpin the front buffers */ -list_for_each_entry (crtc, &dev->mode_config.crtc_list, head) { -const struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private; -if (crtc->enabled) - (*crtc_funcs->disable)(crtc); - } + ret =drm_mode_config_helper_suspend (dev); +if (ret) +return ret;qxl_destroy_monitors_object (qdev);qxl_surf_evict (qdev);
@@ -175,14 +166,7 @@ static int qxl_drm_resume(struct drm_device *dev, bool thaw) }qxl_create_monitors_object (qdev); -drm_helper_resume_force_mode (dev); - -console_lock (); -qxl_fbdev_set_suspend (qdev,0 ); -console_unlock (); - -drm_kms_helper_poll_enable (dev); -return 0 ; +return drm_mode_config_helper_resume (dev); }static int qxl_pm_suspend (struct device *dev)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 95/205 i2c: mediatek: Use DMA safe buffers for i2c transactions
In reply to Sasha LevinFrom: Jun Gao <[email protected]>
[ Upstream commit fc66b39fe36acfd06f716e338de7cd8f9550fad2 ]
DMA mode will always be used in i2c transactions, try to allocate a DMA safe buffer if the buf of struct i2c_msg used is not DMA safe.
--- drivers/i2c/busses/i2c-mt65xx.c | 62 +++++++++++++++++++++++++++++---- 1 file changed, 55 insertions(+), 7 deletions(-)
drivers/i2c/busses/i2c-mt65xx.c +55 -7
@@ -441,6 +441,8 @@ static int mtk_i2c_do_transfer(struct mtk_i2c *i2c, struct i2c_msg *msgs,u16 control_reg;u16 restart_flag =0 ;u32 reg_4g_mode; +u8 *dma_rd_buf =NULL ; +u8 *dma_wr_buf =NULL ;dma_addr_t rpaddr =0 ;dma_addr_t wpaddr =0 ;int ret;
@@ -500,10 +502,18 @@ static int mtk_i2c_do_transfer(struct mtk_i2c *i2c, struct i2c_msg *msgs,if (i2c->op ==I2C_MASTER_RD ) {writel (I2C_DMA_INT_FLAG_NONE , i2c->pdmabase +OFFSET_INT_FLAG );writel (I2C_DMA_CON_RX , i2c->pdmabase +OFFSET_CON ); - rpaddr =dma_map_single (i2c->dev, msgs->buf, + + dma_rd_buf =i2c_get_dma_safe_msg_buf (msgs,0 ); +if (!dma_rd_buf) +return -ENOMEM ; + + rpaddr =dma_map_single (i2c->dev, dma_rd_buf, msgs->len,DMA_FROM_DEVICE ); -if (dma_mapping_error (i2c->dev, rpaddr)) +if (dma_mapping_error (i2c->dev, rpaddr)) { +i2c_put_dma_safe_msg_buf (dma_rd_buf, msgs, false); +return -ENOMEM ; + }if (i2c->dev_comp->support_33bits) { reg_4g_mode =mtk_i2c_set_4g_mode (rpaddr);
@@ -515,10 +525,18 @@ static int mtk_i2c_do_transfer(struct mtk_i2c *i2c, struct i2c_msg *msgs, }else if (i2c->op ==I2C_MASTER_WR ) {writel (I2C_DMA_INT_FLAG_NONE , i2c->pdmabase +OFFSET_INT_FLAG );writel (I2C_DMA_CON_TX , i2c->pdmabase +OFFSET_CON ); - wpaddr =dma_map_single (i2c->dev, msgs->buf, + + dma_wr_buf =i2c_get_dma_safe_msg_buf (msgs,0 ); +if (!dma_wr_buf) +return -ENOMEM ; + + wpaddr =dma_map_single (i2c->dev, dma_wr_buf, msgs->len,DMA_TO_DEVICE ); -if (dma_mapping_error (i2c->dev, wpaddr)) +if (dma_mapping_error (i2c->dev, wpaddr)) { +i2c_put_dma_safe_msg_buf (dma_wr_buf, msgs, false); +return -ENOMEM ; + }if (i2c->dev_comp->support_33bits) { reg_4g_mode =mtk_i2c_set_4g_mode (wpaddr);
@@ -530,16 +548,39 @@ static int mtk_i2c_do_transfer(struct mtk_i2c *i2c, struct i2c_msg *msgs, }else {writel (I2C_DMA_CLR_FLAG , i2c->pdmabase +OFFSET_INT_FLAG );writel (I2C_DMA_CLR_FLAG , i2c->pdmabase +OFFSET_CON ); - wpaddr =dma_map_single (i2c->dev, msgs->buf, + + dma_wr_buf =i2c_get_dma_safe_msg_buf (msgs,0 ); +if (!dma_wr_buf) +return -ENOMEM ; + + wpaddr =dma_map_single (i2c->dev, dma_wr_buf, msgs->len,DMA_TO_DEVICE ); -if (dma_mapping_error (i2c->dev, wpaddr)) +if (dma_mapping_error (i2c->dev, wpaddr)) { +i2c_put_dma_safe_msg_buf (dma_wr_buf, msgs, false); +return -ENOMEM ; - rpaddr =dma_map_single (i2c->dev, (msgs +1 )->buf, + } + + dma_rd_buf =i2c_get_dma_safe_msg_buf ((msgs +1 ),0 ); +if (!dma_rd_buf) { +dma_unmap_single (i2c->dev, wpaddr, + msgs->len,DMA_TO_DEVICE ); + +i2c_put_dma_safe_msg_buf (dma_wr_buf, msgs, false); + +return -ENOMEM ; + } + + rpaddr =dma_map_single (i2c->dev, dma_rd_buf, (msgs +1 )->len,DMA_FROM_DEVICE );if (dma_mapping_error (i2c->dev, rpaddr)) {dma_unmap_single (i2c->dev, wpaddr, msgs->len,DMA_TO_DEVICE ); + +i2c_put_dma_safe_msg_buf (dma_wr_buf, msgs, false); +i2c_put_dma_safe_msg_buf (dma_rd_buf, (msgs +1 ), false); +return -ENOMEM ; }
@@ -578,14 +619,21 @@ static int mtk_i2c_do_transfer(struct mtk_i2c *i2c, struct i2c_msg *msgs,if (i2c->op ==I2C_MASTER_WR ) {dma_unmap_single (i2c->dev, wpaddr, msgs->len,DMA_TO_DEVICE ); + +i2c_put_dma_safe_msg_buf (dma_wr_buf, msgs, true); }else if (i2c->op ==I2C_MASTER_RD ) {dma_unmap_single (i2c->dev, rpaddr, msgs->len,DMA_FROM_DEVICE ); + +i2c_put_dma_safe_msg_buf (dma_rd_buf, msgs, true); }else {dma_unmap_single (i2c->dev, wpaddr, msgs->len,DMA_TO_DEVICE );dma_unmap_single (i2c->dev, rpaddr, (msgs +1 )->len,DMA_FROM_DEVICE ); + +i2c_put_dma_safe_msg_buf (dma_wr_buf, msgs, true); +i2c_put_dma_safe_msg_buf (dma_rd_buf, (msgs +1 ), true); }if (ret ==0 ) {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 106/205 ARM: dts: omap3-gta04: give spi_lcd node a label so that we can overwrite in other DTS files
In reply to Sasha LevinFrom: "H. Nikolaus Schaller" <[email protected]>
[ Upstream commit fa0d7dc355c890725b6178dab0cc11b194203afa ]
needed for device variants based on GTA04 board but with different display panel (driver).
--- arch/arm/boot/dts/omap3-gta04.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/omap3-gta04.dtsi +1 -1
@@ -78,7 +78,7 @@ #sound-dai-cells = <0>; }; - spi_lcd { + spi_lcd: spi_lcd { compatible = "spi-gpio"; #address-cells = <0x1>; #size-cells = <0x0>;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 107/205 ARM: dts: omap3-gta04: fixes for tvout / venc
In reply to Sasha LevinFrom: "H. Nikolaus Schaller" <[email protected]>
[ Upstream commit f6591391373dbff2c0200e1055d4ff86191578d2 ]
* fix connector compatibility (composite)
* add comment for gpio1 23
* add proper #address-cells
* we use only one venc_out channel for composite
--- arch/arm/boot/dts/omap3-gta04.dtsi | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
arch/arm/boot/dts/omap3-gta04.dtsi +7 -3
@@ -131,7 +131,7 @@ }; tv0: connector { - compatible = "svideo-connector"; + compatible = "composite-video-connector"; label = "tv"; port {
@@ -143,7 +143,7 @@ tv_amp: opa362 { compatible = "ti,opa362"; - enable-gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>; + enable-gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>; /* GPIO_23 to enable video out amplifier */ ports { #address-cells = <1>;
@@ -551,10 +551,14 @@ vdda-supply = <&vdac>; + #address-cells = <1>; + #size-cells = <0>; + port { + reg = <0>; venc_out: endpoint { remote-endpoint = <&opa_in>; - ti,channels = <2>; + ti,channels = <1>; ti,invert-polarity; }; };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 108/205 ARM: dts: omap3-gta04: tvout: enable as display1 alias
In reply to Sasha LevinFrom: "H. Nikolaus Schaller" <[email protected]>
[ Upstream commit 8905592b6e50cec905e6c6035bbd36201a3bfac1 ]
The omap dss susbystem takes the display aliases to find out which displays exist. To enable tv-out we must define an alias.
--- arch/arm/boot/dts/omap3-gta04.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm/boot/dts/omap3-gta04.dtsi +1 -0
@@ -28,6 +28,7 @@ aliases { display0 = &lcd; + display1 = &tv0; }; /* fixed 26MHz oscillator */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 109/205 ARM: dts: omap3-gta04: fix touchscreen tsc2007
In reply to Sasha LevinFrom: "H. Nikolaus Schaller" <[email protected]>
[ Upstream commit 7384a24248eda140a234d356b6c840701ee9f055 ]
we fix penirq polarity, add penirq pinmux and touchscreen properties.
--- arch/arm/boot/dts/omap3-gta04.dtsi | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)
arch/arm/boot/dts/omap3-gta04.dtsi +17 -1
@@ -283,6 +283,13 @@ OMAP3_CORE1_IOPAD(0x2134, PIN_INPUT_PULLUP | MUX_MODE4) /* gpio112 */ >; }; + + penirq_pins: pinmux_penirq_pins { + pinctrl-single,pins = < + /* here we could enable to wakeup the cpu from suspend by a pen touch */ + OMAP3_CORE1_IOPAD(0x2194, PIN_INPUT_PULLUP | MUX_MODE4) /* gpio160 */ + >; + }; }; &omap3_pmx_core2 {
@@ -423,10 +430,19 @@ tsc2007@48 { compatible = "ti,tsc2007"; reg = <0x48>; + pinctrl-names = "default"; + pinctrl-0 = <&penirq_pins>; interrupt-parent = <&gpio6>; interrupts = <0 IRQ_TYPE_EDGE_FALLING>; /* GPIO_160 */ - gpios = <&gpio6 0 GPIO_ACTIVE_LOW>; + gpios = <&gpio6 0 GPIO_ACTIVE_LOW>; /* GPIO_160 */ ti,x-plate-ohms = <600>; + touchscreen-size-x = <480>; + touchscreen-size-y = <640>; + touchscreen-max-pressure = <1000>; + touchscreen-fuzz-x = <3>; + touchscreen-fuzz-y = <8>; + touchscreen-fuzz-pressure = <10>; + touchscreen-inverted-y; }; /* RFID EEPROM */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 110/205 ARM: dts: omap3-gta04: make NAND partitions compatible with recent U-Boot
In reply to Sasha LevinFrom: "H. Nikolaus Schaller" <[email protected]>
[ Upstream commit fa99c21ecb3cd4021a60d0e8bf880e78b5bd0729 ]
Vendor defined U-Boot has changed the partition scheme a while ago:
* kernel partition 6MB
* file system partition uses the remainder up to end of the NAND
* increased size of the environment partition (to get an OneNAND compatible base address)
* shrink the U-Boot partition
Let's be compatible (e.g. Debian kernel built from upstream).
--- arch/arm/boot/dts/omap3-gta04.dtsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
arch/arm/boot/dts/omap3-gta04.dtsi +6 -6
@@ -619,22 +619,22 @@ bootloaders@80000 { label = "U-Boot"; - reg = <0x80000 0x1e0000>; + reg = <0x80000 0x1c0000>; }; - bootloaders_env@260000 { + bootloaders_env@240000 { label = "U-Boot Env"; - reg = <0x260000 0x20000>; + reg = <0x240000 0x40000>; }; kernel@280000 { label = "Kernel"; - reg = <0x280000 0x400000>; + reg = <0x280000 0x600000>; }; - filesystem@680000 { + filesystem@880000 { label = "File System"; - reg = <0x680000 0xf980000>; + reg = <0x880000 0>; /* 0 = MTDPART_SIZ_FULL */ }; }; };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 111/205 ARM: dts: omap3-gta04: keep vpll2 always on
In reply to Sasha LevinFrom: "H. Nikolaus Schaller" <[email protected]>
[ Upstream commit 1ae00833e30c9b4af5cbfda65d75b1de12f74013 ]
This is needed to make the display and venc work properly. Compare to omap3-beagle.dts.
--- arch/arm/boot/dts/omap3-gta04.dtsi | 6 ++++++ 1 file changed, 6 insertions(+)
arch/arm/boot/dts/omap3-gta04.dtsi +6 -0
@@ -548,6 +548,12 @@ regulator-max-microvolt = <3150000>; }; +/* Needed to power the DPI pins */ + +&vpll2 { + regulator-always-on; +}; + &dss { pinctrl-names = "default"; pinctrl-0 = < &dss_dpi_pins >;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 117/205 arm64: dts: rockchip: Fix VCC5V0_HOST_EN on rk3399-sapphire
In reply to Sasha LevinFrom: Vicente Bergas <[email protected]>
[ Upstream commit bcdb578a5f5b4aea79441606ab7f0a2e076b4474 ]
The pin is GPIO4-D1 not GPIO1-D1, see schematic, page 15 for reference.
--- arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi +1 -1
@@ -116,7 +116,7 @@ vcc5v0_host: vcc5v0-host-regulator { compatible = "regulator-fixed"; enable-active-high; - gpio = <&gpio1 RK_PD1 GPIO_ACTIVE_HIGH>; + gpio = <&gpio4 RK_PD1 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&vcc5v0_host_en>; regulator-name = "vcc5v0_host";
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 124/205 gpio: of: Handle SPI chipselect legacy bindings
In reply to Sasha LevinFrom: Linus Walleij <[email protected]>
[ Upstream commit 6953c57ab1721ce57914fc5741d0ce0568756bb0 ]
The SPI chipselects are assumed to be active low in the current binding, so when we want to use GPIO descriptors and handle the active low/high semantics in gpiolib, we need a special parsing quirk to deal with this.
We check for the property "spi-cs-high" and if that is NOT present we assume the CS line is active low.
If the line is tagged as active low in the device tree and has no "spi-cs-high" property all is fine, the device tree and the SPI bindings are in agreement.
If the line is tagged as active high in the device tree with the second cell flag and has no "spi-cs-high" property we enforce active low semantics (as this is the exception we can just tag on the flag).
If the line is tagged as active low with the second cell flag AND tagged with "spi-cs-high" the SPI active high property takes precedence and we print a warning.
--- drivers/gpio/gpiolib-of.c | 50 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 48 insertions(+), 2 deletions(-)
drivers/gpio/gpiolib-of.c +48 -2
@@ -58,7 +58,8 @@ static struct gpio_desc *of_xlate_and_get_gpiod_flags(struct gpio_chip *chip, }static void of_gpio_flags_quirks (struct device_node *np, -enum of_gpio_flags *flags) +enum of_gpio_flags *flags, +int index) {/* * Some GPIO fixed regulator quirks.
@@ -92,6 +93,51 @@ static void of_gpio_flags_quirks(struct device_node *np,pr_info ("%s uses legacy open drain flag - update the DTS if you can\n" ,of_node_full_name (np)); } + +/* +* Legacy handling of SPI active high chip select. If we have a +* property named "cs-gpios" we need to inspect the child node +* to determine if the flags should have inverted semantics. +*/ +if (IS_ENABLED (CONFIG_SPI_MASTER ) && +of_property_read_bool (np,"cs-gpios" )) { +struct device_node *child; +u32 cs; +int ret; + +for_each_child_of_node (np, child) { + ret =of_property_read_u32 (child,"reg" , &cs); +if (!ret) +continue ; +if (cs == index) { +/* +* SPI children have active low chip selects +* by default. This can be specified negatively +* by just omitting "spi-cs-high" in the +* device node, or actively by tagging on +* GPIO_ACTIVE_LOW as flag in the device +* tree. If the line is simultaneously +* tagged as active low in the device tree +* and has the "spi-cs-high" set, we get a +* conflict and the "spi-cs-high" flag will +* take precedence. +*/ +if (of_property_read_bool (np,"spi-cs-high" )) { +if (*flags &OF_GPIO_ACTIVE_LOW ) { +pr_warn ("%s GPIO handle specifies active low - ignored\n" , +of_node_full_name (np)); + *flags &= ~OF_GPIO_ACTIVE_LOW ; + } + }else { +if (!(*flags &OF_GPIO_ACTIVE_LOW )) +pr_info ("%s enforce active low on chipselect handle\n" , +of_node_full_name (np)); + *flags |=OF_GPIO_ACTIVE_LOW ; + } +break ; + } + } + } }/**
@@ -132,7 +178,7 @@ struct gpio_desc *of_get_named_gpiod_flags(struct device_node *np, goto out;if (flags) -of_gpio_flags_quirks (np, flags); +of_gpio_flags_quirks (np, flags, index); pr_debug("%s: parsed '%s' property of node '%pOF[%d]' - status (%d)\n", __func__, propname, np, index,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 181/205 ARM: dts: aspeed: Fix I2C bus warnings
In reply to Sasha LevinFrom: Rob Herring <[email protected]>
[ Upstream commit 1426d40e11f730e0c0fd3700a7048082f87b0e6e ]
dtc has new checks for I2C buses. The ASpeed dts files have a node named 'i2c' which causes a false positive warning. As the node is a 'simple-bus', correct the node name to be 'bus' to fix the warnings.
arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dtb: Warning (i2c_bus_bridge): /ahb/apb/i2c at 1e78a000: incorrect #size-cells for I2C bus arch/arm/boot/dts/aspeed-bmc-opp-romulus.dtb: Warning (i2c_bus_bridge): /ahb/apb/i2c at 1e78a000: incorrect #size-cells for I2C bus arch/arm/boot/dts/aspeed-ast2500-evb.dtb: Warning (i2c_bus_bridge): /ahb/apb/i2c at 1e78a000: incorrect #size-cells for I2C bus arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dtb: Warning (i2c_bus_bridge): /ahb/apb/i2c at 1e78a000: incorrect #size-cells for I2C bus arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dtb: Warning (i2c_bus_bridge): /ahb/apb/i2c at 1e78a000: incorrect #size-cells for I2C bus arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dtb: Warning (i2c_bus_bridge): /ahb/apb/i2c at 1e78a000: incorrect #size-cells for I2C bus arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dtb: Warning (i2c_bus_bridge): /ahb/apb/i2c at 1e78a000: incorrect #size-cells for I2C bus arch/arm/boot/dts/aspeed-bmc-opp-zaius.dtb: Warning (i2c_bus_bridge): /ahb/apb/i2c at 1e78a000: incorrect #size-cells for I2C bus arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dtb: Warning (i2c_bus_bridge): /ahb/apb/i2c at 1e78a000: incorrect #size-cells for I2C bus arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dtb: Warning (i2c_bus_bridge): /ahb/apb/i2c at 1e78a000: incorrect #size-cells for I2C bus
--- arch/arm/boot/dts/aspeed-g4.dtsi | 2 +- arch/arm/boot/dts/aspeed-g5.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/aspeed-g4.dtsi +1 -1
@@ -350,7 +350,7 @@ status = "disabled"; }; - i2c: i2c at 1e78a000 { + i2c: bus at 1e78a000 { compatible = "simple-bus"; #address-cells = <1>; #size-cells = <1>;
arch/arm/boot/dts/aspeed-g5.dtsi +1 -1
@@ -410,7 +410,7 @@ status = "disabled"; }; - i2c: i2c at 1e78a000 { + i2c: bus at 1e78a000 { compatible = "simple-bus"; #address-cells = <1>; #size-cells = <1>;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 200/205 ARM: dts: rockchip: Fix erroneous SPI bus dtc warnings on rk3036
In reply to Sasha LevinFrom: Rob Herring <[email protected]>
[ Upstream commit 131c3eb428ccd5f0c784b9edb4f72ec296a045d2 ]
dtc has new checks for SPI buses. The rk3036 dts file has a node named spi' which causes false positive warnings. As the node is a pinctrl child node, change the node name to be 'spi-pins' to fix the warnings.
arch/arm/boot/dts/rk3036-evb.dtb: Warning (spi_bus_bridge): /pinctrl/spi: incorrect #address-cells for SPI bus arch/arm/boot/dts/rk3036-kylin.dtb: Warning (spi_bus_bridge): /pinctrl/spi: incorrect #address-cells for SPI bus arch/arm/boot/dts/rk3036-evb.dtb: Warning (spi_bus_bridge): /pinctrl/spi: incorrect #size-cells for SPI bus arch/arm/boot/dts/rk3036-kylin.dtb: Warning (spi_bus_bridge): /pinctrl/spi: incorrect #size-cells for SPI bus
--- arch/arm/boot/dts/rk3036.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/rk3036.dtsi +1 -1
@@ -733,7 +733,7 @@ /* no rts / cts for uart2 */ }; - spi { + spi-pins { spi_txd:spi-txd { rockchip,pins = <1 29 RK_FUNC_3 &pcfg_pull_default>; };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 201/205 arm64: dts: rockchip: Fix I2C bus unit-address error on rk3399-puma-haikou
In reply to Sasha LevinFrom: Rob Herring <[email protected]>
[ Upstream commit 501500e65fa96f899230d66153fefd780f08dd34 ]
dtc has new checks for I2C buses. Fix the warnings in unit-addresses.
arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dtb: Warning (i2c_bus_reg): /i2c@ff3d0000/codec@0a: I2C bus unit address format error, expected "a"
--- arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts +1 -1
@@ -131,7 +131,7 @@ status = "okay"; clock-frequency = <400000>; - sgtl5000: codec@0a { + sgtl5000: codec@a { compatible = "fsl,sgtl5000"; reg = <0x0a>; clocks = <&sgtl5000_clk>;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 204/205 s390/qeth: limit csum offload erratum to L3 devices
In reply to Sasha LevinFrom: Julian Wiedmann <[email protected]>
[ Upstream commit f231dc9dbd789b0f98a15941e3cebedb4ad72ad5 ]
Combined L3+L4 csum offload is only required for some L3 HW. So for L2 devices, don't offload the IP header csum calculation.
Reference-ID: JUP 394553
--- drivers/s390/net/qeth_core.h | 5 ----- drivers/s390/net/qeth_l3_main.c | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/s390/net/qeth_core.h +0 -5
@@ -902,11 +902,6 @@ static inline void qeth_tx_csum(struct sk_buff *skb, u8 *flags, int ipv)if ((ipv ==4 &&ip_hdr (skb)->protocol ==IPPROTO_UDP ) || (ipv ==6 &&ipv6_hdr (skb)->nexthdr ==IPPROTO_UDP )) *flags |=QETH_HDR_EXT_UDP ; -if (ipv ==4 ) { -/* some HW requires combined L3+L4 csum offload: */ - *flags |=QETH_HDR_EXT_CSUM_HDR_REQ ; -ip_hdr (skb)->check =0 ; - } } static inline void qeth_put_buffer_pool_entry(struct qeth_card *card,
drivers/s390/net/qeth_l3_main.c +5 -0
@@ -2054,6 +2054,11 @@ static void qeth_l3_fill_header(struct qeth_card *card, struct qeth_hdr *hdr,if (!skb_is_gso (skb) && skb->ip_summed ==CHECKSUM_PARTIAL ) {qeth_tx_csum (skb, &hdr->hdr.l3.ext_flags, ipv); +/* some HW requires combined L3+L4 csum offload: */ +if (ipv ==4 ) { + hdr->hdr.l3.ext_flags |=QETH_HDR_EXT_CSUM_HDR_REQ ; +ip_hdr (skb)->check =0 ; + }if (card->options.performance_stats) card->perf_stats.tx_csum++; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 1/205 iio: adc: max9611: explicitly cast gain_selectors
From: Stefan Agner <[email protected]>
[ Upstream commit b1ec0802503820ccbc894aadfd2a44da20232f5e ]
After finding a reasonable gain, the function converts the configured gain to a gain configuration option selector enum max9611_csa_gain. Make the conversion clearly visible by using an explicit cast. This also avoids a warning seen with clang:
drivers/iio/adc/max9611.c:292:16: warning: implicit conversion from
enumeration type 'enum max9611_conf_ids' to different enumeration type 'enum max9611_csa_gain' [-Wenum-conversion]
*csa_gain = gain_selectors[i];
~ ^~~~~~~~~~~~~~~~~
--- drivers/iio/adc/max9611.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/adc/max9611.c +1 -1
@@ -289,7 +289,7 @@ static int max9611_read_csa_voltage(struct max9611_dev *max9611,return ret;if (*adc_raw >0 ) { - *csa_gain = gain_selectors[i]; + *csa_gain = (enum max9611_csa_gain )gain_selectors[i];return 0 ; } }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 2/205 tee: optee: take DT status property into account
From: Ard Biesheuvel <[email protected]>
[ Upstream commit db878f76b9ff7487da9bb0f686153f81829f1230 ]
DT nodes may have a 'status' property which, if set to anything other than 'ok' or 'okay', indicates to the OS that the DT node should be treated as if it was not present. So add that missing logic to the OP-TEE driver.
--- drivers/tee/optee/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tee/optee/core.c +1 -1
@@ -696,7 +696,7 @@ static int __init optee_driver_init(void)return -ENODEV ; np =of_find_matching_node (fw_np, optee_match); -if (!np) +if (!np || !of_device_is_available (np))return -ENODEV ; optee =optee_probe (np);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 3/205 ath10k: fix kernel panic by moving pci flush after napi_disable
In reply to Sasha LevinFrom: Tamizh chelvam <[email protected]>
[ Upstream commit bd1d395070cca4f42a93e520b0597274789274a4 ]
When continuously running wifi up/down sequence, the napi poll can be scheduled after the CE buffers being freed by ath10k_pci_flush
Steps:
In a certain condition, during wifi down below scenario might occur.
ath10k_stop->ath10k_hif_stop->napi_schedule->ath10k_pci_flush->napi_poll(napi_synchronize).
In the above scenario, CE buffer entries will be freed up and become NULL in ath10k_pci_flush. And the napi_poll has been invoked after the flush process and it will try to get the skb from the CE buffer entry and perform some action on that. Since the CE buffer already cleaned by pci flush this action will create NULL pointer dereference and trigger below kernel panic.
Unable to handle kernel NULL pointer dereference at virtual address 0000005c PC is at ath10k_pci_htt_rx_cb+0x64/0x3ec [ath10k_pci]
ath10k_pci_htt_rx_cb [ath10k_pci] ath10k_ce_per_engine_service+0x74/0xc4 [ath10k_pci] ath10k_ce_per_engine_service [ath10k_pci] ath10k_ce_per_engine_service_any+0x74/0x80 [ath10k_pci] ath10k_ce_per_engine_service_any [ath10k_pci] ath10k_pci_napi_poll+0x48/0xec [ath10k_pci] ath10k_pci_napi_poll [ath10k_pci] net_rx_action+0xac/0x160net_rx_action__do_softirq+0xdc/0x208__do_softirqirq_exit+0x84/0xe0irq_exit__handle_domain_irq+0x80/0xa0 __handle_domain_irqgic_handle_irq+0x38/0x5cgic_handle_irq__irq_usr+0x44/0x60
Tested on QCA4019 and firmware version 10.4.3.2.1.1-00010
--- drivers/net/wireless/ath/ath10k/ahb.c | 4 ++-- drivers/net/wireless/ath/ath10k/pci.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath10k/ahb.c +2 -2
@@ -655,10 +655,10 @@ static void ath10k_ahb_hif_stop(struct ath10k *ar)ath10k_ahb_irq_disable (ar);synchronize_irq (ar_ahb->irq); -ath10k_pci_flush (ar); -napi_synchronize (&ar->napi);napi_disable (&ar->napi); + +ath10k_pci_flush (ar); }static int ath10k_ahb_hif_power_up (struct ath10k *ar)
drivers/net/wireless/ath/ath10k/pci.c +1 -1
@@ -2068,9 +2068,9 @@ static void ath10k_pci_hif_stop(struct ath10k *ar)ath10k_pci_irq_disable (ar);ath10k_pci_irq_sync (ar); -ath10k_pci_flush (ar);napi_synchronize (&ar->napi);napi_disable (&ar->napi); +ath10k_pci_flush (ar);spin_lock_irqsave (&ar_pci->ps_lock, flags);WARN_ON (ar_pci->ps_wake_refcount >0 );
Signature · 7 lines
2.20.1 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Sasha Levin
maintainerPATCH 4/205 iio: dac: mcp4922: fix error handling in mcp4922_write_raw
In reply to Sasha LevinFrom: Marcus Folkesson <[email protected]>
[ Upstream commit 0833627fc3f757a0dca11e2a9c46c96335a900ee ]
Do not try to write negative values and make sure that the write goes well.
--- drivers/iio/dac/mcp4922.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/iio/dac/mcp4922.c +8 -3
@@ -94,17 +94,22 @@ static int mcp4922_write_raw(struct iio_dev *indio_dev, long mask) {struct mcp4922_state *state =iio_priv (indio_dev); +int ret;if (val2 !=0 )return -EINVAL ;switch (mask) {case IIO_CHAN_INFO_RAW : -if (val >GENMASK (chan->scan_type.realbits-1 ,0 )) +if (val <0 || val >GENMASK (chan->scan_type.realbits -1 ,0 ))return -EINVAL ; val <<= chan->scan_type.shift; - state->value[chan->channel] = val; -return mcp4922_spi_write (state, chan->channel, val); + + ret =mcp4922_spi_write (state, chan->channel, val); +if (!ret) + state->value[chan->channel] = val; +return ret; +default :return -EINVAL ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 7/205 soundwire: intel: Fix uninitialized adev deref
In reply to Sasha LevinFrom: Vinod Koul <[email protected]>
[ Upstream commit e1c815f4b24a305e5bc9eceb541674bf4d02b709 ]
In case of error, we can dereference uninitialized 'adev'
drivers/soundwire/intel_init.c:154 sdw_intel_acpi_cb()
error: uninitialized symbol 'adev'.
Fix that by not using adev for warn print and make it pr_err.
--- drivers/soundwire/intel_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soundwire/intel_init.c +1 -1
@@ -151,7 +151,7 @@ static acpi_status sdw_intel_acpi_cb(acpi_handle handle, u32 level,struct acpi_device *adev;if (acpi_bus_get_device (handle, &adev)) { -dev_err (&adev->dev,"Couldn't find ACPI handle\n" ); +pr_err ("%s: Couldn't find ACPI handle\n" , __func__);return AE_NOT_FOUND ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 8/205 arm64: dts: allwinner: a64: Orange Pi Win: Fix SD card node
In reply to Sasha LevinFrom: Samuel Holland <[email protected]>
[ Upstream commit 09b964afca14d0594b2b2f265df3d987e2f43867 ]
The Orange Pi Win has a microSD card slot which is connected via all four SD data lines. As the DT was not mentioning this fact, we got the default single bit transfers, losing out on performance. Also, as microSD does not have a write protect switch, we disable this feature in the DT node.
--- arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts +3 -1
@@ -67,7 +67,9 @@ pinctrl-names = "default"; pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_dcdc1>; - cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; + cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */ + disable-wp; + bus-width = <4>; status = "okay"; };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 11/205 ALSA: pcm: signedness bug in snd_pcm_plug_alloc()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit 6f128fa41f310e1f39ebcea9621d2905549ecf52 ]
The "frames" variable is unsigned so the error handling doesn't work properly.
--- sound/core/oss/pcm_plugin.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/core/oss/pcm_plugin.c +2 -2
@@ -111,7 +111,7 @@ int snd_pcm_plug_alloc(struct snd_pcm_substream *plug, snd_pcm_uframes_t frames)while (plugin->next) {if (plugin->dst_frames) frames = plugin->dst_frames (plugin, frames); -if (snd_BUG_ON (frames <=0 )) +if (snd_BUG_ON ((snd_pcm_sframes_t )frames <=0 ))return -ENXIO ; plugin = plugin->next; err =snd_pcm_plugin_alloc (plugin, frames);
@@ -123,7 +123,7 @@ int snd_pcm_plug_alloc(struct snd_pcm_substream *plug, snd_pcm_uframes_t frames)while (plugin->prev) {if (plugin->src_frames) frames = plugin->src_frames (plugin, frames); -if (snd_BUG_ON (frames <=0 )) +if (snd_BUG_ON ((snd_pcm_sframes_t )frames <=0 ))return -ENXIO ; plugin = plugin->prev; err =snd_pcm_plugin_alloc (plugin, frames);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 16/205 ARM: dts: at91/trivial: Fix USART1 definition for at91sam9g45
In reply to Sasha LevinFrom: Jay Foster <[email protected]>
[ Upstream commit 10af10db8c76fa5b9bf1f52a895c1cb2c0ac24da ]
Fix a typo. No functional change made by this patch.
--- arch/arm/boot/dts/at91sam9g45.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/at91sam9g45.dtsi +1 -1
@@ -570,7 +570,7 @@ }; }; - uart1 { + usart1 { pinctrl_usart1: usart1-0 { atmel,pins = <AT91_PIOB 4 AT91_PERIPH_A AT91_PINCTRL_NONE
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 20/205 extcon: cht-wc: Return from default case to avoid warnings
In reply to Sasha LevinFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 962341b54b99965ebec5f70c8d39f1c382eea833 ]
When we have first case to fall through it's not enough to put single comment there to satisfy compiler. Instead of doing that, return fall back value directly from default case.
This to avoid following warnings:
drivers/extcon/extcon-intel-cht-wc.c: In function ‘cht_wc_extcon_get_charger’:include/linux/device.h:1420:2: warning: this statement may fall through [-Wimplicit-fallthrough=]
_dev_warn(dev, dev_fmt(fmt), ##__VA_ARGS__) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~drivers/extcon/extcon-intel-cht-wc.c:148:3: note: in expansion of macro ‘dev_warn’
dev_warn(ext->dev,
^~~~~~~~drivers/extcon/extcon-intel-cht-wc.c:152:2: note: here
case CHT_WC_USBSRC_TYPE_SDP:
^~~~
--- drivers/extcon/extcon-intel-cht-wc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/extcon/extcon-intel-cht-wc.c +1 -1
@@ -156,7 +156,7 @@ static int cht_wc_extcon_get_charger(struct cht_wc_extcon_data *ext,dev_warn (ext->dev,"Unhandled charger type %d, defaulting to SDP\n" , ret); -/* Fall through, treat as SDP */ +return EXTCON_CHG_USB_SDP ;case CHT_WC_USBSRC_TYPE_SDP :case CHT_WC_USBSRC_TYPE_FLOAT_DP_DN :case CHT_WC_USBSRC_TYPE_OTHER :
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 23/205 ath10k: skip resetting rx filter for WCN3990
In reply to Sasha LevinFrom: Rakesh Pillai <[email protected]>
[ Upstream commit 58da3b42307061b71f2dcce2bd1185d578a3aa53 ]
WCN3990 has the MAC_PCU_ADDR1 configured properly and hence it will not send spurious ack frames during boot up.
Hence the reset_rx_filter workaround is not needed for WCN3990. Add a hw_param to indicate if hardware rx filter reset is needed and skip the reset_rx_filter for WCN3990.
Tested HW: WCN3990
Tested FW: WLAN.HL.2.0-01188-QCAHLSWMTPLZ-1
--- drivers/net/wireless/ath/ath10k/core.c | 17 ++++++++++++++++- drivers/net/wireless/ath/ath10k/hw.h | 5 +++++ 2 files changed, 21 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath10k/core.c +16 -1
@@ -91,6 +91,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .rx_ring_fill_level = HTT_RX_RING_FILL_LEVEL, .shadow_reg_support = false, .rri_on_ddr = false, + .hw_filter_reset_required = true, }, { .id = QCA988X_HW_2_0_VERSION,
@@ -124,6 +125,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .per_ce_irq = false, .shadow_reg_support = false, .rri_on_ddr = false, + .hw_filter_reset_required = true, }, { .id = QCA9887_HW_1_0_VERSION,
@@ -157,6 +159,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .per_ce_irq = false, .shadow_reg_support = false, .rri_on_ddr = false, + .hw_filter_reset_required = true, }, { .id = QCA6174_HW_2_1_VERSION,
@@ -189,6 +192,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .per_ce_irq = false, .shadow_reg_support = false, .rri_on_ddr = false, + .hw_filter_reset_required = true, }, { .id = QCA6174_HW_2_1_VERSION,
@@ -221,6 +225,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .per_ce_irq = false, .shadow_reg_support = false, .rri_on_ddr = false, + .hw_filter_reset_required = true, }, { .id = QCA6174_HW_3_0_VERSION,
@@ -253,6 +258,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .per_ce_irq = false, .shadow_reg_support = false, .rri_on_ddr = false, + .hw_filter_reset_required = true, }, { .id = QCA6174_HW_3_2_VERSION,
@@ -288,6 +294,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .per_ce_irq = false, .shadow_reg_support = false, .rri_on_ddr = false, + .hw_filter_reset_required = true, }, { .id = QCA99X0_HW_2_0_DEV_VERSION,
@@ -326,6 +333,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .per_ce_irq = false, .shadow_reg_support = false, .rri_on_ddr = false, + .hw_filter_reset_required = true, }, { .id = QCA9984_HW_1_0_DEV_VERSION,
@@ -369,6 +377,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .per_ce_irq = false, .shadow_reg_support = false, .rri_on_ddr = false, + .hw_filter_reset_required = true, }, { .id = QCA9888_HW_2_0_DEV_VERSION,
@@ -411,6 +420,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .per_ce_irq = false, .shadow_reg_support = false, .rri_on_ddr = false, + .hw_filter_reset_required = true, }, { .id = QCA9377_HW_1_0_DEV_VERSION,
@@ -443,6 +453,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .per_ce_irq = false, .shadow_reg_support = false, .rri_on_ddr = false, + .hw_filter_reset_required = true, }, { .id = QCA9377_HW_1_1_DEV_VERSION,
@@ -477,6 +488,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .per_ce_irq = false, .shadow_reg_support = false, .rri_on_ddr = false, + .hw_filter_reset_required = true, }, { .id = QCA4019_HW_1_0_DEV_VERSION,
@@ -516,6 +528,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .per_ce_irq = false, .shadow_reg_support = false, .rri_on_ddr = false, + .hw_filter_reset_required = true, }, { .id = WCN3990_HW_1_0_DEV_VERSION,
@@ -540,6 +553,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .per_ce_irq = true, .shadow_reg_support = true, .rri_on_ddr = true, + .hw_filter_reset_required = false, }, };
@@ -2406,7 +2420,8 @@ int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode,* possible to implicitly make it correct by creating a dummy vdev and * then deleting it. */ -if (mode ==ATH10K_FIRMWARE_MODE_NORMAL ) { +if (ar->hw_params.hw_filter_reset_required && + mode ==ATH10K_FIRMWARE_MODE_NORMAL ) { status =ath10k_core_reset_rx_filter (ar);if (status) { ath10k_err(ar,
drivers/net/wireless/ath/ath10k/hw.h +5 -0
@@ -589,6 +589,11 @@ struct ath10k_hw_params {/* Number of bytes to be the offset for each FFT sample */ int spectral_bin_offset; + +/* targets which require hw filter reset during boot up, +* to avoid it sending spurious acks. +*/ +bool hw_filter_reset_required; };struct htt_rx_desc ;
Signature · 7 lines
2.20.1 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Sasha Levin
maintainerPATCH 21/205 cfg80211: Avoid regulatory restore when COUNTRY_IE_IGNORE is set
In reply to Sasha LevinFrom: Rajeev Kumar Sirasanagandla <[email protected]>
[ Upstream commit 7417844b63d4b0dc8ab23f88259bf95de7d09b57 ]
When REGULATORY_COUNTRY_IE_IGNORE is set, __reg_process_hint_country_ie() ignores the country code change request from __cfg80211_connect_result() via regulatory_hint_country_ie().
After Disconnect, similar to above, country code should not be reset to world when country IE ignore is set. But this is violated and restore of regulatory settings is invoked by cfg80211_disconnect_work via regulatory_hint_disconnect().
To address this, avoid regulatory restore from regulatory_hint_disconnect() when COUNTRY_IE_IGNORE is set.
Note: Currently, restore_regulatory_settings() takes care of clearing beacon hints. But in the proposed change, regulatory restore is avoided. Therefore, explicitly clear beacon hints when DISABLE_BEACON_HINTS is not set.
--- net/wireless/reg.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+)
net/wireless/reg.c +46 -0
@@ -3225,8 +3225,54 @@ static void restore_regulatory_settings(bool reset_user)schedule_work (®_work); } +static bool is_wiphy_all_set_reg_flag (enum ieee80211_regulatory_flags flag) +{ +struct cfg80211_registered_device *rdev; +struct wireless_dev *wdev; + +list_for_each_entry (rdev, &cfg80211_rdev_list, list) { +list_for_each_entry (wdev, &rdev->wiphy.wdev_list, list) { +wdev_lock (wdev); +if (!(wdev->wiphy->regulatory_flags & flag)) { +wdev_unlock (wdev); +return false; + } +wdev_unlock (wdev); + } + } + +return true; +} +void regulatory_hint_disconnect (void ) { +/* Restore of regulatory settings is not required when wiphy(s) +* ignore IE from connected access point but clearance of beacon hints +* is required when wiphy(s) supports beacon hints. +*/ +if (is_wiphy_all_set_reg_flag (REGULATORY_COUNTRY_IE_IGNORE )) { +struct reg_beacon *reg_beacon, *btmp; + +if (is_wiphy_all_set_reg_flag (REGULATORY_DISABLE_BEACON_HINTS )) +return ; + +spin_lock_bh (®_pending_beacons_lock); +list_for_each_entry_safe (reg_beacon, btmp, + ®_pending_beacons, list) { +list_del (®_beacon->list); +kfree (reg_beacon); + } +spin_unlock_bh (®_pending_beacons_lock); + +list_for_each_entry_safe (reg_beacon, btmp, + ®_beacon_list, list) { +list_del (®_beacon->list); +kfree (reg_beacon); + } + +return ; + } +pr_debug ("All devices are disconnected, going to restore regulatory settings\n" );restore_regulatory_settings (false); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 25/205 wil6210: drop Rx multicast packets that are looped-back to STA
In reply to Sasha LevinFrom: Dedy Lansky <[email protected]>
[ Upstream commit 9a65064abdf82934e0ed4744125f9f466f421f57 ]
Delivering a looped-back multicast packet to network stack can cause higher layer protocols to fail like for example IPv6 DAD. In STA mode, upon receiving Rx multicast packet, check if the source MAC address is equal to our own MAC address and if so drop the packet.
--- drivers/net/wireless/ath/wil6210/txrx.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/wil6210/txrx.c +8 -1
@@ -766,7 +766,14 @@ void wil_netif_rx_any(struct sk_buff *skb, struct net_device *ndev)return ; } -if (wdev->iftype ==NL80211_IFTYPE_AP && !vif->ap_isolate) { +if (wdev->iftype ==NL80211_IFTYPE_STATION ) { +if (mcast &ðer_addr_equal (eth->h_source, ndev->dev_addr)) { +/* mcast packet looped back to us */ + rc =GRO_DROP ; +dev_kfree_skb (skb); + goto stats; + } + }else if (wdev->iftype ==NL80211_IFTYPE_AP && !vif->ap_isolate) {if (mcast) {/* send multicast frames both to higher layers in * local net stack and back to the wireless medium
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 29/205 ath10k: limit available channels via DT ieee80211-freq-limit
In reply to Sasha LevinFrom: Sven Eckelmann <[email protected]>
[ Upstream commit 34d5629d2ca89d847b7040762b87964c696c14da ]
Tri-band devices (1x 2.4GHz + 2x 5GHz) often incorporate special filters in the RX and TX path. These filtered channel can in theory still be used by the hardware but the signal strength is reduced so much that it makes no sense.
There is already a DT property to limit the available channels but ath10k has to manually call this functionality to limit the currrently set wiphy channels further.
--- drivers/net/wireless/ath/ath10k/mac.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/ath/ath10k/mac.c +2 -0
@@ -18,6 +18,7 @@#include "mac.h" +#include <net/cfg80211.h> #include <net/mac80211.h> #include <linux/etherdevice.h> #include <linux/acpi.h>
@@ -8363,6 +8364,7 @@ int ath10k_mac_register(struct ath10k *ar) ar->hw->wiphy->bands[NL80211_BAND_5GHZ ] = band; } +wiphy_read_of_freq_limits (ar->hw->wiphy);ath10k_mac_setup_ht_vht_cap (ar); ar->hw->wiphy->interface_modes =
Signature · 7 lines
2.20.1 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Sasha Levin
maintainerPATCH 30/205 ice: Update request resource command to latest specification
In reply to Sasha LevinFrom: Dan Nowlin <[email protected]>
[ Upstream commit ff2b13213a6a0baca105bc3bc724225f0adde1f8 ]
Align Request Resource Ownership AQ command (0x0008) to the latest specification. This includes:
- Correcting the resource IDs for the Global Cfg and Change locks.
- new enum ICE_CHANGE_LOCK_RES_ID
- new enum ICE_GLOBAL_CFG_LOCK_RES_ID
- Altering the flow for Global Config Lock to allow only the first PF to download the package.
--- drivers/net/ethernet/intel/ice/ice_common.c | 75 ++++++++++++++++----- drivers/net/ethernet/intel/ice/ice_common.h | 2 +- drivers/net/ethernet/intel/ice/ice_nvm.c | 2 +- drivers/net/ethernet/intel/ice/ice_type.h | 9 ++- 4 files changed, 67 insertions(+), 21 deletions(-)
drivers/net/ethernet/intel/ice/ice_common.c +58 -17
@@ -904,7 +904,22 @@ enum ice_status ice_aq_q_shutdown(struct ice_hw *hw, bool unloading)* @timeout: the maximum time in ms that the driver may hold the resource * @cd: pointer to command details structure or NULL * -* requests common resource using the admin queue commands (0x0008) +* Requests common resource using the admin queue commands (0x0008). +* When attempting to acquire the Global Config Lock, the driver can +* learn of three states: +* 1) ICE_SUCCESS - acquired lock, and can perform download package +* 2) ICE_ERR_AQ_ERROR - did not get lock, driver should fail to load +* 3) ICE_ERR_AQ_NO_WORK - did not get lock, but another driver has +* successfully downloaded the package; the driver does +* not have to download the package and can continue +* loading +* +* Note that if the caller is in an acquire lock, perform action, release lock +* phase of operation, it is possible that the FW may detect a timeout and issue +* a CORER. In this case, the driver will receive a CORER interrupt and will +* have to determine its cause. The calling thread that is handling this flow +* will likely get an error propagated back to it indicating the Download +* Package, Update Package or the Release Resource AQ commands timed out. */ static enum ice_status ice_aq_req_res(struct ice_hw *hw, enum ice_aq_res_ids res,
@@ -922,13 +937,43 @@ ice_aq_req_res(struct ice_hw *hw, enum ice_aq_res_ids res, cmd_resp->res_id =cpu_to_le16 (res); cmd_resp->access_type =cpu_to_le16 (access); cmd_resp->res_number =cpu_to_le32 (sdp_number); + cmd_resp->timeout =cpu_to_le32 (*timeout); + *timeout =0 ; status =ice_aq_send_cmd (hw, &desc,NULL ,0 , cd); +/* The completion specifies the maximum time in ms that the driver * may hold the resource in the Timeout field. -* If the resource is held by someone else, the command completes with -* busy return value and the timeout field indicates the maximum time -* the current owner of the resource has to free it. +*/ + +/* Global config lock response utilizes an additional status field. +* +* If the Global config lock resource is held by some other driver, the +* command completes with ICE_AQ_RES_GLBL_IN_PROG in the status field +* and the timeout field indicates the maximum time the current owner +* of the resource has to free it. +*/ +if (res ==ICE_GLOBAL_CFG_LOCK_RES_ID ) { +if (le16_to_cpu (cmd_resp->status) ==ICE_AQ_RES_GLBL_SUCCESS ) { + *timeout =le32_to_cpu (cmd_resp->timeout); +return 0 ; + }else if (le16_to_cpu (cmd_resp->status) == +ICE_AQ_RES_GLBL_IN_PROG ) { + *timeout =le32_to_cpu (cmd_resp->timeout); +return ICE_ERR_AQ_ERROR ; + }else if (le16_to_cpu (cmd_resp->status) == +ICE_AQ_RES_GLBL_DONE ) { +return ICE_ERR_AQ_NO_WORK ; + } + +/* invalid FW response, force a timeout immediately */ + *timeout =0 ; +return ICE_ERR_AQ_ERROR ; + } + +/* If the resource is held by some other driver, the command completes +* with a busy return value and the timeout field indicates the maximum +* time the current owner of the resource has to free it. */ if (!status || hw->adminq.sq_last_status ==ICE_AQ_RC_EBUSY ) *timeout =le32_to_cpu (cmd_resp->timeout);
@@ -967,30 +1012,28 @@ ice_aq_release_res(struct ice_hw *hw, enum ice_aq_res_ids res, u8 sdp_number,* @hw: pointer to the HW structure * @res: resource id * @access: access type (read or write) +* @timeout: timeout in milliseconds * * This function will attempt to acquire the ownership of a resource. */ enum ice_status ice_acquire_res (struct ice_hw *hw,enum ice_aq_res_ids res, -enum ice_aq_res_access_type access) +enum ice_aq_res_access_type access,u32 timeout) {#define ICE_RES_POLLING_DELAY_MS 10u32 delay =ICE_RES_POLLING_DELAY_MS ; +u32 time_left = timeout;enum ice_status status; -u32 time_left =0 ; -u32 timeout; status =ice_aq_req_res (hw, res, access,0 , &time_left,NULL ); -/* An admin queue return code of ICE_AQ_RC_EEXIST means that another -* driver has previously acquired the resource and performed any -* necessary updates; in this case the caller does not obtain the -* resource and has no further work to do. +/* A return code of ICE_ERR_AQ_NO_WORK means that another driver has +* previously acquired the resource and performed any necessary updates; +* in this case the caller does not obtain the resource and has no +* further work to do. */ -if (hw->adminq.sq_last_status ==ICE_AQ_RC_EEXIST ) { - status =ICE_ERR_AQ_NO_WORK ; +if (status ==ICE_ERR_AQ_NO_WORK ) goto ice_acquire_res_exit; - }if (status) ice_debug(hw, ICE_DBG_RES,
@@ -1003,11 +1046,9 @@ ice_acquire_res(struct ice_hw *hw, enum ice_aq_res_ids res, timeout = (timeout > delay) ? timeout - delay :0 ; status =ice_aq_req_res (hw, res, access,0 , &time_left,NULL ); -if (hw->adminq.sq_last_status ==ICE_AQ_RC_EEXIST ) { +if (status ==ICE_ERR_AQ_NO_WORK )/* lock free, but no work to do */ - status =ICE_ERR_AQ_NO_WORK ;break ; - }if (!status)/* lock acquired */
drivers/net/ethernet/intel/ice/ice_common.h +1 -1
@@ -23,7 +23,7 @@ enum ice_status ice_get_link_status(struct ice_port_info *pi, bool *link_up);enum ice_status ice_acquire_res (struct ice_hw *hw,enum ice_aq_res_ids res, -enum ice_aq_res_access_type access); +enum ice_aq_res_access_type access,u32 timeout);void ice_release_res (struct ice_hw *hw,enum ice_aq_res_ids res);enum ice_status ice_init_nvm (struct ice_hw *hw);enum ice_status
drivers/net/ethernet/intel/ice/ice_nvm.c +1 -1
@@ -137,7 +137,7 @@ ice_acquire_nvm(struct ice_hw *hw, enum ice_aq_res_access_type access)if (hw->nvm.blank_nvm_mode)return 0 ; -return ice_acquire_res (hw,ICE_NVM_RES_ID , access); +return ice_acquire_res (hw,ICE_NVM_RES_ID , access,ICE_NVM_TIMEOUT ); }/**
drivers/net/ethernet/intel/ice/ice_type.h +7 -2
@@ -34,10 +34,15 @@ static inline bool ice_is_tc_ena(u8 bitmap, u8 tc)enum ice_aq_res_ids {ICE_NVM_RES_ID =1 ,ICE_SPD_RES_ID , -ICE_GLOBAL_CFG_LOCK_RES_ID , -ICE_CHANGE_LOCK_RES_ID +ICE_CHANGE_LOCK_RES_ID , +ICE_GLOBAL_CFG_LOCK_RES_ID }; +/* FW update timeout definitions are in milliseconds */ +#define ICE_NVM_TIMEOUT 180000 +#define ICE_CHANGE_LOCK_TIMEOUT 1000 +#define ICE_GLOBAL_CFG_LOCK_TIMEOUT 3000 +enum ice_aq_res_access_type {ICE_RES_READ =1 ,ICE_RES_WRITE
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 28/205 wil6210: fix invalid memory access for rx_buff_mgmt debugfs
In reply to Sasha LevinFrom: Dedy Lansky <[email protected]>
[ Upstream commit 4405b632e3da839defec966e4b0be44d0c5e3102 ]
Check rx_buff_mgmt is allocated before accessing its internal fields.
--- drivers/net/wireless/ath/wil6210/debugfs.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/wireless/ath/wil6210/debugfs.c +3 -0
@@ -1263,6 +1263,9 @@ static int wil_rx_buff_mgmt_debugfs_show(struct seq_file *s, void *data)int num_active;int num_free; +if (!rbm->buff_arr) +return -EINVAL ; +seq_printf (s," size = %zu\n" , rbm->size);seq_printf (s," free_list_empty_cnt = %lu\n" , rbm->free_list_empty_cnt);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 34/205 ASoC: dapm: Don't fail creating new DAPM control on NULL pinctrl
In reply to Sasha LevinFrom: Charles Keepax <[email protected]>
[ Upstream commit a5cd7e9cf587f51a84b86c828b4e1c7b392f448e ]
devm_pinctrl_get will only return NULL in the case that pinctrl is not built into the kernel and all the pinctrl functions used by the DAPM core are appropriately stubbed for that case. There is no need to error out of snd_soc_dapm_new_control_unlocked if pinctrl isn't built into the kernel, so change the IS_ERR_OR_NULL to just an IS_ERR.
--- sound/soc/soc-dapm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/soc-dapm.c +1 -1
@@ -3514,7 +3514,7 @@ snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm,break ;case snd_soc_dapm_pinctrl: w->pinctrl =devm_pinctrl_get (dapm->dev); -if (IS_ERR_OR_NULL (w->pinctrl)) { +if (IS_ERR (w->pinctrl)) { ret =PTR_ERR (w->pinctrl);if (ret == -EPROBE_DEFER )return ERR_PTR (ret);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 37/205 ASoC: AMD: Change MCLK to 48Mhz
In reply to Sasha LevinFrom: Akshu Agrawal <[email protected]>
[ Upstream commit a1b1e9880f0c2754a5ac416a546d9f295f72eabc ]
25Mhz MCLK which was earlier used was of spread type. Thus, we were not getting accurate rate. The 48Mhz system clk is of non-spread type and we are changing to it to get accurate rate.
--- sound/soc/amd/acp-da7219-max98357a.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/amd/acp-da7219-max98357a.c +1 -1
@@ -42,7 +42,7 @@#include "../codecs/da7219.h" #include "../codecs/da7219-aad.h" -#define CZ_PLAT_CLK 25000000 +#define CZ_PLAT_CLK 48000000#define DUAL_CHANNEL 2static struct snd_soc_jack cz_jack;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 31/205 ice: Prevent control queue operations during reset
In reply to Sasha LevinFrom: Anirudh Venkataramanan <[email protected]>
[ Upstream commit fd2a981777d911b2e94cdec50779c85c58a0dec9 ]
Once reset is issued, the driver loses all control queue interfaces. Exercising control queue operations during reset is incorrect and may result in long timeouts.
This patch introduces a new field 'reset_ongoing' in the hw structure. This is set to 1 by the core driver when it receives a reset interrupt. ice_sq_send_cmd checks reset_ongoing before actually issuing the control queue operation. If a reset is in progress, it returns a soft error code (ICE_ERR_RESET_PENDING) to the caller. The caller may or may not have to take any action based on this return. Once the driver knows that the reset is done, it has to set reset_ongoing back to 0. This will allow control queue operations to be posted to the hardware again.
This "bail out" logic was specifically added to ice_sq_send_cmd (which is pretty low level function) so that we have one solution in one place that applies to all types of control queues.
--- drivers/net/ethernet/intel/ice/ice_controlq.c | 3 ++ drivers/net/ethernet/intel/ice/ice_main.c | 34 ++++++++++++++++--- drivers/net/ethernet/intel/ice/ice_status.h | 1 + drivers/net/ethernet/intel/ice/ice_type.h | 1 + 4 files changed, 34 insertions(+), 5 deletions(-)
drivers/net/ethernet/intel/ice/ice_controlq.c +3 -0
@@ -814,6 +814,9 @@ ice_sq_send_cmd(struct ice_hw *hw, struct ice_ctl_q_info *cq,u16 retval =0 ;u32 val =0 ; +/* if reset is in progress return a soft error */ +if (hw->reset_ongoing) +return ICE_ERR_RESET_ONGOING ;mutex_lock (&cq->sq_lock); cq->sq_last_status =ICE_AQ_RC_OK ;
drivers/net/ethernet/intel/ice/ice_main.c +29 -5
@@ -535,10 +535,13 @@ static void ice_reset_subtask(struct ice_pf *pf)ice_prepare_for_reset (pf);/* make sure we are ready to rebuild */ -if (ice_check_reset (&pf->hw)) +if (ice_check_reset (&pf->hw)) {set_bit (__ICE_RESET_FAILED, pf->state); -else + }else { +/* done with reset. start rebuild */ + pf->hw.reset_ongoing = false;ice_rebuild (pf); + }clear_bit (__ICE_RESET_RECOVERY_PENDING, pf->state); goto unlock; }
@@ -1757,7 +1760,8 @@ static irqreturn_t ice_misc_intr(int __always_unused irq, void *data)* We also make note of which reset happened so that peer * devices/drivers can be informed. */ -if (!test_bit (__ICE_RESET_RECOVERY_PENDING, pf->state)) { +if (!test_and_set_bit (__ICE_RESET_RECOVERY_PENDING, + pf->state)) {if (reset ==ICE_RESET_CORER )set_bit (__ICE_CORER_RECV, pf->state);else if (reset ==ICE_RESET_GLOBR )
@@ -1765,7 +1769,20 @@ static irqreturn_t ice_misc_intr(int __always_unused irq, void *data)else set_bit (__ICE_EMPR_RECV, pf->state); -set_bit (__ICE_RESET_RECOVERY_PENDING, pf->state); +/* There are couple of different bits at play here. +* hw->reset_ongoing indicates whether the hardware is +* in reset. This is set to true when a reset interrupt +* is received and set back to false after the driver +* has determined that the hardware is out of reset. +* +* __ICE_RESET_RECOVERY_PENDING in pf->state indicates +* that a post reset rebuild is required before the +* driver is operational again. This is set above. +* +* As this is the start of the reset/rebuild cycle, set +* both to indicate that. +*/ + hw->reset_ongoing = true; } }
@@ -4188,7 +4205,14 @@ static int ice_vsi_stop_tx_rings(struct ice_vsi *vsi) } status =ice_dis_vsi_txq (vsi->port_info, vsi->num_txq, q_ids, q_teids,NULL ); -if (status) { +/* if the disable queue command was exercised during an active reset +* flow, ICE_ERR_RESET_ONGOING is returned. This is not an error as +* the reset operation disables queues at the hardware level anyway. +*/ +if (status ==ICE_ERR_RESET_ONGOING ) { +dev_dbg (&pf->pdev->dev, +"Reset in progress. LAN Tx queues already disabled\n" ); + }else if (status) {dev_err (&pf->pdev->dev,"Failed to disable LAN Tx queues, error: %d\n" , status);
drivers/net/ethernet/intel/ice/ice_status.h +1 -0
@@ -20,6 +20,7 @@ enum ice_status {ICE_ERR_ALREADY_EXISTS =-14 ,ICE_ERR_DOES_NOT_EXIST =-15 ,ICE_ERR_MAX_LIMIT =-17 , +ICE_ERR_RESET_ONGOING =-18 ,ICE_ERR_BUF_TOO_SHORT =-52 ,ICE_ERR_NVM_BLANK_MODE =-53 , ICE_ERR_AQ_ERROR = -100,
drivers/net/ethernet/intel/ice/ice_type.h +1 -0
@@ -293,6 +293,7 @@ struct ice_hw {u8 sw_entry_point_layer;u8 evb_veb;/* true for VEB, false for VEPA */ +u8 reset_ongoing;/* true if hw is in reset, false otherwise */ struct ice_bus_info bus;struct ice_nvm_info nvm;struct ice_hw_dev_caps dev_caps;/* device capabilities */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 36/205 ASoC: meson: axg-fifo: report interrupt request failure
In reply to Sasha LevinFrom: Jerome Brunet <[email protected]>
[ Upstream commit dadfab7272b13ca441efdb9aa9117bc669680b05 ]
Return value of request_irq() was irgnored. Fix this and report the failure if any
--- sound/soc/meson/axg-fifo.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/meson/axg-fifo.c +2 -0
@@ -203,6 +203,8 @@ static int axg_fifo_pcm_open(struct snd_pcm_substream *ss) ret =request_irq (fifo->irq, axg_fifo_pcm_irq_block,0 ,dev_name (dev), ss); +if (ret) +return ret;/* Enable pclk to access registers and clock the fifo ip */ ret =clk_prepare_enable (fifo->pclk);
Signature · 7 lines
2.20.1 _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic
Sasha Levin
maintainerPATCH 38/205 pinctrl: ingenic: Probe driver at subsys_initcall
In reply to Sasha LevinFrom: Paul Cercueil <[email protected]>
[ Upstream commit 556a36a71ed80e17ade49225b58513ea3c9e4558 ]
Using postcore_initcall() makes the driver try to initialize way too early.
--- drivers/pinctrl/pinctrl-ingenic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/pinctrl-ingenic.c +1 -1
@@ -847,4 +847,4 @@ static int __init ingenic_pinctrl_drv_register(void) {return platform_driver_register (&ingenic_pinctrl_driver); } -postcore_initcall (ingenic_pinctrl_drv_register); +subsys_initcall (ingenic_pinctrl_drv_register);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 42/205 ARM: dts: exynos: Fix sound in Snow-rev5 Chromebook
In reply to Sasha LevinFrom: Marek Szyprowski <[email protected]>
[ Upstream commit 64858773d78e820003a94e5a7179d368213655d6 ]
This patch adds missing properties to the CODEC and sound nodes, so the audio will work also on Snow rev5 Chromebook. This patch is an extension to the commit e9eefc3f8ce0 ("ARM: dts: exynos: Add missing clock and DAI properties to the max98095 node in Snow Chromebook")
and commit 6ab569936d60 ("ARM: dts: exynos: Enable HDMI audio on Snow Chromebook"). It has been reported that such changes work fine on the rev5 board too.
--- arch/arm/boot/dts/exynos5250-snow-rev5.dts | 11 +++++++++++ 1 file changed, 11 insertions(+)
arch/arm/boot/dts/exynos5250-snow-rev5.dts +11 -0
@@ -20,6 +20,14 @@ samsung,model = "Snow-I2S-MAX98090"; samsung,audio-codec = <&max98090>; + + cpu { + sound-dai = <&i2s0 0>; + }; + + codec { + sound-dai = <&max98090 0>, <&hdmi>; + }; }; };
@@ -31,6 +39,9 @@ interrupt-parent = <&gpx0>; pinctrl-names = "default"; pinctrl-0 = <&max98090_irq>; + clocks = <&pmu_system_controller 0>; + clock-names = "mclk"; + #sound-dai-cells = <1>; }; };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 44/205 arm64: dts: stratix10: i2c clock running out of spec
In reply to Sasha LevinFrom: Alan Tull <[email protected]>
[ Upstream commit c8da1d15b8a4957f105ad77bb1404d72e304566f ]
DesignWare I2C controller was observed running at 105.93kHz rather than the specified 100kHz. Adjust device tree settings to bring it within spec (a slightly conservative 98 MHz).
--- arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts +2 -0
@@ -124,6 +124,8 @@ &i2c1 { status = "okay"; clock-frequency = <100000>; + i2c-sda-falling-time-ns = <890>; /* hcnt */ + i2c-sdl-falling-time-ns = <890>; /* lcnt */ adc@14 { compatible = "lltc,ltc2497";
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 46/205 i40evf: Validate the number of queues a PF sends
In reply to Sasha LevinFrom: Paul M Stillwell Jr <[email protected]>
[ Upstream commit 3c818910911c93bb5099c6637ec350f90c0e71fc ]
A PF can send any number of queues to the VF and the VF may not be able to support that many. Check to see that the number of queues is less than or equal to the max number of queues the VF can have.
--- .../ethernet/intel/i40evf/i40evf_virtchnl.c | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+)
drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c +32 -0
@@ -153,6 +153,32 @@ int i40evf_send_vf_config_msg(struct i40evf_adapter *adapter) NULL, 0); } +/** +* i40evf_validate_num_queues +* @adapter: adapter structure +* +* Validate that the number of queues the PF has sent in +* VIRTCHNL_OP_GET_VF_RESOURCES is not larger than the VF can handle. +**/ +static void i40evf_validate_num_queues (struct i40evf_adapter *adapter) +{ +if (adapter->vf_res->num_queue_pairs >I40EVF_MAX_REQ_QUEUES ) { +struct virtchnl_vsi_resource *vsi_res; +int i; + +dev_info (&adapter->pdev->dev,"Received %d queues, but can only have a max of %d\n" , + adapter->vf_res->num_queue_pairs, +I40EVF_MAX_REQ_QUEUES ); +dev_info (&adapter->pdev->dev,"Fixing by reducing queues to %d\n" , +I40EVF_MAX_REQ_QUEUES ); + adapter->vf_res->num_queue_pairs =I40EVF_MAX_REQ_QUEUES ; +for (i =0 ; i < adapter->vf_res->num_vsis; i++) { + vsi_res = &adapter->vf_res->vsi_res[i]; + vsi_res->num_queue_pairs =I40EVF_MAX_REQ_QUEUES ; + } + } +} +/** * i40evf_get_vf_config * @adapter: private adapter structure
@@ -195,6 +221,11 @@ int i40evf_get_vf_config(struct i40evf_adapter *adapter) err = (i40e_status )le32_to_cpu (event.desc.cookie_low);memcpy (adapter->vf_res, event.msg_buf,min (event.msg_len, len)); +/* some PFs send more queues than we should have so validate that +* we aren't getting too many queues +*/ +if (!err) +i40evf_validate_num_queues (adapter);i40e_vf_parse_hw_config (hw, adapter->vf_res); out_alloc:kfree (event.msg_buf);
@@ -1329,6 +1360,7 @@ void i40evf_virtchnl_completion(struct i40evf_adapter *adapter,I40E_MAX_VF_VSI * sizeof(struct virtchnl_vsi_resource);memcpy (adapter->vf_res, msg,min (msglen, len)); +i40evf_validate_num_queues (adapter);i40e_vf_parse_hw_config (&adapter->hw, adapter->vf_res);/* restore current mac address */ ether_addr_copy (adapter->hw.mac.addr, netdev->dev_addr);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 39/205 MIPS: BCM47XX: Enable USB power on Netgear WNDR3400v3
In reply to Sasha LevinFrom: Tuomas Tynkkynen <[email protected]>
[ Upstream commit feef7918667b84f9d5653c501542dd8d84ae32af ]
Setting GPIO 21 high seems to be required to enable power to USB ports on the WNDR3400v3. As there is already similar code for WNR3500L, make the existing USB power GPIO code generic and use that.
Patchwork: https://patchwork.linux-mips.org/patch/20259/
--- arch/mips/bcm47xx/workarounds.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
arch/mips/bcm47xx/workarounds.c +5 -3
@@ -5,9 +5,8 @@#include <bcm47xx_board.h> #include <bcm47xx.h> -static void __init bcm47xx_workarounds_netgear_wnr3500l (void ) +static void __init bcm47xx_workarounds_enable_usb_power (int usb_power) { -const int usb_power =12 ;int err; err =gpio_request_one (usb_power,GPIOF_OUT_INIT_HIGH ,"usb_power" );
@@ -23,7 +22,10 @@ void __init bcm47xx_workarounds(void)switch (board) {case BCM47XX_BOARD_NETGEAR_WNR3500L : -bcm47xx_workarounds_netgear_wnr3500l (); +bcm47xx_workarounds_enable_usb_power (12 ); +break ; +case BCM47XX_BOARD_NETGEAR_WNDR3400_V3 : +bcm47xx_workarounds_enable_usb_power (21 );break ;default :/* No workaround(s) needed */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 47/205 i40e: use correct length for strncpy
In reply to Sasha LevinFrom: Mitch Williams <[email protected]>
[ Upstream commit 7eb74ff891b4e94b8bac48f648a21e4b94ddee64 ]
Caught by GCC 8. When we provide a length for strncpy, we should not include the terminating null. So we must tell it one less than the size of the destination buffer.
--- drivers/net/ethernet/intel/i40e/i40e_ptp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/i40e/i40e_ptp.c +2 -1
@@ -694,7 +694,8 @@ static long i40e_ptp_create_clock(struct i40e_pf *pf)if (!IS_ERR_OR_NULL (pf->ptp_clock))return 0 ; -strncpy (pf->ptp_caps.name, i40e_driver_name,sizeof (pf->ptp_caps.name)); +strncpy (pf->ptp_caps.name, i40e_driver_name, +sizeof (pf->ptp_caps.name) -1 ); pf->ptp_caps.owner =THIS_MODULE ; pf->ptp_caps.max_adj =999999999 ; pf->ptp_caps.n_ext_ts =0 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 57/205 iwlwifi: don't WARN on trying to dump dead firmware
In reply to Sasha LevinFrom: Johannes Berg <[email protected]>
[ Upstream commit 84f260251ed8153e84c64eb2c5278ab18d3ddef6 ]
There's no point in warning here, the user will just get an error back to the debugfs file write, and warning just makes it seem like there's an internal consistency problem when in reality the user just happened to hit this at a bad time. Remove the warning.
--- drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/net/wireless/intel/iwlwifi/fw/dbg.c +3 -4
@@ -1016,7 +1016,7 @@ int iwl_fw_dbg_collect_desc(struct iwl_fw_runtime *fwrt,* If the loading of the FW completed successfully, the next step is to * get the SMEM config data. Thus, if fwrt->smem_cfg.num_lmacs is non * zero, the FW was already loaded successully. If the state is "NO_FW" -* in such a case - WARN and exit, since FW may be dead. Otherwise, we +* in such a case - exit, since FW may be dead. Otherwise, we * can try to collect the data, since FW might just not be fully * loaded (no "ALIVE" yet), and the debug data is accessible. *
@@ -1024,9 +1024,8 @@ int iwl_fw_dbg_collect_desc(struct iwl_fw_runtime *fwrt,* config. In such a case, due to HW access problems, we might * collect garbage. */ -if (WARN ((fwrt->trans->state ==IWL_TRANS_NO_FW ) && - fwrt->smem_cfg.num_lmacs, -"Can't collect dbg data when FW isn't alive\n" )) +if (fwrt->trans->state ==IWL_TRANS_NO_FW && + fwrt->smem_cfg.num_lmacs)return -EIO ;if (test_and_set_bit (IWL_FWRT_STATUS_DUMPING , &fwrt->status))
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 51/205 i40e: hold the rtnl lock on clearing interrupt scheme
In reply to Sasha LevinFrom: Patryk Małek <[email protected]>
[ Upstream commit 5cba17b14182696d6bb0ec83a1d087933f252241 ]
Hold the rtnl lock when we're clearing interrupt scheme in i40e_shutdown and in i40e_remove.
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/net/ethernet/intel/i40e/i40e_main.c +8 -0
@@ -14208,6 +14208,7 @@ static void i40e_remove(struct pci_dev *pdev)mutex_destroy (&hw->aq.asq_mutex);/* Clear all dynamic memory lists of rings, q_vectors, and VSIs */ +rtnl_lock ();i40e_clear_interrupt_scheme (pf);for (i =0 ; i < pf->num_alloc_vsi; i++) {if (pf->vsi[i]) {
@@ -14216,6 +14217,7 @@ static void i40e_remove(struct pci_dev *pdev) pf->vsi[i] =NULL ; } } +rtnl_unlock ();for (i =0 ; i <I40E_MAX_VEB ; i++) {kfree (pf->veb[i]);
@@ -14427,7 +14429,13 @@ static void i40e_shutdown(struct pci_dev *pdev)wr32 (hw,I40E_PFPM_WUFC , (pf->wol_en ?I40E_PFPM_WUFC_MAG_MASK :0 )); +/* Since we're going to destroy queues during the +* i40e_clear_interrupt_scheme() we should hold the RTNL lock for this +* whole section +*/ +rtnl_lock ();i40e_clear_interrupt_scheme (pf); +rtnl_unlock ();if (system_state ==SYSTEM_POWER_OFF ) {pci_wake_from_d3 (pdev, pf->wol_en);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 58/205 iwlwifi: mvm: avoid sending too many BARs
In reply to Sasha LevinFrom: Sara Sharon <[email protected]>
[ Upstream commit 1a19c139be18ed4d6d681049cc48586fae070120 ]
When we receive TX response, we may release a few packets due to a hole that was closed in the transmission window.
However, if that frame failed, we will mark all the released frames as failed and will send multiple BARs.
This affects statistics badly, and cause unnecessary frames transmission.
Instead, mark all the following packets as success, with the desired result of sending a bar for the failed frame only.
--- drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/net/wireless/intel/iwlwifi/mvm/tx.c +8 -0
@@ -1438,6 +1438,14 @@ static void iwl_mvm_rx_tx_cmd_single(struct iwl_mvm *mvm,break ; } +/* +* If we are freeing multiple frames, mark all the frames +* but the first one as acked, since they were acknowledged +* before +* */ +if (skb_freed >1 ) + info->flags |=IEEE80211_TX_STAT_ACK ; +iwl_mvm_tx_status_check_trigger (mvm, status); info->status.rates[0 ].count = tx_resp->failure_frame +1 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 52/205 i40evf: cancel workqueue sync for adminq when a VF is removed
In reply to Sasha LevinFrom: Lihong Yang <[email protected]>
[ Upstream commit babbcc60040abfb7a9e3caa1c58fe182ae73762a ]
If a VF is being removed, there is no need to continue with the workqueue sync for the adminq task, thus cancel it. Without this call, when VFs are created and removed right away, there might be a chance for the driver to crash with events stuck in the adminq.
--- drivers/net/ethernet/intel/i40evf/i40evf_main.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/intel/i40evf/i40evf_main.c +2 -0
@@ -3884,6 +3884,8 @@ static void i40evf_remove(struct pci_dev *pdev)if (adapter->watchdog_timer.function)del_timer_sync (&adapter->watchdog_timer); +cancel_work_sync (&adapter->adminq_task); +i40evf_free_rss (adapter);if (hw->aq.asq.count)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 53/205 i40e: Prevent deleting MAC address from VF when set by PF
In reply to Sasha LevinFrom: Patryk Małek <[email protected]>
[ Upstream commit 5907cf6c5bbe78be2ed18b875b316c6028b20634 ]
To prevent VF from deleting MAC address that was assigned by the PF we need to check for that scenario when we try to delete a MAC address from a VF.
--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +10 -0
@@ -2571,6 +2571,16 @@ static int i40e_vc_del_mac_addr_msg(struct i40e_vf *vf, u8 *msg, u16 msglen) ret =I40E_ERR_INVALID_MAC_ADDR ; goto error_param; } + +if (vf->pf_set_mac && +ether_addr_equal (al->list[i].addr, + vf->default_lan_addr.addr)) { +dev_err (&pf->pdev->dev, +"MAC addr %pM has been set by PF, cannot delete it for VF %d, reset VF to change MAC addr\n" , + vf->default_lan_addr.addr, vf->vf_id); + ret =I40E_ERR_PARAM ; + goto error_param; + } } vsi = pf->vsi[vf->lan_vsi_idx];
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 65/205 mwifiex: do no submit URB in suspended state
In reply to Sasha LevinFrom: Ganapathi Bhat <[email protected]>
[ Upstream commit 7bd4628c2f31c51254aa39628ecae521d00d0b90 ]
There is a possible race between USB suspend and main thread:
1. After processing the command response, main thread will submit rx_cmd URB back so as to process next command response, by calling mwifiex_usb_submit_rx_urb.
2. During USB suspend, the suspend handler will check if rx_cmd URB is pending(submitted) and if true, kill this URB.
There is a possible race between #1 and #2, where rx_cmd URB will be submitted by main thread(#1) after the suspend handler check in #2.
To fix this, check if device is already suspended in mwifiex_usb_submit_rx_urb, in which case do not submit the URB.
--- drivers/net/wireless/marvell/mwifiex/usb.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/net/wireless/marvell/mwifiex/usb.c +7 -0
@@ -298,6 +298,13 @@ static int mwifiex_usb_submit_rx_urb(struct urb_context *ctx, int size)struct mwifiex_adapter *adapter = ctx->adapter;struct usb_card_rec *card = (struct usb_card_rec *)adapter->card; +if (test_bit (MWIFIEX_IS_SUSPENDED , &adapter->work_flags)) { +mwifiex_dbg (adapter,ERROR , +"%s: card removed/suspended, EP %d rx_cmd URB submit skipped\n" , + __func__, ctx->ep); +return -1 ; + } +if (card->rx_cmd_ep != ctx->ep) { ctx->skb =dev_alloc_skb (size);if (!ctx->skb) {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 55/205 IB/rxe: fixes for rdma read retry
In reply to Sasha LevinFrom: Vijay Immanuel <[email protected]>
[ Upstream commit 030e46e495af855a13964a0aab9753ea82a96edc ]
When a read request is retried for the remaining partial data, the response may restart from read response first or read response only. So support those cases.
Do not advance the comp psn beyond the current wqe's last_psn as that could skip over an entire read wqe and will cause the req_retry() logic to set an incorrect req psn.
An example sequence is as follows:
Write PSN 40 -- this is the current WQE.
Read request PSN 41
Write PSN 42
Receive ACK PSN 42 -- this will complete the current WQE for PSN 40, and set the comp psn to 42 which is a problem because the read request at PSN 41 has been skipped over. So when req_retry() tries to retransmit the read request, it sets the req psn to 42 which is incorrect.
When retrying a read request, calculate the number of psns completed based on the dma resid instead of the wqe first_psn. The wqe first_psn could have moved if the read request was retried multiple times.
Set the reth length to the dma resid to handle read retries for the remaining partial data.
--- drivers/infiniband/sw/rxe/rxe_comp.c | 21 ++++++++++++++++----- drivers/infiniband/sw/rxe/rxe_req.c | 15 +++++++++------ 2 files changed, 25 insertions(+), 11 deletions(-)
drivers/infiniband/sw/rxe/rxe_comp.c +16 -5
@@ -254,6 +254,17 @@ static inline enum comp_state check_ack(struct rxe_qp *qp,case IB_OPCODE_RC_RDMA_READ_RESPONSE_MIDDLE :if (pkt->opcode !=IB_OPCODE_RC_RDMA_READ_RESPONSE_MIDDLE && pkt->opcode !=IB_OPCODE_RC_RDMA_READ_RESPONSE_LAST ) { +/* read retries of partial data may restart from +* read response first or response only. +*/ +if ((pkt->psn == wqe->first_psn && + pkt->opcode == +IB_OPCODE_RC_RDMA_READ_RESPONSE_FIRST ) || + (wqe->first_psn == wqe->last_psn && + pkt->opcode == +IB_OPCODE_RC_RDMA_READ_RESPONSE_ONLY )) +break ; +return COMPST_ERROR ; }break ;
@@ -500,11 +511,11 @@ static inline enum comp_state complete_wqe(struct rxe_qp *qp, struct rxe_pkt_info *pkt, struct rxe_send_wqe *wqe) { - qp->comp.opcode = -1; - -if (pkt) { -if (psn_compare (pkt->psn, qp->comp.psn) >=0 ) - qp->comp.psn = (pkt->psn +1 ) &BTH_PSN_MASK ; +if (pkt && wqe->state == wqe_state_pending) { +if (psn_compare (wqe->last_psn, qp->comp.psn) >=0 ) { + qp->comp.psn = (wqe->last_psn +1 ) &BTH_PSN_MASK ; + qp->comp.opcode =-1 ; + }if (qp->req.wait_psn) { qp->req.wait_psn =0 ;
drivers/infiniband/sw/rxe/rxe_req.c +9 -6
@@ -73,9 +73,6 @@ static void req_retry(struct rxe_qp *qp)int npsn;int first =1 ; - wqe =queue_head (qp->sq.queue); - npsn = (qp->comp.psn - wqe->first_psn) &BTH_PSN_MASK ; - qp->req.wqe_index =consumer_index (qp->sq.queue); qp->req.psn = qp->comp.psn; qp->req.opcode =-1 ;
@@ -107,11 +104,17 @@ static void req_retry(struct rxe_qp *qp)if (first) { first =0 ; -if (mask &WR_WRITE_OR_SEND_MASK ) +if (mask &WR_WRITE_OR_SEND_MASK ) { + npsn = (qp->comp.psn - wqe->first_psn) & +BTH_PSN_MASK ;retry_first_write_send (qp, wqe, mask, npsn); + } -if (mask &WR_READ_MASK ) +if (mask &WR_READ_MASK ) { + npsn = (wqe->dma.length - wqe->dma.resid) / + qp->mtu; wqe->iova += npsn * qp->mtu; + } } wqe->state = wqe_state_posted;
@@ -435,7 +438,7 @@ static struct sk_buff *init_req_packet(struct rxe_qp *qp,if (pkt->mask &RXE_RETH_MASK ) {reth_set_rkey (pkt, ibwr->wr.rdma.rkey);reth_set_va (pkt, wqe->iova); -reth_set_len (pkt, wqe->dma.length); +reth_set_len (pkt, wqe->dma.resid); }if (pkt->mask &RXE_IMMDT_MASK )
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 67/205 brcmfmac: fix wrong strnchr usage
In reply to Sasha LevinFrom: Rasmus Villemoes <[email protected]>
[ Upstream commit cb18e2e9ec71d42409a51b83546686c609780dde ]
strnchr takes arguments in the order of its name: string, max bytes to read, character to search for. Here we're passing '\n' aka 10 as the buffer size, and searching for sizeof(buf) aka BRCMF_DCMD_SMLEN aka 256 (aka '\0', since it's implicitly converted to char) within those 10 bytes.
Just interchanging the last two arguments would still leave a bug, because if we've been successful once, there are not sizeof(buf) characters left after the new value of p.
Since clmver is immediately afterwards passed as a %s argument, I assume that it is actually a properly nul-terminated string. For that case, we have strreplace().
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c +1 -3
@@ -296,9 +296,7 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp)/* Replace all newline/linefeed characters with space * character */ - ptr = clmver; -while ((ptr =strnchr (ptr,'\n' ,sizeof (buf))) !=NULL ) - *ptr =' ' ; +strreplace (clmver,'\n' ,' ' );brcmf_dbg (INFO ,"CLM version = %s\n" , clmver); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 71/205 net: hns3: Fix for multicast failure
In reply to Sasha LevinFrom: Huazhong Tan <[email protected]>
[ Upstream commit fd5f9da3f6583046215d614a87792b46e55785e2 ]
When the lower 24 bits of the IPV6 link-local addresses at both ends are the same, the multicast MAC address for Neigbour Discovery is the same. The multicast for Neigbour Discovery will fail.
This patch fixes it by including the bonding uplink port in the multicast group.
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +2 -2
@@ -4374,7 +4374,7 @@ int hclge_add_mc_addr_common(struct hclge_vport *vport,hnae3_set_bit (req.flags,HCLGE_MAC_VLAN_BIT0_EN_B ,1 );hnae3_set_bit (req.entry_type,HCLGE_MAC_VLAN_BIT0_EN_B ,0 );hnae3_set_bit (req.entry_type,HCLGE_MAC_VLAN_BIT1_EN_B ,1 ); -hnae3_set_bit (req.mc_mac_en,HCLGE_MAC_VLAN_BIT0_EN_B ,0 ); +hnae3_set_bit (req.mc_mac_en,HCLGE_MAC_VLAN_BIT0_EN_B ,1 );hclge_prepare_mac_addr (&req, addr); status =hclge_lookup_mac_vlan_tbl (vport, &req, desc, true);if (!status) {
@@ -4441,7 +4441,7 @@ int hclge_rm_mc_addr_common(struct hclge_vport *vport,hnae3_set_bit (req.flags,HCLGE_MAC_VLAN_BIT0_EN_B ,1 );hnae3_set_bit (req.entry_type,HCLGE_MAC_VLAN_BIT0_EN_B ,0 );hnae3_set_bit (req.entry_type,HCLGE_MAC_VLAN_BIT1_EN_B ,1 ); -hnae3_set_bit (req.mc_mac_en,HCLGE_MAC_VLAN_BIT0_EN_B ,0 ); +hnae3_set_bit (req.mc_mac_en,HCLGE_MAC_VLAN_BIT0_EN_B ,1 );hclge_prepare_mac_addr (&req, addr); status =hclge_lookup_mac_vlan_tbl (vport, &req, desc, true);if (!status) {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 69/205 soc: imx: gpc: fix PDN delay
In reply to Sasha LevinFrom: Sven Schmitt <[email protected]>
[ Upstream commit 9f4d61d531e0efc9c3283963ae5ef7e314579191 ]
imx6_pm_domain_power_off() reads iso and iso2sw from GPC_PGC_PUPSCR_OFFS which stores the power up delays.
So use GPC_PGC_PDNSCR_OFFS for the correct delays.
--- drivers/soc/imx/gpc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soc/imx/gpc.c +1 -1
@@ -69,7 +69,7 @@ static int imx6_pm_domain_power_off(struct generic_pm_domain *genpd)u32 val;/* Read ISO and ISO2SW power down delays */ -regmap_read (pd->regmap, pd->reg_offs +GPC_PGC_PUPSCR_OFFS , &val); +regmap_read (pd->regmap, pd->reg_offs +GPC_PGC_PDNSCR_OFFS , &val); iso = val &0x3f ; iso2sw = (val >>8 ) &0x3f ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 72/205 net: hns3: Fix error of checking used vlan id
In reply to Sasha LevinFrom: Jian Shen <[email protected]>
[ Upstream commit 54e97d117bafa161b08c6ade243a335d92890d94 ]
PF uses hdev->vlan_table to manage the port vlan table. In function hclge_set_vlan_filter_hw(), it checks whether a vlan id has been used, by foreach all the vport bits. It should use macro HCLGE_VPORT_NUM, not VLAN_N_VID as the foreach condition.
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +1 -1
@@ -4784,7 +4784,7 @@ static int hclge_set_vlan_filter_hw(struct hclge_dev *hdev, __be16 proto,return -EINVAL ; } -for_each_set_bit (vport_idx, hdev->vlan_table[vlan_id],VLAN_N_VID ) +for_each_set_bit (vport_idx, hdev->vlan_table[vlan_id],HCLGE_VPORT_NUM ) vport_num++;if ((is_kill && vport_num ==0 ) || (!is_kill && vport_num ==1 ))
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 73/205 net: hns3: Fix for loopback selftest failed problem
In reply to Sasha LevinFrom: Yunsheng Lin <[email protected]>
[ Upstream commit 0f29fc23b21d3cbd966537bfabba07c00466b787 ]
Tqp and mac need to be enabled when doing loopback selftest, ae_algo->ops->start/stop is used to do the job, there is a time window between ae_algo->ops->start/stop and loopback setup, which will cause selftest failed problem when there is frame coming in during that time window.
This patch fixes it by enabling the tqp and mac during loopback setup process.
--- .../ethernet/hisilicon/hns3/hns3_ethtool.c | 17 +------ .../hisilicon/hns3/hns3pf/hclge_main.c | 51 +++++++++++-------- 2 files changed, 31 insertions(+), 37 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c +1 -16
@@ -100,41 +100,26 @@ static int hns3_lp_up(struct net_device *ndev, enum hnae3_loop loop_mode)struct hnae3_handle *h =hns3_get_handle (ndev);int ret; -if (!h->ae_algo->ops->start) -return -EOPNOTSUPP ; - ret =hns3_nic_reset_all_ring (h);if (ret)return ret; - ret = h->ae_algo->ops->start (h); -if (ret) { -netdev_err (ndev, -"hns3_lb_up ae start return error: %d\n" , ret); -return ret; - } - ret =hns3_lp_setup (ndev, loop_mode, true);usleep_range (10000 ,20000 ); -return ret; +return 0 ; }static int hns3_lp_down (struct net_device *ndev,enum hnae3_loop loop_mode) { -struct hnae3_handle *h =hns3_get_handle (ndev);int ret; -if (!h->ae_algo->ops->stop) -return -EOPNOTSUPP ; - ret =hns3_lp_setup (ndev, loop_mode, false);if (ret) {netdev_err (ndev,"lb_setup return error: %d\n" , ret);return ret; } - h->ae_algo->ops->stop (h);usleep_range (10000 ,20000 );return 0 ;
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +30 -21
78 lines not on this page · raw message
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 74/205 net: hns3: Change the dst mac addr of loopback packet
In reply to Sasha LevinFrom: Yunsheng Lin <[email protected]>
[ Upstream commit 7f7d9e501f4123e64b130576621d24f9379adc8f ]
Currently, the dst mac addr of loopback packet is the same as the host' mac addr, the SSU component may loop back the packet to host before the packet reaches mac or serdes, which will defect the purpose of mac or serdes selftest.
This patch changes it by adding 0x1f to the last byte of dst mac addr.
--- drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c +1 -0
@@ -137,6 +137,7 @@ static void hns3_lp_setup_skb(struct sk_buff *skb) packet =skb_put (skb,HNS3_NIC_LB_TEST_PACKET_SIZE );memcpy (ethh->h_dest, ndev->dev_addr,ETH_ALEN ); + ethh->h_dest[5 ] +=0x1f ;eth_zero_addr (ethh->h_source); ethh->h_proto =htons (ETH_P_ARP );skb_reset_mac_header (skb);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 78/205 ARM: dts: meson8: fix the clock controller register size
In reply to Sasha LevinFrom: Martin Blumenstingl <[email protected]>
[ Upstream commit f7f9da89bc4f61e33f7b9f5c75c4efdc1f0455d8 ]
The clock controller registers are not 0x460 wide because the reset controller starts at CBUS 0x4404. This currently overlaps with the clock controller (which is at CBUS 0x4000).
There is no public documentation available on the actual size of the clock controller's register area (also called "HHI"). However, in Amlogic's GPL kernel sources the last "HHI" register is HHI_HDMI_PHY_CNTL2 at CBUS + 0x43a8. 0x400 was chosen because that size doesn't seem unlikely.
--- arch/arm/boot/dts/meson8.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/meson8.dtsi +1 -1
@@ -194,7 +194,7 @@ #clock-cells = <1>; #reset-cells = <1>; compatible = "amlogic,meson8-clkc"; - reg = <0x8000 0x4>, <0x4000 0x460>; + reg = <0x8000 0x4>, <0x4000 0x400>; }; reset: reset-controller@4404 {
Signature · 7 lines
2.20.1 _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic
Sasha Levin
maintainerPATCH 81/205 mtd: rawnand: fsl_ifc: check result of SRAM initialization
In reply to Sasha LevinFrom: Kurt Kanzenbach <[email protected]>
[ Upstream commit 434655af6a187129d8114640443b27d2cecfb979 ]
The SRAM initialization might fail. If that happens further NAND operations won't be successful. Therefore, the chip init routine should fail if the SRAM initialization didn't work.
--- drivers/mtd/nand/raw/fsl_ifc_nand.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
drivers/mtd/nand/raw/fsl_ifc_nand.c +13 -4
@@ -761,7 +761,7 @@ static const struct nand_controller_ops fsl_ifc_controller_ops = { .attach_chip = fsl_ifc_attach_chip, }; -static void fsl_ifc_sram_init (struct fsl_ifc_mtd *priv) +static int fsl_ifc_sram_init (struct fsl_ifc_mtd *priv) {struct fsl_ifc_ctrl *ctrl = priv->ctrl;struct fsl_ifc_runtime __iomem *ifc_runtime = ctrl->rregs;
@@ -805,12 +805,16 @@ static void fsl_ifc_sram_init(struct fsl_ifc_mtd *priv)wait_event_timeout (ctrl->nand_wait, ctrl->nand_stat,msecs_to_jiffies (IFC_TIMEOUT_MSECS )); -if (ctrl->nand_stat !=IFC_NAND_EVTER_STAT_OPC ) +if (ctrl->nand_stat !=IFC_NAND_EVTER_STAT_OPC ) {pr_err ("fsl-ifc: Failed to Initialise SRAM\n" ); +return -ETIMEDOUT ; + }/* Restore CSOR and CSOR_ext */ ifc_out32 (csor, &ifc_global->csor_cs[cs].csor);ifc_out32 (csor_ext, &ifc_global->csor_cs[cs].csor_ext); + +return 0 ; }static int fsl_ifc_chip_init (struct fsl_ifc_mtd *priv)
@@ -914,8 +918,13 @@ static int fsl_ifc_chip_init(struct fsl_ifc_mtd *priv) chip->ecc.algo =NAND_ECC_HAMMING ; } -if (ctrl->version >=FSL_IFC_VERSION_1_1_0 ) -fsl_ifc_sram_init (priv); +if (ctrl->version >=FSL_IFC_VERSION_1_1_0 ) { +int ret; + + ret =fsl_ifc_sram_init (priv); +if (ret) +return ret; + }/* * As IFC version 2.0.0 has 16KB of internal SRAM as compared to older
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 79/205 ARM: dts: meson8b: fix the clock controller register size
In reply to Sasha LevinFrom: Martin Blumenstingl <[email protected]>
[ Upstream commit f31094fe8c16fbd2ca47921acf93b744b045aace ]
The clock controller registers are not 0x460 wide because the reset controller starts at CBUS 0x4404. This currently overlaps with the clock controller (which is at CBUS 0x4000).
There is no public documentation available on the actual size of the clock controller's register area (also called "HHI"). However, in Amlogic's GPL kernel sources the last "HHI" register is HHI_HDMI_PHY_CNTL2 at CBUS + 0x43a8. 0x400 was chosen because that size doesn't seem unlikely.
--- arch/arm/boot/dts/meson8b.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/meson8b.dtsi +1 -1
@@ -163,7 +163,7 @@ #clock-cells = <1>; #reset-cells = <1>; compatible = "amlogic,meson8b-clkc"; - reg = <0x8000 0x4>, <0x4000 0x460>; + reg = <0x8000 0x4>, <0x4000 0x400>; }; reset: reset-controller@4404 {
Signature · 7 lines
2.20.1 _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic
Sasha Levin
maintainerPATCH 75/205 net/mlx5: Fix atomic_mode enum values
In reply to Sasha LevinFrom: Moni Shoua <[email protected]>
[ Upstream commit aa7e80b220f3a543eefbe4b7e2c5d2b73e2e2ef7 ]
The field atomic_mode is 4 bits wide and therefore can hold values from 0x0 to 0xf. Remove the unnecessary 20 bit shift that made the values be incorrect. While that, remove unused enum values.
--- include/linux/mlx5/driver.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
include/linux/mlx5/driver.h +1 -4
@@ -163,10 +163,7 @@ enum mlx5_dcbx_oper_mode { };enum mlx5_dct_atomic_mode { -MLX5_ATOMIC_MODE_DCT_OFF =20 , -MLX5_ATOMIC_MODE_DCT_NONE =0 <<MLX5_ATOMIC_MODE_DCT_OFF , -MLX5_ATOMIC_MODE_DCT_IB_COMP =1 <<MLX5_ATOMIC_MODE_DCT_OFF , -MLX5_ATOMIC_MODE_DCT_CX =2 <<MLX5_ATOMIC_MODE_DCT_OFF , +MLX5_ATOMIC_MODE_DCT_CX =2 , };enum {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 82/205 mtd: rawnand: fsl_ifc: fixup SRAM init for newer ctrl versions
In reply to Sasha LevinFrom: Kurt Kanzenbach <[email protected]>
[ Upstream commit ff8648f29fe58c2d94d32a076d2de7b92be4b485 ]
Newer versions of the IFC controller use a different method of initializing the internal SRAM: Instead of reading from flash, a bit in the NAND configuration register has to be set in order to trigger the self-initializing process.
--- drivers/mtd/nand/raw/fsl_ifc_nand.c | 33 +++++++++++++++++++++++------ include/linux/fsl_ifc.h | 2 ++ 2 files changed, 28 insertions(+), 7 deletions(-)
drivers/mtd/nand/raw/fsl_ifc_nand.c +26 -7
@@ -30,6 +30,7 @@#include <linux/mtd/partitions.h> #include <linux/mtd/nand_ecc.h> #include <linux/fsl_ifc.h> +#include <linux/iopoll.h> #define ERR_BYTE 0xFF/* Value returned for read bytes when read failed */
@@ -769,6 +770,27 @@ static int fsl_ifc_sram_init(struct fsl_ifc_mtd *priv)uint32_t csor =0 , csor_8k =0 , csor_ext =0 ;uint32_t cs = priv->bank; +if (ctrl->version <FSL_IFC_VERSION_1_1_0 ) +return 0 ; + +if (ctrl->version >FSL_IFC_VERSION_1_1_0 ) { +u32 ncfgr, status; +int ret; + +/* Trigger auto initialization */ + ncfgr =ifc_in32 (&ifc_runtime->ifc_nand.ncfgr); +ifc_out32 (ncfgr |IFC_NAND_NCFGR_SRAM_INIT_EN , &ifc_runtime->ifc_nand.ncfgr); + +/* Wait until done */ + ret =readx_poll_timeout (ifc_in32, &ifc_runtime->ifc_nand.ncfgr, + status, !(status &IFC_NAND_NCFGR_SRAM_INIT_EN ), +10 ,IFC_TIMEOUT_MSECS *1000 ); +if (ret) +dev_err (priv->dev,"Failed to initialize SRAM!\n" ); + +return ret; + } +/* Save CSOR and CSOR_ext */ csor =ifc_in32 (&ifc_global->csor_cs[cs].csor); csor_ext =ifc_in32 (&ifc_global->csor_cs[cs].csor_ext);
@@ -825,6 +847,7 @@ static int fsl_ifc_chip_init(struct fsl_ifc_mtd *priv)struct nand_chip *chip = &priv->chip;struct mtd_info *mtd =nand_to_mtd (&priv->chip);u32 csor; +int ret;/* Fill in fsl_ifc_mtd structure */ mtd->dev.parent = priv->dev;
@@ -918,13 +941,9 @@ static int fsl_ifc_chip_init(struct fsl_ifc_mtd *priv) chip->ecc.algo =NAND_ECC_HAMMING ; } -if (ctrl->version >=FSL_IFC_VERSION_1_1_0 ) { -int ret; - - ret =fsl_ifc_sram_init (priv); -if (ret) -return ret; - } + ret =fsl_ifc_sram_init (priv); +if (ret) +return ret;/* * As IFC version 2.0.0 has 16KB of internal SRAM as compared to older
include/linux/fsl_ifc.h +2 -0
@@ -274,6 +274,8 @@*/ /* Auto Boot Mode */ #define IFC_NAND_NCFGR_BOOT 0x80000000 +/* SRAM Initialization */ +#define IFC_NAND_NCFGR_SRAM_INIT_EN 0x20000000/* Addressing Mode-ROW0+n/COL0 */ #define IFC_NAND_NCFGR_ADDR_MODE_RC0 0x00000000/* Addressing Mode-ROW0+n/COL0+n */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 84/205 IB/mlx5: Change TX affinity assignment in RoCE LAG mode
In reply to Sasha LevinFrom: Majd Dibbiny <[email protected]>
[ Upstream commit c6a21c3864fc7f5febae7d096cd136f397c791f2 ]
In the current code, the TX affinity is per RoCE device, which can cause unfairness between different contexts. e.g. if we open two contexts, and each open 10 QPs concurrently, all of the QPs of the first context might end up on the first port instead of distributed on the two ports as expected
To overcome this unfairness between processes, we maintain per device TX affinity, and per process TX affinity.
The allocation algorithm is as follow:
1. Hold two tx_port_affinity atomic variables, one per RoCE device and one per ucontext. Both initialized to 0.
2. In mlx5_ib_alloc_ucontext do:
2.1. ucontext.tx_port_affinity = device.tx_port_affinity 2.2. device.tx_port_affinity += 1
3. In modify QP INIT2RST:
3.1. qp.tx_port_affinity = ucontext.tx_port_affinity % MLX5_PORT_NUM 3.2. ucontext.tx_port_affinity += 1
--- drivers/infiniband/hw/mlx5/main.c | 8 ++++++ drivers/infiniband/hw/mlx5/mlx5_ib.h | 4 ++- drivers/infiniband/hw/mlx5/qp.c | 37 +++++++++++++++++++++++++--- 3 files changed, 44 insertions(+), 5 deletions(-)
drivers/infiniband/hw/mlx5/main.c +8 -0
@@ -1823,6 +1823,14 @@ static struct ib_ucontext *mlx5_ib_alloc_ucontext(struct ib_device *ibdev, context->lib_caps = req.lib_caps;print_lib_caps (dev, context->lib_caps); +if (mlx5_lag_is_active (dev->mdev)) { +u8 port =mlx5_core_native_port_num (dev->mdev); + +atomic_set (&context->tx_port_affinity, +atomic_add_return ( +1 , &dev->roce[port].tx_port_affinity)); + } +return &context->ibucontext; out_mdev:
drivers/infiniband/hw/mlx5/mlx5_ib.h +3 -1
@@ -139,6 +139,8 @@ struct mlx5_ib_ucontext {u64 lib_caps;DECLARE_BITMAP (dm_pages,MLX5_MAX_MEMIC_PAGES );u16 devx_uid; +/* For RoCE LAG TX affinity */ +atomic_t tx_port_affinity; };static inline struct mlx5_ib_ucontext *to_mucontext (struct ib_ucontext *ibucontext)
@@ -700,7 +702,7 @@ struct mlx5_roce {rwlock_t netdev_lock;struct net_device *netdev;struct notifier_block nb; -atomic_t next_port; +atomic_t tx_port_affinity;enum ib_port_state last_port_state;struct mlx5_ib_dev *dev;u8 native_port_num;
drivers/infiniband/hw/mlx5/qp.c +33 -4
@@ -2908,6 +2908,37 @@ static int modify_raw_packet_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,return 0 ; } +static unsigned int get_tx_affinity (struct mlx5_ib_dev *dev, +struct mlx5_ib_pd *pd, +struct mlx5_ib_qp_base *qp_base, +u8 port_num) +{ +struct mlx5_ib_ucontext *ucontext =NULL ; +unsigned int tx_port_affinity; + +if (pd && pd->ibpd.uobject && pd->ibpd.uobject->context) + ucontext =to_mucontext (pd->ibpd.uobject->context); + +if (ucontext) { + tx_port_affinity = (unsigned int )atomic_add_return ( +1 , &ucontext->tx_port_affinity) % +MLX5_MAX_PORTS + +1 ; +mlx5_ib_dbg (dev,"Set tx affinity 0x%x to qpn 0x%x ucontext %p\n" , + tx_port_affinity, qp_base->mqp.qpn, ucontext); + }else { + tx_port_affinity = + (unsigned int )atomic_add_return ( +1 , &dev->roce[port_num].tx_port_affinity) % +MLX5_MAX_PORTS + +1 ; +mlx5_ib_dbg (dev,"Set tx affinity 0x%x to qpn 0x%x\n" , + tx_port_affinity, qp_base->mqp.qpn); + } + +return tx_port_affinity; +} + static int __mlx5_ib_modify_qp(struct ib_qp *ibqp, const struct ib_qp_attr *attr, int attr_mask, enum ib_qp_state cur_state, enum ib_qp_state new_state,
@@ -2973,6 +3004,7 @@ static int __mlx5_ib_modify_qp(struct ib_qp *ibqp,if (!context)return -ENOMEM ; + pd =get_pd (qp); context->flags =cpu_to_be32 (mlx5_st <<16 );if (!(attr_mask &IB_QP_PATH_MIG_STATE )) {
@@ -3001,9 +3033,7 @@ static int __mlx5_ib_modify_qp(struct ib_qp *ibqp, (ibqp->qp_type == IB_QPT_XRC_TGT)) {if (mlx5_lag_is_active (dev->mdev)) {u8 p =mlx5_core_native_port_num (dev->mdev); - tx_affinity = (unsigned int )atomic_add_return (1 , - &dev->roce[p].next_port) % -MLX5_MAX_PORTS +1 ; + tx_affinity =get_tx_affinity (dev, pd, base, p); context->flags |=cpu_to_be32 (tx_affinity <<24 ); } }
@@ -3061,7 +3091,6 @@ static int __mlx5_ib_modify_qp(struct ib_qp *ibqp, goto out; } - pd =get_pd (qp);get_cqs (qp->ibqp.qp_type, qp->ibqp.send_cq, qp->ibqp.recv_cq, &send_cq, &recv_cq);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 80/205 mtd: rawnand: marvell: use regmap_update_bits() for syscon access
In reply to Sasha LevinFrom: Thomas Petazzoni <[email protected]>
[ Upstream commit 88aa3bbfc020d14b13d67af3f5c08aa992d82cd8 ]
The marvell_nfc_init() function fiddles with some bits of a system controller on Armada 7K/8K. However, it does a read/modify/write sequence on GENCONF_CLK_GATING_CTRL and GENCONF_ND_CLK_CTRL, which isn't safe from a concurrency point of view, as the regmap lock isn't taken accross the read/modify/write sequence. To solve this issue, use regmap_update_bits().
While at it, since the "reg" variable is no longer needed for the read/modify/write sequences, get rid of it for the regmap_write() to GENCONF_SOC_DEVICE_MUX, and directly pass the value to be written as argument.
--- drivers/mtd/nand/raw/marvell_nand.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-)
drivers/mtd/nand/raw/marvell_nand.c +11 -12
@@ -2710,24 +2710,23 @@ static int marvell_nfc_init(struct marvell_nfc *nfc)struct regmap *sysctrl_base =syscon_regmap_lookup_by_phandle (np,"marvell,system-controller" ); -u32 reg;if (IS_ERR (sysctrl_base))return PTR_ERR (sysctrl_base); - reg =GENCONF_SOC_DEVICE_MUX_NFC_EN | -GENCONF_SOC_DEVICE_MUX_ECC_CLK_RST | -GENCONF_SOC_DEVICE_MUX_ECC_CORE_RST | -GENCONF_SOC_DEVICE_MUX_NFC_INT_EN ; -regmap_write (sysctrl_base,GENCONF_SOC_DEVICE_MUX , reg); +regmap_write (sysctrl_base,GENCONF_SOC_DEVICE_MUX , +GENCONF_SOC_DEVICE_MUX_NFC_EN | +GENCONF_SOC_DEVICE_MUX_ECC_CLK_RST | +GENCONF_SOC_DEVICE_MUX_ECC_CORE_RST | +GENCONF_SOC_DEVICE_MUX_NFC_INT_EN ); -regmap_read (sysctrl_base,GENCONF_CLK_GATING_CTRL , ®); - reg |=GENCONF_CLK_GATING_CTRL_ND_GATE ; -regmap_write (sysctrl_base,GENCONF_CLK_GATING_CTRL , reg); +regmap_update_bits (sysctrl_base,GENCONF_CLK_GATING_CTRL , +GENCONF_CLK_GATING_CTRL_ND_GATE , +GENCONF_CLK_GATING_CTRL_ND_GATE ); -regmap_read (sysctrl_base,GENCONF_ND_CLK_CTRL , ®); - reg |=GENCONF_ND_CLK_CTRL_EN ; -regmap_write (sysctrl_base,GENCONF_ND_CLK_CTRL , reg); +regmap_update_bits (sysctrl_base,GENCONF_ND_CLK_CTRL , +GENCONF_ND_CLK_CTRL_EN , +GENCONF_ND_CLK_CTRL_EN ); }/* Configure the DMA if appropriate */
Signature · 6 lines
2.20.1 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
Sasha Levin
maintainerPATCH 87/205 cfg80211: validate wmm rule when setting
In reply to Sasha LevinFrom: Stanislaw Gruszka <[email protected]>
[ Upstream commit 014f5a250fc49fa8c6cd50093e725e71f3ae52da ]
Add validation check for wmm rule when copy rules from fwdb and print error when rule is invalid.
--- net/wireless/reg.c | 64 +++++++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 29 deletions(-)
net/wireless/reg.c +35 -29
@@ -847,22 +847,36 @@ static bool valid_regdb(const u8 *data, unsigned int size)return true; } -static void set_wmm_rule (struct ieee80211_reg_rule *rrule, -struct fwdb_wmm_rule *wmm) -{ -struct ieee80211_wmm_rule *rule = &rrule->wmm_rule; -unsigned int i; +static void set_wmm_rule (const struct fwdb_header *db, +const struct fwdb_country *country, +const struct fwdb_rule *rule, +struct ieee80211_reg_rule *rrule) +{ +struct ieee80211_wmm_rule *wmm_rule = &rrule->wmm_rule; +struct fwdb_wmm_rule *wmm; +unsigned int i, wmm_ptr; + + wmm_ptr =be16_to_cpu (rule->wmm_ptr) <<2 ; + wmm = (void *)((u8 *)db + wmm_ptr); + +if (!valid_wmm (wmm)) { +pr_err ("Invalid regulatory WMM rule %u-%u in domain %c%c\n" , +be32_to_cpu (rule->start),be32_to_cpu (rule->end), + country->alpha2[0 ], country->alpha2[1 ]); +return ; + }for (i =0 ; i <IEEE80211_NUM_ACS ; i++) { - rule->client[i].cw_min = + wmm_rule->client[i].cw_min =ecw2cw ((wmm->client[i].ecw &0xf0 ) >>4 ); - rule->client[i].cw_max =ecw2cw (wmm->client[i].ecw &0x0f ); - rule->client[i].aifsn = wmm->client[i].aifsn; - rule->client[i].cot =1000 *be16_to_cpu (wmm->client[i].cot); - rule->ap[i].cw_min =ecw2cw ((wmm->ap[i].ecw &0xf0 ) >>4 ); - rule->ap[i].cw_max =ecw2cw (wmm->ap[i].ecw &0x0f ); - rule->ap[i].aifsn = wmm->ap[i].aifsn; - rule->ap[i].cot =1000 *be16_to_cpu (wmm->ap[i].cot); + wmm_rule->client[i].cw_max =ecw2cw (wmm->client[i].ecw &0x0f ); + wmm_rule->client[i].aifsn = wmm->client[i].aifsn; + wmm_rule->client[i].cot = +1000 *be16_to_cpu (wmm->client[i].cot); + wmm_rule->ap[i].cw_min =ecw2cw ((wmm->ap[i].ecw &0xf0 ) >>4 ); + wmm_rule->ap[i].cw_max =ecw2cw (wmm->ap[i].ecw &0x0f ); + wmm_rule->ap[i].aifsn = wmm->ap[i].aifsn; + wmm_rule->ap[i].cot =1000 *be16_to_cpu (wmm->ap[i].cot); } rrule->has_wmm = true;
@@ -870,7 +884,7 @@ static void set_wmm_rule(struct ieee80211_reg_rule *rrule,static int __regdb_query_wmm (const struct fwdb_header *db,const struct fwdb_country *country,int freq, -struct ieee80211_reg_rule *rule) +struct ieee80211_reg_rule *rrule) {unsigned int ptr =be16_to_cpu (country->coll_ptr) <<2 ;struct fwdb_collection *coll = (void *)((u8 *)db + ptr);
@@ -879,18 +893,14 @@ static int __regdb_query_wmm(const struct fwdb_header *db,for (i =0 ; i < coll->n_rules; i++) {__be16 *rules_ptr = (void *)((u8 *)coll +ALIGN (coll->len,2 ));unsigned int rule_ptr =be16_to_cpu (rules_ptr[i]) <<2 ; -struct fwdb_rule *rrule = (void *)((u8 *)db + rule_ptr); -struct fwdb_wmm_rule *wmm; -unsigned int wmm_ptr; +struct fwdb_rule *rule = (void *)((u8 *)db + rule_ptr); - if (rrule->len < offsetofend(struct fwdb_rule, wmm_ptr)) + if (rule->len < offsetofend(struct fwdb_rule, wmm_ptr))continue ; -if (freq >=KHZ_TO_MHZ (be32_to_cpu (rrule->start)) && - freq <=KHZ_TO_MHZ (be32_to_cpu (rrule->end))) { - wmm_ptr =be16_to_cpu (rrule->wmm_ptr) <<2 ; - wmm = (void *)((u8 *)db + wmm_ptr); -set_wmm_rule (rule, wmm); +if (freq >=KHZ_TO_MHZ (be32_to_cpu (rule->start)) && + freq <=KHZ_TO_MHZ (be32_to_cpu (rule->end))) { +set_wmm_rule (db, country, rule, rrule);return 0 ; } }
@@ -972,12 +982,8 @@ static int regdb_query_country(const struct fwdb_header *db, if (rule->len >= offsetofend(struct fwdb_rule, cac_timeout)) rrule->dfs_cac_ms =1000 *be16_to_cpu (rule->cac_timeout); - if (rule->len >= offsetofend(struct fwdb_rule, wmm_ptr)) { -u32 wmm_ptr =be16_to_cpu (rule->wmm_ptr) <<2 ; -struct fwdb_wmm_rule *wmm = (void *)((u8 *)db + wmm_ptr); - -set_wmm_rule (rrule, wmm); - } + if (rule->len >= offsetofend(struct fwdb_rule, wmm_ptr)) +set_wmm_rule (db, country, rule, rrule); }return reg_schedule_apply (regdom);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 89/205 net: lan78xx: Bail out if lan78xx_get_endpoints fails
In reply to Sasha LevinFrom: Stefan Wahren <[email protected]>
[ Upstream commit fa8cd98c06407b5798b927cd7fd14d30f360ed02 ]
We need to bail out if lan78xx_get_endpoints() fails, otherwise the result is overwritten.
--- drivers/net/usb/lan78xx.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/usb/lan78xx.c +5 -0
@@ -2947,6 +2947,11 @@ static int lan78xx_bind(struct lan78xx_net *dev, struct usb_interface *intf)int i; ret =lan78xx_get_endpoints (dev, intf); +if (ret) { +netdev_warn (dev->net,"lan78xx_get_endpoints failed: %d\n" , + ret); +return ret; + } dev->data[0 ] = (unsigned long )kzalloc (sizeof (*pdata),GFP_KERNEL );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 92/205 ath10k: avoid possible memory access violation
In reply to Sasha LevinFrom: "K.T.VIJAYAKUMAAR" <[email protected]>
[ Upstream commit 97c69a70dc2cecb2c3b96a66529e0082dabc2d2c ]
array "ctl_power_table" access index "pream" is initialized with -1 and is raised as a static analysis tool issue. [drivers\net\wireless\ath\ath10k\wmi.c:4719] -> [drivers\net\wireless\ath\ath10k\wmi.c:4730]: (error) Array index -1 is out of bounds.
Since the "pream" index for accessing ctl_power_table array is initialized with -1, there is a chance of memory access violation for the cases below.
1) wmi_pdev_tpc_final_table_event change frequency is between 2483 and 5180
2) pream_idx is out of the enumeration ranges of wmi_tpc_pream_2ghz, wmi_tpc_pream_5ghz
--- drivers/net/wireless/ath/ath10k/wmi.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/net/wireless/ath/ath10k/wmi.c +7 -0
@@ -4785,6 +4785,13 @@ ath10k_wmi_tpc_final_get_rate(struct ath10k *ar, } } +if (pream ==-1 ) { +ath10k_warn (ar,"unknown wmi tpc final index and frequency: %u, %u\n" , + pream_idx,__le32_to_cpu (ev->chan_freq)); + tpc =0 ; + goto out; + } +if (pream ==4 ) tpc =min_t (u8, ev->rates_array[rate_idx], ev->max_reg_allow_pow[ch]);
Signature · 7 lines
2.20.1 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Sasha Levin
maintainerPATCH 94/205 ath10k: wmi: disable softirq's while calling ieee80211_rx
In reply to Sasha LevinFrom: Erik Stromdahl <[email protected]>
[ Upstream commit 37f62c0d5822f631b786b29a1b1069ab714d1a28 ]
This is done in order not to trig the below warning in ieee80211_rx_napi:
WARN_ON_ONCE(softirq_count() == 0);
ieee80211_rx_napi requires that softirq's are disabled during execution.
The High latency bus drivers (SDIO and USB) sometimes call the wmi ep_rx_complete callback from non softirq context, resulting in a trigger of the above warning.
Calling ieee80211_rx_ni with softirq's already disabled (e.g., from softirq context) should be safe as the local_bh_disable and local_bh_enable functions (called from ieee80211_rx_ni) are fully reentrant.
--- drivers/net/wireless/ath/ath10k/wmi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath10k/wmi.c +2 -1
@@ -2487,7 +2487,8 @@ int ath10k_wmi_event_mgmt_rx(struct ath10k *ar, struct sk_buff *skb) status->freq, status->band, status->signal, status->rate_idx); -ieee80211_rx (ar->hw, skb); +ieee80211_rx_ni (ar->hw, skb); +return 0 ; }
Signature · 7 lines
2.20.1 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Sasha Levin
maintainerPATCH 88/205 f2fs: avoid wrong decrypted data from disk
In reply to Sasha LevinFrom: Jaegeuk Kim <[email protected]>
[ Upstream commit 0ded69f632bb717be9aeea3ae74e29050fcb060c ]
1. Create a file in an encrypted directory
2. Do GC & drop caches
3. Read stale data before its bio for metapage was not issued yet
--- fs/f2fs/data.c | 18 ++++++++++-------- fs/f2fs/f2fs.h | 2 +- fs/f2fs/file.c | 3 +-- fs/f2fs/segment.c | 6 +++++- 4 files changed, 17 insertions(+), 12 deletions(-)
fs/f2fs/data.c +10 -8
@@ -575,9 +575,6 @@ static struct bio *f2fs_grab_read_bio(struct inode *inode, block_t blkaddr, ctx->bio = bio; ctx->enabled_steps = post_read_steps; bio->bi_private = ctx; - -/* wait the page to be moved by cleaning */ -f2fs_wait_on_block_writeback (sbi, blkaddr); }return bio;
@@ -592,6 +589,9 @@ static int f2fs_submit_page_read(struct inode *inode, struct page *page,if (IS_ERR (bio))return PTR_ERR (bio); +/* wait for GCed page writeback via META_MAPPING */ +f2fs_wait_on_block_writeback (inode, blkaddr); +if (bio_add_page (bio, page,PAGE_SIZE ,0 ) <PAGE_SIZE ) {bio_put (bio);return -EFAULT ;
@@ -1569,6 +1569,12 @@ submit_and_realloc: } } +/* +* If the page is under writeback, we need to wait for +* its completion to see the correct decrypted data. +*/ +f2fs_wait_on_block_writeback (inode, block_nr); +if (bio_add_page (bio, page, blocksize,0 ) < blocksize) goto submit_and_realloc;
@@ -1637,7 +1643,7 @@ static int encrypt_one_page(struct f2fs_io_info *fio)return 0 ;/* wait for GCed page writeback via META_MAPPING */ -f2fs_wait_on_block_writeback (fio->sbi, fio->old_blkaddr); +f2fs_wait_on_block_writeback (inode, fio->old_blkaddr); retry_encrypt: fio->encrypted_page = fscrypt_encrypt_page(inode, fio->page,
@@ -2402,10 +2408,6 @@ repeat:f2fs_wait_on_page_writeback (page,DATA , false); -/* wait for GCed page writeback via META_MAPPING */ -if (f2fs_post_read_required (inode)) -f2fs_wait_on_block_writeback (sbi, blkaddr); -if (len ==PAGE_SIZE ||PageUptodate (page))return 0 ;
fs/f2fs/f2fs.h +1 -1
@@ -2973,7 +2973,7 @@ void f2fs_allocate_data_block(struct f2fs_sb_info *sbi, struct page *page, struct f2fs_io_info *fio, bool add_list);void f2fs_wait_on_page_writeback (struct page *page,enum page_type type,bool ordered); -void f2fs_wait_on_block_writeback (struct f2fs_sb_info *sbi,block_t blkaddr); +void f2fs_wait_on_block_writeback (struct inode *inode,block_t blkaddr);void f2fs_write_data_summaries (struct f2fs_sb_info *sbi,block_t start_blk);void f2fs_write_node_summaries (struct f2fs_sb_info *sbi,block_t start_blk); int f2fs_lookup_journal_in_cursum(struct f2fs_journal *journal, int type,
fs/f2fs/file.c +1 -2
@@ -112,8 +112,7 @@ mapped:f2fs_wait_on_page_writeback (page,DATA , false);/* wait for GCed page writeback via META_MAPPING */ -if (f2fs_post_read_required (inode)) -f2fs_wait_on_block_writeback (sbi, dn.data_blkaddr); +f2fs_wait_on_block_writeback (inode, dn.data_blkaddr); out_sem:up_read (&F2FS_I (inode)->i_mmap_sem);
fs/f2fs/segment.c +5 -1
@@ -3214,10 +3214,14 @@ void f2fs_wait_on_page_writeback(struct page *page, } } -void f2fs_wait_on_block_writeback (struct f2fs_sb_info *sbi,block_t blkaddr) +void f2fs_wait_on_block_writeback (struct inode *inode,block_t blkaddr) { +struct f2fs_sb_info *sbi =F2FS_I_SB (inode);struct page *cpage; +if (!f2fs_post_read_required (inode)) +return ; +if (!is_valid_data_blkaddr (sbi, blkaddr))return ;
Signature · 8 lines
2.20.1 _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Sasha Levin
maintainerPATCH 91/205 ASoC: sgtl5000: avoid division by zero if lo_vag is zero
In reply to Sasha LevinFrom: Colin Ian King <[email protected]>
[ Upstream commit 9ab708aef61f5620113269a9d1bdb1543d1207d0 ]
In the case where lo_vag <= SGTL5000_LINE_OUT_GND_BASE, lo_vag is set to zero and later vol_quot is computed by dividing by lo_vag causing a division by zero error. Fix this by avoiding a zero division and set vol_quot to zero in this specific case so that the lowest setting for i is correctly set.
--- sound/soc/codecs/sgtl5000.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/sgtl5000.c +1 -1
@@ -1387,7 +1387,7 @@ static int sgtl5000_set_power_regs(struct snd_soc_component *component)* Searching for a suitable index solving this formula: * idx = 40 * log10(vag_val / lo_cagcntrl) + 15 */ - vol_quot = (vag *100 ) / lo_vag; + vol_quot = lo_vag ? (vag *100 ) / lo_vag :0 ; lo_vol =0 ;for (i =0 ; i <ARRAY_SIZE (vol_quot_table); i++) {if (vol_quot >= vol_quot_table[i])
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 97/205 IB/ipoib: Ensure that MTU isn't less than minimum permitted
In reply to Sasha LevinFrom: Muhammad Sammar <[email protected]>
[ Upstream commit 142a9c287613560edf5a03c8d142c8b6ebc1995b ]
It is illegal to change MTU to a value lower than the minimum MTU stated in ethernet spec. In addition to that we need to add 4 bytes for encapsulation header (IPOIB_ENCAP_LEN).
Before "ifconfig ib0 mtu 0" command, succeeds while it obviously shouldn't.
--- drivers/infiniband/ulp/ipoib/ipoib_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/infiniband/ulp/ipoib/ipoib_main.c +2 -1
@@ -243,7 +243,8 @@ static int ipoib_change_mtu(struct net_device *dev, int new_mtu)return 0 ; } -if (new_mtu >IPOIB_UD_MTU (priv->max_ib_mtu)) +if (new_mtu < (ETH_MIN_MTU +IPOIB_ENCAP_LEN ) || + new_mtu >IPOIB_UD_MTU (priv->max_ib_mtu))return -EINVAL ; priv->admin_mtu = new_mtu;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 99/205 RDMA/core: Follow correct unregister order between sysfs and cgroup
In reply to Sasha LevinFrom: Parav Pandit <[email protected]>
[ Upstream commit c715a39541bb399eb03d728a996b224d90ce1336 ]
During register_device() init sequence is,
(a) register with rdma cgroup followed by
(b) register with sysfs
Therefore, unregister_device() sequence should follow the reverse order.
--- drivers/infiniband/core/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/core/device.c +1 -1
@@ -599,8 +599,8 @@ void ib_unregister_device(struct ib_device *device) }up_read (&lists_rwsem); -ib_device_unregister_rdmacg (device);ib_device_unregister_sysfs (device); +ib_device_unregister_rdmacg (device);mutex_unlock (&device_mutex);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 105/205 of: make PowerMac cache node search conditional on CONFIG_PPC_PMAC
In reply to Sasha LevinFrom: Rob Herring <[email protected]>
[ Upstream commit f6707fd6241e483f6fea2caae82d876e422bb11a ]
Cache nodes under the cpu node(s) is PowerMac specific according to the comment above, so make the code enforce that.
--- drivers/of/base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/of/base.c +1 -1
@@ -2066,7 +2066,7 @@ struct device_node *of_find_next_cache_node(const struct device_node *np)/* OF on pmac has nodes instead of properties named "l2-cache" * beneath CPU nodes. */ -if (!strcmp (np->type,"cpu" )) +if (IS_ENABLED (CONFIG_PPC_PMAC ) && !strcmp (np->type,"cpu" ))for_each_child_of_node (np, child)if (!strcmp (child->type,"cache" ))return child;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 112/205 f2fs: submit bio after shutdown
In reply to Sasha LevinFrom: Jaegeuk Kim <[email protected]>
[ Upstream commit 5ce805869cbed93267ed26552ff76e30f05c91f7 ]
Sometimes, some merged IOs could get a chance to be submitted, resulting in system hang in shutdown test. This issues IOs all the time after shutdown.
--- fs/f2fs/data.c | 2 ++ 1 file changed, 2 insertions(+)
fs/f2fs/data.c +2 -0
@@ -543,6 +543,8 @@ skip:if (fio->in_list) goto next; out: +if (is_sbi_flag_set (sbi,SBI_IS_SHUTDOWN )) +__submit_merged_bio (io);up_write (&io->io_rwsem); }
Signature · 8 lines
2.20.1 _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Sasha Levin
maintainerPATCH 114/205 sched/debug: Explicitly cast sched_feat() to bool
In reply to Sasha LevinFrom: Peter Zijlstra <[email protected]>
[ Upstream commit 7e6f4c5d600c1c8e2a1d900e65cab319d9b6782e ]
LLVM has a warning that tags expressions like:
if (foo && non-bool-const)
This pattern triggers for CONFIG_SCHED_DEBUG=n where sched_feat() ends up being whatever bit we select. Avoid the warning with an explicit cast to bool.
--- kernel/sched/sched.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/sched/sched.h +1 -1
@@ -1393,7 +1393,7 @@ static const_debug __maybe_unused unsigned int sysctl_sched_features =0 ;#undef SCHED_FEAT -#define sched_feat (x) (sysctl_sched_features & (1UL << __SCHED_FEAT_##x)) +#define sched_feat (x) !!(sysctl_sched_features & (1UL << __SCHED_FEAT_##x))#endif /* SCHED_DEBUG && CONFIG_JUMP_LABEL */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 83/205 mtd: rawnand: qcom: don't include dma-direct.h
In reply to Sasha LevinFrom: Christoph Hellwig <[email protected]>
[ Upstream commit ab0fb17c7d46406e1aac2dda265874751946626d ]
A recent commit removed the incorrect use of phys_to_dma from this driver, but failed to remove the dma-direct.h include, so do that now.
--- drivers/mtd/nand/raw/qcom_nandc.c | 1 - 1 file changed, 1 deletion(-)
drivers/mtd/nand/raw/qcom_nandc.c +0 -1
@@ -23,7 +23,6 @@#include <linux/of_device.h> #include <linux/delay.h> #include <linux/dma/qcom_bam_dma.h> -#include <linux/dma-direct.h> /* XXX: drivers shall never use this directly! */ /* NANDc reg offsets */ #define NAND_FLASH_CMD 0x00
Signature · 6 lines
2.20.1 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
Sasha Levin
maintainerPATCH 115/205 sched/debug: Use symbolic names for task state constants
In reply to Sasha LevinFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit ff28915fd31ccafc0d38e6f84b66df280ed9e86a ]
include/trace/events/sched.h includes <linux/sched.h> (via <linux/sched/numa_balancing.h>) and so knows about the TASK_* constants used to interpret .prev_state. So instead of duplicating the magic numbers make use of the defined macros to ease understanding the mapping from state bits to letters which isn't completely intuitive for an outsider.
--- include/trace/events/sched.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
include/trace/events/sched.h +8 -3
@@ -169,9 +169,14 @@ TRACE_EVENT(sched_switch, (__entry->prev_state & (TASK_REPORT_MAX -1 )) ?__print_flags (__entry->prev_state & (TASK_REPORT_MAX -1 ),"|" , - { 0x01, "S" }, { 0x02, "D" }, { 0x04, "T" }, - { 0x08, "t" }, { 0x10, "X" }, { 0x20, "Z" }, - { 0x40, "P" }, { 0x80, "I" }) : + { TASK_INTERRUPTIBLE, "S" }, + { TASK_UNINTERRUPTIBLE, "D" }, + { __TASK_STOPPED, "T" }, + { __TASK_TRACED, "t" }, + { EXIT_DEAD, "X" }, + { EXIT_ZOMBIE, "Z" }, + { TASK_PARKED, "P" }, + { TASK_DEAD, "I" }) :"R" , __entry->prev_state & TASK_REPORT_MAX ? "+" : "",
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 120/205 usb: mtu3: disable vbus rise/fall interrupts of ltssm
In reply to Sasha LevinFrom: Chunfeng Yun <[email protected]>
[ Upstream commit 0eae49582b4dee1a0e96007e1dea5122db98371a ]
The vbus rise & fall interrupts are used to enable and disable U3 function of device automatically, this cause some issues when class driver is initialized as deactivated, and will skip over software-controlled connect by pullup(), but UDC wants to keep disconnect until usb_gadget_activate() is called which calls pullup() if needed. So we disable vbus rise & fall interrupts and just use pullup() to enable & disable U3 function, and reset mtu3 state when disconnect instead when vbus fall.
--- drivers/usb/mtu3/mtu3_core.c | 4 ++-- drivers/usb/mtu3/mtu3_gadget.c | 22 ++++++++++++++-------- 2 files changed, 16 insertions(+), 10 deletions(-)
drivers/usb/mtu3/mtu3_core.c +2 -2
@@ -185,8 +185,8 @@ static void mtu3_intr_enable(struct mtu3 *mtu)if (mtu->is_u3_ip) {/* Enable U3 LTSSM interrupts */ - value =HOT_RST_INTR |WARM_RST_INTR |VBUS_RISE_INTR | -VBUS_FALL_INTR |ENTER_U3_INTR |EXIT_U3_INTR ; + value =HOT_RST_INTR |WARM_RST_INTR | +ENTER_U3_INTR |EXIT_U3_INTR ;mtu3_writel (mbase,U3D_LTSSM_INTR_ENABLE , value); }
drivers/usb/mtu3/mtu3_gadget.c +14 -8
@@ -585,6 +585,17 @@ static const struct usb_gadget_ops mtu3_gadget_ops = { .udc_stop = mtu3_gadget_stop, }; +static void mtu3_state_reset (struct mtu3 *mtu) +{ + mtu->address =0 ; + mtu->ep0_state =MU3D_EP0_STATE_SETUP ; + mtu->may_wakeup =0 ; + mtu->u1_enable =0 ; + mtu->u2_enable =0 ; + mtu->delayed_status = false; + mtu->test_mode = false; +} +static void init_hw_ep (struct mtu3 *mtu,struct mtu3_ep *mep,u32 epnum,u32 is_in) {
@@ -702,6 +713,7 @@ void mtu3_gadget_disconnect(struct mtu3 *mtu)spin_lock (&mtu->lock); } +mtu3_state_reset (mtu);usb_gadget_set_state (&mtu->g,USB_STATE_NOTATTACHED ); }
@@ -712,12 +724,6 @@ void mtu3_gadget_reset(struct mtu3 *mtu)/* report disconnect, if we didn't flush EP state */ if (mtu->g.speed !=USB_SPEED_UNKNOWN )mtu3_gadget_disconnect (mtu); - - mtu->address =0 ; - mtu->ep0_state =MU3D_EP0_STATE_SETUP ; - mtu->may_wakeup =0 ; - mtu->u1_enable =0 ; - mtu->u2_enable =0 ; - mtu->delayed_status = false; - mtu->test_mode = false; +else +mtu3_state_reset (mtu); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 121/205 dmaengine: dma-jz4780: Don't depend on MACH_JZ4780
In reply to Sasha LevinFrom: Paul Cercueil <[email protected]>
[ Upstream commit c558ecd21c852c97ff98dc6c61f715ba420ec251 ]
If we make this driver depend on MACH_JZ4780, that means it can be enabled only if we're building a kernel specially crafted for a JZ4780-based board, while most GNU/Linux distributions will want one generic MIPS kernel that works on multiple boards.
--- drivers/dma/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma/Kconfig +1 -1
@@ -143,7 +143,7 @@ config DMA_JZ4740 config DMA_JZ4780 tristate "JZ4780 DMA support" - depends on MACH_JZ4780 || COMPILE_TEST + depends on MIPS || COMPILE_TEST select DMA_ENGINE select DMA_VIRTUAL_CHANNELS help
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 119/205 ARM: dts: exynos: Disable pull control for PMIC IRQ line on Artik5 board
In reply to Sasha LevinFrom: Marek Szyprowski <[email protected]>
[ Upstream commit 62623718fd31d08b26ebea6c8b40f24924153ab7 ]
S2MPS14 PMIC interrupt line on Exynos3250-based Artik5 evaluation board has external pull-up resistors, so disable any pull control for it in controller node. This fixes support for S2MPS14 PMIC interrupts and enables operation of wakeup from S2MPS14 RTC alarm.
--- arch/arm/boot/dts/exynos3250-artik5.dtsi | 7 +++++++ 1 file changed, 7 insertions(+)
arch/arm/boot/dts/exynos3250-artik5.dtsi +7 -0
@@ -69,6 +69,8 @@ compatible = "samsung,s2mps14-pmic"; interrupt-parent = <&gpx3>; interrupts = <5 IRQ_TYPE_NONE>; + pinctrl-names = "default"; + pinctrl-0 = <&s2mps14_irq>; reg = <0x66>; s2mps14_osc: clocks {
@@ -350,6 +352,11 @@ samsung,pin-drv = <EXYNOS4_PIN_DRV_LV3>; samsung,pin-val = <1>; }; + + s2mps14_irq: s2mps14-irq { + samsung,pins = "gpx3-5"; + samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; + }; }; &rtc {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 116/205 firmware: arm_scmi: use strlcpy to ensure NULL-terminated strings
In reply to Sasha LevinFrom: Sudeep Holla <[email protected]>
[ Upstream commit ca64b719a1e665ac7449b6a968059176af7365a8 ]
Replace all the memcpy() for copying name strings from the firmware with strlcpy() to make sure we are bounded by the source buffer size and we also always have NULL-terminated strings.
This is needed to avoid out of bounds accesses if the firmware returns a non-terminated string.
--- drivers/firmware/arm_scmi/base.c | 2 +- drivers/firmware/arm_scmi/clock.c | 2 +- drivers/firmware/arm_scmi/perf.c | 2 +- drivers/firmware/arm_scmi/power.c | 2 +- drivers/firmware/arm_scmi/sensors.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
drivers/firmware/arm_scmi/base.c +1 -1
@@ -208,7 +208,7 @@ static int scmi_base_discover_agent_get(const struct scmi_handle *handle, ret =scmi_do_xfer (handle, t);if (!ret) -memcpy (name, t->rx.buf,SCMI_MAX_STR_SIZE ); +strlcpy (name, t->rx.buf,SCMI_MAX_STR_SIZE );scmi_xfer_put (handle, t);
drivers/firmware/arm_scmi/clock.c +1 -1
@@ -111,7 +111,7 @@ static int scmi_clock_attributes_get(const struct scmi_handle *handle, ret =scmi_do_xfer (handle, t);if (!ret) -memcpy (clk->name, attr->name,SCMI_MAX_STR_SIZE ); +strlcpy (clk->name, attr->name,SCMI_MAX_STR_SIZE );else clk->name[0 ] ='\0' ;
drivers/firmware/arm_scmi/perf.c +1 -1
@@ -174,7 +174,7 @@ scmi_perf_domain_attributes_get(const struct scmi_handle *handle, u32 domain, dom_info->mult_factor = (dom_info->sustained_freq_khz *1000 ) / dom_info->sustained_perf_level; -memcpy (dom_info->name, attr->name,SCMI_MAX_STR_SIZE ); +strlcpy (dom_info->name, attr->name,SCMI_MAX_STR_SIZE ); }scmi_xfer_put (handle, t);
drivers/firmware/arm_scmi/power.c +1 -1
@@ -106,7 +106,7 @@ scmi_power_domain_attributes_get(const struct scmi_handle *handle, u32 domain, dom_info->state_set_notify =SUPPORTS_STATE_SET_NOTIFY (flags); dom_info->state_set_async =SUPPORTS_STATE_SET_ASYNC (flags); dom_info->state_set_sync =SUPPORTS_STATE_SET_SYNC (flags); -memcpy (dom_info->name, attr->name,SCMI_MAX_STR_SIZE ); +strlcpy (dom_info->name, attr->name,SCMI_MAX_STR_SIZE ); }scmi_xfer_put (handle, t);
drivers/firmware/arm_scmi/sensors.c +1 -1
@@ -140,7 +140,7 @@ static int scmi_sensor_description_get(const struct scmi_handle *handle, s = &si->sensors[desc_index + cnt]; s->id =le32_to_cpu (buf->desc[cnt].id); s->type =SENSOR_TYPE (attrh); -memcpy (s->name, buf->desc[cnt].name,SCMI_MAX_STR_SIZE ); +strlcpy (s->name, buf->desc[cnt].name,SCMI_MAX_STR_SIZE ); } desc_index += num_returned;
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 131/205 signal: Always ignore SIGKILL and SIGSTOP sent to the global init
In reply to Sasha LevinFrom: "Eric W. Biederman" <[email protected]>
[ Upstream commit 86989c41b5ea08776c450cb759592532314a4ed6 ]
If the first process started (aka /sbin/init) receives a SIGKILL it will panic the system if it is delivered. Making the system unusable and undebugable. It isn't much better if the first process started receives SIGSTOP.
So always ignore SIGSTOP and SIGKILL sent to init.
This is done in a separate clause in sig_task_ignored as force_sig_info can clear SIG_UNKILLABLE and this protection should work even then.
--- kernel/signal.c | 4 ++++ 1 file changed, 4 insertions(+)
kernel/signal.c +4 -0
@@ -78,6 +78,10 @@ static bool sig_task_ignored(struct task_struct *t, int sig, bool force) handler =sig_handler (t, sig); +/* SIGKILL and SIGSTOP may not be sent to the global init */ +if (unlikely (is_global_init (t) &&sig_kernel_only (sig))) +return true; +if (unlikely (t->signal->flags &SIGNAL_UNKILLABLE ) && handler ==SIG_DFL && !(force &&sig_kernel_only (sig)))return true;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 134/205 f2fs: fix memory leak of write_io in fill_super()
In reply to Sasha LevinFrom: Chao Yu <[email protected]>
[ Upstream commit 0b2103e886e6de9802e1170e57c573443286a483 ]
It needs to release memory allocated for sbi->write_io in error path, otherwise, it will cause memory leak.
--- fs/f2fs/super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/f2fs/super.c +1 -1
@@ -2923,7 +2923,7 @@ try_onemore: GFP_KERNEL);if (!sbi->write_io[i]) { err = -ENOMEM ; - goto free_options; + goto free_bio_info; }for (j =HOT ; j < n; j++) {
Signature · 8 lines
2.20.1 _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Sasha Levin
maintainerPATCH 133/205 signal: Properly deliver SIGSEGV from x86 uprobes
In reply to Sasha LevinFrom: "Eric W. Biederman" <[email protected]>
[ Upstream commit 4a63c1ffd384ebdce40aac9c997dab68379137be ]
For userspace to tell the difference between an random signal and an exception, the exception must include siginfo information.
Using SEND_SIG_FORCED for SIGSEGV is thus wrong, and it will result in userspace seeing si_code == SI_USER (like a random signal) instead of si_code == SI_KERNEL or a more specific si_code as all exceptions deliver.
Therefore replace force_sig_info(SIGSEGV, SEND_SIG_FORCE, current) with force_sig(SIG_SEGV, current) which gets this right and is shorter and easier to type.
--- arch/x86/kernel/uprobes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/uprobes.c +1 -1
@@ -1089,7 +1089,7 @@ arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regspr_err ("return address clobbered: pid=%d, %%sp=%#lx, %%ip=%#lx\n" , current->pid, regs->sp, regs->ip); -force_sig_info (SIGSEGV ,SEND_SIG_FORCED , current); +force_sig (SIGSEGV , current); }return -1 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 135/205 f2fs: fix memory leak of percpu counter in fill_super()
In reply to Sasha LevinFrom: Chao Yu <[email protected]>
[ Upstream commit 4a70e255449c9a13eed7a6eeecc85a1ea63cef76 ]
In fill_super -> init_percpu_info, we should destroy percpu counter in error path, otherwise memory allcoated for percpu counter will leak.
--- fs/f2fs/super.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
fs/f2fs/super.c +5 -1
@@ -2510,8 +2510,12 @@ static int init_percpu_info(struct f2fs_sb_info *sbi)if (err)return err; -return percpu_counter_init (&sbi->total_valid_inode_count,0 , + err =percpu_counter_init (&sbi->total_valid_inode_count,0 ,GFP_KERNEL ); +if (err) +percpu_counter_destroy (&sbi->alloc_valid_block_count); + +return err; }#ifdef CONFIG_BLK_DEV_ZONED
Signature · 8 lines
2.20.1 _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Sasha Levin
maintainerPATCH 136/205 f2fs: fix setattr project check upon fssetxattr ioctl
In reply to Sasha LevinFrom: Wang Shilong <[email protected]>
[ Upstream commit c8e927579e00a182eda07e4c45df9c8c699c8ded ]
Currently, project quota could be changed by fssetxattr ioctl, and existed permission check inode_owner_or_capable() is obviously not enough, just think that common users could change project id of file, that could make users to break project quota easily.
This patch try to follow same regular of xfs project quota:
"Project Quota ID state is only allowed to change from within the init namespace. Enforce that restriction only if we are trying to change the quota ID state. Everything else is allowed in user namespaces."
Besides that, check and set project id'state should be an atomic operation, protect whole operation with inode lock.
--- fs/f2fs/file.c | 60 +++++++++++++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 23 deletions(-)
fs/f2fs/file.c +37 -23
@@ -2618,34 +2618,26 @@ static int f2fs_ioc_setproject(struct file *filp, __u32 projid)if (projid_eq (kprojid,F2FS_I (inode)->i_projid))return 0 ; - err =mnt_want_write_file (filp); -if (err) -return err; - err = -EPERM ; -inode_lock (inode); -/* Is it quota file? Do not allow user to mess with it */ if (IS_NOQUOTA (inode)) - goto out_unlock; +return err; ipage =f2fs_get_node_page (sbi, inode->i_ino); -if (IS_ERR (ipage)) { - err =PTR_ERR (ipage); - goto out_unlock; - } +if (IS_ERR (ipage)) +return PTR_ERR (ipage);if (!F2FS_FITS_IN_INODE (F2FS_INODE (ipage), fi->i_extra_isize, i_projid)) { err = -EOVERFLOW ;f2fs_put_page (ipage,1 ); - goto out_unlock; +return err; }f2fs_put_page (ipage,1 ); err =dquot_initialize (inode);if (err) - goto out_unlock; +return err; transfer_to[PRJQUOTA ] =dqget (sb,make_kqid_projid (kprojid));if (!IS_ERR (transfer_to[PRJQUOTA ])) {
@@ -2659,9 +2651,6 @@ static int f2fs_ioc_setproject(struct file *filp, __u32 projid) inode->i_ctime =current_time (inode); out_dirty:f2fs_mark_inode_dirty_sync (inode, true); -out_unlock: -inode_unlock (inode); -mnt_drop_write_file (filp); return err; }#else
@@ -2737,6 +2726,30 @@ static int f2fs_ioc_fsgetxattr(struct file *filp, unsigned long arg)return 0 ; } +static int f2fs_ioctl_check_project (struct inode *inode,struct fsxattr *fa) +{ +/* +* Project Quota ID state is only allowed to change from within the init +* namespace. Enforce that restriction only if we are trying to change +* the quota ID state. Everything else is allowed in user namespaces. +*/ +if (current_user_ns () == &init_user_ns) +return 0 ; + +if (__kprojid_val (F2FS_I (inode)->i_projid) != fa->fsx_projid) +return -EINVAL ; + +if (F2FS_I (inode)->i_flags &F2FS_PROJINHERIT_FL ) { +if (!(fa->fsx_xflags &FS_XFLAG_PROJINHERIT )) +return -EINVAL ; + }else { +if (fa->fsx_xflags &FS_XFLAG_PROJINHERIT ) +return -EINVAL ; + } + +return 0 ; +} +static int f2fs_ioc_fssetxattr (struct file *filp,unsigned long arg) {struct inode *inode =file_inode (filp);
@@ -2764,19 +2777,20 @@ static int f2fs_ioc_fssetxattr(struct file *filp, unsigned long arg)return err;inode_lock (inode); + err =f2fs_ioctl_check_project (inode, &fa); +if (err) + goto out; flags = (fi->i_flags & ~F2FS_FL_XFLAG_VISIBLE ) | (flags &F2FS_FL_XFLAG_VISIBLE ); err =__f2fs_ioc_setflags (inode, flags); -inode_unlock (inode); -mnt_drop_write_file (filp);if (err) -return err; + goto out; err =f2fs_ioc_setproject (filp, fa.fsx_projid); -if (err) -return err; - -return 0 ; +out: +inode_unlock (inode); +mnt_drop_write_file (filp); +return err; }int f2fs_pin_file_control (struct inode *inode,bool inc)
Signature · 8 lines
2.20.1 _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Sasha Levin
maintainerPATCH 143/205 scsi: qla2xxx: Check for Register disconnect
In reply to Sasha LevinFrom: Sawan Chandak <[email protected]>
[ Upstream commit f99c5d294b3653e6ae563eaac5db5b4138afe31c ]
During adapter shutdown process check for register disconnect before proceeding to call PCI functions.
--- drivers/scsi/qla2xxx/qla_os.c | 1 + 1 file changed, 1 insertion(+)
drivers/scsi/qla2xxx/qla_os.c +1 -0
@@ -1744,6 +1744,7 @@ __qla2x00_abort_all_cmds(struct qla_qpair *qp, int res) !ha->flags.eeh_busy && (!test_bit (ABORT_ISP_ACTIVE , &vha->dpc_flags)) && + !qla2x00_isp_reg_stat (ha) && (sp->type == SRB_SCSI_CMD)) {/* * Don't abort commands in
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 128/205 dmaengine: at_xdmac: remove a stray bottom half unlock
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit 0b515abb6b7eb08e90bdfc01fc8fbdd112c15d81 ]
We switched this code from spin_lock_bh() to vanilla spin_lock() but there was one stray spin_unlock_bh() that was overlooked. This patch converts it to spin_unlock() as well.
--- drivers/dma/at_xdmac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma/at_xdmac.c +1 -1
@@ -1608,7 +1608,7 @@ static void at_xdmac_tasklet(unsigned long data)dev_vdbg (chan2dev (&atchan->chan),"%s: desc 0x%p\n" , __func__, desc);if (!desc->active_xfer) {dev_err (chan2dev (&atchan->chan),"Xfer not active: exiting" ); -spin_unlock_bh (&atchan->lock); +spin_unlock (&atchan->lock);return ; }
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 139/205 scsi: qla2xxx: Defer chip reset until target mode is enabled
In reply to Sasha LevinFrom: Quinn Tran <[email protected]>
[ Upstream commit 93eca6135183f7a71e36acd47655a085ed11bcdc ]
For target mode, any chip reset triggered before target mode is enabled will be held off until user is ready to enable. This prevents the chip from starting or running before it is intended.
--- drivers/scsi/qla2xxx/qla_os.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-)
drivers/scsi/qla2xxx/qla_os.c +21 -7
@@ -6051,12 +6051,27 @@ qla2x00_do_dpc(void *data)if (test_and_clear_bit (ISP_ABORT_NEEDED , &base_vha->dpc_flags) && !test_bit (UNLOADING , &base_vha->dpc_flags)) { +bool do_reset = true; + +switch (ql2x_ini_mode) { +case QLA2XXX_INI_MODE_ENABLED : +break ; +case QLA2XXX_INI_MODE_DISABLED : +if (!qla_tgt_mode_enabled (base_vha)) + do_reset = false; +break ; +case QLA2XXX_INI_MODE_DUAL : +if (!qla_dual_mode_enabled (base_vha)) + do_reset = false; +break ; +default : +break ; + } -ql_dbg (ql_dbg_dpc, base_vha,0x4007 , -"ISP abort scheduled.\n" ); -if (!(test_and_set_bit (ABORT_ISP_ACTIVE , +if (do_reset && !(test_and_set_bit (ABORT_ISP_ACTIVE , &base_vha->dpc_flags))) { - +ql_dbg (ql_dbg_dpc, base_vha,0x4007 , +"ISP abort scheduled.\n" );if (ha->isp_ops->abort_isp (base_vha)) {/* failed. retry later */ set_bit(ISP_ABORT_NEEDED,
@@ -6064,10 +6079,9 @@ qla2x00_do_dpc(void *data) }clear_bit (ABORT_ISP_ACTIVE , &base_vha->dpc_flags); +ql_dbg (ql_dbg_dpc, base_vha,0x4008 , +"ISP abort end.\n" ); } - -ql_dbg (ql_dbg_dpc, base_vha,0x4008 , -"ISP abort end.\n" ); } if (test_and_clear_bit(FCPORT_UPDATE_NEEDED,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 144/205 scsi: qla2xxx: Fix port speed display on chip reset
In reply to Sasha LevinFrom: Quinn Tran <[email protected]>
[ Upstream commit 5d74c87a20adcc77b19753c315ad9c320b2288be ]
Clear port speed value on chip reset.
--- drivers/scsi/qla2xxx/qla_init.c | 1 + 1 file changed, 1 insertion(+)
drivers/scsi/qla2xxx/qla_init.c +1 -0
@@ -6502,6 +6502,7 @@ qla2x00_abort_isp_cleanup(scsi_qla_host_t *vha)if (!(IS_P3P_TYPE (ha))) ha->isp_ops->reset_chip (vha); + ha->link_data_rate =PORT_SPEED_UNKNOWN ;SAVE_TOPO (ha); ha->flags.rida_fmt2 =0 ; ha->flags.n2n_ae =0 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 149/205 scsi: lpfc: Fix errors in log messages.
In reply to Sasha LevinFrom: James Smart <[email protected]>
[ Upstream commit 2879265f514b1f4154288243c91438ddbedb3ed4 ]
Message 6408 is displayed for each entry in an array, but the cpu and queue numbers were incorrect for the entry. Message 6001 includes an extraneous character.
Resolve both issues
--- drivers/scsi/lpfc/lpfc_nvme.c | 2 +- drivers/scsi/lpfc/lpfc_nvmet.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-)
drivers/scsi/lpfc/lpfc_nvme.c +1 -1
@@ -282,7 +282,7 @@ lpfc_nvme_delete_queue(struct nvme_fc_local_port *pnvme_lport, vport = lport->vport;lpfc_printf_vlog (vport,KERN_INFO ,LOG_NVME , -"6001 ENTER. lpfc_pnvme %p, qidx x%xi qhandle %p\n" , +"6001 ENTER. lpfc_pnvme %p, qidx x%x qhandle %p\n" , lport, qidx, handle);kfree (handle); }
drivers/scsi/lpfc/lpfc_nvmet.c +3 -4
@@ -1340,15 +1340,14 @@ lpfc_nvmet_setup_io_context(struct lpfc_hba *phba) idx =0 ; } - infop = phba->sli4_hba.nvmet_ctx_info; -for (j =0 ; j < phba->cfg_nvmet_mrq; j++) { -for (i =0 ; i < phba->sli4_hba.num_present_cpu; i++) { +for (i =0 ; i < phba->sli4_hba.num_present_cpu; i++) { +for (j =0 ; j < phba->cfg_nvmet_mrq; j++) { + infop =lpfc_get_ctx_list (phba, i, j);lpfc_printf_log (phba,KERN_INFO ,LOG_NVME |LOG_INIT ,"6408 TOTAL NVMET ctx for CPU %d " "MRQ %d: cnt %d nextcpu %p\n" , i, j, infop->nvmet_ctx_list_cnt, infop->nvmet_ctx_next_cpu); - infop++; } }return 0 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 152/205 scsi: pm80xx: Corrected dma_unmap_sg() parameter
In reply to Sasha LevinFrom: Deepak Ukey <[email protected]>
[ Upstream commit 76cb25b058034d37244be6aca97a2ad52a5fbcad ]
For the function dma_unmap_sg(), the <nents> parameter should be number of elements in the scatter list prior to the mapping, not after the mapping.
--- drivers/scsi/pm8001/pm8001_sas.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/pm8001/pm8001_sas.c +1 -1
@@ -466,7 +466,7 @@ err_out:dev_printk (KERN_ERR , pm8001_ha->dev,"pm8001 exec failed[%d]!\n" , rc);if (!sas_protocol_ata (t->task_proto))if (n_elem) -dma_unmap_sg (pm8001_ha->dev, t->scatter, n_elem, +dma_unmap_sg (pm8001_ha->dev, t->scatter, t->num_scatter, t->data_dir); out_done:spin_unlock_irqrestore (&pm8001_ha->lock, flags);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 151/205 ARM: imx6: register pm_power_off handler if "fsl,pmic-stby-poweroff" is set
In reply to Sasha LevinFrom: Oleksij Rempel <[email protected]>
[ Upstream commit 8148d2136002da2e2887caf6a07bbd9c033f14f3 ]
One of the Freescale recommended sequences for power off with external PMIC is the following:
...
3. SoC is programming PMIC for power off when standby is asserted.
4. In CCM STOP mode, Standby is asserted, PMIC gates SoC supplies.
See:
http://www.nxp.com/assets/documents/data/en/reference-manuals/IMX6DQRM.pdf
page 5083
This patch implements step 4. of this sequence.
--- arch/arm/mach-imx/pm-imx6.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
arch/arm/mach-imx/pm-imx6.c +25 -0
@@ -618,6 +618,28 @@ static void __init imx6_pm_common_init(const struct imx6_pm_socdata IMX6Q_GPR1_GINT); } +static void imx6_pm_stby_poweroff (void ) +{ +imx6_set_lpm (STOP_POWER_OFF ); +imx6q_suspend_finish (0 ); + +mdelay (1000 ); + +pr_emerg ("Unable to poweroff system\n" ); +} + +static int imx6_pm_stby_poweroff_probe (void ) +{ +if (pm_power_off) { +pr_warn ("%s: pm_power_off already claimed %p %pf!\n" , + __func__, pm_power_off, pm_power_off); +return -EBUSY ; + } + + pm_power_off = imx6_pm_stby_poweroff; +return 0 ; +} +void __init imx6_pm_ccm_init (const char *ccm_compat) {struct device_node *np;
@@ -634,6 +656,9 @@ void __init imx6_pm_ccm_init(const char *ccm_compat) val =readl_relaxed (ccm_base +CLPCR ); val &= ~BM_CLPCR_LPM ;writel_relaxed (val, ccm_base +CLPCR ); + +if (of_property_read_bool (np,"fsl,pmic-stby-poweroff" )) +imx6_pm_stby_poweroff_probe (); }void __init imx6q_pm_init (void )
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 153/205 scsi: pm80xx: Fixed system hang issue during kexec boot
In reply to Sasha LevinFrom: Deepak Ukey <[email protected]>
[ Upstream commit 72349b62a571effd6faadd0600b8e657dd87afbf ]
When the firmware is not responding, execution of kexec boot causes a system hang. When firmware assertion happened, driver get notified with interrupt vector updated in MPI configuration table. Then, the driver will read scratchpad register and set controller_fatal_error flag to true.
--- drivers/scsi/pm8001/pm8001_hwi.c | 6 +++ drivers/scsi/pm8001/pm8001_sas.c | 7 +++ drivers/scsi/pm8001/pm8001_sas.h | 1 + drivers/scsi/pm8001/pm80xx_hwi.c | 80 +++++++++++++++++++++++++++++--- drivers/scsi/pm8001/pm80xx_hwi.h | 3 ++ 5 files changed, 91 insertions(+), 6 deletions(-)
drivers/scsi/pm8001/pm8001_hwi.c +6 -0
@@ -1479,6 +1479,12 @@ u32 pm8001_mpi_msg_consume(struct pm8001_hba_info *pm8001_ha, }else {u32 producer_index;void *pi_virt = circularQ->pi_virt; +/* spurious interrupt during setup if +* kexec-ing and driver doing a doorbell access +* with the pre-kexec oq interrupt setup +*/ +if (!pi_virt) +break ;/* Update the producer index from SPC */ producer_index =pm8001_read_32 (pi_virt); circularQ->producer_index =cpu_to_le32 (producer_index);
drivers/scsi/pm8001/pm8001_sas.c +7 -0
@@ -374,6 +374,13 @@ static int pm8001_task_exec(struct sas_task *task,return 0 ; } pm8001_ha =pm8001_find_ha_by_dev (task->dev); +if (pm8001_ha->controller_fatal_error) { +struct task_status_struct *ts = &t->task_status; + + ts->resp =SAS_TASK_UNDELIVERED ; + t->task_done (t); +return 0 ; + }PM8001_IO_DBG (pm8001_ha,pm8001_printk ("pm8001_task_exec device \n " ));spin_lock_irqsave (&pm8001_ha->lock, flags); do {
drivers/scsi/pm8001/pm8001_sas.h +1 -0
@@ -538,6 +538,7 @@ struct pm8001_hba_info {u32 logging_level;u32 fw_status;u32 smp_exp_mode; +bool controller_fatal_error;const struct firmware *fw_image;struct isr_param irq_vector[PM8001_MAX_MSIX_VEC ];u32 reset_in_progress;
drivers/scsi/pm8001/pm80xx_hwi.c +74 -6
115 lines not on this page · raw message
drivers/scsi/pm8001/pm80xx_hwi.h +3 -0
@@ -1384,6 +1384,9 @@ typedef struct SASProtocolTimerConfig SASProtocolTimerConfig_t;#define SCRATCH_PAD_BOOT_LOAD_SUCCESS 0x0#define SCRATCH_PAD_IOP0_READY 0xC00#define SCRATCH_PAD_IOP1_READY 0x3000 +#define SCRATCH_PAD_MIPSALL_READY (SCRATCH_PAD_IOP1_READY | \ + SCRATCH_PAD_IOP0_READY | \ + SCRATCH_PAD_RAAE_READY)/* boot loader state */ #define SCRATCH_PAD1_BOOTSTATE_MASK 0x70/* Bit 4-6 */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 155/205 net: aquantia: fix hw_atl_utils_fw_upload_dwords
In reply to Sasha LevinFrom: Yana Esina <[email protected]>
[ Upstream commit 3ee5c8873fd369e2005dc93bf6d4b299b4976e68 ]
This patch fixes the upload function, which worked incorrectly with some chips.
--- .../aquantia/atlantic/hw_atl/hw_atl_llh.c | 8 +++++ .../aquantia/atlantic/hw_atl/hw_atl_llh.h | 3 ++ .../atlantic/hw_atl/hw_atl_llh_internal.h | 13 +++++++ .../aquantia/atlantic/hw_atl/hw_atl_utils.c | 36 +++++++++++++------ .../aquantia/atlantic/hw_atl/hw_atl_utils.h | 5 +++ .../atlantic/hw_atl/hw_atl_utils_fw2x.c | 5 +++ 6 files changed, 59 insertions(+), 11 deletions(-)
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c +8 -0
@@ -1468,3 +1468,11 @@ void hw_atl_reg_glb_cpu_scratch_scp_set(struct aq_hw_s *aq_hw,aq_hw_write_reg (aq_hw,HW_ATL_GLB_CPU_SCRATCH_SCP_ADR (scratch_scp), glb_cpu_scratch_scp); } + +void hw_atl_mcp_up_force_intr_set (struct aq_hw_s *aq_hw,u32 up_force_intr) +{ +aq_hw_write_reg_bit (aq_hw,HW_ATL_MCP_UP_FORCE_INTERRUPT_ADR , +HW_ATL_MCP_UP_FORCE_INTERRUPT_MSK , +HW_ATL_MCP_UP_FORCE_INTERRUPT_SHIFT , + up_force_intr); +}
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h +3 -0
@@ -701,4 +701,7 @@ void hw_atl_msm_reg_wr_strobe_set(struct aq_hw_s *aq_hw, u32 reg_wr_strobe);/* set pci register reset disable */ void hw_atl_pci_pci_reg_res_dis_set (struct aq_hw_s *aq_hw,u32 pci_reg_res_dis); +/* set uP Force Interrupt */ +void hw_atl_mcp_up_force_intr_set (struct aq_hw_s *aq_hw,u32 up_force_intr); +#endif /* HW_ATL_LLH_H */
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh_internal.h +13 -0
@@ -2405,4 +2405,17 @@#define HW_ATL_GLB_CPU_SCRATCH_SCP_ADR (scratch_scp) \ (0x00000300u + (scratch_scp) * 0x4) +/* register address for bitfield uP Force Interrupt */ +#define HW_ATL_MCP_UP_FORCE_INTERRUPT_ADR 0x00000404 +/* bitmask for bitfield uP Force Interrupt */ +#define HW_ATL_MCP_UP_FORCE_INTERRUPT_MSK 0x00000002 +/* inverted bitmask for bitfield uP Force Interrupt */ +#define HW_ATL_MCP_UP_FORCE_INTERRUPT_MSKN 0xFFFFFFFD +/* lower bit position of bitfield uP Force Interrupt */ +#define HW_ATL_MCP_UP_FORCE_INTERRUPT_SHIFT 1 +/* width of bitfield uP Force Interrupt */ +#define HW_ATL_MCP_UP_FORCE_INTERRUPT_WIDTH 1 +/* default value of bitfield uP Force Interrupt */ +#define HW_ATL_MCP_UP_FORCE_INTERRUPT_DEFAULT 0x0 +#endif /* HW_ATL_LLH_INTERNAL_H */
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c +25 -11
@@ -327,17 +327,31 @@ static int hw_atl_utils_fw_upload_dwords(struct aq_hw_s *self, u32 a, u32 *p, err = -ETIME ; goto err_exit; } +if (IS_CHIP_FEATURE (REVISION_B1 )) { +u32 offset =0 ; + +for (; offset < cnt; ++offset) { +aq_hw_write_reg (self,0x328 , p[offset]); +aq_hw_write_reg (self,0x32C , + (0x80000000 | (0xFFFF & (offset *4 )))); +hw_atl_mcp_up_force_intr_set (self,1 ); +/* 1000 times by 10us = 10ms */ +AQ_HW_WAIT_FOR ((aq_hw_read_reg (self, +0x32C ) &0xF0000000 ) != +0x80000000 , +10 ,1000 ); + } + }else { +u32 offset =0 ; -aq_hw_write_reg (self,0x00000208U , a); - -for (++cnt; --cnt;) { -u32 i =0U ; +aq_hw_write_reg (self,0x208 , a); -aq_hw_write_reg (self,0x0000020CU , *(p++)); -aq_hw_write_reg (self,0x00000200U ,0xC000U ); +for (; offset < cnt; ++offset) { +aq_hw_write_reg (self,0x20C , p[offset]); +aq_hw_write_reg (self,0x200 ,0xC000 ); -for (i =1024U ; - (0x100U &aq_hw_read_reg (self,0x00000200U )) && --i;) { +AQ_HW_WAIT_FOR ((aq_hw_read_reg (self,0x200U ) & +0x100 ) ==0 ,10 ,1000 ); } }
@@ -401,7 +415,7 @@ struct aq_hw_atl_utils_fw_rpc_tid_s {#define hw_atl_utils_fw_rpc_init (_H_) hw_atl_utils_fw_rpc_wait(_H_, NULL) -static int hw_atl_utils_fw_rpc_call (struct aq_hw_s *self,unsigned int rpc_size) +int hw_atl_utils_fw_rpc_call (struct aq_hw_s *self,unsigned int rpc_size) {int err =0 ;struct aq_hw_atl_utils_fw_rpc_tid_s sw;
@@ -425,8 +439,8 @@ err_exit:return err; } -static int hw_atl_utils_fw_rpc_wait (struct aq_hw_s *self, -struct hw_aq_atl_utils_fw_rpc **rpc) +int hw_atl_utils_fw_rpc_wait (struct aq_hw_s *self, +struct hw_aq_atl_utils_fw_rpc **rpc) {int err =0 ;struct aq_hw_atl_utils_fw_rpc_tid_s sw;
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h +5 -0
@@ -319,6 +319,11 @@ struct aq_stats_s *hw_atl_utils_get_hw_stats(struct aq_hw_s *self);int hw_atl_utils_fw_downld_dwords (struct aq_hw_s *self,u32 a,u32 *p,u32 cnt); +int hw_atl_utils_fw_rpc_call (struct aq_hw_s *self,unsigned int rpc_size); + +int hw_atl_utils_fw_rpc_wait (struct aq_hw_s *self, +struct hw_aq_atl_utils_fw_rpc **rpc); +extern const struct aq_fw_ops aq_fw_1x_ops;extern const struct aq_fw_ops aq_fw_2x_ops;
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c +5 -0
@@ -21,6 +21,7 @@#define HW_ATL_FW2X_MPI_EFUSE_ADDR 0x364#define HW_ATL_FW2X_MPI_MBOX_ADDR 0x360 +#define HW_ATL_FW2X_MPI_RPC_ADDR 0x334#define HW_ATL_FW2X_MPI_CONTROL_ADDR 0x368#define HW_ATL_FW2X_MPI_CONTROL2_ADDR 0x36C
@@ -40,6 +41,10 @@ static int aq_fw2x_init(struct aq_hw_s *self)AQ_HW_WAIT_FOR (0U != (self->mbox_addr =aq_hw_read_reg (self,HW_ATL_FW2X_MPI_MBOX_ADDR )),1000U ,10U ); +AQ_HW_WAIT_FOR (0U != (self->rpc_addr = +aq_hw_read_reg (self,HW_ATL_FW2X_MPI_RPC_ADDR )), +1000U ,100U ); +return err; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 156/205 Drivers: hv: vmbus: Fix synic per-cpu context initialization
In reply to Sasha LevinFrom: Michael Kelley <[email protected]>
[ Upstream commit f25a7ece08bdb1f2b3c4bbeae942682fc3a99dde ]
If hv_synic_alloc() errors out, the state of the per-cpu context for some CPUs is unknown since the zero'ing is done as each CPU is iterated over. In such case, hv_synic_cleanup() may try to free memory based on uninitialized values. Fix this by zero'ing the per-cpu context for all CPUs before doing any memory allocations that might fail.
--- drivers/hv/hv.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
drivers/hv/hv.c +12 -3
@@ -189,6 +189,17 @@ static void hv_init_clockevent_device(struct clock_event_device *dev, int cpu)int hv_synic_alloc (void ) {int cpu; +struct hv_per_cpu_context *hv_cpu; + +/* +* First, zero all per-cpu memory areas so hv_synic_free() can +* detect what memory has been allocated and cleanup properly +* after any failures. +*/ +for_each_present_cpu (cpu) { + hv_cpu =per_cpu_ptr (hv_context.cpu_context, cpu); +memset (hv_cpu,0 ,sizeof (*hv_cpu)); + } hv_context.hv_numa_map =kcalloc (nr_node_ids,sizeof (struct cpumask ),GFP_KERNEL );
@@ -198,10 +209,8 @@ int hv_synic_alloc(void) }for_each_present_cpu (cpu) { -struct hv_per_cpu_context *hv_cpu - =per_cpu_ptr (hv_context.cpu_context, cpu); + hv_cpu =per_cpu_ptr (hv_context.cpu_context, cpu); -memset (hv_cpu,0 ,sizeof (*hv_cpu));tasklet_init (&hv_cpu->msg_dpc, vmbus_on_msg_dpc, (unsigned long ) hv_cpu);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 157/205 nvmem: core: return error code instead of NULL from nvmem_device_get
In reply to Sasha LevinFrom: Srinivas Kandagatla <[email protected]>
[ Upstream commit ca6ac25cecf0e740d7cc8e03e0ebbf8acbeca3df ]
nvmem_device_get() should return ERR_PTR() on error or valid pointer on success, but one of the code path seems to return NULL, so fix it.
--- drivers/nvmem/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvmem/core.c +1 -1
@@ -692,7 +692,7 @@ static struct nvmem_device *nvmem_find(const char *name) d =bus_find_device_by_name (&nvmem_bus_type,NULL , name);if (!d) -return NULL ; +return ERR_PTR (-ENOENT );return to_nvmem_device (d); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 159/205 ALSA: hda: Fix implicit definition of pci_iomap() on SH
In reply to Sasha LevinFrom: Mark Brown <[email protected]>
[ Upstream commit d9b84a15892c02334ac8a5c28865ae54168d9b22 ]
Include asm/io.h directly so we've got a definition of pci_iomap(), the current set of includes do this implicitly on most architectures but not on SH.
--- sound/pci/hda/patch_ca0132.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_ca0132.c +1 -0
@@ -31,6 +31,7 @@#include <linux/types.h> #include <linux/io.h> #include <linux/pci.h> +#include <asm/io.h> #include <sound/core.h> #include "hda_codec.h" #include "hda_local.h"
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 163/205 arm64: dts: meson: libretech: update board model
In reply to Sasha LevinFrom: Jerome Brunet <[email protected]>
[ Upstream commit b7eb0e26cc4a212fde09144cd49d4103170d2b9e ]
There is actually several different libretech board with the CC suffix so the model name is not appropriate here. Update to something more specific
--- arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts +1 -1
@@ -13,7 +13,7 @@ / { compatible = "libretech,cc", "amlogic,s905x", "amlogic,meson-gxl"; - model = "Libre Technology CC"; + model = "Libre Computer Board AML-S905X-CC"; aliases { serial0 = &uart_AO;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 166/205 arm64: dts: renesas: salvator-common: adv748x: Override secondary addresses
In reply to Sasha LevinFrom: Kieran Bingham <[email protected]>
[ Upstream commit e3da41a6c28f9b61ea03df987f1c9ffffc8b8e60 ]
Ensure that the ADV748x device addresses do not conflict, and group them together (visually in i2cdetect)
--- arch/arm64/boot/dts/renesas/salvator-common.dtsi | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/renesas/salvator-common.dtsi +4 -1
@@ -420,7 +420,10 @@ video-receiver@70 { compatible = "adi,adv7482"; - reg = <0x70>; + reg = <0x70 0x71 0x72 0x73 0x74 0x75 + 0x60 0x61 0x62 0x63 0x64 0x65>; + reg-names = "main", "dpll", "cp", "hdmi", "edid", "repeater", + "infoframe", "cbus", "cec", "sdp", "txa", "txb" ; #address-cells = <1>; #size-cells = <0>;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 169/205 arm64: dts: renesas: r8a77965: Fix clock/reset for usb2_phy1
In reply to Sasha LevinFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 7a590fe317488783a229e5a80e91868942e8463f ]
usb2_phy1 accidentally uses the same clock/reset as usb2_phy0.
--- arch/arm64/boot/dts/renesas/r8a77965.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/renesas/r8a77965.dtsi +2 -2
@@ -1479,9 +1479,9 @@ compatible = "renesas,usb2-phy-r8a77965", "renesas,rcar-gen3-usb2-phy"; reg = <0 0xee0a0200 0 0x700>; - clocks = <&cpg CPG_MOD 703>; + clocks = <&cpg CPG_MOD 702>; power-domains = <&sysc R8A77965_PD_ALWAYS_ON>; - resets = <&cpg 703>; + resets = <&cpg 702>; #phy-cells = <0>; status = "disabled"; };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 164/205 arm64: dts: meson-axg: use the proper compatible for ethmac
In reply to Sasha LevinFrom: Neil Armstrong <[email protected]>
[ Upstream commit eaf8f57c0bf5451132932616ab62f9481adefb55 ]
Use the correct compatible for the AXG ethernet mac node.
--- arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/amlogic/meson-axg.dtsi +1 -1
@@ -458,7 +458,7 @@ }; ethmac: ethernet@ff3f0000 { - compatible = "amlogic,meson-gxbb-dwmac", "snps,dwmac"; + compatible = "amlogic,meson-axg-dwmac", "snps,dwmac"; reg = <0x0 0xff3f0000 0x0 0x10000 0x0 0xff634540 0x0 0x8>; interrupts = <GIC_SPI 8 IRQ_TYPE_EDGE_RISING>;
Signature · 7 lines
2.20.1 _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic
Sasha Levin
maintainerPATCH 167/205 arm64: dts: renesas: r8a77965: Attach the SYS-DMAC to the IPMMU
In reply to Sasha LevinFrom: Magnus Damm <[email protected]>
[ Upstream commit 4d76ad7d9de05506f1ee9a7b22416440468be090 ]
For R-Car M3-N hook up SYS-DMAC0, SYS-DMAC1 and SYS-DMAC2 to IPMMU-DS0 and IPMMU-DS1 in same way as for R-Car M3-W. This follows the R-Car Gen3 Rev.1.00 (April 2018) datasheet.
--- arch/arm64/boot/dts/renesas/r8a77965.dtsi | 24 +++++++++++++++++++++++ 1 file changed, 24 insertions(+)
arch/arm64/boot/dts/renesas/r8a77965.dtsi +24 -0
@@ -634,6 +634,14 @@ resets = <&cpg 219>; #dma-cells = <1>; dma-channels = <16>; + iommus = <&ipmmu_ds0 0>, <&ipmmu_ds0 1>, + <&ipmmu_ds0 2>, <&ipmmu_ds0 3>, + <&ipmmu_ds0 4>, <&ipmmu_ds0 5>, + <&ipmmu_ds0 6>, <&ipmmu_ds0 7>, + <&ipmmu_ds0 8>, <&ipmmu_ds0 9>, + <&ipmmu_ds0 10>, <&ipmmu_ds0 11>, + <&ipmmu_ds0 12>, <&ipmmu_ds0 13>, + <&ipmmu_ds0 14>, <&ipmmu_ds0 15>; }; dmac1: dma-controller@e7300000 {
@@ -668,6 +676,14 @@ resets = <&cpg 218>; #dma-cells = <1>; dma-channels = <16>; + iommus = <&ipmmu_ds1 0>, <&ipmmu_ds1 1>, + <&ipmmu_ds1 2>, <&ipmmu_ds1 3>, + <&ipmmu_ds1 4>, <&ipmmu_ds1 5>, + <&ipmmu_ds1 6>, <&ipmmu_ds1 7>, + <&ipmmu_ds1 8>, <&ipmmu_ds1 9>, + <&ipmmu_ds1 10>, <&ipmmu_ds1 11>, + <&ipmmu_ds1 12>, <&ipmmu_ds1 13>, + <&ipmmu_ds1 14>, <&ipmmu_ds1 15>; }; dmac2: dma-controller@e7310000 {
@@ -702,6 +718,14 @@ resets = <&cpg 217>; #dma-cells = <1>; dma-channels = <16>; + iommus = <&ipmmu_ds1 16>, <&ipmmu_ds1 17>, + <&ipmmu_ds1 18>, <&ipmmu_ds1 19>, + <&ipmmu_ds1 20>, <&ipmmu_ds1 21>, + <&ipmmu_ds1 22>, <&ipmmu_ds1 23>, + <&ipmmu_ds1 24>, <&ipmmu_ds1 25>, + <&ipmmu_ds1 26>, <&ipmmu_ds1 27>, + <&ipmmu_ds1 28>, <&ipmmu_ds1 29>, + <&ipmmu_ds1 30>, <&ipmmu_ds1 31>; }; ipmmu_ds0: mmu@e6740000 {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 170/205 pinctrl: at91-pio4: fix has_config check in atmel_pctl_dt_subnode_to_map()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit b97760ae8e3dc8bb91881c13425a0bff55f2bd85 ]
Smatch complains about this condition:
if (has_config && num_pins >= 1)
The "has_config" variable is either uninitialized or true. The "num_pins" variable is unsigned and we verified that it is non-zero on the lines before so we know "num_pines >= 1" is true. Really, we could just check "num_configs" directly and remove the "has_config" variable.
--- drivers/pinctrl/pinctrl-at91-pio4.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/pinctrl/pinctrl-at91-pio4.c +2 -6
@@ -493,7 +493,6 @@ static int atmel_pctl_dt_subnode_to_map(struct pinctrl_dev *pctldev,unsigned num_pins, num_configs, reserve;unsigned long *configs;struct property *pins; -bool has_config;u32 pinfunc;int ret, i;
@@ -509,9 +508,6 @@ static int atmel_pctl_dt_subnode_to_map(struct pinctrl_dev *pctldev,return ret; } -if (num_configs) - has_config = true; - num_pins = pins->length /sizeof (u32);if (!num_pins) {dev_err (pctldev->dev,"no pins found in node %pOF\n" , np);
@@ -524,7 +520,7 @@ static int atmel_pctl_dt_subnode_to_map(struct pinctrl_dev *pctldev,* map for each pin. */ reserve =1 ; -if (has_config && num_pins >=1 ) +if (num_configs) reserve++; reserve *= num_pins; ret = pinctrl_utils_reserve_map(pctldev, map, reserved_maps, num_maps,
@@ -547,7 +543,7 @@ static int atmel_pctl_dt_subnode_to_map(struct pinctrl_dev *pctldev,pinctrl_utils_add_map_mux (pctldev, map, reserved_maps, num_maps, group, func); -if (has_config) { +if (num_configs) { ret = pinctrl_utils_add_map_configs(pctldev, map, reserved_maps, num_maps, group, configs, num_configs,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 171/205 MIPS: lantiq: Do not enable IRQs in dma open
In reply to Sasha LevinFrom: Hauke Mehrtens <[email protected]>
[ Upstream commit cc973aecf0b0541918c5ecabe6c90d1f709b5f89 ]
When a DMA channel is opened the IRQ should not get activated automatically, this allows it to pull data out manually without the help of interrupts. This is needed for a workaround in the vrx200 Ethernet driver.
--- arch/mips/lantiq/xway/dma.c | 1 - drivers/net/ethernet/lantiq_etop.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-)
arch/mips/lantiq/xway/dma.c +0 -1
@@ -106,7 +106,6 @@ ltq_dma_open(struct ltq_dma_channel *ch)spin_lock_irqsave (<q_dma_lock, flag);ltq_dma_w32 (ch->nr,LTQ_DMA_CS );ltq_dma_w32_mask (0 ,DMA_CHAN_ON ,LTQ_DMA_CCTRL ); -ltq_dma_w32_mask (0 ,1 << ch->nr,LTQ_DMA_IRNEN );spin_unlock_irqrestore (<q_dma_lock, flag); }EXPORT_SYMBOL_GPL (ltq_dma_open);
drivers/net/ethernet/lantiq_etop.c +1 -0
@@ -439,6 +439,7 @@ ltq_etop_open(struct net_device *dev)if (!IS_TX (i) && (!IS_RX (i)))continue ;ltq_dma_open (&ch->dma); +ltq_dma_enable_irq (&ch->dma);napi_enable (&ch->napi); }phy_start (dev->phydev);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 174/205 soc: qcom: geni: Don't ignore clk_round_rate() errors in geni_se_clk_tbl_get()
In reply to Sasha LevinFrom: Douglas Anderson <[email protected]>
[ Upstream commit e11bbcedecae85ce60a5d99ea03528c2d6f867e0 ]
The function clk_round_rate() is defined to return a "long", not an "unsigned long". That's because it might return a negative error code. Change the call in geni_se_clk_tbl_get() to check for errors.
While we're at it, get rid of a useless init of "freq".
NOTE: overall the idea that we should iterate over clk_round_rate() to try to reconstruct a table already present in the clock driver is questionable. Specifically:
- This method relies on "clk_round_rate()" rounding up.
- This method only works if the table is sorted and has no duplicates. ...this patch doesn't try to fix those problems, it just makes the error handling more correct.
--- drivers/soc/qcom/qcom-geni-se.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/soc/qcom/qcom-geni-se.c +2 -2
@@ -513,7 +513,7 @@ EXPORT_SYMBOL(geni_se_resources_on);*/ int geni_se_clk_tbl_get (struct geni_se *se,unsigned long **tbl) { -unsigned long freq =0 ; +long freq =0 ;int i;if (se->clk_perf_tbl) {
@@ -529,7 +529,7 @@ int geni_se_clk_tbl_get(struct geni_se *se, unsigned long **tbl)for (i =0 ; i <MAX_CLK_PERF_LEVEL ; i++) { freq =clk_round_rate (se->clk, freq +1 ); -if (!freq || freq == se->clk_perf_tbl[i -1 ]) +if (freq <=0 || freq == se->clk_perf_tbl[i -1 ])break ; se->clk_perf_tbl[i] = freq; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 172/205 llc: avoid blocking in llc_sap_close()
In reply to Sasha LevinFrom: Cong Wang <[email protected]>
[ Upstream commit 9708d2b5b7c648e8e0a40d11e8cea12f6277f33c ]
llc_sap_close() is called by llc_sap_put() which could be called in BH context in llc_rcv(). We can't block in BH.
There is no reason to block it here, kfree_rcu() should be sufficient.
--- include/net/llc.h | 1 + net/llc/llc_core.c | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-)
include/net/llc.h +1 -0
@@ -66,6 +66,7 @@ struct llc_sap {int sk_count;struct hlist_nulls_head sk_laddr_hash[LLC_SK_LADDR_HASH_ENTRIES ];struct hlist_head sk_dev_hash[LLC_SK_DEV_HASH_ENTRIES ]; +struct rcu_head rcu; }; static inline
net/llc/llc_core.c +1 -3
@@ -127,9 +127,7 @@ void llc_sap_close(struct llc_sap *sap)list_del_rcu (&sap->node);spin_unlock_bh (&llc_sap_list_lock); -synchronize_rcu (); - -kfree (sap); +kfree_rcu (sap, rcu); }static struct packet_type llc_packet_type__read_mostly = {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 177/205 soc: qcom: apr: Avoid string overflow
In reply to Sasha LevinFrom: Niklas Cassel <[email protected]>
[ Upstream commit 4fadb26574cb74e5de079dd384f25f44f4fb3ec3 ]
'adev->name' is used as a NUL-terminated string, but using strncpy() with the length equal to the buffer size may result in lack of the termination:
In function 'apr_add_device',
inlined from 'of_register_apr_devices' at drivers//soc/qcom/apr.c:264:7,
inlined from 'apr_probe' at drivers//soc/qcom/apr.c:290:2:drivers//soc/qcom/apr.c:222:3: warning: 'strncpy' specified bound 32 equals destination size [-Wstringop-truncation]
strncpy(adev->name, np->name, APR_NAME_SIZE);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
This changes it to use the safer strscpy() instead.
--- drivers/soc/qcom/apr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/soc/qcom/apr.c +2 -2
@@ -219,9 +219,9 @@ static int apr_add_device(struct device *dev, struct device_node *np, adev->domain_id = id->domain_id; adev->version = id->svc_version;if (np) -strncpy (adev->name, np->name,APR_NAME_SIZE ); +strscpy (adev->name, np->name,APR_NAME_SIZE );else -strncpy (adev->name, id->name,APR_NAME_SIZE ); +strscpy (adev->name, id->name,APR_NAME_SIZE );dev_set_name (&adev->dev,"aprsvc:%s:%x:%x" , adev->name, id->domain_id, id->svc_id);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 176/205 soc: qcom: wcnss_ctrl: Avoid string overflow
In reply to Sasha LevinFrom: Niklas Cassel <[email protected]>
[ Upstream commit 4c96ed170d658d8826d94edec8ac93ee777981a2 ]
'chinfo.name' is used as a NUL-terminated string, but using strncpy() with the length equal to the buffer size may result in lack of the termination:
drivers//soc/qcom/wcnss_ctrl.c: In function 'qcom_wcnss_open_channel':drivers//soc/qcom/wcnss_ctrl.c:284:2: warning: 'strncpy' specified bound 32 equals destination size [-Wstringop-truncation]
strncpy(chinfo.name, name, sizeof(chinfo.name));
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
This changes it to use the safer strscpy() instead.
--- drivers/soc/qcom/wcnss_ctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soc/qcom/wcnss_ctrl.c +1 -1
@@ -281,7 +281,7 @@ struct rpmsg_endpoint *qcom_wcnss_open_channel(void *wcnss, const char *name, rpstruct rpmsg_channel_info chinfo;struct wcnss_ctrl *_wcnss = wcnss; -strncpy (chinfo.name, name,sizeof (chinfo.name)); +strscpy (chinfo.name, name,sizeof (chinfo.name)); chinfo.src =RPMSG_ADDR_ANY ; chinfo.dst =RPMSG_ADDR_ANY ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 180/205 ARM: dts: bcm: Fix SPI bus warnings
In reply to Sasha LevinFrom: Rob Herring <[email protected]>
[ Upstream commit ab0b47d2eff413d60b0a1fc0c1f87f87f0d7f375 ]
dtc has new checks for SPI buses. Fix the warnings in node names.
arch/arm/boot/dts/bcm53340-ubnt-unifi-switch8.dtb: Warning (spi_bus_bridge): /axi@18000000/qspi@27200: node name for SPI buses should be 'spi' arch/arm/boot/dts/bcm958525er.dtb: Warning (spi_bus_bridge): /axi/qspi@27200: node name for SPI buses should be 'spi' arch/arm/boot/dts/bcm958525xmc.dtb: Warning (spi_bus_bridge): /axi/qspi@27200: node name for SPI buses should be 'spi' arch/arm/boot/dts/bcm958622hr.dtb: Warning (spi_bus_bridge): /axi/qspi@27200: node name for SPI buses should be 'spi' arch/arm/boot/dts/bcm958625hr.dtb: Warning (spi_bus_bridge): /axi/qspi@27200: node name for SPI buses should be 'spi' arch/arm/boot/dts/bcm988312hr.dtb: Warning (spi_bus_bridge): /axi/qspi@27200: node name for SPI buses should be 'spi'
--- arch/arm/boot/dts/bcm-hr2.dtsi | 2 +- arch/arm/boot/dts/bcm-nsp.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/bcm-hr2.dtsi +1 -1
@@ -216,7 +216,7 @@ reg = <0x33000 0x14>; }; - qspi: qspi@27200 { + qspi: spi@27200 { compatible = "brcm,spi-bcm-qspi", "brcm,spi-nsp-qspi"; reg = <0x027200 0x184>, <0x027000 0x124>,
arch/arm/boot/dts/bcm-nsp.dtsi +1 -1
@@ -273,7 +273,7 @@ brcm,nand-has-wp; }; - qspi: qspi@27200 { + qspi: spi@27200 { compatible = "brcm,spi-bcm-qspi", "brcm,spi-nsp-qspi"; reg = <0x027200 0x184>, <0x027000 0x124>,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 183/205 ARM: dts: socfpga: Fix I2C bus unit-address error
In reply to Sasha LevinFrom: Dinh Nguyen <[email protected]>
[ Upstream commit cbbc488ed85061a765cf370c3e41f383c1e0add6 ]
dtc has new checks for I2C buses. Fix the warnings in unit-addresses.
arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dtb: Warning (i2c_bus_reg): /soc/i2c@ffc04000/adxl345@0: I2C bus unit address format error, expected "53"
--- arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts +1 -1
@@ -88,7 +88,7 @@ status = "okay"; clock-frequency = <100000>; - adxl345: adxl345@0 { + adxl345: adxl345@53 { compatible = "adi,adxl345"; reg = <0x53>;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 182/205 powerpc/vdso: Correct call frame information
In reply to Sasha LevinFrom: Alan Modra <[email protected]>
[ Upstream commit 56d20861c027498b5a1112b4f9f05b56d906fdda ]
Call Frame Information is used by gdb for back-traces and inserting breakpoints on function return for the "finish" command. This failed when inside __kernel_clock_gettime. More concerning than difficulty debugging is that CFI is also used by stack frame unwinding code to implement exceptions. If you have an app that needs to handle asynchronous exceptions for some reason, and you are unlucky enough to get one inside the VDSO time functions, your app will crash.
What's wrong: There is control flow in __kernel_clock_gettime that reaches label 99 without saving lr in r12. CFI info however is interpreted by the unwinder without reference to control flow: It's a simple matter of "Execute all the CFI opcodes up to the current address". That means the unwinder thinks r12 contains the return address at label 99. Disabuse it of that notion by resetting CFI for the return address at label 99.
Note that the ".cfi_restore lr" could have gone anywhere from the "mtlr r12" a few instructions earlier to the instruction at label 99. I put the CFI as late as possible, because in general that's best practice (and if possible grouped with other CFI in order to reduce the number of CFI opcodes executed when unwinding). Using r12 as the return address is perfectly fine after the "mtlr r12" since r12 on that code path still contains the return address.
__get_datapage also has a CFI error. That function temporarily saves lr in r0, and reflects that fact with ".cfi_register lr,r0". A later use of r0 means the CFI at that point isn't correct, as r0 no longer contains the return address. Fix that too.
--- arch/powerpc/kernel/vdso32/datapage.S | 1 + arch/powerpc/kernel/vdso32/gettimeofday.S | 1 + arch/powerpc/kernel/vdso64/datapage.S | 1 + arch/powerpc/kernel/vdso64/gettimeofday.S | 1 + 4 files changed, 4 insertions(+)
arch/powerpc/kernel/vdso32/datapage.S +1 -0
@@ -37,6 +37,7 @@ data_page_branch: mtlr r0 addi r3, r3, __kernel_datapage_offset-data_page_branch lwz r0,0(r3) + .cfi_restore lr add r3,r0,r3 blr .cfi_endproc
arch/powerpc/kernel/vdso32/gettimeofday.S +1 -0
@@ -139,6 +139,7 @@ V_FUNCTION_BEGIN(__kernel_clock_gettime) */ 99: li r0,__NR_clock_gettime + .cfi_restore lr sc blr .cfi_endproc
arch/powerpc/kernel/vdso64/datapage.S +1 -0
@@ -37,6 +37,7 @@ data_page_branch: mtlr r0 addi r3, r3, __kernel_datapage_offset-data_page_branch lwz r0,0(r3) + .cfi_restore lr add r3,r0,r3 blr .cfi_endproc
arch/powerpc/kernel/vdso64/gettimeofday.S +1 -0
@@ -169,6 +169,7 @@ V_FUNCTION_BEGIN(__kernel_clock_gettime) */ 99: li r0,__NR_clock_gettime + .cfi_restore lr sc blr .cfi_endproc
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 187/205 android: binder: no outgoing transaction when thread todo has transaction
In reply to Sasha LevinFrom: Sherry Yang <[email protected]>
[ Upstream commit 44b73962cb25f1c8170ea695c4564b05a75e1fd4 ]
When a process dies, failed reply is sent to the sender of any transaction queued on a dead thread's todo list. The sender asserts that the received failed reply corresponds to the head of the transaction stack. This assert can fail if the dead thread is allowed to send outgoing transactions when there is already a transaction on its todo list, because this new transaction can end up on the transaction stack of the original sender. The following steps illustrate how this assertion can fail.
1. Thread1 sends txn19 to Thread2 (T1->transaction_stack=txn19, T2->todo+=txn19)
2. Without processing todo list, Thread2 sends txn20 to Thread1 (T1->todo+=txn20, T2->transaction_stack=txn20)
3. T1 processes txn20 on its todo list (T1->transaction_stack=txn20->txn19, T1->todo=<empty>)
4. T2 dies, T2->todo cleanup attempts to send failed reply for txn19, but T1->transaction_stack points to txn20 -- assertion failes
Step 2. is the incorrect behavior. When there is a transaction on a thread's todo list, this thread should not be able to send any outgoing synchronous transactions. Only the head of the todo list needs to be checked because only threads that are waiting for proc work can directly receive work from another thread, and no work is allowed to be queued on such a thread without waking up the thread. This patch also enforces that a thread is not waiting for proc work when a work is directly enqueued to its todo list.
--- drivers/android/binder.c | 44 +++++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 12 deletions(-)
drivers/android/binder.c +32 -12
@@ -822,6 +822,7 @@ static void binder_enqueue_deferred_thread_work_ilocked(struct binder_thread *thread, struct binder_work *work) { + WARN_ON(!list_empty(&thread->waiting_thread_node));binder_enqueue_work_ilocked (work, &thread->todo); }
@@ -839,6 +840,7 @@ static void binder_enqueue_thread_work_ilocked(struct binder_thread *thread, struct binder_work *work) { + WARN_ON(!list_empty(&thread->waiting_thread_node));binder_enqueue_work_ilocked (work, &thread->todo); thread->process_todo = true; }
@@ -1270,19 +1272,12 @@ static int binder_inc_node_nilocked(struct binder_node *node, int strong, }else node->local_strong_refs++;if (!node->has_strong_ref && target_list) { +struct binder_thread *thread =container_of (target_list, + struct binder_thread, todo);binder_dequeue_work_ilocked (&node->work); -/* -* Note: this function is the only place where we queue -* directly to a thread->todo without using the -* corresponding binder_enqueue_thread_work() helper -* functions; in this case it's ok to not set the -* process_todo flag, since we know this node work will -* always be followed by other work that starts queue -* processing: in case of synchronous transactions, a -* BR_REPLY or BR_ERROR; in case of oneway -* transactions, a BR_TRANSACTION_COMPLETE. -*/ -binder_enqueue_work_ilocked (&node->work, target_list); +BUG_ON (&thread->todo != target_list); +binder_enqueue_deferred_thread_work_ilocked (thread, + &node->work); } }else {if (!internal)
@@ -2733,6 +2728,7 @@ static void binder_transaction(struct binder_proc *proc, {int ret;struct binder_transaction *t; +struct binder_work *w;struct binder_work *tcomplete;binder_size_t *offp, *off_end, *off_start;binder_size_t off_min;
@@ -2874,6 +2870,29 @@ static void binder_transaction(struct binder_proc *proc, goto err_invalid_target_handle; }binder_inner_proc_lock (proc); + + w =list_first_entry_or_null (&thread->todo, + struct binder_work, entry); +if (!(tr->flags &TF_ONE_WAY ) && w && + w->type ==BINDER_WORK_TRANSACTION ) { +/* +* Do not allow new outgoing transaction from a +* thread that has a transaction at the head of +* its todo list. Only need to check the head +* because binder_select_thread_ilocked picks a +* thread from proc->waiting_threads to enqueue +* the transaction, and nothing is queued to the +* todo list while the thread is on waiting_threads. +*/ +binder_user_error ("%d:%d new transaction not allowed when there is a transaction on thread todo\n" , + proc->pid, thread->pid); +binder_inner_proc_unlock (proc); + return_error =BR_FAILED_REPLY ; + return_error_param = -EPROTO ; + return_error_line = __LINE__; + goto err_bad_todo_list; + } +if (!(tr->flags &TF_ONE_WAY ) && thread->transaction_stack) {struct binder_transaction *tmp;
@@ -3256,6 +3275,7 @@ err_alloc_tcomplete_failed:kfree (t);binder_stats_deleted (BINDER_STAT_TRANSACTION ); err_alloc_t_failed: +err_bad_todo_list: err_bad_call_stack: err_empty_call_stack: err_dead_binder:
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 188/205 cxgb4: Fix endianness issue in t4_fwcache()
In reply to Sasha LevinFrom: Ganesh Goudar <[email protected]>
[ Upstream commit 0dc235afc59a226d951352b0adf4a89b532a9d13 ]
Do not put host-endian 0 or 1 into big endian feild.
--- drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c +1 -1
@@ -3889,7 +3889,7 @@ int t4_fwcache(struct adapter *adap, enum fw_params_param_dev_fwcache op) c.param[0 ].mnem =cpu_to_be32 (FW_PARAMS_MNEM_V (FW_PARAMS_MNEM_DEV ) |FW_PARAMS_PARAM_X_V (FW_PARAMS_PARAM_DEV_FWCACHE )); - c.param[0 ].val = (__force __be32 )op; + c.param[0 ].val =cpu_to_be32 (op);return t4_wr_mbox (adap, adap->mbox, &c,sizeof (c),NULL ); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 189/205 arm64: fix for bad_mode() handler to always result in panic
In reply to Sasha LevinFrom: Hari Vyas <[email protected]>
[ Upstream commit e4ba15debcfd27f60d43da940a58108783bff2a6 ]
The bad_mode() handler is called if we encounter an uunknown exception, with the expectation that the subsequent call to panic() will halt the system. Unfortunately, if the exception calling bad_mode() is taken from EL0, then the call to die() can end up killing the current user task and calling schedule() instead of falling through to panic().
Remove the die() call altogether, since we really want to bring down the machine in this "impossible" case.
--- arch/arm64/kernel/traps.c | 1 - 1 file changed, 1 deletion(-)
arch/arm64/kernel/traps.c +0 -1
@@ -611,7 +611,6 @@ asmlinkage void bad_mode(struct pt_regs *regs, int reason, unsigned int esr) handler[reason],smp_processor_id (), esr, esr_get_class_string(esr)); -die ("Oops - bad mode" , regs,0 );local_daif_mask ();panic ("bad mode" ); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 190/205 block, bfq: inject other-queue I/O into seeky idle queues on NCQ flash
In reply to Sasha LevinFrom: Paolo Valente <[email protected]>
[ Upstream commit d0edc2473be9d70f999282e1ca7863ad6ae704dc ]
The Achilles' heel of BFQ is its failing to reach a high throughput with sync random I/O on flash storage with internal queueing, in case the processes doing I/O have differentiated weights.
The cause of this failure is as follows. If at least two processes do sync I/O, and have a different weight from each other, then BFQ plugs I/O dispatching every time one of these processes, while it is being served, remains temporarily without pending I/O requests. This plugging is necessary to guarantee that every process enjoys a bandwidth proportional to its weight; but it empties the internal queue(s) of the drive. And this kills throughput with random I/O. So, if some processes have differentiated weights and do both sync and random I/O, the end result is a throughput collapse.
This commit tries to counter this problem by injecting the service of other processes, in a controlled way, while the process in service happens to have no I/O. This injection is performed only if the medium is non rotational and performs internal queueing, and the process in service does random I/O (service injection might be beneficial for sequential I/O too, we'll work on that).
As an example of the benefits of this commit, on a PLEXTOR PX-256M5S SSD, and with five processes having differentiated weights and doing sync random 4KB I/O, this commit makes the throughput with bfq grow by 400%, from 25 to 100MB/s. This higher throughput is 10MB/s lower than that reached with none. As some less random I/O is added to the mix, the throughput becomes equal to or higher than that with none.
This commit is a very first attempt to recover throughput without losing control, and certainly has many limitations. One is, e.g., that the processes whose service is injected are not chosen so as to distribute the extra bandwidth they receive in accordance to their weights. Thus there might be loss of weighted fairness in some cases. Anyway, this loss concerns extra service, which would not have been received at all without this commit. Other limitations and issues will probably show up with usage.
--- block/bfq-iosched.c | 68 +++++++++++++++++++++++++++++++++++++++++---- block/bfq-iosched.h | 26 +++++++++++++++++ 2 files changed, 88 insertions(+), 6 deletions(-)
block/bfq-iosched.c +62 -6
@@ -3195,6 +3195,13 @@ static unsigned long bfq_bfqq_softrt_next_start(struct bfq_data *bfqd, jiffies + nsecs_to_jiffies(bfqq->bfqd->bfq_slice_idle) + 4); } +static bool bfq_bfqq_injectable (struct bfq_queue *bfqq) +{ +return BFQQ_SEEKY (bfqq) && bfqq->wr_coeff ==1 && +blk_queue_nonrot (bfqq->bfqd->queue) && + bfqq->bfqd->hw_tag; +} +/** * bfq_bfqq_expire - expire a queue. * @bfqd: device owning the queue.
@@ -3304,6 +3311,8 @@ void bfq_bfqq_expire(struct bfq_data *bfqd,if (ref ==1 )/* bfqq is gone, no more actions on it */ return ; + bfqq->injected_service =0 ; +/* mark bfqq as waiting a request only if a bic still points to it */ if (!bfq_bfqq_busy(bfqq) && reason != BFQQE_BUDGET_TIMEOUT &&
@@ -3642,6 +3651,30 @@ static bool bfq_bfqq_must_idle(struct bfq_queue *bfqq)return RB_EMPTY_ROOT (&bfqq->sort_list) &&bfq_better_to_idle (bfqq); } +static struct bfq_queue *bfq_choose_bfqq_for_injection (struct bfq_data *bfqd) +{ +struct bfq_queue *bfqq; + +/* +* A linear search; but, with a high probability, very few +* steps are needed to find a candidate queue, i.e., a queue +* with enough budget left for its next request. In fact: +* - BFQ dynamically updates the budget of every queue so as +* to accommodate the expected backlog of the queue; +* - if a queue gets all its requests dispatched as injected +* service, then the queue is removed from the active list +* (and re-added only if it gets new requests, but with +* enough budget for its new backlog). +*/ +list_for_each_entry (bfqq, &bfqd->active_list, bfqq_list) +if (!RB_EMPTY_ROOT (&bfqq->sort_list) && +bfq_serv_to_charge (bfqq->next_rq, bfqq) <= +bfq_bfqq_budget_left (bfqq)) +return bfqq; + +return NULL ; +} +/* * Select a queue for service. If we have a current queue in service, * check whether to continue servicing it, or retrieve and set a new one.
@@ -3723,10 +3756,19 @@ check_queue:* No requests pending. However, if the in-service queue is idling * for a new request, or has requests waiting for a completion and * may idle after their completion, then keep it anyway. +* +* Yet, to boost throughput, inject service from other queues if +* possible. */ if (bfq_bfqq_wait_request (bfqq) || (bfqq->dispatched !=0 &&bfq_better_to_idle (bfqq))) { - bfqq =NULL ; +if (bfq_bfqq_injectable (bfqq) && + bfqq->injected_service * bfqq->inject_coeff < + bfqq->entity.service *10 ) + bfqq =bfq_choose_bfqq_for_injection (bfqd); +else + bfqq =NULL ; + goto keep_queue; }
@@ -3816,6 +3858,14 @@ static struct request *bfq_dispatch_rq_from_bfqq(struct bfq_data *bfqd,bfq_dispatch_remove (bfqd->queue, rq); +if (bfqq != bfqd->in_service_queue) { +if (likely (bfqd->in_service_queue)) + bfqd->in_service_queue->injected_service += +bfq_serv_to_charge (rq, bfqq); + + goto return_rq; + } +/* * If weight raising has to terminate for bfqq, then next * function causes an immediate update of bfqq's weight,
@@ -3834,13 +3884,12 @@ static struct request *bfq_dispatch_rq_from_bfqq(struct bfq_data *bfqd,* belongs to CLASS_IDLE and other queues are waiting for * service. */ -if (bfqd->busy_queues >1 &&bfq_class_idle (bfqq)) - goto expire; - -return rq; +if (!(bfqd->busy_queues >1 &&bfq_class_idle (bfqq))) + goto return_rq; -expire:bfq_bfqq_expire (bfqd, bfqq, false,BFQQE_BUDGET_EXHAUSTED ); + +return_rq:return rq; }
@@ -4246,6 +4295,13 @@ static void bfq_init_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq,bfq_mark_bfqq_has_short_ttime (bfqq);bfq_mark_bfqq_sync (bfqq);bfq_mark_bfqq_just_created (bfqq); +/* +* Aggressively inject a lot of service: up to 90%. +* This coefficient remains constant during bfqq life, +* but this behavior might be changed, after enough +* testing and tuning. +*/ + bfqq->inject_coeff =1 ; }else bfq_clear_bfqq_sync (bfqq);
block/bfq-iosched.h +26 -0
@@ -351,6 +351,32 @@ struct bfq_queue {unsigned long split_time;/* time of last split */ unsigned long first_IO_time;/* time of first I/O for this queue */ + +/* max service rate measured so far */ +u32 max_service_rate; +/* +* Ratio between the service received by bfqq while it is in +* service, and the cumulative service (of requests of other +* queues) that may be injected while bfqq is empty but still +* in service. To increase precision, the coefficient is +* measured in tenths of unit. Here are some example of (1) +* ratios, (2) resulting percentages of service injected +* w.r.t. to the total service dispatched while bfqq is in +* service, and (3) corresponding values of the coefficient: +* 1 (50%) -> 10 +* 2 (33%) -> 20 +* 10 (9%) -> 100 +* 9.9 (9%) -> 99 +* 1.5 (40%) -> 15 +* 0.5 (66%) -> 5 +* 0.1 (90%) -> 1 +* +* So, if the coefficient is lower than 10, then +* injected service is more than bfqq service. +*/ +unsigned int inject_coeff; +/* amount of service injected in current service slot */ +unsigned int injected_service; };/**
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 194/205 power: reset: at91-poweroff: do not procede if at91_shdwc is allocated
In reply to Sasha LevinFrom: Claudiu Beznea <[email protected]>
[ Upstream commit 9f1e44774be578fb92776add95f1fcaf8284d692 ]
There should be only one instance of struct shdwc in the system. This is referenced through at91_shdwc. Return in probe if at91_shdwc is already allocated.
--- drivers/power/reset/at91-sama5d2_shdwc.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/power/reset/at91-sama5d2_shdwc.c +3 -0
@@ -246,6 +246,9 @@ static int __init at91_shdwc_probe(struct platform_device *pdev)if (!pdev->dev.of_node)return -ENODEV ; +if (at91_shdwc) +return -EBUSY ; + at91_shdwc =devm_kzalloc (&pdev->dev,sizeof (*at91_shdwc),GFP_KERNEL );if (!at91_shdwc)return -ENOMEM ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 192/205 arm64: dts: meson: Fix erroneous SPI bus warnings
In reply to Sasha LevinFrom: Rob Herring <[email protected]>
[ Upstream commit 68ecb5c1920c5b98b1e717fd2349fba2ee5d4031 ]
dtc has new checks for SPI buses. The meson dts files have a node named spi' which causes false positive warnings. As the node is a pinctrl child node, change the node name to be 'spi-pins' to fix the warnings.
arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dtb: Warning (spi_bus_bridge): /soc/periphs@c8834000/pinctrl@4b0/spi: incorrect #address-cells for SPI bus
--- arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 2 +- arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +1 -1
@@ -390,7 +390,7 @@ }; }; - spi_pins: spi { + spi_pins: spi-pins { mux { groups = "spi_miso", "spi_mosi",
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi +1 -1
@@ -337,7 +337,7 @@ }; }; - spi_pins: spi { + spi_pins: spi-pins { mux { groups = "spi_miso", "spi_mosi",
Signature · 7 lines
2.20.1 _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic
Sasha Levin
maintainerPATCH 195/205 power: supply: max8998-charger: Fix platform data retrieval
In reply to Sasha LevinFrom: Tomasz Figa <[email protected]>
[ Upstream commit cb90a2c6f77fe9b43d1e3f759bb2f13fe7fa1811 ]
Since the max8998 MFD driver supports instantiation by DT, platform data retrieval is handled in MFD probe and cell drivers should get use the pdata field of max8998_dev struct to obtain them.
--- drivers/power/supply/max8998_charger.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/power/supply/max8998_charger.c +1 -1
@@ -86,7 +86,7 @@ static const struct power_supply_desc max8998_battery_desc = {static int max8998_battery_probe (struct platform_device *pdev) {struct max8998_dev *iodev =dev_get_drvdata (pdev->dev.parent); -struct max8998_platform_data *pdata =dev_get_platdata (iodev->dev); +struct max8998_platform_data *pdata = iodev->pdata;struct power_supply_config psy_cfg = {};struct max8998_battery_data *max8998;struct i2c_client *i2c;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 196/205 component: fix loop condition to call unbind() if bind() fails
In reply to Sasha LevinFrom: Banajit Goswami <[email protected]>
[ Upstream commit bdae566d5d9733b6e32b378668b84eadf28a94d4 ]
During component_bind_all(), if bind() fails for any particular component associated with a master, unbind() should be called for all previous components in that master's match array, whose bind() might have completed successfully. As per the current logic, if bind() fails for the component at position 'n' in the master's match array, it would start calling unbind() from component in 'n'th position itself and work backwards, and will always skip calling unbind() for component in 0th position in the master's match array.
Fix this by updating the loop condition, and the logic to refer to the components in master's match array, so that unbind() is called for all components starting from 'n-1'st position in the array, until (and including) component in 0th position.
--- drivers/base/component.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/base/component.c +3 -3
@@ -536,9 +536,9 @@ int component_bind_all(struct device *master_dev, void *data) }if (ret !=0 ) { -for (; i--; ) -if (!master->match->compare[i].duplicate) { - c = master->match->compare[i].component; +for (; i >0 ; i--) +if (!master->match->compare[i -1 ].duplicate) { + c = master->match->compare[i -1 ].component;component_unbind (c, master, data); } }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 199/205 scsi: ufshcd: Fix NULL pointer dereference for in ufshcd_init
In reply to Sasha LevinFrom: Vivek Gautam <[email protected]>
[ Upstream commit eebcc19646489b68399ce7b35d9c38eb9f4ec40f ]
Error paths in ufshcd_init() ufshcd_hba_exit() killed clk_scaling workqueue when the workqueue is actually created quite late in ufshcd_init(). So, we end up getting NULL pointer dereference in such error paths. Fix this by moving clk_scaling initialization and kill codes to two separate methods, and call them at required places.
gating")
--- drivers/scsi/ufs/ufshcd.c | 53 +++++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 19 deletions(-)
drivers/scsi/ufs/ufshcd.c +34 -19
@@ -1772,6 +1772,34 @@ out:return count; } +static void ufshcd_init_clk_scaling (struct ufs_hba *hba) +{ +char wq_name[sizeof ("ufs_clkscaling_00" )]; + +if (!ufshcd_is_clkscaling_supported (hba)) +return ; + +INIT_WORK (&hba->clk_scaling.suspend_work, + ufshcd_clk_scaling_suspend_work); +INIT_WORK (&hba->clk_scaling.resume_work, + ufshcd_clk_scaling_resume_work); + +snprintf (wq_name,sizeof (wq_name),"ufs_clkscaling_%d" , + hba->host->host_no); + hba->clk_scaling.workq =create_singlethread_workqueue (wq_name); + +ufshcd_clkscaling_init_sysfs (hba); +} + +static void ufshcd_exit_clk_scaling (struct ufs_hba *hba) +{ +if (!ufshcd_is_clkscaling_supported (hba)) +return ; + +destroy_workqueue (hba->clk_scaling.workq); +ufshcd_devfreq_remove (hba); +} +static void ufshcd_init_clk_gating (struct ufs_hba *hba) {char wq_name[sizeof ("ufs_clk_gating_00" )];
@@ -6676,6 +6704,7 @@ out:*/ if (ret && !ufshcd_eh_in_progress (hba) && !hba->pm_op_in_progress) {pm_runtime_put_sync (hba->dev); +ufshcd_exit_clk_scaling (hba);ufshcd_hba_exit (hba); }
@@ -7223,12 +7252,9 @@ static void ufshcd_hba_exit(struct ufs_hba *hba)ufshcd_variant_hba_exit (hba);ufshcd_setup_vreg (hba, false);ufshcd_suspend_clkscaling (hba); -if (ufshcd_is_clkscaling_supported (hba)) { +if (ufshcd_is_clkscaling_supported (hba))if (hba->devfreq)ufshcd_suspend_clkscaling (hba); -destroy_workqueue (hba->clk_scaling.workq); -ufshcd_devfreq_remove (hba); - }ufshcd_setup_clocks (hba, false);ufshcd_setup_hba_vreg (hba, false); hba->is_powered = false;
@@ -7908,6 +7934,7 @@ void ufshcd_remove(struct ufs_hba *hba)ufshcd_disable_intr (hba, hba->intr_mask);ufshcd_hba_stop (hba, true); +ufshcd_exit_clk_scaling (hba);ufshcd_exit_clk_gating (hba);if (ufshcd_is_clkscaling_supported (hba))device_remove_file (hba->dev, &hba->clk_scaling.enable_attr);
@@ -8079,6 +8106,8 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq)ufshcd_init_clk_gating (hba); +ufshcd_init_clk_scaling (hba); +/* * In order to avoid any spurious interrupt immediately after * registering UFS controller interrupt handler, clear any pending UFS
@@ -8117,21 +8146,6 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq) goto out_remove_scsi_host; } -if (ufshcd_is_clkscaling_supported (hba)) { -char wq_name[sizeof ("ufs_clkscaling_00" )]; - -INIT_WORK (&hba->clk_scaling.suspend_work, - ufshcd_clk_scaling_suspend_work); -INIT_WORK (&hba->clk_scaling.resume_work, - ufshcd_clk_scaling_resume_work); - -snprintf (wq_name,sizeof (wq_name),"ufs_clkscaling_%d" , - host->host_no); - hba->clk_scaling.workq =create_singlethread_workqueue (wq_name); - -ufshcd_clkscaling_init_sysfs (hba); - } -/* * Set the default power management level for runtime and system PM. * Default power saving mode is to keep UFS link in Hibern8 state
@@ -8169,6 +8183,7 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq) out_remove_scsi_host:scsi_remove_host (hba->host); exit_gating: +ufshcd_exit_clk_scaling (hba);ufshcd_exit_clk_gating (hba); out_disable: hba->is_irq_enabled = false;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 202/205 ACPI / LPSS: Exclude I2C busses shared with PUNIT from pmc_atom_d3_mask
In reply to Sasha LevinFrom: Hans de Goede <[email protected]>
[ Upstream commit 86b62e5cd8965d3056f9e9ccdec51631c37add81 ]
lpss_iosf_enter_d3_state() checks if all hw-blocks using the DMA controllers are in d3 before powering down the DMA controllers.
But on devices, where the I2C bus connected to the PMIC is shared by the PUNIT, the controller for that bus will never reach d3 since it has an effectively empty _PS3 method. Instead it appears to automatically power-down during S0i3 and we never see it as being in d3.
This causes the DMA controllers to never be powered-down on these devices, causing them to never reach S0i3. This commit uses the ACPI _SEM method to detect if an I2C bus is shared with the PUNIT and if it is, it removes it from the mask of devices which lpss_iosf_enter_d3_state() checks for.
This fixes these devices never reaching any S0ix states.
--- drivers/acpi/acpi_lpss.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-)
drivers/acpi/acpi_lpss.c +20 -2
@@ -99,6 +99,9 @@ struct lpss_private_data {u32 prv_reg_ctx[LPSS_PRV_REG_COUNT ]; }; +/* Devices which need to be in D3 before lpss_iosf_enter_d3_state() proceeds */ +static u32 pmc_atom_d3_mask =0xfe000ffe ; +/* LPSS run time quirks */ static unsigned int lpss_quirks;
@@ -175,6 +178,21 @@ static void byt_pwm_setup(struct lpss_private_data *pdata)static void byt_i2c_setup (struct lpss_private_data *pdata) { +const char *uid_str =acpi_device_uid (pdata->adev); +acpi_handle handle = pdata->adev->handle; +unsigned long long shared_host =0 ; +acpi_status status; +long uid =0 ; + +/* Expected to always be true, but better safe then sorry */ +if (uid_str) + uid =simple_strtol (uid_str,NULL ,10 ); + +/* Detect I2C bus shared with PUNIT and ignore its d3 status */ + status =acpi_evaluate_integer (handle,"_SEM" ,NULL , &shared_host); +if (ACPI_SUCCESS (status) && shared_host && uid) + pmc_atom_d3_mask &= ~(BIT_LPSS2_F1_I2C1 << (uid -1 )); +lpss_deassert_reset (pdata);if (readl (pdata->mmio_base + pdata->dev_desc->prv_offset))
@@ -894,7 +912,7 @@ static void lpss_iosf_enter_d3_state(void)* Here we read the values related to LPSS power island, i.e. LPSS * devices, excluding both LPSS DMA controllers, along with SCC domain. */ -u32 func_dis, d3_sts_0, pmc_status, pmc_mask =0xfe000ffe ; +u32 func_dis, d3_sts_0, pmc_status;int ret; ret =pmc_atom_read (PMC_FUNC_DIS , &func_dis);
@@ -912,7 +930,7 @@ static void lpss_iosf_enter_d3_state(void)* Shutdown both LPSS DMA controllers if and only if all other devices * are already in D3hot. */ - pmc_status = (~(d3_sts_0 | func_dis)) & pmc_mask; + pmc_status = (~(d3_sts_0 | func_dis)) & pmc_atom_d3_mask;if (pmc_status) goto exit;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 205/205 ath9k: Fix a locking bug in ath9k_add_interface()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit 461cf036057477805a8a391e5fd0f5264a5e56a8 ]
We tried to revert commit d9c52fd17cb4 ("ath9k: fix tx99 with monitor mode interface") but accidentally missed part of the locking change.
The lock has to be held earlier so that we're holding it when we do "sc->tx99_vif = vif;" and also there in the current code there is a stray unlock before we have taken the lock.
--- drivers/net/wireless/ath/ath9k/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/wireless/ath/ath9k/main.c +1 -2
@@ -1251,6 +1251,7 @@ static int ath9k_add_interface(struct ieee80211_hw *hw,struct ath_vif *avp = (void *)vif->drv_priv;struct ath_node *an = &avp->mcast_node; +mutex_lock (&sc->mutex);if (IS_ENABLED (CONFIG_ATH9K_TX99 )) {if (sc->cur_chan->nvifs >=1 ) {mutex_unlock (&sc->mutex);
@@ -1259,8 +1260,6 @@ static int ath9k_add_interface(struct ieee80211_hw *hw, sc->tx99_vif = vif; } -mutex_lock (&sc->mutex); -ath_dbg (common,CONFIG ,"Attach a VIF of type: %d\n" , vif->type); sc->cur_chan->nvifs++;
Signature · 1 line
2.20.1
Julian Wiedmann
NAKRe: [PATCH AUTOSEL 4.19 204/205] s390/qeth: limit csum offload erratum to L3 devices
In reply to Sasha LevinQuoted 7 lines · Sasha Levin
From: Julian Wiedmann <[email protected]>
[ Upstream commit
f231dc9dbd789b0f98a15941e3cebedb4ad72ad5]Combined L3+L4 csum offload is only required for some L3 HW. So for L2 devices, don't offload the IP header csum calculation.
NACK, this has no relevance for stable.
Quoted 42 lines
Signed-off-by Julian Wiedmann <[email protected]>Reference-ID: JUP 394553
Signed-off-by David S. Miller <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- drivers/s390/net/qeth_core.h | 5 ----- drivers/s390/net/qeth_l3_main.c | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-)drivers/s390/net/qeth_core.h +0
-5@@ -902,11 +902,6 @@ static inline void qeth_tx_csum(struct sk_buff *skb, u8 *flags, int ipv)if ((ipv ==4 &&ip_hdr (skb)->protocol ==IPPROTO_UDP ) || (ipv ==6 &&ipv6_hdr (skb)->nexthdr ==IPPROTO_UDP )) *flags |=QETH_HDR_EXT_UDP ; -if (ipv ==4 ) { -/* some HW requires combined L3+L4 csum offload: */ - *flags |=QETH_HDR_EXT_CSUM_HDR_REQ ; -ip_hdr (skb)->check =0 ; - } } static inline void qeth_put_buffer_pool_entry(struct qeth_card *card,drivers/s390/net/qeth_l3_main.c +5
-0@@ -2054,6 +2054,11 @@ static void qeth_l3_fill_header(struct qeth_card *card, struct qeth_hdr *hdr,if (!skb_is_gso (skb) && skb->ip_summed ==CHECKSUM_PARTIAL ) {qeth_tx_csum (skb, &hdr->hdr.l3.ext_flags, ipv); +/* some HW requires combined L3+L4 csum offload: */ +if (ipv ==4 ) { + hdr->hdr.l3.ext_flags |=QETH_HDR_EXT_CSUM_HDR_REQ ; +ip_hdr (skb)->check =0 ; + }if (card->options.performance_stats) card->perf_stats.tx_csum++; }
Sasha Levin
maintainerRe: [PATCH AUTOSEL 4.19 204/205] s390/qeth: limit csum offload erratum to L3 devices
Quoted 10 lines · Julian Wiedmann
Quoted 7 lines · Sasha Levin
From: Julian Wiedmann <[email protected]>
[ Upstream commit
f231dc9dbd789b0f98a15941e3cebedb4ad72ad5]Combined L3+L4 csum offload is only required for some L3 HW. So for L2 devices, don't offload the IP header csum calculation.
NACK, this has no relevance for stable.
Sure, I'll drop it.
Do you have an idea why the centos and ubuntu folks might have backported this commit into their kernels?
Signature · 2 lines
Thanks, Sasha
Sasha Levin
maintainerPATCH 203/205 netfilter: nf_tables: avoid BUG_ON usage
In reply to Sasha LevinFrom: Florian Westphal <[email protected]>
[ Upstream commit fa5950e498e7face21a1761f327e6c1152f778c3 ]
None of these spots really needs to crash the kernel.
In one two cases we can jsut report error to userspace, in the other cases we can just use WARN_ON (and leak memory instead).
--- net/netfilter/nf_tables_api.c | 9 ++++++--- net/netfilter/nft_cmp.c | 6 ++++-- net/netfilter/nft_reject.c | 6 ++++-- 3 files changed, 14 insertions(+), 7 deletions(-)
net/netfilter/nf_tables_api.c +6 -3
@@ -1031,7 +1031,8 @@ static int nf_tables_deltable(struct net *net, struct sock *nlsk,static void nf_tables_table_destroy (struct nft_ctx *ctx) { -BUG_ON (ctx->table->use >0 ); +if (WARN_ON (ctx->table->use >0 )) +return ;rhltable_destroy (&ctx->table->chains_ht);kfree (ctx->table->name);
@@ -1446,7 +1447,8 @@ static void nf_tables_chain_destroy(struct nft_ctx *ctx) {struct nft_chain *chain = ctx->chain; -BUG_ON (chain->use >0 ); +if (WARN_ON (chain->use >0 )) +return ;/* no concurrent access possible anymore */ nf_tables_chain_free_chain_rules (chain);
@@ -7253,7 +7255,8 @@ int __nft_release_basechain(struct nft_ctx *ctx) {struct nft_rule *rule, *nr; -BUG_ON (!nft_is_base_chain (ctx->chain)); +if (WARN_ON (!nft_is_base_chain (ctx->chain))) +return 0 ;nf_tables_unregister_hook (ctx->net, ctx->chain->table, ctx->chain);list_for_each_entry_safe (rule, nr, &ctx->chain->rules, list) {
net/netfilter/nft_cmp.c +4 -2
@@ -79,7 +79,8 @@ static int nft_cmp_init(const struct nft_ctx *ctx, const struct nft_expr *expr, err =nft_data_init (NULL , &priv->data,sizeof (priv->data), &desc, tb[NFTA_CMP_DATA ]); -BUG_ON (err <0 ); +if (err <0 ) +return err; priv->sreg =nft_parse_register (tb[NFTA_CMP_SREG ]); err =nft_validate_register_load (priv->sreg, desc.len);
@@ -129,7 +130,8 @@ static int nft_cmp_fast_init(const struct nft_ctx *ctx, err =nft_data_init (NULL , &data,sizeof (data), &desc, tb[NFTA_CMP_DATA ]); -BUG_ON (err <0 ); +if (err <0 ) +return err; priv->sreg =nft_parse_register (tb[NFTA_CMP_SREG ]); err =nft_validate_register_load (priv->sreg, desc.len);
net/netfilter/nft_reject.c +4 -2
@@ -94,7 +94,8 @@ static u8 icmp_code_v4[NFT_REJECT_ICMPX_MAX + 1] = {int nft_reject_icmp_code (u8 code) { -BUG_ON (code >NFT_REJECT_ICMPX_MAX ); +if (WARN_ON_ONCE (code >NFT_REJECT_ICMPX_MAX )) +return ICMP_NET_UNREACH ;return icmp_code_v4[code]; }
@@ -111,7 +112,8 @@ static u8 icmp_code_v6[NFT_REJECT_ICMPX_MAX + 1] = {int nft_reject_icmpv6_code (u8 code) { -BUG_ON (code >NFT_REJECT_ICMPX_MAX ); +if (WARN_ON_ONCE (code >NFT_REJECT_ICMPX_MAX )) +return ICMPV6_NOROUTE ;return icmp_code_v6[code]; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 198/205 ip_gre: fix parsing gre header in ipgre_err
In reply to Sasha LevinFrom: Haishuang Yan <[email protected]>
[ Upstream commit b0350d51f001e6edc13ee4f253b98b50b05dd401 ]
gre_parse_header stops parsing when csum_err is encountered, which means tpi->key is undefined and ip_tunnel_lookup will return NULL improperly.
This patch introduce a NULL pointer as csum_err parameter. Even when csum_err is encountered, it won't return error and continue parsing gre header as expected.
--- net/ipv4/gre_demux.c | 7 ++++--- net/ipv4/ip_gre.c | 9 +++------ 2 files changed, 7 insertions(+), 9 deletions(-)
net/ipv4/gre_demux.c +4 -3
@@ -87,13 +87,14 @@ int gre_parse_header(struct sk_buff *skb, struct tnl_ptk_info *tpi, options = (__be32 *)(greh +1 );if (greh->flags &GRE_CSUM ) { -if (skb_checksum_simple_validate (skb)) { +if (!skb_checksum_simple_validate (skb)) { +skb_checksum_try_convert (skb,IPPROTO_GRE ,0 , + null_compute_pseudo); + }else if (csum_err) { *csum_err = true;return -EINVAL ; } -skb_checksum_try_convert (skb,IPPROTO_GRE ,0 , - null_compute_pseudo); options++; }
net/ipv4/ip_gre.c +3 -6
@@ -232,13 +232,10 @@ static void gre_err(struct sk_buff *skb, u32 info)const int type =icmp_hdr (skb)->type;const int code =icmp_hdr (skb)->code;struct tnl_ptk_info tpi; -bool csum_err = false; -if (gre_parse_header (skb, &tpi, &csum_err,htons (ETH_P_IP ), - iph->ihl *4 ) <0 ) { -if (!csum_err)/* ignore csum errors. */ -return ; - } +if (gre_parse_header (skb, &tpi,NULL ,htons (ETH_P_IP ), + iph->ihl *4 ) <0 ) +return ;if (type ==ICMP_DEST_UNREACH && code ==ICMP_FRAG_NEEDED ) { ipv4_update_pmtu(skb, dev_net(skb->dev), info,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 197/205 kernfs: Fix range checks in kernfs_get_target_path
In reply to Sasha LevinFrom: Bernd Edlinger <[email protected]>
[ Upstream commit a75e78f21f9ad4b810868c89dbbabcc3931591ca ]
The terminating NUL byte is only there because the buffer is allocated with kzalloc(PAGE_SIZE, GFP_KERNEL), but since the range-check is off-by-one, and PAGE_SIZE==PATH_MAX, the returned string may not be zero-terminated if it is exactly PATH_MAX characters long. Furthermore also the initial loop may theoretically exceed PATH_MAX and cause a fault.
--- fs/kernfs/symlink.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
fs/kernfs/symlink.c +4 -1
@@ -72,6 +72,9 @@ static int kernfs_get_target_path(struct kernfs_node *parent,if (base == kn)break ; +if ((s - path) +3 >=PATH_MAX ) +return -ENAMETOOLONG ; +strcpy (s,"../" ); s +=3 ; base = base->parent;
@@ -88,7 +91,7 @@ static int kernfs_get_target_path(struct kernfs_node *parent,if (len <2 )return -EINVAL ; len--; -if ((s - path) + len >PATH_MAX ) +if ((s - path) + len >=PATH_MAX )return -ENAMETOOLONG ;/* reverse fillup of target string from target to base */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 193/205 power: supply: ab8500_fg: silence uninitialized variable warnings
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit 54baff8d4e5dce2cef61953b1dc22079cda1ddb1 ]
If kstrtoul() fails then we print "charge_full" when it's uninitialized. The debug printk doesn't add anything so I deleted it and cleaned these two functions up a bit.
--- drivers/power/supply/ab8500_fg.c | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-)
drivers/power/supply/ab8500_fg.c +12 -19
@@ -2433,17 +2433,14 @@ static ssize_t charge_full_store(struct ab8500_fg *di, const char *buf, size_t count) {unsigned long charge_full; -ssize_t ret; +int ret; ret =kstrtoul (buf,10 , &charge_full); +if (ret) +return ret; -dev_dbg (di->dev,"Ret %zd charge_full %lu" , ret, charge_full); - -if (!ret) { - di->bat_cap.max_mah = (int ) charge_full; - ret = count; - } -return ret; + di->bat_cap.max_mah = (int ) charge_full; +return count; }static ssize_t charge_now_show (struct ab8500_fg *di,char *buf)
@@ -2455,20 +2452,16 @@ static ssize_t charge_now_store(struct ab8500_fg *di, const char *buf, size_t count) {unsigned long charge_now; -ssize_t ret; +int ret; ret =kstrtoul (buf,10 , &charge_now); +if (ret) +return ret; -dev_dbg (di->dev,"Ret %zd charge_now %lu was %d" , - ret, charge_now, di->bat_cap.prev_mah); - -if (!ret) { - di->bat_cap.user_mah = (int ) charge_now; - di->flags.user_cap = true; - ret = count; -queue_delayed_work (di->fg_wq, &di->fg_periodic_work,0 ); - } -return ret; + di->bat_cap.user_mah = (int ) charge_now; + di->flags.user_cap = true; +queue_delayed_work (di->fg_wq, &di->fg_periodic_work,0 ); +return count; } static struct ab8500_fg_sysfs_entry charge_full_attr =
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 191/205 blok, bfq: do not plug I/O if all queues are weight-raised
In reply to Sasha LevinFrom: Paolo Valente <[email protected]>
[ Upstream commit c8765de0adfcaaf4ffb2d951e07444f00ffa9453 ]
To reduce latency for interactive and soft real-time applications, bfq privileges the bfq_queues containing the I/O of these applications. These privileged queues, referred-to as weight-raised queues, get a much higher share of the device throughput w.r.t. non-privileged queues. To preserve this higher share, the I/O of any non-weight-raised queue must be plugged whenever a sync weight-raised queue, while being served, remains temporarily empty. To attain this goal, bfq simply plugs any I/O (from any queue), if a sync weight-raised queue remains empty while in service.
Unfortunately, this plugging typically lowers throughput with random I/O, on devices with internal queueing (because it reduces the filling level of the internal queues of the device).
This commit addresses this issue by restricting the cases where plugging is performed: if a sync weight-raised queue remains empty while in service, then I/O plugging is performed only if some of the active bfq_queues are *not* weight-raised (which is actually the only circumstance where plugging is needed to preserve the higher share of the throughput of weight-raised queues). This restriction proved able to boost throughput in really many use cases needing only maximum throughput.
--- block/bfq-iosched.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
block/bfq-iosched.c +8 -2
@@ -3593,7 +3593,12 @@ static bool bfq_better_to_idle(struct bfq_queue *bfqq)* whether bfqq is being weight-raised, because * bfq_symmetric_scenario() does not take into account also * weight-raised queues (see comments on -* bfq_weights_tree_add()). +* bfq_weights_tree_add()). In particular, if bfqq is being +* weight-raised, it is important to idle only if there are +* other, non-weight-raised queues that may steal throughput +* to bfqq. Actually, we should be even more precise, and +* differentiate between interactive weight raising and +* soft real-time weight raising. * * As a side note, it is worth considering that the above * device-idling countermeasures may however fail in the
@@ -3605,7 +3610,8 @@ static bool bfq_better_to_idle(struct bfq_queue *bfqq)* to let requests be served in the desired order until all * the requests already queued in the device have been served. */ - asymmetric_scenario = bfqq->wr_coeff >1 || + asymmetric_scenario = (bfqq->wr_coeff >1 && + bfqd->wr_busy_queues < bfqd->busy_queues) || !bfq_symmetric_scenario (bfqd);/*
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 186/205 ARM: dts: sun9i: Fix I2C bus warnings
In reply to Sasha LevinFrom: Rob Herring <[email protected]>
[ Upstream commit 57a83c5222c1b5e7b3acc72c6e60fce00a38991a ]
dtc has new checks for I2C buses. The sun9i-a80 dts file has a node named 'i2c' which causes a false positive warning. As the node is a RSB bus, correct the node name to be 'rsb' to fix the warnings.
arch/arm/boot/dts/sun9i-a80-cubieboard4.dtb: Warning (i2c_bus_reg): /soc/i2c@8003400/codec@e89:reg: I2C address must be less than 10-bits, got "0xe89" arch/arm/boot/dts/sun9i-a80-cubieboard4.dtb: Warning (i2c_bus_reg): /soc/i2c@8003400/pmic@745:reg: I2C address must be less than 10-bits, got "0x745" arch/arm/boot/dts/sun9i-a80-optimus.dtb: Warning (i2c_bus_reg): /soc/i2c@8003400/codec@e89:reg: I2C address must be less than 10-bits, got "0xe89" arch/arm/boot/dts/sun9i-a80-optimus.dtb: Warning (i2c_bus_reg): /soc/i2c@8003400/pmic@745:reg: I2C address must be less than 10-bits, got "0x745"
--- arch/arm/boot/dts/sun9i-a80.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/sun9i-a80.dtsi +1 -1
@@ -1196,7 +1196,7 @@ }; }; - r_rsb: i2c@8003400 { + r_rsb: rsb@8003400 { compatible = "allwinner,sun8i-a23-rsb"; reg = <0x08003400 0x400>; interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 185/205 pinctrl: at91: don't use the same irqchip with multiple gpiochips
In reply to Sasha LevinFrom: Ludovic Desroches <[email protected]>
[ Upstream commit 0c3dfa176912b5f87732545598200fb55e9c1978 ]
Sharing the same irqchip with multiple gpiochips is not a good practice. For instance, when installing hooks, we change the state of the irqchip. The initial state of the irqchip for the second gpiochip to register is then disrupted.
--- drivers/pinctrl/pinctrl-at91.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
drivers/pinctrl/pinctrl-at91.c +14 -14
@@ -1574,16 +1574,6 @@ void at91_pinctrl_gpio_resume(void)#define gpio_irq_set_wake NULL#endif /* CONFIG_PM */ -static struct irq_chip gpio_irqchip = { - .name ="GPIO" , - .irq_ack = gpio_irq_ack, - .irq_disable = gpio_irq_mask, - .irq_mask = gpio_irq_mask, - .irq_unmask = gpio_irq_unmask, -/* .irq_set_type is set dynamically */ - .irq_set_wake = gpio_irq_set_wake, -}; -static void gpio_irq_handler (struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);
@@ -1624,12 +1614,22 @@ static int at91_gpio_of_irq_setup(struct platform_device *pdev,struct gpio_chip *gpiochip_prev =NULL ;struct at91_gpio_chip *prev =NULL ;struct irq_data *d =irq_get_irq_data (at91_gpio->pioc_virq); +struct irq_chip *gpio_irqchip;int ret, i; + gpio_irqchip =devm_kzalloc (&pdev->dev,sizeof (*gpio_irqchip),GFP_KERNEL ); +if (!gpio_irqchip) +return -ENOMEM ; + at91_gpio->pioc_hwirq =irqd_to_hwirq (d); -/* Setup proper .irq_set_type function */ - gpio_irqchip.irq_set_type = at91_gpio->ops->irq_type; + gpio_irqchip->name ="GPIO" ; + gpio_irqchip->irq_ack = gpio_irq_ack; + gpio_irqchip->irq_disable = gpio_irq_mask; + gpio_irqchip->irq_mask = gpio_irq_mask; + gpio_irqchip->irq_unmask = gpio_irq_unmask; + gpio_irqchip->irq_set_wake = gpio_irq_set_wake, + gpio_irqchip->irq_set_type = at91_gpio->ops->irq_type;/* Disable irqs of this PIO controller */ writel_relaxed (~0 , at91_gpio->regbase +PIO_IDR );
@@ -1640,7 +1640,7 @@ static int at91_gpio_of_irq_setup(struct platform_device *pdev,* interrupt. */ ret =gpiochip_irqchip_add (&at91_gpio->chip, - &gpio_irqchip, + gpio_irqchip,0 , handle_edge_irq,IRQ_TYPE_NONE );
@@ -1658,7 +1658,7 @@ static int at91_gpio_of_irq_setup(struct platform_device *pdev,if (!gpiochip_prev) {/* Then register the chain on the parent IRQ */ gpiochip_set_chained_irqchip (&at91_gpio->chip, - &gpio_irqchip, + gpio_irqchip, at91_gpio->pioc_virq, gpio_irq_handler);return 0 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 184/205 ARM: dts: sunxi: Fix I2C bus warnings
In reply to Sasha LevinFrom: Rob Herring <[email protected]>
[ Upstream commit 0729b4af5753b65aa031f58c435da53dbbf56d19 ]
dtc has new checks for I2C buses. Fix the warnings in unit-addresses.
arch/arm/boot/dts/sun8i-a23-gt90h-v4.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2ac00/touchscreen@0: I2C bus unit address format error, expected "40" arch/arm/boot/dts/sun8i-a23-inet86dz.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2ac00/touchscreen@0: I2C bus unit address format error, expected "40" arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2ac00/touchscreen@0: I2C bus unit address format error, expected "40" arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2ac00/touchscreen@0: I2C bus unit address format error, expected "40" arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2ac00/touchscreen@0: I2C bus unit address format error, expected "40" arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2ac00/touchscreen@0: missing or empty reg property arch/arm/boot/dts/sun8i-a33-ippo-q8h-v1.2.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2ac00/touchscreen@0: missing or empty reg property arch/arm/boot/dts/sun8i-a33-q8-tablet.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2ac00/touchscreen@0: missing or empty reg property arch/arm/boot/dts/sun5i-a13-utoo-p66.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2b000/touchscreen: I2C bus unit address format error, expected "40" arch/arm/boot/dts/sun5i-a13-difrnce-dit4350.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2b000/touchscreen: missing or empty reg property arch/arm/boot/dts/sun5i-a13-empire-electronix-m712.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2b000/touchscreen: missing or empty reg property arch/arm/boot/dts/sun5i-a13-inet-98v-rev2.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2b000/touchscreen: missing or empty reg property arch/arm/boot/dts/sun5i-a13-q8-tablet.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2b000/touchscreen: missing or empty reg property
--- arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi | 3 ++- arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi | 3 ++- arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-)
arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi +2 -1
@@ -92,7 +92,8 @@ */ clock-frequency = <400000>; - touchscreen: touchscreen { + touchscreen: touchscreen@40 { + reg = <0x40>; interrupt-parent = <&pio>; interrupts = <6 11 IRQ_TYPE_EDGE_FALLING>; /* EINT11 (PG11) */ pinctrl-names = "default";
arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi +2 -1
@@ -69,7 +69,8 @@ */ clock-frequency = <400000>; - touchscreen: touchscreen@0 { + touchscreen: touchscreen@40 { + reg = <0x40>; interrupt-parent = <&pio>; interrupts = <1 5 IRQ_TYPE_EDGE_FALLING>; /* PB5 */ pinctrl-names = "default";
arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts +1 -1
@@ -95,7 +95,7 @@ &i2c0 { status = "okay"; - axp22x: pmic@68 { + axp22x: pmic@34 { compatible = "x-powers,axp221"; reg = <0x34>; interrupt-parent = <&nmi_intc>;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 179/205 arm64: dts: broadcom: Fix I2C and SPI bus warnings
In reply to Sasha LevinFrom: Rob Herring <[email protected]>
[ Upstream commit 7cdbe45da1a189e744e6801aebb462ee47235580 ]
dtc has new checks for I2C and SPI buses. Fix the warnings in node names and unit-addresses.
arch/arm64/boot/dts/broadcom/stingray/bcm958742k.dtb: Warning (i2c_bus_reg): /hsls/i2c@e0000/pcf8574@20: I2C bus unit address format error, expected "27" arch/arm64/boot/dts/broadcom/stingray/bcm958742t.dtb: Warning (i2c_bus_reg): /hsls/i2c@e0000/pcf8574@20: I2C bus unit address format error, expected "27" arch/arm64/boot/dts/broadcom/stingray/bcm958742k.dtb: Warning (spi_bus_bridge): /hsls/ssp@180000: node name for SPI buses should be 'spi' arch/arm64/boot/dts/broadcom/stingray/bcm958742k.dtb: Warning (spi_bus_bridge): /hsls/ssp@190000: node name for SPI buses should be 'spi'
--- arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi | 4 ++-- arch/arm64/boot/dts/broadcom/stingray/bcm958742-base.dtsi | 2 +- arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)
arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi +2 -2
@@ -639,7 +639,7 @@ status = "disabled"; }; - ssp0: ssp@66180000 { + ssp0: spi@66180000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x66180000 0x1000>; interrupts = <GIC_SPI 404 IRQ_TYPE_LEVEL_HIGH>;
@@ -650,7 +650,7 @@ status = "disabled"; }; - ssp1: ssp@66190000 { + ssp1: spi@66190000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x66190000 0x1000>; interrupts = <GIC_SPI 405 IRQ_TYPE_LEVEL_HIGH>;
arch/arm64/boot/dts/broadcom/stingray/bcm958742-base.dtsi +1 -1
@@ -138,7 +138,7 @@ &i2c1 { status = "okay"; - pcf8574: pcf8574@20 { + pcf8574: pcf8574@27 { compatible = "nxp,pcf8574a"; gpio-controller; #gpio-cells = <2>;
arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi +2 -2
@@ -521,7 +521,7 @@ status = "disabled"; }; - ssp0: ssp@180000 { + ssp0: spi@180000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x00180000 0x1000>; interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;
@@ -533,7 +533,7 @@ status = "disabled"; }; - ssp1: ssp@190000 { + ssp1: spi@190000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x00190000 0x1000>; interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 178/205 drivers: qcom: rpmh-rsc: clear wait_for_compl after use
In reply to Sasha LevinFrom: Lina Iyer <[email protected]>
[ Upstream commit 09e97b6c8754c91470455e69ebd827b741f80af5 ]
The wait_for_compl register ensures the request sequence is maintained when sending requests from the TCS. Clear the register after sending active request and during invalidate of the sleep and wake TCS.
--- drivers/soc/qcom/rpmh-rsc.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/soc/qcom/rpmh-rsc.c +2 -0
@@ -121,6 +121,7 @@ static int tcs_invalidate(struct rsc_drv *drv, int type)return -EAGAIN ; }write_tcs_reg_sync (drv,RSC_DRV_CMD_ENABLE , m,0 ); +write_tcs_reg_sync (drv,RSC_DRV_CMD_WAIT_FOR_CMPL , m,0 ); }bitmap_zero (tcs->slots,MAX_TCS_SLOTS );spin_unlock (&tcs->lock);
@@ -239,6 +240,7 @@ static irqreturn_t tcs_tx_done(int irq, void *p) skip:/* Reclaim the TCS */ write_tcs_reg (drv,RSC_DRV_CMD_ENABLE , i,0 ); +write_tcs_reg (drv,RSC_DRV_CMD_WAIT_FOR_CMPL , i,0 );write_tcs_reg (drv,RSC_DRV_IRQ_CLEAR ,0 ,BIT (i));spin_lock (&drv->lock);clear_bit (i, drv->tcs_in_use);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 175/205 soc: qcom: geni: geni_se_clk_freq_match() should always accept multiples
In reply to Sasha LevinFrom: Douglas Anderson <[email protected]>
[ Upstream commit 867d4aa7013fdee8b962cde1711f96c8dd86d926 ]
The geni_se_clk_freq_match() has some strange semantics. Specifically it is defined with two modes:
1. It can find a clock that's an exact multiple of the requested rate
2. It can find a non-exact match but it can't handle multiples then
...but callers should always be able to handle a clock that is a multiple of the requested clock so mode #2 doesn't really make sense. Let's change the semantics so that the non-exact match can also accept multiples and then change the code to handle that.
The only caller of this code is the unlanded SPI driver [1] which currently passes "exact = True", thus it should be safe to change the semantics in this way. ...and, in fact, the SPI driver should likely be modified to pass "exact = False" (with the new semantics) since that will allow it to work with SPI devices that request a clock rate that doesn't exactly match a rate we can make.
[1] https://lkml.kernel.org/r/[email protected]
--- drivers/soc/qcom/qcom-geni-se.c | 37 ++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 15 deletions(-)
drivers/soc/qcom/qcom-geni-se.c +22 -15
@@ -544,16 +544,17 @@ EXPORT_SYMBOL(geni_se_clk_tbl_get);* @se: Pointer to the concerned serial engine. * @req_freq: Requested clock frequency. * @index: Index of the resultant frequency in the table. -* @res_freq: Resultant frequency which matches or is closer to the -* requested frequency. +* @res_freq: Resultant frequency of the source clock. * @exact: Flag to indicate exact multiple requirement of the requested * frequency. * -* This function is called by the protocol drivers to determine the matching -* or exact multiple of the requested frequency, as provided by the serial -* engine clock in order to meet the performance requirements. If there is -* no matching or exact multiple of the requested frequency found, then it -* selects the closest floor frequency, if exact flag is not set. +* This function is called by the protocol drivers to determine the best match +* of the requested frequency as provided by the serial engine clock in order +* to meet the performance requirements. +* +* If we return success: +* - if @exact is true then @res_freq / <an_integer> == @req_freq +* - if @exact is false then @res_freq / <an_integer> <= @req_freq * * Return: 0 on success, standard Linux error codes on failure. */
@@ -564,6 +565,9 @@ int geni_se_clk_freq_match(struct geni_se *se, unsigned long req_freq,unsigned long *tbl;int num_clk_levels;int i; +unsigned long best_delta; +unsigned long new_delta; +unsigned int divider; num_clk_levels =geni_se_clk_tbl_get (se, &tbl);if (num_clk_levels <0 )
@@ -572,18 +576,21 @@ int geni_se_clk_freq_match(struct geni_se *se, unsigned long req_freq,if (num_clk_levels ==0 )return -EINVAL ; - *res_freq =0 ; + best_delta =ULONG_MAX ;for (i =0 ; i < num_clk_levels; i++) { -if (!(tbl[i] % req_freq)) { + divider =DIV_ROUND_UP (tbl[i], req_freq); + new_delta = req_freq - tbl[i] / divider; +if (new_delta < best_delta) { +/* We have a new best! */ *index = i; *res_freq = tbl[i]; -return 0 ; - } -if (!(*res_freq) || ((tbl[i] > *res_freq) && - (tbl[i] < req_freq))) { - *index = i; - *res_freq = tbl[i]; +/* If the new best is exact then we're done */ +if (new_delta ==0 ) +return 0 ; + +/* Record how close we got */ + best_delta = new_delta; } }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 173/205 ARM: dts: qcom: ipq4019: fix cpu0's qcom,saw2 reg value
In reply to Sasha LevinFrom: Christian Lamparter <[email protected]>
[ Upstream commit bd73a3dd257fb838bd456a18eeee0ef0224b7a40 ]
while compiling an ipq4019 target, dtc will complain:
regulator@b089000 unit address format error, expected "2089000"
The saw0 regulator reg value seems to be
copied and pasted from qcom-ipq8064.dtsi.
This patch fixes the reg value to match that of the unit address which in turn silences the warning. (There is no driver for qcom,saw2 right now. So this went unnoticed)
--- arch/arm/boot/dts/qcom-ipq4019.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/qcom-ipq4019.dtsi +1 -1
@@ -313,7 +313,7 @@ saw0: regulator@b089000 { compatible = "qcom,saw2"; - reg = <0x02089000 0x1000>, <0x0b009000 0x1000>; + reg = <0x0b089000 0x1000>, <0x0b009000 0x1000>; regulator; };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 168/205 arm64: dts: renesas: r8a77965: Fix HS-USB compatible
In reply to Sasha LevinFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 99584d93e301d820d817bba2eb77b9152e13009c ]
Should be "renesas,usbhs-r8a77965", not "renesas,usbhs-r8a7796".
--- arch/arm64/boot/dts/renesas/r8a77965.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/renesas/r8a77965.dtsi +1 -1
@@ -545,7 +545,7 @@ }; hsusb: usb@e6590000 { - compatible = "renesas,usbhs-r8a7796", + compatible = "renesas,usbhs-r8a77965", "renesas,rcar-gen3-usbhs"; reg = <0 0xe6590000 0 0x100>; interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 165/205 ALSA: intel8x0m: Register irq handler after register initializations
In reply to Sasha LevinFrom: Takashi Iwai <[email protected]>
[ Upstream commit 7064f376d4a10686f51c879401a569bb4babf9c6 ]
The interrupt handler has to be acquired after the other resource initialization when allocated with IRQF_SHARED. Otherwise it's triggered before the resource gets ready, and may lead to unpleasant behavior.
--- sound/pci/intel8x0m.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
sound/pci/intel8x0m.c +10 -10
@@ -1171,16 +1171,6 @@ static int snd_intel8x0m_create(struct snd_card *card, } port_inited: -if (request_irq (pci->irq, snd_intel8x0m_interrupt,IRQF_SHARED , -KBUILD_MODNAME , chip)) { -dev_err (card->dev,"unable to grab IRQ %d\n" , pci->irq); -snd_intel8x0m_free (chip); -return -EBUSY ; - } - chip->irq = pci->irq; -pci_set_master (pci); -synchronize_irq (chip->irq); -/* initialize offsets */ chip->bdbars_count =2 ; tbl = intel_regs;
@@ -1224,11 +1214,21 @@ static int snd_intel8x0m_create(struct snd_card *card, chip->int_sta_reg =ICH_REG_GLOB_STA ; chip->int_sta_mask = int_sta_masks; +pci_set_master (pci); +if ((err =snd_intel8x0m_chip_init (chip,1 )) <0 ) {snd_intel8x0m_free (chip);return err; } +if (request_irq (pci->irq, snd_intel8x0m_interrupt,IRQF_SHARED , +KBUILD_MODNAME , chip)) { +dev_err (card->dev,"unable to grab IRQ %d\n" , pci->irq); +snd_intel8x0m_free (chip); +return -EBUSY ; + } + chip->irq = pci->irq; +if ((err =snd_device_new (card,SNDRV_DEV_LOWLEVEL , chip, &ops)) <0 ) {snd_intel8x0m_free (chip);return err;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 158/205 media: dt-bindings: adv748x: Fix decimal unit addresses
In reply to Sasha LevinFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 27582f0ea97fe3e4a38beb98ab36cce4b6f029d5 ]
With recent dtc and W=1:
Warning (graph_port): video-receiver@70/port@10: graph node unit address error, expected "a" Warning (graph_port): video-receiver@70/port@11: graph node unit address error, expected "b"
Unit addresses are always hexadecimal (without prefix), while the bases of reg property values depend on their prefixes.
--- Documentation/devicetree/bindings/media/i2c/adv748x.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/media/i2c/adv748x.txt +2 -2
@@ -73,7 +73,7 @@ Example: }; }; - port@10 { + port@a { reg = <10>; adv7482_txa: endpoint {
@@ -83,7 +83,7 @@ Example: }; }; - port@11 { + port@b { reg = <11>; adv7482_txb: endpoint {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 161/205 media: dvb: fix compat ioctl translation
In reply to Sasha LevinFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 1ccbeeb888ac33627d91f1ccf0b84ef3bcadef24 ]
The VIDEO_GET_EVENT and VIDEO_STILLPICTURE was added back in 2005 but it never worked because the command number is wrong.
Using the right command number means we have a better chance of them actually doing the right thing, though clearly nobody has ever tried it successfully.
I noticed these while auditing the remaining users of compat_time_t for y2038 bugs. This one is fine in that regard, it just never did anything.
--- fs/compat_ioctl.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
fs/compat_ioctl.c +6 -4
@@ -141,6 +141,7 @@ struct compat_video_event {unsigned int frame_rate; } u; }; +#define VIDEO_GET_EVENT32 _IOR('o', 28, struct compat_video_event)static int do_video_get_event (struct file *file,unsigned int cmd,struct compat_video_event __user *up)
@@ -152,7 +153,7 @@ static int do_video_get_event(struct file *file,if (kevent ==NULL )return -EFAULT ; - err =do_ioctl (file, cmd, (unsigned long )kevent); + err =do_ioctl (file,VIDEO_GET_EVENT , (unsigned long )kevent);if (!err) { err =convert_in_user (&kevent->type, &up->type); err |=convert_in_user (&kevent->timestamp, &up->timestamp);
@@ -171,6 +172,7 @@ struct compat_video_still_picture {compat_uptr_t iFrame;int32_t size; }; +#define VIDEO_STILLPICTURE32 _IOW('o', 30, struct compat_video_still_picture)static int do_video_stillpicture (struct file *file,unsigned int cmd,struct compat_video_still_picture __user *up)
@@ -193,7 +195,7 @@ static int do_video_stillpicture(struct file *file,if (err)return -EFAULT ; - err =do_ioctl (file, cmd, (unsigned long ) up_native); + err =do_ioctl (file,VIDEO_STILLPICTURE , (unsigned long ) up_native);return err; }
@@ -1302,9 +1304,9 @@ static long do_ioctl_trans(unsigned int cmd,return rtc_ioctl (file, cmd, argp);/* dvb */ -case VIDEO_GET_EVENT : +case VIDEO_GET_EVENT32 :return do_video_get_event (file, cmd, argp); -case VIDEO_STILLPICTURE : +case VIDEO_STILLPICTURE32 :return do_video_stillpicture (file, cmd, argp); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 160/205 media: fix: media: pci: meye: validate offset to avoid arbitrary access
In reply to Sasha LevinFrom: Lao Wei <[email protected]>
[ Upstream commit eac7230fdb4672c2cb56f6a01a1744f562c01f80 ]
Motion eye video4linux driver for Sony Vaio PictureBook desn't validate user-controlled parameter 'vma->vm_pgoff', a malicious process might access all of kernel memory from user space by trying pass different arbitrary address.
Discussion: http://www.openwall.com/lists/oss-security/2018/07/06/1
--- drivers/media/pci/meye/meye.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/pci/meye/meye.c +1 -1
@@ -1460,7 +1460,7 @@ static int meye_mmap(struct file *file, struct vm_area_struct *vma)unsigned long page, pos;mutex_lock (&meye.lock); -if (size > gbuffers * gbufsize) { +if (size > gbuffers * gbufsize || offset > gbuffers * gbufsize - size) {mutex_unlock (&meye.lock);return -EINVAL ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 162/205 net: bcmgenet: Fix speed selection for reverse MII
In reply to Sasha LevinFrom: Andrew Lunn <[email protected]>
[ Upstream commit 00eb2243b933a496958f4ce1bcf59840fea8be16 ]
The phy supported speed is being used to determine if the MAC should be configured to 100 or 1G. The masking logic is broken. Instead, look at 1G supported speeds to enable 1G MAC support.
--- drivers/net/ethernet/broadcom/genet/bcmmii.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/net/ethernet/broadcom/genet/bcmmii.c +3 -4
@@ -226,11 +226,10 @@ int bcmgenet_mii_config(struct net_device *dev, bool init)* capabilities, use that knowledge to also configure the * Reverse MII interface correctly. */ -if ((dev->phydev->supported &PHY_BASIC_FEATURES ) == -PHY_BASIC_FEATURES ) - port_ctrl =PORT_MODE_EXT_RVMII_25 ; -else +if (dev->phydev->supported &PHY_1000BT_FEATURES ) port_ctrl =PORT_MODE_EXT_RVMII_50 ; +else + port_ctrl =PORT_MODE_EXT_RVMII_25 ;bcmgenet_sys_writel (priv, port_ctrl,SYS_PORT_CTRL );break ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 154/205 kprobes: Don't call BUG_ON() if there is a kprobe in use on free list
In reply to Sasha LevinFrom: Masami Hiramatsu <[email protected]>
[ Upstream commit cbdd96f5586151e48317d90a403941ec23f12660 ]
Instead of calling BUG_ON(), if we find a kprobe in use on free kprobe list, just remove it from the list and keep it on kprobe hash list as same as other in-use kprobes.
--- kernel/kprobes.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
kernel/kprobes.c +7 -1
@@ -544,8 +544,14 @@ static void do_free_cleaned_kprobes(void)struct optimized_kprobe *op, *tmp;list_for_each_entry_safe (op, tmp, &freeing_list, list) { -BUG_ON (!kprobe_unused (&op->kp));list_del_init (&op->list); +if (WARN_ON_ONCE (!kprobe_unused (&op->kp))) { +/* +* This must not happen, but if there is a kprobe +* still in use, keep it on kprobes hash list. +*/ +continue ; + }free_aggr_kprobe (&op->kp); } }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 150/205 scsi: sym53c8xx: fix NULL pointer dereference panic in sym_int_sir()
In reply to Sasha LevinFrom: George Kennedy <[email protected]>
[ Upstream commit 288315e95264b6355e26609e9dec5dc4563d4ab0 ]
sym_int_sir() in sym_hipd.c does not check the command pointer for NULL before using it in debug message prints.
--- drivers/scsi/sym53c8xx_2/sym_hipd.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/scsi/sym53c8xx_2/sym_hipd.c +11 -4
@@ -4370,6 +4370,13 @@ static void sym_nego_rejected(struct sym_hcb *np, struct sym_tcb *tp, struct symOUTB (np,HS_PRT ,HS_BUSY ); } +#define sym_printk(lvl, tp, cp, fmt, v...) do { \ + if (cp) \ + scmd_printk(lvl, cp->cmd, fmt, ##v); \ + else \ + starget_printk(lvl, tp->starget, fmt, ##v); \ +} while (0) +/* * chip exception handler for programmed interrupts. */
@@ -4415,7 +4422,7 @@ static void sym_int_sir(struct sym_hcb *np)* been selected with ATN. We do not want to handle that. */ case SIR_SEL_ATN_NO_MSG_OUT : -scmd_printk (KERN_WARNING , cp->cmd, +sym_printk (KERN_WARNING , tp, cp,"No MSG OUT phase after selection with ATN\n" ); goto out_stuck;/*
@@ -4423,7 +4430,7 @@ static void sym_int_sir(struct sym_hcb *np)* having reselected the initiator. */ case SIR_RESEL_NO_MSG_IN : -scmd_printk (KERN_WARNING , cp->cmd, +sym_printk (KERN_WARNING , tp, cp,"No MSG IN phase after reselection\n" ); goto out_stuck;/*
@@ -4431,7 +4438,7 @@ static void sym_int_sir(struct sym_hcb *np)* an IDENTIFY. */ case SIR_RESEL_NO_IDENTIFY : -scmd_printk (KERN_WARNING , cp->cmd, +sym_printk (KERN_WARNING , tp, cp,"No IDENTIFY after reselection\n" ); goto out_stuck;/*
@@ -4460,7 +4467,7 @@ static void sym_int_sir(struct sym_hcb *np)case SIR_RESEL_ABORTED : np->lastmsg = np->msgout[0 ]; np->msgout[0 ] =M_NOOP ; -scmd_printk (KERN_WARNING , cp->cmd, +sym_printk (KERN_WARNING , tp, cp,"message %x sent on bad reselection\n" , np->lastmsg); goto out;/*
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 148/205 scsi: lpfc: Correct invalid EQ doorbell write on if_type=6
In reply to Sasha LevinFrom: James Smart <[email protected]>
[ Upstream commit aad59d5d34738d6fd8c359df8048a84cd443e504 ]
During attachment, the driver writes the EQ doorbell to disable potential interrupts from an EQ. The current EQ doorbell format used for clearing the interrupt is incorrect and uses an if_type=2 format, making the operation act on the wrong EQ.
Correct the code to use the proper if_type=6 EQ doorbell format.
--- drivers/scsi/lpfc/lpfc_sli.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/scsi/lpfc/lpfc_sli.c +1 -5
@@ -392,11 +392,7 @@ lpfc_sli4_if6_eq_clr_intr(struct lpfc_queue *q)struct lpfc_register doorbell; doorbell.word0 =0 ; -bf_set (lpfc_eqcq_doorbell_eqci, &doorbell,1 ); -bf_set (lpfc_eqcq_doorbell_qt, &doorbell,LPFC_QUEUE_TYPE_EVENT ); -bf_set (lpfc_eqcq_doorbell_eqid_hi, &doorbell, - (q->queue_id >>LPFC_EQID_HI_FIELD_SHIFT )); -bf_set (lpfc_eqcq_doorbell_eqid_lo, &doorbell, q->queue_id); +bf_set (lpfc_if6_eq_doorbell_eqid, &doorbell, q->queue_id);writel (doorbell.word0, q->phba->sli4_hba.EQDBregaddr); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 147/205 scsi: lpfc: Fix GFT_ID and PRLI logic for RSCN
In reply to Sasha LevinFrom: James Smart <[email protected]>
[ Upstream commit 01a8aed6a009625282b6265880f6b20cbd7a9c70 ]
Driver only sends NVME PRLI to a device that also supports FCP. This resuls in remote ports that don't have fc_remote_ports created for them. The driver is clearing the nlp_fc4_type for a ndlp at the wrong time.
Fix by moving the nlp_fc4_type clearing to the discovery engine in the DEVICE_RECOVERY state. Also ensure that rport registration is done for all nlp_fc4_types.
--- drivers/scsi/lpfc/lpfc_ct.c | 5 ----- drivers/scsi/lpfc/lpfc_hbadisc.c | 2 +- drivers/scsi/lpfc/lpfc_nportdisc.c | 3 +++ 3 files changed, 4 insertions(+), 6 deletions(-)
drivers/scsi/lpfc/lpfc_ct.c +0 -5
@@ -471,11 +471,6 @@ lpfc_prep_node_fc4type(struct lpfc_vport *vport, uint32_t Did, uint8_t fc4_type)"Parse GID_FTrsp: did:x%x flg:x%x x%x" , Did, ndlp->nlp_flag, vport->fc_flag); -/* Don't assume the rport is always the previous -* FC4 type. -*/ - ndlp->nlp_fc4_type &= ~(NLP_FC4_FCP |NLP_FC4_NVME ); -/* By default, the driver expects to support FCP FC4 */ if (fc4_type ==FC_TYPE_FCP ) ndlp->nlp_fc4_type |=NLP_FC4_FCP ;
drivers/scsi/lpfc/lpfc_hbadisc.c +1 -1
@@ -4198,7 +4198,7 @@ lpfc_nlp_state_cleanup(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,if (new_state ==NLP_STE_MAPPED_NODE || new_state ==NLP_STE_UNMAPPED_NODE ) { -if (ndlp->nlp_fc4_type &NLP_FC4_FCP || +if (ndlp->nlp_fc4_type || ndlp->nlp_DID == Fabric_DID || ndlp->nlp_DID == NameServer_DID || ndlp->nlp_DID ==FDMI_DID ) {
drivers/scsi/lpfc/lpfc_nportdisc.c +3 -0
@@ -2323,6 +2323,7 @@ lpfc_device_recov_unmap_node(struct lpfc_vport *vport,lpfc_nlp_set_state (vport, ndlp,NLP_STE_NPR_NODE );spin_lock_irq (shost->host_lock); ndlp->nlp_flag &= ~(NLP_NODEV_REMOVE |NLP_NPR_2B_DISC ); + ndlp->nlp_fc4_type &= ~(NLP_FC4_FCP |NLP_FC4_NVME );spin_unlock_irq (shost->host_lock);lpfc_disc_set_adisc (vport, ndlp);
@@ -2400,6 +2401,7 @@ lpfc_device_recov_mapped_node(struct lpfc_vport *vport,lpfc_nlp_set_state (vport, ndlp,NLP_STE_NPR_NODE );spin_lock_irq (shost->host_lock); ndlp->nlp_flag &= ~(NLP_NODEV_REMOVE |NLP_NPR_2B_DISC ); + ndlp->nlp_fc4_type &= ~(NLP_FC4_FCP |NLP_FC4_NVME );spin_unlock_irq (shost->host_lock);lpfc_disc_set_adisc (vport, ndlp);return ndlp->nlp_state;
@@ -2657,6 +2659,7 @@ lpfc_device_recov_npr_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,lpfc_cancel_retry_delay_tmo (vport, ndlp);spin_lock_irq (shost->host_lock); ndlp->nlp_flag &= ~(NLP_NODEV_REMOVE |NLP_NPR_2B_DISC ); + ndlp->nlp_fc4_type &= ~(NLP_FC4_FCP |NLP_FC4_NVME );spin_unlock_irq (shost->host_lock);return ndlp->nlp_state; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 146/205 scsi: qla2xxx: Fix duplicate switch's Nport ID entries
In reply to Sasha LevinFrom: Quinn Tran <[email protected]>
[ Upstream commit f3a03ee1102a44ccbd2c5de80a6e862ba23e9b55 ]
Current code relies on switch to provide a unique combination of WWPN + NPORTID to tract an FC port. This patch tries to detect a case where switch data base can get corrupted where multiple WWPNs can have the same Nport ID. The 1st Nport ID on the list will be kept while the duplicate Nport ID will be discarded.
--- drivers/scsi/qla2xxx/qla_gs.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_gs.c +23 -1
@@ -3902,9 +3902,10 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp)fc_port_t *fcport;u32 i, rc;bool found; -struct fab_scan_rp *rp; +struct fab_scan_rp *rp, *trp;unsigned long flags;u8 recheck =0 ; +u16 dup =0 , dup_cnt =0 ;ql_dbg (ql_dbg_disc, vha,0xffff ,"%s enter\n" , __func__);
@@ -3935,6 +3936,7 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp)for (i =0 ; i < vha->hw->max_fibre_devices; i++) {u64 wwn; +int k; rp = &vha->scan.l[i]; found = false;
@@ -3943,6 +3945,20 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp)if (wwn ==0 )continue ; +/* Remove duplicate NPORT ID entries from switch data base */ +for (k = i +1 ; k < vha->hw->max_fibre_devices; k++) { + trp = &vha->scan.l[k]; +if (rp->id.b24 == trp->id.b24) { + dup =1 ; + dup_cnt++; +ql_dbg (ql_dbg_disc + ql_dbg_verbose, + vha,0xffff , +"Detected duplicate NPORT ID from switch data base: ID %06x WWN %8phN WWN %8phN\n" , + rp->id.b24, rp->port_name, trp->port_name); +memset (trp,0 ,sizeof (*trp)); + } + } +if (!memcmp (rp->port_name, vha->port_name,WWN_SIZE ))continue ;
@@ -3982,6 +3998,12 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp) } } +if (dup) { +ql_log (ql_log_warn, vha,0xffff , +"Detected %d duplicate NPORT ID(s) from switch data base\n" , + dup_cnt); + } +/* * Logout all previous fabric dev marked lost, except FCP2 devices. */
Signature · 1 line
2.20.1
Mark Brown
maintainerRe: [PATCH AUTOSEL 4.19 124/205] gpio: of: Handle SPI chipselect legacy bindings
In reply to Sasha LevinQuoted 8 lines · Sasha Levin
From: Linus Walleij <[email protected]>
[ Upstream commit
6953c57ab1721ce57914fc5741d0ce0568756bb0]The SPI chipselects are assumed to be active low in the current binding, so when we want to use GPIO descriptors and handle the active low/high semantics in gpiolib, we need a special parsing quirk to deal with this.
This stuff is *incredibly* fragile, are we sure this isn't manifiesting in later kernels as a result of some other fix or cleanup exposing issues and won't break without that fixup? I loose track of all the GPIO stuff.
Sasha Levin
maintainerPATCH 145/205 scsi: qla2xxx: Fix dropped srb resource.
In reply to Sasha LevinFrom: Quinn Tran <[email protected]>
[ Upstream commit 527b8ae3948bb59c13ebaa7d657ced56ea25ab05 ]
When FW rejects a command due to "entry_status" error (malform IOCB), the srb resource needs to be returned back for cleanup. The filter to catch this is in the wrong location.
--- drivers/scsi/qla2xxx/qla_isr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_isr.c +1 -1
@@ -2837,6 +2837,7 @@ qla2x00_error_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, sts_entry_t *pkt)case ELS_IOCB_TYPE :case ABORT_IOCB_TYPE :case MBX_IOCB_TYPE : +default : sp =qla2x00_get_sp_from_handle (vha, func, req, pkt);if (sp) { sp->done (sp, res);
@@ -2847,7 +2848,6 @@ qla2x00_error_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, sts_entry_t *pkt)case ABTS_RESP_24XX :case CTIO_TYPE7 :case CTIO_CRC2 : -default :return 1 ; } fatal:
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 141/205 scsi: qla2xxx: Fix deadlock between ATIO and HW lock
In reply to Sasha LevinFrom: Quinn Tran <[email protected]>
[ Upstream commit 1073daa470d906f1853ed4b828f16e2350a5875c ]
Move ATIO queue processing out of hardware_lock to prevent deadlock.
--- drivers/scsi/qla2xxx/qla_init.c | 17 +++--------- drivers/scsi/qla2xxx/qla_isr.c | 48 +++++++++++++++------------------ 2 files changed, 26 insertions(+), 39 deletions(-)
drivers/scsi/qla2xxx/qla_init.c +4 -13
@@ -4869,19 +4869,10 @@ qla2x00_configure_loop(scsi_qla_host_t *vha)*/ if (qla_tgt_mode_enabled (vha) ||qla_dual_mode_enabled (vha)) { -if (IS_QLA27XX (ha) ||IS_QLA83XX (ha)) { -spin_lock_irqsave (&ha->tgt.atio_lock, - flags); -qlt_24xx_process_atio_queue (vha,0 ); -spin_unlock_irqrestore ( - &ha->tgt.atio_lock, flags); - }else { -spin_lock_irqsave (&ha->hardware_lock, - flags); -qlt_24xx_process_atio_queue (vha,1 ); -spin_unlock_irqrestore ( - &ha->hardware_lock, flags); - } +spin_lock_irqsave (&ha->tgt.atio_lock, flags); +qlt_24xx_process_atio_queue (vha,0 ); +spin_unlock_irqrestore (&ha->tgt.atio_lock, + flags); } } }
drivers/scsi/qla2xxx/qla_isr.c +22 -26
90 lines not on this page · raw message
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 142/205 scsi: qla2xxx: Increase abort timeout value
In reply to Sasha LevinFrom: Quinn Tran <[email protected]>
[ Upstream commit 8bccfe0d21b5adbba6ec4fe1776160b80d09f78a ]
Abort IOCB request can take up to 40s or 2 ABTS timeout. We will wait for ABTS response for 20s. On a timeout, second ABTS can go out with another 20s timeout. On 2nd ABTS timeout FW will automatically do Logout.
--- drivers/scsi/qla2xxx/qla_init.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_init.c +2 -1
@@ -1789,7 +1789,8 @@ qla24xx_async_abort_cmd(srb_t *cmd_sp, bool wait) abt_iocb->timeout = qla24xx_abort_iocb_timeout;init_completion (&abt_iocb->u.abt.comp); -qla2x00_init_timer (sp,qla2x00_get_async_timeout (vha)); +/* FW can send 2 x ABTS's timeout/20s */ +qla2x00_init_timer (sp,42 ); abt_iocb->u.abt.cmd_hndl = cmd_sp->handle; abt_iocb->u.abt.req_que_no =cpu_to_le16 (cmd_sp->qpair->req->id);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 140/205 scsi: qla2xxx: Terminate Plogi/PRLI if WWN is 0
In reply to Sasha LevinFrom: Quinn Tran <[email protected]>
[ Upstream commit aa9e6d7b9643fc50a88c7b7aa1e34be8dc032749 ]
When driver receive PLOGI/PRLI from FW, the WWPN value will be provided. If it is not, then driver will terminate it. The WWPN allows driver to locate the session or create a new session.
--- drivers/scsi/qla2xxx/qla_target.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/scsi/qla2xxx/qla_target.c +6 -0
@@ -4703,6 +4703,12 @@ static int qlt_handle_login(struct scsi_qla_host *vha, sess =qlt_find_sess_invalidate_other (vha, wwn, port_id, loop_id, &conflict_sess);spin_unlock_irqrestore (&vha->hw->tgt.sess_lock, flags); + }else { +ql_dbg (ql_dbg_disc, vha,0xffff , +"%s %d Term INOT due to WWN=0 lid=%d, NportID %06X " , + __func__, __LINE__, loop_id, port_id.b24); +qlt_send_term_imm_notif (vha, iocb,1 ); + goto out; }if (IS_SW_RESV_ADDR (port_id)) {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 138/205 scsi: qla2xxx: Fix iIDMA error
In reply to Sasha LevinFrom: Quinn Tran <[email protected]>
[ Upstream commit 8d9bf0a9a268f7ca0b811d6e6a1fc783afa5c746 ]
When switch responds with error for Get Port Speed Command (GPSC), driver should not proceed with telling FW about the speed of the remote port.
--- drivers/scsi/qla2xxx/qla_gs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/qla2xxx/qla_gs.c +2 -2
@@ -3277,7 +3277,7 @@ static void qla24xx_async_gpsc_sp_done(void *s, int res)ql_dbg (ql_dbg_disc, vha,0x2019 ,"GPSC command unsupported, disabling query.\n" ); ha->flags.gpsc_supported =0 ; - res =QLA_SUCCESS ; + goto done; } }else {switch (be16_to_cpu (ct_rsp->rsp.gpsc.speed)) {
@@ -3310,7 +3310,6 @@ static void qla24xx_async_gpsc_sp_done(void *s, int res)be16_to_cpu (ct_rsp->rsp.gpsc.speeds), be16_to_cpu(ct_rsp->rsp.gpsc.speed)); } -done:memset (&ea,0 ,sizeof (ea)); ea.event =FCME_GPSC_DONE ; ea.rc = res;
@@ -3318,6 +3317,7 @@ done: ea.sp = sp;qla2x00_fcport_event_handler (vha, &ea); +done: sp->free (sp); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 137/205 scsi: qla2xxx: Use correct qpair for ABTS/CMD
In reply to Sasha LevinFrom: Quinn Tran <[email protected]>
[ Upstream commit 49cecca7dd49e2950ed6d973acfa84e7c8c7a480 ]
On Abort of initiator scsi command, the abort needs to follow the same qpair as the the scsi command to prevent out of order processing.
--- drivers/scsi/qla2xxx/qla_init.c | 15 +++++---------- drivers/scsi/qla2xxx/qla_iocb.c | 12 +++++++----- 2 files changed, 12 insertions(+), 15 deletions(-)
drivers/scsi/qla2xxx/qla_init.c +5 -10
@@ -1772,18 +1772,18 @@ int qla24xx_async_abort_cmd(srb_t *cmd_sp, bool wait) {scsi_qla_host_t *vha = cmd_sp->vha; -fc_port_t *fcport = cmd_sp->fcport;struct srb_iocb *abt_iocb;srb_t *sp;int rval =QLA_FUNCTION_FAILED ; - sp =qla2x00_get_sp (vha, fcport,GFP_KERNEL ); + sp =qla2xxx_get_qpair_sp (cmd_sp->qpair, cmd_sp->fcport,GFP_KERNEL );if (!sp) goto done; abt_iocb = &sp->u.iocb_cmd; sp->type =SRB_ABT_CMD ; sp->name ="abort" ; + sp->qpair = cmd_sp->qpair;if (wait) sp->flags =SRB_WAKEUP_ON_COMP ;
@@ -1792,18 +1792,13 @@ qla24xx_async_abort_cmd(srb_t *cmd_sp, bool wait)qla2x00_init_timer (sp,qla2x00_get_async_timeout (vha)); abt_iocb->u.abt.cmd_hndl = cmd_sp->handle; - -if (vha->flags.qpairs_available && cmd_sp->qpair) - abt_iocb->u.abt.req_que_no = -cpu_to_le16 (cmd_sp->qpair->req->id); -else - abt_iocb->u.abt.req_que_no =cpu_to_le16 (vha->req->id); + abt_iocb->u.abt.req_que_no =cpu_to_le16 (cmd_sp->qpair->req->id); sp->done = qla24xx_abort_sp_done;ql_dbg (ql_dbg_async, vha,0x507c , -"Abort command issued - hdl=%x, target_id=%x\n" , - cmd_sp->handle, fcport->tgt_id); +"Abort command issued - hdl=%x, type=%x\n" , + cmd_sp->handle, cmd_sp->type); rval =qla2x00_start_sp (sp);if (rval !=QLA_SUCCESS )
drivers/scsi/qla2xxx/qla_iocb.c +7 -5
@@ -3297,19 +3297,21 @@ qla24xx_abort_iocb(srb_t *sp, struct abort_entry_24xx *abt_iocb) {struct srb_iocb *aio = &sp->u.iocb_cmd;scsi_qla_host_t *vha = sp->vha; -struct req_que *req = vha->req; +struct req_que *req = sp->qpair->req;memset (abt_iocb,0 ,sizeof (struct abort_entry_24xx )); abt_iocb->entry_type =ABORT_IOCB_TYPE ; abt_iocb->entry_count =1 ; abt_iocb->handle =cpu_to_le32 (MAKE_HANDLE (req->id, sp->handle)); - abt_iocb->nport_handle =cpu_to_le16 (sp->fcport->loop_id); +if (sp->fcport) { + abt_iocb->nport_handle =cpu_to_le16 (sp->fcport->loop_id); + abt_iocb->port_id[0 ] = sp->fcport->d_id.b.al_pa; + abt_iocb->port_id[1 ] = sp->fcport->d_id.b.area; + abt_iocb->port_id[2 ] = sp->fcport->d_id.b.domain; + } abt_iocb->handle_to_abort =cpu_to_le32 (MAKE_HANDLE (aio->u.abt.req_que_no, aio->u.abt.cmd_hndl)); - abt_iocb->port_id[0 ] = sp->fcport->d_id.b.al_pa; - abt_iocb->port_id[1 ] = sp->fcport->d_id.b.area; - abt_iocb->port_id[2 ] = sp->fcport->d_id.b.domain; abt_iocb->vp_index = vha->vp_idx; abt_iocb->req_que_no =cpu_to_le16 (aio->u.abt.req_que_no);/* Send the command to the firmware */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 132/205 signal: Properly deliver SIGILL from uprobes
In reply to Sasha LevinFrom: "Eric W. Biederman" <[email protected]>
[ Upstream commit 55a3235fc71bf34303e34a95eeee235b2d2a35dd ]
For userspace to tell the difference between a random signal and an exception, the exception must include siginfo information.
Using SEND_SIG_FORCED for SIGILL is thus wrong, and it will result in userspace seeing si_code == SI_USER (like a random signal) instead of si_code == SI_KERNEL or a more specific si_code as all exceptions deliver.
Therefore replace force_sig_info(SIGILL, SEND_SIG_FORCE, current) with force_sig(SIG_ILL, current) which gets this right and is shorter and easier to type.
--- kernel/events/uprobes.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/events/uprobes.c +2 -2
@@ -1858,7 +1858,7 @@ static void handle_trampoline(struct pt_regs *regs) sigill:uprobe_warn (current,"handle uretprobe, sending SIGILL." ); -force_sig_info (SIGILL ,SEND_SIG_FORCED , current); +force_sig (SIGILL , current); }
@@ -1974,7 +1974,7 @@ static void handle_singlestep(struct uprobe_task *utask, struct pt_regs *regs)if (unlikely (err)) {uprobe_warn (current,"execute the probed insn, sending SIGILL." ); -force_sig_info (SIGILL ,SEND_SIG_FORCED , current); +force_sig (SIGILL , current); } }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 130/205 IB/hfi1: Missing return value in error path for user sdma
In reply to Sasha LevinFrom: "Michael J. Ruhl" <[email protected]>
[ Upstream commit 2bf4b33f83dfe521c4c7c407b6b150aeec04d69c ]
If the set_txreq_header_agh() function returns an error, the exit path is chosen.
In this path, the code fails to set the return value. This will cause the caller to not realize an error has occurred.
Set the return value correctly in the error path.
--- drivers/infiniband/hw/hfi1/user_sdma.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/infiniband/hw/hfi1/user_sdma.c +3 -1
@@ -856,8 +856,10 @@ static int user_sdma_send_pkts(struct user_sdma_request *req, unsigned maxpkts) changes =set_txreq_header_ahg (req, tx, datalen); -if (changes <0 ) +if (changes <0 ) { + ret = changes; goto free_tx; + } } }else { ret = sdma_txinit(&tx->txreq, 0, sizeof(req->hdr) +
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 129/205 RDMA/hns: Fix an error code in hns_roce_v2_init_eq_table()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit f1a315420e79fe5c077fa119db9439ffabd2cda2 ]
The error code isn't set on this path.
--- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 1 + 1 file changed, 1 insertion(+)
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +1 -0
@@ -5117,6 +5117,7 @@ static int hns_roce_v2_init_eq_table(struct hns_roce_dev *hr_dev)create_singlethread_workqueue ("hns_roce_irq_workqueue" );if (!hr_dev->irq_workq) {dev_err (dev,"Create irq workqueue failed!\n" ); + ret = -ENOMEM ; goto err_request_irq_fail; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 127/205 ath9k: add back support for using active monitor interfaces for tx99
In reply to Sasha LevinFrom: Felix Fietkau <[email protected]>
[ Upstream commit 6df0580be8bc30803c4d8b2ed9c2230a2740c795 ]
Various documented examples on how to set up tx99 with ath9k rely on setting up a regular monitor interface for setting the channel. My previous patch "ath9k: fix tx99 with monitor mode interface" made it possible to set it up this way again. However, it was removing support for using an active monitor interface, which is required for controlling the bitrate as well, since the bitrate is not passed down with a regular monitor interface.
This patch partially reverts the previous one, but keeps support for using a regular monitor interface to keep documented steps working in cases where the bitrate does not matter
--- drivers/net/wireless/ath/ath9k/ath9k.h | 1 + drivers/net/wireless/ath/ath9k/main.c | 10 ++++++++-- drivers/net/wireless/ath/ath9k/tx99.c | 7 +++++++ drivers/net/wireless/ath/ath9k/xmit.c | 2 +- 4 files changed, 17 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath9k/ath9k.h +1 -0
@@ -1074,6 +1074,7 @@ struct ath_softc {struct ath_spec_scan_priv spec_priv; +struct ieee80211_vif *tx99_vif;struct sk_buff *tx99_skb;bool tx99_state;s16 tx99_power;
drivers/net/wireless/ath/ath9k/main.c +8 -2
@@ -1251,8 +1251,13 @@ static int ath9k_add_interface(struct ieee80211_hw *hw,struct ath_vif *avp = (void *)vif->drv_priv;struct ath_node *an = &avp->mcast_node; -if (IS_ENABLED (CONFIG_ATH9K_TX99 )) -return -EOPNOTSUPP ; +if (IS_ENABLED (CONFIG_ATH9K_TX99 )) { +if (sc->cur_chan->nvifs >=1 ) { +mutex_unlock (&sc->mutex); +return -EOPNOTSUPP ; + } + sc->tx99_vif = vif; + }mutex_lock (&sc->mutex);
@@ -1337,6 +1342,7 @@ static void ath9k_remove_interface(struct ieee80211_hw *hw,ath9k_p2p_remove_vif (sc, vif); sc->cur_chan->nvifs--; + sc->tx99_vif =NULL ;if (!ath9k_is_chanctx_enabled ())list_del (&avp->list);
drivers/net/wireless/ath/ath9k/tx99.c +7 -0
@@ -54,6 +54,7 @@ static struct sk_buff *ath9k_build_tx99_skb(struct ath_softc *sc)struct ieee80211_hdr *hdr;struct ieee80211_tx_info *tx_info;struct sk_buff *skb; +struct ath_vif *avp; skb =alloc_skb (len,GFP_KERNEL );if (!skb)
@@ -71,11 +72,17 @@ static struct sk_buff *ath9k_build_tx99_skb(struct ath_softc *sc)memcpy (hdr->addr2, hw->wiphy->perm_addr,ETH_ALEN );memcpy (hdr->addr3, hw->wiphy->perm_addr,ETH_ALEN ); +if (sc->tx99_vif) { + avp = (struct ath_vif *) sc->tx99_vif->drv_priv; + hdr->seq_ctrl |=cpu_to_le16 (avp->seq_no); + } + tx_info =IEEE80211_SKB_CB (skb);memset (tx_info,0 ,sizeof (*tx_info)); rate = &tx_info->control.rates[0 ]; tx_info->band = sc->cur_chan->chandef.chan->band; tx_info->flags =IEEE80211_TX_CTL_NO_ACK ; + tx_info->control.vif = sc->tx99_vif; rate->count =1 ;if (ah->curchan &&IS_CHAN_HT (ah->curchan)) { rate->flags |=IEEE80211_TX_RC_MCS ;
drivers/net/wireless/ath/ath9k/xmit.c +1 -1
@@ -2974,7 +2974,7 @@ int ath9k_tx99_send(struct ath_softc *sc, struct sk_buff *skb,return -EINVAL ; } -ath_set_rates (NULL ,NULL , bf); +ath_set_rates (sc->tx99_vif,NULL , bf);ath9k_hw_set_desc_link (sc->sc_ah, bf->bf_desc, bf->bf_daddr);ath9k_hw_tx99_start (sc->sc_ah, txctl->txq->axq_qnum);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 126/205 rtc: pl030: fix possible race condition
In reply to Sasha LevinFrom: Alexandre Belloni <[email protected]>
[ Upstream commit c778ec85825dc895936940072aea9fe9037db684 ]
The IRQ is requested before the struct rtc is allocated and registered, but this struct is used in the IRQ handler. This may lead to a NULL pointer dereference.
Switch to devm_rtc_allocate_device/rtc_register_device to allocate the rtc before requesting the IRQ.
--- drivers/rtc/rtc-pl030.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
drivers/rtc/rtc-pl030.c +9 -6
@@ -112,6 +112,13 @@ static int pl030_probe(struct amba_device *dev, const struct amba_id *id) goto err_rtc; } + rtc->rtc =devm_rtc_allocate_device (&dev->dev); +if (IS_ERR (rtc->rtc)) { + ret =PTR_ERR (rtc->rtc); + goto err_rtc; + } + + rtc->rtc->ops = &pl030_ops; rtc->base =ioremap (dev->res.start,resource_size (&dev->res));if (!rtc->base) { ret = -ENOMEM ;
@@ -128,12 +135,9 @@ static int pl030_probe(struct amba_device *dev, const struct amba_id *id)if (ret) goto err_irq; - rtc->rtc =rtc_device_register ("pl030" , &dev->dev, &pl030_ops, -THIS_MODULE ); -if (IS_ERR (rtc->rtc)) { - ret =PTR_ERR (rtc->rtc); + ret =rtc_register_device (rtc->rtc); +if (ret) goto err_reg; - }return 0 ;
@@ -154,7 +158,6 @@ static int pl030_remove(struct amba_device *dev)writel (0 , rtc->base +RTC_CR );free_irq (dev->irq[0 ], rtc); -rtc_device_unregister (rtc->rtc);iounmap (rtc->base);amba_release_regions (dev);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 125/205 rtc: mt6397: fix possible race condition
In reply to Sasha LevinFrom: Alexandre Belloni <[email protected]>
[ Upstream commit babab2f86440352d24e76118fdd7d40cab5fd7bf ]
The IRQ is requested before the struct rtc is allocated and registered, but this struct is used in the IRQ handler. This may lead to a NULL pointer dereference.
Switch to devm_rtc_allocate_device/rtc_register_device to allocate the rtc before requesting the IRQ.
--- drivers/rtc/rtc-mt6397.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/rtc/rtc-mt6397.c +8 -5
@@ -332,6 +332,10 @@ static int mtk_rtc_probe(struct platform_device *pdev)platform_set_drvdata (pdev, rtc); + rtc->rtc_dev =devm_rtc_allocate_device (rtc->dev); +if (IS_ERR (rtc->rtc_dev)) +return PTR_ERR (rtc->rtc_dev); + ret = request_threaded_irq(rtc->irq, NULL, mtk_rtc_irq_handler_thread, IRQF_ONESHOT | IRQF_TRIGGER_HIGH,
@@ -344,11 +348,11 @@ static int mtk_rtc_probe(struct platform_device *pdev)device_init_wakeup (&pdev->dev,1 ); - rtc->rtc_dev =rtc_device_register ("mt6397-rtc" , &pdev->dev, - &mtk_rtc_ops,THIS_MODULE ); -if (IS_ERR (rtc->rtc_dev)) { + rtc->rtc_dev->ops = &mtk_rtc_ops; + + ret =rtc_register_device (rtc->rtc_dev); +if (ret) {dev_err (&pdev->dev,"register rtc device failed\n" ); - ret =PTR_ERR (rtc->rtc_dev); goto out_free_irq; }
@@ -365,7 +369,6 @@ static int mtk_rtc_remove(struct platform_device *pdev) {struct mt6397_rtc *rtc =platform_get_drvdata (pdev); -rtc_device_unregister (rtc->rtc_dev);free_irq (rtc->irq, rtc->rtc_dev);irq_dispose_mapping (rtc->irq);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 123/205 EDAC, sb_edac: Return early on ADDRV bit and address type test
In reply to Sasha LevinFrom: Qiuxu Zhuo <[email protected]>
[ Upstream commit dcc960b225ceb2bd66c45e0845d03e577f7010f9 ]
Users of the mce_register_decode_chain() are called for every logged error. EDAC drivers should check:
1) Is this a memory error? [bit 7 in status register]
2) Is there a valid address? [bit 58 in status register]
3) Is the address a system address? [bitfield 8:6 in misc register]
The sb_edac driver performed test "1" twice. Waited far too long to perform check "2". Didn't do check "3" at all.
Fix it by moving the test for valid address from sbridge_mce_output_error() into sbridge_mce_check_error() and add a test for the type immediately after. Delete the redundant check for the type of the error from sbridge_mce_output_error().
--- drivers/edac/sb_edac.c | 68 ++++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 33 deletions(-)
drivers/edac/sb_edac.c +35 -33
@@ -2912,35 +2912,27 @@ static void sbridge_mce_output_error(struct mem_ctl_info *mci,* cccc = channel * If the mask doesn't match, report an error to the parsing logic */ -if (! ((errcode &0xef80 ) ==0x80 )) { - optype ="Can't parse: it is not a mem" ; - }else { -switch (optypenum) { -case 0 : - optype ="generic undef request error" ; -break ; -case 1 : - optype ="memory read error" ; -break ; -case 2 : - optype ="memory write error" ; -break ; -case 3 : - optype ="addr/cmd error" ; -break ; -case 4 : - optype ="memory scrubbing error" ; -break ; -default : - optype ="reserved" ; -break ; - } +switch (optypenum) { +case 0 : + optype ="generic undef request error" ; +break ; +case 1 : + optype ="memory read error" ; +break ; +case 2 : + optype ="memory write error" ; +break ; +case 3 : + optype ="addr/cmd error" ; +break ; +case 4 : + optype ="memory scrubbing error" ; +break ; +default : + optype ="reserved" ; +break ; } -/* Only decode errors with an valid address (ADDRV) */ -if (!GET_BITFIELD (m->status,58 ,58 )) -return ; -if (pvt->info.type ==KNIGHTS_LANDING ) {if (channel ==14 ) { edac_dbg(0, "%s%s err_code:%04x:%04x EDRAM bank %d\n",
@@ -3046,17 +3038,11 @@ static int sbridge_mce_check_error(struct notifier_block *nb, unsigned long val, {struct mce *mce = (struct mce *)data;struct mem_ctl_info *mci; -struct sbridge_pvt *pvt;char *type;if (edac_get_report_status () ==EDAC_REPORTING_DISABLED )return NOTIFY_DONE ; - mci =get_mci_for_node_id (mce->socketid,IMC0 ); -if (!mci) -return NOTIFY_DONE ; - pvt = mci->pvt_info; -/* * Just let mcelog handle it if the error is * outside the memory controller. A memory error
@@ -3066,6 +3052,22 @@ static int sbridge_mce_check_error(struct notifier_block *nb, unsigned long val,if ((mce->status &0xefff ) >>7 !=1 )return NOTIFY_DONE ; +/* Check ADDRV bit in STATUS */ +if (!GET_BITFIELD (mce->status,58 ,58 )) +return NOTIFY_DONE ; + +/* Check MISCV bit in STATUS */ +if (!GET_BITFIELD (mce->status,59 ,59 )) +return NOTIFY_DONE ; + +/* Check address type in MISC (physical address only) */ +if (GET_BITFIELD (mce->misc,6 ,8 ) !=2 ) +return NOTIFY_DONE ; + + mci =get_mci_for_node_id (mce->socketid,IMC0 ); +if (!mci) +return NOTIFY_DONE ; +if (mce->mcgstatus &MCG_STATUS_MCIP ) type ="Exception" ;else
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 122/205 dmaengine: dma-jz4780: Further residue status fix
In reply to Sasha LevinFrom: Daniel Silsby <[email protected]>
[ Upstream commit 83ef4fb7556b6a673f755da670cbacab7e2c7f1b ]
Func jz4780_dma_desc_residue() expects the index to the next hw descriptor as its last parameter. Caller func jz4780_dma_tx_status(), however, applied modulus before passing it. When the current hw descriptor was last in the list, the index passed became zero.
The resulting excess of reported residue especially caused problems with cyclic DMA transfer clients, i.e. ALSA AIC audio output, which rely on this for determining current DMA location within buffer.
Combined with the recent and related residue-reporting fixes, spurious ALSA audio underruns on jz4770 hardware are now fixed.
--- drivers/dma/dma-jz4780.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma/dma-jz4780.c +1 -1
@@ -587,7 +587,7 @@ static enum dma_status jz4780_dma_tx_status(struct dma_chan *chan, to_jz4780_dma_desc(vdesc), 0); }else if (cookie == jzchan->desc->vdesc.tx.cookie) { txstate->residue =jz4780_dma_desc_residue (jzchan, jzchan->desc, - (jzchan->curr_hwdesc +1 ) % jzchan->desc->count); + jzchan->curr_hwdesc +1 ); }else txstate->residue =0 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 118/205 tty/serial: atmel: Change the driver to work under at91-usart MFD
In reply to Sasha LevinFrom: Radu Pirea <[email protected]>
[ Upstream commit c24d25317a7c6bb3053d4c193b3cf57d1e9a3e4b ]
This patch modifies the place where resources and device tree properties are searched.
--- drivers/tty/serial/Kconfig | 1 + drivers/tty/serial/atmel_serial.c | 42 ++++++++++++++++++++----------- 2 files changed, 28 insertions(+), 15 deletions(-)
drivers/tty/serial/Kconfig +1 -0
@@ -118,6 +118,7 @@ config SERIAL_ATMEL depends on ARCH_AT91 || COMPILE_TEST select SERIAL_CORE select SERIAL_MCTRL_GPIO if GPIOLIB + select MFD_AT91_USART help This enables the driver for the on-chip UARTs of the Atmel AT91 processors.
drivers/tty/serial/atmel_serial.c +27 -15
130 lines not on this page · raw message
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 113/205 failover: Fix error return code in net_failover_create
In reply to Sasha LevinFrom: YueHaibing <[email protected]>
[ Upstream commit 09317da317e55e70ccbe23f65008348a4a1b7c7f ]
if failover_register failed, 'err' code should be set correctly
--- drivers/net/net_failover.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/net_failover.c +3 -1
@@ -765,8 +765,10 @@ struct failover *net_failover_create(struct net_device *standby_dev)netif_carrier_off (failover_dev); failover =failover_register (failover_dev, &net_failover_ops); -if (IS_ERR (failover)) +if (IS_ERR (failover)) { + err =PTR_ERR (failover); goto err_failover_register; + }return failover;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 104/205 ata: Disable AHCI ALPM feature for Ampere Computing eMAG SATA
In reply to Sasha LevinFrom: Suman Tripathi <[email protected]>
[ Upstream commit 20bdc376b427cb420836f39ee8f281ea85dbaeef ]
Due to hardware errata, Ampere Computing eMAG SATA can't support AHCI ALPM feature. This patch disables the AHCI ALPM feature for eMAG SATA.
--- drivers/ata/ahci_platform.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
drivers/ata/ahci_platform.c +14 -1
@@ -33,6 +33,13 @@ static const struct ata_port_info ahci_port_info = { .port_ops = &ahci_platform_ops, }; +static const struct ata_port_info ahci_port_info_nolpm = { + .flags =AHCI_FLAG_COMMON |ATA_FLAG_NO_LPM , + .pio_mask =ATA_PIO4 , + .udma_mask =ATA_UDMA6 , + .port_ops = &ahci_platform_ops, +}; +static struct scsi_host_template ahci_platform_sht = {AHCI_SHT (DRV_NAME ), };
@@ -41,6 +48,7 @@ static int ahci_probe(struct platform_device *pdev) {struct device *dev = &pdev->dev;struct ahci_host_priv *hpriv; +const struct ata_port_info *port;int rc; hpriv = ahci_platform_get_resources(pdev,
@@ -58,7 +66,11 @@ static int ahci_probe(struct platform_device *pdev)if (of_device_is_compatible (dev->of_node,"hisilicon,hisi-ahci" )) hpriv->flags |=AHCI_HFLAG_NO_FBS |AHCI_HFLAG_NO_NCQ ; - rc =ahci_platform_init_host (pdev, hpriv, &ahci_port_info, + port =acpi_device_get_match_data (dev); +if (!port) + port = &ahci_port_info; + + rc =ahci_platform_init_host (pdev, hpriv, port, &ahci_platform_sht);if (rc) goto disable_resources;
@@ -85,6 +97,7 @@ static const struct of_device_id ahci_of_match[] = {MODULE_DEVICE_TABLE (of, ahci_of_match);static const struct acpi_device_id ahci_acpi_match[] = { + {"APMC0D33" , (unsigned long )&ahci_port_info_nolpm }, {ACPI_DEVICE_CLASS (PCI_CLASS_STORAGE_SATA_AHCI ,0xffffff ) }, {}, };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 103/205 ASoC: Intel: hdac_hdmi: Limit sampling rates at dai creation
In reply to Sasha LevinFrom: Yong Zhi <[email protected]>
[ Upstream commit 3b857472f34faa7d11001afa5e158833812c98d7 ]
Playback of 44.1Khz contents with HDMI plugged returns "Invalid pipe config" because HDMI paths in the FW topology are configured to operate at 48Khz.
This patch filters out sampling rates not supported at hdac_hdmi_create_dais() to let user space SRC to do the converting.
--- sound/soc/codecs/hdac_hdmi.c | 6 ++++++ 1 file changed, 6 insertions(+)
sound/soc/codecs/hdac_hdmi.c +6 -0
@@ -1410,6 +1410,12 @@ static int hdac_hdmi_create_dais(struct hdac_device *hdev,if (ret)return ret; +/* Filter out 44.1, 88.2 and 176.4Khz */ + rates &= ~(SNDRV_PCM_RATE_44100 |SNDRV_PCM_RATE_88200 | +SNDRV_PCM_RATE_176400 ); +if (!rates) +return -EINVAL ; +sprintf (dai_name,"intel-hdmi-hifi%d" , i+1 ); hdmi_dais[i].name =devm_kstrdup (&hdev->dev, dai_name,GFP_KERNEL );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 101/205 udf: Fix crash during mount
In reply to Sasha LevinFrom: Jan Kara <[email protected]>
[ Upstream commit b085fbe2ef7fa7489903c45271ae7b7a52b0f9ab ]
Fix a crash during an attempt to mount a filesystem that has both Unallocated Space Table and Unallocated Space Bitmap. Such filesystem actually violates the UDF standard so we just have to properly detect such situation and refuse to mount such filesystem read-write. When we are at it, verify also other constraints on the allocation information mandated by the standard.
--- fs/udf/super.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 60 insertions(+), 5 deletions(-)
fs/udf/super.c +60 -5
@@ -989,12 +989,62 @@ static struct udf_bitmap *udf_sb_alloc_bitmap(struct super_block *sb, u32 index)return bitmap; } +static int check_partition_desc (struct super_block *sb, +struct partitionDesc *p, +struct udf_part_map *map) +{ +bool umap, utable, fmap, ftable; +struct partitionHeaderDesc *phd; + +switch (le32_to_cpu (p->accessType)) { +case PD_ACCESS_TYPE_READ_ONLY : +case PD_ACCESS_TYPE_WRITE_ONCE : +case PD_ACCESS_TYPE_REWRITABLE : +case PD_ACCESS_TYPE_NONE : + goto force_ro; + } + +/* No Partition Header Descriptor? */ +if (strcmp (p->partitionContents.ident,PD_PARTITION_CONTENTS_NSR02 ) && +strcmp (p->partitionContents.ident,PD_PARTITION_CONTENTS_NSR03 )) + goto force_ro; + + phd = (struct partitionHeaderDesc *)p->partitionContentsUse; + utable = phd->unallocSpaceTable.extLength; + umap = phd->unallocSpaceBitmap.extLength; + ftable = phd->freedSpaceTable.extLength; + fmap = phd->freedSpaceBitmap.extLength; + +/* No allocation info? */ +if (!utable && !umap && !ftable && !fmap) + goto force_ro; + +/* We don't support blocks that require erasing before overwrite */ +if (ftable || fmap) + goto force_ro; +/* UDF 2.60: 2.3.3 - no mixing of tables & bitmaps, no VAT. */ +if (utable && umap) + goto force_ro; + +if (map->s_partition_type ==UDF_VIRTUAL_MAP15 || + map->s_partition_type ==UDF_VIRTUAL_MAP20 ) + goto force_ro; + +return 0 ; +force_ro: +if (!sb_rdonly (sb)) +return -EACCES ; +UDF_SET_FLAG (sb,UDF_FLAG_RW_INCOMPAT ); +return 0 ; +} +static int udf_fill_partdesc_info (struct super_block *sb,struct partitionDesc *p,int p_index) {struct udf_part_map *map;struct udf_sb_info *sbi =UDF_SB (sb);struct partitionHeaderDesc *phd; +int err; map = &sbi->s_partmaps[p_index];
@@ -1014,8 +1064,16 @@ static int udf_fill_partdesc_info(struct super_block *sb, p_index, map->s_partition_type, map->s_partition_root, map->s_partition_len); -if (strcmp (p->partitionContents.ident,PD_PARTITION_CONTENTS_NSR02 ) && -strcmp (p->partitionContents.ident,PD_PARTITION_CONTENTS_NSR03 )) + err =check_partition_desc (sb, p, map); +if (err) +return err; + +/* +* Skip loading allocation info it we cannot ever write to the fs. +* This is a correctness thing as we may have decided to force ro mount +* to avoid allocation info we don't support. +*/ +if (UDF_QUERY_FLAG (sb,UDF_FLAG_RW_INCOMPAT ))return 0 ; phd = (struct partitionHeaderDesc *)p->partitionContentsUse;
@@ -1051,9 +1109,6 @@ static int udf_fill_partdesc_info(struct super_block *sb, p_index, bitmap->s_extPosition); } -if (phd->partitionIntegrityTable.extLength) -udf_debug ("partitionIntegrityTable (part %d)\n" , p_index); - if (phd->freedSpaceTable.extLength) { struct kernel_lb_addr loc = { .logicalBlockNum = le32_to_cpu(
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 102/205 ASoC: dapm: Avoid uninitialised variable warning
In reply to Sasha LevinFrom: Charles Keepax <[email protected]>
[ Upstream commit fc269c0396448cabe1afd648c0b335669aa347b7 ]
Commit 4a75aae17b2a ("ASoC: dapm: Add support for multi-CODEC CODEC to CODEC links") adds loops that iterate over multiple CODECs in snd_soc_dai_link_event. This also introduced a compiler warning for a potentially uninitialised variable in the case no CODECs are present. This should never be the case as the DAI link must by definition contain at least 1 CODEC however probably best to avoid the compiler warning by initialising ret to zero.
--- sound/soc/soc-dapm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/soc-dapm.c +1 -1
@@ -3684,7 +3684,7 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,struct snd_pcm_hw_params *params =NULL ;struct snd_pcm_runtime *runtime =NULL ;unsigned int fmt; -int ret; +int ret =0 ;if (WARN_ON (!config) || WARN_ON(list_empty(&w->edges[SND_SOC_DAPM_DIR_OUT]) ||
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 100/205 mips: txx9: fix iounmap related issue
In reply to Sasha LevinFrom: Ding Xiang <[email protected]>
[ Upstream commit c6e1241a82e6e74d1ae5cc34581dab2ffd6022d0 ]
if device_register return error, iounmap should be called, also iounmap need to call before put_device.
Patchwork: https://patchwork.linux-mips.org/patch/20476/
--- arch/mips/txx9/generic/setup.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
arch/mips/txx9/generic/setup.c +2 -3
@@ -960,12 +960,11 @@ void __init txx9_sramc_init(struct resource *r) goto exit_put; err =sysfs_create_bin_file (&dev->dev.kobj, &dev->bindata_attr);if (err) { -device_unregister (&dev->dev);iounmap (dev->base); -kfree (dev); +device_unregister (&dev->dev); }return ; exit_put: +iounmap (dev->base);put_device (&dev->dev); -return ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 93/205 ARM: dts: exynos: Disable pull control for S5M8767 PMIC
In reply to Sasha LevinFrom: Marek Szyprowski <[email protected]>
[ Upstream commit ef2ecab9af5feae97c47b7f61cdd96f7f49b2c23 ]
S5M8767 PMIC interrupt line on Exynos5250-based Arndale board has external pull-up resistors, so disable any pull control for it in in controller node. This fixes support for S5M8767 interrupts and enables operation of wakeup from S5M8767 RTC alarm.
--- arch/arm/boot/dts/exynos5250-arndale.dts | 9 +++++++++ 1 file changed, 9 insertions(+)
arch/arm/boot/dts/exynos5250-arndale.dts +9 -0
@@ -170,6 +170,8 @@ reg = <0x66>; interrupt-parent = <&gpx3>; interrupts = <2 IRQ_TYPE_LEVEL_LOW>; + pinctrl-names = "default"; + pinctrl-0 = <&s5m8767_irq>; vinb1-supply = <&main_dc_reg>; vinb2-supply = <&main_dc_reg>;
@@ -530,6 +532,13 @@ cap-sd-highspeed; }; +&pinctrl_0 { + s5m8767_irq: s5m8767-irq { + samsung,pins = "gpx3-2"; + samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; + }; +}; + &rtc { status = "okay"; };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 98/205 RDMA/core: Rate limit MAD error messages
In reply to Sasha LevinFrom: Parav Pandit <[email protected]>
[ Upstream commit f9d08f1e1939ad4d92e38bd3dee6842512f5bee6 ]
While registering a mad agent, a user space can trigger various errors and flood the logs.
Therefore, decrease verbosity and rate limit such error messages. While we are at it, use __func__ to print function name.
--- drivers/infiniband/core/mad.c | 72 ++++++++++++++++++----------------- 1 file changed, 37 insertions(+), 35 deletions(-)
drivers/infiniband/core/mad.c +37 -35
@@ -223,30 +223,30 @@ struct ib_mad_agent *ib_register_mad_agent(struct ib_device *device,/* Validate parameters */ qpn =get_spl_qp_index (qp_type);if (qpn ==-1 ) { -dev_notice (&device->dev, -"ib_register_mad_agent: invalid QP Type %d\n" , - qp_type); +dev_dbg_ratelimited (&device->dev,"%s: invalid QP Type %d\n" , + __func__, qp_type); goto error1; }if (rmpp_version && rmpp_version !=IB_MGMT_RMPP_VERSION ) { -dev_notice (&device->dev, -"ib_register_mad_agent: invalid RMPP Version %u\n" , - rmpp_version); +dev_dbg_ratelimited (&device->dev, +"%s: invalid RMPP Version %u\n" , + __func__, rmpp_version); goto error1; }/* Validate MAD registration request if supplied */ if (mad_reg_req) {if (mad_reg_req->mgmt_class_version >=MAX_MGMT_VERSION ) { -dev_notice (&device->dev, -"ib_register_mad_agent: invalid Class Version %u\n" , - mad_reg_req->mgmt_class_version); +dev_dbg_ratelimited (&device->dev, +"%s: invalid Class Version %u\n" , + __func__, + mad_reg_req->mgmt_class_version); goto error1; }if (!recv_handler) { -dev_notice (&device->dev, -"ib_register_mad_agent: no recv_handler\n" ); +dev_dbg_ratelimited (&device->dev, +"%s: no recv_handler\n" , __func__); goto error1; }if (mad_reg_req->mgmt_class >=MAX_MGMT_CLASS ) {
@@ -256,9 +256,9 @@ struct ib_mad_agent *ib_register_mad_agent(struct ib_device *device,*/ if (mad_reg_req->mgmt_class !=IB_MGMT_CLASS_SUBN_DIRECTED_ROUTE ) { -dev_notice (&device->dev, -"ib_register_mad_agent: Invalid Mgmt Class 0x%x\n" , - mad_reg_req->mgmt_class); +dev_dbg_ratelimited (&device->dev, +"%s: Invalid Mgmt Class 0x%x\n" , + __func__, mad_reg_req->mgmt_class); goto error1; } }else if (mad_reg_req->mgmt_class ==0 ) {
@@ -266,8 +266,9 @@ struct ib_mad_agent *ib_register_mad_agent(struct ib_device *device,* Class 0 is reserved in IBA and is used for * aliasing of IB_MGMT_CLASS_SUBN_DIRECTED_ROUTE */ -dev_notice (&device->dev, -"ib_register_mad_agent: Invalid Mgmt Class 0\n" ); +dev_dbg_ratelimited (&device->dev, +"%s: Invalid Mgmt Class 0\n" , + __func__); goto error1; }else if (is_vendor_class (mad_reg_req->mgmt_class)) {/*
@@ -275,18 +276,19 @@ struct ib_mad_agent *ib_register_mad_agent(struct ib_device *device,* ensure supplied OUI is not zero */ if (!is_vendor_oui (mad_reg_req->oui)) { -dev_notice (&device->dev, -"ib_register_mad_agent: No OUI specified for class 0x%x\n" , - mad_reg_req->mgmt_class); +dev_dbg_ratelimited (&device->dev, +"%s: No OUI specified for class 0x%x\n" , + __func__, + mad_reg_req->mgmt_class); goto error1; } }/* Make sure class supplied is consistent with RMPP */ if (!ib_is_mad_class_rmpp (mad_reg_req->mgmt_class)) {if (rmpp_version) { -dev_notice (&device->dev, -"ib_register_mad_agent: RMPP version for non-RMPP class 0x%x\n" , - mad_reg_req->mgmt_class); +dev_dbg_ratelimited (&device->dev, +"%s: RMPP version for non-RMPP class 0x%x\n" , + __func__, mad_reg_req->mgmt_class); goto error1; } }
@@ -297,9 +299,9 @@ struct ib_mad_agent *ib_register_mad_agent(struct ib_device *device, IB_MGMT_CLASS_SUBN_LID_ROUTED) && (mad_reg_req->mgmt_class != IB_MGMT_CLASS_SUBN_DIRECTED_ROUTE)) { -dev_notice (&device->dev, -"ib_register_mad_agent: Invalid SM QP type: class 0x%x\n" , - mad_reg_req->mgmt_class); +dev_dbg_ratelimited (&device->dev, +"%s: Invalid SM QP type: class 0x%x\n" , + __func__, mad_reg_req->mgmt_class); goto error1; } }else {
@@ -307,9 +309,9 @@ struct ib_mad_agent *ib_register_mad_agent(struct ib_device *device, IB_MGMT_CLASS_SUBN_LID_ROUTED) || (mad_reg_req->mgmt_class == IB_MGMT_CLASS_SUBN_DIRECTED_ROUTE)) { -dev_notice (&device->dev, -"ib_register_mad_agent: Invalid GS QP type: class 0x%x\n" , - mad_reg_req->mgmt_class); +dev_dbg_ratelimited (&device->dev, +"%s: Invalid GS QP type: class 0x%x\n" , + __func__, mad_reg_req->mgmt_class); goto error1; } }
@@ -324,18 +326,18 @@ struct ib_mad_agent *ib_register_mad_agent(struct ib_device *device,/* Validate device and port */ port_priv =ib_get_mad_port (device, port_num);if (!port_priv) { -dev_notice (&device->dev, -"ib_register_mad_agent: Invalid port %d\n" , - port_num); +dev_dbg_ratelimited (&device->dev,"%s: Invalid port %d\n" , + __func__, port_num); ret =ERR_PTR (-ENODEV ); goto error1; } -/* Verify the QP requested is supported. For example, Ethernet devices -* will not have QP0 */ +/* Verify the QP requested is supported. For example, Ethernet devices +* will not have QP0. +*/ if (!port_priv->qp_info[qpn].qp) { -dev_notice (&device->dev, -"ib_register_mad_agent: QP %d not supported\n" , qpn); +dev_dbg_ratelimited (&device->dev,"%s: QP %d not supported\n" , + __func__, qpn); ret =ERR_PTR (-EPROTONOSUPPORT ); goto error1; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 96/205 IB/mlx5: Don't hold spin lock while checking device state
In reply to Sasha LevinFrom: Parav Pandit <[email protected]>
[ Upstream commit 6c75520f7e5a6a353f3b332509d205e213d05855 ]
mdev->state device state is not protected by the QP for which WRs are being processed. Therefore, there is no need to hold spin lock while checking mdev state.
Given that device fatal error is unlikely situation, wrap the condition check with unlikely().
Additionally, kernel QP1 is also a kernel ULP for which soft CQEs needs to be generated. Therefore, check for device fatal error before processing QP1 work requests.
--- drivers/infiniband/hw/mlx5/qp.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-)
drivers/infiniband/hw/mlx5/qp.c +12 -14
@@ -4405,6 +4405,12 @@ static int _mlx5_ib_post_send(struct ib_qp *ibqp, const struct ib_send_wr *wr,u8 next_fence =0 ;u8 fence; +if (unlikely (mdev->state ==MLX5_DEVICE_STATE_INTERNAL_ERROR && + !drain)) { + *bad_wr = wr; +return -EIO ; + } +if (unlikely (ibqp->qp_type ==IB_QPT_GSI ))return mlx5_ib_gsi_post_send (ibqp, wr, bad_wr);
@@ -4414,13 +4420,6 @@ static int _mlx5_ib_post_send(struct ib_qp *ibqp, const struct ib_send_wr *wr,spin_lock_irqsave (&qp->sq.lock, flags); -if (mdev->state ==MLX5_DEVICE_STATE_INTERNAL_ERROR && !drain) { - err = -EIO ; - *bad_wr = wr; - nreq =0 ; - goto out; - } -for (nreq =0 ; wr; nreq++, wr = wr->next) {if (unlikely (wr->opcode >=ARRAY_SIZE (mlx5_ib_opcode))) {mlx5_ib_warn (dev,"\n" );
@@ -4735,18 +4734,17 @@ static int _mlx5_ib_post_recv(struct ib_qp *ibqp, const struct ib_recv_wr *wr,int ind;int i; +if (unlikely (mdev->state ==MLX5_DEVICE_STATE_INTERNAL_ERROR && + !drain)) { + *bad_wr = wr; +return -EIO ; + } +if (unlikely (ibqp->qp_type ==IB_QPT_GSI ))return mlx5_ib_gsi_post_recv (ibqp, wr, bad_wr);spin_lock_irqsave (&qp->rq.lock, flags); -if (mdev->state ==MLX5_DEVICE_STATE_INTERNAL_ERROR && !drain) { - err = -EIO ; - *bad_wr = wr; - nreq =0 ; - goto out; - } - ind = qp->rq.head & (qp->rq.wqe_cnt -1 );for (nreq =0 ; wr; nreq++, wr = wr->next) {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 90/205 rtnetlink: move type calculation out of loop
In reply to Sasha LevinFrom: Christian Brauner <[email protected]>
[ Upstream commit 87ccbb1f943625884b824c5560f635dcea8e4510 ]
I don't see how the type - which is one of RTM_{GETADDR,GETROUTE,GETNETCONF} - can change. So do the message type calculation once before entering the for loop.
--- net/core/rtnetlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/core/rtnetlink.c +1 -1
@@ -3268,13 +3268,13 @@ static int rtnl_dump_all(struct sk_buff *skb, struct netlink_callback *cb) {int idx;int s_idx = cb->family; +int type = cb->nlh->nlmsg_type -RTM_BASE ;if (s_idx ==0 ) s_idx =1 ;for (idx =1 ; idx <=RTNL_FAMILY_MAX ; idx++) {struct rtnl_link **tab; -int type = cb->nlh->nlmsg_type-RTM_BASE ;struct rtnl_link *link;rtnl_dumpit_func dumpit;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 86/205 mac80211: fix saving a few HE values
In reply to Sasha LevinFrom: Naftali Goldstein <[email protected]>
[ Upstream commit 77cbbc35a49b75969d98edce9400beb21720aa39 ]
After masking the he_oper_params, to get the requested values as integers one must rshift and not lshift. Fix that by using the le32_get_bits() macro.
--- net/mac80211/mlme.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)
net/mac80211/mlme.c +7 -10
@@ -3255,19 +3255,16 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata, }if (bss_conf->he_support) { -u32 he_oper_params = -le32_to_cpu (elems.he_operation->he_oper_params); + bss_conf->bss_color = +le32_get_bits (elems.he_operation->he_oper_params, +IEEE80211_HE_OPERATION_BSS_COLOR_MASK ); - bss_conf->bss_color = he_oper_params & -IEEE80211_HE_OPERATION_BSS_COLOR_MASK ; bss_conf->htc_trig_based_pkt_ext = - (he_oper_params & -IEEE80211_HE_OPERATION_DFLT_PE_DURATION_MASK ) << -IEEE80211_HE_OPERATION_DFLT_PE_DURATION_OFFSET ; +le32_get_bits (elems.he_operation->he_oper_params, +IEEE80211_HE_OPERATION_DFLT_PE_DURATION_MASK ); bss_conf->frame_time_rts_th = - (he_oper_params & -IEEE80211_HE_OPERATION_RTS_THRESHOLD_MASK ) << -IEEE80211_HE_OPERATION_RTS_THRESHOLD_OFFSET ; +le32_get_bits (elems.he_operation->he_oper_params, +IEEE80211_HE_OPERATION_RTS_THRESHOLD_MASK ); bss_conf->multi_sta_back_32bit = sta->sta.he_cap.he_cap_elem.mac_cap_info[2] &
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 76/205 net: phy: mscc: read 'vsc8531,vddmac' as an u32
In reply to Sasha LevinFrom: Quentin Schulz <[email protected]>
[ Upstream commit a993e0f583c7925adaa7721226ccd7a41e7e63d1 ]
In the DT binding, it is specified nowhere that 'vsc8531,vddmac' is an u16, even though it's read as an u16 in the driver.
Let's update the driver to take into consideration that the 'vsc8531,vddmac' property is of the default type u32.
--- drivers/net/phy/mscc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/phy/mscc.c +3 -3
@@ -111,7 +111,7 @@ struct vsc8531_private {#ifdef CONFIG_OF_MDIO struct vsc8531_edge_rate_table { -u16 vddmac; +u32 vddmac;u8 slowdown[8 ]; };
@@ -376,7 +376,7 @@ out_unlock:static int vsc85xx_edge_rate_magic_get (struct phy_device *phydev) {u8 sd; -u16 vdd; +u32 vdd;int rc, i, j;struct device *dev = &phydev->mdio.dev;struct device_node *of_node = dev->of_node;
@@ -385,7 +385,7 @@ static int vsc85xx_edge_rate_magic_get(struct phy_device *phydev)if (!of_node)return -ENODEV ; - rc =of_property_read_u16 (of_node,"vsc8531,vddmac" , &vdd); + rc =of_property_read_u32 (of_node,"vsc8531,vddmac" , &vdd);if (rc !=0 ) vdd =MSCC_VDDMAC_3300 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 77/205 net: phy: mscc: read 'vsc8531, edge-slowdown' as an u32
In reply to Sasha LevinFrom: Quentin Schulz <[email protected]>
[ Upstream commit 36c53cf0f46526b898390659b125155939f67892 ]
In the DT binding, it is specified nowhere that 'vsc8531,edge-slowdown' is an u8, even though it's read as an u8 in the driver.
Let's update the driver to take into consideration that the 'vsc8531,edge-slowdown' property is of the default type u32.
--- drivers/net/phy/mscc.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/net/phy/mscc.c +3 -4
@@ -112,7 +112,7 @@ struct vsc8531_private {#ifdef CONFIG_OF_MDIO struct vsc8531_edge_rate_table {u32 vddmac; -u8 slowdown[8 ]; +u32 slowdown[8 ]; }; static const struct vsc8531_edge_rate_table edge_table[] = {
@@ -375,8 +375,7 @@ out_unlock:#ifdef CONFIG_OF_MDIO static int vsc85xx_edge_rate_magic_get (struct phy_device *phydev) { -u8 sd; -u32 vdd; +u32 vdd, sd;int rc, i, j;struct device *dev = &phydev->mdio.dev;struct device_node *of_node = dev->of_node;
@@ -389,7 +388,7 @@ static int vsc85xx_edge_rate_magic_get(struct phy_device *phydev)if (rc !=0 ) vdd =MSCC_VDDMAC_3300 ; - rc =of_property_read_u8 (of_node,"vsc8531,edge-slowdown" , &sd); + rc =of_property_read_u32 (of_node,"vsc8531,edge-slowdown" , &sd);if (rc !=0 ) sd =0 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 70/205 ASoC: rsnd: ssi: Fix issue in dma data address assignment
In reply to Sasha LevinFrom: Jiada Wang <[email protected]>
[ Upstream commit 0e289012b47a2de1f029a6b61c75998e2f159dd9 ]
Same SSI device may be used in different dai links, by only having one dma struct in rsnd_ssi, after the first instance's dma config be initilized, the following instances can no longer configure dma, this causes issue, when their dma data address are different from the first instance.
--- sound/soc/sh/rcar/rsnd.h | 1 + sound/soc/sh/rcar/ssi.c | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-)
sound/soc/sh/rcar/rsnd.h +1 -0
@@ -438,6 +438,7 @@ struct rsnd_dai_stream {char name[RSND_DAI_NAME_SIZE ];struct snd_pcm_substream *substream;struct rsnd_mod *mod[RSND_MOD_MAX ]; +struct rsnd_mod *dma;struct rsnd_dai *rdai;struct device *dmac_dev;/* for IPMMU */ u32 parent_ssi_status;
sound/soc/sh/rcar/ssi.c +1 -3
@@ -72,7 +72,6 @@struct rsnd_ssi {struct rsnd_mod mod; -struct rsnd_mod *dma;u32 flags;u32 cr_own;
@@ -873,7 +872,6 @@ static int rsnd_ssi_dma_probe(struct rsnd_mod *mod,struct rsnd_dai_stream *io, struct rsnd_priv *priv) { - struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod); int ret;/*
@@ -888,7 +886,7 @@ static int rsnd_ssi_dma_probe(struct rsnd_mod *mod,return ret;/* SSI probe might be called many times in MUX multi path */ - ret =rsnd_dma_attach (io, mod, &ssi->dma); + ret =rsnd_dma_attach (io, mod, &io->dma);return ret; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 68/205 mt76: Fix comparisons with invalid hardware key index
In reply to Sasha LevinFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 81c8eccc2404d06082025b773f1d90e8c861bc6a ]
With gcc 4.1.2:
drivers/net/wireless/mediatek/mt76/mt76x0/tx.c: In function ‘mt76x0_tx’:
drivers/net/wireless/mediatek/mt76/mt76x0/tx.c:169: warning: comparison is always true due to limited range of data type drivers/net/wireless/mediatek/mt76/mt76x2_tx_common.c: In function ‘mt76x2_tx’:
drivers/net/wireless/mediatek/mt76/mt76x2_tx_common.c:35: warning: comparison is always true due to limited range of data type
While assigning -1 to a u8 works fine, comparing with -1 does not work as expected.
Fix this by comparing with 0xff, like is already done in some other places.
--- drivers/net/wireless/mediatek/mt76/mt76x0/tx.c | 2 +- drivers/net/wireless/mediatek/mt76/mt76x2_tx_common.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76x0/tx.c +1 -1
@@ -166,7 +166,7 @@ void mt76x0_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control,if (sta) { msta = (struct mt76_sta *) sta->drv_priv; wcid = &msta->wcid; - }else if (vif && (!info->control.hw_key && wcid->hw_key_idx !=-1 )) { + }else if (vif && (!info->control.hw_key && wcid->hw_key_idx !=0xff )) {struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv; wcid = &mvif->group_wcid;
drivers/net/wireless/mediatek/mt76/mt76x2_tx_common.c +1 -1
@@ -32,7 +32,7 @@ void mt76x2_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control, msta = (struct mt76x2_sta *)control->sta->drv_priv; wcid = &msta->wcid;/* sw encrypted frames */ -if (!info->control.hw_key && wcid->hw_key_idx !=-1 ) +if (!info->control.hw_key && wcid->hw_key_idx !=0xff ) control->sta =NULL ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 63/205 ARM: dts: pxa: fix power i2c base address
In reply to Sasha LevinFrom: Marcel Ziswiler <[email protected]>
[ Upstream commit 8a1ecc01a473b75ab97be9b36f623e4551a6e9ae ]
There is one too many zeroes in the Power I2C base address. Fix this.
--- arch/arm/boot/dts/pxa27x.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/pxa27x.dtsi +1 -1
@@ -71,7 +71,7 @@ clocks = <&clks CLK_PWM1>; }; - pwri2c: i2c@40f000180 { + pwri2c: i2c@40f00180 { compatible = "mrvl,pxa-i2c"; reg = <0x40f00180 0x24>; interrupts = <6>;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 59/205 media: vicodec: fix out-of-range values when decoding
In reply to Sasha LevinFrom: Hans Verkuil <[email protected]>
[ Upstream commit be5a1509af8dd8a78fea24a35fe4a82d4cd0ae70 ]
While decoding you need to make sure you do not get values < 0 or > 255. Note that since this code will also be used in userspace utilities the clamp macro isn't used since that is kernel-only.
--- drivers/media/platform/vicodec/vicodec-codec.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/media/platform/vicodec/vicodec-codec.c +8 -2
@@ -588,8 +588,14 @@ static void fill_decoder_block(u8 *dst, const s16 *input, int stride)int i, j;for (i =0 ; i <8 ; i++) { -for (j =0 ; j <8 ; j++) - *dst++ = *input++; +for (j =0 ; j <8 ; j++, input++, dst++) { +if (*input <0 ) + *dst =0 ; +else if (*input >255 ) + *dst =255 ; +else + *dst = *input; + } dst += stride -8 ; } }
Signature · 1 line
2.20.1