* [PATCH] wifi: b43: Constify struct lpphy_tx_gain_table_entry
@ 2024-07-16 20:21 Christophe JAILLET
2024-07-17 17:57 ` Michael Büsch
0 siblings, 1 reply; 3+ messages in thread
From: Christophe JAILLET @ 2024-07-16 20:21 UTC (permalink / raw)
To: Kalle Valo
Cc: linux-kernel, kernel-janitors, Christophe JAILLET, linux-wireless,
b43-dev
'struct lpphy_tx_gain_table_entry' are not modified in this driver.
Constifying this structure moves some data to a read-only section, so
increase overall security.
On a x86_64, with allmodconfig:
Before:
======
text data bss dec hex filename
16481 6232 0 22713 58b9 drivers/net/wireless/broadcom/b43/tables_lpphy.o
After:
=====
text data bss dec hex filename
22369 395 0 22764 58ec drivers/net/wireless/broadcom/b43/tables_lpphy.o
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
Compile tested-only.
lpphy_write_gain_table() and lpphy_write_gain_table_bulk() could also be
made static and removed from tables_lpphy.h, but without knowing the reason
why it is done this way, I've preferred to leave it as-is
---
.../net/wireless/broadcom/b43/tables_lpphy.c | 26 +++++++++----------
.../net/wireless/broadcom/b43/tables_lpphy.h | 4 +--
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/drivers/net/wireless/broadcom/b43/tables_lpphy.c b/drivers/net/wireless/broadcom/b43/tables_lpphy.c
index 71a7cd8dc787..474cd37c3554 100644
--- a/drivers/net/wireless/broadcom/b43/tables_lpphy.c
+++ b/drivers/net/wireless/broadcom/b43/tables_lpphy.c
@@ -1066,7 +1066,7 @@ static const u32 lpphy_papd_mult_table[] = {
0x00036963, 0x000339f2, 0x00030a89, 0x0002db28,
};
-static struct lpphy_tx_gain_table_entry lpphy_rev0_nopa_tx_gain_table[] = {
+static const struct lpphy_tx_gain_table_entry lpphy_rev0_nopa_tx_gain_table[] = {
{ .gm = 7, .pga = 15, .pad = 14, .dac = 0, .bb_mult = 152, },
{ .gm = 7, .pga = 15, .pad = 14, .dac = 0, .bb_mult = 147, },
{ .gm = 7, .pga = 15, .pad = 14, .dac = 0, .bb_mult = 143, },
@@ -1197,7 +1197,7 @@ static struct lpphy_tx_gain_table_entry lpphy_rev0_nopa_tx_gain_table[] = {
{ .gm = 7, .pga = 11, .pad = 6, .dac = 0, .bb_mult = 71, },
};
-static struct lpphy_tx_gain_table_entry lpphy_rev0_2ghz_tx_gain_table[] = {
+static const struct lpphy_tx_gain_table_entry lpphy_rev0_2ghz_tx_gain_table[] = {
{ .gm = 4, .pga = 15, .pad = 9, .dac = 0, .bb_mult = 64, },
{ .gm = 4, .pga = 15, .pad = 9, .dac = 0, .bb_mult = 62, },
{ .gm = 4, .pga = 15, .pad = 9, .dac = 0, .bb_mult = 60, },
@@ -1328,7 +1328,7 @@ static struct lpphy_tx_gain_table_entry lpphy_rev0_2ghz_tx_gain_table[] = {
{ .gm = 4, .pga = 4, .pad = 2, .dac = 0, .bb_mult = 72, },
};
-static struct lpphy_tx_gain_table_entry lpphy_rev0_5ghz_tx_gain_table[] = {
+static const struct lpphy_tx_gain_table_entry lpphy_rev0_5ghz_tx_gain_table[] = {
{ .gm = 7, .pga = 15, .pad = 15, .dac = 0, .bb_mult = 99, },
{ .gm = 7, .pga = 15, .pad = 15, .dac = 0, .bb_mult = 96, },
{ .gm = 7, .pga = 15, .pad = 15, .dac = 0, .bb_mult = 93, },
@@ -1459,7 +1459,7 @@ static struct lpphy_tx_gain_table_entry lpphy_rev0_5ghz_tx_gain_table[] = {
{ .gm = 7, .pga = 11, .pad = 6, .dac = 0, .bb_mult = 60, },
};
-static struct lpphy_tx_gain_table_entry lpphy_rev1_nopa_tx_gain_table[] = {
+static const struct lpphy_tx_gain_table_entry lpphy_rev1_nopa_tx_gain_table[] = {
{ .gm = 7, .pga = 15, .pad = 14, .dac = 0, .bb_mult = 152, },
{ .gm = 7, .pga = 15, .pad = 14, .dac = 0, .bb_mult = 147, },
{ .gm = 7, .pga = 15, .pad = 14, .dac = 0, .bb_mult = 143, },
@@ -1599,7 +1599,7 @@ static struct lpphy_tx_gain_table_entry lpphy_rev1_nopa_tx_gain_table[] = {
{ .gm = 7, .pga = 11, .pad = 6, .dac = 0, .bb_mult = 71, },
};
-static struct lpphy_tx_gain_table_entry lpphy_rev1_2ghz_tx_gain_table[] = {
+static const struct lpphy_tx_gain_table_entry lpphy_rev1_2ghz_tx_gain_table[] = {
{ .gm = 4, .pga = 15, .pad = 15, .dac = 0, .bb_mult = 90, },
{ .gm = 4, .pga = 15, .pad = 15, .dac = 0, .bb_mult = 88, },
{ .gm = 4, .pga = 15, .pad = 15, .dac = 0, .bb_mult = 85, },
@@ -1730,7 +1730,7 @@ static struct lpphy_tx_gain_table_entry lpphy_rev1_2ghz_tx_gain_table[] = {
{ .gm = 4, .pga = 10, .pad = 6, .dac = 0, .bb_mult = 60, },
};
-static struct lpphy_tx_gain_table_entry lpphy_rev1_5ghz_tx_gain_table[] = {
+static const struct lpphy_tx_gain_table_entry lpphy_rev1_5ghz_tx_gain_table[] = {
{ .gm = 7, .pga = 15, .pad = 15, .dac = 0, .bb_mult = 99, },
{ .gm = 7, .pga = 15, .pad = 15, .dac = 0, .bb_mult = 96, },
{ .gm = 7, .pga = 15, .pad = 15, .dac = 0, .bb_mult = 93, },
@@ -1861,7 +1861,7 @@ static struct lpphy_tx_gain_table_entry lpphy_rev1_5ghz_tx_gain_table[] = {
{ .gm = 7, .pga = 11, .pad = 6, .dac = 0, .bb_mult = 60, },
};
-static struct lpphy_tx_gain_table_entry lpphy_rev2_nopa_tx_gain_table[] = {
+static const struct lpphy_tx_gain_table_entry lpphy_rev2_nopa_tx_gain_table[] = {
{ .gm = 255, .pga = 255, .pad = 203, .dac = 0, .bb_mult = 152, },
{ .gm = 255, .pga = 255, .pad = 203, .dac = 0, .bb_mult = 147, },
{ .gm = 255, .pga = 255, .pad = 203, .dac = 0, .bb_mult = 143, },
@@ -1992,7 +1992,7 @@ static struct lpphy_tx_gain_table_entry lpphy_rev2_nopa_tx_gain_table[] = {
{ .gm = 255, .pga = 111, .pad = 29, .dac = 0, .bb_mult = 64, },
};
-static struct lpphy_tx_gain_table_entry lpphy_rev2_2ghz_tx_gain_table[] = {
+static const struct lpphy_tx_gain_table_entry lpphy_rev2_2ghz_tx_gain_table[] = {
{ .gm = 7, .pga = 99, .pad = 255, .dac = 0, .bb_mult = 64, },
{ .gm = 7, .pga = 96, .pad = 255, .dac = 0, .bb_mult = 64, },
{ .gm = 7, .pga = 93, .pad = 255, .dac = 0, .bb_mult = 64, },
@@ -2123,7 +2123,7 @@ static struct lpphy_tx_gain_table_entry lpphy_rev2_2ghz_tx_gain_table[] = {
{ .gm = 7, .pga = 13, .pad = 52, .dac = 0, .bb_mult = 64, },
};
-static struct lpphy_tx_gain_table_entry lpphy_rev2_5ghz_tx_gain_table[] = {
+static const struct lpphy_tx_gain_table_entry lpphy_rev2_5ghz_tx_gain_table[] = {
{ .gm = 255, .pga = 255, .pad = 255, .dac = 0, .bb_mult = 152, },
{ .gm = 255, .pga = 255, .pad = 255, .dac = 0, .bb_mult = 147, },
{ .gm = 255, .pga = 255, .pad = 255, .dac = 0, .bb_mult = 143, },
@@ -2340,7 +2340,7 @@ void lpphy_rev2plus_table_init(struct b43_wldev *dev)
}
static void lpphy_rev0_1_write_gain_table(struct b43_wldev *dev, int offset,
- struct lpphy_tx_gain_table_entry data)
+ const struct lpphy_tx_gain_table_entry data)
{
u32 tmp;
@@ -2356,7 +2356,7 @@ static void lpphy_rev0_1_write_gain_table(struct b43_wldev *dev, int offset,
}
static void lpphy_rev2plus_write_gain_table(struct b43_wldev *dev, int offset,
- struct lpphy_tx_gain_table_entry data)
+ const struct lpphy_tx_gain_table_entry data)
{
u32 tmp;
@@ -2383,7 +2383,7 @@ static void lpphy_rev2plus_write_gain_table(struct b43_wldev *dev, int offset,
}
void lpphy_write_gain_table(struct b43_wldev *dev, int offset,
- struct lpphy_tx_gain_table_entry data)
+ const struct lpphy_tx_gain_table_entry data)
{
if (dev->phy.rev >= 2)
lpphy_rev2plus_write_gain_table(dev, offset, data);
@@ -2392,7 +2392,7 @@ void lpphy_write_gain_table(struct b43_wldev *dev, int offset,
}
void lpphy_write_gain_table_bulk(struct b43_wldev *dev, int offset, int count,
- struct lpphy_tx_gain_table_entry *table)
+ const struct lpphy_tx_gain_table_entry *table)
{
int i;
diff --git a/drivers/net/wireless/broadcom/b43/tables_lpphy.h b/drivers/net/wireless/broadcom/b43/tables_lpphy.h
index 62002098bbda..7d7af48c27da 100644
--- a/drivers/net/wireless/broadcom/b43/tables_lpphy.h
+++ b/drivers/net/wireless/broadcom/b43/tables_lpphy.h
@@ -34,9 +34,9 @@ struct lpphy_tx_gain_table_entry {
};
void lpphy_write_gain_table(struct b43_wldev *dev, int offset,
- struct lpphy_tx_gain_table_entry data);
+ const struct lpphy_tx_gain_table_entry data);
void lpphy_write_gain_table_bulk(struct b43_wldev *dev, int offset, int count,
- struct lpphy_tx_gain_table_entry *table);
+ const struct lpphy_tx_gain_table_entry *table);
void lpphy_rev0_1_table_init(struct b43_wldev *dev);
void lpphy_rev2plus_table_init(struct b43_wldev *dev);
--
2.45.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] wifi: b43: Constify struct lpphy_tx_gain_table_entry
2024-07-16 20:21 [PATCH] wifi: b43: Constify struct lpphy_tx_gain_table_entry Christophe JAILLET
@ 2024-07-17 17:57 ` Michael Büsch
2024-08-04 6:27 ` Christophe JAILLET
0 siblings, 1 reply; 3+ messages in thread
From: Michael Büsch @ 2024-07-17 17:57 UTC (permalink / raw)
To: Christophe JAILLET
Cc: Kalle Valo, linux-kernel, kernel-janitors, linux-wireless,
b43-dev
[-- Attachment #1: Type: text/plain, Size: 1196 bytes --]
On Tue, 16 Jul 2024 22:21:13 +0200
Christophe JAILLET <christophe.jaillet@wanadoo.fr> wrote:
> static void lpphy_rev0_1_write_gain_table(struct b43_wldev *dev, int offset,
> - struct lpphy_tx_gain_table_entry data)
> + const struct lpphy_tx_gain_table_entry data)
> {
> u32 tmp;
>
> @@ -2356,7 +2356,7 @@ static void lpphy_rev0_1_write_gain_table(struct b43_wldev *dev, int offset,
> }
>
> static void lpphy_rev2plus_write_gain_table(struct b43_wldev *dev, int offset,
> - struct lpphy_tx_gain_table_entry data)
> + const struct lpphy_tx_gain_table_entry data)
> {
> u32 tmp;
>
> @@ -2383,7 +2383,7 @@ static void lpphy_rev2plus_write_gain_table(struct b43_wldev *dev, int offset,
> }
>
> void lpphy_write_gain_table(struct b43_wldev *dev, int offset,
> - struct lpphy_tx_gain_table_entry data)
> + const struct lpphy_tx_gain_table_entry data)
> {
> if (dev->phy.rev >= 2)
> lpphy_rev2plus_write_gain_table(dev, offset, data);
> @@ -2392,7 +2392,7 @@ void lpphy_write_gain_table(struct b43_wldev *dev, int offset,
> }
These three changes look like they are not necessary.
--
Michael Büsch
https://bues.ch/
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] wifi: b43: Constify struct lpphy_tx_gain_table_entry
2024-07-17 17:57 ` Michael Büsch
@ 2024-08-04 6:27 ` Christophe JAILLET
0 siblings, 0 replies; 3+ messages in thread
From: Christophe JAILLET @ 2024-08-04 6:27 UTC (permalink / raw)
To: Michael Büsch
Cc: Kalle Valo, linux-kernel, kernel-janitors, linux-wireless,
b43-dev
Le 17/07/2024 à 19:57, Michael Büsch a écrit :
> On Tue, 16 Jul 2024 22:21:13 +0200
> Christophe JAILLET <christophe.jaillet@wanadoo.fr> wrote:
>
>> static void lpphy_rev0_1_write_gain_table(struct b43_wldev *dev, int offset,
>> - struct lpphy_tx_gain_table_entry data)
>> + const struct lpphy_tx_gain_table_entry data)
>> {
>> u32 tmp;
>>
>> @@ -2356,7 +2356,7 @@ static void lpphy_rev0_1_write_gain_table(struct b43_wldev *dev, int offset,
>> }
>>
>> static void lpphy_rev2plus_write_gain_table(struct b43_wldev *dev, int offset,
>> - struct lpphy_tx_gain_table_entry data)
>> + const struct lpphy_tx_gain_table_entry data)
>> {
>> u32 tmp;
>>
>> @@ -2383,7 +2383,7 @@ static void lpphy_rev2plus_write_gain_table(struct b43_wldev *dev, int offset,
>> }
>>
>> void lpphy_write_gain_table(struct b43_wldev *dev, int offset,
>> - struct lpphy_tx_gain_table_entry data)
>> + const struct lpphy_tx_gain_table_entry data)
>> {
>> if (dev->phy.rev >= 2)
>> lpphy_rev2plus_write_gain_table(dev, offset, data);
>> @@ -2392,7 +2392,7 @@ void lpphy_write_gain_table(struct b43_wldev *dev, int offset,
>> }
>
> These three changes look like they are not necessary.
>
Correct. I'll send a v2.
CJ
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-08-04 6:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-16 20:21 [PATCH] wifi: b43: Constify struct lpphy_tx_gain_table_entry Christophe JAILLET
2024-07-17 17:57 ` Michael Büsch
2024-08-04 6:27 ` Christophe JAILLET
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).