- Linux-stable-mirror - lists.linaro.org

[PATCH] serial: mvebu-uart: fix tx lost characters

by Gabriel Matni

From: Gabriel Matni <gabriel.matni(a)exfo.com> Fixes missing characters on kernel console at low baud rates (i.e.9600). The driver should poll TX_RDY or TX_FIFO_EMP instead of TX_EMP to ensure that the transmitter holding register (THR) is ready to receive a new byte. TX_EMP tells us when it is possible to send a break sequence via SND_BRK_SEQ. While this also indicates that both the THR and the TSR are empty, it does not guarantee that a new byte can be written just yet. Fixes: 30530791a7a0 ("serial: mvebu-uart: initial support for Armada-3700 serial port") Reviewed-by: Miquel Raynal <miquel.raynal(a)bootlin.com> Acked-by: Gregory CLEMENT <gregory.clement(a)bootlin.com> Signed-off-by: Gabriel Matni <gabriel.matni(a)exfo.com> --- drivers/tty/serial/mvebu-uart.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/tty/serial/mvebu-uart.c b/drivers/tty/serial/mvebu-uart.c index a100e98259d7..f0df0640208e 100644 --- a/drivers/tty/serial/mvebu-uart.c +++ b/drivers/tty/serial/mvebu-uart.c @@ -618,7 +618,7 @@ static void wait_for_xmitr(struct uart_port *port) u32 val; readl_poll_timeout_atomic(port->membase + UART_STAT, val, - (val & STAT_TX_EMP), 1, 10000); + (val & STAT_TX_RDY(port)), 1, 10000); } static void mvebu_uart_console_putchar(struct uart_port *port, int ch) -- 2.7.4 > -----Original Message----- > From: Miquel Raynal [mailto:miquel.raynal@bootlin.com] > Sent: March 5, 2018 4:47 AM > To: Gabriel Matni <gabriel.matni(a)exfo.com> > Cc: linux-arm-kernel(a)lists.infradead.org; gregkh(a)linuxfoundation.org; > Grégory Clement <gregory.clement(a)bootlin.com>; Thomas Petazzoni > <thomas.petazzoni(a)bootlin.com> > Subject: Re: [PATCH] serial: mvebu_uart: fix tx lost characters > > Hi Gabriel, > > On Tue, 27 Feb 2018 21:56:03 +0000, Gabriel Matni > <gabriel.matni(a)exfo.com> wrote: > > > Hi Miquèl, > > > > > -----Original Message----- > > > From: Miquel Raynal [mailto:miquel.raynal@bootlin.com] > > > Sent: February 27, 2018 8:13 AM > > > To: Gabriel Matni <gabriel.matni(a)exfo.com> > > > Cc: linux-arm-kernel(a)lists.infradead.org; gregkh(a)linuxfoundation.org; > > > Grégory Clement <gregory.clement(a)bootlin.com>; Thomas Petazzoni > > > <thomas.petazzoni(a)bootlin.com> > > > Subject: Re: [PATCH] serial: mvebu_uart: fix tx lost characters > > > > > > Hi Gabriel, > > > > > > On Thu, 22 Feb 2018 20:30:56 +0000, Gabriel Matni > > > <gabriel.matni(a)exfo.com> wrote: > > > > > > > From: Gabriel Matni <gabriel.matni(a)exfo.com> > > > > > > > > Fixes missing characters on kernel console at low baud rates (i.e.9600). > > > > The driver should poll TX_RDY instead of TX_EMPTY to ensure that the > > > > transmitter holding is ready to receive a new byte. Polling TX_EMPTY > > > > isn't enough as the hardware buffer can become empty but not yet > ready > > > > for CPU to write the next byte. > > > > > > I am kind of sceptic with the explanation. My understanding is that: > > > - TX_EMPTY means the FIFO is empty > > I had a deeper look into the spec : TX_EMPTY != TX_FIFO_EMPTY. I was > referring to TX_FIFO_EMPTY here so my understanding of your solution was > wrong. > > > > - TX_RDY means the FIFO is not full, neither empty, it is a "half > > > loaded" state. > > > Polling TX_RDY instead of TX_EMPTY should work too, but I don't see why > it > > > would fix the loss of character by filling the FIFO when there are bytes in > it > > > rather than when it is fully empty. > > > > TX_READY is set whenever the UART Transmitter Holding register is ready > to > > receive a new byte. It gets cleared as soon as a new byte is written to the > > register. If the FIFO is empty or still has room, the ready will be set. > > > > TX_EMPTY tells us when it is possible to send a break sequence via > > SND_BRK_SEQ. While this also indicates that both the THR and the TSR are > > empty, it does not guarantee that a new byte can be written just yet. > > I do agree with this statement. You are right that polling on TX_EMPTY > looks wrong and we should definitively poll on TX_READY instead. > > > I am > > unsure about the FIFO status in this case as I can encounter > TX_FIFO_EMP=0 > > while TX_EMP=1, which suggests that the FIFO isn't necessarily empty > when > > TX_EMP is set. > > That is weird but maybe the TX_FIFO_EMPTY is asserted only when all > bits have been shifted, which is a 10-bit period after TSR is > cleared, while TX_EMPTY would not wait for these bits to be actually > shifted out and would be asserted a bit earlier, as soon as TSR is > cleared. That is just and idea. > > > > > Therefore, the driver can either poll TX_FIFO_EMP or TX_READY to know > > whether it can output a new byte. I personally like TX_READY as it takes > > advantage of the FIFO. > > True. > > > > > > > > > > > Signed-off-by: Gabriel Matni <gabriel.matni(a)exfo.com> > > Reviewed-by: Miquel Raynal <miquel.raynal(a)bootlin.com> > > Thanks, > Miquèl > > -- > Miquel Raynal, Bootlin (formerly Free Electrons) > Embedded Linux and Kernel engineering > https://bootlin.com

7 years, 5 months

3
5
0 0

[PATCH 0/3] Fix build on multi_v7_defconfig

by Sam Protsenko

