Commit 2a1a4bee authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull char / misc driver fixes from Greg KH:
 "Here are a number of small driver fixes for 5.9-rc5

  Included in here are:

   - habanalabs driver fixes

   - interconnect driver fixes

   - soundwire driver fixes

   - dyndbg fixes for reported issues, and then reverts to fix it all up
     to a sane state.

   - phy driver fixes

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

* tag 'char-misc-5.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  Revert "dyndbg: accept query terms like file=bar and module=foo"
  Revert "dyndbg: fix problem parsing format="foo bar""
  scripts/tags.sh: exclude tools directory from tags generation
  video: fbdev: fix OOB read in vga_8planes_imageblit()
  dyndbg: fix problem parsing format="foo bar"
  dyndbg: refine export, rename to dynamic_debug_exec_queries()
  dyndbg: give %3u width in pr-format, cosmetic only
  interconnect: qcom: Fix small BW votes being truncated to zero
  soundwire: fix double free of dangling pointer
  interconnect: Show bandwidth for disabled paths as zero in debugfs
  habanalabs: fix report of RAZWI initiator coordinates
  habanalabs: prevent user buff overflow
  phy: omap-usb2-phy: disable PHY charger detect
  phy: qcom-qmp: Use correct values for ipq8074 PCIe Gen2 PHY init
  soundwire: bus: fix typo in comment on INTSTAT registers
  phy: qualcomm: fix return value check in qcom_ipq806x_usb_phy_probe()
  phy: qualcomm: fix platform_no_drv_owner.cocci warnings
parents 84b13499 952e934d

Documentation/admin-guide/dynamic-debug-howto.rst

+0 −1
Original line number Diff line number Diff line
@@ -156,7 +156,6 @@ against. Possible keywords are::: 
  ``line-range`` cannot contain space, e.g.

  "1-30" is valid range but "1 - 30" is not.



  ``module=foo`` combined keyword=value form is interchangably accepted



The meanings of each keyword are:

drivers/interconnect/core.c

+8 −2
Original line number Diff line number Diff line
@@ -55,12 +55,18 @@ static int icc_summary_show(struct seq_file *s, void *data) 


			icc_summary_show_one(s, n);

			hlist_for_each_entry(r, &n->req_list, req_node) {

				u32 avg_bw = 0, peak_bw = 0;



				if (!r->dev)

					continue;



				if (r->enabled) {

					avg_bw = r->avg_bw;

					peak_bw = r->peak_bw;

				}



				seq_printf(s, "  %-27s %12u %12u %12u\n",

					   dev_name(r->dev), r->tag, r->avg_bw,

					   r->peak_bw);

					   dev_name(r->dev), r->tag, avg_bw, peak_bw);

			}

		}

	}

drivers/interconnect/qcom/bcm-voter.c

+19 −8
Original line number Diff line number Diff line
@@ -52,8 +52,20 @@ static int cmp_vcd(void *priv, struct list_head *a, struct list_head *b) 
		return 1;

}



static u64 bcm_div(u64 num, u32 base)

{

	/* Ensure that small votes aren't lost. */

	if (num && num < base)

		return 1;



	do_div(num, base);



	return num;

}



static void bcm_aggregate(struct qcom_icc_bcm *bcm)

