Hi,
On 6/29/24 8:58 AM, Christophe JAILLET wrote:
> '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@xxxxxxxxxx>
> ---
> Compile tested-only
Thanks, patch looks good to me:
Reviewed-by: Hans de Goede <hdegoede@xxxxxxxxxx>
Regards,
Hans
> ---
> drivers/acpi/pmic/intel_pmic.c | 2 +-
> drivers/acpi/pmic/intel_pmic.h | 4 ++--
> drivers/acpi/pmic/intel_pmic_bxtwc.c | 4 ++--
> drivers/acpi/pmic/intel_pmic_bytcrc.c | 4 ++--
> drivers/acpi/pmic/intel_pmic_chtdc_ti.c | 4 ++--
> drivers/acpi/pmic/intel_pmic_chtwc.c | 2 +-
> drivers/acpi/pmic/intel_pmic_xpower.c | 4 ++--
> 7 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/acpi/pmic/intel_pmic.c b/drivers/acpi/pmic/intel_pmic.c
> index f20dbda1a831..134e9ca8eaa2 100644
> --- 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 d956b03a6ca0..006f0780ffab 100644
> --- 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 e247615189fa..c332afbf82bd 100644
> --- 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 2b09f8da5400..b4c21a75294a 100644
> --- 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 79f9df552524..ecb36fbc1e7f 100644
> --- 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 25aa3e33b09a..81caede51ca2 100644
> --- 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 43c5850b4bf3..49bda5e0c8aa 100644
> --- 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