Recent patches broke build on multi_v7_defconfig (ARM), on stable-rc/linux-4.4.y branch. The build error as follows: arch/arm/mach-omap2/omap_hwmod_7xx_data.c:2243:12: error: 'HWMOD_CLKDM_NOAUTO' undeclared here (not in a function) .flags = HWMOD_CLKDM_NOAUTO, ^~~~~~~~~~~~~~~~~~ Pull in missing dependency patches to fix that build error. 1. "Allow modules to disable HW_AUTO": this commit is needed to fix build error 2. "add usecounting support to autoidle APIs": this commit is a dependency for 1 3. "provide space for more hwmod flags": this is also a dependency for 1 Tested on TI BeagleBoard X15. Roger Quadros (1): ARM: OMAP2+ hwmod: Allow modules to disable HW_AUTO Sekhar Nori (1): ARM: OMAP2+: omap_hwmod: provide space for more hwmod flags Tero Kristo (1): ARM: OMAP2+: clockdomain: add usecounting support to autoidle APIs arch/arm/mach-omap2/clockdomain.c | 36 ++++++++++++++++++++++++------------ arch/arm/mach-omap2/clockdomain.h | 2 ++ arch/arm/mach-omap2/cpuidle44xx.c | 2 +- arch/arm/mach-omap2/omap-smp.c | 2 +- arch/arm/mach-omap2/omap_hwmod.c | 32 +++++++++++++++++--------------- arch/arm/mach-omap2/omap_hwmod.h | 7 ++++++- arch/arm/mach-omap2/pm.c | 8 +------- arch/arm/mach-omap2/powerdomain.c | 20 ++++++-------------- 8 files changed, 58 insertions(+), 51 deletions(-) -- 2.16.1

7 years, 5 months

3
6
0 0

patch "phy: allwinner: sun4i-usb: poll vbus changes on A23/A33 when driving" added to usb-testing

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled phy: allwinner: sun4i-usb: poll vbus changes on A23/A33 when driving to my usb git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git in the usb-testing branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will be merged to the usb-next branch sometime soon, after it passes testing, and the merge window is open. If you have any questions about this process, please let me know. >From d7119224bfe6e8efbf821a52db7da9530d790f07 Mon Sep 17 00:00:00 2001 From: Chen-Yu Tsai <wens(a)csie.org> Date: Fri, 19 Jan 2018 17:25:41 +0800 Subject: phy: allwinner: sun4i-usb: poll vbus changes on A23/A33 when driving VBUS The AXP223 PMIC, like the AXP221, does not generate VBUS change interrupts when N_VBUSEN is used to drive VBUS for the OTG port on the board. This was not noticed until recently, as most A23/A33 boards use a GPIO pin that does not support interrupts for OTG ID detection. This forces the driver to use polling. However the A33-OlinuXino uses a pin that does support interrupts, so the driver uses them. However the VBUS interrupt never fires, and the driver never gets to update the VBUS status. This results in musb timing out waiting for VBUS to rise. This was worked around for the AXP221 by resorting to polling changes in commit 91d96f06a760 ("phy-sun4i-usb: Add workaround for missing Vbus det interrupts on A31"). This patch adds the A23 and A33 to the list of SoCs that need the workaround. Fixes: fc1f45ed3043 ("phy-sun4i-usb: Add support for the usb-phys on the sun8i-a33 SoC") Fixes: 123dfdbcfaf5 ("phy-sun4i-usb: Add support for the usb-phys on the sun8i-a23 SoC") Cc: <stable(a)vger.kernel.org> # 4.3.x: 68dbc2ce77bb phy-sun4i-usb: Use of_match_node to get model specific config data Cc: <stable(a)vger.kernel.org> # 4.3.x: 5cf700ac9d50 phy: phy-sun4i-usb: Fix optional gpios failing probe Cc: <stable(a)vger.kernel.org> # 4.3.x: 04e59a0211ff phy-sun4i-usb: Fix irq free conditions to match request conditions Cc: <stable(a)vger.kernel.org> # 4.3.x: 91d96f06a760 phy-sun4i-usb: Add workaround for missing Vbus det interrupts on A31 Cc: <stable(a)vger.kernel.org> # 4.3.x Signed-off-by: Chen-Yu Tsai <wens(a)csie.org> Acked-by: Maxime Ripard <maxime.ripard(a)free-electrons.com> Signed-off-by: Kishon Vijay Abraham I <kishon(a)ti.com> Signed-off-by: Kishon Vijay Abraham I <kishon(a)ti.com> --- drivers/phy/allwinner/phy-sun4i-usb.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/phy/allwinner/phy-sun4i-usb.c b/drivers/phy/allwinner/phy-sun4i-usb.c index bee798892b21..d4dcd39b8d76 100644 --- a/drivers/phy/allwinner/phy-sun4i-usb.c +++ b/drivers/phy/allwinner/phy-sun4i-usb.c @@ -411,11 +411,13 @@ static bool sun4i_usb_phy0_poll(struct sun4i_usb_phy_data *data) return true; /* - * The A31 companion pmic (axp221) does not generate vbus change - * interrupts when the board is driving vbus, so we must poll + * The A31/A23/A33 companion pmics (AXP221/AXP223) do not + * generate vbus change interrupts when the board is driving + * vbus using the N_VBUSEN pin on the pmic, so we must poll * when using the pmic for vbus-det _and_ we're driving vbus. */ - if (data->cfg->type == sun6i_a31_phy && + if ((data->cfg->type == sun6i_a31_phy || + data->cfg->type == sun8i_a33_phy) && data->vbus_power_supply && data->phys[0].regulator_on) return true; @@ -886,7 +888,7 @@ static const struct sun4i_usb_phy_cfg sun7i_a20_cfg = { static const struct sun4i_usb_phy_cfg sun8i_a23_cfg = { .num_phys = 2, - .type = sun4i_a10_phy, + .type = sun6i_a31_phy, .disc_thresh = 3, .phyctl_offset = REG_PHYCTL_A10, .dedicated_clocks = true, -- 2.16.2

7 years, 5 months

1
0
0 0

[PATCH] spi: Fix unregistration of controller with fixed SPI bus number

by Jarkko Nikula

