4.19.85-stable review
Subsystems (9)
Greg Kroah-Hartman
maintainerPATCH 148/422 firmware: arm_scmi: use strlcpy to ensure NULL-terminated strings
In reply to Greg Kroah-HartmanFrom: Sudeep Holla <[email protected]>
[ Upstream commit ca64b719a1e665ac7449b6a968059176af7365a8 ]
Replace all the memcpy() for copying name strings from the firmware with strlcpy() to make sure we are bounded by the source buffer size and we also always have NULL-terminated strings.
This is needed to avoid out of bounds accesses if the firmware returns a non-terminated string.
--- drivers/firmware/arm_scmi/base.c | 2 +- drivers/firmware/arm_scmi/clock.c | 2 +- drivers/firmware/arm_scmi/perf.c | 2 +- drivers/firmware/arm_scmi/power.c | 2 +- drivers/firmware/arm_scmi/sensors.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
drivers/firmware/arm_scmi/base.c +1 -1
@@ -208,7 +208,7 @@ static int scmi_base_discover_agent_get(const struct scmi_handle *handle, ret =scmi_do_xfer (handle, t);if (!ret) -memcpy (name, t->rx.buf,SCMI_MAX_STR_SIZE ); +strlcpy (name, t->rx.buf,SCMI_MAX_STR_SIZE );scmi_xfer_put (handle, t);
drivers/firmware/arm_scmi/clock.c +1 -1
@@ -111,7 +111,7 @@ static int scmi_clock_attributes_get(const struct scmi_handle *handle, ret =scmi_do_xfer (handle, t);if (!ret) -memcpy (clk->name, attr->name,SCMI_MAX_STR_SIZE ); +strlcpy (clk->name, attr->name,SCMI_MAX_STR_SIZE );else clk->name[0 ] ='\0' ;
drivers/firmware/arm_scmi/perf.c +1 -1
@@ -174,7 +174,7 @@ scmi_perf_domain_attributes_get(const struct scmi_handle *handle, u32 domain, dom_info->mult_factor = (dom_info->sustained_freq_khz *1000 ) / dom_info->sustained_perf_level; -memcpy (dom_info->name, attr->name,SCMI_MAX_STR_SIZE ); +strlcpy (dom_info->name, attr->name,SCMI_MAX_STR_SIZE ); }scmi_xfer_put (handle, t);
drivers/firmware/arm_scmi/power.c +1 -1
@@ -106,7 +106,7 @@ scmi_power_domain_attributes_get(const struct scmi_handle *handle, u32 domain, dom_info->state_set_notify =SUPPORTS_STATE_SET_NOTIFY (flags); dom_info->state_set_async =SUPPORTS_STATE_SET_ASYNC (flags); dom_info->state_set_sync =SUPPORTS_STATE_SET_SYNC (flags); -memcpy (dom_info->name, attr->name,SCMI_MAX_STR_SIZE ); +strlcpy (dom_info->name, attr->name,SCMI_MAX_STR_SIZE ); }scmi_xfer_put (handle, t);
drivers/firmware/arm_scmi/sensors.c +1 -1
@@ -140,7 +140,7 @@ static int scmi_sensor_description_get(const struct scmi_handle *handle, s = &si->sensors[desc_index + cnt]; s->id =le32_to_cpu (buf->desc[cnt].id); s->type =SENSOR_TYPE (attrh); -memcpy (s->name, buf->desc[cnt].name,SCMI_MAX_STR_SIZE ); +strlcpy (s->name, buf->desc[cnt].name,SCMI_MAX_STR_SIZE ); } desc_index += num_returned;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 149/422 arm64: dts: rockchip: Fix VCC5V0_HOST_EN on rk3399-sapphire
In reply to Greg Kroah-HartmanFrom: Vicente Bergas <[email protected]>
[ Upstream commit bcdb578a5f5b4aea79441606ab7f0a2e076b4474 ]
The pin is GPIO4-D1 not GPIO1-D1, see schematic, page 15 for reference.
--- arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi +1 -1
@@ -116,7 +116,7 @@ vcc5v0_host: vcc5v0-host-regulator { compatible = "regulator-fixed"; enable-active-high; - gpio = <&gpio1 RK_PD1 GPIO_ACTIVE_HIGH>; + gpio = <&gpio4 RK_PD1 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&vcc5v0_host_en>; regulator-name = "vcc5v0_host";
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 150/422 tty/serial: atmel: Change the driver to work under at91-usart MFD
In reply to Greg Kroah-HartmanFrom: Radu Pirea <[email protected]>
[ Upstream commit c24d25317a7c6bb3053d4c193b3cf57d1e9a3e4b ]
This patch modifies the place where resources and device tree properties are searched.
--- drivers/tty/serial/Kconfig | 1 + drivers/tty/serial/atmel_serial.c | 42 ++++++++++++++++++++----------- 2 files changed, 28 insertions(+), 15 deletions(-)
drivers/tty/serial/Kconfig +1 -0
@@ -118,6 +118,7 @@ config SERIAL_ATMEL depends on ARCH_AT91 || COMPILE_TEST select SERIAL_CORE select SERIAL_MCTRL_GPIO if GPIOLIB + select MFD_AT91_USART help This enables the driver for the on-chip UARTs of the Atmel AT91 processors.
drivers/tty/serial/atmel_serial.c +27 -15
130 lines not on this page · raw message
Signature · 1 line
2.20.1
Re: [PATCH 4.19 150/422] tty/serial: atmel: Change the driver to work under at91-usart MFD
Hi all,
Le 19/11/2019 à 06:15, Greg Kroah-Hartman a écrit :
Quoted 6 lines
From: Radu Pirea <[email protected]>
[ Upstream commit
c24d25317a7c6bb3053d4c193b3cf57d1e9a3e4b]This patch modifies the place where resources and device tree properties are searched.
Maybe I missed something, but I don't see why this is backported to stable. I don't think that this patch was send with a Cc: stable (I just came back from holidays, so I may be wrong :))
Moreover, it's part of a series that introduce "config MFD_AT91_USART", but grepping MFD_AT91_USART on stable-rc/linux-4.19.y only returns:drivers/tty/serial/Kconfig: select MFD_AT91_USART
So I think this is a mistake (but how it got there ? it is by a bot or something ?)
regards,
Richard
Quoted 171 lines
Signed-off-by Radu Pirea <[email protected]>Reviewed-by Andy Shevchenko <[email protected]>Acked-by Richard Genoud <[email protected]>Acked-by Nicolas Ferre <[email protected]>Signed-off-by Lee Jones <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- drivers/tty/serial/Kconfig | 1 + drivers/tty/serial/atmel_serial.c | 42 ++++++++++++++++++++----------- 2 files changed, 28 insertions(+), 15 deletions(-)drivers/tty/serial/Kconfig +1
-0@@ -118,6 +118,7 @@ config SERIAL_ATMEL depends on ARCH_AT91 || COMPILE_TEST select SERIAL_CORE select SERIAL_MCTRL_GPIO if GPIOLIB + select MFD_AT91_USART help This enables the driver for the on-chip UARTs of the Atmel AT91 processors.drivers/tty/serial/atmel_serial.c +27
-15@@ -195,8 +195,7 @@ static struct console atmel_console;#if defined(CONFIG_OF )static const struct of_device_id atmel_serial_dt_ids[] = { - { .compatible ="atmel,at91rm9200-usart" }, - { .compatible ="atmel,at91sam9260-usart" }, + { .compatible ="atmel,at91rm9200-usart-serial" }, {/* sentinel */ } };#endif @@ -926,6 +925,7 @@ static void atmel_tx_dma(struct uart_port *port)static int atmel_prepare_tx_dma (struct uart_port *port) {struct atmel_uart_port *atmel_port =to_atmel_uart_port (port); +struct device *mfd_dev = port->dev->parent;dma_cap_mask_t mask;struct dma_slave_config config;int ret, nent;@@ -933,7 +933,7 @@ static int atmel_prepare_tx_dma(struct uart_port *port)dma_cap_zero (mask);dma_cap_set (DMA_SLAVE , mask); - atmel_port->chan_tx =dma_request_slave_channel (port->dev,"tx" ); + atmel_port->chan_tx =dma_request_slave_channel (mfd_dev,"tx" );if (atmel_port->chan_tx ==NULL ) goto chan_err; dev_info(port->dev, "using %s for tx DMA transfers\n",@@ -1104,6 +1104,7 @@ static void atmel_rx_from_dma(struct uart_port *port)static int atmel_prepare_rx_dma (struct uart_port *port) {struct atmel_uart_port *atmel_port =to_atmel_uart_port (port); +struct device *mfd_dev = port->dev->parent;struct dma_async_tx_descriptor *desc;dma_cap_mask_t mask;struct dma_slave_config config;@@ -1115,7 +1116,7 @@ static int atmel_prepare_rx_dma(struct uart_port *port)dma_cap_zero (mask);dma_cap_set (DMA_CYCLIC , mask); - atmel_port->chan_rx =dma_request_slave_channel (port->dev,"rx" ); + atmel_port->chan_rx =dma_request_slave_channel (mfd_dev,"rx" );if (atmel_port->chan_rx ==NULL ) goto chan_err; dev_info(port->dev, "using %s for rx DMA transfers\n",@@ -2246,8 +2247,8 @@ static const char *atmel_type(struct uart_port *port)*/ static void atmel_release_port (struct uart_port *port) { -struct platform_device *pdev =to_platform_device (port->dev); -int size = pdev->resource[0 ].end - pdev->resource[0 ].start +1 ; +struct platform_device *mpdev =to_platform_device (port->dev->parent); +int size =resource_size (mpdev->resource);release_mem_region (port->mapbase, size);@@ -2262,8 +2263,8 @@ static void atmel_release_port(struct uart_port *port)*/ static int atmel_request_port (struct uart_port *port) { -struct platform_device *pdev =to_platform_device (port->dev); -int size = pdev->resource[0 ].end - pdev->resource[0 ].start +1 ; +struct platform_device *mpdev =to_platform_device (port->dev->parent); +int size =resource_size (mpdev->resource);if (!request_mem_region (port->mapbase, size,"atmel_serial" ))return -EBUSY ;@@ -2365,27 +2366,28 @@ static int atmel_init_port(struct atmel_uart_port *atmel_port, {int ret;struct uart_port *port = &atmel_port->uart; +struct platform_device *mpdev =to_platform_device (pdev->dev.parent);atmel_init_property (atmel_port, pdev);atmel_set_ops (port); -uart_get_rs485_mode (&pdev->dev, &port->rs485); +uart_get_rs485_mode (&mpdev->dev, &port->rs485); port->iotype =UPIO_MEM ; port->flags =UPF_BOOT_AUTOCONF |UPF_IOREMAP ; port->ops = &atmel_pops; port->fifosize =1 ; port->dev = &pdev->dev; - port->mapbase = pdev->resource[0 ].start; - port->irq = pdev->resource[1 ].start; + port->mapbase = mpdev->resource[0 ].start; + port->irq = mpdev->resource[1 ].start; port->rs485_config = atmel_config_rs485; - port->membase =NULL ; + port->membase =NULL ;memset (&atmel_port->rx_ring,0 ,sizeof (atmel_port->rx_ring));/* for console, the clock could already be configured */ if (!atmel_port->clk) { - atmel_port->clk =clk_get (&pdev->dev,"usart" ); + atmel_port->clk =clk_get (&mpdev->dev,"usart" );if (IS_ERR (atmel_port->clk)) { ret =PTR_ERR (atmel_port->clk); atmel_port->clk =NULL ;@@ -2718,13 +2720,22 @@ static void atmel_serial_probe_fifos(struct atmel_uart_port *atmel_port,static int atmel_serial_probe (struct platform_device *pdev) {struct atmel_uart_port *atmel_port; -struct device_node *np = pdev->dev.of_node; +struct device_node *np = pdev->dev.parent->of_node;void *data;int ret = -ENODEV ;bool rs485_enabled;BUILD_BUG_ON (ATMEL_SERIAL_RINGSIZE & (ATMEL_SERIAL_RINGSIZE -1 )); +/* +* In device tree there is no node with "atmel,at91rm9200-usart-serial" +* as compatible string. This driver is probed by at91-usart mfd driver +* which is just a wrapper over the atmel_serial driver and +* spi-at91-usart driver. All attributes needed by this driver are +* found in of_node of parent. +*/ + pdev->dev.of_node = np; + ret =of_alias_get_id (np,"serial" );if (ret <0 )/* port id not found in platform data nor device-tree aliases: @@ -2860,6 +2871,7 @@ static int atmel_serial_remove(struct platform_device *pdev)clk_put (atmel_port->clk); atmel_port->clk =NULL ; + pdev->dev.of_node =NULL ;return ret; }@@ -2870,7 +2882,7 @@ static struct platform_driver atmel_serial_driver = { .suspend = atmel_serial_suspend, .resume = atmel_serial_resume, .driver = { - .name = "atmel_usart", + .name = "atmel_usart_serial", .of_match_table = of_match_ptr(atmel_serial_dt_ids), }, };
Re: [PATCH 4.19 150/422] tty/serial: atmel: Change the driver to work under at91-usart MFD
Le 19/11/2019 à 13:01, Richard Genoud a écrit :
Quoted 14 lines
Hi all,
Le 19/11/2019 à 06:15, Greg Kroah-Hartman a écrit :
Quoted 6 lines
From: Radu Pirea <[email protected]>
[ Upstream commit
c24d25317a7c6bb3053d4c193b3cf57d1e9a3e4b]This patch modifies the place where resources and device tree properties are searched.
Maybe I missed something, but I don't see why this is backported to stable. I don't think that this patch was send with a Cc: stable (I just came back from holidays, so I may be wrong :))
Quoted 6 lines
Moreover, it's part of a series that introduce "config
MFD_AT91_USART", but greppingMFD_AT91_USARTon stable-rc/linux-4.19.y only returns:drivers/tty/serial/Kconfig: selectMFD_AT91_USARTSo I think this is a mistake (but how it got there ? it is by a bot or something ?)
Replying to myself :)
Mystery solved, it was added by Sasha's bot/AI
[PATCH AUTOSEL 4.19 118/205] tty/serial: atmel: Change the driver to work under at91-usart MFD
So Greg, you can safely drop this patch.
Thanks,
Richard.
Quoted 176 lines
regards,
RichardQuoted 171 lines
Signed-off-by Radu Pirea <[email protected]>Reviewed-by Andy Shevchenko <[email protected]>Acked-by Richard Genoud <[email protected]>Acked-by Nicolas Ferre <[email protected]>Signed-off-by Lee Jones <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- drivers/tty/serial/Kconfig | 1 + drivers/tty/serial/atmel_serial.c | 42 ++++++++++++++++++++----------- 2 files changed, 28 insertions(+), 15 deletions(-)drivers/tty/serial/Kconfig +1
-0@@ -118,6 +118,7 @@ config SERIAL_ATMEL depends on ARCH_AT91 || COMPILE_TEST select SERIAL_CORE select SERIAL_MCTRL_GPIO if GPIOLIB + select MFD_AT91_USART help This enables the driver for the on-chip UARTs of the Atmel AT91 processors.drivers/tty/serial/atmel_serial.c +27
-15@@ -195,8 +195,7 @@ static struct console atmel_console;#if defined(CONFIG_OF )static const struct of_device_id atmel_serial_dt_ids[] = { - { .compatible ="atmel,at91rm9200-usart" }, - { .compatible ="atmel,at91sam9260-usart" }, + { .compatible ="atmel,at91rm9200-usart-serial" }, {/* sentinel */ } };#endif @@ -926,6 +925,7 @@ static void atmel_tx_dma(struct uart_port *port)static int atmel_prepare_tx_dma (struct uart_port *port) {struct atmel_uart_port *atmel_port =to_atmel_uart_port (port); +struct device *mfd_dev = port->dev->parent;dma_cap_mask_t mask;struct dma_slave_config config;int ret, nent;@@ -933,7 +933,7 @@ static int atmel_prepare_tx_dma(struct uart_port *port)dma_cap_zero (mask);dma_cap_set (DMA_SLAVE , mask); - atmel_port->chan_tx =dma_request_slave_channel (port->dev,"tx" ); + atmel_port->chan_tx =dma_request_slave_channel (mfd_dev,"tx" );if (atmel_port->chan_tx ==NULL ) goto chan_err; dev_info(port->dev, "using %s for tx DMA transfers\n",@@ -1104,6 +1104,7 @@ static void atmel_rx_from_dma(struct uart_port *port)static int atmel_prepare_rx_dma (struct uart_port *port) {struct atmel_uart_port *atmel_port =to_atmel_uart_port (port); +struct device *mfd_dev = port->dev->parent;struct dma_async_tx_descriptor *desc;dma_cap_mask_t mask;struct dma_slave_config config;@@ -1115,7 +1116,7 @@ static int atmel_prepare_rx_dma(struct uart_port *port)dma_cap_zero (mask);dma_cap_set (DMA_CYCLIC , mask); - atmel_port->chan_rx =dma_request_slave_channel (port->dev,"rx" ); + atmel_port->chan_rx =dma_request_slave_channel (mfd_dev,"rx" );if (atmel_port->chan_rx ==NULL ) goto chan_err; dev_info(port->dev, "using %s for rx DMA transfers\n",@@ -2246,8 +2247,8 @@ static const char *atmel_type(struct uart_port *port)*/ static void atmel_release_port (struct uart_port *port) { -struct platform_device *pdev =to_platform_device (port->dev); -int size = pdev->resource[0 ].end - pdev->resource[0 ].start +1 ; +struct platform_device *mpdev =to_platform_device (port->dev->parent); +int size =resource_size (mpdev->resource);release_mem_region (port->mapbase, size);@@ -2262,8 +2263,8 @@ static void atmel_release_port(struct uart_port *port)*/ static int atmel_request_port (struct uart_port *port) { -struct platform_device *pdev =to_platform_device (port->dev); -int size = pdev->resource[0 ].end - pdev->resource[0 ].start +1 ; +struct platform_device *mpdev =to_platform_device (port->dev->parent); +int size =resource_size (mpdev->resource);if (!request_mem_region (port->mapbase, size,"atmel_serial" ))return -EBUSY ;@@ -2365,27 +2366,28 @@ static int atmel_init_port(struct atmel_uart_port *atmel_port, {int ret;struct uart_port *port = &atmel_port->uart; +struct platform_device *mpdev =to_platform_device (pdev->dev.parent);atmel_init_property (atmel_port, pdev);atmel_set_ops (port); -uart_get_rs485_mode (&pdev->dev, &port->rs485); +uart_get_rs485_mode (&mpdev->dev, &port->rs485); port->iotype =UPIO_MEM ; port->flags =UPF_BOOT_AUTOCONF |UPF_IOREMAP ; port->ops = &atmel_pops; port->fifosize =1 ; port->dev = &pdev->dev; - port->mapbase = pdev->resource[0 ].start; - port->irq = pdev->resource[1 ].start; + port->mapbase = mpdev->resource[0 ].start; + port->irq = mpdev->resource[1 ].start; port->rs485_config = atmel_config_rs485; - port->membase =NULL ; + port->membase =NULL ;memset (&atmel_port->rx_ring,0 ,sizeof (atmel_port->rx_ring));/* for console, the clock could already be configured */ if (!atmel_port->clk) { - atmel_port->clk =clk_get (&pdev->dev,"usart" ); + atmel_port->clk =clk_get (&mpdev->dev,"usart" );if (IS_ERR (atmel_port->clk)) { ret =PTR_ERR (atmel_port->clk); atmel_port->clk =NULL ;@@ -2718,13 +2720,22 @@ static void atmel_serial_probe_fifos(struct atmel_uart_port *atmel_port,static int atmel_serial_probe (struct platform_device *pdev) {struct atmel_uart_port *atmel_port; -struct device_node *np = pdev->dev.of_node; +struct device_node *np = pdev->dev.parent->of_node;void *data;int ret = -ENODEV ;bool rs485_enabled;BUILD_BUG_ON (ATMEL_SERIAL_RINGSIZE & (ATMEL_SERIAL_RINGSIZE -1 )); +/* +* In device tree there is no node with "atmel,at91rm9200-usart-serial" +* as compatible string. This driver is probed by at91-usart mfd driver +* which is just a wrapper over the atmel_serial driver and +* spi-at91-usart driver. All attributes needed by this driver are +* found in of_node of parent. +*/ + pdev->dev.of_node = np; + ret =of_alias_get_id (np,"serial" );if (ret <0 )/* port id not found in platform data nor device-tree aliases: @@ -2860,6 +2871,7 @@ static int atmel_serial_remove(struct platform_device *pdev)clk_put (atmel_port->clk); atmel_port->clk =NULL ; + pdev->dev.of_node =NULL ;return ret; }@@ -2870,7 +2882,7 @@ static struct platform_driver atmel_serial_driver = { .suspend = atmel_serial_suspend, .resume = atmel_serial_resume, .driver = { - .name = "atmel_usart", + .name = "atmel_usart_serial", .of_match_table = of_match_ptr(atmel_serial_dt_ids), }, };
Greg Kroah-Hartman
maintainerRe: [PATCH 4.19 150/422] tty/serial: atmel: Change the driver to work under at91-usart MFD
Quoted 19 lines · Richard Genoud
Le 19/11/2019 à 13:01, Richard Genoud a écrit :
Quoted 18 lines
Hi all,
Le 19/11/2019 à 06:15, Greg Kroah-Hartman a écrit :
Quoted 6 lines
From: Radu Pirea <[email protected]>
[ Upstream commit
c24d25317a7c6bb3053d4c193b3cf57d1e9a3e4b]This patch modifies the place where resources and device tree properties are searched.
Maybe I missed something, but I don't see why this is backported to stable. I don't think that this patch was send with a Cc: stable (I just came back from holidays, so I may be wrong :))
Moreover, it's part of a series that introduce "config
MFD_AT91_USART", but greppingMFD_AT91_USARTon stable-rc/linux-4.19.y only returns:drivers/tty/serial/Kconfig: selectMFD_AT91_USART
Quoted 8 lines
Quoted 2 lines
So I think this is a mistake (but how it got there ? it is by a bot or something ?)
Replying to myself :)
Mystery solved, it was added by Sasha's bot/AI
[PATCH AUTOSEL 4.19 118/205] tty/serial: atmel: Change the driver to work under at91-usart MFDSo Greg, you can safely drop this patch.
Now dropped, thanks.
greg k-h
Greg Kroah-Hartman
maintainerPATCH 151/422 ARM: dts: exynos: Disable pull control for PMIC IRQ line on Artik5 board
In reply to Greg Kroah-HartmanFrom: Marek Szyprowski <[email protected]>
[ Upstream commit 62623718fd31d08b26ebea6c8b40f24924153ab7 ]
S2MPS14 PMIC interrupt line on Exynos3250-based Artik5 evaluation board has external pull-up resistors, so disable any pull control for it in controller node. This fixes support for S2MPS14 PMIC interrupts and enables operation of wakeup from S2MPS14 RTC alarm.
--- arch/arm/boot/dts/exynos3250-artik5.dtsi | 7 +++++++ 1 file changed, 7 insertions(+)
arch/arm/boot/dts/exynos3250-artik5.dtsi +7 -0
@@ -69,6 +69,8 @@ compatible = "samsung,s2mps14-pmic"; interrupt-parent = <&gpx3>; interrupts = <5 IRQ_TYPE_NONE>; + pinctrl-names = "default"; + pinctrl-0 = <&s2mps14_irq>; reg = <0x66>; s2mps14_osc: clocks {
@@ -350,6 +352,11 @@ samsung,pin-drv = <EXYNOS4_PIN_DRV_LV3>; samsung,pin-val = <1>; }; + + s2mps14_irq: s2mps14-irq { + samsung,pins = "gpx3-5"; + samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; + }; }; &rtc {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 152/422 usb: mtu3: disable vbus rise/fall interrupts of ltssm
In reply to Greg Kroah-HartmanFrom: Chunfeng Yun <[email protected]>
[ Upstream commit 0eae49582b4dee1a0e96007e1dea5122db98371a ]
The vbus rise & fall interrupts are used to enable and disable U3 function of device automatically, this cause some issues when class driver is initialized as deactivated, and will skip over software-controlled connect by pullup(), but UDC wants to keep disconnect until usb_gadget_activate() is called which calls pullup() if needed. So we disable vbus rise & fall interrupts and just use pullup() to enable & disable U3 function, and reset mtu3 state when disconnect instead when vbus fall.
--- drivers/usb/mtu3/mtu3_core.c | 4 ++-- drivers/usb/mtu3/mtu3_gadget.c | 22 ++++++++++++++-------- 2 files changed, 16 insertions(+), 10 deletions(-)
drivers/usb/mtu3/mtu3_core.c +2 -2
@@ -185,8 +185,8 @@ static void mtu3_intr_enable(struct mtu3 *mtu)if (mtu->is_u3_ip) {/* Enable U3 LTSSM interrupts */ - value =HOT_RST_INTR |WARM_RST_INTR |VBUS_RISE_INTR | -VBUS_FALL_INTR |ENTER_U3_INTR |EXIT_U3_INTR ; + value =HOT_RST_INTR |WARM_RST_INTR | +ENTER_U3_INTR |EXIT_U3_INTR ;mtu3_writel (mbase,U3D_LTSSM_INTR_ENABLE , value); }
drivers/usb/mtu3/mtu3_gadget.c +14 -8
@@ -585,6 +585,17 @@ static const struct usb_gadget_ops mtu3_gadget_ops = { .udc_stop = mtu3_gadget_stop, }; +static void mtu3_state_reset (struct mtu3 *mtu) +{ + mtu->address =0 ; + mtu->ep0_state =MU3D_EP0_STATE_SETUP ; + mtu->may_wakeup =0 ; + mtu->u1_enable =0 ; + mtu->u2_enable =0 ; + mtu->delayed_status = false; + mtu->test_mode = false; +} +static void init_hw_ep (struct mtu3 *mtu,struct mtu3_ep *mep,u32 epnum,u32 is_in) {
@@ -702,6 +713,7 @@ void mtu3_gadget_disconnect(struct mtu3 *mtu)spin_lock (&mtu->lock); } +mtu3_state_reset (mtu);usb_gadget_set_state (&mtu->g,USB_STATE_NOTATTACHED ); }
@@ -712,12 +724,6 @@ void mtu3_gadget_reset(struct mtu3 *mtu)/* report disconnect, if we didn't flush EP state */ if (mtu->g.speed !=USB_SPEED_UNKNOWN )mtu3_gadget_disconnect (mtu); - - mtu->address =0 ; - mtu->ep0_state =MU3D_EP0_STATE_SETUP ; - mtu->may_wakeup =0 ; - mtu->u1_enable =0 ; - mtu->u2_enable =0 ; - mtu->delayed_status = false; - mtu->test_mode = false; +else +mtu3_state_reset (mtu); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 153/422 dmaengine: dma-jz4780: Dont depend on MACH_JZ4780
In reply to Greg Kroah-HartmanFrom: Paul Cercueil <[email protected]>
[ Upstream commit c558ecd21c852c97ff98dc6c61f715ba420ec251 ]
If we make this driver depend on MACH_JZ4780, that means it can be enabled only if we're building a kernel specially crafted for a JZ4780-based board, while most GNU/Linux distributions will want one generic MIPS kernel that works on multiple boards.
--- drivers/dma/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma/Kconfig +1 -1
@@ -143,7 +143,7 @@ config DMA_JZ4740 config DMA_JZ4780 tristate "JZ4780 DMA support" - depends on MACH_JZ4780 || COMPILE_TEST + depends on MIPS || COMPILE_TEST select DMA_ENGINE select DMA_VIRTUAL_CHANNELS help
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 154/422 dmaengine: dma-jz4780: Further residue status fix
In reply to Greg Kroah-HartmanFrom: Daniel Silsby <[email protected]>
[ Upstream commit 83ef4fb7556b6a673f755da670cbacab7e2c7f1b ]
Func jz4780_dma_desc_residue() expects the index to the next hw descriptor as its last parameter. Caller func jz4780_dma_tx_status(), however, applied modulus before passing it. When the current hw descriptor was last in the list, the index passed became zero.
The resulting excess of reported residue especially caused problems with cyclic DMA transfer clients, i.e. ALSA AIC audio output, which rely on this for determining current DMA location within buffer.
Combined with the recent and related residue-reporting fixes, spurious ALSA audio underruns on jz4770 hardware are now fixed.
--- drivers/dma/dma-jz4780.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma/dma-jz4780.c +1 -1
@@ -587,7 +587,7 @@ static enum dma_status jz4780_dma_tx_status(struct dma_chan *chan, to_jz4780_dma_desc(vdesc), 0); }else if (cookie == jzchan->desc->vdesc.tx.cookie) { txstate->residue =jz4780_dma_desc_residue (jzchan, jzchan->desc, - (jzchan->curr_hwdesc +1 ) % jzchan->desc->count); + jzchan->curr_hwdesc +1 ); }else txstate->residue =0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 155/422 EDAC, sb_edac: Return early on ADDRV bit and address type test
In reply to Greg Kroah-HartmanFrom: Qiuxu Zhuo <[email protected]>
[ Upstream commit dcc960b225ceb2bd66c45e0845d03e577f7010f9 ]
Users of the mce_register_decode_chain() are called for every logged error. EDAC drivers should check:
1) Is this a memory error? [bit 7 in status register]
2) Is there a valid address? [bit 58 in status register]
3) Is the address a system address? [bitfield 8:6 in misc register]
The sb_edac driver performed test "1" twice. Waited far too long to perform check "2". Didn't do check "3" at all.
Fix it by moving the test for valid address from sbridge_mce_output_error() into sbridge_mce_check_error() and add a test for the type immediately after. Delete the redundant check for the type of the error from sbridge_mce_output_error().
--- drivers/edac/sb_edac.c | 68 ++++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 33 deletions(-)
drivers/edac/sb_edac.c +35 -33
@@ -2912,35 +2912,27 @@ static void sbridge_mce_output_error(struct mem_ctl_info *mci,* cccc = channel * If the mask doesn't match, report an error to the parsing logic */ -if (! ((errcode &0xef80 ) ==0x80 )) { - optype ="Can't parse: it is not a mem" ; - }else { -switch (optypenum) { -case 0 : - optype ="generic undef request error" ; -break ; -case 1 : - optype ="memory read error" ; -break ; -case 2 : - optype ="memory write error" ; -break ; -case 3 : - optype ="addr/cmd error" ; -break ; -case 4 : - optype ="memory scrubbing error" ; -break ; -default : - optype ="reserved" ; -break ; - } +switch (optypenum) { +case 0 : + optype ="generic undef request error" ; +break ; +case 1 : + optype ="memory read error" ; +break ; +case 2 : + optype ="memory write error" ; +break ; +case 3 : + optype ="addr/cmd error" ; +break ; +case 4 : + optype ="memory scrubbing error" ; +break ; +default : + optype ="reserved" ; +break ; } -/* Only decode errors with an valid address (ADDRV) */ -if (!GET_BITFIELD (m->status,58 ,58 )) -return ; -if (pvt->info.type ==KNIGHTS_LANDING ) {if (channel ==14 ) { edac_dbg(0, "%s%s err_code:%04x:%04x EDRAM bank %d\n",
@@ -3046,17 +3038,11 @@ static int sbridge_mce_check_error(struct notifier_block *nb, unsigned long val, {struct mce *mce = (struct mce *)data;struct mem_ctl_info *mci; -struct sbridge_pvt *pvt;char *type;if (edac_get_report_status () ==EDAC_REPORTING_DISABLED )return NOTIFY_DONE ; - mci =get_mci_for_node_id (mce->socketid,IMC0 ); -if (!mci) -return NOTIFY_DONE ; - pvt = mci->pvt_info; -/* * Just let mcelog handle it if the error is * outside the memory controller. A memory error
@@ -3066,6 +3052,22 @@ static int sbridge_mce_check_error(struct notifier_block *nb, unsigned long val,if ((mce->status &0xefff ) >>7 !=1 )return NOTIFY_DONE ; +/* Check ADDRV bit in STATUS */ +if (!GET_BITFIELD (mce->status,58 ,58 )) +return NOTIFY_DONE ; + +/* Check MISCV bit in STATUS */ +if (!GET_BITFIELD (mce->status,59 ,59 )) +return NOTIFY_DONE ; + +/* Check address type in MISC (physical address only) */ +if (GET_BITFIELD (mce->misc,6 ,8 ) !=2 ) +return NOTIFY_DONE ; + + mci =get_mci_for_node_id (mce->socketid,IMC0 ); +if (!mci) +return NOTIFY_DONE ; +if (mce->mcgstatus &MCG_STATUS_MCIP ) type ="Exception" ;else
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 156/422 rtc: mt6397: fix possible race condition
In reply to Greg Kroah-HartmanFrom: Alexandre Belloni <[email protected]>
[ Upstream commit babab2f86440352d24e76118fdd7d40cab5fd7bf ]
The IRQ is requested before the struct rtc is allocated and registered, but this struct is used in the IRQ handler. This may lead to a NULL pointer dereference.
Switch to devm_rtc_allocate_device/rtc_register_device to allocate the rtc before requesting the IRQ.
--- drivers/rtc/rtc-mt6397.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/rtc/rtc-mt6397.c +8 -5
@@ -332,6 +332,10 @@ static int mtk_rtc_probe(struct platform_device *pdev)platform_set_drvdata (pdev, rtc); + rtc->rtc_dev =devm_rtc_allocate_device (rtc->dev); +if (IS_ERR (rtc->rtc_dev)) +return PTR_ERR (rtc->rtc_dev); + ret = request_threaded_irq(rtc->irq, NULL, mtk_rtc_irq_handler_thread, IRQF_ONESHOT | IRQF_TRIGGER_HIGH,
@@ -344,11 +348,11 @@ static int mtk_rtc_probe(struct platform_device *pdev)device_init_wakeup (&pdev->dev,1 ); - rtc->rtc_dev =rtc_device_register ("mt6397-rtc" , &pdev->dev, - &mtk_rtc_ops,THIS_MODULE ); -if (IS_ERR (rtc->rtc_dev)) { + rtc->rtc_dev->ops = &mtk_rtc_ops; + + ret =rtc_register_device (rtc->rtc_dev); +if (ret) {dev_err (&pdev->dev,"register rtc device failed\n" ); - ret =PTR_ERR (rtc->rtc_dev); goto out_free_irq; }
@@ -365,7 +369,6 @@ static int mtk_rtc_remove(struct platform_device *pdev) {struct mt6397_rtc *rtc =platform_get_drvdata (pdev); -rtc_device_unregister (rtc->rtc_dev);free_irq (rtc->irq, rtc->rtc_dev);irq_dispose_mapping (rtc->irq);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 157/422 rtc: pl030: fix possible race condition
In reply to Greg Kroah-HartmanFrom: Alexandre Belloni <[email protected]>
[ Upstream commit c778ec85825dc895936940072aea9fe9037db684 ]
The IRQ is requested before the struct rtc is allocated and registered, but this struct is used in the IRQ handler. This may lead to a NULL pointer dereference.
Switch to devm_rtc_allocate_device/rtc_register_device to allocate the rtc before requesting the IRQ.
--- drivers/rtc/rtc-pl030.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
drivers/rtc/rtc-pl030.c +9 -6
@@ -112,6 +112,13 @@ static int pl030_probe(struct amba_device *dev, const struct amba_id *id) goto err_rtc; } + rtc->rtc =devm_rtc_allocate_device (&dev->dev); +if (IS_ERR (rtc->rtc)) { + ret =PTR_ERR (rtc->rtc); + goto err_rtc; + } + + rtc->rtc->ops = &pl030_ops; rtc->base =ioremap (dev->res.start,resource_size (&dev->res));if (!rtc->base) { ret = -ENOMEM ;
@@ -128,12 +135,9 @@ static int pl030_probe(struct amba_device *dev, const struct amba_id *id)if (ret) goto err_irq; - rtc->rtc =rtc_device_register ("pl030" , &dev->dev, &pl030_ops, -THIS_MODULE ); -if (IS_ERR (rtc->rtc)) { - ret =PTR_ERR (rtc->rtc); + ret =rtc_register_device (rtc->rtc); +if (ret) goto err_reg; - }return 0 ;
@@ -154,7 +158,6 @@ static int pl030_remove(struct amba_device *dev)writel (0 , rtc->base +RTC_CR );free_irq (dev->irq[0 ], rtc); -rtc_device_unregister (rtc->rtc);iounmap (rtc->base);amba_release_regions (dev);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 158/422 ath9k: add back support for using active monitor interfaces for tx99
In reply to Greg Kroah-HartmanFrom: Felix Fietkau <[email protected]>
[ Upstream commit 6df0580be8bc30803c4d8b2ed9c2230a2740c795 ]
Various documented examples on how to set up tx99 with ath9k rely on setting up a regular monitor interface for setting the channel. My previous patch "ath9k: fix tx99 with monitor mode interface" made it possible to set it up this way again. However, it was removing support for using an active monitor interface, which is required for controlling the bitrate as well, since the bitrate is not passed down with a regular monitor interface.
This patch partially reverts the previous one, but keeps support for using a regular monitor interface to keep documented steps working in cases where the bitrate does not matter
--- drivers/net/wireless/ath/ath9k/ath9k.h | 1 + drivers/net/wireless/ath/ath9k/main.c | 10 ++++++++-- drivers/net/wireless/ath/ath9k/tx99.c | 7 +++++++ drivers/net/wireless/ath/ath9k/xmit.c | 2 +- 4 files changed, 17 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath9k/ath9k.h +1 -0
@@ -1074,6 +1074,7 @@ struct ath_softc {struct ath_spec_scan_priv spec_priv; +struct ieee80211_vif *tx99_vif;struct sk_buff *tx99_skb;bool tx99_state;s16 tx99_power;
drivers/net/wireless/ath/ath9k/main.c +8 -2
@@ -1251,8 +1251,13 @@ static int ath9k_add_interface(struct ieee80211_hw *hw,struct ath_vif *avp = (void *)vif->drv_priv;struct ath_node *an = &avp->mcast_node; -if (IS_ENABLED (CONFIG_ATH9K_TX99 )) -return -EOPNOTSUPP ; +if (IS_ENABLED (CONFIG_ATH9K_TX99 )) { +if (sc->cur_chan->nvifs >=1 ) { +mutex_unlock (&sc->mutex); +return -EOPNOTSUPP ; + } + sc->tx99_vif = vif; + }mutex_lock (&sc->mutex);
@@ -1337,6 +1342,7 @@ static void ath9k_remove_interface(struct ieee80211_hw *hw,ath9k_p2p_remove_vif (sc, vif); sc->cur_chan->nvifs--; + sc->tx99_vif =NULL ;if (!ath9k_is_chanctx_enabled ())list_del (&avp->list);
drivers/net/wireless/ath/ath9k/tx99.c +7 -0
@@ -54,6 +54,7 @@ static struct sk_buff *ath9k_build_tx99_skb(struct ath_softc *sc)struct ieee80211_hdr *hdr;struct ieee80211_tx_info *tx_info;struct sk_buff *skb; +struct ath_vif *avp; skb =alloc_skb (len,GFP_KERNEL );if (!skb)
@@ -71,11 +72,17 @@ static struct sk_buff *ath9k_build_tx99_skb(struct ath_softc *sc)memcpy (hdr->addr2, hw->wiphy->perm_addr,ETH_ALEN );memcpy (hdr->addr3, hw->wiphy->perm_addr,ETH_ALEN ); +if (sc->tx99_vif) { + avp = (struct ath_vif *) sc->tx99_vif->drv_priv; + hdr->seq_ctrl |=cpu_to_le16 (avp->seq_no); + } + tx_info =IEEE80211_SKB_CB (skb);memset (tx_info,0 ,sizeof (*tx_info)); rate = &tx_info->control.rates[0 ]; tx_info->band = sc->cur_chan->chandef.chan->band; tx_info->flags =IEEE80211_TX_CTL_NO_ACK ; + tx_info->control.vif = sc->tx99_vif; rate->count =1 ;if (ah->curchan &&IS_CHAN_HT (ah->curchan)) { rate->flags |=IEEE80211_TX_RC_MCS ;
drivers/net/wireless/ath/ath9k/xmit.c +1 -1
@@ -2974,7 +2974,7 @@ int ath9k_tx99_send(struct ath_softc *sc, struct sk_buff *skb,return -EINVAL ; } -ath_set_rates (NULL ,NULL , bf); +ath_set_rates (sc->tx99_vif,NULL , bf);ath9k_hw_set_desc_link (sc->sc_ah, bf->bf_desc, bf->bf_daddr);ath9k_hw_tx99_start (sc->sc_ah, txctl->txq->axq_qnum);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 159/422 dmaengine: at_xdmac: remove a stray bottom half unlock
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 0b515abb6b7eb08e90bdfc01fc8fbdd112c15d81 ]
We switched this code from spin_lock_bh() to vanilla spin_lock() but there was one stray spin_unlock_bh() that was overlooked. This patch converts it to spin_unlock() as well.
--- drivers/dma/at_xdmac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma/at_xdmac.c +1 -1
@@ -1608,7 +1608,7 @@ static void at_xdmac_tasklet(unsigned long data)dev_vdbg (chan2dev (&atchan->chan),"%s: desc 0x%p\n" , __func__, desc);if (!desc->active_xfer) {dev_err (chan2dev (&atchan->chan),"Xfer not active: exiting" ); -spin_unlock_bh (&atchan->lock); +spin_unlock (&atchan->lock);return ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 160/422 RDMA/hns: Fix an error code in hns_roce_v2_init_eq_table()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit f1a315420e79fe5c077fa119db9439ffabd2cda2 ]
The error code isn't set on this path.
--- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 1 + 1 file changed, 1 insertion(+)
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +1 -0
@@ -5117,6 +5117,7 @@ static int hns_roce_v2_init_eq_table(struct hns_roce_dev *hr_dev)create_singlethread_workqueue ("hns_roce_irq_workqueue" );if (!hr_dev->irq_workq) {dev_err (dev,"Create irq workqueue failed!\n" ); + ret = -ENOMEM ; goto err_request_irq_fail; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 161/422 IB/hfi1: Missing return value in error path for user sdma
In reply to Greg Kroah-HartmanFrom: Michael J. Ruhl <[email protected]>
[ Upstream commit 2bf4b33f83dfe521c4c7c407b6b150aeec04d69c ]
If the set_txreq_header_agh() function returns an error, the exit path is chosen.
In this path, the code fails to set the return value. This will cause the caller to not realize an error has occurred.
Set the return value correctly in the error path.
--- drivers/infiniband/hw/hfi1/user_sdma.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/infiniband/hw/hfi1/user_sdma.c +3 -1
@@ -856,8 +856,10 @@ static int user_sdma_send_pkts(struct user_sdma_request *req, unsigned maxpkts) changes =set_txreq_header_ahg (req, tx, datalen); -if (changes <0 ) +if (changes <0 ) { + ret = changes; goto free_tx; + } } }else { ret = sdma_txinit(&tx->txreq, 0, sizeof(req->hdr) +
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 162/422 signal: Always ignore SIGKILL and SIGSTOP sent to the global init
In reply to Greg Kroah-HartmanFrom: Eric W. Biederman <[email protected]>
[ Upstream commit 86989c41b5ea08776c450cb759592532314a4ed6 ]
If the first process started (aka /sbin/init) receives a SIGKILL it will panic the system if it is delivered. Making the system unusable and undebugable. It isn't much better if the first process started receives SIGSTOP.
So always ignore SIGSTOP and SIGKILL sent to init.
This is done in a separate clause in sig_task_ignored as force_sig_info can clear SIG_UNKILLABLE and this protection should work even then.
--- kernel/signal.c | 4 ++++ 1 file changed, 4 insertions(+)
kernel/signal.c +4 -0
@@ -78,6 +78,10 @@ static bool sig_task_ignored(struct task_struct *t, int sig, bool force) handler =sig_handler (t, sig); +/* SIGKILL and SIGSTOP may not be sent to the global init */ +if (unlikely (is_global_init (t) &&sig_kernel_only (sig))) +return true; +if (unlikely (t->signal->flags &SIGNAL_UNKILLABLE ) && handler ==SIG_DFL && !(force &&sig_kernel_only (sig)))return true;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 163/422 signal: Properly deliver SIGILL from uprobes
In reply to Greg Kroah-HartmanFrom: Eric W. Biederman <[email protected]>
[ Upstream commit 55a3235fc71bf34303e34a95eeee235b2d2a35dd ]
For userspace to tell the difference between a random signal and an exception, the exception must include siginfo information.
Using SEND_SIG_FORCED for SIGILL is thus wrong, and it will result in userspace seeing si_code == SI_USER (like a random signal) instead of si_code == SI_KERNEL or a more specific si_code as all exceptions deliver.
Therefore replace force_sig_info(SIGILL, SEND_SIG_FORCE, current) with force_sig(SIG_ILL, current) which gets this right and is shorter and easier to type.
--- kernel/events/uprobes.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/events/uprobes.c +2 -2
@@ -1858,7 +1858,7 @@ static void handle_trampoline(struct pt_regs *regs) sigill:uprobe_warn (current,"handle uretprobe, sending SIGILL." ); -force_sig_info (SIGILL ,SEND_SIG_FORCED , current); +force_sig (SIGILL , current); }
@@ -1974,7 +1974,7 @@ static void handle_singlestep(struct uprobe_task *utask, struct pt_regs *regs)if (unlikely (err)) {uprobe_warn (current,"execute the probed insn, sending SIGILL." ); -force_sig_info (SIGILL ,SEND_SIG_FORCED , current); +force_sig (SIGILL , current); } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 164/422 signal: Properly deliver SIGSEGV from x86 uprobes
In reply to Greg Kroah-HartmanFrom: Eric W. Biederman <[email protected]>
[ Upstream commit 4a63c1ffd384ebdce40aac9c997dab68379137be ]
For userspace to tell the difference between an random signal and an exception, the exception must include siginfo information.
Using SEND_SIG_FORCED for SIGSEGV is thus wrong, and it will result in userspace seeing si_code == SI_USER (like a random signal) instead of si_code == SI_KERNEL or a more specific si_code as all exceptions deliver.
Therefore replace force_sig_info(SIGSEGV, SEND_SIG_FORCE, current) with force_sig(SIG_SEGV, current) which gets this right and is shorter and easier to type.
--- arch/x86/kernel/uprobes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/uprobes.c +1 -1
@@ -1089,7 +1089,7 @@ arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regspr_err ("return address clobbered: pid=%d, %%sp=%#lx, %%ip=%#lx\n" , current->pid, regs->sp, regs->ip); -force_sig_info (SIGSEGV ,SEND_SIG_FORCED , current); +force_sig (SIGSEGV , current); }return -1 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 165/422 f2fs: fix memory leak of write_io in fill_super()
In reply to Greg Kroah-HartmanFrom: Chao Yu <[email protected]>
[ Upstream commit 0b2103e886e6de9802e1170e57c573443286a483 ]
It needs to release memory allocated for sbi->write_io in error path, otherwise, it will cause memory leak.
--- fs/f2fs/super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/f2fs/super.c +1 -1
@@ -2929,7 +2929,7 @@ try_onemore: GFP_KERNEL);if (!sbi->write_io[i]) { err = -ENOMEM ; - goto free_options; + goto free_bio_info; }for (j =HOT ; j < n; j++) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 166/422 f2fs: fix memory leak of percpu counter in fill_super()
In reply to Greg Kroah-HartmanFrom: Chao Yu <[email protected]>
[ Upstream commit 4a70e255449c9a13eed7a6eeecc85a1ea63cef76 ]
In fill_super -> init_percpu_info, we should destroy percpu counter in error path, otherwise memory allcoated for percpu counter will leak.
--- fs/f2fs/super.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
fs/f2fs/super.c +5 -1
@@ -2516,8 +2516,12 @@ static int init_percpu_info(struct f2fs_sb_info *sbi)if (err)return err; -return percpu_counter_init (&sbi->total_valid_inode_count,0 , + err =percpu_counter_init (&sbi->total_valid_inode_count,0 ,GFP_KERNEL ); +if (err) +percpu_counter_destroy (&sbi->alloc_valid_block_count); + +return err; }#ifdef CONFIG_BLK_DEV_ZONED
Signature · 1 line
2.20.1
Re: [PATCH 4.19 166/422] f2fs: fix memory leak of percpu counter in fill_super()
Hi!
Quoted 14 lines
From: Chao Yu <[email protected]>
[ Upstream commit
4a70e255449c9a13eed7a6eeecc85a1ea63cef76]In
fill_super->init_percpu_info, we should destroy percpu counter in error path, otherwise memory allcoated for percpu counter will leak.fs/f2fs/super.c +0
-0@@ -2516,8 +2516,12 @@ static int init_percpu_info(struct f2fs_sb_info *sbi)if (err)
fs/f2fs/super.c static int init_percpu_info(struct f2fs_sb_info *sbi) · line 2525
Quoted 10 lines
fs/f2fs/super.c +5
-1return err; -return percpu_counter_init (&sbi->total_valid_inode_count,0 , + err =percpu_counter_init (&sbi->total_valid_inode_count,0 ,GFP_KERNEL ); +if (err) +percpu_counter_destroy (&sbi->alloc_valid_block_count); + +return err; }
Are you sure this is good idea? Normally when _init() fails, the thing is not allocated, and there is nothing to destroy...
If you are right, there's same bug in fs/xfs/xfs_buf.c .
Best regards,
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Greg Kroah-Hartman
maintainerPATCH 167/422 f2fs: fix setattr project check upon fssetxattr ioctl
In reply to Greg Kroah-HartmanFrom: Wang Shilong <[email protected]>
[ Upstream commit c8e927579e00a182eda07e4c45df9c8c699c8ded ]
Currently, project quota could be changed by fssetxattr ioctl, and existed permission check inode_owner_or_capable() is obviously not enough, just think that common users could change project id of file, that could make users to break project quota easily.
This patch try to follow same regular of xfs project quota:
"Project Quota ID state is only allowed to change from within the init namespace. Enforce that restriction only if we are trying to change the quota ID state. Everything else is allowed in user namespaces."
Besides that, check and set project id'state should be an atomic operation, protect whole operation with inode lock.
--- fs/f2fs/file.c | 60 +++++++++++++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 23 deletions(-)
fs/f2fs/file.c +37 -23
@@ -2618,34 +2618,26 @@ static int f2fs_ioc_setproject(struct file *filp, __u32 projid)if (projid_eq (kprojid,F2FS_I (inode)->i_projid))return 0 ; - err =mnt_want_write_file (filp); -if (err) -return err; - err = -EPERM ; -inode_lock (inode); -/* Is it quota file? Do not allow user to mess with it */ if (IS_NOQUOTA (inode)) - goto out_unlock; +return err; ipage =f2fs_get_node_page (sbi, inode->i_ino); -if (IS_ERR (ipage)) { - err =PTR_ERR (ipage); - goto out_unlock; - } +if (IS_ERR (ipage)) +return PTR_ERR (ipage);if (!F2FS_FITS_IN_INODE (F2FS_INODE (ipage), fi->i_extra_isize, i_projid)) { err = -EOVERFLOW ;f2fs_put_page (ipage,1 ); - goto out_unlock; +return err; }f2fs_put_page (ipage,1 ); err =dquot_initialize (inode);if (err) - goto out_unlock; +return err; transfer_to[PRJQUOTA ] =dqget (sb,make_kqid_projid (kprojid));if (!IS_ERR (transfer_to[PRJQUOTA ])) {
@@ -2659,9 +2651,6 @@ static int f2fs_ioc_setproject(struct file *filp, __u32 projid) inode->i_ctime =current_time (inode); out_dirty:f2fs_mark_inode_dirty_sync (inode, true); -out_unlock: -inode_unlock (inode); -mnt_drop_write_file (filp); return err; }#else
@@ -2737,6 +2726,30 @@ static int f2fs_ioc_fsgetxattr(struct file *filp, unsigned long arg)return 0 ; } +static int f2fs_ioctl_check_project (struct inode *inode,struct fsxattr *fa) +{ +/* +* Project Quota ID state is only allowed to change from within the init +* namespace. Enforce that restriction only if we are trying to change +* the quota ID state. Everything else is allowed in user namespaces. +*/ +if (current_user_ns () == &init_user_ns) +return 0 ; + +if (__kprojid_val (F2FS_I (inode)->i_projid) != fa->fsx_projid) +return -EINVAL ; + +if (F2FS_I (inode)->i_flags &F2FS_PROJINHERIT_FL ) { +if (!(fa->fsx_xflags &FS_XFLAG_PROJINHERIT )) +return -EINVAL ; + }else { +if (fa->fsx_xflags &FS_XFLAG_PROJINHERIT ) +return -EINVAL ; + } + +return 0 ; +} +static int f2fs_ioc_fssetxattr (struct file *filp,unsigned long arg) {struct inode *inode =file_inode (filp);
@@ -2764,19 +2777,20 @@ static int f2fs_ioc_fssetxattr(struct file *filp, unsigned long arg)return err;inode_lock (inode); + err =f2fs_ioctl_check_project (inode, &fa); +if (err) + goto out; flags = (fi->i_flags & ~F2FS_FL_XFLAG_VISIBLE ) | (flags &F2FS_FL_XFLAG_VISIBLE ); err =__f2fs_ioc_setflags (inode, flags); -inode_unlock (inode); -mnt_drop_write_file (filp);if (err) -return err; + goto out; err =f2fs_ioc_setproject (filp, fa.fsx_projid); -if (err) -return err; - -return 0 ; +out: +inode_unlock (inode); +mnt_drop_write_file (filp); +return err; }int f2fs_pin_file_control (struct inode *inode,bool inc)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 168/422 scsi: qla2xxx: Use correct qpair for ABTS/CMD
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
[ Upstream commit 49cecca7dd49e2950ed6d973acfa84e7c8c7a480 ]
On Abort of initiator scsi command, the abort needs to follow the same qpair as the the scsi command to prevent out of order processing.
--- drivers/scsi/qla2xxx/qla_init.c | 15 +++++---------- drivers/scsi/qla2xxx/qla_iocb.c | 12 +++++++----- 2 files changed, 12 insertions(+), 15 deletions(-)
drivers/scsi/qla2xxx/qla_init.c +5 -10
@@ -1772,18 +1772,18 @@ int qla24xx_async_abort_cmd(srb_t *cmd_sp, bool wait) {scsi_qla_host_t *vha = cmd_sp->vha; -fc_port_t *fcport = cmd_sp->fcport;struct srb_iocb *abt_iocb;srb_t *sp;int rval =QLA_FUNCTION_FAILED ; - sp =qla2x00_get_sp (vha, fcport,GFP_KERNEL ); + sp =qla2xxx_get_qpair_sp (cmd_sp->qpair, cmd_sp->fcport,GFP_KERNEL );if (!sp) goto done; abt_iocb = &sp->u.iocb_cmd; sp->type =SRB_ABT_CMD ; sp->name ="abort" ; + sp->qpair = cmd_sp->qpair;if (wait) sp->flags =SRB_WAKEUP_ON_COMP ;
@@ -1792,18 +1792,13 @@ qla24xx_async_abort_cmd(srb_t *cmd_sp, bool wait)qla2x00_init_timer (sp,qla2x00_get_async_timeout (vha)); abt_iocb->u.abt.cmd_hndl = cmd_sp->handle; - -if (vha->flags.qpairs_available && cmd_sp->qpair) - abt_iocb->u.abt.req_que_no = -cpu_to_le16 (cmd_sp->qpair->req->id); -else - abt_iocb->u.abt.req_que_no =cpu_to_le16 (vha->req->id); + abt_iocb->u.abt.req_que_no =cpu_to_le16 (cmd_sp->qpair->req->id); sp->done = qla24xx_abort_sp_done;ql_dbg (ql_dbg_async, vha,0x507c , -"Abort command issued - hdl=%x, target_id=%x\n" , - cmd_sp->handle, fcport->tgt_id); +"Abort command issued - hdl=%x, type=%x\n" , + cmd_sp->handle, cmd_sp->type); rval =qla2x00_start_sp (sp);if (rval !=QLA_SUCCESS )
drivers/scsi/qla2xxx/qla_iocb.c +7 -5
@@ -3297,19 +3297,21 @@ qla24xx_abort_iocb(srb_t *sp, struct abort_entry_24xx *abt_iocb) {struct srb_iocb *aio = &sp->u.iocb_cmd;scsi_qla_host_t *vha = sp->vha; -struct req_que *req = vha->req; +struct req_que *req = sp->qpair->req;memset (abt_iocb,0 ,sizeof (struct abort_entry_24xx )); abt_iocb->entry_type =ABORT_IOCB_TYPE ; abt_iocb->entry_count =1 ; abt_iocb->handle =cpu_to_le32 (MAKE_HANDLE (req->id, sp->handle)); - abt_iocb->nport_handle =cpu_to_le16 (sp->fcport->loop_id); +if (sp->fcport) { + abt_iocb->nport_handle =cpu_to_le16 (sp->fcport->loop_id); + abt_iocb->port_id[0 ] = sp->fcport->d_id.b.al_pa; + abt_iocb->port_id[1 ] = sp->fcport->d_id.b.area; + abt_iocb->port_id[2 ] = sp->fcport->d_id.b.domain; + } abt_iocb->handle_to_abort =cpu_to_le32 (MAKE_HANDLE (aio->u.abt.req_que_no, aio->u.abt.cmd_hndl)); - abt_iocb->port_id[0 ] = sp->fcport->d_id.b.al_pa; - abt_iocb->port_id[1 ] = sp->fcport->d_id.b.area; - abt_iocb->port_id[2 ] = sp->fcport->d_id.b.domain; abt_iocb->vp_index = vha->vp_idx; abt_iocb->req_que_no =cpu_to_le16 (aio->u.abt.req_que_no);/* Send the command to the firmware */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 169/422 scsi: qla2xxx: Fix iIDMA error
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
[ Upstream commit 8d9bf0a9a268f7ca0b811d6e6a1fc783afa5c746 ]
When switch responds with error for Get Port Speed Command (GPSC), driver should not proceed with telling FW about the speed of the remote port.
--- drivers/scsi/qla2xxx/qla_gs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/qla2xxx/qla_gs.c +2 -2
@@ -3277,7 +3277,7 @@ static void qla24xx_async_gpsc_sp_done(void *s, int res)ql_dbg (ql_dbg_disc, vha,0x2019 ,"GPSC command unsupported, disabling query.\n" ); ha->flags.gpsc_supported =0 ; - res =QLA_SUCCESS ; + goto done; } }else {switch (be16_to_cpu (ct_rsp->rsp.gpsc.speed)) {
@@ -3310,7 +3310,6 @@ static void qla24xx_async_gpsc_sp_done(void *s, int res)be16_to_cpu (ct_rsp->rsp.gpsc.speeds), be16_to_cpu(ct_rsp->rsp.gpsc.speed)); } -done:memset (&ea,0 ,sizeof (ea)); ea.event =FCME_GPSC_DONE ; ea.rc = res;
@@ -3318,6 +3317,7 @@ done: ea.sp = sp;qla2x00_fcport_event_handler (vha, &ea); +done: sp->free (sp); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 170/422 scsi: qla2xxx: Defer chip reset until target mode is enabled
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
[ Upstream commit 93eca6135183f7a71e36acd47655a085ed11bcdc ]
For target mode, any chip reset triggered before target mode is enabled will be held off until user is ready to enable. This prevents the chip from starting or running before it is intended.
--- drivers/scsi/qla2xxx/qla_os.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-)
drivers/scsi/qla2xxx/qla_os.c +21 -7
@@ -6059,12 +6059,27 @@ qla2x00_do_dpc(void *data)if (test_and_clear_bit (ISP_ABORT_NEEDED , &base_vha->dpc_flags) && !test_bit (UNLOADING , &base_vha->dpc_flags)) { +bool do_reset = true; + +switch (ql2x_ini_mode) { +case QLA2XXX_INI_MODE_ENABLED : +break ; +case QLA2XXX_INI_MODE_DISABLED : +if (!qla_tgt_mode_enabled (base_vha)) + do_reset = false; +break ; +case QLA2XXX_INI_MODE_DUAL : +if (!qla_dual_mode_enabled (base_vha)) + do_reset = false; +break ; +default : +break ; + } -ql_dbg (ql_dbg_dpc, base_vha,0x4007 , -"ISP abort scheduled.\n" ); -if (!(test_and_set_bit (ABORT_ISP_ACTIVE , +if (do_reset && !(test_and_set_bit (ABORT_ISP_ACTIVE , &base_vha->dpc_flags))) { - +ql_dbg (ql_dbg_dpc, base_vha,0x4007 , +"ISP abort scheduled.\n" );if (ha->isp_ops->abort_isp (base_vha)) {/* failed. retry later */ set_bit(ISP_ABORT_NEEDED,
@@ -6072,10 +6087,9 @@ qla2x00_do_dpc(void *data) }clear_bit (ABORT_ISP_ACTIVE , &base_vha->dpc_flags); +ql_dbg (ql_dbg_dpc, base_vha,0x4008 , +"ISP abort end.\n" ); } - -ql_dbg (ql_dbg_dpc, base_vha,0x4008 , -"ISP abort end.\n" ); } if (test_and_clear_bit(FCPORT_UPDATE_NEEDED,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 171/422 scsi: qla2xxx: Terminate Plogi/PRLI if WWN is 0
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
[ Upstream commit aa9e6d7b9643fc50a88c7b7aa1e34be8dc032749 ]
When driver receive PLOGI/PRLI from FW, the WWPN value will be provided. If it is not, then driver will terminate it. The WWPN allows driver to locate the session or create a new session.
--- drivers/scsi/qla2xxx/qla_target.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/scsi/qla2xxx/qla_target.c +6 -0
@@ -4703,6 +4703,12 @@ static int qlt_handle_login(struct scsi_qla_host *vha, sess =qlt_find_sess_invalidate_other (vha, wwn, port_id, loop_id, &conflict_sess);spin_unlock_irqrestore (&vha->hw->tgt.sess_lock, flags); + }else { +ql_dbg (ql_dbg_disc, vha,0xffff , +"%s %d Term INOT due to WWN=0 lid=%d, NportID %06X " , + __func__, __LINE__, loop_id, port_id.b24); +qlt_send_term_imm_notif (vha, iocb,1 ); + goto out; }if (IS_SW_RESV_ADDR (port_id)) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 172/422 scsi: qla2xxx: Fix deadlock between ATIO and HW lock
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
[ Upstream commit 1073daa470d906f1853ed4b828f16e2350a5875c ]
Move ATIO queue processing out of hardware_lock to prevent deadlock.
--- drivers/scsi/qla2xxx/qla_init.c | 17 +++--------- drivers/scsi/qla2xxx/qla_isr.c | 48 +++++++++++++++------------------ 2 files changed, 26 insertions(+), 39 deletions(-)
drivers/scsi/qla2xxx/qla_init.c +4 -13
@@ -4869,19 +4869,10 @@ qla2x00_configure_loop(scsi_qla_host_t *vha)*/ if (qla_tgt_mode_enabled (vha) ||qla_dual_mode_enabled (vha)) { -if (IS_QLA27XX (ha) ||IS_QLA83XX (ha)) { -spin_lock_irqsave (&ha->tgt.atio_lock, - flags); -qlt_24xx_process_atio_queue (vha,0 ); -spin_unlock_irqrestore ( - &ha->tgt.atio_lock, flags); - }else { -spin_lock_irqsave (&ha->hardware_lock, - flags); -qlt_24xx_process_atio_queue (vha,1 ); -spin_unlock_irqrestore ( - &ha->hardware_lock, flags); - } +spin_lock_irqsave (&ha->tgt.atio_lock, flags); +qlt_24xx_process_atio_queue (vha,0 ); +spin_unlock_irqrestore (&ha->tgt.atio_lock, + flags); } } }
drivers/scsi/qla2xxx/qla_isr.c +22 -26
90 lines not on this page · raw message
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 173/422 scsi: qla2xxx: Increase abort timeout value
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
[ Upstream commit 8bccfe0d21b5adbba6ec4fe1776160b80d09f78a ]
Abort IOCB request can take up to 40s or 2 ABTS timeout. We will wait for ABTS response for 20s. On a timeout, second ABTS can go out with another 20s timeout. On 2nd ABTS timeout FW will automatically do Logout.
--- drivers/scsi/qla2xxx/qla_init.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_init.c +2 -1
@@ -1789,7 +1789,8 @@ qla24xx_async_abort_cmd(srb_t *cmd_sp, bool wait) abt_iocb->timeout = qla24xx_abort_iocb_timeout;init_completion (&abt_iocb->u.abt.comp); -qla2x00_init_timer (sp,qla2x00_get_async_timeout (vha)); +/* FW can send 2 x ABTS's timeout/20s */ +qla2x00_init_timer (sp,42 ); abt_iocb->u.abt.cmd_hndl = cmd_sp->handle; abt_iocb->u.abt.req_que_no =cpu_to_le16 (cmd_sp->qpair->req->id);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 174/422 scsi: qla2xxx: Check for Register disconnect
In reply to Greg Kroah-HartmanFrom: Sawan Chandak <[email protected]>
[ Upstream commit f99c5d294b3653e6ae563eaac5db5b4138afe31c ]
During adapter shutdown process check for register disconnect before proceeding to call PCI functions.
--- drivers/scsi/qla2xxx/qla_os.c | 1 + 1 file changed, 1 insertion(+)
drivers/scsi/qla2xxx/qla_os.c +1 -0
@@ -1744,6 +1744,7 @@ __qla2x00_abort_all_cmds(struct qla_qpair *qp, int res) !ha->flags.eeh_busy && (!test_bit (ABORT_ISP_ACTIVE , &vha->dpc_flags)) && + !qla2x00_isp_reg_stat (ha) && (sp->type == SRB_SCSI_CMD)) {/* * Don't abort commands in
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 175/422 scsi: qla2xxx: Fix port speed display on chip reset
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
[ Upstream commit 5d74c87a20adcc77b19753c315ad9c320b2288be ]
Clear port speed value on chip reset.
--- drivers/scsi/qla2xxx/qla_init.c | 1 + 1 file changed, 1 insertion(+)
drivers/scsi/qla2xxx/qla_init.c +1 -0
@@ -6502,6 +6502,7 @@ qla2x00_abort_isp_cleanup(scsi_qla_host_t *vha)if (!(IS_P3P_TYPE (ha))) ha->isp_ops->reset_chip (vha); + ha->link_data_rate =PORT_SPEED_UNKNOWN ;SAVE_TOPO (ha); ha->flags.rida_fmt2 =0 ; ha->flags.n2n_ae =0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 176/422 scsi: qla2xxx: Fix dropped srb resource.
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
[ Upstream commit 527b8ae3948bb59c13ebaa7d657ced56ea25ab05 ]
When FW rejects a command due to "entry_status" error (malform IOCB), the srb resource needs to be returned back for cleanup. The filter to catch this is in the wrong location.
--- drivers/scsi/qla2xxx/qla_isr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_isr.c +1 -1
@@ -2837,6 +2837,7 @@ qla2x00_error_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, sts_entry_t *pkt)case ELS_IOCB_TYPE :case ABORT_IOCB_TYPE :case MBX_IOCB_TYPE : +default : sp =qla2x00_get_sp_from_handle (vha, func, req, pkt);if (sp) { sp->done (sp, res);
@@ -2847,7 +2848,6 @@ qla2x00_error_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, sts_entry_t *pkt)case ABTS_RESP_24XX :case CTIO_TYPE7 :case CTIO_CRC2 : -default :return 1 ; } fatal:
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 177/422 scsi: qla2xxx: Fix duplicate switchs Nport ID entries
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
[ Upstream commit f3a03ee1102a44ccbd2c5de80a6e862ba23e9b55 ]
Current code relies on switch to provide a unique combination of WWPN + NPORTID to tract an FC port. This patch tries to detect a case where switch data base can get corrupted where multiple WWPNs can have the same Nport ID. The 1st Nport ID on the list will be kept while the duplicate Nport ID will be discarded.
--- drivers/scsi/qla2xxx/qla_gs.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_gs.c +23 -1
@@ -3902,9 +3902,10 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp)fc_port_t *fcport;u32 i, rc;bool found; -struct fab_scan_rp *rp; +struct fab_scan_rp *rp, *trp;unsigned long flags;u8 recheck =0 ; +u16 dup =0 , dup_cnt =0 ;ql_dbg (ql_dbg_disc, vha,0xffff ,"%s enter\n" , __func__);
@@ -3935,6 +3936,7 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp)for (i =0 ; i < vha->hw->max_fibre_devices; i++) {u64 wwn; +int k; rp = &vha->scan.l[i]; found = false;
@@ -3943,6 +3945,20 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp)if (wwn ==0 )continue ; +/* Remove duplicate NPORT ID entries from switch data base */ +for (k = i +1 ; k < vha->hw->max_fibre_devices; k++) { + trp = &vha->scan.l[k]; +if (rp->id.b24 == trp->id.b24) { + dup =1 ; + dup_cnt++; +ql_dbg (ql_dbg_disc + ql_dbg_verbose, + vha,0xffff , +"Detected duplicate NPORT ID from switch data base: ID %06x WWN %8phN WWN %8phN\n" , + rp->id.b24, rp->port_name, trp->port_name); +memset (trp,0 ,sizeof (*trp)); + } + } +if (!memcmp (rp->port_name, vha->port_name,WWN_SIZE ))continue ;
@@ -3982,6 +3998,12 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp) } } +if (dup) { +ql_log (ql_log_warn, vha,0xffff , +"Detected %d duplicate NPORT ID(s) from switch data base\n" , + dup_cnt); + } +/* * Logout all previous fabric dev marked lost, except FCP2 devices. */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 178/422 scsi: lpfc: Fix GFT_ID and PRLI logic for RSCN
In reply to Greg Kroah-HartmanFrom: James Smart <[email protected]>
[ Upstream commit 01a8aed6a009625282b6265880f6b20cbd7a9c70 ]
Driver only sends NVME PRLI to a device that also supports FCP. This resuls in remote ports that don't have fc_remote_ports created for them. The driver is clearing the nlp_fc4_type for a ndlp at the wrong time.
Fix by moving the nlp_fc4_type clearing to the discovery engine in the DEVICE_RECOVERY state. Also ensure that rport registration is done for all nlp_fc4_types.
--- drivers/scsi/lpfc/lpfc_ct.c | 5 ----- drivers/scsi/lpfc/lpfc_hbadisc.c | 2 +- drivers/scsi/lpfc/lpfc_nportdisc.c | 3 +++ 3 files changed, 4 insertions(+), 6 deletions(-)
drivers/scsi/lpfc/lpfc_ct.c +0 -5
@@ -471,11 +471,6 @@ lpfc_prep_node_fc4type(struct lpfc_vport *vport, uint32_t Did, uint8_t fc4_type)"Parse GID_FTrsp: did:x%x flg:x%x x%x" , Did, ndlp->nlp_flag, vport->fc_flag); -/* Don't assume the rport is always the previous -* FC4 type. -*/ - ndlp->nlp_fc4_type &= ~(NLP_FC4_FCP |NLP_FC4_NVME ); -/* By default, the driver expects to support FCP FC4 */ if (fc4_type ==FC_TYPE_FCP ) ndlp->nlp_fc4_type |=NLP_FC4_FCP ;
drivers/scsi/lpfc/lpfc_hbadisc.c +1 -1
@@ -4198,7 +4198,7 @@ lpfc_nlp_state_cleanup(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,if (new_state ==NLP_STE_MAPPED_NODE || new_state ==NLP_STE_UNMAPPED_NODE ) { -if (ndlp->nlp_fc4_type &NLP_FC4_FCP || +if (ndlp->nlp_fc4_type || ndlp->nlp_DID == Fabric_DID || ndlp->nlp_DID == NameServer_DID || ndlp->nlp_DID ==FDMI_DID ) {
drivers/scsi/lpfc/lpfc_nportdisc.c +3 -0
@@ -2323,6 +2323,7 @@ lpfc_device_recov_unmap_node(struct lpfc_vport *vport,lpfc_nlp_set_state (vport, ndlp,NLP_STE_NPR_NODE );spin_lock_irq (shost->host_lock); ndlp->nlp_flag &= ~(NLP_NODEV_REMOVE |NLP_NPR_2B_DISC ); + ndlp->nlp_fc4_type &= ~(NLP_FC4_FCP |NLP_FC4_NVME );spin_unlock_irq (shost->host_lock);lpfc_disc_set_adisc (vport, ndlp);
@@ -2400,6 +2401,7 @@ lpfc_device_recov_mapped_node(struct lpfc_vport *vport,lpfc_nlp_set_state (vport, ndlp,NLP_STE_NPR_NODE );spin_lock_irq (shost->host_lock); ndlp->nlp_flag &= ~(NLP_NODEV_REMOVE |NLP_NPR_2B_DISC ); + ndlp->nlp_fc4_type &= ~(NLP_FC4_FCP |NLP_FC4_NVME );spin_unlock_irq (shost->host_lock);lpfc_disc_set_adisc (vport, ndlp);return ndlp->nlp_state;
@@ -2657,6 +2659,7 @@ lpfc_device_recov_npr_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,lpfc_cancel_retry_delay_tmo (vport, ndlp);spin_lock_irq (shost->host_lock); ndlp->nlp_flag &= ~(NLP_NODEV_REMOVE |NLP_NPR_2B_DISC ); + ndlp->nlp_fc4_type &= ~(NLP_FC4_FCP |NLP_FC4_NVME );spin_unlock_irq (shost->host_lock);return ndlp->nlp_state; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 179/422 scsi: lpfc: Correct invalid EQ doorbell write on if_type=6
In reply to Greg Kroah-HartmanFrom: James Smart <[email protected]>
[ Upstream commit aad59d5d34738d6fd8c359df8048a84cd443e504 ]
During attachment, the driver writes the EQ doorbell to disable potential interrupts from an EQ. The current EQ doorbell format used for clearing the interrupt is incorrect and uses an if_type=2 format, making the operation act on the wrong EQ.
Correct the code to use the proper if_type=6 EQ doorbell format.
--- drivers/scsi/lpfc/lpfc_sli.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/scsi/lpfc/lpfc_sli.c +1 -5
@@ -392,11 +392,7 @@ lpfc_sli4_if6_eq_clr_intr(struct lpfc_queue *q)struct lpfc_register doorbell; doorbell.word0 =0 ; -bf_set (lpfc_eqcq_doorbell_eqci, &doorbell,1 ); -bf_set (lpfc_eqcq_doorbell_qt, &doorbell,LPFC_QUEUE_TYPE_EVENT ); -bf_set (lpfc_eqcq_doorbell_eqid_hi, &doorbell, - (q->queue_id >>LPFC_EQID_HI_FIELD_SHIFT )); -bf_set (lpfc_eqcq_doorbell_eqid_lo, &doorbell, q->queue_id); +bf_set (lpfc_if6_eq_doorbell_eqid, &doorbell, q->queue_id);writel (doorbell.word0, q->phba->sli4_hba.EQDBregaddr); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 180/422 scsi: lpfc: Fix errors in log messages.
In reply to Greg Kroah-HartmanFrom: James Smart <[email protected]>
[ Upstream commit 2879265f514b1f4154288243c91438ddbedb3ed4 ]
Message 6408 is displayed for each entry in an array, but the cpu and queue numbers were incorrect for the entry. Message 6001 includes an extraneous character.
Resolve both issues
--- drivers/scsi/lpfc/lpfc_nvme.c | 2 +- drivers/scsi/lpfc/lpfc_nvmet.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-)
drivers/scsi/lpfc/lpfc_nvme.c +1 -1
@@ -282,7 +282,7 @@ lpfc_nvme_delete_queue(struct nvme_fc_local_port *pnvme_lport, vport = lport->vport;lpfc_printf_vlog (vport,KERN_INFO ,LOG_NVME , -"6001 ENTER. lpfc_pnvme %p, qidx x%xi qhandle %p\n" , +"6001 ENTER. lpfc_pnvme %p, qidx x%x qhandle %p\n" , lport, qidx, handle);kfree (handle); }
drivers/scsi/lpfc/lpfc_nvmet.c +3 -4
@@ -1340,15 +1340,14 @@ lpfc_nvmet_setup_io_context(struct lpfc_hba *phba) idx =0 ; } - infop = phba->sli4_hba.nvmet_ctx_info; -for (j =0 ; j < phba->cfg_nvmet_mrq; j++) { -for (i =0 ; i < phba->sli4_hba.num_present_cpu; i++) { +for (i =0 ; i < phba->sli4_hba.num_present_cpu; i++) { +for (j =0 ; j < phba->cfg_nvmet_mrq; j++) { + infop =lpfc_get_ctx_list (phba, i, j);lpfc_printf_log (phba,KERN_INFO ,LOG_NVME |LOG_INIT ,"6408 TOTAL NVMET ctx for CPU %d " "MRQ %d: cnt %d nextcpu %p\n" , i, j, infop->nvmet_ctx_list_cnt, infop->nvmet_ctx_next_cpu); - infop++; } }return 0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 181/422 scsi: sym53c8xx: fix NULL pointer dereference panic in sym_int_sir()
In reply to Greg Kroah-HartmanFrom: George Kennedy <[email protected]>
[ Upstream commit 288315e95264b6355e26609e9dec5dc4563d4ab0 ]
sym_int_sir() in sym_hipd.c does not check the command pointer for NULL before using it in debug message prints.
--- drivers/scsi/sym53c8xx_2/sym_hipd.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/scsi/sym53c8xx_2/sym_hipd.c +11 -4
@@ -4370,6 +4370,13 @@ static void sym_nego_rejected(struct sym_hcb *np, struct sym_tcb *tp, struct symOUTB (np,HS_PRT ,HS_BUSY ); } +#define sym_printk(lvl, tp, cp, fmt, v...) do { \ + if (cp) \ + scmd_printk(lvl, cp->cmd, fmt, ##v); \ + else \ + starget_printk(lvl, tp->starget, fmt, ##v); \ +} while (0) +/* * chip exception handler for programmed interrupts. */
@@ -4415,7 +4422,7 @@ static void sym_int_sir(struct sym_hcb *np)* been selected with ATN. We do not want to handle that. */ case SIR_SEL_ATN_NO_MSG_OUT : -scmd_printk (KERN_WARNING , cp->cmd, +sym_printk (KERN_WARNING , tp, cp,"No MSG OUT phase after selection with ATN\n" ); goto out_stuck;/*
@@ -4423,7 +4430,7 @@ static void sym_int_sir(struct sym_hcb *np)* having reselected the initiator. */ case SIR_RESEL_NO_MSG_IN : -scmd_printk (KERN_WARNING , cp->cmd, +sym_printk (KERN_WARNING , tp, cp,"No MSG IN phase after reselection\n" ); goto out_stuck;/*
@@ -4431,7 +4438,7 @@ static void sym_int_sir(struct sym_hcb *np)* an IDENTIFY. */ case SIR_RESEL_NO_IDENTIFY : -scmd_printk (KERN_WARNING , cp->cmd, +sym_printk (KERN_WARNING , tp, cp,"No IDENTIFY after reselection\n" ); goto out_stuck;/*
@@ -4460,7 +4467,7 @@ static void sym_int_sir(struct sym_hcb *np)case SIR_RESEL_ABORTED : np->lastmsg = np->msgout[0 ]; np->msgout[0 ] =M_NOOP ; -scmd_printk (KERN_WARNING , cp->cmd, +sym_printk (KERN_WARNING , tp, cp,"message %x sent on bad reselection\n" , np->lastmsg); goto out;/*
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 182/422 ARM: imx6: register pm_power_off handler if "fsl,pmic-stby-poweroff" is set
In reply to Greg Kroah-HartmanFrom: Oleksij Rempel <[email protected]>
[ Upstream commit 8148d2136002da2e2887caf6a07bbd9c033f14f3 ]
One of the Freescale recommended sequences for power off with external PMIC is the following:
...
3. SoC is programming PMIC for power off when standby is asserted.
4. In CCM STOP mode, Standby is asserted, PMIC gates SoC supplies.
See:
http://www.nxp.com/assets/documents/data/en/reference-manuals/IMX6DQRM.pdf
page 5083
This patch implements step 4. of this sequence.
--- arch/arm/mach-imx/pm-imx6.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
arch/arm/mach-imx/pm-imx6.c +25 -0
@@ -618,6 +618,28 @@ static void __init imx6_pm_common_init(const struct imx6_pm_socdata IMX6Q_GPR1_GINT); } +static void imx6_pm_stby_poweroff (void ) +{ +imx6_set_lpm (STOP_POWER_OFF ); +imx6q_suspend_finish (0 ); + +mdelay (1000 ); + +pr_emerg ("Unable to poweroff system\n" ); +} + +static int imx6_pm_stby_poweroff_probe (void ) +{ +if (pm_power_off) { +pr_warn ("%s: pm_power_off already claimed %p %pf!\n" , + __func__, pm_power_off, pm_power_off); +return -EBUSY ; + } + + pm_power_off = imx6_pm_stby_poweroff; +return 0 ; +} +void __init imx6_pm_ccm_init (const char *ccm_compat) {struct device_node *np;
@@ -634,6 +656,9 @@ void __init imx6_pm_ccm_init(const char *ccm_compat) val =readl_relaxed (ccm_base +CLPCR ); val &= ~BM_CLPCR_LPM ;writel_relaxed (val, ccm_base +CLPCR ); + +if (of_property_read_bool (np,"fsl,pmic-stby-poweroff" )) +imx6_pm_stby_poweroff_probe (); }void __init imx6q_pm_init (void )
Signature · 1 line
2.20.1
Re: [PATCH 4.19 182/422] ARM: imx6: register pm_power_off handler if "fsl,pmic-stby-poweroff" is set
Hi!
Quoted 17 lines
From: Oleksij Rempel <[email protected]>
[ Upstream commit
8148d2136002da2e2887caf6a07bbd9c033f14f3]One of the Freescale recommended sequences for power off with external PMIC is the following:
...
3. SoC is programming PMIC for power off when standby is asserted.
4. In CCM STOP mode, Standby is asserted, PMIC gates SoC supplies.See:
http://www.nxp.com/assets/documents/data/en/reference-manuals/IMX6DQRM.pdf
page 5083This patch implements step 4. of this sequence.
arch/arm/mach-imx/pm-imx6.c void __init imx6_pm_ccm_init(const char *ccm_compat) · line 662
Quoted 3 lines
arch/arm/mach-imx/pm-imx6.c +2
-0+if (of_property_read_bool (np,"fsl,pmic-stby-poweroff" )) +imx6_pm_stby_poweroff_probe (); }
This is only active when fsl,pmic-stby-poweroff is present somewhere in the tree, and that is not the case for 4.19-stable AFAICT. Is it still good idea to have it stable branch?
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Greg Kroah-Hartman
maintainerPATCH 183/422 scsi: pm80xx: Corrected dma_unmap_sg() parameter
In reply to Greg Kroah-HartmanFrom: Deepak Ukey <[email protected]>
[ Upstream commit 76cb25b058034d37244be6aca97a2ad52a5fbcad ]
For the function dma_unmap_sg(), the <nents> parameter should be number of elements in the scatter list prior to the mapping, not after the mapping.
--- drivers/scsi/pm8001/pm8001_sas.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/pm8001/pm8001_sas.c +1 -1
@@ -466,7 +466,7 @@ err_out:dev_printk (KERN_ERR , pm8001_ha->dev,"pm8001 exec failed[%d]!\n" , rc);if (!sas_protocol_ata (t->task_proto))if (n_elem) -dma_unmap_sg (pm8001_ha->dev, t->scatter, n_elem, +dma_unmap_sg (pm8001_ha->dev, t->scatter, t->num_scatter, t->data_dir); out_done:spin_unlock_irqrestore (&pm8001_ha->lock, flags);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 184/422 scsi: pm80xx: Fixed system hang issue during kexec boot
In reply to Greg Kroah-HartmanFrom: Deepak Ukey <[email protected]>
[ Upstream commit 72349b62a571effd6faadd0600b8e657dd87afbf ]
When the firmware is not responding, execution of kexec boot causes a system hang. When firmware assertion happened, driver get notified with interrupt vector updated in MPI configuration table. Then, the driver will read scratchpad register and set controller_fatal_error flag to true.
--- drivers/scsi/pm8001/pm8001_hwi.c | 6 +++ drivers/scsi/pm8001/pm8001_sas.c | 7 +++ drivers/scsi/pm8001/pm8001_sas.h | 1 + drivers/scsi/pm8001/pm80xx_hwi.c | 80 +++++++++++++++++++++++++++++--- drivers/scsi/pm8001/pm80xx_hwi.h | 3 ++ 5 files changed, 91 insertions(+), 6 deletions(-)
drivers/scsi/pm8001/pm8001_hwi.c +6 -0
@@ -1479,6 +1479,12 @@ u32 pm8001_mpi_msg_consume(struct pm8001_hba_info *pm8001_ha, }else {u32 producer_index;void *pi_virt = circularQ->pi_virt; +/* spurious interrupt during setup if +* kexec-ing and driver doing a doorbell access +* with the pre-kexec oq interrupt setup +*/ +if (!pi_virt) +break ;/* Update the producer index from SPC */ producer_index =pm8001_read_32 (pi_virt); circularQ->producer_index =cpu_to_le32 (producer_index);
drivers/scsi/pm8001/pm8001_sas.c +7 -0
@@ -374,6 +374,13 @@ static int pm8001_task_exec(struct sas_task *task,return 0 ; } pm8001_ha =pm8001_find_ha_by_dev (task->dev); +if (pm8001_ha->controller_fatal_error) { +struct task_status_struct *ts = &t->task_status; + + ts->resp =SAS_TASK_UNDELIVERED ; + t->task_done (t); +return 0 ; + }PM8001_IO_DBG (pm8001_ha,pm8001_printk ("pm8001_task_exec device \n " ));spin_lock_irqsave (&pm8001_ha->lock, flags); do {
drivers/scsi/pm8001/pm8001_sas.h +1 -0
@@ -538,6 +538,7 @@ struct pm8001_hba_info {u32 logging_level;u32 fw_status;u32 smp_exp_mode; +bool controller_fatal_error;const struct firmware *fw_image;struct isr_param irq_vector[PM8001_MAX_MSIX_VEC ];u32 reset_in_progress;
drivers/scsi/pm8001/pm80xx_hwi.c +74 -6
115 lines not on this page · raw message
drivers/scsi/pm8001/pm80xx_hwi.h +3 -0
@@ -1384,6 +1384,9 @@ typedef struct SASProtocolTimerConfig SASProtocolTimerConfig_t;#define SCRATCH_PAD_BOOT_LOAD_SUCCESS 0x0#define SCRATCH_PAD_IOP0_READY 0xC00#define SCRATCH_PAD_IOP1_READY 0x3000 +#define SCRATCH_PAD_MIPSALL_READY (SCRATCH_PAD_IOP1_READY | \ + SCRATCH_PAD_IOP0_READY | \ + SCRATCH_PAD_RAAE_READY)/* boot loader state */ #define SCRATCH_PAD1_BOOTSTATE_MASK 0x70/* Bit 4-6 */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 185/422 kprobes: Dont call BUG_ON() if there is a kprobe in use on free list
In reply to Greg Kroah-HartmanFrom: Masami Hiramatsu <[email protected]>
[ Upstream commit cbdd96f5586151e48317d90a403941ec23f12660 ]
Instead of calling BUG_ON(), if we find a kprobe in use on free kprobe list, just remove it from the list and keep it on kprobe hash list as same as other in-use kprobes.
--- kernel/kprobes.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
kernel/kprobes.c +7 -1
@@ -544,8 +544,14 @@ static void do_free_cleaned_kprobes(void)struct optimized_kprobe *op, *tmp;list_for_each_entry_safe (op, tmp, &freeing_list, list) { -BUG_ON (!kprobe_unused (&op->kp));list_del_init (&op->list); +if (WARN_ON_ONCE (!kprobe_unused (&op->kp))) { +/* +* This must not happen, but if there is a kprobe +* still in use, keep it on kprobes hash list. +*/ +continue ; + }free_aggr_kprobe (&op->kp); } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 186/422 net: aquantia: fix hw_atl_utils_fw_upload_dwords
In reply to Greg Kroah-HartmanFrom: Yana Esina <[email protected]>
[ Upstream commit 3ee5c8873fd369e2005dc93bf6d4b299b4976e68 ]
This patch fixes the upload function, which worked incorrectly with some chips.
--- .../aquantia/atlantic/hw_atl/hw_atl_llh.c | 8 +++++ .../aquantia/atlantic/hw_atl/hw_atl_llh.h | 3 ++ .../atlantic/hw_atl/hw_atl_llh_internal.h | 13 +++++++ .../aquantia/atlantic/hw_atl/hw_atl_utils.c | 36 +++++++++++++------ .../aquantia/atlantic/hw_atl/hw_atl_utils.h | 5 +++ .../atlantic/hw_atl/hw_atl_utils_fw2x.c | 5 +++ 6 files changed, 59 insertions(+), 11 deletions(-)
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c +8 -0
@@ -1468,3 +1468,11 @@ void hw_atl_reg_glb_cpu_scratch_scp_set(struct aq_hw_s *aq_hw,aq_hw_write_reg (aq_hw,HW_ATL_GLB_CPU_SCRATCH_SCP_ADR (scratch_scp), glb_cpu_scratch_scp); } + +void hw_atl_mcp_up_force_intr_set (struct aq_hw_s *aq_hw,u32 up_force_intr) +{ +aq_hw_write_reg_bit (aq_hw,HW_ATL_MCP_UP_FORCE_INTERRUPT_ADR , +HW_ATL_MCP_UP_FORCE_INTERRUPT_MSK , +HW_ATL_MCP_UP_FORCE_INTERRUPT_SHIFT , + up_force_intr); +}
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h +3 -0
@@ -701,4 +701,7 @@ void hw_atl_msm_reg_wr_strobe_set(struct aq_hw_s *aq_hw, u32 reg_wr_strobe);/* set pci register reset disable */ void hw_atl_pci_pci_reg_res_dis_set (struct aq_hw_s *aq_hw,u32 pci_reg_res_dis); +/* set uP Force Interrupt */ +void hw_atl_mcp_up_force_intr_set (struct aq_hw_s *aq_hw,u32 up_force_intr); +#endif /* HW_ATL_LLH_H */
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh_internal.h +13 -0
@@ -2405,4 +2405,17 @@#define HW_ATL_GLB_CPU_SCRATCH_SCP_ADR (scratch_scp) \ (0x00000300u + (scratch_scp) * 0x4) +/* register address for bitfield uP Force Interrupt */ +#define HW_ATL_MCP_UP_FORCE_INTERRUPT_ADR 0x00000404 +/* bitmask for bitfield uP Force Interrupt */ +#define HW_ATL_MCP_UP_FORCE_INTERRUPT_MSK 0x00000002 +/* inverted bitmask for bitfield uP Force Interrupt */ +#define HW_ATL_MCP_UP_FORCE_INTERRUPT_MSKN 0xFFFFFFFD +/* lower bit position of bitfield uP Force Interrupt */ +#define HW_ATL_MCP_UP_FORCE_INTERRUPT_SHIFT 1 +/* width of bitfield uP Force Interrupt */ +#define HW_ATL_MCP_UP_FORCE_INTERRUPT_WIDTH 1 +/* default value of bitfield uP Force Interrupt */ +#define HW_ATL_MCP_UP_FORCE_INTERRUPT_DEFAULT 0x0 +#endif /* HW_ATL_LLH_INTERNAL_H */
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c +25 -11
@@ -327,17 +327,31 @@ static int hw_atl_utils_fw_upload_dwords(struct aq_hw_s *self, u32 a, u32 *p, err = -ETIME ; goto err_exit; } +if (IS_CHIP_FEATURE (REVISION_B1 )) { +u32 offset =0 ; + +for (; offset < cnt; ++offset) { +aq_hw_write_reg (self,0x328 , p[offset]); +aq_hw_write_reg (self,0x32C , + (0x80000000 | (0xFFFF & (offset *4 )))); +hw_atl_mcp_up_force_intr_set (self,1 ); +/* 1000 times by 10us = 10ms */ +AQ_HW_WAIT_FOR ((aq_hw_read_reg (self, +0x32C ) &0xF0000000 ) != +0x80000000 , +10 ,1000 ); + } + }else { +u32 offset =0 ; -aq_hw_write_reg (self,0x00000208U , a); - -for (++cnt; --cnt;) { -u32 i =0U ; +aq_hw_write_reg (self,0x208 , a); -aq_hw_write_reg (self,0x0000020CU , *(p++)); -aq_hw_write_reg (self,0x00000200U ,0xC000U ); +for (; offset < cnt; ++offset) { +aq_hw_write_reg (self,0x20C , p[offset]); +aq_hw_write_reg (self,0x200 ,0xC000 ); -for (i =1024U ; - (0x100U &aq_hw_read_reg (self,0x00000200U )) && --i;) { +AQ_HW_WAIT_FOR ((aq_hw_read_reg (self,0x200U ) & +0x100 ) ==0 ,10 ,1000 ); } }
@@ -401,7 +415,7 @@ struct aq_hw_atl_utils_fw_rpc_tid_s {#define hw_atl_utils_fw_rpc_init (_H_) hw_atl_utils_fw_rpc_wait(_H_, NULL) -static int hw_atl_utils_fw_rpc_call (struct aq_hw_s *self,unsigned int rpc_size) +int hw_atl_utils_fw_rpc_call (struct aq_hw_s *self,unsigned int rpc_size) {int err =0 ;struct aq_hw_atl_utils_fw_rpc_tid_s sw;
@@ -425,8 +439,8 @@ err_exit:return err; } -static int hw_atl_utils_fw_rpc_wait (struct aq_hw_s *self, -struct hw_aq_atl_utils_fw_rpc **rpc) +int hw_atl_utils_fw_rpc_wait (struct aq_hw_s *self, +struct hw_aq_atl_utils_fw_rpc **rpc) {int err =0 ;struct aq_hw_atl_utils_fw_rpc_tid_s sw;
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h +5 -0
@@ -319,6 +319,11 @@ struct aq_stats_s *hw_atl_utils_get_hw_stats(struct aq_hw_s *self);int hw_atl_utils_fw_downld_dwords (struct aq_hw_s *self,u32 a,u32 *p,u32 cnt); +int hw_atl_utils_fw_rpc_call (struct aq_hw_s *self,unsigned int rpc_size); + +int hw_atl_utils_fw_rpc_wait (struct aq_hw_s *self, +struct hw_aq_atl_utils_fw_rpc **rpc); +extern const struct aq_fw_ops aq_fw_1x_ops;extern const struct aq_fw_ops aq_fw_2x_ops;
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c +5 -0
@@ -21,6 +21,7 @@#define HW_ATL_FW2X_MPI_EFUSE_ADDR 0x364#define HW_ATL_FW2X_MPI_MBOX_ADDR 0x360 +#define HW_ATL_FW2X_MPI_RPC_ADDR 0x334#define HW_ATL_FW2X_MPI_CONTROL_ADDR 0x368#define HW_ATL_FW2X_MPI_CONTROL2_ADDR 0x36C
@@ -40,6 +41,10 @@ static int aq_fw2x_init(struct aq_hw_s *self)AQ_HW_WAIT_FOR (0U != (self->mbox_addr =aq_hw_read_reg (self,HW_ATL_FW2X_MPI_MBOX_ADDR )),1000U ,10U ); +AQ_HW_WAIT_FOR (0U != (self->rpc_addr = +aq_hw_read_reg (self,HW_ATL_FW2X_MPI_RPC_ADDR )), +1000U ,100U ); +return err; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 187/422 Drivers: hv: vmbus: Fix synic per-cpu context initialization
In reply to Greg Kroah-HartmanFrom: Michael Kelley <[email protected]>
[ Upstream commit f25a7ece08bdb1f2b3c4bbeae942682fc3a99dde ]
If hv_synic_alloc() errors out, the state of the per-cpu context for some CPUs is unknown since the zero'ing is done as each CPU is iterated over. In such case, hv_synic_cleanup() may try to free memory based on uninitialized values. Fix this by zero'ing the per-cpu context for all CPUs before doing any memory allocations that might fail.
--- drivers/hv/hv.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
drivers/hv/hv.c +12 -3
@@ -189,6 +189,17 @@ static void hv_init_clockevent_device(struct clock_event_device *dev, int cpu)int hv_synic_alloc (void ) {int cpu; +struct hv_per_cpu_context *hv_cpu; + +/* +* First, zero all per-cpu memory areas so hv_synic_free() can +* detect what memory has been allocated and cleanup properly +* after any failures. +*/ +for_each_present_cpu (cpu) { + hv_cpu =per_cpu_ptr (hv_context.cpu_context, cpu); +memset (hv_cpu,0 ,sizeof (*hv_cpu)); + } hv_context.hv_numa_map =kcalloc (nr_node_ids,sizeof (struct cpumask ),GFP_KERNEL );
@@ -198,10 +209,8 @@ int hv_synic_alloc(void) }for_each_present_cpu (cpu) { -struct hv_per_cpu_context *hv_cpu - =per_cpu_ptr (hv_context.cpu_context, cpu); + hv_cpu =per_cpu_ptr (hv_context.cpu_context, cpu); -memset (hv_cpu,0 ,sizeof (*hv_cpu));tasklet_init (&hv_cpu->msg_dpc, vmbus_on_msg_dpc, (unsigned long ) hv_cpu);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 188/422 nvmem: core: return error code instead of NULL from nvmem_device_get
In reply to Greg Kroah-HartmanFrom: Srinivas Kandagatla <[email protected]>
[ Upstream commit ca6ac25cecf0e740d7cc8e03e0ebbf8acbeca3df ]
nvmem_device_get() should return ERR_PTR() on error or valid pointer on success, but one of the code path seems to return NULL, so fix it.
--- drivers/nvmem/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvmem/core.c +1 -1
@@ -692,7 +692,7 @@ static struct nvmem_device *nvmem_find(const char *name) d =bus_find_device_by_name (&nvmem_bus_type,NULL , name);if (!d) -return NULL ; +return ERR_PTR (-ENOENT );return to_nvmem_device (d); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 189/422 media: dt-bindings: adv748x: Fix decimal unit addresses
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 27582f0ea97fe3e4a38beb98ab36cce4b6f029d5 ]
With recent dtc and W=1:
Warning (graph_port): video-receiver@70/port@10: graph node unit address error, expected "a" Warning (graph_port): video-receiver@70/port@11: graph node unit address error, expected "b"
Unit addresses are always hexadecimal (without prefix), while the bases of reg property values depend on their prefixes.
--- Documentation/devicetree/bindings/media/i2c/adv748x.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/media/i2c/adv748x.txt +2 -2
@@ -73,7 +73,7 @@ Example: }; }; - port@10 { + port@a { reg = <10>; adv7482_txa: endpoint {
@@ -83,7 +83,7 @@ Example: }; }; - port@11 { + port@b { reg = <11>; adv7482_txb: endpoint {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 190/422 ALSA: hda: Fix implicit definition of pci_iomap() on SH
In reply to Greg Kroah-HartmanFrom: Mark Brown <[email protected]>
[ Upstream commit d9b84a15892c02334ac8a5c28865ae54168d9b22 ]
Include asm/io.h directly so we've got a definition of pci_iomap(), the current set of includes do this implicitly on most architectures but not on SH.
--- sound/pci/hda/patch_ca0132.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_ca0132.c +1 -0
@@ -31,6 +31,7 @@#include <linux/types.h> #include <linux/io.h> #include <linux/pci.h> +#include <asm/io.h> #include <sound/core.h> #include "hda_codec.h" #include "hda_local.h"
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 191/422 media: fix: media: pci: meye: validate offset to avoid arbitrary access
In reply to Greg Kroah-HartmanFrom: Lao Wei <[email protected]>
[ Upstream commit eac7230fdb4672c2cb56f6a01a1744f562c01f80 ]
Motion eye video4linux driver for Sony Vaio PictureBook desn't validate user-controlled parameter 'vma->vm_pgoff', a malicious process might access all of kernel memory from user space by trying pass different arbitrary address.
Discussion: http://www.openwall.com/lists/oss-security/2018/07/06/1
--- drivers/media/pci/meye/meye.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/pci/meye/meye.c +1 -1
@@ -1460,7 +1460,7 @@ static int meye_mmap(struct file *file, struct vm_area_struct *vma)unsigned long page, pos;mutex_lock (&meye.lock); -if (size > gbuffers * gbufsize) { +if (size > gbuffers * gbufsize || offset > gbuffers * gbufsize - size) {mutex_unlock (&meye.lock);return -EINVAL ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 192/422 media: dvb: fix compat ioctl translation
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 1ccbeeb888ac33627d91f1ccf0b84ef3bcadef24 ]
The VIDEO_GET_EVENT and VIDEO_STILLPICTURE was added back in 2005 but it never worked because the command number is wrong.
Using the right command number means we have a better chance of them actually doing the right thing, though clearly nobody has ever tried it successfully.
I noticed these while auditing the remaining users of compat_time_t for y2038 bugs. This one is fine in that regard, it just never did anything.
--- fs/compat_ioctl.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
fs/compat_ioctl.c +6 -4
@@ -141,6 +141,7 @@ struct compat_video_event {unsigned int frame_rate; } u; }; +#define VIDEO_GET_EVENT32 _IOR('o', 28, struct compat_video_event)static int do_video_get_event (struct file *file,unsigned int cmd,struct compat_video_event __user *up)
@@ -152,7 +153,7 @@ static int do_video_get_event(struct file *file,if (kevent ==NULL )return -EFAULT ; - err =do_ioctl (file, cmd, (unsigned long )kevent); + err =do_ioctl (file,VIDEO_GET_EVENT , (unsigned long )kevent);if (!err) { err =convert_in_user (&kevent->type, &up->type); err |=convert_in_user (&kevent->timestamp, &up->timestamp);
@@ -171,6 +172,7 @@ struct compat_video_still_picture {compat_uptr_t iFrame;int32_t size; }; +#define VIDEO_STILLPICTURE32 _IOW('o', 30, struct compat_video_still_picture)static int do_video_stillpicture (struct file *file,unsigned int cmd,struct compat_video_still_picture __user *up)
@@ -193,7 +195,7 @@ static int do_video_stillpicture(struct file *file,if (err)return -EFAULT ; - err =do_ioctl (file, cmd, (unsigned long ) up_native); + err =do_ioctl (file,VIDEO_STILLPICTURE , (unsigned long ) up_native);return err; }
@@ -1302,9 +1304,9 @@ static long do_ioctl_trans(unsigned int cmd,return rtc_ioctl (file, cmd, argp);/* dvb */ -case VIDEO_GET_EVENT : +case VIDEO_GET_EVENT32 :return do_video_get_event (file, cmd, argp); -case VIDEO_STILLPICTURE : +case VIDEO_STILLPICTURE32 :return do_video_stillpicture (file, cmd, argp); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 193/422 net: bcmgenet: Fix speed selection for reverse MII
In reply to Greg Kroah-HartmanFrom: Andrew Lunn <[email protected]>
[ Upstream commit 00eb2243b933a496958f4ce1bcf59840fea8be16 ]
The phy supported speed is being used to determine if the MAC should be configured to 100 or 1G. The masking logic is broken. Instead, look at 1G supported speeds to enable 1G MAC support.
--- drivers/net/ethernet/broadcom/genet/bcmmii.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/net/ethernet/broadcom/genet/bcmmii.c +3 -4
@@ -226,11 +226,10 @@ int bcmgenet_mii_config(struct net_device *dev, bool init)* capabilities, use that knowledge to also configure the * Reverse MII interface correctly. */ -if ((dev->phydev->supported &PHY_BASIC_FEATURES ) == -PHY_BASIC_FEATURES ) - port_ctrl =PORT_MODE_EXT_RVMII_25 ; -else +if (dev->phydev->supported &PHY_1000BT_FEATURES ) port_ctrl =PORT_MODE_EXT_RVMII_50 ; +else + port_ctrl =PORT_MODE_EXT_RVMII_25 ;bcmgenet_sys_writel (priv, port_ctrl,SYS_PORT_CTRL );break ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 194/422 arm64: dts: meson: libretech: update board model
In reply to Greg Kroah-HartmanFrom: Jerome Brunet <[email protected]>
[ Upstream commit b7eb0e26cc4a212fde09144cd49d4103170d2b9e ]
There is actually several different libretech board with the CC suffix so the model name is not appropriate here. Update to something more specific
--- arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts +1 -1
@@ -13,7 +13,7 @@ / { compatible = "libretech,cc", "amlogic,s905x", "amlogic,meson-gxl"; - model = "Libre Technology CC"; + model = "Libre Computer Board AML-S905X-CC"; aliases { serial0 = &uart_AO;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 195/422 arm64: dts: meson-axg: use the proper compatible for ethmac
In reply to Greg Kroah-HartmanFrom: Neil Armstrong <[email protected]>
[ Upstream commit eaf8f57c0bf5451132932616ab62f9481adefb55 ]
Use the correct compatible for the AXG ethernet mac node.
--- arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/amlogic/meson-axg.dtsi +1 -1
@@ -458,7 +458,7 @@ }; ethmac: ethernet@ff3f0000 { - compatible = "amlogic,meson-gxbb-dwmac", "snps,dwmac"; + compatible = "amlogic,meson-axg-dwmac", "snps,dwmac"; reg = <0x0 0xff3f0000 0x0 0x10000 0x0 0xff634540 0x0 0x8>; interrupts = <GIC_SPI 8 IRQ_TYPE_EDGE_RISING>;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 196/422 ALSA: intel8x0m: Register irq handler after register initializations
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
[ Upstream commit 7064f376d4a10686f51c879401a569bb4babf9c6 ]
The interrupt handler has to be acquired after the other resource initialization when allocated with IRQF_SHARED. Otherwise it's triggered before the resource gets ready, and may lead to unpleasant behavior.
--- sound/pci/intel8x0m.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
sound/pci/intel8x0m.c +10 -10
@@ -1171,16 +1171,6 @@ static int snd_intel8x0m_create(struct snd_card *card, } port_inited: -if (request_irq (pci->irq, snd_intel8x0m_interrupt,IRQF_SHARED , -KBUILD_MODNAME , chip)) { -dev_err (card->dev,"unable to grab IRQ %d\n" , pci->irq); -snd_intel8x0m_free (chip); -return -EBUSY ; - } - chip->irq = pci->irq; -pci_set_master (pci); -synchronize_irq (chip->irq); -/* initialize offsets */ chip->bdbars_count =2 ; tbl = intel_regs;
@@ -1224,11 +1214,21 @@ static int snd_intel8x0m_create(struct snd_card *card, chip->int_sta_reg =ICH_REG_GLOB_STA ; chip->int_sta_mask = int_sta_masks; +pci_set_master (pci); +if ((err =snd_intel8x0m_chip_init (chip,1 )) <0 ) {snd_intel8x0m_free (chip);return err; } +if (request_irq (pci->irq, snd_intel8x0m_interrupt,IRQF_SHARED , +KBUILD_MODNAME , chip)) { +dev_err (card->dev,"unable to grab IRQ %d\n" , pci->irq); +snd_intel8x0m_free (chip); +return -EBUSY ; + } + chip->irq = pci->irq; +if ((err =snd_device_new (card,SNDRV_DEV_LOWLEVEL , chip, &ops)) <0 ) {snd_intel8x0m_free (chip);return err;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 197/422 arm64: dts: renesas: salvator-common: adv748x: Override secondary addresses
In reply to Greg Kroah-HartmanFrom: Kieran Bingham <[email protected]>
[ Upstream commit e3da41a6c28f9b61ea03df987f1c9ffffc8b8e60 ]
Ensure that the ADV748x device addresses do not conflict, and group them together (visually in i2cdetect)
--- arch/arm64/boot/dts/renesas/salvator-common.dtsi | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/renesas/salvator-common.dtsi +4 -1
@@ -420,7 +420,10 @@ video-receiver@70 { compatible = "adi,adv7482"; - reg = <0x70>; + reg = <0x70 0x71 0x72 0x73 0x74 0x75 + 0x60 0x61 0x62 0x63 0x64 0x65>; + reg-names = "main", "dpll", "cp", "hdmi", "edid", "repeater", + "infoframe", "cbus", "cec", "sdp", "txa", "txb" ; #address-cells = <1>; #size-cells = <0>;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 198/422 arm64: dts: renesas: r8a77965: Attach the SYS-DMAC to the IPMMU
In reply to Greg Kroah-HartmanFrom: Magnus Damm <[email protected]>
[ Upstream commit 4d76ad7d9de05506f1ee9a7b22416440468be090 ]
For R-Car M3-N hook up SYS-DMAC0, SYS-DMAC1 and SYS-DMAC2 to IPMMU-DS0 and IPMMU-DS1 in same way as for R-Car M3-W. This follows the R-Car Gen3 Rev.1.00 (April 2018) datasheet.
--- arch/arm64/boot/dts/renesas/r8a77965.dtsi | 24 +++++++++++++++++++++++ 1 file changed, 24 insertions(+)
arch/arm64/boot/dts/renesas/r8a77965.dtsi +24 -0
@@ -634,6 +634,14 @@ resets = <&cpg 219>; #dma-cells = <1>; dma-channels = <16>; + iommus = <&ipmmu_ds0 0>, <&ipmmu_ds0 1>, + <&ipmmu_ds0 2>, <&ipmmu_ds0 3>, + <&ipmmu_ds0 4>, <&ipmmu_ds0 5>, + <&ipmmu_ds0 6>, <&ipmmu_ds0 7>, + <&ipmmu_ds0 8>, <&ipmmu_ds0 9>, + <&ipmmu_ds0 10>, <&ipmmu_ds0 11>, + <&ipmmu_ds0 12>, <&ipmmu_ds0 13>, + <&ipmmu_ds0 14>, <&ipmmu_ds0 15>; }; dmac1: dma-controller@e7300000 {
@@ -668,6 +676,14 @@ resets = <&cpg 218>; #dma-cells = <1>; dma-channels = <16>; + iommus = <&ipmmu_ds1 0>, <&ipmmu_ds1 1>, + <&ipmmu_ds1 2>, <&ipmmu_ds1 3>, + <&ipmmu_ds1 4>, <&ipmmu_ds1 5>, + <&ipmmu_ds1 6>, <&ipmmu_ds1 7>, + <&ipmmu_ds1 8>, <&ipmmu_ds1 9>, + <&ipmmu_ds1 10>, <&ipmmu_ds1 11>, + <&ipmmu_ds1 12>, <&ipmmu_ds1 13>, + <&ipmmu_ds1 14>, <&ipmmu_ds1 15>; }; dmac2: dma-controller@e7310000 {
@@ -702,6 +718,14 @@ resets = <&cpg 217>; #dma-cells = <1>; dma-channels = <16>; + iommus = <&ipmmu_ds1 16>, <&ipmmu_ds1 17>, + <&ipmmu_ds1 18>, <&ipmmu_ds1 19>, + <&ipmmu_ds1 20>, <&ipmmu_ds1 21>, + <&ipmmu_ds1 22>, <&ipmmu_ds1 23>, + <&ipmmu_ds1 24>, <&ipmmu_ds1 25>, + <&ipmmu_ds1 26>, <&ipmmu_ds1 27>, + <&ipmmu_ds1 28>, <&ipmmu_ds1 29>, + <&ipmmu_ds1 30>, <&ipmmu_ds1 31>; }; ipmmu_ds0: mmu@e6740000 {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 199/422 arm64: dts: renesas: r8a77965: Fix HS-USB compatible
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 99584d93e301d820d817bba2eb77b9152e13009c ]
Should be "renesas,usbhs-r8a77965", not "renesas,usbhs-r8a7796".
--- arch/arm64/boot/dts/renesas/r8a77965.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/renesas/r8a77965.dtsi +1 -1
@@ -545,7 +545,7 @@ }; hsusb: usb@e6590000 { - compatible = "renesas,usbhs-r8a7796", + compatible = "renesas,usbhs-r8a77965", "renesas,rcar-gen3-usbhs"; reg = <0 0xe6590000 0 0x100>; interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 200/422 arm64: dts: renesas: r8a77965: Fix clock/reset for usb2_phy1
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 7a590fe317488783a229e5a80e91868942e8463f ]
usb2_phy1 accidentally uses the same clock/reset as usb2_phy0.
--- arch/arm64/boot/dts/renesas/r8a77965.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/renesas/r8a77965.dtsi +2 -2
@@ -1479,9 +1479,9 @@ compatible = "renesas,usb2-phy-r8a77965", "renesas,rcar-gen3-usb2-phy"; reg = <0 0xee0a0200 0 0x700>; - clocks = <&cpg CPG_MOD 703>; + clocks = <&cpg CPG_MOD 702>; power-domains = <&sysc R8A77965_PD_ALWAYS_ON>; - resets = <&cpg 703>; + resets = <&cpg 702>; #phy-cells = <0>; status = "disabled"; };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 201/422 pinctrl: at91-pio4: fix has_config check in atmel_pctl_dt_subnode_to_map()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit b97760ae8e3dc8bb91881c13425a0bff55f2bd85 ]
Smatch complains about this condition:
if (has_config && num_pins >= 1)
The "has_config" variable is either uninitialized or true. The "num_pins" variable is unsigned and we verified that it is non-zero on the lines before so we know "num_pines >= 1" is true. Really, we could just check "num_configs" directly and remove the "has_config" variable.
--- drivers/pinctrl/pinctrl-at91-pio4.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/pinctrl/pinctrl-at91-pio4.c +2 -6
@@ -493,7 +493,6 @@ static int atmel_pctl_dt_subnode_to_map(struct pinctrl_dev *pctldev,unsigned num_pins, num_configs, reserve;unsigned long *configs;struct property *pins; -bool has_config;u32 pinfunc;int ret, i;
@@ -509,9 +508,6 @@ static int atmel_pctl_dt_subnode_to_map(struct pinctrl_dev *pctldev,return ret; } -if (num_configs) - has_config = true; - num_pins = pins->length /sizeof (u32);if (!num_pins) {dev_err (pctldev->dev,"no pins found in node %pOF\n" , np);
@@ -524,7 +520,7 @@ static int atmel_pctl_dt_subnode_to_map(struct pinctrl_dev *pctldev,* map for each pin. */ reserve =1 ; -if (has_config && num_pins >=1 ) +if (num_configs) reserve++; reserve *= num_pins; ret = pinctrl_utils_reserve_map(pctldev, map, reserved_maps, num_maps,
@@ -547,7 +543,7 @@ static int atmel_pctl_dt_subnode_to_map(struct pinctrl_dev *pctldev,pinctrl_utils_add_map_mux (pctldev, map, reserved_maps, num_maps, group, func); -if (has_config) { +if (num_configs) { ret = pinctrl_utils_add_map_configs(pctldev, map, reserved_maps, num_maps, group, configs, num_configs,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 202/422 llc: avoid blocking in llc_sap_close()
In reply to Greg Kroah-HartmanFrom: Cong Wang <[email protected]>
[ Upstream commit 9708d2b5b7c648e8e0a40d11e8cea12f6277f33c ]
llc_sap_close() is called by llc_sap_put() which could be called in BH context in llc_rcv(). We can't block in BH.
There is no reason to block it here, kfree_rcu() should be sufficient.
--- include/net/llc.h | 1 + net/llc/llc_core.c | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-)
include/net/llc.h +1 -0
@@ -66,6 +66,7 @@ struct llc_sap {int sk_count;struct hlist_nulls_head sk_laddr_hash[LLC_SK_LADDR_HASH_ENTRIES ];struct hlist_head sk_dev_hash[LLC_SK_DEV_HASH_ENTRIES ]; +struct rcu_head rcu; }; static inline
net/llc/llc_core.c +1 -3
@@ -127,9 +127,7 @@ void llc_sap_close(struct llc_sap *sap)list_del_rcu (&sap->node);spin_unlock_bh (&llc_sap_list_lock); -synchronize_rcu (); - -kfree (sap); +kfree_rcu (sap, rcu); }static struct packet_type llc_packet_type__read_mostly = {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 203/422 ARM: dts: qcom: ipq4019: fix cpu0s qcom,saw2 reg value
In reply to Greg Kroah-HartmanFrom: Christian Lamparter <[email protected]>
[ Upstream commit bd73a3dd257fb838bd456a18eeee0ef0224b7a40 ]
while compiling an ipq4019 target, dtc will complain:
regulator@b089000 unit address format error, expected "2089000"
The saw0 regulator reg value seems to be
copied and pasted from qcom-ipq8064.dtsi.
This patch fixes the reg value to match that of the unit address which in turn silences the warning. (There is no driver for qcom,saw2 right now. So this went unnoticed)
--- arch/arm/boot/dts/qcom-ipq4019.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/qcom-ipq4019.dtsi +1 -1
@@ -313,7 +313,7 @@ saw0: regulator@b089000 { compatible = "qcom,saw2"; - reg = <0x02089000 0x1000>, <0x0b009000 0x1000>; + reg = <0x0b089000 0x1000>, <0x0b009000 0x1000>; regulator; };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 204/422 soc: qcom: geni: Dont ignore clk_round_rate() errors in geni_se_clk_tbl_get()
In reply to Greg Kroah-HartmanFrom: Douglas Anderson <[email protected]>
[ Upstream commit e11bbcedecae85ce60a5d99ea03528c2d6f867e0 ]
The function clk_round_rate() is defined to return a "long", not an "unsigned long". That's because it might return a negative error code. Change the call in geni_se_clk_tbl_get() to check for errors.
While we're at it, get rid of a useless init of "freq".
NOTE: overall the idea that we should iterate over clk_round_rate() to try to reconstruct a table already present in the clock driver is questionable. Specifically:
- This method relies on "clk_round_rate()" rounding up.
- This method only works if the table is sorted and has no duplicates. ...this patch doesn't try to fix those problems, it just makes the error handling more correct.
--- drivers/soc/qcom/qcom-geni-se.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/soc/qcom/qcom-geni-se.c +2 -2
@@ -513,7 +513,7 @@ EXPORT_SYMBOL(geni_se_resources_on);*/ int geni_se_clk_tbl_get (struct geni_se *se,unsigned long **tbl) { -unsigned long freq =0 ; +long freq =0 ;int i;if (se->clk_perf_tbl) {
@@ -529,7 +529,7 @@ int geni_se_clk_tbl_get(struct geni_se *se, unsigned long **tbl)for (i =0 ; i <MAX_CLK_PERF_LEVEL ; i++) { freq =clk_round_rate (se->clk, freq +1 ); -if (!freq || freq == se->clk_perf_tbl[i -1 ]) +if (freq <=0 || freq == se->clk_perf_tbl[i -1 ])break ; se->clk_perf_tbl[i] = freq; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 205/422 soc: qcom: geni: geni_se_clk_freq_match() should always accept multiples
In reply to Greg Kroah-HartmanFrom: Douglas Anderson <[email protected]>
[ Upstream commit 867d4aa7013fdee8b962cde1711f96c8dd86d926 ]
The geni_se_clk_freq_match() has some strange semantics. Specifically it is defined with two modes:
1. It can find a clock that's an exact multiple of the requested rate
2. It can find a non-exact match but it can't handle multiples then
...but callers should always be able to handle a clock that is a multiple of the requested clock so mode #2 doesn't really make sense. Let's change the semantics so that the non-exact match can also accept multiples and then change the code to handle that.
The only caller of this code is the unlanded SPI driver [1] which currently passes "exact = True", thus it should be safe to change the semantics in this way. ...and, in fact, the SPI driver should likely be modified to pass "exact = False" (with the new semantics) since that will allow it to work with SPI devices that request a clock rate that doesn't exactly match a rate we can make.
[1] https://lkml.kernel.org/r/[email protected]
--- drivers/soc/qcom/qcom-geni-se.c | 37 ++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 15 deletions(-)
drivers/soc/qcom/qcom-geni-se.c +22 -15
@@ -544,16 +544,17 @@ EXPORT_SYMBOL(geni_se_clk_tbl_get);* @se: Pointer to the concerned serial engine. * @req_freq: Requested clock frequency. * @index: Index of the resultant frequency in the table. -* @res_freq: Resultant frequency which matches or is closer to the -* requested frequency. +* @res_freq: Resultant frequency of the source clock. * @exact: Flag to indicate exact multiple requirement of the requested * frequency. * -* This function is called by the protocol drivers to determine the matching -* or exact multiple of the requested frequency, as provided by the serial -* engine clock in order to meet the performance requirements. If there is -* no matching or exact multiple of the requested frequency found, then it -* selects the closest floor frequency, if exact flag is not set. +* This function is called by the protocol drivers to determine the best match +* of the requested frequency as provided by the serial engine clock in order +* to meet the performance requirements. +* +* If we return success: +* - if @exact is true then @res_freq / <an_integer> == @req_freq +* - if @exact is false then @res_freq / <an_integer> <= @req_freq * * Return: 0 on success, standard Linux error codes on failure. */
@@ -564,6 +565,9 @@ int geni_se_clk_freq_match(struct geni_se *se, unsigned long req_freq,unsigned long *tbl;int num_clk_levels;int i; +unsigned long best_delta; +unsigned long new_delta; +unsigned int divider; num_clk_levels =geni_se_clk_tbl_get (se, &tbl);if (num_clk_levels <0 )
@@ -572,18 +576,21 @@ int geni_se_clk_freq_match(struct geni_se *se, unsigned long req_freq,if (num_clk_levels ==0 )return -EINVAL ; - *res_freq =0 ; + best_delta =ULONG_MAX ;for (i =0 ; i < num_clk_levels; i++) { -if (!(tbl[i] % req_freq)) { + divider =DIV_ROUND_UP (tbl[i], req_freq); + new_delta = req_freq - tbl[i] / divider; +if (new_delta < best_delta) { +/* We have a new best! */ *index = i; *res_freq = tbl[i]; -return 0 ; - } -if (!(*res_freq) || ((tbl[i] > *res_freq) && - (tbl[i] < req_freq))) { - *index = i; - *res_freq = tbl[i]; +/* If the new best is exact then we're done */ +if (new_delta ==0 ) +return 0 ; + +/* Record how close we got */ + best_delta = new_delta; } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 206/422 soc: qcom: wcnss_ctrl: Avoid string overflow
In reply to Greg Kroah-HartmanFrom: Niklas Cassel <[email protected]>
[ Upstream commit 4c96ed170d658d8826d94edec8ac93ee777981a2 ]
'chinfo.name' is used as a NUL-terminated string, but using strncpy() with the length equal to the buffer size may result in lack of the termination:
drivers//soc/qcom/wcnss_ctrl.c: In function 'qcom_wcnss_open_channel':drivers//soc/qcom/wcnss_ctrl.c:284:2: warning: 'strncpy' specified bound 32 equals destination size [-Wstringop-truncation]
strncpy(chinfo.name, name, sizeof(chinfo.name));
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
This changes it to use the safer strscpy() instead.
--- drivers/soc/qcom/wcnss_ctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soc/qcom/wcnss_ctrl.c +1 -1
@@ -281,7 +281,7 @@ struct rpmsg_endpoint *qcom_wcnss_open_channel(void *wcnss, const char *name, rpstruct rpmsg_channel_info chinfo;struct wcnss_ctrl *_wcnss = wcnss; -strncpy (chinfo.name, name,sizeof (chinfo.name)); +strscpy (chinfo.name, name,sizeof (chinfo.name)); chinfo.src =RPMSG_ADDR_ANY ; chinfo.dst =RPMSG_ADDR_ANY ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 207/422 soc: qcom: apr: Avoid string overflow
In reply to Greg Kroah-HartmanFrom: Niklas Cassel <[email protected]>
[ Upstream commit 4fadb26574cb74e5de079dd384f25f44f4fb3ec3 ]
'adev->name' is used as a NUL-terminated string, but using strncpy() with the length equal to the buffer size may result in lack of the termination:
In function 'apr_add_device',
inlined from 'of_register_apr_devices' at drivers//soc/qcom/apr.c:264:7,
inlined from 'apr_probe' at drivers//soc/qcom/apr.c:290:2:drivers//soc/qcom/apr.c:222:3: warning: 'strncpy' specified bound 32 equals destination size [-Wstringop-truncation]
strncpy(adev->name, np->name, APR_NAME_SIZE);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
This changes it to use the safer strscpy() instead.
--- drivers/soc/qcom/apr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/soc/qcom/apr.c +2 -2
@@ -219,9 +219,9 @@ static int apr_add_device(struct device *dev, struct device_node *np, adev->domain_id = id->domain_id; adev->version = id->svc_version;if (np) -strncpy (adev->name, np->name,APR_NAME_SIZE ); +strscpy (adev->name, np->name,APR_NAME_SIZE );else -strncpy (adev->name, id->name,APR_NAME_SIZE ); +strscpy (adev->name, id->name,APR_NAME_SIZE );dev_set_name (&adev->dev,"aprsvc:%s:%x:%x" , adev->name, id->domain_id, id->svc_id);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 208/422 drivers: qcom: rpmh-rsc: clear wait_for_compl after use
In reply to Greg Kroah-HartmanFrom: Lina Iyer <[email protected]>
[ Upstream commit 09e97b6c8754c91470455e69ebd827b741f80af5 ]
The wait_for_compl register ensures the request sequence is maintained when sending requests from the TCS. Clear the register after sending active request and during invalidate of the sleep and wake TCS.
--- drivers/soc/qcom/rpmh-rsc.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/soc/qcom/rpmh-rsc.c +2 -0
@@ -121,6 +121,7 @@ static int tcs_invalidate(struct rsc_drv *drv, int type)return -EAGAIN ; }write_tcs_reg_sync (drv,RSC_DRV_CMD_ENABLE , m,0 ); +write_tcs_reg_sync (drv,RSC_DRV_CMD_WAIT_FOR_CMPL , m,0 ); }bitmap_zero (tcs->slots,MAX_TCS_SLOTS );spin_unlock (&tcs->lock);
@@ -239,6 +240,7 @@ static irqreturn_t tcs_tx_done(int irq, void *p) skip:/* Reclaim the TCS */ write_tcs_reg (drv,RSC_DRV_CMD_ENABLE , i,0 ); +write_tcs_reg (drv,RSC_DRV_CMD_WAIT_FOR_CMPL , i,0 );write_tcs_reg (drv,RSC_DRV_IRQ_CLEAR ,0 ,BIT (i));spin_lock (&drv->lock);clear_bit (i, drv->tcs_in_use);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 209/422 arm64: dts: broadcom: Fix I2C and SPI bus warnings
In reply to Greg Kroah-HartmanFrom: Rob Herring <[email protected]>
[ Upstream commit 7cdbe45da1a189e744e6801aebb462ee47235580 ]
dtc has new checks for I2C and SPI buses. Fix the warnings in node names and unit-addresses.
arch/arm64/boot/dts/broadcom/stingray/bcm958742k.dtb: Warning (i2c_bus_reg): /hsls/i2c@e0000/pcf8574@20: I2C bus unit address format error, expected "27" arch/arm64/boot/dts/broadcom/stingray/bcm958742t.dtb: Warning (i2c_bus_reg): /hsls/i2c@e0000/pcf8574@20: I2C bus unit address format error, expected "27" arch/arm64/boot/dts/broadcom/stingray/bcm958742k.dtb: Warning (spi_bus_bridge): /hsls/ssp@180000: node name for SPI buses should be 'spi' arch/arm64/boot/dts/broadcom/stingray/bcm958742k.dtb: Warning (spi_bus_bridge): /hsls/ssp@190000: node name for SPI buses should be 'spi'
--- arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi | 4 ++-- arch/arm64/boot/dts/broadcom/stingray/bcm958742-base.dtsi | 2 +- arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)
arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi +2 -2
@@ -639,7 +639,7 @@ status = "disabled"; }; - ssp0: ssp@66180000 { + ssp0: spi@66180000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x66180000 0x1000>; interrupts = <GIC_SPI 404 IRQ_TYPE_LEVEL_HIGH>;
@@ -650,7 +650,7 @@ status = "disabled"; }; - ssp1: ssp@66190000 { + ssp1: spi@66190000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x66190000 0x1000>; interrupts = <GIC_SPI 405 IRQ_TYPE_LEVEL_HIGH>;
arch/arm64/boot/dts/broadcom/stingray/bcm958742-base.dtsi +1 -1
@@ -138,7 +138,7 @@ &i2c1 { status = "okay"; - pcf8574: pcf8574@20 { + pcf8574: pcf8574@27 { compatible = "nxp,pcf8574a"; gpio-controller; #gpio-cells = <2>;
arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi +2 -2
@@ -520,7 +520,7 @@ status = "disabled"; }; - ssp0: ssp@180000 { + ssp0: spi@180000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x00180000 0x1000>; interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;
@@ -532,7 +532,7 @@ status = "disabled"; }; - ssp1: ssp@190000 { + ssp1: spi@190000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x00190000 0x1000>; interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 210/422 ARM: dts: bcm: Fix SPI bus warnings
In reply to Greg Kroah-HartmanFrom: Rob Herring <[email protected]>
[ Upstream commit ab0b47d2eff413d60b0a1fc0c1f87f87f0d7f375 ]
dtc has new checks for SPI buses. Fix the warnings in node names.
arch/arm/boot/dts/bcm53340-ubnt-unifi-switch8.dtb: Warning (spi_bus_bridge): /axi@18000000/qspi@27200: node name for SPI buses should be 'spi' arch/arm/boot/dts/bcm958525er.dtb: Warning (spi_bus_bridge): /axi/qspi@27200: node name for SPI buses should be 'spi' arch/arm/boot/dts/bcm958525xmc.dtb: Warning (spi_bus_bridge): /axi/qspi@27200: node name for SPI buses should be 'spi' arch/arm/boot/dts/bcm958622hr.dtb: Warning (spi_bus_bridge): /axi/qspi@27200: node name for SPI buses should be 'spi' arch/arm/boot/dts/bcm958625hr.dtb: Warning (spi_bus_bridge): /axi/qspi@27200: node name for SPI buses should be 'spi' arch/arm/boot/dts/bcm988312hr.dtb: Warning (spi_bus_bridge): /axi/qspi@27200: node name for SPI buses should be 'spi'
--- arch/arm/boot/dts/bcm-hr2.dtsi | 2 +- arch/arm/boot/dts/bcm-nsp.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/bcm-hr2.dtsi +1 -1
@@ -216,7 +216,7 @@ reg = <0x33000 0x14>; }; - qspi: qspi@27200 { + qspi: spi@27200 { compatible = "brcm,spi-bcm-qspi", "brcm,spi-nsp-qspi"; reg = <0x027200 0x184>, <0x027000 0x124>,
arch/arm/boot/dts/bcm-nsp.dtsi +1 -1
@@ -273,7 +273,7 @@ brcm,nand-has-wp; }; - qspi: qspi@27200 { + qspi: spi@27200 { compatible = "brcm,spi-bcm-qspi", "brcm,spi-nsp-qspi"; reg = <0x027200 0x184>, <0x027000 0x124>,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 211/422 ARM: dts: aspeed: Fix I2C bus warnings
In reply to Greg Kroah-HartmanFrom: Rob Herring <[email protected]>
[ Upstream commit 1426d40e11f730e0c0fd3700a7048082f87b0e6e ]
dtc has new checks for I2C buses. The ASpeed dts files have a node named 'i2c' which causes a false positive warning. As the node is a 'simple-bus', correct the node name to be 'bus' to fix the warnings.
arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dtb: Warning (i2c_bus_bridge): /ahb/apb/i2c at 1e78a000: incorrect #size-cells for I2C bus arch/arm/boot/dts/aspeed-bmc-opp-romulus.dtb: Warning (i2c_bus_bridge): /ahb/apb/i2c at 1e78a000: incorrect #size-cells for I2C bus arch/arm/boot/dts/aspeed-ast2500-evb.dtb: Warning (i2c_bus_bridge): /ahb/apb/i2c at 1e78a000: incorrect #size-cells for I2C bus arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dtb: Warning (i2c_bus_bridge): /ahb/apb/i2c at 1e78a000: incorrect #size-cells for I2C bus arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dtb: Warning (i2c_bus_bridge): /ahb/apb/i2c at 1e78a000: incorrect #size-cells for I2C bus arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dtb: Warning (i2c_bus_bridge): /ahb/apb/i2c at 1e78a000: incorrect #size-cells for I2C bus arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dtb: Warning (i2c_bus_bridge): /ahb/apb/i2c at 1e78a000: incorrect #size-cells for I2C bus arch/arm/boot/dts/aspeed-bmc-opp-zaius.dtb: Warning (i2c_bus_bridge): /ahb/apb/i2c at 1e78a000: incorrect #size-cells for I2C bus arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dtb: Warning (i2c_bus_bridge): /ahb/apb/i2c at 1e78a000: incorrect #size-cells for I2C bus arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dtb: Warning (i2c_bus_bridge): /ahb/apb/i2c at 1e78a000: incorrect #size-cells for I2C bus
--- arch/arm/boot/dts/aspeed-g4.dtsi | 2 +- arch/arm/boot/dts/aspeed-g5.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/aspeed-g4.dtsi +1 -1
@@ -350,7 +350,7 @@ status = "disabled"; }; - i2c: i2c at 1e78a000 { + i2c: bus at 1e78a000 { compatible = "simple-bus"; #address-cells = <1>; #size-cells = <1>;
arch/arm/boot/dts/aspeed-g5.dtsi +1 -1
@@ -410,7 +410,7 @@ status = "disabled"; }; - i2c: i2c at 1e78a000 { + i2c: bus at 1e78a000 { compatible = "simple-bus"; #address-cells = <1>; #size-cells = <1>;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 212/422 powerpc/vdso: Correct call frame information
In reply to Greg Kroah-HartmanFrom: Alan Modra <[email protected]>
[ Upstream commit 56d20861c027498b5a1112b4f9f05b56d906fdda ]
Call Frame Information is used by gdb for back-traces and inserting breakpoints on function return for the "finish" command. This failed when inside __kernel_clock_gettime. More concerning than difficulty debugging is that CFI is also used by stack frame unwinding code to implement exceptions. If you have an app that needs to handle asynchronous exceptions for some reason, and you are unlucky enough to get one inside the VDSO time functions, your app will crash.
What's wrong: There is control flow in __kernel_clock_gettime that reaches label 99 without saving lr in r12. CFI info however is interpreted by the unwinder without reference to control flow: It's a simple matter of "Execute all the CFI opcodes up to the current address". That means the unwinder thinks r12 contains the return address at label 99. Disabuse it of that notion by resetting CFI for the return address at label 99.
Note that the ".cfi_restore lr" could have gone anywhere from the "mtlr r12" a few instructions earlier to the instruction at label 99. I put the CFI as late as possible, because in general that's best practice (and if possible grouped with other CFI in order to reduce the number of CFI opcodes executed when unwinding). Using r12 as the return address is perfectly fine after the "mtlr r12" since r12 on that code path still contains the return address.
__get_datapage also has a CFI error. That function temporarily saves lr in r0, and reflects that fact with ".cfi_register lr,r0". A later use of r0 means the CFI at that point isn't correct, as r0 no longer contains the return address. Fix that too.
--- arch/powerpc/kernel/vdso32/datapage.S | 1 + arch/powerpc/kernel/vdso32/gettimeofday.S | 1 + arch/powerpc/kernel/vdso64/datapage.S | 1 + arch/powerpc/kernel/vdso64/gettimeofday.S | 1 + 4 files changed, 4 insertions(+)
arch/powerpc/kernel/vdso32/datapage.S +1 -0
@@ -37,6 +37,7 @@ data_page_branch: mtlr r0 addi r3, r3, __kernel_datapage_offset-data_page_branch lwz r0,0(r3) + .cfi_restore lr add r3,r0,r3 blr .cfi_endproc
arch/powerpc/kernel/vdso32/gettimeofday.S +1 -0
@@ -139,6 +139,7 @@ V_FUNCTION_BEGIN(__kernel_clock_gettime) */ 99: li r0,__NR_clock_gettime + .cfi_restore lr sc blr .cfi_endproc
arch/powerpc/kernel/vdso64/datapage.S +1 -0
@@ -37,6 +37,7 @@ data_page_branch: mtlr r0 addi r3, r3, __kernel_datapage_offset-data_page_branch lwz r0,0(r3) + .cfi_restore lr add r3,r0,r3 blr .cfi_endproc
arch/powerpc/kernel/vdso64/gettimeofday.S +1 -0
@@ -169,6 +169,7 @@ V_FUNCTION_BEGIN(__kernel_clock_gettime) */ 99: li r0,__NR_clock_gettime + .cfi_restore lr sc blr .cfi_endproc
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 213/422 ARM: dts: socfpga: Fix I2C bus unit-address error
In reply to Greg Kroah-HartmanFrom: Dinh Nguyen <[email protected]>
[ Upstream commit cbbc488ed85061a765cf370c3e41f383c1e0add6 ]
dtc has new checks for I2C buses. Fix the warnings in unit-addresses.
arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dtb: Warning (i2c_bus_reg): /soc/i2c@ffc04000/adxl345@0: I2C bus unit address format error, expected "53"
--- arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts +1 -1
@@ -88,7 +88,7 @@ status = "okay"; clock-frequency = <100000>; - adxl345: adxl345@0 { + adxl345: adxl345@53 { compatible = "adi,adxl345"; reg = <0x53>;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 214/422 ARM: dts: sunxi: Fix I2C bus warnings
In reply to Greg Kroah-HartmanFrom: Rob Herring <[email protected]>
[ Upstream commit 0729b4af5753b65aa031f58c435da53dbbf56d19 ]
dtc has new checks for I2C buses. Fix the warnings in unit-addresses.
arch/arm/boot/dts/sun8i-a23-gt90h-v4.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2ac00/touchscreen@0: I2C bus unit address format error, expected "40" arch/arm/boot/dts/sun8i-a23-inet86dz.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2ac00/touchscreen@0: I2C bus unit address format error, expected "40" arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2ac00/touchscreen@0: I2C bus unit address format error, expected "40" arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2ac00/touchscreen@0: I2C bus unit address format error, expected "40" arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2ac00/touchscreen@0: I2C bus unit address format error, expected "40" arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2ac00/touchscreen@0: missing or empty reg property arch/arm/boot/dts/sun8i-a33-ippo-q8h-v1.2.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2ac00/touchscreen@0: missing or empty reg property arch/arm/boot/dts/sun8i-a33-q8-tablet.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2ac00/touchscreen@0: missing or empty reg property arch/arm/boot/dts/sun5i-a13-utoo-p66.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2b000/touchscreen: I2C bus unit address format error, expected "40" arch/arm/boot/dts/sun5i-a13-difrnce-dit4350.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2b000/touchscreen: missing or empty reg property arch/arm/boot/dts/sun5i-a13-empire-electronix-m712.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2b000/touchscreen: missing or empty reg property arch/arm/boot/dts/sun5i-a13-inet-98v-rev2.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2b000/touchscreen: missing or empty reg property arch/arm/boot/dts/sun5i-a13-q8-tablet.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2b000/touchscreen: missing or empty reg property
--- arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi | 3 ++- arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi | 3 ++- arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-)
arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi +2 -1
@@ -92,7 +92,8 @@ */ clock-frequency = <400000>; - touchscreen: touchscreen { + touchscreen: touchscreen@40 { + reg = <0x40>; interrupt-parent = <&pio>; interrupts = <6 11 IRQ_TYPE_EDGE_FALLING>; /* EINT11 (PG11) */ pinctrl-names = "default";
arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi +2 -1
@@ -69,7 +69,8 @@ */ clock-frequency = <400000>; - touchscreen: touchscreen@0 { + touchscreen: touchscreen@40 { + reg = <0x40>; interrupt-parent = <&pio>; interrupts = <1 5 IRQ_TYPE_EDGE_FALLING>; /* PB5 */ pinctrl-names = "default";
arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts +1 -1
@@ -95,7 +95,7 @@ &i2c0 { status = "okay"; - axp22x: pmic@68 { + axp22x: pmic@34 { compatible = "x-powers,axp221"; reg = <0x34>; interrupt-parent = <&nmi_intc>;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 215/422 pinctrl: at91: dont use the same irqchip with multiple gpiochips
In reply to Greg Kroah-HartmanFrom: Ludovic Desroches <[email protected]>
[ Upstream commit 0c3dfa176912b5f87732545598200fb55e9c1978 ]
Sharing the same irqchip with multiple gpiochips is not a good practice. For instance, when installing hooks, we change the state of the irqchip. The initial state of the irqchip for the second gpiochip to register is then disrupted.
--- drivers/pinctrl/pinctrl-at91.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
drivers/pinctrl/pinctrl-at91.c +14 -14
@@ -1574,16 +1574,6 @@ void at91_pinctrl_gpio_resume(void)#define gpio_irq_set_wake NULL#endif /* CONFIG_PM */ -static struct irq_chip gpio_irqchip = { - .name ="GPIO" , - .irq_ack = gpio_irq_ack, - .irq_disable = gpio_irq_mask, - .irq_mask = gpio_irq_mask, - .irq_unmask = gpio_irq_unmask, -/* .irq_set_type is set dynamically */ - .irq_set_wake = gpio_irq_set_wake, -}; -static void gpio_irq_handler (struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);
@@ -1624,12 +1614,22 @@ static int at91_gpio_of_irq_setup(struct platform_device *pdev,struct gpio_chip *gpiochip_prev =NULL ;struct at91_gpio_chip *prev =NULL ;struct irq_data *d =irq_get_irq_data (at91_gpio->pioc_virq); +struct irq_chip *gpio_irqchip;int ret, i; + gpio_irqchip =devm_kzalloc (&pdev->dev,sizeof (*gpio_irqchip),GFP_KERNEL ); +if (!gpio_irqchip) +return -ENOMEM ; + at91_gpio->pioc_hwirq =irqd_to_hwirq (d); -/* Setup proper .irq_set_type function */ - gpio_irqchip.irq_set_type = at91_gpio->ops->irq_type; + gpio_irqchip->name ="GPIO" ; + gpio_irqchip->irq_ack = gpio_irq_ack; + gpio_irqchip->irq_disable = gpio_irq_mask; + gpio_irqchip->irq_mask = gpio_irq_mask; + gpio_irqchip->irq_unmask = gpio_irq_unmask; + gpio_irqchip->irq_set_wake = gpio_irq_set_wake, + gpio_irqchip->irq_set_type = at91_gpio->ops->irq_type;/* Disable irqs of this PIO controller */ writel_relaxed (~0 , at91_gpio->regbase +PIO_IDR );
@@ -1640,7 +1640,7 @@ static int at91_gpio_of_irq_setup(struct platform_device *pdev,* interrupt. */ ret =gpiochip_irqchip_add (&at91_gpio->chip, - &gpio_irqchip, + gpio_irqchip,0 , handle_edge_irq,IRQ_TYPE_NONE );
@@ -1658,7 +1658,7 @@ static int at91_gpio_of_irq_setup(struct platform_device *pdev,if (!gpiochip_prev) {/* Then register the chain on the parent IRQ */ gpiochip_set_chained_irqchip (&at91_gpio->chip, - &gpio_irqchip, + gpio_irqchip, at91_gpio->pioc_virq, gpio_irq_handler);return 0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 216/422 ARM: dts: sun9i: Fix I2C bus warnings
In reply to Greg Kroah-HartmanFrom: Rob Herring <[email protected]>
[ Upstream commit 57a83c5222c1b5e7b3acc72c6e60fce00a38991a ]
dtc has new checks for I2C buses. The sun9i-a80 dts file has a node named 'i2c' which causes a false positive warning. As the node is a RSB bus, correct the node name to be 'rsb' to fix the warnings.
arch/arm/boot/dts/sun9i-a80-cubieboard4.dtb: Warning (i2c_bus_reg): /soc/i2c@8003400/codec@e89:reg: I2C address must be less than 10-bits, got "0xe89" arch/arm/boot/dts/sun9i-a80-cubieboard4.dtb: Warning (i2c_bus_reg): /soc/i2c@8003400/pmic@745:reg: I2C address must be less than 10-bits, got "0x745" arch/arm/boot/dts/sun9i-a80-optimus.dtb: Warning (i2c_bus_reg): /soc/i2c@8003400/codec@e89:reg: I2C address must be less than 10-bits, got "0xe89" arch/arm/boot/dts/sun9i-a80-optimus.dtb: Warning (i2c_bus_reg): /soc/i2c@8003400/pmic@745:reg: I2C address must be less than 10-bits, got "0x745"
--- arch/arm/boot/dts/sun9i-a80.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/sun9i-a80.dtsi +1 -1
@@ -1196,7 +1196,7 @@ }; }; - r_rsb: i2c@8003400 { + r_rsb: rsb@8003400 { compatible = "allwinner,sun8i-a23-rsb"; reg = <0x08003400 0x400>; interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 217/422 android: binder: no outgoing transaction when thread todo has transaction
In reply to Greg Kroah-HartmanFrom: Sherry Yang <[email protected]>
[ Upstream commit 44b73962cb25f1c8170ea695c4564b05a75e1fd4 ]
When a process dies, failed reply is sent to the sender of any transaction queued on a dead thread's todo list. The sender asserts that the received failed reply corresponds to the head of the transaction stack. This assert can fail if the dead thread is allowed to send outgoing transactions when there is already a transaction on its todo list, because this new transaction can end up on the transaction stack of the original sender. The following steps illustrate how this assertion can fail.
1. Thread1 sends txn19 to Thread2 (T1->transaction_stack=txn19, T2->todo+=txn19)
2. Without processing todo list, Thread2 sends txn20 to Thread1 (T1->todo+=txn20, T2->transaction_stack=txn20)
3. T1 processes txn20 on its todo list (T1->transaction_stack=txn20->txn19, T1->todo=<empty>)
4. T2 dies, T2->todo cleanup attempts to send failed reply for txn19, but T1->transaction_stack points to txn20 -- assertion failes
Step 2. is the incorrect behavior. When there is a transaction on a thread's todo list, this thread should not be able to send any outgoing synchronous transactions. Only the head of the todo list needs to be checked because only threads that are waiting for proc work can directly receive work from another thread, and no work is allowed to be queued on such a thread without waking up the thread. This patch also enforces that a thread is not waiting for proc work when a work is directly enqueued to its todo list.
--- drivers/android/binder.c | 44 +++++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 12 deletions(-)
drivers/android/binder.c +32 -12
@@ -822,6 +822,7 @@ static void binder_enqueue_deferred_thread_work_ilocked(struct binder_thread *thread, struct binder_work *work) { + WARN_ON(!list_empty(&thread->waiting_thread_node));binder_enqueue_work_ilocked (work, &thread->todo); }
@@ -839,6 +840,7 @@ static void binder_enqueue_thread_work_ilocked(struct binder_thread *thread, struct binder_work *work) { + WARN_ON(!list_empty(&thread->waiting_thread_node));binder_enqueue_work_ilocked (work, &thread->todo); thread->process_todo = true; }
@@ -1270,19 +1272,12 @@ static int binder_inc_node_nilocked(struct binder_node *node, int strong, }else node->local_strong_refs++;if (!node->has_strong_ref && target_list) { +struct binder_thread *thread =container_of (target_list, + struct binder_thread, todo);binder_dequeue_work_ilocked (&node->work); -/* -* Note: this function is the only place where we queue -* directly to a thread->todo without using the -* corresponding binder_enqueue_thread_work() helper -* functions; in this case it's ok to not set the -* process_todo flag, since we know this node work will -* always be followed by other work that starts queue -* processing: in case of synchronous transactions, a -* BR_REPLY or BR_ERROR; in case of oneway -* transactions, a BR_TRANSACTION_COMPLETE. -*/ -binder_enqueue_work_ilocked (&node->work, target_list); +BUG_ON (&thread->todo != target_list); +binder_enqueue_deferred_thread_work_ilocked (thread, + &node->work); } }else {if (!internal)
@@ -2733,6 +2728,7 @@ static void binder_transaction(struct binder_proc *proc, {int ret;struct binder_transaction *t; +struct binder_work *w;struct binder_work *tcomplete;binder_size_t *offp, *off_end, *off_start;binder_size_t off_min;
@@ -2874,6 +2870,29 @@ static void binder_transaction(struct binder_proc *proc, goto err_invalid_target_handle; }binder_inner_proc_lock (proc); + + w =list_first_entry_or_null (&thread->todo, + struct binder_work, entry); +if (!(tr->flags &TF_ONE_WAY ) && w && + w->type ==BINDER_WORK_TRANSACTION ) { +/* +* Do not allow new outgoing transaction from a +* thread that has a transaction at the head of +* its todo list. Only need to check the head +* because binder_select_thread_ilocked picks a +* thread from proc->waiting_threads to enqueue +* the transaction, and nothing is queued to the +* todo list while the thread is on waiting_threads. +*/ +binder_user_error ("%d:%d new transaction not allowed when there is a transaction on thread todo\n" , + proc->pid, thread->pid); +binder_inner_proc_unlock (proc); + return_error =BR_FAILED_REPLY ; + return_error_param = -EPROTO ; + return_error_line = __LINE__; + goto err_bad_todo_list; + } +if (!(tr->flags &TF_ONE_WAY ) && thread->transaction_stack) {struct binder_transaction *tmp;
@@ -3256,6 +3275,7 @@ err_alloc_tcomplete_failed:kfree (t);binder_stats_deleted (BINDER_STAT_TRANSACTION ); err_alloc_t_failed: +err_bad_todo_list: err_bad_call_stack: err_empty_call_stack: err_dead_binder:
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 218/422 cxgb4: Fix endianness issue in t4_fwcache()
In reply to Greg Kroah-HartmanFrom: Ganesh Goudar <[email protected]>
[ Upstream commit 0dc235afc59a226d951352b0adf4a89b532a9d13 ]
Do not put host-endian 0 or 1 into big endian feild.
--- drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c +1 -1
@@ -3889,7 +3889,7 @@ int t4_fwcache(struct adapter *adap, enum fw_params_param_dev_fwcache op) c.param[0 ].mnem =cpu_to_be32 (FW_PARAMS_MNEM_V (FW_PARAMS_MNEM_DEV ) |FW_PARAMS_PARAM_X_V (FW_PARAMS_PARAM_DEV_FWCACHE )); - c.param[0 ].val = (__force __be32 )op; + c.param[0 ].val =cpu_to_be32 (op);return t4_wr_mbox (adap, adap->mbox, &c,sizeof (c),NULL ); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 219/422 arm64: fix for bad_mode() handler to always result in panic
In reply to Greg Kroah-HartmanFrom: Hari Vyas <[email protected]>
[ Upstream commit e4ba15debcfd27f60d43da940a58108783bff2a6 ]
The bad_mode() handler is called if we encounter an uunknown exception, with the expectation that the subsequent call to panic() will halt the system. Unfortunately, if the exception calling bad_mode() is taken from EL0, then the call to die() can end up killing the current user task and calling schedule() instead of falling through to panic().
Remove the die() call altogether, since we really want to bring down the machine in this "impossible" case.
--- arch/arm64/kernel/traps.c | 1 - 1 file changed, 1 deletion(-)
arch/arm64/kernel/traps.c +0 -1
@@ -611,7 +611,6 @@ asmlinkage void bad_mode(struct pt_regs *regs, int reason, unsigned int esr) handler[reason],smp_processor_id (), esr, esr_get_class_string(esr)); -die ("Oops - bad mode" , regs,0 );local_daif_mask ();panic ("bad mode" ); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 220/422 block, bfq: inject other-queue I/O into seeky idle queues on NCQ flash
In reply to Greg Kroah-HartmanFrom: Paolo Valente <[email protected]>
[ Upstream commit d0edc2473be9d70f999282e1ca7863ad6ae704dc ]
The Achilles' heel of BFQ is its failing to reach a high throughput with sync random I/O on flash storage with internal queueing, in case the processes doing I/O have differentiated weights.
The cause of this failure is as follows. If at least two processes do sync I/O, and have a different weight from each other, then BFQ plugs I/O dispatching every time one of these processes, while it is being served, remains temporarily without pending I/O requests. This plugging is necessary to guarantee that every process enjoys a bandwidth proportional to its weight; but it empties the internal queue(s) of the drive. And this kills throughput with random I/O. So, if some processes have differentiated weights and do both sync and random I/O, the end result is a throughput collapse.
This commit tries to counter this problem by injecting the service of other processes, in a controlled way, while the process in service happens to have no I/O. This injection is performed only if the medium is non rotational and performs internal queueing, and the process in service does random I/O (service injection might be beneficial for sequential I/O too, we'll work on that).
As an example of the benefits of this commit, on a PLEXTOR PX-256M5S SSD, and with five processes having differentiated weights and doing sync random 4KB I/O, this commit makes the throughput with bfq grow by 400%, from 25 to 100MB/s. This higher throughput is 10MB/s lower than that reached with none. As some less random I/O is added to the mix, the throughput becomes equal to or higher than that with none.
This commit is a very first attempt to recover throughput without losing control, and certainly has many limitations. One is, e.g., that the processes whose service is injected are not chosen so as to distribute the extra bandwidth they receive in accordance to their weights. Thus there might be loss of weighted fairness in some cases. Anyway, this loss concerns extra service, which would not have been received at all without this commit. Other limitations and issues will probably show up with usage.
--- block/bfq-iosched.c | 68 +++++++++++++++++++++++++++++++++++++++++---- block/bfq-iosched.h | 26 +++++++++++++++++ 2 files changed, 88 insertions(+), 6 deletions(-)
block/bfq-iosched.c +62 -6
@@ -3195,6 +3195,13 @@ static unsigned long bfq_bfqq_softrt_next_start(struct bfq_data *bfqd, jiffies + nsecs_to_jiffies(bfqq->bfqd->bfq_slice_idle) + 4); } +static bool bfq_bfqq_injectable (struct bfq_queue *bfqq) +{ +return BFQQ_SEEKY (bfqq) && bfqq->wr_coeff ==1 && +blk_queue_nonrot (bfqq->bfqd->queue) && + bfqq->bfqd->hw_tag; +} +/** * bfq_bfqq_expire - expire a queue. * @bfqd: device owning the queue.
@@ -3304,6 +3311,8 @@ void bfq_bfqq_expire(struct bfq_data *bfqd,if (ref ==1 )/* bfqq is gone, no more actions on it */ return ; + bfqq->injected_service =0 ; +/* mark bfqq as waiting a request only if a bic still points to it */ if (!bfq_bfqq_busy(bfqq) && reason != BFQQE_BUDGET_TIMEOUT &&
@@ -3642,6 +3651,30 @@ static bool bfq_bfqq_must_idle(struct bfq_queue *bfqq)return RB_EMPTY_ROOT (&bfqq->sort_list) &&bfq_better_to_idle (bfqq); } +static struct bfq_queue *bfq_choose_bfqq_for_injection (struct bfq_data *bfqd) +{ +struct bfq_queue *bfqq; + +/* +* A linear search; but, with a high probability, very few +* steps are needed to find a candidate queue, i.e., a queue +* with enough budget left for its next request. In fact: +* - BFQ dynamically updates the budget of every queue so as +* to accommodate the expected backlog of the queue; +* - if a queue gets all its requests dispatched as injected +* service, then the queue is removed from the active list +* (and re-added only if it gets new requests, but with +* enough budget for its new backlog). +*/ +list_for_each_entry (bfqq, &bfqd->active_list, bfqq_list) +if (!RB_EMPTY_ROOT (&bfqq->sort_list) && +bfq_serv_to_charge (bfqq->next_rq, bfqq) <= +bfq_bfqq_budget_left (bfqq)) +return bfqq; + +return NULL ; +} +/* * Select a queue for service. If we have a current queue in service, * check whether to continue servicing it, or retrieve and set a new one.
@@ -3723,10 +3756,19 @@ check_queue:* No requests pending. However, if the in-service queue is idling * for a new request, or has requests waiting for a completion and * may idle after their completion, then keep it anyway. +* +* Yet, to boost throughput, inject service from other queues if +* possible. */ if (bfq_bfqq_wait_request (bfqq) || (bfqq->dispatched !=0 &&bfq_better_to_idle (bfqq))) { - bfqq =NULL ; +if (bfq_bfqq_injectable (bfqq) && + bfqq->injected_service * bfqq->inject_coeff < + bfqq->entity.service *10 ) + bfqq =bfq_choose_bfqq_for_injection (bfqd); +else + bfqq =NULL ; + goto keep_queue; }
@@ -3816,6 +3858,14 @@ static struct request *bfq_dispatch_rq_from_bfqq(struct bfq_data *bfqd,bfq_dispatch_remove (bfqd->queue, rq); +if (bfqq != bfqd->in_service_queue) { +if (likely (bfqd->in_service_queue)) + bfqd->in_service_queue->injected_service += +bfq_serv_to_charge (rq, bfqq); + + goto return_rq; + } +/* * If weight raising has to terminate for bfqq, then next * function causes an immediate update of bfqq's weight,
@@ -3834,13 +3884,12 @@ static struct request *bfq_dispatch_rq_from_bfqq(struct bfq_data *bfqd,* belongs to CLASS_IDLE and other queues are waiting for * service. */ -if (bfqd->busy_queues >1 &&bfq_class_idle (bfqq)) - goto expire; - -return rq; +if (!(bfqd->busy_queues >1 &&bfq_class_idle (bfqq))) + goto return_rq; -expire:bfq_bfqq_expire (bfqd, bfqq, false,BFQQE_BUDGET_EXHAUSTED ); + +return_rq:return rq; }
@@ -4246,6 +4295,13 @@ static void bfq_init_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq,bfq_mark_bfqq_has_short_ttime (bfqq);bfq_mark_bfqq_sync (bfqq);bfq_mark_bfqq_just_created (bfqq); +/* +* Aggressively inject a lot of service: up to 90%. +* This coefficient remains constant during bfqq life, +* but this behavior might be changed, after enough +* testing and tuning. +*/ + bfqq->inject_coeff =1 ; }else bfq_clear_bfqq_sync (bfqq);
block/bfq-iosched.h +26 -0
@@ -351,6 +351,32 @@ struct bfq_queue {unsigned long split_time;/* time of last split */ unsigned long first_IO_time;/* time of first I/O for this queue */ + +/* max service rate measured so far */ +u32 max_service_rate; +/* +* Ratio between the service received by bfqq while it is in +* service, and the cumulative service (of requests of other +* queues) that may be injected while bfqq is empty but still +* in service. To increase precision, the coefficient is +* measured in tenths of unit. Here are some example of (1) +* ratios, (2) resulting percentages of service injected +* w.r.t. to the total service dispatched while bfqq is in +* service, and (3) corresponding values of the coefficient: +* 1 (50%) -> 10 +* 2 (33%) -> 20 +* 10 (9%) -> 100 +* 9.9 (9%) -> 99 +* 1.5 (40%) -> 15 +* 0.5 (66%) -> 5 +* 0.1 (90%) -> 1 +* +* So, if the coefficient is lower than 10, then +* injected service is more than bfqq service. +*/ +unsigned int inject_coeff; +/* amount of service injected in current service slot */ +unsigned int injected_service; };/**
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 221/422 blok, bfq: do not plug I/O if all queues are weight-raised
In reply to Greg Kroah-HartmanFrom: Paolo Valente <[email protected]>
[ Upstream commit c8765de0adfcaaf4ffb2d951e07444f00ffa9453 ]
To reduce latency for interactive and soft real-time applications, bfq privileges the bfq_queues containing the I/O of these applications. These privileged queues, referred-to as weight-raised queues, get a much higher share of the device throughput w.r.t. non-privileged queues. To preserve this higher share, the I/O of any non-weight-raised queue must be plugged whenever a sync weight-raised queue, while being served, remains temporarily empty. To attain this goal, bfq simply plugs any I/O (from any queue), if a sync weight-raised queue remains empty while in service.
Unfortunately, this plugging typically lowers throughput with random I/O, on devices with internal queueing (because it reduces the filling level of the internal queues of the device).
This commit addresses this issue by restricting the cases where plugging is performed: if a sync weight-raised queue remains empty while in service, then I/O plugging is performed only if some of the active bfq_queues are *not* weight-raised (which is actually the only circumstance where plugging is needed to preserve the higher share of the throughput of weight-raised queues). This restriction proved able to boost throughput in really many use cases needing only maximum throughput.
--- block/bfq-iosched.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
block/bfq-iosched.c +8 -2
@@ -3593,7 +3593,12 @@ static bool bfq_better_to_idle(struct bfq_queue *bfqq)* whether bfqq is being weight-raised, because * bfq_symmetric_scenario() does not take into account also * weight-raised queues (see comments on -* bfq_weights_tree_add()). +* bfq_weights_tree_add()). In particular, if bfqq is being +* weight-raised, it is important to idle only if there are +* other, non-weight-raised queues that may steal throughput +* to bfqq. Actually, we should be even more precise, and +* differentiate between interactive weight raising and +* soft real-time weight raising. * * As a side note, it is worth considering that the above * device-idling countermeasures may however fail in the
@@ -3605,7 +3610,8 @@ static bool bfq_better_to_idle(struct bfq_queue *bfqq)* to let requests be served in the desired order until all * the requests already queued in the device have been served. */ - asymmetric_scenario = bfqq->wr_coeff >1 || + asymmetric_scenario = (bfqq->wr_coeff >1 && + bfqd->wr_busy_queues < bfqd->busy_queues) || !bfq_symmetric_scenario (bfqd);/*
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 222/422 arm64: dts: meson: Fix erroneous SPI bus warnings
In reply to Greg Kroah-HartmanFrom: Rob Herring <[email protected]>
[ Upstream commit 68ecb5c1920c5b98b1e717fd2349fba2ee5d4031 ]
dtc has new checks for SPI buses. The meson dts files have a node named spi' which causes false positive warnings. As the node is a pinctrl child node, change the node name to be 'spi-pins' to fix the warnings.
arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dtb: Warning (spi_bus_bridge): /soc/periphs@c8834000/pinctrl@4b0/spi: incorrect #address-cells for SPI bus
--- arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 2 +- arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +1 -1
@@ -390,7 +390,7 @@ }; }; - spi_pins: spi { + spi_pins: spi-pins { mux { groups = "spi_miso", "spi_mosi",
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi +1 -1
@@ -337,7 +337,7 @@ }; }; - spi_pins: spi { + spi_pins: spi-pins { mux { groups = "spi_miso", "spi_mosi",
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 223/422 power: supply: ab8500_fg: silence uninitialized variable warnings
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 54baff8d4e5dce2cef61953b1dc22079cda1ddb1 ]
If kstrtoul() fails then we print "charge_full" when it's uninitialized. The debug printk doesn't add anything so I deleted it and cleaned these two functions up a bit.
--- drivers/power/supply/ab8500_fg.c | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-)
drivers/power/supply/ab8500_fg.c +12 -19
@@ -2433,17 +2433,14 @@ static ssize_t charge_full_store(struct ab8500_fg *di, const char *buf, size_t count) {unsigned long charge_full; -ssize_t ret; +int ret; ret =kstrtoul (buf,10 , &charge_full); +if (ret) +return ret; -dev_dbg (di->dev,"Ret %zd charge_full %lu" , ret, charge_full); - -if (!ret) { - di->bat_cap.max_mah = (int ) charge_full; - ret = count; - } -return ret; + di->bat_cap.max_mah = (int ) charge_full; +return count; }static ssize_t charge_now_show (struct ab8500_fg *di,char *buf)
@@ -2455,20 +2452,16 @@ static ssize_t charge_now_store(struct ab8500_fg *di, const char *buf, size_t count) {unsigned long charge_now; -ssize_t ret; +int ret; ret =kstrtoul (buf,10 , &charge_now); +if (ret) +return ret; -dev_dbg (di->dev,"Ret %zd charge_now %lu was %d" , - ret, charge_now, di->bat_cap.prev_mah); - -if (!ret) { - di->bat_cap.user_mah = (int ) charge_now; - di->flags.user_cap = true; - ret = count; -queue_delayed_work (di->fg_wq, &di->fg_periodic_work,0 ); - } -return ret; + di->bat_cap.user_mah = (int ) charge_now; + di->flags.user_cap = true; +queue_delayed_work (di->fg_wq, &di->fg_periodic_work,0 ); +return count; } static struct ab8500_fg_sysfs_entry charge_full_attr =
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 224/422 power: reset: at91-poweroff: do not procede if at91_shdwc is allocated
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit 9f1e44774be578fb92776add95f1fcaf8284d692 ]
There should be only one instance of struct shdwc in the system. This is referenced through at91_shdwc. Return in probe if at91_shdwc is already allocated.
--- drivers/power/reset/at91-sama5d2_shdwc.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/power/reset/at91-sama5d2_shdwc.c +3 -0
@@ -246,6 +246,9 @@ static int __init at91_shdwc_probe(struct platform_device *pdev)if (!pdev->dev.of_node)return -ENODEV ; +if (at91_shdwc) +return -EBUSY ; + at91_shdwc =devm_kzalloc (&pdev->dev,sizeof (*at91_shdwc),GFP_KERNEL );if (!at91_shdwc)return -ENOMEM ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 225/422 power: supply: max8998-charger: Fix platform data retrieval
In reply to Greg Kroah-HartmanFrom: Tomasz Figa <[email protected]>
[ Upstream commit cb90a2c6f77fe9b43d1e3f759bb2f13fe7fa1811 ]
Since the max8998 MFD driver supports instantiation by DT, platform data retrieval is handled in MFD probe and cell drivers should get use the pdata field of max8998_dev struct to obtain them.
--- drivers/power/supply/max8998_charger.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/power/supply/max8998_charger.c +1 -1
@@ -86,7 +86,7 @@ static const struct power_supply_desc max8998_battery_desc = {static int max8998_battery_probe (struct platform_device *pdev) {struct max8998_dev *iodev =dev_get_drvdata (pdev->dev.parent); -struct max8998_platform_data *pdata =dev_get_platdata (iodev->dev); +struct max8998_platform_data *pdata = iodev->pdata;struct power_supply_config psy_cfg = {};struct max8998_battery_data *max8998;struct i2c_client *i2c;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 226/422 component: fix loop condition to call unbind() if bind() fails
In reply to Greg Kroah-HartmanFrom: Banajit Goswami <[email protected]>
[ Upstream commit bdae566d5d9733b6e32b378668b84eadf28a94d4 ]
During component_bind_all(), if bind() fails for any particular component associated with a master, unbind() should be called for all previous components in that master's match array, whose bind() might have completed successfully. As per the current logic, if bind() fails for the component at position 'n' in the master's match array, it would start calling unbind() from component in 'n'th position itself and work backwards, and will always skip calling unbind() for component in 0th position in the master's match array.
Fix this by updating the loop condition, and the logic to refer to the components in master's match array, so that unbind() is called for all components starting from 'n-1'st position in the array, until (and including) component in 0th position.
--- drivers/base/component.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/base/component.c +3 -3
@@ -536,9 +536,9 @@ int component_bind_all(struct device *master_dev, void *data) }if (ret !=0 ) { -for (; i--; ) -if (!master->match->compare[i].duplicate) { - c = master->match->compare[i].component; +for (; i >0 ; i--) +if (!master->match->compare[i -1 ].duplicate) { + c = master->match->compare[i -1 ].component;component_unbind (c, master, data); } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 227/422 kernfs: Fix range checks in kernfs_get_target_path
In reply to Greg Kroah-HartmanFrom: Bernd Edlinger <[email protected]>
[ Upstream commit a75e78f21f9ad4b810868c89dbbabcc3931591ca ]
The terminating NUL byte is only there because the buffer is allocated with kzalloc(PAGE_SIZE, GFP_KERNEL), but since the range-check is off-by-one, and PAGE_SIZE==PATH_MAX, the returned string may not be zero-terminated if it is exactly PATH_MAX characters long. Furthermore also the initial loop may theoretically exceed PATH_MAX and cause a fault.
--- fs/kernfs/symlink.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
fs/kernfs/symlink.c +4 -1
@@ -72,6 +72,9 @@ static int kernfs_get_target_path(struct kernfs_node *parent,if (base == kn)break ; +if ((s - path) +3 >=PATH_MAX ) +return -ENAMETOOLONG ; +strcpy (s,"../" ); s +=3 ; base = base->parent;
@@ -88,7 +91,7 @@ static int kernfs_get_target_path(struct kernfs_node *parent,if (len <2 )return -EINVAL ; len--; -if ((s - path) + len >PATH_MAX ) +if ((s - path) + len >=PATH_MAX )return -ENAMETOOLONG ;/* reverse fillup of target string from target to base */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 228/422 ip_gre: fix parsing gre header in ipgre_err
In reply to Greg Kroah-HartmanFrom: Haishuang Yan <[email protected]>
[ Upstream commit b0350d51f001e6edc13ee4f253b98b50b05dd401 ]
gre_parse_header stops parsing when csum_err is encountered, which means tpi->key is undefined and ip_tunnel_lookup will return NULL improperly.
This patch introduce a NULL pointer as csum_err parameter. Even when csum_err is encountered, it won't return error and continue parsing gre header as expected.
--- net/ipv4/gre_demux.c | 7 ++++--- net/ipv4/ip_gre.c | 9 +++------ 2 files changed, 7 insertions(+), 9 deletions(-)
net/ipv4/gre_demux.c +4 -3
@@ -87,13 +87,14 @@ int gre_parse_header(struct sk_buff *skb, struct tnl_ptk_info *tpi, options = (__be32 *)(greh +1 );if (greh->flags &GRE_CSUM ) { -if (skb_checksum_simple_validate (skb)) { +if (!skb_checksum_simple_validate (skb)) { +skb_checksum_try_convert (skb,IPPROTO_GRE ,0 , + null_compute_pseudo); + }else if (csum_err) { *csum_err = true;return -EINVAL ; } -skb_checksum_try_convert (skb,IPPROTO_GRE ,0 , - null_compute_pseudo); options++; }
net/ipv4/ip_gre.c +3 -6
@@ -232,13 +232,10 @@ static void gre_err(struct sk_buff *skb, u32 info)const int type =icmp_hdr (skb)->type;const int code =icmp_hdr (skb)->code;struct tnl_ptk_info tpi; -bool csum_err = false; -if (gre_parse_header (skb, &tpi, &csum_err,htons (ETH_P_IP ), - iph->ihl *4 ) <0 ) { -if (!csum_err)/* ignore csum errors. */ -return ; - } +if (gre_parse_header (skb, &tpi,NULL ,htons (ETH_P_IP ), + iph->ihl *4 ) <0 ) +return ;if (type ==ICMP_DEST_UNREACH && code ==ICMP_FRAG_NEEDED ) { ipv4_update_pmtu(skb, dev_net(skb->dev), info,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 229/422 scsi: ufshcd: Fix NULL pointer dereference for in ufshcd_init
In reply to Greg Kroah-HartmanFrom: Vivek Gautam <[email protected]>
[ Upstream commit eebcc19646489b68399ce7b35d9c38eb9f4ec40f ]
Error paths in ufshcd_init() ufshcd_hba_exit() killed clk_scaling workqueue when the workqueue is actually created quite late in ufshcd_init(). So, we end up getting NULL pointer dereference in such error paths. Fix this by moving clk_scaling initialization and kill codes to two separate methods, and call them at required places.
gating")
--- drivers/scsi/ufs/ufshcd.c | 53 +++++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 19 deletions(-)
drivers/scsi/ufs/ufshcd.c +34 -19
@@ -1772,6 +1772,34 @@ out:return count; } +static void ufshcd_init_clk_scaling (struct ufs_hba *hba) +{ +char wq_name[sizeof ("ufs_clkscaling_00" )]; + +if (!ufshcd_is_clkscaling_supported (hba)) +return ; + +INIT_WORK (&hba->clk_scaling.suspend_work, + ufshcd_clk_scaling_suspend_work); +INIT_WORK (&hba->clk_scaling.resume_work, + ufshcd_clk_scaling_resume_work); + +snprintf (wq_name,sizeof (wq_name),"ufs_clkscaling_%d" , + hba->host->host_no); + hba->clk_scaling.workq =create_singlethread_workqueue (wq_name); + +ufshcd_clkscaling_init_sysfs (hba); +} + +static void ufshcd_exit_clk_scaling (struct ufs_hba *hba) +{ +if (!ufshcd_is_clkscaling_supported (hba)) +return ; + +destroy_workqueue (hba->clk_scaling.workq); +ufshcd_devfreq_remove (hba); +} +static void ufshcd_init_clk_gating (struct ufs_hba *hba) {char wq_name[sizeof ("ufs_clk_gating_00" )];
@@ -6676,6 +6704,7 @@ out:*/ if (ret && !ufshcd_eh_in_progress (hba) && !hba->pm_op_in_progress) {pm_runtime_put_sync (hba->dev); +ufshcd_exit_clk_scaling (hba);ufshcd_hba_exit (hba); }
@@ -7223,12 +7252,9 @@ static void ufshcd_hba_exit(struct ufs_hba *hba)ufshcd_variant_hba_exit (hba);ufshcd_setup_vreg (hba, false);ufshcd_suspend_clkscaling (hba); -if (ufshcd_is_clkscaling_supported (hba)) { +if (ufshcd_is_clkscaling_supported (hba))if (hba->devfreq)ufshcd_suspend_clkscaling (hba); -destroy_workqueue (hba->clk_scaling.workq); -ufshcd_devfreq_remove (hba); - }ufshcd_setup_clocks (hba, false);ufshcd_setup_hba_vreg (hba, false); hba->is_powered = false;
@@ -7908,6 +7934,7 @@ void ufshcd_remove(struct ufs_hba *hba)ufshcd_disable_intr (hba, hba->intr_mask);ufshcd_hba_stop (hba, true); +ufshcd_exit_clk_scaling (hba);ufshcd_exit_clk_gating (hba);if (ufshcd_is_clkscaling_supported (hba))device_remove_file (hba->dev, &hba->clk_scaling.enable_attr);
@@ -8079,6 +8106,8 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq)ufshcd_init_clk_gating (hba); +ufshcd_init_clk_scaling (hba); +/* * In order to avoid any spurious interrupt immediately after * registering UFS controller interrupt handler, clear any pending UFS
@@ -8117,21 +8146,6 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq) goto out_remove_scsi_host; } -if (ufshcd_is_clkscaling_supported (hba)) { -char wq_name[sizeof ("ufs_clkscaling_00" )]; - -INIT_WORK (&hba->clk_scaling.suspend_work, - ufshcd_clk_scaling_suspend_work); -INIT_WORK (&hba->clk_scaling.resume_work, - ufshcd_clk_scaling_resume_work); - -snprintf (wq_name,sizeof (wq_name),"ufs_clkscaling_%d" , - host->host_no); - hba->clk_scaling.workq =create_singlethread_workqueue (wq_name); - -ufshcd_clkscaling_init_sysfs (hba); - } -/* * Set the default power management level for runtime and system PM. * Default power saving mode is to keep UFS link in Hibern8 state
@@ -8169,6 +8183,7 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq) out_remove_scsi_host:scsi_remove_host (hba->host); exit_gating: +ufshcd_exit_clk_scaling (hba);ufshcd_exit_clk_gating (hba); out_disable: hba->is_irq_enabled = false;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 230/422 ARM: dts: rockchip: Fix erroneous SPI bus dtc warnings on rk3036
In reply to Greg Kroah-HartmanFrom: Rob Herring <[email protected]>
[ Upstream commit 131c3eb428ccd5f0c784b9edb4f72ec296a045d2 ]
dtc has new checks for SPI buses. The rk3036 dts file has a node named spi' which causes false positive warnings. As the node is a pinctrl child node, change the node name to be 'spi-pins' to fix the warnings.
arch/arm/boot/dts/rk3036-evb.dtb: Warning (spi_bus_bridge): /pinctrl/spi: incorrect #address-cells for SPI bus arch/arm/boot/dts/rk3036-kylin.dtb: Warning (spi_bus_bridge): /pinctrl/spi: incorrect #address-cells for SPI bus arch/arm/boot/dts/rk3036-evb.dtb: Warning (spi_bus_bridge): /pinctrl/spi: incorrect #size-cells for SPI bus arch/arm/boot/dts/rk3036-kylin.dtb: Warning (spi_bus_bridge): /pinctrl/spi: incorrect #size-cells for SPI bus
--- arch/arm/boot/dts/rk3036.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/rk3036.dtsi +1 -1
@@ -733,7 +733,7 @@ /* no rts / cts for uart2 */ }; - spi { + spi-pins { spi_txd:spi-txd { rockchip,pins = <1 29 RK_FUNC_3 &pcfg_pull_default>; };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 231/422 arm64: dts: rockchip: Fix I2C bus unit-address error on rk3399-puma-haikou
In reply to Greg Kroah-HartmanFrom: Rob Herring <[email protected]>
[ Upstream commit 501500e65fa96f899230d66153fefd780f08dd34 ]
dtc has new checks for I2C buses. Fix the warnings in unit-addresses.
arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dtb: Warning (i2c_bus_reg): /i2c@ff3d0000/codec@0a: I2C bus unit address format error, expected "a"
--- arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts +1 -1
@@ -131,7 +131,7 @@ status = "okay"; clock-frequency = <400000>; - sgtl5000: codec@0a { + sgtl5000: codec@a { compatible = "fsl,sgtl5000"; reg = <0x0a>; clocks = <&sgtl5000_clk>;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 232/422 ACPI / LPSS: Exclude I2C busses shared with PUNIT from pmc_atom_d3_mask
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit 86b62e5cd8965d3056f9e9ccdec51631c37add81 ]
lpss_iosf_enter_d3_state() checks if all hw-blocks using the DMA controllers are in d3 before powering down the DMA controllers.
But on devices, where the I2C bus connected to the PMIC is shared by the PUNIT, the controller for that bus will never reach d3 since it has an effectively empty _PS3 method. Instead it appears to automatically power-down during S0i3 and we never see it as being in d3.
This causes the DMA controllers to never be powered-down on these devices, causing them to never reach S0i3. This commit uses the ACPI _SEM method to detect if an I2C bus is shared with the PUNIT and if it is, it removes it from the mask of devices which lpss_iosf_enter_d3_state() checks for.
This fixes these devices never reaching any S0ix states.
--- drivers/acpi/acpi_lpss.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-)
drivers/acpi/acpi_lpss.c +20 -2
@@ -99,6 +99,9 @@ struct lpss_private_data {u32 prv_reg_ctx[LPSS_PRV_REG_COUNT ]; }; +/* Devices which need to be in D3 before lpss_iosf_enter_d3_state() proceeds */ +static u32 pmc_atom_d3_mask =0xfe000ffe ; +/* LPSS run time quirks */ static unsigned int lpss_quirks;
@@ -175,6 +178,21 @@ static void byt_pwm_setup(struct lpss_private_data *pdata)static void byt_i2c_setup (struct lpss_private_data *pdata) { +const char *uid_str =acpi_device_uid (pdata->adev); +acpi_handle handle = pdata->adev->handle; +unsigned long long shared_host =0 ; +acpi_status status; +long uid =0 ; + +/* Expected to always be true, but better safe then sorry */ +if (uid_str) + uid =simple_strtol (uid_str,NULL ,10 ); + +/* Detect I2C bus shared with PUNIT and ignore its d3 status */ + status =acpi_evaluate_integer (handle,"_SEM" ,NULL , &shared_host); +if (ACPI_SUCCESS (status) && shared_host && uid) + pmc_atom_d3_mask &= ~(BIT_LPSS2_F1_I2C1 << (uid -1 )); +lpss_deassert_reset (pdata);if (readl (pdata->mmio_base + pdata->dev_desc->prv_offset))
@@ -894,7 +912,7 @@ static void lpss_iosf_enter_d3_state(void)* Here we read the values related to LPSS power island, i.e. LPSS * devices, excluding both LPSS DMA controllers, along with SCC domain. */ -u32 func_dis, d3_sts_0, pmc_status, pmc_mask =0xfe000ffe ; +u32 func_dis, d3_sts_0, pmc_status;int ret; ret =pmc_atom_read (PMC_FUNC_DIS , &func_dis);
@@ -912,7 +930,7 @@ static void lpss_iosf_enter_d3_state(void)* Shutdown both LPSS DMA controllers if and only if all other devices * are already in D3hot. */ - pmc_status = (~(d3_sts_0 | func_dis)) & pmc_mask; + pmc_status = (~(d3_sts_0 | func_dis)) & pmc_atom_d3_mask;if (pmc_status) goto exit;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 233/422 netfilter: nf_tables: avoid BUG_ON usage
In reply to Greg Kroah-HartmanFrom: Florian Westphal <[email protected]>
[ Upstream commit fa5950e498e7face21a1761f327e6c1152f778c3 ]
None of these spots really needs to crash the kernel.
In one two cases we can jsut report error to userspace, in the other cases we can just use WARN_ON (and leak memory instead).
--- net/netfilter/nf_tables_api.c | 9 ++++++--- net/netfilter/nft_cmp.c | 6 ++++-- net/netfilter/nft_reject.c | 6 ++++-- 3 files changed, 14 insertions(+), 7 deletions(-)
net/netfilter/nf_tables_api.c +6 -3
@@ -1031,7 +1031,8 @@ static int nf_tables_deltable(struct net *net, struct sock *nlsk,static void nf_tables_table_destroy (struct nft_ctx *ctx) { -BUG_ON (ctx->table->use >0 ); +if (WARN_ON (ctx->table->use >0 )) +return ;rhltable_destroy (&ctx->table->chains_ht);kfree (ctx->table->name);
@@ -1446,7 +1447,8 @@ static void nf_tables_chain_destroy(struct nft_ctx *ctx) {struct nft_chain *chain = ctx->chain; -BUG_ON (chain->use >0 ); +if (WARN_ON (chain->use >0 )) +return ;/* no concurrent access possible anymore */ nf_tables_chain_free_chain_rules (chain);
@@ -7253,7 +7255,8 @@ int __nft_release_basechain(struct nft_ctx *ctx) {struct nft_rule *rule, *nr; -BUG_ON (!nft_is_base_chain (ctx->chain)); +if (WARN_ON (!nft_is_base_chain (ctx->chain))) +return 0 ;nf_tables_unregister_hook (ctx->net, ctx->chain->table, ctx->chain);list_for_each_entry_safe (rule, nr, &ctx->chain->rules, list) {
net/netfilter/nft_cmp.c +4 -2
@@ -79,7 +79,8 @@ static int nft_cmp_init(const struct nft_ctx *ctx, const struct nft_expr *expr, err =nft_data_init (NULL , &priv->data,sizeof (priv->data), &desc, tb[NFTA_CMP_DATA ]); -BUG_ON (err <0 ); +if (err <0 ) +return err; priv->sreg =nft_parse_register (tb[NFTA_CMP_SREG ]); err =nft_validate_register_load (priv->sreg, desc.len);
@@ -129,7 +130,8 @@ static int nft_cmp_fast_init(const struct nft_ctx *ctx, err =nft_data_init (NULL , &data,sizeof (data), &desc, tb[NFTA_CMP_DATA ]); -BUG_ON (err <0 ); +if (err <0 ) +return err; priv->sreg =nft_parse_register (tb[NFTA_CMP_SREG ]); err =nft_validate_register_load (priv->sreg, desc.len);
net/netfilter/nft_reject.c +4 -2
@@ -94,7 +94,8 @@ static u8 icmp_code_v4[NFT_REJECT_ICMPX_MAX + 1] = {int nft_reject_icmp_code (u8 code) { -BUG_ON (code >NFT_REJECT_ICMPX_MAX ); +if (WARN_ON_ONCE (code >NFT_REJECT_ICMPX_MAX )) +return ICMP_NET_UNREACH ;return icmp_code_v4[code]; }
@@ -111,7 +112,8 @@ static u8 icmp_code_v6[NFT_REJECT_ICMPX_MAX + 1] = {int nft_reject_icmpv6_code (u8 code) { -BUG_ON (code >NFT_REJECT_ICMPX_MAX ); +if (WARN_ON_ONCE (code >NFT_REJECT_ICMPX_MAX )) +return ICMPV6_NOROUTE ;return icmp_code_v6[code]; }
Signature · 1 line
2.20.1
Re: [PATCH 4.19 233/422] netfilter: nf_tables: avoid BUG_ON usage
Hi!
Quoted 7 lines
From: Florian Westphal <[email protected]>
[ Upstream commit
fa5950e498e7face21a1761f327e6c1152f778c3]None of these spots really needs to crash the kernel.
In one two cases we can jsut report error to userspace, in the other cases we can just useWARN_ON(and leak memory instead).
Do these conditions trigger for someone, to warrant -stable patch?
Quoted 12 lines
+++
b/net/netfilter/nft_cmp.cnet/netfilter/nft_cmp.c +2
-1@@ -79,7 +79,8 @@ static int nft_cmp_init(const struct nft_ctx *ctx, const struct nft_expr *expr, err =nft_data_init (NULL , &priv->data,sizeof (priv->data), &desc, tb[NFTA_CMP_DATA ]); -BUG_ON (err <0 ); +if (err <0 ) +return err; priv->sreg =nft_parse_register (tb[NFTA_CMP_SREG ]); err =nft_validate_register_load (priv->sreg, desc.len);
net/netfilter/nft_cmp.c static int nft_cmp_fast_init(const struct nft_ctx *ctx, · line 137
Quoted 9 lines
net/netfilter/nft_cmp.c +2
-1@@ -129,7 +130,8 @@ static int nft_cmp_fast_init(const struct nft_ctx *ctx, err =nft_data_init (NULL , &data,sizeof (data), &desc, tb[NFTA_CMP_DATA ]); -BUG_ON (err <0 ); +if (err <0 ) +return err; priv->sreg =nft_parse_register (tb[NFTA_CMP_SREG ]); err =nft_validate_register_load (priv->sreg, desc.len);
This goes from "kill kernel with backtrace" to "silently return failure". Should WARN_ON() be preserved here?
Best regards,
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Greg Kroah-Hartman
maintainerRe: [PATCH 4.19 233/422] netfilter: nf_tables: avoid BUG_ON usage
Quoted 31 lines · Pavel Machek
Hi!
Quoted 7 lines
From: Florian Westphal <[email protected]>
[ Upstream commit
fa5950e498e7face21a1761f327e6c1152f778c3]None of these spots really needs to crash the kernel.
In one two cases we can jsut report error to userspace, in the other cases we can just useWARN_ON(and leak memory instead).Do these conditions trigger for someone, to warrant -stable patch?
Quoted 19 lines
+++
b/net/netfilter/nft_cmp.cnet/netfilter/nft_cmp.c +4
-2@@ -79,7 +79,8 @@ static int nft_cmp_init(const struct nft_ctx *ctx, const struct nft_expr *expr, err =nft_data_init (NULL , &priv->data,sizeof (priv->data), &desc, tb[NFTA_CMP_DATA ]); -BUG_ON (err <0 ); +if (err <0 ) +return err; priv->sreg =nft_parse_register (tb[NFTA_CMP_SREG ]); err =nft_validate_register_load (priv->sreg, desc.len);@@ -129,7 +130,8 @@ static int nft_cmp_fast_init(const struct nft_ctx *ctx, err =nft_data_init (NULL , &data,sizeof (data), &desc, tb[NFTA_CMP_DATA ]); -BUG_ON (err <0 ); +if (err <0 ) +return err;
Quoted 5 lines
Review static int nft_cmp_fast_init(const struct nft_ctx *ctx, · line 137
Quoted 2 lines
(quoted diff) +0
-0priv->sreg = nft_parse_register(tb[NFTA_CMP_SREG]); err = nft_validate_register_load(priv->sreg, desc.len);This goes from "kill kernel with backtrace" to "silently return failure". Should
WARN_ON()be preserved here?
if this can be triggered, then the people running with panic-on-warn would reboot. It's best to handle it properly here. And it isn't "silent", the error is returned.
thanks,
greg k-h
Re: [PATCH 4.19 233/422] netfilter: nf_tables: avoid BUG_ON usage
In reply to Pavel MachekQuoted 2 lines · Pavel Machek
This goes from "kill kernel with backtrace" to "silently return failure". Should
WARN_ON()be preserved here?
No need. The error would propagate back to userspace via nfnetlink.
So it would be 'running this command fails with error x' vs. 'running this command makes kernel crash'.
That being said, I did not observe this BUG from triggering, ever. I only removed it because I did not see any reason for it.
Greg Kroah-Hartman
maintainerPATCH 234/422 ath9k: Fix a locking bug in ath9k_add_interface()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 461cf036057477805a8a391e5fd0f5264a5e56a8 ]
We tried to revert commit d9c52fd17cb4 ("ath9k: fix tx99 with monitor mode interface") but accidentally missed part of the locking change.
The lock has to be held earlier so that we're holding it when we do "sc->tx99_vif = vif;" and also there in the current code there is a stray unlock before we have taken the lock.
--- drivers/net/wireless/ath/ath9k/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/wireless/ath/ath9k/main.c +1 -2
@@ -1251,6 +1251,7 @@ static int ath9k_add_interface(struct ieee80211_hw *hw,struct ath_vif *avp = (void *)vif->drv_priv;struct ath_node *an = &avp->mcast_node; +mutex_lock (&sc->mutex);if (IS_ENABLED (CONFIG_ATH9K_TX99 )) {if (sc->cur_chan->nvifs >=1 ) {mutex_unlock (&sc->mutex);
@@ -1259,8 +1260,6 @@ static int ath9k_add_interface(struct ieee80211_hw *hw, sc->tx99_vif = vif; } -mutex_lock (&sc->mutex); -ath_dbg (common,CONFIG ,"Attach a VIF of type: %d\n" , vif->type); sc->cur_chan->nvifs++;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 235/422 s390/qeth: uninstall IRQ handler on device removal
In reply to Greg Kroah-HartmanFrom: Julian Wiedmann <[email protected]>
[ Upstream commit 121ca39aa5585def682a2c8592983442438b84dc ]
When setting up, qeth installs its IRQ handler on the ccw devices. But the IRQ handler is not cleared on removal - so even after qeth yields control of the ccw devices, spurious interrupts would still be presented to us.
Make (de-)installation of the IRQ handler part of the ccw channel setup/removal helpers, and while at it also add the appropriate locking. Shift around qeth_setup_channel() to avoid a forward declaration for qeth_irq().
--- drivers/s390/net/qeth_core_main.c | 102 ++++++++++++++++-------------- 1 file changed, 54 insertions(+), 48 deletions(-)
drivers/s390/net/qeth_core_main.c +54 -48
@@ -901,44 +901,6 @@ out:qeth_release_buffer (channel, iob); } -static int qeth_setup_channel (struct qeth_channel *channel,bool alloc_buffers) -{ -int cnt; - -QETH_DBF_TEXT (SETUP ,2 ,"setupch" ); - - channel->ccw =kmalloc (sizeof (struct ccw1 ),GFP_KERNEL |GFP_DMA ); -if (!channel->ccw) -return -ENOMEM ; - channel->state =CH_STATE_DOWN ; -atomic_set (&channel->irq_pending,0 ); -init_waitqueue_head (&channel->wait_q); - -if (!alloc_buffers) -return 0 ; - -for (cnt =0 ; cnt <QETH_CMD_BUFFER_NO ; cnt++) { - channel->iob[cnt].data = -kzalloc (QETH_BUFSIZE ,GFP_DMA |GFP_KERNEL ); -if (channel->iob[cnt].data ==NULL ) -break ; - channel->iob[cnt].state =BUF_STATE_FREE ; - channel->iob[cnt].channel = channel; - channel->iob[cnt].callback = qeth_send_control_data_cb; - channel->iob[cnt].rc =0 ; - } -if (cnt <QETH_CMD_BUFFER_NO ) { -kfree (channel->ccw); -while (cnt-- >0 ) -kfree (channel->iob[cnt].data); -return -ENOMEM ; - } - channel->io_buf_no =0 ; -spin_lock_init (&channel->iob_lock); - -return 0 ; -} -static int qeth_set_thread_start_bit (struct qeth_card *card,unsigned long thread) {
@@ -1339,14 +1301,61 @@ static void qeth_free_buffer_pool(struct qeth_card *card)static void qeth_clean_channel (struct qeth_channel *channel) { +struct ccw_device *cdev = channel->ccwdev;int cnt;QETH_DBF_TEXT (SETUP ,2 ,"freech" ); + +spin_lock_irq (get_ccwdev_lock (cdev)); + cdev->handler =NULL ; +spin_unlock_irq (get_ccwdev_lock (cdev)); +for (cnt =0 ; cnt <QETH_CMD_BUFFER_NO ; cnt++)kfree (channel->iob[cnt].data);kfree (channel->ccw); } +static int qeth_setup_channel (struct qeth_channel *channel,bool alloc_buffers) +{ +struct ccw_device *cdev = channel->ccwdev; +int cnt; + +QETH_DBF_TEXT (SETUP ,2 ,"setupch" ); + + channel->ccw =kmalloc (sizeof (struct ccw1 ),GFP_KERNEL |GFP_DMA ); +if (!channel->ccw) +return -ENOMEM ; + channel->state =CH_STATE_DOWN ; +atomic_set (&channel->irq_pending,0 ); +init_waitqueue_head (&channel->wait_q); + +spin_lock_irq (get_ccwdev_lock (cdev)); + cdev->handler = qeth_irq; +spin_unlock_irq (get_ccwdev_lock (cdev)); + +if (!alloc_buffers) +return 0 ; + +for (cnt =0 ; cnt <QETH_CMD_BUFFER_NO ; cnt++) { + channel->iob[cnt].data = +kzalloc (QETH_BUFSIZE ,GFP_DMA |GFP_KERNEL ); +if (channel->iob[cnt].data ==NULL ) +break ; + channel->iob[cnt].state =BUF_STATE_FREE ; + channel->iob[cnt].channel = channel; + channel->iob[cnt].callback = qeth_send_control_data_cb; + channel->iob[cnt].rc =0 ; + } +if (cnt <QETH_CMD_BUFFER_NO ) { +qeth_clean_channel (channel); +return -ENOMEM ; + } + channel->io_buf_no =0 ; +spin_lock_init (&channel->iob_lock); + +return 0 ; +} +static void qeth_set_single_write_queues (struct qeth_card *card) { if ((atomic_read(&card->qdio.state) != QETH_QDIO_UNINITIALIZED) &&
@@ -1498,7 +1507,7 @@ static void qeth_core_sl_print(struct seq_file *m, struct service_level *slr) CARD_BUS_ID(card), card->info.mcl_level); } -static struct qeth_card *qeth_alloc_card (void ) +static struct qeth_card *qeth_alloc_card (struct ccwgroup_device *gdev) {struct qeth_card *card;
@@ -1507,6 +1516,11 @@ static struct qeth_card *qeth_alloc_card(void)if (!card) goto out;QETH_DBF_HEX (SETUP ,2 , &card,sizeof (void *)); + + card->gdev = gdev; +CARD_RDEV (card) = gdev->cdev[0 ]; +CARD_WDEV (card) = gdev->cdev[1 ]; +CARD_DDEV (card) = gdev->cdev[2 ];if (qeth_setup_channel (&card->read, true)) goto out_ip;if (qeth_setup_channel (&card->write, true))
@@ -5745,7 +5759,7 @@ static int qeth_core_probe_device(struct ccwgroup_device *gdev)QETH_DBF_TEXT_ (SETUP ,2 ,"%s" ,dev_name (&gdev->dev)); - card =qeth_alloc_card (); + card =qeth_alloc_card (gdev);if (!card) {QETH_DBF_TEXT_ (SETUP ,2 ,"1err%d" , -ENOMEM ); rc = -ENOMEM ;
@@ -5761,15 +5775,7 @@ static int qeth_core_probe_device(struct ccwgroup_device *gdev) goto err_card; } - card->read.ccwdev = gdev->cdev[0 ]; - card->write.ccwdev = gdev->cdev[1 ]; - card->data.ccwdev = gdev->cdev[2 ];dev_set_drvdata (&gdev->dev, card); - card->gdev = gdev; - gdev->cdev[0 ]->handler = qeth_irq; - gdev->cdev[1 ]->handler = qeth_irq; - gdev->cdev[2 ]->handler = qeth_irq; -qeth_setup_card (card); rc =qeth_update_from_chp_desc (card);if (rc)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 236/422 s390/qeth: invoke softirqs after napi_schedule()
In reply to Greg Kroah-HartmanFrom: Julian Wiedmann <[email protected]>
[ Upstream commit 4d19db777a2f32c9b76f6fd517ed8960576cb43e ]
Calling napi_schedule() from process context does not ensure that the NET_RX softirq is run in a timely fashion. So trigger it manually.
This is no big issue with current code. A call to ndo_open() is usually followed by a ndo_set_rx_mode() call, and for qeth this contains a spin_unlock_bh(). Except for OSN, where qeth_l2_set_rx_mode() bails out early.
Nevertheless it's best to not depend on this behaviour, and just fix the issue at its source like all other drivers do. For instance see commit 83a0c6e58901 ("i40e: Invoke softirqs after napi_reschedule").
--- drivers/s390/net/qeth_l2_main.c | 3 +++ drivers/s390/net/qeth_l3_main.c | 3 +++ 2 files changed, 6 insertions(+)
drivers/s390/net/qeth_l2_main.c +3 -0
@@ -789,7 +789,10 @@ static int __qeth_l2_open(struct net_device *dev)if (qdio_stop_irq (card->data.ccwdev,0 ) >=0 ) {napi_enable (&card->napi); +local_bh_disable ();napi_schedule (&card->napi); +/* kick-start the NAPI softirq: */ +local_bh_enable (); }else rc = -EIO ;return rc;
drivers/s390/net/qeth_l3_main.c +3 -0
@@ -2414,7 +2414,10 @@ static int __qeth_l3_open(struct net_device *dev)if (qdio_stop_irq (card->data.ccwdev,0 ) >=0 ) {napi_enable (&card->napi); +local_bh_disable ();napi_schedule (&card->napi); +/* kick-start the NAPI softirq: */ +local_bh_enable (); }else rc = -EIO ;return rc;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 237/422 media: vsp1: Fix vsp1_regs.h license header
In reply to Greg Kroah-HartmanFrom: Laurent Pinchart <[email protected]>
[ Upstream commit 5eea860a6fec1e60709d19832015ee0991d3e80c ]
All source files of the vsp1 driver are licensed under the GPLv2+ except for vsp1_regs.h which is licensed under GPLv2. This is caused by a bad copy&paste that dates back from the initial version of the driver. Fix it.
--- drivers/media/platform/vsp1/vsp1_regs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/vsp1/vsp1_regs.h +1 -1
@@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * vsp1_regs.h -- R-Car VSP1 Registers Definitions *
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 238/422 media: vsp1: Fix YCbCr planar formats pitch calculation
In reply to Greg Kroah-HartmanFrom: Koji Matsuoka <[email protected]>
[ Upstream commit 9b2798d5b71c50f64c41a40f0cbcae47c3fbd067 ]
YCbCr planar formats can have different pitch values for the luma and chroma planes. This isn't taken into account in the driver. Fix it.
Based on a BSP patch from Koji Matsuoka <[email protected]>.
--- drivers/media/platform/vsp1/vsp1_drm.c | 11 ++++++++++- include/media/vsp1.h | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-)
drivers/media/platform/vsp1/vsp1_drm.c +10 -1
@@ -770,6 +770,7 @@ int vsp1_du_atomic_update(struct device *dev, unsigned int pipe_index,struct vsp1_device *vsp1 =dev_get_drvdata (dev);struct vsp1_drm_pipeline *drm_pipe = &vsp1->drm->pipe[pipe_index];const struct vsp1_format_info *fmtinfo; +unsigned int chroma_hsub;struct vsp1_rwpf *rpf;if (rpf_index >= vsp1->info->rpf_count)
@@ -810,10 +811,18 @@ int vsp1_du_atomic_update(struct device *dev, unsigned int pipe_index,return -EINVAL ; } +/* +* Only formats with three planes can affect the chroma planes pitch. +* All formats with two planes have a horizontal subsampling value of 2, +* but combine U and V in a single chroma plane, which thus results in +* the luma plane and chroma plane having the same pitch. +*/ + chroma_hsub = (fmtinfo->planes ==3 ) ? fmtinfo->hsub :1 ; + rpf->fmtinfo = fmtinfo; rpf->format.num_planes = fmtinfo->planes; rpf->format.plane_fmt[0 ].bytesperline = cfg->pitch; - rpf->format.plane_fmt[1 ].bytesperline = cfg->pitch; + rpf->format.plane_fmt[1 ].bytesperline = cfg->pitch / chroma_hsub; rpf->alpha = cfg->alpha; rpf->mem.addr[0 ] = cfg->mem[0 ];
include/media/vsp1.h +1 -1
@@ -46,7 +46,7 @@ int vsp1_du_setup_lif(struct device *dev, unsigned int pipe_index,/** * struct vsp1_du_atomic_config - VSP atomic configuration parameters * @pixelformat: plane pixel format (V4L2 4CC) -* @pitch: line pitch in bytes, for all planes +* @pitch: line pitch in bytes for the first plane * @mem: DMA memory address for each plane of the frame buffer * @src: source rectangle in the frame buffer (integer coordinates) * @dst: destination rectangle on the display (integer coordinates)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 239/422 media: ov2680: dont register the v4l2 subdevice before checking chip ID
In reply to Greg Kroah-HartmanFrom: Javier Martinez Canillas <[email protected]>
[ Upstream commit b7a417628abf49dae98cb80a272dc133b0e4d1a3 ]
The driver registers the v4l2 subdevice before attempting to power on the chip and checking its ID. This means that a media device driver that it's waiting for this subdevice to be bound, will prematurely expose its media device node to userspace because if something goes wrong the media entity will be cleaned up again on the ov2680 probe function.
This also simplifies the probe function error path since no initialization is made before attempting to enable the resources or checking the chip ID.
--- drivers/media/i2c/ov2680.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-)
drivers/media/i2c/ov2680.c +4 -10
@@ -1088,26 +1088,20 @@ static int ov2680_probe(struct i2c_client *client)mutex_init (&sensor->lock); - ret =ov2680_v4l2_init (sensor); + ret =ov2680_check_id (sensor);if (ret <0 ) goto lock_destroy; - ret =ov2680_check_id (sensor); + ret =ov2680_v4l2_init (sensor);if (ret <0 ) - goto error_cleanup; + goto lock_destroy;dev_info (dev,"ov2680 init correctly\n" );return 0 ; -error_cleanup: -dev_err (dev,"ov2680 init fail: %d\n" , ret); - -media_entity_cleanup (&sensor->sd.entity); -v4l2_async_unregister_subdev (&sensor->sd); -v4l2_ctrl_handler_free (&sensor->ctrls.handler); - lock_destroy: +dev_err (dev,"ov2680 init fail: %d\n" , ret);mutex_destroy (&sensor->lock);return ret;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 240/422 PCI/ACPI: Correct error message for ASPM disabling
In reply to Greg Kroah-HartmanFrom: Sinan Kaya <[email protected]>
[ Upstream commit 1ad61b612b95980a4d970c52022aa01dfc0f6068 ]
If _OSC execution fails today for platforms without an _OSC entry, code is printing a misleading message saying disabling ASPM as follows:
acpi PNP0A03:00: _OSC failed (AE_NOT_FOUND); disabling ASPM
We need to ensure that platform supports ASPM to begin with.
--- drivers/acpi/pci_root.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/acpi/pci_root.c +3 -2
@@ -455,8 +455,9 @@ static void negotiate_os_control(struct acpi_pci_root *root, int *no_aspm)decode_osc_support (root,"OS supports" , support); status =acpi_pci_osc_support (root, support);if (ACPI_FAILURE (status)) { -dev_info (&device->dev,"_OSC failed (%s); disabling ASPM\n" , -acpi_format_exception (status)); +dev_info (&device->dev,"_OSC failed (%s)%s\n" , +acpi_format_exception (status), +pcie_aspm_support_enabled () ?"; disabling ASPM" :"" ); *no_aspm =1 ;return ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 241/422 net: socionext: Fix two sleep-in-atomic-context bugs in ave_rxfifo_reset()
In reply to Greg Kroah-HartmanFrom: Jia-Ju Bai <[email protected]>
[ Upstream commit 0020f5c807ef67954d9210eea0ba17a6134cdf7d ]
The driver may sleep with holding a spinlock.
The function call paths (from bottom to top) in Linux-4.17 are:
[FUNC] usleep_rangedrivers/net/ethernet/socionext/sni_ave.c, 892:
usleep_range in ave_rxfifo_resetdrivers/net/ethernet/socionext/sni_ave.c, 932:
ave_rxfifo_reset in ave_irq_handler
[FUNC] usleep_rangedrivers/net/ethernet/socionext/sni_ave.c, 888:
usleep_range in ave_rxfifo_resetdrivers/net/ethernet/socionext/sni_ave.c, 932:
ave_rxfifo_reset in ave_irq_handler
To fix these bugs, usleep_range() is replaced with udelay().
These bugs are found by my static analysis tool DSAC.
--- drivers/net/ethernet/socionext/sni_ave.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/socionext/sni_ave.c +2 -2
@@ -906,11 +906,11 @@ static void ave_rxfifo_reset(struct net_device *ndev)/* assert reset */ writel (AVE_GRR_RXFFR , priv->base +AVE_GRR ); -usleep_range (40 ,50 ); +udelay (50 );/* negate reset */ writel (0 , priv->base +AVE_GRR ); -usleep_range (10 ,20 ); +udelay (20 );/* negate interrupt status */ writel (AVE_GI_RXOVF , priv->base +AVE_GISR );
Signature · 1 line
2.20.1
Re: [PATCH 4.19 241/422] net: socionext: Fix two sleep-in-atomic-context bugs in ave_rxfifo_reset()
Hi!
Quoted 11 lines
[ Upstream commit
0020f5c807ef67954d9210eea0ba17a6134cdf7d]The driver may sleep with holding a spinlock.
The function call paths (from bottom to top) in Linux-4.17 are:[FUNC]
usleep_rangedrivers/net/ethernet/socionext/sni_ave.c, 892:
usleep_rangeinave_rxfifo_resetdrivers/net/ethernet/socionext/sni_ave.c, 932:
ave_rxfifo_resetinave_irq_handler
Quoted 7 lines
[FUNC]
usleep_rangedrivers/net/ethernet/socionext/sni_ave.c, 888:
usleep_rangeinave_rxfifo_resetdrivers/net/ethernet/socionext/sni_ave.c, 932:
ave_rxfifo_resetinave_irq_handlerTo fix these bugs,
usleep_range()is replaced withudelay().
I don't believe this is serious enough for -stable, but more importantly:
drivers/net/ethernet/socionext/sni_ave.c static void ave_rxfifo_reset(struct net_device *ndev) · line 914
Quoted 13 lines
+++
b/drivers/net/ethernet/socionext/sni_ave.cdrivers/net/ethernet/socionext/sni_ave.c +2
-2@@ -906,11 +906,11 @@ static void ave_rxfifo_reset(struct net_device *ndev)/* assert reset */ writel (AVE_GRR_RXFFR , priv->base +AVE_GRR ); -usleep_range (40 ,50 ); +udelay (50 );/* negate reset */ writel (0 , priv->base +AVE_GRR ); -usleep_range (10 ,20 ); +udelay (20 );
udelay(40) / udelay(10) should be enough here.
Best regards,
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Greg Kroah-Hartman
maintainerRe: [PATCH 4.19 241/422] net: socionext: Fix two sleep-in-atomic-context bugs in ave_rxfifo_reset()
Quoted 19 lines · Pavel Machek
Hi!
Quoted 17 lines
[ Upstream commit
0020f5c807ef67954d9210eea0ba17a6134cdf7d]The driver may sleep with holding a spinlock.
The function call paths (from bottom to top) in Linux-4.17 are:[FUNC]
usleep_rangedrivers/net/ethernet/socionext/sni_ave.c, 892:
usleep_rangeinave_rxfifo_resetdrivers/net/ethernet/socionext/sni_ave.c, 932:
ave_rxfifo_resetinave_irq_handler[FUNC]
usleep_rangedrivers/net/ethernet/socionext/sni_ave.c, 888:
usleep_rangeinave_rxfifo_resetdrivers/net/ethernet/socionext/sni_ave.c, 932:
ave_rxfifo_resetinave_irq_handler
Quoted 4 lines
Quoted 1 line
To fix these bugs,
usleep_range()is replaced withudelay().I don't believe this is serious enough for -stable, but more importantly:
Sleeping in a spinlock is not allowed, yes, this is a bugfix worth of stable, how could it not?
Quoted 8 lines
Quoted 8 lines
+++
b/drivers/net/ethernet/socionext/sni_ave.cdrivers/net/ethernet/socionext/sni_ave.c +1
-1@@ -906,11 +906,11 @@ static void ave_rxfifo_reset(struct net_device *ndev)/* assert reset */ writel (AVE_GRR_RXFFR , priv->base +AVE_GRR ); -usleep_range (40 ,50 ); +udelay (50 );
Quoted 7 lines
drivers/net/ethernet/socionext/sni_ave.c static void ave_rxfifo_reset(struct net_device *ndev) · line 914
Quoted 5 lines
drivers/net/ethernet/socionext/sni_ave.c +1
-1/* negate reset */ writel (0 , priv->base +AVE_GRR ); -usleep_range (10 ,20 ); +udelay (20 );udelay(40) / udelay(10) should be enough here.
Maybe not, this way is safe, right?
greg k-h
Greg Kroah-Hartman
maintainerPATCH 242/422 PCI: mediatek: Fix unchecked return value
In reply to Greg Kroah-HartmanFrom: Gustavo A. R. Silva <[email protected]>
[ Upstream commit 17a0a1e5f6c4bd6df17834312ff577c1373d87b8 ]
Check return value of devm_pci_remap_iospace().
Addresses-Coverity-ID: 1471965 ("Unchecked return value")
--- drivers/pci/controller/pcie-mediatek.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/pci/controller/pcie-mediatek.c +3 -1
@@ -1120,7 +1120,9 @@ static int mtk_pcie_request_resources(struct mtk_pcie *pcie)if (err <0 )return err; -devm_pci_remap_iospace (dev, &pcie->pio, pcie->io.start); + err =devm_pci_remap_iospace (dev, &pcie->pio, pcie->io.start); +if (err) +return err;return 0 ; }
Signature · 1 line
2.20.1
Re: [PATCH 4.19 242/422] PCI: mediatek: Fix unchecked return value
Hi!
Quoted 9 lines · Greg Kroah-Hartman
[ Upstream commit
17a0a1e5f6c4bd6df17834312ff577c1373d87b8]Check return value of
devm_pci_remap_iospace().index
c5ff6ca65eab2..0d100f56cb884100644
drivers/pci/controller/pcie-mediatek.c static int mtk_pcie_request_resources(struct mtk_pcie *pcie) · line 1128
Quoted 10 lines
drivers/pci/controller/pcie-mediatek.c +3
-1@@ -1120,7 +1120,9 @@ static int mtk_pcie_request_resources(struct mtk_pcie *pcie)if (err <0 )return err; -devm_pci_remap_iospace (dev, &pcie->pio, pcie->io.start); + err =devm_pci_remap_iospace (dev, &pcie->pio, pcie->io.start); +if (err) +return err;return 0 ; }
You can just do return devm_pci_remap_iospace(dev, &pcie->pio, pcie->io.start); instead. No need for if ()...
Best regards,
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Greg Kroah-Hartman
maintainerPATCH 243/422 ARM: dts: xilinx: Fix I2C and SPI bus warnings
In reply to Greg Kroah-HartmanFrom: Rob Herring <[email protected]>
[ Upstream commit f5054ceed420b1f38d37920a4c65446fcc5d6b90 ]
dtc has new checks for I2C and SPI buses. Fix the warnings in node names and unit-addresses.
arch/arm/boot/dts/zynq-zc702.dtb: Warning (i2c_bus_reg): /amba/i2c@e0004000/i2c-mux@74/i2c@7/hwmon@52: I2C bus unit address format error, expected "34" arch/arm/boot/dts/zynq-zc702.dtb: Warning (i2c_bus_reg): /amba/i2c@e0004000/i2c-mux@74/i2c@7/hwmon@53: I2C bus unit address format error, expected "35" arch/arm/boot/dts/zynq-zc702.dtb: Warning (i2c_bus_reg): /amba/i2c@e0004000/i2c-mux@74/i2c@7/hwmon@54: I2C bus unit address format error, expected "36" arch/arm/boot/dts/zynq-zc770-xm013.dtb: Warning (spi_bus_reg): /amba/spi@e0006000/eeprom@0: SPI bus unit address format error, expected "2" arch/arm/boot/dts/zynq-zc770-xm010.dtb: Warning (spi_bus_reg): /amba/spi@e0007000/flash@0: SPI bus unit address format error, expected "1"
--- arch/arm/boot/dts/zynq-zc702.dts | 12 ++++++------ arch/arm/boot/dts/zynq-zc770-xm010.dts | 2 +- arch/arm/boot/dts/zynq-zc770-xm013.dts | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-)
arch/arm/boot/dts/zynq-zc702.dts +6 -6
@@ -174,17 +174,17 @@ #address-cells = <1>; #size-cells = <0>; reg = <7>; - hwmon@52 { + hwmon@34 { compatible = "ti,ucd9248"; - reg = <52>; + reg = <0x34>; }; - hwmon@53 { + hwmon@35 { compatible = "ti,ucd9248"; - reg = <53>; + reg = <0x35>; }; - hwmon@54 { + hwmon@36 { compatible = "ti,ucd9248"; - reg = <54>; + reg = <0x36>; }; }; };
arch/arm/boot/dts/zynq-zc770-xm010.dts +1 -1
@@ -68,7 +68,7 @@ status = "okay"; num-cs = <4>; is-decoded-cs = <0>; - flash@0 { + flash@1 { compatible = "sst25wf080", "jedec,spi-nor"; reg = <1>; spi-max-frequency = <1000000>;
arch/arm/boot/dts/zynq-zc770-xm013.dts +1 -1
@@ -62,7 +62,7 @@ status = "okay"; num-cs = <4>; is-decoded-cs = <0>; - eeprom: eeprom@0 { + eeprom: eeprom@2 { at25,byte-len = <8192>; at25,addr-mode = <2>; at25,page-size = <32>;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 244/422 serial: uartps: Fix suspend functionality
In reply to Greg Kroah-HartmanFrom: Nava kishore Manne <[email protected]>
[ Upstream commit 4b9d33c6a30688344a3e95179654ea31b07f59b7 ]
The driver's suspend/resume functions were buggy. If UART node contains any child node in the DT and the child is established a communication path with the parent UART. The relevant /dev/ttyPS* node will be not available for other operations.
If the driver is trying to do any operations like suspend/resume without checking the tty->dev status it leads to the kernel crash/hang.
This patch fix this issue by call the device_may_wake() with the generic parameter of type struct device. in the uart suspend and resume paths.
It also fixes a race condition in the uart suspend path(i.e uart_suspend_port() should be called at the end of cdns_uart_suspend API this path updates the same)
--- drivers/tty/serial/xilinx_uartps.c | 41 +++++++++--------------------- 1 file changed, 12 insertions(+), 29 deletions(-)
drivers/tty/serial/xilinx_uartps.c +12 -29
@@ -1279,24 +1279,11 @@ static struct uart_driver cdns_uart_uart_driver = {static int cdns_uart_suspend (struct device *device) {struct uart_port *port =dev_get_drvdata (device); -struct tty_struct *tty; -struct device *tty_dev; -int may_wake =0 ; - -/* Get the tty which could be NULL so don't assume it's valid */ - tty =tty_port_tty_get (&port->state->port); -if (tty) { - tty_dev = tty->dev; - may_wake =device_may_wakeup (tty_dev); -tty_kref_put (tty); - } +int may_wake; -/* -* Call the API provided in serial_core.c file which handles -* the suspend. -*/ -uart_suspend_port (&cdns_uart_uart_driver, port); -if (!(console_suspend_enabled && !may_wake)) { + may_wake =device_may_wakeup (device); + +if (console_suspend_enabled && may_wake) {unsigned long flags =0 ;spin_lock_irqsave (&port->lock, flags);
@@ -1311,7 +1298,11 @@ static int cdns_uart_suspend(struct device *device)spin_unlock_irqrestore (&port->lock, flags); } -return 0 ; +/* +* Call the API provided in serial_core.c file which handles +* the suspend. +*/ +return uart_suspend_port (&cdns_uart_uart_driver, port); }/**
@@ -1325,17 +1316,9 @@ static int cdns_uart_resume(struct device *device)struct uart_port *port =dev_get_drvdata (device);unsigned long flags =0 ;u32 ctrl_reg; -struct tty_struct *tty; -struct device *tty_dev; -int may_wake =0 ; - -/* Get the tty which could be NULL so don't assume it's valid */ - tty =tty_port_tty_get (&port->state->port); -if (tty) { - tty_dev = tty->dev; - may_wake =device_may_wakeup (tty_dev); -tty_kref_put (tty); - } +int may_wake; + + may_wake =device_may_wakeup (device);if (console_suspend_enabled && !may_wake) {struct cdns_uart *cdns_uart = port->private_data;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 245/422 serial: samsung: Enable baud clock for UART reset procedure in resume
In reply to Greg Kroah-HartmanFrom: Marek Szyprowski <[email protected]>
[ Upstream commit 1ff3652bc7111df26b5807037f624be294cf69d5 ]
Ensure that the baud clock is also enabled for UART register writes in driver resume. On Exynos5433 SoC this is needed to avoid external abort issue.
--- drivers/tty/serial/samsung.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/tty/serial/samsung.c +8 -0
@@ -1944,7 +1944,11 @@ static int s3c24xx_serial_resume(struct device *dev)if (port) {clk_prepare_enable (ourport->clk); +if (!IS_ERR (ourport->baudclk)) +clk_prepare_enable (ourport->baudclk);s3c24xx_serial_resetport (port,s3c24xx_port_to_cfg (port)); +if (!IS_ERR (ourport->baudclk)) +clk_disable_unprepare (ourport->baudclk);clk_disable_unprepare (ourport->clk);uart_resume_port (&s3c24xx_uart_drv, port);
@@ -1967,7 +1971,11 @@ static int s3c24xx_serial_resume_noirq(struct device *dev)if (rx_enabled (port)) uintm &= ~S3C64XX_UINTM_RXD_MSK ;clk_prepare_enable (ourport->clk); +if (!IS_ERR (ourport->baudclk)) +clk_prepare_enable (ourport->baudclk);wr_regl (port,S3C64XX_UINTM , uintm); +if (!IS_ERR (ourport->baudclk)) +clk_disable_unprepare (ourport->baudclk);clk_disable_unprepare (ourport->clk); } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 246/422 serial: mxs-auart: Fix potential infinite loop
In reply to Greg Kroah-HartmanFrom: Anton Vasilyev <[email protected]>
[ Upstream commit 5963e8a3122471cadfe0eba41c4ceaeaa5c8bb4d ]
On the error path of mxs_auart_request_gpio_irq() is performed backward iterating with index i of enum type. Underline enum type may be unsigned char. In this case check (--i >= 0) will be always true and error handling goes into infinite loop.
The patch changes the check so that it is valid for signed and unsigned types.
Found by Linux Driver Verification project (linuxtesting.org).
--- drivers/tty/serial/mxs-auart.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/tty/serial/mxs-auart.c +2 -1
@@ -1634,8 +1634,9 @@ static int mxs_auart_request_gpio_irq(struct mxs_auart_port *s)/* * If something went wrong, rollback. +* Be careful: i may be unsigned. */ -while (err && (--i >=0 )) +while (err && (i-- >0 ))if (irq[i] >=0 )free_irq (irq[i], s);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 247/422 tty: serial: qcom_geni_serial: Fix serial when not used as console
In reply to Greg Kroah-HartmanFrom: Douglas Anderson <[email protected]>
[ Upstream commit c362272bdea32bf048d6916b0a2dc485eb9cf787 ]
If you've got the "console" serial port setup to use just as a UART (AKA there is no "console=ttyMSMX" on the kernel command line) then certain initialization is skipped. When userspace later tries to do something with the port then things go boom (specifically, on my system, some sort of exception hit that caused the system to reboot itself w/ no error messages).
Let's cleanup / refactor the init so that we always run the same init code regardless of whether we're using the console.
To make this work, we make rely on qcom_geni_serial_pm doing its job to turn resources on.
For the record, here is a trace of the order of things (after this patch) when console= is specified on the command line and we have an agetty on the port:
qcom_geni_serial_pm: 4 (undefined) => 0 (on) qcom_geni_console_setup
qcom_geni_serial_port_setup qcom_geni_serial_console_write
qcom_geni_serial_startup
qcom_geni_serial_start_tx
...and here is the order of things (after this patch) when console= is _NOT_ specified on the command line and we have an agetty port:
qcom_geni_serial_pm: 4 => 0
qcom_geni_serial_pm: 0 => 3
qcom_geni_serial_pm: 3 => 0
qcom_geni_serial_startup
qcom_geni_serial_port_setup
qcom_geni_serial_pm: 0 => 3
qcom_geni_serial_pm: 3 => 0
qcom_geni_serial_startup
qcom_geni_serial_start_tx
--- drivers/tty/serial/qcom_geni_serial.c | 55 +++++++++++++-------------- 1 file changed, 26 insertions(+), 29 deletions(-)
drivers/tty/serial/qcom_geni_serial.c +26 -29
@@ -851,6 +851,23 @@ static int qcom_geni_serial_port_setup(struct uart_port *uport) {struct qcom_geni_serial_port *port =to_dev_port (uport, uport);unsigned int rxstale =DEFAULT_BITS_PER_CHAR *STALE_TIMEOUT ; +u32 proto; + +if (uart_console (uport)) + port->tx_bytes_pw =1 ; +else + port->tx_bytes_pw =4 ; + port->rx_bytes_pw =RX_BYTES_PW ; + + proto =geni_se_read_proto (&port->se); +if (proto !=GENI_SE_UART ) { +dev_err (uport->dev,"Invalid FW loaded, proto: %d\n" , proto); +return -ENXIO ; + } + +qcom_geni_serial_stop_rx (uport); + +get_tx_fifo_size (port);set_rfr_wm (port);writel_relaxed (rxstale, uport->membase +SE_UART_RX_STALE_CNT );
@@ -874,30 +891,19 @@ static int qcom_geni_serial_port_setup(struct uart_port *uport)return -ENOMEM ; } port->setup = true; +return 0 ; }static int qcom_geni_serial_startup (struct uart_port *uport) {int ret; -u32 proto;struct qcom_geni_serial_port *port =to_dev_port (uport, uport);scnprintf (port->name,sizeof (port->name),"qcom_serial_%s%d" , (uart_console (uport) ?"console" :"uart" ), uport->line); -if (!uart_console (uport)) { - port->tx_bytes_pw =4 ; - port->rx_bytes_pw =RX_BYTES_PW ; - } - proto =geni_se_read_proto (&port->se); -if (proto !=GENI_SE_UART ) { -dev_err (uport->dev,"Invalid FW loaded, proto: %d\n" , proto); -return -ENXIO ; - } - -get_tx_fifo_size (port);if (!port->setup) { ret =qcom_geni_serial_port_setup (uport);if (ret)
@@ -1056,6 +1062,7 @@ static int __init qcom_geni_console_setup(struct console *co, char *options)int bits =8 ;int parity ='n' ;int flow ='n' ; +int ret;if (co->index >=GENI_UART_CONS_PORTS || co->index <0 )return -ENXIO ;
@@ -1071,21 +1078,10 @@ static int __init qcom_geni_console_setup(struct console *co, char *options)if (unlikely (!uport->membase))return -ENXIO ; -if (geni_se_resources_on (&port->se)) { -dev_err (port->se.dev,"Error turning on resources\n" ); -return -ENXIO ; - } - -if (unlikely (geni_se_read_proto (&port->se) !=GENI_SE_UART )) { -geni_se_resources_off (&port->se); -return -ENXIO ; - } -if (!port->setup) { - port->tx_bytes_pw =1 ; - port->rx_bytes_pw =RX_BYTES_PW ; -qcom_geni_serial_stop_rx (uport); -qcom_geni_serial_port_setup (uport); + ret =qcom_geni_serial_port_setup (uport); +if (ret) +return ret; }if (options)
@@ -1203,11 +1199,12 @@ static void qcom_geni_serial_pm(struct uart_port *uport, {struct qcom_geni_serial_port *port =to_dev_port (uport, uport); +/* If we've never been called, treat it as off */ +if (old_state ==UART_PM_STATE_UNDEFINED ) + old_state =UART_PM_STATE_OFF ; +if (new_state ==UART_PM_STATE_ON && old_state ==UART_PM_STATE_OFF )geni_se_resources_on (&port->se); -else if (!uart_console (uport) && (new_state ==UART_PM_STATE_ON && - old_state ==UART_PM_STATE_UNDEFINED )) -geni_se_resources_on (&port->se);else if (new_state ==UART_PM_STATE_OFF && old_state ==UART_PM_STATE_ON )geni_se_resources_off (&port->se);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 248/422 arm64: dts: ti: k3-am65: Change #address-cells and #size-cells of interconnect to 2
In reply to Greg Kroah-HartmanFrom: Kishon Vijay Abraham I <[email protected]>
[ Upstream commit 3bc1572068e3896b60d86f9c0fb56d1cef28201c ]
AM65 has two PCIe controllers and each PCIe controller has '2' address spaces one within the 4GB address space of the SoC and the other above the 4GB address space of the SoC (cbass_main) in addition to the register space. The size of the address space above the 4GB SoC address space is 4GB. These address ranges will be used by CPU/DMA to access the PCIe address space. In order to represent the address space above the 4GB SoC address space and to represent the size of this address space as 4GB, change address-cells and size-cells of interconnect to 2.
Since OSPI has similar need in MCU Domain Memory Map, change address-cells and size-cells of cbass_mcu interconnect also to 2.
--- arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 10 +++--- arch/arm64/boot/dts/ti/k3-am65.dtsi | 44 ++++++++++++------------ 2 files changed, 27 insertions(+), 27 deletions(-)
arch/arm64/boot/dts/ti/k3-am65-main.dtsi +5 -5
@@ -8,13 +8,13 @@ &cbass_main { gic500: interrupt-controller@1800000 { compatible = "arm,gic-v3"; - #address-cells = <1>; - #size-cells = <1>; + #address-cells = <2>; + #size-cells = <2>; ranges; #interrupt-cells = <3>; interrupt-controller; - reg = <0x01800000 0x10000>, /* GICD */ - <0x01880000 0x90000>; /* GICR */ + reg = <0x00 0x01800000 0x00 0x10000>, /* GICD */ + <0x00 0x01880000 0x00 0x90000>; /* GICR */ /* * vcpumntirq: * virtual CPU interface maintenance interrupt
@@ -23,7 +23,7 @@ gic_its: gic-its@1820000 { compatible = "arm,gic-v3-its"; - reg = <0x01820000 0x10000>; + reg = <0x00 0x01820000 0x00 0x10000>; msi-controller; #msi-cells = <1>; };
arch/arm64/boot/dts/ti/k3-am65.dtsi +22 -22
60 lines not on this page · raw message
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 249/422 samples/bpf: fix a compilation failure
In reply to Greg Kroah-HartmanFrom: Yonghong Song <[email protected]>
[ Upstream commit 534e0e52bc23de588e81b5a6f75e10c8c4b189fc ]
samples/bpf build failed with the following errors:
$ make samples/bpf/
...
HOSTCC samples/bpf/sockex3_user.o
/data/users/yhs/work/net-next/samples/bpf/sockex3_user.c:16:8: error: redefinition of ‘struct bpf_flow_keys’
struct bpf_flow_keys {
^
In file included from /data/users/yhs/work/net-next/samples/bpf/sockex3_user.c:4:0:
./usr/include/linux/bpf.h:2338:9: note: originally defined here
struct bpf_flow_keys *flow_keys;
^
make[3]: *** [samples/bpf/sockex3_user.o] Error 1Commit d58e468b1112d ("flow_dissector: implements flow dissector BPF hook") introduced struct bpf_flow_keys in include/uapi/linux/bpf.h and hence caused the naming conflict with samples/bpf/sockex3_user.c.
The fix is to rename struct bpf_flow_keys in samples/bpf/sockex3_user.c to flow_keys to avoid the conflict.
--- samples/bpf/sockex3_user.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
samples/bpf/sockex3_user.c +2 -2
@@ -13,7 +13,7 @@#define PARSE_IP_PROG_FD (prog_fd[0])#define PROG_ARRAY_FD (map_fd[0]) -struct bpf_flow_keys { +struct flow_keys {__be32 src;__be32 dst;union {
@@ -64,7 +64,7 @@ int main(int argc, char **argv) (void ) f;for (i =0 ; i <5 ; i++) { -struct bpf_flow_keys key = {}, next_key; +struct flow_keys key = {}, next_key;struct pair value;sleep (1 );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 250/422 spi/bcm63xx-hsspi: keep pll clk enabled
In reply to Greg Kroah-HartmanFrom: Jonas Gorski <[email protected]>
[ Upstream commit 0fd85869c2a9c8723a98bc1f56a876e8383649f4 ]
If the pll clock needs to be enabled to get its rate, it will also need to be enabled to provide it. So ensure it is kept enabled through the lifetime of the device.
--- drivers/spi/spi-bcm63xx-hsspi.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)
drivers/spi/spi-bcm63xx-hsspi.c +16 -4
@@ -101,6 +101,7 @@ struct bcm63xx_hsspi {struct platform_device *pdev;struct clk *clk; +struct clk *pll_clk;void __iomem *regs;u8 __iomem *fifo;
@@ -332,7 +333,7 @@ static int bcm63xx_hsspi_probe(struct platform_device *pdev)struct resource *res_mem;void __iomem *regs;struct device *dev = &pdev->dev; -struct clk *clk; +struct clk *clk, *pll_clk =NULL ;int irq, ret;u32 reg, rate, num_cs =HSSPI_SPI_MAX_CS ;
@@ -358,7 +359,7 @@ static int bcm63xx_hsspi_probe(struct platform_device *pdev) rate =clk_get_rate (clk);if (!rate) { -struct clk *pll_clk =devm_clk_get (dev,"pll" ); + pll_clk =devm_clk_get (dev,"pll" );if (IS_ERR (pll_clk)) { ret =PTR_ERR (pll_clk);
@@ -373,19 +374,20 @@ static int bcm63xx_hsspi_probe(struct platform_device *pdev)clk_disable_unprepare (pll_clk);if (!rate) { ret = -EINVAL ; - goto out_disable_clk; + goto out_disable_pll_clk; } } master =spi_alloc_master (&pdev->dev,sizeof (*bs));if (!master) { ret = -ENOMEM ; - goto out_disable_clk; + goto out_disable_pll_clk; } bs =spi_master_get_devdata (master); bs->pdev = pdev; bs->clk = clk; + bs->pll_clk = pll_clk; bs->regs = regs; bs->speed_hz = rate; bs->fifo = (u8 __iomem *)(bs->regs +HSSPI_FIFO_REG (0 ));
@@ -440,6 +442,8 @@ static int bcm63xx_hsspi_probe(struct platform_device *pdev) out_put_master:spi_master_put (master); +out_disable_pll_clk: +clk_disable_unprepare (pll_clk); out_disable_clk:clk_disable_unprepare (clk);return ret;
@@ -453,6 +457,7 @@ static int bcm63xx_hsspi_remove(struct platform_device *pdev)/* reset the hardware and block queue progress */ __raw_writel (0 , bs->regs +HSSPI_INT_MASK_REG ); +clk_disable_unprepare (bs->pll_clk);clk_disable_unprepare (bs->clk);return 0 ;
@@ -465,6 +470,7 @@ static int bcm63xx_hsspi_suspend(struct device *dev)struct bcm63xx_hsspi *bs =spi_master_get_devdata (master);spi_master_suspend (master); +clk_disable_unprepare (bs->pll_clk);clk_disable_unprepare (bs->clk);return 0 ;
@@ -480,6 +486,12 @@ static int bcm63xx_hsspi_resume(struct device *dev)if (ret)return ret; +if (bs->pll_clk) { + ret =clk_prepare_enable (bs->pll_clk); +if (ret) +return ret; + } +spi_master_resume (master);return 0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 251/422 spi: mediatek: Dont modify spi_transfer when transfer.
In reply to Greg Kroah-HartmanFrom: Peter Shih <[email protected]>
[ Upstream commit 00bca73bfca4fb0ab089b94cad0fc83d8b49c25f ]
Mediatek SPI driver modifies some fields (tx_buf, rx_buf, len, tx_dma, rx_dma) of the spi_transfer* passed in when doing transfer_one and in interrupt handler. This is somewhat unexpected, and there are some caller (e.g. Cr50 spi driver) that reuse the spi_transfer for multiple messages. Add a field to record how many bytes have been transferred, and calculate the right len / buffer based on it instead.
--- drivers/spi/spi-mt65xx.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-)
drivers/spi/spi-mt65xx.c +21 -16
@@ -98,6 +98,7 @@ struct mtk_spi {struct clk *parent_clk, *sel_clk, *spi_clk;struct spi_transfer *cur_transfer;u32 xfer_len; +u32 num_xfered;struct scatterlist *tx_sgl, *rx_sgl;u32 tx_sgl_len, rx_sgl_len;const struct mtk_spi_compatible *dev_comp;
@@ -385,6 +386,7 @@ static int mtk_spi_fifo_transfer(struct spi_master *master, mdata->cur_transfer = xfer; mdata->xfer_len =min (MTK_SPI_MAX_FIFO_SIZE , xfer->len); + mdata->num_xfered =0 ;mtk_spi_prepare_transfer (master, xfer);mtk_spi_setup_packet (master);
@@ -415,6 +417,7 @@ static int mtk_spi_dma_transfer(struct spi_master *master, mdata->tx_sgl_len =0 ; mdata->rx_sgl_len =0 ; mdata->cur_transfer = xfer; + mdata->num_xfered =0 ;mtk_spi_prepare_transfer (master, xfer);
@@ -482,7 +485,7 @@ static int mtk_spi_setup(struct spi_device *spi)static irqreturn_t mtk_spi_interrupt (int irq,void *dev_id) { -u32 cmd, reg_val, cnt, remainder; +u32 cmd, reg_val, cnt, remainder, len;struct spi_master *master = dev_id;struct mtk_spi *mdata =spi_master_get_devdata (master);struct spi_transfer *trans = mdata->cur_transfer;
@@ -497,36 +500,38 @@ static irqreturn_t mtk_spi_interrupt(int irq, void *dev_id)if (trans->rx_buf) { cnt = mdata->xfer_len /4 ;ioread32_rep (mdata->base +SPI_RX_DATA_REG , - trans->rx_buf, cnt); + trans->rx_buf + mdata->num_xfered, cnt); remainder = mdata->xfer_len %4 ;if (remainder >0 ) { reg_val =readl (mdata->base +SPI_RX_DATA_REG ); -memcpy (trans->rx_buf + (cnt *4 ), - ®_val, remainder); +memcpy (trans->rx_buf + + mdata->num_xfered + + (cnt *4 ), + ®_val, + remainder); } } - trans->len -= mdata->xfer_len; -if (!trans->len) { + mdata->num_xfered += mdata->xfer_len; +if (mdata->num_xfered == trans->len) {spi_finalize_current_transfer (master);return IRQ_HANDLED ; } -if (trans->tx_buf) - trans->tx_buf += mdata->xfer_len; -if (trans->rx_buf) - trans->rx_buf += mdata->xfer_len; - - mdata->xfer_len =min (MTK_SPI_MAX_FIFO_SIZE , trans->len); + len = trans->len - mdata->num_xfered; + mdata->xfer_len =min (MTK_SPI_MAX_FIFO_SIZE , len);mtk_spi_setup_packet (master); - cnt = trans->len /4 ; -iowrite32_rep (mdata->base +SPI_TX_DATA_REG , trans->tx_buf, cnt); + cnt = len /4 ; +iowrite32_rep (mdata->base +SPI_TX_DATA_REG , + trans->tx_buf + mdata->num_xfered, cnt); - remainder = trans->len %4 ; + remainder = len %4 ;if (remainder >0 ) { reg_val =0 ; -memcpy (®_val, trans->tx_buf + (cnt *4 ), remainder); +memcpy (®_val, + trans->tx_buf + (cnt *4 ) + mdata->num_xfered, + remainder);writel (reg_val, mdata->base +SPI_TX_DATA_REG ); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 252/422 ASoC: rt5682: Fix the boost volume at the begining of playback
In reply to Greg Kroah-HartmanFrom: Shuming Fan <[email protected]>
[ Upstream commit 28b20dde5e1c943ab899549a655ac4935cffccbb ]
This patch fixed the boost volume at the begining of playback while DAC volume set to lower level.
--- sound/soc/codecs/rt5682.c | 5 +++++ 1 file changed, 5 insertions(+)
sound/soc/codecs/rt5682.c +5 -0
@@ -68,6 +68,7 @@ struct rt5682_priv {static const struct reg_sequence patch_list[] = { {0x01c1 ,0x1000 }, + {RT5682_DAC_ADC_DIG_VOL1 ,0xa020 }, };static const struct reg_default rt5682_reg[] = {
@@ -1457,6 +1458,8 @@ static int rt5682_hp_event(struct snd_soc_dapm_widget *w, RT5682_NG2_EN_MASK, RT5682_NG2_EN);snd_soc_component_update_bits (component,RT5682_DEPOP_1 ,0x60 ,0x60 ); +snd_soc_component_update_bits (component, +RT5682_DAC_ADC_DIG_VOL1 ,0x00c0 ,0x0080 );break ;case SND_SOC_DAPM_POST_PMD :
@@ -1464,6 +1467,8 @@ static int rt5682_hp_event(struct snd_soc_dapm_widget *w, RT5682_DEPOP_1, 0x60, 0x0);snd_soc_component_write (component,RT5682_HP_CTRL_2 ,0x0000 ); +snd_soc_component_update_bits (component, +RT5682_DAC_ADC_DIG_VOL1 ,0x00c0 ,0x0000 );break ;default :
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 253/422 ipmi_si_pci: fix NULL device in ipmi_si error message
In reply to Greg Kroah-HartmanFrom: Meelis Roos <[email protected]>
[ Upstream commit 01508d9ebf4fc863f2fc4561c390bf4b7c3301a6 ]
I noticed that 4.17.0 logs the follwing during ipmi_si setup:
ipmi_si 0000:01:04.6: probing via PCI
(NULL device *): Could not setup I/O space
ipmi_si 0000:01:04.6: [mem 0xf5ef0000-0xf5ef00ff] regsize 1 spacing 1 irq 21
Fix the "NULL device *) by moving io.dev assignment before its potential use by ipmi_pci_probe_regspacing().
Result:
ipmi_si 0000:01:04.6: probing via PCI
ipmi_si 0000:01:04.6: Could not setup I/O space
ipmi_si 0000:01:04.6: [mem 0xf5ef0000-0xf5ef00ff] regsize 1 spacing 1 irq 21
--- drivers/char/ipmi/ipmi_si_pci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/char/ipmi/ipmi_si_pci.c +2 -2
@@ -120,6 +120,8 @@ static int ipmi_pci_probe(struct pci_dev *pdev, } io.addr_data =pci_resource_start (pdev,0 ); + io.dev = &pdev->dev; + io.regspacing =ipmi_pci_probe_regspacing (&io); io.regsize =DEFAULT_REGSIZE ; io.regshift =0 ;
@@ -128,8 +130,6 @@ static int ipmi_pci_probe(struct pci_dev *pdev,if (io.irq) io.irq_setup = ipmi_std_irq_setup; - io.dev = &pdev->dev; -dev_info (&pdev->dev,"%pR regsize %d spacing %d irq %d\n" , &pdev->resource[0 ], io.regsize, io.regspacing, io.irq);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 254/422 ipmi_si: fix potential integer overflow on large shift
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit 97a103e6b584442cd848887ed8d47be2410b7e09 ]
Shifting unsigned char b by an int type can lead to sign-extension overflow. For example, if b is 0xff and the shift is 24, then top bit is sign-extended so the final value passed to writeq has all the upper 32 bits set. Fix this by casting b to a 64 bit unsigned before the shift.
Detected by CoverityScan, CID#1465246 ("Unintended sign extension")
--- drivers/char/ipmi/ipmi_si_mem_io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/char/ipmi/ipmi_si_mem_io.c +1 -1
@@ -51,7 +51,7 @@ static unsigned char mem_inq(const struct si_sm_io *io, unsigned int offset)static void mem_outq (const struct si_sm_io *io,unsigned int offset,unsigned char b) { -writeq (b << io->regshift, (io->addr)+(offset * io->regspacing)); +writeq ((u64 )b << io->regshift, (io->addr)+(offset * io->regspacing)); }#endif
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 255/422 ipmi:dmi: Ignore IPMI SMBIOS entries with a zero base address
In reply to Greg Kroah-HartmanFrom: Corey Minyard <[email protected]>
[ Upstream commit 1574608f5f4204440d6d9f52b971aba967664764 ]
Looking at logs from systems all over the place, it looks like tons of broken systems exist that set the base address to zero. I can only guess that is some sort of non-standard idea to mark the interface as not being present. It can't be zero, anyway, so just complain and ignore it.
--- drivers/char/ipmi/ipmi_dmi.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/char/ipmi/ipmi_dmi.c +4 -0
@@ -217,6 +217,10 @@ static void __init dmi_decode_ipmi(const struct dmi_header *dm) slave_addr = data[DMI_IPMI_SLAVEADDR ];memcpy (&base_addr, data +DMI_IPMI_ADDR ,sizeof (unsigned long )); +if (!base_addr) { +pr_err ("Base address is zero, assuming no IPMI interface\n" ); +return ; + }if (len >=DMI_IPMI_VER2_LENGTH ) {if (type ==IPMI_DMI_TYPE_SSIF ) { offset =0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 256/422 ipmi: fix return value of ipmi_set_my_LUN
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit 060e8fb53fe3455568982d10ab8c3dd605565049 ]
Fixes gcc '-Wunused-but-set-variable' warning:
drivers/char/ipmi/ipmi_msghandler.c: In function 'ipmi_set_my_LUN':drivers/char/ipmi/ipmi_msghandler.c:1335:13: warning:
variable 'rv' set but not used [-Wunused-but-set-variable]
int index, rv = 0;
'rv' should be the correct return value.
--- drivers/char/ipmi/ipmi_msghandler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/char/ipmi/ipmi_msghandler.c +1 -1
@@ -1365,7 +1365,7 @@ int ipmi_set_my_LUN(struct ipmi_user *user, }release_ipmi_user (user, index); -return 0 ; +return rv; }EXPORT_SYMBOL (ipmi_set_my_LUN);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 257/422 net: hns3: fix return type of ndo_start_xmit function
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit c9c3941186c5637caed131c4f4064411d6882299 ]
The method ndo_start_xmit() is defined as returning an 'netdev_tx_t', which is a typedef for an enum type, also the implementation in this driver has returns 'netdev_tx_t' value, so just change the function return type to netdev_tx_t.
Found by coccinelle.
--- drivers/net/ethernet/hisilicon/hip04_eth.c | 3 ++- drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
drivers/net/ethernet/hisilicon/hip04_eth.c +2 -1
@@ -424,7 +424,8 @@ static void hip04_start_tx_timer(struct hip04_priv *priv) ns, HRTIMER_MODE_REL); } -static int hip04_mac_start_xmit (struct sk_buff *skb,struct net_device *ndev) +static netdev_tx_t +hip04_mac_start_xmit (struct sk_buff *skb,struct net_device *ndev) {struct hip04_priv *priv =netdev_priv (ndev);struct net_device_stats *stats = &ndev->stats;
drivers/net/ethernet/hisilicon/hix5hd2_gmac.c +1 -1
@@ -736,7 +736,7 @@ static int hix5hd2_fill_sg_desc(struct hix5hd2_priv *priv,return 0 ; } -static int hix5hd2_net_xmit (struct sk_buff *skb,struct net_device *dev) +static netdev_tx_t hix5hd2_net_xmit (struct sk_buff *skb,struct net_device *dev) {struct hix5hd2_priv *priv =netdev_priv (dev);struct hix5hd2_desc *desc;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 258/422 net: cavium: fix return type of ndo_start_xmit function
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit ac1172dea10b6ba51de9346d3130db688b5196c5 ]
The method ndo_start_xmit() is defined as returning an 'netdev_tx_t', which is a typedef for an enum type, so make sure the implementation in this driver has returns 'netdev_tx_t' value, and change the function return type to netdev_tx_t.
Found by coccinelle.
--- drivers/net/ethernet/cavium/liquidio/lio_main.c | 2 +- drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 2 +- drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c | 5 +++-- drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 5 +++-- 4 files changed, 8 insertions(+), 6 deletions(-)
drivers/net/ethernet/cavium/liquidio/lio_main.c +1 -1
@@ -2324,7 +2324,7 @@ static inline int send_nic_timestamp_pkt(struct octeon_device *oct,* @returns whether the packet was transmitted to the device okay or not * (NETDEV_TX_OK or NETDEV_TX_BUSY) */ -static int liquidio_xmit (struct sk_buff *skb,struct net_device *netdev) +static netdev_tx_t liquidio_xmit (struct sk_buff *skb,struct net_device *netdev) {struct lio *lio;struct octnet_buf_free_info *finfo;
drivers/net/ethernet/cavium/liquidio/lio_vf_main.c +1 -1
@@ -1390,7 +1390,7 @@ static int send_nic_timestamp_pkt(struct octeon_device *oct,* @returns whether the packet was transmitted to the device okay or not * (NETDEV_TX_OK or NETDEV_TX_BUSY) */ -static int liquidio_xmit (struct sk_buff *skb,struct net_device *netdev) +static netdev_tx_t liquidio_xmit (struct sk_buff *skb,struct net_device *netdev) {struct octnet_buf_free_info *finfo;union octnic_cmd_setup cmdsetup;
drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c +3 -2
@@ -31,7 +31,8 @@static int lio_vf_rep_open (struct net_device *ndev);static int lio_vf_rep_stop (struct net_device *ndev); -static int lio_vf_rep_pkt_xmit (struct sk_buff *skb,struct net_device *ndev); +static netdev_tx_t lio_vf_rep_pkt_xmit (struct sk_buff *skb, +struct net_device *ndev);static void lio_vf_rep_tx_timeout (struct net_device *netdev);static int lio_vf_rep_phys_port_name (struct net_device *dev,char *buf,size_t len);
@@ -382,7 +383,7 @@ lio_vf_rep_packet_sent_callback(struct octeon_device *oct,netif_wake_queue (ndev); } -static int +static netdev_tx_t lio_vf_rep_pkt_xmit (struct sk_buff *skb,struct net_device *ndev) {struct lio_vf_rep_desc *vf_rep =netdev_priv (ndev);
drivers/net/ethernet/cavium/octeon/octeon_mgmt.c +3 -2
@@ -1268,12 +1268,13 @@ static int octeon_mgmt_stop(struct net_device *netdev)return 0 ; } -static int octeon_mgmt_xmit (struct sk_buff *skb,struct net_device *netdev) +static netdev_tx_t +octeon_mgmt_xmit (struct sk_buff *skb,struct net_device *netdev) {struct octeon_mgmt *p =netdev_priv (netdev);union mgmt_port_ring_entry re;unsigned long flags; -int rv =NETDEV_TX_BUSY ; +netdev_tx_t rv =NETDEV_TX_BUSY ; re.d64 =0 ; re.s.tstamp = ((skb_shinfo (skb)->tx_flags &SKBTX_HW_TSTAMP ) !=0 );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 259/422 net: ibm: fix return type of ndo_start_xmit function
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit 94b2bb28dbb43fcb943d5275ab19fd5a4972bedb ]
The method ndo_start_xmit() is defined as returning an 'netdev_tx_t', which is a typedef for an enum type, so make sure the implementation in this driver has returns 'netdev_tx_t' value, and change the function return type to netdev_tx_t.
Found by coccinelle.
--- drivers/net/ethernet/ibm/ehea/ehea_main.c | 2 +- drivers/net/ethernet/ibm/emac/core.c | 7 ++++--- drivers/net/ethernet/ibm/ibmvnic.c | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-)
drivers/net/ethernet/ibm/ehea/ehea_main.c +1 -1
@@ -2027,7 +2027,7 @@ static void ehea_xmit3(struct sk_buff *skb, struct net_device *dev,dev_consume_skb_any (skb); } -static int ehea_start_xmit (struct sk_buff *skb,struct net_device *dev) +static netdev_tx_t ehea_start_xmit (struct sk_buff *skb,struct net_device *dev) {struct ehea_port *port =netdev_priv (dev);struct ehea_swqe *swqe;
drivers/net/ethernet/ibm/emac/core.c +4 -3
@@ -1409,7 +1409,7 @@ static inline u16 emac_tx_csum(struct emac_instance *dev,return 0 ; } -static inline int emac_xmit_finish (struct emac_instance *dev,int len) +static inline netdev_tx_t emac_xmit_finish (struct emac_instance *dev,int len) {struct emac_regs __iomem *p = dev->emacp;struct net_device *ndev = dev->ndev;
@@ -1436,7 +1436,7 @@ static inline int emac_xmit_finish(struct emac_instance *dev, int len) }/* Tx lock BH */ -static int emac_start_xmit (struct sk_buff *skb,struct net_device *ndev) +static netdev_tx_t emac_start_xmit (struct sk_buff *skb,struct net_device *ndev) {struct emac_instance *dev =netdev_priv (ndev);unsigned int len = skb->len;
@@ -1494,7 +1494,8 @@ static inline int emac_xmit_split(struct emac_instance *dev, int slot, }/* Tx lock BH disabled (SG version for TAH equipped EMACs) */ -static int emac_start_xmit_sg (struct sk_buff *skb,struct net_device *ndev) +static netdev_tx_t +emac_start_xmit_sg (struct sk_buff *skb,struct net_device *ndev) {struct emac_instance *dev =netdev_priv (ndev);int nr_frags =skb_shinfo (skb)->nr_frags;
drivers/net/ethernet/ibm/ibmvnic.c +2 -2
@@ -1420,7 +1420,7 @@ static int ibmvnic_xmit_workarounds(struct sk_buff *skb,return 0 ; } -static int ibmvnic_xmit (struct sk_buff *skb,struct net_device *netdev) +static netdev_tx_t ibmvnic_xmit (struct sk_buff *skb,struct net_device *netdev) {struct ibmvnic_adapter *adapter =netdev_priv (netdev);int queue_num =skb_get_queue_mapping (skb);
@@ -1444,7 +1444,7 @@ static int ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev)u64 *handle_array;int index =0 ;u8 proto =0 ; -int ret =0 ; +netdev_tx_t ret =NETDEV_TX_OK ;if (adapter->resetting) {if (!netif_subqueue_stopped (netdev, skb))
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 260/422 powerpc/iommu: Avoid derefence before pointer check
In reply to Greg Kroah-HartmanFrom: Breno Leitao <[email protected]>
[ Upstream commit 984ecdd68de0fa1f63ce205d6c19ef5a7bc67b40 ]
The tbl pointer is being derefenced by IOMMU_PAGE_SIZE prior the check if it is not NULL.
Just moving the dereference code to after the check, where there will be guarantee that 'tbl' will not be NULL.
--- arch/powerpc/kernel/iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/kernel/iommu.c +1 -1
@@ -785,9 +785,9 @@ dma_addr_t iommu_map_page(struct device *dev, struct iommu_table *tbl, vaddr =page_address (page) + offset; uaddr = (unsigned long )vaddr; - npages =iommu_num_pages (uaddr, size,IOMMU_PAGE_SIZE (tbl));if (tbl) { + npages =iommu_num_pages (uaddr, size,IOMMU_PAGE_SIZE (tbl)); align =0 ;if (tbl->it_page_shift <PAGE_SHIFT && size >=PAGE_SIZE && ((unsigned long )vaddr & ~PAGE_MASK ) ==0 )
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 261/422 selftests/powerpc: Do not fail with reschedule
In reply to Greg Kroah-HartmanFrom: Breno Leitao <[email protected]>
[ Upstream commit 44d947eff19d64384efc06069509db7a0a1103b0 ]
There are cases where the test is not expecting to have the transaction aborted, but, the test process might have been rescheduled, either in the OS level or by KVM (if it is running on a KVM guest machine). The process reschedule will cause a treclaim/recheckpoint which will cause the transaction to doom, aborting the transaction as soon as the process is rescheduled back to the CPU. This might cause the test to fail, but this is not a failure in essence.
If that is the case, TEXASR[FC] is indicated with either TM_CAUSE_RESCHEDULE or TM_CAUSE_KVM_RESCHEDULE for KVM interruptions.
In this scenario, ignore these two failures and avoid the whole test to return failure.
--- tools/testing/selftests/powerpc/tm/tm-unavailable.c | 9 ++++++--- tools/testing/selftests/powerpc/tm/tm.h | 9 +++++++++ 2 files changed, 15 insertions(+), 3 deletions(-)
tools/testing/selftests/powerpc/tm/tm-unavailable.c +6 -3
@@ -236,7 +236,8 @@ void *tm_una_ping(void *input) }/* Check if we were not expecting a failure and a it occurred. */ -if (!expecting_failure () &&is_failure (cr_)) { +if (!expecting_failure () &&is_failure (cr_) && + !failure_is_reschedule ()) {printf ("\n\tUnexpected transaction failure 0x%02lx\n\t" ,failure_code ());return (void *)-1 ;
@@ -244,9 +245,11 @@ void *tm_una_ping(void *input)/* * Check if TM failed due to the cause we were expecting. 0xda is a -* TM_CAUSE_FAC_UNAV cause, otherwise it's an unexpected cause. +* TM_CAUSE_FAC_UNAV cause, otherwise it's an unexpected cause, unless +* it was caused by a reschedule. */ -if (is_failure (cr_) && !failure_is_unavailable ()) { +if (is_failure (cr_) && !failure_is_unavailable () && + !failure_is_reschedule ()) {printf ("\n\tUnexpected failure cause 0x%02lx\n\t" ,failure_code ());return (void *)-1 ;
tools/testing/selftests/powerpc/tm/tm.h +9 -0
@@ -52,6 +52,15 @@ static inline bool failure_is_unavailable(void)return (failure_code () &TM_CAUSE_FAC_UNAV ) ==TM_CAUSE_FAC_UNAV ; } +static inline bool failure_is_reschedule (void ) +{ +if ((failure_code () &TM_CAUSE_RESCHED ) ==TM_CAUSE_RESCHED || + (failure_code () &TM_CAUSE_KVM_RESCHED ) ==TM_CAUSE_KVM_RESCHED ) +return true; + +return false; +} +static inline bool failure_is_nesting (void ) {return (__builtin_get_texasru () &0x400000 );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 262/422 powerpc/64s/hash: Fix stab_rr off by one initialization
In reply to Greg Kroah-HartmanFrom: Nicholas Piggin <[email protected]>
[ Upstream commit 09b4438db13fa83b6219aee5993711a2aa2a0c64 ]
This causes SLB alloation to start 1 beyond the start of the SLB. There is no real problem because after it wraps it stats behaving properly, it's just surprisig to see when looking at SLB traces.
--- arch/powerpc/mm/slb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/mm/slb.c +1 -1
@@ -355,7 +355,7 @@ void slb_initialize(void)#endif } -get_paca ()->stab_rr =SLB_NUM_BOLTED ; +get_paca ()->stab_rr =SLB_NUM_BOLTED -1 ; lflags =SLB_VSID_KERNEL | linear_llp; vflags =SLB_VSID_KERNEL | vmalloc_llp;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 263/422 powerpc/pseries/memory-hotplug: Only update DT once per memory DLPAR request
In reply to Greg Kroah-HartmanFrom: Nathan Fontenot <[email protected]>
[ Upstream commit 063b8b1251fd069f3740339fca56119d218f11ba ]
The updates to powerpc numa and memory hotplug code now use the in-kernel LMB array instead of the device tree. This change allows the pseries memory DLPAR code to only update the device tree once after successfully handling a DLPAR request.
Prior to the in-kernel LMB array, the numa code looked up the affinity for memory being added in the device tree, the code now looks this up in the LMB array. This change means the memory hotplug code can just update the affinity for an LMB in the LMB array instead of updating the device tree.
This also provides a savings in kernel memory. When updating the device tree old properties are never free'ed since there is no usecount on properties. This behavior leads to a new copy of the property being allocated every time a LMB is added or removed (i.e. a request to add 100 LMBs creates 100 new copies of the property). With this update only a single new property is created when a DLPAR request completes successfully.
--- arch/powerpc/include/asm/drmem.h | 5 ++ .../platforms/pseries/hotplug-memory.c | 55 ++++++------------- 2 files changed, 21 insertions(+), 39 deletions(-)
arch/powerpc/include/asm/drmem.h +5 -0
@@ -99,4 +99,9 @@ void __init walk_drmem_lmbs_early(unsigned long node, void (*func)(struct drmem_lmb *, const __be32 **));#endif +static inline void invalidate_lmb_associativity_index (struct drmem_lmb *lmb) +{ + lmb->aa_index =0xffffffff ; +} +#endif /* _ASM_POWERPC_LMB_H */
arch/powerpc/platforms/pseries/hotplug-memory.c +16 -39
103 lines not on this page · raw message
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 264/422 powerpc/pseries: Disable CPU hotplug across migrations
In reply to Greg Kroah-HartmanFrom: Nathan Fontenot <[email protected]>
[ Upstream commit 85a88cabad57d26d826dd94ea34d3a785824d802 ]
When performing partition migrations all present CPUs must be online as all present CPUs must make the H_JOIN call as part of the migration process. Once all present CPUs make the H_JOIN call, one CPU is returned to make the rtas call to perform the migration to the destination system.
During testing of migration and changing the SMT state we have found instances where CPUs are offlined, as part of the SMT state change, before they make the H_JOIN call. This results in a hung system where every CPU is either in H_JOIN or offline.
To prevent this this patch disables CPU hotplug during the migration process.
--- arch/powerpc/kernel/rtas.c | 2 ++ 1 file changed, 2 insertions(+)
arch/powerpc/kernel/rtas.c +2 -0
@@ -985,6 +985,7 @@ int rtas_ibm_suspend_me(u64 handle) goto out; } +cpu_hotplug_disable ();stop_topology_update ();/* Call function on all CPUs. One of us will make the
@@ -999,6 +1000,7 @@ int rtas_ibm_suspend_me(u64 handle)printk (KERN_ERR "Error doing global join\n" );start_topology_update (); +cpu_hotplug_enable ();/* Take down CPUs not online prior to suspend */ cpuret =rtas_offline_cpus_mask (offline_mask);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 265/422 powerpc: Fix duplicate const clang warning in user access code
In reply to Greg Kroah-HartmanFrom: Anton Blanchard <[email protected]>
[ Upstream commit e00d93ac9a189673028ac125a74b9bc8ae73eebc ]
This re-applies commit b91c1e3e7a6f ("powerpc: Fix duplicate const
clang warning in user access code") (Jun 2015) which was undone in
commits:
f2ca80905929 ("powerpc/sparse: Constify the address pointer in __get_user_nosleep()") (Feb 2017) d466f6c5cac1 ("powerpc/sparse: Constify the address pointer in __get_user_nocheck()") (Feb 2017) f84ed59a612d ("powerpc/sparse: Constify the address pointer in __get_user_check()") (Feb 2017)
We see a large number of duplicate const errors in the user access code when building with llvm/clang:
include/linux/pagemap.h:576:8: warning: duplicate 'const' declaration specifier [-Wduplicate-decl-specifier]
ret = __get_user(c, uaddr);
The problem is we are doing const __typeof__(*(ptr)), which will hit the warning if ptr is marked const.
Removing const does not seem to have any effect on GCC code generation.
--- arch/powerpc/include/asm/uaccess.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/powerpc/include/asm/uaccess.h +3 -3
@@ -260,7 +260,7 @@ do { \ ({ \ long __gu_err; \ __long_type(*(ptr)) __gu_val; \ - const __typeof__(*(ptr)) __user *__gu_addr = (ptr); \ + __typeof__(*(ptr)) __user *__gu_addr = (ptr); \ __chk_user_ptr(ptr); \ if (!is_kernel_addr((unsigned long)__gu_addr)) \ might_fault(); \
@@ -274,7 +274,7 @@ do { \ ({ \ long __gu_err = -EFAULT; \ __long_type(*(ptr)) __gu_val = 0; \ - const __typeof__(*(ptr)) __user *__gu_addr = (ptr); \ + __typeof__(*(ptr)) __user *__gu_addr = (ptr); \ might_fault(); \ if (access_ok(VERIFY_READ, __gu_addr, (size))) { \ barrier_nospec(); \
@@ -288,7 +288,7 @@ do { \ ({ \ long __gu_err; \ __long_type(*(ptr)) __gu_val; \ - const __typeof__(*(ptr)) __user *__gu_addr = (ptr); \ + __typeof__(*(ptr)) __user *__gu_addr = (ptr); \ __chk_user_ptr(ptr); \ barrier_nospec(); \ __get_user_size(__gu_val, __gu_addr, (size), __gu_err); \
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 266/422 RDMA/i40iw: Fix incorrect iterator type
In reply to Greg Kroah-HartmanFrom: Håkon Bugge <[email protected]>
[ Upstream commit 802fa45cd320de319e86c93bca72abec028ba059 ]
Commit f27b4746f378 ("i40iw: add connection management code") uses an incorrect rcu iterator, whilst holding the rtnl_lock. Since the critical region invokes i40iw_manage_qhash(), which is a sleeping function, the rcu locking and traversal cannot be used.
--- drivers/infiniband/hw/i40iw/i40iw_cm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/i40iw/i40iw_cm.c +1 -1
@@ -1689,7 +1689,7 @@ static enum i40iw_status_code i40iw_add_mqh_6(struct i40iw_device *iwdev,unsigned long flags;rtnl_lock (); -for_each_netdev_rcu (&init_net, ip_dev) { +for_each_netdev (&init_net, ip_dev) {if ((((rdma_vlan_dev_vlan_id (ip_dev) <I40IW_NO_VLAN ) && (rdma_vlan_dev_real_dev (ip_dev) == iwdev->netdev)) || (ip_dev == iwdev->netdev)) && (ip_dev->flags &IFF_UP )) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 267/422 ARM: dts: atmel: Fix I2C and SPI bus warnings
In reply to Greg Kroah-HartmanFrom: Rob Herring <[email protected]>
[ Upstream commit c890ecdbe93d482512a911b299bfb009780a29c2 ]
dtc has new checks for I2C and SPI buses. Fix the warnings in node names and unit-addresses.
arch/arm/boot/dts/at91-dvk_som60.dtb: Warning (i2c_bus_reg): /ahb/apb/i2c@f0018000/eeprom@87: I2C bus unit address format error, expected "57" arch/arm/boot/dts/at91-dvk_som60.dtb: Warning (i2c_bus_reg): /ahb/apb/i2c@f0018000/ft5426@56: I2C bus unit address format error, expected "38" arch/arm/boot/dts/at91-vinco.dtb: Warning (i2c_bus_reg): /ahb/apb/i2c@f8024000/rtc@64: I2C bus unit address format error, expected "32" arch/arm/boot/dts/at91sam9260ek.dtb: Warning (spi_bus_reg): /ahb/apb/spi@fffc8000/mtd_dataflash@0: SPI bus unit address format error, expected "1" arch/arm/boot/dts/at91sam9g20ek_2mmc.dtb: Warning (spi_bus_reg): /ahb/apb/spi@fffc8000/mtd_dataflash@0: SPI bus unit address format error, expected "1" arch/arm/boot/dts/at91sam9g20ek.dtb: Warning (spi_bus_reg): /ahb/apb/spi@fffc8000/mtd_dataflash@0: SPI bus unit address format error, expected "1" arch/arm/boot/dts/at91sam9261ek.dtb: Warning (spi_bus_reg): /ahb/apb/spi@fffc8000/tsc2046@0: SPI bus unit address format error, expected "2"
--- arch/arm/boot/dts/at91-dvk_su60_somc.dtsi | 4 ++-- arch/arm/boot/dts/at91-dvk_su60_somc_lcm.dtsi | 4 ++-- arch/arm/boot/dts/at91-vinco.dts | 2 +- arch/arm/boot/dts/at91sam9260ek.dts | 2 +- arch/arm/boot/dts/at91sam9261ek.dts | 2 +- arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-)
arch/arm/boot/dts/at91-dvk_su60_somc.dtsi +2 -2
@@ -70,9 +70,9 @@ &i2c1 { status = "okay"; - eeprom@87 { + eeprom@57 { compatible = "giantec,gt24c32a", "atmel,24c32"; - reg = <87>; + reg = <0x57>; pagesize = <32>; }; };
arch/arm/boot/dts/at91-dvk_su60_somc_lcm.dtsi +2 -2
@@ -59,9 +59,9 @@ &i2c1 { status = "okay"; - ft5426@56 { + ft5426@38 { compatible = "focaltech,ft5426", "edt,edt-ft5406"; - reg = <56>; + reg = <0x38>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_lcd_ctp_int>;
arch/arm/boot/dts/at91-vinco.dts +1 -1
@@ -128,7 +128,7 @@ i2c2: i2c@f8024000 { status = "okay"; - rtc1: rtc@64 { + rtc1: rtc@32 { compatible = "epson,rx8900"; reg = <0x32>; };
arch/arm/boot/dts/at91sam9260ek.dts +1 -1
@@ -127,7 +127,7 @@ spi0: spi@fffc8000 { cs-gpios = <0>, <&pioC 11 0>, <0>, <0>; - mtd_dataflash@0 { + mtd_dataflash@1 { compatible = "atmel,at45", "atmel,dataflash"; spi-max-frequency = <50000000>; reg = <1>;
arch/arm/boot/dts/at91sam9261ek.dts +1 -1
@@ -160,7 +160,7 @@ spi-max-frequency = <15000000>; }; - tsc2046@0 { + tsc2046@2 { reg = <2>; compatible = "ti,ads7843"; interrupts-extended = <&pioC 2 IRQ_TYPE_EDGE_BOTH>;
arch/arm/boot/dts/at91sam9g20ek_common.dtsi +1 -1
@@ -109,7 +109,7 @@ spi0: spi@fffc8000 { cs-gpios = <0>, <&pioC 11 0>, <0>, <0>; - mtd_dataflash@0 { + mtd_dataflash@1 { compatible = "atmel,at45", "atmel,dataflash"; spi-max-frequency = <50000000>; reg = <1>;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 268/422 OPP: Protect dev_list with opp_table lock
In reply to Greg Kroah-HartmanFrom: Viresh Kumar <[email protected]>
[ Upstream commit 3d2556992a878a2210d3be498416aee39e0c32aa ]
The dev_list needs to be protected with a lock, else we may have simultaneous access (addition/removal) to it and that would be racy. Extend scope of the opp_table lock to protect dev_list as well.
--- drivers/opp/core.c | 21 +++++++++++++++++++-- drivers/opp/cpu.c | 2 ++ drivers/opp/opp.h | 2 +- 3 files changed, 22 insertions(+), 3 deletions(-)
drivers/opp/core.c +19 -2
@@ -48,9 +48,14 @@ static struct opp_device *_find_opp_dev(const struct device *dev,static struct opp_table *_find_opp_table_unlocked (struct device *dev) {struct opp_table *opp_table; +bool found;list_for_each_entry (opp_table, &opp_tables, node) { -if (_find_opp_dev (dev, opp_table)) { +mutex_lock (&opp_table->lock); + found = !!_find_opp_dev (dev, opp_table); +mutex_unlock (&opp_table->lock); + +if (found) {_get_opp_table_kref (opp_table);return opp_table;
@@ -766,6 +771,8 @@ struct opp_device *_add_opp_dev(const struct device *dev,/* Initialize opp-dev */ opp_dev->dev = dev; + +mutex_lock (&opp_table->lock);list_add (&opp_dev->node, &opp_table->dev_list);/* Create debugfs entries for the opp_table */
@@ -773,6 +780,7 @@ struct opp_device *_add_opp_dev(const struct device *dev,if (ret)dev_err (dev,"%s: Failed to register opp debugfs (%d)\n" , __func__, ret); +mutex_unlock (&opp_table->lock);return opp_dev; }
@@ -791,6 +799,7 @@ static struct opp_table *_allocate_opp_table(struct device *dev)if (!opp_table)return NULL ; +mutex_init (&opp_table->lock);INIT_LIST_HEAD (&opp_table->dev_list); opp_dev =_add_opp_dev (dev, opp_table);
@@ -812,7 +821,6 @@ static struct opp_table *_allocate_opp_table(struct device *dev)BLOCKING_INIT_NOTIFIER_HEAD (&opp_table->head);INIT_LIST_HEAD (&opp_table->opp_list); -mutex_init (&opp_table->lock);kref_init (&opp_table->kref);/* Secure the device table modification */
@@ -854,6 +862,10 @@ static void _opp_table_kref_release(struct kref *kref)if (!IS_ERR (opp_table->clk))clk_put (opp_table->clk); +/* +* No need to take opp_table->lock here as we are guaranteed that no +* references to the OPP table are taken at this point. +*/ opp_dev = list_first_entry(&opp_table->dev_list, struct opp_device, node);
@@ -1719,6 +1731,9 @@ void _dev_pm_opp_remove_table(struct opp_table *opp_table, struct device *dev, {struct dev_pm_opp *opp, *tmp; +/* Protect dev_list */ +mutex_lock (&opp_table->lock); +/* Find if opp_table manages a single device */ if (list_is_singular (&opp_table->dev_list)) {/* Free static OPPs */
@@ -1736,6 +1751,8 @@ void _dev_pm_opp_remove_table(struct opp_table *opp_table, struct device *dev, }else {_remove_opp_dev (_find_opp_dev (dev, opp_table), opp_table); } + +mutex_unlock (&opp_table->lock); }void _dev_pm_opp_find_and_remove_table (struct device *dev,bool remove_all)
drivers/opp/cpu.c +2 -0
@@ -222,8 +222,10 @@ int dev_pm_opp_get_sharing_cpus(struct device *cpu_dev, struct cpumask *cpumask)cpumask_clear (cpumask);if (opp_table->shared_opp ==OPP_TABLE_ACCESS_SHARED ) { +mutex_lock (&opp_table->lock);list_for_each_entry (opp_dev, &opp_table->dev_list, node)cpumask_set_cpu (opp_dev->dev->id, cpumask); +mutex_unlock (&opp_table->lock); }else {cpumask_set_cpu (cpu_dev->id, cpumask); }
drivers/opp/opp.h +1 -1
@@ -126,7 +126,7 @@ enum opp_table_access {* @dev_list: list of devices that share these OPPs * @opp_list: table of opps * @kref: for reference count of the table. -* @lock: mutex protecting the opp_list. +* @lock: mutex protecting the opp_list and dev_list. * @np: struct device_node pointer for opp's DT node. * @clock_latency_ns_max: Max clock latency in nanoseconds. * @shared_opp: OPP is shared between multiple devices.
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 269/422 of/unittest: Fix I2C bus unit-address error
In reply to Greg Kroah-HartmanFrom: Rob Herring <[email protected]>
[ Upstream commit 62287dce5d0ee207b6a09a0a1abd06b61cee1094 ]
dtc has new checks for I2C buses. Fix the warnings in unit-addresses in the unittests.
drivers/of/unittest-data/testcases.dtb: Warning (i2c_bus_reg): /testcase-data/overlay-node/test-bus/i2c-test-bus/test-unittest14/i2c@0/test-mux-dev: I2C bus unit address format error, expected "20" drivers/of/unittest-data/overlay_15.dtb: Warning (i2c_bus_reg): /fragment@0/__overlay__/test-unittest15/i2c@0/test-mux-dev: I2C bus unit address format error, expected "20"
--- drivers/of/unittest-data/overlay_15.dts | 4 ++-- drivers/of/unittest-data/tests-overlay.dtsi | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/of/unittest-data/overlay_15.dts +2 -2
@@ -20,8 +20,8 @@ #size-cells = <0>; reg = <0>; - test-mux-dev { - reg = <32>; + test-mux-dev@20 { + reg = <0x20>; compatible = "unittest-i2c-dev"; status = "okay"; };
drivers/of/unittest-data/tests-overlay.dtsi +2 -2
@@ -103,8 +103,8 @@ #size-cells = <0>; reg = <0>; - test-mux-dev { - reg = <32>; + test-mux-dev@20 { + reg = <0x20>; compatible = "unittest-i2c-dev"; status = "okay"; };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 270/422 libfdt: Ensure INT_MAX is defined in libfdt_env.h
In reply to Greg Kroah-HartmanFrom: Rob Herring <[email protected]>
[ Upstream commit 53dd9dce6979bc54d64a3a09a2fb20187a025be7 ]
The next update of libfdt has a new dependency on INT_MAX. Update the instances of libfdt_env.h in the kernel to either include the necessary header with the definition or define it locally.
--- arch/arm/boot/compressed/libfdt_env.h | 2 ++ arch/powerpc/boot/libfdt_env.h | 2 ++ include/linux/libfdt_env.h | 1 + 3 files changed, 5 insertions(+)
arch/arm/boot/compressed/libfdt_env.h +2 -0
@@ -6,6 +6,8 @@#include <linux/string.h> #include <asm/byteorder.h> +#define INT_MAX ((int)(~0U>>1)) +typedef __be16 fdt16_t ;typedef __be32 fdt32_t ;typedef __be64 fdt64_t ;
arch/powerpc/boot/libfdt_env.h +2 -0
@@ -5,6 +5,8 @@#include <types.h> #include <string.h> +#define INT_MAX ((int)(~0U>>1)) +#include "of.h" typedef unsigned long uintptr_t ;
include/linux/libfdt_env.h +1 -0
@@ -2,6 +2,7 @@#ifndef LIBFDT_ENV_H #define LIBFDT_ENV_H +#include <linux/kernel.h> /* For INT_MAX */ #include <linux/string.h> #include <asm/byteorder.h>
Signature · 9 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Greg Kroah-Hartman
maintainerPATCH 271/422 power: supply: twl4030_charger: fix charging current out-of-bounds
In reply to Greg Kroah-HartmanFrom: Andreas Kemnade <[email protected]>
[ Upstream commit 8314c212f995bc0d06b54ad02ef0ab4089781540 ]
the charging current uses unsigned int variables, if we step back if the current is still low, we would run into negative which means setting the target to a huge value.
Better add checks here.
--- drivers/power/supply/twl4030_charger.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/power/supply/twl4030_charger.c +2 -1
@@ -420,7 +420,8 @@ static void twl4030_current_worker(struct work_struct *data)if (v <USB_MIN_VOLT ) {/* Back up and stop adjusting. */ - bci->usb_cur -=USB_CUR_STEP ; +if (bci->usb_cur >=USB_CUR_STEP ) + bci->usb_cur -=USB_CUR_STEP ; bci->usb_cur_target = bci->usb_cur; }else if (bci->usb_cur >= bci->usb_cur_target || bci->usb_cur +USB_CUR_STEP >USB_MAX_CURRENT ) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 272/422 power: supply: twl4030_charger: disable eoc interrupt on linear charge
In reply to Greg Kroah-HartmanFrom: Andreas Kemnade <[email protected]>
[ Upstream commit 079cdff3d0a09c5da10ae1be35def7a116776328 ]
This avoids getting woken up from suspend after power interruptions when the bci wrongly thinks the battery is full just because of input current going low because of low input power
--- drivers/power/supply/twl4030_charger.c | 27 +++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-)
drivers/power/supply/twl4030_charger.c +26 -1
@@ -440,6 +440,7 @@ static void twl4030_current_worker(struct work_struct *data)static int twl4030_charger_enable_usb (struct twl4030_bci *bci,bool enable) {int ret; +u32 reg;if (bci->usb_mode ==CHARGE_OFF ) enable = false;
@@ -453,14 +454,38 @@ static int twl4030_charger_enable_usb(struct twl4030_bci *bci, bool enable) bci->usb_enabled =1 ; } -if (bci->usb_mode ==CHARGE_AUTO ) +if (bci->usb_mode ==CHARGE_AUTO ) { +/* Enable interrupts now. */ + reg = ~(u32)(TWL4030_ICHGLOW |TWL4030_ICHGEOC | +TWL4030_TBATOR2 |TWL4030_TBATOR1 | +TWL4030_BATSTS ); + ret =twl_i2c_write_u8 (TWL4030_MODULE_INTERRUPTS , reg, +TWL4030_INTERRUPTS_BCIIMR1A ); +if (ret <0 ) { +dev_err (bci->dev, +"failed to unmask interrupts: %d\n" , + ret); +return ret; + }/* forcing the field BCIAUTOUSB (BOOT_BCI[1]) to 1 */ ret =twl4030_clear_set_boot_bci (0 ,TWL4030_BCIAUTOUSB ); + }/* forcing USBFASTMCHG(BCIMFSTS4[2]) to 1 */ ret =twl4030_clear_set (TWL_MODULE_MAIN_CHARGE ,0 ,TWL4030_USBFASTMCHG ,TWL4030_BCIMFSTS4 );if (bci->usb_mode ==CHARGE_LINEAR ) { +/* Enable interrupts now. */ + reg = ~(u32)(TWL4030_ICHGLOW |TWL4030_TBATOR2 | +TWL4030_TBATOR1 |TWL4030_BATSTS ); + ret =twl_i2c_write_u8 (TWL4030_MODULE_INTERRUPTS , reg, +TWL4030_INTERRUPTS_BCIIMR1A ); +if (ret <0 ) { +dev_err (bci->dev, +"failed to unmask interrupts: %d\n" , + ret); +return ret; + }twl4030_clear_set_boot_bci (TWL4030_BCIAUTOAC |TWL4030_CVENAC ,0 );/* Watch dog key: WOVF acknowledge */ ret = twl_i2c_write_u8(TWL_MODULE_MAIN_CHARGE, 0x33,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 273/422 net: mvpp2: fix the number of queues per cpu for PPv2.2
In reply to Greg Kroah-HartmanFrom: Antoine Tenart <[email protected]>
[ Upstream commit 70afb58e9856a70ff9e45760af2d0ebeb7c46ac2 ]
The Marvell PPv2.2 engine only has 8 Rx queues per CPU, while PPv2.1 has 16 of them. This patch updates the code so that the Rx queues mask width is selected given the version of the network controller used.
--- drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 3 ++- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-)
drivers/net/ethernet/marvell/mvpp2/mvpp2.h +2 -1
@@ -253,7 +253,8 @@#define MVPP2_ISR_ENABLE_INTERRUPT (mask) ((mask) & 0xffff)#define MVPP2_ISR_DISABLE_INTERRUPT (mask) (((mask) << 16) & 0xffff0000)#define MVPP2_ISR_RX_TX_CAUSE_REG (port) (0x5480 + 4 * (port)) -#define MVPP2_CAUSE_RXQ_OCCUP_DESC_ALL_MASK 0xffff +#define MVPP2_CAUSE_RXQ_OCCUP_DESC_ALL_MASK (version) \ + ((version) == MVPP21 ? 0xffff : 0xff)#define MVPP2_CAUSE_TXQ_OCCUP_DESC_ALL_MASK 0xff0000#define MVPP2_CAUSE_TXQ_OCCUP_DESC_ALL_OFFSET 16#define MVPP2_CAUSE_RX_FIFO_OVERRUN_MASK BIT(24)
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +4 -3
@@ -908,7 +908,7 @@ static void mvpp2_interrupts_unmask(void *arg)u32 val; val =MVPP2_CAUSE_MISC_SUM_MASK | -MVPP2_CAUSE_RXQ_OCCUP_DESC_ALL_MASK ; +MVPP2_CAUSE_RXQ_OCCUP_DESC_ALL_MASK (port->priv->hw_version);if (port->has_tx_irqs) val |=MVPP2_CAUSE_TXQ_OCCUP_DESC_ALL_MASK ;
@@ -928,7 +928,7 @@ mvpp2_shared_interrupt_mask_unmask(struct mvpp2_port *port, bool mask)if (mask) val =0 ;else - val =MVPP2_CAUSE_RXQ_OCCUP_DESC_ALL_MASK ; + val =MVPP2_CAUSE_RXQ_OCCUP_DESC_ALL_MASK (MVPP22 );for (i =0 ; i < port->nqvecs; i++) {struct mvpp2_queue_vector *v = port->qvecs + i;
@@ -3059,7 +3059,8 @@ static int mvpp2_poll(struct napi_struct *napi, int budget) }/* Process RX packets */ - cause_rx = cause_rx_tx &MVPP2_CAUSE_RXQ_OCCUP_DESC_ALL_MASK ; + cause_rx = cause_rx_tx & +MVPP2_CAUSE_RXQ_OCCUP_DESC_ALL_MASK (port->priv->hw_version); cause_rx <<= qv->first_rxq; cause_rx |= qv->pending_cause_rx;while (cause_rx && budget >0 ) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 274/422 net: marvell: fix return type of ndo_start_xmit function
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit f03508ce3f9650148262c176e0178413e16c902b ]
The method ndo_start_xmit() is defined as returning an 'netdev_tx_t', which is a typedef for an enum type, so make sure the implementation in this driver has returns 'netdev_tx_t' value, and change the function return type to netdev_tx_t.
Found by coccinelle.
--- drivers/net/ethernet/marvell/mvneta.c | 2 +- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 2 +- drivers/net/ethernet/marvell/pxa168_eth.c | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-)
drivers/net/ethernet/marvell/mvneta.c +1 -1
@@ -2394,7 +2394,7 @@ error: }/* Main tx processing */ -static int mvneta_tx (struct sk_buff *skb,struct net_device *dev) +static netdev_tx_t mvneta_tx (struct sk_buff *skb,struct net_device *dev) {struct mvneta_port *pp =netdev_priv (dev);u16 txq_id =skb_get_queue_mapping (skb);
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +1 -1
@@ -2901,7 +2901,7 @@ release: }/* Main tx processing */ -static int mvpp2_tx (struct sk_buff *skb,struct net_device *dev) +static netdev_tx_t mvpp2_tx (struct sk_buff *skb,struct net_device *dev) {struct mvpp2_port *port =netdev_priv (dev);struct mvpp2_tx_queue *txq, *aggr_txq;
drivers/net/ethernet/marvell/pxa168_eth.c +2 -1
@@ -1260,7 +1260,8 @@ static int pxa168_rx_poll(struct napi_struct *napi, int budget)return work_done; } -static int pxa168_eth_start_xmit (struct sk_buff *skb,struct net_device *dev) +static netdev_tx_t +pxa168_eth_start_xmit (struct sk_buff *skb,struct net_device *dev) {struct pxa168_eth_private *pep =netdev_priv (dev);struct net_device_stats *stats = &dev->stats;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 275/422 net: toshiba: fix return type of ndo_start_xmit function
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit bacade822524e02f662d88f784d2ae821a5546fb ]
The method ndo_start_xmit() is defined as returning an 'netdev_tx_t', which is a typedef for an enum type, so make sure the implementation in this driver has returns 'netdev_tx_t' value, and change the function return type to netdev_tx_t.
Found by coccinelle.
--- drivers/net/ethernet/toshiba/ps3_gelic_net.c | 4 ++-- drivers/net/ethernet/toshiba/ps3_gelic_net.h | 2 +- drivers/net/ethernet/toshiba/spider_net.c | 4 ++-- drivers/net/ethernet/toshiba/tc35815.c | 6 ++++-- 4 files changed, 9 insertions(+), 7 deletions(-)
drivers/net/ethernet/toshiba/ps3_gelic_net.c +2 -2
@@ -845,9 +845,9 @@ static int gelic_card_kick_txdma(struct gelic_card *card,* @skb: packet to send out * @netdev: interface device structure * -* returns 0 on success, <0 on failure +* returns NETDEV_TX_OK on success, NETDEV_TX_BUSY on failure */ -int gelic_net_xmit (struct sk_buff *skb,struct net_device *netdev) +netdev_tx_t gelic_net_xmit (struct sk_buff *skb,struct net_device *netdev) {struct gelic_card *card =netdev_card (netdev);struct gelic_descr *descr;
drivers/net/ethernet/toshiba/ps3_gelic_net.h +1 -1
@@ -370,7 +370,7 @@ void gelic_card_up(struct gelic_card *card);void gelic_card_down (struct gelic_card *card);int gelic_net_open (struct net_device *netdev);int gelic_net_stop (struct net_device *netdev); -int gelic_net_xmit (struct sk_buff *skb,struct net_device *netdev); +netdev_tx_t gelic_net_xmit (struct sk_buff *skb,struct net_device *netdev);void gelic_net_set_multi (struct net_device *netdev);void gelic_net_tx_timeout (struct net_device *netdev);int gelic_net_setup_netdev (struct net_device *netdev,struct gelic_card *card);
drivers/net/ethernet/toshiba/spider_net.c +2 -2
@@ -880,9 +880,9 @@ out:* @skb: packet to send out * @netdev: interface device structure * -* returns 0 on success, !0 on failure +* returns NETDEV_TX_OK on success, NETDEV_TX_BUSY on failure */ -static int +static netdev_tx_t spider_net_xmit (struct sk_buff *skb,struct net_device *netdev) {int cnt;
drivers/net/ethernet/toshiba/tc35815.c +4 -2
@@ -474,7 +474,8 @@ static void free_rxbuf_skb(struct pci_dev *hwdev, struct sk_buff *skb, dma_addr_/* Index to functions, as function prototypes. */ static int tc35815_open (struct net_device *dev); -static int tc35815_send_packet (struct sk_buff *skb,struct net_device *dev); +static netdev_tx_t tc35815_send_packet (struct sk_buff *skb, +struct net_device *dev);static irqreturn_t tc35815_interrupt (int irq,void *dev_id);static int tc35815_rx (struct net_device *dev,int limit);static int tc35815_poll (struct napi_struct *napi,int budget);
@@ -1248,7 +1249,8 @@ tc35815_open(struct net_device *dev)* invariant will hold if you make sure that the netif_*_queue() * calls are done at the proper times. */ -static int tc35815_send_packet (struct sk_buff *skb,struct net_device *dev) +static netdev_tx_t +tc35815_send_packet (struct sk_buff *skb,struct net_device *dev) {struct tc35815_local *lp =netdev_priv (dev);struct TxFD *txfd;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 276/422 net: xilinx: fix return type of ndo_start_xmit function
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit 81255af8d9d5565004792c295dde49344df450ca ]
The method ndo_start_xmit() is defined as returning an 'netdev_tx_t', which is a typedef for an enum type, so make sure the implementation in this driver has returns 'netdev_tx_t' value, and change the function return type to netdev_tx_t.
Found by coccinelle.
--- drivers/net/ethernet/xilinx/ll_temac_main.c | 3 ++- drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 3 ++- drivers/net/ethernet/xilinx/xilinx_emaclite.c | 9 +++++---- 3 files changed, 9 insertions(+), 6 deletions(-)
drivers/net/ethernet/xilinx/ll_temac_main.c +2 -1
@@ -674,7 +674,8 @@ static inline int temac_check_tx_bd_space(struct temac_local *lp, int num_frag)return 0 ; } -static int temac_start_xmit (struct sk_buff *skb,struct net_device *ndev) +static netdev_tx_t +temac_start_xmit (struct sk_buff *skb,struct net_device *ndev) {struct temac_local *lp =netdev_priv (ndev);struct cdmac_bd *cur_p;
drivers/net/ethernet/xilinx/xilinx_axienet_main.c +2 -1
@@ -657,7 +657,8 @@ static inline int axienet_check_tx_bd_space(struct axienet_local *lp,* start the transmission. Additionally if checksum offloading is supported, * it populates AXI Stream Control fields with appropriate values. */ -static int axienet_start_xmit (struct sk_buff *skb,struct net_device *ndev) +static netdev_tx_t +axienet_start_xmit (struct sk_buff *skb,struct net_device *ndev) {u32 ii;u32 num_frag;
drivers/net/ethernet/xilinx/xilinx_emaclite.c +5 -4
@@ -1020,9 +1020,10 @@ static int xemaclite_close(struct net_device *dev)* deferred and the Tx queue is stopped so that the deferred socket buffer can * be transmitted when the Emaclite device is free to transmit data. * -* Return: 0, always. +* Return: NETDEV_TX_OK, always. */ -static int xemaclite_send (struct sk_buff *orig_skb,struct net_device *dev) +static netdev_tx_t +xemaclite_send (struct sk_buff *orig_skb,struct net_device *dev) {struct net_local *lp =netdev_priv (dev);struct sk_buff *new_skb;
@@ -1044,7 +1045,7 @@ static int xemaclite_send(struct sk_buff *orig_skb, struct net_device *dev)/* Take the time stamp now, since we can't do this in an ISR. */ skb_tx_timestamp (new_skb);spin_unlock_irqrestore (&lp->reset_lock, flags); -return 0 ; +return NETDEV_TX_OK ; }spin_unlock_irqrestore (&lp->reset_lock, flags);
@@ -1053,7 +1054,7 @@ static int xemaclite_send(struct sk_buff *orig_skb, struct net_device *dev) dev->stats.tx_bytes += len;dev_consume_skb_any (new_skb); -return 0 ; +return NETDEV_TX_OK ; }/**
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 277/422 net: broadcom: fix return type of ndo_start_xmit function
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit 0c13b8d1aee87c35a2fbc1d85a1f766227cf54b5 ]
The method ndo_start_xmit() is defined as returning an 'netdev_tx_t', which is a typedef for an enum type, so make sure the implementation in this driver has returns 'netdev_tx_t' value, and change the function return type to netdev_tx_t.
Found by coccinelle.
--- drivers/net/ethernet/broadcom/bcm63xx_enet.c | 5 +++-- drivers/net/ethernet/broadcom/sb1250-mac.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-)
drivers/net/ethernet/broadcom/bcm63xx_enet.c +3 -2
@@ -568,12 +568,13 @@ static irqreturn_t bcm_enet_isr_dma(int irq, void *dev_id)/* * tx request callback */ -static int bcm_enet_start_xmit (struct sk_buff *skb,struct net_device *dev) +static netdev_tx_t +bcm_enet_start_xmit (struct sk_buff *skb,struct net_device *dev) {struct bcm_enet_priv *priv;struct bcm_enet_desc *desc;u32 len_stat; -int ret; +netdev_tx_t ret; priv =netdev_priv (dev);
drivers/net/ethernet/broadcom/sb1250-mac.c +2 -2
@@ -299,7 +299,7 @@ static enum sbmac_state sbmac_set_channel_state(struct sbmac_softc *,static void sbmac_promiscuous_mode (struct sbmac_softc *sc,int onoff);static uint64_t sbmac_addr2reg (unsigned char *ptr);static irqreturn_t sbmac_intr (int irq,void *dev_instance); -static int sbmac_start_tx (struct sk_buff *skb,struct net_device *dev); +static netdev_tx_t sbmac_start_tx (struct sk_buff *skb,struct net_device *dev);static void sbmac_setmulti (struct sbmac_softc *sc);static int sbmac_init (struct platform_device *pldev,long long base);static int sbmac_set_speed (struct sbmac_softc *s,enum sbmac_speed speed);
@@ -2028,7 +2028,7 @@ static irqreturn_t sbmac_intr(int irq,void *dev_instance)* Return value: * nothing ********************************************************************* */ -static int sbmac_start_tx (struct sk_buff *skb,struct net_device *dev) +static netdev_tx_t sbmac_start_tx (struct sk_buff *skb,struct net_device *dev) {struct sbmac_softc *sc =netdev_priv (dev);unsigned long flags;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 278/422 net: amd: fix return type of ndo_start_xmit function
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit fe72352e37ae8478f4c97975a9831f0c50f22e73 ]
The method ndo_start_xmit() is defined as returning an 'netdev_tx_t', which is a typedef for an enum type, so make sure the implementation in this driver has returns 'netdev_tx_t' value, and change the function return type to netdev_tx_t.
Found by coccinelle.
--- drivers/net/ethernet/amd/am79c961a.c | 2 +- drivers/net/ethernet/amd/atarilance.c | 6 ++++-- drivers/net/ethernet/amd/declance.c | 2 +- drivers/net/ethernet/amd/sun3lance.c | 6 ++++-- drivers/net/ethernet/amd/sunlance.c | 2 +- drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 4 ++-- 6 files changed, 13 insertions(+), 9 deletions(-)
drivers/net/ethernet/amd/am79c961a.c +1 -1
@@ -440,7 +440,7 @@ static void am79c961_timeout(struct net_device *dev)/* * Transmit a packet */ -static int +static netdev_tx_t am79c961_sendpacket (struct sk_buff *skb,struct net_device *dev) {struct dev_priv *priv =netdev_priv (dev);
drivers/net/ethernet/amd/atarilance.c +4 -2
@@ -339,7 +339,8 @@ static unsigned long lance_probe1( struct net_device *dev, struct lance_addr *init_rec );static int lance_open (struct net_device *dev );static void lance_init_ring (struct net_device *dev ); -static int lance_start_xmit (struct sk_buff *skb,struct net_device *dev ); +static netdev_tx_t lance_start_xmit (struct sk_buff *skb, +struct net_device *dev);static irqreturn_t lance_interrupt (int irq,void *dev_id );static int lance_rx (struct net_device *dev );static int lance_close (struct net_device *dev );
@@ -769,7 +770,8 @@ static void lance_tx_timeout (struct net_device *dev)/* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX */ -static int lance_start_xmit (struct sk_buff *skb,struct net_device *dev ) +static netdev_tx_t +lance_start_xmit (struct sk_buff *skb,struct net_device *dev) {struct lance_private *lp =netdev_priv (dev);struct lance_ioreg *IO = lp->iobase;
drivers/net/ethernet/amd/declance.c +1 -1
@@ -894,7 +894,7 @@ static void lance_tx_timeout(struct net_device *dev)netif_wake_queue (dev); } -static int lance_start_xmit (struct sk_buff *skb,struct net_device *dev) +static netdev_tx_t lance_start_xmit (struct sk_buff *skb,struct net_device *dev) {struct lance_private *lp =netdev_priv (dev);volatile struct lance_regs *ll = lp->ll;
drivers/net/ethernet/amd/sun3lance.c +4 -2
@@ -236,7 +236,8 @@ struct lance_private {static int lance_probe (struct net_device *dev);static int lance_open (struct net_device *dev );static void lance_init_ring (struct net_device *dev ); -static int lance_start_xmit (struct sk_buff *skb,struct net_device *dev ); +static netdev_tx_t lance_start_xmit (struct sk_buff *skb, +struct net_device *dev);static irqreturn_t lance_interrupt (int irq,void *dev_id);static int lance_rx (struct net_device *dev );static int lance_close (struct net_device *dev );
@@ -511,7 +512,8 @@ static void lance_init_ring( struct net_device *dev ) } -static int lance_start_xmit (struct sk_buff *skb,struct net_device *dev ) +static netdev_tx_t +lance_start_xmit (struct sk_buff *skb,struct net_device *dev) {struct lance_private *lp =netdev_priv (dev);int entry, len;
drivers/net/ethernet/amd/sunlance.c +1 -1
@@ -1106,7 +1106,7 @@ static void lance_tx_timeout(struct net_device *dev)netif_wake_queue (dev); } -static int lance_start_xmit (struct sk_buff *skb,struct net_device *dev) +static netdev_tx_t lance_start_xmit (struct sk_buff *skb,struct net_device *dev) {struct lance_private *lp =netdev_priv (dev);int entry, skblen, len;
drivers/net/ethernet/amd/xgbe/xgbe-drv.c +2 -2
@@ -2009,7 +2009,7 @@ static int xgbe_close(struct net_device *netdev)return 0 ; } -static int xgbe_xmit (struct sk_buff *skb,struct net_device *netdev) +static netdev_tx_t xgbe_xmit (struct sk_buff *skb,struct net_device *netdev) {struct xgbe_prv_data *pdata =netdev_priv (netdev);struct xgbe_hw_if *hw_if = &pdata->hw_if;
@@ -2018,7 +2018,7 @@ static int xgbe_xmit(struct sk_buff *skb, struct net_device *netdev)struct xgbe_ring *ring;struct xgbe_packet_data *packet;struct netdev_queue *txq; -int ret; +netdev_tx_t ret;DBGPR ("-->xgbe_xmit: skb->len = %d\n" , skb->len);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 279/422 net: sun: fix return type of ndo_start_xmit function
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit 0e0cc31f6999df18bb5cfd0bd83c892ed5633975 ]
The method ndo_start_xmit() is defined as returning an 'netdev_tx_t', which is a typedef for an enum type, but the implementation in this driver returns an 'int'.
Found by coccinelle.
--- drivers/net/ethernet/sun/ldmvsw.c | 2 +- drivers/net/ethernet/sun/sunbmac.c | 3 ++- drivers/net/ethernet/sun/sunqe.c | 2 +- drivers/net/ethernet/sun/sunvnet.c | 2 +- drivers/net/ethernet/sun/sunvnet_common.c | 14 ++++++++------ drivers/net/ethernet/sun/sunvnet_common.h | 7 ++++--- 6 files changed, 17 insertions(+), 13 deletions(-)
drivers/net/ethernet/sun/ldmvsw.c +1 -1
@@ -113,7 +113,7 @@ static u16 vsw_select_queue(struct net_device *dev, struct sk_buff *skb, }/* Wrappers to common functions */ -static int vsw_start_xmit (struct sk_buff *skb,struct net_device *dev) +static netdev_tx_t vsw_start_xmit (struct sk_buff *skb,struct net_device *dev) {return sunvnet_start_xmit_common (skb, dev, vsw_tx_port_find); }
drivers/net/ethernet/sun/sunbmac.c +2 -1
@@ -950,7 +950,8 @@ static void bigmac_tx_timeout(struct net_device *dev) }/* Put a packet on the wire. */ -static int bigmac_start_xmit (struct sk_buff *skb,struct net_device *dev) +static netdev_tx_t +bigmac_start_xmit (struct sk_buff *skb,struct net_device *dev) {struct bigmac *bp =netdev_priv (dev);int len, entry;
drivers/net/ethernet/sun/sunqe.c +1 -1
@@ -570,7 +570,7 @@ out: }/* Get a packet queued to go onto the wire. */ -static int qe_start_xmit (struct sk_buff *skb,struct net_device *dev) +static netdev_tx_t qe_start_xmit (struct sk_buff *skb,struct net_device *dev) {struct sunqe *qep =netdev_priv (dev);struct sunqe_buffers *qbufs = qep->buffers;
drivers/net/ethernet/sun/sunvnet.c +1 -1
@@ -247,7 +247,7 @@ static u16 vnet_select_queue(struct net_device *dev, struct sk_buff *skb, }/* Wrappers to common functions */ -static int vnet_start_xmit (struct sk_buff *skb,struct net_device *dev) +static netdev_tx_t vnet_start_xmit (struct sk_buff *skb,struct net_device *dev) {return sunvnet_start_xmit_common (skb, dev, vnet_tx_port_find); }
drivers/net/ethernet/sun/sunvnet_common.c +8 -6
@@ -1216,9 +1216,10 @@ static inline struct sk_buff *vnet_skb_shape(struct sk_buff *skb, int ncookies)return skb; } -static int vnet_handle_offloads (struct vnet_port *port,struct sk_buff *skb, -struct vnet_port *(*vnet_tx_port) - (struct sk_buff *,struct net_device *)) +static netdev_tx_t +vnet_handle_offloads (struct vnet_port *port,struct sk_buff *skb, +struct vnet_port *(*vnet_tx_port) + (struct sk_buff *,struct net_device *)) {struct net_device *dev =VNET_PORT_TO_NET_DEVICE (port);struct vio_dring_state *dr = &port->vio.drings[VIO_DRIVER_TX_RING ];
@@ -1321,9 +1322,10 @@ out_dropped:return NETDEV_TX_OK ; } -int sunvnet_start_xmit_common (struct sk_buff *skb,struct net_device *dev, -struct vnet_port *(*vnet_tx_port) - (struct sk_buff *,struct net_device *)) +netdev_tx_t +sunvnet_start_xmit_common (struct sk_buff *skb,struct net_device *dev, +struct vnet_port *(*vnet_tx_port) + (struct sk_buff *,struct net_device *)) {struct vnet_port *port =NULL ;struct vio_dring_state *dr;
drivers/net/ethernet/sun/sunvnet_common.h +4 -3
@@ -136,9 +136,10 @@ int sunvnet_close_common(struct net_device *dev);void sunvnet_set_rx_mode_common (struct net_device *dev,struct vnet *vp);int sunvnet_set_mac_addr_common (struct net_device *dev,void *p);void sunvnet_tx_timeout_common (struct net_device *dev); -int sunvnet_start_xmit_common (struct sk_buff *skb,struct net_device *dev, -struct vnet_port *(*vnet_tx_port) - (struct sk_buff *,struct net_device *)); +netdev_tx_t +sunvnet_start_xmit_common (struct sk_buff *skb,struct net_device *dev, +struct vnet_port *(*vnet_tx_port) + (struct sk_buff *,struct net_device *));#ifdef CONFIG_NET_POLL_CONTROLLER void sunvnet_poll_controller_common (struct net_device *dev,struct vnet *vp);#endif
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 280/422 net: hns3: Fix for setting speed for phy failed problem
In reply to Greg Kroah-HartmanFrom: Fuyun Liang <[email protected]>
[ Upstream commit fd8133148eb6a733f9cfdaecd4d99f378e21d582 ]
The function of genphy_read_status is that reading phy information from HW and using these information to update SW variable. If user is using ethtool to setting the speed of phy and service task is calling by hclge_get_mac_phy_link, the result of speed setting is uncertain. Because ethtool cmd will modified phydev and hclge_get_mac_phy_link also will modified phydev.
Because phy state machine will update phy link periodically, we can just use phydev->link to check the link status. This patch removes function call of genphy_read_status. To ensure accuracy, this patch adds a phy state check. If phy state is not PHY_RUNNING, we consider link is down. Because in some scenarios, phydev->link may be link up, but phy state is not PHY_RUNNING. This is just an intermediate state. In fact, the link is not ready yet.
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +1 -1
@@ -2367,7 +2367,7 @@ static int hclge_get_mac_phy_link(struct hclge_dev *hdev) mac_state =hclge_get_mac_link_status (hdev);if (hdev->hw.mac.phydev) { -if (!genphy_read_status (hdev->hw.mac.phydev)) +if (hdev->hw.mac.phydev->state ==PHY_RUNNING ) link_stat = mac_state & hdev->hw.mac.phydev->link;else
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 281/422 net: hns3: Fix cmdq registers initialization issue for vf
In reply to Greg Kroah-HartmanFrom: Jian Shen <[email protected]>
[ Upstream commit 37dc9cdbdc1bd64bd3b6ea285a9c2e811404dc82 ]
According to hardware's description, the head pointer register should be written before the tail pointer register while initializing the vf command queue. Otherwise, it may trigger an interrupt even though there is no command received.
--- drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c +2 -2
@@ -132,8 +132,8 @@ static int hclgevf_init_cmd_queue(struct hclgevf_dev *hdev, reg_val |=HCLGEVF_NIC_CMQ_ENABLE ;hclgevf_write_dev (hw,HCLGEVF_NIC_CSQ_DEPTH_REG , reg_val); -hclgevf_write_dev (hw,HCLGEVF_NIC_CSQ_TAIL_REG ,0 );hclgevf_write_dev (hw,HCLGEVF_NIC_CSQ_HEAD_REG ,0 ); +hclgevf_write_dev (hw,HCLGEVF_NIC_CSQ_TAIL_REG ,0 );break ;case HCLGEVF_TYPE_CRQ : reg_val = (u32 )ring->desc_dma_addr;
@@ -145,8 +145,8 @@ static int hclgevf_init_cmd_queue(struct hclgevf_dev *hdev, reg_val |=HCLGEVF_NIC_CMQ_ENABLE ;hclgevf_write_dev (hw,HCLGEVF_NIC_CRQ_DEPTH_REG , reg_val); -hclgevf_write_dev (hw,HCLGEVF_NIC_CRQ_TAIL_REG ,0 );hclgevf_write_dev (hw,HCLGEVF_NIC_CRQ_HEAD_REG ,0 ); +hclgevf_write_dev (hw,HCLGEVF_NIC_CRQ_TAIL_REG ,0 );break ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 282/422 net: hns3: Clear client pointer when initialize client failed or unintialize finished
In reply to Greg Kroah-HartmanFrom: Jian Shen <[email protected]>
[ Upstream commit 49dd80541c75c2f21c28bbbdd958e993b55bf97b ]
If initialize client failed or finish uninitializing client, we should clear the client pointer. It may cause unexpected result when use uninitialized client. Meanwhile, we also should check whether client exist when uninitialize it.
--- .../hisilicon/hns3/hns3pf/hclge_main.c | 25 +++++++++----- .../hisilicon/hns3/hns3vf/hclgevf_main.c | 33 ++++++++++++++----- 2 files changed, 41 insertions(+), 17 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +17 -8
@@ -5476,13 +5476,13 @@ static int hclge_init_client_instance(struct hnae3_client *client, vport->nic.client = client; ret = client->ops->init_instance (&vport->nic);if (ret) -return ret; + goto clear_nic; ret =hclge_init_instance_hw (hdev);if (ret) { client->ops->uninit_instance (&vport->nic,0 ); -return ret; + goto clear_nic; } if (hdev->roce_client &&
@@ -5491,11 +5491,11 @@ static int hclge_init_client_instance(struct hnae3_client *client, ret =hclge_init_roce_base_info (vport);if (ret) -return ret; + goto clear_roce; ret = rc->ops->init_instance (&vport->roce);if (ret) -return ret; + goto clear_roce; }break ;
@@ -5505,7 +5505,7 @@ static int hclge_init_client_instance(struct hnae3_client *client, ret = client->ops->init_instance (&vport->nic);if (ret) -return ret; + goto clear_nic;break ;case HNAE3_CLIENT_ROCE :
@@ -5517,16 +5517,25 @@ static int hclge_init_client_instance(struct hnae3_client *client,if (hdev->roce_client && hdev->nic_client) { ret =hclge_init_roce_base_info (vport);if (ret) -return ret; + goto clear_roce; ret = client->ops->init_instance (&vport->roce);if (ret) -return ret; + goto clear_roce; } } }return 0 ; + +clear_nic: + hdev->nic_client =NULL ; + vport->nic.client =NULL ; +return ret; +clear_roce: + hdev->roce_client =NULL ; + vport->roce.client =NULL ; +return ret; } static void hclge_uninit_client_instance(struct hnae3_client *client,
@@ -5546,7 +5555,7 @@ static void hclge_uninit_client_instance(struct hnae3_client *client, }if (client->type ==HNAE3_CLIENT_ROCE )return ; -if (client->ops->uninit_instance) { +if (hdev->nic_client && client->ops->uninit_instance) {hclge_uninit_instance_hw (hdev); client->ops->uninit_instance (&vport->nic,0 ); hdev->nic_client =NULL ;
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c +24 -9
@@ -1629,17 +1629,17 @@ static int hclgevf_init_client_instance(struct hnae3_client *client, ret = client->ops->init_instance (&hdev->nic);if (ret) -return ret; + goto clear_nic;if (hdev->roce_client &&hnae3_dev_roce_supported (hdev)) {struct hnae3_client *rc = hdev->roce_client; ret =hclgevf_init_roce_base_info (hdev);if (ret) -return ret; + goto clear_roce; ret = rc->ops->init_instance (&hdev->roce);if (ret) -return ret; + goto clear_roce; }break ;case HNAE3_CLIENT_UNIC :
@@ -1648,7 +1648,7 @@ static int hclgevf_init_client_instance(struct hnae3_client *client, ret = client->ops->init_instance (&hdev->nic);if (ret) -return ret; + goto clear_nic;break ;case HNAE3_CLIENT_ROCE :if (hnae3_dev_roce_supported (hdev)) {
@@ -1659,15 +1659,24 @@ static int hclgevf_init_client_instance(struct hnae3_client *client,if (hdev->roce_client && hdev->nic_client) { ret =hclgevf_init_roce_base_info (hdev);if (ret) -return ret; + goto clear_roce; ret = client->ops->init_instance (&hdev->roce);if (ret) -return ret; + goto clear_roce; } }return 0 ; + +clear_nic: + hdev->nic_client =NULL ; + hdev->nic.client =NULL ; +return ret; +clear_roce: + hdev->roce_client =NULL ; + hdev->roce.client =NULL ; +return ret; } static void hclgevf_uninit_client_instance(struct hnae3_client *client,
@@ -1676,13 +1685,19 @@ static void hclgevf_uninit_client_instance(struct hnae3_client *client,struct hclgevf_dev *hdev = ae_dev->priv;/* un-init roce, if it exists */ -if (hdev->roce_client) +if (hdev->roce_client) { hdev->roce_client->ops->uninit_instance (&hdev->roce,0 ); + hdev->roce_client =NULL ; + hdev->roce.client =NULL ; + }/* un-init nic/unic, if this was not called by roce client */ -if ((client->ops->uninit_instance) && - (client->type !=HNAE3_CLIENT_ROCE )) +if (client->ops->uninit_instance && hdev->nic_client && + client->type !=HNAE3_CLIENT_ROCE ) { client->ops->uninit_instance (&hdev->nic,0 ); + hdev->nic_client =NULL ; + hdev->nic.client =NULL ; + } }static int hclgevf_pci_init (struct hclgevf_dev *hdev)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 283/422 net: hns3: Fix client initialize state issue when roce client initialize failed
In reply to Greg Kroah-HartmanFrom: Jian Shen <[email protected]>
[ Upstream commit d9f28fc23d544f673d087b00a6c7132d972f89ea ]
When roce is loaded before nic, the roce client will not be initialized until nic client is initialized, but roce init flag is set before it. Furthermore, in this case of nic initialized success and roce failed, the nic init flag is not set, and roce init flag is not cleared.
This patch fixes it by set init flag only after the client is initialized successfully.
--- drivers/net/ethernet/hisilicon/hns3/hnae3.c | 12 +++++------- drivers/net/ethernet/hisilicon/hns3/hnae3.h | 3 +++ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 9 +++++++++ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 9 +++++++++ 4 files changed, 26 insertions(+), 7 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hnae3.c +5 -7
@@ -29,8 +29,8 @@ static bool hnae3_client_match(enum hnae3_client_type client_type,return false; } -static void hnae3_set_client_init_flag (struct hnae3_client *client, -struct hnae3_ae_dev *ae_dev,int inited) +void hnae3_set_client_init_flag (struct hnae3_client *client, +struct hnae3_ae_dev *ae_dev,int inited) {switch (client->type) {case HNAE3_CLIENT_KNIC :
@@ -46,6 +46,7 @@ static void hnae3_set_client_init_flag(struct hnae3_client *client,break ; } } +EXPORT_SYMBOL (hnae3_set_client_init_flag);static int hnae3_get_client_init_flag (struct hnae3_client *client,struct hnae3_ae_dev *ae_dev)
@@ -86,14 +87,11 @@ static int hnae3_match_n_instantiate(struct hnae3_client *client,/* now, (un-)instantiate client by calling lower layer */ if (is_reg) { ret = ae_dev->ops->init_client_instance (client, ae_dev); -if (ret) { +if (ret)dev_err (&ae_dev->pdev->dev,"fail to instantiate client, ret = %d\n" , ret); -return ret; - } -hnae3_set_client_init_flag (client, ae_dev,1 ); -return 0 ; +return ret; }if (hnae3_get_client_init_flag (client, ae_dev)) {
drivers/net/ethernet/hisilicon/hns3/hnae3.h +3 -0
@@ -521,4 +521,7 @@ void hnae3_register_ae_algo(struct hnae3_ae_algo *ae_algo);void hnae3_unregister_client (struct hnae3_client *client);int hnae3_register_client (struct hnae3_client *client); + +void hnae3_set_client_init_flag (struct hnae3_client *client, +struct hnae3_ae_dev *ae_dev,int inited);#endif
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +9 -0
@@ -5485,6 +5485,8 @@ static int hclge_init_client_instance(struct hnae3_client *client, goto clear_nic; } +hnae3_set_client_init_flag (client, ae_dev,1 ); +if (hdev->roce_client &&hnae3_dev_roce_supported (hdev)) {struct hnae3_client *rc = hdev->roce_client;
@@ -5496,6 +5498,9 @@ static int hclge_init_client_instance(struct hnae3_client *client, ret = rc->ops->init_instance (&vport->roce);if (ret) goto clear_roce; + +hnae3_set_client_init_flag (hdev->roce_client, + ae_dev,1 ); }break ;
@@ -5507,6 +5512,8 @@ static int hclge_init_client_instance(struct hnae3_client *client,if (ret) goto clear_nic; +hnae3_set_client_init_flag (client, ae_dev,1 ); +break ;case HNAE3_CLIENT_ROCE :if (hnae3_dev_roce_supported (hdev)) {
@@ -5522,6 +5529,8 @@ static int hclge_init_client_instance(struct hnae3_client *client, ret = client->ops->init_instance (&vport->roce);if (ret) goto clear_roce; + +hnae3_set_client_init_flag (client, ae_dev,1 ); } } }
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c +9 -0
@@ -1631,6 +1631,8 @@ static int hclgevf_init_client_instance(struct hnae3_client *client,if (ret) goto clear_nic; +hnae3_set_client_init_flag (client, ae_dev,1 ); +if (hdev->roce_client &&hnae3_dev_roce_supported (hdev)) {struct hnae3_client *rc = hdev->roce_client;
@@ -1640,6 +1642,9 @@ static int hclgevf_init_client_instance(struct hnae3_client *client, ret = rc->ops->init_instance (&hdev->roce);if (ret) goto clear_roce; + +hnae3_set_client_init_flag (hdev->roce_client, ae_dev, +1 ); }break ;case HNAE3_CLIENT_UNIC :
@@ -1649,6 +1654,8 @@ static int hclgevf_init_client_instance(struct hnae3_client *client, ret = client->ops->init_instance (&hdev->nic);if (ret) goto clear_nic; + +hnae3_set_client_init_flag (client, ae_dev,1 );break ;case HNAE3_CLIENT_ROCE :if (hnae3_dev_roce_supported (hdev)) {
@@ -1665,6 +1672,8 @@ static int hclgevf_init_client_instance(struct hnae3_client *client,if (ret) goto clear_roce; } + +hnae3_set_client_init_flag (client, ae_dev,1 ); }return 0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 284/422 net: hns3: Fix parameter type for q_id in hclge_tm_q_to_qs_map_cfg()
In reply to Greg Kroah-HartmanFrom: Jian Shen <[email protected]>
[ Upstream commit 32c7fbc8ffd752c6aa05d2dd7c13b0f0aa00ddaa ]
So far all the places calling hclge_tm_q_to_qs_map_cfg() are assigning an u16 type value to "q_id", and in the processing of hclge_tm_q_to_qs_map_cfg(), it also converts the "q_id" to le16.
The max tqp number for pf can be more than 256, we should use "u16" to store the queue id, instead of "u8", which may cause data lost.
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c +1 -1
@@ -298,7 +298,7 @@ static int hclge_tm_qs_to_pri_map_cfg(struct hclge_dev *hdev, }static int hclge_tm_q_to_qs_map_cfg (struct hclge_dev *hdev, -u8 q_id,u16 qs_id) +u16 q_id,u16 qs_id) {struct hclge_nq_to_qs_link_cmd *map;struct hclge_desc desc;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 285/422 nfp: provide a better warning when ring allocation fails
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 23d9f5531c7c28546954b0bf332134a9b8a38c0a ]
NFP supports fairly enormous ring sizes (up to 256k descriptors). In commit 466271703867 ("nfp: use kvcalloc() to allocate SW buffer descriptor arrays") we have started using kvcalloc() functions to make sure the allocation of software state arrays doesn't hit the MAX_ORDER limit. Unfortunately, we can't use virtual mappings for the DMA region holding HW descriptors. In case this allocation fails instead of the generic (and fairly scary) warning/splat in the logs print a helpful message explaining what happened and suggesting how to fix it.
--- .../net/ethernet/netronome/nfp/nfp_net_common.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/net/ethernet/netronome/nfp/nfp_net_common.c +12 -4
@@ -2187,9 +2187,13 @@ nfp_net_tx_ring_alloc(struct nfp_net_dp *dp, struct nfp_net_tx_ring *tx_ring) tx_ring->size =array_size (tx_ring->cnt,sizeof (*tx_ring->txds)); tx_ring->txds =dma_zalloc_coherent (dp->dev, tx_ring->size, - &tx_ring->dma,GFP_KERNEL ); -if (!tx_ring->txds) + &tx_ring->dma, +GFP_KERNEL | __GFP_NOWARN); +if (!tx_ring->txds) { +netdev_warn (dp->netdev,"failed to allocate TX descriptor ring memory, requested descriptor count: %d, consider lowering descriptor count\n" , + tx_ring->cnt); goto err_alloc; + } tx_ring->txbufs =kvcalloc (tx_ring->cnt,sizeof (*tx_ring->txbufs),GFP_KERNEL );
@@ -2341,9 +2345,13 @@ nfp_net_rx_ring_alloc(struct nfp_net_dp *dp, struct nfp_net_rx_ring *rx_ring) rx_ring->cnt = dp->rxd_cnt; rx_ring->size =array_size (rx_ring->cnt,sizeof (*rx_ring->rxds)); rx_ring->rxds =dma_zalloc_coherent (dp->dev, rx_ring->size, - &rx_ring->dma,GFP_KERNEL ); -if (!rx_ring->rxds) + &rx_ring->dma, +GFP_KERNEL | __GFP_NOWARN); +if (!rx_ring->rxds) { +netdev_warn (dp->netdev,"failed to allocate RX descriptor ring memory, requested descriptor count: %d, consider lowering descriptor count\n" , + rx_ring->cnt); goto err_alloc; + } rx_ring->rxbufs =kvcalloc (rx_ring->cnt,sizeof (*rx_ring->rxbufs),GFP_KERNEL );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 286/422 usb: chipidea: imx: enable OTG overcurrent in case USB subsystem is already started
In reply to Greg Kroah-HartmanFrom: Nicolas Adell <[email protected]>
[ Upstream commit 1dedbdf2bbb1ede8d96f35f9845ecae179dc1988 ]
When initializing the USB subsystem before starting the kernel, OTG overcurrent detection is disabled. In case the OTG polarity of overcurrent is low active, the overcurrent detection is never enabled again and events cannot be reported as expected. Because imx usb overcurrent polarity is low active by default, only detection needs to be enable in usbmisc init function.
--- drivers/usb/chipidea/usbmisc_imx.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/chipidea/usbmisc_imx.c +2 -0
@@ -343,6 +343,8 @@ static int usbmisc_imx6q_init(struct imx_usbmisc_data *data) }else if (data->oc_polarity ==1 ) {/* High active */ reg &= ~(MX6_BM_OVER_CUR_DIS |MX6_BM_OVER_CUR_POLARITY ); + }else { + reg &= ~(MX6_BM_OVER_CUR_DIS ); }writel (reg, usbmisc->base + data->index *4 );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 287/422 usb: chipidea: Fix otg event handler
In reply to Greg Kroah-HartmanFrom: Loic Poulain <[email protected]>
[ Upstream commit 59739131e0ca06db7560f9073fff2fb83f6bc2a5 ]
At OTG work running time, it's possible that several events need to be addressed (e.g. ID and VBUS events). The current implementation handles only one event at a time which leads to ignoring the other one. Fix it.
--- drivers/usb/chipidea/otg.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/usb/chipidea/otg.c +6 -3
@@ -203,14 +203,17 @@ static void ci_otg_work(struct work_struct *work) }pm_runtime_get_sync (ci->dev); +if (ci->id_event) { ci->id_event = false;ci_handle_id_switch (ci); - }else if (ci->b_sess_valid_event) { + } + +if (ci->b_sess_valid_event) { ci->b_sess_valid_event = false;ci_handle_vbus_change (ci); - }else -dev_err (ci->dev,"unexpected event occurs at %s\n" , __func__); + } +pm_runtime_put_sync (ci->dev);enable_irq (ci->irq);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 288/422 usb: usbtmc: Fix ioctl USBTMC_IOCTL_ABORT_BULK_OUT
In reply to Greg Kroah-HartmanFrom: Guido Kiener <[email protected]>
[ Upstream commit 0e59088e7ff7aeda49dedadbf0e967761b909ad8 ]
Add parameter 'tag' to function usbtmc_ioctl_abort_bulk_out_tag() for future versions.
Use USBTMC_BUFSIZE (4k) instead of USBTMC_SIZE_IOBUFFER (2k). Using USBTMC_SIZE_IOBUFFER is deprecated.
Insert a sleep of 50 ms between subsequent CHECK_ABORT_BULK_OUT_STATUS control requests to avoid stressing the instrument with repeated requests.
Use common macro USB_CTRL_GET_TIMEOUT instead of USBTMC_TIMEOUT.
--- drivers/usb/class/usbtmc.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/usb/class/usbtmc.c +12 -4
@@ -342,7 +342,8 @@ exit: } -static int usbtmc_ioctl_abort_bulk_out (struct usbtmc_device_data *data) +static int usbtmc_ioctl_abort_bulk_out_tag (struct usbtmc_device_data *data, +u8 tag) {struct device *dev;u8 *buffer;
@@ -359,8 +360,8 @@ static int usbtmc_ioctl_abort_bulk_out(struct usbtmc_device_data *data)usb_rcvctrlpipe (data->usb_dev,0 ),USBTMC_REQUEST_INITIATE_ABORT_BULK_OUT ,USB_DIR_IN |USB_TYPE_CLASS |USB_RECIP_ENDPOINT , - data->bTag_last_write, data->bulk_out, - buffer, 2, USBTMC_TIMEOUT); + tag, data->bulk_out, + buffer, 2, USB_CTRL_GET_TIMEOUT);if (rv <0 ) {dev_err (dev,"usb_control_msg returned %d\n" , rv);
@@ -379,12 +380,14 @@ static int usbtmc_ioctl_abort_bulk_out(struct usbtmc_device_data *data) n =0 ; usbtmc_abort_bulk_out_check_status: +/* do not stress device with subsequent requests */ +msleep (50 ); rv =usb_control_msg (data->usb_dev,usb_rcvctrlpipe (data->usb_dev,0 ),USBTMC_REQUEST_CHECK_ABORT_BULK_OUT_STATUS ,USB_DIR_IN |USB_TYPE_CLASS |USB_RECIP_ENDPOINT ,0 , data->bulk_out, buffer,0x08 , -USBTMC_TIMEOUT ); +USB_CTRL_GET_TIMEOUT ); n++;if (rv <0 ) {dev_err (dev,"usb_control_msg returned %d\n" , rv);
@@ -418,6 +421,11 @@ exit:return rv; } +static int usbtmc_ioctl_abort_bulk_out (struct usbtmc_device_data *data) +{ +return usbtmc_ioctl_abort_bulk_out_tag (data, data->bTag_last_write); +} +static int usbtmc488_ioctl_read_stb (struct usbtmc_file_data *file_data,void __user *arg) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 289/422 s390/zcrypt: enable AP bus scan without a valid default domain
In reply to Greg Kroah-HartmanFrom: Halil Pasic <[email protected]>
[ Upstream commit 1c472d46283263497adccd7a0bec64ee2f9c09e5 ]
The AP bus scan is aborted before doing anything worth mentioning if ap_select_domain() fails, e.g. if the ap_rights.aqm mask is all zeros. As the result of this the ap bus fails to manage (e.g. create and register) devices like it is supposed to.
Let us make ap_scan_bus() work even if ap_select_domain() can't select a default domain. Let's also make ap_select_domain() return void, as there are no more callers interested in its return value.
--- drivers/s390/crypto/ap_bus.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-)
drivers/s390/crypto/ap_bus.c +6 -12
@@ -1223,11 +1223,10 @@ static struct bus_attribute *const ap_bus_attrs[] = { };/** -* ap_select_domain(): Select an AP domain. -* -* Pick one of the 16 AP domains. +* ap_select_domain(): Select an AP domain if possible and we haven't +* already done so before. */ -static int ap_select_domain (void ) +static void ap_select_domain (void ) {int count, max_count, best_domain;struct ap_queue_status status;
@@ -1242,7 +1241,7 @@ static int ap_select_domain(void)if (ap_domain_index >=0 ) {/* Domain has already been selected. */ spin_unlock_bh (&ap_domain_lock); -return 0 ; +return ; } best_domain =-1 ; max_count =0 ;
@@ -1269,11 +1268,8 @@ static int ap_select_domain(void)if (best_domain >=0 ) { ap_domain_index = best_domain;AP_DBF (DBF_DEBUG ,"new ap_domain_index=%d\n" , ap_domain_index); -spin_unlock_bh (&ap_domain_lock); -return 0 ; }spin_unlock_bh (&ap_domain_lock); -return -ENODEV ; }/*
@@ -1351,8 +1347,7 @@ static void ap_scan_bus(struct work_struct *unused)AP_DBF (DBF_DEBUG ,"%s running\n" , __func__);ap_query_configuration (ap_configuration); -if (ap_select_domain () !=0 ) - goto out; +ap_select_domain ();for (id =0 ; id <AP_DEVICES ; id++) {/* check if device is registered */
@@ -1468,12 +1463,11 @@ static void ap_scan_bus(struct work_struct *unused) } }/* end device loop */ -if (defdomdevs <1 ) +if (ap_domain_index >=0 && defdomdevs <1 )AP_DBF (DBF_INFO ,"no queue device with default domain %d available\n" , ap_domain_index); -out:mod_timer (&ap_config_timer, jiffies + ap_config_time *HZ ); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 290/422 s390/vdso: avoid 64-bit vdso mapping for compat tasks
In reply to Greg Kroah-HartmanFrom: Vasily Gorbik <[email protected]>
[ Upstream commit d1befa65823e9c6d013883b8a41d081ec338c489 ]
vdso_fault used is_compat_task function (on s390 it tests "current" thread_info flags) to distinguish compat tasks and map 31-bit vdso pages. But "current" task might not correspond to mm context.
When 31-bit compat inferior is executed under gdb, gdb does PTRACE_PEEKTEXT on vdso page, causing vdso_fault with "current" being 64-bit gdb process. So, 31-bit inferior ends up with 64-bit vdso mapped.
To avoid this problem a new compat_mm flag has been introduced into mm context. This flag is used in vdso_fault and vdso_mremap instead of is_compat_task.
--- arch/s390/include/asm/mmu.h | 2 ++ arch/s390/include/asm/mmu_context.h | 1 + arch/s390/kernel/vdso.c | 8 +++++--- 3 files changed, 8 insertions(+), 3 deletions(-)
arch/s390/include/asm/mmu.h +2 -0
@@ -32,6 +32,8 @@ typedef struct { unsigned int uses_cmm:1;/* The gmaps associated with this context are allowed to use huge pages. */ unsigned int allow_gmap_hpage_1m:1; +/* The mmu context is for compat task */ + unsigned int compat_mm:1; } mm_context_t;#define INIT_MM_CONTEXT (name) \
arch/s390/include/asm/mmu_context.h +1 -0
@@ -25,6 +25,7 @@ static inline int init_new_context(struct task_struct *tsk,atomic_set (&mm->context.flush_count,0 ); mm->context.gmap_asce =0 ; mm->context.flush_mm =0 ; + mm->context.compat_mm =0 ;#ifdef CONFIG_PGSTE mm->context.alloc_pgste = page_table_allocate_pgste || test_thread_flag(TIF_PGSTE) ||
arch/s390/kernel/vdso.c +5 -3
@@ -56,7 +56,7 @@ static vm_fault_t vdso_fault(const struct vm_special_mapping *sm, vdso_pagelist = vdso64_pagelist; vdso_pages = vdso64_pages;#ifdef CONFIG_COMPAT -if (is_compat_task ()) { +if (vma->vm_mm->context.compat_mm) { vdso_pagelist = vdso32_pagelist; vdso_pages = vdso32_pages; }
@@ -77,7 +77,7 @@ static int vdso_mremap(const struct vm_special_mapping *sm, vdso_pages = vdso64_pages;#ifdef CONFIG_COMPAT -if (is_compat_task ()) +if (vma->vm_mm->context.compat_mm) vdso_pages = vdso32_pages;#endif
@@ -224,8 +224,10 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) vdso_pages = vdso64_pages;#ifdef CONFIG_COMPAT -if (is_compat_task ()) +if (is_compat_task ()) { vdso_pages = vdso32_pages; + mm->context.compat_mm =1 ; + }#endif /* * vDSO has a problem and was disabled, just don't "enable" it for
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 291/422 s390/vdso: correct CFI annotations of vDSO functions
In reply to Greg Kroah-HartmanFrom: Vasily Gorbik <[email protected]>
[ Upstream commit 26f4414a45b808f83d42d6fd2fbf4a59ef25e84b ]
Correct stack frame overhead for 31-bit vdso, which should be 96 rather then 160. This is done by reusing STACK_FRAME_OVERHEAD definition which contains correct value based on build flags. This fixes stack unwinding within vdso code for 31-bit processes. While at it replace all hard coded stack frame overhead values with the same definition in vdso64 as well.
--- arch/s390/kernel/vdso32/clock_gettime.S | 19 ++++++++++--------- arch/s390/kernel/vdso32/gettimeofday.S | 3 ++- arch/s390/kernel/vdso64/clock_gettime.S | 25 +++++++++++++------------ arch/s390/kernel/vdso64/gettimeofday.S | 3 ++- 4 files changed, 27 insertions(+), 23 deletions(-)
arch/s390/kernel/vdso32/clock_gettime.S +10 -9
@@ -10,6 +10,7 @@ #include <asm/asm-offsets.h> #include <asm/unistd.h> #include <asm/dwarf.h> +#include <asm/ptrace.h> .text .align 4
@@ -18,8 +19,8 @@ __kernel_clock_gettime: CFI_STARTPROC ahi %r15,-16 - CFI_DEF_CFA_OFFSET 176 - CFI_VAL_OFFSET 15, -160 + CFI_DEF_CFA_OFFSET STACK_FRAME_OVERHEAD+16 + CFI_VAL_OFFSET 15, -STACK_FRAME_OVERHEAD basr %r5,0 0: al %r5,21f-0b(%r5) /* get &_vdso_data */ chi %r2,__CLOCK_REALTIME_COARSE
@@ -72,13 +73,13 @@ __kernel_clock_gettime: st %r1,4(%r3) /* store tp->tv_nsec */ lhi %r2,0 ahi %r15,16 - CFI_DEF_CFA_OFFSET 160 + CFI_DEF_CFA_OFFSET STACK_FRAME_OVERHEAD CFI_RESTORE 15 br %r14 /* CLOCK_MONOTONIC_COARSE */ - CFI_DEF_CFA_OFFSET 176 - CFI_VAL_OFFSET 15, -160 + CFI_DEF_CFA_OFFSET STACK_FRAME_OVERHEAD+16 + CFI_VAL_OFFSET 15, -STACK_FRAME_OVERHEAD 9: l %r4,__VDSO_UPD_COUNT+4(%r5) /* load update counter */ tml %r4,0x0001 /* pending update ? loop */ jnz 9b
@@ -158,17 +159,17 @@ __kernel_clock_gettime: st %r1,4(%r3) /* store tp->tv_nsec */ lhi %r2,0 ahi %r15,16 - CFI_DEF_CFA_OFFSET 160 + CFI_DEF_CFA_OFFSET STACK_FRAME_OVERHEAD CFI_RESTORE 15 br %r14 /* Fallback to system call */ - CFI_DEF_CFA_OFFSET 176 - CFI_VAL_OFFSET 15, -160 + CFI_DEF_CFA_OFFSET STACK_FRAME_OVERHEAD+16 + CFI_VAL_OFFSET 15, -STACK_FRAME_OVERHEAD 19: lhi %r1,__NR_clock_gettime svc 0 ahi %r15,16 - CFI_DEF_CFA_OFFSET 160 + CFI_DEF_CFA_OFFSET STACK_FRAME_OVERHEAD CFI_RESTORE 15 br %r14 CFI_ENDPROC
arch/s390/kernel/vdso32/gettimeofday.S +2 -1
@@ -10,6 +10,7 @@ #include <asm/asm-offsets.h> #include <asm/unistd.h> #include <asm/dwarf.h> +#include <asm/ptrace.h> .text .align 4
@@ -19,7 +20,7 @@ __kernel_gettimeofday: CFI_STARTPROC ahi %r15,-16 CFI_ADJUST_CFA_OFFSET 16 - CFI_VAL_OFFSET 15, -160 + CFI_VAL_OFFSET 15, -STACK_FRAME_OVERHEAD basr %r5,0 0: al %r5,13f-0b(%r5) /* get &_vdso_data */ 1: ltr %r3,%r3 /* check if tz is NULL */
arch/s390/kernel/vdso64/clock_gettime.S +13 -12
@@ -10,6 +10,7 @@ #include <asm/asm-offsets.h> #include <asm/unistd.h> #include <asm/dwarf.h> +#include <asm/ptrace.h> .text .align 4
@@ -18,8 +19,8 @@ __kernel_clock_gettime: CFI_STARTPROC aghi %r15,-16 - CFI_DEF_CFA_OFFSET 176 - CFI_VAL_OFFSET 15, -160 + CFI_DEF_CFA_OFFSET STACK_FRAME_OVERHEAD+16 + CFI_VAL_OFFSET 15, -STACK_FRAME_OVERHEAD larl %r5,_vdso_data cghi %r2,__CLOCK_REALTIME_COARSE je 4f
@@ -56,13 +57,13 @@ __kernel_clock_gettime: stg %r1,8(%r3) /* store tp->tv_nsec */ lghi %r2,0 aghi %r15,16 - CFI_DEF_CFA_OFFSET 160 + CFI_DEF_CFA_OFFSET STACK_FRAME_OVERHEAD CFI_RESTORE 15 br %r14 /* CLOCK_MONOTONIC_COARSE */ - CFI_DEF_CFA_OFFSET 176 - CFI_VAL_OFFSET 15, -160 + CFI_DEF_CFA_OFFSET STACK_FRAME_OVERHEAD+16 + CFI_VAL_OFFSET 15, -STACK_FRAME_OVERHEAD 3: lg %r4,__VDSO_UPD_COUNT(%r5) /* load update counter */ tmll %r4,0x0001 /* pending update ? loop */ jnz 3b
@@ -115,13 +116,13 @@ __kernel_clock_gettime: stg %r1,8(%r3) /* store tp->tv_nsec */ lghi %r2,0 aghi %r15,16 - CFI_DEF_CFA_OFFSET 160 + CFI_DEF_CFA_OFFSET STACK_FRAME_OVERHEAD CFI_RESTORE 15 br %r14 /* CPUCLOCK_VIRT for this thread */ - CFI_DEF_CFA_OFFSET 176 - CFI_VAL_OFFSET 15, -160 + CFI_DEF_CFA_OFFSET STACK_FRAME_OVERHEAD+16 + CFI_VAL_OFFSET 15, -STACK_FRAME_OVERHEAD 9: lghi %r4,0 icm %r0,15,__VDSO_ECTG_OK(%r5) jz 12f
@@ -142,17 +143,17 @@ __kernel_clock_gettime: stg %r4,8(%r3) lghi %r2,0 aghi %r15,16 - CFI_DEF_CFA_OFFSET 160 + CFI_DEF_CFA_OFFSET STACK_FRAME_OVERHEAD CFI_RESTORE 15 br %r14 /* Fallback to system call */ - CFI_DEF_CFA_OFFSET 176 - CFI_VAL_OFFSET 15, -160 + CFI_DEF_CFA_OFFSET STACK_FRAME_OVERHEAD+16 + CFI_VAL_OFFSET 15, -STACK_FRAME_OVERHEAD 12: lghi %r1,__NR_clock_gettime svc 0 aghi %r15,16 - CFI_DEF_CFA_OFFSET 160 + CFI_DEF_CFA_OFFSET STACK_FRAME_OVERHEAD CFI_RESTORE 15 br %r14 CFI_ENDPROC
arch/s390/kernel/vdso64/gettimeofday.S +2 -1
@@ -10,6 +10,7 @@ #include <asm/asm-offsets.h> #include <asm/unistd.h> #include <asm/dwarf.h> +#include <asm/ptrace.h> .text .align 4
@@ -19,7 +20,7 @@ __kernel_gettimeofday: CFI_STARTPROC aghi %r15,-16 CFI_ADJUST_CFA_OFFSET 16 - CFI_VAL_OFFSET 15, -160 + CFI_VAL_OFFSET 15, -STACK_FRAME_OVERHEAD larl %r5,_vdso_data 0: ltgr %r3,%r3 /* check if tz is NULL */ je 1f
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 292/422 brcmfmac: increase buffer for obtaining firmware capabilities
In reply to Greg Kroah-HartmanFrom: Arend van Spriel <[email protected]>
[ Upstream commit 59c2a30d36c8ae430d26a902c4c9665ea33ccee5 ]
When obtaining the firmware capability a buffer is provided of 512 bytes. However, if all features in firmware are supported the buffer needs to be 565 bytes as otherwise truncated information is retrieved from firmware. Increasing the buffer to 768 bytes on stack.
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c +1 -1
@@ -178,7 +178,7 @@ static void brcmf_feat_iovar_data_set(struct brcmf_if *ifp, ifp->fwil_fwerr = false; } -#define MAX_CAPS_BUFFER_SIZE 512 +#define MAX_CAPS_BUFFER_SIZE 768static void brcmf_feat_firmware_capabilities (struct brcmf_if *ifp) {char caps[MAX_CAPS_BUFFER_SIZE ];
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 293/422 brcmsmac: Use kvmalloc() for ucode allocations
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
[ Upstream commit 6c3efbe77bc78bf49db851aec7f385be475afca6 ]
The ucode chunk might be relatively large and the allocation with kmalloc() may fail occasionally. Since the data isn't DMA-transferred but by manual loops, we can use vmalloc instead of kmalloc. For a better performance, though, kvmalloc() would be the best choice in such a case, so let's replace with it.
Bugzilla: https://bugzilla.suse.com/show_bug.cgi?id=1103431
--- .../net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c +3 -3
@@ -1578,10 +1578,10 @@ int brcms_ucode_init_buf(struct brcms_info *wl, void **pbuf, u32 idx)if (le32_to_cpu (hdr->idx) == idx) { pdata = wl->fw.fw_bin[i]->data +le32_to_cpu (hdr->offset); - *pbuf =kmemdup (pdata, len,GFP_KERNEL ); + *pbuf =kvmalloc (len,GFP_KERNEL );if (*pbuf ==NULL ) goto fail; - +memcpy (*pbuf, pdata, len);return 0 ; } }
@@ -1629,7 +1629,7 @@ int brcms_ucode_init_uint(struct brcms_info *wl, size_t *n_bytes, u32 idx)*/ void brcms_ucode_free_buf (void *p) { -kfree (p); +kvfree (p); }/*
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 294/422 mlxsw: spectrum: Init shaper for TCs 8..15
In reply to Greg Kroah-HartmanFrom: Petr Machata <[email protected]>
[ Upstream commit a9f36656b519a9a21309793c306941a3cd0eeb8f ]
With introduction of MC-aware mode to mlxsw, it became necessary to configure TCs above 7 as well. There is now code in mlxsw to disable ETS for these higher classes, but disablement of max shaper was neglected.
By default, max shaper is currently disabled to begin with, so the problem is just cosmetic. However, for symmetry, do like we do for ETS configuration, and call mlxsw_sp_port_ets_maxrate_set() for both TC i and i + 8.
--- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/net/ethernet/mellanox/mlxsw/spectrum.c +7 -0
@@ -2815,6 +2815,13 @@ static int mlxsw_sp_port_ets_init(struct mlxsw_sp_port *mlxsw_sp_port) MLXSW_REG_QEEC_MAS_DIS);if (err)return err; + + err =mlxsw_sp_port_ets_maxrate_set (mlxsw_sp_port, +MLXSW_REG_QEEC_HIERARCY_TC , + i +8 , i, +MLXSW_REG_QEEC_MAS_DIS ); +if (err) +return err; }/* Map all priorities to traffic class 0. */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 295/422 PCI: portdrv: Initialize service drivers directly
In reply to Greg Kroah-HartmanFrom: Keith Busch <[email protected]>
[ Upstream commit c29de84149aba5f74e87b6491c13ac7203c12f55 ]
The PCI port driver saves the PCI state after initializing the device with the applicable service devices. This was, however, before the service drivers were even registered because PCI probe happens before the device_initcall initialized those service drivers. The config space state that the services set up were not being saved. The end result would cause PCI devices to not react to events that the drivers think they did if the PCI state ever needed to be restored.
Fix this by changing the service drivers from using the init calls to having the portdrv driver calling the services directly. This will get the state saved as desired, while making the relationship between the port driver and the services under it more explicit in the code.
--- drivers/pci/hotplug/pciehp_core.c | 3 +-- drivers/pci/pcie/aer.c | 3 +-- drivers/pci/pcie/dpc.c | 3 +-- drivers/pci/pcie/pme.c | 3 +-- drivers/pci/pcie/portdrv.h | 24 ++++++++++++++++++++++++ drivers/pci/pcie/portdrv_pci.c | 9 +++++++++ 6 files changed, 37 insertions(+), 8 deletions(-)
drivers/pci/hotplug/pciehp_core.c +1 -2
@@ -348,7 +348,7 @@ static struct pcie_port_service_driver hpdriver_portdrv = {#endif /* PM */ }; -static int __init pcied_init (void ) +int __init pcie_hp_init (void ) {int retval =0 ;
@@ -359,4 +359,3 @@ static int __init pcied_init(void)return retval; } -device_initcall (pcied_init);
drivers/pci/pcie/aer.c +1 -2
@@ -1569,10 +1569,9 @@ static struct pcie_port_service_driver aerdriver = {* * Invoked when AER root service driver is loaded. */ -static int __init aer_service_init (void ) +int __init pcie_aer_init (void ) {if (!pci_aer_available () ||aer_acpi_firmware_first ())return -ENXIO ;return pcie_port_service_register (&aerdriver); } -device_initcall (aer_service_init);
drivers/pci/pcie/dpc.c +1 -2
@@ -307,8 +307,7 @@ static struct pcie_port_service_driver dpcdriver = { .reset_link = dpc_reset_link, }; -static int __init dpc_service_init (void ) +int __init pcie_dpc_init (void ) {return pcie_port_service_register (&dpcdriver); } -device_initcall (dpc_service_init);
drivers/pci/pcie/pme.c +1 -2
@@ -455,8 +455,7 @@ static struct pcie_port_service_driver pcie_pme_driver = {/** * pcie_pme_service_init - Register the PCIe PME service driver. */ -static int __init pcie_pme_service_init (void ) +int __init pcie_pme_init (void ) {return pcie_port_service_register (&pcie_pme_driver); } -device_initcall (pcie_pme_service_init);
drivers/pci/pcie/portdrv.h +24 -0
@@ -23,6 +23,30 @@#define PCIE_PORT_DEVICE_MAXSERVICES 4 +#ifdef CONFIG_PCIEAER +int pcie_aer_init (void ); +#else +static inline int pcie_aer_init (void ) {return 0 ; } +#endif + +#ifdef CONFIG_HOTPLUG_PCI_PCIE +int pcie_hp_init (void ); +#else +static inline int pcie_hp_init (void ) {return 0 ; } +#endif + +#ifdef CONFIG_PCIE_PME +int pcie_pme_init (void ); +#else +static inline int pcie_pme_init (void ) {return 0 ; } +#endif + +#ifdef CONFIG_PCIE_DPC +int pcie_dpc_init (void ); +#else +static inline int pcie_dpc_init (void ) {return 0 ; } +#endif +/* Port Type */ #define PCIE_ANY_PORT (~0)
drivers/pci/pcie/portdrv_pci.c +9 -0
@@ -226,11 +226,20 @@ static const struct dmi_system_id pcie_portdrv_dmi_table[] __initconst = { {} }; +static void __init pcie_init_services (void ) +{ +pcie_aer_init (); +pcie_pme_init (); +pcie_dpc_init (); +pcie_hp_init (); +} +static int __init pcie_portdrv_init (void ) {if (pcie_ports_disabled)return -EACCES ; +pcie_init_services ();dmi_check_system (pcie_portdrv_dmi_table);return pci_register_driver (&pcie_portdriver);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 296/422 ARM: dts: am335x-evm: fix number of cpsw
In reply to Greg Kroah-HartmanFrom: Grygorii Strashko <[email protected]>
[ Upstream commit dcbf6b18d81bcdc51390ca1b258c17e2e13b7d0c ]
am335x-evm has only one CPSW external port physically wired, but DT defines 2 ext. ports. As result, PHY connection failure reported for the second ext. port.
Update DT to reflect am335x-evm board HW configuration, and, while here, switch to use phy-handle instead of phy_id.
--- arch/arm/boot/dts/am335x-evm.dts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
arch/arm/boot/dts/am335x-evm.dts +6 -6
@@ -731,6 +731,7 @@ pinctrl-0 = <&cpsw_default>; pinctrl-1 = <&cpsw_sleep>; status = "okay"; + slaves = <1>; }; &davinci_mdio {
@@ -738,15 +739,14 @@ pinctrl-0 = <&davinci_mdio_default>; pinctrl-1 = <&davinci_mdio_sleep>; status = "okay"; -}; -&cpsw_emac0 { - phy_id = <&davinci_mdio>, <0>; - phy-mode = "rgmii-txid"; + ethphy0: ethernet-phy@0 { + reg = <0>; + }; }; -&cpsw_emac1 { - phy_id = <&davinci_mdio>, <1>; +&cpsw_emac0 { + phy-handle = <ðphy0>; phy-mode = "rgmii-txid"; };
Signature · 1 line
2.20.1