ACPI: PMIC: Constify struct pmic_table

'struct pmic_table' is not modified in these drivers.

Constifying this structure moves some data to a read-only section, so
increase overall security.

On a x86_64, with allmodconfig, as an example:
Before:
======
   text	   data	    bss	    dec	    hex	filename
   3811	    786	      0	   4597	   11f5	drivers/acpi/pmic/intel_pmic_xpower.o

   text	   data	    bss	    dec	    hex	filename
   4147	    450	      0	   4597	   11f5	drivers/acpi/pmic/intel_pmic_xpower.o

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://patch.msgid.link/a6c9b1bcdf259adabbcaf91183d3f5ab87a98600.1719644292.git.christophe.jaillet@wanadoo.fr
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/pmic/intel_pmic.c b/drivers/acpi/pmic/intel_pmic.c
index f20dbda1a8310d22fd64f3360f90c92c18688d78..134e9ca8eaa2355f09ac53e3b56f7f40a4b4d719 100644 (file)
--- a/drivers/acpi/pmic/intel_pmic.c
+++ b/drivers/acpi/pmic/intel_pmic.c
@@ -31,7 +31,7 @@ struct intel_pmic_opregion {
 
 static struct intel_pmic_opregion *intel_pmic_opregion;
 
-static int pmic_get_reg_bit(int address, struct pmic_table *table,
+static int pmic_get_reg_bit(int address, const struct pmic_table *table,
                            int count, int *reg, int *bit)
 {
        int i;

diff --git a/drivers/acpi/pmic/intel_pmic.h b/drivers/acpi/pmic/intel_pmic.h
index d956b03a6ca02ab1881ab8da1a1bac92349526c8..006f0780ffabf08da221268a57ac43a75360203d 100644 (file)
--- a/drivers/acpi/pmic/intel_pmic.h
+++ b/drivers/acpi/pmic/intel_pmic.h
@@ -21,9 +21,9 @@ struct intel_pmic_opregion_data {
                                          u32 reg_address, u32 value, u32 mask);
        int (*lpat_raw_to_temp)(struct acpi_lpat_conversion_table *lpat_table,
                                int raw);
-       struct pmic_table *power_table;
+       const struct pmic_table *power_table;
        int power_table_count;
-       struct pmic_table *thermal_table;
+       const struct pmic_table *thermal_table;
        int thermal_table_count;
        /* For generic exec_mipi_pmic_seq_element handling */
        int pmic_i2c_address;

diff --git a/drivers/acpi/pmic/intel_pmic_bxtwc.c b/drivers/acpi/pmic/intel_pmic_bxtwc.c
index e247615189fa5afc6df4118872af250318b79263..c332afbf82bdd126c15f16fa9707a9d6abdb04be 100644 (file)
--- a/drivers/acpi/pmic/intel_pmic_bxtwc.c
+++ b/drivers/acpi/pmic/intel_pmic_bxtwc.c
@@ -24,7 +24,7 @@
 #define VSWITCH1_OUTPUT         BIT(4)
 #define VUSBPHY_CHARGE          BIT(1)
 
-static struct pmic_table power_table[] = {
+static const struct pmic_table power_table[] = {
        {
                .address = 0x0,
                .reg = 0x63,
@@ -177,7 +177,7 @@ static struct pmic_table power_table[] = {
        } /* MOFF -> MODEMCTRL Bit 0 */
 };
 
-static struct pmic_table thermal_table[] = {
+static const struct pmic_table thermal_table[] = {
        {
                .address = 0x00,
                .reg = 0x4F39

diff --git a/drivers/acpi/pmic/intel_pmic_bytcrc.c b/drivers/acpi/pmic/intel_pmic_bytcrc.c
index 2b09f8da5400e64944478ac92ebe84e51a549277..b4c21a75294a0582cae99759daf87c9786400619 100644 (file)
--- a/drivers/acpi/pmic/intel_pmic_bytcrc.c
+++ b/drivers/acpi/pmic/intel_pmic_bytcrc.c
@@ -16,7 +16,7 @@
 
 #define PMIC_A0LOCK_REG                0xc5
 
-static struct pmic_table power_table[] = {
+static const struct pmic_table power_table[] = {
 /*     {
                .address = 0x00,
                .reg = ??,
@@ -134,7 +134,7 @@ static struct pmic_table power_table[] = {
        }, /* V105 -> V1P05S, L2 SRAM */
 };
 
-static struct pmic_table thermal_table[] = {
+static const struct pmic_table thermal_table[] = {
        {
                .address = 0x00,
                .reg = 0x75

diff --git a/drivers/acpi/pmic/intel_pmic_chtdc_ti.c b/drivers/acpi/pmic/intel_pmic_chtdc_ti.c
index 79f9df552524be9b2da50d630c376a59f020e164..ecb36fbc1e7fe15b95c3eb0810cce74b74f71064 100644 (file)
--- a/drivers/acpi/pmic/intel_pmic_chtdc_ti.c
+++ b/drivers/acpi/pmic/intel_pmic_chtdc_ti.c
@@ -23,7 +23,7 @@
 #define CHTDC_TI_BPTHERM       0x58
 #define CHTDC_TI_GPADC         0x5a
 
-static struct pmic_table chtdc_ti_power_table[] = {
+static const struct pmic_table chtdc_ti_power_table[] = {
        { .address = 0x00, .reg = 0x41 }, /* LDO1 */
        { .address = 0x04, .reg = 0x42 }, /* LDO2 */
        { .address = 0x08, .reg = 0x43 }, /* LDO3 */
@@ -39,7 +39,7 @@ static struct pmic_table chtdc_ti_power_table[] = {
        { .address = 0x30, .reg = 0x4e }, /* LD14 */
 };
 
-static struct pmic_table chtdc_ti_thermal_table[] = {
+static const struct pmic_table chtdc_ti_thermal_table[] = {
        {
                .address = 0x00,
                .reg = CHTDC_TI_GPADC

diff --git a/drivers/acpi/pmic/intel_pmic_chtwc.c b/drivers/acpi/pmic/intel_pmic_chtwc.c
index 25aa3e33b09a1fbe3d2a557ae9413f2aef5198cf..81caede51ca252aaf192e7e2d488c173116a16bd 100644 (file)
--- a/drivers/acpi/pmic/intel_pmic_chtwc.c
+++ b/drivers/acpi/pmic/intel_pmic_chtwc.c
@@ -70,7 +70,7 @@
  * "regulator: whiskey_cove: implements Whiskey Cove pmic VRF support"
  * https://github.com/intel-aero/meta-intel-aero/blob/master/recipes-kernel/linux/linux-yocto/0019-regulator-whiskey_cove-implements-WhiskeyCove-pmic-V.patch
  */
-static struct pmic_table power_table[] = {
+static const struct pmic_table power_table[] = {
        {
                .address = 0x0,
                .reg = CHT_WC_V1P8A_CTRL,

diff --git a/drivers/acpi/pmic/intel_pmic_xpower.c b/drivers/acpi/pmic/intel_pmic_xpower.c
index 43c5850b4bf33c6a360a75e3a96082b59410ccdd..49bda5e0c8aa0a155264a2ad91f9d935b75664fc 100644 (file)
--- a/drivers/acpi/pmic/intel_pmic_xpower.c
+++ b/drivers/acpi/pmic/intel_pmic_xpower.c
@@ -26,7 +26,7 @@
 #define AXP288_ADC_TS_CURRENT_ON_ONDEMAND              (2 << 0)
 #define AXP288_ADC_TS_CURRENT_ON                       (3 << 0)
 
-static struct pmic_table power_table[] = {
+static const struct pmic_table power_table[] = {
        {
                .address = 0x00,
                .reg = 0x13,
@@ -129,7 +129,7 @@ static struct pmic_table power_table[] = {
 };
 
 /* TMP0 - TMP5 are the same, all from GPADC */
-static struct pmic_table thermal_table[] = {
+static const struct pmic_table thermal_table[] = {
        {
                .address = 0x00,
                .reg = XPOWER_GPADC_LOW