Commit fdbc80bd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'char-misc-5.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc 

Pull char/misc driver fixes from Greg KH:
 "Here are some small char/misc driver fixes for 5.11-rc5:

   - habanalabs driver fixes

   - phy driver fixes

   - hwtracing driver fixes

   - rtsx cardreader driver fix

  All of these have been in linux-next with no reported issues"

* tag 'char-misc-5.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  misc: rtsx: init value of aspm_enabled
  habanalabs: disable FW events on device removal
  habanalabs: fix backward compatibility of idle check
  habanalabs: zero pci counters packet before submit to FW
  intel_th: pci: Add Alder Lake-P support
  stm class: Fix module init return on allocation failure
  habanalabs: prevent soft lockup during unmap
  habanalabs: fix reset process in case of failures
  habanalabs: fix dma_addr passed to dma_mmap_coherent
  phy: mediatek: allow compile-testing the dsi phy
  phy: cpcap-usb: Fix warning for missing regulator_disable
  PHY: Ingenic: fix unconditional build of phy-ingenic-usb
parents 443d1129 31b08106

drivers/hwtracing/intel_th/pci.c

+5 −0
Original line number Diff line number Diff line
@@ -268,6 +268,11 @@ static const struct pci_device_id intel_th_pci_id_table[] = { 
		PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x7aa6),

		.driver_data = (kernel_ulong_t)&intel_th_2x,

	},

	{

		/* Alder Lake-P */

		PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x51a6),

		.driver_data = (kernel_ulong_t)&intel_th_2x,

	},

	{

		/* Alder Lake CPU */

		PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x466f),

drivers/hwtracing/stm/heartbeat.c

+4 −2
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static void stm_heartbeat_unlink(struct stm_source_data *data) 


static int stm_heartbeat_init(void)

{

	int i, ret = -ENOMEM;

	int i, ret;



	if (nr_devs < 0 || nr_devs > STM_HEARTBEAT_MAX)

		return -EINVAL;
@@ -72,8 +72,10 @@ static int stm_heartbeat_init(void) 
	for (i = 0; i < nr_devs; i++) {

		stm_heartbeat[i].data.name =

			kasprintf(GFP_KERNEL, "heartbeat.%d", i);

		if (!stm_heartbeat[i].data.name)

		if (!stm_heartbeat[i].data.name) {

			ret = -ENOMEM;

			goto fail_unregister;

		}



		stm_heartbeat[i].data.nr_chans	= 1;

		stm_heartbeat[i].data.link	= stm_heartbeat_link;

drivers/misc/cardreader/rtsx_pcr.c

+6 −1
Original line number Diff line number Diff line
@@ -1512,6 +1512,7 @@ static int rtsx_pci_probe(struct pci_dev *pcidev, 
	struct pcr_handle *handle;

	u32 base, len;

	int ret, i, bar = 0;

	u8 val;



	dev_dbg(&(pcidev->dev),

		": Realtek PCI-E Card Reader found at %s [%04x:%04x] (rev %x)\n",
@@ -1577,7 +1578,11 @@ static int rtsx_pci_probe(struct pci_dev *pcidev, 
	pcr->host_cmds_addr = pcr->rtsx_resv_buf_addr;

	pcr->host_sg_tbl_ptr = pcr->rtsx_resv_buf + HOST_CMDS_BUF_LEN;

	pcr->host_sg_tbl_addr = pcr->rtsx_resv_buf_addr + HOST_CMDS_BUF_LEN;



	rtsx_pci_read_register(pcr, ASPM_FORCE_CTL, &val);

	if (val & FORCE_ASPM_CTL0 && val & FORCE_ASPM_CTL1)

		pcr->aspm_enabled = false;

	else

		pcr->aspm_enabled = true;

	pcr->card_inserted = 0;

	pcr->card_removed = 0;

	INIT_DELAYED_WORK(&pcr->carddet_work, rtsx_pci_card_detect);

drivers/misc/habanalabs/common/device.c

+10 −1
Original line number Diff line number Diff line
@@ -1037,7 +1037,7 @@ int hl_device_reset(struct hl_device *hdev, bool hard_reset, 


	if (hard_reset) {

		/* Release kernel context */

		if (hl_ctx_put(hdev->kernel_ctx) == 1)

		if (hdev->kernel_ctx && hl_ctx_put(hdev->kernel_ctx) == 1)

			hdev->kernel_ctx = NULL;

		hl_vm_fini(hdev);

		hl_mmu_fini(hdev);
@@ -1487,6 +1487,15 @@ void hl_device_fini(struct hl_device *hdev) 
		}

	}



	/* Disable PCI access from device F/W so it won't send us additional

	 * interrupts. We disable MSI/MSI-X at the halt_engines function and we

	 * can't have the F/W sending us interrupts after that. We need to

	 * disable the access here because if the device is marked disable, the

	 * message won't be send. Also, in case of heartbeat, the device CPU is

	 * marked as disable so this message won't be sent

	 */

	hl_fw_send_pci_access_msg(hdev,	CPUCP_PACKET_DISABLE_PCI_ACCESS);



	/* Mark device as disabled */

	hdev->disabled = true;

drivers/misc/habanalabs/common/firmware_if.c

+5 −0
Original line number Diff line number Diff line
@@ -402,6 +402,10 @@ int hl_fw_cpucp_pci_counters_get(struct hl_device *hdev, 
	}

	counters->rx_throughput = result;



	memset(&pkt, 0, sizeof(pkt));

	pkt.ctl = cpu_to_le32(CPUCP_PACKET_PCIE_THROUGHPUT_GET <<

			CPUCP_PKT_CTL_OPCODE_SHIFT);



	/* Fetch PCI tx counter */

	pkt.index = cpu_to_le32(cpucp_pcie_throughput_tx);

	rc = hdev->asic_funcs->send_cpu_message(hdev, (u32 *) &pkt, sizeof(pkt),
@@ -414,6 +418,7 @@ int hl_fw_cpucp_pci_counters_get(struct hl_device *hdev, 
	counters->tx_throughput = result;



	/* Fetch PCI replay counter */

	memset(&pkt, 0, sizeof(pkt));

	pkt.ctl = cpu_to_le32(CPUCP_PACKET_PCIE_REPLAY_CNT_GET <<

			CPUCP_PKT_CTL_OPCODE_SHIFT);