From nobody Sat May 4 07:00:48 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=reject dis=none) header.from=google.com ARC-Seal: i=1; a=rsa-sha256; t=1641511121; cv=none; d=zohomail.com; s=zohoarc; b=hcoYo/WsirpRDQLvLy8o4NMdUEM6jwyLkijar8NOGpkQmyQJ2Rn+TXl9TnfhZcN/tOZODvuYjMmwtqe1t8Vw87hzgAn/G+hfmhWoCdk2HWKN9aZrE4HwT/cS4240p3559/9bNW1UJXyPnRLMNoLbGlqfVQTgY84JYh0aKtwuKAs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641511121; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vW4Xo7g4Y3w1c48JyjTkubYnaRSDR0XM7VsJM/RJjGE=; b=G2F5IjPBSV9FKsHjlCEU7PY1SDZDQuhT0Zg0FBes3mFquyEff86pdgAkLC5SYTgNiPaCWdB06MdAS99HfVtwgfXJ9YrXgM2TXGJuwC9e0dAt3tIItg3a0PRxZjiIMe4AOeti2CMSriST9iKucdAgzO5cDI9A3+ndZaXPqeUQTcc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1641511121070525.269679412564; Thu, 6 Jan 2022 15:18:41 -0800 (PST) Received: from localhost ([::1]:43334 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n5c1n-0004SU-HY for importer@patchew.org; Thu, 06 Jan 2022 18:18:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34558) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <3wHbXYQYKCiEQFQRPODLLDIB.9LJNBJR-ABSBIKLKDKR.LOD@flex--titusr.bounces.google.com>) id 1n5bz6-0001ee-An for qemu-devel@nongnu.org; Thu, 06 Jan 2022 18:15:52 -0500 Received: from [2607:f8b0:4864:20::44a] (port=56010 helo=mail-pf1-x44a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <3wHbXYQYKCiEQFQRPODLLDIB.9LJNBJR-ABSBIKLKDKR.LOD@flex--titusr.bounces.google.com>) id 1n5bz3-00063e-J0 for qemu-devel@nongnu.org; Thu, 06 Jan 2022 18:15:52 -0500 Received: by mail-pf1-x44a.google.com with SMTP id n4-20020aa79044000000b004bcd447b6easo2570372pfo.22 for ; Thu, 06 Jan 2022 15:15:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc:content-transfer-encoding; bh=vW4Xo7g4Y3w1c48JyjTkubYnaRSDR0XM7VsJM/RJjGE=; b=pKKXdDQJb544tOHDI8mINAGzVuxbozTjstb7q2gUfk8Ul9HUP98vBG8yz6xTeldAs+ l7IhnNTeNZRqV9XGczB+Kcsa9qIGmQ13c4S49Kq6qFia5V9xywTsiTr5Dklx/eO5amXQ xGsq1ZHMOzQCH6cieqmzrMaEOcqLXd3O/NT1q1kyhYoA45jlUaivUC5TqgrvHd/UVDzV 344XjjIxtzgydNx30n18lfREOIfXK24p98hzALkN32msPpttehVdyYyy3DuVzogTG8Xu xtwzvuSvVI8ul+ZILWqxutg7qNKV0t3WsiLna7EtRma7RbPbt0Rt4f7FJ5C+kZOA3QsV UhTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc:content-transfer-encoding; bh=vW4Xo7g4Y3w1c48JyjTkubYnaRSDR0XM7VsJM/RJjGE=; b=3vJcF8XVFZLjdX3a3h1k1GcKqVzEFUYaQeCn/KvlJgi9SjXcF5IuVcui/oP5Lk4/xX a1vGXGXAkkVGQnfkgWobNWgPukXqkys1XXxVG0uRWdPCenXdLnu5kEXWVegJuziei9+W 2zjp2JnywbrHQRFqfyoatgRZInD8ExgXxHwr676Kedr/gea+vf1dyonw3E61C2A42puX 1TH6j561PDyEhg9hXtdZaNAMhthDaQ3eMelrYUO7dJHRCFCHGU29LlRMAh8Qgycc1Xxc eQZX8Cr1BoijQmeIpC1QzRxb7Qqig1eude7o5ZCZuPTmoQCwtX3aumu4zhXMoBAk3opL V//Q== X-Gm-Message-State: AOAM532VXnJZO2tGpy2Q7TN0Q1Lh0BkJkES7gvuLzIePLEsDXcpNKaa6 LW0I8r2y8uQM+ilOSL6XfE5u+y1+zis= X-Google-Smtp-Source: ABdhPJynMwybMm1qzQoRKlu1bQVKZAMoDQWg5pTDezH2/XcPDMXVl49vO51lhrRjGbtHKT2k0+FpunYYISc= X-Received: from titusr.c.googlers.com ([fda3:e722:ac3:cc00:14:4d90:c0a8:22b8]) (user=titusr job=sendgmr) by 2002:a05:6102:3f55:: with SMTP id l21mr4209104vsv.67.1641510592976; Thu, 06 Jan 2022 15:09:52 -0800 (PST) Date: Thu, 6 Jan 2022 23:09:32 +0000 In-Reply-To: <20220106230936.417020-1-titusr@google.com> Message-Id: <20220106230936.417020-2-titusr@google.com> Mime-Version: 1.0 References: <20220106230936.417020-1-titusr@google.com> X-Mailer: git-send-email 2.34.1.448.ga2b2bfdf31-goog Subject: [PATCH 1/5] hw/i2c: pmbus updates From: Titus Rwantare To: f4bug@amsat.org, minyard@acm.org Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, venture@google.com, Titus Rwantare , Hao Wu Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::44a (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::44a; envelope-from=3wHbXYQYKCiEQFQRPODLLDIB.9LJNBJR-ABSBIKLKDKR.LOD@flex--titusr.bounces.google.com; helo=mail-pf1-x44a.google.com X-Spam_score_int: -87 X-Spam_score: -8.8 X-Spam_bar: -------- X-Spam_report: (-8.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, USER_IN_DEF_DKIM_WL=-7.5 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @google.com) X-ZM-MESSAGEID: 1641511122137100002 Content-Type: text/plain; charset="utf-8" - add vout min register - add PEC unsupported warning to pmbus_device class - guard against out of range pmbus page accesses Signed-off-by: Titus Rwantare Reviewed-by: Hao Wu --- MAINTAINERS | 12 ++++- hw/i2c/pmbus_device.c | 88 +++++++++++++++++++++++++++++++---- include/hw/i2c/pmbus_device.h | 3 ++ 3 files changed, 92 insertions(+), 11 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index f871d759fd..6349e3da1f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2790,7 +2790,7 @@ R: Paolo Bonzini R: Bandan Das R: Stefan Hajnoczi R: Thomas Huth -R: Darren Kenny =20 +R: Darren Kenny R: Qiuhao Li S: Maintained F: tests/qtest/fuzz/ @@ -3029,6 +3029,16 @@ F: include/hw/i2c/smbus_master.h F: include/hw/i2c/smbus_slave.h F: include/hw/i2c/smbus_eeprom.h =20 +PMBus +M: Titus Rwantare +S: Maintained +F: hw/i2c/pmbus_device.c +F: hw/sensor/adm1272.c +F: hw/sensor/max34451.c +F: include/hw/i2c/pmbus_device.h +F: tests/qtest/adm1272-test.c +F: tests/qtest/max34451-test.c + Firmware schema specifications M: Philippe Mathieu-Daud=C3=A9 R: Daniel P. Berrange diff --git a/hw/i2c/pmbus_device.c b/hw/i2c/pmbus_device.c index 24f8f522d9..3beb02afad 100644 --- a/hw/i2c/pmbus_device.c +++ b/hw/i2c/pmbus_device.c @@ -89,16 +89,16 @@ void pmbus_send_string(PMBusDevice *pmdev, const char *= data) } =20 =20 -static uint64_t pmbus_receive_uint(const uint8_t *buf, uint8_t len) +static uint64_t pmbus_receive_uint(PMBusDevice *pmdev) { uint64_t ret =3D 0; =20 /* Exclude command code from return value */ - buf++; - len--; + pmdev->in_buf++; + pmdev->in_buf_len--; =20 - for (int i =3D len - 1; i >=3D 0; i--) { - ret =3D ret << 8 | buf[i]; + for (int i =3D pmdev->in_buf_len - 1; i >=3D 0; i--) { + ret =3D ret << 8 | pmdev->in_buf[i]; } return ret; } @@ -110,7 +110,7 @@ uint8_t pmbus_receive8(PMBusDevice *pmdev) "%s: length mismatch. Expected 1 byte, got %d bytes\= n", __func__, pmdev->in_buf_len - 1); } - return pmbus_receive_uint(pmdev->in_buf, pmdev->in_buf_len); + return pmbus_receive_uint(pmdev); } =20 uint16_t pmbus_receive16(PMBusDevice *pmdev) @@ -120,7 +120,7 @@ uint16_t pmbus_receive16(PMBusDevice *pmdev) "%s: length mismatch. Expected 2 bytes, got %d bytes= \n", __func__, pmdev->in_buf_len - 1); } - return pmbus_receive_uint(pmdev->in_buf, pmdev->in_buf_len); + return pmbus_receive_uint(pmdev); } =20 uint32_t pmbus_receive32(PMBusDevice *pmdev) @@ -130,7 +130,7 @@ uint32_t pmbus_receive32(PMBusDevice *pmdev) "%s: length mismatch. Expected 4 bytes, got %d bytes= \n", __func__, pmdev->in_buf_len - 1); } - return pmbus_receive_uint(pmdev->in_buf, pmdev->in_buf_len); + return pmbus_receive_uint(pmdev); } =20 uint64_t pmbus_receive64(PMBusDevice *pmdev) @@ -140,7 +140,7 @@ uint64_t pmbus_receive64(PMBusDevice *pmdev) "%s: length mismatch. Expected 8 bytes, got %d bytes= \n", __func__, pmdev->in_buf_len - 1); } - return pmbus_receive_uint(pmdev->in_buf, pmdev->in_buf_len); + return pmbus_receive_uint(pmdev); } =20 static uint8_t pmbus_out_buf_pop(PMBusDevice *pmdev) @@ -243,18 +243,47 @@ void pmbus_check_limits(PMBusDevice *pmdev) } } =20 +/* assert the status_cml error upon receipt of malformed command */ +static void pmbus_cml_error(PMBusDevice *pmdev) +{ + for (int i =3D 0; i < pmdev->num_pages; i++) { + pmdev->pages[i].status_word |=3D PMBUS_STATUS_CML; + pmdev->pages[i].status_cml |=3D PB_CML_FAULT_INVALID_CMD; + } +} + static uint8_t pmbus_receive_byte(SMBusDevice *smd) { PMBusDevice *pmdev =3D PMBUS_DEVICE(smd); PMBusDeviceClass *pmdc =3D PMBUS_DEVICE_GET_CLASS(pmdev); uint8_t ret =3D 0xFF; - uint8_t index =3D pmdev->page; + uint8_t index; =20 if (pmdev->out_buf_len !=3D 0) { ret =3D pmbus_out_buf_pop(pmdev); return ret; } =20 + /* + * Reading from all pages will return the value from page 0, + * this is unspecified behaviour in general. + */ + if (pmdev->page =3D=3D PB_ALL_PAGES) { + index =3D 0; + qemu_log_mask(LOG_GUEST_ERROR, + "%s: tried to read from all pages\n", + __func__); + pmbus_cml_error(pmdev); + } else if (pmdev->page > pmdev->num_pages - 1) { + qemu_log_mask(LOG_GUEST_ERROR, + "%s: page %d is out of range\n", + __func__, pmdev->page); + pmbus_cml_error(pmdev); + return -1; + } else { + index =3D pmdev->page; + } + switch (pmdev->code) { case PMBUS_PAGE: pmbus_send8(pmdev, pmdev->page); @@ -278,6 +307,11 @@ static uint8_t pmbus_receive_byte(SMBusDevice *smd) =20 case PMBUS_CAPABILITY: pmbus_send8(pmdev, pmdev->capability); + if (pmdev->capability & BIT(7)) { + qemu_log_mask(LOG_GUEST_ERROR, + "%s: PEC is enabled but not yet supported.\n", + __func__); + } break; =20 case PMBUS_VOUT_MODE: /* R/W byte */ @@ -368,6 +402,14 @@ static uint8_t pmbus_receive_byte(SMBusDevice *smd) } break; =20 + case PMBUS_VOUT_MIN: /* R/W word */ + if (pmdev->pages[index].page_flags & PB_HAS_VOUT_RATING) { + pmbus_send16(pmdev, pmdev->pages[index].vout_min); + } else { + goto passthough; + } + break; + /* TODO: implement coefficients support */ =20 case PMBUS_POUT_MAX: /* R/W word */ @@ -708,6 +750,10 @@ static uint8_t pmbus_receive_byte(SMBusDevice *smd) pmbus_send8(pmdev, pmdev->pages[index].status_other); break; =20 + case PMBUS_STATUS_MFR_SPECIFIC: /* R/W byte */ + pmbus_send8(pmdev, pmdev->pages[index].status_mfr_specific); + 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); @@ -1026,6 +1072,7 @@ static int pmbus_write_data(SMBusDevice *smd, uint8_t= *buf, uint8_t len) pmdev->page =3D pmbus_receive8(pmdev); return 0; } + /* loop through all the pages when 0xFF is received */ if (pmdev->page =3D=3D PB_ALL_PAGES) { for (int i =3D 0; i < pmdev->num_pages; i++) { @@ -1036,6 +1083,15 @@ static int pmbus_write_data(SMBusDevice *smd, uint8_= t *buf, uint8_t len) return 0; } =20 + if (pmdev->page > pmdev->num_pages - 1) { + qemu_log_mask(LOG_GUEST_ERROR, + "%s: page %u is out of range\n", + __func__, pmdev->page); + pmdev->page =3D 0; /* undefined behaviour - reset to page 0 */ + pmbus_cml_error(pmdev); + return -1; + } + index =3D pmdev->page; =20 switch (pmdev->code) { @@ -1149,6 +1205,14 @@ static int pmbus_write_data(SMBusDevice *smd, uint8_= t *buf, uint8_t len) } break; =20 + case PMBUS_VOUT_MIN: /* R/W word */ + if (pmdev->pages[index].page_flags & PB_HAS_VOUT_RATING) { + pmdev->pages[index].vout_min =3D pmbus_receive16(pmdev); + } else { + goto passthrough; + } + break; + case PMBUS_POUT_MAX: /* R/W word */ if (pmdev->pages[index].page_flags & PB_HAS_VOUT) { pmdev->pages[index].pout_max =3D pmbus_receive16(pmdev); @@ -1482,6 +1546,10 @@ static int pmbus_write_data(SMBusDevice *smd, uint8_= t *buf, uint8_t len) pmdev->pages[index].status_other =3D pmbus_receive8(pmdev); break; =20 + case PMBUS_STATUS_MFR_SPECIFIC: /* R/W byte */ + pmdev->pages[index].status_mfr_specific =3D pmbus_receive8(pmdev); + 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 62bd38c83f..72c0483149 100644 --- a/include/hw/i2c/pmbus_device.h +++ b/include/hw/i2c/pmbus_device.h @@ -43,6 +43,7 @@ enum pmbus_registers { PMBUS_VOUT_DROOP =3D 0x28, /* R/W word */ PMBUS_VOUT_SCALE_LOOP =3D 0x29, /* R/W word */ PMBUS_VOUT_SCALE_MONITOR =3D 0x2A, /* R/W word */ + PMBUS_VOUT_MIN =3D 0x2B, /* R/W word */ PMBUS_COEFFICIENTS =3D 0x30, /* Read-only block 5 bytes */ PMBUS_POUT_MAX =3D 0x31, /* R/W word */ PMBUS_MAX_DUTY =3D 0x32, /* R/W word */ @@ -255,6 +256,7 @@ OBJECT_DECLARE_TYPE(PMBusDevice, PMBusDeviceClass, #define PB_HAS_TEMP3 BIT_ULL(42) #define PB_HAS_TEMP_RATING BIT_ULL(43) #define PB_HAS_MFR_INFO BIT_ULL(50) +#define PB_HAS_STATUS_MFR_SPECIFIC BIT_ULL(51) =20 struct PMBusDeviceClass { SMBusDeviceClass parent_class; @@ -295,6 +297,7 @@ typedef struct PMBusPage { uint16_t vout_droop; /* R/W word */ uint16_t vout_scale_loop; /* R/W word */ uint16_t vout_scale_monitor; /* R/W word */ + uint16_t vout_min; /* R/W word */ uint8_t coefficients[5]; /* Read-only block 5 bytes */ uint16_t pout_max; /* R/W word */ uint16_t max_duty; /* R/W word */ --=20 2.34.1.448.ga2b2bfdf31-goog From nobody Sat May 4 07:00:48 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=reject dis=none) header.from=google.com ARC-Seal: i=1; a=rsa-sha256; t=1641511307; cv=none; d=zohomail.com; s=zohoarc; b=asOuhepQMElhqerQFAj+tT8CL8n0M2qumDpwzYLxD8wuhdMdWAGsZPZN5ZVUBExy2OqDhRB95DJ1W3W3hZrE5r6EViukmGbrzB3JG6cIkmcWw/kuFmJYHvojn24vA+ennkdNZCNFnmjjN9oE+MPyQKbBPGvStn8CtbhUK5EePso= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641511307; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YbOjq3KDlppshwQpezVsb9MS/E9NuLAoax6A9T70OSQ=; b=YJZg5+M5hauaGPgLc7o0Ypfz8WLYFZd/Y8hCJAIqmkXQfNSPbI7EoTJrXE0/c4+n+tkDzaZquEtIseHpV6DZD+MDWYMKE7pf1Ga7T2LhizLQi8QEUivruTB/ZveEfsQllGzgEY6tkwwpMpAoT+Dr+kZ5Q+1Tw4upnPpIff8vo40= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16415113070281007.1000613192173; Thu, 6 Jan 2022 15:21:47 -0800 (PST) Received: from localhost ([::1]:49554 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n5c4n-0000UC-Ro for importer@patchew.org; Thu, 06 Jan 2022 18:21:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34542) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <3wXbXYQYKCiIRGRSQPEMMEJC.AMKOCKS-BCTCJLMLELS.MPE@flex--titusr.bounces.google.com>) id 1n5bz5-0001eN-U9 for qemu-devel@nongnu.org; Thu, 06 Jan 2022 18:15:51 -0500 Received: from [2607:f8b0:4864:20::b49] (port=39921 helo=mail-yb1-xb49.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <3wXbXYQYKCiIRGRSQPEMMEJC.AMKOCKS-BCTCJLMLELS.MPE@flex--titusr.bounces.google.com>) id 1n5bz3-00063F-DZ for qemu-devel@nongnu.org; Thu, 06 Jan 2022 18:15:51 -0500 Received: by mail-yb1-xb49.google.com with SMTP id k130-20020a255688000000b0060c3dcae580so7956338ybb.6 for ; Thu, 06 Jan 2022 15:15:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=YbOjq3KDlppshwQpezVsb9MS/E9NuLAoax6A9T70OSQ=; b=jc5cDr3OREYGEfR5CAaIq3QBrJAl5cWO28XpM4lxNWwQTw+Vy5PYSvXqYX7fbyR52I cWdZw7lCXIzVmaR2kLc9kX3i8yWnJamLHHV5/8s6vmwIsgVWJ1Sd7rNLwBahvgaF+uAm 8F0g8NAgCBNirvUzrv1DmaU4c8uFzPuOqQC4/fzeG3d7rC5uVspPnVB56ERcpk9Guqzf D91DfkF4xaWqWYogM4WySnXvT3PJscbIPOhwUqj1RYVCT4q4MrBX4okH4sZO003fj5Yo qFXCirB6STaz2fazj+eSJohIlFSs1ErdykfB7zsFFUg9EvKeDTgmP7jSgpS331hxLUZV AWDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=YbOjq3KDlppshwQpezVsb9MS/E9NuLAoax6A9T70OSQ=; b=250FTKkMeUHDW5LaZRCSY3nNwgaz+6MNgf3jAxwkehjS+VgV0jwp1Vqhx3Wh92pxEy 04w0gou4XvG+/twOgRR1KzooMLrBgtI5XodG7bMXoQpmv1Ye2lLs6igPxfy4A/0N8Sks BCf6dvg2WRhV8qUG+u95qcMly0XpWnrm6Nbu96afcDX2R8ileHhT834Wo2mVO+tMm1ok Q2I5J/exKnZxSFch2937KQ1pgqGHsHuSOeVV9Z8PL/JFh6U+pd0ZvdXUn4kFTn3K3eNA /YaXHlfphtTSkC3WcAtGoq6bJh7nSEbZKZ3JT2yYvqe9Rf2SRYVvlP+RwHHfiBgnhMVS Rwbw== X-Gm-Message-State: AOAM530wuPetcNSN5lYQMIlngxfRQQAgho0xsxnUIz7aeZjyh3Hg+SPK Q2RBukpMX+L/u6yYmZR85odoXneFm0E= X-Google-Smtp-Source: ABdhPJzAV57Kj61O/DbrIucBNN+T7qurrRe4G/dVtQ76CJfWPi+gbgX5PWIcLuIGXI2nxqpSRCICyUMWRsk= X-Received: from titusr.c.googlers.com ([fda3:e722:ac3:cc00:14:4d90:c0a8:22b8]) (user=titusr job=sendgmr) by 2002:a5b:386:: with SMTP id k6mr32905947ybp.706.1641510593947; Thu, 06 Jan 2022 15:09:53 -0800 (PST) Date: Thu, 6 Jan 2022 23:09:33 +0000 In-Reply-To: <20220106230936.417020-1-titusr@google.com> Message-Id: <20220106230936.417020-3-titusr@google.com> Mime-Version: 1.0 References: <20220106230936.417020-1-titusr@google.com> X-Mailer: git-send-email 2.34.1.448.ga2b2bfdf31-goog Subject: [PATCH 2/5] hw/i2c: Added linear mode translation for pmbus devices From: Titus Rwantare To: f4bug@amsat.org, minyard@acm.org Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, venture@google.com, Shengtan Mao , Titus Rwantare X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::b49 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::b49; envelope-from=3wXbXYQYKCiIRGRSQPEMMEJC.AMKOCKS-BCTCJLMLELS.MPE@flex--titusr.bounces.google.com; helo=mail-yb1-xb49.google.com X-Spam_score_int: -87 X-Spam_score: -8.8 X-Spam_bar: -------- X-Spam_report: (-8.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, USER_IN_DEF_DKIM_WL=-7.5 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @google.com) X-ZM-MESSAGEID: 1641511309691100001 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Shengtan Mao Signed-off-by: Shengtan Mao Reviewed-by: Titus Rwantare Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/i2c/pmbus_device.c | 18 ++++++++++++++++++ include/hw/i2c/pmbus_device.h | 20 +++++++++++++++++++- 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/hw/i2c/pmbus_device.c b/hw/i2c/pmbus_device.c index 3beb02afad..1036c41c49 100644 --- a/hw/i2c/pmbus_device.c +++ b/hw/i2c/pmbus_device.c @@ -28,6 +28,24 @@ uint32_t pmbus_direct_mode2data(PMBusCoefficients c, uin= t16_t value) return x; } =20 +uint16_t pmbus_data2linear_mode(uint16_t value, int exp) +{ + /* L =3D D * 2^(-e) */ + if (exp < 0) { + return value << (-exp); + } + return value >> exp; +} + +uint16_t pmbus_linear_mode2data(uint16_t value, int exp) +{ + /* D =3D L * 2^e */ + if (exp < 0) { + return value >> (-exp); + } + return value << exp; +} + void pmbus_send(PMBusDevice *pmdev, const uint8_t *data, uint16_t len) { if (pmdev->out_buf_len + len > SMBUS_DATA_MAX_LEN) { diff --git a/include/hw/i2c/pmbus_device.h b/include/hw/i2c/pmbus_device.h index 72c0483149..9a274247ab 100644 --- a/include/hw/i2c/pmbus_device.h +++ b/include/hw/i2c/pmbus_device.h @@ -446,7 +446,7 @@ typedef struct PMBusCoefficients { * * Y =3D (m * x - b) * 10^R * - * @return uint32_t + * @return uint16_t */ uint16_t pmbus_data2direct_mode(PMBusCoefficients c, uint32_t value); =20 @@ -459,6 +459,24 @@ uint16_t pmbus_data2direct_mode(PMBusCoefficients c, u= int32_t value); */ uint32_t pmbus_direct_mode2data(PMBusCoefficients c, uint16_t value); =20 +/** + * Convert sensor values to linear mode format + * + * L =3D D * 2^(-e) + * + * @return uint16 + */ +uint16_t pmbus_data2linear_mode(uint16_t value, int exp); + +/** + * Convert linear mode formatted data into sensor reading + * + * D =3D L * 2^e + * + * @return uint16 + */ +uint16_t pmbus_linear_mode2data(uint16_t value, int exp); + /** * @brief Send a block of data over PMBus * Assumes that the bytes in the block are already ordered correctly, --=20 2.34.1.448.ga2b2bfdf31-goog From nobody Sat May 4 07:00:48 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=reject dis=none) header.from=google.com ARC-Seal: i=1; a=rsa-sha256; t=1641511338; cv=none; d=zohomail.com; s=zohoarc; b=maYifP8It6ARa0PyaMcqTpe1jJ5el/A61Y44jR3tuTS8J3Pl1bzGt2gstYmbBY/d/NzJFN+5yHlec59ydjlwIJZYA2iQV0TuUFHQJNBTpy3lTwwUniZuzieVPMr7GUGd1QWX1CMK9uXxCXFO9DJAUgVQmgU3/WZKCDmngfXk4ms= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641511338; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BBSm/hDYAhdvfuPCK4QVypTacENhTuHzVycYWC2Evek=; b=YZaiOi7FRIz84+JpXTitDdi5RprwhO++PAHys4JwVdnfuJxlPgb5RmtVyJ925nJsh8qvU0eEna7ctQ+WkrwZ3Zt9DVR5bbKVdb9J4tcof1HkgOVlz2+gGkQwb+Zd+hkUmc/+b/kUdUV8zzgYqhGzhzmaJCf6MhwJ9+f9cESags4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1641511338934678.3631167872127; Thu, 6 Jan 2022 15:22:18 -0800 (PST) Received: from localhost ([::1]:50112 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n5c5J-0000zU-Tt for importer@patchew.org; Thu, 06 Jan 2022 18:22:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34582) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <3wnbXYQYKCiMSHSTRQFNNFKD.BNLPDLT-CDUDKMNMFMT.NQF@flex--titusr.bounces.google.com>) id 1n5bz7-0001gP-5f for qemu-devel@nongnu.org; Thu, 06 Jan 2022 18:15:54 -0500 Received: from [2607:f8b0:4864:20::74a] (port=52930 helo=mail-qk1-x74a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <3wnbXYQYKCiMSHSTRQFNNFKD.BNLPDLT-CDUDKMNMFMT.NQF@flex--titusr.bounces.google.com>) id 1n5bz3-00063c-It for qemu-devel@nongnu.org; Thu, 06 Jan 2022 18:15:52 -0500 Received: by mail-qk1-x74a.google.com with SMTP id x3-20020a05620a01e300b0047672880035so2933591qkn.19 for ; Thu, 06 Jan 2022 15:15:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc:content-transfer-encoding; bh=BBSm/hDYAhdvfuPCK4QVypTacENhTuHzVycYWC2Evek=; b=StEtCWm282gNOt9/fDkSiwOQlH3/VeDX7qpiM8e7DskVu7n041p/uMkWtPRjFL0bKs QGf4ev/4PmxFjbXyil9zOVJpKeNWT5qchum8gqlaBA84IzLbxiGuES4XFM6zRPv4Aq2t 04ZR5nIaIuiGo5n63F3PvHtxxD3NopQ9nmASVAp5o7sIBROdNevFU8J3tsVai0fe0qM2 2NbhgI/QmhPPA77B/a9I5TeJKfgLx92RbE0W16vux7aQLXtUa2ueRqSL4boEBEarLXnc oxF0yZWecQKg0y7B43qPgtgnKsAuwSiAV8c5nFOR1pqofdHp50OD+c2DqopUtDRGeQGW ey6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc:content-transfer-encoding; bh=BBSm/hDYAhdvfuPCK4QVypTacENhTuHzVycYWC2Evek=; b=2KpJEwfmQwlw438Jn9mpaeo8AzoVw1pyZoHuhYIJ7U8gsaUjnso0nCSizQHvf6ftuM bUrQBtqRbBOKIajSKgS86QoFsoiS4NZvIhKZrztswxac4YZPmRdNudU/Lfr7xX7yxL8U 9aUFGfF8b76Dr79G/tYMuwjjD8lcnitZFmjDjYCC9vi1PsK/4cKC4BOZhYl3RJll0aHF Dtyh4vxz9IM8UNpbzn3Q5/tCQuzGfL47WHS9b52dtAhiXJ8B8iIfjEnAkNtH99w74N9m LLH1aaHXNa07nXGIc+4KHco7lyuxnb+MK8BtE/6WDrXF9RUAnxu6Bib3EepJel4edCde MNLQ== X-Gm-Message-State: AOAM53019cdlqOjhTMN6BCHEJb22+22l2gdpvs8l8tyTnQpo8civ5iTa hJiWVg/cb+Rq14aGGDQ9IDxFItNwkfE= X-Google-Smtp-Source: ABdhPJxOqjKu1M5v5Q2WLS6rszFI4OZqtHNYH4B/LVobgLBrAYeuLJCO/xmgGsE1eVjSItBqoD/vjbc9e48= X-Received: from titusr.c.googlers.com ([fda3:e722:ac3:cc00:14:4d90:c0a8:22b8]) (user=titusr job=sendgmr) by 2002:ac8:47cb:: with SMTP id d11mr53827134qtr.446.1641510594869; Thu, 06 Jan 2022 15:09:54 -0800 (PST) Date: Thu, 6 Jan 2022 23:09:34 +0000 In-Reply-To: <20220106230936.417020-1-titusr@google.com> Message-Id: <20220106230936.417020-4-titusr@google.com> Mime-Version: 1.0 References: <20220106230936.417020-1-titusr@google.com> X-Mailer: git-send-email 2.34.1.448.ga2b2bfdf31-goog Subject: [PATCH 3/5] hw/sensor: add Intersil ISL69260 device model From: Titus Rwantare To: f4bug@amsat.org, minyard@acm.org Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, venture@google.com, Titus Rwantare , Hao Wu Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::74a (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::74a; envelope-from=3wnbXYQYKCiMSHSTRQFNNFKD.BNLPDLT-CDUDKMNMFMT.NQF@flex--titusr.bounces.google.com; helo=mail-qk1-x74a.google.com X-Spam_score_int: -87 X-Spam_score: -8.8 X-Spam_bar: -------- X-Spam_report: (-8.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, USER_IN_DEF_DKIM_WL=-7.5 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @google.com) X-ZM-MESSAGEID: 1641511339494100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Titus Rwantare Reviewed-by: Hao Wu --- MAINTAINERS | 3 + hw/arm/Kconfig | 1 + hw/sensor/Kconfig | 5 + hw/sensor/isl_pmbus.c | 210 +++++++++++++++++++ hw/sensor/meson.build | 1 + include/hw/sensor/isl_pmbus.h | 50 +++++ tests/qtest/isl_pmbus-test.c | 381 ++++++++++++++++++++++++++++++++++ tests/qtest/meson.build | 1 + 8 files changed, 652 insertions(+) create mode 100644 hw/sensor/isl_pmbus.c create mode 100644 include/hw/sensor/isl_pmbus.h create mode 100644 tests/qtest/isl_pmbus-test.c diff --git a/MAINTAINERS b/MAINTAINERS index 6349e3da1f..156c5812a8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3034,10 +3034,13 @@ M: Titus Rwantare S: Maintained F: hw/i2c/pmbus_device.c F: hw/sensor/adm1272.c +F: hw/sensor/isl_pmbus.c F: hw/sensor/max34451.c F: include/hw/i2c/pmbus_device.h +F: include/hw/sensor/isl_pmbus.h F: tests/qtest/adm1272-test.c F: tests/qtest/max34451-test.c +F: tests/qtest/isl_pmbus-test.c =20 Firmware schema specifications M: Philippe Mathieu-Daud=C3=A9 diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index e652590943..019099df96 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -393,6 +393,7 @@ config NPCM7XX select SMBUS select AT24C # EEPROM select MAX34451 + select ISL_PMBUS select PL310 # cache controller select PMBUS select SERIAL diff --git a/hw/sensor/Kconfig b/hw/sensor/Kconfig index 9c8a049b06..f935d9cccb 100644 --- a/hw/sensor/Kconfig +++ b/hw/sensor/Kconfig @@ -21,3 +21,8 @@ config ADM1272 config MAX34451 bool depends on I2C + +config ISL_PMBUS + bool + depends on I2C + diff --git a/hw/sensor/isl_pmbus.c b/hw/sensor/isl_pmbus.c new file mode 100644 index 0000000000..8cc7220a57 --- /dev/null +++ b/hw/sensor/isl_pmbus.c @@ -0,0 +1,210 @@ +/* + * PMBus device for Renesas Digital Multiphase Voltage Regulators + * + * Copyright 2021 Google LLC + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "hw/sensor/isl_pmbus.h" +#include "hw/qdev-properties.h" +#include "qapi/visitor.h" +#include "qemu/log.h" +#include "qemu/module.h" + +static uint8_t isl_pmbus_read_byte(PMBusDevice *pmdev) +{ + qemu_log_mask(LOG_GUEST_ERROR, + "%s: reading from unsupported register: 0x%02x\n", + __func__, pmdev->code); + return 0xFF; +} + +static int isl_pmbus_write_data(PMBusDevice *pmdev, const uint8_t *buf, + uint8_t len) +{ + qemu_log_mask(LOG_GUEST_ERROR, + "%s: write to unsupported register: 0x%02x\n", + __func__, pmdev->code); + return 0xFF; +} + +/* TODO: Implement coefficients support in pmbus_device.c for qmp */ +static void isl_pmbus_get(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) +{ + visit_type_uint16(v, name, (uint16_t *)opaque, errp); +} + +static void isl_pmbus_set(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) +{ + PMBusDevice *pmdev =3D PMBUS_DEVICE(obj); + uint16_t *internal =3D opaque; + uint16_t value; + if (!visit_type_uint16(v, name, &value, errp)) { + return; + } + + *internal =3D value; + pmbus_check_limits(pmdev); +} + +static void isl_pmbus_exit_reset(Object *obj) +{ + PMBusDevice *pmdev =3D PMBUS_DEVICE(obj); + + pmdev->page =3D 0; + pmdev->capability =3D ISL_CAPABILITY_DEFAULT; + for (int i =3D 0; i < pmdev->num_pages; i++) { + pmdev->pages[i].operation =3D ISL_OPERATION_DEFAULT; + pmdev->pages[i].on_off_config =3D ISL_ON_OFF_CONFIG_DEFAULT; + pmdev->pages[i].vout_mode =3D ISL_VOUT_MODE_DEFAULT; + pmdev->pages[i].vout_command =3D ISL_VOUT_COMMAND_DEFAULT; + pmdev->pages[i].vout_max =3D ISL_VOUT_MAX_DEFAULT; + pmdev->pages[i].vout_margin_high =3D ISL_VOUT_MARGIN_HIGH_DEFAULT; + pmdev->pages[i].vout_margin_low =3D ISL_VOUT_MARGIN_LOW_DEFAULT; + pmdev->pages[i].vout_transition_rate =3D ISL_VOUT_TRANSITION_RATE_= DEFAULT; + pmdev->pages[i].vout_ov_fault_limit =3D ISL_VOUT_OV_FAULT_LIMIT_DE= FAULT; + pmdev->pages[i].ot_fault_limit =3D ISL_OT_FAULT_LIMIT_DEFAULT; + pmdev->pages[i].ot_warn_limit =3D ISL_OT_WARN_LIMIT_DEFAULT; + pmdev->pages[i].vin_ov_warn_limit =3D ISL_VIN_OV_WARN_LIMIT_DEFAUL= T; + pmdev->pages[i].vin_uv_warn_limit =3D ISL_VIN_UV_WARN_LIMIT_DEFAUL= T; + pmdev->pages[i].iin_oc_fault_limit =3D ISL_IIN_OC_FAULT_LIMIT_DEFA= ULT; + pmdev->pages[i].ton_delay =3D ISL_TON_DELAY_DEFAULT; + pmdev->pages[i].ton_rise =3D ISL_TON_RISE_DEFAULT; + pmdev->pages[i].toff_fall =3D ISL_TOFF_FALL_DEFAULT; + pmdev->pages[i].revision =3D ISL_REVISION_DEFAULT; + + pmdev->pages[i].read_vout =3D ISL_READ_VOUT_DEFAULT; + pmdev->pages[i].read_iout =3D ISL_READ_IOUT_DEFAULT; + pmdev->pages[i].read_pout =3D ISL_READ_POUT_DEFAULT; + pmdev->pages[i].read_vin =3D ISL_READ_VIN_DEFAULT; + pmdev->pages[i].read_iin =3D ISL_READ_IIN_DEFAULT; + pmdev->pages[i].read_pin =3D ISL_READ_PIN_DEFAULT; + pmdev->pages[i].read_temperature_1 =3D ISL_READ_TEMP_DEFAULT; + pmdev->pages[i].read_temperature_2 =3D ISL_READ_TEMP_DEFAULT; + pmdev->pages[i].read_temperature_3 =3D ISL_READ_TEMP_DEFAULT; + } +} + +static void isl_pmbus_add_props(Object *obj, uint64_t *flags, uint8_t page= s) +{ + PMBusDevice *pmdev =3D PMBUS_DEVICE(obj); + for (int i =3D 0; i < pages; i++) { + if (flags[i] & PB_HAS_VIN) { + object_property_add(obj, "vin[*]", "uint16", + isl_pmbus_get, + isl_pmbus_set, + NULL, &pmdev->pages[i].read_vin); + } + + if (flags[i] & PB_HAS_VOUT) { + object_property_add(obj, "vout[*]", "uint16", + isl_pmbus_get, + isl_pmbus_set, + NULL, &pmdev->pages[i].read_vout); + } + + if (flags[i] & PB_HAS_IIN) { + object_property_add(obj, "iin[*]", "uint16", + isl_pmbus_get, + isl_pmbus_set, + NULL, &pmdev->pages[i].read_iin); + } + + if (flags[i] & PB_HAS_IOUT) { + object_property_add(obj, "iout[*]", "uint16", + isl_pmbus_get, + isl_pmbus_set, + NULL, &pmdev->pages[i].read_iout); + } + + if (flags[i] & PB_HAS_PIN) { + object_property_add(obj, "pin[*]", "uint16", + isl_pmbus_get, + isl_pmbus_set, + NULL, &pmdev->pages[i].read_pin); + } + + if (flags[i] & PB_HAS_POUT) { + object_property_add(obj, "pout[*]", "uint16", + isl_pmbus_get, + isl_pmbus_set, + NULL, &pmdev->pages[i].read_pout); + } + + if (flags[i] & PB_HAS_TEMPERATURE) { + object_property_add(obj, "temp1[*]", "uint16", + isl_pmbus_get, + isl_pmbus_set, + NULL, &pmdev->pages[i].read_temperature_1); + } + + if (flags[i] & PB_HAS_TEMP2) { + object_property_add(obj, "temp2[*]", "uint16", + isl_pmbus_get, + isl_pmbus_set, + NULL, &pmdev->pages[i].read_temperature_2); + } + + if (flags[i] & PB_HAS_TEMP3) { + object_property_add(obj, "temp3[*]", "uint16", + isl_pmbus_get, + isl_pmbus_set, + NULL, &pmdev->pages[i].read_temperature_3); + } + } +} + +static void raa22xx_init(Object *obj) +{ + PMBusDevice *pmdev =3D PMBUS_DEVICE(obj); + uint64_t flags[2]; + + flags[0] =3D PB_HAS_VIN | PB_HAS_VOUT | PB_HAS_VOUT_MODE | + PB_HAS_VOUT_RATING | PB_HAS_VOUT_MARGIN | PB_HAS_IIN | + PB_HAS_IOUT | PB_HAS_PIN | PB_HAS_POUT | PB_HAS_TEMPERATURE= | + PB_HAS_TEMP2 | PB_HAS_TEMP3 | PB_HAS_STATUS_MFR_SPECIFIC; + flags[1] =3D PB_HAS_IIN | PB_HAS_PIN | PB_HAS_TEMPERATURE | PB_HAS_TEM= P3 | + PB_HAS_VOUT | PB_HAS_VOUT_MODE | PB_HAS_VOUT_MARGIN | + PB_HAS_VOUT_RATING | PB_HAS_IOUT | PB_HAS_POUT | + PB_HAS_STATUS_MFR_SPECIFIC; + + pmbus_page_config(pmdev, 0, flags[0]); + pmbus_page_config(pmdev, 1, flags[1]); + isl_pmbus_add_props(obj, flags, 2); +} + +static void isl_pmbus_class_init(ObjectClass *klass, void *data, uint8_t p= ages) +{ + PMBusDeviceClass *k =3D PMBUS_DEVICE_CLASS(klass); + k->write_data =3D isl_pmbus_write_data; + k->receive_byte =3D isl_pmbus_read_byte; + k->device_num_pages =3D pages; +} + +static void isl69260_class_init(ObjectClass *klass, void *data) +{ + ResettableClass *rc =3D RESETTABLE_CLASS(klass); + DeviceClass *dc =3D DEVICE_CLASS(klass); + dc->desc =3D "Renesas ISL69260 Digital Multiphase Voltage Regulator"; + rc->phases.exit =3D isl_pmbus_exit_reset; + isl_pmbus_class_init(klass, data, 2); +} + +static const TypeInfo isl69260_info =3D { + .name =3D TYPE_ISL69260, + .parent =3D TYPE_PMBUS_DEVICE, + .instance_size =3D sizeof(ISLState), + .instance_init =3D raa22xx_init, + .class_init =3D isl69260_class_init, +}; + +static void isl_pmbus_register_types(void) +{ + type_register_static(&isl69260_info); +} + +type_init(isl_pmbus_register_types) diff --git a/hw/sensor/meson.build b/hw/sensor/meson.build index 059c4ca935..d511994d0c 100644 --- a/hw/sensor/meson.build +++ b/hw/sensor/meson.build @@ -4,3 +4,4 @@ softmmu_ss.add(when: 'CONFIG_DPS310', if_true: files('dps31= 0.c')) softmmu_ss.add(when: 'CONFIG_EMC141X', if_true: files('emc141x.c')) softmmu_ss.add(when: 'CONFIG_ADM1272', if_true: files('adm1272.c')) softmmu_ss.add(when: 'CONFIG_MAX34451', if_true: files('max34451.c')) +softmmu_ss.add(when: 'CONFIG_ISL_PMBUS', if_true: files('isl_pmbus.c')) diff --git a/include/hw/sensor/isl_pmbus.h b/include/hw/sensor/isl_pmbus.h new file mode 100644 index 0000000000..8115aaa698 --- /dev/null +++ b/include/hw/sensor/isl_pmbus.h @@ -0,0 +1,50 @@ +/* + * PMBus device for Renesas Digital Multiphase Voltage Regulators + * + * Copyright 2022 Google LLC + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#ifndef HW_MISC_ISL_PMBUS_H +#define HW_MISC_ISL_PMBUS_H + +#include "hw/i2c/pmbus_device.h" +#include "qom/object.h" + +#define TYPE_ISL69260 "isl69260" + +struct ISLState { + PMBusDevice parent; +}; + +OBJECT_DECLARE_SIMPLE_TYPE(ISLState, ISL69260) + +#define ISL_CAPABILITY_DEFAULT 0x40 +#define ISL_OPERATION_DEFAULT 0x80 +#define ISL_ON_OFF_CONFIG_DEFAULT 0x16 +#define ISL_VOUT_MODE_DEFAULT 0x40 +#define ISL_VOUT_COMMAND_DEFAULT 0x0384 +#define ISL_VOUT_MAX_DEFAULT 0x08FC +#define ISL_VOUT_MARGIN_HIGH_DEFAULT 0x0640 +#define ISL_VOUT_MARGIN_LOW_DEFAULT 0xFA +#define ISL_VOUT_TRANSITION_RATE_DEFAULT 0x64 +#define ISL_VOUT_OV_FAULT_LIMIT_DEFAULT 0x076C +#define ISL_OT_FAULT_LIMIT_DEFAULT 0x7D +#define ISL_OT_WARN_LIMIT_DEFAULT 0x07D0 +#define ISL_VIN_OV_WARN_LIMIT_DEFAULT 0x36B0 +#define ISL_VIN_UV_WARN_LIMIT_DEFAULT 0x1F40 +#define ISL_IIN_OC_FAULT_LIMIT_DEFAULT 0x32 +#define ISL_TON_DELAY_DEFAULT 0x14 +#define ISL_TON_RISE_DEFAULT 0x01F4 +#define ISL_TOFF_FALL_DEFAULT 0x01F4 +#define ISL_REVISION_DEFAULT 0x33 +#define ISL_READ_VOUT_DEFAULT 1000 +#define ISL_READ_IOUT_DEFAULT 40 +#define ISL_READ_POUT_DEFAULT 4 +#define ISL_READ_TEMP_DEFAULT 25 +#define ISL_READ_VIN_DEFAULT 1100 +#define ISL_READ_IIN_DEFAULT 40 +#define ISL_READ_PIN_DEFAULT 4 + +#endif diff --git a/tests/qtest/isl_pmbus-test.c b/tests/qtest/isl_pmbus-test.c new file mode 100644 index 0000000000..3e956f912c --- /dev/null +++ b/tests/qtest/isl_pmbus-test.c @@ -0,0 +1,381 @@ +/* + * QTests for the ISL_PMBUS digital voltage regulators + * + * Copyright 2021 Google LLC + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WIT= HOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + */ + +#include "qemu/osdep.h" +#include +#include "hw/i2c/pmbus_device.h" +#include "hw/sensor/isl_pmbus.h" +#include "libqtest-single.h" +#include "libqos/qgraph.h" +#include "libqos/i2c.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qnum.h" +#include "qemu/bitops.h" + +#define TEST_ID "isl_pmbus-test" +#define TEST_ADDR (0x43) + +static uint16_t qmp_isl_pmbus_get(const char *id, const char *property) +{ + QDict *response; + uint64_t ret; + + response =3D qmp("{ 'execute': 'qom-get', 'arguments': { 'path': %s, " + "'property': %s } }", id, property); + g_assert(qdict_haskey(response, "return")); + ret =3D qnum_get_uint(qobject_to(QNum, qdict_get(response, "return"))); + qobject_unref(response); + return ret; +} + +static void qmp_isl_pmbus_set(const char *id, + const char *property, + uint16_t value) +{ + QDict *response; + + response =3D qmp("{ 'execute': 'qom-set', 'arguments': { 'path': %s, " + "'property': %s, 'value': %u } }", id, property, value); + g_assert(qdict_haskey(response, "return")); + qobject_unref(response); +} + +/* PMBus commands are little endian vs i2c_set16 in i2c.h which is big end= ian */ +static uint16_t isl_pmbus_i2c_get16(QI2CDevice *i2cdev, uint8_t reg) +{ + uint8_t resp[2]; + i2c_read_block(i2cdev, reg, resp, sizeof(resp)); + return (resp[1] << 8) | resp[0]; +} + +/* PMBus commands are little endian vs i2c_set16 in i2c.h which is big end= ian */ +static void isl_pmbus_i2c_set16(QI2CDevice *i2cdev, uint8_t reg, uint16_t = value) +{ + uint8_t data[2]; + + data[0] =3D value & 255; + data[1] =3D value >> 8; + i2c_write_block(i2cdev, reg, data, sizeof(data)); +} + +static void test_defaults(void *obj, void *data, QGuestAllocator *alloc) +{ + uint16_t value, i2c_value; + QI2CDevice *i2cdev =3D (QI2CDevice *)obj; + + value =3D qmp_isl_pmbus_get(TEST_ID, "vout[0]"); + g_assert_cmpuint(value, =3D=3D, ISL_READ_VOUT_DEFAULT); + + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_READ_IOUT); + g_assert_cmpuint(i2c_value, =3D=3D, ISL_READ_IOUT_DEFAULT); + + value =3D qmp_isl_pmbus_get(TEST_ID, "pout[0]"); + g_assert_cmpuint(value, =3D=3D, ISL_READ_POUT_DEFAULT); + + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_READ_VIN); + g_assert_cmpuint(i2c_value, =3D=3D, ISL_READ_VIN_DEFAULT); + + value =3D qmp_isl_pmbus_get(TEST_ID, "iin[0]"); + g_assert_cmpuint(value, =3D=3D, ISL_READ_IIN_DEFAULT); + + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_READ_PIN); + g_assert_cmpuint(i2c_value, =3D=3D, ISL_READ_PIN_DEFAULT); + + value =3D qmp_isl_pmbus_get(TEST_ID, "temp1[0]"); + g_assert_cmpuint(value, =3D=3D, ISL_READ_TEMP_DEFAULT); + + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_READ_TEMPERATURE_2); + g_assert_cmpuint(i2c_value, =3D=3D, ISL_READ_TEMP_DEFAULT); + + i2c_value =3D i2c_get8(i2cdev, PMBUS_CAPABILITY); + g_assert_cmphex(i2c_value, =3D=3D, ISL_CAPABILITY_DEFAULT); + + i2c_value =3D i2c_get8(i2cdev, PMBUS_OPERATION); + g_assert_cmphex(i2c_value, =3D=3D, ISL_OPERATION_DEFAULT); + + i2c_value =3D i2c_get8(i2cdev, PMBUS_ON_OFF_CONFIG); + g_assert_cmphex(i2c_value, =3D=3D, ISL_ON_OFF_CONFIG_DEFAULT); + + i2c_value =3D i2c_get8(i2cdev, PMBUS_VOUT_MODE); + g_assert_cmphex(i2c_value, =3D=3D, ISL_VOUT_MODE_DEFAULT); + + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_VOUT_COMMAND); + g_assert_cmphex(i2c_value, =3D=3D, ISL_VOUT_COMMAND_DEFAULT); + + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_VOUT_MAX); + g_assert_cmphex(i2c_value, =3D=3D, ISL_VOUT_MAX_DEFAULT); + + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_VOUT_MARGIN_HIGH); + g_assert_cmphex(i2c_value, =3D=3D, ISL_VOUT_MARGIN_HIGH_DEFAULT); + + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_VOUT_MARGIN_LOW); + g_assert_cmphex(i2c_value, =3D=3D, ISL_VOUT_MARGIN_LOW_DEFAULT); + + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_VOUT_TRANSITION_RATE); + g_assert_cmphex(i2c_value, =3D=3D, ISL_VOUT_TRANSITION_RATE_DEFAULT); + + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_VOUT_OV_FAULT_LIMIT); + g_assert_cmphex(i2c_value, =3D=3D, ISL_VOUT_OV_FAULT_LIMIT_DEFAULT); + + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_OT_FAULT_LIMIT); + g_assert_cmphex(i2c_value, =3D=3D, ISL_OT_FAULT_LIMIT_DEFAULT); + + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_OT_WARN_LIMIT); + g_assert_cmphex(i2c_value, =3D=3D, ISL_OT_WARN_LIMIT_DEFAULT); + + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_VIN_OV_WARN_LIMIT); + g_assert_cmphex(i2c_value, =3D=3D, ISL_VIN_OV_WARN_LIMIT_DEFAULT); + + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_VIN_UV_WARN_LIMIT); + g_assert_cmphex(i2c_value, =3D=3D, ISL_VIN_UV_WARN_LIMIT_DEFAULT); + + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_IIN_OC_FAULT_LIMIT); + g_assert_cmphex(i2c_value, =3D=3D, ISL_IIN_OC_FAULT_LIMIT_DEFAULT); + + i2c_value =3D i2c_get8(i2cdev, PMBUS_REVISION); + g_assert_cmphex(i2c_value, =3D=3D, ISL_REVISION_DEFAULT); +} + +/* test qmp access */ +static void test_tx_rx(void *obj, void *data, QGuestAllocator *alloc) +{ + uint16_t i2c_value, value; + QI2CDevice *i2cdev =3D (QI2CDevice *)obj; + + qmp_isl_pmbus_set(TEST_ID, "vin[0]", 200); + value =3D qmp_isl_pmbus_get(TEST_ID, "vin[0]"); + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_READ_VIN); + g_assert_cmpuint(value, =3D=3D, i2c_value); + + qmp_isl_pmbus_set(TEST_ID, "vout[0]", 2500); + value =3D qmp_isl_pmbus_get(TEST_ID, "vout[0]"); + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_READ_VOUT); + g_assert_cmpuint(value, =3D=3D, i2c_value); + + qmp_isl_pmbus_set(TEST_ID, "iin[0]", 300); + value =3D qmp_isl_pmbus_get(TEST_ID, "iin[0]"); + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_READ_IIN); + g_assert_cmpuint(value, =3D=3D, i2c_value); + + qmp_isl_pmbus_set(TEST_ID, "iout[0]", 310); + value =3D qmp_isl_pmbus_get(TEST_ID, "iout[0]"); + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_READ_IOUT); + g_assert_cmpuint(value, =3D=3D, i2c_value); + + qmp_isl_pmbus_set(TEST_ID, "pin[0]", 100); + value =3D qmp_isl_pmbus_get(TEST_ID, "pin[0]"); + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_READ_PIN); + g_assert_cmpuint(value, =3D=3D, i2c_value); + + qmp_isl_pmbus_set(TEST_ID, "pout[0]", 95); + value =3D qmp_isl_pmbus_get(TEST_ID, "pout[0]"); + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_READ_POUT); + g_assert_cmpuint(value, =3D=3D, i2c_value); + + qmp_isl_pmbus_set(TEST_ID, "temp1[0]", 26); + value =3D qmp_isl_pmbus_get(TEST_ID, "temp1[0]"); + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_READ_TEMPERATURE_1); + g_assert_cmpuint(value, =3D=3D, i2c_value); + + qmp_isl_pmbus_set(TEST_ID, "temp2[0]", 27); + value =3D qmp_isl_pmbus_get(TEST_ID, "temp2[0]"); + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_READ_TEMPERATURE_2); + g_assert_cmpuint(value, =3D=3D, i2c_value); + + qmp_isl_pmbus_set(TEST_ID, "temp3[0]", 28); + value =3D qmp_isl_pmbus_get(TEST_ID, "temp3[0]"); + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_READ_TEMPERATURE_3); + g_assert_cmpuint(value, =3D=3D, i2c_value); + +} + +/* test r/w registers */ +static void test_rw_regs(void *obj, void *data, QGuestAllocator *alloc) +{ + uint16_t i2c_value; + QI2CDevice *i2cdev =3D (QI2CDevice *)obj; + + isl_pmbus_i2c_set16(i2cdev, PMBUS_VOUT_COMMAND, 0x1234); + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_VOUT_COMMAND); + g_assert_cmphex(i2c_value, =3D=3D, 0x1234); + + isl_pmbus_i2c_set16(i2cdev, PMBUS_VOUT_TRIM, 0x4567); + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_VOUT_TRIM); + g_assert_cmphex(i2c_value, =3D=3D, 0x4567); + + isl_pmbus_i2c_set16(i2cdev, PMBUS_VOUT_MAX, 0x9876); + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_VOUT_MAX); + g_assert_cmphex(i2c_value, =3D=3D, 0x9876); + + isl_pmbus_i2c_set16(i2cdev, PMBUS_VOUT_MARGIN_HIGH, 0xABCD); + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_VOUT_MARGIN_HIGH); + g_assert_cmphex(i2c_value, =3D=3D, 0xABCD); + + isl_pmbus_i2c_set16(i2cdev, PMBUS_VOUT_MARGIN_LOW, 0xA1B2); + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_VOUT_MARGIN_LOW); + g_assert_cmphex(i2c_value, =3D=3D, 0xA1B2); + + isl_pmbus_i2c_set16(i2cdev, PMBUS_VOUT_TRANSITION_RATE, 0xDEF1); + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_VOUT_TRANSITION_RATE); + g_assert_cmphex(i2c_value, =3D=3D, 0xDEF1); + + isl_pmbus_i2c_set16(i2cdev, PMBUS_VOUT_DROOP, 0x5678); + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_VOUT_DROOP); + g_assert_cmphex(i2c_value, =3D=3D, 0x5678); + + isl_pmbus_i2c_set16(i2cdev, PMBUS_VOUT_MIN, 0x1234); + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_VOUT_MIN); + g_assert_cmphex(i2c_value, =3D=3D, 0x1234); + + isl_pmbus_i2c_set16(i2cdev, PMBUS_VOUT_OV_FAULT_LIMIT, 0x2345); + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_VOUT_OV_FAULT_LIMIT); + g_assert_cmphex(i2c_value, =3D=3D, 0x2345); + + isl_pmbus_i2c_set16(i2cdev, PMBUS_VOUT_UV_FAULT_LIMIT, 0xFA12); + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_VOUT_UV_FAULT_LIMIT); + g_assert_cmphex(i2c_value, =3D=3D, 0xFA12); + + isl_pmbus_i2c_set16(i2cdev, PMBUS_OT_FAULT_LIMIT, 0xF077); + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_OT_FAULT_LIMIT); + g_assert_cmphex(i2c_value, =3D=3D, 0xF077); + + isl_pmbus_i2c_set16(i2cdev, PMBUS_OT_WARN_LIMIT, 0x7137); + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_OT_WARN_LIMIT); + g_assert_cmphex(i2c_value, =3D=3D, 0x7137); + + isl_pmbus_i2c_set16(i2cdev, PMBUS_VIN_OV_FAULT_LIMIT, 0x3456); + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_VIN_OV_FAULT_LIMIT); + g_assert_cmphex(i2c_value, =3D=3D, 0x3456); + + isl_pmbus_i2c_set16(i2cdev, PMBUS_VIN_UV_FAULT_LIMIT, 0xBADA); + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_VIN_UV_FAULT_LIMIT); + g_assert_cmphex(i2c_value, =3D=3D, 0xBADA); + + isl_pmbus_i2c_set16(i2cdev, PMBUS_IIN_OC_FAULT_LIMIT, 0xB1B0); + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_IIN_OC_FAULT_LIMIT); + g_assert_cmphex(i2c_value, =3D=3D, 0xB1B0); + + i2c_set8(i2cdev, PMBUS_PAGE, 2); + i2c_value =3D i2c_get8(i2cdev, PMBUS_PAGE); + g_assert_cmphex(i2c_value, =3D=3D, 2); + + i2c_set8(i2cdev, PMBUS_OPERATION, 0xA); + i2c_value =3D i2c_get8(i2cdev, PMBUS_OPERATION); + g_assert_cmphex(i2c_value, =3D=3D, 0xA); + + i2c_set8(i2cdev, PMBUS_ON_OFF_CONFIG, 0x42); + i2c_value =3D i2c_get8(i2cdev, PMBUS_ON_OFF_CONFIG); + g_assert_cmphex(i2c_value, =3D=3D, 0x42); +} + +/* test read-only registers */ +static void test_ro_regs(void *obj, void *data, QGuestAllocator *alloc) +{ + uint16_t i2c_init_value, i2c_value; + QI2CDevice *i2cdev =3D (QI2CDevice *)obj; + + i2c_init_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_READ_VIN); + isl_pmbus_i2c_set16(i2cdev, PMBUS_READ_VIN, 0xBEEF); + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_READ_VIN); + g_assert_cmphex(i2c_init_value, =3D=3D, i2c_value); + + i2c_init_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_READ_IIN); + isl_pmbus_i2c_set16(i2cdev, PMBUS_READ_IIN, 0xB00F); + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_READ_IIN); + g_assert_cmphex(i2c_init_value, =3D=3D, i2c_value); + + i2c_init_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_READ_VOUT); + isl_pmbus_i2c_set16(i2cdev, PMBUS_READ_VOUT, 0x1234); + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_READ_VOUT); + g_assert_cmphex(i2c_init_value, =3D=3D, i2c_value); + + i2c_init_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_READ_IOUT); + isl_pmbus_i2c_set16(i2cdev, PMBUS_READ_IOUT, 0x6547); + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_READ_IOUT); + g_assert_cmphex(i2c_init_value, =3D=3D, i2c_value); + + i2c_init_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_READ_TEMPERATURE_= 1); + isl_pmbus_i2c_set16(i2cdev, PMBUS_READ_TEMPERATURE_1, 0x1597); + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_READ_TEMPERATURE_1); + g_assert_cmphex(i2c_init_value, =3D=3D, i2c_value); + + i2c_init_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_READ_TEMPERATURE_= 2); + isl_pmbus_i2c_set16(i2cdev, PMBUS_READ_TEMPERATURE_2, 0x1897); + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_READ_TEMPERATURE_2); + g_assert_cmphex(i2c_init_value, =3D=3D, i2c_value); + + i2c_init_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_READ_TEMPERATURE_= 3); + isl_pmbus_i2c_set16(i2cdev, PMBUS_READ_TEMPERATURE_3, 0x1007); + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_READ_TEMPERATURE_3); + g_assert_cmphex(i2c_init_value, =3D=3D, i2c_value); + + i2c_init_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_READ_PIN); + isl_pmbus_i2c_set16(i2cdev, PMBUS_READ_PIN, 0xDEAD); + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_READ_PIN); + g_assert_cmphex(i2c_init_value, =3D=3D, i2c_value); + + i2c_init_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_READ_POUT); + isl_pmbus_i2c_set16(i2cdev, PMBUS_READ_POUT, 0xD00D); + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_READ_POUT); + g_assert_cmphex(i2c_init_value, =3D=3D, i2c_value); +} + +/* test voltage fault handling */ +static void test_voltage_faults(void *obj, void *data, QGuestAllocator *al= loc) +{ + uint16_t i2c_value; + uint8_t i2c_byte; + QI2CDevice *i2cdev =3D (QI2CDevice *)obj; + + isl_pmbus_i2c_set16(i2cdev, PMBUS_VOUT_OV_WARN_LIMIT, 5000); + qmp_isl_pmbus_set(TEST_ID, "vout[0]", 5100); + + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_STATUS_WORD); + i2c_byte =3D i2c_get8(i2cdev, PMBUS_STATUS_VOUT); + g_assert_true((i2c_value & PB_STATUS_VOUT) !=3D 0); + g_assert_true((i2c_byte & PB_STATUS_VOUT_OV_WARN) !=3D 0); + + qmp_isl_pmbus_set(TEST_ID, "vout[0]", 4500); + i2c_set8(i2cdev, PMBUS_CLEAR_FAULTS, 0); + i2c_byte =3D i2c_get8(i2cdev, PMBUS_STATUS_VOUT); + g_assert_true((i2c_byte & PB_STATUS_VOUT_OV_WARN) =3D=3D 0); + + isl_pmbus_i2c_set16(i2cdev, PMBUS_VOUT_UV_WARN_LIMIT, 4600); + + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_STATUS_WORD); + i2c_byte =3D i2c_get8(i2cdev, PMBUS_STATUS_VOUT); + g_assert_true((i2c_value & PB_STATUS_VOUT) !=3D 0); + g_assert_true((i2c_byte & PB_STATUS_VOUT_UV_WARN) !=3D 0); + +} + +static void isl_pmbus_register_nodes(void) +{ + QOSGraphEdgeOptions opts =3D { + .extra_device_opts =3D "id=3D" TEST_ID ",address=3D0x43" + }; + add_qi2c_address(&opts, &(QI2CAddress) { TEST_ADDR }); + + qos_node_create_driver("isl69260", i2c_device_create); + qos_node_consumes("isl69260", "i2c-bus", &opts); + + qos_add_test("test_defaults", "isl69260", test_defaults, NULL); + qos_add_test("test_tx_rx", "isl69260", test_tx_rx, NULL); + qos_add_test("test_rw_regs", "isl69260", test_rw_regs, NULL); + qos_add_test("test_ro_regs", "isl69260", test_ro_regs, NULL); + qos_add_test("test_ov_faults", "isl69260", test_voltage_faults, NULL); +} +libqos_init(isl_pmbus_register_nodes); diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 37e1eaa449..7a580d6d9f 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -242,6 +242,7 @@ qos_test_ss.add( 'eepro100-test.c', 'es1370-test.c', 'ipoctal232-test.c', + 'isl_pmbus-test.c', 'max34451-test.c', 'megasas-test.c', 'ne2000-test.c', --=20 2.34.1.448.ga2b2bfdf31-goog From nobody Sat May 4 07:00:48 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=reject dis=none) header.from=google.com ARC-Seal: i=1; a=rsa-sha256; t=1641511434; cv=none; d=zohomail.com; s=zohoarc; b=ZQxiR2NMD5hAXcHjiR1Tf4vgqRmDcknx5w8BY/QUEGPkPF3YK0lJoe7AZDWcY7sZ8X7DktGOfQrxOyYS4+KSEi5BYrQ6EVe3WB56fWTQQ+uLfIxK4ZFhGMxStSR7+LCT7ORUUdd1XQQo6u7fxL091jJy1XJYFoYyfHsMC9JseC8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641511434; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6LLiL4AuMjgwJDw/hLv0NPZST2B5iF1mx74lkuGwVXU=; b=LMQwE91wUrkasUbbbaHDxpLnjGnySqLsqjm2UehYLpkLK3F2a8eQVR3tYP+uzLGodX6+31rM+E9XExp935AwNX9LfGMzsuRDiSAMt3BgragnCUW9/q4SkKMuBnS2iS0PGBTfriFLsbNHg7RHLsvWjO1VVClgss9VLBw2wg6Hx98= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1641511434631804.2421576358992; Thu, 6 Jan 2022 15:23:54 -0800 (PST) Received: from localhost ([::1]:54282 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n5c6r-0003wz-HF for importer@patchew.org; Thu, 06 Jan 2022 18:23:53 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34926) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <3w3bXYQYKCiQTITUSRGOOGLE.COMQEMU-DEVELNONGNU.ORG@flex--titusr.bounces.google.com>) id 1n5c1O-0004d7-8o for qemu-devel@nongnu.org; Thu, 06 Jan 2022 18:18:14 -0500 Received: from [2607:f8b0:4864:20::b4a] (port=37819 helo=mail-yb1-xb4a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <3w3bXYQYKCiQTITUSRGOOGLE.COMQEMU-DEVELNONGNU.ORG@flex--titusr.bounces.google.com>) id 1n5c1M-0006La-7u for qemu-devel@nongnu.org; Thu, 06 Jan 2022 18:18:13 -0500 Received: by mail-yb1-xb4a.google.com with SMTP id b144-20020a253496000000b0060bddc72114so8111107yba.4 for ; Thu, 06 Jan 2022 15:18:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=6LLiL4AuMjgwJDw/hLv0NPZST2B5iF1mx74lkuGwVXU=; b=kT86I2A7X33698nvhWqXd10azQVYBJoLMMVvbxgM0BxL49+NvqdjoInbNcVknzcTLE aVbM0eeX9IwMHydD9xILzF73LG+I5ieBd1ZgzPnrfN8AVp9NLSxKqck6qPyCSP35STae tsXfbojoEvrMxEBhMsosxdcmB6atvfRuasmYeMOqMZ1sPpuQqc8EubD7gjuYRrMYR2S9 ZKsS83O8HCFLV/cdKsfXsqdqQNKq4WGpRhTyaSlsEzFGndHYHkcqvrRkxOaQJmsVZBP1 bZorWcEN9uKmHpajtkbscUEqWBsGjaSvvGbZBnxTiy9xQJwsydxxnn9Pm8M90lzwMQjF KIiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=6LLiL4AuMjgwJDw/hLv0NPZST2B5iF1mx74lkuGwVXU=; b=IKO3ZKBpXjWvZ4n6hjOPIT3siDNAJaynq5Heyu9PIt7sbXeyQLmxCI9zNV3Ue6XoXB tp/fG1YfB4Bm8699OqgyBgPZ0mDIprybF6HMKBs4uOcnS5LeiggcEEjkjC2IPxEcUDIn nGCCc/FKwOhe+ovDZf/sPWWioB/4SqXLhX3aY3KbUGCeFf5FUVtRr+hZNUB8zumk9uRD XE8J60UDru3FaOdot0tqYBOujzRFLWzjdmobppU1bNAFIRBMxUmwoFsZL/uyf3YiroZJ BKdZCX3hTq+5UtYXXSuwk6oG4kEwCQDOEl8sNtJWOtMr0MkWnQ+6sVMS56KSuF23Wnfs FlvA== X-Gm-Message-State: AOAM530WWmdQ6iNqTSxQ+NfP0zXNVNTe9w8O5ucT2Y7EXja1wL2t3cpb Cqhx002KF1ACrrN73PE8MZ+v4F0O8W0= X-Google-Smtp-Source: ABdhPJwPEl/zGcFLZnHwXXTxGdwPYEhsh0DKnPduM7oMObG8mUIsvEcyvpMiy4E4QHv2iSBXppHo1hgGbFI= X-Received: from titusr.c.googlers.com ([fda3:e722:ac3:cc00:14:4d90:c0a8:22b8]) (user=titusr job=sendgmr) by 2002:a25:8a:: with SMTP id 132mr62878693yba.738.1641510595760; Thu, 06 Jan 2022 15:09:55 -0800 (PST) Date: Thu, 6 Jan 2022 23:09:35 +0000 In-Reply-To: <20220106230936.417020-1-titusr@google.com> Message-Id: <20220106230936.417020-5-titusr@google.com> Mime-Version: 1.0 References: <20220106230936.417020-1-titusr@google.com> X-Mailer: git-send-email 2.34.1.448.ga2b2bfdf31-goog Subject: [PATCH 4/5] hw/sensor: add Renesas raa229004 PMBus device From: Titus Rwantare To: f4bug@amsat.org, minyard@acm.org Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, venture@google.com, Titus Rwantare , Hao Wu X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::b4a (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::b4a; envelope-from=3w3bXYQYKCiQTITUSRGOOGLE.COMQEMU-DEVELNONGNU.ORG@flex--titusr.bounces.google.com; helo=mail-yb1-xb4a.google.com X-Spam_score_int: -87 X-Spam_score: -8.8 X-Spam_bar: -------- X-Spam_report: (-8.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, USER_IN_DEF_DKIM_WL=-7.5 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @google.com) X-ZM-MESSAGEID: 1641511436034100003 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The Renesas RAA229004 is a PMBus Multiphase Voltage Regulator Signed-off-by: Titus Rwantare Reviewed-by: Hao Wu --- hw/sensor/isl_pmbus.c | 18 ++++++++++++++++++ include/hw/sensor/isl_pmbus.h | 1 + tests/qtest/isl_pmbus-test.c | 7 +++++++ 3 files changed, 26 insertions(+) diff --git a/hw/sensor/isl_pmbus.c b/hw/sensor/isl_pmbus.c index 8cc7220a57..4ff848f663 100644 --- a/hw/sensor/isl_pmbus.c +++ b/hw/sensor/isl_pmbus.c @@ -194,6 +194,15 @@ static void isl69260_class_init(ObjectClass *klass, vo= id *data) isl_pmbus_class_init(klass, data, 2); } =20 +static void raa229004_class_init(ObjectClass *klass, void *data) +{ + ResettableClass *rc =3D RESETTABLE_CLASS(klass); + DeviceClass *dc =3D DEVICE_CLASS(klass); + dc->desc =3D "Renesas 229004 Digital Multiphase Voltage Regulator"; + rc->phases.exit =3D isl_pmbus_exit_reset; + isl_pmbus_class_init(klass, data, 2); +} + static const TypeInfo isl69260_info =3D { .name =3D TYPE_ISL69260, .parent =3D TYPE_PMBUS_DEVICE, @@ -202,9 +211,18 @@ static const TypeInfo isl69260_info =3D { .class_init =3D isl69260_class_init, }; =20 +static const TypeInfo raa229004_info =3D { + .name =3D TYPE_RAA229004, + .parent =3D TYPE_PMBUS_DEVICE, + .instance_size =3D sizeof(ISLState), + .instance_init =3D raa22xx_init, + .class_init =3D raa229004_class_init, +}; + static void isl_pmbus_register_types(void) { type_register_static(&isl69260_info); + type_register_static(&raa229004_info); } =20 type_init(isl_pmbus_register_types) diff --git a/include/hw/sensor/isl_pmbus.h b/include/hw/sensor/isl_pmbus.h index 8115aaa698..a947fd3903 100644 --- a/include/hw/sensor/isl_pmbus.h +++ b/include/hw/sensor/isl_pmbus.h @@ -13,6 +13,7 @@ #include "qom/object.h" =20 #define TYPE_ISL69260 "isl69260" +#define TYPE_RAA229004 "raa229004" =20 struct ISLState { PMBusDevice parent; diff --git a/tests/qtest/isl_pmbus-test.c b/tests/qtest/isl_pmbus-test.c index 3e956f912c..5bdc247428 100644 --- a/tests/qtest/isl_pmbus-test.c +++ b/tests/qtest/isl_pmbus-test.c @@ -372,10 +372,17 @@ static void isl_pmbus_register_nodes(void) qos_node_create_driver("isl69260", i2c_device_create); qos_node_consumes("isl69260", "i2c-bus", &opts); =20 + qos_node_create_driver("raa229004", i2c_device_create); + qos_node_consumes("raa229004", "i2c-bus", &opts); + qos_add_test("test_defaults", "isl69260", test_defaults, NULL); qos_add_test("test_tx_rx", "isl69260", test_tx_rx, NULL); qos_add_test("test_rw_regs", "isl69260", test_rw_regs, NULL); qos_add_test("test_ro_regs", "isl69260", test_ro_regs, NULL); qos_add_test("test_ov_faults", "isl69260", test_voltage_faults, NULL); + + qos_add_test("test_tx_rx", "raa229004", test_tx_rx, NULL); + qos_add_test("test_rw_regs", "raa229004", test_rw_regs, NULL); + qos_add_test("test_ov_faults", "raa229004", test_voltage_faults, NULL); } libqos_init(isl_pmbus_register_nodes); --=20 2.34.1.448.ga2b2bfdf31-goog From nobody Sat May 4 07:00:48 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=reject dis=none) header.from=google.com ARC-Seal: i=1; a=rsa-sha256; t=1641511119; cv=none; d=zohomail.com; s=zohoarc; b=Me1xR9n+vLefNGOGEF5DB1I7sSHogNBvtX61JdS+qP4nzFj8XQTzp1fegCYrG7Z/zqNTG8SxH1gWuqh5OGLr9kSqJFBatKhYof4E5QKdyURcqgTdtGE+GYXExcbhgfaaKGZEOAbzahVD2iJQE+sUgm5K2PfeTuMl21oN2fgzrB0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641511119; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=nYWFZm+kcWsf7aAygcl1/A/lTC91XhdZMvgXx7BO+Yc=; b=QuL5hRat0VgPYXHKQ5KjY25WFF21pGEg9A/x5K4hFkV6CfcOTBUqliIuNwhN85vtIZBi6u901WaAnP8b7r6lXJZNBI3A6TSthZTvrkfizgcW8hdMIrucPEKK5LjP5Bfdv/OykQ29T6coK4TsXTKacMkaTqPKHtKgA+BySg0IjLQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1641511119913555.87993835882; Thu, 6 Jan 2022 15:18:39 -0800 (PST) Received: from localhost ([::1]:43200 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n5c1m-0004Hs-4C for importer@patchew.org; Thu, 06 Jan 2022 18:18:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34514) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <3xHbXYQYKCiUUJUVTSHPPHMF.DPNRFNV-EFWFMOPOHOV.PSH@flex--titusr.bounces.google.com>) id 1n5bz4-0001dJ-ML for qemu-devel@nongnu.org; Thu, 06 Jan 2022 18:15:51 -0500 Received: from [2607:f8b0:4864:20::f49] (port=42605 helo=mail-qv1-xf49.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <3xHbXYQYKCiUUJUVTSHPPHMF.DPNRFNV-EFWFMOPOHOV.PSH@flex--titusr.bounces.google.com>) id 1n5bz2-000620-Od for qemu-devel@nongnu.org; Thu, 06 Jan 2022 18:15:50 -0500 Received: by mail-qv1-xf49.google.com with SMTP id ge12-20020a05621427cc00b00410de1dc898so3453078qvb.9 for ; Thu, 06 Jan 2022 15:15:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=nYWFZm+kcWsf7aAygcl1/A/lTC91XhdZMvgXx7BO+Yc=; b=mtB5ASu1153XMnbafuD8FGOMiS1F996/yI3Rl1kjkKKtyAymKYPwYDoF+Uj6ZjHnpM lgKqsHumFgjGmM9Jk3vAVvdIYA1r5QTN5R8w5iTcLXNl17q82aRRxuERlzaJOugRoFaM WmNasnsBg4OvxDa983xfevl4HKZ9i6+wBC+4hRJDRDMU6wpqT0Ij9IHbjx4He/DDT1UQ gzaYz1CsQEhMIQsVR9hYDtGZKKBnvRLVy05GU6L7B9iSzgo788wvryV5IvxH0QwiYPLp Z4PKnIx/LmUKKtNWzcVfQOIDjFok1oXQYHl4iCGEuC7eMConfUzGzg3MNBemK+qjyOQw 8Wkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=nYWFZm+kcWsf7aAygcl1/A/lTC91XhdZMvgXx7BO+Yc=; b=Yf6X7m0SeBEHgLfUNdWhasZf6ItX/l2IZ2+zHl1lLr21kSkJeAgRKgN3HAiYwoS35M YOxWo0X3SAmIPXTrXWkHqcmX5vowu1J/GuP8y0srIfeG513cNWcuwaRq1oQju906lChw mBh4cncHseQKptBdA+wOo9fe5jsF98SKTQ4pmWF+jvoK/Flb4CgX3A8pC5QiS1SySDba akrDDdH06idxT/0GbO1kyGDROc14GPA70LDhUQ/OIvLNRfFFHiToJ/4hO2PV+mvdmDNu qJoq9IiDPCmWfaLxS6VlZbp/s8eAQqIBKTsRXKfp/5XheDgrkWpng5sVrgHCM+LZbOiY b52w== X-Gm-Message-State: AOAM53283B++aK8dkPYFiUqMFDpLdev0omHjm9w5MJgV7GeD2iSuR8OQ 6CP8iALGUiRzJAmOqo2C5yVHxmtqxTA= X-Google-Smtp-Source: ABdhPJwR/vfjn6ONMQip4KoZjdihkyLwiwvzDFkCPUM9rfy/q2VLb+HvofVTQ5zn745pDxdUMZROKLFPdQo= X-Received: from titusr.c.googlers.com ([fda3:e722:ac3:cc00:14:4d90:c0a8:22b8]) (user=titusr job=sendgmr) by 2002:a05:622a:1713:: with SMTP id h19mr54424729qtk.464.1641510596557; Thu, 06 Jan 2022 15:09:56 -0800 (PST) Date: Thu, 6 Jan 2022 23:09:36 +0000 In-Reply-To: <20220106230936.417020-1-titusr@google.com> Message-Id: <20220106230936.417020-6-titusr@google.com> Mime-Version: 1.0 References: <20220106230936.417020-1-titusr@google.com> X-Mailer: git-send-email 2.34.1.448.ga2b2bfdf31-goog Subject: [PATCH 5/5] hw/misc: add Renesas raa228000 device From: Titus Rwantare To: f4bug@amsat.org, minyard@acm.org Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, venture@google.com, Titus Rwantare , Hao Wu X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::f49 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::f49; envelope-from=3xHbXYQYKCiUUJUVTSHPPHMF.DPNRFNV-EFWFMOPOHOV.PSH@flex--titusr.bounces.google.com; helo=mail-qv1-xf49.google.com X-Spam_score_int: -87 X-Spam_score: -8.8 X-Spam_bar: -------- X-Spam_report: (-8.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, USER_IN_DEF_DKIM_WL=-7.5 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @google.com) X-ZM-MESSAGEID: 1641511122098100001 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Signed-off-by: Titus Rwantare Reviewed-by: Hao Wu --- hw/sensor/isl_pmbus.c | 50 ++++++++++++++++++++++ include/hw/sensor/isl_pmbus.h | 1 + tests/qtest/isl_pmbus-test.c | 78 +++++++++++++++++++++++++++++++++-- 3 files changed, 126 insertions(+), 3 deletions(-) diff --git a/hw/sensor/isl_pmbus.c b/hw/sensor/isl_pmbus.c index 4ff848f663..e3b42b119e 100644 --- a/hw/sensor/isl_pmbus.c +++ b/hw/sensor/isl_pmbus.c @@ -89,6 +89,24 @@ static void isl_pmbus_exit_reset(Object *obj) } } =20 +/* The raa228000 uses different direct mode coefficents from most isl devi= ces */ +static void raa228000_exit_reset(Object *obj) +{ + isl_pmbus_exit_reset(obj); + + PMBusDevice *pmdev =3D PMBUS_DEVICE(obj); + + pmdev->pages[0].read_vout =3D 0; + pmdev->pages[0].read_iout =3D 0; + pmdev->pages[0].read_pout =3D 0; + pmdev->pages[0].read_vin =3D 0; + pmdev->pages[0].read_iin =3D 0; + pmdev->pages[0].read_pin =3D 0; + pmdev->pages[0].read_temperature_1 =3D 0; + pmdev->pages[0].read_temperature_2 =3D 0; + pmdev->pages[0].read_temperature_3 =3D 0; +} + static void isl_pmbus_add_props(Object *obj, uint64_t *flags, uint8_t page= s) { PMBusDevice *pmdev =3D PMBUS_DEVICE(obj); @@ -177,6 +195,20 @@ static void raa22xx_init(Object *obj) isl_pmbus_add_props(obj, flags, 2); } =20 +static void raa228000_init(Object *obj) +{ + PMBusDevice *pmdev =3D PMBUS_DEVICE(obj); + uint64_t flags[1]; + + flags[0] =3D PB_HAS_VIN | PB_HAS_VOUT | PB_HAS_VOUT_MODE | + PB_HAS_VOUT_RATING | PB_HAS_VOUT_MARGIN | PB_HAS_IIN | + PB_HAS_IOUT | PB_HAS_PIN | PB_HAS_POUT | PB_HAS_TEMPERATURE= | + PB_HAS_TEMP2 | PB_HAS_TEMP3 | PB_HAS_STATUS_MFR_SPECIFIC; + + pmbus_page_config(pmdev, 0, flags[0]); + isl_pmbus_add_props(obj, flags, 1); +} + static void isl_pmbus_class_init(ObjectClass *klass, void *data, uint8_t p= ages) { PMBusDeviceClass *k =3D PMBUS_DEVICE_CLASS(klass); @@ -194,6 +226,15 @@ static void isl69260_class_init(ObjectClass *klass, vo= id *data) isl_pmbus_class_init(klass, data, 2); } =20 +static void raa228000_class_init(ObjectClass *klass, void *data) +{ + ResettableClass *rc =3D RESETTABLE_CLASS(klass); + DeviceClass *dc =3D DEVICE_CLASS(klass); + dc->desc =3D "Renesas 228000 Digital Multiphase Voltage Regulator"; + rc->phases.exit =3D raa228000_exit_reset; + isl_pmbus_class_init(klass, data, 1); +} + static void raa229004_class_init(ObjectClass *klass, void *data) { ResettableClass *rc =3D RESETTABLE_CLASS(klass); @@ -219,9 +260,18 @@ static const TypeInfo raa229004_info =3D { .class_init =3D raa229004_class_init, }; =20 +static const TypeInfo raa228000_info =3D { + .name =3D TYPE_RAA228000, + .parent =3D TYPE_PMBUS_DEVICE, + .instance_size =3D sizeof(ISLState), + .instance_init =3D raa228000_init, + .class_init =3D raa228000_class_init, +}; + static void isl_pmbus_register_types(void) { type_register_static(&isl69260_info); + type_register_static(&raa228000_info); type_register_static(&raa229004_info); } =20 diff --git a/include/hw/sensor/isl_pmbus.h b/include/hw/sensor/isl_pmbus.h index a947fd3903..7ead1dc4a2 100644 --- a/include/hw/sensor/isl_pmbus.h +++ b/include/hw/sensor/isl_pmbus.h @@ -13,6 +13,7 @@ #include "qom/object.h" =20 #define TYPE_ISL69260 "isl69260" +#define TYPE_RAA228000 "raa228000" #define TYPE_RAA229004 "raa229004" =20 struct ISLState { diff --git a/tests/qtest/isl_pmbus-test.c b/tests/qtest/isl_pmbus-test.c index 5bdc247428..3b5fb2208d 100644 --- a/tests/qtest/isl_pmbus-test.c +++ b/tests/qtest/isl_pmbus-test.c @@ -149,6 +149,70 @@ static void test_defaults(void *obj, void *data, QGues= tAllocator *alloc) g_assert_cmphex(i2c_value, =3D=3D, ISL_REVISION_DEFAULT); } =20 +static void raa228000_test_defaults(void *obj, void *data, + QGuestAllocator *alloc) +{ + uint16_t value, i2c_value; + QI2CDevice *i2cdev =3D (QI2CDevice *)obj; + + value =3D qmp_isl_pmbus_get(TEST_ID, "vout[0]"); + g_assert_cmpuint(value, =3D=3D, 0); + + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_READ_IOUT); + g_assert_cmpuint(i2c_value, =3D=3D, 0); + + value =3D qmp_isl_pmbus_get(TEST_ID, "pout[0]"); + g_assert_cmpuint(value, =3D=3D, 0); + + i2c_value =3D i2c_get8(i2cdev, PMBUS_CAPABILITY); + g_assert_cmphex(i2c_value, =3D=3D, ISL_CAPABILITY_DEFAULT); + + i2c_value =3D i2c_get8(i2cdev, PMBUS_OPERATION); + g_assert_cmphex(i2c_value, =3D=3D, ISL_OPERATION_DEFAULT); + + i2c_value =3D i2c_get8(i2cdev, PMBUS_ON_OFF_CONFIG); + g_assert_cmphex(i2c_value, =3D=3D, ISL_ON_OFF_CONFIG_DEFAULT); + + i2c_value =3D i2c_get8(i2cdev, PMBUS_VOUT_MODE); + g_assert_cmphex(i2c_value, =3D=3D, ISL_VOUT_MODE_DEFAULT); + + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_VOUT_COMMAND); + g_assert_cmphex(i2c_value, =3D=3D, ISL_VOUT_COMMAND_DEFAULT); + + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_VOUT_MAX); + g_assert_cmphex(i2c_value, =3D=3D, ISL_VOUT_MAX_DEFAULT); + + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_VOUT_MARGIN_HIGH); + g_assert_cmphex(i2c_value, =3D=3D, ISL_VOUT_MARGIN_HIGH_DEFAULT); + + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_VOUT_MARGIN_LOW); + g_assert_cmphex(i2c_value, =3D=3D, ISL_VOUT_MARGIN_LOW_DEFAULT); + + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_VOUT_TRANSITION_RATE); + g_assert_cmphex(i2c_value, =3D=3D, ISL_VOUT_TRANSITION_RATE_DEFAULT); + + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_VOUT_OV_FAULT_LIMIT); + g_assert_cmphex(i2c_value, =3D=3D, ISL_VOUT_OV_FAULT_LIMIT_DEFAULT); + + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_OT_FAULT_LIMIT); + g_assert_cmphex(i2c_value, =3D=3D, ISL_OT_FAULT_LIMIT_DEFAULT); + + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_OT_WARN_LIMIT); + g_assert_cmphex(i2c_value, =3D=3D, ISL_OT_WARN_LIMIT_DEFAULT); + + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_VIN_OV_WARN_LIMIT); + g_assert_cmphex(i2c_value, =3D=3D, ISL_VIN_OV_WARN_LIMIT_DEFAULT); + + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_VIN_UV_WARN_LIMIT); + g_assert_cmphex(i2c_value, =3D=3D, ISL_VIN_UV_WARN_LIMIT_DEFAULT); + + i2c_value =3D isl_pmbus_i2c_get16(i2cdev, PMBUS_IIN_OC_FAULT_LIMIT); + g_assert_cmphex(i2c_value, =3D=3D, ISL_IIN_OC_FAULT_LIMIT_DEFAULT); + + i2c_value =3D i2c_get8(i2cdev, PMBUS_REVISION); + g_assert_cmphex(i2c_value, =3D=3D, ISL_REVISION_DEFAULT); +} + /* test qmp access */ static void test_tx_rx(void *obj, void *data, QGuestAllocator *alloc) { @@ -372,17 +436,25 @@ static void isl_pmbus_register_nodes(void) qos_node_create_driver("isl69260", i2c_device_create); qos_node_consumes("isl69260", "i2c-bus", &opts); =20 - qos_node_create_driver("raa229004", i2c_device_create); - qos_node_consumes("raa229004", "i2c-bus", &opts); - qos_add_test("test_defaults", "isl69260", test_defaults, NULL); qos_add_test("test_tx_rx", "isl69260", test_tx_rx, NULL); qos_add_test("test_rw_regs", "isl69260", test_rw_regs, NULL); qos_add_test("test_ro_regs", "isl69260", test_ro_regs, NULL); qos_add_test("test_ov_faults", "isl69260", test_voltage_faults, NULL); =20 + qos_node_create_driver("raa229004", i2c_device_create); + qos_node_consumes("raa229004", "i2c-bus", &opts); + qos_add_test("test_tx_rx", "raa229004", test_tx_rx, NULL); qos_add_test("test_rw_regs", "raa229004", test_rw_regs, NULL); qos_add_test("test_ov_faults", "raa229004", test_voltage_faults, NULL); + + qos_node_create_driver("raa22800", i2c_device_create); + qos_node_consumes("raa22800", "i2c-bus", &opts); + + qos_add_test("test_defaults", "raa22800", raa228000_test_defaults, NUL= L); + qos_add_test("test_tx_rx", "raa22800", test_tx_rx, NULL); + qos_add_test("test_rw_regs", "raa22800", test_rw_regs, NULL); + qos_add_test("test_ov_faults", "raa22800", test_voltage_faults, NULL); } libqos_init(isl_pmbus_register_nodes); --=20 2.34.1.448.ga2b2bfdf31-goog