Commit 9b61e302210e (spi: Pick spi bus number from Linux idr or spi alias) ceased to unregister SPI buses with fixed bus numbers. Moreover this is visible only if CONFIG_SPI_DEBUG=y is set or when trying to re-register the same SPI controller. rmmod spi_pxa2xx_platform (with CONFIG_SPI_DEBUG=y): [ 26.788362] spi_master spi1: attempting to delete unregistered controller [spi1] modprobe spi_pxa2xx_platform: [ 37.883137] sysfs: cannot create duplicate filename '/devices/pci0000:00/0000:00:19.0/pxa2xx-spi.12/spi_master/spi1' [ 37.894984] CPU: 1 PID: 1467 Comm: modprobe Not tainted 4.16.0-rc4+ #21 [ 37.902384] Call Trace: ... [ 38.122680] kobject_add_internal failed for spi1 with -EEXIST, don't try to register things with the same name in the same directory. [ 38.136154] WARNING: CPU: 1 PID: 1467 at lib/kobject.c:238 kobject_add_internal+0x2a5/0x2f0 ... [ 38.513817] pxa2xx-spi pxa2xx-spi.12: problem registering spi master [ 38.521036] pxa2xx-spi: probe of pxa2xx-spi.12 failed with error -17 Fix this by not returning immediately from spi_unregister_controller() if idr_find() doesn't find controller with given ID/bus number. It finds only those controllers that were registered with dynamic SPI bus numbers. Only conditional cleanup between dynamic and fixed bus numbers is to remove allocated IDR. Fixes: 9b61e302210e (spi: Pick spi bus number from Linux idr or spi alias) Cc: stable(a)vger.kernel.org Signed-off-by: Jarkko Nikula <jarkko.nikula(a)linux.intel.com> --- This doesn't apply to v4.14 without commit 67f7b2781faf ("spi: fix use-after-free at controller deregistration"). --- drivers/spi/spi.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index b33a727a0158..e90fd442b3f0 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -2254,12 +2254,6 @@ void spi_unregister_controller(struct spi_controller *ctlr) mutex_lock(&board_lock); found = idr_find(&spi_master_idr, id); mutex_unlock(&board_lock); - if (found != ctlr) { - dev_dbg(&ctlr->dev, - "attempting to delete unregistered controller [%s]\n", - dev_name(&ctlr->dev)); - return; - } if (ctlr->queued) { if (spi_destroy_queue(ctlr)) dev_err(&ctlr->dev, "queue remove failed\n"); @@ -2272,7 +2266,8 @@ void spi_unregister_controller(struct spi_controller *ctlr) device_unregister(&ctlr->dev); /* free bus id */ mutex_lock(&board_lock); - idr_remove(&spi_master_idr, id); + if (found == ctlr) + idr_remove(&spi_master_idr, id); mutex_unlock(&board_lock); } EXPORT_SYMBOL_GPL(spi_unregister_controller); -- 2.16.1

7 years, 5 months

2
1
0 0

[RESEND PATCH] spi: Fix unregistration of controller with fixed SPI bus number

by Jarkko Nikula

Commit 9b61e302210e (spi: Pick spi bus number from Linux idr or spi alias) ceased to unregister SPI buses with fixed bus numbers. Moreover this is visible only if CONFIG_SPI_DEBUG=y is set or when trying to re-register the same SPI controller. rmmod spi_pxa2xx_platform (with CONFIG_SPI_DEBUG=y): [ 26.788362] spi_master spi1: attempting to delete unregistered controller [spi1] modprobe spi_pxa2xx_platform: [ 37.883137] sysfs: cannot create duplicate filename '/devices/pci0000:00/0000:00:19.0/pxa2xx-spi.12/spi_master/spi1' [ 37.894984] CPU: 1 PID: 1467 Comm: modprobe Not tainted 4.16.0-rc4+ #21 [ 37.902384] Call Trace: ... [ 38.122680] kobject_add_internal failed for spi1 with -EEXIST, don't try to register things with the same name in the same directory. [ 38.136154] WARNING: CPU: 1 PID: 1467 at lib/kobject.c:238 kobject_add_internal+0x2a5/0x2f0 ... [ 38.513817] pxa2xx-spi pxa2xx-spi.12: problem registering spi master [ 38.521036] pxa2xx-spi: probe of pxa2xx-spi.12 failed with error -17 Fix this by not returning immediately from spi_unregister_controller() if idr_find() doesn't find controller with given ID/bus number. It finds only those controllers that were registered with dynamic SPI bus numbers. Only conditional cleanup between dynamic and fixed bus numbers is to remove allocated IDR. Fixes: 9b61e302210e (spi: Pick spi bus number from Linux idr or spi alias) Cc: stable(a)vger.kernel.org Signed-off-by: Jarkko Nikula <jarkko.nikula(a)linux.intel.com> --- This doesn't apply to v4.14 without commit 67f7b2781faf ("spi: fix use-after-free at controller deregistration"). --- drivers/spi/spi.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index b33a727a0158..e90fd442b3f0 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -2254,12 +2254,6 @@ void spi_unregister_controller(struct spi_controller *ctlr) mutex_lock(&board_lock); found = idr_find(&spi_master_idr, id); mutex_unlock(&board_lock); - if (found != ctlr) { - dev_dbg(&ctlr->dev, - "attempting to delete unregistered controller [%s]\n", - dev_name(&ctlr->dev)); - return; - } if (ctlr->queued) { if (spi_destroy_queue(ctlr)) dev_err(&ctlr->dev, "queue remove failed\n"); @@ -2272,7 +2266,8 @@ void spi_unregister_controller(struct spi_controller *ctlr) device_unregister(&ctlr->dev); /* free bus id */ mutex_lock(&board_lock); - idr_remove(&spi_master_idr, id); + if (found == ctlr) + idr_remove(&spi_master_idr, id); mutex_unlock(&board_lock); } EXPORT_SYMBOL_GPL(spi_unregister_controller); -- 2.16.2

7 years, 5 months

1
0
0 0

[PATCH][v3] mtd: rawnand: fsl_ifc: Fix eccstat array overflow for IFC ver >= 2.0.0

by Jagdish Gediya

