diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-10-06 22:32:08 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-10-06 22:32:08 +0300 |
| commit | aa2e505c80ba604077f8eca633f542bdb24217a2 (patch) | |
| tree | 0dfffd2704b36457b98a29b1f29fc4381a572924 /drivers/soc | |
| parent | 8a749fd1a8720d4619c91c8b6e7528c0a355c0aa (diff) | |
| parent | a46e42c097982e258f89c64c5f52f30994bcfeda (diff) | |
| download | linux-aa2e505c80ba604077f8eca633f542bdb24217a2.tar.xz | |
Merge tag 'acpi-pcc-updates-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux
Merge ACPI PCC changes for v6.7 from Sudeep Holla:
"ACPI: PCC: Mailbox and generic updates for v6.7
Main updates include:
1. Addition of support for Type 4 PCC subspace that enables platform
notification handling (Huisong Li).
2. Support for the shared interrupt amongst multiple PCC subspaces/
channels (Huisong Li).
3. Consolidation of PCC shared memory region command and status
bitfields definitions that were duplicated and scattered across
multiple PCC client drivers (Sudeep Holla)."
* tag 'acpi-pcc-updates-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
soc: kunpeng_hccs: Migrate to use generic PCC shmem related macros
hwmon: (xgene) Migrate to use generic PCC shmem related macros
i2c: xgene-slimpro: Migrate to use generic PCC shmem related macros
ACPI: PCC: Add PCC shared memory region command and status bitfields
mailbox: pcc: Support shared interrupt for multiple subspaces
mailbox: pcc: Add support for platform notification handling
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/hisilicon/kunpeng_hccs.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/soc/hisilicon/kunpeng_hccs.c b/drivers/soc/hisilicon/kunpeng_hccs.c index f3810d9d1caa..27a96cafd1ea 100644 --- a/drivers/soc/hisilicon/kunpeng_hccs.c +++ b/drivers/soc/hisilicon/kunpeng_hccs.c @@ -31,10 +31,6 @@ #include "kunpeng_hccs.h" -/* PCC defines */ -#define HCCS_PCC_SIGNATURE_MASK 0x50434300 -#define HCCS_PCC_STATUS_CMD_COMPLETE BIT(0) - /* * Arbitrary retries in case the remote processor is slow to respond * to PCC commands @@ -187,7 +183,7 @@ static int hccs_check_chan_cmd_complete(struct hccs_dev *hdev) * deadline_us(timeout_us) until PCC command complete bit is set(cond) */ ret = readw_poll_timeout(&comm_base->status, status, - status & HCCS_PCC_STATUS_CMD_COMPLETE, + status & PCC_STATUS_CMD_COMPLETE, HCCS_POLL_STATUS_TIME_INTERVAL_US, cl_info->deadline_us); if (unlikely(ret)) @@ -208,7 +204,7 @@ static int hccs_pcc_cmd_send(struct hccs_dev *hdev, u8 cmd, int ret; /* Write signature for this subspace */ - tmp.signature = HCCS_PCC_SIGNATURE_MASK | hdev->chan_id; + tmp.signature = PCC_SIGNATURE | hdev->chan_id; /* Write to the shared command region */ tmp.command = cmd; /* Clear cmd complete bit */ |