4.5.3-stable review
Subsystems (7)
Greg Kroah-Hartman
maintainerPATCH 172/200 mtd: brcmnand: Fix v7.1 register offsets
In reply to Greg Kroah-Hartman4.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Fainelli <[email protected]>
commit d267aefc54a28efc5bda7f009598dc83b5f98734 upstream.
The BRCMNAND controller revision 7.1 is almost 100% compatible with the previous v6.0 register offset layout, except for the Correctable Error Reporting Threshold registers. Fix this by adding another table with the correct offsets for CORR_THRESHOLD and CORR_THRESHOLD_EXT.
--- drivers/mtd/nand/brcmnand/brcmnand.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-)
drivers/mtd/nand/brcmnand/brcmnand.c +33 -1
@@ -311,6 +311,36 @@ static const u16 brcmnand_regs_v60[] = { [BRCMNAND_FC_BASE] = 0x400, }; +/* BRCMNAND v7.1 */ +static const u16 brcmnand_regs_v71[] = { + [BRCMNAND_CMD_START ] =0x04 , + [BRCMNAND_CMD_EXT_ADDRESS ] =0x08 , + [BRCMNAND_CMD_ADDRESS ] =0x0c , + [BRCMNAND_INTFC_STATUS ] =0x14 , + [BRCMNAND_CS_SELECT ] =0x18 , + [BRCMNAND_CS_XOR ] =0x1c , + [BRCMNAND_LL_OP ] =0x20 , + [BRCMNAND_CS0_BASE ] =0x50 , + [BRCMNAND_CS1_BASE ] =0 , + [BRCMNAND_CORR_THRESHOLD ] =0xdc , + [BRCMNAND_CORR_THRESHOLD_EXT ] =0xe0 , + [BRCMNAND_UNCORR_COUNT ] =0xfc , + [BRCMNAND_CORR_COUNT ] =0x100 , + [BRCMNAND_CORR_EXT_ADDR ] =0x10c , + [BRCMNAND_CORR_ADDR ] =0x110 , + [BRCMNAND_UNCORR_EXT_ADDR ] =0x114 , + [BRCMNAND_UNCORR_ADDR ] =0x118 , + [BRCMNAND_SEMAPHORE ] =0x150 , + [BRCMNAND_ID ] =0x194 , + [BRCMNAND_ID_EXT ] =0x198 , + [BRCMNAND_LL_RDATA ] =0x19c , + [BRCMNAND_OOB_READ_BASE ] =0x200 , + [BRCMNAND_OOB_READ_10_BASE ] =0 , + [BRCMNAND_OOB_WRITE_BASE ] =0x280 , + [BRCMNAND_OOB_WRITE_10_BASE ] =0 , + [BRCMNAND_FC_BASE ] =0x400 , +}; +enum brcmnand_cs_reg {BRCMNAND_CS_CFG_EXT =0 ,BRCMNAND_CS_CFG ,
@@ -406,7 +436,9 @@ static int brcmnand_revision_init(struct }/* Register offsets */ -if (ctrl->nand_version >=0x0600 ) +if (ctrl->nand_version >=0x0701 ) + ctrl->reg_offsets = brcmnand_regs_v71; +else if (ctrl->nand_version >=0x0600 ) ctrl->reg_offsets = brcmnand_regs_v60;else if (ctrl->nand_version >=0x0500 ) ctrl->reg_offsets = brcmnand_regs_v50;
Greg Kroah-Hartman
maintainerPATCH 177/200 perf stat: Document --detailed option
In reply to Greg Kroah-Hartman4.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Borislav Petkov <[email protected]>
commit f594bae08183fb6b57db55387794ece3e1edf6f6 upstream.
I'm surprised this remained undocumented since at least 2011. And it is actually a very useful switch, as Steve and I came to realize recently.
Add the text from
2cba3ffb9a9d ("perf stat: Add -d -d and -d -d -d options to show more CPU events")
which added the incrementing aspect to -d.
--- tools/perf/Documentation/perf-stat.txt | 8 ++++++++ 1 file changed, 8 insertions(+)
tools/perf/Documentation/perf-stat.txt +8 -0
@@ -69,6 +69,14 @@ report:: --scale:: scale/normalize counter values +-d:: +--detailed:: + print more detailed statistics, can be specified up to 3 times + + -d: detailed events, L1 and LLC data cache + -d -d: more detailed events, dTLB and iTLB events + -d -d -d: very detailed events, adding prefetch events + -r:: --repeat=<n>:: repeat command and print average + stddev (max: 100). 0 means forever.
Greg Kroah-Hartman
maintainerPATCH 178/200 ntb: perf test: fix address space confusion
In reply to Greg Kroah-Hartman4.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
commit 1985a88107b5330b2a911ad4d279e1bd7e4deb24 upstream.
The ntb driver assigns between pointers an __iomem tokens, and also casts them to 64-bit integers, which results in compiler warnings on 32-bit systems:
drivers/ntb/test/ntb_perf.c: In function 'perf_copy':drivers/ntb/test/ntb_perf.c:213:10: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
vbase = (u64)(u64 *)mw->vbase;
^
drivers/ntb/test/ntb_perf.c:214:14: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
dst_vaddr = (u64)(u64 *)dst;
^This adds __iomem annotations where needed and changes the temporary variables to iomem pointers to avoid casting them to u64. I did not see the problem in linux-next earlier, but it show showed up in 4.5-rc1.
--- drivers/ntb/test/ntb_perf.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)
drivers/ntb/test/ntb_perf.c +11 -10
@@ -178,7 +178,7 @@ static void perf_copy_callback(void *datatomic_dec (&pctx->dma_sync); } -static ssize_t perf_copy (struct pthr_ctx *pctx,char *dst, +static ssize_t perf_copy (struct pthr_ctx *pctx,char __iomem *dst,char *src,size_t size) {struct perf_ctx *perf = pctx->perf;
@@ -189,7 +189,8 @@ static ssize_t perf_copy(struct pthr_ctxdma_cookie_t cookie;size_t src_off, dst_off;struct perf_mw *mw = &perf->mw; -u64 vbase, dst_vaddr; +void __iomem *vbase; +void __iomem *dst_vaddr;dma_addr_t dst_phys;int retries =0 ;
@@ -204,14 +205,14 @@ static ssize_t perf_copy(struct pthr_ctx } device = chan->device; - src_off = (size_t )src & ~PAGE_MASK ; - dst_off = (size_t )dst & ~PAGE_MASK ; + src_off = (uintptr_t )src & ~PAGE_MASK ; + dst_off = (uintptr_t __force )dst & ~PAGE_MASK ;if (!is_dma_copy_aligned (device, src_off, dst_off, size))return -ENODEV ; - vbase = (u64 )(u64 *)mw->vbase; - dst_vaddr = (u64 )(u64 *)dst; + vbase = mw->vbase; + dst_vaddr = dst; dst_phys = mw->phys_addr + (dst_vaddr - vbase); unmap =dmaengine_get_unmap_data (device->dev,1 ,GFP_NOWAIT );
@@ -261,13 +262,13 @@ err_get_unmap:return 0 ; } -static int perf_move_data (struct pthr_ctx *pctx,char *dst,char *src, +static int perf_move_data (struct pthr_ctx *pctx,char __iomem *dst,char *src,u64 buf_size,u64 win_size,u64 total) {int chunks, total_chunks, i;int copied_chunks =0 ;u64 copied =0 , result; -char *tmp = dst; +char __iomem *tmp = dst;u64 perf, diff_us;ktime_t kstart, kstop, kdiff;
@@ -324,7 +325,7 @@ static int ntb_perf_thread(void *data)struct perf_ctx *perf = pctx->perf;struct pci_dev *pdev = perf->ntb->pdev;struct perf_mw *mw = &perf->mw; -char *dst; +char __iomem *dst;u64 win_size, buf_size, total;void *src;int rc, node, i;
@@ -364,7 +365,7 @@ static int ntb_perf_thread(void *data)if (buf_size >MAX_TEST_SIZE ) buf_size =MAX_TEST_SIZE ; - dst = (char *)mw->vbase; + dst = (char __iomem *)mw->vbase;atomic_inc (&perf->tsync);while (atomic_read (&perf->tsync) != perf->perf_threads)
Greg Kroah-Hartman
maintainerPATCH 179/200 NTB: Remove _addr functions from ntb_hw_amd
In reply to Greg Kroah-Hartman4.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Allen Hubbe <[email protected]>
commit 4f1b50c3e3082b31c94cee2b897bd9f5d0f3e7c8 upstream.
Kernel zero day testing warned about address space confusion. A virtual iomem address was used where a physical address is expected. The offending functions implement an optional part of the api, so they are removed. They can be added later, after testing.
--- drivers/ntb/hw/amd/ntb_hw_amd.c | 30 ------------------------------ 1 file changed, 30 deletions(-)
drivers/ntb/hw/amd/ntb_hw_amd.c +0 -30
@@ -357,20 +357,6 @@ static int amd_ntb_db_clear_mask(structreturn 0 ; } -static int amd_ntb_peer_db_addr (struct ntb_dev *ntb, -phys_addr_t *db_addr, -resource_size_t *db_size) -{ -struct amd_ntb_dev *ndev =ntb_ndev (ntb); - -if (db_addr) - *db_addr = (phys_addr_t)(ndev->peer_mmio +AMD_DBREQ_OFFSET ); -if (db_size) - *db_size =sizeof (u32); - -return 0 ; -} -static int amd_ntb_peer_db_set (struct ntb_dev *ntb,u64 db_bits) {struct amd_ntb_dev *ndev =ntb_ndev (ntb);
@@ -415,20 +401,6 @@ static int amd_ntb_spad_write(struct ntbreturn 0 ; } -static int amd_ntb_peer_spad_addr (struct ntb_dev *ntb,int idx, -phys_addr_t *spad_addr) -{ -struct amd_ntb_dev *ndev =ntb_ndev (ntb); - -if (idx <0 || idx >= ndev->spad_count) -return -EINVAL ; - -if (spad_addr) - *spad_addr = (phys_addr_t)(ndev->self_mmio +AMD_SPAD_OFFSET + - ndev->peer_spad + (idx <<2 )); -return 0 ; -} -static u32 amd_ntb_peer_spad_read (struct ntb_dev *ntb,int idx) {struct amd_ntb_dev *ndev =ntb_ndev (ntb);
@@ -472,12 +444,10 @@ static const struct ntb_dev_ops amd_ntb_ .db_clear = amd_ntb_db_clear, .db_set_mask = amd_ntb_db_set_mask, .db_clear_mask = amd_ntb_db_clear_mask, - .peer_db_addr = amd_ntb_peer_db_addr, .peer_db_set = amd_ntb_peer_db_set, .spad_count = amd_ntb_spad_count, .spad_read = amd_ntb_spad_read, .spad_write = amd_ntb_spad_write, - .peer_spad_addr = amd_ntb_peer_spad_addr, .peer_spad_read = amd_ntb_peer_spad_read, .peer_spad_write = amd_ntb_peer_spad_write, };
Greg Kroah-Hartman
maintainerPATCH 180/200 perf/core: Dont leak event in the syscall error path
In reply to Greg Kroah-Hartman4.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexander Shishkin <[email protected]>
commit 201c2f85bd0bc13b712d9c0b3d11251b182e06ae upstream.
In the error path, event_file not being NULL is used to determine whether the event itself still needs to be free'd, so fix it up to avoid leaking.
--- kernel/events/core.c | 1 + 1 file changed, 1 insertion(+)
kernel/events/core.c +1 -0
@@ -8479,6 +8479,7 @@ SYSCALL_DEFINE5(perf_event_open, f_flags);if (IS_ERR (event_file)) { err =PTR_ERR (event_file); + event_file =NULL ; goto err_context; }
Greg Kroah-Hartman
maintainerPATCH 145/200 fbdev: da8xx-fb: fix videomodes of lcd panels
In reply to Greg Kroah-Hartman4.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sushaanth Srirangapathi <[email protected]>
commit 713fced8d10fa1c759c8fb6bf9aaa681bae68cad upstream.
Commit 028cd86b794f4a ("video: da8xx-fb: fix the polarities of the hsync/vsync pulse") fixes polarities of HSYNC/VSYNC pulse but forgot to update known_lcd_panels[] which had sync values according to old logic. This breaks LCD at least on DA850 EVM.
This patch fixes this issue and I have tested this for panel "Sharp_LK043T1DG01" using DA850 EVM board.
--- drivers/video/fbdev/da8xx-fb.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/video/fbdev/da8xx-fb.c +3 -4
@@ -209,8 +209,7 @@ static struct fb_videomode known_lcd_pan .lower_margin = 2, .hsync_len = 0, .vsync_len = 0, - .sync =FB_SYNC_CLK_INVERT | - FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, + .sync = FB_SYNC_CLK_INVERT, },/* Sharp LK043T1DG01 */ [1] = {
@@ -224,7 +223,7 @@ static struct fb_videomode known_lcd_pan .lower_margin = 2, .hsync_len = 41, .vsync_len = 10, - .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, + .sync = 0, .flag = 0, }, [2] = {
@@ -239,7 +238,7 @@ static struct fb_videomode known_lcd_pan .lower_margin = 10, .hsync_len = 10, .vsync_len = 10, - .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, + .sync = 0, .flag = 0, }, [3] = {
Greg Kroah-Hartman
maintainerPATCH 181/200 perf/core: Fix time tracking bug with multiplexing
In reply to Greg Kroah-Hartman4.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Zijlstra <[email protected]>
commit 8fdc65391c6ad16461526a685f03262b3b01bfde upstream.
Stephane reported that commit:
3cbaa5906967 ("perf: Fix ctx time tracking by introducing EVENT_TIME")
introduced a regression wrt. time tracking, as easily observed by:
Quoted 34 lines
This patch introduce a bug in the time tracking of events when multiplexing is used.
The issue is easily reproducible with the following perf run:
$ perf stat -a -C 0 -e branches,branches,branches,branches,branches,branches -I 1000 1.000730239 652,394 branches (66.41%) 1.000730239 597,809 branches (66.41%) 1.000730239 593,870 branches (66.63%) 1.000730239 651,440 branches (67.03%) 1.000730239 656,725 branches (66.96%) 1.000730239 <not counted> branchesOne branches event is shown as not having run. Yet, with multiplexing, all events should run especially with a 1s (-I 1000) interval. The delta for
time_runningcomes out to 0. Yet, the event has run because the kernel is actually multiplexing the events. The problem is that the time tracking is the kernel and especially inctx_sched_out()is wrong now.The problem is that in case that the kernel enters
ctx_sched_out()with the following state:ctx->is_active=0x7 event_type=0x1 Call Trace: [<ffffffff813ddd41>] dump_stack+0x63/0x82 [<ffffffff81182bdc>] ctx_sched_out+0x2bc/0x2d0 [<ffffffff81183896>] perf_mux_hrtimer_handler+0xf6/0x2c0 [<ffffffff811837a0>] ? __perf_install_in_context+0x130/0x130 [<ffffffff810f5818>] __hrtimer_run_queues+0xf8/0x2f0 [<ffffffff810f6097>] hrtimer_interrupt+0xb7/0x1d0 [<ffffffff810509a8>] local_apic_timer_interrupt+0x38/0x60 [<ffffffff8175ca9d>] smp_apic_timer_interrupt+0x3d/0x50 [<ffffffff8175ac7c>] apic_timer_interrupt+0x8c/0xa0
Quoted 5 lines
In that case, the test:
if (is_active&EVENT_TIME)will be false and the time will not be updated. Time must always be updated on sched out.
Fix this by always updating time if EVENT_TIME was set, as opposed to only updating time when EVENT_TIME changed.
--- kernel/events/core.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
kernel/events/core.c +12 -2
@@ -2402,14 +2402,24 @@ static void ctx_sched_out(struct perf_ev cpuctx->task_ctx =NULL ; } - is_active ^= ctx->is_active;/* changed bits */ - +/* +* Always update time if it was set; not only when it changes. +* Otherwise we can 'forget' to update time for any but the last +* context we sched out. For example: +* +* ctx_sched_out(.event_type = EVENT_FLEXIBLE) +* ctx_sched_out(.event_type = EVENT_PINNED) +* +* would only update time for the pinned events. +*/ if (is_active &EVENT_TIME ) {/* update (and stop) ctx time */ update_context_time (ctx);update_cgrp_time_from_cpuctx (cpuctx); } + is_active ^= ctx->is_active;/* changed bits */ +if (!ctx->nr_active || !(is_active &EVENT_ALL ))return ;
Greg Kroah-Hartman
maintainerPATCH 184/200 ARM: prima2: always enable reset controller
In reply to Greg Kroah-Hartman4.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
commit ef2b1d777d643af227a22309d8b79898b90b123c upstream.
The atlas7 clock controller driver registers a reset controller for itself, which causes a link error when the subsystem is disabled:
drivers/built-in.o: In function `atlas7_clk_init':drivers/clk/sirf/clk-atlas7.c:1681: undefined reference to `reset_controller_register'
As the clk driver does not have a Kconfig symbol for itself but it always built-in when the platform is enabled, we have to ensure that the reset controller subsystem is also built-in in this case.
--- arch/arm/mach-prima2/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/arm/mach-prima2/Kconfig +1 -0
@@ -2,6 +2,7 @@ menuconfig ARCH_SIRF bool "CSR SiRF" depends on ARCH_MULTI_V7 select ARCH_HAS_RESET_CONTROLLER + select RESET_CONTROLLER select ARCH_REQUIRE_GPIOLIB select GENERIC_IRQ_CHIP select NO_IOPORT_MAP
Greg Kroah-Hartman
maintainerPATCH 186/200 ARM: dts: armada-375: use armada-370-sata for SATA
In reply to Greg Kroah-Hartman4.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lior Amsalem <[email protected]>
commit b3a7f31eb7375633cd6a742f19488fc5a4208b36 upstream.
The Armada 375 has the same SATA IP as Armada 370 and Armada XP, which requires the PHY speed to be set in the LP_PHY_CTL register for SATA hotplug to work.
Therefore, this commit updates the compatible string used to describe the SATA IP in Armada 375 from marvell,orion-sata to marvell,armada-370-sata.
--- arch/arm/boot/dts/armada-375.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/armada-375.dtsi +1 -1
@@ -529,7 +529,7 @@ }; sata@a0000 { - compatible = "marvell,orion-sata"; + compatible = "marvell,armada-370-sata"; reg = <0xa0000 0x5000>; interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>; clocks = <&gateclk 14>, <&gateclk 20>;
Greg Kroah-Hartman
maintainerPATCH 187/200 ARM: dts: pxa: fix dma engine node to pxa3xx-nand
In reply to Greg Kroah-Hartman4.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Robert Jarzmik <[email protected]>
commit 07c6b2d01d351f0512ed7145625265e435ab3240 upstream.
Since the switch from mmp_pdma to pxa_dma driver for pxa architectures, the pxa_dma requires 2 arguments, namely the requestor line and the requested priority.
Fix the only left device node which was still passing only one argument, making the pxa3xx-nand driver misbehave in a device-tree configuration, ie. failing all data transfers.
--- arch/arm/boot/dts/pxa3xx.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/pxa3xx.dtsi +1 -1
@@ -30,7 +30,7 @@ reg = <0x43100000 90>; interrupts = <45>; clocks = <&clks CLK_NAND>; - dmas = <&pdma 97>; + dmas = <&pdma 97 3>; dma-names = "data"; #address-cells = <1>; #size-cells = <1>;
Greg Kroah-Hartman
maintainerPATCH 146/200 lib/mpi: Endianness fix
In reply to Greg Kroah-Hartman4.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Marek <[email protected]>
commit 3ee0cb5fb5eea2110db1b5cb7f67029b7be8a376 upstream.
The limbs are integers in the host endianness, so we can't simply iterate over the individual bytes. The current code happens to work on little-endian, because the order of the limbs in the MPI array is the same as the order of the bytes in each limb, but it breaks on big-endian.
--- lib/mpi/mpicoder.c | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-)
lib/mpi/mpicoder.c +21 -18
@@ -128,6 +128,23 @@ leave: }EXPORT_SYMBOL_GPL (mpi_read_from_buffer); +static int count_lzeros (MPI a) +{ +mpi_limb_t alimb; +int i, lzeros =0 ; + +for (i = a->nlimbs -1 ; i >=0 ; i--) { + alimb = a->d[i]; +if (alimb ==0 ) { + lzeros +=sizeof (mpi_limb_t); + }else { + lzeros +=count_leading_zeros (alimb) /8 ; +break ; + } + } +return lzeros; +} +/** * mpi_read_buffer() - read MPI to a bufer provided by user (msb first) *
@@ -148,7 +165,7 @@ int mpi_read_buffer(MPI a, uint8_t *buf,uint8_t *p;mpi_limb_t alimb;unsigned int n =mpi_get_size (a); -int i, lzeros =0 ; +int i, lzeros;if (!buf || !nbytes)return -EINVAL ;
@@ -156,14 +173,7 @@ int mpi_read_buffer(MPI a, uint8_t *buf,if (sign) *sign = a->sign; - p = (void *)&a->d[a->nlimbs] -1 ; - -for (i = a->nlimbs *sizeof (alimb) -1 ; i >=0 ; i--, p--) { -if (!*p) - lzeros++; -else -break ; - } + lzeros =count_lzeros (a);if (buf_len < n - lzeros) { *nbytes = n - lzeros;
@@ -351,7 +361,7 @@ int mpi_write_to_sgl(MPI a, struct scattu8 *p, *p2;mpi_limb_t alimb, alimb2;unsigned int n =mpi_get_size (a); -int i, x, y =0 , lzeros =0 , buf_len; +int i, x, y =0 , lzeros, buf_len;if (!nbytes)return -EINVAL ;
@@ -359,14 +369,7 @@ int mpi_write_to_sgl(MPI a, struct scattif (sign) *sign = a->sign; - p = (void *)&a->d[a->nlimbs] -1 ; - -for (i = a->nlimbs *sizeof (alimb) -1 ; i >=0 ; i--, p--) { -if (!*p) - lzeros++; -else -break ; - } + lzeros =count_lzeros (a);if (*nbytes < n - lzeros) { *nbytes = n - lzeros;
Greg Kroah-Hartman
maintainerPATCH 147/200 misc/bmp085: Enable building as a module
In reply to Greg Kroah-Hartman4.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ben Hutchings <[email protected]>
commit 50e6315dba721cbc24ccd6d7b299f1782f210a98 upstream.
Commit 985087dbcb02 'misc: add support for bmp18x chips to the bmp085 driver' changed the BMP085 config symbol to a boolean. I see no reason why the shared code cannot be built as a module, so change it back to tristate.
--- drivers/misc/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/misc/Kconfig +1 -1
@@ -440,7 +440,7 @@ config ARM_CHARLCD still useful. config BMP085 - bool + tristate depends on SYSFS config BMP085_I2C
Greg Kroah-Hartman
maintainerPATCH 148/200 misc: mic/scif: fix wrap around tests
In reply to Greg Kroah-Hartman4.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
commit 7b64dbf849abdd7e769820e25120758f956a7f13 upstream.
Signed integer overflow is undefined. Also I added a check for "(offset < 0)" in scif_unregister() because that makes it match the other conditions and because I didn't want to subtract a negative.
--- drivers/misc/mic/scif/scif_rma.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/misc/mic/scif/scif_rma.c +4 -3
@@ -1511,7 +1511,7 @@ off_t scif_register_pinned_pages(scif_epif ((map_flags &SCIF_MAP_FIXED ) && ((ALIGN (offset,PAGE_SIZE ) != offset) || (offset <0 ) || - (offset + (off_t )len < offset))) + (len >LONG_MAX - offset)))return -EINVAL ;might_sleep ();
@@ -1614,7 +1614,7 @@ off_t scif_register(scif_epd_t epd, voidif ((map_flags &SCIF_MAP_FIXED ) && ((ALIGN (offset,PAGE_SIZE ) != offset) || (offset <0 ) || - (offset + (off_t )len < offset))) + (len >LONG_MAX - offset)))return -EINVAL ;/* Unsupported protection requested */
@@ -1732,7 +1732,8 @@ scif_unregister(scif_epd_t epd, off_t of/* Offset is not page aligned or offset+len wraps around */ if ((ALIGN (offset,PAGE_SIZE ) != offset) || - (offset + (off_t )len < offset)) + (offset <0 ) || + (len >LONG_MAX - offset))return -EINVAL ; err =scif_verify_epd (ep);
Greg Kroah-Hartman
maintainerPATCH 149/200 PM / OPP: Initialize u_volt_min/max to a valid value
In reply to Greg Kroah-Hartman4.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Viresh Kumar <[email protected]>
commit c88c395f4a6485f23f81e385c79945d68bcd5c5d upstream.
We kept u_volt_min/max initialized to 0, when only the target voltage is present in DT, instead of the target/min/max triplet.
This didn't go well with the regulator framework, as on few calls the min voltage was set to target and max was set to 0 and so resulted in a kernel crash like below:
kernel BUG at ../drivers/regulator/core.c:216!
[<c0684af4>] (regulator_check_voltage) from [<c06857ac>] (regulator_set_voltage_unlocked+0x58/0x230) [<c06857ac>] (regulator_set_voltage_unlocked) from [<c06859ac>] (regulator_set_voltage+0x28/0x54) [<c06859ac>] (regulator_set_voltage) from [<c0775b28>] (_set_opp_voltage+0x30/0x98) [<c0775b28>] (_set_opp_voltage) from [<c0776630>] (dev_pm_opp_set_rate+0xf0/0x28c) [<c0776630>] (dev_pm_opp_set_rate) from [<c096f784>] (__cpufreq_driver_target+0x184/0x2b4) [<c096f784>] (__cpufreq_driver_target) from [<c0973760>] (dbs_check_cpu+0x1b0/0x1f4) [<c0973760>] (dbs_check_cpu) from [<c0973f30>] (cpufreq_governor_dbs+0x324/0x5c4) [<c0973f30>] (cpufreq_governor_dbs) from [<c0970958>] (__cpufreq_governor+0xe4/0x1ec) [<c0970958>] (__cpufreq_governor) from [<c09711e0>] (cpufreq_init_policy+0x64/0x8c) [<c09711e0>] (cpufreq_init_policy) from [<c09718cc>] (cpufreq_online+0x2fc/0x708) [<c09718cc>] (cpufreq_online) from [<c0765ff0>] (subsys_interface_register+0x94/0xd8) [<c0765ff0>] (subsys_interface_register) from [<c0970530>] (cpufreq_register_driver+0x14c/0x19c) [<c0970530>] (cpufreq_register_driver) from [<c09746dc>] (dt_cpufreq_probe+0x70/0xec) [<c09746dc>] (dt_cpufreq_probe) from [<c076907c>] (platform_drv_probe+0x4c/0xb0) [<c076907c>] (platform_drv_probe) from [<c07678e0>] (driver_probe_device+0x214/0x2c0) [<c07678e0>] (driver_probe_device) from [<c0767a18>] (__driver_attach+0x8c/0x90) [<c0767a18>] (__driver_attach) from [<c0765c2c>] (bus_for_each_dev+0x68/0x9c) [<c0765c2c>] (bus_for_each_dev) from [<c0766d78>] (bus_add_driver+0x1a0/0x218) [<c0766d78>] (bus_add_driver) from [<c076810c>] (driver_register+0x78/0xf8) [<c076810c>] (driver_register) from [<c0301d74>] (do_one_initcall+0x90/0x1d8) [<c0301d74>] (do_one_initcall) from [<c1100e14>] (kernel_init_freeable+0x15c/0x1fc) [<c1100e14>] (kernel_init_freeable) from [<c0b27a0c>] (kernel_init+0x8/0xf0) [<c0b27a0c>] (kernel_init) from [<c0307d78>] (ret_from_fork+0x14/0x3c)
Code: e1550004 baffffeb e3a00000 e8bd8070 (e7f001f2)
Fix that by initializing u_volt_min/max to the target voltage in such cases.
--- drivers/base/power/opp/core.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/base/power/opp/core.c +8 -2
@@ -844,8 +844,14 @@ static int opp_parse_supplies(struct dev } opp->u_volt = microvolt[0 ]; - opp->u_volt_min = microvolt[1 ]; - opp->u_volt_max = microvolt[2 ]; + +if (count ==1 ) { + opp->u_volt_min = opp->u_volt; + opp->u_volt_max = opp->u_volt; + }else { + opp->u_volt_min = microvolt[1 ]; + opp->u_volt_max = microvolt[2 ]; + }/* Search for "opp-microamp-<name>" */ prop =NULL ;
Greg Kroah-Hartman
maintainerPATCH 190/200 bus: imx-weim: Take the status property value into account
In reply to Greg Kroah-Hartman4.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fabio Estevam <[email protected]>
commit 33b96d2c9579213cf3f36d7b29841b1e464750c4 upstream.
Currently we have an incorrect behaviour when multiple devices are present under the weim node. For example:
&weim {
...
status = "okay";
sram@0,0 {
...
status = "okay";
};
mram@0,0 {
...
status = "disabled";
};
};In this case only the 'sram' device should be probed and not 'mram'.
However what happens currently is that the status variable is ignored, causing the 'sram' device to be disabled and 'mram' to be enabled.
Change the weim_parse_dt() function to use for_each_available_child_of_node()so that the devices marked with 'status = disabled' are not probed.
--- drivers/bus/imx-weim.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/bus/imx-weim.c +1 -1
@@ -150,7 +150,7 @@ static int __init weim_parse_dt(struct preturn ret; } -for_each_child_of_node (pdev->dev.of_node, child) { +for_each_available_child_of_node (pdev->dev.of_node, child) {if (!child->name)continue ;
Greg Kroah-Hartman
maintainerPATCH 199/200 stm class: Select CONFIG_SRCU
In reply to Greg Kroah-Hartman4.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
commit 042d4460b5b4379a12f375045ff9065cf6758735 upstream.
The newly added STM code uses SRCU, but does not ensure that this code is part of the kernel:
drivers/built-in.o: In function `stm_source_link_show':include/linux/srcu.h:221: undefined reference to __srcu_read_lock' include/linux/srcu.h:238: undefined reference to __srcu_read_unlock' drivers/built-in.o: In function `stm_source_link_drop':include/linux/srcu.h:221: undefined reference to __srcu_read_lock' include/linux/srcu.h:238: undefined reference to __srcu_read_unlock'
This adds a Kconfig 'select' statement like all the other SRCU using drivers have.
--- drivers/hwtracing/stm/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/hwtracing/stm/Kconfig +1 -0
@@ -1,6 +1,7 @@ config STM tristate "System Trace Module devices" select CONFIGFS_FS + select SRCU help A System Trace Module (STM) is a device exporting data in System Trace Protocol (STP) format as defined by MIPI STP standards.
Greg Kroah-Hartman
maintainerPATCH 191/200 btrfs: fix memory leak of fs_info in block group cache
In reply to Greg Kroah-Hartman4.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kinglong Mee <[email protected]>
commit aa66b0bb08869d93492bd817d2eae694ca743a3d upstream.
When starting up linux with btrfs filesystem, I got many memory leak messages by kmemleak as,
unreferenced object 0xffff880066882000 (size 4096):
comm "modprobe", pid 730, jiffies 4294690024 (age 196.599s) hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<ffffffff8174d52e>] kmemleak_alloc+0x4e/0xb0
[<ffffffff811d09aa>] kmem_cache_alloc_trace+0xea/0x1e0
[<ffffffffa03620fb>] btrfs_alloc_dummy_fs_info+0x6b/0x2a0 [btrfs]
[<ffffffffa03624fc>] btrfs_alloc_dummy_block_group+0x5c/0x120 [btrfs]
[<ffffffffa0360aa9>] btrfs_test_free_space_cache+0x39/0xed0 [btrfs]
[<ffffffffa03b5a74>] trace_raw_output_xfs_attr_class+0x54/0xe0 [xfs]
[<ffffffff81002122>] do_one_initcall+0xb2/0x1f0
[<ffffffff811765aa>] do_init_module+0x5e/0x1e9
[<ffffffff810fec09>] load_module+0x20a9/0x2690
[<ffffffff810ff439>] SyS_finit_module+0xb9/0xf0
[<ffffffff81757daf>] entry_SYSCALL_64_fastpath+0x12/0x76
[<ffffffffffffffff>] 0xffffffffffffffff
unreferenced object 0xffff8800573f8000 (size 10256):
comm "modprobe", pid 730, jiffies 4294690185 (age 196.460s)
hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<ffffffff8174d52e>] kmemleak_alloc+0x4e/0xb0
[<ffffffff8119ca6e>] kmalloc_order+0x5e/0x70
[<ffffffff8119caa4>] kmalloc_order_trace+0x24/0x90
[<ffffffffa03620b3>] btrfs_alloc_dummy_fs_info+0x23/0x2a0 [btrfs]
[<ffffffffa03624fc>] btrfs_alloc_dummy_block_group+0x5c/0x120 [btrfs]
[<ffffffffa036603d>] run_test+0xfd/0x320 [btrfs]
[<ffffffffa0366f34>] btrfs_test_free_space_tree+0x94/0xee [btrfs]
[<ffffffffa03b5aab>] trace_raw_output_xfs_attr_class+0x8b/0xe0 [xfs]
[<ffffffff81002122>] do_one_initcall+0xb2/0x1f0
[<ffffffff811765aa>] do_init_module+0x5e/0x1e9
[<ffffffff810fec09>] load_module+0x20a9/0x2690
[<ffffffff810ff439>] SyS_finit_module+0xb9/0xf0
[<ffffffff81757daf>] entry_SYSCALL_64_fastpath+0x12/0x76
[<ffffffffffffffff>] 0xffffffffffffffffThis patch lets btrfs using fs_info stored in btrfs_root for block group cache directly without allocating a new one.
--- fs/btrfs/tests/btrfs-tests.c | 6 ------ fs/btrfs/tests/free-space-tree-tests.c | 1 + 2 files changed, 1 insertion(+), 6 deletions(-)
fs/btrfs/tests/btrfs-tests.c +0 -6
@@ -189,12 +189,6 @@ btrfs_alloc_dummy_block_group(unsigned lkfree (cache);return NULL ; } - cache->fs_info =btrfs_alloc_dummy_fs_info (); -if (!cache->fs_info) { -kfree (cache->free_space_ctl); -kfree (cache); -return NULL ; - } cache->key.objectid =0 ; cache->key.offset = length;
fs/btrfs/tests/free-space-tree-tests.c +1 -0
@@ -485,6 +485,7 @@ static int run_test(test_func_t test_fun cache->bitmap_low_thresh =0 ; cache->bitmap_high_thresh = (u32)-1 ; cache->needs_free_space =1 ; + cache->fs_info = root->fs_info;btrfs_init_dummy_trans (&trans);
Greg Kroah-Hartman
maintainerPATCH 195/200 sunrpc/cache: drop reference when sunrpc_cache_pipe_upcall() detects a race
In reply to Greg Kroah-Hartman4.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: NeilBrown <[email protected]>
commit a6ab1e8126d205238defbb55d23661a3a5c6a0d8 upstream.
sunrpc_cache_pipe_upcall() can detect a race if CACHE_PENDING is no longer set. In this case it aborts the queuing of the upcall.
However it has already taken a new counted reference on "h" and doesn't "put" it, even though it frees the data structure holding the reference.
So let's delay the "cache_get" until we know we need it.
--- net/sunrpc/cache.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/sunrpc/cache.c +3 -3
@@ -1182,14 +1182,14 @@ int sunrpc_cache_pipe_upcall(struct cach } crq->q.reader =0 ; - crq->item =cache_get (h); crq->buf = buf; crq->len =0 ; crq->readers =0 ;spin_lock (&queue_lock); -if (test_bit (CACHE_PENDING , &h->flags)) +if (test_bit (CACHE_PENDING , &h->flags)) { + crq->item =cache_get (h);list_add_tail (&crq->q.list, &detail->queue); -else + }else /* Lost a race, no longer PENDING, so don't enqueue */ ret = -EAGAIN ;spin_unlock (&queue_lock);
Greg Kroah-Hartman
maintainerPATCH 196/200 megaraid_sas: add missing curly braces in ioctl handler
In reply to Greg Kroah-Hartman4.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
commit 3deb9438d34a09f6796639b652a01d110aca9f75 upstream.
gcc-6 found a dubious indentation in the megasas_mgmt_fw_ioctl function:
drivers/scsi/megaraid/megaraid_sas_base.c: In function 'megasas_mgmt_fw_ioctl':drivers/scsi/megaraid/megaraid_sas_base.c:6658:4: warning: statement is indented as if it were guarded by... [-Wmisleading-indentation]
kbuff_arr[i] = NULL;
^~~~~~~~~drivers/scsi/megaraid/megaraid_sas_base.c:6653:3: note: ...this 'if' clause, but it is not
if (kbuff_arr[i])
^~
The code is actually correct, as there is no downside in clearing a NULL pointer again.
This clarifies the code and avoids the warning by adding extra curly braces.
--- drivers/scsi/megaraid/megaraid_sas_base.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/scsi/megaraid/megaraid_sas_base.c +2 -1
@@ -6282,12 +6282,13 @@ out: }for (i =0 ; i < ioc->sge_count; i++) { -if (kbuff_arr[i]) +if (kbuff_arr[i]) {dma_free_coherent (&instance->pdev->dev,le32_to_cpu (kern_sge32[i].length), kbuff_arr[i],le32_to_cpu (kern_sge32[i].phys_addr)); kbuff_arr[i] =NULL ; + } }megasas_return_cmd (instance, cmd);
Greg Kroah-Hartman
maintainerPATCH 189/200 ARM: dts: am437x: Fix GPMC dma properties
In reply to Greg Kroah-Hartman4.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Franklin S Cooper Jr <[email protected]>
commit 883cbc901b570625f54250a37b008d3635f1fbda upstream.
This patch updates the GPMC's DT DMA property to reflect the updated eDMA bindings.
--- arch/arm/boot/dts/am4372.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/am4372.dtsi +1 -1
@@ -884,7 +884,7 @@ gpmc: gpmc@50000000 { compatible = "ti,am3352-gpmc"; ti,hwmods = "gpmc"; - dmas = <&edma 52>; + dmas = <&edma 52 0>; dma-names = "rxtx"; clocks = <&l3s_gclk>; clock-names = "fck";
Greg Kroah-Hartman
maintainerPATCH 46/200 futex: Handle unlock_pi race gracefully
In reply to Greg Kroah-Hartman4.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sebastian Andrzej Siewior <[email protected]>
commit 89e9e66ba1b3bde9d8ea90566c2aee20697ad681 upstream.
If userspace calls UNLOCK_PI unconditionally without trying the TID -> 0 transition in user space first then the user space value might not have the waiters bit set. This opens the following race:
CPU0 CPU1
uval = get_user(futex)
lock(hb)
lock(hb)
futex |= FUTEX_WAITERS .... unlock(hb)
cmpxchg(futex, uval, newval)
So the cmpxchg fails and returns -EINVAL to user space, which is wrong because the futex value is valid.
To handle this (yes, yet another) corner case gracefully, check for a flag change and retry.
[ tglx: Massaged changelog and slightly reworked implementation ]
--- kernel/futex.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-)
kernel/futex.c +22 -3
@@ -1212,10 +1212,20 @@ static int wake_futex_pi(u32 __user *uadif (unlikely (should_fail_futex (true))) ret = -EFAULT ; -if (cmpxchg_futex_value_locked (&curval, uaddr, uval, newval)) +if (cmpxchg_futex_value_locked (&curval, uaddr, uval, newval)) { ret = -EFAULT ; -else if (curval != uval) - ret = -EINVAL ; + }else if (curval != uval) { +/* +* If a unconditional UNLOCK_PI operation (user space did not +* try the TID->0 transition) raced with a waiter setting the +* FUTEX_WAITERS flag between get_user() and locking the hash +* bucket lock, retry the operation. +*/ +if ((FUTEX_TID_MASK & curval) == uval) + ret = -EAGAIN ; +else + ret = -EINVAL ; + }if (ret) {raw_spin_unlock_irq (&pi_state->pi_mutex.wait_lock);return ret;
@@ -2536,6 +2546,15 @@ retry:if (ret == -EFAULT ) goto pi_faulted;/* +* A unconditional UNLOCK_PI op raced against a waiter +* setting the FUTEX_WAITERS bit. Try again. +*/ +if (ret == -EAGAIN ) { +spin_unlock (&hb->lock); +put_futex_key (&key); + goto retry; + } +/* * wake_futex_pi has detected invalid state. Tell user * space. */
Greg Kroah-Hartman
maintainerPATCH 104/200 perf intel-pt: Fix segfault tracing transactions
In reply to Greg Kroah-Hartman4.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adrian Hunter <[email protected]>
commit 1342e0b7a6c1a060c593037fbac9f4b717f1cb3b upstream.
Tracing a workload that uses transactions gave a seg fault as follows:
perf record -e intel_pt// workload
perf report
Program received signal SIGSEGV, Segmentation fault.
0x000000000054b58c in intel_pt_reset_last_branch_rb (ptq=0x1a36110)
at util/intel-pt.c:929
929 ptq->last_branch_rb->nr = 0;
(gdb) p ptq->last_branch_rb
$1 = (struct branch_stack *) 0x0
(gdb) up
1148 intel_pt_reset_last_branch_rb(ptq);
(gdb) l
1143 if (ret)
1144 pr_err("Intel Processor Trace: failed to deliver transaction event
1145 ret);
1146
1147 if (pt->synth_opts.callchain)
1148 intel_pt_reset_last_branch_rb(ptq);
1149
1150 return ret;
1151 }
1152
(gdb) p pt->synth_opts.callchain
$2 = true
(gdb)
(gdb) bt
#0 0x000000000054b58c in intel_pt_reset_last_branch_rb (ptq=0x1a36110)
#1 0x000000000054c1e0 in intel_pt_synth_transaction_sample (ptq=0x1a36110)
#2 0x000000000054c5b2 in intel_pt_sample (ptq=0x1a36110)Caused by checking the 'callchain' flag when it should have been the 'last_branch' flag. Fix that.
--- tools/perf/util/intel-pt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/intel-pt.c +1 -1
@@ -1127,7 +1127,7 @@ static int intel_pt_synth_transaction_sapr_err ("Intel Processor Trace: failed to deliver transaction event, error %d\n" , ret); -if (pt->synth_opts.callchain) +if (pt->synth_opts.last_branch)intel_pt_reset_last_branch_rb (ptq);return ret;
Greg Kroah-Hartman
maintainerPATCH 138/200 locking/mcs: Fix mcs_spin_lock() ordering
In reply to Greg Kroah-Hartman4.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Zijlstra <[email protected]>
commit 920c720aa5aa3900a7f1689228fdfc2580a91e7e upstream.
Similar to commit b4b29f94856a ("locking/osq: Fix ordering of node initialisation in osq_lock") the use of xchg_acquire() is fundamentally broken with MCS like constructs.
Furthermore, it turns out we rely on the global transitivity of this operation because the unlock path observes the pointer with a READ_ONCE(), not an smp_load_acquire().
This is non-critical because the MCS code isn't actually used and mostly serves as documentation, a stepping stone to the more complex things we've build on top of the idea.
--- kernel/locking/mcs_spinlock.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
kernel/locking/mcs_spinlock.h +7 -1
@@ -67,7 +67,13 @@ void mcs_spin_lock(struct mcs_spinlock * node->locked =0 ; node->next =NULL ; - prev =xchg_acquire (lock, node); +/* +* We rely on the full barrier with global transitivity implied by the +* below xchg() to order the initialization stores above against any +* observation of @node. And to provide the ACQUIRE ordering associated +* with a LOCK primitive. +*/ + prev =xchg (lock, node);if (likely (prev ==NULL )) {/* * Lock acquired, don't need to set node->locked to 1. Threads
Greg Kroah-Hartman
maintainerPATCH 192/200 btrfs: cleaner_kthread() doesnt need explicit freeze
In reply to Greg Kroah-Hartman4.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiri Kosina <[email protected]>
commit 838fe1887765f4cc679febea60d87d2a06bd300e upstream.
cleaner_kthread() is not marked freezable, and therefore calling try_to_freeze() in its context is a pointless no-op.
In addition to that, as has been clearly demonstrated by 80ad623edd2d ("Revert "btrfs: clear PF_NOFREEZE in cleaner_kthread()"), it's perfectly valid / legal for cleaner_kthread() to stay scheduled out in an arbitrary place during suspend (in that particular example that was waiting for reading of extent pages), so there is no need to leave any traces of freezer in this kthread.
--- fs/btrfs/disk-io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/disk-io.c +1 -1
@@ -1830,7 +1830,7 @@ static int cleaner_kthread(void *arg)*/ btrfs_delete_unused_bgs (root->fs_info); sleep: -if (!try_to_freeze () && !again) { +if (!again) {set_current_state (TASK_INTERRUPTIBLE );if (!kthread_should_stop ())schedule ();
Greg Kroah-Hartman
maintainerPATCH 193/200 unbreak allmodconfig KCONFIG_ALLCONFIG=...
In reply to Greg Kroah-Hartman4.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Al Viro <[email protected]>
commit 6b87b70c5339f30e3c5b32085e69625906513dc2 upstream.
Prior to 3.13 make allmodconfig KCONFIG_ALLCONFIG=/dev/null used
to be equivalent to make allmodconfig; these days it hardwires MODULES to n. In fact, any KCONFIG_ALLCONFIG that doesn't set MODULES explicitly is treated as if it set it to n.
Regression had been introduced by commit cfa98f ("kconfig: do not
override symbols already set"); what happens is that conf_read_simple() does sym_calc_value(modules_sym) on exit, which leaves SYMBOL_VALID set and has conf_set_all_new_symbols() skip modules_sym.
It's pretty easy to fix - simply move that call of sym_calc_value()
into the callers, except for the ones in KCONFIG_ALLCONFIG handling. Objections?
--- scripts/kconfig/confdata.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
scripts/kconfig/confdata.c +7 -5
@@ -267,10 +267,8 @@ int conf_read_simple(const char *name, iif (in) goto load;sym_add_change_count (1 ); -if (!sym_defconfig_list) { -sym_calc_value (modules_sym); +if (!sym_defconfig_list)return 1 ; - } for_all_defaults(sym_defconfig_list, prop) { if (expr_calc_value(prop->visible.expr) == no ||
@@ -403,7 +401,6 @@ setsym: }free (line);fclose (in); -sym_calc_value (modules_sym);return 0 ; }
@@ -414,8 +411,12 @@ int conf_read(const char *name)sym_set_change_count (0 ); -if (conf_read_simple (name,S_DEF_USER )) +if (conf_read_simple (name,S_DEF_USER )) { +sym_calc_value (modules_sym);return 1 ; + } + +sym_calc_value (modules_sym); for_all_symbols(i, sym) {sym_calc_value (sym);
@@ -846,6 +847,7 @@ static int conf_split_config(void) name =conf_get_autoconfig_name ();conf_read_simple (name,S_DEF_AUTO ); +sym_calc_value (modules_sym);if (chdir ("include/config" ))return 1 ;
Greg Kroah-Hartman
maintainerPATCH 41/200 ALSA: hda - add PCI ID for Intel Broxton-T
In reply to Greg Kroah-Hartman4.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lu, Han <[email protected]>
commit 9859a971ca228725425238756ee89c6133306ec8 upstream.
Add HD Audio Device PCI ID for the Intel Broxton-T platform. It is an HDA Intel PCH controller.
--- sound/pci/hda/hda_intel.c | 3 +++ 1 file changed, 3 insertions(+)
sound/pci/hda/hda_intel.c +3 -0
@@ -2232,6 +2232,9 @@ static const struct pci_device_id azx_id/* Broxton-P(Apollolake) */ { PCI_DEVICE(0x8086, 0x5a98), .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BROXTON }, + /* Broxton-T */ + { PCI_DEVICE(0x8086, 0x1a98), + .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BROXTON }, /* Haswell */ { PCI_DEVICE(0x8086, 0x0a0c), .driver_data = AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL },
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.5.3 release. There are 200 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu May 5 00:05:29 UTC 2016. Anything received after that time might be too late.
Build results:
total: 147 pass: 144 fail: 3
Failed builds:
arm:allmodconfig
arm64:allmodconfig
mips:allmodconfig
Qemu test results:
total: 107 pass: 90 fail: 17 Failed tests: arm:beagle:multi_v7_defconfig:omap3-beagle arm:beaglexm:multi_v7_defconfig:omap3-beagle-xm arm:overo:multi_v7_defconfig:omap3-overo-tobi arm:vexpress-a9:multi_v7_defconfig:vexpress-v2p-ca9 arm:vexpress-a15:multi_v7_defconfig:vexpress-v2p-ca15-tc1 arm:xilinx-zynq-a9:multi_v7_defconfig:zynq-zc702 arm:xilinx-zynq-a9:multi_v7_defconfig:zynq-zc706 arm:xilinx-zynq-a9:multi_v7_defconfig:zynq-zed arm:midway:multi_v7_defconfig:ecx-2000 arm:smdkc210:multi_v7_defconfig:exynos4210-smdkv310 arm:akita:pxa_defconfig arm:borzoi:pxa_defconfig arm:mainstone:pxa_defconfig arm:spitz:pxa_defconfig arm:terrier:pxa_defconfig arm:tosa:pxa_defconfig arm:z2:pxa_defconfig
Details are available at http://kerneltests.org/builders.
Same problem as with 4.4.
drivers/spi/spi-rockchip.c: In function 'rockchip_spi_prepare_dma':drivers/spi/spi-rockchip.c:458:19: error: 'struct dma_slave_caps' has no member named 'max_burst' drivers/spi/spi-rockchip.c:478:19: error: 'struct dma_slave_caps' has no member named 'max_burst'
As with 4.4, this is caused by "spi: rockchip: modify DMA max burst to 1". Commit 6d5bbed30f89 ("dmaengine: core: expose max burst capability to clients") does apply here and fixes the build problem.
Guenter
Quoted 5 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.5.3 release. There are 200 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Quoted 7 lines
Responses should be made by Thu May 5 00:05:29 UTC 2016. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.5.3-rc1.gzand the diffstat can be found below.
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
Greg Kroah-Hartman
maintainerQuoted 9 lines · Shuah Khan
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.5.3 release. There are 200 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu May 5 00:05:29 UTC 2016. Anything received after that time might be too late.
Quoted 6 lines
Quoted 4 lines
The whole patch series can be found in one patch at:
kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.5.3-rc1.gzand the diffstat can be found below.
Compiled and booted on my test system. No dmesg regressions.
Thanks for testing all of these and letting me know.
greg k-h
Greg Kroah-Hartman
maintainerQuoted 42 lines · Guenter Roeck
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.5.3 release. There are 200 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu May 5 00:05:29 UTC 2016. Anything received after that time might be too late.
Build results:
total: 147 pass: 144 fail: 3Failed builds:
arm:allmodconfig
arm64:allmodconfig
mips:allmodconfigQemu test results:
total: 107 pass: 90 fail: 17 Failed tests: arm:beagle:multi_v7_defconfig:omap3-beagle arm:beaglexm:multi_v7_defconfig:omap3-beagle-xm arm:overo:multi_v7_defconfig:omap3-overo-tobi arm:vexpress-a9:multi_v7_defconfig:vexpress-v2p-ca9 arm:vexpress-a15:multi_v7_defconfig:vexpress-v2p-ca15-tc1 arm:xilinx-zynq-a9:multi_v7_defconfig:zynq-zc702 arm:xilinx-zynq-a9:multi_v7_defconfig:zynq-zc706 arm:xilinx-zynq-a9:multi_v7_defconfig:zynq-zed arm:midway:multi_v7_defconfig:ecx-2000 arm:smdkc210:multi_v7_defconfig:exynos4210-smdkv310 arm:akita:pxa_defconfig arm:borzoi:pxa_defconfig arm:mainstone:pxa_defconfig arm:spitz:pxa_defconfig arm:terrier:pxa_defconfig arm:tosa:pxa_defconfig arm:z2:pxa_defconfigDetails are available at http://kerneltests.org/builders.
Same problem as with 4.4.
Quoted 7 lines
drivers/spi/spi-rockchip.c: In function 'rockchip_spi_prepare_dma':drivers/spi/spi-rockchip.c:458:19: error: 'structdma_slave_caps' has no member named 'max_burst'drivers/spi/spi-rockchip.c:478:19: error: 'structdma_slave_caps' has no member named 'max_burst'As with 4.4, this is caused by "spi: rockchip: modify DMA max burst to 1". Commit
6d5bbed30f89("dmaengine: core: expose max burst capability to clients") does apply here and fixes the build problem.
I've now deleted this patch, thanks for letting me know.
greg k-h
Quoted 47 lines · Greg Kroah-Hartman
Quoted 46 lines · Guenter Roeck
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.5.3 release. There are 200 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu May 5 00:05:29 UTC 2016. Anything received after that time might be too late.
Build results:
total: 147 pass: 144 fail: 3Failed builds:
arm:allmodconfig
arm64:allmodconfig
mips:allmodconfigQemu test results:
total: 107 pass: 90 fail: 17 Failed tests: arm:beagle:multi_v7_defconfig:omap3-beagle arm:beaglexm:multi_v7_defconfig:omap3-beagle-xm arm:overo:multi_v7_defconfig:omap3-overo-tobi arm:vexpress-a9:multi_v7_defconfig:vexpress-v2p-ca9 arm:vexpress-a15:multi_v7_defconfig:vexpress-v2p-ca15-tc1 arm:xilinx-zynq-a9:multi_v7_defconfig:zynq-zc702 arm:xilinx-zynq-a9:multi_v7_defconfig:zynq-zc706 arm:xilinx-zynq-a9:multi_v7_defconfig:zynq-zed arm:midway:multi_v7_defconfig:ecx-2000 arm:smdkc210:multi_v7_defconfig:exynos4210-smdkv310 arm:akita:pxa_defconfig arm:borzoi:pxa_defconfig arm:mainstone:pxa_defconfig arm:spitz:pxa_defconfig arm:terrier:pxa_defconfig arm:tosa:pxa_defconfig arm:z2:pxa_defconfigDetails are available at http://kerneltests.org/builders.
Same problem as with 4.4.
drivers/spi/spi-rockchip.c: In function 'rockchip_spi_prepare_dma':drivers/spi/spi-rockchip.c:458:19: error: 'structdma_slave_caps' has no member named 'max_burst'drivers/spi/spi-rockchip.c:478:19: error: 'structdma_slave_caps' has no member named 'max_burst'
Quoted 6 lines
Quoted 3 lines
As with 4.4, this is caused by "spi: rockchip: modify DMA max burst to 1". Commit
6d5bbed30f89("dmaengine: core: expose max burst capability to clients") does apply here and fixes the build problem.I've now deleted this patch, thanks for letting me know.
Both 4.4 and 4.5 are now clean - all build and qemu tests pass.
Guenter
Re: [PATCH 4.5 118/200] [media] videobuf2-v4l2: Verify planes array in buffer dequeueing
In reply to Greg Kroah-HartmanHi Greg,
This patch seems to be causing trobles with DVB drivers that uses videobuf2-dvb.
Just sent a patch reverting it.
Regards,
Mauro
Em Mon, 2 May 2016 17:11:57 -0700
Greg Kroah-Hartman <[email protected]> escreveu:
Quoted 56 lines
4.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sakari Ailus <[email protected]>
commit
2c1f6951a8a82e6de0d82b1158b5e493fc6c54abupstream.When a buffer is being dequeued using
VIDIOC_DQBUFIOCTL, the exact buffer which will be dequeued is not known until the buffer has been removed from the queue. The number of planes is specific to a buffer, not to the queue.This does lead to the situation where multi-plane buffers may be requested and queued with n planes, but
VIDIOC_DQBUFIOCTL may be passed an argument struct with fewer planes.
__fill_v4l2_buffer()however uses the number of planes from the dequeued videobuf2 buffer, overwriting kernel memory (the m.planes array allocated invideo_usercopy()inv4l2-ioctl.c) if the user provided fewer planes than the dequeued buffer had. Oops!Fixes b0e0e1f83de3 ("[media] media: videobuf2: Prepare to divide videobuf2")Signed-off-by Sakari Ailus <[email protected]>Acked-by Hans Verkuil <[email protected]>Signed-off-by Mauro Carvalho Chehab <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- drivers/media/v4l2-core/videobuf2-v4l2.c | 6 ++++++ 1 file changed, 6 insertions(+)drivers/media/v4l2-core/videobuf2-v4l2.c +6
-0@@ -74,6 +74,11 @@ static int __verify_planes_array(structreturn 0 ; } +static int __verify_planes_array_core (struct vb2_buffer *vb,const void *pb) +{ +return __verify_planes_array (vb, pb); +} +/** * __verify_length() - Verify that the bytesused value for each plane fits in * the plane length and that the data offset doesn't exceed the bytesused value. @@ -437,6 +442,7 @@ static int __fill_vb2_buffer(struct vb2_ }static const struct vb2_buf_ops v4l2_buf_ops = { + .verify_planes_array = __verify_planes_array_core, .fill_user_buffer = __fill_v4l2_buffer, .fill_vb2_buffer = __fill_vb2_buffer, .copy_timestamp = __copy_timestamp,
Signature · 2 lines
Thanks, Mauro