Number of ECC status registers i.e. (ECCSTATx) has been increased in IFC version 2.0.0 due to increase in SRAM size. This is causing eccstat array to over flow. So, replace eccstat array with u32 variable to make it fail-safe and independent of number of ECC status registers or SRAM size. Fixes: bccb06c353af ("mtd: nand: ifc: update bufnum mask for ver >= 2.0.0") Cc: stable(a)vger.kernel.org # 3.18+ Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha(a)nxp.com> Signed-off-by: Jagdish Gediya <jagdish.gediya(a)nxp.com> --- Changes for v2: Incorporated comments from Miquel Raynal and Boris Brezillon - Updated patch subject - Remove usage of eccstat array - Added Cc: stable(a)vger.kernel.org Changes for v3: Incorporated comments from Boris Brezillon - Added fixes tag drivers/mtd/nand/fsl_ifc_nand.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/drivers/mtd/nand/fsl_ifc_nand.c b/drivers/mtd/nand/fsl_ifc_nand.c index 4872a7b..9390cbd 100644 --- a/drivers/mtd/nand/fsl_ifc_nand.c +++ b/drivers/mtd/nand/fsl_ifc_nand.c @@ -173,14 +173,9 @@ static void set_addr(struct mtd_info *mtd, int column, int page_addr, int oob) /* returns nonzero if entire page is blank */ static int check_read_ecc(struct mtd_info *mtd, struct fsl_ifc_ctrl *ctrl, - u32 *eccstat, unsigned int bufnum) + u32 eccstat, unsigned int bufnum) { - u32 reg = eccstat[bufnum / 4]; - int errors; - - errors = (reg >> ((3 - bufnum % 4) * 8)) & 15; - - return errors; + return (eccstat >> ((3 - bufnum % 4) * 8)) & 15; } /* @@ -193,7 +188,7 @@ static void fsl_ifc_run_command(struct mtd_info *mtd) struct fsl_ifc_ctrl *ctrl = priv->ctrl; struct fsl_ifc_nand_ctrl *nctrl = ifc_nand_ctrl; struct fsl_ifc_runtime __iomem *ifc = ctrl->rregs; - u32 eccstat[4]; + u32 eccstat; int i; /* set the chip select for NAND Transaction */ @@ -237,10 +232,18 @@ static void fsl_ifc_run_command(struct mtd_info *mtd) else eccstat_regs = ifc->ifc_nand.v1_nand_eccstat; - for (i = sector / 4; i <= sector_end / 4; i++) - eccstat[i] = ifc_in32(&eccstat_regs[i]); + eccstat = 0; for (i = sector; i <= sector_end; i++) { + + /* + * sector is not necessarily aligned on 4 and + * we need to read the eccstat in this case, + * hence the sector test. + */ + if ((i % 4 == 0) || (sector == sector_end)) + eccstat = ifc_in32(&eccstat_regs[i / 4]); + errors = check_read_ecc(mtd, ctrl, eccstat, i); if (errors == 15) { -- 1.9.1

7 years, 5 months

2
1
0 0

Patch "ARM: dts: r8a7794: Add DU1 clock to device tree" has been added to the 4.9-stable tree

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled ARM: dts: r8a7794: Add DU1 clock to device tree to the 4.9-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… The filename of the patch is: arm-dts-r8a7794-add-du1-clock-to-device-tree.patch and it can be found in the queue-4.9 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable(a)vger.kernel.org> know about it. >From 1764f8081f1524bf629e0744b277db751281ff56 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven <geert+renesas(a)glider.be> Date: Tue, 28 Mar 2017 12:45:30 +0200 Subject: ARM: dts: r8a7794: Add DU1 clock to device tree From: Geert Uytterhoeven <geert+renesas(a)glider.be> commit 1764f8081f1524bf629e0744b277db751281ff56 upstream. Add the missing module clock for the second channel of the display unit. Signed-off-by: Geert Uytterhoeven <geert+renesas(a)glider.be> Acked-by: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> Signed-off-by: Simon Horman <horms+renesas(a)verge.net.au> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- arch/arm/boot/dts/r8a7794.dtsi | 8 +++++--- include/dt-bindings/clock/r8a7794-clock.h | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) --- a/arch/arm/boot/dts/r8a7794.dtsi +++ b/arch/arm/boot/dts/r8a7794.dtsi @@ -1261,19 +1261,21 @@ clocks = <&mp_clk>, <&hp_clk>, <&zs_clk>, <&p_clk>, <&p_clk>, <&zs_clk>, <&zs_clk>, <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>, - <&zx_clk>; + <&zx_clk>, <&zx_clk>; #clock-cells = <1>; clock-indices = < R8A7794_CLK_EHCI R8A7794_CLK_HSUSB R8A7794_CLK_HSCIF2 R8A7794_CLK_SCIF5 R8A7794_CLK_SCIF4 R8A7794_CLK_HSCIF1 R8A7794_CLK_HSCIF0 R8A7794_CLK_SCIF3 R8A7794_CLK_SCIF2 R8A7794_CLK_SCIF1 - R8A7794_CLK_SCIF0 R8A7794_CLK_DU0 + R8A7794_CLK_SCIF0 + R8A7794_CLK_DU1 R8A7794_CLK_DU0 >; clock-output-names = "ehci", "hsusb", "hscif2", "scif5", "scif4", "hscif1", "hscif0", - "scif3", "scif2", "scif1", "scif0", "du0"; + "scif3", "scif2", "scif1", "scif0", + "du1", "du0"; }; mstp8_clks: mstp8_clks@e6150990 { compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks"; --- a/include/dt-bindings/clock/r8a7794-clock.h +++ b/include/dt-bindings/clock/r8a7794-clock.h @@ -81,6 +81,7 @@ #define R8A7794_CLK_SCIF2 19 #define R8A7794_CLK_SCIF1 20 #define R8A7794_CLK_SCIF0 21 +#define R8A7794_CLK_DU1 23 #define R8A7794_CLK_DU0 24 /* MSTP8 */ Patches currently in stable-queue which might be from geert+renesas(a)glider.be are queue-4.9/arm64-dts-r8a7796-remove-unit-address-and-reg-from-integrated-cache.patch queue-4.9/arm-dts-r8a7791-remove-unit-address-and-reg-from-integrated-cache.patch queue-4.9/arm-dts-r7s72100-fix-ethernet-clock-parent.patch queue-4.9/arm-dts-r8a7791-correct-parent-of-ssi-clocks.patch queue-4.9/arm-dts-r8a7794-add-du1-clock-to-device-tree.patch queue-4.9/arm-dts-silk-correct-clock-of-du1.patch queue-4.9/arm-dts-r8a7792-remove-unit-address-and-reg-from-integrated-cache.patch queue-4.9/arm-dts-koelsch-correct-clock-frequency-of-x2-du-clock-input.patch queue-4.9/arm-dts-r8a7794-correct-clock-of-du1.patch queue-4.9/arm-dts-r8a7794-remove-unit-address-and-reg-from-integrated-cache.patch queue-4.9/arm-dts-r8a7793-remove-unit-address-and-reg-from-integrated-cache.patch queue-4.9/arm-dts-r8a7793-correct-parent-of-ssi-clocks.patch queue-4.9/arm-dts-r8a7790-correct-parent-of-ssi-clocks.patch

