2024-05-08 00:50:18

by K, Kiran

[permalink] [raw]
Subject: [PATCH v1] Bluetooth: btintel_pcie: Fix compiler warnings

Fix compiler warnings reported by kernel bot.

Reported-by: kernel test robot <[email protected]>
Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
Signed-off-by: Kiran K <[email protected]>
---
drivers/bluetooth/btintel_pcie.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/drivers/bluetooth/btintel_pcie.c b/drivers/bluetooth/btintel_pcie.c
index e9bc4b673424..2853ab80079d 100644
--- a/drivers/bluetooth/btintel_pcie.c
+++ b/drivers/bluetooth/btintel_pcie.c
@@ -251,7 +251,6 @@ static void btintel_pcie_reset_bt(struct btintel_pcie_data *data)
static int btintel_pcie_enable_bt(struct btintel_pcie_data *data)
{
int err;
- u32 reg;

data->gp0_received = false;

@@ -259,7 +258,7 @@ static int btintel_pcie_enable_bt(struct btintel_pcie_data *data)
btintel_pcie_wr_reg32(data, BTINTEL_PCIE_CSR_CI_ADDR_LSB_REG,
data->ci_p_addr & 0xffffffff);
btintel_pcie_wr_reg32(data, BTINTEL_PCIE_CSR_CI_ADDR_MSB_REG,
- data->ci_p_addr >> 32);
+ (u64)data->ci_p_addr >> 32);

/* Reset the cached value of boot stage. it is updated by the MSI-X
* gp0 interrupt handler.
@@ -267,7 +266,7 @@ static int btintel_pcie_enable_bt(struct btintel_pcie_data *data)
data->boot_stage_cache = 0x0;

/* Set MAC_INIT bit to start primary bootloader */
- reg = btintel_pcie_rd_reg32(data, BTINTEL_PCIE_CSR_FUNC_CTRL_REG);
+ btintel_pcie_rd_reg32(data, BTINTEL_PCIE_CSR_FUNC_CTRL_REG);

btintel_pcie_set_reg_bits(data, BTINTEL_PCIE_CSR_FUNC_CTRL_REG,
BTINTEL_PCIE_CSR_FUNC_CTRL_MAC_INIT);
@@ -285,7 +284,7 @@ static int btintel_pcie_enable_bt(struct btintel_pcie_data *data)
BTINTEL_PCIE_CSR_FUNC_CTRL_FUNC_ENA |
BTINTEL_PCIE_CSR_FUNC_CTRL_FUNC_INIT);

- reg = btintel_pcie_rd_reg32(data, BTINTEL_PCIE_CSR_FUNC_CTRL_REG);
+ btintel_pcie_rd_reg32(data, BTINTEL_PCIE_CSR_FUNC_CTRL_REG);

