LLCC: Support for Broadcast_AND region

The LLCC driver in SM8450, SM8550 and SM8650 have a new register space for Broadcast_AND region. This is used to check that all channels have bit set to "1", mainly in SCID activation/deactivation.

Previously we were mapping only the Broadcast_OR region assuming there was only one broadcast register region. Now we also map Broadcast_AND region.

Signed-off-by Unnathi Chalicheemala <[email protected]>

Reviewed-by Krzysztof Kozlowski <[email protected]>

---
 .../devicetree/bindings/cache/qcom,llcc.yaml  | 41 +++++++++++++++----
 1 file changed, 33 insertions(+), 8 deletions(-)

Mapping Broadcast_AND region for LLCC in SM8450.

Quoted 1 line · Unnathi Chalicheemala

Mapping Broadcast_AND region for LLCC in SM8450.

Why?

And why your DTS is in the middle of driver changes? Driver cannot depend on DTS - you are now breaking all existing boards and users.

Best regards,
Krzysztof

Quoted 8 lines · Krzysztof Kozlowski

Quoted 1 line · Unnathi Chalicheemala

Mapping Broadcast_AND region for LLCC in SM8450.

Why?

And why your DTS is in the middle of driver changes? Driver cannot depend on DTS - you are now breaking all existing boards and users.

I was following a similar patch which has DT and driver changes in the same patchset:
https://lore.kernel.org/all/[email protected]/

The AND region was added in the IP block in SM8450, but was not added to the DT or driver. That is why I included both in the same patchset - if you think the DT changes should be separate I can correct it in the next version.

Thanks a lot for taking the time to review Krzysztof.

Quoted 4 lines

Best regards,
Krzysztof

Define new regmap structure for Broadcast_AND region and initialize regmap for Broadcast_AND region when HW block version
is greater than 4.1 for backwards compatibility.

Switch from broadcast_OR to broadcast_AND region for checking status bit 1 as Broadcast_OR region checks only for bit 0.

Define new regmap structure for Broadcast_AND region and initialize regmap for Broadcast_AND region when HW block version
is greater than 4.1 for backwards compatibility.

Switch from broadcast_OR to broadcast_AND region for checking status bit 1 as Broadcast_OR region checks only for bit 0.

Signed-off-by Unnathi Chalicheemala <[email protected]>

---
 drivers/soc/qcom/llcc-qcom.c       | 22 +++++++++++++++++++---
 include/linux/soc/qcom/llcc-qcom.h |  4 +++-
 2 files changed, 22 insertions(+), 4 deletions(-)

drivers/soc/qcom/llcc-qcom.c +0 -1