7 years, 5 months

1
0
0 0

patch "staging: comedi: ni_mio_common: ack ai fifo error interrupts." added to staging-next

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled staging: comedi: ni_mio_common: ack ai fifo error interrupts. to my staging git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git in the staging-next branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will also be merged in the next major kernel release during the merge window. If you have any questions about this process, please let me know. >From e1d9fc04c41840a4688ef6ce90b6dcca157ea4d7 Mon Sep 17 00:00:00 2001 From: Frank Mori Hess <fmh6jj(a)gmail.com> Date: Thu, 15 Mar 2018 10:25:44 +0000 Subject: staging: comedi: ni_mio_common: ack ai fifo error interrupts. Ack ai fifo error interrupts in interrupt handler to clear interrupt after fifo overflow. It should prevent lock-ups after the ai fifo overflows. Cc: <stable(a)vger.kernel.org> # v4.2+ Signed-off-by: Frank Mori Hess <fmh6jj(a)gmail.com> Signed-off-by: Ian Abbott <abbotti(a)mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/staging/comedi/drivers/ni_mio_common.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c index d6eb55b41814..e40a2c0a9543 100644 --- a/drivers/staging/comedi/drivers/ni_mio_common.c +++ b/drivers/staging/comedi/drivers/ni_mio_common.c @@ -1275,6 +1275,8 @@ static void ack_a_interrupt(struct comedi_device *dev, unsigned short a_status) ack |= NISTC_INTA_ACK_AI_START; if (a_status & NISTC_AI_STATUS1_STOP) ack |= NISTC_INTA_ACK_AI_STOP; + if (a_status & NISTC_AI_STATUS1_OVER) + ack |= NISTC_INTA_ACK_AI_ERR; if (ack) ni_stc_writew(dev, ack, NISTC_INTA_ACK_REG); } -- 2.16.2

7 years, 5 months

1
0
0 0

