X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kernel-small_fixes.patch;h=f0584fb5d2bf489cc24ac7eaf952c345766e3c27;hb=968cc686e4754b540581e741e5ee450a69101639;hp=2d92e0bbc834c192335fcd551cdd4bf50b40f0f9;hpb=42b355f2bf012f3ac6f883b9d50227409d8d5f3d;p=packages%2Fkernel.git diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch index 2d92e0bb..f0584fb5 100644 --- a/kernel-small_fixes.patch +++ b/kernel-small_fixes.patch @@ -1,185 +1,117 @@ ---- linux-2.6.33/scripts/mod/modpost.c~ 2010-02-24 19:52:17.000000000 +0100 -+++ linux-2.6.33/scripts/mod/modpost.c 2010-03-07 14:26:47.242168558 +0100 -@@ -15,7 +15,8 @@ - #include - #include - #include "modpost.h" --#include "../../include/generated/autoconf.h" -+// PLD architectures don't use CONFIG_SYMBOL_PREFIX -+//#include "../../include/generated/autoconf.h" - #include "../../include/linux/license.h" +; https://lkml.org/lkml/2019/7/10/244 +diff -ur linux-5.3/drivers/scsi/aacraid.org/aacraid.h linux-5.3/drivers/scsi/aacraid/aacraid.h +--- linux-5.3/drivers/scsi/aacraid.org/aacraid.h 2019-11-01 22:42:37.011469816 +0100 ++++ linux-5.3/drivers/scsi/aacraid/aacraid.h 2019-11-04 09:29:51.321486211 +0100 +@@ -2740,17 +2740,6 @@ + int aac_rx_deliver_producer(struct fib * fib); + void aac_reinit_aif(struct aac_dev *aac, unsigned int index); - /* Some toolchains use a `_' prefix for all user symbols. */ - ---- linux-3.0/scripts/kconfig/lxdialog/check-lxdialog.sh~ 2011-07-22 04:17:23.000000000 +0200 -+++ linux-3.0/scripts/kconfig/lxdialog/check-lxdialog.sh 2011-08-25 21:26:04.799150642 +0200 -@@ -9,6 +9,12 @@ - $cc -print-file-name=lib${lib}.${ext} | grep -q / - if [ $? -eq 0 ]; then - echo "-l${lib}" -+ for libt in tinfow tinfo ; do -+ $cc -print-file-name=lib${libt}.${ext} | grep -q / -+ if [ $? -eq 0 ]; then -+ echo "-l${libt}" -+ fi -+ done - exit - fi - done - -diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c -index 7a0c800..ec5ebbb 100644 ---- a/drivers/net/ethernet/realtek/r8169.c -+++ b/drivers/net/ethernet/realtek/r8169.c -@@ -6927,6 +6927,14 @@ rtl_init_one(struct pci_dev *pdev, const - for (i = 0; i < ETH_ALEN; i++) - dev->dev_addr[i] = RTL_R8(MAC0 + i); - -+ if (!is_valid_ether_addr(dev->dev_addr)) { -+ /* Report it and use a random ethernet address instead */ -+ netdev_err(dev, "Invalid MAC address: %pM\n", dev->dev_addr); -+ random_ether_addr(dev->dev_addr); -+ netdev_info(dev, "Using random MAC address: %pM\n", -+ dev->dev_addr); -+ } -+ - SET_ETHTOOL_OPS(dev, &rtl8169_ethtool_ops); - dev->watchdog_timeo = RTL8169_TX_TIMEOUT; - -[PATCH] SCSI: Don't attempt to send extended INQUIRY command if skip_vpd_pages is set - -If a device has the skip_vpd_pages flag set we should simply fail the -scsi_get_vpd_page() call. - -Signed-off-by: Martin K. Petersen -Acked-by: Alan Stern -Tested-by: Stuart Foster -Cc: stable@vger.kernel.org - -diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c -index 3b1ea34..eaa808e 100644 ---- a/drivers/scsi/scsi.c -+++ b/drivers/scsi/scsi.c -@@ -1031,6 +1031,9 @@ +-static inline int aac_is_src(struct aac_dev *dev) +-{ +- u16 device = dev->pdev->device; +- +- if (device == PMC_DEVICE_S6 || +- device == PMC_DEVICE_S7 || +- device == PMC_DEVICE_S8) +- return 1; +- return 0; +-} +- + static inline int aac_supports_2T(struct aac_dev *dev) { - int i, result; + return (dev->adapter_info.options & AAC_OPT_NEW_COMM_64); +diff -ur linux-5.3/drivers/scsi/aacraid.org/comminit.c linux-5.3/drivers/scsi/aacraid/comminit.c +--- linux-5.3/drivers/scsi/aacraid.org/comminit.c 2019-11-01 22:42:37.014803249 +0100 ++++ linux-5.3/drivers/scsi/aacraid/comminit.c 2019-11-04 09:29:51.321486211 +0100 +@@ -41,8 +41,11 @@ + { + u32 status = 0; -+ if (sdev->skip_vpd_pages) -+ goto fail; -+ - /* Ask for all the pages supported by this device */ - result = scsi_vpd_inquiry(sdev, buf, 0, buf_len); - if (result) -commit 4d0ed18277cc6f07513ee0b04475f19cd69e75ef -Author: Peter Hurley -Date: Tue Dec 10 17:12:02 2013 -0500 - - n_tty: Fix buffer overruns with larger-than-4k pastes - - readline() inadvertently triggers an error recovery path when - pastes larger than 4k overrun the line discipline buffer. The - error recovery path discards input when the line discipline buffer - is full and operating in canonical mode and no newline has been - received. Because readline() changes the termios to non-canonical - mode to read the line char-by-char, the line discipline buffer - can become full, and then when readline() restores termios back - to canonical mode for the caller, the now-full line discipline - buffer triggers the error recovery. - - When changing termios from non-canon to canon mode and the read - buffer contains data, simulate an EOF push _without_ the - DISABLED_CHAR in the read buffer. - - Importantly for the readline() problem, the termios can be - changed back to non-canonical mode without changes to the read - buffer occurring; ie., as if the previous termios change had not - happened (as long as no intervening read took place). - - Preserve existing userspace behavior which allows '\0's already - received in non-canon mode to be read as '\0's in canon mode - (rather than trigger add'l EOF pushes or an actual EOF). - - Patch based on original proposal and discussion here - https://bugzilla.kernel.org/show_bug.cgi?id=55991 - by Stas Sergeev - - Reported-by: Margarita Manterola - Cc: Maximiliano Curia - Cc: Pavel Machek - Cc: Arkadiusz Miskiewicz - Acked-by: Stas Sergeev - Signed-off-by: Peter Hurley - Signed-off-by: Greg Kroah-Hartman - -diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c -index fdc2ecd..961e6a9 100644 ---- a/drivers/tty/n_tty.c -+++ b/drivers/tty/n_tty.c -@@ -104,6 +104,7 @@ struct n_tty_data { +- if (aac_is_src(dev)) ++ if (dev->pdev->device == PMC_DEVICE_S6 || ++ dev->pdev->device == PMC_DEVICE_S7 || ++ dev->pdev->device == PMC_DEVICE_S8) { + status = src_readl(dev, MUnit.OMR); ++ } + return (status & AAC_INT_MODE_MSIX); + } - /* must hold exclusive termios_rwsem to reset these */ - unsigned char lnext:1, erasing:1, raw:1, real_raw:1, icanon:1; -+ unsigned char push:1; +@@ -349,7 +352,8 @@ + /* FIB should be freed only after getting the response from the F/W */ + if (status != -ERESTARTSYS) + aac_fib_free(fibctx); +- if (aac_is_src(dev) && ++ if ((dev->pdev->device == PMC_DEVICE_S7 || ++ dev->pdev->device == PMC_DEVICE_S8) && + dev->msi_enabled) + aac_set_intx_mode(dev); + return status; +@@ -610,7 +614,8 @@ + dev->max_fib_size = status[1] & 0xFFE0; + host->sg_tablesize = status[2] >> 16; + dev->sg_tablesize = status[2] & 0xFFFF; +- if (aac_is_src(dev)) { ++ if (dev->pdev->device == PMC_DEVICE_S7 || ++ dev->pdev->device == PMC_DEVICE_S8) { + if (host->can_queue > (status[3] >> 16) - + AAC_NUM_MGT_FIB) + host->can_queue = (status[3] >> 16) - +@@ -629,7 +634,9 @@ + pr_warn("numacb=%d ignored\n", numacb); + } - /* shared by producer and consumer */ - char read_buf[N_TTY_BUF_SIZE]; -@@ -341,6 +342,7 @@ static void reset_buffer_flags(struct n_tty_data *ldata) +- if (aac_is_src(dev)) ++ if (dev->pdev->device == PMC_DEVICE_S6 || ++ dev->pdev->device == PMC_DEVICE_S7 || ++ dev->pdev->device == PMC_DEVICE_S8) + aac_define_int_mode(dev); + /* + * Ok now init the communication subsystem +diff -ur linux-5.3/drivers/scsi/aacraid.org/commsup.c linux-5.3/drivers/scsi/aacraid/commsup.c +--- linux-5.3/drivers/scsi/aacraid.org/commsup.c 2019-11-01 22:42:37.014803249 +0100 ++++ linux-5.3/drivers/scsi/aacraid/commsup.c 2019-11-04 09:29:51.321486211 +0100 +@@ -2593,7 +2593,9 @@ + { + int i; - ldata->erasing = 0; - bitmap_zero(ldata->read_flags, N_TTY_BUF_SIZE); -+ ldata->push = 0; - } +- if (aac_is_src(dev)) { ++ if (dev->pdev->device == PMC_DEVICE_S6 || ++ dev->pdev->device == PMC_DEVICE_S7 || ++ dev->pdev->device == PMC_DEVICE_S8) { + if (dev->max_msix > 1) { + for (i = 0; i < dev->max_msix; i++) + free_irq(pci_irq_vector(dev->pdev, i), +diff -ur linux-5.3/drivers/scsi/aacraid.org/linit.c linux-5.3/drivers/scsi/aacraid/linit.c +--- linux-5.3/drivers/scsi/aacraid.org/linit.c 2019-11-01 22:42:37.011469816 +0100 ++++ linux-5.3/drivers/scsi/aacraid/linit.c 2019-11-04 09:29:51.321486211 +0100 +@@ -1567,8 +1567,9 @@ + aac_send_shutdown(aac); - static void n_tty_packet_mode_flush(struct tty_struct *tty) -@@ -1745,7 +1747,16 @@ static void n_tty_set_termios(struct tty_struct *tty, struct ktermios *old) + aac_adapter_disable_int(aac); +- +- if (aac_is_src(aac)) { ++ if (aac->pdev->device == PMC_DEVICE_S6 || ++ aac->pdev->device == PMC_DEVICE_S7 || ++ aac->pdev->device == PMC_DEVICE_S8) { + if (aac->max_msix > 1) { + for (i = 0; i < aac->max_msix; i++) { + free_irq(pci_irq_vector(aac->pdev, i), +@@ -1858,7 +1859,8 @@ + aac_adapter_enable_int(dev); - if (!old || (old->c_lflag ^ tty->termios.c_lflag) & ICANON) { - bitmap_zero(ldata->read_flags, N_TTY_BUF_SIZE); -- ldata->line_start = ldata->canon_head = ldata->read_tail; -+ ldata->line_start = ldata->read_tail; -+ if (!L_ICANON(tty) || !read_cnt(ldata)) { -+ ldata->canon_head = ldata->read_tail; -+ ldata->push = 0; -+ } else { -+ set_bit((ldata->read_head - 1) & (N_TTY_BUF_SIZE - 1), -+ ldata->read_flags); -+ ldata->canon_head = ldata->read_head; -+ ldata->push = 1; -+ } - ldata->erasing = 0; - ldata->lnext = 0; - } -@@ -1951,6 +1962,12 @@ static int copy_from_read_buf(struct tty_struct *tty, - * it copies one line of input up to and including the line-delimiting - * character into the user-space buffer. - * -+ * NB: When termios is changed from non-canonical to canonical mode and -+ * the read buffer contains data, n_tty_set_termios() simulates an EOF -+ * push (as if C-d were input) _without_ the DISABLED_CHAR in the buffer. -+ * This causes data already processed as input to be immediately available -+ * as input although a newline has not been received. -+ * - * Called under the atomic_read_lock mutex - * - * n_tty_read()/consumer path: -@@ -1997,7 +2014,7 @@ static int canon_copy_from_read_buf(struct tty_struct *tty, - n += found; - c = n; -- if (found && read_buf(ldata, eol) == __DISABLED_CHAR) { -+ if (found && !ldata->push && read_buf(ldata, eol) == __DISABLED_CHAR) { - n--; - eof_push = !n && ldata->read_tail != ldata->line_start; - } -@@ -2024,7 +2041,10 @@ static int canon_copy_from_read_buf(struct tty_struct *tty, - ldata->read_tail += c; +- if (aac_is_src(dev)) ++ if (dev->pdev->device == PMC_DEVICE_S7 || ++ dev->pdev->device == PMC_DEVICE_S8) + aac_define_int_mode(dev); - if (found) { -- ldata->line_start = ldata->read_tail; -+ if (!ldata->push) -+ ldata->line_start = ldata->read_tail; -+ else -+ ldata->push = 0; - tty_audit_push(tty); - } - return eof_push ? -EAGAIN : 0; + if (dev->msi_enabled) + +--- linux-5.7/scripts/ld-version.sh~ 2020-06-01 01:49:15.000000000 +0200 ++++ linux-5.7/scripts/ld-version.sh 2020-06-02 08:28:48.303207264 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/awk -f ++#!/bin/awk -f + # SPDX-License-Identifier: GPL-2.0 + # extract linker version number from stdin and turn into single number + {