misc: amd-sbi: Extend support for MCAMSR protocol for rev 0x21

- MCAMSR protocol for revision 0x21 is updated to include the
  extended thread supported by the platform.
- This modifies the existing protocol to include additional byte
  to provide high thread number.
- New input structure is defined to address this, as the hardware
  protocol is tightly coupled with the input structure length

Reviewed-by: Naveen Krishna Chatradhi <naveenkrishna.chatradhi@amd.com>
Signed-off-by: Akshay Gupta <akshay.gupta@amd.com>
Link: https://patch.msgid.link/20250915103649.1705078-6-akshay.gupta@amd.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/misc/amd-sbi/rmi-core.c b/drivers/misc/amd-sbi/rmi-core.c
index ef93dce7e038a585712989eb72f85611e1b61671..c3a58912d6db8fd92c5a00eb2d5bc988d1707ad1 100644 (file)
--- a/drivers/misc/amd-sbi/rmi-core.c
+++ b/drivers/misc/amd-sbi/rmi-core.c
@@ -35,8 +35,10 @@
 /* MSR */
 #define MSR_RD_REG_LEN         0xa
 #define MSR_WR_REG_LEN         0x8
+#define MSR_WR_REG_LEN_EXT     0x9
 #define MSR_RD_DATA_LEN                0x8
 #define MSR_WR_DATA_LEN                0x7
+#define MSR_WR_DATA_LEN_EXT    0x8
 
 /* CPUID MSR Command Ids */
 #define CPUID_MCA_CMD  0x73
@@ -120,6 +122,17 @@ static inline void prepare_mca_msr_input_message(struct cpu_msr_indata *input,
        input->value            = data_in;
 }
 
+static inline void prepare_mca_msr_input_message_ext(struct cpu_msr_indata_ext *input,
+                                                    u16 thread_id, u32 data_in)
+{
+       input->rd_len           = MSR_RD_DATA_LEN;
+       input->wr_len           = MSR_WR_DATA_LEN_EXT;
+       input->proto_cmd        = RD_MCA_CMD;
+       input->thread_lo        = (thread_id & 0xFF) << 1;
+       input->thread_hi        = thread_id >> 8;
+       input->value            = data_in;
+}
+
 static int sbrmi_get_rev(struct sbrmi_data *data)
 {
        unsigned int rev;
@@ -248,13 +261,47 @@ exit_unlock:
        return ret;
 }
 
+static int rmi_mcamsr_input(struct sbrmi_data *data, struct apml_mcamsr_msg *msg,
+                           u16 thread)
+{
+       struct cpu_msr_indata input = {0};
+       int val = 0, ret;
+
+       /* Thread > 127, Thread128 CS register, 1'b1 needs to be set to 1 */
+       if (thread > 127) {
+               thread -= 128;
+               val = 1;
+       }
+
+       ret = regmap_write(data->regmap, SBRMI_THREAD128CS, val);
+       if (ret < 0)
+               return ret;
+
+       prepare_mca_msr_input_message(&input, thread,
+                                     msg->mcamsr_in_out & CPUID_MCA_FUNC_MASK);
+
+       return regmap_bulk_write(data->regmap, CPUID_MCA_CMD,
+                                &input, MSR_WR_REG_LEN);
+}
+
+static int rmi_mcamsr_input_ext(struct sbrmi_data *data, struct apml_mcamsr_msg *msg,
+                               u16 thread)
+{
+       struct cpu_msr_indata_ext input = {0};
+
+       prepare_mca_msr_input_message_ext(&input, thread,
+                                         msg->mcamsr_in_out & CPUID_MCA_FUNC_MASK);
+
+       return regmap_bulk_write(data->regmap, CPUID_MCA_CMD,
+                                &input, MSR_WR_REG_LEN_EXT);
+}
+
 /* MCA MSR protocol */
 static int rmi_mca_msr_read(struct sbrmi_data *data,
                            struct apml_mcamsr_msg  *msg)
 {
        struct cpu_msr_outdata output = {0};
-       struct cpu_msr_indata input = {0};
-       int ret, val = 0;
+       int ret;
        int hw_status;
        u16 thread;
 
@@ -265,30 +312,29 @@ static int rmi_mca_msr_read(struct sbrmi_data *data,
                if (ret < 0)
                        goto exit_unlock;
        }
-       /* MCA MSR protocol for REV 0x20 is supported*/
-       if (data->rev != 0x20) {
-               ret = -EOPNOTSUPP;
-               goto exit_unlock;
-       }
 
+       /* Extract thread from the input msg structure */
        thread = msg->mcamsr_in_out >> CPUID_MCA_THRD_INDEX;
 
-       /* Thread > 127, Thread128 CS register, 1'b1 needs to be set to 1 */
-       if (thread > 127) {
-               thread -= 128;
-               val = 1;
-       }
-       ret = regmap_write(data->regmap, SBRMI_THREAD128CS, val);
-       if (ret < 0)
+       switch (data->rev) {
+       case 0x10:
+               /* MCAMSR protocol for REV 0x10 is not supported*/
+               ret = -EOPNOTSUPP;
                goto exit_unlock;
-
-       prepare_mca_msr_input_message(&input, thread,
-                                     msg->mcamsr_in_out & CPUID_MCA_FUNC_MASK);
-
-       ret = regmap_bulk_write(data->regmap, CPUID_MCA_CMD,
-                               &input, MSR_WR_REG_LEN);
-       if (ret < 0)
+       case 0x20:
+               ret = rmi_mcamsr_input(data, msg, thread);
+               if (ret)
+                       goto exit_unlock;
+               break;
+       case 0x21:
+               ret = rmi_mcamsr_input_ext(data, msg, thread);
+               if (ret)
+                       goto exit_unlock;
+               break;
+       default:
+               ret = -EOPNOTSUPP;
                goto exit_unlock;
+       }
 
        /*
         * For RMI Rev 0x20, new h/w status bit is introduced. which is used