Empty description, but the code itself looks ok.
Acked-by: Corey Minyard <cminy...@mvista.com>
On Wed, Mar 22, 2023 at 05:55:11PM +0000, Titus Rwantare wrote:
> Reviewed-by: Stephen Longfield <slongfi...@google.com>
> Signed-off-by: Titus Rwantare <tit...@google.com>
> ---
> hw/i2c/pmbus_device.c | 176 ++++++++++++++++++++++++++++++++++
> include/hw/i2c/pmbus_device.h | 1 +
> 2 files changed, 177 insertions(+)
>
> diff --git a/hw/i2c/pmbus_device.c b/hw/i2c/pmbus_device.c
> index 02647769cd..bb42e410b4 100644
> --- a/hw/i2c/pmbus_device.c
> +++ b/hw/i2c/pmbus_device.c
> @@ -490,6 +490,54 @@ static uint8_t pmbus_receive_byte(SMBusDevice *smd)
> }
> break;
>
> + case PMBUS_FAN_CONFIG_1_2: /* R/W byte */
> + if (pmdev->pages[index].page_flags & PB_HAS_FAN) {
> + pmbus_send8(pmdev, pmdev->pages[index].fan_config_1_2);
> + } else {
> + goto passthough;
> + }
> + break;
> +
> + case PMBUS_FAN_COMMAND_1: /* R/W word */
> + if (pmdev->pages[index].page_flags & PB_HAS_FAN) {
> + pmbus_send16(pmdev, pmdev->pages[index].fan_command_1);
> + } else {
> + goto passthough;
> + }
> + break;
> +
> + case PMBUS_FAN_COMMAND_2: /* R/W word */
> + if (pmdev->pages[index].page_flags & PB_HAS_FAN) {
> + pmbus_send16(pmdev, pmdev->pages[index].fan_command_2);
> + } else {
> + goto passthough;
> + }
> + break;
> +
> + case PMBUS_FAN_CONFIG_3_4: /* R/W byte */
> + if (pmdev->pages[index].page_flags & PB_HAS_FAN) {
> + pmbus_send8(pmdev, pmdev->pages[index].fan_config_3_4);
> + } else {
> + goto passthough;
> + }
> + break;
> +
> + case PMBUS_FAN_COMMAND_3: /* R/W word */
> + if (pmdev->pages[index].page_flags & PB_HAS_FAN) {
> + pmbus_send16(pmdev, pmdev->pages[index].fan_command_3);
> + } else {
> + goto passthough;
> + }
> + break;
> +
> + case PMBUS_FAN_COMMAND_4: /* R/W word */
> + if (pmdev->pages[index].page_flags & PB_HAS_FAN) {
> + pmbus_send16(pmdev, pmdev->pages[index].fan_command_4);
> + } else {
> + goto passthough;
> + }
> + break;
> +
> case PMBUS_VOUT_OV_FAULT_LIMIT: /* R/W word */
> if (pmdev->pages[index].page_flags & PB_HAS_VOUT) {
> pmbus_send16(pmdev, pmdev->pages[index].vout_ov_fault_limit);
> @@ -800,6 +848,22 @@ static uint8_t pmbus_receive_byte(SMBusDevice *smd)
> pmbus_send8(pmdev, pmdev->pages[index].status_mfr_specific);
> break;
>
> + case PMBUS_STATUS_FANS_1_2: /* R/W byte */
> + if (pmdev->pages[index].page_flags & PB_HAS_FAN) {
> + pmbus_send8(pmdev, pmdev->pages[index].status_fans_1_2);
> + } else {
> + goto passthough;
> + }
> + break;
> +
> + case PMBUS_STATUS_FANS_3_4: /* R/W byte */
> + if (pmdev->pages[index].page_flags & PB_HAS_FAN) {
> + pmbus_send8(pmdev, pmdev->pages[index].status_fans_3_4);
> + } else {
> + goto passthough;
> + }
> + break;
> +
> case PMBUS_READ_EIN: /* Read-Only block 5 bytes */
> if (pmdev->pages[index].page_flags & PB_HAS_EIN) {
> pmbus_send(pmdev, pmdev->pages[index].read_ein, 5);
> @@ -872,6 +936,54 @@ static uint8_t pmbus_receive_byte(SMBusDevice *smd)
> }
> break;
>
> + case PMBUS_READ_FAN_SPEED_1: /* Read-Only word */
> + if (pmdev->pages[index].page_flags & PB_HAS_FAN) {
> + pmbus_send16(pmdev, pmdev->pages[index].read_fan_speed_1);
> + } else {
> + goto passthough;
> + }
> + break;
> +
> + case PMBUS_READ_FAN_SPEED_2: /* Read-Only word */
> + if (pmdev->pages[index].page_flags & PB_HAS_FAN) {
> + pmbus_send16(pmdev, pmdev->pages[index].read_fan_speed_2);
> + } else {
> + goto passthough;
> + }
> + break;
> +
> + case PMBUS_READ_FAN_SPEED_3: /* Read-Only word */
> + if (pmdev->pages[index].page_flags & PB_HAS_FAN) {
> + pmbus_send16(pmdev, pmdev->pages[index].read_fan_speed_3);
> + } else {
> + goto passthough;
> + }
> + break;
> +
> + case PMBUS_READ_FAN_SPEED_4: /* Read-Only word */
> + if (pmdev->pages[index].page_flags & PB_HAS_FAN) {
> + pmbus_send16(pmdev, pmdev->pages[index].read_fan_speed_4);
> + } else {
> + goto passthough;
> + }
> + break;
> +
> + case PMBUS_READ_DUTY_CYCLE: /* Read-Only word */
> + if (pmdev->pages[index].page_flags & PB_HAS_FAN) {
> + pmbus_send16(pmdev, pmdev->pages[index].read_duty_cycle);
> + } else {
> + goto passthough;
> + }
> + break;
> +
> + case PMBUS_READ_FREQUENCY: /* Read-Only word */
> + if (pmdev->pages[index].page_flags & PB_HAS_FAN) {
> + pmbus_send16(pmdev, pmdev->pages[index].read_frequency);
> + } else {
> + goto passthough;
> + }
> + break;
> +
> case PMBUS_READ_POUT: /* Read-Only word */
> if (pmdev->pages[index].page_flags & PB_HAS_POUT) {
> pmbus_send16(pmdev, pmdev->pages[index].read_pout);
> @@ -1295,6 +1407,54 @@ static int pmbus_write_data(SMBusDevice *smd, uint8_t
> *buf, uint8_t len)
> }
> break;
>
> + case PMBUS_FAN_CONFIG_1_2: /* R/W byte */
> + if (pmdev->pages[index].page_flags & PB_HAS_FAN) {
> + pmdev->pages[index].fan_config_1_2 = pmbus_receive8(pmdev);
> + } else {
> + goto passthrough;
> + }
> + break;
> +
> + case PMBUS_FAN_COMMAND_1: /* R/W word */
> + if (pmdev->pages[index].page_flags & PB_HAS_FAN) {
> + pmdev->pages[index].fan_command_1 = pmbus_receive16(pmdev);
> + } else {
> + goto passthrough;
> + }
> + break;
> +
> + case PMBUS_FAN_COMMAND_2: /* R/W word */
> + if (pmdev->pages[index].page_flags & PB_HAS_FAN) {
> + pmdev->pages[index].fan_command_2 = pmbus_receive16(pmdev);
> + } else {
> + goto passthrough;
> + }
> + break;
> +
> + case PMBUS_FAN_CONFIG_3_4: /* R/W byte */
> + if (pmdev->pages[index].page_flags & PB_HAS_FAN) {
> + pmdev->pages[index].fan_config_3_4 = pmbus_receive8(pmdev);
> + } else {
> + goto passthrough;
> + }
> + break;
> +
> + case PMBUS_FAN_COMMAND_3: /* R/W word */
> + if (pmdev->pages[index].page_flags & PB_HAS_FAN) {
> + pmdev->pages[index].fan_command_3 = pmbus_receive16(pmdev);
> + } else {
> + goto passthrough;
> + }
> + break;
> +
> + case PMBUS_FAN_COMMAND_4: /* R/W word */
> + if (pmdev->pages[index].page_flags & PB_HAS_FAN) {
> + pmdev->pages[index].fan_command_4 = pmbus_receive16(pmdev);
> + } else {
> + goto passthrough;
> + }
> + break;
> +
> case PMBUS_VOUT_OV_FAULT_LIMIT: /* R/W word */
> if (pmdev->pages[index].page_flags & PB_HAS_VOUT) {
> pmdev->pages[index].vout_ov_fault_limit = pmbus_receive16(pmdev);
> @@ -1600,6 +1760,22 @@ static int pmbus_write_data(SMBusDevice *smd, uint8_t
> *buf, uint8_t len)
> pmdev->pages[index].status_mfr_specific = pmbus_receive8(pmdev);
> break;
>
> + case PMBUS_STATUS_FANS_1_2: /* R/W byte */
> + if (pmdev->pages[index].page_flags & PB_HAS_FAN) {
> + pmbus_send8(pmdev, pmdev->pages[index].status_fans_1_2);
> + } else {
> + goto passthrough;
> + }
> + break;
> +
> + case PMBUS_STATUS_FANS_3_4: /* R/W byte */
> + if (pmdev->pages[index].page_flags & PB_HAS_FAN) {
> + pmbus_send8(pmdev, pmdev->pages[index].status_fans_3_4);
> + } else {
> + goto passthrough;
> + }
> + break;
> +
> case PMBUS_PAGE_PLUS_READ: /* Block Read-only */
> case PMBUS_CAPABILITY: /* Read-Only byte */
> case PMBUS_COEFFICIENTS: /* Read-only block 5 bytes */
> diff --git a/include/hw/i2c/pmbus_device.h b/include/hw/i2c/pmbus_device.h
> index 2e95164aa1..ad431bdc7c 100644
> --- a/include/hw/i2c/pmbus_device.h
> +++ b/include/hw/i2c/pmbus_device.h
> @@ -258,6 +258,7 @@ OBJECT_DECLARE_TYPE(PMBusDevice, PMBusDeviceClass,
> #define PB_HAS_TEMP2 BIT_ULL(41)
> #define PB_HAS_TEMP3 BIT_ULL(42)
> #define PB_HAS_TEMP_RATING BIT_ULL(43)
> +#define PB_HAS_FAN BIT_ULL(44)
> #define PB_HAS_MFR_INFO BIT_ULL(50)
> #define PB_HAS_STATUS_MFR_SPECIFIC BIT_ULL(51)
>
> --
> 2.40.0.rc1.284.g88254d51c5-goog
>
