5.10-stable patches

added patches:
	cifs-when-extending-a-file-with-falloc-we-should-make-files-not-sparse.patch
	fonts-make-font-size-unsigned-in-font_desc.patch
	parisc-stifb-keep-track-of-hardware-path-of-graphics-card.patch
	xhci-allow-host-runtime-pm-as-default-for-intel-alder-lake-n-xhci.patch

diff --git a/queue-5.10/cifs-when-extending-a-file-with-falloc-we-should-make-files-not-sparse.patch b/queue-5.10/cifs-when-extending-a-file-with-falloc-we-should-make-files-not-sparse.patch
new file mode 100644 (file)
index 0000000..20e6b47
--- /dev/null
+++ b/queue-5.10/cifs-when-extending-a-file-with-falloc-we-should-make-files-not-sparse.patch
@@ -0,0 +1,32 @@
+From f66f8b94e7f2f4ac9fffe710be231ca8f25c5057 Mon Sep 17 00:00:00 2001
+From: Ronnie Sahlberg <lsahlber@redhat.com>
+Date: Wed, 1 Jun 2022 08:48:38 +1000
+Subject: cifs: when extending a file with falloc we should make files not-sparse
+
+From: Ronnie Sahlberg <lsahlber@redhat.com>
+
+commit f66f8b94e7f2f4ac9fffe710be231ca8f25c5057 upstream.
+
+as this is the only way to make sure the region is allocated.
+Fix the conditional that was wrong and only tried to make already
+non-sparse files non-sparse.
+
+Cc: stable@vger.kernel.org
+Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
+Signed-off-by: Steve French <stfrench@microsoft.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ fs/cifs/smb2ops.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/fs/cifs/smb2ops.c
++++ b/fs/cifs/smb2ops.c
+@@ -3632,7 +3632,7 @@ static long smb3_simple_falloc(struct fi
+               if (rc)
+                       goto out;
+ 
+-              if ((cifsi->cifsAttrs & FILE_ATTRIBUTE_SPARSE_FILE) == 0)
++              if (cifsi->cifsAttrs & FILE_ATTRIBUTE_SPARSE_FILE)
+                       smb2_set_sparse(xid, tcon, cfile, inode, false);
+ 
+               eof = cpu_to_le64(off + len);

diff --git a/queue-5.10/fonts-make-font-size-unsigned-in-font_desc.patch b/queue-5.10/fonts-make-font-size-unsigned-in-font_desc.patch
new file mode 100644 (file)
index 0000000..4948352
--- /dev/null
+++ b/queue-5.10/fonts-make-font-size-unsigned-in-font_desc.patch
@@ -0,0 +1,48 @@
+From 7cb415003468d41aecd6877ae088c38f6c0fc174 Mon Sep 17 00:00:00 2001
+From: Peilin Ye <yepeilin.cs@gmail.com>
+Date: Wed, 28 Oct 2020 06:56:47 -0400
+Subject: Fonts: Make font size unsigned in font_desc
+
+From: Peilin Ye <yepeilin.cs@gmail.com>
+
+commit 7cb415003468d41aecd6877ae088c38f6c0fc174 upstream.
+
+`width` and `height` are defined as unsigned in our UAPI font descriptor
+`struct console_font`. Make them unsigned in our kernel font descriptor
+`struct font_desc`, too.
+
+Also, change the corresponding printk() format identifiers from `%d` to
+`%u`, in sti_select_fbfont().
+
+Signed-off-by: Peilin Ye <yepeilin.cs@gmail.com>
+Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+Link: https://patchwork.freedesktop.org/patch/msgid/20201028105647.1210161-1-yepeilin.cs@gmail.com
+Cc: Helge Deller <deller@gmx.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/video/console/sticore.c |    2 +-
+ include/linux/font.h            |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/video/console/sticore.c
++++ b/drivers/video/console/sticore.c
+@@ -503,7 +503,7 @@ sti_select_fbfont(struct sti_cooked_rom
+       if (!fbfont)
+               return NULL;
+ 
+-      pr_info("STI selected %dx%d framebuffer font %s for sticon\n",
++      pr_info("STI selected %ux%u framebuffer font %s for sticon\n",
+                       fbfont->width, fbfont->height, fbfont->name);
+                       
+       bpc = ((fbfont->width+7)/8) * fbfont->height; 
+--- a/include/linux/font.h
++++ b/include/linux/font.h
+@@ -16,7 +16,7 @@
+ struct font_desc {
+     int idx;
+     const char *name;
+-    int width, height;
++    unsigned int width, height;
+     const void *data;
+     int pref;
+ };

diff --git a/queue-5.10/parisc-stifb-keep-track-of-hardware-path-of-graphics-card.patch b/queue-5.10/parisc-stifb-keep-track-of-hardware-path-of-graphics-card.patch
new file mode 100644 (file)
index 0000000..eb842c5
--- /dev/null
+++ b/queue-5.10/parisc-stifb-keep-track-of-hardware-path-of-graphics-card.patch
@@ -0,0 +1,113 @@
+From b046f984814af7985f444150ec28716d42d00d9a Mon Sep 17 00:00:00 2001
+From: Helge Deller <deller@gmx.de>
+Date: Thu, 2 Jun 2022 13:55:26 +0200
+Subject: parisc/stifb: Keep track of hardware path of graphics card
+
+From: Helge Deller <deller@gmx.de>
+
+commit b046f984814af7985f444150ec28716d42d00d9a upstream.
+
+Keep the pa_path (hardware path) of the graphics card in sti_struct and use
+this info to give more useful info which card is currently being used.
+
+Signed-off-by: Helge Deller <deller@gmx.de>
+Cc: stable@vger.kernel.org   # v5.10+
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/video/console/sticon.c  |    5 ++++-
+ drivers/video/console/sticore.c |   15 +++++++--------
+ drivers/video/fbdev/sticore.h   |    3 +++
+ 3 files changed, 14 insertions(+), 9 deletions(-)
+
+--- a/drivers/video/console/sticon.c
++++ b/drivers/video/console/sticon.c
+@@ -46,6 +46,7 @@
+ #include <linux/slab.h>
+ #include <linux/font.h>
+ #include <linux/crc32.h>
++#include <linux/fb.h>
+ 
+ #include <asm/io.h>
+ 
+@@ -392,7 +393,9 @@ static int __init sticonsole_init(void)
+     for (i = 0; i < MAX_NR_CONSOLES; i++)
+       font_data[i] = STI_DEF_FONT;
+ 
+-    pr_info("sticon: Initializing STI text console.\n");
++    pr_info("sticon: Initializing STI text console on %s at [%s]\n",
++      sticon_sti->sti_data->inq_outptr.dev_name,
++      sticon_sti->pa_path);
+     console_lock();
+     err = do_take_over_console(&sti_con, 0, MAX_NR_CONSOLES - 1,
+               PAGE0->mem_cons.cl_class != CL_DUPLEX);
+--- a/drivers/video/console/sticore.c
++++ b/drivers/video/console/sticore.c
+@@ -34,7 +34,7 @@
+ 
+ #include "../fbdev/sticore.h"
+ 
+-#define STI_DRIVERVERSION "Version 0.9b"
++#define STI_DRIVERVERSION "Version 0.9c"
+ 
+ static struct sti_struct *default_sti __read_mostly;
+ 
+@@ -503,7 +503,7 @@ sti_select_fbfont(struct sti_cooked_rom
+       if (!fbfont)
+               return NULL;
+ 
+-      pr_info("STI selected %ux%u framebuffer font %s for sticon\n",
++      pr_info("    using %ux%u framebuffer font %s\n",
+                       fbfont->width, fbfont->height, fbfont->name);
+                       
+       bpc = ((fbfont->width+7)/8) * fbfont->height; 
+@@ -947,6 +947,7 @@ out_err:
+ 
+ static void sticore_check_for_default_sti(struct sti_struct *sti, char *path)
+ {
++      pr_info("    located at [%s]\n", sti->pa_path);
+       if (strcmp (path, default_sti_path) == 0)
+               default_sti = sti;
+ }
+@@ -958,7 +959,6 @@ static void sticore_check_for_default_st
+  */
+ static int __init sticore_pa_init(struct parisc_device *dev)
+ {
+-      char pa_path[21];
+       struct sti_struct *sti = NULL;
+       int hpa = dev->hpa.start;
+ 
+@@ -971,8 +971,8 @@ static int __init sticore_pa_init(struct
+       if (!sti)
+               return 1;
+ 
+-      print_pa_hwpath(dev, pa_path);
+-      sticore_check_for_default_sti(sti, pa_path);
++      print_pa_hwpath(dev, sti->pa_path);
++      sticore_check_for_default_sti(sti, sti->pa_path);
+       return 0;
+ }
+ 
+@@ -1008,9 +1008,8 @@ static int sticore_pci_init(struct pci_d
+ 
+       sti = sti_try_rom_generic(rom_base, fb_base, pd);
+       if (sti) {
+-              char pa_path[30];
+-              print_pci_hwpath(pd, pa_path);
+-              sticore_check_for_default_sti(sti, pa_path);
++              print_pci_hwpath(pd, sti->pa_path);
++              sticore_check_for_default_sti(sti, sti->pa_path);
+       }
+       
+       if (!sti) {
+--- a/drivers/video/fbdev/sticore.h
++++ b/drivers/video/fbdev/sticore.h
+@@ -370,6 +370,9 @@ struct sti_struct {
+ 
+       /* pointer to all internal data */
+       struct sti_all_data *sti_data;
++
++      /* pa_path of this device */
++      char pa_path[24];
+ };
+ 
+ 

diff --git a/queue-5.10/series b/queue-5.10/series
index cf83154b5f0a3d904c34fd1752fb7e39d63291ad..7d5f679df48eb429204d6b10a149ecb041d64c4f 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -10,3 +10,7 @@ usb-serial-option-add-quectel-bg95-modem.patch
 usb-new-quirk-for-dell-gen-2-devices.patch
 usb-dwc3-gadget-move-null-pinter-check-to-proper-place.patch
 usb-core-hcd-add-support-for-deferring-roothub-registration.patch
+cifs-when-extending-a-file-with-falloc-we-should-make-files-not-sparse.patch
+xhci-allow-host-runtime-pm-as-default-for-intel-alder-lake-n-xhci.patch
+fonts-make-font-size-unsigned-in-font_desc.patch
+parisc-stifb-keep-track-of-hardware-path-of-graphics-card.patch

diff --git a/queue-5.10/xhci-allow-host-runtime-pm-as-default-for-intel-alder-lake-n-xhci.patch b/queue-5.10/xhci-allow-host-runtime-pm-as-default-for-intel-alder-lake-n-xhci.patch
new file mode 100644 (file)
index 0000000..4c80759
--- /dev/null
+++ b/queue-5.10/xhci-allow-host-runtime-pm-as-default-for-intel-alder-lake-n-xhci.patch
@@ -0,0 +1,39 @@
+From 74f55a62c4c354f43a6d75f77dd184c4f57b9a26 Mon Sep 17 00:00:00 2001
+From: Mathias Nyman <mathias.nyman@linux.intel.com>
+Date: Thu, 12 May 2022 01:04:50 +0300
+Subject: xhci: Allow host runtime PM as default for Intel Alder Lake N xHCI
+
+From: Mathias Nyman <mathias.nyman@linux.intel.com>
+
+commit 74f55a62c4c354f43a6d75f77dd184c4f57b9a26 upstream.
+
+Alder Lake N TCSS xHCI needs to be runtime suspended whenever possible
+to allow the TCSS hardware block to enter D3 and thus save energy
+
+Cc: stable@kernel.org
+Suggested-by: Gopal Vamshi Krishna <vamshi.krishna.gopal@intel.com>
+Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
+Link: https://lore.kernel.org/r/20220511220450.85367-10-mathias.nyman@linux.intel.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/usb/host/xhci-pci.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/usb/host/xhci-pci.c
++++ b/drivers/usb/host/xhci-pci.c
+@@ -59,6 +59,7 @@
+ #define PCI_DEVICE_ID_INTEL_TIGER_LAKE_XHCI           0x9a13
+ #define PCI_DEVICE_ID_INTEL_MAPLE_RIDGE_XHCI          0x1138
+ #define PCI_DEVICE_ID_INTEL_ALDER_LAKE_XHCI           0x461e
++#define PCI_DEVICE_ID_INTEL_ALDER_LAKE_N_XHCI         0x464e
+ #define PCI_DEVICE_ID_INTEL_ALDER_LAKE_PCH_XHCI       0x51ed
+ 
+ #define PCI_DEVICE_ID_AMD_PROMONTORYA_4                       0x43b9
+@@ -263,6 +264,7 @@ static void xhci_pci_quirks(struct devic
+            pdev->device == PCI_DEVICE_ID_INTEL_TIGER_LAKE_XHCI ||
+            pdev->device == PCI_DEVICE_ID_INTEL_MAPLE_RIDGE_XHCI ||
+            pdev->device == PCI_DEVICE_ID_INTEL_ALDER_LAKE_XHCI ||
++           pdev->device == PCI_DEVICE_ID_INTEL_ALDER_LAKE_N_XHCI ||
+            pdev->device == PCI_DEVICE_ID_INTEL_ALDER_LAKE_PCH_XHCI))
+               xhci->quirks |= XHCI_DEFAULT_PM_RUNTIME_ALLOW;
+