/* wait for interrupt from the device after booting up to primary
* bootloader.
@@ -525,7 +524,6 @@ static void btintel_pcie_msix_rx_handle(struct btintel_pcie_data *data)
u16 cr_hia, cr_tia;
struct rxq *rxq;
struct urbd1 *urbd1;
- struct frbd *frbd;
struct data_buf *buf;
int ret;
struct hci_dev *hdev = data->hdev;
@@ -550,8 +548,6 @@ static void btintel_pcie_msix_rx_handle(struct btintel_pcie_data *data)
urbd1 = &rxq->urbd1s[cr_tia];
ipc_print_urbd1(data->hdev, urbd1, cr_tia);

- frbd = &rxq->frbds[urbd1->frbd_tag];
-
buf = &rxq->bufs[urbd1->frbd_tag];
if (!buf) {
bt_dev_err(hdev, "RXQ: failed to get the DMA buffer for %d",
--
2.40.1



2024-05-08 01:52:49

by bluez.test.bot

[permalink] [raw]
Subject: RE: [v1] Bluetooth: btintel_pcie: Fix compiler warnings

This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=851385

---Test result---

Test Summary:
CheckPatch PASS 0.47 seconds
GitLint FAIL 0.46 seconds
SubjectPrefix PASS 0.06 seconds
BuildKernel PASS 29.23 seconds
CheckAllWarning PASS 32.08 seconds
CheckSparse PASS 37.50 seconds
CheckSmatch FAIL 34.54 seconds
BuildKernel32 PASS 28.21 seconds
TestRunnerSetup PASS 511.57 seconds
TestRunner_l2cap-tester PASS 20.26 seconds
TestRunner_iso-tester PASS 30.57 seconds
TestRunner_bnep-tester PASS 4.63 seconds
TestRunner_mgmt-tester PASS 110.22 seconds
TestRunner_rfcomm-tester PASS 7.14 seconds
TestRunner_sco-tester PASS 14.88 seconds
TestRunner_ioctl-tester PASS 7.65 seconds
TestRunner_mesh-tester PASS 5.68 seconds
TestRunner_smp-tester PASS 6.66 seconds
TestRunner_userchan-tester PASS 4.79 seconds
IncrementalBuild PASS 27.32 seconds

Details
##############################
Test: GitLint - FAIL
Desc: Run gitlint
Output:
[v1] Bluetooth: btintel_pcie: Fix compiler warnings

WARNING: I3 - ignore-body-lines: gitlint will be switching from using Python regex 'match' (match beginning) to 'search' (match anywhere) semantics. Please review your ignore-body-lines.regex option accordingly. To remove this warning, set general.regex-style-search=True. More details: https://jorisroovers.github.io/gitlint/configuration/#regex-style-search
6: B1 Line exceeds max length (82>80): "Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/"
##############################
Test: CheckSmatch - FAIL
Desc: Run smatch tool with source
Output:

Segmentation fault (core dumped)
make[4]: *** [scripts/Makefile.build:244: net/bluetooth/hci_core.o] Error 139
make[4]: *** Deleting file 'net/bluetooth/hci_core.o'
make[3]: *** [scripts/Makefile.build:485: net/bluetooth] Error 2
make[2]: *** [scripts/Makefile.build:485: net] Error 2
make[2]: *** Waiting for unfinished jobs....
Segmentation fault (core dumped)
make[4]: *** [scripts/Makefile.build:244: drivers/bluetooth/bcm203x.o] Error 139
make[4]: *** Deleting file 'drivers/bluetooth/bcm203x.o'
make[4]: *** Waiting for unfinished jobs....
make[3]: *** [scripts/Makefile.build:485: drivers/bluetooth] Error 2
make[2]: *** [scripts/Makefile.build:485: drivers] Error 2
make[1]: *** [/github/workspace/src/src/Makefile:1919: .] Error 2
make: *** [Makefile:240: __sub-make] Error 2


---
Regards,
Linux Bluetooth

2024-05-08 04:32:21

by Paul Menzel

[permalink] [raw]
Subject: Re: [PATCH v1] Bluetooth: btintel_pcie: Fix compiler warnings

Dear Kiran,


Thank you for your patch.

Am 08.05.24 um 03:04 schrieb Kiran K:
> Fix compiler warnings reported by kernel bot.

It’d be great, if you added the warnings:

>> drivers/bluetooth/btintel_pcie.c:184:6: warning: variable 'reg' set
but not used [-Wunused-but-set-variable]
u32 reg;
^
>> drivers/bluetooth/btintel_pcie.c:192:26: warning: shift count >=
width of type [-Wshift-count-overflow]
data->ci_p_addr >> 32);
^ ~~
>> drivers/bluetooth/btintel_pcie.c:458:15: warning: variable 'frbd'
set but not used [-Wunused-but-set-variable]
struct frbd *frbd;
^
3 warnings generated.

> Reported-by: kernel test robot <[email protected]>
> Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
> Signed-off-by: Kiran K <[email protected]>

Please add a Fixes: tag.

(I personally would also prefer one commit per warning.)


Kind regards,

Paul


> ---
> drivers/bluetooth/btintel_pcie.c | 10 +++-------
> 1 file changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/bluetooth/btintel_pcie.c b/drivers/bluetooth/btintel_pcie.c
> index e9bc4b673424..2853ab80079d 100644
> --- a/drivers/bluetooth/btintel_pcie.c
> +++ b/drivers/bluetooth/btintel_pcie.c
> @@ -251,7 +251,6 @@ static void btintel_pcie_reset_bt(struct btintel_pcie_data *data)
> static int btintel_pcie_enable_bt(struct btintel_pcie_data *data)
> {
> int err;
> - u32 reg;
>
> data->gp0_received = false;
>
> @@ -259,7 +258,7 @@ static int btintel_pcie_enable_bt(struct btintel_pcie_data *data)
> btintel_pcie_wr_reg32(data, BTINTEL_PCIE_CSR_CI_ADDR_LSB_REG,
> data->ci_p_addr & 0xffffffff);
> btintel_pcie_wr_reg32(data, BTINTEL_PCIE_CSR_CI_ADDR_MSB_REG,
> - data->ci_p_addr >> 32);
> + (u64)data->ci_p_addr >> 32);
>
> /* Reset the cached value of boot stage. it is updated by the MSI-X
> * gp0 interrupt handler.
> @@ -267,7 +266,7 @@ static int btintel_pcie_enable_bt(struct btintel_pcie_data *data)
> data->boot_stage_cache = 0x0;
>
> /* Set MAC_INIT bit to start primary bootloader */
> - reg = btintel_pcie_rd_reg32(data, BTINTEL_PCIE_CSR_FUNC_CTRL_REG);
> + btintel_pcie_rd_reg32(data, BTINTEL_PCIE_CSR_FUNC_CTRL_REG);
>
> btintel_pcie_set_reg_bits(data, BTINTEL_PCIE_CSR_FUNC_CTRL_REG,
> BTINTEL_PCIE_CSR_FUNC_CTRL_MAC_INIT);
> @@ -285,7 +284,7 @@ static int btintel_pcie_enable_bt(struct btintel_pcie_data *data)
> BTINTEL_PCIE_CSR_FUNC_CTRL_FUNC_ENA |
> BTINTEL_PCIE_CSR_FUNC_CTRL_FUNC_INIT);
>
> - reg = btintel_pcie_rd_reg32(data, BTINTEL_PCIE_CSR_FUNC_CTRL_REG);
> + btintel_pcie_rd_reg32(data, BTINTEL_PCIE_CSR_FUNC_CTRL_REG);
>
> /* wait for interrupt from the device after booting up to primary
> * bootloader.
> @@ -525,7 +524,6 @@ static void btintel_pcie_msix_rx_handle(struct btintel_pcie_data *data)
> u16 cr_hia, cr_tia;
> struct rxq *rxq;
> struct urbd1 *urbd1;
> - struct frbd *frbd;
> struct data_buf *buf;
> int ret;
> struct hci_dev *hdev = data->hdev;
> @@ -550,8 +548,6 @@ static void btintel_pcie_msix_rx_handle(struct btintel_pcie_data *data)
> urbd1 = &rxq->urbd1s[cr_tia];
> ipc_print_urbd1(data->hdev, urbd1, cr_tia);
>
> - frbd = &rxq->frbds[urbd1->frbd_tag];
> -
> buf = &rxq->bufs[urbd1->frbd_tag];
> if (!buf) {
> bt_dev_err(hdev, "RXQ: failed to get the DMA buffer for %d",