]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
5.15-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 6 Mar 2023 07:30:20 +0000 (08:30 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 6 Mar 2023 07:30:20 +0000 (08:30 +0100)
added patches:
block-don-t-allow-multiple-bios-for-iocb_nowait-issue.patch
firmware-coreboot-framebuffer-ignore-reserved-pixel-color-bits.patch
ipmi-ssif-resend_msg-cannot-fail.patch
ipmi_ssif-rename-idle-state-and-check.patch
rtc-pm8xxx-fix-set-alarm-race.patch
wifi-rtl8xxxu-fixing-transmisison-failure-for-rtl8192eu.patch

queue-5.15/block-don-t-allow-multiple-bios-for-iocb_nowait-issue.patch [new file with mode: 0644]
queue-5.15/firmware-coreboot-framebuffer-ignore-reserved-pixel-color-bits.patch [new file with mode: 0644]
queue-5.15/ipmi-ssif-resend_msg-cannot-fail.patch [new file with mode: 0644]
queue-5.15/ipmi_ssif-rename-idle-state-and-check.patch [new file with mode: 0644]
queue-5.15/rtc-pm8xxx-fix-set-alarm-race.patch [new file with mode: 0644]
queue-5.15/series
queue-5.15/wifi-rtl8xxxu-fixing-transmisison-failure-for-rtl8192eu.patch [new file with mode: 0644]

diff --git a/queue-5.15/block-don-t-allow-multiple-bios-for-iocb_nowait-issue.patch b/queue-5.15/block-don-t-allow-multiple-bios-for-iocb_nowait-issue.patch
new file mode 100644 (file)
index 0000000..b93a001
--- /dev/null
@@ -0,0 +1,70 @@
+From 67d59247d4b52c917e373f05a807027756ab216f Mon Sep 17 00:00:00 2001
+From: Jens Axboe <axboe@kernel.dk>
+Date: Mon, 16 Jan 2023 08:55:53 -0700
+Subject: block: don't allow multiple bios for IOCB_NOWAIT issue
+
+From: Jens Axboe <axboe@kernel.dk>
+
+commit 67d59247d4b52c917e373f05a807027756ab216f upstream.
+
+If we're doing a large IO request which needs to be split into multiple
+bios for issue, then we can run into the same situation as the below
+marked commit fixes - parts will complete just fine, one or more parts
+will fail to allocate a request. This will result in a partially
+completed read or write request, where the caller gets EAGAIN even though
+parts of the IO completed just fine.
+
+Do the same for large bios as we do for splits - fail a NOWAIT request
+with EAGAIN. This isn't technically fixing an issue in the below marked
+patch, but for stable purposes, we should have either none of them or
+both.
+
+This depends on: 613b14884b85 ("block: handle bio_split_to_limits() NULL return")
+
+Cc: stable@vger.kernel.org # 5.15+
+Fixes: 9cea62b2cbab ("block: don't allow splitting of a REQ_NOWAIT bio")
+Link: https://github.com/axboe/liburing/issues/766
+Reported-and-tested-by: Michael Kelley <mikelley@microsoft.com>
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ block/fops.c |   21 ++++++++++++++++++---
+ 1 file changed, 18 insertions(+), 3 deletions(-)
+
+--- a/block/fops.c
++++ b/block/fops.c
+@@ -243,6 +243,24 @@ static ssize_t __blkdev_direct_IO(struct
+                       bio_endio(bio);
+                       break;
+               }
++              if (iocb->ki_flags & IOCB_NOWAIT) {
++                      /*
++                       * This is nonblocking IO, and we need to allocate
++                       * another bio if we have data left to map. As we
++                       * cannot guarantee that one of the sub bios will not
++                       * fail getting issued FOR NOWAIT and as error results
++                       * are coalesced across all of them, be safe and ask for
++                       * a retry of this from blocking context.
++                       */
++                      if (unlikely(iov_iter_count(iter))) {
++                              bio_release_pages(bio, false);
++                              bio_clear_flag(bio, BIO_REFFED);
++                              bio_put(bio);
++                              blk_finish_plug(&plug);
++                              return -EAGAIN;
++                      }
++                      bio->bi_opf |= REQ_NOWAIT;
++              }
+               if (is_read) {
+                       bio->bi_opf = REQ_OP_READ;
+@@ -252,9 +270,6 @@ static ssize_t __blkdev_direct_IO(struct
+                       bio->bi_opf = dio_bio_write_op(iocb);
+                       task_io_account_write(bio->bi_iter.bi_size);
+               }
+-              if (iocb->ki_flags & IOCB_NOWAIT)
+-                      bio->bi_opf |= REQ_NOWAIT;
+-
+               dio->size += bio->bi_iter.bi_size;
+               pos += bio->bi_iter.bi_size;
diff --git a/queue-5.15/firmware-coreboot-framebuffer-ignore-reserved-pixel-color-bits.patch b/queue-5.15/firmware-coreboot-framebuffer-ignore-reserved-pixel-color-bits.patch
new file mode 100644 (file)
index 0000000..13e37d6
--- /dev/null
@@ -0,0 +1,52 @@
+From e6acaf25cba14661211bb72181c35dd13b24f5b3 Mon Sep 17 00:00:00 2001
+From: Alper Nebi Yasak <alpernebiyasak@gmail.com>
+Date: Sun, 22 Jan 2023 22:04:31 +0300
+Subject: firmware: coreboot: framebuffer: Ignore reserved pixel color bits
+
+From: Alper Nebi Yasak <alpernebiyasak@gmail.com>
+
+commit e6acaf25cba14661211bb72181c35dd13b24f5b3 upstream.
+
+The coreboot framebuffer doesn't support transparency, its 'reserved'
+bit field is merely padding for byte/word alignment of pixel colors [1].
+When trying to match the framebuffer to a simplefb format, the kernel
+driver unnecessarily requires the format's transparency bit field to
+exactly match this padding, even if the former is zero-width.
+
+Due to a coreboot bug [2] (fixed upstream), some boards misreport the
+reserved field's size as equal to its position (0x18 for both on a
+'Lick' Chromebook), and the driver fails to probe where it would have
+otherwise worked fine with e.g. the a8r8g8b8 or x8r8g8b8 formats.
+
+Remove the transparency comparison with reserved bits. When the
+bits-per-pixel and other color components match, transparency will
+already be in a subset of the reserved field. Not forcing it to match
+reserved bits allows the driver to work on the boards which misreport
+the reserved field. It also enables using simplefb formats that don't
+have transparency bits, although this doesn't currently happen due to
+format support and ordering in linux/platform_data/simplefb.h.
+
+[1] https://review.coreboot.org/plugins/gitiles/coreboot/+/4.19/src/commonlib/include/commonlib/coreboot_tables.h#255
+[2] https://review.coreboot.org/plugins/gitiles/coreboot/+/4.13/src/drivers/intel/fsp2_0/graphics.c#82
+
+Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
+Link: https://lore.kernel.org/r/20230122190433.195941-1-alpernebiyasak@gmail.com
+Cc: Salvatore Bonaccorso <carnil@debian.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/firmware/google/framebuffer-coreboot.c |    4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+--- a/drivers/firmware/google/framebuffer-coreboot.c
++++ b/drivers/firmware/google/framebuffer-coreboot.c
+@@ -43,9 +43,7 @@ static int framebuffer_probe(struct core
+                   fb->green_mask_pos     == formats[i].green.offset &&
+                   fb->green_mask_size    == formats[i].green.length &&
+                   fb->blue_mask_pos      == formats[i].blue.offset &&
+-                  fb->blue_mask_size     == formats[i].blue.length &&
+-                  fb->reserved_mask_pos  == formats[i].transp.offset &&
+-                  fb->reserved_mask_size == formats[i].transp.length)
++                  fb->blue_mask_size     == formats[i].blue.length)
+                       pdata.format = formats[i].name;
+       }
+       if (!pdata.format)
diff --git a/queue-5.15/ipmi-ssif-resend_msg-cannot-fail.patch b/queue-5.15/ipmi-ssif-resend_msg-cannot-fail.patch
new file mode 100644 (file)
index 0000000..dc0824e
--- /dev/null
@@ -0,0 +1,93 @@
+From 95767ed78a181d5404202627499f9cde56053b96 Mon Sep 17 00:00:00 2001
+From: Corey Minyard <cminyard@mvista.com>
+Date: Wed, 25 Jan 2023 10:11:06 -0600
+Subject: ipmi:ssif: resend_msg() cannot fail
+
+From: Corey Minyard <cminyard@mvista.com>
+
+commit 95767ed78a181d5404202627499f9cde56053b96 upstream.
+
+The resend_msg() function cannot fail, but there was error handling
+around using it.  Rework the handling of the error, and fix the out of
+retries debug reporting that was wrong around this, too.
+
+Cc: stable@vger.kernel.org
+Signed-off-by: Corey Minyard <cminyard@mvista.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/char/ipmi/ipmi_ssif.c |   28 +++++++---------------------
+ 1 file changed, 7 insertions(+), 21 deletions(-)
+
+--- a/drivers/char/ipmi/ipmi_ssif.c
++++ b/drivers/char/ipmi/ipmi_ssif.c
+@@ -602,7 +602,7 @@ static void ssif_alert(struct i2c_client
+               start_get(ssif_info);
+ }
+-static int start_resend(struct ssif_info *ssif_info);
++static void start_resend(struct ssif_info *ssif_info);
+ static void msg_done_handler(struct ssif_info *ssif_info, int result,
+                            unsigned char *data, unsigned int len)
+@@ -909,31 +909,17 @@ static void msg_written_handler(struct s
+       if (result < 0) {
+               ssif_info->retries_left--;
+               if (ssif_info->retries_left > 0) {
+-                      if (!start_resend(ssif_info)) {
+-                              ssif_inc_stat(ssif_info, send_retries);
+-                              return;
+-                      }
+-                      /* request failed, just return the error. */
+-                      ssif_inc_stat(ssif_info, send_errors);
+-
+-                      if (ssif_info->ssif_debug & SSIF_DEBUG_MSG)
+-                              dev_dbg(&ssif_info->client->dev,
+-                                      "%s: Out of retries\n", __func__);
+-                      msg_done_handler(ssif_info, -EIO, NULL, 0);
++                      start_resend(ssif_info);
+                       return;
+               }
+               ssif_inc_stat(ssif_info, send_errors);
+-              /*
+-               * Got an error on transmit, let the done routine
+-               * handle it.
+-               */
+               if (ssif_info->ssif_debug & SSIF_DEBUG_MSG)
+                       dev_dbg(&ssif_info->client->dev,
+-                              "%s: Error  %d\n", __func__, result);
++                              "%s: Out of retries\n", __func__);
+-              msg_done_handler(ssif_info, result, NULL, 0);
++              msg_done_handler(ssif_info, -EIO, NULL, 0);
+               return;
+       }
+@@ -996,7 +982,7 @@ static void msg_written_handler(struct s
+       }
+ }
+-static int start_resend(struct ssif_info *ssif_info)
++static void start_resend(struct ssif_info *ssif_info)
+ {
+       int command;
+@@ -1021,7 +1007,6 @@ static int start_resend(struct ssif_info
+       ssif_i2c_send(ssif_info, msg_written_handler, I2C_SMBUS_WRITE,
+                  command, ssif_info->data, I2C_SMBUS_BLOCK_DATA);
+-      return 0;
+ }
+ static int start_send(struct ssif_info *ssif_info,
+@@ -1036,7 +1021,8 @@ static int start_send(struct ssif_info *
+       ssif_info->retries_left = SSIF_SEND_RETRIES;
+       memcpy(ssif_info->data + 1, data, len);
+       ssif_info->data_len = len;
+-      return start_resend(ssif_info);
++      start_resend(ssif_info);
++      return 0;
+ }
+ /* Must be called with the message lock held. */
diff --git a/queue-5.15/ipmi_ssif-rename-idle-state-and-check.patch b/queue-5.15/ipmi_ssif-rename-idle-state-and-check.patch
new file mode 100644 (file)
index 0000000..743eb66
--- /dev/null
@@ -0,0 +1,193 @@
+From 8230831c43a328c2be6d28c65d3f77e14c59986b Mon Sep 17 00:00:00 2001
+From: Corey Minyard <cminyard@mvista.com>
+Date: Wed, 25 Jan 2023 10:13:13 -0600
+Subject: ipmi_ssif: Rename idle state and check
+
+From: Corey Minyard <cminyard@mvista.com>
+
+commit 8230831c43a328c2be6d28c65d3f77e14c59986b upstream.
+
+Rename the SSIF_IDLE() to IS_SSIF_IDLE(), since that is more clear, and
+rename SSIF_NORMAL to SSIF_IDLE, since that's more accurate.
+
+Cc: stable@vger.kernel.org
+Signed-off-by: Corey Minyard <cminyard@mvista.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/char/ipmi/ipmi_ssif.c |   46 +++++++++++++++++++++---------------------
+ 1 file changed, 23 insertions(+), 23 deletions(-)
+
+--- a/drivers/char/ipmi/ipmi_ssif.c
++++ b/drivers/char/ipmi/ipmi_ssif.c
+@@ -92,7 +92,7 @@
+ #define SSIF_WATCH_WATCHDOG_TIMEOUT   msecs_to_jiffies(250)
+ enum ssif_intf_state {
+-      SSIF_NORMAL,
++      SSIF_IDLE,
+       SSIF_GETTING_FLAGS,
+       SSIF_GETTING_EVENTS,
+       SSIF_CLEARING_FLAGS,
+@@ -100,8 +100,8 @@ enum ssif_intf_state {
+       /* FIXME - add watchdog stuff. */
+ };
+-#define SSIF_IDLE(ssif)        ((ssif)->ssif_state == SSIF_NORMAL \
+-                        && (ssif)->curr_msg == NULL)
++#define IS_SSIF_IDLE(ssif) ((ssif)->ssif_state == SSIF_IDLE \
++                          && (ssif)->curr_msg == NULL)
+ /*
+  * Indexes into stats[] in ssif_info below.
+@@ -348,9 +348,9 @@ static void return_hosed_msg(struct ssif
+ /*
+  * Must be called with the message lock held.  This will release the
+- * message lock.  Note that the caller will check SSIF_IDLE and start a
+- * new operation, so there is no need to check for new messages to
+- * start in here.
++ * message lock.  Note that the caller will check IS_SSIF_IDLE and
++ * start a new operation, so there is no need to check for new
++ * messages to start in here.
+  */
+ static void start_clear_flags(struct ssif_info *ssif_info, unsigned long *flags)
+ {
+@@ -367,7 +367,7 @@ static void start_clear_flags(struct ssi
+       if (start_send(ssif_info, msg, 3) != 0) {
+               /* Error, just go to normal state. */
+-              ssif_info->ssif_state = SSIF_NORMAL;
++              ssif_info->ssif_state = SSIF_IDLE;
+       }
+ }
+@@ -382,7 +382,7 @@ static void start_flag_fetch(struct ssif
+       mb[0] = (IPMI_NETFN_APP_REQUEST << 2);
+       mb[1] = IPMI_GET_MSG_FLAGS_CMD;
+       if (start_send(ssif_info, mb, 2) != 0)
+-              ssif_info->ssif_state = SSIF_NORMAL;
++              ssif_info->ssif_state = SSIF_IDLE;
+ }
+ static void check_start_send(struct ssif_info *ssif_info, unsigned long *flags,
+@@ -393,7 +393,7 @@ static void check_start_send(struct ssif
+               flags = ipmi_ssif_lock_cond(ssif_info, &oflags);
+               ssif_info->curr_msg = NULL;
+-              ssif_info->ssif_state = SSIF_NORMAL;
++              ssif_info->ssif_state = SSIF_IDLE;
+               ipmi_ssif_unlock_cond(ssif_info, flags);
+               ipmi_free_smi_msg(msg);
+       }
+@@ -407,7 +407,7 @@ static void start_event_fetch(struct ssi
+       msg = ipmi_alloc_smi_msg();
+       if (!msg) {
+-              ssif_info->ssif_state = SSIF_NORMAL;
++              ssif_info->ssif_state = SSIF_IDLE;
+               ipmi_ssif_unlock_cond(ssif_info, flags);
+               return;
+       }
+@@ -430,7 +430,7 @@ static void start_recv_msg_fetch(struct
+       msg = ipmi_alloc_smi_msg();
+       if (!msg) {
+-              ssif_info->ssif_state = SSIF_NORMAL;
++              ssif_info->ssif_state = SSIF_IDLE;
+               ipmi_ssif_unlock_cond(ssif_info, flags);
+               return;
+       }
+@@ -448,9 +448,9 @@ static void start_recv_msg_fetch(struct
+ /*
+  * Must be called with the message lock held.  This will release the
+- * message lock.  Note that the caller will check SSIF_IDLE and start a
+- * new operation, so there is no need to check for new messages to
+- * start in here.
++ * message lock.  Note that the caller will check IS_SSIF_IDLE and
++ * start a new operation, so there is no need to check for new
++ * messages to start in here.
+  */
+ static void handle_flags(struct ssif_info *ssif_info, unsigned long *flags)
+ {
+@@ -466,7 +466,7 @@ static void handle_flags(struct ssif_inf
+               /* Events available. */
+               start_event_fetch(ssif_info, flags);
+       else {
+-              ssif_info->ssif_state = SSIF_NORMAL;
++              ssif_info->ssif_state = SSIF_IDLE;
+               ipmi_ssif_unlock_cond(ssif_info, flags);
+       }
+ }
+@@ -568,7 +568,7 @@ static void watch_timeout(struct timer_l
+       if (ssif_info->watch_timeout) {
+               mod_timer(&ssif_info->watch_timer,
+                         jiffies + ssif_info->watch_timeout);
+-              if (SSIF_IDLE(ssif_info)) {
++              if (IS_SSIF_IDLE(ssif_info)) {
+                       start_flag_fetch(ssif_info, flags); /* Releases lock */
+                       return;
+               }
+@@ -756,7 +756,7 @@ static void msg_done_handler(struct ssif
+       }
+       switch (ssif_info->ssif_state) {
+-      case SSIF_NORMAL:
++      case SSIF_IDLE:
+               ipmi_ssif_unlock_cond(ssif_info, flags);
+               if (!msg)
+                       break;
+@@ -774,7 +774,7 @@ static void msg_done_handler(struct ssif
+                        * Error fetching flags, or invalid length,
+                        * just give up for now.
+                        */
+-                      ssif_info->ssif_state = SSIF_NORMAL;
++                      ssif_info->ssif_state = SSIF_IDLE;
+                       ipmi_ssif_unlock_cond(ssif_info, flags);
+                       dev_warn(&ssif_info->client->dev,
+                                "Error getting flags: %d %d, %x\n",
+@@ -809,7 +809,7 @@ static void msg_done_handler(struct ssif
+                                "Invalid response clearing flags: %x %x\n",
+                                data[0], data[1]);
+               }
+-              ssif_info->ssif_state = SSIF_NORMAL;
++              ssif_info->ssif_state = SSIF_IDLE;
+               ipmi_ssif_unlock_cond(ssif_info, flags);
+               break;
+@@ -887,7 +887,7 @@ static void msg_done_handler(struct ssif
+       }
+       flags = ipmi_ssif_lock_cond(ssif_info, &oflags);
+-      if (SSIF_IDLE(ssif_info) && !ssif_info->stopping) {
++      if (IS_SSIF_IDLE(ssif_info) && !ssif_info->stopping) {
+               if (ssif_info->req_events)
+                       start_event_fetch(ssif_info, flags);
+               else if (ssif_info->req_flags)
+@@ -1032,7 +1032,7 @@ static void start_next_msg(struct ssif_i
+       unsigned long oflags;
+  restart:
+-      if (!SSIF_IDLE(ssif_info)) {
++      if (!IS_SSIF_IDLE(ssif_info)) {
+               ipmi_ssif_unlock_cond(ssif_info, flags);
+               return;
+       }
+@@ -1255,7 +1255,7 @@ static void shutdown_ssif(void *send_inf
+       dev_set_drvdata(&ssif_info->client->dev, NULL);
+       /* make sure the driver is not looking for flags any more. */
+-      while (ssif_info->ssif_state != SSIF_NORMAL)
++      while (ssif_info->ssif_state != SSIF_IDLE)
+               schedule_timeout(1);
+       ssif_info->stopping = true;
+@@ -1827,7 +1827,7 @@ static int ssif_probe(struct i2c_client
+       }
+       spin_lock_init(&ssif_info->lock);
+-      ssif_info->ssif_state = SSIF_NORMAL;
++      ssif_info->ssif_state = SSIF_IDLE;
+       timer_setup(&ssif_info->retry_timer, retry_timeout, 0);
+       timer_setup(&ssif_info->watch_timer, watch_timeout, 0);
diff --git a/queue-5.15/rtc-pm8xxx-fix-set-alarm-race.patch b/queue-5.15/rtc-pm8xxx-fix-set-alarm-race.patch
new file mode 100644 (file)
index 0000000..971a58d
--- /dev/null
@@ -0,0 +1,74 @@
+From c88db0eff9722fc2b6c4d172a50471d20e08ecc6 Mon Sep 17 00:00:00 2001
+From: Johan Hovold <johan+linaro@kernel.org>
+Date: Thu, 2 Feb 2023 16:54:27 +0100
+Subject: rtc: pm8xxx: fix set-alarm race
+
+From: Johan Hovold <johan+linaro@kernel.org>
+
+commit c88db0eff9722fc2b6c4d172a50471d20e08ecc6 upstream.
+
+Make sure to disable the alarm before updating the four alarm time
+registers to avoid spurious alarms during the update.
+
+Note that the disable needs to be done outside of the ctrl_reg_lock
+section to prevent a racing alarm interrupt from disabling the newly set
+alarm when the lock is released.
+
+Fixes: 9a9a54ad7aa2 ("drivers/rtc: add support for Qualcomm PMIC8xxx RTC")
+Cc: stable@vger.kernel.org      # 3.1
+Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
+Reviewed-by: David Collins <quic_collinsd@quicinc.com>
+Link: https://lore.kernel.org/r/20230202155448.6715-2-johan+linaro@kernel.org
+Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/rtc/rtc-pm8xxx.c |   24 ++++++++++--------------
+ 1 file changed, 10 insertions(+), 14 deletions(-)
+
+--- a/drivers/rtc/rtc-pm8xxx.c
++++ b/drivers/rtc/rtc-pm8xxx.c
+@@ -220,7 +220,6 @@ static int pm8xxx_rtc_set_alarm(struct d
+ {
+       int rc, i;
+       u8 value[NUM_8_BIT_RTC_REGS];
+-      unsigned int ctrl_reg;
+       unsigned long secs, irq_flags;
+       struct pm8xxx_rtc *rtc_dd = dev_get_drvdata(dev);
+       const struct pm8xxx_rtc_regs *regs = rtc_dd->regs;
+@@ -232,6 +231,11 @@ static int pm8xxx_rtc_set_alarm(struct d
+               secs >>= 8;
+       }
++      rc = regmap_update_bits(rtc_dd->regmap, regs->alarm_ctrl,
++                              regs->alarm_en, 0);
++      if (rc)
++              return rc;
++
+       spin_lock_irqsave(&rtc_dd->ctrl_reg_lock, irq_flags);
+       rc = regmap_bulk_write(rtc_dd->regmap, regs->alarm_rw, value,
+@@ -241,19 +245,11 @@ static int pm8xxx_rtc_set_alarm(struct d
+               goto rtc_rw_fail;
+       }
+-      rc = regmap_read(rtc_dd->regmap, regs->alarm_ctrl, &ctrl_reg);
+-      if (rc)
+-              goto rtc_rw_fail;
+-
+-      if (alarm->enabled)
+-              ctrl_reg |= regs->alarm_en;
+-      else
+-              ctrl_reg &= ~regs->alarm_en;
+-
+-      rc = regmap_write(rtc_dd->regmap, regs->alarm_ctrl, ctrl_reg);
+-      if (rc) {
+-              dev_err(dev, "Write to RTC alarm control register failed\n");
+-              goto rtc_rw_fail;
++      if (alarm->enabled) {
++              rc = regmap_update_bits(rtc_dd->regmap, regs->alarm_ctrl,
++                                      regs->alarm_en, regs->alarm_en);
++              if (rc)
++                      goto rtc_rw_fail;
+       }
+       dev_dbg(dev, "Alarm Set for h:m:s=%ptRt, y-m-d=%ptRdr\n",
index 80307cdb55f17f3daaaca4c3eb5907adc66454b4..117d947a7d1d20c45191938c443b61dd12085591 100644 (file)
@@ -428,3 +428,9 @@ dm-thin-add-cond_resched-to-various-workqueue-loops.patch
 dm-cache-add-cond_resched-to-various-workqueue-loops.patch
 nfsd-zero-out-pointers-after-putting-nfsd_files-on-c.patch
 drm-shmem-helper-revert-accidental-non-gpl-export.patch
+wifi-rtl8xxxu-fixing-transmisison-failure-for-rtl8192eu.patch
+firmware-coreboot-framebuffer-ignore-reserved-pixel-color-bits.patch
+block-don-t-allow-multiple-bios-for-iocb_nowait-issue.patch
+rtc-pm8xxx-fix-set-alarm-race.patch
+ipmi-ssif-resend_msg-cannot-fail.patch
+ipmi_ssif-rename-idle-state-and-check.patch
diff --git a/queue-5.15/wifi-rtl8xxxu-fixing-transmisison-failure-for-rtl8192eu.patch b/queue-5.15/wifi-rtl8xxxu-fixing-transmisison-failure-for-rtl8192eu.patch
new file mode 100644 (file)
index 0000000..d3d846f
--- /dev/null
@@ -0,0 +1,36 @@
+From c6015bf3ff1ffb3caa27eb913797438a0fc634a0 Mon Sep 17 00:00:00 2001
+From: Jun ASAKA <JunASAKA@zzy040330.moe>
+Date: Sat, 17 Dec 2022 11:06:59 +0800
+Subject: wifi: rtl8xxxu: fixing transmisison failure for rtl8192eu
+
+From: Jun ASAKA <JunASAKA@zzy040330.moe>
+
+commit c6015bf3ff1ffb3caa27eb913797438a0fc634a0 upstream.
+
+Fixing transmission failure which results in
+"authentication with ... timed out". This can be
+fixed by disable the REG_TXPAUSE.
+
+Signed-off-by: Jun ASAKA <JunASAKA@zzy040330.moe>
+Reviewed-by: Ping-Ke Shih <pkshih@realtek.com>
+Signed-off-by: Kalle Valo <kvalo@kernel.org>
+Link: https://lore.kernel.org/r/20221217030659.12577-1-JunASAKA@zzy040330.moe
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c
++++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c
+@@ -1669,6 +1669,11 @@ static void rtl8192e_enable_rf(struct rt
+       val8 = rtl8xxxu_read8(priv, REG_PAD_CTRL1);
+       val8 &= ~BIT(0);
+       rtl8xxxu_write8(priv, REG_PAD_CTRL1, val8);
++
++      /*
++       * Fix transmission failure of rtl8192e.
++       */
++      rtl8xxxu_write8(priv, REG_TXPAUSE, 0x00);
+ }
+ struct rtl8xxxu_fileops rtl8192eu_fops = {