uqmi: upstream patches

diff --git a/package/network/utils/uqmi/patches/0001-uim-add-application-state-to-SIM-status.patch b/package/network/utils/uqmi/patches/0001-uim-add-application-state-to-SIM-status.patch
new file mode 100644 (file)
index 0000000..7b0f76f
--- /dev/null
+++ b/package/network/utils/uqmi/patches/0001-uim-add-application-state-to-SIM-status.patch
@@ -0,0 +1,62 @@
+From b03993904f3c6e28772fbb2f4bbbe1a5144daefd Mon Sep 17 00:00:00 2001
+From: David Bauer <mail@david-bauer.net>
+Date: Sat, 7 Oct 2023 19:03:24 +0200
+Subject: [PATCH 1/2] uim: add application state to SIM status
+
+Signed-off-by: David Bauer <mail@david-bauer.net>
+---
+ commands-uim.c | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+diff --git a/commands-uim.c b/commands-uim.c
+index 3bd8a74..68803b4 100644
+--- a/commands-uim.c
++++ b/commands-uim.c
+@@ -59,6 +59,16 @@ static void cmd_uim_get_sim_state_cb(struct qmi_dev *qmi, struct qmi_request *re
+ {
+       struct qmi_uim_get_card_status_response res;
+       void * const card_table = blobmsg_open_table(&status, NULL);
++      static const char *card_application_states[] = {
++              [QMI_UIM_CARD_APPLICATION_STATE_UNKNOWN] = "unknown",
++              [QMI_UIM_CARD_APPLICATION_STATE_DETECTED] = "detected",
++              [QMI_UIM_CARD_APPLICATION_STATE_PIN1_OR_UPIN_PIN_REQUIRED] = "pin-required",
++              [QMI_UIM_CARD_APPLICATION_STATE_PUK1_OR_UPIN_PUK_REQUIRED] = "puk-required",
++              [QMI_UIM_CARD_APPLICATION_STATE_CHECK_PERSONALIZATION_STATE] = "check-personalization-state",
++              [QMI_UIM_CARD_APPLICATION_STATE_PIN1_BLOCKED] = "pin1-blocked",
++              [QMI_UIM_CARD_APPLICATION_STATE_ILLEGAL] = "illegal",
++              [QMI_UIM_CARD_APPLICATION_STATE_READY] = "ready",
++      };
+ 
+       qmi_parse_uim_get_card_status_response(msg, &res);
+ 
+@@ -66,6 +76,7 @@ static void cmd_uim_get_sim_state_cb(struct qmi_dev *qmi, struct qmi_request *re
+               if (res.data.card_status.cards[i].card_state != QMI_UIM_CARD_STATE_PRESENT)
+                       continue;
+ 
++              uint8_t card_application_state;
+               uint8_t pin1_state = res.data.card_status.cards[i].upin_state;
+               uint8_t pin1_retries = res.data.card_status.cards[i].upin_retries;
+               uint8_t puk1_retries = res.data.card_status.cards[i].upuk_retries;
+@@ -78,6 +89,8 @@ static void cmd_uim_get_sim_state_cb(struct qmi_dev *qmi, struct qmi_request *re
+                       if (res.data.card_status.cards[i].applications[j].type == QMI_UIM_CARD_APPLICATION_TYPE_UNKNOWN)
+                               continue;
+ 
++                      card_application_state = pin1_state = res.data.card_status.cards[i].applications[j].state;
++
+                       if (!res.data.card_status.cards[i].applications[j].upin_replaces_pin1) {
+                               pin1_state = res.data.card_status.cards[i].applications[j].pin1_state;
+                               pin1_retries = res.data.card_status.cards[i].applications[j].pin1_retries;
+@@ -92,6 +105,10 @@ static void cmd_uim_get_sim_state_cb(struct qmi_dev *qmi, struct qmi_request *re
+                       break; /* handle first application only for now */
+               }
+ 
++              if (card_application_state > QMI_UIM_CARD_APPLICATION_STATE_READY)
++                      card_application_state = QMI_UIM_CARD_APPLICATION_STATE_UNKNOWN;
++
++              blobmsg_add_string(&status, "card_application_state", card_application_states[card_application_state]);
+               blobmsg_add_string(&status, "pin1_status", get_pin_status(pin1_state));
+               blobmsg_add_u32(&status, "pin1_verify_tries", pin1_retries);
+               blobmsg_add_u32(&status, "pin1_unlock_tries", puk1_retries);
+-- 
+2.40.1
+

diff --git a/package/network/utils/uqmi/patches/0002-uim-support-SIM-card-power-up-down.patch b/package/network/utils/uqmi/patches/0002-uim-support-SIM-card-power-up-down.patch
new file mode 100644 (file)
index 0000000..532d9dd
--- /dev/null
+++ b/package/network/utils/uqmi/patches/0002-uim-support-SIM-card-power-up-down.patch
@@ -0,0 +1,107 @@
+From 86187c00273412b04b9ccf13b4b1c72fb72ec27b Mon Sep 17 00:00:00 2001
+From: David Bauer <mail@david-bauer.net>
+Date: Sat, 7 Oct 2023 19:04:10 +0200
+Subject: [PATCH 2/2] uim: support SIM card power-up/down
+
+Signed-off-by: David Bauer <mail@david-bauer.net>
+---
+ commands-uim.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ commands-uim.h |  9 ++++++++-
+ 2 files changed, 60 insertions(+), 1 deletion(-)
+
+diff --git a/commands-uim.c b/commands-uim.c
+index 68803b4..ff01d7b 100644
+--- a/commands-uim.c
++++ b/commands-uim.c
+@@ -19,6 +19,8 @@
+  * Boston, MA 02110-1301 USA.
+  */
+ 
++static int uim_slot = 0;
++
+ #define cmd_uim_verify_pin1_cb no_cb
+ static enum qmi_cmd_result
+ cmd_uim_verify_pin1_prepare(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg, char *arg)
+@@ -130,3 +132,53 @@ cmd_uim_get_sim_state_prepare(struct qmi_dev *qmi, struct qmi_request *req, stru
+       qmi_set_uim_get_card_status_request(msg);
+       return QMI_CMD_REQUEST;
+ }
++
++#define cmd_uim_slot_cb no_cb
++static enum qmi_cmd_result
++cmd_uim_slot_prepare(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg, char *arg)
++{
++      char *err;
++      int value = strtoul(arg, &err, 10);
++      if ((err && *err) || value < 1 || value > 2) {
++              uqmi_add_error("Invalid UIM-Slot value. Allowed: [1,2]");
++              return QMI_CMD_EXIT;
++      }
++
++      uim_slot = value;
++
++      return QMI_CMD_DONE;
++}
++
++#define cmd_uim_power_off_cb no_cb
++static enum qmi_cmd_result
++cmd_uim_power_off_prepare(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg, char *arg)
++{
++      struct qmi_uim_power_off_sim_request data = {
++              QMI_INIT(slot, uim_slot)
++      };
++
++      if (!uim_slot) {
++              uqmi_add_error("UIM-Slot not set. Use --uim-slot <slot> to set it.");
++              return QMI_CMD_EXIT;
++      }
++
++      qmi_set_uim_power_off_sim_request(msg, &data);
++      return QMI_CMD_REQUEST;
++}
++
++#define cmd_uim_power_on_cb no_cb
++static enum qmi_cmd_result
++cmd_uim_power_on_prepare(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg, char *arg)
++{
++      struct qmi_uim_power_on_sim_request data = {
++              QMI_INIT(slot, uim_slot)
++      };
++
++      if (!uim_slot) {
++              uqmi_add_error("UIM-Slot not set. Use --uim-slot <slot> to set it.");
++              return QMI_CMD_EXIT;
++      }
++
++      qmi_set_uim_power_on_sim_request(msg, &data);
++      return QMI_CMD_REQUEST;
++}
+diff --git a/commands-uim.h b/commands-uim.h
+index 02a49b1..191f09c 100644
+--- a/commands-uim.h
++++ b/commands-uim.h
+@@ -20,13 +20,20 @@
+  */
+ 
+ #define __uqmi_uim_commands                                                                                           \
++      __uqmi_command(uim_slot, uim-slot, required, CMD_TYPE_OPTION), \
+       __uqmi_command(uim_verify_pin1, uim-verify-pin1, required, QMI_SERVICE_UIM), \
+       __uqmi_command(uim_verify_pin2, uim-verify-pin2, required, QMI_SERVICE_UIM), \
+-      __uqmi_command(uim_get_sim_state, uim-get-sim-state, no, QMI_SERVICE_UIM) \
++      __uqmi_command(uim_get_sim_state, uim-get-sim-state, no, QMI_SERVICE_UIM), \
++      __uqmi_command(uim_power_off, uim-power-off, no, QMI_SERVICE_UIM), \
++      __uqmi_command(uim_power_on, uim-power-on, no, QMI_SERVICE_UIM) \
+ 
+ 
+ #define uim_helptext \
+               "  --uim-verify-pin1 <pin>:          Verify PIN1 (new devices)\n" \
+               "  --uim-verify-pin2 <pin>:          Verify PIN2 (new devices)\n" \
+               "  --uim-get-sim-state:                  Get current SIM state\n" \
++              "  --uim-power-off:                  Power off SIM card\n" \
++              "    --uim-slot:                     SIM slot [1-2]\n" \
++              "  --uim-power-on:                   Power on SIM card\n" \
++              "    --uim-slot:                     SIM slot [1-2]\n" \
+ 
+-- 
+2.40.1
+