| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20250215-bcm59054-v4-5-dbfb2d76a855@gmail.com>
Date: Sat, 15 Feb 2025 10:39:40 +0100
From: Artur Weber <aweber.kernel@...il.com>
To: Lee Jones <lee@...nel.org>, Rob Herring <robh@...nel.org>,
Krzysztof Kozlowski <krzk+dt@...nel.org>,
Conor Dooley <conor+dt@...nel.org>, Liam Girdwood <lgirdwood@...il.com>,
Mark Brown <broonie@...nel.org>,
Florian Fainelli <florian.fainelli@...adcom.com>,
Ray Jui <rjui@...adcom.com>, Scott Branden <sbranden@...adcom.com>,
Broadcom internal kernel review list <bcm-kernel-feedback-list@...adcom.com>
Cc: Stanislav Jakubek <stano.jakubek@...il.com>, devicetree@...r.kernel.org,
linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
~postmarketos/upstreaming@...ts.sr.ht,
Artur Weber <aweber.kernel@...il.com>
Subject: [PATCH v4 5/9] mfd: bcm590xx: Add PMU ID/revision parsing function
The BCM590xx PMUs have two I2C registers for reading the PMU ID
and revision. The revision is useful for subdevice drivers, since
different revisions may have slight differences in behavior.
Add a function to parse the data contained in the ID/revision
registers. Use the ID value to verify that the correct compatible is
used; store the revision value as two separate variables, rev_dig
and rev_ana, for later usage.
Also add some known revision values to bcm590xx.h, for convenience
when writing subdevice drivers.
Signed-off-by: Artur Weber <aweber.kernel@...il.com>
---
Changes in v4:
- Added this commit
---
drivers/mfd/bcm590xx.c | 81 ++++++++++++++++++++++++++++++++++++++++++++
include/linux/mfd/bcm590xx.h | 14 ++++++++
2 files changed, 95 insertions(+)
diff --git a/drivers/mfd/bcm590xx.c b/drivers/mfd/bcm590xx.c
index 632eb57d0d9e9f20f801fac22eae21b3c46cefd5..094186165efa5a2356a442efdfb4da02ad9be9da 100644
--- a/drivers/mfd/bcm590xx.c
+++ b/drivers/mfd/bcm590xx.c
@@ -17,6 +17,17 @@
#include <linux/regmap.h>
#include <linux/slab.h>
+/* Under primary I2C address: */
+#define BCM590XX_PMUID 0x1e
+#define BCM590XX_PMUID_BCM59054 0x54
+#define BCM590XX_PMUID_BCM59056 0x56
+
+#define BCM590XX_PMUREV 0x1f
+#define BCM590XX_PMUREV_DIG_MASK 0xF
+#define BCM590XX_PMUREV_DIG_SHIFT 0
+#define BCM590XX_PMUREV_ANA_MASK 0xF0
+#define BCM590XX_PMUREV_ANA_SHIFT 4
+
static const struct mfd_cell bcm590xx_devs[] = {
{
.name = "bcm590xx-vregs",
@@ -37,6 +48,72 @@ static const struct regmap_config bcm590xx_regmap_config_sec = {
.cache_type = REGCACHE_MAPLE,
};
+/* Map device_type enum value to model name string */
+static const char * const bcm590xx_names[BCM590XX_TYPE_MAX] = {
+ [BCM59054_TYPE] = "BCM59054",
+ [BCM59056_TYPE] = "BCM59056",
+};
+
+/*
+ * Parse the version from version registers and make sure it matches
+ * the device type passed to the compatible.
+ */
+static int bcm590xx_parse_version(struct bcm590xx *bcm590xx)
+{
+ unsigned int id, rev;
+ int ret;
+
+ /* Get PMU ID and verify that it matches compatible */
+ ret = regmap_read(bcm590xx->regmap_pri, BCM590XX_PMUID, &id);
+ if (ret) {
+ dev_err(bcm590xx->dev, "failed to read PMU ID: %d\n", ret);
+ return ret;
+ }
+
+ switch (bcm590xx->dev_type) {
+ case BCM59054_TYPE:
+ if (id != BCM590XX_PMUID_BCM59054) {
+ dev_err(bcm590xx->dev,
+ "Incorrect ID for BCM59054: expected %x, got %x. Check your DT compatible.\n",
+ BCM590XX_PMUID_BCM59054, id);
+ return -EINVAL;
+ }
+ break;
+ case BCM59056_TYPE:
+ if (id != BCM590XX_PMUID_BCM59056) {
+ dev_err(bcm590xx->dev,
+ "Incorrect ID for BCM59056: expected %x, got %x. Check your DT compatible.\n",
+ BCM590XX_PMUID_BCM59056, id);
+ return -EINVAL;
+ }
+ break;
+ default:
+ dev_err(bcm590xx->dev,
+ "Unknown device type, this is a driver bug!\n");
+ return -EINVAL;
+ }
+
+ /* Get PMU revision and store it in the info struct */
+ ret = regmap_read(bcm590xx->regmap_pri, BCM590XX_PMUREV, &rev);
+ if (ret) {
+ dev_err(bcm590xx->dev, "failed to read PMU revision: %d\n",
+ ret);
+ return ret;
+ }
+
+ bcm590xx->rev_dig = (rev & BCM590XX_PMUREV_DIG_MASK)
+ >> BCM590XX_PMUREV_DIG_SHIFT;
+
+ bcm590xx->rev_ana = (rev & BCM590XX_PMUREV_ANA_MASK)
+ >> BCM590XX_PMUREV_ANA_SHIFT;
+
+ dev_info(bcm590xx->dev, "PMU ID 0x%x (%s), revision: dig %d ana %d",
+ id, bcm590xx_names[bcm590xx->dev_type],
+ bcm590xx->rev_dig, bcm590xx->rev_ana);
+
+ return 0;
+}
+
static int bcm590xx_i2c_probe(struct i2c_client *i2c_pri)
{
struct bcm590xx *bcm590xx;
@@ -78,6 +155,10 @@ static int bcm590xx_i2c_probe(struct i2c_client *i2c_pri)
goto err;
}
+ ret = bcm590xx_parse_version(bcm590xx);
+ if (ret)
+ goto err;
+
ret = devm_mfd_add_devices(&i2c_pri->dev, -1, bcm590xx_devs,
ARRAY_SIZE(bcm590xx_devs), NULL, 0, NULL);
if (ret < 0) {
diff --git a/include/linux/mfd/bcm590xx.h b/include/linux/mfd/bcm590xx.h
index 83e62b5a6c45805bc2acc88ccc7119d86f9ac424..ba1cb3716b383d7a2ee396e0595a3b94d3b4ca5e 100644
--- a/include/linux/mfd/bcm590xx.h
+++ b/include/linux/mfd/bcm590xx.h
@@ -32,6 +32,20 @@ struct bcm590xx {
struct regmap *regmap_pri;
struct regmap *regmap_sec;
unsigned int id;
+
+ /* Chip revision, read from PMUREV reg */
+ u8 rev_dig;
+ u8 rev_ana;
};
+/* Known chip revision IDs */
+#define BCM59054_REV_DIG_A1 1
+#define BCM59054_REV_ANA_A1 2
+
+#define BCM59056_REV_DIG_A0 1
+#define BCM59056_REV_ANA_A0 1
+
+#define BCM59056_REV_DIG_B0 2
+#define BCM59056_REV_ANA_B0 2
+
#endif /* __LINUX_MFD_BCM590XX_H */
--
2.48.1
Powered by blists - more mailing lists