Skip to content
This repository has been archived by the owner on Oct 31, 2024. It is now read-only.

Commit

Permalink
Merge tag 'v6.9.12' into 6.9
Browse files Browse the repository at this point in the history 
This is the 6.9.12 stable release
  • Loading branch information
@xanmod
xanmod committed Jul 28, 2024
2 parents d9c0ea3 + bb67b27 commit 9a8b5f6
Show file tree
Hide file tree
Showing 27 changed files with 198 additions and 55 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
VERSION = 6
PATCHLEVEL = 9
SUBLEVEL = 11
SUBLEVEL = 12
EXTRAVERSION =
NAME = Hurr durr I'ma ninja sloth

Expand Down
1 change: 1 addition & 0 deletions arch/arm64/boot/dts/qcom/ipq6018.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -685,6 +685,7 @@
clocks = <&xo>;
clock-names = "ref";
tx-fifo-resize;
snps,parkmode-disable-ss-quirk;
snps,is-utmi-l1-suspend;
snps,hird-threshold = /bits/ 8 <0x0>;
snps,dis_u2_susphy_quirk;
Expand Down
2 changes: 2 additions & 0 deletions arch/arm64/boot/dts/qcom/ipq8074.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -647,6 +647,7 @@
interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
phys = <&qusb_phy_0>, <&ssphy_0>;
phy-names = "usb2-phy", "usb3-phy";
snps,parkmode-disable-ss-quirk;
snps,is-utmi-l1-suspend;
snps,hird-threshold = /bits/ 8 <0x0>;
snps,dis_u2_susphy_quirk;
Expand Down Expand Up @@ -696,6 +697,7 @@
interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;
phys = <&qusb_phy_1>, <&ssphy_1>;
phy-names = "usb2-phy", "usb3-phy";
snps,parkmode-disable-ss-quirk;
snps,is-utmi-l1-suspend;
snps,hird-threshold = /bits/ 8 <0x0>;
snps,dis_u2_susphy_quirk;
Expand Down
1 change: 1 addition & 0 deletions arch/arm64/boot/dts/qcom/msm8996.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3061,6 +3061,7 @@
snps,dis_u2_susphy_quirk;
snps,dis_enblslpm_quirk;
snps,is-utmi-l1-suspend;
snps,parkmode-disable-ss-quirk;
tx-fifo-resize;
};
};
Expand Down
1 change: 1 addition & 0 deletions arch/arm64/boot/dts/qcom/msm8998.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2154,6 +2154,7 @@
interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>;
snps,dis_u2_susphy_quirk;
snps,dis_enblslpm_quirk;
snps,parkmode-disable-ss-quirk;
phys = <&qusb2phy>, <&usb3phy>;
phy-names = "usb2-phy", "usb3-phy";
snps,has-lpm-erratum;
Expand Down
13 changes: 12 additions & 1 deletion arch/arm64/boot/dts/qcom/qrb2210-rb1.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,17 @@
};
};

i2c2_gpio: i2c {
compatible = "i2c-gpio";

sda-gpios = <&tlmm 6 GPIO_ACTIVE_HIGH>;
scl-gpios = <&tlmm 7 GPIO_ACTIVE_HIGH>;
#address-cells = <1>;
#size-cells = <0>;

status = "disabled";
};

leds {
compatible = "gpio-leds";

Expand Down Expand Up @@ -199,7 +210,7 @@
status = "okay";
};

&i2c2 {
&i2c2_gpio {
clock-frequency = <400000>;
status = "okay";

Expand Down
13 changes: 12 additions & 1 deletion arch/arm64/boot/dts/qcom/qrb4210-rb2.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,17 @@
};
};

i2c2_gpio: i2c {
compatible = "i2c-gpio";

sda-gpios = <&tlmm 6 GPIO_ACTIVE_HIGH>;
scl-gpios = <&tlmm 7 GPIO_ACTIVE_HIGH>;
#address-cells = <1>;
#size-cells = <0>;

status = "disabled";
};

leds {
compatible = "gpio-leds";

Expand Down Expand Up @@ -190,7 +201,7 @@
};
};

