Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Colin Foster <colin.foster@in-advantage.com>
To:     linux-kernel@vger.kernel.org
Cc:     "Rafael J. Wysocki" <rafael@kernel.org>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Mark Brown <broonie@kernel.org>
Subject: [RFC v1 2/2] regmap: allow a defined reg_base to be added to every address
Date:   Sun, 13 Mar 2022 15:45:24 -0700
Message-Id: <20220313224524.399947-3-colin.foster@in-advantage.com>
In-Reply-To: <20220313224524.399947-1-colin.foster@in-advantage.com>
References: <20220313224524.399947-1-colin.foster@in-advantage.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?qntIW992OyZ09q4O27EdCPEpK/c3JGFcUk6Sx+1pL8fEXg+eWflUgIVMVg/h?=
 =?us-ascii?Q?WhWH1R/uFk2sV9t9NxWEG+UBv6taDZPFWMIocmdASGi3ctJY2l2ax3t8sAdu?=
 =?us-ascii?Q?Na1Cml6ZhJP5oWPRFVuAHEHvUta5ysA1p7g3CHlLdL5cSXmBf7gnQcYcMDlM?=
 =?us-ascii?Q?6HDcki0vA930g9hnoUJwVsjWXOn5YeSo4BRfxZz3c5CUqEOMlqQlt7ztDg2J?=
 =?us-ascii?Q?HFM387tXFAiuIWwCDiomia/KM5WdzcTtwmi5yAqA9cwq3CDaGIOi+BRg4Dd7?=
 =?us-ascii?Q?pL0l3FNM5h5xXPcjQqnHRs8SGOkTorHxcC/MW41s8a02XPJSnKNodlI81nR6?=
 =?us-ascii?Q?pSBdbWQuvgz2hrJtsBrJIR2lDKGBCfxwWrXuAfHZHWGVB8tyAjlavbzK2DW5?=
 =?us-ascii?Q?ok9TMNncGX2oF6vX7/nayqK5lkJ6q8KeL46yWPXM0LZN6AnVW4R5bU2dOktt?=
 =?us-ascii?Q?gR27laqX8NPljjuGAsnbWZgsE3U0ojlJiKYBTDyMpi+SBI5edg7XJCe234W8?=
 =?us-ascii?Q?KoxhuYcm4qj2kRhaufs2UC544R4PGP5Ql38y+GZ4jt5fYmQv4o/88huQzlxX?=
 =?us-ascii?Q?/2i7URBzvIQvZEUqH50iKixzaNPCC3VHjma1gfybZ6LmTKkvCnzVhzjnka4I?=
 =?us-ascii?Q?gxUv0jdRO67+BB76fIqOdVZ+XbcsWFhECOOZIwApKqgftO5Bc8p6D5fpGksY?=
 =?us-ascii?Q?E5LohHPFlzT+xHx2mecy0UVyoKWZg92QHfT/VziBwgzSDBhRhfx7OMfdxn8Q?=
 =?us-ascii?Q?y6zAMZrmjwaKu+x7bxiEthNyvhGkOtLoUtKebG1jhvZqXCVnWofxWqdv3k//?=
 =?us-ascii?Q?P6Gv8y8ZUeflaw4XZIht/xHracGbcIV6xzU19vMolxfFgT/GTSfxmTAGcdXG?=
 =?us-ascii?Q?7YrzHCYIJ9Frp4Odzyn8iNtTFRgtYBb5P4d7kpV6MA80frEbOV8V5zDU9uYg?=
 =?us-ascii?Q?lgj4TrBOkDWV3QKEMN6uaQtyh6efri7ouRfGOUq16EwtY4WfFk69H6MC1SPt?=
 =?us-ascii?Q?kD0egg4n9aIWZqmyPJ+HCmpV8S3YUh6JB0JDMbj2XG/rawblaMr2ybgYcmBn?=
 =?us-ascii?Q?ymH4BbH5bFW/X7EHEtZGpTlNQGbGOuXTMPMlnNneclZBWJ20X3Ps/o6fj+oU?=
 =?us-ascii?Q?NzzTc3Up/i03l1FqTMtilx4fML58AQovS2Cw/qqlgHrqTmi5MROg8Mk6GgHG?=
 =?us-ascii?Q?gSjLy/jLfRi1sFA4DI814gt0yB/BR9JnOHXRq/mYWiWWEiLOBqmYEP6k71zQ?=
 =?us-ascii?Q?KuCXGRRYAk5Og8hNRYEo1wAS1lalHAwOuUVPGWwdtgnaE7ZrpvFxvSNpzMCr?=
 =?us-ascii?Q?QZFbeT723BBgWJoJ8izuQ142UPphe4rxkGkPNAC37Mmxq//dmUFhZddjEjFr?=
 =?us-ascii?Q?CptvI1RYESETcDKFStbK9RFLBvkALmDuj/2Gk4ek4t4K+mwx45PUzc0ZUDSY?=
 =?us-ascii?Q?bUnmTcewBDrWDKJc/uxDttM7Zm+U8A3rOwMoRqUK6d6myskLU6OsP4GOsQCz?=
 =?us-ascii?Q?7cpeumqSbXSiSnxpnVxzJZodbgnu4bsdzptMDIeWzIeV5aK6CNteg9y17y0J?=
 =?us-ascii?Q?0n7+CKzafElAgxVQdGyHIFpT92/YkC/Mbp4aAF9rVHDlBov1ymG3hWYMCPFc?=
 =?us-ascii?Q?2uuyoUcD+0QWl/TGsHKQCZMsW4tT28Z0UoH8WwECugdYQ06VUDimdghQtoGh?=
 =?us-ascii?Q?ICnDC0414YpyOFm0NNy2Y5jcy8Q=3D?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7ada5f06-aa0a-4440-fb74-08da05433169
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2022 22:45:37.8354
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 48e842ca-fbd8-4633-a79d-0c955a7d3aae
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 0Y446/uTlmYnPMKZS1lH1oqm6KH8KozBlNIGtxN3TFzZKTDJMs9q8TPY61xiDpH9z0TilP9WSOQ9rPI8XJ33qNbB7URm5YX8Obr2PuxdYho=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR1001MB2379
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,
        T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