[PATCH 4.14 000/109] 4.14.28-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.14.28 release. There are 109 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 Sun Mar 18 15:22:53 UTC 2018. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.14.28-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.14.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.14.28-rc1 Anusha Srivatsa <anusha.srivatsa(a)intel.com> drm/i915/glk: Disable Guc and HuC on GLK Sinan Kaya <okaya(a)codeaurora.org> dmaengine: qcom_hidma: check pending interrupts Arnd Bergmann <arnd(a)arndb.de> IB/mlx5: revisit -Wmaybe-uninitialized warning Mimi Zohar <zohar(a)linux.vnet.ibm.com> ima: relax requiring a file signature for new files with zero length Davidlohr Bueso <dave(a)stgolabs.net> locking/locktorture: Fix num reader/writer corner cases SeongJae Park <sj38.park(a)gmail.com> rcutorture/configinit: Fix build directory error message Mahesh Bandewar <maheshb(a)google.com> ipvlan: add L2 check for packets arriving via virtual devices Christophe Leroy <christophe.leroy(a)c-s.fr> Fix misannotated out-of-line _copy_to_user() Adrian Hunter <adrian.hunter(a)intel.com> mmc: mmc_test: Ensure command queue is disabled for testing Dan Carpenter <dan.carpenter(a)oracle.com> ASoC: nuc900: Fix a loop timeout test Horia Geantă <horia.geanta(a)nxp.com> crypto: caam/qi - use correct print specifier for size_t Luca Coelho <luciano.coelho(a)intel.com> mac80211: remove BUG() when interface type is invalid Adiel Aloni <adiel.aloni(a)intel.com> mac80211_hwsim: enforce PS_MANUAL_POLL to be set after PS_ENABLED Chris Wilson <chris(a)chris-wilson.co.uk> agp/intel: Flush all chipset writes after updating the GGTT Geert Uytterhoeven <geert+renesas(a)glider.be> arm64: dts: renesas: salvator-common: Add EthernetAVB PHY reset Nicholas Piggin <npiggin(a)gmail.com> powerpc/64: Don't trace irqs-off at interrupt return to soft-disabled context Josh Poimboeuf <jpoimboe(a)redhat.com> powerpc/modules: Don't try to restore r2 after a sibling call Yong Zhao <yong.zhao(a)amd.com> drm/amdkfd: Fix memory leaks in kfd topology Stephen Hemminger <stephen(a)networkplumber.org> veth: set peer GSO values John Fastabend <john.fastabend(a)gmail.com> net: sched: drop qdisc_reset from dev_graft_qdisc Toshiaki Makita <makita.toshiaki(a)lab.ntt.co.jp> virtio_net: Disable interrupts if napi_complete_done rescheduled napi Gustavo A. R. Silva <garsilva(a)embeddedor.com> media: davinci: vpif_capture: add NULL check on devm_kzalloc return value Dan Carpenter <dan.carpenter(a)oracle.com> media: cpia2: Fix a couple off by one bugs Heinz Mauelshagen <heinzm(a)redhat.com> dm raid: fix raid set size revalidation Kieran Bingham <kieran.bingham+renesas(a)ideasonboard.com> media: vsp1: Prevent suspending and resuming DRM pipelines Xose Vazquez Perez <xose.vazquez(a)gmail.com> scsi: dh: add new rdac devices Xose Vazquez Perez <xose.vazquez(a)gmail.com> scsi: devinfo: apply to HP XP the same flags as Hitachi VSP Bart Van Assche <bart.vanassche(a)wdc.com> scsi: core: scsi_get_device_flags_keyed(): Always return device flags Michael Chan <michael.chan(a)broadcom.com> bnxt_en: Don't print "Link speed -1 no longer supported" messages. Tobias Jordan <Tobias.Jordan(a)elektrobit.com> spi: sun6i: disable/unprepare clocks on remove Julien BOIBESSOT <julien.boibessot(a)armadeus.com> tools/usbip: fixes build with musl libc toolchain Ben Greear <greearb(a)candelatech.com> ath10k: fix invalid STS_CAP_OFFSET_MASK Limin Zhu <liminzhu(a)marvell.com> mwifiex: cfg80211: do not change virtual interface during scan processing Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> clk: qcom: msm8916: fix mnd_width for codec_digcodec Monk Liu <Monk.Liu(a)amd.com> drm/amdgpu:fix virtual dce bug Sara Sharon <sara.sharon(a)intel.com> iwlwifi: mvm: avoid dumping assert log when device is stopped Thomas Richter <tmricht(a)linux.vnet.ibm.com> perf annotate: Fix objdump comment parsing for Intel mov dissassembly Thomas Richter <tmricht(a)linux.vnet.ibm.com> perf annotate: Fix unnecessary memory allocation for s390x Takeshi Kihara <takeshi.kihara.df(a)renesas.com> pinctrl: sh-pfc: r8a7795-es1: Fix MOD_SEL1 bit[25:24] to 0x3 when using STP_ISEN_1_D Fabrizio Castro <fabrizio.castro(a)bp.renesas.com> pinctrl: sh-pfc: r8a7791: Add can_clk function Jernej Skrabec <jernej.skrabec(a)siol.net> drm/sun4i: Fix format mask in DE2 driver Axel Lin <axel.lin(a)ingics.com> pwm: stmpe: Fix wrong register offset for hwpwm=2 case Li Dongyang <dongyang.li(a)anu.edu.au> scsi: ses: don't ask for diagnostic pages repeatedly during probe Monk Liu <Monk.Liu(a)amd.com> drm/amdgpu:fix random missing of FLR NOTIFY Peter Ujfalusi <peter.ujfalusi(a)ti.com> dmaengine: amba-pl08x: Use vchan_terminate_vdesc() instead of desc_free Peter Ujfalusi <peter.ujfalusi(a)ti.com> dmaengine: bcm2835-dma: Use vchan_terminate_vdesc() instead of desc_free Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> cpufreq: Fix governor module removal race Manikanta Pubbisetty <mpubbise(a)qti.qualcomm.com> ath10k: update tdls teardown state to target Peter Meerwald-Stadler <pmeerw(a)pmeerw.net> iio: health: max30102: Add power enable parameter to get_temp function Stefan Brüns <stefan.bruens(a)rwth-aachen.de> iio: adc: ina2xx: Shift bus voltage register to mask flag bits Philipp Zabel <p.zabel(a)pengutronix.de> drm/etnaviv: make THERMAL selectable Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> power: supply: ab8500_charger: Bail out in case of error in 'ab8500_charger_init_hw_registers()' Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> power: supply: ab8500_charger: Fix an error handling path Tero Kristo <t-kristo(a)ti.com> clk: ti: clkctrl: add support for retrying failed init Bjorn Andersson <bjorn.andersson(a)linaro.org> leds: pm8058: Silence pointer to integer size warning Yossef Efraim <yossefe(a)mellanox.com> xfrm: Fix xfrm_replay_overflow_offload_esn Eric W. Biederman <ebiederm(a)xmission.com> userns: Don't fail follow_automount based on s_user_ns Jagdish Gediya <jagdish.gediya(a)nxp.com> mtd: nand: ifc: update bufnum mask for ver >= 2.0.0 Andrew F. Davis <afd(a)ti.com> ARM: dts: omap3-n900: Fix the audio CODEC's reset pin Andrew F. Davis <afd(a)ti.com> ARM: dts: am335x-pepper: Fix the audio CODEC's reset pin Sunil Goutham <sgoutham(a)cavium.com> net: thunderx: Set max queue count taking XDP_TX into account Miquel Raynal <miquel.raynal(a)free-electrons.com> mtd: nand: fix interpretation of NAND_CMD_NONE in nand_command[_lp]() Lorenzo Colitti <lorenzo(a)google.com> net: xfrm: allow clearing socket xfrm policies. Alexey Khoroshilov <khoroshilov(a)ispras.ru> rtc: brcmstb-waketimer: fix error handling in brcmstb_waketmr_probe() Michael Hennerich <michael.hennerich(a)analog.com> net: ieee802154: adf7242: Fix bug if defined DEBUG Luis R. Rodriguez <mcgrof(a)kernel.org> test_firmware: fix setting old custom fw path back on exit Colin Ian King <colin.king(a)canonical.com> crypto: cavium - fix memory leak on info Pierre <pinaraf(a)pinaraf.info> crypto: ecc - Fix NULL pointer deref. on no default_rng Paul E. McKenney <paulmck(a)linux.vnet.ibm.com> sched: Stop resched_cpu() from sending IPIs to offline CPUs Paul E. McKenney <paulmck(a)linux.vnet.ibm.com> sched: Stop switched_to_rt() from sending IPIs to offline CPUs Johan Hovold <johan(a)kernel.org> USB: ledtrig-usbport: fix of-node leak Adam Thomson <Adam.Thomson.Opensource(a)diasemi.com> typec: tcpm: fusb302: Resolve out of order messaging events Colin Ian King <colin.king(a)canonical.com> staging: rtl8822be: fix missing null check on dev_alloc_skb return Felix Kuehling <Felix.Kuehling(a)amd.com> drm/amdgpu: fix get_max_engine_clock_in_mhz Simon Shields <simon(a)lineageos.org> ARM: dts: exynos: Correct Trats2 panel reset line Yixun Lan <yixun.lan(a)amlogic.com> clk: meson: gxbb: fix wrong clock for SARADC/SANA Simon Horman <horms+renesas(a)verge.net.au> ARM: dts: koelsch: Move cec_clock to root node Emmanuel Grumbach <emmanuel.grumbach(a)intel.com> iwlwifi: mvm: rs: don't override the rate history in the search cycle Jiri Kosina <jkosina(a)suse.cz> HID: elo: clear BTN_LEFT mapping Hans de Goede <hdegoede(a)redhat.com> HID: multitouch: Only look at non touch fields in first packet of a frame Ville Syrjälä <ville.syrjala(a)linux.intel.com> video/hdmi: Allow "empty" HDMI infoframes Chris Wilson <chris(a)chris-wilson.co.uk> dma-buf/fence: Fix lock inversion within dma-fence-array Jani Nikula <jani.nikula(a)intel.com> drm/edid: set ELD connector type in drm_edid_to_eld() Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Revert "btrfs: use proper endianness accessors for super_copy" Steffen Maier <maier(a)linux.vnet.ibm.com> dm mpath: fix passing integrity data Greentime Hu <green.hu(a)gmail.com> earlycon: add reg-offset to physical address before mapping Sebastian Andrzej Siewior <bigeasy(a)linutronix.de> serial: core: mark port as initialized in autoconfig Nikola Ciprich <nikola.ciprich(a)linuxbox.cz> serial: 8250_pci: Add Brainboxes UC-260 4 port serial device Roger Quadros <rogerq(a)ti.com> usb: dwc3: Fix lock-up on ID change during system suspend/resume Xinyong <xinyong.fang(a)linux.alibaba.com> usb: gadget: f_fs: Fix use-after-free in ffs_fs_kill_sb() Pete Zaitcev <zaitcev(a)kotori.zaitcev.us> usb: usbmon: Read text within supplied buffer size Danilo Krummrich <danilokrummrich(a)dk-develop.de> usb: quirks: add control message delay for 1b1c:1b20 Colin Ian King <colin.king(a)canonical.com> usbip: vudc: fix null pointer dereference on udc->lock Teijo Kinnunen <teijo.kinnunen(a)code-q.fi> USB: storage: Add JMicron bridge 152d:2567 to unusual_devs.h Joel Fernandes <joelaf(a)google.com> staging: android: ashmem: Fix lockdep issue during llseek Frank Mori Hess <fmh6jj(a)gmail.com> staging: comedi: fix comedi_nsamples_left. Oliver Neukum <oneukum(a)suse.com> uas: fix comparison for error code Jonas Danielsson <jonas(a)orbital-systems.com> tty/serial: atmel: add new version check for usart Ulrich Hecht <ulrich.hecht+renesas(a)gmail.com> serial: sh-sci: prevent lockup on full TTY buffers Mathias Nyman <mathias.nyman(a)linux.intel.com> xhci: fix endpoint context tracer output Kai-Heng Feng <kai.heng.feng(a)canonical.com> xhci: Fix front USB ports on ASUS PRIME B350M-A Yoshihiro Shimoda <yoshihiro.shimoda.uh(a)renesas.com> usb: host: xhci-rcar: add support for r8a77965 Hans de Goede <hdegoede(a)redhat.com> ASoC: rt5651: Fix regcache sync errors on resume Richard Fitzgerald <rf(a)opensource.cirrus.com> ASoC: wm_adsp: For TLV controls only register TLV get/set Fabio Estevam <fabio.estevam(a)nxp.com> ASoC: sgtl5000: Fix suspend/resume Yong Deng <yong.deng(a)magewell.com> ASoC: sun4i-i2s: Fix RX slot number of SUN8I H.J. Lu <hjl.tools(a)gmail.com> x86: Treat R_X86_64_PLT32 as R_X86_64_PC32 Andrew Lunn <andrew(a)lunn.ch> net: phy: Restore phy_resume() locking assumption Russell King <rmk+kernel(a)armlinux.org.uk> net: phy: fix resume handling ------------- Diffstat: Documentation/devicetree/bindings/usb/usb-xhci.txt | 1 + Makefile | 4 +- arch/arm/boot/dts/am335x-pepper.dts | 2 +- arch/arm/boot/dts/exynos4412-trats2.dts | 2 +- arch/arm/boot/dts/omap3-n900.dts | 4 +- arch/arm/boot/dts/r8a7791-koelsch.dts | 12 +- arch/arm64/boot/dts/renesas/salvator-common.dtsi | 1 + arch/powerpc/include/asm/code-patching.h | 1 + arch/powerpc/kernel/entry_64.S | 10 +- arch/powerpc/kernel/module_64.c | 12 +- arch/powerpc/lib/code-patching.c | 5 + arch/x86/kernel/machine_kexec_64.c | 1 + arch/x86/kernel/module.c | 1 + arch/x86/tools/relocs.c | 3 + crypto/ecc.c | 2 +- drivers/base/Kconfig | 1 + drivers/char/agp/intel-gtt.c | 2 + drivers/clk/meson/gxbb.c | 4 +- drivers/clk/qcom/gcc-msm8916.c | 1 + drivers/clk/ti/clkctrl.c | 12 +- drivers/cpufreq/cpufreq.c | 6 + drivers/crypto/caam/caamalg_qi.c | 6 +- drivers/crypto/cavium/cpt/cptvf_reqmanager.c | 3 +- drivers/dma-buf/dma-fence-array.c | 14 ++- drivers/dma/amba-pl08x.c | 11 +- drivers/dma/bcm2835-dma.c | 10 +- drivers/dma/qcom/hidma_ll.c | 9 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 7 +- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 4 +- drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 14 ++- drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 10 ++ drivers/gpu/drm/drm_edid.c | 9 +- drivers/gpu/drm/etnaviv/Kconfig | 9 ++ drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 8 +- drivers/gpu/drm/i915/intel_guc_loader.c | 9 -- drivers/gpu/drm/i915/intel_huc.c | 11 -- drivers/gpu/drm/sun4i/sun8i_mixer.h | 2 +- drivers/hid/hid-elo.c | 6 + drivers/hid/hid-multitouch.c | 17 ++- drivers/iio/adc/ina2xx-adc.c | 26 +++-- drivers/iio/health/max30102.c | 36 +++--- drivers/infiniband/hw/mlx5/mr.c | 3 + drivers/leds/leds-pm8058.c | 2 +- drivers/md/dm-mpath.c | 5 +- drivers/md/dm-raid.c | 30 +++-- drivers/media/platform/davinci/vpif_capture.c | 2 + drivers/media/platform/vsp1/vsp1_drv.c | 16 ++- drivers/media/usb/cpia2/cpia2_v4l.c | 4 +- drivers/mmc/core/mmc_test.c | 11 +- drivers/mtd/nand/fsl_ifc_nand.c | 7 ++ drivers/mtd/nand/nand_base.c | 9 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 10 +- drivers/net/ethernet/cavium/thunder/nicvf_main.c | 5 + drivers/net/ieee802154/adf7242.c | 4 +- drivers/net/ipvlan/ipvlan_core.c | 4 + drivers/net/phy/at803x.c | 4 - drivers/net/phy/phy.c | 9 +- drivers/net/phy/phy_device.c | 20 +++- drivers/net/veth.c | 3 + drivers/net/virtio_net.c | 9 +- drivers/net/wireless/ath/ath10k/mac.c | 10 ++ drivers/net/wireless/ath/ath10k/wmi.h | 3 +- drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 4 +- drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 6 + drivers/net/wireless/mac80211_hwsim.c | 17 ++- drivers/net/wireless/marvell/mwifiex/cfg80211.c | 6 + drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 22 +++- drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c | 2 +- drivers/power/supply/ab8500_charger.c | 6 +- drivers/pwm/pwm-stmpe.c | 2 +- drivers/rtc/rtc-brcmstb-waketimer.c | 15 ++- drivers/scsi/scsi_devinfo.c | 9 +- drivers/scsi/scsi_dh.c | 5 +- drivers/scsi/ses.c | 11 +- drivers/spi/spi-sun6i.c | 2 +- drivers/staging/android/ashmem.c | 15 ++- drivers/staging/comedi/drivers.c | 3 +- drivers/staging/rtlwifi/rtl8822be/fw.c | 2 + drivers/staging/typec/fusb302/fusb302.c | 21 +++- drivers/tty/serial/8250/8250_pci.c | 11 ++ drivers/tty/serial/atmel_serial.c | 1 + drivers/tty/serial/earlycon.c | 3 +- drivers/tty/serial/serial_core.c | 2 + drivers/tty/serial/sh-sci.c | 2 + drivers/usb/core/ledtrig-usbport.c | 8 +- drivers/usb/core/message.c | 4 + drivers/usb/core/quirks.c | 3 +- drivers/usb/dwc3/core.c | 2 +- drivers/usb/gadget/function/f_fs.c | 1 - drivers/usb/host/xhci-pci.c | 3 + drivers/usb/host/xhci-rcar.c | 4 + drivers/usb/host/xhci.c | 3 + drivers/usb/host/xhci.h | 23 ++-- drivers/usb/mon/mon_text.c | 126 +++++++++++++-------- drivers/usb/storage/uas.c | 2 +- drivers/usb/storage/unusual_devs.h | 7 ++ drivers/usb/usbip/vudc_sysfs.c | 8 +- drivers/video/hdmi.c | 51 +++++---- fs/btrfs/sysfs.c | 8 +- fs/btrfs/transaction.c | 20 ++-- fs/namei.c | 3 - include/linux/dma-fence-array.h | 3 + include/linux/phy.h | 1 + include/linux/usb/quirks.h | 3 + kernel/locking/locktorture.c | 76 +++++++------ kernel/sched/core.c | 3 +- kernel/sched/rt.c | 2 +- lib/usercopy.c | 2 +- net/mac80211/iface.c | 2 +- net/sched/sch_generic.c | 28 +++-- net/xfrm/xfrm_policy.c | 2 +- net/xfrm/xfrm_replay.c | 3 +- net/xfrm/xfrm_state.c | 7 ++ security/integrity/ima/ima_appraise.c | 3 +- sound/soc/codecs/rt5651.c | 1 + sound/soc/codecs/sgtl5000.c | 11 ++ sound/soc/codecs/wm_adsp.c | 14 ++- sound/soc/nuc900/nuc900-ac97.c | 4 +- sound/soc/sunxi/sun4i-i2s.c | 2 +- tools/perf/arch/s390/annotate/instructions.c | 3 +- tools/perf/util/annotate.c | 8 +- tools/testing/selftests/firmware/fw_filesystem.sh | 5 +- .../testing/selftests/rcutorture/bin/configinit.sh | 2 +- tools/usb/usbip/src/usbipd.c | 2 +- 124 files changed, 763 insertions(+), 345 deletions(-)