&i2c2 {
&i2c2_gpio {
clock-frequency = <400000>;
status = "okay";

Expand Down
1 change: 1 addition & 0 deletions arch/arm64/boot/dts/qcom/sc7180.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3063,6 +3063,7 @@
iommus = <&apps_smmu 0x540 0>;
snps,dis_u2_susphy_quirk;
snps,dis_enblslpm_quirk;
snps,parkmode-disable-ss-quirk;
phys = <&usb_1_hsphy>, <&usb_1_qmpphy QMP_USB43DP_USB3_PHY>;
phy-names = "usb2-phy", "usb3-phy";
maximum-speed = "super-speed";
Expand Down
1 change: 1 addition & 0 deletions arch/arm64/boot/dts/qcom/sc7280.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4131,6 +4131,7 @@
iommus = <&apps_smmu 0xe0 0x0>;
snps,dis_u2_susphy_quirk;
snps,dis_enblslpm_quirk;
snps,parkmode-disable-ss-quirk;
phys = <&usb_1_hsphy>, <&usb_1_qmpphy QMP_USB43DP_USB3_PHY>;
phy-names = "usb2-phy", "usb3-phy";
maximum-speed = "super-speed";
Expand Down
1 change: 1 addition & 0 deletions arch/arm64/boot/dts/qcom/sdm630.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1302,6 +1302,7 @@
interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>;
snps,dis_u2_susphy_quirk;
snps,dis_enblslpm_quirk;
snps,parkmode-disable-ss-quirk;

phys = <&qusb2phy0>, <&usb3_qmpphy>;
phy-names = "usb2-phy", "usb3-phy";
Expand Down
2 changes: 2 additions & 0 deletions arch/arm64/boot/dts/qcom/sdm845.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4086,6 +4086,7 @@
iommus = <&apps_smmu 0x740 0>;
snps,dis_u2_susphy_quirk;
snps,dis_enblslpm_quirk;
snps,parkmode-disable-ss-quirk;
phys = <&usb_1_hsphy>, <&usb_1_qmpphy QMP_USB43DP_USB3_PHY>;
phy-names = "usb2-phy", "usb3-phy";
};
Expand Down Expand Up @@ -4141,6 +4142,7 @@
iommus = <&apps_smmu 0x760 0>;
snps,dis_u2_susphy_quirk;
snps,dis_enblslpm_quirk;
snps,parkmode-disable-ss-quirk;
phys = <&usb_2_hsphy>, <&usb_2_qmpphy>;
phy-names = "usb2-phy", "usb3-phy";
};
Expand Down
1 change: 1 addition & 0 deletions arch/arm64/boot/dts/qcom/sm6115.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1656,6 +1656,7 @@
snps,has-lpm-erratum;
snps,hird-threshold = /bits/ 8 <0x10>;
snps,usb3_lpm_capable;
snps,parkmode-disable-ss-quirk;

usb-role-switch;

Expand Down
1 change: 1 addition & 0 deletions arch/arm64/boot/dts/qcom/sm6350.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1859,6 +1859,7 @@
snps,dis_enblslpm_quirk;
snps,has-lpm-erratum;
snps,hird-threshold = /bits/ 8 <0x10>;
snps,parkmode-disable-ss-quirk;
phys = <&usb_1_hsphy>, <&usb_1_qmpphy QMP_USB43DP_USB3_PHY>;
phy-names = "usb2-phy", "usb3-phy";
};
Expand Down
17 changes: 13 additions & 4 deletions arch/arm64/boot/dts/qcom/x1e80100-crd.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -657,7 +657,7 @@
};

&pcie6a_phy {
vdda-phy-supply = <&vreg_l3j_0p8>;
vdda-phy-supply = <&vreg_l1d_0p8>;
vdda-pll-supply = <&vreg_l2j_1p2>;

status = "okay";
Expand Down Expand Up @@ -824,12 +824,15 @@

&usb_1_ss0_hsphy {
vdd-supply = <&vreg_l2e_0p8>;
vdda12-supply = <&vreg_l3e_1p2>;
vdda12-supply = <&vreg_l2j_1p2>;

status = "okay";
};

&usb_1_ss0_qmpphy {
vdda-phy-supply = <&vreg_l3e_1p2>;
vdda-pll-supply = <&vreg_l1j_0p8>;

status = "okay";
};

Expand All @@ -844,12 +847,15 @@

&usb_1_ss1_hsphy {
vdd-supply = <&vreg_l2e_0p8>;
vdda12-supply = <&vreg_l3e_1p2>;
vdda12-supply = <&vreg_l2j_1p2>;

status = "okay";
};

&usb_1_ss1_qmpphy {
vdda-phy-supply = <&vreg_l3e_1p2>;
vdda-pll-supply = <&vreg_l2d_0p9>;

status = "okay";
};

Expand All @@ -864,12 +870,15 @@

&usb_1_ss2_hsphy {
vdd-supply = <&vreg_l2e_0p8>;
vdda12-supply = <&vreg_l3e_1p2>;
vdda12-supply = <&vreg_l2j_1p2>;

status = "okay";
};

&usb_1_ss2_qmpphy {
vdda-phy-supply = <&vreg_l3e_1p2>;
vdda-pll-supply = <&vreg_l2d_0p9>;

status = "okay";
};

Expand Down
17 changes: 13 additions & 4 deletions arch/arm64/boot/dts/qcom/x1e80100-qcp.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@
};