There's an inconsistency that arises when a register set can be accessed
internally via MMIO, or externally via SPI. The VSC7514 chip allows both
modes of operation. When internally accessed, the system utilizes __iomem,
devm_ioremap_resource, and devm_regmap_init_mmio.

For SPI it isn't possible to utilize memory-mapped IO. To properly operate,
the resource base must be added to the register before every operation.

Signed-off-by: Colin Foster <colin.foster@in-advantage.com>
---
 drivers/base/regmap/internal.h | 1 +
 drivers/base/regmap/regmap.c   | 6 ++++++
 include/linux/regmap.h         | 3 +++
 3 files changed, 10 insertions(+)

diff --git a/drivers/base/regmap/internal.h b/drivers/base/regmap/internal.h
index 88f710e7ce31..b4df36c7b17d 100644
--- a/drivers/base/regmap/internal.h
+++ b/drivers/base/regmap/internal.h
@@ -63,6 +63,7 @@ struct regmap {
 	regmap_unlock unlock;
 	void *lock_arg; /* This is passed to lock/unlock functions */
 	gfp_t alloc_flags;
+	unsigned int reg_base;
 
 	struct device *dev; /* Device we do I/O on */
 	void *work_buf;     /* Scratch buffer used to format I/O */
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 1c7c6d6361af..5e12f7cb5147 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -821,6 +821,8 @@ struct regmap *__regmap_init(struct device *dev,
 	else
 		map->alloc_flags = GFP_KERNEL;
 
+	map->reg_base = config->reg_base;
+
 	map->format.reg_bytes = DIV_ROUND_UP(config->reg_bits, 8);
 	map->format.pad_bytes = config->pad_bits / 8;
 	map->format.reg_downshift = config->reg_downshift;
@@ -1736,6 +1738,7 @@ static int _regmap_raw_write_impl(struct regmap *map, unsigned int reg,
 			return ret;
 	}
 
+	reg += map->reg_base;
 	reg >>= map->format.reg_downshift;
 	map->format.format_reg(map->work_buf, reg, map->reg_shift);
 	regmap_set_work_buf_flag_mask(map, map->format.reg_bytes,
@@ -1907,6 +1910,7 @@ static int _regmap_bus_formatted_write(void *context, unsigned int reg,
 			return ret;
 	}
 
+	reg += map->reg_base;
 	reg >>= map->format.reg_downshift;
 	map->format.format_write(map, reg, val);
 
@@ -2349,6 +2353,7 @@ static int _regmap_raw_multi_reg_write(struct regmap *map,
 		unsigned int reg = regs[i].reg;
 		unsigned int val = regs[i].def;
 		trace_regmap_hw_write_start(map, reg, 1);
+		reg += map->reg_base;
 		reg >>= map->format.reg_downshift;
 		map->format.format_reg(u8, reg, map->reg_shift);
 		u8 += reg_bytes + pad_bytes;
@@ -2677,6 +2682,7 @@ static int _regmap_raw_read(struct regmap *map, unsigned int reg, void *val,
 			return ret;
 	}
 
+	reg += map->reg_base;
 	reg >>= map->format.reg_downshift;
 	map->format.format_reg(map->work_buf, reg, map->reg_shift);
 	regmap_set_work_buf_flag_mask(map, map->format.reg_bytes,
diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index 40fb9399add6..de81a94d7b30 100644
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -239,6 +239,8 @@ typedef void (*regmap_unlock)(void *);
  *              used.
  * @reg_downshift: The number of bits to downshift the register before
  *		   performing any operations.
+ * @reg_base: Value to be added to every register address before performing any
+ *	      operation.
  * @pad_bits: Number of bits of padding between register and value.
  * @val_bits: Number of bits in a register value, mandatory.
  *
@@ -363,6 +365,7 @@ struct regmap_config {
 	int reg_bits;
 	int reg_stride;
 	int reg_downshift;
+	unsigned int reg_base;
 	int pad_bits;
 	int val_bits;
 
-- 
2.25.1