diff --git a/.raspberrypi2.metadata b/.raspberrypi2.metadata index 9c6f8bc..9514bdc 100644 --- a/.raspberrypi2.metadata +++ b/.raspberrypi2.metadata @@ -1,3 +1,3 @@ be0b909f1fbb760cc2d5cf146e1da3b2af0cf899 SOURCES/linux-5.10.tar.xz -57b223850b572350d5129e4175cb5b5d11d86369 SOURCES/a4040b2554f459347480f17358ce76990b2d0a41.tar.gz -4d9e131bec2ca375b14fa7e78e06d521d9353914 SOURCES/patch-5.10.123.xz +f0298626ec9b3d0e7f4e8c44d022f9c661ef518d SOURCES/fb956866207031fcd83af4ece2b636d81be4482a.tar.gz +0fd49caf0b6d38cf3f385dd37455f9e1f8bea77e SOURCES/patch-5.10.131.xz diff --git a/SOURCES/rpi-5.10.x.patch b/SOURCES/rpi-5.10.x.patch index d5058b7..f7c1015 100644 --- a/SOURCES/rpi-5.10.x.patch +++ b/SOURCES/rpi-5.10.x.patch @@ -69319,10 +69319,10 @@ index f66957d48dc3..0e9ec3f593b8 100644 static int bcm2708_fb_register(struct bcm2708_fb *fb) diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c -index 00939ca2065a..098cd5dfc06f 100644 +index d787a344b3b8..68203a093367 100644 --- a/drivers/video/fbdev/core/fbmem.c +++ b/drivers/video/fbdev/core/fbmem.c -@@ -1085,6 +1085,30 @@ fb_blank(struct fb_info *info, int blank) +@@ -1095,6 +1095,30 @@ fb_blank(struct fb_info *info, int blank) } EXPORT_SYMBOL(fb_blank); @@ -69353,7 +69353,7 @@ index 00939ca2065a..098cd5dfc06f 100644 static long do_fb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg) { -@@ -1093,6 +1117,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd, +@@ -1103,6 +1127,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd, struct fb_fix_screeninfo fix; struct fb_cmap cmap_from; struct fb_cmap_user cmap; @@ -69361,7 +69361,7 @@ index 00939ca2065a..098cd5dfc06f 100644 void __user *argp = (void __user *)arg; long ret = 0; -@@ -1168,6 +1193,15 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd, +@@ -1180,6 +1205,15 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd, unlock_fb_info(info); console_unlock(); break; @@ -69377,7 +69377,7 @@ index 00939ca2065a..098cd5dfc06f 100644 default: lock_fb_info(info); fb = info->fbops; -@@ -1313,6 +1347,7 @@ static long fb_compat_ioctl(struct file *file, unsigned int cmd, +@@ -1325,6 +1359,7 @@ static long fb_compat_ioctl(struct file *file, unsigned int cmd, case FBIOPAN_DISPLAY: case FBIOGET_CON2FBMAP: case FBIOPUT_CON2FBMAP: @@ -135527,7 +135527,7 @@ Signed-off-by: Dave Stevenson 1 file changed, 7 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS -index 7c118b507912..c2f7af4f4356 100644 +index 4d10e79030a9..b12981fa1ebd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3417,6 +3417,13 @@ N: bcm113* @@ -137755,10 +137755,10 @@ Signed-off-by: Jonathan Bell 1 file changed, 98 insertions(+) diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c -index a1ed5e0d0612..7bf05d0d6876 100644 +index 997de5f294f1..808f70d5c655 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -1482,6 +1482,103 @@ static int xhci_check_maxpacket(struct xhci_hcd *xhci, unsigned int slot_id, +@@ -1493,6 +1493,103 @@ static int xhci_check_maxpacket(struct xhci_hcd *xhci, unsigned int slot_id, return ret; } @@ -137862,7 +137862,7 @@ index a1ed5e0d0612..7bf05d0d6876 100644 /* * non-error returns are a promise to giveback() the urb later * we drop ownership so next owner (or urb unlink) can get it -@@ -5389,6 +5486,7 @@ static const struct hc_driver xhci_hc_driver = { +@@ -5400,6 +5497,7 @@ static const struct hc_driver xhci_hc_driver = { .endpoint_reset = xhci_endpoint_reset, .check_bandwidth = xhci_check_bandwidth, .reset_bandwidth = xhci_reset_bandwidth, @@ -139158,7 +139158,7 @@ index 024e8911df34..af64128647c4 100644 "// Write ERST size = %i to ir_set 0 (some bits preserved)", val); diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h -index a46bbf5beffa..8a76ac632df2 100644 +index 0c66424b34ba..6321b58bca28 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -1656,8 +1656,8 @@ struct urb_priv { @@ -139582,7 +139582,7 @@ Signed-off-by: Phil Elwell 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile -index 862946040186..9f3eccd06811 100644 +index 53f1a45ae69b..6ea434acc25e 100644 --- a/Makefile +++ b/Makefile @@ -1354,6 +1354,9 @@ ifneq ($(dtstree),) @@ -142141,7 +142141,7 @@ Signed-off-by: Nataliya Korovkina 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 9f3eccd06811..4094f8592328 100644 +index 6ea434acc25e..98c3e00dd2ce 100644 --- a/Makefile +++ b/Makefile @@ -1354,7 +1354,7 @@ ifneq ($(dtstree),) @@ -142937,7 +142937,7 @@ index 000000000000..ce6b81a10303 + +... diff --git a/MAINTAINERS b/MAINTAINERS -index c2f7af4f4356..207da89c94db 100644 +index b12981fa1ebd..d6f6cd7e8471 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3417,6 +3417,13 @@ N: bcm113* @@ -147892,7 +147892,7 @@ Signed-off-by: Naushir Patuck create mode 100644 drivers/media/platform/bcm2835/vc4-regs-unicam.h diff --git a/MAINTAINERS b/MAINTAINERS -index 207da89c94db..4bfb18781d9c 100644 +index d6f6cd7e8471..74f3e5ced2a9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3425,7 +3425,7 @@ F: Documentation/devicetree/bindings/media/rpivid_hevc.jaml @@ -162875,7 +162875,7 @@ Reported-by: kbuild test robot create mode 100644 drivers/media/platform/bcm2835/vc4-regs-unicam.h diff --git a/MAINTAINERS b/MAINTAINERS -index 4bfb18781d9c..5c360917535e 100644 +index 74f3e5ced2a9..21396c1e9df7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3429,7 +3429,7 @@ M: Raspberry Pi Kernel Maintenance @@ -175112,7 +175112,7 @@ Signed-off-by: Naushir Patuck create mode 100644 drivers/media/i2c/imx477.c diff --git a/MAINTAINERS b/MAINTAINERS -index 5c360917535e..ce9bdaf033d4 100644 +index 21396c1e9df7..91a37761ba16 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -16347,6 +16347,14 @@ S: Maintained @@ -178429,7 +178429,7 @@ Signed-off-by: popcornmix 2 files changed, 3 insertions(+) diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig -index 3e2703a49632..0294d1959ead 100644 +index b4e65d1ede26..eabd6ba13ed1 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig @@ -5,6 +5,8 @@ @@ -185244,7 +185244,7 @@ Signed-off-by: Naushir Patuck create mode 100644 drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c diff --git a/MAINTAINERS b/MAINTAINERS -index ce9bdaf033d4..0e14d13d11a3 100644 +index 91a37761ba16..271e406196ae 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3431,6 +3431,15 @@ S: Maintained @@ -189307,10 +189307,10 @@ Signed-off-by: Jonathan Bell 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c -index 886279755804..7bb0071928b1 100644 +index 8952492d43be..896052839e3a 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c -@@ -295,6 +295,7 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) +@@ -299,6 +299,7 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) if (pdev->vendor == PCI_VENDOR_ID_VIA && pdev->device == 0x3483) { xhci->quirks |= XHCI_LPM_SUPPORT; xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS; @@ -189340,7 +189340,7 @@ index fa3a7ac15f82..aa3e09e6e7bb 100644 state->new_deq_ptr = new_deq; diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h -index 8a76ac632df2..4e449c268ac3 100644 +index 6321b58bca28..294afe3c9bc8 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -1887,7 +1887,8 @@ struct xhci_hcd { @@ -198216,7 +198216,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20201028123222.1732139-1-max 30 files changed, 168 insertions(+), 110 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c -index 7bb151283f44..67d05ac192b7 100644 +index f069d0faba64..9a8e8976b947 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -5606,17 +5606,19 @@ static void dm_update_crtc_active_planes(struct drm_crtc *crtc, @@ -212028,7 +212028,7 @@ Signed-off-by: Maxime Ripard 5 files changed, 25 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c -index 67d05ac192b7..d6ee31f73ce7 100644 +index 9a8e8976b947..df528ba788aa 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -6532,9 +6532,7 @@ void amdgpu_dm_connector_init_helper(struct amdgpu_display_manager *dm, @@ -212140,7 +212140,7 @@ Signed-off-by: Maxime Ripard 5 files changed, 33 insertions(+), 48 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c -index d6ee31f73ce7..c73425152889 100644 +index df528ba788aa..36639c068cbf 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -5477,25 +5477,6 @@ static int fill_hdr_info_packet(const struct drm_connector_state *state, @@ -232066,7 +232066,7 @@ index 000000000000..f832b4bfab93 + +... diff --git a/MAINTAINERS b/MAINTAINERS -index 0e14d13d11a3..17423a918ba0 100644 +index 271e406196ae..59f43a8f6007 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -16361,6 +16361,7 @@ M: Raspberry Pi Kernel Maintenance @@ -235216,7 +235216,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20201211114237.213288-2-tomi 19 files changed, 102 insertions(+), 101 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c -index c73425152889..a1542a7c6c6a 100644 +index 36639c068cbf..24a6d472a942 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -4993,7 +4993,6 @@ static void dm_disable_vblank(struct drm_crtc *crtc) @@ -237917,7 +237917,7 @@ Signed-off-by: Noralf Trønnes create mode 100644 include/drm/gud.h diff --git a/MAINTAINERS b/MAINTAINERS -index 17423a918ba0..951706c17010 100644 +index 59f43a8f6007..6c514661240d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5525,6 +5525,14 @@ S: Maintained @@ -247305,7 +247305,7 @@ Subject: [PATCH 0815/1070] drm/amdgpu: Add missing conversion of 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c -index a1542a7c6c6a..83a979fd5083 100644 +index 24a6d472a942..f45dd99cecc2 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -7762,7 +7762,7 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state) @@ -250079,7 +250079,7 @@ index 000000000000..717230a21764 + +... diff --git a/MAINTAINERS b/MAINTAINERS -index 951706c17010..5d4f5cf4ec17 100644 +index 6c514661240d..49a9ea7df3c7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -16373,6 +16373,14 @@ F: Documentation/devicetree/bindings/media/i2c/imx378.yaml @@ -269303,10 +269303,10 @@ index af64128647c4..92cd8a60e5b4 100644 return -ENOMEM; diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c -index 7bb0071928b1..d931b0d7386a 100644 +index 896052839e3a..21e3e97f9e63 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c -@@ -296,6 +296,7 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) +@@ -300,6 +300,7 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) xhci->quirks |= XHCI_LPM_SUPPORT; xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS; xhci->quirks |= XHCI_AVOID_DQ_ON_LINK; @@ -269315,7 +269315,7 @@ index 7bb0071928b1..d931b0d7386a 100644 if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h -index 4e449c268ac3..9b6e3d52701a 100644 +index 294afe3c9bc8..1fadcb661d58 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -1889,6 +1889,7 @@ struct xhci_hcd { @@ -269969,10 +269969,10 @@ index 92cd8a60e5b4..af64128647c4 100644 return -ENOMEM; diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c -index d931b0d7386a..7bb0071928b1 100644 +index 21e3e97f9e63..896052839e3a 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c -@@ -296,7 +296,6 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) +@@ -300,7 +300,6 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) xhci->quirks |= XHCI_LPM_SUPPORT; xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS; xhci->quirks |= XHCI_AVOID_DQ_ON_LINK; @@ -269981,7 +269981,7 @@ index d931b0d7386a..7bb0071928b1 100644 if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h -index 9b6e3d52701a..4e449c268ac3 100644 +index 1fadcb661d58..294afe3c9bc8 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -1889,7 +1889,6 @@ struct xhci_hcd { @@ -270198,10 +270198,10 @@ index 6be63826090c..b01cc54aeef6 100644 xhci_update_erst_dequeue(xhci, event_ring_deq); event_ring_deq = xhci->event_ring->dequeue; diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c -index 7bf05d0d6876..0ebed22ea669 100644 +index 808f70d5c655..75bff1eefad4 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -867,8 +867,8 @@ static void xhci_clear_command_ring(struct xhci_hcd *xhci) +@@ -878,8 +878,8 @@ static void xhci_clear_command_ring(struct xhci_hcd *xhci) seg = ring->deq_seg; do { memset(seg->trbs, 0, @@ -270212,7 +270212,7 @@ index 7bf05d0d6876..0ebed22ea669 100644 cpu_to_le32(~TRB_CYCLE); seg = seg->next; } while (seg != ring->deq_seg); -@@ -879,7 +879,7 @@ static void xhci_clear_command_ring(struct xhci_hcd *xhci) +@@ -890,7 +890,7 @@ static void xhci_clear_command_ring(struct xhci_hcd *xhci) ring->enq_seg = ring->deq_seg; ring->enqueue = ring->dequeue; @@ -270222,7 +270222,7 @@ index 7bf05d0d6876..0ebed22ea669 100644 * Ring is now zeroed, so the HW should look for change of ownership * when the cycle bit is set to 1. diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h -index 4e449c268ac3..ef4122ed653a 100644 +index 294afe3c9bc8..9f87e78ef472 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -1618,6 +1618,7 @@ struct xhci_ring { @@ -270293,10 +270293,10 @@ index e498c4ec7b27..a7da6c7da33a 100644 &ring->last_seg, num_segs, ring->trbs_per_seg, cycle_state, type, max_packet, flags); diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c -index 7bb0071928b1..d931b0d7386a 100644 +index 896052839e3a..21e3e97f9e63 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c -@@ -296,6 +296,7 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) +@@ -300,6 +300,7 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) xhci->quirks |= XHCI_LPM_SUPPORT; xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS; xhci->quirks |= XHCI_AVOID_DQ_ON_LINK; @@ -270305,7 +270305,7 @@ index 7bb0071928b1..d931b0d7386a 100644 if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h -index ef4122ed653a..af6537e317d1 100644 +index 9f87e78ef472..96089ebe8982 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -1890,6 +1890,7 @@ struct xhci_hcd { @@ -279128,10 +279128,10 @@ Signed-off-by: Jonathan Bell 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c -index d931b0d7386a..b0ecbe26d3ee 100644 +index 21e3e97f9e63..68a48bf5c315 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c -@@ -297,6 +297,7 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) +@@ -301,6 +301,7 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS; xhci->quirks |= XHCI_AVOID_DQ_ON_LINK; xhci->quirks |= XHCI_VLI_TRB_CACHE_BUG; @@ -279192,7 +279192,7 @@ index b01cc54aeef6..4fa23c9f0f87 100644 if (first_trb) { first_trb = false; diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h -index af6537e317d1..c0f2d724638c 100644 +index 96089ebe8982..8520878eee37 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -1891,6 +1891,7 @@ struct xhci_hcd { diff --git a/SPECS/raspberrypi2.spec b/SPECS/raspberrypi2.spec index 1754d94..fba86d9 100644 --- a/SPECS/raspberrypi2.spec +++ b/SPECS/raspberrypi2.spec @@ -1,4 +1,4 @@ -%global commit_firmware_long a4040b2554f459347480f17358ce76990b2d0a41 +%global commit_firmware_long fb956866207031fcd83af4ece2b636d81be4482a %global commit_linux_long 427c6bd8835e197693e9b4aedbe45c2c3c84cdce ExclusiveArch: aarch64 armv7hl @@ -32,7 +32,7 @@ ExclusiveArch: aarch64 armv7hl %define extra_version 1 %define kversion 5.10 -%define kfullversion %{kversion}.123 +%define kfullversion %{kversion}.131 Name: raspberrypi2 Version: %{kfullversion} @@ -292,6 +292,9 @@ cp $(ls -1 /boot/config-kernel-*-*|sort -V|tail -1) /boot/config-kernel.inc %doc /boot/LICENCE.broadcom %changelog +* Sat Jul 16 2022 Pablo Greco - 5.10.131 +- Update to version v5.10.131 + * Sun Jun 19 2022 Pablo Greco - 5.10.123 - Update to version v5.10.123