media: davinci-isif: avoid uninitialized variable use
Subsystems (59)
Sasha Levin
maintainerPATCH 266/671 spi: tegra114: clear packed bit for unpacked mode
In reply to Sasha LevinFrom: Sowjanya Komatineni <[email protected]>
[ Upstream commit 7b3d10cdf54b8bc1dc0da21faed9789ac4da3684 ]
Packed bit is not cleared when not using packed mode. This results in transfer timeouts for the unpacked mode transfers followed by the packed mode transfers.
--- drivers/spi/spi-tegra114.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/spi/spi-tegra114.c +2 -0
@@ -730,6 +730,8 @@ static int tegra_spi_start_transfer_one(struct spi_device *spi,if (tspi->is_packed) command1 |=SPI_PACKED ; +else + command1 &= ~SPI_PACKED ; command1 &= ~(SPI_CS_SEL_MASK |SPI_TX_EN |SPI_RX_EN ); tspi->cur_direction =0 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 267/671 spi: tegra114: fix for unpacked mode transfers
In reply to Sasha LevinFrom: Sowjanya Komatineni <[email protected]>
[ Upstream commit 1a89ac5b91895127f7c586ec5075c3753ca25501 ]
Fixes: computation of actual bytes to fill/receive in/from FIFO in unpacked mode when transfer length is not a multiple of requested bits per word.
unpacked mode transfers fails when the transfer includes partial bytes in the last word.
Total words to be written/read to/from FIFO is computed based on transfer length and bits per word. Unpacked mode includes 0 padding bytes for partial words to align with bits per word and these extra bytes are also accounted for calculating bytes left to transfer in the current driver.
This causes extra bytes access of tx/rx buffers along with buffer index position crossing actual length where remain_len becomes negative and due to unsigned type, negative value is a 32 bit representation of signed value and transferred bytes never meets the actual transfer length resulting in transfer timeout and a hang.
This patch fixes this with proper computation of the actual bytes to fill in FIFO during transmit and the actual bytes to read from FIFO during receive ignoring 0 padded bytes.
--- drivers/spi/spi-tegra114.c | 43 +++++++++++++++++++++++++++++++------- 1 file changed, 36 insertions(+), 7 deletions(-)
drivers/spi/spi-tegra114.c +36 -7
@@ -307,10 +307,16 @@ static unsigned tegra_spi_fill_tx_fifo_from_client_txbuf( x |= (u32)(*tx_buf++) << (i *8 );tegra_spi_writel (tspi, x,SPI_TX_FIFO ); } + + tspi->cur_tx_pos += written_words * tspi->bytes_per_word; }else { +unsigned int write_bytes; max_n_32bit =min (tspi->curr_dma_words, tx_empty_count); written_words = max_n_32bit; nbytes = written_words * tspi->bytes_per_word; +if (nbytes > t->len - tspi->cur_pos) + nbytes = t->len - tspi->cur_pos; + write_bytes = nbytes;for (count =0 ; count < max_n_32bit; count++) {u32 x =0 ;
@@ -319,8 +325,10 @@ static unsigned tegra_spi_fill_tx_fifo_from_client_txbuf( x |= (u32)(*tx_buf++) << (i *8 );tegra_spi_writel (tspi, x,SPI_TX_FIFO ); } + + tspi->cur_tx_pos += write_bytes; } - tspi->cur_tx_pos += written_words * tspi->bytes_per_word; +return written_words; }
@@ -344,20 +352,27 @@ static unsigned int tegra_spi_read_rx_fifo_to_client_rxbuf(for (i =0 ; len && (i <4 ); i++, len--) *rx_buf++ = (x >> i*8 ) &0xFF ; } - tspi->cur_rx_pos += tspi->curr_dma_words * tspi->bytes_per_word; read_words += tspi->curr_dma_words; + tspi->cur_rx_pos += tspi->curr_dma_words * tspi->bytes_per_word; }else {u32 rx_mask = ((u32 )1 << t->bits_per_word) -1 ; +u8 bytes_per_word = tspi->bytes_per_word; +unsigned int read_bytes; + len = rx_full_count * bytes_per_word; +if (len > t->len - tspi->cur_pos) + len = t->len - tspi->cur_pos; + read_bytes = len;for (count =0 ; count < rx_full_count; count++) {u32 x =tegra_spi_readl (tspi,SPI_RX_FIFO ) & rx_mask; -for (i =0 ; (i < tspi->bytes_per_word); i++) +for (i =0 ; len && (i < bytes_per_word); i++, len--) *rx_buf++ = (x >> (i*8 )) &0xFF ; } - tspi->cur_rx_pos += rx_full_count * tspi->bytes_per_word; read_words += rx_full_count; + tspi->cur_rx_pos += read_bytes; } +return read_words; }
@@ -372,12 +387,17 @@ static void tegra_spi_copy_client_txbuf_to_spi_txbuf(unsigned len = tspi->curr_dma_words * tspi->bytes_per_word;memcpy (tspi->tx_dma_buf, t->tx_buf + tspi->cur_pos, len); + tspi->cur_tx_pos += tspi->curr_dma_words * tspi->bytes_per_word; }else {unsigned int i;unsigned int count;u8 *tx_buf = (u8 *)t->tx_buf + tspi->cur_tx_pos;unsigned consume = tspi->curr_dma_words * tspi->bytes_per_word; +unsigned int write_bytes; +if (consume > t->len - tspi->cur_pos) + consume = t->len - tspi->cur_pos; + write_bytes = consume;for (count =0 ; count < tspi->curr_dma_words; count++) {u32 x =0 ;
@@ -386,8 +406,9 @@ static void tegra_spi_copy_client_txbuf_to_spi_txbuf( x |= (u32)(*tx_buf++) << (i *8 ); tspi->tx_dma_buf[count] = x; } + + tspi->cur_tx_pos += write_bytes; } - tspi->cur_tx_pos += tspi->curr_dma_words * tspi->bytes_per_word;/* Make the dma buffer to read by dma */ dma_sync_single_for_device(tspi->dev, tspi->tx_dma_phys,
@@ -405,20 +426,28 @@ static void tegra_spi_copy_spi_rxbuf_to_client_rxbuf(unsigned len = tspi->curr_dma_words * tspi->bytes_per_word;memcpy (t->rx_buf + tspi->cur_rx_pos, tspi->rx_dma_buf, len); + tspi->cur_rx_pos += tspi->curr_dma_words * tspi->bytes_per_word; }else {unsigned int i;unsigned int count;unsigned char *rx_buf = t->rx_buf + tspi->cur_rx_pos;u32 rx_mask = ((u32 )1 << t->bits_per_word) -1 ; +unsigned consume = tspi->curr_dma_words * tspi->bytes_per_word; +unsigned int read_bytes; +if (consume > t->len - tspi->cur_pos) + consume = t->len - tspi->cur_pos; + read_bytes = consume;for (count =0 ; count < tspi->curr_dma_words; count++) {u32 x = tspi->rx_dma_buf[count] & rx_mask; -for (i =0 ; (i < tspi->bytes_per_word); i++) +for (i =0 ; consume && (i < tspi->bytes_per_word); + i++, consume--) *rx_buf++ = (x >> (i*8 )) &0xFF ; } + + tspi->cur_rx_pos += read_bytes; } - tspi->cur_rx_pos += tspi->curr_dma_words * tspi->bytes_per_word;/* Make the dma buffer to read by dma */ dma_sync_single_for_device(tspi->dev, tspi->rx_dma_phys,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 268/671 spi: tegra114: terminate dma and reset on transfer timeout
In reply to Sasha LevinFrom: Sowjanya Komatineni <[email protected]>
[ Upstream commit 32bd1a9551cae34e6889afa235c7afdfede9aeac ]
Fixes: terminate DMA and perform controller reset on transfer timeout to clear the FIFO's and errors.
--- drivers/spi/spi-tegra114.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/spi/spi-tegra114.c +9 -0
@@ -869,7 +869,16 @@ static int tegra_spi_transfer_one_message(struct spi_master *master,if (WARN_ON (ret ==0 )) {dev_err (tspi->dev,"spi transfer timeout, err %d\n" , ret); +if (tspi->is_curr_dma_xfer && + (tspi->cur_direction &DATA_DIR_TX )) +dmaengine_terminate_all (tspi->tx_dma_chan); +if (tspi->is_curr_dma_xfer && + (tspi->cur_direction &DATA_DIR_RX )) +dmaengine_terminate_all (tspi->rx_dma_chan); ret = -EIO ; +reset_control_assert (tspi->rst); +udelay (2 ); +reset_control_deassert (tspi->rst); goto complete_xfer; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 269/671 spi: tegra114: flush fifos
In reply to Sasha LevinFrom: Sowjanya Komatineni <[email protected]>
[ Upstream commit c4fc9e5b28ff787e35137c2cc13316bb11d7657b ]
Fixes: Flush TX and RX FIFOs before start of new transfer and on FIFO overflow or underrun errors.
--- drivers/spi/spi-tegra114.c | 39 +++++++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 9 deletions(-)
drivers/spi/spi-tegra114.c +30 -9
@@ -499,22 +499,37 @@ static int tegra_spi_start_rx_dma(struct tegra_spi_data *tspi, int len)return 0 ; } -static int tegra_spi_start_dma_based_transfer ( -struct tegra_spi_data *tspi,struct spi_transfer *t) +static int tegra_spi_flush_fifos (struct tegra_spi_data *tspi) { -u32 val; -unsigned int len; -int ret =0 ; +unsigned long timeout = jiffies +HZ ;u32 status; -/* Make sure that Rx and Tx fifo are empty */ status =tegra_spi_readl (tspi,SPI_FIFO_STATUS );if ((status &SPI_FIFO_EMPTY ) !=SPI_FIFO_EMPTY ) { -dev_err (tspi->dev,"Rx/Tx fifo are not empty status 0x%08x\n" , - (unsigned )status); -return -EIO ; + status |=SPI_RX_FIFO_FLUSH |SPI_TX_FIFO_FLUSH ; +tegra_spi_writel (tspi, status,SPI_FIFO_STATUS ); +while ((status &SPI_FIFO_EMPTY ) !=SPI_FIFO_EMPTY ) { + status =tegra_spi_readl (tspi,SPI_FIFO_STATUS ); +if (time_after (jiffies, timeout)) { +dev_err (tspi->dev, +"timeout waiting for fifo flush\n" ); +return -EIO ; + } + +udelay (1 ); + } } +return 0 ; +} + +static int tegra_spi_start_dma_based_transfer ( +struct tegra_spi_data *tspi,struct spi_transfer *t) +{ +u32 val; +unsigned int len; +int ret =0 ; + val =SPI_DMA_BLK_SET (tspi->curr_dma_words -1 );tegra_spi_writel (tspi, val,SPI_DMA_BLK );
@@ -779,6 +794,9 @@ static int tegra_spi_start_transfer_one(struct spi_device *spi,dev_dbg (tspi->dev,"The def 0x%x and written 0x%x\n" , tspi->def_command1_reg, (unsigned )command1); + ret =tegra_spi_flush_fifos (tspi); +if (ret <0 ) +return ret;if (total_fifo_words >SPI_FIFO_DEPTH ) ret =tegra_spi_start_dma_based_transfer (tspi, t);else
@@ -876,6 +894,7 @@ static int tegra_spi_transfer_one_message(struct spi_master *master, (tspi->cur_direction & DATA_DIR_RX))dmaengine_terminate_all (tspi->rx_dma_chan); ret = -EIO ; +tegra_spi_flush_fifos (tspi);reset_control_assert (tspi->rst);udelay (2 );reset_control_deassert (tspi->rst);
@@ -929,6 +948,7 @@ static irqreturn_t handle_cpu_based_xfer(struct tegra_spi_data *tspi) tspi->status_reg);dev_err (tspi->dev,"CpuXfer 0x%08x:0x%08x\n" , tspi->command1_reg, tspi->dma_control_reg); +tegra_spi_flush_fifos (tspi);reset_control_assert (tspi->rst);udelay (2 );reset_control_deassert (tspi->rst);
@@ -1001,6 +1021,7 @@ static irqreturn_t handle_dma_based_xfer(struct tegra_spi_data *tspi) tspi->status_reg);dev_err (tspi->dev,"DmaXfer 0x%08x:0x%08x\n" , tspi->command1_reg, tspi->dma_control_reg); +tegra_spi_flush_fifos (tspi);reset_control_assert (tspi->rst);udelay (2 );reset_control_deassert (tspi->rst);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 270/671 spi: tegra114: configure dma burst size to fifo trig level
In reply to Sasha LevinFrom: Sowjanya Komatineni <[email protected]>
[ Upstream commit f4ce428c41fb22e3ed55496dded94df44cb920fa ]
Fixes: Configure DMA burst size to be same as SPI TX/RX trigger levels to avoid mismatch.
SPI FIFO trigger levels are calculated based on the transfer length. So this patch moves DMA slave configuration to happen before start of DMAs.
--- drivers/spi/spi-tegra114.c | 52 ++++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 22 deletions(-)
drivers/spi/spi-tegra114.c +30 -22
@@ -529,6 +529,8 @@ static int tegra_spi_start_dma_based_transfer(u32 val;unsigned int len;int ret =0 ; +u8 dma_burst; +struct dma_slave_config dma_sconfig = {0 }; val =SPI_DMA_BLK_SET (tspi->curr_dma_words -1 );tegra_spi_writel (tspi, val,SPI_DMA_BLK );
@@ -540,12 +542,16 @@ static int tegra_spi_start_dma_based_transfer( len = tspi->curr_dma_words *4 ;/* Set attention level based on length of transfer */ -if (len &0xF ) +if (len &0xF ) { val |=SPI_TX_TRIG_1 |SPI_RX_TRIG_1 ; -else if (((len) >>4 ) &0x1 ) + dma_burst =1 ; + }else if (((len) >>4 ) &0x1 ) { val |=SPI_TX_TRIG_4 |SPI_RX_TRIG_4 ; -else + dma_burst =4 ; + }else { val |=SPI_TX_TRIG_8 |SPI_RX_TRIG_8 ; + dma_burst =8 ; + }if (tspi->cur_direction &DATA_DIR_TX ) val |=SPI_IE_TX ;
@@ -556,7 +562,18 @@ static int tegra_spi_start_dma_based_transfer(tegra_spi_writel (tspi, val,SPI_DMA_CTL ); tspi->dma_control_reg = val; + dma_sconfig.device_fc = true;if (tspi->cur_direction &DATA_DIR_TX ) { + dma_sconfig.dst_addr = tspi->phys +SPI_TX_FIFO ; + dma_sconfig.dst_addr_width =DMA_SLAVE_BUSWIDTH_4_BYTES ; + dma_sconfig.dst_maxburst = dma_burst; + ret =dmaengine_slave_config (tspi->tx_dma_chan, &dma_sconfig); +if (ret <0 ) { +dev_err (tspi->dev, +"DMA slave config failed: %d\n" , ret); +return ret; + } +tegra_spi_copy_client_txbuf_to_spi_txbuf (tspi, t); ret =tegra_spi_start_tx_dma (tspi, len);if (ret <0 ) {
@@ -567,6 +584,16 @@ static int tegra_spi_start_dma_based_transfer( }if (tspi->cur_direction &DATA_DIR_RX ) { + dma_sconfig.src_addr = tspi->phys +SPI_RX_FIFO ; + dma_sconfig.src_addr_width =DMA_SLAVE_BUSWIDTH_4_BYTES ; + dma_sconfig.src_maxburst = dma_burst; + ret =dmaengine_slave_config (tspi->rx_dma_chan, &dma_sconfig); +if (ret <0 ) { +dev_err (tspi->dev, +"DMA slave config failed: %d\n" , ret); +return ret; + } +/* Make the dma buffer to read by dma */ dma_sync_single_for_device (tspi->dev, tspi->rx_dma_phys, tspi->dma_buf_size,DMA_FROM_DEVICE );
@@ -626,7 +653,6 @@ static int tegra_spi_init_dma_param(struct tegra_spi_data *tspi,u32 *dma_buf;dma_addr_t dma_phys;int ret; -struct dma_slave_config dma_sconfig; dma_chan =dma_request_slave_channel_reason (tspi->dev, dma_to_memory ?"rx" :"tx" );
@@ -646,19 +672,6 @@ static int tegra_spi_init_dma_param(struct tegra_spi_data *tspi,return -ENOMEM ; } -if (dma_to_memory) { - dma_sconfig.src_addr = tspi->phys +SPI_RX_FIFO ; - dma_sconfig.src_addr_width =DMA_SLAVE_BUSWIDTH_4_BYTES ; - dma_sconfig.src_maxburst =0 ; - }else { - dma_sconfig.dst_addr = tspi->phys +SPI_TX_FIFO ; - dma_sconfig.dst_addr_width =DMA_SLAVE_BUSWIDTH_4_BYTES ; - dma_sconfig.dst_maxburst =0 ; - } - - ret =dmaengine_slave_config (dma_chan, &dma_sconfig); -if (ret) - goto scrub;if (dma_to_memory) { tspi->rx_dma_chan = dma_chan; tspi->rx_dma_buf = dma_buf;
@@ -669,11 +682,6 @@ static int tegra_spi_init_dma_param(struct tegra_spi_data *tspi, tspi->tx_dma_phys = dma_phys; }return 0 ; - -scrub: -dma_free_coherent (tspi->dev, tspi->dma_buf_size, dma_buf, dma_phys); -dma_release_channel (dma_chan); -return ret; } static void tegra_spi_deinit_dma_param(struct tegra_spi_data *tspi,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 271/671 bus: ti-sysc: Fix sysc_unprepare() when no clocks have been allocated
In reply to Sasha LevinFrom: Tony Lindgren <[email protected]>
[ Upstream commit aaa29bb01cc4bf5a87dbdb219efba3b09f259d8e ]
If we return early before ddata->clocks have been allocated we will get a NULL pointer dereference in sysc_unprepare(). Let's fix this by returning early when no clocks are allocated.
--- drivers/bus/ti-sysc.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/bus/ti-sysc.c +3 -0
@@ -1400,6 +1400,9 @@ static void sysc_unprepare(struct sysc *ddata) {int i; +if (!ddata->clocks) +return ; +for (i =0 ; i <SYSC_MAX_CLOCKS ; i++) {if (!IS_ERR_OR_NULL (ddata->clocks[i]))clk_unprepare (ddata->clocks[i]);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 272/671 dccp: Fix memleak in __feat_register_sp
In reply to Sasha LevinFrom: YueHaibing <[email protected]>
[ Upstream commit 1d3ff0950e2b40dc861b1739029649d03f591820 ]
If dccp_feat_push_change fails, we forget free the mem which is alloced by kmemdup in dccp_feat_clone_sp_val.
--- net/dccp/feat.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
net/dccp/feat.c +6 -1
@@ -738,7 +738,12 @@ static int __feat_register_sp(struct list_head *fn, u8 feat, u8 is_local,if (dccp_feat_clone_sp_val (&fval, sp_val, sp_len))return -ENOMEM ; -return dccp_feat_push_change (fn, feat, is_local, mandatory, &fval); +if (dccp_feat_push_change (fn, feat, is_local, mandatory, &fval)) { +kfree (fval.sp.vec); +return -ENOMEM ; + } + +return 0 ; }/**
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 274/671 spi: bcm2835aux: fix driver to not allow 65535 (=-1) cs-gpios
In reply to Sasha LevinFrom: Martin Sperl <[email protected]>
[ Upstream commit 509c583620e9053e43d611bf1614fc3d3abafa96 ]
The original driver by default defines num_chipselects as -1. This actually allicates an array of 65535 entries in of_spi_register_master.
There is a side-effect for buggy device trees that (contrary to dt-binding documentation) have no cs-gpio defined.
This mode was never supported by the driver due to limitations of native cs and additional code complexity and is explicitly not stated to be implemented.
To keep backwards compatibility with such buggy DTs we limit the number of chip_selects to 1, as for all practical purposes it is only ever realistic to use a single chip select in native cs mode without negative side-effects.
--- drivers/spi/spi-bcm2835aux.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/spi/spi-bcm2835aux.c +12 -1
@@ -416,7 +416,18 @@ static int bcm2835aux_spi_probe(struct platform_device *pdev)platform_set_drvdata (pdev, master); master->mode_bits = (SPI_CPOL |SPI_CS_HIGH |SPI_NO_CS ); master->bits_per_word_mask =SPI_BPW_MASK (8 ); - master->num_chipselect =-1 ; +/* even though the driver never officially supported native CS +* allow a single native CS for legacy DT support purposes when +* no cs-gpio is configured. +* Known limitations for native cs are: +* * multiple chip-selects: cs0-cs2 are all simultaniously asserted +* whenever there is a transfer - this even includes SPI_NO_CS +* * SPI_CS_HIGH: is ignores - cs are always asserted low +* * cs_change: cs is deasserted after each spi_transfer +* * cs_delay_usec: cs is always deasserted one SCK cycle after +* a spi_transfer +*/ + master->num_chipselect =1 ; master->transfer_one = bcm2835aux_spi_transfer_one; master->handle_err = bcm2835aux_spi_handle_err; master->prepare_message = bcm2835aux_spi_prepare_message;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 289/671 scsi: target/core: Fix a race condition in the LUN lookup code
In reply to Sasha LevinFrom: Bart Van Assche <[email protected]>
[ Upstream commit 63f7479439c95bcd49b7dd4af809862c316c71a3 ]
The rcu_dereference(deve->se_lun) expression occurs twice in the LUN lookup functions. Since these expressions are not serialized against deve->se_lun assignments each of these expressions may yield a different result. Avoid that the wrong LUN pointer is stored in se_cmd by reading deve->se_lun only once.
--- drivers/target/target_core_device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/target/target_core_device.c +2 -2
@@ -85,7 +85,7 @@ transport_lookup_cmd_lun(struct se_cmd *se_cmd, u64 unpacked_lun) goto out_unlock; } - se_cmd->se_lun =rcu_dereference (deve->se_lun); + se_cmd->se_lun = se_lun; se_cmd->pr_res_key = deve->pr_res_key; se_cmd->orig_fe_lun = unpacked_lun; se_cmd->se_cmd_flags |=SCF_SE_LUN_CMD ;
@@ -176,7 +176,7 @@ int transport_lookup_tmr_lun(struct se_cmd *se_cmd, u64 unpacked_lun) goto out_unlock; } - se_cmd->se_lun =rcu_dereference (deve->se_lun); + se_cmd->se_lun = se_lun; se_cmd->pr_res_key = deve->pr_res_key; se_cmd->orig_fe_lun = unpacked_lun; se_cmd->se_cmd_flags |=SCF_SE_LUN_CMD ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 292/671 PCI: rockchip: Fix rockchip_pcie_ep_assert_intx() bitwise operations
In reply to Sasha LevinFrom: Colin Ian King <[email protected]>
[ Upstream commit c577f4a5a08bb9677e12ddafb62e2f3a901de87f ]
Currently the bitwise operations on the u16 variable 'status' with the setting ROCKCHIP_PCIE_EP_CMD_STATUS_IS are incorrect because ROCKCHIP_PCIE_EP_CMD_STATUS_IS is 1UL<<19 which is wider than the u16 variable.
Fix this by making status a u32.
--- drivers/pci/controller/pcie-rockchip-ep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/controller/pcie-rockchip-ep.c +1 -1
@@ -350,7 +350,7 @@ static void rockchip_pcie_ep_assert_intx(struct rockchip_pcie_ep *ep, u8 fn,struct rockchip_pcie *rockchip = &ep->rockchip;u32 r = ep->max_regions -1 ;u32 offset; -u16 status; +u32 status;u8 msg_code; if (unlikely(ep->irq_pci_addr != ROCKCHIP_PCIE_EP_PCI_LEGACY_IRQ_ADDR ||
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 299/671 platform/x86: alienware-wmi: fix kfree on potentially uninitialized pointer
In reply to Sasha LevinFrom: Colin Ian King <[email protected]>
[ Upstream commit 98e2630284ab741804bd0713e932e725466f2f84 ]
Currently the kfree of output.pointer can be potentially freeing an uninitalized pointer in the case where out_data is NULL. Fix this by reworking the case where out_data is not-null to perform the ACPI status check and also the kfree of outpoint.pointer in one block and hence ensuring the pointer is only freed when it has been used.
Also replace the if (ptr != NULL) idiom with just if (ptr).
--- drivers/platform/x86/alienware-wmi.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
drivers/platform/x86/alienware-wmi.c +8 -9
@@ -522,23 +522,22 @@ static acpi_status alienware_wmax_command(struct wmax_basic_args *in_args, input.length = (acpi_size )sizeof (*in_args); input.pointer = in_args; -if (out_data !=NULL ) { +if (out_data) { output.length =ACPI_ALLOCATE_BUFFER ; output.pointer =NULL ; status =wmi_evaluate_method (WMAX_CONTROL_GUID ,0 , command, &input, &output); - }else +if (ACPI_SUCCESS (status)) { + obj = (union acpi_object *)output.pointer; +if (obj && obj->type ==ACPI_TYPE_INTEGER ) + *out_data = (u32 )obj->integer.value; + } +kfree (output.pointer); + }else { status =wmi_evaluate_method (WMAX_CONTROL_GUID ,0 , command, &input,NULL ); - -if (ACPI_SUCCESS (status) && out_data !=NULL ) { - obj = (union acpi_object *)output.pointer; -if (obj && obj->type ==ACPI_TYPE_INTEGER ) - *out_data = (u32 ) obj->integer.value; } -kfree (output.pointer);return status; - }/*
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 319/671 KVM: PPC: Book3S HV: Fix lockdep warning when entering the guest
In reply to Sasha LevinFrom: Alexey Kardashevskiy <[email protected]>
[ Upstream commit 3309bec85e60d60d6394802cb8e183a4f4a72def ]
The trace_hardirqs_on() sets current->hardirqs_enabled and from here the lockdep assumes interrupts are enabled although they are remain disabled until the context switches to the guest. Consequent srcu_read_lock() checks the flags in rcu_lock_acquire(), observes disabled interrupts and prints a warning (see below).
This moves trace_hardirqs_on/off closer to __kvmppc_vcore_entry to prevent lockdep from being confused.
DEBUG_LOCKS_WARN_ON(current->hardirqs_enabled)
WARNING: CPU: 16 PID: 8038 at kernel/locking/lockdep.c:4128 check_flags.part.25+0x224/0x280 [...] NIP [c000000000185b84] check_flags.part.25+0x224/0x280 LR [c000000000185b80] check_flags.part.25+0x220/0x280 Call Trace: [c000003fec253710] [c000000000185b80] check_flags.part.25+0x220/0x280 (unreliable) [c000003fec253780] [c000000000187ea4] lock_acquire+0x94/0x260 [c000003fec253840] [c00800001a1e9768] kvmppc_run_core+0xa60/0x1ab0 [kvm_hv] [c000003fec253a10] [c00800001a1ed944] kvmppc_vcpu_run_hv+0x73c/0xec0 [kvm_hv] [c000003fec253ae0] [c00800001a1095dc] kvmppc_vcpu_run+0x34/0x48 [kvm] [c000003fec253b00] [c00800001a1056bc] kvm_arch_vcpu_ioctl_run+0x2f4/0x400 [kvm] [c000003fec253b90] [c00800001a0f3618] kvm_vcpu_ioctl+0x460/0x850 [kvm] [c000003fec253d00] [c00000000041c4f4] do_vfs_ioctl+0xe4/0x930 [c000003fec253db0] [c00000000041ce04] ksys_ioctl+0xc4/0x110 [c000003fec253e00] [c00000000041ce78] sys_ioctl+0x28/0x80 [c000003fec253e20] [c00000000000b5a4] system_call+0x5c/0x70 Instruction dump: 419e0034 3d220004 39291730 81290000 2f890000 409e0020 3c82ffc6 3c62ffc5 3884be70 386329c0 4bf6ea71 60000000 <0fe00000> 3c62ffc6 3863be90 4801273d irq event stamp: 1025 hardirqs last enabled at (1025): [<c00800001a1e9728>] kvmppc_run_core+0xa20/0x1ab0 [kvm_hv] hardirqs last disabled at (1024): [<c00800001a1e9358>] kvmppc_run_core+0x650/0x1ab0 [kvm_hv] softirqs last enabled at (0): [<c0000000000f1210>] copy_process.isra.4.part.5+0x5f0/0x1d00 softirqs last disabled at (0): [<0000000000000000>] (null) ---[ end trace 31180adcc848993e ]--- possible reason: unannotated irqs-off. irq event stamp: 1025 hardirqs last enabled at (1025): [<c00800001a1e9728>] kvmppc_run_core+0xa20/0x1ab0 [kvm_hv] hardirqs last disabled at (1024): [<c00800001a1e9358>] kvmppc_run_core+0x650/0x1ab0 [kvm_hv] softirqs last enabled at (0): [<c0000000000f1210>] copy_process.isra.4.part.5+0x5f0/0x1d00 softirqs last disabled at (0): [<0000000000000000>] (null)
--- arch/powerpc/kvm/book3s_hv.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
arch/powerpc/kvm/book3s_hv.c +8 -7
@@ -2993,25 +2993,26 @@ static noinline void kvmppc_run_core(struct kvmppc_vcore *vc) } } -/* -* Interrupts will be enabled once we get into the guest, -* so tell lockdep that we're about to enable interrupts. -*/ -trace_hardirqs_on (); -guest_enter_irqoff (); srcu_idx =srcu_read_lock (&vc->kvm->srcu);this_cpu_disable_ftrace (); +/* +* Interrupts will be enabled once we get into the guest, +* so tell lockdep that we're about to enable interrupts. +*/ +trace_hardirqs_on (); + trap =__kvmppc_vcore_entry (); +trace_hardirqs_off (); +this_cpu_enable_ftrace ();srcu_read_unlock (&vc->kvm->srcu, srcu_idx); -trace_hardirqs_off ();set_irq_happened (trap);spin_lock (&vc->lock);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 334/671 dmaengine: tegra210-adma: restore channel status
In reply to Sasha LevinFrom: Sameer Pujar <[email protected]>
[ Upstream commit f33e7bb3eb922618612a90f0a828c790e8880773 ]
Status of ADMA channel registers is not saved and restored during system suspend. During active playback if system enters suspend, this results in wrong state of channel registers during system resume and playback fails to resume properly. Fix this by saving following channel registers in runtime suspend and restore during runtime resume.
* ADMA_CH_LOWER_SRC_ADDR
* ADMA_CH_LOWER_TRG_ADDR
* ADMA_CH_FIFO_CTRL
* ADMA_CH_CONFIG
* ADMA_CH_CTRL
* ADMA_CH_CMD
* ADMA_CH_TC
Runtime PM calls will be inovked during system resume path if a playback or capture needs to be resumed. Hence above changes work fine for system suspend case.
--- drivers/dma/tegra210-adma.c | 46 ++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-)
drivers/dma/tegra210-adma.c +45 -1
@@ -98,6 +98,7 @@ struct tegra_adma_chan_regs {unsigned int src_addr;unsigned int trg_addr;unsigned int fifo_ctrl; +unsigned int cmd;unsigned int tc; };
@@ -127,6 +128,7 @@ struct tegra_adma_chan {enum dma_transfer_direction sreq_dir;unsigned int sreq_index;bool sreq_reserved; +struct tegra_adma_chan_regs ch_regs;/* Transfer count and position info */ unsigned int tx_buf_count;
@@ -635,8 +637,30 @@ static struct dma_chan *tegra_dma_of_xlate(struct of_phandle_args *dma_spec,static int tegra_adma_runtime_suspend (struct device *dev) {struct tegra_adma *tdma =dev_get_drvdata (dev); +struct tegra_adma_chan_regs *ch_reg; +struct tegra_adma_chan *tdc; +int i; tdma->global_cmd =tdma_read (tdma,ADMA_GLOBAL_CMD ); +if (!tdma->global_cmd) + goto clk_disable; + +for (i =0 ; i < tdma->nr_channels; i++) { + tdc = &tdma->channels[i]; + ch_reg = &tdc->ch_regs; + ch_reg->cmd =tdma_ch_read (tdc,ADMA_CH_CMD ); +/* skip if channel is not active */ +if (!ch_reg->cmd) +continue ; + ch_reg->tc =tdma_ch_read (tdc,ADMA_CH_TC ); + ch_reg->src_addr =tdma_ch_read (tdc,ADMA_CH_LOWER_SRC_ADDR ); + ch_reg->trg_addr =tdma_ch_read (tdc,ADMA_CH_LOWER_TRG_ADDR ); + ch_reg->ctrl =tdma_ch_read (tdc,ADMA_CH_CTRL ); + ch_reg->fifo_ctrl =tdma_ch_read (tdc,ADMA_CH_FIFO_CTRL ); + ch_reg->config =tdma_ch_read (tdc,ADMA_CH_CONFIG ); + } + +clk_disable:clk_disable_unprepare (tdma->ahub_clk);return 0 ;
@@ -645,7 +669,9 @@ static int tegra_adma_runtime_suspend(struct device *dev)static int tegra_adma_runtime_resume (struct device *dev) {struct tegra_adma *tdma =dev_get_drvdata (dev); -int ret; +struct tegra_adma_chan_regs *ch_reg; +struct tegra_adma_chan *tdc; +int ret, i; ret =clk_prepare_enable (tdma->ahub_clk);if (ret) {
@@ -654,6 +680,24 @@ static int tegra_adma_runtime_resume(struct device *dev) }tdma_write (tdma,ADMA_GLOBAL_CMD , tdma->global_cmd); +if (!tdma->global_cmd) +return 0 ; + +for (i =0 ; i < tdma->nr_channels; i++) { + tdc = &tdma->channels[i]; + ch_reg = &tdc->ch_regs; +/* skip if channel was not active earlier */ +if (!ch_reg->cmd) +continue ; +tdma_ch_write (tdc,ADMA_CH_TC , ch_reg->tc); +tdma_ch_write (tdc,ADMA_CH_LOWER_SRC_ADDR , ch_reg->src_addr); +tdma_ch_write (tdc,ADMA_CH_LOWER_TRG_ADDR , ch_reg->trg_addr); +tdma_ch_write (tdc,ADMA_CH_CTRL , ch_reg->ctrl); +tdma_ch_write (tdc,ADMA_CH_FIFO_CTRL , ch_reg->fifo_ctrl); +tdma_ch_write (tdc,ADMA_CH_CONFIG , ch_reg->config); +tdma_ch_write (tdc,ADMA_CH_CMD , ch_reg->cmd); + } +return 0 ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 347/671 platform/x86: alienware-wmi: printing the wrong error code
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit 6d1f8b3d75419a8659ac916a1e9543bb3513a882 ]
The "out_data" variable is uninitialized at the point. Originally, this used to print "status" instead and that seems like the correct thing to print.
--- drivers/platform/x86/alienware-wmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/platform/x86/alienware-wmi.c +1 -1
@@ -587,7 +587,7 @@ static ssize_t show_hdmi_source(struct device *dev,return scnprintf (buf,PAGE_SIZE ,"input [gpu] unknown\n" ); } -pr_err ("alienware-wmi: unknown HDMI source status: %d\n" , out_data); +pr_err ("alienware-wmi: unknown HDMI source status: %u\n" , status);return scnprintf (buf,PAGE_SIZE ,"input gpu [unknown]\n" ); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 349/671 netfilter: ebtables: CONFIG_COMPAT: reject trailing data after last rule
In reply to Sasha LevinFrom: Florian Westphal <[email protected]>
[ Upstream commit 680f6af5337c98d116e4f127cea7845339dba8da ]
If userspace provides a rule blob with trailing data after last target, we trigger a splat, then convert ruleset to 64bit format (with trailing data), then pass that to do_replace_finish() which then returns -EINVAL.
Erroring out right away avoids the splat plus unneeded translation and error unwind.
--- net/bridge/netfilter/ebtables.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/bridge/netfilter/ebtables.c +3 -1
@@ -2165,7 +2165,9 @@ static int compat_copy_entries(unsigned char *data, unsigned int size_user,if (ret <0 )return ret; -WARN_ON (size_remaining); +if (size_remaining) +return -EINVAL ; +return state->buf_kern_offset; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 350/671 pwm: meson: Consider 128 a valid pre-divider
In reply to Sasha LevinFrom: Martin Blumenstingl <[email protected]>
[ Upstream commit 51496e4446875726d50a5617a6e0e0dabbc2e6da ]
The pre-divider allows configuring longer PWM periods compared to using the input clock directly. The pre-divider is 7 bit wide, meaning it's maximum value is 128 (the register value is off-by-one: 0x7f or 127).
Change the loop to also allow for the maximum possible value to be considered valid.
--- drivers/pwm/pwm-meson.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pwm/pwm-meson.c +2 -2
@@ -188,7 +188,7 @@ static int meson_pwm_calc(struct meson_pwm *meson,do_div (fin_ps, fin_freq);/* Calc pre_div with the period */ -for (pre_div =0 ; pre_div <MISC_CLK_DIV_MASK ; pre_div++) { +for (pre_div =0 ; pre_div <=MISC_CLK_DIV_MASK ; pre_div++) { cnt =DIV_ROUND_CLOSEST_ULL ((u64 )period *1000 , fin_ps * (pre_div +1 )); dev_dbg(meson->chip.dev, "fin_ps=%llu pre_div=%u cnt=%u\n",
@@ -197,7 +197,7 @@ static int meson_pwm_calc(struct meson_pwm *meson,break ; } -if (pre_div ==MISC_CLK_DIV_MASK ) { +if (pre_div >MISC_CLK_DIV_MASK ) {dev_err (meson->chip.dev,"unable to get period pre_div\n" );return -EINVAL ; }
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 351/671 pwm: meson: Don't disable PWM when setting duty repeatedly
In reply to Sasha LevinFrom: Bichao Zheng <[email protected]>
[ Upstream commit a279345807e1e0ae79567a52cfdd9d30c9174a3c ]
There is an abnormally low about 20ms,when setting duty repeatedly. Because setting the duty will disable PWM and then enable. Delete this operation now.
--- drivers/pwm/pwm-meson.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/pwm/pwm-meson.c +0 -5
@@ -325,11 +325,6 @@ static int meson_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,if (state->period != channel->state.period || state->duty_cycle != channel->state.duty_cycle || state->polarity != channel->state.polarity) { -if (channel->state.enabled) { -meson_pwm_disable (meson, pwm->hwpwm); - channel->state.enabled = false; - } -if (state->polarity != channel->state.polarity) {if (state->polarity ==PWM_POLARITY_NORMAL ) meson->inverter_mask |=BIT (pwm->hwpwm);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 356/671 backlight: lm3630a: Return 0 on success in update_status functions
In reply to Sasha LevinFrom: Brian Masney <[email protected]>
[ Upstream commit d3f48ec0954c6aac736ab21c34a35d7554409112 ]
lm3630a_bank_a_update_status() and lm3630a_bank_b_update_status() both return the brightness value if the brightness was successfully updated. Writing to these attributes via sysfs would cause a 'Bad address' error to be returned. These functions should return 0 on success, so let's change it to correct that error.
--- drivers/video/backlight/lm3630a_bl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/video/backlight/lm3630a_bl.c +2 -2
@@ -201,7 +201,7 @@ static int lm3630a_bank_a_update_status(struct backlight_device *bl) LM3630A_LEDA_ENABLE, LM3630A_LEDA_ENABLE);if (ret <0 ) goto out_i2c_err; -return bl->props.brightness; +return 0 ; out_i2c_err:dev_err (pchip->dev,"i2c failed to access\n" );
@@ -278,7 +278,7 @@ static int lm3630a_bank_b_update_status(struct backlight_device *bl) LM3630A_LEDB_ENABLE, LM3630A_LEDB_ENABLE);if (ret <0 ) goto out_i2c_err; -return bl->props.brightness; +return 0 ; out_i2c_err:dev_err (pchip->dev,"i2c failed to access REG_CTRL\n" );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 367/671 dmaengine: tegra210-adma: Fix crash during probe
In reply to Sasha LevinFrom: Jon Hunter <[email protected]>
[ Upstream commit b53611fb1ce9b1786bd18205473e0c1d6bfa8934 ]
Commit f33e7bb3eb92 ("dmaengine: tegra210-adma: restore channel status") added support to save and restore the DMA channel registers when runtime suspending the ADMA. This change is causing the kernel to crash when probing the ADMA, if the device is probed deferred when looking up the channel interrupts. The crash occurs because not all of the channel base addresses have been setup at this point and in the clean-up path of the probe, pm_runtime_suspend() is called invoking its callback which expects all the channel base addresses to be initialised.
Although this could be fixed by simply checking for a NULL address, on further review of the driver it seems more appropriate that we only call pm_runtime_get_sync() after all the channel interrupts and base addresses have been configured. Therefore, fix this crash by moving the calls to pm_runtime_enable(), pm_runtime_get_sync() and tegra_adma_init() after the DMA channels have been initialised.
--- drivers/dma/tegra210-adma.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
drivers/dma/tegra210-adma.c +13 -13
@@ -744,16 +744,6 @@ static int tegra_adma_probe(struct platform_device *pdev)return PTR_ERR (tdma->ahub_clk); } -pm_runtime_enable (&pdev->dev); - - ret =pm_runtime_get_sync (&pdev->dev); -if (ret <0 ) - goto rpm_disable; - - ret =tegra_adma_init (tdma); -if (ret) - goto rpm_put; -INIT_LIST_HEAD (&tdma->dma_dev.channels);for (i =0 ; i < tdma->nr_channels; i++) {struct tegra_adma_chan *tdc = &tdma->channels[i];
@@ -771,6 +761,16 @@ static int tegra_adma_probe(struct platform_device *pdev) tdc->tdma = tdma; } +pm_runtime_enable (&pdev->dev); + + ret =pm_runtime_get_sync (&pdev->dev); +if (ret <0 ) + goto rpm_disable; + + ret =tegra_adma_init (tdma); +if (ret) + goto rpm_put; +dma_cap_set (DMA_SLAVE , tdma->dma_dev.cap_mask);dma_cap_set (DMA_PRIVATE , tdma->dma_dev.cap_mask);dma_cap_set (DMA_CYCLIC , tdma->dma_dev.cap_mask);
@@ -812,13 +812,13 @@ static int tegra_adma_probe(struct platform_device *pdev) dma_remove:dma_async_device_unregister (&tdma->dma_dev); -irq_dispose: -while (--i >=0 ) -irq_dispose_mapping (tdma->channels[i].irq); rpm_put:pm_runtime_put_sync (&pdev->dev); rpm_disable:pm_runtime_disable (&pdev->dev); +irq_dispose: +while (--i >=0 ) +irq_dispose_mapping (tdma->channels[i].irq);return ret; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 370/671 spi: spi-fsl-spi: call spi_finalize_current_message() at the end
In reply to Sasha LevinFrom: Christophe Leroy <[email protected]>
[ Upstream commit 44a042182cb1e9f7916e015c836967bf638b33c4 ]
spi_finalize_current_message() shall be called once all actions are finished, otherwise the last actions might step over a newly started transfer.
--- drivers/spi/spi-fsl-spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/spi-fsl-spi.c +1 -1
@@ -407,7 +407,6 @@ static int fsl_spi_do_one_msg(struct spi_master *master, } m->status = status; -spi_finalize_current_message (master);if (status || !cs_change) {ndelay (nsecs);
@@ -415,6 +414,7 @@ static int fsl_spi_do_one_msg(struct spi_master *master, }fsl_spi_setup_transfer (spi,NULL ); +spi_finalize_current_message (master);return 0 ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 422/671 net/af_iucv: build proper skbs for HiperTransport
In reply to Sasha LevinFrom: Julian Wiedmann <[email protected]>
[ Upstream commit 238965b71b968dc5b3c0fe430e946f488322c4b5 ]
The HiperSockets-based transport path in af_iucv is still too closely entangled with qeth.
With commit a647a02512ca ("s390/qeth: speed-up L3 IQD xmit"), the relevant xmit code in qeth has begun to use skb_cow_head(). So to avoid unnecessary skb head expansions, af_iucv must learn to
1) respect dev->needed_headroom when allocating skbs, and
2) drop the header reference before cloning the skb.
While at it, also stop hard-coding the LL-header creation stage and just use the appropriate helper.
--- net/iucv/af_iucv.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
net/iucv/af_iucv.c +11 -2
@@ -13,6 +13,7 @@#define pr_fmt (fmt) KMSG_COMPONENT ": " fmt#include <linux/module.h> +#include <linux/netdevice.h> #include <linux/types.h> #include <linux/list.h> #include <linux/errno.h>
@@ -355,6 +356,9 @@ static int afiucv_hs_send(struct iucv_message *imsg, struct sock *sock, err = -ENODEV ; goto err_free; } + +dev_hard_header (skb, skb->dev,ETH_P_AF_IUCV ,NULL ,NULL , skb->len); +if (!(skb->dev->flags &IFF_UP ) || !netif_carrier_ok (skb->dev)) { err = -ENETDOWN ; goto err_free;
@@ -367,6 +371,8 @@ static int afiucv_hs_send(struct iucv_message *imsg, struct sock *sock,skb_trim (skb, skb->dev->mtu); } skb->protocol =cpu_to_be16 (ETH_P_AF_IUCV ); + +__skb_header_release (skb); nskb =skb_clone (skb,GFP_ATOMIC );if (!nskb) { err = -ENOMEM ;
@@ -466,12 +472,14 @@ static void iucv_sever_path(struct sock *sk, int with_user_data)/* Send controlling flags through an IUCV socket for HIPER transport */ static int iucv_send_ctrl (struct sock *sk,u8 flags) { +struct iucv_sock *iucv =iucv_sk (sk);int err =0 ;int blen;struct sk_buff *skb;u8 shutdown =0 ; - blen =sizeof (struct af_iucv_trans_hdr ) +ETH_HLEN ; + blen =sizeof (struct af_iucv_trans_hdr ) + +LL_RESERVED_SPACE (iucv->hs_dev);if (sk->sk_shutdown &SEND_SHUTDOWN ) {/* controlling flags should be sent anyway */ shutdown = sk->sk_shutdown;
@@ -1131,7 +1139,8 @@ static int iucv_sock_sendmsg(struct socket *sock, struct msghdr *msg,* segmented records using the MSG_EOR flag), but * for SOCK_STREAM we might want to improve it in future */ if (iucv->transport ==AF_IUCV_TRANS_HIPER ) { - headroom =sizeof (struct af_iucv_trans_hdr ) +ETH_HLEN ; + headroom =sizeof (struct af_iucv_trans_hdr ) + +LL_RESERVED_SPACE (iucv->hs_dev); linear = len; }else {if (len <PAGE_SIZE ) {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 438/671 backlight: pwm_bl: Fix heuristic to determine number of brightness levels
In reply to Sasha LevinFrom: Matthias Kaehlcke <[email protected]>
[ Upstream commit 73fbfc499448455f1e1c77717040e09e25f1d976 ]
With commit 88ba95bedb79 ("backlight: pwm_bl: Compute brightness of LED linearly to human eye") the number of set bits (aka hweight()) in the PWM period is used in the heuristic to determine the number of brightness levels, when the brightness table isn't specified in the DT. The number of set bits doesn't provide a reliable clue about the length of the period, instead change the heuristic to:
nlevels = period / fls(period)
Also limit the maximum number of brightness levels to 4096 to avoid excessively large tables.
With this the number of levels increases monotonically with the PWM period, until the maximum of 4096 levels is reached:
period (ns) # levels
100 16
500 62
1000 111
5000 416
10000 769
50000 3333
100000 4096
--- drivers/video/backlight/pwm_bl.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-)
drivers/video/backlight/pwm_bl.c +5 -18
@@ -199,29 +199,17 @@ int pwm_backlight_brightness_default(struct device *dev, struct platform_pwm_backlight_data *data, unsigned int period) { -unsigned int counter =0 ; -unsigned int i, n; +unsigned int i;u64 retval;/* -* Count the number of bits needed to represent the period number. The -* number of bits is used to calculate the number of levels used for the -* brightness-levels table, the purpose of this calculation is have a -* pre-computed table with enough levels to get linear brightness -* perception. The period is divided by the number of bits so for a -* 8-bit PWM we have 255 / 8 = 32 brightness levels or for a 16-bit PWM -* we have 65535 / 16 = 4096 brightness levels. -* -* Note that this method is based on empirical testing on different -* devices with PWM of 8 and 16 bits of resolution. +* Once we have 4096 levels there's little point going much higher... +* neither interactive sliders nor animation benefits from having +* more values in the table. */ - n = period; -while (n) { - counter += n %2 ; - n >>=1 ; - } + data->max_brightness +min ((int )DIV_ROUND_UP (period,fls (period)),4096 ); - data->max_brightness =DIV_ROUND_UP (period, counter); data->levels =devm_kcalloc (dev, data->max_brightness,sizeof (*data->levels),GFP_KERNEL );if (!data->levels)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 484/671 spi: bcm-qspi: Fix BSPI QUAD and DUAL mode support when using flex mode
In reply to Sasha LevinFrom: Rayagonda Kokatanur <[email protected]>
[ Upstream commit 79629d0f7ce5b38515c1716911a0181f01b91102 ]
Fix data transfer width settings based on DT field 'spi-rx-bus-width' to configure BSPI in single, dual or quad mode by using data width and not the command width.
--- drivers/spi/spi-bcm-qspi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/spi/spi-bcm-qspi.c +2 -2
@@ -354,7 +354,7 @@ static int bcm_qspi_bspi_set_flex_mode(struct bcm_qspi *qspi, {int bpc =0 , bpp =0 ;u8 command = op->cmd.opcode; -int width = op->cmd.buswidth ? op->cmd.buswidth :SPI_NBITS_SINGLE ; +int width = op->data.buswidth ? op->data.buswidth :SPI_NBITS_SINGLE ;int addrlen = op->addr.nbytes;int flex_mode =1 ;
@@ -992,7 +992,7 @@ static int bcm_qspi_exec_mem_op(struct spi_mem *mem,if (mspi_read)return bcm_qspi_mspi_exec_mem_op (spi, op); - ret =bcm_qspi_bspi_set_mode (qspi, op,-1 ); + ret =bcm_qspi_bspi_set_mode (qspi, op,0 );if (!ret) ret =bcm_qspi_bspi_exec_mem_op (spi, op);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 504/671 i40e: reduce stack usage in i40e_set_fc
In reply to Sasha LevinFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 33b165684ab70867d4545643f550a5d48d3ddc57 ]
The functions i40e_aq_get_phy_abilities_resp() and i40e_set_fc() both have giant structure on the stack, which makes each one use stack frames larger than 500 bytes.
As clang decides one function into the other, we get a warning for exceeding the frame size limit on 32-bit architectures:
drivers/net/ethernet/intel/i40e/i40e_common.c:1654:23: error: stack frame size of 1116 bytes in function 'i40e_set_fc' [-Werror,-Wframe-larger-than=]
When building with gcc, the inlining does not happen, but i40e_set_fc() calls i40e_aq_get_phy_abilities_resp() anyway, so they add up on the kernel stack just as much.
The parts that actually use large stacks don't overlap, so make sure each one is a separate function, and mark them as noinline_for_stack to prevent the compilers from combining them again.
--- drivers/net/ethernet/intel/i40e/i40e_common.c | 91 +++++++++++-------- 1 file changed, 51 insertions(+), 40 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_common.c +51 -40
@@ -1668,25 +1668,15 @@ enum i40e_status_code i40e_aq_set_phy_config(struct i40e_hw *hw,return status; } -/** -* i40e_set_fc -* @hw: pointer to the hw struct -* @aq_failures: buffer to return AdminQ failure information -* @atomic_restart: whether to enable atomic link restart -* -* Set the requested flow control mode using set_phy_config. -**/ -enum i40e_status_code i40e_set_fc (struct i40e_hw *hw,u8 *aq_failures, -bool atomic_restart) +static noinline_for_stack enum i40e_status_code +i40e_set_fc_status (struct i40e_hw *hw, +struct i40e_aq_get_phy_abilities_resp *abilities, +bool atomic_restart) { -enum i40e_fc_mode fc_mode = hw->fc.requested_mode; -struct i40e_aq_get_phy_abilities_resp abilities;struct i40e_aq_set_phy_config config; -enum i40e_status_code status; +enum i40e_fc_mode fc_mode = hw->fc.requested_mode;u8 pause_mask =0x0 ; - *aq_failures =0x0 ; -switch (fc_mode) {case I40E_FC_FULL : pause_mask |=I40E_AQ_PHY_FLAG_PAUSE_TX ;
@@ -1702,6 +1692,48 @@ enum i40e_status_code i40e_set_fc(struct i40e_hw *hw, u8 *aq_failures,break ; } +memset (&config,0 ,sizeof (struct i40e_aq_set_phy_config )); +/* clear the old pause settings */ + config.abilities = abilities->abilities & ~(I40E_AQ_PHY_FLAG_PAUSE_TX ) & + ~(I40E_AQ_PHY_FLAG_PAUSE_RX ); +/* set the new abilities */ + config.abilities |= pause_mask; +/* If the abilities have changed, then set the new config */ +if (config.abilities == abilities->abilities) +return 0 ; + +/* Auto restart link so settings take effect */ +if (atomic_restart) + config.abilities |=I40E_AQ_PHY_ENABLE_ATOMIC_LINK ; +/* Copy over all the old settings */ + config.phy_type = abilities->phy_type; + config.phy_type_ext = abilities->phy_type_ext; + config.link_speed = abilities->link_speed; + config.eee_capability = abilities->eee_capability; + config.eeer = abilities->eeer_val; + config.low_power_ctrl = abilities->d3_lpan; + config.fec_config = abilities->fec_cfg_curr_mod_ext_info & +I40E_AQ_PHY_FEC_CONFIG_MASK ; + +return i40e_aq_set_phy_config (hw, &config,NULL ); +} + +/** +* i40e_set_fc +* @hw: pointer to the hw struct +* @aq_failures: buffer to return AdminQ failure information +* @atomic_restart: whether to enable atomic link restart +* +* Set the requested flow control mode using set_phy_config. +**/ +enum i40e_status_code i40e_set_fc (struct i40e_hw *hw,u8 *aq_failures, +bool atomic_restart) +{ +struct i40e_aq_get_phy_abilities_resp abilities; +enum i40e_status_code status; + + *aq_failures =0x0 ; +/* Get the current phy config */ status =i40e_aq_get_phy_capabilities (hw, false, false, &abilities,NULL );
@@ -1710,31 +1742,10 @@ enum i40e_status_code i40e_set_fc(struct i40e_hw *hw, u8 *aq_failures,return status; } -memset (&config,0 ,sizeof (struct i40e_aq_set_phy_config )); -/* clear the old pause settings */ - config.abilities = abilities.abilities & ~(I40E_AQ_PHY_FLAG_PAUSE_TX ) & - ~(I40E_AQ_PHY_FLAG_PAUSE_RX ); -/* set the new abilities */ - config.abilities |= pause_mask; -/* If the abilities have changed, then set the new config */ -if (config.abilities != abilities.abilities) { -/* Auto restart link so settings take effect */ -if (atomic_restart) - config.abilities |=I40E_AQ_PHY_ENABLE_ATOMIC_LINK ; -/* Copy over all the old settings */ - config.phy_type = abilities.phy_type; - config.phy_type_ext = abilities.phy_type_ext; - config.link_speed = abilities.link_speed; - config.eee_capability = abilities.eee_capability; - config.eeer = abilities.eeer_val; - config.low_power_ctrl = abilities.d3_lpan; - config.fec_config = abilities.fec_cfg_curr_mod_ext_info & -I40E_AQ_PHY_FEC_CONFIG_MASK ; - status =i40e_aq_set_phy_config (hw, &config,NULL ); + status =i40e_set_fc_status (hw, &abilities, atomic_restart); +if (status) + *aq_failures |=I40E_SET_FC_AQ_FAIL_SET ; -if (status) - *aq_failures |=I40E_SET_FC_AQ_FAIL_SET ; - }/* Update the link info */ status =i40e_update_link_info (hw);if (status) {
@@ -2563,7 +2574,7 @@ i40e_status i40e_get_link_status(struct i40e_hw *hw, bool *link_up)* i40e_updatelink_status - update status of the HW network link * @hw: pointer to the hw struct **/ -i40e_status i40e_update_link_info (struct i40e_hw *hw) +noinline_for_stack i40e_status i40e_update_link_info(struct i40e_hw *hw) {struct i40e_aq_get_phy_abilities_resp abilities;i40e_status status =0 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 522/671 bcache: Fix an error code in bch_dump_read()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit d66c9920c0cf984cf99cab5036fd5f3a1b7fba46 ]
The copy_to_user() function returns the number of bytes remaining to be copied, but the intention here was to return -EFAULT if the copy fails.
--- drivers/md/bcache/debug.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/md/bcache/debug.c +2 -3
@@ -178,10 +178,9 @@ static ssize_t bch_dump_read(struct file *file, char __user *buf,while (size) {struct keybuf_key *w;unsigned int bytes =min (i->bytes, size); -int err =copy_to_user (buf, i->buf, bytes); -if (err) -return err; +if (copy_to_user (buf, i->buf, bytes)) +return -EFAULT ; ret += bytes; buf += bytes;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 528/671 ARM: dts: aspeed-g5: Fixe gpio-ranges upper limit
In reply to Sasha LevinFrom: Oscar A Perez <[email protected]>
[ Upstream commit 89b97c429e2e77d695b5133572ca12ec256a4ea4 ]
According to the AST2500/AST2520 specs, these SoCs support up to 228 GPIO pins. However, 'gpio-ranges' value in 'aspeed-g5.dtsi' file is currently setting the upper limit to 220 which isn't allowing access to all their GPIOs. The correct upper limit value is 232 (actual number is 228 plus a 4-GPIO hole in GPIOAB). Without this patch, GPIOs AC5 and AC6 do not work correctly on a AST2500 BMC running Linux Kernel v4.19
--- arch/arm/boot/dts/aspeed-g5.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/aspeed-g5.dtsi +1 -1
@@ -247,7 +247,7 @@ compatible = "aspeed,ast2500-gpio"; reg = <0x1e780000 0x1000>; interrupts = <20>; - gpio-ranges = <&pinctrl 0 0 220>; + gpio-ranges = <&pinctrl 0 0 232>; clocks = <&syscon ASPEED_CLK_APB>; interrupt-controller; };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 535/671 ARM: dts: logicpd-som-lv: Fix i2c2 and i2c3 Pin mux
In reply to Sasha LevinFrom: Adam Ford <[email protected]>
[ Upstream commit a932b77b4d1939ad173f18be87da409427fb705c ]
When the pinmux configuration was added, it was accidentally placed into the omap3_pmx_wkup node when it should have been placed into the omap3_pmx_core. This error was accidentally propagated to stable by me when I blindly requested the pull after seeing I2C issues without actually reviewing the content of the pinout. Since the bootloader previously muxed these correctly in the past, was a hidden error.
This patch moves the i2c2_pins and i2c3_pins to the correct node which should eliminate i2c bus errors and timeouts due to the fact the bootloader uses the save device tree that no longer properly assigns these pins.
for LogicPD SOM-LV") #4.9+
--- arch/arm/boot/dts/logicpd-som-lv.dtsi | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-)
arch/arm/boot/dts/logicpd-som-lv.dtsi +14 -12
@@ -232,6 +232,20 @@ >; }; + i2c2_pins: pinmux_i2c2_pins { + pinctrl-single,pins = < + OMAP3_CORE1_IOPAD(0x21be, PIN_INPUT | MUX_MODE0) /* i2c2_scl */ + OMAP3_CORE1_IOPAD(0x21c0, PIN_INPUT | MUX_MODE0) /* i2c2_sda */ + >; + }; + + i2c3_pins: pinmux_i2c3_pins { + pinctrl-single,pins = < + OMAP3_CORE1_IOPAD(0x21c2, PIN_INPUT | MUX_MODE0) /* i2c3_scl */ + OMAP3_CORE1_IOPAD(0x21c4, PIN_INPUT | MUX_MODE0) /* i2c3_sda */ + >; + }; + tsc2004_pins: pinmux_tsc2004_pins { pinctrl-single,pins = < OMAP3_CORE1_IOPAD(0x2186, PIN_INPUT | MUX_MODE4) /* mcbsp4_dr.gpio_153 */
@@ -253,18 +267,6 @@ OMAP3_WKUP_IOPAD(0x2a0c, PIN_OUTPUT | MUX_MODE4) /* sys_boot1.gpio_3 */ >; }; - i2c2_pins: pinmux_i2c2_pins { - pinctrl-single,pins = < - OMAP3_CORE1_IOPAD(0x21be, PIN_INPUT | MUX_MODE0) /* i2c2_scl */ - OMAP3_CORE1_IOPAD(0x21c0, PIN_INPUT | MUX_MODE0) /* i2c2_sda */ - >; - }; - i2c3_pins: pinmux_i2c3_pins { - pinctrl-single,pins = < - OMAP3_CORE1_IOPAD(0x21c2, PIN_INPUT | MUX_MODE0) /* i2c3_scl */ - OMAP3_CORE1_IOPAD(0x21c4, PIN_INPUT | MUX_MODE0) /* i2c3_sda */ - >; - }; }; &omap3_pmx_core2 {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 543/671 ixgbe: sync the first fragment unconditionally
In reply to Sasha LevinFrom: Firo Yang <[email protected]>
[ Upstream commit e7ba676c6188d394a0133fc4b9bcd7ee50d54b7f ]
In Xen environment, if Xen-swiotlb is enabled, ixgbe driver could possibly allocate a page, DMA memory buffer, for the first fragment which is not suitable for Xen-swiotlb to do DMA operations. Xen-swiotlb have to internally allocate another page for doing DMA operations. This mechanism requires syncing the data from the internal page to the page which ixgbe sends to upper network stack. However, since commit f3213d932173 ("ixgbe: Update driver to make use of DMA attributes in Rx path"), the unmap operation is performed with DMA_ATTR_SKIP_CPU_SYNC. As a result, the sync is not performed. Since the sync isn't performed, the upper network stack could receive a incomplete network packet. By incomplete, it means the linear data on the first fragment(between skb->head and skb->end) is invalid. So we have to copy the data from the internal xen-swiotlb page to the page which ixgbe sends to upper network stack through the sync operation.
More details from Alexander Duyck:
Specifically since we are mapping the frame with DMA_ATTR_SKIP_CPU_SYNC we have to unmap with that as well. As a result a sync is not performed on an unmap and must be done manually as we skipped it for the first frag. As such we need to always sync before possibly performing a page unmap operation.
--- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +9 -7
@@ -1822,13 +1822,7 @@ static void ixgbe_pull_tail(struct ixgbe_ring *rx_ring,static void ixgbe_dma_sync_frag (struct ixgbe_ring *rx_ring,struct sk_buff *skb) { -/* if the page was released unmap it, else just sync our portion */ -if (unlikely (IXGBE_CB (skb)->page_released)) { -dma_unmap_page_attrs (rx_ring->dev,IXGBE_CB (skb)->dma, -ixgbe_rx_pg_size (rx_ring), -DMA_FROM_DEVICE , -IXGBE_RX_DMA_ATTR ); - }else if (ring_uses_build_skb (rx_ring)) { +if (ring_uses_build_skb (rx_ring)) {unsigned long offset = (unsigned long )(skb->data) & ~PAGE_MASK ; dma_sync_single_range_for_cpu(rx_ring->dev,
@@ -1845,6 +1839,14 @@ static void ixgbe_dma_sync_frag(struct ixgbe_ring *rx_ring,skb_frag_size (frag), DMA_FROM_DEVICE); } + +/* If the page was released, just unmap it. */ +if (unlikely (IXGBE_CB (skb)->page_released)) { +dma_unmap_page_attrs (rx_ring->dev,IXGBE_CB (skb)->dma, +ixgbe_rx_pg_size (rx_ring), +DMA_FROM_DEVICE , +IXGBE_RX_DMA_ATTR ); + } }/**
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 547/671 gpio/aspeed: Fix incorrect number of banks
In reply to Sasha LevinFrom: Rashmica Gupta <[email protected]>
[ Upstream commit 3c4710ae6f883f9c6e3df5e27e274702a1221c57 ]
The current calculation for the number of GPIO banks is only correct if the number of GPIOs is a multiple of 32 (if there were 31 GPIOs we would currently say there are 0 banks, which is incorrect).
--- drivers/gpio/gpio-aspeed.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpio/gpio-aspeed.c +1 -1
@@ -1199,7 +1199,7 @@ static int __init aspeed_gpio_probe(struct platform_device *pdev) gpio->chip.irq.need_valid_mask = true;/* Allocate a cache of the output registers */ - banks = gpio->config->nr_gpios >>5 ; + banks =DIV_ROUND_UP (gpio->config->nr_gpios,32 ); gpio->dcache =devm_kcalloc (&pdev->dev, banks,sizeof (u32),GFP_KERNEL );if (!gpio->dcache)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 552/671 um: Fix off by one error in IRQ enumeration
In reply to Sasha LevinFrom: Anton Ivanov <[email protected]>
[ Upstream commit 09ccf0364ca3e94aba4093707ef433ea8014e2a4 ]
Fix an off-by-one in IRQ enumeration
Reported by: Dana Johnson <[email protected]>
--- arch/um/include/asm/irq.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/um/include/asm/irq.h +1 -1
@@ -23,7 +23,7 @@#define VECTOR_BASE_IRQ 15#define VECTOR_IRQ_SPACE 8 -#define LAST_IRQ (VECTOR_IRQ_SPACE + VECTOR_BASE_IRQ) +#define LAST_IRQ (VECTOR_IRQ_SPACE + VECTOR_BASE_IRQ - 1)#else
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 585/671 sctp: add chunks to sk_backlog when the newsk sk_socket is not set
In reply to Sasha LevinFrom: Xin Long <[email protected]>
[ Upstream commit 819be8108fded0b9e710bbbf81193e52f7bab2f7 ]
This patch is to fix a NULL-ptr deref in selinux_socket_connect_helper:
[...] kasan: GPF could be caused by NULL-ptr deref or user memory access [...] RIP: 0010:selinux_socket_connect_helper+0x94/0x460 [...] Call Trace:
[...] selinux_sctp_bind_connect+0x16a/0x1d0 [...] security_sctp_bind_connect+0x58/0x90 [...] sctp_process_asconf+0xa52/0xfd0 [sctp] [...] sctp_sf_do_asconf+0x785/0x980 [sctp] [...] sctp_do_sm+0x175/0x5a0 [sctp] [...] sctp_assoc_bh_rcv+0x285/0x5b0 [sctp] [...] sctp_backlog_rcv+0x482/0x910 [sctp] [...] __release_sock+0x11e/0x310 [...] release_sock+0x4f/0x180 [...] sctp_accept+0x3f9/0x5a0 [sctp] [...] inet_accept+0xe7/0x720
It was caused by that the 'newsk' sk_socket was not set before going to security sctp hook when processing asconf chunk with SCTP_PARAM_ADD_IP or SCTP_PARAM_SET_PRIMARY:
inet_accept()->
sctp_accept():
lock_sock():
lock listening 'sk'
do_softirq():
sctp_rcv(): <-- [1]
asconf chunk arrives and
enqueued in 'sk' backlog
sctp_sock_migrate():
set asoc's sk to 'newsk'
release_sock():
sctp_backlog_rcv():
lock 'newsk'
sctp_process_asconf() <-- [2]
unlock 'newsk'
sock_graft():
set sk_socket <-- [3]As it shows, at [1] the asconf chunk would be put into the listening 'sk' backlog, as accept() was holding its sock lock. Then at [2] asconf would get processed with 'newsk' as asoc's sk had been set to 'newsk'. However, 'newsk' sk_socket is not set until [3], while selinux_sctp_bind_connect() would deref it, then kernel crashed.
Here to fix it by adding the chunk to sk_backlog until newsk sk_socket is set when .accept() is done.
Note that sk->sk_socket can be NULL when the sock is closed, so SOCK_DEAD flag is also needed to check in sctp_newsk_ready().
Thanks to Ondrej for reviewing the code.
--- include/net/sctp/sctp.h | 5 +++++ net/sctp/input.c | 12 +++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-)
include/net/sctp/sctp.h +5 -0
@@ -625,4 +625,9 @@ static inline __u32 sctp_min_frag_point(struct sctp_sock *sp, __u16 datasize) return sctp_mtu_payload(sp, SCTP_DEFAULT_MINSEGMENT, datasize); } +static inline bool sctp_newsk_ready (const struct sock *sk) +{ +return sock_flag (sk,SOCK_DEAD ) || sk->sk_socket; +} +#endif /* __net_sctp_h__ */
net/sctp/input.c +9 -3
@@ -255,7 +255,7 @@ int sctp_rcv(struct sk_buff *skb)bh_lock_sock (sk); } -if (sock_owned_by_user (sk)) { +if (sock_owned_by_user (sk) || !sctp_newsk_ready (sk)) {if (sctp_add_backlog (sk, skb)) {bh_unlock_sock (sk);sctp_chunk_free (chunk);
@@ -333,7 +333,7 @@ int sctp_backlog_rcv(struct sock *sk, struct sk_buff *skb)local_bh_disable ();bh_lock_sock (sk); -if (sock_owned_by_user (sk)) { +if (sock_owned_by_user (sk) || !sctp_newsk_ready (sk)) {if (sk_add_backlog (sk, skb, sk->sk_rcvbuf))sctp_chunk_free (chunk);else
@@ -348,7 +348,13 @@ int sctp_backlog_rcv(struct sock *sk, struct sk_buff *skb)if (backloged)return 0 ; }else { -sctp_inq_push (inqueue, chunk); +if (!sctp_newsk_ready (sk)) { +if (!sk_add_backlog (sk, skb, sk->sk_rcvbuf)) +return 0 ; +sctp_chunk_free (chunk); + }else { +sctp_inq_push (inqueue, chunk); + } } done:
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 596/671 vhost/test: stop device before reset
In reply to Sasha LevinFrom: "Michael S. Tsirkin" <[email protected]>
[ Upstream commit 245cdd9fbd396483d501db83047116e2530f245f ]
When device stop was moved out of reset, test device wasn't updated to stop before reset, this resulted in a use after free. Fix by invoking stop appropriately.
--- drivers/vhost/test.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/vhost/test.c +2 -0
@@ -162,6 +162,7 @@ static int vhost_test_release(struct inode *inode, struct file *f)vhost_test_stop (n, &private);vhost_test_flush (n); +vhost_dev_stop (&n->dev);vhost_dev_cleanup (&n->dev);/* We do an extra flush before freeing memory, * since jobs can re-queue themselves. */
@@ -238,6 +239,7 @@ static long vhost_test_reset_owner(struct vhost_test *n) }vhost_test_stop (n, &priv);vhost_test_flush (n); +vhost_dev_stop (&n->dev);vhost_dev_reset_owner (&n->dev, umem); done:mutex_unlock (&n->dev.mutex);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 617/671 hwrng: omap3-rom - Fix missing clock by probing with device tree
In reply to Sasha LevinFrom: Tony Lindgren <[email protected]>
[ Upstream commit 0c0ef9ea6f3f0d5979dc7b094b0a184c1a94716b ]
Commit 0ed266d7ae5e ("clk: ti: omap3: cleanup unnecessary clock aliases") removed old omap3 clock framework aliases but caused omap3-rom-rng to stop working with clock not found error.
Based on discussions on the mailing list it was requested by Tero Kristo that it would be best to fix this issue by probing omap3-rom-rng using device tree to provide a proper clk property. The other option would be to add back the missing clock alias, but that does not help moving things forward with removing old legacy platform_data.
Let's also add a proper device tree binding and keep it together with the fix.
--- .../devicetree/bindings/rng/omap3_rom_rng.txt | 27 +++++++++++++++++++ arch/arm/boot/dts/omap3-n900.dts | 6 +++++ arch/arm/mach-omap2/pdata-quirks.c | 12 +-------- drivers/char/hw_random/omap3-rom-rng.c | 17 ++++++++++-- 4 files changed, 49 insertions(+), 13 deletions(-) create mode 100644 Documentation/devicetree/bindings/rng/omap3_rom_rng.txt
Documentation/devicetree/bindings/rng/omap3_rom_rng.txt new file +27 -0
@@ -0,0 +1,27 @@ +OMAP ROM RNG driver binding + +Secure SoCs may provide RNG via secure ROM calls like Nokia N900 does. The +implementation can depend on the SoC secure ROM used. + +- compatible: + Usage: required + Value type: <string> + Definition: must be "nokia,n900-rom-rng" + +- clocks: + Usage: required + Value type: <prop-encoded-array> + Definition: reference to the the RNG interface clock + +- clock-names: + Usage: required + Value type: <stringlist> + Definition: must be "ick" + +Example: + + rom_rng: rng { + compatible = "nokia,n900-rom-rng"; + clocks = <&rng_ick>; + clock-names = "ick"; + };
arch/arm/boot/dts/omap3-n900.dts +6 -0
@@ -158,6 +158,12 @@ pwms = <&pwm9 0 26316 0>; /* 38000 Hz */ }; + rom_rng: rng { + compatible = "nokia,n900-rom-rng"; + clocks = <&rng_ick>; + clock-names = "ick"; + }; + /* controlled (enabled/disabled) directly by bcm2048 and wl1251 */ vctcxo: vctcxo { compatible = "fixed-clock";
arch/arm/mach-omap2/pdata-quirks.c +1 -11
@@ -263,14 +263,6 @@ static void __init am3517_evm_legacy_init(void)am35xx_emac_reset (); } -static struct platform_device omap3_rom_rng_device = { - .name ="omap3-rom-rng" , - .id =-1 , - .dev = { - .platform_data = rx51_secure_rng_call, - }, -}; -static void __init nokia_n900_legacy_init (void ) {hsmmc2_internal_input_clk ();
@@ -286,9 +278,6 @@ static void __init nokia_n900_legacy_init(void)pr_warn ("RX-51: Not enabling ARM errata 430973 workaround\n" );pr_warn ("Thumb binaries may crash randomly without this workaround\n" ); } - -pr_info ("RX-51: Registering OMAP3 HWRNG device\n" ); -platform_device_register (&omap3_rom_rng_device); } }
@@ -466,6 +455,7 @@ static struct of_dev_auxdata omap_auxdata_lookup[] = {OF_DEV_AUXDATA ("ti,davinci_mdio" ,0x5c030000 ,"davinci_mdio.0" ,NULL ),OF_DEV_AUXDATA ("ti,am3517-emac" ,0x5c000000 ,"davinci_emac.0" , &am35xx_emac_pdata), +OF_DEV_AUXDATA ("nokia,n900-rom-rng" ,0 ,NULL , rx51_secure_rng_call),/* McBSP modules with sidetone core */ #if IS_ENABLED(CONFIG_SND_OMAP_SOC_MCBSP) OF_DEV_AUXDATA("ti,omap3-mcbsp", 0x49022000, "49022000.mcbsp", &mcbsp_pdata),
drivers/char/hw_random/omap3-rom-rng.c +15 -2
@@ -20,6 +20,8 @@#include <linux/workqueue.h> #include <linux/clk.h> #include <linux/err.h> +#include <linux/of.h> +#include <linux/of_device.h> #include <linux/platform_device.h> #define RNG_RESET 0x01
@@ -86,14 +88,18 @@ static int omap3_rom_rng_read(struct hwrng *rng, void *data, size_t max, bool w)static struct hwrng omap3_rom_rng_ops = { .name ="omap3-rom" , - .read = omap3_rom_rng_read, };static int omap3_rom_rng_probe (struct platform_device *pdev) {int ret =0 ; -pr_info ("initializing\n" ); + omap3_rom_rng_ops.read =of_device_get_match_data (&pdev->dev); +if (!omap3_rom_rng_ops.read) { +dev_err (&pdev->dev,"missing rom code handler\n" ); + +return -ENODEV ; + } omap3_rom_rng_call = pdev->dev.platform_data;if (!omap3_rom_rng_call) {
@@ -126,9 +132,16 @@ static int omap3_rom_rng_remove(struct platform_device *pdev)return 0 ; } +static const struct of_device_id omap_rom_rng_match[] = { + { .compatible ="nokia,n900-rom-rng" , .data = omap3_rom_rng_read, }, + {/* sentinel */ }, +}; +MODULE_DEVICE_TABLE (of, omap_rom_rng_match); +static struct platform_driver omap3_rom_rng_driver = { .driver = { .name ="omap3-rom-rng" , + .of_match_table = omap_rom_rng_match, }, .probe = omap3_rom_rng_probe, .remove = omap3_rom_rng_remove,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 623/671 spi: atmel: fix handling of cs_change set on non-last xfer
In reply to Sasha LevinFrom: Mans Rullgard <[email protected]>
[ Upstream commit fed8d8c7a6dc2a76d7764842853d81c770b0788e ]
The driver does the wrong thing when cs_change is set on a non-last xfer in a message. When cs_change is set, the driver deactivates the CS and leaves it off until a later xfer again has cs_change set whereas it should be briefly toggling CS off and on again.
This patch brings the behaviour of the driver back in line with the documentation and common sense. The delay of 10 us is the same as is used by the default spi_transfer_one_message() function in spi.c.
--- drivers/spi/spi-atmel.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/spi/spi-atmel.c +3 -7
@@ -305,7 +305,6 @@ struct atmel_spi {bool use_cs_gpios;bool keep_cs; -bool cs_active;u32 fifo_size; };
@@ -1381,11 +1380,9 @@ static int atmel_spi_one_transfer(struct spi_master *master, &msg->transfers)) { as->keep_cs = true; }else { - as->cs_active = !as->cs_active; -if (as->cs_active) -cs_activate (as, msg->spi); -else -cs_deactivate (as, msg->spi); +cs_deactivate (as, msg->spi); +udelay (10 ); +cs_activate (as, msg->spi); } }
@@ -1408,7 +1405,6 @@ static int atmel_spi_transfer_one_message(struct spi_master *master,atmel_spi_lock (as);cs_activate (as, spi); - as->cs_active = true; as->keep_cs = false; msg->status =0 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 654/671 scsi: target: core: Fix a pr_debug() argument
In reply to Sasha LevinFrom: Bart Van Assche <[email protected]>
[ Upstream commit c941e0d172605731de9b4628bd4146d35cf2e7d6 ]
Print the string for which conversion failed instead of printing the function name twice.
--- drivers/target/target_core_fabric_lib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/target/target_core_fabric_lib.c +1 -1
@@ -131,7 +131,7 @@ static int srp_get_pr_transport_id(memset (buf +8 ,0 , leading_zero_bytes); rc =hex2bin (buf +8 + leading_zero_bytes, p, count);if (rc <0 ) { -pr_debug ("hex2bin failed for %s: %d\n" , __func__, rc); +pr_debug ("hex2bin failed for %s: %d\n" , p, rc);return rc; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 667/671 soc: aspeed: Fix snoop_file_poll()'s return type
In reply to Sasha LevinFrom: Luc Van Oostenryck <[email protected]>
[ Upstream commit a4e55ccd4392e70f296d12e81b93c6ca96ee21d5 ]
snoop_file_poll() is defined as returning 'unsigned int' but the .poll method is declared as returning '__poll_t', a bitwise type.
Fix this by using the proper return type and using the EPOLL constants instead of the POLL ones, as required for __poll_t.
--- drivers/misc/aspeed-lpc-snoop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/misc/aspeed-lpc-snoop.c +2 -2
@@ -101,13 +101,13 @@ static ssize_t snoop_file_read(struct file *file, char __user *buffer,return ret ? ret : copied; } -static unsigned int snoop_file_poll (struct file *file, +static __poll_t snoop_file_poll (struct file *file,struct poll_table_struct *pt) {struct aspeed_lpc_snoop_channel *chan =snoop_file_to_chan (file);poll_wait (file, &chan->wq, pt); -return !kfifo_is_empty (&chan->fifo) ?POLLIN :0 ; +return !kfifo_is_empty (&chan->fifo) ?EPOLLIN :0 ; }static const struct file_operations snoop_fops = {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 265/671 media: tw5864: Fix possible NULL pointer dereference in tw5864_handle_frame
In reply to Sasha LevinFrom: YueHaibing <[email protected]>
[ Upstream commit 2e7682ebfc750177a4944eeb56e97a3f05734528 ]
'vb' null check should be done before dereferencing it in tw5864_handle_frame, otherwise a NULL pointer dereference may occur.
--- drivers/media/pci/tw5864/tw5864-video.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/pci/tw5864/tw5864-video.c +2 -2
@@ -1395,13 +1395,13 @@ static void tw5864_handle_frame(struct tw5864_h264_frame *frame) input->vb =NULL ;spin_unlock_irqrestore (&input->slock, flags); - v4l2_buf =to_vb2_v4l2_buffer (&vb->vb.vb2_buf); -if (!vb) {/* Gone because of disabling */ dev_dbg (&dev->pci->dev,"vb is empty, dropping frame\n" );return ; } + v4l2_buf =to_vb2_v4l2_buffer (&vb->vb.vb2_buf); +/* * Check for space. * Mind the overhead of startcode emulation prevention.
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 275/671 drm/fb-helper: generic: Call drm_client_add() after setup is done
In reply to Sasha LevinFrom: Noralf Trønnes <[email protected]>
[ Upstream commit 6e3f17ee73f7e3c2ef0e2c8fd8624b2ece8ef2c9 ]
Hotplug can happen while drm_fbdev_generic_setup() is running so move drm_client_add() call after setup is done to avoid drm_fbdev_client_hotplug() running in two threads at the same time.
--- drivers/gpu/drm/drm_fb_helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/drm_fb_helper.c +2 -2
@@ -3257,8 +3257,6 @@ int drm_fbdev_generic_setup(struct drm_device *dev, unsigned int preferred_bpp)return ret; } -drm_client_add (&fb_helper->client); -if (!preferred_bpp) preferred_bpp = dev->mode_config.preferred_depth;if (!preferred_bpp)
@@ -3267,6 +3265,8 @@ int drm_fbdev_generic_setup(struct drm_device *dev, unsigned int preferred_bpp)drm_fbdev_client_hotplug (&fb_helper->client); +drm_client_add (&fb_helper->client); +return 0 ; }EXPORT_SYMBOL (drm_fbdev_generic_setup);
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 273/671 soc/fsl/qe: Fix an error code in qe_pin_request()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit 5674a92ca4b7e5a6a19231edd10298d30324cd27 ]
We forgot to set "err" on this error path.
--- drivers/soc/fsl/qe/gpio.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/soc/fsl/qe/gpio.c +3 -1
@@ -179,8 +179,10 @@ struct qe_pin *qe_pin_request(struct device_node *np, int index)if (err <0 ) goto err0; gc =gpio_to_chip (err); -if (WARN_ON (!gc)) +if (WARN_ON (!gc)) { + err = -ENODEV ; goto err0; + }if (!of_device_is_compatible (gc->of_node,"fsl,mpc8323-qe-pario-bank" )) {pr_debug ("%s: tried to get a non-qe pin\n" , __func__);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 276/671 arm64/vdso: don't leak kernel addresses
In reply to Sasha LevinFrom: Matteo Croce <[email protected]>
[ Upstream commit 0f1bf7e39822476b2f921435cf990f67a61f5f92 ]
Since commit ad67b74d2469d9b8 ("printk: hash addresses printed with %p"), two obfuscated kernel pointer are printed at every boot:
vdso: 2 pages (1 code @ (____ptrval____), 1 data @ (____ptrval____))
Remove the the print completely, as it's useless without the addresses.
--- arch/arm64/kernel/vdso.c | 2 -- 1 file changed, 2 deletions(-)
arch/arm64/kernel/vdso.c +0 -2
@@ -146,8 +146,6 @@ static int __init vdso_init(void) } vdso_pages = (vdso_end - vdso_start) >>PAGE_SHIFT ; -pr_info ("vdso: %ld pages (%ld code @ %p, %ld data @ %p)\n" , - vdso_pages +1 , vdso_pages, vdso_start,1L , vdso_data);/* Allocate the vDSO pagelist, plus a page for the data. */ vdso_pagelist = kcalloc(vdso_pages + 1, sizeof(struct page *),
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 278/671 rtc: mt6397: Don't call irq_dispose_mapping.
In reply to Sasha LevinFrom: Pi-Hsun Shih <[email protected]>
[ Upstream commit 24db953e942bd7a983e97892bdaddf69d00b1199 ]
The IRQ mapping was changed to not being created in the rtc-mt6397 driver, so the irq_dispose_mapping is no longer needed. Also the dev_id passed to free_irq should be the same as the last argument passed to request_threaded_irq.
This prevents a "Trying to free already-free IRQ 274" warning when unbinding the driver.
--- drivers/rtc/rtc-mt6397.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/rtc/rtc-mt6397.c +3 -6
@@ -343,7 +343,7 @@ static int mtk_rtc_probe(struct platform_device *pdev)if (ret) {dev_err (&pdev->dev,"Failed to request alarm IRQ: %d: %d\n" , rtc->irq, ret); - goto out_dispose_irq; +return ret; }device_init_wakeup (&pdev->dev,1 );
@@ -359,9 +359,7 @@ static int mtk_rtc_probe(struct platform_device *pdev)return 0 ; out_free_irq: -free_irq (rtc->irq, rtc->rtc_dev); -out_dispose_irq: -irq_dispose_mapping (rtc->irq); +free_irq (rtc->irq, rtc);return ret; }
@@ -369,8 +367,7 @@ static int mtk_rtc_remove(struct platform_device *pdev) {struct mt6397_rtc *rtc =platform_get_drvdata (pdev); -free_irq (rtc->irq, rtc->rtc_dev); -irq_dispose_mapping (rtc->irq); +free_irq (rtc->irq, rtc);return 0 ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 281/671 drm/vmwgfx: Remove set but not used variable 'restart'
In reply to Sasha LevinFrom: YueHaibing <[email protected]>
[ Upstream commit b2130cca9c8db5073b71d832da2a6c8311a8f3bb ]
Fixes gcc '-Wunused-but-set-variable' warning:
drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c: In function 'vmw_cmdbuf_work_func':drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c:514:7: warning:
variable 'restart' set but not used [-Wunused-but-set-variable]
It not used any more after commit dc366364c4ef ("drm/vmwgfx: Fix multiple command buffer context use")
--- drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c +1 -5
@@ -511,17 +511,14 @@ static void vmw_cmdbuf_work_func(struct work_struct *work) container_of(work, struct vmw_cmdbuf_man, work);struct vmw_cmdbuf_header *entry, *next;uint32_t dummy; -bool restart[SVGA_CB_CONTEXT_MAX ];bool send_fence = false;struct list_head restart_head[SVGA_CB_CONTEXT_MAX ];int i;struct vmw_cmdbuf_context *ctx;bool global_block = false; -for_each_cmdbuf_ctx (man, i, ctx) { +for_each_cmdbuf_ctx (man, i, ctx)INIT_LIST_HEAD (&restart_head[i]); - restart[i] = false; - }mutex_lock (&man->error_mutex);spin_lock (&man->lock);
@@ -533,7 +530,6 @@ static void vmw_cmdbuf_work_func(struct work_struct *work)const char *cmd_name;list_del_init (&entry->list); - restart[entry->cb_context] = true; global_block = true;if (!vmw_cmd_describe (header, &error_cmd_size, &cmd_name)) {
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 293/671 net: hns3: fix for vport->bw_limit overflow problem
In reply to Sasha LevinFrom: Yunsheng Lin <[email protected]>
[ Upstream commit 2566f10676ba996b745e138f54f3e2f974311692 ]
When setting vport->bw_limit to hdev->tm_info.pg_info[0].bw_limit in hclge_tm_vport_tc_info_update, vport->bw_limit can be as big as HCLGE_ETHER_MAX_RATE (100000), which can not fit into u16 (65535).
So this patch fixes it by using u32 for vport->bw_limit.
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h +1 -1
@@ -600,7 +600,7 @@ struct hclge_vport {u16 alloc_rss_size;u16 qs_offset; -u16 bw_limit;/* VSI BW Limit (0 = disabled) */ +u32 bw_limit;/* VSI BW Limit (0 = disabled) */ u8 dwrr;struct hclge_tx_vtag_cfg txvlan_cfg;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 290/671 brcmfmac: fix leak of mypkt on error return path
In reply to Sasha LevinFrom: Colin Ian King <[email protected]>
[ Upstream commit a927e8d8ab57e696800e20cf09a72b7dfe3bbebb ]
Currently if the call to brcmf_sdiod_set_backplane_window fails then error return path leaks mypkt. Fix this by returning by a new error path labelled 'out' that calls brcmu_pkt_buf_free_skb to free mypkt. Also remove redundant check on err before calling brcmf_sdiod_skbuff_write.
Addresses-Coverity: ("Resource Leak")
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c +3 -5
@@ -617,15 +617,13 @@ int brcmf_sdiod_send_buf(struct brcmf_sdio_dev *sdiodev, u8 *buf, uint nbytes) err =brcmf_sdiod_set_backplane_window (sdiodev, addr);if (err) -return err; + goto out; addr &=SBSDIO_SB_OFT_ADDR_MASK ; addr |=SBSDIO_SB_ACCESS_2_4B_FLAG ; -if (!err) - err =brcmf_sdiod_skbuff_write (sdiodev, sdiodev->func2, addr, - mypkt); - + err =brcmf_sdiod_skbuff_write (sdiodev, sdiodev->func2, addr, mypkt); +out:brcmu_pkt_buf_free_skb (mypkt);return err;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 291/671 ARM: pxa: ssp: Fix "WARNING: invalid free of devm_ allocated data"
In reply to Sasha LevinFrom: YueHaibing <[email protected]>
[ Upstream commit 9ee8578d953023cc57e7e736ae48502c707c0210 ]
Since commit 1c459de1e645 ("ARM: pxa: ssp: use devm_ functions") kfree, iounmap, clk_put etc are not needed anymore in remove path.
--- arch/arm/plat-pxa/ssp.c | 6 ------ 1 file changed, 6 deletions(-)
arch/arm/plat-pxa/ssp.c +0 -6
@@ -183,18 +183,12 @@ static int pxa_ssp_probe(struct platform_device *pdev)static int pxa_ssp_remove (struct platform_device *pdev) { -struct resource *res;struct ssp_device *ssp; ssp =platform_get_drvdata (pdev);if (ssp ==NULL )return -ENODEV ; - res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); -release_mem_region (res->start,resource_size (res)); - -clk_put (ssp->clk); -mutex_lock (&ssp_lock);list_del (&ssp->node);mutex_unlock (&ssp_lock);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 304/671 powerpc: vdso: Make vdso32 installation conditional in vdso_install
In reply to Sasha LevinFrom: Ben Hutchings <[email protected]>
[ Upstream commit ff6d27823f619892ab96f7461764840e0d786b15 ]
The 32-bit vDSO is not needed and not normally built for 64-bit little-endian configurations. However, the vdso_install target still builds and installs it. Add the same config condition as is normally used for the build.
--- arch/powerpc/Makefile | 2 ++ 1 file changed, 2 insertions(+)
arch/powerpc/Makefile +2 -0
@@ -412,7 +412,9 @@ vdso_install: ifdef CONFIG_PPC64 $(Q)$(MAKE) $(build)=arch/$(ARCH)/kernel/vdso64 $@ endif +ifdef CONFIG_VDSO32 $(Q)$(MAKE) $(build)=arch/$(ARCH)/kernel/vdso32 $@ +endif archclean: $(Q)$(MAKE) $(clean)=$(boot)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 300/671 tipc: set sysctl_tipc_rmem and named_timeout right range
In reply to Sasha LevinFrom: Jie Liu <[email protected]>
[ Upstream commit 4bcd4ec1017205644a2697bccbc3b5143f522f5f ]
We find that sysctl_tipc_rmem and named_timeout do not have the right minimum setting. sysctl_tipc_rmem should be larger than zero, like sysctl_tcp_rmem. And named_timeout as a timeout setting should be not less than zero.
--- net/tipc/sysctl.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
net/tipc/sysctl.c +6 -2
@@ -37,6 +37,8 @@#include <linux/sysctl.h> +static int zero; +static int one =1 ;static struct ctl_table_header *tipc_ctl_hdr;static struct ctl_table tipc_table[] = {
@@ -45,14 +47,16 @@ static struct ctl_table tipc_table[] = { .data = &sysctl_tipc_rmem, .maxlen = sizeof(sysctl_tipc_rmem), .mode = 0644, - .proc_handler = proc_dointvec, + .proc_handler = proc_dointvec_minmax, + .extra1 = &one, }, { .procname = "named_timeout", .data = &sysctl_tipc_named_timeout, .maxlen = sizeof(sysctl_tipc_named_timeout), .mode = 0644, - .proc_handler = proc_dointvec, + .proc_handler = proc_dointvec_minmax, + .extra1 = &zero, }, {} };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 314/671 s390/kexec_file: Fix potential segment overlap in ELF loader
In reply to Sasha LevinFrom: Philipp Rudo <[email protected]>
[ Upstream commit 6339a3889ad4d0dd930ed7a1e873fb81d3e690f7 ]
When loading an ELF image via kexec_file the segment alignment is ignored in the calculation for the load address of the next segment. When there are multiple segments this can lead to segment overlap and thus load failure.
--- arch/s390/kernel/kexec_elf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/s390/kernel/kexec_elf.c +1 -1
@@ -58,7 +58,7 @@ static int kexec_file_add_elf_kernel(struct kimage *image,if (ret)return ret; - data->memsz += buf.memsz; + data->memsz =ALIGN (data->memsz, phdr->p_align) + buf.memsz; }return 0 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 312/671 NFS: Don't interrupt file writeout due to fatal errors
In reply to Sasha LevinFrom: Trond Myklebust <[email protected]>
[ Upstream commit 14bebe3c90b326d2a0df78aed5e9de090c71d878 ]
When flushing out dirty pages, the fact that we may hit fatal errors is not a reason to stop writeback. Those errors are reported through fsync(), not through the flush mechanism.
--- fs/nfs/write.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/write.c +1 -1
@@ -646,7 +646,7 @@ static int nfs_page_async_flush(struct nfs_pageio_descriptor *pgio,return ret; out_launder:nfs_write_error_remove_page (req); -return ret; +return 0 ; } static int nfs_do_writepage(struct page *page, struct writeback_control *wbc,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 316/671 scsi: qla2xxx: Fix a format specifier
In reply to Sasha LevinFrom: Bart Van Assche <[email protected]>
[ Upstream commit 19ce192cd718e02f880197c0983404ca48236807 ]
Since mcmd->sess->port_name is eight bytes long, use %8phC to format that port name instead of %phC.
--- drivers/scsi/qla2xxx/qla_target.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_target.c +1 -1
@@ -2290,7 +2290,7 @@ void qlt_xmit_tm_rsp(struct qla_tgt_mgmt_cmd *mcmd) mcmd->orig_iocb.imm_ntfy.u.isp24.status_subcode == ELS_TPRLO) {ql_dbg (ql_dbg_disc, vha,0x2106 , -"TM response logo %phC status %#x state %#x" , +"TM response logo %8phC status %#x state %#x" , mcmd->sess->port_name, mcmd->fc_tm_rsp, mcmd->flags);qlt_schedule_sess_for_deletion (mcmd->sess);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 306/671 media: ov2659: fix unbalanced mutex_lock/unlock
In reply to Sasha LevinFrom: Akinobu Mita <[email protected]>
[ Upstream commit 384538bda10913e5c94ec5b5d34bd3075931bcf4 ]
Avoid returning with mutex locked.
--- drivers/media/i2c/ov2659.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/i2c/ov2659.c +1 -1
@@ -1136,7 +1136,7 @@ static int ov2659_set_fmt(struct v4l2_subdev *sd, mf =v4l2_subdev_get_try_format (sd, cfg, fmt->pad); *mf = fmt->format;#else -return -ENOTTY ; + ret = -ENOTTY ;#endif }else {s64 val;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 317/671 scsi: qla2xxx: Fix error handling in qlt_alloc_qfull_cmd()
In reply to Sasha LevinFrom: Bart Van Assche <[email protected]>
[ Upstream commit c04466c17142d5eb566984372b9a5003d1900fe3 ]
The test "if (!cmd)" is not useful because it is guaranteed that cmd != NULL. Instead of testing the cmd pointer, rely on the tag to decide whether or not command allocation failed.
--- drivers/scsi/qla2xxx/qla_target.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/scsi/qla2xxx/qla_target.c +2 -5
@@ -5334,11 +5334,7 @@ qlt_alloc_qfull_cmd(struct scsi_qla_host *vha, se_sess = sess->se_sess; tag =sbitmap_queue_get (&se_sess->sess_tag_pool, &cpu); -if (tag <0 ) -return ; - - cmd = &((struct qla_tgt_cmd *)se_sess->sess_cmd_map)[tag]; -if (!cmd) { +if (tag <0 ) {ql_dbg (ql_dbg_io, vha,0x3009 ,"qla_target(%d): %s: Allocation of cmd failed\n" , vha->vp_idx, __func__);
@@ -5353,6 +5349,7 @@ qlt_alloc_qfull_cmd(struct scsi_qla_host *vha,return ; } + cmd = &((struct qla_tgt_cmd *)se_sess->sess_cmd_map)[tag];memset (cmd,0 ,sizeof (struct qla_tgt_cmd ));qlt_incr_num_pend_cmds (vha);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 307/671 6lowpan: Off by one handling ->nexthdr
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit f57c4bbf34439531adccd7d3a4ecc14f409c1399 ]
NEXTHDR_MAX is 255. What happens here is that we take a u8 value "hdr->nexthdr" from the network and then look it up in lowpan_nexthdr_nhcs[]. The problem is that if hdr->nexthdr is 0xff then we read one element beyond the end of the array so the array needs to be one element larger.
--- net/6lowpan/nhc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/6lowpan/nhc.c +1 -1
@@ -18,7 +18,7 @@#include "nhc.h" static struct rb_root rb_root =RB_ROOT ; -static struct lowpan_nhc *lowpan_nexthdr_nhcs[NEXTHDR_MAX ]; +static struct lowpan_nhc *lowpan_nexthdr_nhcs[NEXTHDR_MAX +1 ];static DEFINE_SPINLOCK (lowpan_nhc_lock);static int lowpan_nhc_insert (struct lowpan_nhc *nhc)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 322/671 ARM: dts: logicpd-som-lv: Fix MMC1 card detect
In reply to Sasha LevinFrom: Adam Ford <[email protected]>
[ Upstream commit 6a38df676a0a06bfc7ff8607ac62ccd6d95969ad ]
The card detect pin was incorrectly using IRQ_TYPE_LEVEL_LOW instead of GPIO_ACTIVE_LOW when reading the state of the CD pin.
This was previosly fixed on Torpedo, but missed on the SOM-LV
--- arch/arm/boot/dts/logicpd-som-lv-baseboard.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/logicpd-som-lv-baseboard.dtsi +1 -1
@@ -153,7 +153,7 @@ pinctrl-names = "default"; pinctrl-0 = <&mmc1_pins>; wp-gpios = <&gpio4 30 GPIO_ACTIVE_HIGH>; /* gpio_126 */ - cd-gpios = <&gpio4 14 IRQ_TYPE_LEVEL_LOW>; /* gpio_110 */ + cd-gpios = <&gpio4 14 GPIO_ACTIVE_LOW>; /* gpio_110 */ vmmc-supply = <&vmmc1>; bus-width = <4>; cap-power-off-card;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 315/671 irqchip/gic-v3-its: fix some definitions of inner cacheability attributes
In reply to Sasha LevinFrom: Hongbo Yao <[email protected]>
[ Upstream commit 0f29456d08042134aff6e562d07a6365c841c4ad ]
Some definitions of Inner Cacheability attibutes need to be corrected.
--- include/linux/irqchip/arm-gic-v3.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
include/linux/irqchip/arm-gic-v3.h +6 -6
@@ -165,7 +165,7 @@#define GICR_PROPBASER_nCnB GIC_BASER_CACHEABILITY(GICR_PROPBASER, INNER, nCnB)#define GICR_PROPBASER_nC GIC_BASER_CACHEABILITY(GICR_PROPBASER, INNER, nC)#define GICR_PROPBASER_RaWt GIC_BASER_CACHEABILITY(GICR_PROPBASER, INNER, RaWt) -#define GICR_PROPBASER_RaWb GIC_BASER_CACHEABILITY(GICR_PROPBASER, INNER, RaWt) +#define GICR_PROPBASER_RaWb GIC_BASER_CACHEABILITY(GICR_PROPBASER, INNER, RaWb)#define GICR_PROPBASER_WaWt GIC_BASER_CACHEABILITY(GICR_PROPBASER, INNER, WaWt)#define GICR_PROPBASER_WaWb GIC_BASER_CACHEABILITY(GICR_PROPBASER, INNER, WaWb)#define GICR_PROPBASER_RaWaWt GIC_BASER_CACHEABILITY(GICR_PROPBASER, INNER, RaWaWt)
@@ -192,7 +192,7 @@#define GICR_PENDBASER_nCnB GIC_BASER_CACHEABILITY(GICR_PENDBASER, INNER, nCnB)#define GICR_PENDBASER_nC GIC_BASER_CACHEABILITY(GICR_PENDBASER, INNER, nC)#define GICR_PENDBASER_RaWt GIC_BASER_CACHEABILITY(GICR_PENDBASER, INNER, RaWt) -#define GICR_PENDBASER_RaWb GIC_BASER_CACHEABILITY(GICR_PENDBASER, INNER, RaWt) +#define GICR_PENDBASER_RaWb GIC_BASER_CACHEABILITY(GICR_PENDBASER, INNER, RaWb)#define GICR_PENDBASER_WaWt GIC_BASER_CACHEABILITY(GICR_PENDBASER, INNER, WaWt)#define GICR_PENDBASER_WaWb GIC_BASER_CACHEABILITY(GICR_PENDBASER, INNER, WaWb)#define GICR_PENDBASER_RaWaWt GIC_BASER_CACHEABILITY(GICR_PENDBASER, INNER, RaWaWt)
@@ -251,7 +251,7 @@#define GICR_VPROPBASER_nCnB GIC_BASER_CACHEABILITY(GICR_VPROPBASER, INNER, nCnB)#define GICR_VPROPBASER_nC GIC_BASER_CACHEABILITY(GICR_VPROPBASER, INNER, nC)#define GICR_VPROPBASER_RaWt GIC_BASER_CACHEABILITY(GICR_VPROPBASER, INNER, RaWt) -#define GICR_VPROPBASER_RaWb GIC_BASER_CACHEABILITY(GICR_VPROPBASER, INNER, RaWt) +#define GICR_VPROPBASER_RaWb GIC_BASER_CACHEABILITY(GICR_VPROPBASER, INNER, RaWb)#define GICR_VPROPBASER_WaWt GIC_BASER_CACHEABILITY(GICR_VPROPBASER, INNER, WaWt)#define GICR_VPROPBASER_WaWb GIC_BASER_CACHEABILITY(GICR_VPROPBASER, INNER, WaWb)#define GICR_VPROPBASER_RaWaWt GIC_BASER_CACHEABILITY(GICR_VPROPBASER, INNER, RaWaWt)
@@ -277,7 +277,7 @@#define GICR_VPENDBASER_nCnB GIC_BASER_CACHEABILITY(GICR_VPENDBASER, INNER, nCnB)#define GICR_VPENDBASER_nC GIC_BASER_CACHEABILITY(GICR_VPENDBASER, INNER, nC)#define GICR_VPENDBASER_RaWt GIC_BASER_CACHEABILITY(GICR_VPENDBASER, INNER, RaWt) -#define GICR_VPENDBASER_RaWb GIC_BASER_CACHEABILITY(GICR_VPENDBASER, INNER, RaWt) +#define GICR_VPENDBASER_RaWb GIC_BASER_CACHEABILITY(GICR_VPENDBASER, INNER, RaWb)#define GICR_VPENDBASER_WaWt GIC_BASER_CACHEABILITY(GICR_VPENDBASER, INNER, WaWt)#define GICR_VPENDBASER_WaWb GIC_BASER_CACHEABILITY(GICR_VPENDBASER, INNER, WaWb)#define GICR_VPENDBASER_RaWaWt GIC_BASER_CACHEABILITY(GICR_VPENDBASER, INNER, RaWaWt)
@@ -351,7 +351,7 @@#define GITS_CBASER_nCnB GIC_BASER_CACHEABILITY(GITS_CBASER, INNER, nCnB)#define GITS_CBASER_nC GIC_BASER_CACHEABILITY(GITS_CBASER, INNER, nC)#define GITS_CBASER_RaWt GIC_BASER_CACHEABILITY(GITS_CBASER, INNER, RaWt) -#define GITS_CBASER_RaWb GIC_BASER_CACHEABILITY(GITS_CBASER, INNER, RaWt) +#define GITS_CBASER_RaWb GIC_BASER_CACHEABILITY(GITS_CBASER, INNER, RaWb)#define GITS_CBASER_WaWt GIC_BASER_CACHEABILITY(GITS_CBASER, INNER, WaWt)#define GITS_CBASER_WaWb GIC_BASER_CACHEABILITY(GITS_CBASER, INNER, WaWb)#define GITS_CBASER_RaWaWt GIC_BASER_CACHEABILITY(GITS_CBASER, INNER, RaWaWt)
@@ -375,7 +375,7 @@#define GITS_BASER_nCnB GIC_BASER_CACHEABILITY(GITS_BASER, INNER, nCnB)#define GITS_BASER_nC GIC_BASER_CACHEABILITY(GITS_BASER, INNER, nC)#define GITS_BASER_RaWt GIC_BASER_CACHEABILITY(GITS_BASER, INNER, RaWt) -#define GITS_BASER_RaWb GIC_BASER_CACHEABILITY(GITS_BASER, INNER, RaWt) +#define GITS_BASER_RaWb GIC_BASER_CACHEABILITY(GITS_BASER, INNER, RaWb)#define GITS_BASER_WaWt GIC_BASER_CACHEABILITY(GITS_BASER, INNER, WaWt)#define GITS_BASER_WaWb GIC_BASER_CACHEABILITY(GITS_BASER, INNER, WaWb)#define GITS_BASER_RaWaWt GIC_BASER_CACHEABILITY(GITS_BASER, INNER, RaWaWt)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 325/671 usb: gadget: fsl: fix link error against usb-gadget module
In reply to Sasha LevinFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 2100e3ca3676e894fa48b8f6f01d01733387fe81 ]
The dependency to ensure this driver links correctly fails since it can not be a loadable module:
drivers/usb/phy/phy-fsl-usb.o: In function `fsl_otg_set_peripheral':
phy-fsl-usb.c:(.text+0x2224): undefined reference to `usb_gadget_vbus_disconnect'
Make the option 'tristate' so it can work correctly.
--- drivers/usb/phy/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/phy/Kconfig +1 -1
@@ -20,7 +20,7 @@ config AB8500_USB in host mode, low speed. config FSL_USB2_OTG - bool "Freescale USB OTG Transceiver Driver" + tristate "Freescale USB OTG Transceiver Driver" depends on USB_EHCI_FSL && USB_FSL_USB2 && USB_OTG_FSM=y && PM depends on USB_GADGET || !USB_GADGET # if USB_GADGET=m, this can't be 'y' select USB_PHY
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 327/671 IB/mlx5: Add missing XRC options to QP optional params mask
In reply to Sasha LevinFrom: Jack Morgenstein <[email protected]>
[ Upstream commit 8f4426aa19fcdb9326ac44154a117b1a3a5ae126 ]
The QP transition optional parameters for the various transition for XRC QPs are identical to those for RC QPs.
Many of the XRC QP transition optional parameter bits are missing from the QP optional mask table. These omissions caused failures when doing XRC QP state transitions.
For example, when trying to change the response timer of an XRC receive QP via the RTS2RTS transition, the new timer value was ignored because MLX5_QP_OPTPAR_RNR_TIMEOUT bit was missing from the optional params mask for XRC qps for the RTS2RTS transition.
Fix this by adding the missing XRC optional parameters for all QP transitions to the opt_mask table.
--- drivers/infiniband/hw/mlx5/qp.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
drivers/infiniband/hw/mlx5/qp.c +21 -0
@@ -2598,6 +2598,11 @@ static enum mlx5_qp_optpar opt_mask[MLX5_QP_NUM_STATE][MLX5_QP_NUM_STATE][MLX5_Q [MLX5_QP_ST_UD ] =MLX5_QP_OPTPAR_PKEY_INDEX |MLX5_QP_OPTPAR_Q_KEY | MLX5_QP_OPTPAR_PRI_PORT, + [MLX5_QP_ST_XRC ] =MLX5_QP_OPTPAR_RRE | +MLX5_QP_OPTPAR_RAE | +MLX5_QP_OPTPAR_RWE | +MLX5_QP_OPTPAR_PKEY_INDEX | +MLX5_QP_OPTPAR_PRI_PORT , }, [MLX5_QP_STATE_RTR] = { [MLX5_QP_ST_RC] = MLX5_QP_OPTPAR_ALT_ADDR_PATH |
@@ -2631,6 +2636,12 @@ static enum mlx5_qp_optpar opt_mask[MLX5_QP_NUM_STATE][MLX5_QP_NUM_STATE][MLX5_QMLX5_QP_OPTPAR_RWE | MLX5_QP_OPTPAR_PM_STATE, [MLX5_QP_ST_UD] = MLX5_QP_OPTPAR_Q_KEY, + [MLX5_QP_ST_XRC ] =MLX5_QP_OPTPAR_ALT_ADDR_PATH | +MLX5_QP_OPTPAR_RRE | +MLX5_QP_OPTPAR_RAE | +MLX5_QP_OPTPAR_RWE | +MLX5_QP_OPTPAR_PM_STATE | + MLX5_QP_OPTPAR_RNR_TIMEOUT, }, }, [MLX5_QP_STATE_RTS] = {
@@ -2647,6 +2658,12 @@ static enum mlx5_qp_optpar opt_mask[MLX5_QP_NUM_STATE][MLX5_QP_NUM_STATE][MLX5_Q [MLX5_QP_ST_UD ] =MLX5_QP_OPTPAR_Q_KEY |MLX5_QP_OPTPAR_SRQN | MLX5_QP_OPTPAR_CQN_RCV, + [MLX5_QP_ST_XRC ] =MLX5_QP_OPTPAR_RRE | +MLX5_QP_OPTPAR_RAE | +MLX5_QP_OPTPAR_RWE | +MLX5_QP_OPTPAR_RNR_TIMEOUT | +MLX5_QP_OPTPAR_PM_STATE | + MLX5_QP_OPTPAR_ALT_ADDR_PATH, }, }, [MLX5_QP_STATE_SQER] = {
@@ -2658,6 +2675,10 @@ static enum mlx5_qp_optpar opt_mask[MLX5_QP_NUM_STATE][MLX5_QP_NUM_STATE][MLX5_QMLX5_QP_OPTPAR_RWE |MLX5_QP_OPTPAR_RAE | MLX5_QP_OPTPAR_RRE, + [MLX5_QP_ST_XRC ] =MLX5_QP_OPTPAR_RNR_TIMEOUT | +MLX5_QP_OPTPAR_RWE | +MLX5_QP_OPTPAR_RAE | + MLX5_QP_OPTPAR_RRE, }, }, };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 321/671 PCI: iproc: Enable iProc config read for PAXBv2
In reply to Sasha LevinFrom: Srinath Mannam <[email protected]>
[ Upstream commit 8cff995405eb0b563e7a0d2c49838611ea3f2692 ]
iProc config read flag has to be enabled for PAXBv2 instead of PAXB.
--- drivers/pci/controller/pcie-iproc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/controller/pcie-iproc.c +1 -1
@@ -1347,7 +1347,6 @@ static int iproc_pcie_rev_init(struct iproc_pcie *pcie)break ;case IPROC_PCIE_PAXB : regs = iproc_pcie_reg_paxb; - pcie->iproc_cfg_read = true; pcie->has_apb_err_disable = true;if (pcie->need_ob_cfg) { pcie->ob_map = paxb_ob_map;
@@ -1356,6 +1355,7 @@ static int iproc_pcie_rev_init(struct iproc_pcie *pcie)break ;case IPROC_PCIE_PAXB_V2 : regs = iproc_pcie_reg_paxb_v2; + pcie->iproc_cfg_read = true; pcie->has_apb_err_disable = true;if (pcie->need_ob_cfg) { pcie->ob_map = paxb_v2_ob_map;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 329/671 iommu/vt-d: Make kernel parameter igfx_off work with vIOMMU
In reply to Sasha LevinFrom: Lu Baolu <[email protected]>
[ Upstream commit 5daab58043ee2bca861068e2595564828f3bc663 ]
The kernel parameter igfx_off is used by users to disable DMA remapping for the Intel integrated graphic device. It was designed for bare metal cases where a dedicated IOMMU is used for graphic. This doesn't apply to virtual IOMMU case where an include-all IOMMU is used. This makes the kernel parameter work with virtual IOMMU as well.
--- drivers/iommu/intel-iommu.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/iommu/intel-iommu.c +4 -1
@@ -3387,9 +3387,12 @@ static int __init init_dmars(void) iommu_identity_mapping |=IDENTMAP_ALL ;#ifdef CONFIG_INTEL_IOMMU_BROKEN_GFX_WA - iommu_identity_mapping |=IDENTMAP_GFX ; + dmar_map_gfx =0 ;#endif +if (!dmar_map_gfx) + iommu_identity_mapping |=IDENTMAP_GFX ; +check_tylersburg_isoch ();if (iommu_identity_mapping) {
Signature · 6 lines
2.20.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Sasha Levin
maintainerPATCH 338/671 ath10k: Fix encoding for protected management frames
In reply to Sasha LevinFrom: Rakesh Pillai <[email protected]>
[ Upstream commit 42f1bc43e6a97b9ddbe976eba9bd05306c990c75 ]
Currently the protected management frames are
not appended with the MIC_LEN which results in
the protected management frames being encoded
incorrectly.
Add the extra space at the end of the protected
management frames to fix this encoding error for
the protected management frames.
Tested HW: WCN3990
Tested FW: WLAN.HL.3.1-00784-QCAHLSWMTPLZ-1
--- drivers/net/wireless/ath/ath10k/wmi-tlv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath10k/wmi-tlv.c +3 -1
@@ -2692,8 +2692,10 @@ ath10k_wmi_tlv_op_gen_mgmt_tx_send(struct ath10k *ar, struct sk_buff *msdu,if ((ieee80211_is_action (hdr->frame_control) ||ieee80211_is_deauth (hdr->frame_control) ||ieee80211_is_disassoc (hdr->frame_control)) && -ieee80211_has_protected (hdr->frame_control)) +ieee80211_has_protected (hdr->frame_control)) { +skb_put (msdu,IEEE80211_CCMP_MIC_LEN ); buf_len +=IEEE80211_CCMP_MIC_LEN ; + } buf_len =min_t (u32, buf_len,WMI_TLV_MGMT_TX_FRAME_MAX_LEN ); buf_len =round_up (buf_len,4 );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 333/671 net: ena: fix ena_com_fill_hash_function() implementation
In reply to Sasha LevinFrom: Sameeh Jubran <[email protected]>
[ Upstream commit 11bd7a00c0d8ffe33d1e926f8e789b4aea787186 ]
ena_com_fill_hash_function() didn't configure the rss->hash_func.
--- drivers/net/ethernet/amazon/ena/ena_com.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/amazon/ena/ena_com.c +1 -0
@@ -2093,6 +2093,7 @@ int ena_com_fill_hash_function(struct ena_com_dev *ena_dev,return -EINVAL ; } + rss->hash_func = func; rc =ena_com_set_hash_function (ena_dev);/* Restore the old function */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 342/671 vfio/mdev: Fix aborting mdev child device removal if one fails
In reply to Sasha LevinFrom: Parav Pandit <[email protected]>
[ Upstream commit 6093e348a5e2475c5bb2e571346460f939998670 ]
device_for_each_child() stops executing callback function for remaining child devices, if callback hits an error.
Each child mdev device is independent of each other.
While unregistering parent device, mdev core must remove all child mdev devices.
Therefore, mdev_device_remove_cb() always returns success so that device_for_each_child doesn't abort if one child removal hits error.
While at it, improve remove and unregister functions for below simplicity.
There isn't need to pass forced flag pointer during mdev parent removal which invokes mdev_device_remove(). So simplify the flow.
mdev_device_remove() is called from two paths.
1. mdev_unregister_driver()
mdev_device_remove_cb()
mdev_device_remove()
2. remove_store()
mdev_device_remove()
--- drivers/vfio/mdev/mdev_core.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/vfio/mdev/mdev_core.c +4 -6
@@ -150,10 +150,10 @@ static int mdev_device_remove_ops(struct mdev_device *mdev, bool force_remove)static int mdev_device_remove_cb (struct device *dev,void *data) { -if (!dev_is_mdev (dev)) -return 0 ; +if (dev_is_mdev (dev)) +mdev_device_remove (dev, true); -return mdev_device_remove (dev, data ? *(bool *)data : true); +return 0 ; }/*
@@ -241,7 +241,6 @@ EXPORT_SYMBOL(mdev_register_device);void mdev_unregister_device (struct device *dev) {struct mdev_parent *parent; -bool force_remove = true;mutex_lock (&parent_list_lock); parent =__find_parent_device (dev);
@@ -255,8 +254,7 @@ void mdev_unregister_device(struct device *dev)list_del (&parent->next);class_compat_remove_link (mdev_bus_compat_class, dev,NULL ); -device_for_each_child (dev, (void *)&force_remove, - mdev_device_remove_cb); +device_for_each_child (dev,NULL , mdev_device_remove_cb);parent_remove_sysfs_files (parent);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 346/671 media: davinci/vpbe: array underflow in vpbe_enum_outputs()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit b72845ee5577b227131b1fef23f9d9a296621d7b ]
In vpbe_enum_outputs() we check if (temp_index >= cfg->num_outputs) but the problem is that "temp_index" can be negative. This patch changes the types to unsigned to address this array underflow bug.
--- drivers/media/platform/davinci/vpbe.c | 2 +- include/media/davinci/vpbe.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/media/platform/davinci/vpbe.c +1 -1
@@ -126,7 +126,7 @@ static int vpbe_enum_outputs(struct vpbe_device *vpbe_dev, struct v4l2_output *output) {struct vpbe_config *cfg = vpbe_dev->cfg; -int temp_index = output->index; +unsigned int temp_index = output->index;if (temp_index >= cfg->num_outputs)return -EINVAL ;
include/media/davinci/vpbe.h +1 -1
@@ -92,7 +92,7 @@ struct vpbe_config {struct encoder_config_info *ext_encoders;/* amplifier information goes here */ struct amp_config_info *amp; -int num_outputs; +unsigned int num_outputs;/* Order is venc outputs followed by LCD and then external encoders */ struct vpbe_output *outputs; };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 345/671 media: omap_vout: potential buffer overflow in vidioc_dqbuf()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit dd6e2a981bfe83aa4a493143fd8cf1edcda6c091 ]
The "b->index" is a u32 the comes from the user in the ioctl. It hasn't been checked. We aren't supposed to use it but we're instead supposed to use the value that gets written to it when we call videobuf_dqbuf().
The videobuf_dqbuf() first memsets it to zero and then re-initializes it inside the videobuf_status() function. It's this final value which we want.
Hans Verkuil pointed out that we need to check the return from videobuf_dqbuf(). I ended up doing a little cleanup related to that as well.
--- drivers/media/platform/omap/omap_vout.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
drivers/media/platform/omap/omap_vout.c +6 -9
@@ -1527,23 +1527,20 @@ static int vidioc_dqbuf(struct file *file, void *fh, struct v4l2_buffer *b)unsigned long size;struct videobuf_buffer *vb; - vb = q->bufs[b->index]; -if (!vout->streaming)return -EINVAL ; -if (file->f_flags &O_NONBLOCK ) -/* Call videobuf_dqbuf for non blocking mode */ - ret =videobuf_dqbuf (q, (struct v4l2_buffer *)b,1 ); -else -/* Call videobuf_dqbuf for blocking mode */ - ret =videobuf_dqbuf (q, (struct v4l2_buffer *)b,0 ); + ret =videobuf_dqbuf (q, b, !!(file->f_flags &O_NONBLOCK )); +if (ret) +return ret; + + vb = q->bufs[b->index]; addr = (unsigned long ) vout->buf_phy_addr[vb->i]; size = (unsigned long ) vb->size;dma_unmap_single (vout->vid_dev->v4l2_dev.dev, addr, size,DMA_TO_DEVICE ); -return ret; +return 0 ; }static int vidioc_streamon (struct file *file,void *fh,enum v4l2_buf_type i)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 348/671 crypto: caam - fix caam_dump_sg that iterates through scatterlist
In reply to Sasha LevinFrom: Iuliana Prodan <[email protected]>
[ Upstream commit 8c65d35435e8cbfdf953cafe5ebe3648ee9276a2 ]
Fix caam_dump_sg by correctly determining the next scatterlist entry in the list.
--- drivers/crypto/caam/error.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/caam/error.c +1 -1
@@ -22,7 +22,7 @@ void caam_dump_sg(const char *level, const char *prefix_str, int prefix_type,size_t len;void *buf; -for (it = sg; it && tlen >0 ; it =sg_next (sg)) { +for (it = sg; it && tlen >0 ; it =sg_next (it)) {/* * make sure the scatterlist's page * has a valid virtual memory mapping
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 352/671 ARM: riscpc: fix lack of keyboard interrupts after irq conversion
In reply to Sasha LevinFrom: Russell King <[email protected]>
[ Upstream commit 63a0666bca9311f35017be454587f3ba903644b8 ]
Fix lack of keyboard interrupts for RiscPC due to incorrect conversion.
--- arch/arm/mach-rpc/irq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/mach-rpc/irq.c +2 -1
@@ -118,7 +118,7 @@ extern unsigned char rpc_default_fiq_start, rpc_default_fiq_end;void __init rpc_init_irq (void ) { -unsigned int irq, clr, set =0 ; +unsigned int irq, clr, set;iomd_writeb (0 ,IOMD_IRQMASKA );iomd_writeb (0 ,IOMD_IRQMASKB );
@@ -130,6 +130,7 @@ void __init rpc_init_irq(void)for (irq =0 ; irq <NR_IRQS ; irq++) { clr =IRQ_NOREQUEST ; + set =0 ;if (irq <=6 || (irq >=9 && irq <=15 )) clr |=IRQ_NOPROBE ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 359/671 EDAC/mc: Fix edac_mc_find() in case no device is found
In reply to Sasha LevinFrom: Robert Richter <[email protected]>
[ Upstream commit 29a0c843973bc385918158c6976e4dbe891df969 ]
The function should return NULL in case no device is found, but it always returns the last checked mc device from the list even if the index did not match. Fix that.
I did some analysis why this did not raise any issues for about 3 years and the reason is that edac_mc_find() is mostly used to search for existing devices. Thus, the bug is not triggered.
[ bp: Drop the if (mci->mc_idx > idx) test in favor of readability. ]
--- drivers/edac/edac_mc.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
drivers/edac/edac_mc.c +4 -8
@@ -681,22 +681,18 @@ static int del_mc_from_global_list(struct mem_ctl_info *mci)struct mem_ctl_info *edac_mc_find (int idx) { -struct mem_ctl_info *mci =NULL ; +struct mem_ctl_info *mci;struct list_head *item;mutex_lock (&mem_ctls_mutex);list_for_each (item, &mc_devices) { mci = list_entry(item, struct mem_ctl_info, link); - -if (mci->mc_idx >= idx) { -if (mci->mc_idx == idx) { - goto unlock; - } -break ; - } +if (mci->mc_idx == idx) + goto unlock; } + mci =NULL ; unlock:mutex_unlock (&mem_ctls_mutex);return mci;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 366/671 clk: meson: axg: spread spectrum is on mpll2
In reply to Sasha LevinFrom: Jerome Brunet <[email protected]>
[ Upstream commit dc4e62d373f881cbf51513296a6db7806516a01a ]
After testing, it appears that the SSEN bit controls the spread spectrum function on MPLL2, not MPLL0.
--- drivers/clk/meson/axg.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/clk/meson/axg.c +5 -5
@@ -461,11 +461,6 @@ static struct clk_regmap axg_mpll0_div = { .shift = 16, .width = 9, }, - .ssen = { - .reg_off = HHI_MPLL_CNTL, - .shift = 25, - .width = 1, - }, .misc = { .reg_off = HHI_PLL_TOP_MISC, .shift = 0,
@@ -560,6 +555,11 @@ static struct clk_regmap axg_mpll2_div = { .shift = 16, .width = 9, }, + .ssen = { + .reg_off = HHI_MPLL_CNTL, + .shift = 25, + .width = 1, + }, .misc = { .reg_off = HHI_PLL_TOP_MISC, .shift = 2,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 361/671 afs: Don't invalidate callback if AFS_VNODE_DIR_VALID not set
In reply to Sasha LevinFrom: David Howells <[email protected]>
[ Upstream commit d9052dda8a39069312218f913d22d99c48d90004 ]
Don't invalidate the callback promise on a directory if the AFS_VNODE_DIR_VALID flag is not set (which indicates that the directory contents are invalid, due to edit failure, callback break, page reclaim).
The directory will be reloaded next time the directory is accessed, so clearing the callback flag at this point may race with a reload of the directory and cancel it's recorded callback promise.
--- fs/afs/inode.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
fs/afs/inode.c +2 -5
@@ -398,12 +398,9 @@ int afs_validate(struct afs_vnode *vnode, struct key *key) vnode->cb_s_break = vnode->cb_interest->server->cb_s_break; vnode->cb_v_break = vnode->volume->cb_v_break; valid = false; - }else if (vnode->status.type ==AFS_FTYPE_DIR && - (!test_bit (AFS_VNODE_DIR_VALID , &vnode->flags) || - vnode->cb_expires_at -10 <= now)) { + }else if (test_bit (AFS_VNODE_ZAP_DATA , &vnode->flags)) { valid = false; - }else if (test_bit (AFS_VNODE_ZAP_DATA , &vnode->flags) || - vnode->cb_expires_at -10 <= now) { + }else if (vnode->cb_expires_at -10 <= now) { valid = false; }else { valid = true;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 363/671 afs: Fix double inc of vnode->cb_break
In reply to Sasha LevinFrom: David Howells <[email protected]>
[ Upstream commit fd711586bb7d63f257da5eff234e68c446ac35ea ]
When __afs_break_callback() clears the CB_PROMISED flag, it increments vnode->cb_break to trigger a future refetch of the status and callback - however it also calls afs_clear_permits(), which also increments vnode->cb_break.
Fix this by removing the increment from afs_clear_permits().
Whilst we're at it, fix the conditional call to afs_put_permits() as the function checks to see if the argument is NULL, so the check is redundant.
--- fs/afs/security.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
fs/afs/security.c +1 -3
@@ -87,11 +87,9 @@ void afs_clear_permits(struct afs_vnode *vnode) permits =rcu_dereference_protected (vnode->permit_cache,lockdep_is_held (&vnode->lock));RCU_INIT_POINTER (vnode->permit_cache,NULL ); - vnode->cb_break++;spin_unlock (&vnode->lock); -if (permits) -afs_put_permits (permits); +afs_put_permits (permits); }/*
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 372/671 crypto: ccp - Fix 3DES complaint from ccp-crypto module
In reply to Sasha LevinFrom: "Hook, Gary" <[email protected]>
[ Upstream commit 89646fdda4cae203185444ac7988835f36a21ee1 ]
Crypto self-tests reveal an error:
alg: skcipher: cbc-des3-ccp encryption test failed (wrong output IV) on test vector 0, cfg="in-place"
The offset value should not be recomputed when retrieving the context. Also, a code path exists which makes decisions based on older (version 3) hardware; a v3 device deosn't support 3DES so remove this check.
--- drivers/crypto/ccp/ccp-ops.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)
drivers/crypto/ccp/ccp-ops.c +4 -11
@@ -1293,6 +1293,9 @@ static int ccp_run_des3_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)int ret;/* Error checks */ +if (cmd_q->ccp->vdata->version <CCP_VERSION (5 ,0 )) +return -EINVAL ; +if (!cmd_q->ccp->vdata->perform->des3)return -EINVAL ;
@@ -1375,8 +1378,6 @@ static int ccp_run_des3_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)* passthru option to convert from big endian to little endian. */ if (des3->mode !=CCP_DES3_MODE_ECB ) { -u32 load_mode; - op.sb_ctx = cmd_q->sb_ctx; ret = ccp_init_dm_workarea(&ctx, cmd_q,
@@ -1392,12 +1393,8 @@ static int ccp_run_des3_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)if (ret) goto e_ctx; -if (cmd_q->ccp->vdata->version ==CCP_VERSION (3 ,0 )) - load_mode =CCP_PASSTHRU_BYTESWAP_NOOP ; -else - load_mode =CCP_PASSTHRU_BYTESWAP_256BIT ; ret =ccp_copy_to_sb (cmd_q, &ctx, op.jobid, op.sb_ctx, - load_mode); +CCP_PASSTHRU_BYTESWAP_256BIT );if (ret) { cmd->engine_error = cmd_q->cmd_error; goto e_ctx;
@@ -1459,10 +1456,6 @@ static int ccp_run_des3_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd) }/* ...but we only need the last DES3_EDE_BLOCK_SIZE bytes */ -if (cmd_q->ccp->vdata->version ==CCP_VERSION (3 ,0 )) - dm_offset =CCP_SB_BYTES - des3->iv_len; -else - dm_offset =0 ;ccp_get_dm_area (&ctx, dm_offset, des3->iv,0 ,DES3_EDE_BLOCK_SIZE ); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 369/671 RDMA/qedr: Fix incorrect device rate.
In reply to Sasha LevinFrom: Sagiv Ozeri <[email protected]>
[ Upstream commit 69054666df0a9b4e8331319f98b6b9a88bc3fcc4 ]
Use the correct enum value introduced in commit 12113a35ada6 ("IB/core:
Add HDR speed enum") Prior to this change a 50Gbps port would show 40Gbps.
This patch also cleaned up the redundant redefiniton of ib speeds for qedr.
--- drivers/infiniband/hw/qedr/verbs.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-)
drivers/infiniband/hw/qedr/verbs.c +9 -16
@@ -158,54 +158,47 @@ int qedr_query_device(struct ib_device *ibdev,return 0 ; } -#define QEDR_SPEED_SDR (1) -#define QEDR_SPEED_DDR (2) -#define QEDR_SPEED_QDR (4) -#define QEDR_SPEED_FDR10 (8) -#define QEDR_SPEED_FDR (16) -#define QEDR_SPEED_EDR (32) -static inline void get_link_speed_and_width (int speed,u8 *ib_speed,u8 *ib_width) {switch (speed) {case 1000 : - *ib_speed =QEDR_SPEED_SDR ; + *ib_speed =IB_SPEED_SDR ; *ib_width =IB_WIDTH_1X ;break ;case 10000 : - *ib_speed =QEDR_SPEED_QDR ; + *ib_speed =IB_SPEED_QDR ; *ib_width =IB_WIDTH_1X ;break ;case 20000 : - *ib_speed =QEDR_SPEED_DDR ; + *ib_speed =IB_SPEED_DDR ; *ib_width =IB_WIDTH_4X ;break ;case 25000 : - *ib_speed =QEDR_SPEED_EDR ; + *ib_speed =IB_SPEED_EDR ; *ib_width =IB_WIDTH_1X ;break ;case 40000 : - *ib_speed =QEDR_SPEED_QDR ; + *ib_speed =IB_SPEED_QDR ; *ib_width =IB_WIDTH_4X ;break ;case 50000 : - *ib_speed =QEDR_SPEED_QDR ; - *ib_width =IB_WIDTH_4X ; + *ib_speed =IB_SPEED_HDR ; + *ib_width =IB_WIDTH_1X ;break ;case 100000 : - *ib_speed =QEDR_SPEED_EDR ; + *ib_speed =IB_SPEED_EDR ; *ib_width =IB_WIDTH_4X ;break ;default :/* Unsupported */ - *ib_speed =QEDR_SPEED_SDR ; + *ib_speed =IB_SPEED_SDR ; *ib_width =IB_WIDTH_1X ; } }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 376/671 serial: stm32: fix transmit_chars when tx is stopped
In reply to Sasha LevinFrom: Erwan Le Ray <[email protected]>
[ Upstream commit b83b957c91f68e53f0dc596e129e8305761f2a32 ]
Disables the tx irq when the transmission is ended and updates stop_tx conditions for code cleanup.
--- drivers/tty/serial/stm32-usart.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
drivers/tty/serial/stm32-usart.c +3 -8
@@ -420,13 +420,8 @@ static void stm32_transmit_chars(struct uart_port *port)return ; } -if (uart_tx_stopped (port)) { -stm32_stop_tx (port); -return ; - } - -if (uart_circ_empty (xmit)) { -stm32_stop_tx (port); +if (uart_circ_empty (xmit) ||uart_tx_stopped (port)) { +stm32_clr_bits (port, ofs->cr1,USART_CR1_TXEIE );return ; }
@@ -439,7 +434,7 @@ static void stm32_transmit_chars(struct uart_port *port)uart_write_wakeup (port);if (uart_circ_empty (xmit)) -stm32_stop_tx (port); +stm32_clr_bits (port, ofs->cr1,USART_CR1_TXEIE ); }static irqreturn_t stm32_interrupt (int irq,void *ptr)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 373/671 serial: stm32: fix word length configuration
In reply to Sasha LevinFrom: Erwan Le Ray <[email protected]>
[ Upstream commit c8a9d043947b4acb19a65f7fac2bd0893e581cd5 ]
STM32 supports either:
- 8 and 9 bits word length (including parity bit) for stm32f4 compatible devices
- 7, 8 and 9 bits word length (including parity bit) for stm32f7 and stm32h7 compatible devices.
As a consequence STM32 supports the following termios configurations:
- CS7 with parity bit, and CS8 (with or without parity bit) for stm32f4 compatible devices.
- CS6 with parity bit, CS7 and CS8 (with or without parity bit) for stm32f7 and stm32h7 compatible devices.
This patch is fixing word length by configuring correctly the SoC with supported configurations.
--- drivers/tty/serial/stm32-usart.c | 56 ++++++++++++++++++++++++++++---- drivers/tty/serial/stm32-usart.h | 3 +- 2 files changed, 50 insertions(+), 9 deletions(-)
drivers/tty/serial/stm32-usart.c +49 -7
@@ -599,6 +599,36 @@ static void stm32_shutdown(struct uart_port *port)free_irq (port->irq, port); } +unsigned int stm32_get_databits (struct ktermios *termios) +{ +unsigned int bits; + +tcflag_t cflag = termios->c_cflag; + +switch (cflag &CSIZE ) { +/* +* CSIZE settings are not necessarily supported in hardware. +* CSIZE unsupported configurations are handled here to set word length +* to 8 bits word as default configuration and to print debug message. +*/ +case CS5 : + bits =5 ; +break ; +case CS6 : + bits =6 ; +break ; +case CS7 : + bits =7 ; +break ; +/* default including CS8 */ +default : + bits =8 ; +break ; + } + +return bits; +} +static void stm32_set_termios (struct uart_port *port,struct ktermios *termios,struct ktermios *old) {
@@ -606,7 +636,7 @@ static void stm32_set_termios(struct uart_port *port, struct ktermios *termios,struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;struct stm32_usart_config *cfg = &stm32_port->info->cfg;struct serial_rs485 *rs485conf = &port->rs485; -unsigned int baud; +unsigned int baud, bits;u32 usartdiv, mantissa, fraction, oversampling;tcflag_t cflag = termios->c_cflag;u32 cr1, cr2, cr3;
@@ -632,16 +662,28 @@ static void stm32_set_termios(struct uart_port *port, struct ktermios *termios,if (cflag &CSTOPB ) cr2 |=USART_CR2_STOP_2B ; + bits =stm32_get_databits (termios); +if (cflag &PARENB ) { + bits++; cr1 |=USART_CR1_PCE ; -if ((cflag &CSIZE ) ==CS8 ) { -if (cfg->has_7bits_data) - cr1 |=USART_CR1_M0 ; -else - cr1 |=USART_CR1_M ; - } } +/* +* Word length configuration: +* CS8 + parity, 9 bits word aka [M1:M0] = 0b01 +* CS7 or (CS6 + parity), 7 bits word aka [M1:M0] = 0b10 +* CS8 or (CS7 + parity), 8 bits word aka [M1:M0] = 0b00 +* M0 and M1 already cleared by cr1 initialization. +*/ +if (bits ==9 ) + cr1 |=USART_CR1_M0 ; +else if ((bits ==7 ) && cfg->has_7bits_data) + cr1 |=USART_CR1_M1 ; +else if (bits !=8 ) +dev_dbg (port->dev,"Unsupported data bits config: %u bits\n" + , bits); +if (cflag &PARODD ) cr1 |=USART_CR1_PS ;
drivers/tty/serial/stm32-usart.h +1 -2
@@ -151,8 +151,7 @@ struct stm32_usart_info stm32h7_info = {#define USART_CR1_PS BIT(9)#define USART_CR1_PCE BIT(10)#define USART_CR1_WAKE BIT(11) -#define USART_CR1_M BIT(12) -#define USART_CR1_M0 BIT(12)/* F7 */ +#define USART_CR1_M0 BIT(12)/* F7 (CR1_M for F4) */ #define USART_CR1_MME BIT(13)/* F7 */ #define USART_CR1_CMIE BIT(14)/* F7 */ #define USART_CR1_OVER8 BIT(15)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 380/671 PCI: PM: Avoid possible suspend-to-idle issue
In reply to Sasha LevinFrom: "Rafael J. Wysocki" <[email protected]>
[ Upstream commit d491f2b75237ef37d8867830ab7fad8d9659e853 ]
If a PCI driver leaves the device handled by it in D0 and calls pci_save_state() on the device in its ->suspend() or ->suspend_late() callback, it can expect the device to stay in D0 over the whole s2idle cycle. However, that may not be the case if there is a spurious wakeup while the system is suspended, because in that case pci_pm_suspend_noirq() will run again after pci_pm_resume_noirq() which calls pci_restore_state(), via pci_pm_default_resume_early(), so state_saved is cleared and the second iteration of pci_pm_suspend_noirq() will invoke pci_prepare_to_sleep() which may change the power state of the device.
To avoid that, add a new internal flag, skip_bus_pm, that will be set by pci_pm_suspend_noirq() when it runs for the first time during the given system suspend-resume cycle if the state of the device has been saved already and the device is still in D0. Setting that flag will cause the next iterations of pci_pm_suspend_noirq() to set state_saved for pci_pm_resume_noirq(), so that it always restores the device state from the originally saved data, and avoid calling pci_prepare_to_sleep() for the device.
--- drivers/pci/pci-driver.c | 17 ++++++++++++++++- include/linux/pci.h | 1 + 2 files changed, 17 insertions(+), 1 deletion(-)
drivers/pci/pci-driver.c +16 -1
@@ -736,6 +736,8 @@ static int pci_pm_suspend(struct device *dev)struct pci_dev *pci_dev =to_pci_dev (dev);const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm :NULL ; + pci_dev->skip_bus_pm = false; +if (pci_has_legacy_pm_support (pci_dev))return pci_legacy_suspend (dev,PMSG_SUSPEND );
@@ -829,7 +831,20 @@ static int pci_pm_suspend_noirq(struct device *dev) } } -if (!pci_dev->state_saved) { +if (pci_dev->skip_bus_pm) { +/* +* The function is running for the second time in a row without +* going through full resume, which is possible only during +* suspend-to-idle in a spurious wakeup case. Moreover, the +* device was originally left in D0, so its power state should +* not be changed here and the device register values saved +* originally should be restored on resume again. +*/ + pci_dev->state_saved = true; + }else if (pci_dev->state_saved) { +if (pci_dev->current_state ==PCI_D0 ) + pci_dev->skip_bus_pm = true; + }else {pci_save_state (pci_dev);if (pci_power_manageable (pci_dev))pci_prepare_to_sleep (pci_dev);
include/linux/pci.h +1 -0
@@ -342,6 +342,7 @@ struct pci_dev {D3cold, not set for devices powered on/off by the corresponding bridge */ + unsigned int skip_bus_pm:1; /* Internal: Skip bus-level PM */ unsigned int ignore_hotplug:1; /* Ignore hotplug events */ unsigned int hotplug_user_indicators:1; /* SlotCtl indicatorscontrolled exclusively by
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 374/671 serial: stm32: fix rx error handling
In reply to Sasha LevinFrom: Erwan Le Ray <[email protected]>
[ Upstream commit 4f01d833fdcdd6f9b85d9e5d5d7568eb683626a7 ]
- Fixes parity and framing error bit by clearing parity and framing error flag. The current implementation doesn't clear the error bits when an error is detected.
- Fixes the incorrect name of framing error clearing flag in header file.
- Fixes misalignement between data frame and errors status. The status read for "n" frame was the status of "n+1" frame".
- Fixes break detection was not triggered by the expected register.
--- drivers/tty/serial/stm32-usart.c | 54 +++++++++++++++++++++----------- drivers/tty/serial/stm32-usart.h | 10 ++---- 2 files changed, 37 insertions(+), 27 deletions(-)
drivers/tty/serial/stm32-usart.c +35 -19
@@ -225,35 +225,51 @@ static void stm32_receive_chars(struct uart_port *port, bool threaded)while (stm32_pending_rx (port, &sr, &stm32_port->last_res, threaded)) { sr |=USART_SR_DUMMY_RX ; - c =stm32_get_char (port, &sr, &stm32_port->last_res); flag =TTY_NORMAL ; - port->icount.rx++; +/* +* Status bits has to be cleared before reading the RDR: +* In FIFO mode, reading the RDR will pop the next data +* (if any) along with its status bits into the SR. +* Not doing so leads to misalignement between RDR and SR, +* and clear status bits of the next rx data. +* +* Clear errors flags for stm32f7 and stm32h7 compatible +* devices. On stm32f4 compatible devices, the error bit is +* cleared by the sequence [read SR - read DR]. +*/ +if ((sr &USART_SR_ERR_MASK ) && ofs->icr !=UNDEF_REG ) +stm32_clr_bits (port, ofs->icr,USART_ICR_ORECF | +USART_ICR_PECF |USART_ICR_FECF ); + + c =stm32_get_char (port, &sr, &stm32_port->last_res); + port->icount.rx++;if (sr &USART_SR_ERR_MASK ) { -if (sr &USART_SR_LBD ) { - port->icount.brk++; -if (uart_handle_break (port)) -continue ; - }else if (sr &USART_SR_ORE ) { -if (ofs->icr !=UNDEF_REG ) -writel_relaxed (USART_ICR_ORECF , - port->membase + - ofs->icr); +if (sr &USART_SR_ORE ) { port->icount.overrun++; }else if (sr &USART_SR_PE ) { port->icount.parity++; }else if (sr &USART_SR_FE ) { - port->icount.frame++; +/* Break detection if character is null */ +if (!c) { + port->icount.brk++; +if (uart_handle_break (port)) +continue ; + }else { + port->icount.frame++; + } } sr &= port->read_status_mask; -if (sr &USART_SR_LBD ) - flag =TTY_BREAK ; -else if (sr &USART_SR_PE ) +if (sr &USART_SR_PE ) { flag =TTY_PARITY ; -else if (sr &USART_SR_FE ) - flag =TTY_FRAME ; + }else if (sr &USART_SR_FE ) { +if (!c) + flag =TTY_BREAK ; +else + flag =TTY_FRAME ; + } }if (uart_handle_sysrq_char (port, c))
@@ -721,14 +737,14 @@ static void stm32_set_termios(struct uart_port *port, struct ktermios *termios,if (termios->c_iflag &INPCK ) port->read_status_mask |=USART_SR_PE |USART_SR_FE ;if (termios->c_iflag & (IGNBRK |BRKINT |PARMRK )) - port->read_status_mask |=USART_SR_LBD ; + port->read_status_mask |=USART_SR_FE ;/* Characters to ignore */ port->ignore_status_mask =0 ;if (termios->c_iflag &IGNPAR ) port->ignore_status_mask =USART_SR_PE |USART_SR_FE ;if (termios->c_iflag &IGNBRK ) { - port->ignore_status_mask |=USART_SR_LBD ; + port->ignore_status_mask |=USART_SR_FE ;/* * If we're ignoring parity and break indicators, * ignore overruns too (for real raw support).
drivers/tty/serial/stm32-usart.h +2 -8
@@ -108,7 +108,6 @@ struct stm32_usart_info stm32h7_info = {#define USART_SR_RXNE BIT(5)#define USART_SR_TC BIT(6)#define USART_SR_TXE BIT(7) -#define USART_SR_LBD BIT(8)#define USART_SR_CTSIF BIT(9)#define USART_SR_CTS BIT(10)/* F7 */ #define USART_SR_RTOF BIT(11)/* F7 */
@@ -120,8 +119,7 @@ struct stm32_usart_info stm32h7_info = {#define USART_SR_SBKF BIT(18)/* F7 */ #define USART_SR_WUF BIT(20)/* H7 */ #define USART_SR_TEACK BIT(21)/* F7 */ -#define USART_SR_ERR_MASK (USART_SR_LBD | USART_SR_ORE | \ - USART_SR_FE | USART_SR_PE) +#define USART_SR_ERR_MASK (USART_SR_ORE | USART_SR_FE | USART_SR_PE)/* Dummy bits */ #define USART_SR_DUMMY_RX BIT(16)
@@ -168,8 +166,6 @@ struct stm32_usart_info stm32h7_info = {/* USART_CR2 */ #define USART_CR2_ADD_MASK GENMASK(3, 0)/* F4 */ #define USART_CR2_ADDM7 BIT(4)/* F7 */ -#define USART_CR2_LBDL BIT(5) -#define USART_CR2_LBDIE BIT(6)#define USART_CR2_LBCL BIT(8)#define USART_CR2_CPHA BIT(9)#define USART_CR2_CPOL BIT(10)
@@ -226,12 +222,10 @@ struct stm32_usart_info stm32h7_info = {/* USART_ICR */ #define USART_ICR_PECF BIT(0)/* F7 */ -#define USART_ICR_FFECF BIT(1)/* F7 */ -#define USART_ICR_NCF BIT(2)/* F7 */ +#define USART_ICR_FECF BIT(1)/* F7 */ #define USART_ICR_ORECF BIT(3)/* F7 */ #define USART_ICR_IDLECF BIT(4)/* F7 */ #define USART_ICR_TCCF BIT(6)/* F7 */ -#define USART_ICR_LBDCF BIT(8)/* F7 */ #define USART_ICR_CTSCF BIT(9)/* F7 */ #define USART_ICR_RTOCF BIT(11)/* F7 */ #define USART_ICR_EOBCF BIT(12)/* F7 */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 382/671 iommu: Use right function to get group for device
In reply to Sasha LevinFrom: Lu Baolu <[email protected]>
[ Upstream commit 57274ea25736496ee019a5c40479855b21888839 ]
The iommu_group_get_for_dev() will allocate a group for a device if it isn't in any group. This isn't the use case in iommu_request_dm_for_dev(). Let's use iommu_group_get() instead.
--- drivers/iommu/iommu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/iommu/iommu.c +3 -3
@@ -1899,9 +1899,9 @@ int iommu_request_dm_for_dev(struct device *dev)int ret;/* Device must already be in a group before calling this function */ - group =iommu_group_get_for_dev (dev); -if (IS_ERR (group)) -return PTR_ERR (group); + group =iommu_group_get (dev); +if (!group) +return -EINVAL ;mutex_lock (&group->mutex);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 387/671 media: Staging: media: Release the correct resource in an error handling path
In reply to Sasha LevinFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 3b6471c7becd06325eb5e701cc2602b2edbbc7b6 ]
'res' is reassigned several times in the function and if we 'goto error_unmap', its value is not the returned value of 'request_mem_region()' anymore.
Introduce a new 'struct resource *' variable (i.e. res2) to keep a pointer to the right resource, if needed in the error handling path.
--- drivers/staging/media/davinci_vpfe/dm365_ipipe.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/staging/media/davinci_vpfe/dm365_ipipe.c +5 -5
@@ -1777,7 +1777,7 @@ vpfe_ipipe_init(struct vpfe_ipipe_device *ipipe, struct platform_device *pdev)struct media_pad *pads = &ipipe->pads[0 ];struct v4l2_subdev *sd = &ipipe->subdev;struct media_entity *me = &sd->entity; -struct resource *res, *memres; +struct resource *res, *res2, *memres; res =platform_get_resource (pdev,IORESOURCE_MEM ,4 );if (!res)
@@ -1791,11 +1791,11 @@ vpfe_ipipe_init(struct vpfe_ipipe_device *ipipe, struct platform_device *pdev)if (!ipipe->base_addr) goto error_release; - res =platform_get_resource (pdev,IORESOURCE_MEM ,6 ); -if (!res) + res2 =platform_get_resource (pdev,IORESOURCE_MEM ,6 ); +if (!res2) goto error_unmap; - ipipe->isp5_base_addr =ioremap_nocache (res->start, -resource_size (res)); + ipipe->isp5_base_addr =ioremap_nocache (res2->start, +resource_size (res2));if (!ipipe->isp5_base_addr) goto error_unmap;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 381/671 iommu: Add missing new line for dma type
In reply to Sasha LevinFrom: Lu Baolu <[email protected]>
[ Upstream commit 24f307d8abf79486dd3c1b645037df7d91602aaa ]
So that all types are printed in the same format.
--- drivers/iommu/iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iommu/iommu.c +1 -1
@@ -317,7 +317,7 @@ static ssize_t iommu_group_show_type(struct iommu_group *group, type ="unmanaged\n" ;break ;case IOMMU_DOMAIN_DMA : - type ="DMA" ; + type ="DMA\n" ;break ; } }
Signature · 6 lines
2.20.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Sasha Levin
maintainerPATCH 392/671 net: don't clear sock->sk early to avoid trouble in strparser
In reply to Sasha LevinFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 2b81f8161dfeda4017cef4f2498ccb64b13f0d61 ]
af_inet sets sock->sk to NULL which trips strparser over:
BUG: kernel NULL pointer dereference, address: 0000000000000012 PGD 0 P4D 0 Oops: 0000 [#1] SMP PTI CPU: 7 PID: 0 Comm: swapper/7 Not tainted 5.2.0-rc1-00139-g14629453a6d3 #21 RIP: 0010:tcp_peek_len+0x10/0x60 RSP: 0018:ffffc02e41c54b98 EFLAGS: 00010246 RAX: 0000000000000000 RBX: ffff9cf924c4e030 RCX: 0000000000000051 RDX: 0000000000000000 RSI: 000000000000000c RDI: ffff9cf97128f480 RBP: ffff9cf9365e0300 R08: ffff9cf94fe7d2c0 R09: 0000000000000000 R10: 000000000000036b R11: ffff9cf939735e00 R12: ffff9cf91ad9ae40 R13: ffff9cf924c4e000 R14: ffff9cf9a8fcbaae R15: 0000000000000020 FS: 0000000000000000(0000) GS:ffff9cf9af7c0000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000012 CR3: 000000013920a003 CR4: 00000000003606e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <IRQ> strp_data_ready+0x48/0x90 tls_data_ready+0x22/0xd0 [tls] tcp_rcv_established+0x569/0x620 tcp_v4_do_rcv+0x127/0x1e0 tcp_v4_rcv+0xad7/0xbf0 ip_protocol_deliver_rcu+0x2c/0x1c0 ip_local_deliver_finish+0x41/0x50 ip_local_deliver+0x6b/0xe0 ? ip_protocol_deliver_rcu+0x1c0/0x1c0 ip_rcv+0x52/0xd0 ? ip_rcv_finish_core.isra.20+0x380/0x380 __netif_receive_skb_one_core+0x7e/0x90 netif_receive_skb_internal+0x42/0xf0 napi_gro_receive+0xed/0x150 nfp_net_poll+0x7a2/0xd30 [nfp] ? kmem_cache_free_bulk+0x286/0x310 net_rx_action+0x149/0x3b0 __do_softirq+0xe3/0x30a ? handle_irq_event_percpu+0x6a/0x80 irq_exit+0xe8/0xf0 do_IRQ+0x85/0xd0 common_interrupt+0xf/0xf </IRQ> RIP: 0010:cpuidle_enter_state+0xbc/0x450
To avoid this issue set sock->sk after sk_prot->close. My grepping and testing did not discover any code which would depend on the current behaviour.
--- net/ipv4/af_inet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/af_inet.c +1 -1
@@ -424,8 +424,8 @@ int inet_release(struct socket *sock)if (sock_flag (sk,SOCK_LINGER ) && !(current->flags &PF_EXITING )) timeout = sk->sk_lingertime; - sock->sk =NULL ; sk->sk_prot->close (sk, timeout); + sock->sk =NULL ; }return 0 ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 395/671 cpufreq: brcmstb-avs-cpufreq: Fix types for voltage/frequency
In reply to Sasha LevinFrom: Florian Fainelli <[email protected]>
[ Upstream commit 4c5681fcc684c762b09435de3e82ffeee7769d21 ]
What we read back from the register is going to be capped at 32-bits, and cpufreq_freq_table.frequency is an unsigned int. Avoid any possible value truncation by using the appropriate return value.
--- drivers/cpufreq/brcmstb-avs-cpufreq.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/cpufreq/brcmstb-avs-cpufreq.c +4 -4
@@ -384,12 +384,12 @@ static int brcm_avs_set_pstate(struct private_data *priv, unsigned int pstate)return __issue_avs_command (priv,AVS_CMD_SET_PSTATE , true, args); } -static unsigned long brcm_avs_get_voltage (void __iomem *base) +static u32 brcm_avs_get_voltage (void __iomem *base) {return readl (base +AVS_MBOX_VOLTAGE1 ); } -static unsigned long brcm_avs_get_frequency (void __iomem *base) +static u32 brcm_avs_get_frequency (void __iomem *base) {return readl (base +AVS_MBOX_FREQUENCY ) *1000 ;/* in kHz */ }
@@ -653,14 +653,14 @@ static ssize_t show_brcm_avs_voltage(struct cpufreq_policy *policy, char *buf) {struct private_data *priv = policy->driver_data; -return sprintf (buf,"0x%08lx\n" ,brcm_avs_get_voltage (priv->base)); +return sprintf (buf,"0x%08x\n" ,brcm_avs_get_voltage (priv->base)); }static ssize_t show_brcm_avs_frequency (struct cpufreq_policy *policy,char *buf) {struct private_data *priv = policy->driver_data; -return sprintf (buf,"0x%08lx\n" ,brcm_avs_get_frequency (priv->base)); +return sprintf (buf,"0x%08x\n" ,brcm_avs_get_frequency (priv->base)); }cpufreq_freq_attr_ro (brcm_avs_pstate);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 398/671 crypto: inside-secure - fix zeroing of the request in ahash_exit_inv
In reply to Sasha LevinFrom: Antoine Tenart <[email protected]>
[ Upstream commit b926213d6fede9c9427d7c12eaf7d9f0895deb4e ]
A request is zeroed in safexcel_ahash_exit_inv(). This request total size is EIP197_AHASH_REQ_SIZE while the memset zeroing it uses sizeof(struct ahash_request), which happens to be less than EIP197_AHASH_REQ_SIZE. This patch fixes it.
--- drivers/crypto/inside-secure/safexcel_hash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/inside-secure/safexcel_hash.c +1 -1
@@ -486,7 +486,7 @@ static int safexcel_ahash_exit_inv(struct crypto_tfm *tfm)struct safexcel_inv_result result = {};int ring = ctx->base.ring; -memset (req,0 ,sizeof (struct ahash_request )); +memset (req,0 ,EIP197_AHASH_REQ_SIZE );/* create invalidation request */ init_completion (&result.completion);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 399/671 crypto: inside-secure - fix queued len computation
In reply to Sasha LevinFrom: Antoine Tenart <[email protected]>
[ Upstream commit ccd65a206a5025cf953a2e4f37e894921b131a5c ]
This patch fixes the queued len computation, which could theoretically be wrong if req->len[1] - req->processed[1] > 1. Be future-proof here, and fix it.
--- drivers/crypto/inside-secure/safexcel_hash.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/crypto/inside-secure/safexcel_hash.c +5 -3
@@ -50,10 +50,12 @@ struct safexcel_ahash_req {static inline u64 safexcel_queued_len (struct safexcel_ahash_req *req) { -if (req->len[1 ] > req->processed[1 ]) -return 0xffffffff - (req->len[0 ] - req->processed[0 ]); +u64 len, processed; -return req->len[0 ] - req->processed[0 ]; + len = (0xffffffff * req->len[1 ]) + req->len[0 ]; + processed = (0xffffffff * req->processed[1 ]) + req->processed[0 ]; + +return len - processed; } static void safexcel_hash_token(struct safexcel_command_desc *cdesc,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 400/671 arm64: dts: renesas: ebisu: Remove renesas, no-ether-link property
In reply to Sasha LevinFrom: Takeshi Kihara <[email protected]>
[ Upstream commit 90d4fa39d028f2e46c57c3d0e1b759e5287d98b7 ]
It is incorrect to specify the no-ether-link property for the AVB device on the Ebisu board. This is because the property should only be used when a board does not provide a proper AVB_LINK signal. However, the Ebisu board does provide this signal.
As per 87c059e9c39d ("arm64: dts: renesas: salvator-x: Remove renesas, no-ether-link property") this fixes a bug:
Steps to reproduce:
- start AVB TX stream (Using aplay via MSE),
- disconnect+reconnect the eth cable,
- after a reconnection the eth connection goes iteratively up/down without user interaction,
- this may heal after some seconds or even stay for minutes.
As the documentation specifies, the "renesas,no-ether-link" option should be used when a board does not provide a proper AVB_LINK signal. There is no need for this option enabled on RCAR H3/M3 Salvator-X/XS and ULCB starter kits since the AVB_LINK is correctly handled by HW.
Choosing to keep or remove the "renesas,no-ether-link" option will have impact on the code flow in the following ways:
- keeping this option enabled may lead to unexpected behavior since the RX & TX are enabled/disabled directly from adjust_link function without any HW interrogation,
- removing this option, the RX & TX will only be enabled/disabled after HW interrogation. The HW check is made through the LMON pin in PSR register which specifies AVB_LINK signal value (0 - at low level; 1 - at high level).
In conclusion, the present change is also a safety improvement because it removes the "renesas,no-ether-link" option leading to a proper way of detecting the link state based on HW interrogation and not on software heuristic.
--- arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts | 1 - 1 file changed, 1 deletion(-)
arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts +0 -1
@@ -33,7 +33,6 @@ &avb { pinctrl-0 = <&avb_pins>; pinctrl-names = "default"; - renesas,no-ether-link; phy-handle = <&phy0>; phy-mode = "rgmii-txid"; status = "okay";
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 403/671 arm64: dts: meson-gxm-khadas-vim2: fix gpio-keys-polled node
In reply to Sasha LevinFrom: Christian Hewitt <[email protected]>
[ Upstream commit 0afd24c2fb61bd5163bab08ea1ee54d60d3ea37e ]
Fix DTC warnings:
meson-gxm-khadas-vim2.dtb: Warning (avoid_unnecessary_addr_size):
/gpio-keys-polled: unnecessary #address-cells/#size-cells
without "ranges" or child "reg" property
--- arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts +1 -3
@@ -63,11 +63,9 @@ gpio-keys-polled { compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; poll-interval = <100>; - button@0 { + power-button { label = "power"; linux,code = <KEY_POWER>; gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_LOW>;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 401/671 mpls: fix warning with multi-label encap
In reply to Sasha LevinFrom: George Wilkie <[email protected]>
[ Upstream commit 2f3f7d1fa0d1039b24a55d127ed190f196fc3e79 ]
If you configure a route with multiple labels, e.g.
ip route add 10.10.3.0/24 encap mpls 16/100 via 10.10.2.2 dev ens4
A warning is logged:
kernel: [ 130.561819] netlink: 'ip': attribute type 1 has an invalid length.
This happens because mpls_iptunnel_policy has set the type of MPLS_IPTUNNEL_DST to fixed size NLA_U32.
Change it to a minimum size.nla_get_labels() does the remaining validation.
--- net/mpls/mpls_iptunnel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/mpls/mpls_iptunnel.c +1 -1
@@ -28,7 +28,7 @@#include "internal.h" static const struct nla_policy mpls_iptunnel_policy[MPLS_IPTUNNEL_MAX +1 ] = { - [MPLS_IPTUNNEL_DST ] = { .type =NLA_U32 }, + [MPLS_IPTUNNEL_DST ] = { .len =sizeof (u32) }, [MPLS_IPTUNNEL_TTL ] = { .type =NLA_U8 }, };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 405/671 iommu/vt-d: Duplicate iommu_resv_region objects per device list
In reply to Sasha LevinFrom: Eric Auger <[email protected]>
[ Upstream commit 5f64ce5411b467f1cfea6c63e2494c22b773582b ]
intel_iommu_get_resv_regions() aims to return the list of reserved regions accessible by a given @device. However several devices can access the same reserved memory region and when building the list it is not safe to use a single iommu_resv_region object, whose container is the RMRR. This iommu_resv_region must be duplicated per device reserved region list.
Let's remove the struct iommu_resv_region from the RMRR unit and allocate the iommu_resv_region directly in intel_iommu_get_resv_regions(). We hold the dmar_global_lock instead of the rcu-lock to allow sleeping.
--- drivers/iommu/intel-iommu.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-)
drivers/iommu/intel-iommu.c +17 -17
@@ -387,7 +387,6 @@ struct dmar_rmrr_unit {u64 end_address;/* reserved end address */ struct dmar_dev_scope *devices;/* target devices */ int devices_cnt;/* target device count */ -struct iommu_resv_region *resv;/* reserved region handle */ };struct dmar_atsr_unit {
@@ -4185,7 +4184,6 @@ static inline void init_iommu_pm_ops(void) {}int __init dmar_parse_one_rmrr (struct acpi_dmar_header *header,void *arg) {struct acpi_dmar_reserved_memory *rmrr; -int prot =DMA_PTE_READ |DMA_PTE_WRITE ;struct dmar_rmrr_unit *rmrru;size_t length;
@@ -4199,22 +4197,16 @@ int __init dmar_parse_one_rmrr(struct acpi_dmar_header *header, void *arg) rmrru->end_address = rmrr->end_address; length = rmrr->end_address - rmrr->base_address +1 ; - rmrru->resv =iommu_alloc_resv_region (rmrr->base_address, length, prot, -IOMMU_RESV_DIRECT ); -if (!rmrru->resv) - goto free_rmrru; rmrru->devices =dmar_alloc_dev_scope ((void *)(rmrr +1 ), ((void *)rmrr) + rmrr->header.length, &rmrru->devices_cnt);if (rmrru->devices_cnt && rmrru->devices ==NULL ) - goto free_all; + goto free_rmrru;list_add (&rmrru->list, &dmar_rmrr_units);return 0 ; -free_all: -kfree (rmrru->resv); free_rmrru:kfree (rmrru); out:
@@ -4432,7 +4424,6 @@ static void intel_iommu_free_dmars(void)list_for_each_entry_safe (rmrru, rmrr_n, &dmar_rmrr_units, list) {list_del (&rmrru->list);dmar_free_dev_scope (&rmrru->devices, &rmrru->devices_cnt); -kfree (rmrru->resv);kfree (rmrru); }
@@ -5206,22 +5197,33 @@ static void intel_iommu_remove_device(struct device *dev)static void intel_iommu_get_resv_regions (struct device *device,struct list_head *head) { +int prot =DMA_PTE_READ |DMA_PTE_WRITE ;struct iommu_resv_region *reg;struct dmar_rmrr_unit *rmrr;struct device *i_dev;int i; -rcu_read_lock (); +down_read (&dmar_global_lock);for_each_rmrr_units (rmrr) {for_each_active_dev_scope (rmrr->devices, rmrr->devices_cnt, i, i_dev) { +struct iommu_resv_region *resv; +size_t length; +if (i_dev != device)continue ; -list_add_tail (&rmrr->resv->list, head); + length = rmrr->end_address - rmrr->base_address +1 ; + resv =iommu_alloc_resv_region (rmrr->base_address, + length, prot, +IOMMU_RESV_DIRECT ); +if (!resv) +break ; + +list_add_tail (&resv->list, head); } } -rcu_read_unlock (); +up_read (&dmar_global_lock); reg = iommu_alloc_resv_region(IOAPIC_RANGE_START, IOAPIC_RANGE_END - IOAPIC_RANGE_START + 1,
@@ -5236,10 +5238,8 @@ static void intel_iommu_put_resv_regions(struct device *dev, {struct iommu_resv_region *entry, *next; -list_for_each_entry_safe (entry, next, head, list) { -if (entry->type ==IOMMU_RESV_MSI ) -kfree (entry); - } +list_for_each_entry_safe (entry, next, head, list) +kfree (entry); }#ifdef CONFIG_INTEL_IOMMU_SVM
Signature · 6 lines
2.20.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Sasha Levin
maintainerPATCH 408/671 firmware: arm_scmi: update rate_discrete in clock_describe_rates_get
In reply to Sasha LevinFrom: Peng Fan <[email protected]>
[ Upstream commit c0759b9b5d411ab27c479125cee9bae391a96436 ]
The boolean rate_discrete needs to be assigned to clk->rate_discrete, so that clock driver can distinguish between the continuous range and discrete rates. It uses this in scmi_clk_round_rate could get the rounded value if it's a continuous range.
--- drivers/firmware/arm_scmi/clock.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/firmware/arm_scmi/clock.c +2 -0
@@ -185,6 +185,8 @@ scmi_clock_describe_rates_get(const struct scmi_handle *handle, u32 clk_id,if (rate_discrete) clk->list.num_rates = tot_rate_cnt; + clk->rate_discrete = rate_discrete; + err:scmi_xfer_put (handle, t);return ret;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 409/671 ntb_hw_switchtec: potential shift wrapping bug in switchtec_ntb_init_sndev()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit ff148d8ac53e59802645bd3200c811620317eb9f ]
This code triggers a Smatch warning:
drivers/ntb/hw/mscc/ntb_hw_switchtec.c:884 switchtec_ntb_init_sndev()
warn: should '(1 << sndev->peer_partition)' be a 64 bit type?The "part_map" and "tpart_vec" variables are u64 type so this seems like a valid warning.
--- drivers/ntb/hw/mscc/ntb_hw_switchtec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ntb/hw/mscc/ntb_hw_switchtec.c +1 -1
@@ -899,7 +899,7 @@ static int switchtec_ntb_init_sndev(struct switchtec_ntb *sndev) } sndev->peer_partition =ffs (tpart_vec) -1 ; -if (!(part_map & (1 << sndev->peer_partition))) { +if (!(part_map & (1ULL << sndev->peer_partition))) {dev_err (&sndev->stdev->dev,"ntb target partition is not NT partition\n" );return -ENODEV ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 411/671 ASoC: meson: axg-tdmout: right_j is not supported
In reply to Sasha LevinFrom: Jerome Brunet <[email protected]>
[ Upstream commit 7e0d7d0fbd06af0507611f85dba8daf24832abd9 ]
Right justified format is actually not supported by the amlogic tdm output encoder.
--- sound/soc/meson/axg-tdmout.c | 1 - 1 file changed, 1 deletion(-)
sound/soc/meson/axg-tdmout.c +0 -1
@@ -136,7 +136,6 @@ static int axg_tdmout_prepare(struct regmap *map, struct axg_tdm_stream *ts)break ;case SND_SOC_DAIFMT_LEFT_J : -case SND_SOC_DAIFMT_RIGHT_J :case SND_SOC_DAIFMT_DSP_B : val |=TDMOUT_CTRL0_INIT_BITNUM (2 );break ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 410/671 ASoC: meson: axg-tdmin: right_j is not supported
In reply to Sasha LevinFrom: Jerome Brunet <[email protected]>
[ Upstream commit 47c317b786b6c1efc2cb3cdb894fd323422fe5ea ]
Right justified format is actually not supported by the amlogic tdm input decoder.
--- sound/soc/meson/axg-tdmin.c | 1 - 1 file changed, 1 deletion(-)
sound/soc/meson/axg-tdmin.c +0 -1
@@ -119,7 +119,6 @@ static int axg_tdmin_prepare(struct regmap *map, struct axg_tdm_stream *ts)break ;case SND_SOC_DAIFMT_LEFT_J : -case SND_SOC_DAIFMT_RIGHT_J :case SND_SOC_DAIFMT_DSP_B : val =TDMIN_CTRL_IN_BIT_SKEW (2 );break ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 413/671 qed: iWARP - Use READ_ONCE and smp_store_release to access ep->state
In reply to Sasha LevinFrom: Michal Kalderon <[email protected]>
[ Upstream commit 6117561e1bb30b2fe7f51e1961f34dbedd0bec8a ]
Destroy QP waits for it's ep object state to be set to CLOSED before proceeding. ep->state can be updated from a different context. Add smp_store_release/READ_ONCE to synchronize.
--- drivers/net/ethernet/qlogic/qed/qed_iwarp.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
drivers/net/ethernet/qlogic/qed/qed_iwarp.c +11 -5
@@ -532,7 +532,8 @@ int qed_iwarp_destroy_qp(struct qed_hwfn *p_hwfn, struct qed_rdma_qp *qp)/* Make sure ep is closed before returning and freeing memory. */ if (ep) { -while (ep->state !=QED_IWARP_EP_CLOSED && wait_count++ <200 ) +while (READ_ONCE (ep->state) !=QED_IWARP_EP_CLOSED && + wait_count++ <200 )msleep (100 );if (ep->state !=QED_IWARP_EP_CLOSED )
@@ -1023,8 +1024,6 @@ qed_iwarp_mpa_complete(struct qed_hwfn *p_hwfn, params.ep_context = ep; - ep->state =QED_IWARP_EP_CLOSED ; -switch (fw_return_code) {case RDMA_RETURN_OK : ep->qp->max_rd_atomic_req = ep->cm_info.ord;
@@ -1084,6 +1083,10 @@ qed_iwarp_mpa_complete(struct qed_hwfn *p_hwfn,break ; } +if (fw_return_code !=RDMA_RETURN_OK ) +/* paired with READ_ONCE in destroy_qp */ +smp_store_release (&ep->state,QED_IWARP_EP_CLOSED ); + ep->event_cb (ep->cb_context, ¶ms);/* on passive side, if there is no associated QP (REJECT) we need to
@@ -2828,7 +2831,9 @@ static void qed_iwarp_qp_in_error(struct qed_hwfn *p_hwfn, params.status = (fw_return_code ==IWARP_QP_IN_ERROR_GOOD_CLOSE ) ?0 : -ECONNRESET ; - ep->state =QED_IWARP_EP_CLOSED ; +/* paired with READ_ONCE in destroy_qp */ +smp_store_release (&ep->state,QED_IWARP_EP_CLOSED ); +spin_lock_bh (&p_hwfn->p_rdma_info->iwarp.iw_lock);list_del (&ep->list_entry);spin_unlock_bh (&p_hwfn->p_rdma_info->iwarp.iw_lock);
@@ -2917,7 +2922,8 @@ qed_iwarp_tcp_connect_unsuccessful(struct qed_hwfn *p_hwfn, params.event =QED_IWARP_EVENT_ACTIVE_COMPLETE ; params.ep_context = ep; params.cm_info = &ep->cm_info; - ep->state =QED_IWARP_EP_CLOSED ; +/* paired with READ_ONCE in destroy_qp */ +smp_store_release (&ep->state,QED_IWARP_EP_CLOSED );switch (fw_return_code) {case IWARP_CONN_ERROR_TCP_CONNECT_INVALID_PACKET :
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 412/671 PCI: PM: Skip devices in D0 for suspend-to-idle
In reply to Sasha LevinFrom: "Rafael J. Wysocki" <[email protected]>
[ Upstream commit 3e26c5feed2add218046ecf91bab3cfa9bf762a6 ]
Commit d491f2b75237 ("PCI: PM: Avoid possible suspend-to-idle issue") attempted to avoid a problem with devices whose drivers want them to stay in D0 over suspend-to-idle and resume, but it did not go as far as it should with that.
Namely, first of all, the power state of a PCI bridge with a downstream device in D0 must be D0 (based on the PCI PM spec r1.2, sec 6, table 6-1, if the bridge is not in D0, there can be no PCI transactions on its secondary bus), but that is not actively enforced during system-wide PM transitions, so use the skip_bus_pm flag introduced by commit d491f2b75237 for that.
Second, the configuration of devices left in D0 (whatever the reason) during suspend-to-idle need not be changed and attempting to put them into D0 again by force is pointless, so explicitly avoid doing that.
--- drivers/pci/pci-driver.c | 47 ++++++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 12 deletions(-)
drivers/pci/pci-driver.c +35 -12
@@ -526,7 +526,6 @@ static void pci_pm_default_resume_early(struct pci_dev *pci_dev)pci_power_up (pci_dev);pci_restore_state (pci_dev);pci_pme_restore (pci_dev); -pci_fixup_device (pci_fixup_resume_early, pci_dev); }/*
@@ -833,18 +832,16 @@ static int pci_pm_suspend_noirq(struct device *dev)if (pci_dev->skip_bus_pm) {/* -* The function is running for the second time in a row without +* Either the device is a bridge with a child in D0 below it, or +* the function is running for the second time in a row without * going through full resume, which is possible only during -* suspend-to-idle in a spurious wakeup case. Moreover, the -* device was originally left in D0, so its power state should -* not be changed here and the device register values saved -* originally should be restored on resume again. +* suspend-to-idle in a spurious wakeup case. The device should +* be in D0 at this point, but if it is a bridge, it may be +* necessary to save its state. */ - pci_dev->state_saved = true; - }else if (pci_dev->state_saved) { -if (pci_dev->current_state ==PCI_D0 ) - pci_dev->skip_bus_pm = true; - }else { +if (!pci_dev->state_saved) +pci_save_state (pci_dev); + }else if (!pci_dev->state_saved) {pci_save_state (pci_dev);if (pci_power_manageable (pci_dev))pci_prepare_to_sleep (pci_dev);
@@ -853,6 +850,22 @@ static int pci_pm_suspend_noirq(struct device *dev)dev_dbg (dev,"PCI PM: Suspend power state: %s\n" ,pci_power_name (pci_dev->current_state)); +if (pci_dev->current_state ==PCI_D0 ) { + pci_dev->skip_bus_pm = true; +/* +* Per PCI PM r1.2, table 6-1, a bridge must be in D0 if any +* downstream device is in D0, so avoid changing the power state +* of the parent bridge by setting the skip_bus_pm flag for it. +*/ +if (pci_dev->bus->self) + pci_dev->bus->self->skip_bus_pm = true; + } + +if (pci_dev->skip_bus_pm && !pm_suspend_via_firmware ()) { +dev_dbg (dev,"PCI PM: Skipped\n" ); + goto Fixup; + } +pci_pm_set_unknown_state (pci_dev);/*
@@ -900,7 +913,16 @@ static int pci_pm_resume_noirq(struct device *dev)if (dev_pm_smart_suspend_and_suspended (dev))pm_runtime_set_active (dev); -pci_pm_default_resume_early (pci_dev); +/* +* In the suspend-to-idle case, devices left in D0 during suspend will +* stay in D0, so it is not necessary to restore or update their +* configuration here and attempting to put them into D0 again may +* confuse some firmware, so avoid doing that. +*/ +if (!pci_dev->skip_bus_pm ||pm_suspend_via_firmware ()) +pci_pm_default_resume_early (pci_dev); + +pci_fixup_device (pci_fixup_resume_early, pci_dev);if (pci_has_legacy_pm_support (pci_dev))return pci_legacy_resume_early (dev);
@@ -1201,6 +1223,7 @@ static int pci_pm_restore_noirq(struct device *dev) }pci_pm_default_resume_early (pci_dev); +pci_fixup_device (pci_fixup_resume_early, pci_dev);if (pci_has_legacy_pm_support (pci_dev))return pci_legacy_resume_early (dev);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 419/671 drm/msm/mdp5: Fix mdp5_cfg_init error return
In reply to Sasha LevinFrom: Jeffrey Hugo <[email protected]>
[ Upstream commit fc19cbb785d7bbd1a1af26229b5240a3ab332744 ]
If mdp5_cfg_init fails because of an unknown major version, a null pointer dereference occurs. This is because the caller of init expects error pointers, but init returns NULL on error. Fix this by returning the expected values on error.
--- drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c +1 -1
@@ -635,7 +635,7 @@ struct mdp5_cfg_handler *mdp5_cfg_init(struct mdp5_kms *mdp5_kms,if (cfg_handler)mdp5_cfg_destroy (cfg_handler); -return NULL ; +return ERR_PTR (ret); }static struct mdp5_cfg_platform *mdp5_get_config (struct platform_device *dev)
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 421/671 net/udp_gso: Allow TX timestamp with UDP GSO
In reply to Sasha LevinFrom: Fred Klassen <[email protected]>
[ Upstream commit 76e21533a48bb42d1fa894f93f6233bf4554f45e ]
Fixes an issue where TX Timestamps are not arriving on the error queue when UDP_SEGMENT CMSG type is combined with CMSG type SO_TIMESTAMPING. This can be illustrated with an updated updgso_bench_tx program which includes the '-T' option to test for this condition. It also introduces the '-P' option which will call poll() before reading the error queue.
./udpgso_bench_tx -4ucTPv -S 1472 -l2 -D 172.16.120.18 poll timeout
udp tx: 0 MB/s 1 calls/s 1 msg/s
The "poll timeout" message above indicates that TX timestamp never arrived.
This patch preserves tx_flags for the first UDP GSO segment. Only the first segment is timestamped, even though in some cases there may be benefital in timestamping both the first and last segment.
Factors in deciding on first segment timestamp only:
- Timestamping both first and last segmented is not feasible. Hardware can only have one outstanding TS request at a time.
- Timestamping last segment may under report network latency of the previous segments. Even though the doorbell is suppressed, the ring producer counter has been incremented.
- Timestamping the first segment has the upside in that it reports timestamps from the application's view, e.g. RTT.
- Timestamping the first segment has the downside that it may underreport tx host network latency. It appears that we have to pick one or the other. And possibly follow-up with a config flag to choose behavior.
v2: Remove tests as noted by Willem de Bruijn <[email protected]>
Moving tests from net to net-next
v3: Update only relevant tx_flag bits as per
Willem de Bruijn <[email protected]>
v4: Update comments and commit message as per
Willem de Bruijn <[email protected]>
--- net/ipv4/udp_offload.c | 5 +++++ 1 file changed, 5 insertions(+)
net/ipv4/udp_offload.c +5 -0
@@ -227,6 +227,11 @@ struct sk_buff *__udp_gso_segment(struct sk_buff *gso_skb, seg = segs; uh =udp_hdr (seg); +/* preserve TX timestamp flags and TS key for first segment */ +skb_shinfo (seg)->tskey =skb_shinfo (gso_skb)->tskey; +skb_shinfo (seg)->tx_flags |= + (skb_shinfo (gso_skb)->tx_flags &SKBTX_ANY_TSTAMP ); +/* compute checksum adjustment based on old length versus new */ newlen =htons (sizeof (*uh) + mss); check =csum16_add (csum16_sub (uh->check, uh->len), newlen);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 423/671 net/af_iucv: always register net_device notifier
In reply to Sasha LevinFrom: Julian Wiedmann <[email protected]>
[ Upstream commit 06996c1d4088a0d5f3e7789d7f96b4653cc947cc ]
Even when running as VM guest (ie pr_iucv != NULL), af_iucv can still open HiperTransport-based connections. For robust operation these connections require the af_iucv_netdev_notifier, so register it unconditionally.
Also handle any error that register_netdevice_notifier() returns.
--- net/iucv/af_iucv.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-)
net/iucv/af_iucv.c +20 -7
@@ -2465,6 +2465,13 @@ static int afiucv_iucv_init(void)return err; } +static void afiucv_iucv_exit (void ) +{ +device_unregister (af_iucv_dev); +driver_unregister (&af_iucv_driver); + pr_iucv->iucv_unregister (&af_iucv_handler,0 ); +} +static int __init afiucv_init (void ) {int err;
@@ -2498,11 +2505,18 @@ static int __init afiucv_init(void) err =afiucv_iucv_init ();if (err) goto out_sock; - }else -register_netdevice_notifier (&afiucv_netdev_notifier); + } + + err =register_netdevice_notifier (&afiucv_netdev_notifier); +if (err) + goto out_notifier; +dev_add_pack (&iucv_packet_type);return 0 ; +out_notifier: +if (pr_iucv) +afiucv_iucv_exit (); out_sock:sock_unregister (PF_IUCV ); out_proto:
@@ -2516,12 +2530,11 @@ static int __init afiucv_init(void) static void __exit afiucv_exit(void) {if (pr_iucv) { -device_unregister (af_iucv_dev); -driver_unregister (&af_iucv_driver); - pr_iucv->iucv_unregister (&af_iucv_handler,0 ); +afiucv_iucv_exit ();symbol_put (iucv_if); - }else -unregister_netdevice_notifier (&afiucv_netdev_notifier); + } + +unregister_netdevice_notifier (&afiucv_netdev_notifier);dev_remove_pack (&iucv_packet_type);sock_unregister (PF_IUCV );proto_unregister (&iucv_proto);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 424/671 ASoC: ti: davinci-mcasp: Fix slot mask settings when using multiple AXRs
In reply to Sasha LevinFrom: Peter Ujfalusi <[email protected]>
[ Upstream commit fd14f4436fd47d5418023c90e933e66d3645552e ]
If multiple serializers are connected in the system and the number of channels will need to use more than one serializer the mask to enable the serializers were left to 0 if tdm_mask is provided
--- sound/soc/davinci/davinci-mcasp.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
sound/soc/davinci/davinci-mcasp.c +6 -7
@@ -874,14 +874,13 @@ static int mcasp_i2s_hw_param(struct davinci_mcasp *mcasp, int stream, active_slots =hweight32 (mcasp->tdm_mask[stream]); active_serializers = (channels + active_slots -1 ) / active_slots; -if (active_serializers ==1 ) { +if (active_serializers ==1 ) active_slots = channels; -for (i =0 ; i < total_slots; i++) { -if ((1 << i) & mcasp->tdm_mask[stream]) { - mask |= (1 << i); -if (--active_slots <=0 ) -break ; - } +for (i =0 ; i < total_slots; i++) { +if ((1 << i) & mcasp->tdm_mask[stream]) { + mask |= (1 << i); +if (--active_slots <=0 ) +break ; } } }else {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 426/671 rtc: pcf8563: Clear event flags and disable interrupts before requesting irq
In reply to Sasha LevinFrom: Chen-Yu Tsai <[email protected]>
[ Upstream commit 3572e8aea3bf925dac1dbf86127657c39fe5c254 ]
Besides the alarm, the PCF8563 also has a timer triggered interrupt. In cases where the previous system left the timer and interrupts on, or somehow the bits got enabled, the interrupt would keep triggering as the kernel doesn't know about it.
Clear both the alarm and timer event flags, and disable the interrupts, before requesting the interrupt line.
--- drivers/rtc/rtc-pcf8563.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/rtc/rtc-pcf8563.c +5 -6
@@ -563,7 +563,6 @@ static int pcf8563_probe(struct i2c_client *client,struct pcf8563 *pcf8563;int err;unsigned char buf; -unsigned char alm_pending;dev_dbg (&client->dev,"%s\n" , __func__);
@@ -587,13 +586,13 @@ static int pcf8563_probe(struct i2c_client *client,return err; } - err =pcf8563_get_alarm_mode (client,NULL , &alm_pending); -if (err) { -dev_err (&client->dev,"%s: read error\n" , __func__); +/* Clear flags and disable interrupts */ + buf =0 ; + err =pcf8563_write_block_data (client,PCF8563_REG_ST2 ,1 , &buf); +if (err <0 ) { +dev_err (&client->dev,"%s: write error\n" , __func__);return err; } -if (alm_pending) -pcf8563_set_alarm_mode (client,0 ); pcf8563->rtc = devm_rtc_device_register(&client->dev, pcf8563_driver.driver.name,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 430/671 drm/msm/a3xx: remove TPL1 regs from snapshot
In reply to Sasha LevinFrom: Rob Clark <[email protected]>
[ Upstream commit f47bee2ba447bebc304111c16ef1e1a73a9744dd ]
These regs are write-only, and the hw throws a hissy-fit (ie. reboots) when we try to read them for GPU state snapshot, in response to a GPU hang. It is rather impolite when GPU recovery triggers an insta- reboot, so lets remove the TPL1 registers from the snapshot.
--- drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)
drivers/gpu/drm/msm/adreno/a3xx_gpu.c +11 -13
@@ -395,19 +395,17 @@ static const unsigned int a3xx_registers[] = {0x2200 ,0x2212 ,0x2214 ,0x2217 ,0x221a ,0x221a ,0x2240 ,0x227e ,0x2280 ,0x228b ,0x22c0 ,0x22c0 ,0x22c4 ,0x22ce ,0x22d0 ,0x22d8 ,0x22df ,0x22e6 ,0x22e8 ,0x22e9 ,0x22ec ,0x22ec ,0x22f0 ,0x22f7 , -0x22ff ,0x22ff ,0x2340 ,0x2343 ,0x2348 ,0x2349 ,0x2350 ,0x2356 , -0x2360 ,0x2360 ,0x2440 ,0x2440 ,0x2444 ,0x2444 ,0x2448 ,0x244d , -0x2468 ,0x2469 ,0x246c ,0x246d ,0x2470 ,0x2470 ,0x2472 ,0x2472 , -0x2474 ,0x2475 ,0x2479 ,0x247a ,0x24c0 ,0x24d3 ,0x24e4 ,0x24ef , -0x2500 ,0x2509 ,0x250c ,0x250c ,0x250e ,0x250e ,0x2510 ,0x2511 , -0x2514 ,0x2515 ,0x25e4 ,0x25e4 ,0x25ea ,0x25ea ,0x25ec ,0x25ed , -0x25f0 ,0x25f0 ,0x2600 ,0x2612 ,0x2614 ,0x2617 ,0x261a ,0x261a , -0x2640 ,0x267e ,0x2680 ,0x268b ,0x26c0 ,0x26c0 ,0x26c4 ,0x26ce , -0x26d0 ,0x26d8 ,0x26df ,0x26e6 ,0x26e8 ,0x26e9 ,0x26ec ,0x26ec , -0x26f0 ,0x26f7 ,0x26ff ,0x26ff ,0x2740 ,0x2743 ,0x2748 ,0x2749 , -0x2750 ,0x2756 ,0x2760 ,0x2760 ,0x300c ,0x300e ,0x301c ,0x301d , -0x302a ,0x302a ,0x302c ,0x302d ,0x3030 ,0x3031 ,0x3034 ,0x3036 , -0x303c ,0x303c ,0x305e ,0x305f , +0x22ff ,0x22ff ,0x2340 ,0x2343 ,0x2440 ,0x2440 ,0x2444 ,0x2444 , +0x2448 ,0x244d ,0x2468 ,0x2469 ,0x246c ,0x246d ,0x2470 ,0x2470 , +0x2472 ,0x2472 ,0x2474 ,0x2475 ,0x2479 ,0x247a ,0x24c0 ,0x24d3 , +0x24e4 ,0x24ef ,0x2500 ,0x2509 ,0x250c ,0x250c ,0x250e ,0x250e , +0x2510 ,0x2511 ,0x2514 ,0x2515 ,0x25e4 ,0x25e4 ,0x25ea ,0x25ea , +0x25ec ,0x25ed ,0x25f0 ,0x25f0 ,0x2600 ,0x2612 ,0x2614 ,0x2617 , +0x261a ,0x261a ,0x2640 ,0x267e ,0x2680 ,0x268b ,0x26c0 ,0x26c0 , +0x26c4 ,0x26ce ,0x26d0 ,0x26d8 ,0x26df ,0x26e6 ,0x26e8 ,0x26e9 , +0x26ec ,0x26ec ,0x26f0 ,0x26f7 ,0x26ff ,0x26ff ,0x2740 ,0x2743 , +0x300c ,0x300e ,0x301c ,0x301d ,0x302a ,0x302a ,0x302c ,0x302d , +0x3030 ,0x3031 ,0x3034 ,0x3036 ,0x303c ,0x303c ,0x305e ,0x305f , ~0 /* sentinel */ };
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 429/671 arm64: dts: allwinner: h6: Pine H64: Add interrupt line for RTC
In reply to Sasha LevinFrom: Chen-Yu Tsai <[email protected]>
[ Upstream commit 0bb9d1876c0605815ea0452f68cb819a775a75f9 ]
The external PCF8563 RTC chip's interrupt line is connected to the NMI line on the SoC.
Add the interrupt line to the device tree.
--- arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts +2 -0
@@ -176,6 +176,8 @@ pcf8563: rtc@51 { compatible = "nxp,pcf8563"; reg = <0x51>; + interrupt-parent = <&r_intc>; + interrupts = <0 IRQ_TYPE_LEVEL_LOW>; #clock-cells = <0>; }; };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 432/671 perf/ioctl: Add check for the sample_period value
In reply to Sasha LevinFrom: Ravi Bangoria <[email protected]>
[ Upstream commit 913a90bc5a3a06b1f04c337320e9aeee2328dd77 ]
perf_event_open() limits the sample_period to 63 bits. See:
0819b2e30ccb ("perf: Limit perf_event_attr::sample_period to 63 bits")
Make ioctl() consistent with it.
Also on PowerPC, negative sample_period could cause a recursive PMIs leading to a hang (reported when running perf-fuzzer).
--- kernel/events/core.c | 3 +++ 1 file changed, 3 insertions(+)
kernel/events/core.c +3 -0
@@ -5012,6 +5012,9 @@ static int perf_event_period(struct perf_event *event, u64 __user *arg)if (perf_event_check_period (event, value))return -EINVAL ; +if (!event->attr.freq && (value & (1ULL <<63 ))) +return -EINVAL ; +event_function_call (event, __perf_event_period, &value);return 0 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 433/671 dmaengine: hsu: Revert "set HSU_CH_MTSR to memory width"
In reply to Sasha LevinFrom: Andy Shevchenko <[email protected]>
[ Upstream commit c24a5c735f87d0549060de31367c095e8810b895 ]
The commit
080edf75d337 ("dmaengine: hsu: set HSU_CH_MTSR to memory width")
has been mistakenly submitted. The further investigations show that the original code does better job since the memory side transfer size has never been configured by DMA users.
As per latest revision of documentation: "Channel minimum transfer size (CHnMTSR)... For IOSF UART, maximum value that can be programmed is 64 and minimum value that can be programmed is 1."
This reverts commit 080edf75d337d35faa6fc3df99342b10d2848d16.
--- drivers/dma/hsu/hsu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/dma/hsu/hsu.c +2 -2
@@ -64,10 +64,10 @@ static void hsu_dma_chan_start(struct hsu_dma_chan *hsuc)if (hsuc->direction ==DMA_MEM_TO_DEV ) { bsr = config->dst_maxburst; - mtsr = config->src_addr_width; + mtsr = config->dst_addr_width; }else if (hsuc->direction ==DMA_DEV_TO_MEM ) { bsr = config->src_maxburst; - mtsr = config->dst_addr_width; + mtsr = config->src_addr_width; }hsu_chan_disable (hsuc);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 434/671 clk: qcom: Fix -Wunused-const-variable
In reply to Sasha LevinFrom: Nathan Huckleberry <[email protected]>
[ Upstream commit da642427bd7710ec4f4140f693f59aa8521a358c ]
Clang produces the following warning
drivers/clk/qcom/gcc-msm8996.c:133:32: warning: unused variable 'gcc_xo_gpll0_gpll2_gpll3_gpll0_early_div_map' [-Wunused-const-variable] static const structparent_map gcc_xo_gpll0_gpll2_gpll3_gpll0_early_div_map[] =
{ ^drivers/clk/qcom/gcc-msm8996.c:141:27: warning: unused variable 'gcc_xo_gpll0_gpll2_gpll3_gpll0_early_div' [-Wunused-const-variable] static const char * const gcc_xo_gpll0_gpll2_gpll3_gpll0_early_div[] = { ^ drivers/clk/qcom/gcc-msm8996.c:187:32: warning: unused variable 'gcc_xo_gpll0_gpll2_gpll3_gpll1_gpll4_gpll0_early_div_map' [-Wunused-const-variable] static const struct parent_map gcc_xo_gpll0_gpll2_gpll3_gpll1_gpll4_gpll0_early_div_map[] = { ^ drivers/clk/qcom/gcc-msm8996.c:197:27: warning: unused variable 'gcc_xo_gpll0_gpll2_gpll3_gpll1_gpll4_gpll0_early_div' [-Wunused-const-variable] static const char * const gcc_xo_gpll0_gpll2_gpll3_gpll1_gpll4_gpll0_early_div[] = {
It looks like these were never used.
--- drivers/clk/qcom/gcc-msm8996.c | 36 ---------------------------------- 1 file changed, 36 deletions(-)
drivers/clk/qcom/gcc-msm8996.c +0 -36
@@ -138,22 +138,6 @@ static const char * const gcc_xo_gpll0_gpll4_gpll0_early_div[] = {"gpll0_early_div" }; -static const struct parent_map gcc_xo_gpll0_gpll2_gpll3_gpll0_early_div_map[] = { - {P_XO ,0 }, - {P_GPLL0 ,1 }, - {P_GPLL2 ,2 }, - {P_GPLL3 ,3 }, - {P_GPLL0_EARLY_DIV ,6 } -}; - -static const char *const gcc_xo_gpll0_gpll2_gpll3_gpll0_early_div[] = { -"xo" , -"gpll0" , -"gpll2" , -"gpll3" , -"gpll0_early_div" -}; -static const struct parent_map gcc_xo_gpll0_gpll1_early_div_gpll1_gpll4_gpll0_early_div_map[] = { {P_XO ,0 }, {P_GPLL0 ,1 },
@@ -192,26 +176,6 @@ static const char * const gcc_xo_gpll0_gpll2_gpll3_gpll1_gpll2_early_gpll0_early"gpll0_early_div" }; -static const struct parent_map gcc_xo_gpll0_gpll2_gpll3_gpll1_gpll4_gpll0_early_div_map[] = { - {P_XO ,0 }, - {P_GPLL0 ,1 }, - {P_GPLL2 ,2 }, - {P_GPLL3 ,3 }, - {P_GPLL1 ,4 }, - {P_GPLL4 ,5 }, - {P_GPLL0_EARLY_DIV ,6 } -}; - -static const char *const gcc_xo_gpll0_gpll2_gpll3_gpll1_gpll4_gpll0_early_div[] = { -"xo" , -"gpll0" , -"gpll2" , -"gpll3" , -"gpll1" , -"gpll4" , -"gpll0_early_div" -}; -static struct clk_fixed_factor xo = { .mult =1 , .div =1 ,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 437/671 tools: bpftool: use correct argument in cgroup errors
In reply to Sasha LevinFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 6c6874f401e5a0caab3b6a0663169e1fb5e930bb ]
cgroup code tries to use argv[0] as the cgroup path, but if it fails uses argv[1] to report errors.
--- tools/bpf/bpftool/cgroup.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
tools/bpf/bpftool/cgroup.c +3 -3
@@ -164,7 +164,7 @@ static int do_show(int argc, char **argv) cgroup_fd =open (argv[0 ],O_RDONLY );if (cgroup_fd <0 ) { -p_err ("can't open cgroup %s" , argv[1 ]); +p_err ("can't open cgroup %s" , argv[0 ]); goto exit; }
@@ -345,7 +345,7 @@ static int do_attach(int argc, char **argv) cgroup_fd =open (argv[0 ],O_RDONLY );if (cgroup_fd <0 ) { -p_err ("can't open cgroup %s" , argv[1 ]); +p_err ("can't open cgroup %s" , argv[0 ]); goto exit; }
@@ -403,7 +403,7 @@ static int do_detach(int argc, char **argv) cgroup_fd =open (argv[0 ],O_RDONLY );if (cgroup_fd <0 ) { -p_err ("can't open cgroup %s" , argv[1 ]); +p_err ("can't open cgroup %s" , argv[0 ]); goto exit; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 443/671 mfd: intel-lpss: Release IDA resources
In reply to Sasha LevinFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 02f36911c1b41fcd8779fa0c135aab0554333fa5 ]
ida instances allocate some internal memory for ->free_bitmap in addition to the base 'struct ida'. Use ida_destroy() to release that memory at module_exit().
--- drivers/mfd/intel-lpss.c | 1 + 1 file changed, 1 insertion(+)
drivers/mfd/intel-lpss.c +1 -0
@@ -545,6 +545,7 @@ module_init(intel_lpss_init); static void __exit intel_lpss_exit(void) { +ida_destroy (&intel_lpss_devid_ida);debugfs_remove (intel_lpss_debugfs); }module_exit (intel_lpss_exit);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 444/671 rxrpc: Fix uninitialized error code in rxrpc_send_data_packet()
In reply to Sasha LevinFrom: David Howells <[email protected]>
[ Upstream commit 3427beb6375d04e9627c67343872e79341a684ea ]
With gcc 4.1:
net/rxrpc/output.c: In function ‘rxrpc_send_data_packet’:
net/rxrpc/output.c:338: warning: ‘ret’ may be used uninitialized in this function
Indeed, if the first jump to the send_fragmentable label is made, and the address family is not handled in the switch() statement, ret will be used uninitialized.
Fix this by BUG()'ing as is done in other places in rxrpc where internal support for future address families will need adding. It should not be possible to reach this normally as the address families are checked up-front.
--- net/rxrpc/output.c | 3 +++ 1 file changed, 3 insertions(+)
net/rxrpc/output.c +3 -0
@@ -524,6 +524,9 @@ int rxrpc_send_data_packet(struct rxrpc_call *call, struct sk_buff *skb, }break ;#endif + +default : +BUG (); }if (ret <0 )
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 445/671 xprtrdma: Fix use-after-free in rpcrdma_post_recvs
In reply to Sasha LevinFrom: Chuck Lever <[email protected]>
[ Upstream commit 2d0abe36cf13fb7b577949fd1539326adddcc9bc ]
Dereference wr->next /before/ the memory backing wr has been released. This issue was found by code inspection. It is not expected to be a significant problem because it is in an error path that is almost never executed.
--- net/sunrpc/xprtrdma/verbs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/sunrpc/xprtrdma/verbs.c +2 -1
@@ -1558,10 +1558,11 @@ rpcrdma_post_recvs(struct rpcrdma_xprt *r_xprt, bool temp) rc =ib_post_recv (r_xprt->rx_ia.ri_id->qp, wr, (const struct ib_recv_wr **)&bad_wr);if (rc) { -for (wr = bad_wr; wr; wr = wr->next) { +for (wr = bad_wr; wr;) {struct rpcrdma_rep *rep; rep = container_of(wr, struct rpcrdma_rep, rr_recv_wr); + wr = wr->next;rpcrdma_recv_buffer_put (rep); --count; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 447/671 PM: ACPI/PCI: Resume all devices during hibernation
In reply to Sasha LevinFrom: "Rafael J. Wysocki" <[email protected]>
[ Upstream commit 501debd4aa5edc755037c39ea5a8fba23b41e580 ]
Both the PCI bus type and the ACPI PM domain avoid resuming runtime-suspended devices with DPM_FLAG_SMART_SUSPEND set during hibernation (before creating the snapshot image of system memory), but that turns out to be a mistake. It leads to functional issues and adds complexity that's hard to justify.
For this reason, resume all runtime-suspended PCI devices and all devices in the ACPI PM domains before creating a snapshot image of system memory during hibernation.
--- drivers/acpi/device_pm.c | 13 +++++++------ drivers/pci/pci-driver.c | 16 ++++++++-------- 2 files changed, 15 insertions(+), 14 deletions(-)
drivers/acpi/device_pm.c +7 -6
@@ -1116,13 +1116,14 @@ EXPORT_SYMBOL_GPL(acpi_subsys_resume_early);int acpi_subsys_freeze (struct device *dev) {/* -* This used to be done in acpi_subsys_prepare() for all devices and -* some drivers may depend on it, so do it here. Ideally, however, -* runtime-suspended devices should not be touched during freeze/thaw -* transitions. +* Resume all runtime-suspended devices before creating a snapshot +* image of system memory, because the restore kernel generally cannot +* be expected to always handle them consistently and they need to be +* put into the runtime-active metastate during system resume anyway, +* so it is better to ensure that the state saved in the image will be +* always consistent with that. */ -if (!dev_pm_test_driver_flags (dev,DPM_FLAG_SMART_SUSPEND )) -pm_runtime_resume (dev); +pm_runtime_resume (dev);return pm_generic_freeze (dev); }
drivers/pci/pci-driver.c +8 -8
@@ -996,15 +996,15 @@ static int pci_pm_freeze(struct device *dev) }/* -* This used to be done in pci_pm_prepare() for all devices and some -* drivers may depend on it, so do it here. Ideally, runtime-suspended -* devices should not be touched during freeze/thaw transitions, -* however. +* Resume all runtime-suspended devices before creating a snapshot +* image of system memory, because the restore kernel generally cannot +* be expected to always handle them consistently and they need to be +* put into the runtime-active metastate during system resume anyway, +* so it is better to ensure that the state saved in the image will be +* always consistent with that. */ -if (!dev_pm_smart_suspend_and_suspended (dev)) { -pm_runtime_resume (dev); - pci_dev->state_saved = false; - } +pm_runtime_resume (dev); + pci_dev->state_saved = false;if (pm->freeze) {int error;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 442/671 iommu/amd: Make iommu_disable safer
In reply to Sasha LevinFrom: Kevin Mitchell <[email protected]>
[ Upstream commit 3ddbe913e55516d3e2165d43d4d5570761769878 ]
Make it safe to call iommu_disable during early init error conditions before mmio_base is set, but after the struct amd_iommu has been added to the amd_iommu_list. For example, this happens if firmware fails to fill in mmio_phys in the ACPI table leading to a NULL pointer dereference in iommu_feature_disable.
--- drivers/iommu/amd_iommu_init.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/iommu/amd_iommu_init.c +3 -0
@@ -422,6 +422,9 @@ static void iommu_enable(struct amd_iommu *iommu)static void iommu_disable (struct amd_iommu *iommu) { +if (!iommu->mmio_base) +return ; +/* Disable command buffer */ iommu_feature_disable (iommu,CONTROL_CMDBUF_EN );
Signature · 6 lines
2.20.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Sasha Levin
maintainerPATCH 451/671 devres: allow const resource arguments
In reply to Sasha LevinFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 9dea44c91469512d346e638694c22c30a5273992 ]
devm_ioremap_resource() does not currently take 'const' arguments, which results in a warning from the first driver trying to do it anyway:
drivers/gpio/gpio-amd-fch.c: In function 'amd_fch_gpio_probe':drivers/gpio/gpio-amd-fch.c:171:49: error: passing argument 2 of 'devm_ioremap_resource' discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]
priv->base = devm_ioremap_resource(&pdev->dev, &amd_fch_gpio_iores);
^~~~~~~~~~~~~~~~~~~Change the prototype to allow it, as there is no real reason not to.
--- include/linux/device.h | 3 ++- lib/devres.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
include/linux/device.h +2 -1
@@ -701,7 +701,8 @@ extern unsigned long devm_get_free_pages(struct device *dev, gfp_t gfp_mask, unsigned int order);extern void devm_free_pages (struct device *dev,unsigned long addr); -void __iomem *devm_ioremap_resource (struct device *dev,struct resource *res); +void __iomem *devm_ioremap_resource (struct device *dev, +const struct resource *res); void __iomem *devm_of_iomap(struct device *dev, struct device_node *node, int index,
lib/devres.c +2 -1
@@ -131,7 +131,8 @@ EXPORT_SYMBOL(devm_iounmap);* if (IS_ERR(base)) * return PTR_ERR(base); */ -void __iomem *devm_ioremap_resource (struct device *dev,struct resource *res) +void __iomem *devm_ioremap_resource (struct device *dev, +const struct resource *res) {resource_size_t size;const char *name;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 452/671 fsi: sbefifo: Don't fail operations when in SBE IPL state
In reply to Sasha LevinFrom: Eddie James <[email protected]>
[ Upstream commit 7ce98fb6c53d2311b3e9faae90b1a9c1a96534db ]
SBE fifo operations should be allowed while the SBE is in any of the "IPL" states. Operations should succeed in this state.
--- drivers/fsi/fsi-sbefifo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/fsi/fsi-sbefifo.c +2 -2
@@ -289,11 +289,11 @@ static int sbefifo_check_sbe_state(struct sbefifo *sbefifo)switch ((sbm &CFAM_SBM_SBE_STATE_MASK ) >>CFAM_SBM_SBE_STATE_SHIFT ) {case SBE_STATE_UNKNOWN :return -ESHUTDOWN ; +case SBE_STATE_DMT : +return -EBUSY ;case SBE_STATE_IPLING :case SBE_STATE_ISTEP :case SBE_STATE_MPIPL : -case SBE_STATE_DMT : -return -EBUSY ;case SBE_STATE_RUNTIME :case SBE_STATE_DUMP :/* Not sure about that one */ break ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 446/671 um: Fix IRQ controller regression on console read
In reply to Sasha LevinFrom: Jouni Malinen <[email protected]>
[ Upstream commit bebe4681d0e7e1be2608282dc86645728bc7f623 ]
The conversion of UML to use epoll based IRQ controller claimed that clone_one_chan() can safely call um_free_irq() while starting to ignore the delay_free_irq parameter that explicitly noted that the IRQ cannot be freed because this is being called from chan_interrupt(). This resulted in free_irq() getting called in interrupt context ("Trying to free IRQ 6 from IRQ context!").
Fix this by restoring previously used delay_free_irq processing.
--- arch/um/drivers/chan_kern.c | 52 +++++++++++++++++++++++++++++++------ arch/um/kernel/irq.c | 4 +++ 2 files changed, 48 insertions(+), 8 deletions(-)
arch/um/drivers/chan_kern.c +44 -8
@@ -171,19 +171,55 @@ int enable_chan(struct line *line)return err; } +/* Items are added in IRQ context, when free_irq can't be called, and +* removed in process context, when it can. +* This handles interrupt sources which disappear, and which need to +* be permanently disabled. This is discovered in IRQ context, but +* the freeing of the IRQ must be done later. +*/ +static DEFINE_SPINLOCK (irqs_to_free_lock); +static LIST_HEAD (irqs_to_free); + +void free_irqs (void ) +{ +struct chan *chan; +LIST_HEAD (list); +struct list_head *ele; +unsigned long flags; + +spin_lock_irqsave (&irqs_to_free_lock, flags); +list_splice_init (&irqs_to_free, &list); +spin_unlock_irqrestore (&irqs_to_free_lock, flags); + +list_for_each (ele, &list) { + chan = list_entry(ele, struct chan, free_list); + +if (chan->input && chan->enabled) +um_free_irq (chan->line->driver->read_irq, chan); +if (chan->output && chan->enabled) +um_free_irq (chan->line->driver->write_irq, chan); + chan->enabled =0 ; + } +} +static void close_one_chan (struct chan *chan,int delay_free_irq) { +unsigned long flags; +if (!chan->opened)return ; -/* we can safely call free now - it will be marked -* as free and freed once the IRQ stopped processing -*/ -if (chan->input && chan->enabled) -um_free_irq (chan->line->driver->read_irq, chan); -if (chan->output && chan->enabled) -um_free_irq (chan->line->driver->write_irq, chan); - chan->enabled =0 ; +if (delay_free_irq) { +spin_lock_irqsave (&irqs_to_free_lock, flags); +list_add (&chan->free_list, &irqs_to_free); +spin_unlock_irqrestore (&irqs_to_free_lock, flags); + }else { +if (chan->input && chan->enabled) +um_free_irq (chan->line->driver->read_irq, chan); +if (chan->output && chan->enabled) +um_free_irq (chan->line->driver->write_irq, chan); + chan->enabled =0 ; + }if (chan->ops->close !=NULL ) (*chan->ops->close)(chan->fd, chan->data);
arch/um/kernel/irq.c +4 -0
@@ -21,6 +21,8 @@#include <irq_user.h> +extern void free_irqs (void ); +/* When epoll triggers we do not know why it did so * we can also have different IRQs for read and write. * This is why we keep a small irq_fd array for each fd -
@@ -100,6 +102,8 @@ void sigio_handler(int sig, struct siginfo *unused_si, struct uml_pt_regs *regs) } } } + +free_irqs (); }static int assign_epoll_events_to_irq (struct irq_entry *irq_entry)
Signature · 7 lines
2.20.1 _______________________________________________ linux-um mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-um
Sasha Levin
maintainerPATCH 450/671 fsi/core: Fix error paths on CFAM init
In reply to Sasha LevinFrom: Jeremy Kerr <[email protected]>
[ Upstream commit 371975b0b07520c85098652d561639837a60a905 ]
Change d1dcd67825 re-worked the struct fsi_slave initialisation in fsi_slave_init, but introduced a few inconsitencies: the slave->dev is now registered through cdev_device_add, but we may kfree() the device out from underneath the cdev registration. We may also leave an IDA allocated.
This change fixes the error paths, so that we kfree() only before the device is registered with the core code. We also move the smode write to before we start creating proper devices, as it's the most likely to fail. We also remove the IDA-allocated minor on error, and properly clean up the of_node.
--- drivers/fsi/fsi-core.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-)
drivers/fsi/fsi-core.c +20 -12
@@ -1060,6 +1060,14 @@ static int fsi_slave_init(struct fsi_master *master, int link, uint8_t id) } + rc =fsi_slave_set_smode (slave); +if (rc) { +dev_warn (&master->dev, +"can't set smode on slave:%02x:%02x %d\n" , + link, id, rc); + goto err_free; + } +/* Allocate a minor in the FSI space */ rc =__fsi_get_new_minor (slave, fsi_dev_cfam, &slave->dev.devt, &slave->cdev_idx);
@@ -1071,17 +1079,14 @@ static int fsi_slave_init(struct fsi_master *master, int link, uint8_t id) rc =cdev_device_add (&slave->cdev, &slave->dev);if (rc) {dev_err (&slave->dev,"Error %d creating slave device\n" , rc); - goto err_free; + goto err_free_ida; } - rc =fsi_slave_set_smode (slave); -if (rc) { -dev_warn (&master->dev, -"can't set smode on slave:%02x:%02x %d\n" , - link, id, rc); -kfree (slave); -return -ENODEV ; - } +/* Now that we have the cdev registered with the core, any fatal +* failures beyond this point will need to clean up through +* cdev_device_del(). Fortunately though, nothing past here is fatal. +*/ +if (master->link_config) master->link_config(master, link, slave->t_send_delay,
@@ -1098,10 +1103,13 @@ static int fsi_slave_init(struct fsi_master *master, int link, uint8_t id)dev_dbg (&master->dev,"failed during slave scan with: %d\n" , rc); -return rc; +return 0 ; - err_free: -put_device (&slave->dev); +err_free_ida: +fsi_free_minor (slave->dev.devt); +err_free: +of_node_put (slave->dev.of_node); +kfree (slave);return rc; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 457/671 ceph: fix "ceph.dir.rctime" vxattr value
In reply to Sasha LevinFrom: David Disseldorp <[email protected]>
[ Upstream commit 718807289d4130be1fe13f24f018733116958070 ]
The vxattr value incorrectly places a "09" prefix to the nanoseconds field, instead of providing it as a zero-pad width specifier after '%'.
--- fs/ceph/xattr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ceph/xattr.c +1 -1
@@ -221,7 +221,7 @@ static size_t ceph_vxattrcb_dir_rbytes(struct ceph_inode_info *ci, char *val,static size_t ceph_vxattrcb_dir_rctime (struct ceph_inode_info *ci,char *val,size_t size) { -return snprintf (val, size,"%lld.09%ld" , ci->i_rctime.tv_sec, +return snprintf (val, size,"%lld.%09ld" , ci->i_rctime.tv_sec, ci->i_rctime.tv_nsec); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 456/671 PCI: mobiveil: Fix the valid check for inbound and outbound windows
In reply to Sasha LevinFrom: Hou Zhiqiang <[email protected]>
[ Upstream commit ccd34dac2ed596b1f26079912bdf638e002a3979 ]
In program_ib/ob_windows() check the window index from the function parameter instead of the total number of initialized windows to determine if the specified window is valid.
--- drivers/pci/controller/pcie-mobiveil.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pci/controller/pcie-mobiveil.c +2 -2
@@ -395,7 +395,7 @@ static void program_ib_windows(struct mobiveil_pcie *pcie, int win_num,int amap_ctrl_dw;u64 size64 = ~(size -1 ); -if ((pcie->ib_wins_configured +1 ) > pcie->ppio_wins) { +if (win_num >= pcie->ppio_wins) {dev_err (&pcie->pdev->dev,"ERROR: max inbound windows reached !\n" );return ;
@@ -429,7 +429,7 @@ static void program_ob_windows(struct mobiveil_pcie *pcie, int win_num,u32 value, type;u64 size64 = ~(size -1 ); -if ((pcie->ob_wins_configured +1 ) > pcie->apio_wins) { +if (win_num >= pcie->apio_wins) {dev_err (&pcie->pdev->dev,"ERROR: max outbound windows reached !\n" );return ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 455/671 PCI: mobiveil: Fix devfn check in mobiveil_pcie_valid_device()
In reply to Sasha LevinFrom: Hou Zhiqiang <[email protected]>
[ Upstream commit cbd50b3ca3964c79dac65fda277637577e029e8c ]
Current check for devfn number in mobiveil_pci_valid_device() is wrong in that it flags as invalid functions present in PCI device 0 in the root bus while it is perfectly valid to access all functions in PCI device 0 in the root bus.
Update the check in mobiveil_pci_valid_device() to fix the issue.
--- drivers/pci/controller/pcie-mobiveil.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/controller/pcie-mobiveil.c +1 -1
@@ -174,7 +174,7 @@ static bool mobiveil_pcie_valid_device(struct pci_bus *bus, unsigned int devfn)* Do not read more than one device on the bus directly * attached to RC */ -if ((bus->primary == pcie->root_bus_nr) && (devfn >0 )) +if ((bus->primary == pcie->root_bus_nr) && (PCI_SLOT (devfn) >0 ))return false;return true;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 458/671 net: pasemi: fix an use-after-free in pasemi_mac_phy_init()
In reply to Sasha LevinFrom: Wen Yang <[email protected]>
[ Upstream commit faf5577f2498cea23011b5c785ef853ded22700b ]
The phy_dn variable is still being used in of_phy_connect() after the of_node_put() call, which may result in use-after-free.
--- drivers/net/ethernet/pasemi/pasemi_mac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/pasemi/pasemi_mac.c +1 -1
@@ -1053,7 +1053,6 @@ static int pasemi_mac_phy_init(struct net_device *dev) dn =pci_device_to_OF_node (mac->pdev); phy_dn =of_parse_phandle (dn,"phy-handle" ,0 ); -of_node_put (phy_dn); mac->link =0 ; mac->speed =0 ;
@@ -1062,6 +1061,7 @@ static int pasemi_mac_phy_init(struct net_device *dev) phydev =of_phy_connect (dev, phy_dn, &pasemi_adjust_link,0 ,PHY_INTERFACE_MODE_SGMII ); +of_node_put (phy_dn);if (!phydev) {printk (KERN_ERR "%s: Could not attach to phy\n" , dev->name);return -ENODEV ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 465/671 drm/panel: make drm_panel.h self-contained
In reply to Sasha LevinFrom: Jani Nikula <[email protected]>
[ Upstream commit bf3f5e98559360661a3d2af340d46522512c0b00 ]
Fix build warning if drm_panel.h is built with CONFIG_OF=n or CONFIG_DRM_PANEL=n and included without the prerequisite err.h:
./include/drm/drm_panel.h: In function ‘of_drm_find_panel’:./include/drm/drm_panel.h:203:9: error: implicit declaration of function ‘ERR_PTR’ [-Werror=implicit-function-declaration]
return ERR_PTR(-ENODEV);
^~~~~~~
./include/drm/drm_panel.h:203:9: error: returning ‘int’ from a function with return type ‘struct drm_panel *’ makes pointer from integer without a cast [-Werror=int-conversion]
return ERR_PTR(-ENODEV);
^~~~~~~~~~~~~~~~--- include/drm/drm_panel.h | 1 + 1 file changed, 1 insertion(+)
include/drm/drm_panel.h +1 -0
@@ -24,6 +24,7 @@#ifndef __DRM_PANEL_H__#define __DRM_PANEL_H__ +#include <linux/err.h> #include <linux/errno.h> #include <linux/list.h>
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 309/671 ALSA: usb-audio: Handle the error from snd_usb_mixer_apply_create_quirk()
In reply to Sasha LevinFrom: Takashi Iwai <[email protected]>
[ Upstream commit 328e9f6973be2ee67862cb17bf6c0c5c5918cd72 ]
The error from snd_usb_mixer_apply_create_quirk() is ignored in the current usb-audio driver code, which will continue the probing even after the error. Let's take it more serious.
--- sound/usb/mixer.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
sound/usb/mixer.c +3 -1
@@ -3480,7 +3480,9 @@ int snd_usb_create_mixer(struct snd_usb_audio *chip, int ctrlif,if (err <0 ) goto _error; -snd_usb_mixer_apply_create_quirk (mixer); + err =snd_usb_mixer_apply_create_quirk (mixer); +if (err <0 ) + goto _error; err =snd_device_new (chip->card,SNDRV_DEV_CODEC , mixer, &dev_ops);if (err <0 )
Signature · 6 lines
2.20.1 _______________________________________________ Alsa-devel mailing list [email protected] https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Sasha Levin
maintainerPATCH 459/671 net/tls: fix socket wmem accounting on fallback with netem
In reply to Sasha LevinFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 5c4b4608fe100838c62591877101128467e56c00 ]
netem runs skb_orphan_partial() which "disconnects" the skb from normal TCP write memory accounting. We should not adjust sk->sk_wmem_alloc on the fallback path for such skbs.
--- net/tls/tls_device_fallback.c | 4 ++++ 1 file changed, 4 insertions(+)
net/tls/tls_device_fallback.c +4 -0
@@ -208,6 +208,10 @@ static void complete_skb(struct sk_buff *nskb, struct sk_buff *skb, int headln)update_chksum (nskb, headln); +/* sock_efree means skb must gone through skb_orphan_partial() */ +if (nskb->destructor == sock_efree) +return ; + delta = nskb->truesize - skb->truesize;if (likely (delta <0 ))WARN_ON_ONCE (refcount_sub_and_test (-delta, &sk->sk_wmem_alloc));
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 463/671 scsi: libfc: fix null pointer dereference on a null lport
In reply to Sasha LevinFrom: Colin Ian King <[email protected]>
[ Upstream commit 41a6bf6529edd10a6def42e3b2c34a7474bcc2f5 ]
Currently if lport is null then the null lport pointer is dereference when printing out debug via the FC_LPORT_DB macro. Fix this by using the more generic FC_LIBFC_DBG debug macro instead that does not use lport.
Addresses-Coverity: ("Dereference after null check")
--- drivers/scsi/libfc/fc_exch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/libfc/fc_exch.c +1 -1
@@ -2603,7 +2603,7 @@ void fc_exch_recv(struct fc_lport *lport, struct fc_frame *fp)/* lport lock ? */ if (!lport || lport->state ==LPORT_ST_DISABLED ) { -FC_LPORT_DBG (lport,"Receiving frames for an lport that " +FC_LIBFC_DBG ("Receiving frames for an lport that " "has not been initialized correctly\n" );fc_frame_free (fp);return ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 466/671 clk: sunxi-ng: v3s: add the missing PLL_DDR1
In reply to Sasha LevinFrom: Icenowy Zheng <[email protected]>
[ Upstream commit c5ed9475c22c89d5409402055142372e35d26a3f ]
The user manual of V3/V3s/S3 declares a PLL_DDR1, however it's forgot when developing the V3s CCU driver.
Add back the missing PLL_DDR1.
--- drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 19 +++++++++++++++---- drivers/clk/sunxi-ng/ccu-sun8i-v3s.h | 6 ++++-- 2 files changed, 19 insertions(+), 6 deletions(-)
drivers/clk/sunxi-ng/ccu-sun8i-v3s.c +15 -4
@@ -84,7 +84,7 @@ static SUNXI_CCU_NM_WITH_FRAC_GATE_LOCK(pll_ve_clk, "pll-ve",BIT (28 ),/* lock */ 0); -static SUNXI_CCU_NKM_WITH_GATE_LOCK(pll_ddr_clk, "pll-ddr", +static SUNXI_CCU_NKM_WITH_GATE_LOCK(pll_ddr0_clk, "pll-ddr0","osc24M" ,0x020 ,8 ,5 ,/* N */ 4, 2, /* K */
@@ -123,6 +123,14 @@ static SUNXI_CCU_NK_WITH_GATE_LOCK_POSTDIV(pll_periph1_clk, "pll-periph1",2 ,/* post-div */ 0); +static SUNXI_CCU_NM_WITH_GATE_LOCK(pll_ddr1_clk, "pll-ddr1", +"osc24M" ,0x04c , +8 ,7 ,/* N */ +0 ,2 ,/* M */ +BIT (31 ),/* gate */ +BIT (28 ),/* lock */ + 0); +static const char *const cpu_parents[] = {"osc32k" ,"osc24M" ,"pll-cpu" ,"pll-cpu" }; static SUNXI_CCU_MUX(cpu_clk, "cpu", cpu_parents,
@@ -310,7 +318,8 @@ static SUNXI_CCU_GATE(usb_phy0_clk, "usb-phy0", "osc24M", static SUNXI_CCU_GATE(usb_ohci0_clk, "usb-ohci0", "osc24M", 0x0cc, BIT(16), 0); -static const char *const dram_parents[] = {"pll-ddr" ,"pll-periph0-2x" }; +static const char *const dram_parents[] = {"pll-ddr0" ,"pll-ddr1" , +"pll-periph0-2x" }; static SUNXI_CCU_M_WITH_MUX(dram_clk, "dram", dram_parents, 0x0f4, 0, 4, 20, 2, CLK_IS_CRITICAL);
@@ -369,10 +378,11 @@ static struct ccu_common *sun8i_v3s_ccu_clks[] = { &pll_audio_base_clk.common, &pll_video_clk.common, &pll_ve_clk.common, - &pll_ddr_clk.common, + &pll_ddr0_clk.common, &pll_periph0_clk.common, &pll_isp_clk.common, &pll_periph1_clk.common, + &pll_ddr1_clk.common, &cpu_clk.common, &axi_clk.common, &ahb1_clk.common,
@@ -457,11 +467,12 @@ static struct clk_hw_onecell_data sun8i_v3s_hw_clks = { [CLK_PLL_AUDIO_8X] = &pll_audio_8x_clk.hw, [CLK_PLL_VIDEO] = &pll_video_clk.common.hw, [CLK_PLL_VE] = &pll_ve_clk.common.hw, - [CLK_PLL_DDR] = &pll_ddr_clk.common.hw, + [CLK_PLL_DDR0] = &pll_ddr0_clk.common.hw, [CLK_PLL_PERIPH0] = &pll_periph0_clk.common.hw, [CLK_PLL_PERIPH0_2X] = &pll_periph0_2x_clk.hw, [CLK_PLL_ISP] = &pll_isp_clk.common.hw, [CLK_PLL_PERIPH1] = &pll_periph1_clk.common.hw, + [CLK_PLL_DDR1] = &pll_ddr1_clk.common.hw, [CLK_CPU] = &cpu_clk.common.hw, [CLK_AXI] = &axi_clk.common.hw, [CLK_AHB1] = &ahb1_clk.common.hw,
drivers/clk/sunxi-ng/ccu-sun8i-v3s.h +4 -2
@@ -29,7 +29,7 @@#define CLK_PLL_AUDIO_8X 5#define CLK_PLL_VIDEO 6#define CLK_PLL_VE 7 -#define CLK_PLL_DDR 8 +#define CLK_PLL_DDR0 8#define CLK_PLL_PERIPH0 9#define CLK_PLL_PERIPH0_2X 10#define CLK_PLL_ISP 11
@@ -58,6 +58,8 @@/* And the GPU module clock is exported */ -#define CLK_NUMBER (CLK_MIPI_CSI + 1) +#define CLK_PLL_DDR1 74 + +#define CLK_NUMBER (CLK_PLL_DDR1 + 1)#endif /* _CCU_SUN8I_H3_H_ */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 468/671 libertas_tf: Use correct channel range in lbtf_geo_init
In reply to Sasha LevinFrom: YueHaibing <[email protected]>
[ Upstream commit 2ec4ad49b98e4a14147d04f914717135eca7c8b1 ]
It seems we should use 'range' instead of 'priv->range' in lbtf_geo_init(), because 'range' is the corret one related to current regioncode.
--- drivers/net/wireless/marvell/libertas_tf/cmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/marvell/libertas_tf/cmd.c +1 -1
@@ -69,7 +69,7 @@ static void lbtf_geo_init(struct lbtf_private *priv)break ; } -for (ch = priv->range.start; ch < priv->range.end; ch++) +for (ch = range->start; ch < range->end; ch++) priv->channels[CHAN_TO_IDX (ch)].flags =0 ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 470/671 usb: host: xhci-hub: fix extra endianness conversion
In reply to Sasha LevinFrom: Ruslan Bilovol <[email protected]>
[ Upstream commit 6269e4c76eacabaea0d0099200ae1a455768d208 ]
Don't do extra cpu_to_le32 conversion for put_unaligned_le32 because it is already implemented in this function.
Fixes sparse error:
xhci-hub.c:1152:44: warning: incorrect type in argument 1 (different base types)
xhci-hub.c:1152:44: expected unsigned int [usertype] val
xhci-hub.c:1152:44: got restricted __le32 [usertype]
--- drivers/usb/host/xhci-hub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/host/xhci-hub.c +1 -1
@@ -1104,7 +1104,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, } port_li =readl (ports[wIndex]->addr +PORTLI ); status =xhci_get_ext_port_status (temp, port_li); -put_unaligned_le32 (cpu_to_le32 (status), &buf[4 ]); +put_unaligned_le32 (status, &buf[4 ]); }break ;case SetPortFeature:
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 476/671 arm64: dts: renesas: r8a77995: Fix register range of display node
In reply to Sasha LevinFrom: Yoshihiro Kaneko <[email protected]>
[ Upstream commit 56d651e890f3befd616b6962a862f5ffa1a514fa ]
Since the R8A77995 SoC uses DU{0,1}, the range from the base address to the 0x4000 address is used.
This patch fixed it.
--- arch/arm64/boot/dts/renesas/r8a77995.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/renesas/r8a77995.dtsi +1 -1
@@ -938,7 +938,7 @@ du: display@feb00000 { compatible = "renesas,du-r8a77995"; - reg = <0 0xfeb00000 0 0x80000>; + reg = <0 0xfeb00000 0 0x40000>; interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>; clocks = <&cpg CPG_MOD 724>,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 478/671 ARM: dts: stm32: add missing vdda-supply to adc on stm32h743i-eval
In reply to Sasha LevinFrom: Fabrice Gasnier <[email protected]>
[ Upstream commit 493e84c5dc4d703d976b5875f5db22dae08a0782 ]
Add missing vdda-supply required by STM32 ADC.
board")
--- arch/arm/boot/dts/stm32h743i-eval.dts | 1 + 1 file changed, 1 insertion(+)
arch/arm/boot/dts/stm32h743i-eval.dts +1 -0
@@ -79,6 +79,7 @@ }; &adc_12 { + vdda-supply = <&vdda>; vref-supply = <&vdda>; status = "okay"; adc1: adc@0 {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 474/671 crypto: ccp - Reduce maximum stack usage
In reply to Sasha LevinFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 72c8117adfced37df101c8c0b3f363e0906f83f0 ]
Each of the operations in ccp_run_cmd() needs several hundred bytes of kernel stack. Depending on the inlining, these may need separate stack slots that add up to more than the warning limit, as shown in this clang based build:
drivers/crypto/ccp/ccp-ops.c:871:12: error: stack frame size of 1164 bytes in function 'ccp_run_aes_cmd' [-Werror,-Wframe-larger-than=] static int ccp_run_aes_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)
The problem may also happen when there is no warning, e.g. in the ccp_run_cmd()->ccp_run_aes_cmd()->ccp_run_aes_gcm_cmd() call chain with over 2000 bytes.
Mark each individual function as 'noinline_for_stack' to prevent this from happening, and move the calls to the two special cases for aes into the top-level function. This will keep the actual combined stack usage to the mimimum: 828 bytes for ccp_run_aes_gcm_cmd() and at most 524 bytes for each of the other cases.
--- drivers/crypto/ccp/ccp-ops.c | 52 +++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 21 deletions(-)
drivers/crypto/ccp/ccp-ops.c +31 -21
@@ -458,8 +458,8 @@ static int ccp_copy_from_sb(struct ccp_cmd_queue *cmd_q,return ccp_copy_to_from_sb (cmd_q, wa, jobid, sb, byte_swap, true); } -static int ccp_run_aes_cmac_cmd (struct ccp_cmd_queue *cmd_q, -struct ccp_cmd *cmd) +static noinline_for_stack int +ccp_run_aes_cmac_cmd (struct ccp_cmd_queue *cmd_q,struct ccp_cmd *cmd) {struct ccp_aes_engine *aes = &cmd->u.aes;struct ccp_dm_workarea key, ctx;
@@ -614,8 +614,8 @@ static int ccp_run_aes_cmac_cmd(struct ccp_cmd_queue *cmd_q,return ret; } -static int ccp_run_aes_gcm_cmd (struct ccp_cmd_queue *cmd_q, -struct ccp_cmd *cmd) +static noinline_for_stack int +ccp_run_aes_gcm_cmd (struct ccp_cmd_queue *cmd_q,struct ccp_cmd *cmd) {struct ccp_aes_engine *aes = &cmd->u.aes;struct ccp_dm_workarea key, ctx, final_wa, tag;
@@ -897,7 +897,8 @@ static int ccp_run_aes_gcm_cmd(struct ccp_cmd_queue *cmd_q,return ret; } -static int ccp_run_aes_cmd (struct ccp_cmd_queue *cmd_q,struct ccp_cmd *cmd) +static noinline_for_stack int +ccp_run_aes_cmd (struct ccp_cmd_queue *cmd_q,struct ccp_cmd *cmd) {struct ccp_aes_engine *aes = &cmd->u.aes;struct ccp_dm_workarea key, ctx;
@@ -907,12 +908,6 @@ static int ccp_run_aes_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)bool in_place = false;int ret; -if (aes->mode ==CCP_AES_MODE_CMAC ) -return ccp_run_aes_cmac_cmd (cmd_q, cmd); - -if (aes->mode ==CCP_AES_MODE_GCM ) -return ccp_run_aes_gcm_cmd (cmd_q, cmd); -if (!((aes->key_len ==AES_KEYSIZE_128 ) || (aes->key_len ==AES_KEYSIZE_192 ) || (aes->key_len ==AES_KEYSIZE_256 )))
@@ -1080,8 +1075,8 @@ static int ccp_run_aes_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)return ret; } -static int ccp_run_xts_aes_cmd (struct ccp_cmd_queue *cmd_q, -struct ccp_cmd *cmd) +static noinline_for_stack int +ccp_run_xts_aes_cmd (struct ccp_cmd_queue *cmd_q,struct ccp_cmd *cmd) {struct ccp_xts_aes_engine *xts = &cmd->u.xts;struct ccp_dm_workarea key, ctx;
@@ -1280,7 +1275,8 @@ static int ccp_run_xts_aes_cmd(struct ccp_cmd_queue *cmd_q,return ret; } -static int ccp_run_des3_cmd (struct ccp_cmd_queue *cmd_q,struct ccp_cmd *cmd) +static noinline_for_stack int +ccp_run_des3_cmd (struct ccp_cmd_queue *cmd_q,struct ccp_cmd *cmd) {struct ccp_des3_engine *des3 = &cmd->u.des3;
@@ -1476,7 +1472,8 @@ static int ccp_run_des3_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)return ret; } -static int ccp_run_sha_cmd (struct ccp_cmd_queue *cmd_q,struct ccp_cmd *cmd) +static noinline_for_stack int +ccp_run_sha_cmd (struct ccp_cmd_queue *cmd_q,struct ccp_cmd *cmd) {struct ccp_sha_engine *sha = &cmd->u.sha;struct ccp_dm_workarea ctx;
@@ -1820,7 +1817,8 @@ static int ccp_run_sha_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)return ret; } -static int ccp_run_rsa_cmd (struct ccp_cmd_queue *cmd_q,struct ccp_cmd *cmd) +static noinline_for_stack int +ccp_run_rsa_cmd (struct ccp_cmd_queue *cmd_q,struct ccp_cmd *cmd) {struct ccp_rsa_engine *rsa = &cmd->u.rsa;struct ccp_dm_workarea exp, src, dst;
@@ -1951,8 +1949,8 @@ static int ccp_run_rsa_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)return ret; } -static int ccp_run_passthru_cmd (struct ccp_cmd_queue *cmd_q, -struct ccp_cmd *cmd) +static noinline_for_stack int +ccp_run_passthru_cmd (struct ccp_cmd_queue *cmd_q,struct ccp_cmd *cmd) {struct ccp_passthru_engine *pt = &cmd->u.passthru;struct ccp_dm_workarea mask;
@@ -2083,7 +2081,8 @@ static int ccp_run_passthru_cmd(struct ccp_cmd_queue *cmd_q,return ret; } -static int ccp_run_passthru_nomap_cmd (struct ccp_cmd_queue *cmd_q, +static noinline_for_stack int +ccp_run_passthru_nomap_cmd (struct ccp_cmd_queue *cmd_q,struct ccp_cmd *cmd) {struct ccp_passthru_nomap_engine *pt = &cmd->u.passthru_nomap;
@@ -2424,7 +2423,8 @@ static int ccp_run_ecc_pm_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)return ret; } -static int ccp_run_ecc_cmd (struct ccp_cmd_queue *cmd_q,struct ccp_cmd *cmd) +static noinline_for_stack int +ccp_run_ecc_cmd (struct ccp_cmd_queue *cmd_q,struct ccp_cmd *cmd) {struct ccp_ecc_engine *ecc = &cmd->u.ecc;
@@ -2461,7 +2461,17 @@ int ccp_run_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)switch (cmd->engine) {case CCP_ENGINE_AES : - ret =ccp_run_aes_cmd (cmd_q, cmd); +switch (cmd->u.aes.mode) { +case CCP_AES_MODE_CMAC : + ret =ccp_run_aes_cmac_cmd (cmd_q, cmd); +break ; +case CCP_AES_MODE_GCM : + ret =ccp_run_aes_gcm_cmd (cmd_q, cmd); +break ; +default : + ret =ccp_run_aes_cmd (cmd_q, cmd); +break ; + }break ;case CCP_ENGINE_XTS_AES_128 : ret =ccp_run_xts_aes_cmd (cmd_q, cmd);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 480/671 net/mlx5: Fix mlx5_ifc_query_lag_out_bits
In reply to Sasha LevinFrom: Mark Zhang <[email protected]>
[ Upstream commit ea77388b02270b0af8dc57f668f311235ea068f0 ]
Remove the "reserved_at_40" field to match the device specification.
--- include/linux/mlx5/mlx5_ifc.h | 2 -- 1 file changed, 2 deletions(-)
include/linux/mlx5/mlx5_ifc.h +0 -2
@@ -9053,8 +9053,6 @@ struct mlx5_ifc_query_lag_out_bits {u8 syndrome[0x20 ]; -u8 reserved_at_40[0x40 ]; -struct mlx5_ifc_lagc_bits ctx; };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 324/671 ASoC: fix valid stream condition
In reply to Sasha LevinFrom: Jerome Brunet <[email protected]>
[ Upstream commit 6a7c59c6d9f3b280e81d7a04bbe4e55e90152dce ]
A stream may specify a rate range using 'rate_min' and 'rate_max', so a stream may be valid and not specify any rates. However, as stream cannot be valid and not have any channel. Let's use this condition instead to determine if a stream is valid or not.
--- sound/soc/soc-pcm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/soc-pcm.c +2 -2
@@ -42,8 +42,8 @@ static bool snd_soc_dai_stream_valid(struct snd_soc_dai *dai, int stream)else codec_stream = &dai->driver->capture; -/* If the codec specifies any rate at all, it supports the stream. */ -return codec_stream->rates; +/* If the codec specifies any channels at all, it supports the stream */ +return codec_stream->channels_min; }/**
Signature · 6 lines
2.20.1 _______________________________________________ Alsa-devel mailing list [email protected] https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Sasha Levin
maintainerPATCH 481/671 cifs: fix rmmod regression in cifs.ko caused by force_sig changes
In reply to Sasha LevinFrom: Steve French <[email protected]>
[ Upstream commit 247bc9470b1eeefc7b58cdf2c39f2866ba651509 ]
The global change from force_sig caused module unloading of cifs.ko to fail (since the cifsd process could not be killed, "rmmod cifs" now would always fail)
--- fs/cifs/connect.c | 1 + 1 file changed, 1 insertion(+)
fs/cifs/connect.c +1 -0
@@ -970,6 +970,7 @@ cifs_demultiplex_thread(void *p)mempool_resize (cifs_req_poolp, length + cifs_min_rcv);set_freezable (); +allow_signal (SIGKILL );while (server->tcpStatus != CifsExiting) {if (try_to_freeze ())continue ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 483/671 net: fix bpf_xdp_adjust_head regression for generic-XDP
In reply to Sasha LevinFrom: Jesper Dangaard Brouer <[email protected]>
[ Upstream commit 065af355470519bd184019a93ac579f22b036045 ]
When generic-XDP was moved to a later processing step by commit 458bf2f224f0 ("net: core: support XDP generic on stacked devices.") a regression was introduced when using bpf_xdp_adjust_head.
The issue is that after this commit the skb->network_header is now changed prior to calling generic XDP and not after. Thus, if the header is changed by XDP (via bpf_xdp_adjust_head), then skb->network_header also need to be updated again. Fix by calling skb_reset_network_header().
--- net/core/dev.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
net/core/dev.c +10 -5
@@ -4349,12 +4349,17 @@ static u32 netif_receive_generic_xdp(struct sk_buff *skb, act =bpf_prog_run_xdp (xdp_prog, xdp); +/* check if bpf_xdp_adjust_head was used */ off = xdp->data - orig_data; -if (off >0 ) -__skb_pull (skb, off); -else if (off <0 ) -__skb_push (skb, -off); - skb->mac_header += off; +if (off) { +if (off >0 ) +__skb_pull (skb, off); +else if (off <0 ) +__skb_push (skb, -off); + + skb->mac_header += off; +skb_reset_network_header (skb); + }/* check if bpf_xdp_adjust_tail was used. it can only "shrink" * pckt.
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 479/671 coredump: split pipe command whitespace before expanding template
In reply to Sasha LevinFrom: Paul Wise <[email protected]>
[ Upstream commit 315c69261dd3fa12dbc830d4fa00d1fad98d3b03 ]
Save the offsets of the start of each argument to avoid having to update pointers to each argument after every corename krealloc and to avoid having to duplicate the memory for the dump command.
Executable names containing spaces were previously being expanded from %e or %E and then split in the middle of the filename. This is incorrect behaviour since an argument list can represent arguments with spaces.
The splitting could lead to extra arguments being passed to the core dump handler that it might have interpreted as options or ignored completely.
Core dump handlers that are not aware of this Linux kernel issue will be using %e or %E without considering that it may be split and so they will be vulnerable to processes with spaces in their names breaking their argument list. If their internals are otherwise well written, such as if they are written in shell but quote arguments, they will work better after this change than before. If they are not well written, then there is a slight chance of breakage depending on the details of the code but they will already be fairly broken by the split filenames.
Core dump handlers that are aware of this Linux kernel issue will be placing %e or %E as the last item in their core_pattern and then aggregating all of the remaining arguments into one, separated by spaces. Alternatively they will be obtaining the filename via other methods. Both of these will be compatible with the new arrangement.
A side effect from this change is that unknown template types (for example %z) result in an empty argument to the dump handler instead of the argument being dropped. This is a desired change as:
It is easier for dump handlers to process empty arguments than dropped ones, especially if they are written in shell or don't pass each template item with a preceding command-line option in order to differentiate between individual template types. Most core_patterns in the wild do not use options so they can confuse different template types (especially numeric ones) if an earlier one gets dropped in old kernels. If the kernel introduces a new template type and a core_pattern uses it, the core dump handler might not expect that the argument can be dropped in old kernels.
For example, this can result in security issues when %d is dropped in old kernels. This happened with the corekeeper package in Debian and resulted in the interface between corekeeper and Linux having to be rewritten to use command-line options to differentiate between template types.
The core_pattern for most core dump handlers is written by the handler author who would generally not insert unknown template types so this change should be compatible with all the core dump handlers that exist.
--- fs/coredump.c | 44 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 39 insertions(+), 5 deletions(-)
fs/coredump.c +39 -5
@@ -7,6 +7,7 @@#include <linux/stat.h> #include <linux/fcntl.h> #include <linux/swap.h> +#include <linux/ctype.h> #include <linux/string.h> #include <linux/init.h> #include <linux/pagemap.h>
@@ -187,11 +188,13 @@ static int cn_print_exe_file(struct core_name *cn)* name into corename, which must have space for at least * CORENAME_MAX_SIZE bytes plus one byte for the zero terminator. */ -static int format_corename (struct core_name *cn,struct coredump_params *cprm) +static int format_corename (struct core_name *cn,struct coredump_params *cprm, +size_t **argv,int *argc) {const struct cred *cred =current_cred ();const char *pat_ptr = core_pattern;int ispipe = (*pat_ptr =='|' ); +bool was_space = false;int pid_in_pattern =0 ;int err =0 ;
@@ -201,12 +204,35 @@ static int format_corename(struct core_name *cn, struct coredump_params *cprm)return -ENOMEM ; cn->corename[0 ] ='\0' ; -if (ispipe) +if (ispipe) { +int argvs =sizeof (core_pattern) /2 ; + (*argv) =kmalloc_array (argvs,sizeof (**argv),GFP_KERNEL ); +if (!(*argv)) +return -ENOMEM ; + (*argv)[(*argc)++] =0 ; ++pat_ptr; + }/* Repeat as long as we have more pattern to process and more output space */ while (*pat_ptr) { +/* +* Split on spaces before doing template expansion so that +* %e and %E don't get split if they have spaces in them +*/ +if (ispipe) { +if (isspace (*pat_ptr)) { + was_space = true; + pat_ptr++; +continue ; + }else if (was_space) { + was_space = false; + err =cn_printf (cn,"%c" ,'\0' ); +if (err) +return err; + (*argv)[(*argc)++] = cn->used; + } + }if (*pat_ptr !='%' ) { err =cn_printf (cn,"%c" , *pat_ptr++); }else {
@@ -546,6 +572,8 @@ void do_coredump(const siginfo_t *siginfo)struct cred *cred;int retval =0 ;int ispipe; +size_t *argv =NULL ; +int argc =0 ;struct files_struct *displaced;/* require nonrelative corefile path and be extra careful */ bool need_suid_safe = false;
@@ -592,9 +620,10 @@ void do_coredump(const siginfo_t *siginfo) old_cred =override_creds (cred); - ispipe =format_corename (&cn, &cprm); + ispipe =format_corename (&cn, &cprm, &argv, &argc);if (ispipe) { +int argi;int dump_count;char **helper_argv;struct subprocess_info *sub_info;
@@ -637,12 +666,16 @@ void do_coredump(const siginfo_t *siginfo) goto fail_dropcount; } - helper_argv =argv_split (GFP_KERNEL , cn.corename,NULL ); + helper_argv =kmalloc_array (argc +1 ,sizeof (*helper_argv), +GFP_KERNEL );if (!helper_argv) {printk (KERN_WARNING "%s failed to allocate memory\n" , __func__); goto fail_dropcount; } +for (argi =0 ; argi < argc; argi++) + helper_argv[argi] = cn.corename + argv[argi]; + helper_argv[argi] =NULL ; retval = -ENOMEM ; sub_info = call_usermodehelper_setup(helper_argv[0],
@@ -652,7 +685,7 @@ void do_coredump(const siginfo_t *siginfo) retval =call_usermodehelper_exec (sub_info,UMH_WAIT_EXEC ); -argv_free (helper_argv); +kfree (helper_argv);if (retval) {printk (KERN_INFO "Core dump to |%s pipe failed\n" , cn.corename);
@@ -766,6 +799,7 @@ void do_coredump(const siginfo_t *siginfo)if (ispipe)atomic_dec (&core_dump_count); fail_unlock: +kfree (argv);kfree (cn.corename);coredump_finish (mm, core_dumped);revert_creds (old_cred);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 491/671 ASoC: cs4349: Use PM ops 'cs4349_runtime_pm'
In reply to Sasha LevinFrom: YueHaibing <[email protected]>
[ Upstream commit 9b4275c415acca6264a3d7f1182589959c93d530 ]
sound/soc/codecs/cs4349.c:358:32: warning:
cs4349_runtime_pm defined but not used [-Wunused-const-variable=]
cs4349_runtime_pm ops already defined, it seems we should enable it.
--- sound/soc/codecs/cs4349.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/codecs/cs4349.c +1 -0
@@ -381,6 +381,7 @@ static struct i2c_driver cs4349_i2c_driver = { .driver = { .name = "cs4349", .of_match_table = cs4349_of_match, + .pm = &cs4349_runtime_pm, }, .id_table = cs4349_i2c_id, .probe = cs4349_i2c_probe,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 482/671 iio: tsl2772: Use devm_add_action_or_reset for tsl2772_chip_off
In reply to Sasha LevinFrom: Chuhong Yuan <[email protected]>
[ Upstream commit 338084135aeddb103624a6841972fb8588295cc6 ]
Use devm_add_action_or_reset to call tsl2772_chip_off when the device is removed.
This also fixes the issue that the chip is turned off before the device is unregistered.
Not marked for stable as fairly hard to hit the bug and this is in the middle of a set making other cleanups to the driver. Hence will probably need explicit backporting.
--- drivers/iio/light/tsl2772.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
drivers/iio/light/tsl2772.c +13 -3
@@ -716,6 +716,13 @@ static int tsl2772_chip_off(struct iio_dev *indio_dev)return tsl2772_write_control_reg (chip,0x00 ); } +static void tsl2772_chip_off_action (void *data) +{ +struct iio_dev *indio_dev = data; + +tsl2772_chip_off (indio_dev); +} +/** * tsl2772_invoke_change - power cycle the device to implement the user * parameters
@@ -1711,9 +1718,14 @@ static int tsl2772_probe(struct i2c_client *clientp,if (ret <0 )return ret; + ret =devm_add_action_or_reset (&clientp->dev, + tsl2772_chip_off_action, + indio_dev); +if (ret <0 ) +return ret; + ret =iio_device_register (indio_dev);if (ret) { -tsl2772_chip_off (indio_dev);dev_err (&clientp->dev,"%s: iio registration failed\n" , __func__);return ret;
@@ -1740,8 +1752,6 @@ static int tsl2772_remove(struct i2c_client *client) {struct iio_dev *indio_dev =i2c_get_clientdata (client); -tsl2772_chip_off (indio_dev); -iio_device_unregister (indio_dev);return 0 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 496/671 drm: rcar-du: lvds: Fix bridge_to_rcar_lvds
In reply to Sasha LevinFrom: Fabrizio Castro <[email protected]>
[ Upstream commit 0b936e6122738f4cf474d1f3ff636cba0edc8b94 ]
Using name "bridge" for macro bridge_to_rcar_lvds argument doesn't work when the pointer name used by the caller is not "bridge". Rename the argument to "b" to allow for any pointer name.
While at it, fix the connector_to_rcar_lvds macro similarly.
--- drivers/gpu/drm/rcar-du/rcar_lvds.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/rcar-du/rcar_lvds.c +4 -4
@@ -59,11 +59,11 @@ struct rcar_lvds {enum rcar_lvds_mode mode; }; -#define bridge_to_rcar_lvds (bridge) \ - container_of(bridge, struct rcar_lvds, bridge) +#define bridge_to_rcar_lvds (b) \ + container_of(b, struct rcar_lvds, bridge) -#define connector_to_rcar_lvds (connector) \ - container_of(connector, struct rcar_lvds, connector) +#define connector_to_rcar_lvds (c) \ + container_of(c, struct rcar_lvds, connector)static void rcar_lvds_write (struct rcar_lvds *lvds,u32 reg,u32 data) {
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 488/671 RDMA/hns: Bugfix for slab-out-of-bounds when unloading hip08 driver
In reply to Sasha LevinFrom: Xi Wang <[email protected]>
[ Upstream commit 9bba3f0cbfc8abf2e1549ea03c0128186081d7a8 ]
kasan will report a BUG when run command 'rmmod hns_roce_hw_v2', the calltrace is as follows:
==================================================================
BUG: KASAN: slab-out-of-bounds in hns_roce_table_mhop_put+0x584/0x828 [hns_roce] Read of size 8 at addr ffff802185e08300 by task rmmod/270 Call trace: dump_backtrace+0x0/0x1e8 show_stack+0x14/0x20 dump_stack+0xc4/0xfc print_address_description+0x60/0x270 __kasan_report+0x164/0x1b8 kasan_report+0xc/0x18 __asan_load8+0x84/0xa8 hns_roce_table_mhop_put+0x584/0x828 [hns_roce] hns_roce_table_put+0x174/0x1a0 [hns_roce] hns_roce_mr_free+0x124/0x210 [hns_roce] hns_roce_dereg_mr+0x90/0xb8 [hns_roce] ib_dealloc_pd_user+0x60/0xf0 ib_mad_port_close+0x128/0x1d8 ib_mad_remove_device+0x94/0x118 remove_client_context+0xa0/0xe0 disable_device+0xfc/0x1c0 __ib_unregister_device+0x60/0xe0 ib_unregister_device+0x24/0x38 hns_roce_exit+0x3c/0x138 [hns_roce] __hns_roce_hw_v2_uninit_instance.isra.30+0x28/0x50 [hns_roce_hw_v2] hns_roce_hw_v2_uninit_instance+0x44/0x60 [hns_roce_hw_v2] hclge_uninit_client_instance+0x15c/0x238 [hclge] hnae3_uninit_client_instance+0x84/0xa8 [hnae3] hnae3_unregister_client+0x84/0x158 [hnae3] hns_roce_hw_v2_exit+0x14/0x20 [hns_roce_hw_v2] __arm64_sys_delete_module+0x20c/0x308 el0_svc_handler+0xbc/0x210 el0_svc+0x8/0xc Allocated by task 255: __kasan_kmalloc.isra.0+0xd0/0x180 kasan_kmalloc+0xc/0x18 __kmalloc+0x16c/0x328 hns_roce_init_hem_table+0x20c/0x428 [hns_roce] hns_roce_init+0x214/0xfe0 [hns_roce] __hns_roce_hw_v2_init_instance+0x284/0x330 [hns_roce_hw_v2] hns_roce_hw_v2_init_instance+0xd0/0x1b8 [hns_roce_hw_v2] hclge_init_roce_client_instance+0x180/0x310 [hclge] hclge_init_client_instance+0xcc/0x508 [hclge] hnae3_init_client_instance.part.3+0x3c/0x80 [hnae3] hnae3_register_client+0x134/0x1a8 [hnae3] 0xffff200009c00014 do_one_initcall+0x9c/0x3e0 do_init_module+0xd4/0x2d8 load_module+0x3284/0x3690 __se_sys_init_module+0x274/0x308 __arm64_sys_init_module+0x40/0x50 el0_svc_handler+0xbc/0x210 el0_svc+0x8/0xc Freed by task 0:
(stack is not available)
The buggy address belongs to the object at ffff802185e06300 which belongs to the cache kmalloc-8k of size 8192 The buggy address is located 0 bytes to the right of 8192-byte region [ffff802185e06300, ffff802185e08300) The buggy address belongs to the page: page:ffff7fe008617800 refcount:1 mapcount:0 mapping:ffff802340020e00 index:0x0 compound_mapcount: 0 flags: 0x5fffe00000010200(slab|head) raw: 5fffe00000010200 dead000000000100 dead000000000200 ffff802340020e00 raw: 0000000000000000 00000000803e003e 00000001ffffffff 0000000000000000 page dumped because: kasan: bad access detected Memory state around the buggy address: ffff802185e08200: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ffff802185e08280: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 >ffff802185e08300: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
^ffff802185e08380: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fcffff802185e08400: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
==================================================================
Disabling lock debugging due to kernel taint
--- drivers/infiniband/hw/hns/hns_roce_hem.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
drivers/infiniband/hw/hns/hns_roce_hem.c +13 -6
@@ -54,12 +54,13 @@ bool hns_roce_check_whether_mhop(struct hns_roce_dev *hr_dev, u32 type)EXPORT_SYMBOL_GPL (hns_roce_check_whether_mhop);static bool hns_roce_check_hem_null (struct hns_roce_hem **hem,u64 start_idx, -u32 bt_chunk_num) +u32 bt_chunk_num,u64 hem_max_num) { -int i; +u64 check_max_num = start_idx + bt_chunk_num; +u64 i; -for (i =0 ; i < bt_chunk_num; i++) -if (hem[start_idx + i]) +for (i = start_idx; (i < check_max_num) && (i < hem_max_num); i++) +if (hem[i])return false;return true;
@@ -413,6 +414,12 @@ static int hns_roce_table_mhop_get(struct hns_roce_dev *hr_dev,return -EINVAL ; } +if (unlikely (hem_idx >= table->num_hem)) { +dev_err (dev,"Table %d exceed hem limt idx = %llu,max = %lu!\n" , + table->type, hem_idx, table->num_hem); +return -EINVAL ; + } +mutex_lock (&table->mutex);if (table->hem[hem_idx]) {
@@ -649,7 +656,7 @@ static void hns_roce_table_mhop_put(struct hns_roce_dev *hr_dev,if (check_whether_bt_num_2 (table->type, hop_num)) { start_idx = mhop.l0_idx * chunk_ba_num;if (hns_roce_check_hem_null (table->hem, start_idx, - chunk_ba_num)) { + chunk_ba_num, table->num_hem)) {if (table->type <HEM_TYPE_MTT && hr_dev->hw->clear_hem (hr_dev, table, obj,0 ))dev_warn (dev,"Clear HEM base address failed.\n" );
@@ -663,7 +670,7 @@ static void hns_roce_table_mhop_put(struct hns_roce_dev *hr_dev, start_idx = mhop.l0_idx * chunk_ba_num * chunk_ba_num + mhop.l1_idx * chunk_ba_num;if (hns_roce_check_hem_null (table->hem, start_idx, - chunk_ba_num)) { + chunk_ba_num, table->num_hem)) {if (hr_dev->hw->clear_hem (hr_dev, table, obj,1 ))dev_warn (dev,"Clear HEM base address failed.\n" );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 503/671 mac80211: minstrel_ht: fix per-group max throughput rate initialization
In reply to Sasha LevinFrom: Felix Fietkau <[email protected]>
[ Upstream commit 56dd918ff06e3ee24d8067e93ed12b2a39e71394 ]
The group number needs to be multiplied by the number of rates per group to get the full rate index
--- net/mac80211/rc80211_minstrel_ht.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/mac80211/rc80211_minstrel_ht.c +1 -1
@@ -529,7 +529,7 @@ minstrel_ht_update_stats(struct minstrel_priv *mp, struct minstrel_ht_sta *mi)/* (re)Initialize group rate indexes */ for (j =0 ; j <MAX_THR_RATES ; j++) - tmp_group_tp_rate[j] = group; + tmp_group_tp_rate[j] =MCS_GROUP_RATES * group;for (i =0 ; i <MCS_GROUP_RATES ; i++) {if (!(mi->supported[group] &BIT (i)))
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 497/671 bnxt_en: Fix handling FRAG_ERR when NVM_INSTALL_UPDATE cmd fails
In reply to Sasha LevinFrom: Vasundhara Volam <[email protected]>
[ Upstream commit dd2ebf3404c7c295014bc025dea23960960ceb1a ]
If FW returns FRAG_ERR in response error code, driver is resending the command only when HWRM command returns success. Fix the code to resend NVM_INSTALL_UPDATE command with DEFRAG install flags, if FW returns FRAG_ERR in its response error code.
--- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +5 -7
@@ -1778,21 +1778,19 @@ static int bnxt_flash_package_from_file(struct net_device *dev,mutex_lock (&bp->hwrm_cmd_lock); hwrm_err =_hwrm_send_message (bp, &install,sizeof (install),INSTALL_PACKAGE_TIMEOUT ); -if (hwrm_err) - goto flash_pkg_exit; - -if (resp->error_code) { +if (hwrm_err) {u8 error_code = ((struct hwrm_err_output *)resp)->cmd_err; -if (error_code ==NVM_INSTALL_UPDATE_CMD_ERR_CODE_FRAG_ERR ) { +if (resp->error_code && error_code == +NVM_INSTALL_UPDATE_CMD_ERR_CODE_FRAG_ERR ) { install.flags |=cpu_to_le16 (NVM_INSTALL_UPDATE_REQ_FLAGS_ALLOWED_TO_DEFRAG ); hwrm_err =_hwrm_send_message (bp, &install,sizeof (install),INSTALL_PACKAGE_TIMEOUT ); -if (hwrm_err) - goto flash_pkg_exit; } +if (hwrm_err) + goto flash_pkg_exit; }if (resp->result) {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 501/671 dmaengine: dw: platform: Switch to acpi_dma_controller_register()
In reply to Sasha LevinFrom: Andy Shevchenko <[email protected]>
[ Upstream commit e7b8514e4d68bec21fc6385fa0a66797ddc34ac9 ]
There is a possibility to have registered ACPI DMA controller while it has been gone already.
To avoid the potential crash, move to non-managed acpi_dma_controller_register().
--- drivers/dma/dw/platform.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
drivers/dma/dw/platform.c +12 -2
@@ -87,13 +87,20 @@ static void dw_dma_acpi_controller_register(struct dw_dma *dw)dma_cap_set (DMA_SLAVE , info->dma_cap); info->filter_fn = dw_dma_acpi_filter; - ret =devm_acpi_dma_controller_register (dev, acpi_dma_simple_xlate, - info); + ret =acpi_dma_controller_register (dev, acpi_dma_simple_xlate, info);if (ret) dev_err(dev, "could not register acpi_dma_controller\n"); } + +static void dw_dma_acpi_controller_free (struct dw_dma *dw) +{ +struct device *dev = dw->dma.dev; + +acpi_dma_controller_free (dev); +}#else /* !CONFIG_ACPI */ static inline void dw_dma_acpi_controller_register (struct dw_dma *dw) {} +static inline void dw_dma_acpi_controller_free (struct dw_dma *dw) {}#endif /* !CONFIG_ACPI */ #ifdef CONFIG_OF
@@ -249,6 +256,9 @@ static int dw_remove(struct platform_device *pdev) {struct dw_dma_chip *chip =platform_get_drvdata (pdev); +if (ACPI_HANDLE (&pdev->dev)) +dw_dma_acpi_controller_free (chip->dw); +if (pdev->dev.of_node)of_dma_controller_free (pdev->dev.of_node);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 509/671 media: em28xx: Fix exception handling in em28xx_alloc_urbs()
In reply to Sasha LevinFrom: Markus Elfring <[email protected]>
[ Upstream commit ecbce48f1ff2442371ebcd12ec0ecddb431fbd72 ]
A null pointer would be passed to a call of the function "kfree" directly after a call of the function "kcalloc" failed at one place. Pass the data structure member "urb" instead for which memory was allocated before (so that this resource will be properly cleaned up).
This issue was detected by using the Coccinelle software.
--- drivers/media/usb/em28xx/em28xx-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/usb/em28xx/em28xx-core.c +1 -1
@@ -930,7 +930,7 @@ int em28xx_alloc_urbs(struct em28xx *dev, enum em28xx_mode mode, int xfer_bulk, usb_bufs->buf =kcalloc (num_bufs,sizeof (void *),GFP_KERNEL );if (!usb_bufs->buf) { -kfree (usb_bufs->buf); +kfree (usb_bufs->urb);return -ENOMEM ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 511/671 ahci: Do not export local variable ahci_em_messages
In reply to Sasha LevinFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 60fc35f327e0a9e60b955c0f3c3ed623608d1baa ]
The commit ed08d40cdec4
("ahci: Changing two module params with static and __read_mostly")
moved ahci_em_messages to be static while missing the fact of exporting it.
WARNING: "ahci_em_messages" [vmlinux] is a static EXPORT_SYMBOL_GPL
Drop export for the local variable ahci_em_messages.
--- drivers/ata/libahci.c | 1 - 1 file changed, 1 deletion(-)
drivers/ata/libahci.c +0 -1
@@ -191,7 +191,6 @@ struct ata_port_operations ahci_pmp_retry_srst_ops = {EXPORT_SYMBOL_GPL (ahci_pmp_retry_srst_ops);static bool ahci_em_messages__read_mostly = true; -EXPORT_SYMBOL_GPL (ahci_em_messages);module_param (ahci_em_messages, bool,0444 );/* add other LED protocol types when they become supported */ MODULE_PARM_DESC(ahci_em_messages,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 512/671 rxrpc: Fix lack of conn cleanup when local endpoint is cleaned up [ver #2]
In reply to Sasha LevinFrom: David Howells <[email protected]>
[ Upstream commit d12040b6933f684a26773afad46dbba9778608d7 ]
When a local endpoint is ceases to be in use, such as when the kafs module is unloaded, the kernel will emit an assertion failure if there are any outstanding client connections:
rxrpc: Assertion failed ------------[ cut here ]------------ kernel BUG at net/rxrpc/local_object.c:433!
and even beyond that, will evince other oopses if there are service connections still present.
Fix this by:
(1) Removing the triggering of connection reaping when an rxrpc socket is released. These don't actually clean up the connections anyway - and further, the local endpoint may still be in use through another socket.
(2) Mark the local endpoint as dead when we start the process of tearing it down.
(3) When destroying a local endpoint, strip all of its client connections from the idle list and discard the ref on each that the list was holding.
(4) When destroying a local endpoint, call the service connection reaper directly (rather than through a workqueue) to immediately kill off all outstanding service connections.
(5) Make the service connection reaper reap connections for which the local endpoint is marked dead.
Only after destroying the connections can we close the socket lest we get an oops in a workqueue that's looking at a connection or a peer.
--- net/rxrpc/af_rxrpc.c | 3 --- net/rxrpc/ar-internal.h | 1 + net/rxrpc/conn_client.c | 44 ++++++++++++++++++++++++++++++++++++++++ net/rxrpc/conn_object.c | 2 +- net/rxrpc/local_object.c | 5 ++++- 5 files changed, 50 insertions(+), 5 deletions(-)
net/rxrpc/af_rxrpc.c +0 -3
@@ -869,7 +869,6 @@ static void rxrpc_sock_destructor(struct sock *sk)static int rxrpc_release_sock (struct sock *sk) {struct rxrpc_sock *rx =rxrpc_sk (sk); -struct rxrpc_net *rxnet =rxrpc_net (sock_net (&rx->sk));_enter ("%p{%d,%d}" , sk, sk->sk_state,refcount_read (&sk->sk_refcnt));
@@ -905,8 +904,6 @@ static int rxrpc_release_sock(struct sock *sk)rxrpc_release_calls_on_socket (rx);flush_workqueue (rxrpc_workqueue);rxrpc_purge_queue (&sk->sk_receive_queue); -rxrpc_queue_work (&rxnet->service_conn_reaper); -rxrpc_queue_work (&rxnet->client_conn_reaper);rxrpc_unuse_local (rx->local); rx->local =NULL ;
net/rxrpc/ar-internal.h +1 -0
@@ -903,6 +903,7 @@ void rxrpc_disconnect_client_call(struct rxrpc_call *);void rxrpc_put_client_conn (struct rxrpc_connection *);void rxrpc_discard_expired_client_conns (struct work_struct *);void rxrpc_destroy_all_client_connections (struct rxrpc_net *); +void rxrpc_clean_up_local_conns (struct rxrpc_local *);/* * conn_event.c
net/rxrpc/conn_client.c +44 -0
47 lines not on this page · raw message
net/rxrpc/conn_object.c +1 -1
@@ -401,7 +401,7 @@ void rxrpc_service_connection_reaper(struct work_struct *work)if (conn->state ==RXRPC_CONN_SERVICE_PREALLOC )continue ; -if (rxnet->live) { +if (rxnet->live && !conn->params.local->dead) { idle_timestamp =READ_ONCE (conn->idle_timestamp); expire_at = idle_timestamp + rxrpc_connection_expiry *HZ ;if (conn->params.local->service_closed)
net/rxrpc/local_object.c +4 -1
@@ -430,11 +430,14 @@ static void rxrpc_local_destroyer(struct rxrpc_local *local)_enter ("%d" , local->debug_id); + local->dead = true; +mutex_lock (&rxnet->local_mutex);list_del_init (&local->link);mutex_unlock (&rxnet->local_mutex); -ASSERT (RB_EMPTY_ROOT (&local->client_conns)); +rxrpc_clean_up_local_conns (local); +rxrpc_service_connection_reaper (&rxnet->service_conn_reaper);ASSERT (!local->service);if (socket) {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 514/671 hwmon: (lm75) Fix write operations for negative temperatures
In reply to Sasha LevinFrom: Guenter Roeck <[email protected]>
[ Upstream commit 7d82fcc9d9e81241778aaa22fda7be753e237d86 ]
Writes into limit registers fail if the temperature written is negative. The regmap write operation checks the value range, regmap_write accepts an unsigned int as parameter, and the temperature value passed to regmap_write is kept in a variable declared as long. Negative values are converted large unsigned integers, which fails the range check. Fix by type casting the temperature to u16 when calling regmap_write().
--- drivers/hwmon/lm75.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hwmon/lm75.c +1 -1
@@ -165,7 +165,7 @@ static int lm75_write(struct device *dev, enum hwmon_sensor_types type, temp =DIV_ROUND_CLOSEST (temp << (resolution -8 ),1000 ) << (16 - resolution); -return regmap_write (data->regmap, reg, temp); +return regmap_write (data->regmap, reg, (u16 )temp); } static umode_t lm75_is_visible(const void *data, enum hwmon_sensor_types type,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 510/671 iommu/mediatek: Fix iova_to_phys PA start for 4GB mode
In reply to Sasha LevinFrom: Yong Wu <[email protected]>
[ Upstream commit 76ce65464fcd2c21db84391572b7938b716aceb0 ]
In M4U 4GB mode, the physical address is remapped as below:
CPU Physical address:
====================
0 1G 2G 3G 4G 5G |---A---|---B---|---C---|---D---|---E---|
+--I/O--+------------Memory-------------+
IOMMU output physical address:
=============================
4G 5G 6G 7G 8G
|---E---|---B---|---C---|---D---|
+------------Memory-------------+The Region 'A'(I/O) can not be mapped by M4U; For Region 'B'/'C'/'D', the bit32 of the CPU physical address always is needed to set, and for Region 'E', the CPU physical address keep as is. something looks like this:
CPU PA -> M4U OUTPUT PA 0x4000_0000 0x1_4000_0000 (Add bit32) 0x8000_0000 0x1_8000_0000 ... 0xc000_0000 0x1_c000_0000 ... 0x1_0000_0000 0x1_0000_0000 (No change)
Additionally, the iommu consumers always use the CPU phyiscal address.
The PA in the iova_to_phys that is got from v7s always is u32, But from the CPU point of view, PA only need add BIT(32) when PA < 0x4000_0000.
for 4GB mode")
--- drivers/iommu/mtk_iommu.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-)
drivers/iommu/mtk_iommu.c +25 -1
@@ -115,6 +115,30 @@ struct mtk_iommu_domain {static struct iommu_ops mtk_iommu_ops; +/* +* In M4U 4GB mode, the physical address is remapped as below: +* +* CPU Physical address: +* ==================== +* +* 0 1G 2G 3G 4G 5G +* |---A---|---B---|---C---|---D---|---E---| +* +--I/O--+------------Memory-------------+ +* +* IOMMU output physical address: +* ============================= +* +* 4G 5G 6G 7G 8G +* |---E---|---B---|---C---|---D---| +* +------------Memory-------------+ +* +* The Region 'A'(I/O) can NOT be mapped by M4U; For Region 'B'/'C'/'D', the +* bit32 of the CPU physical address always is needed to set, and for Region +* 'E', the CPU physical address keep as is. +* Additionally, The iommu consumers always use the CPU phyiscal address. +*/ +#define MTK_IOMMU_4GB_MODE_REMAP_BASE 0x40000000 +static LIST_HEAD (m4ulist);/* List all the M4U HWs */ #define for_each_m4u (data) list_for_each_entry(data, &m4ulist, list)
@@ -409,7 +433,7 @@ static phys_addr_t mtk_iommu_iova_to_phys(struct iommu_domain *domain, pa = dom->iop->iova_to_phys (dom->iop, iova);spin_unlock_irqrestore (&dom->pgtlock, flags); -if (data->enable_4GB) +if (data->enable_4GB && pa <MTK_IOMMU_4GB_MODE_REMAP_BASE ) pa |=BIT_ULL (32 );return pa;
Signature · 6 lines
2.20.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Sasha Levin
maintainerPATCH 344/671 ALSA: aica: Fix a long-time build breakage
In reply to Sasha LevinFrom: Takashi Iwai <[email protected]>
[ Upstream commit 534420c6ff87d3052540f1fd346e0adcff440819 ]
The build of aica sound driver has been broken since the timer API conversion and some code rewrite. This patch fixes the breakage by using the common substream field, as well as a bit cleaning up wrt the timer handling in the code.
--- sound/sh/aica.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-)
sound/sh/aica.c +4 -10
@@ -303,7 +303,7 @@ static void aica_period_elapsed(struct timer_list *t) {struct snd_card_aica *dreamcastcard =from_timer (dreamcastcard, t, timer); -struct snd_pcm_substream *substream = dreamcastcard->timer_substream; +struct snd_pcm_substream *substream = dreamcastcard->substream;/*timer function - so cannot sleep */ int play_period;struct snd_pcm_runtime *runtime;
@@ -335,13 +335,6 @@ static void spu_begin_dma(struct snd_pcm_substream *substream) dreamcastcard = substream->pcm->private_data;/*get the queue to do the work */ schedule_work (&(dreamcastcard->spu_dma_work)); -/* Timer may already be running */ -if (unlikely (dreamcastcard->timer_substream)) { -mod_timer (&dreamcastcard->timer, jiffies +4 ); -return ; - } -timer_setup (&dreamcastcard->timer, aica_period_elapsed,0 ); - dreamcastcard->timer_substream = substream;mod_timer (&dreamcastcard->timer, jiffies +4 ); }
@@ -379,8 +372,8 @@ static int snd_aicapcm_pcm_close(struct snd_pcm_substream {struct snd_card_aica *dreamcastcard = substream->pcm->private_data;flush_work (&(dreamcastcard->spu_dma_work)); -if (dreamcastcard->timer_substream) -del_timer (&dreamcastcard->timer); +del_timer (&dreamcastcard->timer); + dreamcastcard->substream =NULL ;kfree (dreamcastcard->channel);spu_disable ();return 0 ;
@@ -615,6 +608,7 @@ static int snd_aica_probe(struct platform_device *devptr) "Yamaha AICA Super Intelligent Sound Processor for SEGA Dreamcast");/* Prepare to use the queue */ INIT_WORK (&(dreamcastcard->spu_dma_work), run_spu_dma); +timer_setup (&dreamcastcard->timer, aica_period_elapsed,0 );/* Load the PCM 'chip' */ err =snd_aicapcmchip (dreamcastcard,0 );if (unlikely (err <0 ))
Signature · 6 lines
2.20.1 _______________________________________________ Alsa-devel mailing list [email protected] https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Sasha Levin
maintainerPATCH 516/671 power: supply: Init device wakeup after device_add()
In reply to Sasha LevinFrom: Stephen Boyd <[email protected]>
[ Upstream commit 8288022284859acbcc3cf1a073a1e2692d6c2543 ]
We may want to use the device pointer in device_init_wakeup() with functions that expect the device to already be added with device_add(). For example, if we were to link the device initializing wakeup to something in sysfs such as a class for wakeups we'll run into an error. It looks like this code was written with the assumption that the device would be added before initializing wakeup due to the order of operations in power_supply_unregister().
Let's change the order of operations so we don't run into problems here.
--- drivers/power/supply/power_supply_core.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/power/supply/power_supply_core.c +5 -5
@@ -902,14 +902,14 @@ __power_supply_register(struct device *parent, }spin_lock_init (&psy->changed_lock); - rc =device_init_wakeup (dev, ws); -if (rc) - goto wakeup_init_failed; - rc =device_add (dev);if (rc) goto device_add_failed; + rc =device_init_wakeup (dev, ws); +if (rc) + goto wakeup_init_failed; + rc =psy_register_thermal (psy);if (rc) goto register_thermal_failed;
@@ -946,8 +946,8 @@ __power_supply_register(struct device *parent,psy_unregister_thermal (psy); register_thermal_failed:device_del (dev); -device_add_failed: wakeup_init_failed: +device_add_failed: check_supplies_failed: dev_set_name_failed:put_device (dev);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 521/671 usb: typec: tps6598x: Fix build error without CONFIG_REGMAP_I2C
In reply to Sasha LevinFrom: YueHaibing <[email protected]>
[ Upstream commit 35af2445dc306403254a181507b390ec9eb725d5 ]
If CONFIG_REGMAP_I2C is not set, building fails:
drivers/usb/typec/tps6598x.o: In function `tps6598x_probe':
tps6598x.c:(.text+0x5f0): undefined reference to `__devm_regmap_init_i2c'
Select REGMAP_I2C to fix this.
--- drivers/usb/typec/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/usb/typec/Kconfig +1 -0
@@ -95,6 +95,7 @@ source "drivers/usb/typec/ucsi/Kconfig" config TYPEC_TPS6598X tristate "TI TPS6598x USB Power Delivery controller driver" depends on I2C + select REGMAP_I2C help Say Y or M here if your system has TI TPS65982 or TPS65983 USB Power Delivery controller.
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 525/671 ath9k: dynack: fix possible deadlock in ath_dynack_node_{de}init
In reply to Sasha LevinFrom: Lorenzo Bianconi <[email protected]>
[ Upstream commit e1aa1a1db3b01c9890e82cf065cee99962ba1ed9 ]
Fix following lockdep warning disabling bh in
ath_dynack_node_init/ath_dynack_node_deinit
[ 75.955878] --------------------------------
[ 75.955880] inconsistent {SOFTIRQ-ON-W} -> {IN-SOFTIRQ-W} usage.
[ 75.955884] swapper/0/0 [HC0[0]:SC1[3]:HE1:SE0] takes:
[ 75.955888] 00000000792a7ee0 (&(&da->qlock)->rlock){+.?.}, at: ath_dynack_sample_ack_ts+0x4d/0xa0 [ath9k_hw]
[ 75.955905] {SOFTIRQ-ON-W} state was registered at:
[ 75.955912] lock_acquire+0x9a/0x160
[ 75.955917] _raw_spin_lock+0x2c/0x70
[ 75.955927] ath_dynack_node_init+0x2a/0x60 [ath9k_hw]
[ 75.955934] ath9k_sta_state+0xec/0x160 [ath9k]
[ 75.955976] drv_sta_state+0xb2/0x740 [mac80211]
[ 75.956008] sta_info_insert_finish+0x21a/0x420 [mac80211]
[ 75.956039] sta_info_insert_rcu+0x12b/0x2c0 [mac80211]
[ 75.956069] sta_info_insert+0x7/0x70 [mac80211]
[ 75.956093] ieee80211_prep_connection+0x42e/0x730 [mac80211]
[ 75.956120] ieee80211_mgd_auth.cold+0xb9/0x15c [mac80211]
[ 75.956152] cfg80211_mlme_auth+0x143/0x350 [cfg80211]
[ 75.956169] nl80211_authenticate+0x25e/0x2b0 [cfg80211]
[ 75.956172] genl_family_rcv_msg+0x198/0x400
[ 75.956174] genl_rcv_msg+0x42/0x90
[ 75.956176] netlink_rcv_skb+0x35/0xf0
[ 75.956178] genl_rcv+0x1f/0x30
[ 75.956180] netlink_unicast+0x154/0x200
[ 75.956182] netlink_sendmsg+0x1bf/0x3d0
[ 75.956186] ___sys_sendmsg+0x2c2/0x2f0
[ 75.956187] __sys_sendmsg+0x44/0x80
[ 75.956190] do_syscall_64+0x55/0x1a0
[ 75.956192] entry_SYSCALL_64_after_hwframe+0x49/0xbe
[ 75.956194] irq event stamp: 2357092
[ 75.956196] hardirqs last enabled at (2357092): [<ffffffff818c62de>] _raw_spin_unlock_irqrestore+0x3e/0x50
[ 75.956199] hardirqs last disabled at (2357091): [<ffffffff818c60b1>] _raw_spin_lock_irqsave+0x11/0x80
[ 75.956202] softirqs last enabled at (2357072): [<ffffffff8106dc09>] irq_enter+0x59/0x60
[ 75.956204] softirqs last disabled at (2357073): [<ffffffff8106dcbe>] irq_exit+0xae/0xc0
[ 75.956206]
other info that might help us debug this:
[ 75.956207] Possible unsafe locking scenario:[ 75.956208] CPU0
[ 75.956209] ----
[ 75.956210] lock(&(&da->qlock)->rlock);
[ 75.956213] <Interrupt>
[ 75.956214] lock(&(&da->qlock)->rlock);
[ 75.956216]
*** DEADLOCK ***[ 75.956217] 1 lock held by swapper/0/0:
[ 75.956219] #0: 000000003bb5675c (&(&sc->sc_pcu_lock)->rlock){+.-.}, at: ath9k_tasklet+0x55/0x240 [ath9k]
[ 75.956225]
stack backtrace:
[ 75.956228] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.3.0-rc1-wdn+ #13
[ 75.956229] Hardware name: Dell Inc. Studio XPS 1340/0K183D, BIOS A11 09/08/2009
[ 75.956231] Call Trace:
[ 75.956233] <IRQ>
[ 75.956236] dump_stack+0x67/0x90
[ 75.956239] mark_lock+0x4c1/0x640
[ 75.956242] ? check_usage_backwards+0x130/0x130
[ 75.956245] ? sched_clock_local+0x12/0x80
[ 75.956247] __lock_acquire+0x484/0x7a0
[ 75.956250] ? __lock_acquire+0x3b9/0x7a0
[ 75.956252] lock_acquire+0x9a/0x160
[ 75.956259] ? ath_dynack_sample_ack_ts+0x4d/0xa0 [ath9k_hw]
[ 75.956262] _raw_spin_lock_bh+0x34/0x80
[ 75.956268] ? ath_dynack_sample_ack_ts+0x4d/0xa0 [ath9k_hw]
[ 75.956275] ath_dynack_sample_ack_ts+0x4d/0xa0 [ath9k_hw]
[ 75.956280] ath_rx_tasklet+0xd09/0xe90 [ath9k]
[ 75.956286] ath9k_tasklet+0x102/0x240 [ath9k]
[ 75.956288] tasklet_action_common.isra.0+0x6d/0x170
[ 75.956291] __do_softirq+0xcc/0x425
[ 75.956294] irq_exit+0xae/0xc0
[ 75.956296] do_IRQ+0x8a/0x110
[ 75.956298] common_interrupt+0xf/0xf
[ 75.956300] </IRQ>
[ 75.956303] RIP: 0010:cpuidle_enter_state+0xb2/0x400
[ 75.956308] RSP: 0018:ffffffff82203e70 EFLAGS: 00000202 ORIG_RAX: ffffffffffffffd7
[ 75.956310] RAX: ffffffff82219800 RBX: ffffffff822bd0a0 RCX: 0000000000000000
[ 75.956312] RDX: 0000000000000046 RSI: 0000000000000006 RDI: ffffffff82219800
[ 75.956314] RBP: ffff888155a01c00 R08: 00000011af51aabe R09: 0000000000000000
[ 75.956315] R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000000002
[ 75.956317] R13: 00000011af51aabe R14: 0000000000000003 R15: ffffffff82219800
[ 75.956321] cpuidle_enter+0x24/0x40
[ 75.956323] do_idle+0x1ac/0x220
[ 75.956326] cpu_startup_entry+0x14/0x20
[ 75.956329] start_kernel+0x482/0x489
[ 75.956332] secondary_startup_64+0xa4/0xb0--- drivers/net/wireless/ath/ath9k/dynack.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/wireless/ath/ath9k/dynack.c +4 -4
@@ -300,9 +300,9 @@ void ath_dynack_node_init(struct ath_hw *ah, struct ath_node *an) an->ackto = ackto; -spin_lock (&da->qlock); +spin_lock_bh (&da->qlock);list_add_tail (&an->list, &da->nodes); -spin_unlock (&da->qlock); +spin_unlock_bh (&da->qlock); }EXPORT_SYMBOL (ath_dynack_node_init);
@@ -316,9 +316,9 @@ void ath_dynack_node_deinit(struct ath_hw *ah, struct ath_node *an) {struct ath_dynack *da = &ah->dynack; -spin_lock (&da->qlock); +spin_lock_bh (&da->qlock);list_del (&an->list); -spin_unlock (&da->qlock); +spin_unlock_bh (&da->qlock); }EXPORT_SYMBOL (ath_dynack_node_deinit);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 487/671 ext4: set error return correctly when ext4_htree_store_dirent fails
In reply to Sasha LevinFrom: Colin Ian King <[email protected]>
[ Upstream commit 7a14826ede1d714f0bb56de8167c0e519041eeda ]
Currently when the call to ext4_htree_store_dirent fails the error return variable 'ret' is is not being set to the error code and variable count is instead, hence the error code is not being returned. Fix this by assigning ret to the error return code.
Addresses-Coverity: ("Unused value")
--- fs/ext4/inline.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ext4/inline.c +1 -1
@@ -1419,7 +1419,7 @@ int htree_inlinedir_to_tree(struct file *dir_file, err =ext4_htree_store_dirent (dir_file, hinfo->hash, hinfo->minor_hash, de, &tmp_str);if (err) { - count = err; + ret = err; goto out; } count++;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 530/671 xsk: avoid store-tearing when assigning umem
In reply to Sasha LevinFrom: Björn Töpel <[email protected]>
[ Upstream commit 9764f4b301c3e7eb3b75eec85b73cad449cdbb0d ]
The umem member of struct xdp_sock is read outside of the control mutex, in the mmap implementation, and needs a WRITE_ONCE to avoid potential store-tearing.
--- net/xdp/xsk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/xdp/xsk.c +2 -2
@@ -454,7 +454,7 @@ static int xsk_bind(struct socket *sock, struct sockaddr *addr, int addr_len) }xdp_get_umem (umem_xs->umem); - xs->umem = umem_xs->umem; +WRITE_ONCE (xs->umem, umem_xs->umem);sockfd_put (sock); }else if (!xs->umem || !xdp_umem_validate_queues (xs->umem)) { err = -EINVAL ;
@@ -534,7 +534,7 @@ static int xsk_setsockopt(struct socket *sock, int level, int optname,/* Make sure umem is ready before it can be seen by others */ smp_wmb (); - xs->umem = umem; +WRITE_ONCE (xs->umem, umem);mutex_unlock (&xs->mutex);return 0 ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 534/671 rtlwifi: Fix file release memory leak
In reply to Sasha LevinFrom: Wei Yongjun <[email protected]>
[ Upstream commit 4c3e48794dec7cb568974ba3bf2ab62b9c45ca3e ]
When using single_open() for opening, single_release() should be used instead of seq_release(), otherwise there is a memory leak.
This is detected by Coccinelle semantic patch.
--- drivers/net/wireless/realtek/rtlwifi/debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/realtek/rtlwifi/debug.c +1 -1
@@ -109,7 +109,7 @@ static const struct file_operations file_ops_common = { .open = dl_debug_open_common, .read = seq_read, .llseek = seq_lseek, - .release = seq_release, + .release = single_release, };static int rtl_debug_get_mac_page (struct seq_file *m,void *v)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 532/671 net: sonic: return NETDEV_TX_OK if failed to map buffer
In reply to Sasha LevinFrom: Mao Wenan <[email protected]>
[ Upstream commit 6e1cdedcf0362fed3aedfe051d46bd7ee2a85fe1 ]
NETDEV_TX_BUSY really should only be used by drivers that call netif_tx_stop_queue() at the wrong moment. If dma_map_single() is failed to map tx DMA buffer, it might trigger an infinite loop. This patch use NETDEV_TX_OK instead of NETDEV_TX_BUSY, and change printk to pr_err_ratelimited.
--- drivers/net/ethernet/natsemi/sonic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/natsemi/sonic.c +2 -2
@@ -231,9 +231,9 @@ static int sonic_send_packet(struct sk_buff *skb, struct net_device *dev) laddr =dma_map_single (lp->device, skb->data, length,DMA_TO_DEVICE );if (!laddr) { -printk (KERN_ERR "%s: failed to map tx DMA buffer.\n" , dev->name); +pr_err_ratelimited ("%s: failed to map tx DMA buffer.\n" , dev->name);dev_kfree_skb (skb); -return NETDEV_TX_BUSY ; +return NETDEV_TX_OK ; }sonic_tda_put (dev, entry,SONIC_TD_STATUS ,0 );/* clear status */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 533/671 net: hns3: fix error VF index when setting VLAN offload
In reply to Sasha LevinFrom: Jian Shen <[email protected]>
[ Upstream commit d9c0f2756a33833b2653f7a3612814fa5f52a568 ]
In original codes, the VF index used incorrectly in function hclge_set_vlan_rx_offload_cfg() and hclge_set_vlan_rx_offload_cfg(). When VF id is greater than 8, for example 9, it will set the same bit with VF id 1.
This patch fixes it by using vport->vport_id % HCLGE_VF_NUM_PER_CMD / HCLGE_VF_NUM_PER_BYTE as the array index, instead of vport->vport_id / HCLGE_VF_NUM_PER_CMD.
--- .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +10 -4
@@ -4833,6 +4833,7 @@ static int hclge_set_vlan_tx_offload_cfg(struct hclge_vport *vport)struct hclge_vport_vtag_tx_cfg_cmd *req;struct hclge_dev *hdev = vport->back;struct hclge_desc desc; +u16 bmap_index;int status;hclge_cmd_setup_basic_desc (&desc,HCLGE_OPC_VLAN_PORT_TX_CFG , false);
@@ -4855,8 +4856,10 @@ static int hclge_set_vlan_tx_offload_cfg(struct hclge_vport *vport)hnae3_set_bit (req->vport_vlan_cfg,HCLGE_CFG_NIC_ROCE_SEL_B ,0 ); req->vf_offset = vport->vport_id /HCLGE_VF_NUM_PER_CMD ; - req->vf_bitmap[req->vf_offset] = -1 << (vport->vport_id %HCLGE_VF_NUM_PER_BYTE ); + bmap_index = vport->vport_id %HCLGE_VF_NUM_PER_CMD / +HCLGE_VF_NUM_PER_BYTE ; + req->vf_bitmap[bmap_index] = +1U << (vport->vport_id %HCLGE_VF_NUM_PER_BYTE ); status =hclge_cmd_send (&hdev->hw, &desc,1 );if (status)
@@ -4873,6 +4876,7 @@ static int hclge_set_vlan_rx_offload_cfg(struct hclge_vport *vport)struct hclge_vport_vtag_rx_cfg_cmd *req;struct hclge_dev *hdev = vport->back;struct hclge_desc desc; +u16 bmap_index;int status;hclge_cmd_setup_basic_desc (&desc,HCLGE_OPC_VLAN_PORT_RX_CFG , false);
@@ -4888,8 +4892,10 @@ static int hclge_set_vlan_rx_offload_cfg(struct hclge_vport *vport) vcfg->vlan2_vlan_prionly ? 1 : 0); req->vf_offset = vport->vport_id /HCLGE_VF_NUM_PER_CMD ; - req->vf_bitmap[req->vf_offset] = -1 << (vport->vport_id %HCLGE_VF_NUM_PER_BYTE ); + bmap_index = vport->vport_id %HCLGE_VF_NUM_PER_CMD / +HCLGE_VF_NUM_PER_BYTE ; + req->vf_bitmap[bmap_index] = +1U << (vport->vport_id %HCLGE_VF_NUM_PER_BYTE ); status =hclge_cmd_send (&hdev->hw, &desc,1 );if (status)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 539/671 Btrfs: fix hang when loading existing inode cache off disk
In reply to Sasha LevinFrom: Filipe Manana <[email protected]>
[ Upstream commit 7764d56baa844d7f6206394f21a0e8c1f303c476 ]
If we are able to load an existing inode cache off disk, we set the state of the cache to BTRFS_CACHE_FINISHED, but we don't wake up any one waiting for the cache to be available. This means that anyone waiting for the cache to be available, waiting on the condition that either its state is BTRFS_CACHE_FINISHED or its available free space is greather than zero, can hang forever.
This could be observed running fstests with MOUNT_OPTIONS="-o inode_cache", in particular test case generic/161 triggered it very frequently for me, producing a trace like the following:
[63795.739712] BTRFS info (device sdc): enabling inode map caching [63795.739714] BTRFS info (device sdc): disk space caching is enabled [63795.739716] BTRFS info (device sdc): has skinny extents [64036.653886] INFO: task btrfs-transacti:3917 blocked for more than 120 seconds. [64036.654079] Not tainted 5.2.0-rc4-btrfs-next-50 #1 [64036.654143] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [64036.654232] btrfs-transacti D 0 3917 2 0x80004000 [64036.654239] Call Trace: [64036.654258] ? __schedule+0x3ae/0x7b0 [64036.654271] schedule+0x3a/0xb0 [64036.654325] btrfs_commit_transaction+0x978/0xae0 [btrfs] [64036.654339] ? remove_wait_queue+0x60/0x60 [64036.654395] transaction_kthread+0x146/0x180 [btrfs] [64036.654450] ? btrfs_cleanup_transaction+0x620/0x620 [btrfs] [64036.654456] kthread+0x103/0x140 [64036.654464] ? kthread_create_worker_on_cpu+0x70/0x70 [64036.654476] ret_from_fork+0x3a/0x50 [64036.654504] INFO: task xfs_io:3919 blocked for more than 120 seconds. [64036.654568] Not tainted 5.2.0-rc4-btrfs-next-50 #1 [64036.654617] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [64036.654685] xfs_io D 0 3919 3633 0x00000000 [64036.654691] Call Trace: [64036.654703] ? __schedule+0x3ae/0x7b0 [64036.654716] schedule+0x3a/0xb0 [64036.654756] btrfs_find_free_ino+0xa9/0x120 [btrfs] [64036.654764] ? remove_wait_queue+0x60/0x60 [64036.654809] btrfs_create+0x72/0x1f0 [btrfs] [64036.654822] lookup_open+0x6bc/0x790 [64036.654849] path_openat+0x3bc/0xc00 [64036.654854] ? __lock_acquire+0x331/0x1cb0 [64036.654869] do_filp_open+0x99/0x110 [64036.654884] ? __alloc_fd+0xee/0x200 [64036.654895] ? do_raw_spin_unlock+0x49/0xc0 [64036.654909] ? do_sys_open+0x132/0x220 [64036.654913] do_sys_open+0x132/0x220 [64036.654926] do_syscall_64+0x60/0x1d0 [64036.654933] entry_SYSCALL_64_after_hwframe+0x49/0xbe
Fix this by adding a wake_up() call right after setting the cache state to BTRFS_CACHE_FINISHED, at start_caching(), when we are able to load the cache from disk.
--- fs/btrfs/inode-map.c | 1 + 1 file changed, 1 insertion(+)
fs/btrfs/inode-map.c +1 -0
@@ -145,6 +145,7 @@ static void start_caching(struct btrfs_root *root)spin_lock (&root->ino_cache_lock); root->ino_cache_state =BTRFS_CACHE_FINISHED ;spin_unlock (&root->ino_cache_lock); +wake_up (&root->ino_cache_wait);return ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 540/671 Btrfs: fix inode cache waiters hanging on failure to start caching thread
In reply to Sasha LevinFrom: Filipe Manana <[email protected]>
[ Upstream commit a68ebe0790fc88b4314d17984a2cf99ce2361901 ]
If we fail to start the inode caching thread, we print an error message and disable the inode cache, however we never wake up any waiters, so they hang forever waiting for the caching to finish. Fix this by waking them up and have them fallback to a call to btrfs_find_free_objectid().
--- fs/btrfs/inode-map.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-)
fs/btrfs/inode-map.c +18 -5
@@ -12,6 +12,19 @@#include "inode-map.h" #include "transaction.h" +static void fail_caching_thread (struct btrfs_root *root) +{ +struct btrfs_fs_info *fs_info = root->fs_info; + +btrfs_warn (fs_info,"failed to start inode caching task" ); +btrfs_clear_pending_and_info (fs_info,INODE_MAP_CACHE , +"disabling inode map caching" ); +spin_lock (&root->ino_cache_lock); + root->ino_cache_state =BTRFS_CACHE_ERROR ; +spin_unlock (&root->ino_cache_lock); +wake_up (&root->ino_cache_wait); +} +static int caching_kthread (void *data) {struct btrfs_root *root = data;
@@ -164,11 +177,8 @@ static void start_caching(struct btrfs_root *root) tsk =kthread_run (caching_kthread, root,"btrfs-ino-cache-%llu" , root->root_key.objectid); -if (IS_ERR (tsk)) { -btrfs_warn (fs_info,"failed to start inode caching task" ); -btrfs_clear_pending_and_info (fs_info,INODE_MAP_CACHE , -"disabling inode map caching" ); - } +if (IS_ERR (tsk)) +fail_caching_thread (root); }int btrfs_find_free_ino (struct btrfs_root *root,u64 *objectid)
@@ -186,11 +196,14 @@ int btrfs_find_free_ino(struct btrfs_root *root, u64 *objectid)wait_event (root->ino_cache_wait, root->ino_cache_state ==BTRFS_CACHE_FINISHED || + root->ino_cache_state ==BTRFS_CACHE_ERROR || root->free_ino_ctl->free_space >0 );if (root->ino_cache_state ==BTRFS_CACHE_FINISHED && root->free_ino_ctl->free_space ==0 )return -ENOSPC ; +else if (root->ino_cache_state ==BTRFS_CACHE_ERROR ) +return btrfs_find_free_objectid (root, objectid);else goto again; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 541/671 Btrfs: fix inode cache waiters hanging on path allocation failure
In reply to Sasha LevinFrom: Filipe Manana <[email protected]>
[ Upstream commit 9d123a35d7e97bb2139747b16127c9b22b6a593e ]
If the caching thread fails to allocate a path, it returns without waking up any cache waiters, leaving them hang forever. Fix this by following the same approach as when we fail to start the caching thread: print an error message, disable inode caching and make the wakers fallback to non-caching mode behaviour (calling btrfs_find_free_objectid()).
--- fs/btrfs/inode-map.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/btrfs/inode-map.c +3 -1
@@ -41,8 +41,10 @@ static int caching_kthread(void *data)return 0 ; path =btrfs_alloc_path (); -if (!path) +if (!path) { +fail_caching_thread (root);return -ENOMEM ; + }/* Since the commit root is read-only, we can safely skip locking. */ path->skip_locking =1 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 536/671 f2fs: fix wrong error injection path in inc_valid_block_count()
In reply to Sasha LevinFrom: Chao Yu <[email protected]>
[ Upstream commit 9ea2f0be6ceaebae1518a5f897cff2645830dd95 ]
If FAULT_BLOCK type error injection is on, in inc_valid_block_count() we may decrease sbi->alloc_valid_block_count percpu stat count incorrectly, fix it.
--- fs/f2fs/f2fs.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/f2fs/f2fs.h +2 -1
@@ -1701,7 +1701,7 @@ static inline int inc_valid_block_count(struct f2fs_sb_info *sbi,if (time_to_inject (sbi,FAULT_BLOCK )) {f2fs_show_injection_info (FAULT_BLOCK ); release = *count; - goto enospc; + goto release_quota; }/*
@@ -1741,6 +1741,7 @@ static inline int inc_valid_block_count(struct f2fs_sb_info *sbi, enospc:percpu_counter_sub (&sbi->alloc_valid_block_count, release); +release_quota:dquot_release_reservation_block (inode, release);return -ENOSPC ; }
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 537/671 f2fs: fix error path of f2fs_convert_inline_page()
In reply to Sasha LevinFrom: Chao Yu <[email protected]>
[ Upstream commit e8c82c11c93d586d03d80305959527bcac383555 ]
In error path of f2fs_convert_inline_page(), we missed to truncate newly reserved block in .i_addrs[0] once we failed in get_node_info(), fix it.
--- fs/f2fs/inline.c | 1 + 1 file changed, 1 insertion(+)
fs/f2fs/inline.c +1 -0
@@ -133,6 +133,7 @@ int f2fs_convert_inline_page(struct dnode_of_data *dn, struct page *page) err =f2fs_get_node_info (fio.sbi, dn->nid, &ni);if (err) { +f2fs_truncate_data_blocks_range (dn,1 );f2fs_put_dnode (dn);return err; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 545/671 net: sonic: replace dev_kfree_skb in sonic_send_packet
In reply to Sasha LevinFrom: Mao Wenan <[email protected]>
[ Upstream commit 49f6c90bf6805948b597eabb499e500a47cf24be ]
sonic_send_packet will be processed in irq or non-irq context, so it would better use dev_kfree_skb_any instead of dev_kfree_skb.
--- drivers/net/ethernet/natsemi/sonic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/natsemi/sonic.c +1 -1
@@ -232,7 +232,7 @@ static int sonic_send_packet(struct sk_buff *skb, struct net_device *dev) laddr =dma_map_single (lp->device, skb->data, length,DMA_TO_DEVICE );if (!laddr) {pr_err_ratelimited ("%s: failed to map tx DMA buffer.\n" , dev->name); -dev_kfree_skb (skb); +dev_kfree_skb_any (skb);return NETDEV_TX_OK ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 548/671 ath10k: adjust skb length in ath10k_sdio_mbox_rx_packet
In reply to Sasha LevinFrom: Nicolas Boichat <[email protected]>
[ Upstream commit b7139960832eb56fa15d390a4b5c8c5739bd0d1a ]
When the FW bundles multiple packets, pkt->act_len may be incorrect as it refers to the first packet only (however, the FW will only bundle packets that fit into the same pkt->alloc_len).
Before this patch, the skb length would be set (incorrectly) to pkt->act_len in ath10k_sdio_mbox_rx_packet, and then later manually adjusted in ath10k_sdio_mbox_rx_process_packet.
The first problem is that ath10k_sdio_mbox_rx_process_packet does not use proper skb_put commands to adjust the length (it directly changes skb->len), so we end up with a mismatch between skb->head + skb->tail and skb->data + skb->len. This is quite serious, and causes corruptions in the TCP stack, as the stack tries to coalesce packets, and relies on skb->tail being correct (that is, skb_tail_pointer must point to the first byte_after_ the data).
Instead of re-adjusting the size in ath10k_sdio_mbox_rx_process_packet, this moves the code to ath10k_sdio_mbox_rx_packet, and also add a bounds check, as skb_put would crash the kernel if not enough space is available.
Tested with QCA6174 SDIO with firmware
WLAN.RMH.4.4.1-00007-QCARMSWP-1.
--- drivers/net/wireless/ath/ath10k/sdio.c | 29 +++++++++++++++++++------- 1 file changed, 21 insertions(+), 8 deletions(-)
drivers/net/wireless/ath/ath10k/sdio.c +21 -8
@@ -392,16 +392,11 @@ static int ath10k_sdio_mbox_rx_process_packet(struct ath10k *ar,struct ath10k_htc_hdr *htc_hdr = (struct ath10k_htc_hdr *)skb->data;bool trailer_present = htc_hdr->flags &ATH10K_HTC_FLAG_TRAILER_PRESENT ;enum ath10k_htc_ep_id eid; -u16 payload_len;u8 *trailer;int ret; - payload_len =le16_to_cpu (htc_hdr->len); - skb->len = payload_len +sizeof (struct ath10k_htc_hdr ); -if (trailer_present) { - trailer = skb->data +sizeof (*htc_hdr) + - payload_len - htc_hdr->trailer_len; + trailer = skb->data + skb->len - htc_hdr->trailer_len; eid =pipe_id_to_eid (htc_hdr->eid);
@@ -638,13 +633,31 @@ static int ath10k_sdio_mbox_rx_packet(struct ath10k *ar, {struct ath10k_sdio *ar_sdio =ath10k_sdio_priv (ar);struct sk_buff *skb = pkt->skb; +struct ath10k_htc_hdr *htc_hdr;int ret; ret =ath10k_sdio_readsb (ar, ar_sdio->mbox_info.htc_addr, skb->data, pkt->alloc_len); +if (ret) + goto out; + +/* Update actual length. The original length may be incorrect, +* as the FW will bundle multiple packets as long as their sizes +* fit within the same aligned length (pkt->alloc_len). +*/ + htc_hdr = (struct ath10k_htc_hdr *)skb->data; + pkt->act_len =le16_to_cpu (htc_hdr->len) +sizeof (*htc_hdr); +if (pkt->act_len > pkt->alloc_len) { +ath10k_warn (ar,"rx packet too large (%zu > %zu)\n" , + pkt->act_len, pkt->alloc_len); + ret = -EMSGSIZE ; + goto out; + } + +skb_put (skb, pkt->act_len); + +out: pkt->status = ret; -if (!ret) -skb_put (skb, pkt->act_len);return ret; }
Signature · 7 lines
2.20.1 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Sasha Levin
maintainerPATCH 551/671 net/rds: Fix 'ib_evt_handler_call' element in 'rds_ib_stat_names'
In reply to Sasha LevinFrom: Gerd Rausch <[email protected]>
[ Upstream commit 05a82481a3024b94db00b8c816bb3d526b5209e0 ]
All entries in 'rds_ib_stat_names' are stringified versions of the corresponding "struct rds_ib_statistics" element without the "s_"-prefix.
Fix entry 'ib_evt_handler_call' to do the same.
--- net/rds/ib_stats.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/rds/ib_stats.c +1 -1
@@ -42,7 +42,7 @@ DEFINE_PER_CPU_SHARED_ALIGNED(struct rds_ib_statistics, rds_ib_stats);static const char *const rds_ib_stat_names[] = {"ib_connect_raced" ,"ib_listen_closed_stale" , -"s_ib_evt_handler_call" , +"ib_evt_handler_call" ,"ib_tasklet_call" ,"ib_tx_cq_event" ,"ib_tx_ring_full" ,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 555/671 mailbox: qcom-apcs: fix max_register value
In reply to Sasha LevinFrom: Jorge Ramirez-Ortiz <[email protected]>
[ Upstream commit 556a0964e28c4441dcdd50fb07596fd042246bd5 ]
The mailbox length is 0x1000 hence the max_register value is 0xFFC.
regmap")
--- drivers/mailbox/qcom-apcs-ipc-mailbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mailbox/qcom-apcs-ipc-mailbox.c +1 -1
@@ -36,7 +36,7 @@ static const struct regmap_config apcs_regmap_config = { .reg_bits = 32, .reg_stride = 4, .val_bits = 32, - .max_register = 0x1000, + .max_register = 0xFFC, .fast_io = true, };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 558/671 bpf: fix BTF limits
In reply to Sasha LevinFrom: Alexei Starovoitov <[email protected]>
[ Upstream commit a0791f0df7d212c245761538b17a9ea93607b667 ]
vmlinux BTF has more than 64k types.
Its string section is also at the offset larger than 64k.
Adjust both limits to make in-kernel BTF verifier successfully parse in-kernel BTF.
--- include/uapi/linux/btf.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/uapi/linux/btf.h +2 -2
@@ -22,9 +22,9 @@ struct btf_header { };/* Max # of type identifier */ -#define BTF_MAX_TYPE 0x0000ffff +#define BTF_MAX_TYPE 0x000fffff/* Max offset into the string section */ -#define BTF_MAX_NAME_OFFSET 0x0000ffff +#define BTF_MAX_NAME_OFFSET 0x00ffffff/* Max # of struct/union/enum members or func args */ #define BTF_MAX_VLEN 0xffff
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 554/671 f2fs: fix to avoid accessing uninitialized field of inode page in is_alive()
In reply to Sasha LevinFrom: Chao Yu <[email protected]>
[ Upstream commit 98194030554cd9b10568a9b58f5a135c7e7cba85 ]
If inode is newly created, inode page may not synchronize with inode cache, so fields like .i_inline or .i_extra_isize could be wrong, in below call path, we may access such wrong fields, result in failing to migrate valid target block.
Thread A Thread B
- f2fs_create
- f2fs_add_link
- f2fs_add_dentry
- f2fs_init_inode_metadata
- f2fs_add_inline_entry
- f2fs_new_inode_page
- f2fs_put_page
: inode page wasn't updated with inode cache
- gc_data_segment
- is_alive
- f2fs_get_node_page
- datablock_addr
- offset_in_addr : access uninitialized fields
--- fs/f2fs/dir.c | 5 +++++ fs/f2fs/inline.c | 5 +++++ 2 files changed, 10 insertions(+)
fs/f2fs/dir.c +5 -0
@@ -572,6 +572,11 @@ int f2fs_add_regular_entry(struct inode *dir, const struct qstr *new_name,if (inode) {f2fs_i_pino_write (inode, dir->i_ino); + +/* synchronize inode page's data from inode cache */ +if (is_inode_flag_set (inode,FI_NEW_INODE )) +f2fs_update_inode (inode, page); +f2fs_put_page (page,1 ); }
fs/f2fs/inline.c +5 -0
@@ -578,6 +578,11 @@ int f2fs_add_inline_entry(struct inode *dir, const struct qstr *new_name,/* we don't need to mark_inode_dirty now */ if (inode) {f2fs_i_pino_write (inode, dir->i_ino); + +/* synchronize inode page's data from inode cache */ +if (is_inode_flag_set (inode,FI_NEW_INODE )) +f2fs_update_inode (inode, page); +f2fs_put_page (page,1 ); }
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 559/671 crypto: hisilicon - Matching the dma address for dma_pool_free()
In reply to Sasha LevinFrom: Yunfeng Ye <[email protected]>
[ Upstream commit e00371af1d4ce73d527d8ee69fda2febaf5a42c2 ]
When dma_pool_zalloc() fail in sec_alloc_and_fill_hw_sgl(), dma_pool_free() is invoked, but the parameters that sgl_current and sgl_current->next_sgl is not match.
Using sec_free_hw_sgl() instead of the original free routine.
--- drivers/crypto/hisilicon/sec/sec_algs.c | 44 +++++++++++-------------- 1 file changed, 19 insertions(+), 25 deletions(-)
drivers/crypto/hisilicon/sec/sec_algs.c +19 -25
@@ -153,6 +153,24 @@ static void sec_alg_skcipher_init_context(struct crypto_skcipher *atfm, ctx->cipher_alg); } +static void sec_free_hw_sgl (struct sec_hw_sgl *hw_sgl, +dma_addr_t psec_sgl,struct sec_dev_info *info) +{ +struct sec_hw_sgl *sgl_current, *sgl_next; +dma_addr_t sgl_next_dma; + + sgl_current = hw_sgl; +while (sgl_current) { + sgl_next = sgl_current->next; + sgl_next_dma = sgl_current->next_sgl; + +dma_pool_free (info->hw_sgl_pool, sgl_current, psec_sgl); + + sgl_current = sgl_next; + psec_sgl = sgl_next_dma; + } +} + static int sec_alloc_and_fill_hw_sgl(struct sec_hw_sgl **sec_sgl, dma_addr_t *psec_sgl, struct scatterlist *sgl,
@@ -199,36 +217,12 @@ static int sec_alloc_and_fill_hw_sgl(struct sec_hw_sgl **sec_sgl,return 0 ; err_free_hw_sgls: - sgl_current = *sec_sgl; -while (sgl_current) { - sgl_next = sgl_current->next; -dma_pool_free (info->hw_sgl_pool, sgl_current, - sgl_current->next_sgl); - sgl_current = sgl_next; - } +sec_free_hw_sgl (*sec_sgl, *psec_sgl, info); *psec_sgl =0 ;return ret; } -static void sec_free_hw_sgl (struct sec_hw_sgl *hw_sgl, -dma_addr_t psec_sgl,struct sec_dev_info *info) -{ -struct sec_hw_sgl *sgl_current, *sgl_next; -dma_addr_t sgl_next_dma; - - sgl_current = hw_sgl; -while (sgl_current) { - sgl_next = sgl_current->next; - sgl_next_dma = sgl_current->next_sgl; - -dma_pool_free (info->hw_sgl_pool, sgl_current, psec_sgl); - - sgl_current = sgl_next; - psec_sgl = sgl_next_dma; - } -} -static int sec_alg_skcipher_setkey (struct crypto_skcipher *tfm,const u8 *key,unsigned int keylen,enum sec_cipher_alg alg)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 556/671 clk: actions: Fix factor clk struct member access
In reply to Sasha LevinFrom: Manivannan Sadhasivam <[email protected]>
[ Upstream commit ed309bfb4812e8b31a3eb877e157b8028a49e50c ]
Since the helper "owl_factor_helper_round_rate" is shared between factor and composite clocks, using the factor clk specific helper function like "hw_to_owl_factor" to access its members will create issues when called from composite clk specific code. Hence, pass the "factor_hw" struct pointer directly instead of fetching it using factor clk specific helpers.
This issue has been observed when a composite clock like "sd0_clk" tried to call "owl_factor_helper_round_rate" resulting in pointer dereferencing error.
While we are at it, let's rename the "clk_val_best" function to "owl_clk_val_best" since this is an owl SoCs specific helper.
--- drivers/clk/actions/owl-factor.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/clk/actions/owl-factor.c +3 -4
@@ -64,11 +64,10 @@ static unsigned int _get_table_val(const struct clk_factor_table *table,return val; } -static int clk_val_best (struct clk_hw *hw,unsigned long rate, +static int owl_clk_val_best (const struct owl_factor_hw *factor_hw, +struct clk_hw *hw,unsigned long rate,unsigned long *best_parent_rate) { -struct owl_factor *factor =hw_to_owl_factor (hw); -struct owl_factor_hw *factor_hw = &factor->factor_hw;const struct clk_factor_table *clkt = factor_hw->table;unsigned long parent_rate, try_parent_rate, best =0 , cur_rate;unsigned long parent_rate_saved = *best_parent_rate;
@@ -126,7 +125,7 @@ long owl_factor_helper_round_rate(struct owl_clk_common *common,const struct clk_factor_table *clkt = factor_hw->table;unsigned int val, mul =0 , div =1 ; - val =clk_val_best (&common->hw, rate, parent_rate); + val =owl_clk_val_best (factor_hw, &common->hw, rate, parent_rate);_get_table_div_mul (clkt, val, &mul, &div);return *parent_rate * mul / div;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 560/671 iommu/amd: Wait for completion of IOTLB flush in attach_device
In reply to Sasha LevinFrom: Filippo Sironi <[email protected]>
[ Upstream commit 0b15e02f0cc4fb34a9160de7ba6db3a4013dc1b7 ]
To make sure the domain tlb flush completes before the function returns, explicitly wait for its completion.
--- drivers/iommu/amd_iommu.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/iommu/amd_iommu.c +2 -0
@@ -2153,6 +2153,8 @@ static int attach_device(struct device *dev,*/ domain_flush_tlb_pde (domain); +domain_flush_complete (domain); +return ret; }
Signature · 6 lines
2.20.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Sasha Levin
maintainerPATCH 566/671 net: socionext: Fix a signedness bug in ave_probe()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit 7f9e88e6ef8c971f2c638b5ff7044c59b5d0f58d ]
The "phy_mode" variable is an enum and in this context GCC treats it as an unsigned int so the error handling is never triggered.
--- drivers/net/ethernet/socionext/sni_ave.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/socionext/sni_ave.c +1 -1
@@ -1575,7 +1575,7 @@ static int ave_probe(struct platform_device *pdev) np = dev->of_node; phy_mode =of_get_phy_mode (np); -if (phy_mode <0 ) { +if ((int )phy_mode <0 ) {dev_err (dev,"phy-mode not found\n" );return -EINVAL ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 567/671 net: stmmac: dwmac-meson8b: Fix signedness bug in probe
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit f10210517a2f37feea2edf85eb34c98977265c16 ]
The "dwmac->phy_mode" is an enum and in this context GCC treats it as an unsigned int so the error handling is never triggered.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c +1 -1
@@ -355,7 +355,7 @@ static int meson8b_dwmac_probe(struct platform_device *pdev) dwmac->dev = &pdev->dev; dwmac->phy_mode =of_get_phy_mode (pdev->dev.of_node); -if (dwmac->phy_mode <0 ) { +if ((int )dwmac->phy_mode <0 ) {dev_err (&pdev->dev,"missing phy-mode property\n" ); ret = -EINVAL ; goto err_remove_config_dt;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 569/671 of: mdio: Fix a signedness bug in of_phy_get_and_connect()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit d7eb651212fdbafa82d485d8e76095ac3b14c193 ]
The "iface" variable is an enum and in this context GCC treats it as an unsigned int so the error handling is never triggered.
--- drivers/of/of_mdio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/of/of_mdio.c +1 -1
@@ -370,7 +370,7 @@ struct phy_device *of_phy_get_and_connect(struct net_device *dev,int ret; iface =of_get_phy_mode (np); -if (iface <0 ) +if ((int )iface <0 )return NULL ;if (of_phy_is_fixed_link (np)) { ret =of_phy_register_fixed_link (np);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 575/671 net: stmmac: gmac4+: Not all Unicast addresses may be available
In reply to Sasha LevinFrom: Jose Abreu <[email protected]>
[ Upstream commit 25683bab09a70542b9f8e3e28f79b3369e56701f ]
Some setups may not have all Unicast addresses filters available. Check the number of available filters before trying to setup it.
--- drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c +1 -1
@@ -443,7 +443,7 @@ static void dwmac4_set_filter(struct mac_device_info *hw, }/* Handle multiple unicast addresses */ -if (netdev_uc_count (dev) >GMAC_MAX_PERFECT_ADDRESSES ) { +if (netdev_uc_count (dev) > hw->unicast_filter_entries) {/* Switch to promiscuous mode if more than 128 addrs * are required */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 578/671 mac80211: accept deauth frames in IBSS mode
In reply to Sasha LevinFrom: Johannes Berg <[email protected]>
[ Upstream commit 95697f9907bfe3eab0ef20265a766b22e27dde64 ]
We can process deauth frames and all, but we drop them very early in the RX path today - this could never have worked.
--- net/mac80211/rx.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
net/mac80211/rx.c +10 -1
@@ -3391,9 +3391,18 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_data *rx)case cpu_to_le16 (IEEE80211_STYPE_PROBE_RESP ):/* process for all: mesh, mlme, ibss */ break ; +case cpu_to_le16 (IEEE80211_STYPE_DEAUTH ): +if (is_multicast_ether_addr (mgmt->da) && + !is_broadcast_ether_addr (mgmt->da)) +return RX_DROP_MONITOR ; + +/* process only for station/IBSS */ +if (sdata->vif.type !=NL80211_IFTYPE_STATION && + sdata->vif.type !=NL80211_IFTYPE_ADHOC ) +return RX_DROP_MONITOR ; +break ;case cpu_to_le16 (IEEE80211_STYPE_ASSOC_RESP ):case cpu_to_le16 (IEEE80211_STYPE_REASSOC_RESP ): -case cpu_to_le16 (IEEE80211_STYPE_DEAUTH ):case cpu_to_le16 (IEEE80211_STYPE_DISASSOC ):if (is_multicast_ether_addr (mgmt->da) && !is_broadcast_ether_addr (mgmt->da))
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 577/671 rxrpc: Fix trace-after-put looking at the put call record
In reply to Sasha LevinFrom: David Howells <[email protected]>
[ Upstream commit 48c9e0ec7cbbb7370448f859ccc8e3b7eb69e755 ]
rxrpc_put_call() calls trace_rxrpc_call() after it has done the decrement of the refcount - which looks at the debug_id in the call record. But unless the refcount was reduced to zero, we no longer have the right to look in the record and, indeed, it may be deleted by some other thread.
Fix this by getting the debug_id out before decrementing the refcount and then passing that into the tracepoint.
--- include/trace/events/rxrpc.h | 6 +++--- net/rxrpc/call_accept.c | 2 +- net/rxrpc/call_object.c | 28 +++++++++++++++++----------- 3 files changed, 21 insertions(+), 15 deletions(-)
include/trace/events/rxrpc.h +3 -3
@@ -614,10 +614,10 @@ TRACE_EVENT(rxrpc_client, ); TRACE_EVENT(rxrpc_call, - TP_PROTO(struct rxrpc_call *call, enum rxrpc_call_trace op, + TP_PROTO(unsigned int call_debug_id, enum rxrpc_call_trace op, int usage, const void *where, const void *aux), - TP_ARGS(call, op, usage, where, aux), + TP_ARGS(call_debug_id, op, usage, where, aux), TP_STRUCT__entry( __field(unsigned int, call )
@@ -628,7 +628,7 @@ TRACE_EVENT(rxrpc_call, ), TP_fast_assign( - __entry->call = call->debug_id; + __entry->call = call_debug_id; __entry->op = op; __entry->usage = usage; __entry->where = where;
net/rxrpc/call_accept.c +1 -1
@@ -101,7 +101,7 @@ static int rxrpc_service_prealloc_one(struct rxrpc_sock *rx, call->flags |= (1 <<RXRPC_CALL_IS_SERVICE ); call->state =RXRPC_CALL_SERVER_PREALLOC ; -trace_rxrpc_call (call, rxrpc_call_new_service, +trace_rxrpc_call (call->debug_id, rxrpc_call_new_service,atomic_read (&call->usage), here, (const void *)user_call_ID);
net/rxrpc/call_object.c +17 -11
@@ -242,7 +242,8 @@ struct rxrpc_call *rxrpc_new_client_call(struct rxrpc_sock *rx, } call->tx_total_len = p->tx_total_len; -trace_rxrpc_call (call, rxrpc_call_new_client,atomic_read (&call->usage), +trace_rxrpc_call (call->debug_id, rxrpc_call_new_client, +atomic_read (&call->usage), here, (const void *)p->user_call_ID);/* We need to protect a partially set up call against the user as we
@@ -292,8 +293,8 @@ struct rxrpc_call *rxrpc_new_client_call(struct rxrpc_sock *rx,if (ret <0 ) goto error; -trace_rxrpc_call (call, rxrpc_call_connected,atomic_read (&call->usage), - here,NULL ); +trace_rxrpc_call (call->debug_id, rxrpc_call_connected, +atomic_read (&call->usage), here,NULL );rxrpc_start_call_timer (call);
@@ -315,8 +316,8 @@ struct rxrpc_call *rxrpc_new_client_call(struct rxrpc_sock *rx, error:__rxrpc_set_call_completion (call,RXRPC_CALL_LOCAL_ERROR ,RX_CALL_DEAD , ret); -trace_rxrpc_call (call, rxrpc_call_error,atomic_read (&call->usage), - here,ERR_PTR (ret)); +trace_rxrpc_call (call->debug_id, rxrpc_call_error, +atomic_read (&call->usage), here,ERR_PTR (ret));rxrpc_release_call (rx, call);mutex_unlock (&call->user_mutex);rxrpc_put_call (call, rxrpc_call_put);
@@ -420,7 +421,8 @@ bool rxrpc_queue_call(struct rxrpc_call *call)if (n ==0 )return false;if (rxrpc_queue_work (&call->processor)) -trace_rxrpc_call (call, rxrpc_call_queued, n +1 , here,NULL ); +trace_rxrpc_call (call->debug_id, rxrpc_call_queued, n +1 , + here,NULL );else rxrpc_put_call (call, rxrpc_call_put_noqueue);return true;
@@ -435,7 +437,8 @@ bool __rxrpc_queue_call(struct rxrpc_call *call)int n =atomic_read (&call->usage); ASSERTCMP(n, >=, 1);if (rxrpc_queue_work (&call->processor)) -trace_rxrpc_call (call, rxrpc_call_queued_ref, n, here,NULL ); +trace_rxrpc_call (call->debug_id, rxrpc_call_queued_ref, n, + here,NULL );else rxrpc_put_call (call, rxrpc_call_put_noqueue);return true;
@@ -450,7 +453,8 @@ void rxrpc_see_call(struct rxrpc_call *call)if (call) {int n =atomic_read (&call->usage); -trace_rxrpc_call (call, rxrpc_call_seen, n, here,NULL ); +trace_rxrpc_call (call->debug_id, rxrpc_call_seen, n, + here,NULL ); } }
@@ -462,7 +466,7 @@ void rxrpc_get_call(struct rxrpc_call *call, enum rxrpc_call_trace op)const void *here =__builtin_return_address (0 );int n =atomic_inc_return (&call->usage); -trace_rxrpc_call (call, op, n, here,NULL ); +trace_rxrpc_call (call->debug_id, op, n, here,NULL ); }/*
@@ -477,7 +481,8 @@ void rxrpc_release_call(struct rxrpc_sock *rx, struct rxrpc_call *call)_enter ("{%d,%d}" , call->debug_id,atomic_read (&call->usage)); -trace_rxrpc_call (call, rxrpc_call_release,atomic_read (&call->usage), +trace_rxrpc_call (call->debug_id, rxrpc_call_release, +atomic_read (&call->usage), here, (const void *)call->flags); ASSERTCMP(call->state, ==, RXRPC_CALL_COMPLETE);
@@ -625,12 +630,13 @@ void rxrpc_put_call(struct rxrpc_call *call, enum rxrpc_call_trace op) {struct rxrpc_net *rxnet = call->rxnet;const void *here =__builtin_return_address (0 ); +unsigned int debug_id = call->debug_id;int n;ASSERT (call !=NULL ); n =atomic_dec_return (&call->usage); -trace_rxrpc_call (call, op, n, here,NULL ); +trace_rxrpc_call (debug_id, op, n, here,NULL ); ASSERTCMP(n, >=, 0);if (n ==0 ) {_debug ("call %d dead" , call->debug_id);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 579/671 llc: fix another potential sk_buff leak in llc_ui_sendmsg()
In reply to Sasha LevinFrom: Eric Biggers <[email protected]>
[ Upstream commit fc8d5db10cbe1338a52ebc74e7feab9276721774 ]
All callers of llc_conn_state_process() except llc_build_and_send_pkt() (via llc_ui_sendmsg() -> llc_ui_send_data()) assume that it always consumes a reference to the skb. Fix this caller to do the same.
--- net/llc/af_llc.c | 34 ++++++++++++++++++++-------------- net/llc/llc_conn.c | 2 ++ net/llc/llc_if.c | 12 ++++++++---- 3 files changed, 30 insertions(+), 18 deletions(-)
net/llc/af_llc.c +20 -14
@@ -113,22 +113,26 @@ static inline u8 llc_ui_header_len(struct sock *sk, struct sockaddr_llc *addr)* * Send data via reliable llc2 connection. * Returns 0 upon success, non-zero if action did not succeed. +* +* This function always consumes a reference to the skb. */ static int llc_ui_send_data (struct sock * sk,struct sk_buff *skb,int noblock) {struct llc_sock * llc =llc_sk (sk); -int rc =0 ;if (unlikely (llc_data_accept_state (llc->state) || llc->remote_busy_flag || llc->p_flag)) {long timeout =sock_sndtimeo (sk, noblock); +int rc; rc =llc_ui_wait_for_busy_core (sk, timeout); +if (rc) { +kfree_skb (skb); +return rc; + } } -if (unlikely (!rc)) - rc =llc_build_and_send_pkt (sk, skb); -return rc; +return llc_build_and_send_pkt (sk, skb); }static void llc_ui_sk_init (struct socket *sock,struct sock *sk)
@@ -900,7 +904,7 @@ static int llc_ui_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) DECLARE_SOCKADDR(struct sockaddr_llc *, addr, msg->msg_name);int flags = msg->msg_flags;int noblock = flags &MSG_DONTWAIT ; -struct sk_buff *skb; +struct sk_buff *skb =NULL ;size_t size =0 ;int rc = -EINVAL , copied =0 , hdrlen;
@@ -909,10 +913,10 @@ static int llc_ui_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)lock_sock (sk);if (addr) {if (msg->msg_namelen <sizeof (*addr)) - goto release; + goto out; }else {if (llc_ui_addr_null (&llc->addr)) - goto release; + goto out; addr = &llc->addr; }/* must bind connection to sap if user hasn't done it. */
@@ -920,7 +924,7 @@ static int llc_ui_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)/* bind to sap with null dev, exclusive. */ rc =llc_ui_autobind (sock, addr);if (rc) - goto release; + goto out; } hdrlen = llc->dev->hard_header_len +llc_ui_header_len (sk, addr); size = hdrlen + len;
@@ -929,12 +933,12 @@ static int llc_ui_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) copied = size - hdrlen; rc = -EINVAL ;if (copied <0 ) - goto release; + goto out;release_sock (sk); skb =sock_alloc_send_skb (sk, size, noblock, &rc);lock_sock (sk);if (!skb) - goto release; + goto out; skb->dev = llc->dev; skb->protocol =llc_proto_type (addr->sllc_arphrd);skb_reserve (skb, hdrlen);
@@ -944,29 +948,31 @@ static int llc_ui_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)if (sk->sk_type ==SOCK_DGRAM || addr->sllc_ua) {llc_build_and_send_ui_pkt (llc->sap, skb, addr->sllc_mac, addr->sllc_sap); + skb =NULL ; goto out; }if (addr->sllc_test) {llc_build_and_send_test_pkt (llc->sap, skb, addr->sllc_mac, addr->sllc_sap); + skb =NULL ; goto out; }if (addr->sllc_xid) {llc_build_and_send_xid_pkt (llc->sap, skb, addr->sllc_mac, addr->sllc_sap); + skb =NULL ; goto out; } rc = -ENOPROTOOPT ;if (!(sk->sk_type ==SOCK_STREAM && !addr->sllc_ua)) goto out; rc =llc_ui_send_data (sk, skb, noblock); + skb =NULL ; out: -if (rc) { -kfree_skb (skb); -release: +kfree_skb (skb); +if (rc)dprintk ("%s: failed sending from %02X to %02X: %d\n" , __func__, llc->laddr.lsap, llc->daddr.lsap, rc); - }release_sock (sk);return rc ? : copied; }
net/llc/llc_conn.c +2 -0
@@ -55,6 +55,8 @@ int sysctl_llc2_busy_timeout = LLC2_BUSY_TIME * HZ;* (executing it's actions and changing state), upper layer will be * indicated or confirmed, if needed. Returns 0 for success, 1 for * failure. The socket lock has to be held before calling this function. +* +* This function always consumes a reference to the skb. */ int llc_conn_state_process (struct sock *sk,struct sk_buff *skb) {
net/llc/llc_if.c +8 -4
@@ -38,6 +38,8 @@* closed and -EBUSY when sending data is not permitted in this state or * LLC has send an I pdu with p bit set to 1 and is waiting for it's * response. +* +* This function always consumes a reference to the skb. */ int llc_build_and_send_pkt (struct sock *sk,struct sk_buff *skb) {
@@ -46,20 +48,22 @@ int llc_build_and_send_pkt(struct sock *sk, struct sk_buff *skb)struct llc_sock *llc =llc_sk (sk);if (unlikely (llc->state ==LLC_CONN_STATE_ADM )) - goto out; + goto out_free; rc = -EBUSY ;if (unlikely (llc_data_accept_state (llc->state) ||/* data_conn_refuse */ llc->p_flag)) { llc->failed_data_req =1 ; - goto out; + goto out_free; } ev =llc_conn_ev (skb); ev->type =LLC_CONN_EV_TYPE_PRIM ; ev->prim =LLC_DATA_PRIM ; ev->prim_type =LLC_PRIM_TYPE_REQ ; skb->dev = llc->dev; - rc =llc_conn_state_process (sk, skb); -out: +return llc_conn_state_process (sk, skb); + +out_free: +kfree_skb (skb);return rc; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 581/671 ip6erspan: remove the incorrect mtu limit for ip6erspan
In reply to Sasha LevinFrom: Haishuang Yan <[email protected]>
[ Upstream commit 4123f637a5129470ff9d3cb00a5a4e213f2e15cc ]
ip6erspan driver calls ether_setup(), after commit 61e84623ace3 ("net: centralize net_device min/max MTU checking"), the range of mtu is [min_mtu, max_mtu], which is [68, 1500] by default.
It causes the dev mtu of the erspan device to not be greater than 1500, this limit value is not correct for ip6erspan tap device.
--- net/ipv6/ip6_gre.c | 1 + 1 file changed, 1 insertion(+)
net/ipv6/ip6_gre.c +1 -0
@@ -2218,6 +2218,7 @@ static void ip6erspan_tap_setup(struct net_device *dev) {ether_setup (dev); + dev->max_mtu =0 ; dev->netdev_ops = &ip6erspan_netdev_ops; dev->needs_free_netdev = true; dev->priv_destructor = ip6gre_dev_free;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 583/671 net: stmmac: fix length of PTP clock's name string
In reply to Sasha LevinFrom: Antonio Borneo <[email protected]>
[ Upstream commit 5da202c88f8c355ad79bc2e8eb582e6d433060e7 ]
The field "name" in struct ptp_clock_info has a fixed size of 16 chars and is used as zero terminated string by clock_name_show() in drivers/ptp/ptp_sysfs.c
The current initialization value requires 17 chars to fit also the null termination, and this causes overflow to the next bytes in the struct when the string is read as null terminated:
hexdump -C /sys/class/ptp/ptp0/clock_name 00000000 73 74 6d 6d 61 63 5f 70 74 70 5f 63 6c 6f 63 6b |stmmac_ptp_clock| 00000010 a0 ac b9 03 0a |.....|
where the extra 4 bytes (excluding the newline) after the string represent the integer 0x03b9aca0 = 62500000 assigned to the field "max_adj" that follows "name" in the same struct.
There is no strict requirement for the "name" content and in the comment in ptp_clock_kernel.h it's reported it should just be 'A short "friendly name" to identify the clock'.
Replace it with "stmmac ptp".
--- drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c +1 -1
@@ -174,7 +174,7 @@ static int stmmac_enable(struct ptp_clock_info *ptp,/* structure describing a PTP hardware clock */ static struct ptp_clock_info stmmac_ptp_clock_ops = { .owner =THIS_MODULE , - .name ="stmmac_ptp_clock" , + .name ="stmmac ptp" , .max_adj =62500000 , .n_alarm =0 , .n_ext_ts =0 ,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 586/671 s390/qeth: Fix error handling during VNICC initialization
In reply to Sasha LevinFrom: Alexandra Winter <[email protected]>
[ Upstream commit b528965bcc827dad32a8d21745feaacfc76c9703 ]
Smatch discovered the use of uninitialized variable sup_cmds in error paths.
--- drivers/s390/net/qeth_l2_main.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/s390/net/qeth_l2_main.c +7 -4
@@ -2331,10 +2331,10 @@ static bool qeth_l2_vnicc_recover_char(struct qeth_card *card, u32 vnicc,static void qeth_l2_vnicc_init (struct qeth_card *card) {u32 *timeout = &card->options.vnicc.learning_timeout; +bool enable, error = false;unsigned int chars_len, i;unsigned long chars_tmp;u32 sup_cmds, vnicc; -bool enable, error;QETH_CARD_TEXT (card,2 ,"vniccini" );/* reset rx_bcast */
@@ -2355,7 +2355,10 @@ static void qeth_l2_vnicc_init(struct qeth_card *card) chars_len =sizeof (card->options.vnicc.sup_chars) *BITS_PER_BYTE ;for_each_set_bit (i, &chars_tmp, chars_len) { vnicc =BIT (i); -qeth_l2_vnicc_query_cmds (card, vnicc, &sup_cmds); +if (qeth_l2_vnicc_query_cmds (card, vnicc, &sup_cmds)) { + sup_cmds =0 ; + error = true; + }if (!(sup_cmds &IPA_VNICC_SET_TIMEOUT ) || !(sup_cmds &IPA_VNICC_GET_TIMEOUT )) card->options.vnicc.getset_timeout_sup &= ~vnicc;
@@ -2364,8 +2367,8 @@ static void qeth_l2_vnicc_init(struct qeth_card *card) card->options.vnicc.set_char_sup &= ~vnicc; }/* enforce assumed default values and recover settings, if changed */ - error =qeth_l2_vnicc_recover_timeout (card,QETH_VNICC_LEARNING , - timeout); + error |=qeth_l2_vnicc_recover_timeout (card,QETH_VNICC_LEARNING , + timeout); chars_tmp = card->options.vnicc.wanted_chars ^QETH_VNICC_DEFAULT ; chars_tmp |=QETH_VNICC_BRIDGE_INVISIBLE ; chars_len =sizeof (card->options.vnicc.wanted_chars) *BITS_PER_BYTE ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 587/671 s390/qeth: Fix initialization of vnicc cmd masks during set online
In reply to Sasha LevinFrom: Alexandra Winter <[email protected]>
[ Upstream commit be40a86c319706f90caca144343c64743c32b953 ]
Without this patch, a command bit in the supported commands mask is only ever set to unsupported during set online. If a command is ever marked as unsupported (e.g. because of error during qeth_l2_vnicc_query_cmds), subsequent successful initialization (offline/online) would not bring it back.
--- drivers/s390/net/qeth_l2_main.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/s390/net/qeth_l2_main.c +8 -4
@@ -2359,11 +2359,15 @@ static void qeth_l2_vnicc_init(struct qeth_card *card) sup_cmds =0 ; error = true; } -if (!(sup_cmds &IPA_VNICC_SET_TIMEOUT ) || - !(sup_cmds &IPA_VNICC_GET_TIMEOUT )) +if ((sup_cmds &IPA_VNICC_SET_TIMEOUT ) && + (sup_cmds &IPA_VNICC_GET_TIMEOUT )) + card->options.vnicc.getset_timeout_sup |= vnicc; +else card->options.vnicc.getset_timeout_sup &= ~vnicc; -if (!(sup_cmds &IPA_VNICC_ENABLE ) || - !(sup_cmds &IPA_VNICC_DISABLE )) +if ((sup_cmds &IPA_VNICC_ENABLE ) && + (sup_cmds &IPA_VNICC_DISABLE )) + card->options.vnicc.set_char_sup |= vnicc; +else card->options.vnicc.set_char_sup &= ~vnicc; }/* enforce assumed default values and recover settings, if changed */
Signature · 1 line
2.20.1