&pcie6a_phy {
vdda-phy-supply = <&vreg_l3j_0p8>;
vdda-phy-supply = <&vreg_l1d_0p8>;
vdda-pll-supply = <&vreg_l2j_1p2>;

status = "okay";
Expand Down Expand Up @@ -520,12 +520,15 @@

&usb_1_ss0_hsphy {
vdd-supply = <&vreg_l2e_0p8>;
vdda12-supply = <&vreg_l3e_1p2>;
vdda12-supply = <&vreg_l2j_1p2>;

status = "okay";
};

&usb_1_ss0_qmpphy {
vdda-phy-supply = <&vreg_l3e_1p2>;
vdda-pll-supply = <&vreg_l1j_0p8>;

status = "okay";
};

Expand All @@ -540,12 +543,15 @@

&usb_1_ss1_hsphy {
vdd-supply = <&vreg_l2e_0p8>;
vdda12-supply = <&vreg_l3e_1p2>;
vdda12-supply = <&vreg_l2j_1p2>;

status = "okay";
};

&usb_1_ss1_qmpphy {
vdda-phy-supply = <&vreg_l3e_1p2>;
vdda-pll-supply = <&vreg_l2d_0p9>;

status = "okay";
};

Expand All @@ -560,12 +566,15 @@

&usb_1_ss2_hsphy {
vdd-supply = <&vreg_l2e_0p8>;
vdda12-supply = <&vreg_l3e_1p2>;
vdda12-supply = <&vreg_l2j_1p2>;

status = "okay";
};

&usb_1_ss2_qmpphy {
vdda-phy-supply = <&vreg_l3e_1p2>;
vdda-pll-supply = <&vreg_l2d_0p9>;

status = "okay";
};

Expand Down
3 changes: 2 additions & 1 deletion arch/s390/mm/fault.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -432,12 +432,13 @@ static void do_exception(struct pt_regs *regs, int access)
handle_fault_error_nolock(regs, 0);
else
do_sigsegv(regs, SEGV_MAPERR);
} else if (fault & VM_FAULT_SIGBUS) {
} else if (fault & (VM_FAULT_SIGBUS | VM_FAULT_HWPOISON)) {
if (!user_mode(regs))
handle_fault_error_nolock(regs, 0);
else
do_sigbus(regs);
} else {
pr_emerg("Unexpected fault flags: %08x\n", fault);
BUG();
}
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2017,7 +2017,7 @@ static int sdma_v4_0_process_trap_irq(struct amdgpu_device *adev,
struct amdgpu_irq_src *source,
struct amdgpu_iv_entry *entry)
{
uint32_t instance;
int instance;

DRM_DEBUG("IH: SDMA trap\n");
instance = sdma_v4_0_irq_id_to_seq(entry->client_id);
Expand Down
5 changes: 5 additions & 0 deletions drivers/net/tap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1177,6 +1177,11 @@ static int tap_get_user_xdp(struct tap_queue *q, struct xdp_buff *xdp)
struct sk_buff *skb;
int err, depth;

if (unlikely(xdp->data_end - xdp->data < ETH_HLEN)) {
err = -EINVAL;
goto err;
}

if (q->flags & IFF_VNET_HDR)
vnet_hdr_len = READ_ONCE(q->vnet_hdr_sz);

Expand Down
3 changes: 3 additions & 0 deletions drivers/net/tun.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2451,6 +2451,9 @@ static int tun_xdp_one(struct tun_struct *tun,
bool skb_xdp = false;
struct page *page;

if (unlikely(datasize < ETH_HLEN))
return -EINVAL;

xdp_prog = rcu_dereference(tun->xdp_prog);
if (xdp_prog) {
if (gso->gso_type) {
Expand Down
19 changes: 11 additions & 8 deletions drivers/usb/gadget/function/f_midi2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,9 @@ struct f_midi2 {

#define func_to_midi2(f) container_of(f, struct f_midi2, func)

/* convert from MIDI protocol number (1 or 2) to SNDRV_UMP_EP_INFO_PROTO_* */
#define to_ump_protocol(v) (((v) & 3) << 8)

/* get EP name string */
static const char *ump_ep_name(const struct f_midi2_ep *ep)
{
Expand Down Expand Up @@ -564,8 +567,7 @@ static void reply_ump_stream_ep_config(struct f_midi2_ep *ep)
.status = UMP_STREAM_MSG_STATUS_STREAM_CFG,
};

if ((ep->info.protocol & SNDRV_UMP_EP_INFO_PROTO_MIDI_MASK) ==
SNDRV_UMP_EP_INFO_PROTO_MIDI2)
if (ep->info.protocol == 2)
rep.protocol = UMP_STREAM_MSG_EP_INFO_CAP_MIDI2 >> 8;
else
rep.protocol = UMP_STREAM_MSG_EP_INFO_CAP_MIDI1 >> 8;
Expand Down Expand Up @@ -627,13 +629,13 @@ static void process_ump_stream_msg(struct f_midi2_ep *ep, const u32 *data)
return;
case UMP_STREAM_MSG_STATUS_STREAM_CFG_REQUEST:
if (*data & UMP_STREAM_MSG_EP_INFO_CAP_MIDI2) {
ep->info.protocol = SNDRV_UMP_EP_INFO_PROTO_MIDI2;
ep->info.protocol = 2;
DBG(midi2, "Switching Protocol to MIDI2\n");
} else {
ep->info.protocol = SNDRV_UMP_EP_INFO_PROTO_MIDI1;
ep->info.protocol = 1;
DBG(midi2, "Switching Protocol to MIDI1\n");
}
snd_ump_switch_protocol(ep->ump, ep->info.protocol);
snd_ump_switch_protocol(ep->ump, to_ump_protocol(ep->info.protocol));
reply_ump_stream_ep_config(ep);
return;
case UMP_STREAM_MSG_STATUS_FB_DISCOVERY:
Expand Down Expand Up @@ -1065,7 +1067,8 @@ static void f_midi2_midi1_ep_out_complete(struct usb_ep *usb_ep,
group = midi2->out_cable_mapping[cable].group;
bytes = midi1_packet_bytes[*buf & 0x0f];
for (c = 0; c < bytes; c++) {
snd_ump_convert_to_ump(cvt, group, ep->info.protocol,
snd_ump_convert_to_ump(cvt, group,
to_ump_protocol(ep->info.protocol),
buf[c + 1]);
if (cvt->ump_bytes) {
snd_ump_receive(ep->ump, cvt->ump,
Expand Down Expand Up @@ -1375,7 +1378,7 @@ static void assign_block_descriptors(struct f_midi2 *midi2,
desc->nNumGroupTrm = b->num_groups;
desc->iBlockItem = ep->blks[blk].string_id;

if (ep->info.protocol & SNDRV_UMP_EP_INFO_PROTO_MIDI2)
if (ep->info.protocol == 2)
desc->bMIDIProtocol = USB_MS_MIDI_PROTO_2_0;
else
desc->bMIDIProtocol = USB_MS_MIDI_PROTO_1_0_128;
Expand Down Expand Up @@ -1552,7 +1555,7 @@ static int f_midi2_create_card(struct f_midi2 *midi2)
if (midi2->info.static_block)
ump->info.flags |= SNDRV_UMP_EP_INFO_STATIC_BLOCKS;
ump->info.protocol_caps = (ep->info.protocol_caps & 3) << 8;
ump->info.protocol = (ep->info.protocol & 3) << 8;
ump->info.protocol = to_ump_protocol(ep->info.protocol);
ump->info.version = 0x0101;
ump->info.family_id = ep->info.family;
ump->info.model_id = ep->info.model;
Expand Down
Loading

0 comments on commit 9a8b5f6

Please sign in to comment.