Unverified Commit 151595c9 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!2933 Backport linux 6.6.1 LTS patches 

Merge Pull Request from: @zhang-changzhong 
 
Backport linux-6.6.1 LTS patches from upstream.
git cherry-pick v6.6..v6.6.1~1 -s
No conflicts.
Build and boot testing passed. 
 
Link:https://gitee.com/openeuler/kernel/pulls/2933

 

Reviewed-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
Reviewed-by: default avatarsanglipeng <sanglipeng1@jd.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents c8352b65 b8e16428

Documentation/devicetree/bindings/serial/rs485.yaml

+4 −0
Original line number Diff line number Diff line
@@ -29,6 +29,10 @@ properties: 
          default: 0

          maximum: 100



  rs485-rts-active-high:

    description: drive RTS high when sending (this is the default).

    $ref: /schemas/types.yaml#/definitions/flag



  rs485-rts-active-low:

    description: drive RTS low when sending (default is high).

    $ref: /schemas/types.yaml#/definitions/flag

drivers/bluetooth/hci_bcm4377.c

+5 −0
Original line number Diff line number Diff line
@@ -512,6 +512,7 @@ struct bcm4377_hw { 
	unsigned long disable_aspm : 1;

	unsigned long broken_ext_scan : 1;

	unsigned long broken_mws_transport_config : 1;

	unsigned long broken_le_coded : 1;



	int (*send_calibration)(struct bcm4377_data *bcm4377);

	int (*send_ptb)(struct bcm4377_data *bcm4377,
@@ -2372,6 +2373,8 @@ static int bcm4377_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
		set_bit(HCI_QUIRK_BROKEN_MWS_TRANSPORT_CONFIG, &hdev->quirks);

	if (bcm4377->hw->broken_ext_scan)

		set_bit(HCI_QUIRK_BROKEN_EXT_SCAN, &hdev->quirks);

	if (bcm4377->hw->broken_le_coded)

		set_bit(HCI_QUIRK_BROKEN_LE_CODED, &hdev->quirks);



	pci_set_drvdata(pdev, bcm4377);

	hci_set_drvdata(hdev, bcm4377);
@@ -2461,6 +2464,7 @@ static const struct bcm4377_hw bcm4377_hw_variants[] = { 
		.bar0_core2_window2 = 0x18107000,

		.has_bar0_core2_window2 = true,

		.broken_mws_transport_config = true,

		.broken_le_coded = true,

		.send_calibration = bcm4378_send_calibration,

		.send_ptb = bcm4378_send_ptb,

	},
@@ -2474,6 +2478,7 @@ static const struct bcm4377_hw bcm4377_hw_variants[] = { 
		.has_bar0_core2_window2 = true,

		.clear_pciecfg_subsystem_ctrl_bit19 = true,

		.broken_mws_transport_config = true,

		.broken_le_coded = true,

		.send_calibration = bcm4387_send_calibration,

		.send_ptb = bcm4378_send_ptb,

	},

drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c

+2 −1
Original line number Diff line number Diff line
@@ -586,7 +586,8 @@ static void dcn10_dmcu_set_psr_enable(struct dmcu *dmcu, bool enable, bool wait) 
				if (state == PSR_STATE0)

					break;

			}

			fsleep(500);

			/* must *not* be fsleep - this can be called from high irq levels */

			udelay(500);

		}



		/* assert if max retry hit */

drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c

+2 −1
Original line number Diff line number Diff line
@@ -216,7 +216,8 @@ static void dmub_psr_enable(struct dmub_psr *dmub, bool enable, bool wait, uint8 
					break;

			}



			fsleep(500);

			/* must *not* be fsleep - this can be called from high irq levels */

			udelay(500);

		}



		/* assert if max retry hit */

drivers/misc/pci_endpoint_test.c

+4 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ 
#define PCI_DEVICE_ID_TI_AM654			0xb00c

#define PCI_DEVICE_ID_TI_J7200			0xb00f

#define PCI_DEVICE_ID_TI_AM64			0xb010

#define PCI_DEVICE_ID_TI_J721S2		0xb013

#define PCI_DEVICE_ID_LS1088A			0x80c0

#define PCI_DEVICE_ID_IMX8			0x0808
@@ -999,6 +1000,9 @@ static const struct pci_device_id pci_endpoint_test_tbl[] = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_AM64),

	  .driver_data = (kernel_ulong_t)&j721e_data,

	},

	{ PCI_DEVICE(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_J721S2),

	  .driver_data = (kernel_ulong_t)&j721e_data,

	},

	{ }

};

MODULE_DEVICE_TABLE(pci, pci_endpoint_test_tbl);