index 4ca88eaebf06..fbd2542cd4c5 100644
@@ -849,9 +849,14 @@ static int llcc_update_act_ctrl(u32 sid,
 		return ret;
 
 	if (drv_data->version >= LLCC_VERSION_4_1_0_0) {
-		ret = regmap_read_poll_timeout(drv_data->bcast_regmap, status_reg,

Quoted 3 lines · Unnathi Chalicheemala

Define new regmap structure for Broadcast_AND region and initialize regmap for Broadcast_AND region when HW block version
is greater than 4.1 for backwards compatibility.

Are they actually separate regions and not a single contiguous one?

Quoted 19 lines

Switch from broadcast_OR to broadcast_AND region for checking status bit 1 as Broadcast_OR region checks only for bit 0.

Signed-off-by Unnathi Chalicheemala <[email protected]>

---
 drivers/soc/qcom/llcc-qcom.c       | 22 +++++++++++++++++++---
 include/linux/soc/qcom/llcc-qcom.h |  4 +++-
 2 files changed, 22 insertions(+), 4 deletions(-)

drivers/soc/qcom/llcc-qcom.c +0 -1

index 4ca88eaebf06..fbd2542cd4c5 100644
@@ -849,9 +849,14 @@ static int llcc_update_act_ctrl(u32 sid,
 		return ret;
 
 	if (drv_data->version >= LLCC_VERSION_4_1_0_0) {
-		ret = regmap_read_poll_timeout(drv_data->bcast_regmap, status_reg,

drivers/soc/qcom/llcc-qcom.c static int llcc_update_act_ctrl(u32 sid, · line 859

Quoted 10 lines

drivers/soc/qcom/llcc-qcom.c +8 -2

-				      slice_status, (slice_status & ACT_COMPLETE),
-				      0, LLCC_STATUS_READ_DELAY);
+		if (!drv_data->bcast_and_regmap)
+			ret = regmap_read_poll_timeout(drv_data->bcast_regmap, status_reg,
+					slice_status, (slice_status & ACT_COMPLETE),
+					0, LLCC_STATUS_READ_DELAY);
+		else
+			ret = regmap_read_poll_timeout(drv_data->bcast_and_regmap, status_reg,
+					slice_status, (slice_status & ACT_COMPLETE),
+					0, LLCC_STATUS_READ_DELAY);

struct regmap *regmap = drv_data->bcast_and_regmap ?: bcast_regmap;

?

drivers/soc/qcom/llcc-qcom.c static int qcom_llcc_probe(struct platform_device *pdev) · line 1290

Quoted 2 lines

drivers/soc/qcom/llcc-qcom.c +1 -0

+	if (drv_data->version >= LLCC_VERSION_4_1_0_0) {

This check is rather redundant.. If there's no such region in hardware, it won't be described, and as such the _get()s will return some sort of an error.

Might as well make it a comment that it's intended for >=v4.1 and definitely leave a comment for the next guy that there's a backwards compatibility quirk involved..

Konrad

This series adds:
1. Device tree register mapping for Broadcast_AND region in SM8450, SM8550, SM8650.
2. LLCC driver updates to reflect addition of Broadcast_AND regmap.

To support CSR programming, a broadcast interface is used to program all channels in a single command. Until SM8450 there was only one broadcast region (Broadcast_OR) used to broadcast write and check for status bit
0. From SM8450 onwards another broadcast region (Broadcast_AND) has been added which checks for status bit 1.

This series updates the device trees from SM8450 onwards to have a mapping to this Broadcast_AND region. It also updates the llcc_drv_data structure with a regmap for Broadcast_AND region and corrects the broadcast region used to check for status bit 1.

Merging strategy
----------------

All patches should be merged due to LLCC DeviceTree/driver dependency.

Quoted 16 lines · Unnathi Chalicheemala

This series adds:
1. Device tree register mapping for Broadcast_AND region in SM8450, SM8550, SM8650.
2. LLCC driver updates to reflect addition of Broadcast_AND regmap.

To support CSR programming, a broadcast interface is used to program all channels in a single command. Until SM8450 there was only one broadcast region (Broadcast_OR) used to broadcast write and check for status bit
0. From SM8450 onwards another broadcast region (Broadcast_AND) has been added which checks for status bit 1.

This series updates the device trees from SM8450 onwards to have a mapping to this Broadcast_AND region. It also updates the llcc_drv_data structure with a regmap for Broadcast_AND region and corrects the broadcast region used to check for status bit 1.

Quoted 4 lines

Merging strategy
----------------

All patches should be merged due to LLCC DeviceTree/driver dependency.

Dependency? Sorry, there cannot be a dependency between DTS and driver. Please fix your patchset.

Best regards,
Krzysztof

Quoted 22 lines · Krzysztof Kozlowski

Quoted 20 lines · Unnathi Chalicheemala

This series adds:
1. Device tree register mapping for Broadcast_AND region in SM8450, SM8550, SM8650.
2. LLCC driver updates to reflect addition of Broadcast_AND regmap.

To support CSR programming, a broadcast interface is used to program all channels in a single command. Until SM8450 there was only one broadcast region (Broadcast_OR) used to broadcast write and check for status bit
0. From SM8450 onwards another broadcast region (Broadcast_AND) has been added which checks for status bit 1.

This series updates the device trees from SM8450 onwards to have a mapping to this Broadcast_AND region. It also updates the llcc_drv_data structure with a regmap for Broadcast_AND region and corrects the broadcast region used to check for status bit 1.

Merging strategy
----------------

All patches should be merged due to LLCC DeviceTree/driver dependency.

Quoted 3 lines

Dependency? Sorry, there cannot be a dependency between DTS and driver. Please fix your patchset.

This is the suggested merge strategy. But I have updated the driver in v2 to ensure that applying the driver patch alone will work with existing DTs. Sorry for being unclear; "should" does make it sound like there is a hard dependency.