diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2024-04-29 22:16:58 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2024-04-29 22:16:58 +0200 |
| commit | 29a7020067d2dd91971d8b0ee7386a3081edd69c (patch) | |
| tree | 4a98f6d5a37f1cbd2149798a57115e5d09e9214a /drivers/soc | |
| parent | 7ec7695d0b493fa2cda272b3e4baebadd45e8a9c (diff) | |
| parent | 95d6333e0622dd5ca32c7832a015ae24f56d1ad2 (diff) | |
Merge tag 'hisi-drivers-for-6.10' of https://github.com/hisilicon/linux-hisi into soc/drivers
HiSilicon driver updates for v6.10
- Add the check for obtaining complete port attribute in the HCCS driver
- Replace MAILBOX dependency with PCC for the HCCS driver
* tag 'hisi-drivers-for-6.10' of https://github.com/hisilicon/linux-hisi:
soc: hisilicon: kunpeng_hccs: replace MAILBOX dependency with PCC
soc: hisilicon: kunpeng_hccs: Add the check for obtaining complete port attribute
Link: https://lore.kernel.org/r/662A3EDE.5070708@hisilicon.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/hisilicon/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/soc/hisilicon/kunpeng_hccs.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/drivers/soc/hisilicon/Kconfig b/drivers/soc/hisilicon/Kconfig index 0ab688af308f..4b0a099b28cc 100644 --- a/drivers/soc/hisilicon/Kconfig +++ b/drivers/soc/hisilicon/Kconfig @@ -6,7 +6,7 @@ menu "Hisilicon SoC drivers" config KUNPENG_HCCS tristate "HCCS driver on Kunpeng SoC" depends on ACPI - depends on MAILBOX + depends on PCC depends on ARM64 || COMPILE_TEST help The Huawei Cache Coherence System (HCCS) is a multi-chip diff --git a/drivers/soc/hisilicon/kunpeng_hccs.c b/drivers/soc/hisilicon/kunpeng_hccs.c index 9ff70b38e5e9..e882a61636ec 100644 --- a/drivers/soc/hisilicon/kunpeng_hccs.c +++ b/drivers/soc/hisilicon/kunpeng_hccs.c @@ -556,6 +556,12 @@ static int hccs_get_all_port_attr(struct hccs_dev *hdev, start_id = rsp_head.next_id; } + if (left_buf_len != 0) { + dev_err(hdev->dev, "failed to get the expected port number(%u) attribute.\n", + size); + return -EINVAL; + } + return 0; } |