net: fix net-next
Subsystems (6)
cover net: fix net-next
David: These patches resolve two issues caused by the IPA driver
being incorporated into net-next. I hope you will merge them as soon as you can.
The IPA driver was merged into net-next last week, but two problems arise as a result, affecting net-next and linux-next:
- The patch that defines field_max() was not incorporated into net-next, but is required by the IPA code
- A patch that updates "sdm845.dtsi" *was* incorporated into net-next, but other changes to that file in the Qualcomm for-next branch lead to errors
Bjorn has agreed to incorporate the DTS file change into the Qualcomm tree after it is reverted from net-next.
-Alex
Alex Elder (2):
bitfield.h: add FIELD_MAX() and field_max() Revert "arm64: dts: sdm845: add IPA information"
arch/arm64/boot/dts/qcom/sdm845.dtsi | 51 ---------------------------- include/linux/bitfield.h | 14 ++++++++ 2 files changed, 14 insertions(+), 51 deletions(-)
Signature · 1 line
2.20.1
PATCH 1/2 bitfield.h: add FIELD_MAX() and field_max()
Define FIELD_MAX(), which supplies the maximum value that can be represented by a field value. Define field_max() as well, to go along with the lower-case forms of the field mask functions.
--- include/linux/bitfield.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
include/linux/bitfield.h +14 -0
@@ -55,6 +55,19 @@ (1ULL << __bf_shf(_mask))); \ }) +/** +* FIELD_MAX() - produce the maximum value representable by a field +* @_mask: shifted mask defining the field's length and position +* +* FIELD_MAX() returns the maximum value that can be held in the field +* specified by @_mask. +*/ +#define FIELD_MAX (_mask) \ + ({ \ + __BF_FIELD_CHECK(_mask, 0ULL, 0ULL, "FIELD_MAX: "); \ + (typeof(_mask))((_mask) >> __bf_shf(_mask)); \ + }) +/** * FIELD_FIT() - check if value fits in the field * @_mask: shifted mask defining the field's length and position
@@ -110,6 +123,7 @@ static __always_inline u64 field_mask(u64 field) {return field /field_multiplier (field); } +#define field_max (field) ((typeof(field))field_mask(field))#define ____MAKE_OP (type,base,to,from) \ static __always_inline __##type type##_encode_bits(base v, base field) \ { \
Signature · 1 line
2.20.1
PATCH 2/2 Revert "arm64: dts: sdm845: add IPA information"
In reply to Alex ElderThis reverts commit 9cc5ae125f0eaee471bc87fb5cbf29385fd9272a.
This commit:
b303f9f0050b arm64: dts: sdm845: Redefine interconnect provider DT nodes
found in the Qualcomm for-next tree removes/redefines the interconnect provider node(s) used for IPA. I'm not sure whether it technically conflicts with the IPA change to "sdm845.dtsi" in for-next, but it renders it broken.
Revert this commit in the for-next tree, with the plan to incorporate it into the Qualcomm tree instead.
--- arch/arm64/boot/dts/qcom/sdm845.dtsi | 51 ---------------------------- 1 file changed, 51 deletions(-)
arch/arm64/boot/dts/qcom/sdm845.dtsi +0 -51
@@ -675,17 +675,6 @@ interrupt-controller; #interrupt-cells = <2>; }; - - ipa_smp2p_out: ipa-ap-to-modem { - qcom,entry-name = "ipa"; - #qcom,smem-state-cells = <1>; - }; - - ipa_smp2p_in: ipa-modem-to-ap { - qcom,entry-name = "ipa"; - interrupt-controller; - #interrupt-cells = <2>; - }; }; smp2p-slpi {
@@ -1446,46 +1435,6 @@ }; }; - ipa@1e40000 { - compatible = "qcom,sdm845-ipa"; - - modem-init; - modem-remoteproc = <&mss_pil>; - - reg = <0 0x1e40000 0 0x7000>, - <0 0x1e47000 0 0x2000>, - <0 0x1e04000 0 0x2c000>; - reg-names = "ipa-reg", - "ipa-shared", - "gsi"; - - interrupts-extended = - <&intc 0 311 IRQ_TYPE_EDGE_RISING>, - <&intc 0 432 IRQ_TYPE_LEVEL_HIGH>, - <&ipa_smp2p_in 0 IRQ_TYPE_EDGE_RISING>, - <&ipa_smp2p_in 1 IRQ_TYPE_EDGE_RISING>; - interrupt-names = "ipa", - "gsi", - "ipa-clock-query", - "ipa-setup-ready"; - - clocks = <&rpmhcc RPMH_IPA_CLK>; - clock-names = "core"; - - interconnects = - <&rsc_hlos MASTER_IPA &rsc_hlos SLAVE_EBI1>, - <&rsc_hlos MASTER_IPA &rsc_hlos SLAVE_IMEM>, - <&rsc_hlos MASTER_APPSS_PROC &rsc_hlos SLAVE_IPA_CFG>; - interconnect-names = "memory", - "imem", - "config"; - - qcom,smem-states = <&ipa_smp2p_out 0>, - <&ipa_smp2p_out 1>; - qcom,smem-state-names = "ipa-clock-enabled-valid", - "ipa-clock-enabled"; - }; - tcsr_mutex_regs: syscon@1f40000 { compatible = "syscon"; reg = <0 0x01f40000 0 0x40000>;
Signature · 1 line
2.20.1
David Miller
maintainerFrom: Alex Elder <[email protected]>
Date: Thu, 12 Mar 2020 11:44:26 -0500
Quoted 12 lines
David: These patches resolve two issues caused by the IPA driver
being incorporated into net-next. I hope you will merge them as soon as you can.The IPA driver was merged into net-next last week, but two problems arise as a result, affecting net-next and linux-next:
- The patch that definesfield_max()was not incorporated into net-next, but is required by the IPA code
- A patch that updates "sdm845.dtsi" *was* incorporated into net-next, but other changes to that file in the Qualcomm for-next branch lead to errors
Quoted 2 lines
Bjorn has agreed to incorporate the DTS file change into the Qualcomm tree after it is reverted from net-next.
Series applied, thanks Alex.