{

	struct qcom_icc_node *node;

	size_t i, bucket;

	u64 agg_avg[QCOM_ICC_NUM_BUCKETS] = {0};

	u64 agg_peak[QCOM_ICC_NUM_BUCKETS] = {0};
@@ -61,22 +73,21 @@ static void bcm_aggregate(struct qcom_icc_bcm *bcm) 


	for (bucket = 0; bucket < QCOM_ICC_NUM_BUCKETS; bucket++) {

		for (i = 0; i < bcm->num_nodes; i++) {

			temp = bcm->nodes[i]->sum_avg[bucket] * bcm->aux_data.width;

			do_div(temp, bcm->nodes[i]->buswidth * bcm->nodes[i]->channels);

			node = bcm->nodes[i];

			temp = bcm_div(node->sum_avg[bucket] * bcm->aux_data.width,

				       node->buswidth * node->channels);

			agg_avg[bucket] = max(agg_avg[bucket], temp);



			temp = bcm->nodes[i]->max_peak[bucket] * bcm->aux_data.width;

			do_div(temp, bcm->nodes[i]->buswidth);

			temp = bcm_div(node->max_peak[bucket] * bcm->aux_data.width,

				       node->buswidth);

			agg_peak[bucket] = max(agg_peak[bucket], temp);

		}



		temp = agg_avg[bucket] * 1000ULL;

		do_div(temp, bcm->aux_data.unit);

		bcm->vote_x[bucket] = temp;

		bcm->vote_x[bucket] = bcm_div(temp, bcm->aux_data.unit);



		temp = agg_peak[bucket] * 1000ULL;

		do_div(temp, bcm->aux_data.unit);

		bcm->vote_y[bucket] = temp;

		bcm->vote_y[bucket] = bcm_div(temp, bcm->aux_data.unit);

	}



	if (bcm->keepalive && bcm->vote_x[QCOM_ICC_BUCKET_AMC] == 0 &&

drivers/misc/habanalabs/common/debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -982,7 +982,7 @@ static ssize_t hl_clk_gate_read(struct file *f, char __user *buf, 
		return 0;



	sprintf(tmp_buf, "0x%llx\n", hdev->clock_gating_mask);

	rc = simple_read_from_buffer(buf, strlen(tmp_buf) + 1, ppos, tmp_buf,

	rc = simple_read_from_buffer(buf, count, ppos, tmp_buf,

			strlen(tmp_buf) + 1);



	return rc;

drivers/misc/habanalabs/include/gaudi/gaudi_masks.h

+16 −16
Original line number Diff line number Diff line
@@ -378,15 +378,15 @@ enum axi_id { 
	((((y) & RAZWI_INITIATOR_Y_MASK) << RAZWI_INITIATOR_Y_SHIFT) | \

		(((x) & RAZWI_INITIATOR_X_MASK) << RAZWI_INITIATOR_X_SHIFT))



#define RAZWI_INITIATOR_ID_X_Y_TPC0_NIC0	RAZWI_INITIATOR_ID_X_Y(1, 0)

#define RAZWI_INITIATOR_ID_X_Y_TPC1		RAZWI_INITIATOR_ID_X_Y(2, 0)

#define RAZWI_INITIATOR_ID_X_Y_MME0_0		RAZWI_INITIATOR_ID_X_Y(3, 0)

#define RAZWI_INITIATOR_ID_X_Y_MME0_1		RAZWI_INITIATOR_ID_X_Y(4, 0)

#define RAZWI_INITIATOR_ID_X_Y_MME1_0		RAZWI_INITIATOR_ID_X_Y(5, 0)

#define RAZWI_INITIATOR_ID_X_Y_MME1_1		RAZWI_INITIATOR_ID_X_Y(6, 0)

#define RAZWI_INITIATOR_ID_X_Y_TPC2		RAZWI_INITIATOR_ID_X_Y(7, 0)

#define RAZWI_INITIATOR_ID_X_Y_TPC0_NIC0	RAZWI_INITIATOR_ID_X_Y(1, 1)

#define RAZWI_INITIATOR_ID_X_Y_TPC1		RAZWI_INITIATOR_ID_X_Y(2, 1)

#define RAZWI_INITIATOR_ID_X_Y_MME0_0		RAZWI_INITIATOR_ID_X_Y(3, 1)

#define RAZWI_INITIATOR_ID_X_Y_MME0_1		RAZWI_INITIATOR_ID_X_Y(4, 1)

#define RAZWI_INITIATOR_ID_X_Y_MME1_0		RAZWI_INITIATOR_ID_X_Y(5, 1)

#define RAZWI_INITIATOR_ID_X_Y_MME1_1		RAZWI_INITIATOR_ID_X_Y(6, 1)

#define RAZWI_INITIATOR_ID_X_Y_TPC2		RAZWI_INITIATOR_ID_X_Y(7, 1)

#define RAZWI_INITIATOR_ID_X_Y_TPC3_PCI_CPU_PSOC \

						RAZWI_INITIATOR_ID_X_Y(8, 0)

						RAZWI_INITIATOR_ID_X_Y(8, 1)

#define RAZWI_INITIATOR_ID_X_Y_DMA_IF_W_S_0	RAZWI_INITIATOR_ID_X_Y(0, 1)

#define RAZWI_INITIATOR_ID_X_Y_DMA_IF_E_S_0	RAZWI_INITIATOR_ID_X_Y(9, 1)

#define RAZWI_INITIATOR_ID_X_Y_DMA_IF_W_S_1	RAZWI_INITIATOR_ID_X_Y(0, 2)
@@ -395,14 +395,14 @@ enum axi_id { 
#define RAZWI_INITIATOR_ID_X_Y_DMA_IF_E_N_0	RAZWI_INITIATOR_ID_X_Y(9, 3)

#define RAZWI_INITIATOR_ID_X_Y_DMA_IF_W_N_1	RAZWI_INITIATOR_ID_X_Y(0, 4)

#define RAZWI_INITIATOR_ID_X_Y_DMA_IF_E_N_1	RAZWI_INITIATOR_ID_X_Y(9, 4)

#define RAZWI_INITIATOR_ID_X_Y_TPC4_NIC1_NIC2	RAZWI_INITIATOR_ID_X_Y(1, 5)

#define RAZWI_INITIATOR_ID_X_Y_TPC5		RAZWI_INITIATOR_ID_X_Y(2, 5)

#define RAZWI_INITIATOR_ID_X_Y_MME2_0		RAZWI_INITIATOR_ID_X_Y(3, 5)

#define RAZWI_INITIATOR_ID_X_Y_MME2_1		RAZWI_INITIATOR_ID_X_Y(4, 5)

#define RAZWI_INITIATOR_ID_X_Y_MME3_0		RAZWI_INITIATOR_ID_X_Y(5, 5)

#define RAZWI_INITIATOR_ID_X_Y_MME3_1		RAZWI_INITIATOR_ID_X_Y(6, 5)

#define RAZWI_INITIATOR_ID_X_Y_TPC6		RAZWI_INITIATOR_ID_X_Y(7, 5)

#define RAZWI_INITIATOR_ID_X_Y_TPC7_NIC4_NIC5	RAZWI_INITIATOR_ID_X_Y(8, 5)

#define RAZWI_INITIATOR_ID_X_Y_TPC4_NIC1_NIC2	RAZWI_INITIATOR_ID_X_Y(1, 6)

#define RAZWI_INITIATOR_ID_X_Y_TPC5		RAZWI_INITIATOR_ID_X_Y(2, 6)

#define RAZWI_INITIATOR_ID_X_Y_MME2_0		RAZWI_INITIATOR_ID_X_Y(3, 6)

#define RAZWI_INITIATOR_ID_X_Y_MME2_1		RAZWI_INITIATOR_ID_X_Y(4, 6)

#define RAZWI_INITIATOR_ID_X_Y_MME3_0		RAZWI_INITIATOR_ID_X_Y(5, 6)

#define RAZWI_INITIATOR_ID_X_Y_MME3_1		RAZWI_INITIATOR_ID_X_Y(6, 6)

#define RAZWI_INITIATOR_ID_X_Y_TPC6		RAZWI_INITIATOR_ID_X_Y(7, 6)

#define RAZWI_INITIATOR_ID_X_Y_TPC7_NIC4_NIC5	RAZWI_INITIATOR_ID_X_Y(8, 6)



#define PSOC_ETR_AXICTL_PROTCTRLBIT1_SHIFT                           1

CRA Git | Maintained and supported by SUSTech CRA and CCSE