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

Merge tag 'char-misc-6.2-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 and other subsystem driver fixes for
  6.2-rc5 to resolve a few reported issues. They include:

   - long time pending fastrpc fixes (should have gone into 6.1, my
     fault)

   - mei driver/bus fixes and new device ids

   - interconnect driver fixes for reported problems

   - vmci bugfix

   - w1 driver bugfixes for reported problems

  Almost all of these have been in linux-next with no reported problems,
  the rest have all passed 0-day bot testing in my tree and on the
  mailing lists where they have sat too long due to me taking a long
  time to catch up on my pending patch queue"

* tag 'char-misc-6.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  VMCI: Use threaded irqs instead of tasklets
  misc: fastrpc: Pass bitfield into qcom_scm_assign_mem
  gsmi: fix null-deref in gsmi_get_variable
  misc: fastrpc: Fix use-after-free race condition for maps
  misc: fastrpc: Don't remove map on creater_process and device_release
  misc: fastrpc: Fix use-after-free and race in fastrpc_map_find
  misc: fastrpc: fix error code in fastrpc_req_mmap()
  mei: me: add meteor lake point M DID
  mei: bus: fix unlink on bus in error path
  w1: fix WARNING after calling w1_process()
  w1: fix deadloop in __w1_remove_master_device()
  comedi: adv_pci1760: Fix PWM instruction handling
  interconnect: qcom: rpm: Use _optional func for provider clocks
  interconnect: qcom: msm8996: Fix regmap max_register values
  interconnect: qcom: msm8996: Provide UFS clocks to A2NoC
  dt-bindings: interconnect: Add UFS clocks to MSM8996 A2NoC
parents c88a3114 3daed634

Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml

+23 −1
Original line number Diff line number Diff line
@@ -84,7 +84,6 @@ allOf: 
              - qcom,msm8939-pcnoc

              - qcom,msm8939-snoc

              - qcom,msm8996-a1noc

              - qcom,msm8996-a2noc

              - qcom,msm8996-bimc

              - qcom,msm8996-cnoc

              - qcom,msm8996-pnoc
@@ -186,6 +185,29 @@ allOf: 
      required:

        - power-domains



  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,msm8996-a2noc



    then:

      properties:

        clock-names:

          items:

            - const: bus

            - const: bus_a

            - const: aggre2_ufs_axi

            - const: ufs_axi



        clocks:

          items:

            - description: Bus Clock

            - description: Bus A Clock

            - description: Aggregate2 NoC UFS AXI Clock

            - description: UFS AXI Clock



  - if:

      properties:

        compatible:

drivers/comedi/drivers/adv_pci1760.c

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 
#define PCI1760_CMD_CLR_IMB2		0x00	/* Clears IMB2 */

#define PCI1760_CMD_SET_DO		0x01	/* Set output state */

#define PCI1760_CMD_GET_DO		0x02	/* Read output status */

#define PCI1760_CMD_GET_STATUS		0x03	/* Read current status */

#define PCI1760_CMD_GET_STATUS		0x07	/* Read current status */

#define PCI1760_CMD_GET_FW_VER		0x0e	/* Read firmware version */

#define PCI1760_CMD_GET_HW_VER		0x0f	/* Read hardware version */

#define PCI1760_CMD_SET_PWM_HI(x)	(0x10 + (x) * 2) /* Set "hi" period */

drivers/firmware/google/gsmi.c

+4 −3
Original line number Diff line number Diff line
@@ -361,6 +361,7 @@ static efi_status_t gsmi_get_variable(efi_char16_t *name, 
		memcpy(data, gsmi_dev.data_buf->start, *data_size);



		/* All variables are have the following attributes */

		if (attr)

			*attr = EFI_VARIABLE_NON_VOLATILE |

				EFI_VARIABLE_BOOTSERVICE_ACCESS |

				EFI_VARIABLE_RUNTIME_ACCESS;

drivers/interconnect/qcom/icc-rpm.c

+1 −1
Original line number Diff line number Diff line
@@ -488,7 +488,7 @@ int qnoc_probe(struct platform_device *pdev) 
	}



regmap_done:

	ret = devm_clk_bulk_get(dev, qp->num_clks, qp->bus_clks);

	ret = devm_clk_bulk_get_optional(dev, qp->num_clks, qp->bus_clks);

	if (ret)

		return ret;

drivers/interconnect/qcom/msm8996.c

+14 −5
Original line number Diff line number Diff line
@@ -33,6 +33,13 @@ static const char * const bus_a0noc_clocks[] = { 
	"aggre0_noc_mpu_cfg"

};



static const char * const bus_a2noc_clocks[] = {

	"bus",

	"bus_a",

	"aggre2_ufs_axi",

	"ufs_axi"

};



static const u16 mas_a0noc_common_links[] = {

	MSM8996_SLAVE_A0NOC_SNOC

};
@@ -1806,7 +1813,7 @@ static const struct regmap_config msm8996_a0noc_regmap_config = { 
	.reg_bits	= 32,

	.reg_stride	= 4,

	.val_bits	= 32,

	.max_register	= 0x9000,

	.max_register	= 0x6000,

	.fast_io	= true

};
@@ -1830,7 +1837,7 @@ static const struct regmap_config msm8996_a1noc_regmap_config = { 
	.reg_bits	= 32,

	.reg_stride	= 4,

	.val_bits	= 32,

	.max_register	= 0x7000,

	.max_register	= 0x5000,

	.fast_io	= true

};
@@ -1851,7 +1858,7 @@ static const struct regmap_config msm8996_a2noc_regmap_config = { 
	.reg_bits	= 32,

	.reg_stride	= 4,

	.val_bits	= 32,

	.max_register	= 0xa000,

	.max_register	= 0x7000,

	.fast_io	= true

};
@@ -1859,6 +1866,8 @@ static const struct qcom_icc_desc msm8996_a2noc = { 
	.type = QCOM_ICC_NOC,

	.nodes = a2noc_nodes,

	.num_nodes = ARRAY_SIZE(a2noc_nodes),

	.clocks = bus_a2noc_clocks,

	.num_clocks = ARRAY_SIZE(bus_a2noc_clocks),

	.regmap_cfg = &msm8996_a2noc_regmap_config

};
@@ -1877,7 +1886,7 @@ static const struct regmap_config msm8996_bimc_regmap_config = { 
	.reg_bits	= 32,

	.reg_stride	= 4,

	.val_bits	= 32,

	.max_register	= 0x62000,

	.max_register	= 0x5a000,

	.fast_io	= true

};
@@ -1988,7 +1997,7 @@ static const struct regmap_config msm8996_mnoc_regmap_config = { 
	.reg_bits	= 32,

	.reg_stride	= 4,

	.val_bits	= 32,

	.max_register	= 0x20000,

	.max_register	= 0x1c000,

	.fast_io	= true

};