--- /dev/null
+From foo@baz Fri Apr 6 10:27:52 CEST 2018
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Fri, 6 Apr 2018 08:47:29 +0200
+Subject: Revert "ARM: dts: am335x-pepper: Fix the audio CODEC's reset pin"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit 272b5eef085c23cd71eec30fe040fb1592682508 which was
+comit e153db03c6b7a035c797bcdf35262586f003ee93 upstream.
+
+It requires a driver that was not merged until 4.16, so remove it from
+this stable tree as it is pointless.
+
+Reported-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
+Cc: Andrew F. Davis <afd@ti.com>
+Cc: Tony Lindgren <tony@atomide.com>
+Cc: Sasha Levin <alexander.levin@microsoft.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/arm/boot/dts/am335x-pepper.dts | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/arm/boot/dts/am335x-pepper.dts
++++ b/arch/arm/boot/dts/am335x-pepper.dts
+@@ -139,7 +139,7 @@
+ &audio_codec {
+ status = "okay";
+
+- reset-gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
++ gpio-reset = <&gpio1 16 GPIO_ACTIVE_LOW>;
+ AVDD-supply = <&ldo3_reg>;
+ IOVDD-supply = <&ldo3_reg>;
+ DRVDD-supply = <&ldo3_reg>;
--- /dev/null
+From foo@baz Fri Apr 6 10:27:52 CEST 2018
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Fri, 6 Apr 2018 08:56:45 +0200
+Subject: Revert "ARM: dts: omap3-n900: Fix the audio CODEC's reset pin"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit e5ca83f556925b86133af12ef7f17c1a52c39d7e which was
+commit 7be4b5dc7ffa9499ac6ef33a5ffa9ff43f9b7057 upstream.
+
+It requires a driver that was not merged until 4.16, so remove it from
+this stable tree as it is pointless.
+
+Reported-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
+Cc: Andrew F. Davis <afd@ti.com>
+Cc: Tony Lindgren <tony@atomide.com>
+Cc: Sasha Levin <alexander.levin@microsoft.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/arm/boot/dts/omap3-n900.dts | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/arch/arm/boot/dts/omap3-n900.dts
++++ b/arch/arm/boot/dts/omap3-n900.dts
+@@ -510,7 +510,7 @@
+ tlv320aic3x: tlv320aic3x@18 {
+ compatible = "ti,tlv320aic3x";
+ reg = <0x18>;
+- reset-gpios = <&gpio2 28 GPIO_ACTIVE_LOW>; /* 60 */
++ gpio-reset = <&gpio2 28 GPIO_ACTIVE_HIGH>; /* 60 */
+ ai3x-gpio-func = <
+ 0 /* AIC3X_GPIO1_FUNC_DISABLED */
+ 5 /* AIC3X_GPIO2_FUNC_DIGITAL_MIC_INPUT */
+@@ -527,7 +527,7 @@
+ tlv320aic3x_aux: tlv320aic3x@19 {
+ compatible = "ti,tlv320aic3x";
+ reg = <0x19>;
+- reset-gpios = <&gpio2 28 GPIO_ACTIVE_LOW>; /* 60 */
++ gpio-reset = <&gpio2 28 GPIO_ACTIVE_HIGH>; /* 60 */
+
+ AVDD-supply = <&vmmc2>;
+ DRVDD-supply = <&vmmc2>;
--- /dev/null
+From foo@baz Fri Apr 6 10:27:52 CEST 2018
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Fri, 6 Apr 2018 09:45:22 +0200
+Subject: Revert "ip6_vti: adjust vti mtu according to mtu of lower device"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit 1139d77d8a7f9aa6b6ae0a1c902f94775dad2f52 which is
+commit 53c81e95df1793933f87748d36070a721f6cb287 upstream.
+
+Ben writes that there are a number of follow-on patches needed to fix
+this up, but they get complex to backport, and some custom fixes are
+needed, so let's just revert this and wait for a "real" set of patches
+to resolve this to be submitted if it is really needed.
+
+Reported-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
+Cc: Petr Vorel <pvorel@suse.cz>
+Cc: Alexey Kodanev <alexey.kodanev@oracle.com>
+Cc: David S. Miller <davem@davemloft.net>
+Cc: Stefano Brivio <sbrivio@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ net/ipv6/ip6_vti.c | 20 --------------------
+ 1 file changed, 20 deletions(-)
+
+--- a/net/ipv6/ip6_vti.c
++++ b/net/ipv6/ip6_vti.c
+@@ -625,7 +625,6 @@ static void vti6_link_config(struct ip6_
+ {
+ struct net_device *dev = t->dev;
+ struct __ip6_tnl_parm *p = &t->parms;
+- struct net_device *tdev = NULL;
+
+ memcpy(dev->dev_addr, &p->laddr, sizeof(struct in6_addr));
+ memcpy(dev->broadcast, &p->raddr, sizeof(struct in6_addr));
+@@ -638,25 +637,6 @@ static void vti6_link_config(struct ip6_
+ dev->flags |= IFF_POINTOPOINT;
+ else
+ dev->flags &= ~IFF_POINTOPOINT;
+-
+- if (p->flags & IP6_TNL_F_CAP_XMIT) {
+- int strict = (ipv6_addr_type(&p->raddr) &
+- (IPV6_ADDR_MULTICAST | IPV6_ADDR_LINKLOCAL));
+- struct rt6_info *rt = rt6_lookup(t->net,
+- &p->raddr, &p->laddr,
+- p->link, strict);
+-
+- if (rt)
+- tdev = rt->dst.dev;
+- ip6_rt_put(rt);
+- }
+-
+- if (!tdev && p->link)
+- tdev = __dev_get_by_index(t->net, p->link);
+-
+- if (tdev)
+- dev->mtu = max_t(int, tdev->mtu - dev->hard_header_len,
+- IPV6_MIN_MTU);
+ }
+
+ /**
--- /dev/null
+From foo@baz Fri Apr 6 10:27:52 CEST 2018
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Fri, 6 Apr 2018 09:28:46 +0200
+Subject: Revert "mtip32xx: use runtime tag to initialize command header"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit db54facd56a40e7766bf7f7cda1ae138e72a691c which was
+commit a4e84aae8139aca9fbfbced1f45c51ca81b57488 upstream.
+
+Ben writes:
+ MQ IO schedulers were introduced in 4.11, so this shouldn't be
+ needed in older branches. It also causes a performance
+ regression (fixed upstream). Please revert this for 4.4 and
+ 4.9.
+
+So let's revert it!
+
+Reported-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
+Cc: Ming Lei <ming.lei@redhat.com>
+Cc: Jens Axboe <axboe@fb.com>
+Cc: Sasha Levin <alexander.levin@microsoft.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/block/mtip32xx/mtip32xx.c | 36 ++++++++++++------------------------
+ 1 file changed, 12 insertions(+), 24 deletions(-)
+
+--- a/drivers/block/mtip32xx/mtip32xx.c
++++ b/drivers/block/mtip32xx/mtip32xx.c
+@@ -169,25 +169,6 @@ static bool mtip_check_surprise_removal(
+ return false; /* device present */
+ }
+
+-/* we have to use runtime tag to setup command header */
+-static void mtip_init_cmd_header(struct request *rq)
+-{
+- struct driver_data *dd = rq->q->queuedata;
+- struct mtip_cmd *cmd = blk_mq_rq_to_pdu(rq);
+- u32 host_cap_64 = readl(dd->mmio + HOST_CAP) & HOST_CAP_64;
+-
+- /* Point the command headers at the command tables. */
+- cmd->command_header = dd->port->command_list +
+- (sizeof(struct mtip_cmd_hdr) * rq->tag);
+- cmd->command_header_dma = dd->port->command_list_dma +
+- (sizeof(struct mtip_cmd_hdr) * rq->tag);
+-
+- if (host_cap_64)
+- cmd->command_header->ctbau = __force_bit2int cpu_to_le32((cmd->command_dma >> 16) >> 16);
+-
+- cmd->command_header->ctba = __force_bit2int cpu_to_le32(cmd->command_dma & 0xFFFFFFFF);
+-}
+-
+ static struct mtip_cmd *mtip_get_int_command(struct driver_data *dd)
+ {
+ struct request *rq;
+@@ -199,9 +180,6 @@ static struct mtip_cmd *mtip_get_int_com
+ if (IS_ERR(rq))
+ return NULL;
+
+- /* Internal cmd isn't submitted via .queue_rq */
+- mtip_init_cmd_header(rq);
+-
+ return blk_mq_rq_to_pdu(rq);
+ }
+
+@@ -3833,8 +3811,6 @@ static int mtip_queue_rq(struct blk_mq_h
+ struct request *rq = bd->rq;
+ int ret;
+
+- mtip_init_cmd_header(rq);
+-
+ if (unlikely(mtip_check_unal_depth(hctx, rq)))
+ return BLK_MQ_RQ_QUEUE_BUSY;
+
+@@ -3866,6 +3842,7 @@ static int mtip_init_cmd(void *data, str
+ {
+ struct driver_data *dd = data;
+ struct mtip_cmd *cmd = blk_mq_rq_to_pdu(rq);
++ u32 host_cap_64 = readl(dd->mmio + HOST_CAP) & HOST_CAP_64;
+
+ /*
+ * For flush requests, request_idx starts at the end of the
+@@ -3882,6 +3859,17 @@ static int mtip_init_cmd(void *data, str
+
+ memset(cmd->command, 0, CMD_DMA_ALLOC_SZ);
+
++ /* Point the command headers at the command tables. */
++ cmd->command_header = dd->port->command_list +
++ (sizeof(struct mtip_cmd_hdr) * request_idx);
++ cmd->command_header_dma = dd->port->command_list_dma +
++ (sizeof(struct mtip_cmd_hdr) * request_idx);
++
++ if (host_cap_64)
++ cmd->command_header->ctbau = __force_bit2int cpu_to_le32((cmd->command_dma >> 16) >> 16);
++
++ cmd->command_header->ctba = __force_bit2int cpu_to_le32(cmd->command_dma & 0xFFFFFFFF);
++
+ sg_init_table(cmd->sg, MTIP_MAX_SG);
+ return 0;
+ }
--- /dev/null
+From foo@baz Fri Apr 6 10:27:52 CEST 2018
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Fri, 6 Apr 2018 09:08:12 +0200
+Subject: Revert "spi: bcm-qspi: shut up warning about cfi header inclusion"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit c30e6636ce101fd61331092c490b9d9c55b2d143.
+
+Florian writes:
+ Sorry for noticing so late, but this appears to be bogus, there
+ is no MTD_NORFLASH symbol being defined in 4.9, in fact I can't
+ find this Kconfig symbol in any kernel version, so this
+ effectively results in the driver no longer being selectable, so
+ this sure does silence the warning.
+
+It's not good to just disable a whole driver :(
+
+So let's revert the patch for now, Arnd can work on a better build
+fix...
+
+Reported-by: Florian Fainelli <f.fainelli@gmail.com>
+Cc: Arnd Bergmann <arnd@arndb.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/spi/Kconfig | 1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/drivers/spi/Kconfig
++++ b/drivers/spi/Kconfig
+@@ -156,7 +156,6 @@ config SPI_BCM63XX_HSSPI
+ config SPI_BCM_QSPI
+ tristate "Broadcom BSPI and MSPI controller support"
+ depends on ARCH_BRCMSTB || ARCH_BCM || ARCH_BCM_IPROC || COMPILE_TEST
+- depends on MTD_NORFLASH
+ default ARCH_BCM_IPROC
+ help
+ Enables support for the Broadcom SPI flash and MSPI controller.
md-raid10-reset-the-first-at-the-end-of-loop.patch
net-hns-fix-ethtool-private-flags.patch
fix-slab-name-biovec-1-21-12.patch
+revert-arm-dts-am335x-pepper-fix-the-audio-codec-s-reset-pin.patch
+revert-arm-dts-omap3-n900-fix-the-audio-codec-s-reset-pin.patch
+revert-spi-bcm-qspi-shut-up-warning-about-cfi-header-inclusion.patch
+revert-mtip32xx-use-runtime-tag-to-initialize-command-header.patch
+revert-ip6_vti-adjust-vti-mtu-according-to-mtu-of-lower-device.patch
+spi-davinci-fix-up-dma_mapping_error-incorrect-patch.patch
--- /dev/null
+From foo@baz Fri Apr 6 10:27:52 CEST 2018
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Fri, 6 Apr 2018 10:18:25 +0200
+Subject: spi: davinci: fix up dma_mapping_error() incorrect patch
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+commit aabb797b4c1204b2e8518538b2616e476f2bac92, which is commit
+c5a2a394835f473ae23931eda5066d3771d7b2f8 upstream had an error in it.
+
+Ben writes:
+ The '!' needs to be deleted. This appears to have been fixed upstream
+ by:
+
+ commit 8aedbf580d21121d2a032e4c8ea12d8d2d85e275
+ Author: Fabien Parent <fparent@baylibre.com>
+ Date: Thu Feb 23 19:01:56 2017 +0100
+
+ spi: davinci: Use SPI framework to handle DMA mapping
+
+ which is not suitable for stable.
+
+So I'm just fixing this up directly.
+
+Reported-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
+Cc: Kevin Hilman <khilman@baylibre.com>
+Cc: Mark Brown <broonie@kernel.org>
+Cc: Sasha Levin <alexander.levin@verizon.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/spi/spi-davinci.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/spi/spi-davinci.c
++++ b/drivers/spi/spi-davinci.c
+@@ -646,7 +646,7 @@ static int davinci_spi_bufs(struct spi_d
+ buf = t->rx_buf;
+ t->rx_dma = dma_map_single(&spi->dev, buf,
+ t->len, DMA_FROM_DEVICE);
+- if (dma_mapping_error(&spi->dev, !t->rx_dma)) {
++ if (dma_mapping_error(&spi->dev, t->rx_dma)) {
+ ret = -EFAULT;
+ goto err_rx_map;
+ }
projects / thirdparty / kernel / stable-queue.git / commitdiff