7 years, 5 months

8
122
0 0

[PATCH 05/15] mm/hmm: hmm_pfns_bad() was accessing wrong struct

by jglisse＠redhat.com

From: Jérôme Glisse <jglisse(a)redhat.com> The private field of mm_walk struct point to an hmm_vma_walk struct and not to the hmm_range struct desired. Fix to get proper struct pointer. Signed-off-by: Jérôme Glisse <jglisse(a)redhat.com> Cc: stable(a)vger.kernel.org Cc: Evgeny Baskakov <ebaskakov(a)nvidia.com> Cc: Ralph Campbell <rcampbell(a)nvidia.com> Cc: Mark Hairgrove <mhairgrove(a)nvidia.com> Cc: John Hubbard <jhubbard(a)nvidia.com> --- mm/hmm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mm/hmm.c b/mm/hmm.c index 667944630dc9..f5631e1a7319 100644 --- a/mm/hmm.c +++ b/mm/hmm.c @@ -312,7 +312,8 @@ static int hmm_pfns_bad(unsigned long addr, unsigned long end, struct mm_walk *walk) { - struct hmm_range *range = walk->private; + struct hmm_vma_walk *hmm_vma_walk = walk->private; + struct hmm_range *range = hmm_vma_walk->range; hmm_pfn_t *pfns = range->pfns; unsigned long i; -- 2.14.3

7 years, 5 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror