History

Merge tag 'soc-fixes-7.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

Pull SoC fixes from Arnd Bergmann: "These are three last-minute fixes for the 7.2 release, though nothing alarming: - one error handling fix for optee firmware - incorrect i2c data for the apple M3 that was added in 7.2 - a boot time warning fix for nvidia tegra" * tag 'soc-fixes-7.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: arm64: tegra: Add EL2 virtual timer interrupt for Tegra194 arm64: dts: apple: t8122: Fix I2C resources optee: ffa: Add NULL check in optee_ffa_lend_protmem

Linus Torvalds committed 2 months ago

Commit 3eb40772 parents 5e060ff e36c0673 files · +20 −15Browse files

Unified · Split

3 files
  1. arch/arm64/boot/dts/apple/t8122.dtsi +15 −15
  2. arch/arm64/boot/dts/nvidia/tegra194.dtsi +2 −0
  3. drivers/tee/optee/ffa_abi.c +3 −0
arch/arm64/boot/dts/apple/t8122.dtsi+15−15
@@ -186,12 +186,12 @@ · 185 unmodified lines
186 /* Required to get >32-bit DMA via DARTs */186 /* Required to get >32-bit DMA via DARTs */
187 dma-ranges = <0 0 0 0 0xffffffff 0xffffc000>;187 dma-ranges = <0 0 0 0 0xffffffff 0xffffc000>;
188 188
189 i2c0: i2c@235010000 {189 i2c0: i2c@2a1010000 {
190 compatible = "apple,t8122-i2c", "apple,t8103-i2c";190 compatible = "apple,t8122-i2c", "apple,t8103-i2c";
191 reg = <0x2 0x35010000 0x0 0x4000>;191 reg = <0x2 0xa1010000 0x0 0x4000>;
192 clocks = <&clkref>;192 clocks = <&clkref>;
193 interrupt-parent = <&aic>;193 interrupt-parent = <&aic>;
194 interrupts = <AIC_IRQ 761 IRQ_TYPE_LEVEL_HIGH>;194 interrupts = <AIC_IRQ 780 IRQ_TYPE_LEVEL_HIGH>;
195 pinctrl-0 = <&i2c0_pins>;195 pinctrl-0 = <&i2c0_pins>;
196 pinctrl-names = "default";196 pinctrl-names = "default";
197 #address-cells = <0x1>;197 #address-cells = <0x1>;
@@ -200,12 +200,12 @@ · 2 unmodified lines
200 status = "disabled";200 status = "disabled";
201 };201 };
202 202
203 i2c1: i2c@235014000 {203 i2c1: i2c@2a1014000 {
204 compatible = "apple,t8122-i2c", "apple,t8103-i2c";204 compatible = "apple,t8122-i2c", "apple,t8103-i2c";
205 reg = <0x2 0x35014000 0x0 0x4000>;205 reg = <0x2 0xa1014000 0x0 0x4000>;
206 clocks = <&clkref>;206 clocks = <&clkref>;
207 interrupt-parent = <&aic>;207 interrupt-parent = <&aic>;
208 interrupts = <AIC_IRQ 762 IRQ_TYPE_LEVEL_HIGH>;208 interrupts = <AIC_IRQ 781 IRQ_TYPE_LEVEL_HIGH>;
209 pinctrl-0 = <&i2c1_pins>;209 pinctrl-0 = <&i2c1_pins>;
210 pinctrl-names = "default";210 pinctrl-names = "default";
211 #address-cells = <0x1>;211 #address-cells = <0x1>;
@@ -214,12 +214,12 @@ · 2 unmodified lines
214 status = "disabled";214 status = "disabled";
215 };215 };
216 216
217 i2c2: i2c@235018000 {217 i2c2: i2c@2a1018000 {
218 compatible = "apple,t8122-i2c", "apple,t8103-i2c";218 compatible = "apple,t8122-i2c", "apple,t8103-i2c";
219 reg = <0x2 0x35018000 0x0 0x4000>;219 reg = <0x2 0xa1018000 0x0 0x4000>;
220 clocks = <&clkref>;220 clocks = <&clkref>;
221 interrupt-parent = <&aic>;221 interrupt-parent = <&aic>;
222 interrupts = <AIC_IRQ 763 IRQ_TYPE_LEVEL_HIGH>;222 interrupts = <AIC_IRQ 782 IRQ_TYPE_LEVEL_HIGH>;
223 pinctrl-0 = <&i2c2_pins>;223 pinctrl-0 = <&i2c2_pins>;
224 pinctrl-names = "default";224 pinctrl-names = "default";
225 #address-cells = <0x1>;225 #address-cells = <0x1>;
@@ -228,12 +228,12 @@ · 2 unmodified lines
228 status = "disabled";228 status = "disabled";
229 };229 };
230 230
231 i2c3: i2c@23501c000 {231 i2c3: i2c@2a101c000 {
232 compatible = "apple,t8122-i2c", "apple,t8103-i2c";232 compatible = "apple,t8122-i2c", "apple,t8103-i2c";
233 reg = <0x2 0x3501c000 0x0 0x4000>;233 reg = <0x2 0xa101c000 0x0 0x4000>;
234 clocks = <&clkref>;234 clocks = <&clkref>;
235 interrupt-parent = <&aic>;235 interrupt-parent = <&aic>;
236 interrupts = <AIC_IRQ 764 IRQ_TYPE_LEVEL_HIGH>;236 interrupts = <AIC_IRQ 783 IRQ_TYPE_LEVEL_HIGH>;
237 pinctrl-0 = <&i2c3_pins>;237 pinctrl-0 = <&i2c3_pins>;
238 pinctrl-names = "default";238 pinctrl-names = "default";
239 #address-cells = <0x1>;239 #address-cells = <0x1>;
@@ -242,12 +242,12 @@ · 2 unmodified lines
242 status = "disabled";242 status = "disabled";
243 };243 };
244 244
245 i2c4: i2c@235020000 {245 i2c4: i2c@2a1020000 {
246 compatible = "apple,t8122-i2c", "apple,t8103-i2c";246 compatible = "apple,t8122-i2c", "apple,t8103-i2c";
247 reg = <0x2 0x35020000 0x0 0x4000>;247 reg = <0x2 0xa1020000 0x0 0x4000>;
248 clocks = <&clkref>;248 clocks = <&clkref>;
249 interrupt-parent = <&aic>;249 interrupt-parent = <&aic>;
250 interrupts = <AIC_IRQ 765 IRQ_TYPE_LEVEL_HIGH>;250 interrupts = <AIC_IRQ 784 IRQ_TYPE_LEVEL_HIGH>;
251 pinctrl-0 = <&i2c4_pins>;251 pinctrl-0 = <&i2c4_pins>;
252 pinctrl-names = "default";252 pinctrl-names = "default";
253 #address-cells = <0x1>;253 #address-cells = <0x1>;
arch/arm64/boot/dts/nvidia/tegra194.dtsi+2−0
@@ -3176,6 +3176,8 @@ · 3175 unmodified lines
3176 <GIC_PPI 113176 <GIC_PPI 11
3177 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,3177 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
3178 <GIC_PPI 103178 <GIC_PPI 10
3179 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
3180 <GIC_PPI 15
3179 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;3181 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
3180 interrupt-parent = <&gic>;3182 interrupt-parent = <&gic>;
3181 always-on;3183 always-on;
drivers/tee/optee/ffa_abi.c+3−0
@@ -698,6 +698,9 @@ static int optee_ffa_lend_protmem(struct optee *optee, struct tee_shm *protmem, · 697 unmodified lines
698 int rc;698 int rc;
699 699
700 mem_attr = kzalloc_objs(*mem_attr, ma_count);700 mem_attr = kzalloc_objs(*mem_attr, ma_count);
701 if (!mem_attr)
702 return -ENOMEM;
703
701 for (n = 0; n < ma_count; n++) {704 for (n = 0; n < ma_count; n++) {
702 mem_attr[n].receiver = mem_attrs[n] & U16_MAX;705 mem_attr[n].receiver = mem_attrs[n] & U16_MAX;
703 mem_attr[n].attrs = mem_attrs[n] >> 16;706 mem_attr[n].attrs = mem_attrs[n] >> 16;