6.7.4-rc1 review
Subsystems (4)
Greg Kroah-Hartman
maintainerPATCH 129/353 ice: fix ICE_AQ_VSI_Q_OPT_RSS_* register values
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ahmed Zaki <[email protected]>
[ Upstream commit 20f73b60bb5c276cee9b1a530f100c677bc74af8 ]
Fix the values of the ICE_AQ_VSI_Q_OPT_RSS_* registers. Shifting is already done when the values are used, no need to double shift. Bug was not discovered earlier since only ICE_AQ_VSI_Q_OPT_RSS_TPLZ (Zero) is currently used.
Also, rename ICE_AQ_VSI_Q_OPT_RSS_XXX to ICE_AQ_VSI_Q_OPT_RSS_HASH_XXX for consistency.
--- drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 8 ++++---- drivers/net/ethernet/intel/ice/ice_lib.c | 4 ++-- drivers/net/ethernet/intel/ice/ice_virtchnl.c | 12 +++++------- 3 files changed, 11 insertions(+), 13 deletions(-)
drivers/net/ethernet/intel/ice/ice_adminq_cmd.h +4 -4
@@ -491,10 +491,10 @@ struct ice_aqc_vsi_props {#define ICE_AQ_VSI_Q_OPT_RSS_GBL_LUT_M (0xF << ICE_AQ_VSI_Q_OPT_RSS_GBL_LUT_S)#define ICE_AQ_VSI_Q_OPT_RSS_HASH_S 6#define ICE_AQ_VSI_Q_OPT_RSS_HASH_M (0x3 << ICE_AQ_VSI_Q_OPT_RSS_HASH_S) -#define ICE_AQ_VSI_Q_OPT_RSS_TPLZ (0x0 << ICE_AQ_VSI_Q_OPT_RSS_HASH_S) -#define ICE_AQ_VSI_Q_OPT_RSS_SYM_TPLZ (0x1 << ICE_AQ_VSI_Q_OPT_RSS_HASH_S) -#define ICE_AQ_VSI_Q_OPT_RSS_XOR (0x2 << ICE_AQ_VSI_Q_OPT_RSS_HASH_S) -#define ICE_AQ_VSI_Q_OPT_RSS_JHASH (0x3 << ICE_AQ_VSI_Q_OPT_RSS_HASH_S) +#define ICE_AQ_VSI_Q_OPT_RSS_HASH_TPLZ 0x0U +#define ICE_AQ_VSI_Q_OPT_RSS_HASH_SYM_TPLZ 0x1U +#define ICE_AQ_VSI_Q_OPT_RSS_HASH_XOR 0x2U +#define ICE_AQ_VSI_Q_OPT_RSS_HASH_JHASH 0x3Uu8 q_opt_tc;#define ICE_AQ_VSI_Q_OPT_TC_OVR_S 0#define ICE_AQ_VSI_Q_OPT_TC_OVR_M (0x1F << ICE_AQ_VSI_Q_OPT_TC_OVR_S)
drivers/net/ethernet/intel/ice/ice_lib.c +2 -2
@@ -1186,12 +1186,12 @@ static void ice_set_rss_vsi_ctx(struct ice_vsi_ctx *ctxt, struct ice_vsi *vsi)case ICE_VSI_PF :/* PF VSI will inherit RSS instance of PF */ lut_type =ICE_AQ_VSI_Q_OPT_RSS_LUT_PF ; - hash_type =ICE_AQ_VSI_Q_OPT_RSS_TPLZ ; + hash_type =ICE_AQ_VSI_Q_OPT_RSS_HASH_TPLZ ;break ;case ICE_VSI_VF :/* VF VSI will gets a small RSS table which is a VSI LUT type */ lut_type =ICE_AQ_VSI_Q_OPT_RSS_LUT_VSI ; - hash_type =ICE_AQ_VSI_Q_OPT_RSS_TPLZ ; + hash_type =ICE_AQ_VSI_Q_OPT_RSS_HASH_TPLZ ;break ;default : dev_dbg(dev, "Unsupported VSI type %s\n",
drivers/net/ethernet/intel/ice/ice_virtchnl.c +5 -7
@@ -823,8 +823,8 @@ static int ice_vc_handle_rss_cfg(struct ice_vf *vf, u8 *msg, bool add)int status; lut_type =ICE_AQ_VSI_Q_OPT_RSS_LUT_VSI ; - hash_type = add ?ICE_AQ_VSI_Q_OPT_RSS_XOR : -ICE_AQ_VSI_Q_OPT_RSS_TPLZ ; + hash_type = add ?ICE_AQ_VSI_Q_OPT_RSS_HASH_XOR : +ICE_AQ_VSI_Q_OPT_RSS_HASH_TPLZ ; ctx =kzalloc (sizeof (*ctx),GFP_KERNEL );if (!ctx) {
@@ -832,11 +832,9 @@ static int ice_vc_handle_rss_cfg(struct ice_vf *vf, u8 *msg, bool add) goto error_param; } - ctx->info.q_opt_rss = ((lut_type << -ICE_AQ_VSI_Q_OPT_RSS_LUT_S ) & -ICE_AQ_VSI_Q_OPT_RSS_LUT_M ) | - (hash_type & -ICE_AQ_VSI_Q_OPT_RSS_HASH_M ); + ctx->info.q_opt_rss = +FIELD_PREP (ICE_AQ_VSI_Q_OPT_RSS_LUT_M , lut_type) | +FIELD_PREP (ICE_AQ_VSI_Q_OPT_RSS_HASH_M , hash_type);/* Preserve existing queueing option setting */ ctx->info.q_opt_rss |= (vsi->info.q_opt_rss &
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 130/353 net: atlantic: eliminate double free in error handling logic
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Igor Russkikh <[email protected]>
[ Upstream commit b3cb7a830a24527877b0bc900b9bd74a96aea928 ]
Driver has a logic leak in ring data allocation/free, where aq_ring_free could be called multiple times on same ring, if system is under stress and got memory allocation error.
Ring pointer was used as an indicator of failure, but this is not correct since only ring data is allocated/deallocated. Ring itself is an array member.
Changing ring allocation functions to return error code directly. This simplifies error handling and eliminates aq_ring_free on higher layer.
--- .../net/ethernet/aquantia/atlantic/aq_ptp.c | 28 +++------ .../net/ethernet/aquantia/atlantic/aq_ring.c | 61 +++++-------------- .../net/ethernet/aquantia/atlantic/aq_ring.h | 22 +++---- .../net/ethernet/aquantia/atlantic/aq_vec.c | 23 +++---- 4 files changed, 47 insertions(+), 87 deletions(-)
drivers/net/ethernet/aquantia/atlantic/aq_ptp.c +10 -18
@@ -953,8 +953,6 @@ int aq_ptp_ring_alloc(struct aq_nic_s *aq_nic) {struct aq_ptp_s *aq_ptp = aq_nic->aq_ptp;unsigned int tx_ring_idx, rx_ring_idx; -struct aq_ring_s *hwts; -struct aq_ring_s *ring;int err;if (!aq_ptp)
@@ -962,29 +960,23 @@ int aq_ptp_ring_alloc(struct aq_nic_s *aq_nic) tx_ring_idx =aq_ptp_ring_idx (aq_nic->aq_nic_cfg.tc_mode); - ring =aq_ring_tx_alloc (&aq_ptp->ptp_tx, aq_nic, - tx_ring_idx, &aq_nic->aq_nic_cfg); -if (!ring) { - err = -ENOMEM ; + err =aq_ring_tx_alloc (&aq_ptp->ptp_tx, aq_nic, + tx_ring_idx, &aq_nic->aq_nic_cfg); +if (err) goto err_exit; - } rx_ring_idx =aq_ptp_ring_idx (aq_nic->aq_nic_cfg.tc_mode); - ring =aq_ring_rx_alloc (&aq_ptp->ptp_rx, aq_nic, - rx_ring_idx, &aq_nic->aq_nic_cfg); -if (!ring) { - err = -ENOMEM ; + err =aq_ring_rx_alloc (&aq_ptp->ptp_rx, aq_nic, + rx_ring_idx, &aq_nic->aq_nic_cfg); +if (err) goto err_exit_ptp_tx; - } - hwts =aq_ring_hwts_rx_alloc (&aq_ptp->hwts_rx, aq_nic,PTP_HWST_RING_IDX , - aq_nic->aq_nic_cfg.rxds, - aq_nic->aq_nic_cfg.aq_hw_caps->rxd_size); -if (!hwts) { - err = -ENOMEM ; + err =aq_ring_hwts_rx_alloc (&aq_ptp->hwts_rx, aq_nic,PTP_HWST_RING_IDX , + aq_nic->aq_nic_cfg.rxds, + aq_nic->aq_nic_cfg.aq_hw_caps->rxd_size); +if (err) goto err_exit_ptp_rx; - } err =aq_ptp_skb_ring_init (&aq_ptp->skb_ring, aq_nic->aq_nic_cfg.rxds);if (err !=0 ) {
drivers/net/ethernet/aquantia/atlantic/aq_ring.c +16 -45
102 lines not on this page · raw message
drivers/net/ethernet/aquantia/atlantic/aq_ring.h +11 -11
@@ -183,14 +183,14 @@ static inline unsigned int aq_ring_avail_dx(struct aq_ring_s *self) self->sw_head - self->sw_tail - 1); } -struct aq_ring_s *aq_ring_tx_alloc (struct aq_ring_s *self, -struct aq_nic_s *aq_nic, -unsigned int idx, -struct aq_nic_cfg_s *aq_nic_cfg); -struct aq_ring_s *aq_ring_rx_alloc (struct aq_ring_s *self, -struct aq_nic_s *aq_nic, -unsigned int idx, -struct aq_nic_cfg_s *aq_nic_cfg); +int aq_ring_tx_alloc (struct aq_ring_s *self, +struct aq_nic_s *aq_nic, +unsigned int idx, +struct aq_nic_cfg_s *aq_nic_cfg); +int aq_ring_rx_alloc (struct aq_ring_s *self, +struct aq_nic_s *aq_nic, +unsigned int idx, +struct aq_nic_cfg_s *aq_nic_cfg);int aq_ring_init (struct aq_ring_s *self,const enum atl_ring_type ring_type);void aq_ring_rx_deinit (struct aq_ring_s *self);
@@ -207,9 +207,9 @@ int aq_ring_rx_clean(struct aq_ring_s *self, int budget);int aq_ring_rx_fill (struct aq_ring_s *self); -struct aq_ring_s *aq_ring_hwts_rx_alloc (struct aq_ring_s *self, -struct aq_nic_s *aq_nic,unsigned int idx, -unsigned int size,unsigned int dx_size); +int aq_ring_hwts_rx_alloc (struct aq_ring_s *self, +struct aq_nic_s *aq_nic,unsigned int idx, +unsigned int size,unsigned int dx_size);void aq_ring_hwts_rx_clean (struct aq_ring_s *self,struct aq_nic_s *aq_nic);unsigned int aq_ring_fill_stats_data (struct aq_ring_s *self,u64 *data);
drivers/net/ethernet/aquantia/atlantic/aq_vec.c +10 -13
@@ -136,35 +136,32 @@ int aq_vec_ring_alloc(struct aq_vec_s *self, struct aq_nic_s *aq_nic,const unsigned int idx_ring =AQ_NIC_CFG_TCVEC2RING (aq_nic_cfg, i, idx); - ring =aq_ring_tx_alloc (&self->ring[i][AQ_VEC_TX_ID ], aq_nic, - idx_ring, aq_nic_cfg); -if (!ring) { - err = -ENOMEM ; + ring = &self->ring[i][AQ_VEC_TX_ID ]; + err =aq_ring_tx_alloc (ring, aq_nic, idx_ring, aq_nic_cfg); +if (err) goto err_exit; - } ++self->tx_rings;aq_nic_set_tx_ring (aq_nic, idx_ring, ring); -if (xdp_rxq_info_reg (&self->ring[i][AQ_VEC_RX_ID ].xdp_rxq, + ring = &self->ring[i][AQ_VEC_RX_ID ]; +if (xdp_rxq_info_reg (&ring->xdp_rxq, aq_nic->ndev, idx, self->napi.napi_id) <0 ) { err = -ENOMEM ; goto err_exit; } -if (xdp_rxq_info_reg_mem_model (&self->ring[i][AQ_VEC_RX_ID ].xdp_rxq, +if (xdp_rxq_info_reg_mem_model (&ring->xdp_rxq,MEM_TYPE_PAGE_SHARED ,NULL ) <0 ) { -xdp_rxq_info_unreg (&self->ring[i][AQ_VEC_RX_ID ].xdp_rxq); +xdp_rxq_info_unreg (&ring->xdp_rxq); err = -ENOMEM ; goto err_exit; } - ring =aq_ring_rx_alloc (&self->ring[i][AQ_VEC_RX_ID ], aq_nic, - idx_ring, aq_nic_cfg); -if (!ring) { -xdp_rxq_info_unreg (&self->ring[i][AQ_VEC_RX_ID ].xdp_rxq); - err = -ENOMEM ; + err =aq_ring_rx_alloc (ring, aq_nic, idx_ring, aq_nic_cfg); +if (err) { +xdp_rxq_info_unreg (&ring->xdp_rxq); goto err_exit; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 131/353 net: dsa: mv88e6xxx: Fix mv88e6352_serdes_get_stats error path
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tobias Waldekranz <[email protected]>
[ Upstream commit fc82a08ae795ee6b73fb6b50785f7be248bec7b5 ]
mv88e6xxx_get_stats, which collects stats from various sources, expects all callees to return the number of stats read. If an error occurs, 0 should be returned.
Prevent future mishaps of this kind by updating the return type to reflect this contract.
--- drivers/net/dsa/mv88e6xxx/chip.h | 4 ++-- drivers/net/dsa/mv88e6xxx/serdes.c | 10 +++++----- drivers/net/dsa/mv88e6xxx/serdes.h | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-)
drivers/net/dsa/mv88e6xxx/chip.h +2 -2
@@ -601,8 +601,8 @@ struct mv88e6xxx_ops {int (*serdes_get_sset_count)(struct mv88e6xxx_chip *chip,int port);int (*serdes_get_strings)(struct mv88e6xxx_chip *chip,int port,uint8_t *data); -int (*serdes_get_stats)(struct mv88e6xxx_chip *chip,int port, -uint64_t *data); +size_t (*serdes_get_stats)(struct mv88e6xxx_chip *chip,int port, +uint64_t *data);/* SERDES registers for ethtool */ int (*serdes_get_regs_len)(struct mv88e6xxx_chip *chip,int port);
drivers/net/dsa/mv88e6xxx/serdes.c +5 -5
@@ -177,8 +177,8 @@ static uint64_t mv88e6352_serdes_get_stat(struct mv88e6xxx_chip *chip,return val; } -int mv88e6352_serdes_get_stats (struct mv88e6xxx_chip *chip,int port, -uint64_t *data) +size_t mv88e6352_serdes_get_stats (struct mv88e6xxx_chip *chip,int port, +uint64_t *data) {struct mv88e6xxx_port *mv88e6xxx_port = &chip->ports[port];struct mv88e6352_serdes_hw_stat *stat;
@@ -187,7 +187,7 @@ int mv88e6352_serdes_get_stats(struct mv88e6xxx_chip *chip, int port, err =mv88e6352_g2_scratch_port_has_serdes (chip, port);if (err <=0 ) -return err; +return 0 ;BUILD_BUG_ON (ARRAY_SIZE (mv88e6352_serdes_hw_stats) >ARRAY_SIZE (mv88e6xxx_port->serdes_stats));
@@ -429,8 +429,8 @@ static uint64_t mv88e6390_serdes_get_stat(struct mv88e6xxx_chip *chip, int lane,return reg[0 ] | ((u64 )reg[1 ] <<16 ) | ((u64 )reg[2 ] <<32 ); } -int mv88e6390_serdes_get_stats (struct mv88e6xxx_chip *chip,int port, -uint64_t *data) +size_t mv88e6390_serdes_get_stats (struct mv88e6xxx_chip *chip,int port, +uint64_t *data) {struct mv88e6390_serdes_hw_stat *stat;int lane;
drivers/net/dsa/mv88e6xxx/serdes.h +4 -4
@@ -127,13 +127,13 @@ unsigned int mv88e6390_serdes_irq_mapping(struct mv88e6xxx_chip *chip,int mv88e6352_serdes_get_sset_count (struct mv88e6xxx_chip *chip,int port);int mv88e6352_serdes_get_strings (struct mv88e6xxx_chip *chip,int port,uint8_t *data); -int mv88e6352_serdes_get_stats (struct mv88e6xxx_chip *chip,int port, -uint64_t *data); +size_t mv88e6352_serdes_get_stats (struct mv88e6xxx_chip *chip,int port, +uint64_t *data);int mv88e6390_serdes_get_sset_count (struct mv88e6xxx_chip *chip,int port);int mv88e6390_serdes_get_strings (struct mv88e6xxx_chip *chip,int port,uint8_t *data); -int mv88e6390_serdes_get_stats (struct mv88e6xxx_chip *chip,int port, -uint64_t *data); +size_t mv88e6390_serdes_get_stats (struct mv88e6xxx_chip *chip,int port, +uint64_t *data);int mv88e6352_serdes_get_regs_len (struct mv88e6xxx_chip *chip,int port);void mv88e6352_serdes_get_regs (struct mv88e6xxx_chip *chip,int port,void *_p);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 132/353 ARM: dts: marvell: Fix some common switch mistakes
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Linus Walleij <[email protected]>
[ Upstream commit 6e75ac5a824e1551764cd4bfce5ede3d5fafc407 ]
Fix some errors in the Marvell MV88E6xxx switch descriptions:
- The top node had no address size or cells.
- switch0@0 is not OK, should be ethernet-switch@0.
- The ports node should be named ethernet-ports
- The ethernet-ports node should have port@0 etc children, no plural "ports" in the children.
- Ports should be named ethernet-port@0 etc
- PHYs should be named ethernet-phy@0 etc
This serves as an example of fixes needed for introducing a schema for the bindings, but the patch can simply be applied.
--- arch/arm/boot/dts/marvell/armada-370-rd.dts | 24 +++++----- .../marvell/armada-381-netgear-gs110emx.dts | 44 +++++++++---------- .../marvell/armada-385-clearfog-gtr-l8.dts | 38 ++++++++-------- .../marvell/armada-385-clearfog-gtr-s4.dts | 22 +++++----- .../boot/dts/marvell/armada-385-linksys.dtsi | 18 ++++---- .../dts/marvell/armada-385-turris-omnia.dts | 20 ++++----- .../boot/dts/marvell/armada-388-clearfog.dts | 20 ++++----- .../dts/marvell/armada-xp-linksys-mamba.dts | 18 ++++---- 8 files changed, 96 insertions(+), 108 deletions(-)
arch/arm/boot/dts/marvell/armada-370-rd.dts +11 -13
@@ -149,39 +149,37 @@ }; }; - switch: switch@10 { + switch: ethernet-switch@10 { compatible = "marvell,mv88e6085"; - #address-cells = <1>; - #size-cells = <0>; reg = <0x10>; interrupt-controller; #interrupt-cells = <2>; - ports { + ethernet-ports { #address-cells = <1>; #size-cells = <0>; - port@0 { + ethernet-port@0 { reg = <0>; label = "lan0"; }; - port@1 { + ethernet-port@1 { reg = <1>; label = "lan1"; }; - port@2 { + ethernet-port@2 { reg = <2>; label = "lan2"; }; - port@3 { + ethernet-port@3 { reg = <3>; label = "lan3"; }; - port@5 { + ethernet-port@5 { reg = <5>; ethernet = <ð1>; phy-mode = "rgmii-id";
@@ -196,25 +194,25 @@ #address-cells = <1>; #size-cells = <0>; - switchphy0: switchphy@0 { + switchphy0: ethernet-phy@0 { reg = <0>; interrupt-parent = <&switch>; interrupts = <0 IRQ_TYPE_LEVEL_HIGH>; }; - switchphy1: switchphy@1 { + switchphy1: ethernet-phy@1 { reg = <1>; interrupt-parent = <&switch>; interrupts = <1 IRQ_TYPE_LEVEL_HIGH>; }; - switchphy2: switchphy@2 { + switchphy2: ethernet-phy@2 { reg = <2>; interrupt-parent = <&switch>; interrupts = <2 IRQ_TYPE_LEVEL_HIGH>; }; - switchphy3: switchphy@3 { + switchphy3: ethernet-phy@3 { reg = <3>; interrupt-parent = <&switch>; interrupts = <3 IRQ_TYPE_LEVEL_HIGH>;
arch/arm/boot/dts/marvell/armada-381-netgear-gs110emx.dts +21 -23
145 lines not on this page · raw message
arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-l8.dts +19 -19
@@ -7,66 +7,66 @@ }; &mdio { - switch0: switch0@4 { + switch0: ethernet-switch@4 { compatible = "marvell,mv88e6190"; reg = <4>; pinctrl-names = "default"; pinctrl-0 = <&cf_gtr_switch_reset_pins>; reset-gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; - ports { + ethernet-ports { #address-cells = <1>; #size-cells = <0>; - port@1 { + ethernet-port@1 { reg = <1>; label = "lan8"; phy-handle = <&switch0phy0>; }; - port@2 { + ethernet-port@2 { reg = <2>; label = "lan7"; phy-handle = <&switch0phy1>; }; - port@3 { + ethernet-port@3 { reg = <3>; label = "lan6"; phy-handle = <&switch0phy2>; }; - port@4 { + ethernet-port@4 { reg = <4>; label = "lan5"; phy-handle = <&switch0phy3>; }; - port@5 { + ethernet-port@5 { reg = <5>; label = "lan4"; phy-handle = <&switch0phy4>; }; - port@6 { + ethernet-port@6 { reg = <6>; label = "lan3"; phy-handle = <&switch0phy5>; }; - port@7 { + ethernet-port@7 { reg = <7>; label = "lan2"; phy-handle = <&switch0phy6>; }; - port@8 { + ethernet-port@8 { reg = <8>; label = "lan1"; phy-handle = <&switch0phy7>; }; - port@10 { + ethernet-port@10 { reg = <10>; phy-mode = "2500base-x";
@@ -83,35 +83,35 @@ #address-cells = <1>; #size-cells = <0>; - switch0phy0: switch0phy0@1 { + switch0phy0: ethernet-phy@1 { reg = <0x1>; }; - switch0phy1: switch0phy1@2 { + switch0phy1: ethernet-phy@2 { reg = <0x2>; }; - switch0phy2: switch0phy2@3 { + switch0phy2: ethernet-phy@3 { reg = <0x3>; }; - switch0phy3: switch0phy3@4 { + switch0phy3: ethernet-phy@4 { reg = <0x4>; }; - switch0phy4: switch0phy4@5 { + switch0phy4: ethernet-phy@5 { reg = <0x5>; }; - switch0phy5: switch0phy5@6 { + switch0phy5: ethernet-phy@6 { reg = <0x6>; }; - switch0phy6: switch0phy6@7 { + switch0phy6: ethernet-phy@7 { reg = <0x7>; }; - switch0phy7: switch0phy7@8 { + switch0phy7: ethernet-phy@8 { reg = <0x8>; }; };
arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-s4.dts +11 -11
@@ -11,42 +11,42 @@ }; &mdio { - switch0: switch0@4 { + switch0: ethernet-switch@4 { compatible = "marvell,mv88e6085"; reg = <4>; pinctrl-names = "default"; pinctrl-0 = <&cf_gtr_switch_reset_pins>; reset-gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; - ports { + ethernet-ports { #address-cells = <1>; #size-cells = <0>; - port@1 { + ethernet-port@1 { reg = <1>; label = "lan2"; phy-handle = <&switch0phy0>; }; - port@2 { + ethernet-port@2 { reg = <2>; label = "lan1"; phy-handle = <&switch0phy1>; }; - port@3 { + ethernet-port@3 { reg = <3>; label = "lan4"; phy-handle = <&switch0phy2>; }; - port@4 { + ethernet-port@4 { reg = <4>; label = "lan3"; phy-handle = <&switch0phy3>; }; - port@5 { + ethernet-port@5 { reg = <5>; phy-mode = "2500base-x"; ethernet = <ð1>;
@@ -63,19 +63,19 @@ #address-cells = <1>; #size-cells = <0>; - switch0phy0: switch0phy0@11 { + switch0phy0: ethernet-phy@11 { reg = <0x11>; }; - switch0phy1: switch0phy1@12 { + switch0phy1: ethernet-phy@12 { reg = <0x12>; }; - switch0phy2: switch0phy2@13 { + switch0phy2: ethernet-phy@13 { reg = <0x13>; }; - switch0phy3: switch0phy3@14 { + switch0phy3: ethernet-phy@14 { reg = <0x14>; }; };
arch/arm/boot/dts/marvell/armada-385-linksys.dtsi +8 -10
@@ -158,42 +158,40 @@ &mdio { status = "okay"; - switch@0 { + ethernet-switch@0 { compatible = "marvell,mv88e6085"; - #address-cells = <1>; - #size-cells = <0>; reg = <0>; - ports { + ethernet-ports { #address-cells = <1>; #size-cells = <0>; - port@0 { + ethernet-port@0 { reg = <0>; label = "lan4"; }; - port@1 { + ethernet-port@1 { reg = <1>; label = "lan3"; }; - port@2 { + ethernet-port@2 { reg = <2>; label = "lan2"; }; - port@3 { + ethernet-port@3 { reg = <3>; label = "lan1"; }; - port@4 { + ethernet-port@4 { reg = <4>; label = "wan"; }; - port@5 { + ethernet-port@5 { reg = <5>; phy-mode = "sgmii"; ethernet = <ð2>;
arch/arm/boot/dts/marvell/armada-385-turris-omnia.dts +9 -11
@@ -435,12 +435,10 @@ }; /* Switch MV88E6176 at address 0x10 */ - switch@10 { + ethernet-switch@10 { pinctrl-names = "default"; pinctrl-0 = <&swint_pins>; compatible = "marvell,mv88e6085"; - #address-cells = <1>; - #size-cells = <0>; dsa,member = <0 0>; reg = <0x10>;
@@ -448,36 +446,36 @@ interrupt-parent = <&gpio1>; interrupts = <13 IRQ_TYPE_LEVEL_LOW>; - ports { + ethernet-ports { #address-cells = <1>; #size-cells = <0>; - ports@0 { + ethernet-port@0 { reg = <0>; label = "lan0"; }; - ports@1 { + ethernet-port@1 { reg = <1>; label = "lan1"; }; - ports@2 { + ethernet-port@2 { reg = <2>; label = "lan2"; }; - ports@3 { + ethernet-port@3 { reg = <3>; label = "lan3"; }; - ports@4 { + ethernet-port@4 { reg = <4>; label = "lan4"; }; - ports@5 { + ethernet-port@5 { reg = <5>; ethernet = <ð1>; phy-mode = "rgmii-id";
@@ -488,7 +486,7 @@ }; }; - ports@6 { + ethernet-port@6 { reg = <6>; ethernet = <ð0>; phy-mode = "rgmii-id";
arch/arm/boot/dts/marvell/armada-388-clearfog.dts +9 -11
@@ -92,44 +92,42 @@ &mdio { status = "okay"; - switch@4 { + ethernet-switch@4 { compatible = "marvell,mv88e6085"; - #address-cells = <1>; - #size-cells = <0>; reg = <4>; pinctrl-0 = <&clearfog_dsa0_clk_pins &clearfog_dsa0_pins>; pinctrl-names = "default"; - ports { + ethernet-ports { #address-cells = <1>; #size-cells = <0>; - port@0 { + ethernet-port@0 { reg = <0>; label = "lan5"; }; - port@1 { + ethernet-port@1 { reg = <1>; label = "lan4"; }; - port@2 { + ethernet-port@2 { reg = <2>; label = "lan3"; }; - port@3 { + ethernet-port@3 { reg = <3>; label = "lan2"; }; - port@4 { + ethernet-port@4 { reg = <4>; label = "lan1"; }; - port@5 { + ethernet-port@5 { reg = <5>; ethernet = <ð1>; phy-mode = "1000base-x";
@@ -140,7 +138,7 @@ }; }; - port@6 { + ethernet-port@6 { /* 88E1512 external phy */ reg = <6>; label = "lan6";
arch/arm/boot/dts/marvell/armada-xp-linksys-mamba.dts +8 -10
@@ -265,42 +265,40 @@ &mdio { status = "okay"; - switch@0 { + ethernet-switch@0 { compatible = "marvell,mv88e6085"; - #address-cells = <1>; - #size-cells = <0>; reg = <0>; - ports { + ethernet-ports { #address-cells = <1>; #size-cells = <0>; - port@0 { + ethernet-port@0 { reg = <0>; label = "lan4"; }; - port@1 { + ethernet-port@1 { reg = <1>; label = "lan3"; }; - port@2 { + ethernet-port@2 { reg = <2>; label = "lan2"; }; - port@3 { + ethernet-port@3 { reg = <3>; label = "lan1"; }; - port@4 { + ethernet-port@4 { reg = <4>; label = "internet"; }; - port@5 { + ethernet-port@5 { reg = <5>; phy-mode = "rgmii-id"; ethernet = <ð0>;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 133/353 ARM64: dts: marvell: Fix some common switch mistakes
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Linus Walleij <[email protected]>
[ Upstream commit fedb923aaf611e36adad4cd8c91d35bc283d3eea ]
Fix some errors in the Marvell MV88E6xxx switch descriptions:
- The top node had no address size or cells.
- switch0@0 is not OK, should be ethernet-switch@0.
- ports should be ethernet-ports
- port@0 should be ethernet-port@0
- PHYs should be named ethernet-phy@
--- .../marvell/armada-3720-espressobin-ultra.dts | 14 +-- .../dts/marvell/armada-3720-espressobin.dtsi | 20 ++--- .../dts/marvell/armada-3720-gl-mv1000.dts | 20 ++--- .../dts/marvell/armada-3720-turris-mox.dts | 85 +++++++++++-------- .../boot/dts/marvell/armada-7040-mochabin.dts | 24 +++--- .../marvell/armada-8040-clearfog-gt-8k.dts | 22 ++--- arch/arm64/boot/dts/marvell/cn9130-crb.dtsi | 42 +++++---- 7 files changed, 115 insertions(+), 112 deletions(-)
arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts +7 -7
@@ -126,32 +126,32 @@ reset-gpios = <&gpiosb 23 GPIO_ACTIVE_LOW>; - ports { - switch0port1: port@1 { + ethernet-ports { + switch0port1: ethernet-port@1 { reg = <1>; label = "lan0"; phy-handle = <&switch0phy0>; }; - switch0port2: port@2 { + switch0port2: ethernet-port@2 { reg = <2>; label = "lan1"; phy-handle = <&switch0phy1>; }; - switch0port3: port@3 { + switch0port3: ethernet-port@3 { reg = <3>; label = "lan2"; phy-handle = <&switch0phy2>; }; - switch0port4: port@4 { + switch0port4: ethernet-port@4 { reg = <4>; label = "lan3"; phy-handle = <&switch0phy3>; }; - switch0port5: port@5 { + switch0port5: ethernet-port@5 { reg = <5>; label = "wan"; phy-handle = <&extphy>;
@@ -160,7 +160,7 @@ }; mdio { - switch0phy3: switch0phy3@14 { + switch0phy3: ethernet-phy@14 { reg = <0x14>; }; };
arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi +9 -11
@@ -145,19 +145,17 @@ }; &mdio { - switch0: switch0@1 { + switch0: ethernet-switch@1 { compatible = "marvell,mv88e6085"; - #address-cells = <1>; - #size-cells = <0>; reg = <1>; dsa,member = <0 0>; - ports { + ethernet-ports { #address-cells = <1>; #size-cells = <0>; - switch0port0: port@0 { + switch0port0: ethernet-port@0 { reg = <0>; label = "cpu"; ethernet = <ð0>;
@@ -168,19 +166,19 @@ }; }; - switch0port1: port@1 { + switch0port1: ethernet-port@1 { reg = <1>; label = "wan"; phy-handle = <&switch0phy0>; }; - switch0port2: port@2 { + switch0port2: ethernet-port@2 { reg = <2>; label = "lan0"; phy-handle = <&switch0phy1>; }; - switch0port3: port@3 { + switch0port3: ethernet-port@3 { reg = <3>; label = "lan1"; phy-handle = <&switch0phy2>;
@@ -192,13 +190,13 @@ #address-cells = <1>; #size-cells = <0>; - switch0phy0: switch0phy0@11 { + switch0phy0: ethernet-phy@11 { reg = <0x11>; }; - switch0phy1: switch0phy1@12 { + switch0phy1: ethernet-phy@12 { reg = <0x12>; }; - switch0phy2: switch0phy2@13 { + switch0phy2: ethernet-phy@13 { reg = <0x13>; }; };
arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts +9 -11
@@ -152,31 +152,29 @@ }; &mdio { - switch0: switch0@1 { + switch0: ethernet-switch@1 { compatible = "marvell,mv88e6085"; - #address-cells = <1>; - #size-cells = <0>; reg = <1>; dsa,member = <0 0>; - ports: ports { + ports: ethernet-ports { #address-cells = <1>; #size-cells = <0>; - port@0 { + ethernet-port@0 { reg = <0>; label = "cpu"; ethernet = <ð0>; }; - port@1 { + ethernet-port@1 { reg = <1>; label = "wan"; phy-handle = <&switch0phy0>; }; - port@2 { + ethernet-port@2 { reg = <2>; label = "lan0"; phy-handle = <&switch0phy1>;
@@ -185,7 +183,7 @@ nvmem-cell-names = "mac-address"; }; - port@3 { + ethernet-port@3 { reg = <3>; label = "lan1"; phy-handle = <&switch0phy2>;
@@ -199,13 +197,13 @@ #address-cells = <1>; #size-cells = <0>; - switch0phy0: switch0phy0@11 { + switch0phy0: ethernet-phy@11 { reg = <0x11>; }; - switch0phy1: switch0phy1@12 { + switch0phy1: ethernet-phy@12 { reg = <0x12>; }; - switch0phy2: switch0phy2@13 { + switch0phy2: ethernet-phy@13 { reg = <0x13>; }; };
arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts +48 -37
247 lines not on this page · raw message
arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts +11 -13
@@ -301,10 +301,8 @@ }; /* 88E6141 Topaz switch */ - switch: switch@3 { + switch: ethernet-switch@3 { compatible = "marvell,mv88e6085"; - #address-cells = <1>; - #size-cells = <0>; reg = <3>; pinctrl-names = "default";
@@ -314,35 +312,35 @@ interrupt-parent = <&cp0_gpio1>; interrupts = <1 IRQ_TYPE_LEVEL_LOW>; - ports { + ethernet-ports { #address-cells = <1>; #size-cells = <0>; - swport1: port@1 { + swport1: ethernet-port@1 { reg = <1>; label = "lan0"; phy-handle = <&swphy1>; }; - swport2: port@2 { + swport2: ethernet-port@2 { reg = <2>; label = "lan1"; phy-handle = <&swphy2>; }; - swport3: port@3 { + swport3: ethernet-port@3 { reg = <3>; label = "lan2"; phy-handle = <&swphy3>; }; - swport4: port@4 { + swport4: ethernet-port@4 { reg = <4>; label = "lan3"; phy-handle = <&swphy4>; }; - port@5 { + ethernet-port@5 { reg = <5>; label = "cpu"; ethernet = <&cp0_eth1>;
@@ -355,19 +353,19 @@ #address-cells = <1>; #size-cells = <0>; - swphy1: swphy1@17 { + swphy1: ethernet-phy@17 { reg = <17>; }; - swphy2: swphy2@18 { + swphy2: ethernet-phy@18 { reg = <18>; }; - swphy3: swphy3@19 { + swphy3: ethernet-phy@19 { reg = <19>; }; - swphy4: swphy4@20 { + swphy4: ethernet-phy@20 { reg = <20>; }; };
arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts +11 -11
@@ -497,42 +497,42 @@ reset-deassert-us = <10000>; }; - switch0: switch0@4 { + switch0: ethernet-switch@4 { compatible = "marvell,mv88e6085"; reg = <4>; pinctrl-names = "default"; pinctrl-0 = <&cp1_switch_reset_pins>; reset-gpios = <&cp1_gpio1 24 GPIO_ACTIVE_LOW>; - ports { + ethernet-ports { #address-cells = <1>; #size-cells = <0>; - port@1 { + ethernet-port@1 { reg = <1>; label = "lan2"; phy-handle = <&switch0phy0>; }; - port@2 { + ethernet-port@2 { reg = <2>; label = "lan1"; phy-handle = <&switch0phy1>; }; - port@3 { + ethernet-port@3 { reg = <3>; label = "lan4"; phy-handle = <&switch0phy2>; }; - port@4 { + ethernet-port@4 { reg = <4>; label = "lan3"; phy-handle = <&switch0phy3>; }; - port@5 { + ethernet-port@5 { reg = <5>; label = "cpu"; ethernet = <&cp1_eth2>;
@@ -545,19 +545,19 @@ #address-cells = <1>; #size-cells = <0>; - switch0phy0: switch0phy0@11 { + switch0phy0: ethernet-phy@11 { reg = <0x11>; }; - switch0phy1: switch0phy1@12 { + switch0phy1: ethernet-phy@12 { reg = <0x12>; }; - switch0phy2: switch0phy2@13 { + switch0phy2: ethernet-phy@13 { reg = <0x13>; }; - switch0phy3: switch0phy3@14 { + switch0phy3: ethernet-phy@14 { reg = <0x14>; }; };
arch/arm64/boot/dts/marvell/cn9130-crb.dtsi +20 -22
132 lines not on this page · raw message
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 134/353 block: prevent an integer overflow in bvec_try_merge_hw_page
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoph Hellwig <[email protected]>
[ Upstream commit 3f034c374ad55773c12dd8f3c1607328e17c0072 ]
Reordered a check to avoid a possible overflow when adding len to bv_len.
--- block/bio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
block/bio.c +1 -1
@@ -944,7 +944,7 @@ bool bvec_try_merge_hw_page(struct request_queue *q, struct bio_vec *bv,if ((addr1 | mask) != (addr2 | mask))return false; -if (bv->bv_len + len >queue_max_segment_size (q)) +if (len >queue_max_segment_size (q) - bv->bv_len)return false;return bvec_try_merge_page (bv, page, len, offset, same_page); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 135/353 md: Whenassemble the array, consult the superblock of the freshest device
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Lyakas <[email protected]>
[ Upstream commit dc1cc22ed58f11d58d8553c5ec5f11cbfc3e3039 ]
Upon assembling the array, both kernel and mdadm allow the devices to have event counter difference of 1, and still consider them as up-to-date. However, a device whose event count is behind by 1, may in fact not be up-to-date, and array resync with such a device may cause data corruption.
To avoid this, consult the superblock of the freshest device about the status of a device, whose event counter is behind by 1.
--- drivers/md/md.c | 54 ++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 44 insertions(+), 10 deletions(-)
drivers/md/md.c +44 -10
@@ -1219,6 +1219,7 @@ struct super_type {struct md_rdev *refdev, int minor_version);int (*validate_super)(struct mddev *mddev, +struct md_rdev *freshest,struct md_rdev *rdev);void (*sync_super)(struct mddev *mddev,struct md_rdev *rdev);
@@ -1356,8 +1357,9 @@ static int super_90_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor/* * validate_super for 0.90.0 +* note: we are not using "freshest" for 0.9 superblock */ -static int super_90_validate (struct mddev *mddev,struct md_rdev *rdev) +static int super_90_validate (struct mddev *mddev,struct md_rdev *freshest,struct md_rdev *rdev) {mdp_disk_t *desc;mdp_super_t *sb =page_address (rdev->sb_page);
@@ -1869,7 +1871,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_return ret; } -static int super_1_validate (struct mddev *mddev,struct md_rdev *rdev) +static int super_1_validate (struct mddev *mddev,struct md_rdev *freshest,struct md_rdev *rdev) {struct mdp_superblock_1 *sb =page_address (rdev->sb_page);__u64 ev1 =le64_to_cpu (sb->events);
@@ -1965,13 +1967,15 @@ static int super_1_validate(struct mddev *mddev, struct md_rdev *rdev) } }else if (mddev->pers ==NULL ) {/* Insist of good event counter while assembling, except for -* spares (which don't need an event count) */ - ++ev1; +* spares (which don't need an event count). +* Similar to mdadm, we allow event counter difference of 1 +* from the freshest device. +*/ if (rdev->desc_nr >=0 && rdev->desc_nr <le32_to_cpu (sb->max_dev) && (le16_to_cpu (sb->dev_roles[rdev->desc_nr]) <MD_DISK_ROLE_MAX ||le16_to_cpu (sb->dev_roles[rdev->desc_nr]) ==MD_DISK_ROLE_JOURNAL )) -if (ev1 < mddev->events) +if (ev1 +1 < mddev->events)return -EINVAL ; }else if (mddev->bitmap) {/* If adding to array with a bitmap, then we can accept an
@@ -1992,8 +1996,38 @@ static int super_1_validate(struct mddev *mddev, struct md_rdev *rdev) rdev->desc_nr >= le32_to_cpu(sb->max_dev)) { role =MD_DISK_ROLE_SPARE ; rdev->desc_nr =-1 ; - } else + } else if (mddev->pers == NULL && freshest && ev1 < mddev->events) { +/* +* If we are assembling, and our event counter is smaller than the +* highest event counter, we cannot trust our superblock about the role. +* It could happen that our rdev was marked as Faulty, and all other +* superblocks were updated with +1 event counter. +* Then, before the next superblock update, which typically happens when +* remove_and_add_spares() removes the device from the array, there was +* a crash or reboot. +* If we allow current rdev without consulting the freshest superblock, +* we could cause data corruption. +* Note that in this case our event counter is smaller by 1 than the +* highest, otherwise, this rdev would not be allowed into array; +* both kernel and mdadm allow event counter difference of 1. +*/ +struct mdp_superblock_1 *freshest_sb =page_address (freshest->sb_page); +u32 freshest_max_dev =le32_to_cpu (freshest_sb->max_dev); + +if (rdev->desc_nr >= freshest_max_dev) { +/* this is unexpected, better not proceed */ +pr_warn ("md: %s: rdev[%pg]: desc_nr(%d) >= freshest(%pg)->sb->max_dev(%u)\n" , +mdname (mddev), rdev->bdev, rdev->desc_nr, + freshest->bdev, freshest_max_dev); +return -EUCLEAN ; + } + + role =le16_to_cpu (freshest_sb->dev_roles[rdev->desc_nr]); +pr_debug ("md: %s: rdev[%pg]: role=%d(0x%x) according to freshest %pg\n" , +mdname (mddev), rdev->bdev, role, role, freshest->bdev); + } else { role =le16_to_cpu (sb->dev_roles[rdev->desc_nr]); + }switch (role) {case MD_DISK_ROLE_SPARE :/* spare */ break ;
@@ -2900,7 +2934,7 @@ static int add_bound_rdev(struct md_rdev *rdev)* and should be added immediately. */ super_types[mddev->major_version]. -validate_super (mddev, rdev); +validate_super (mddev,NULL /*freshest*/ , rdev); err = mddev->pers->hot_add_disk (mddev, rdev);if (err) {md_kick_rdev_from_array (rdev);
@@ -3837,7 +3871,7 @@ static int analyze_sbs(struct mddev *mddev) } super_types[mddev->major_version]. -validate_super (mddev, freshest); +validate_super (mddev,NULL /*freshest*/ , freshest); i =0 ;rdev_for_each_safe (rdev, tmp, mddev) {
@@ -3852,7 +3886,7 @@ static int analyze_sbs(struct mddev *mddev) }if (rdev != freshest) {if (super_types[mddev->major_version]. -validate_super (mddev, rdev)) { +validate_super (mddev, freshest, rdev)) {pr_warn ("md: kicking non-fresh %pg from array!\n" , rdev->bdev);md_kick_rdev_from_array (rdev);
@@ -6843,7 +6877,7 @@ int md_add_new_disk(struct mddev *mddev, struct mdu_disk_info_s *info) rdev->saved_raid_disk = rdev->raid_disk; }else super_types[mddev->major_version]. -validate_super (mddev, rdev); +validate_super (mddev,NULL /*freshest*/ , rdev);if ((info->state & (1 <<MD_DISK_SYNC )) && rdev->raid_disk != info->raid_disk) {/* This was a hot-add request, but events doesn't
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 136/353 x86/cfi,bpf: Fix bpf_exception_cb() signature
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexei Starovoitov <[email protected]>
[ Upstream commit 852486b35f344887786d63250946dd921a05d7e8 ]
As per the earlier patches, BPF sub-programs have bpf_callback_t signature and CFI expects callers to have matching signature. This is violated by bpf_prog_aux::bpf_exception_cb().
--- include/linux/bpf.h | 2 +- kernel/bpf/helpers.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
include/linux/bpf.h +1 -1
@@ -1447,7 +1447,7 @@ struct bpf_prog_aux {int cgroup_atype;/* enum cgroup_bpf_attach_type */ struct bpf_map *cgroup_storage[MAX_BPF_CGROUP_STORAGE_TYPE ];char name[BPF_OBJ_NAME_LEN ]; -unsigned int (*bpf_exception_cb)(u64 cookie,u64 sp,u64 bp); +u64 (*bpf_exception_cb)(u64 cookie,u64 sp,u64 bp,u64 ,u64 );#ifdef CONFIG_SECURITY void *security;#endif
kernel/bpf/helpers.c +1 -1
@@ -2509,7 +2509,7 @@ __bpf_kfunc void bpf_throw(u64 cookie)* which skips compiler generated instrumentation to do the same. */ kasan_unpoison_task_stack_below ((void *)(long )ctx.sp); - ctx.aux->bpf_exception_cb (cookie, ctx.sp, ctx.bp); + ctx.aux->bpf_exception_cb (cookie, ctx.sp, ctx.bp,0 ,0 );WARN (1 ,"A call to BPF exception callback should never return\n" ); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 137/353 arm64: dts: qcom: msm8996: Fix in-ports is a required property
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mao Jinlong <[email protected]>
[ Upstream commit 9a6fc510a6a3ec150cb7450aec1e5f257e6fc77b ]
Add the inport of funnel@3023000 to fix 'in-ports' is a required property warning.
--- arch/arm64/boot/dts/qcom/msm8996.dtsi | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
arch/arm64/boot/dts/qcom/msm8996.dtsi +21 -0
@@ -444,6 +444,19 @@ reg = <0x0 0x80000000 0x0 0x0>; }; + etm { + compatible = "qcom,coresight-remote-etm"; + + out-ports { + port { + modem_etm_out_funnel_in2: endpoint { + remote-endpoint = + <&funnel_in2_in_modem_etm>; + }; + }; + }; + }; + psci { compatible = "arm,psci-1.0"; method = "smc";
@@ -2644,6 +2657,14 @@ clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>; clock-names = "apb_pclk", "atclk"; + in-ports { + port { + funnel_in2_in_modem_etm: endpoint { + remote-endpoint = + <&modem_etm_out_funnel_in2>; + }; + }; + }; out-ports { port {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 138/353 arm64: dts: qcom: msm8998: Fix out-ports is a required property
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mao Jinlong <[email protected]>
[ Upstream commit ae5ee3562a2519214b12228545e88a203dd68bbd ]
out-ports is a required property for coresight ETM. Add out-ports for ETM nodes to fix the warning.
--- arch/arm64/boot/dts/qcom/msm8998.dtsi | 32 +++++++++++++++++---------- 1 file changed, 20 insertions(+), 12 deletions(-)
arch/arm64/boot/dts/qcom/msm8998.dtsi +20 -12
@@ -2031,9 +2031,11 @@ cpu = <&CPU4>; - port { - etm4_out: endpoint { - remote-endpoint = <&apss_funnel_in4>; + out-ports { + port { + etm4_out: endpoint { + remote-endpoint = <&apss_funnel_in4>; + }; }; }; };
@@ -2048,9 +2050,11 @@ cpu = <&CPU5>; - port { - etm5_out: endpoint { - remote-endpoint = <&apss_funnel_in5>; + out-ports { + port { + etm5_out: endpoint { + remote-endpoint = <&apss_funnel_in5>; + }; }; }; };
@@ -2065,9 +2069,11 @@ cpu = <&CPU6>; - port { - etm6_out: endpoint { - remote-endpoint = <&apss_funnel_in6>; + out-ports { + port { + etm6_out: endpoint { + remote-endpoint = <&apss_funnel_in6>; + }; }; }; };
@@ -2082,9 +2088,11 @@ cpu = <&CPU7>; - port { - etm7_out: endpoint { - remote-endpoint = <&apss_funnel_in7>; + out-ports { + port { + etm7_out: endpoint { + remote-endpoint = <&apss_funnel_in7>; + }; }; }; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 139/353 arm64: dts: qcom: Fix coresight warnings in in-ports and out-ports
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mao Jinlong <[email protected]>
[ Upstream commit bdb6339fd46b8702ea7411b0b414587b86a40562 ]
When a node is only one in port or one out port, address-cells and size-cells are not required in in-ports and out-ports. And the number and reg of the port need to be removed.
--- arch/arm64/boot/dts/qcom/sdm845.dtsi | 5 +---- arch/arm64/boot/dts/qcom/sm8150.dtsi | 5 +---- arch/arm64/boot/dts/qcom/sm8250.dtsi | 24 ++++-------------------- 3 files changed, 6 insertions(+), 28 deletions(-)
arch/arm64/boot/dts/qcom/sdm845.dtsi +1 -4
@@ -3545,11 +3545,8 @@ }; in-ports { - #address-cells = <1>; - #size-cells = <0>; - port@1 { - reg = <1>; + port { etf_in: endpoint { remote-endpoint = <&merge_funnel_out>;
arch/arm64/boot/dts/qcom/sm8150.dtsi +1 -4
@@ -2957,11 +2957,8 @@ }; in-ports { - #address-cells = <1>; - #size-cells = <0>; - port@1 { - reg = <1>; + port { replicator1_in: endpoint { remote-endpoint = <&replicator_out1>; };
arch/arm64/boot/dts/qcom/sm8250.dtsi +4 -20
@@ -3095,11 +3095,8 @@ clock-names = "apb_pclk"; out-ports { - #address-cells = <1>; - #size-cells = <0>; - port@0 { - reg = <0>; + port { tpda_out_funnel_qatb: endpoint { remote-endpoint = <&funnel_qatb_in_tpda>; };
@@ -3142,11 +3139,7 @@ }; in-ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; + port { funnel_qatb_in_tpda: endpoint { remote-endpoint = <&tpda_out_funnel_qatb>; };
@@ -3355,11 +3348,8 @@ }; in-ports { - #address-cells = <1>; - #size-cells = <0>; - port@0 { - reg = <0>; + port { etf_in_funnel_swao_out: endpoint { remote-endpoint = <&funnel_swao_out_etf>; };
@@ -3443,8 +3433,6 @@ clock-names = "apb_pclk"; out-ports { - #address-cells = <1>; - #size-cells = <0>; port { tpdm_mm_out_tpda9: endpoint { remote-endpoint = <&tpda_9_in_tpdm_mm>;
@@ -3710,11 +3698,7 @@ }; in-ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; + port { funnel_apss_merg_in_funnel_apss: endpoint { remote-endpoint = <&funnel_apss_out_funnel_apss_merg>; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 140/353 intel: add bit macro includes where needed
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jesse Brandeburg <[email protected]>
[ Upstream commit 3314f2097dee43defc20554f961a8b17f4787e2d ]
This series is introducing the use of FIELD_GET and FIELD_PREP which requires bitfield.h to be included. Fix all the includes in this one change, and rearrange includes into alphabetical order to ease readability and future maintenance.
virtchnl.h and it's usage was modified to have it's own includes as it should. This required including bits.h for virtchnl.h.
--- drivers/net/ethernet/intel/e1000/e1000_hw.c | 1 + drivers/net/ethernet/intel/fm10k/fm10k_pf.c | 1 + drivers/net/ethernet/intel/fm10k/fm10k_vf.c | 1 + drivers/net/ethernet/intel/i40e/i40e_common.c | 1 + drivers/net/ethernet/intel/i40e/i40e_dcb.c | 2 ++ drivers/net/ethernet/intel/i40e/i40e_nvm.c | 1 + drivers/net/ethernet/intel/iavf/iavf_common.c | 3 +- .../net/ethernet/intel/iavf/iavf_ethtool.c | 5 ++-- drivers/net/ethernet/intel/iavf/iavf_fdir.c | 1 + drivers/net/ethernet/intel/iavf/iavf_txrx.c | 1 + drivers/net/ethernet/intel/igb/e1000_i210.c | 4 +-- drivers/net/ethernet/intel/igb/e1000_nvm.c | 4 +-- drivers/net/ethernet/intel/igb/e1000_phy.c | 4 +-- drivers/net/ethernet/intel/igbvf/netdev.c | 28 +++++++++---------- drivers/net/ethernet/intel/igc/igc_i225.c | 1 + drivers/net/ethernet/intel/igc/igc_phy.c | 1 + include/linux/avf/virtchnl.h | 1 + 17 files changed, 37 insertions(+), 23 deletions(-)
drivers/net/ethernet/intel/e1000/e1000_hw.c +1 -0
@@ -5,6 +5,7 @@* Shared functions for accessing and configuring the MAC */ +#include <linux/bitfield.h> #include "e1000.h" static s32 e1000_check_downshift (struct e1000_hw *hw);
drivers/net/ethernet/intel/fm10k/fm10k_pf.c +1 -0
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright(c) 2013 - 2019 Intel Corporation. */ +#include <linux/bitfield.h> #include "fm10k_pf.h" #include "fm10k_vf.h"
drivers/net/ethernet/intel/fm10k/fm10k_vf.c +1 -0
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright(c) 2013 - 2019 Intel Corporation. */ +#include <linux/bitfield.h> #include "fm10k_vf.h" /**
drivers/net/ethernet/intel/i40e/i40e_common.c +1 -0
@@ -2,6 +2,7 @@/* Copyright(c) 2013 - 2021 Intel Corporation. */ #include <linux/avf/virtchnl.h> +#include <linux/bitfield.h> #include <linux/delay.h> #include <linux/etherdevice.h> #include <linux/pci.h>
drivers/net/ethernet/intel/i40e/i40e_dcb.c +2 -0
@@ -1,6 +1,8 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright(c) 2013 - 2021 Intel Corporation. */ +#include <linux/bitfield.h> +#include "i40e_adminq.h" #include "i40e_alloc.h" #include "i40e_dcb.h" #include "i40e_prototype.h"
drivers/net/ethernet/intel/i40e/i40e_nvm.c +1 -0
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright(c) 2013 - 2018 Intel Corporation. */ +#include <linux/bitfield.h> #include <linux/delay.h> #include "i40e_alloc.h" #include "i40e_prototype.h"
drivers/net/ethernet/intel/iavf/iavf_common.c +2 -1
@@ -1,10 +1,11 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright(c) 2013 - 2018 Intel Corporation. */ +#include <linux/avf/virtchnl.h> +#include <linux/bitfield.h> #include "iavf_type.h" #include "iavf_adminq.h" #include "iavf_prototype.h" -#include <linux/avf/virtchnl.h> /** * iavf_aq_str - convert AQ err code to a string
drivers/net/ethernet/intel/iavf/iavf_ethtool.c +3 -2
@@ -1,11 +1,12 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright(c) 2013 - 2018 Intel Corporation. */ +#include <linux/bitfield.h> +#include <linux/uaccess.h> +/* ethtool support for iavf */ #include "iavf.h" -#include <linux/uaccess.h> -/* ethtool statistics helpers */ /**
drivers/net/ethernet/intel/iavf/iavf_fdir.c +1 -0
@@ -3,6 +3,7 @@/* flow director ethtool support for iavf */ +#include <linux/bitfield.h> #include "iavf.h" #define GTPU_PORT 2152
drivers/net/ethernet/intel/iavf/iavf_txrx.c +1 -0
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright(c) 2013 - 2018 Intel Corporation. */ +#include <linux/bitfield.h> #include <linux/prefetch.h> #include "iavf.h"
drivers/net/ethernet/intel/igb/e1000_i210.c +2 -2
@@ -5,9 +5,9 @@* e1000_i211 */ -#include <linux/types.h> +#include <linux/bitfield.h> #include <linux/if_ether.h> - +#include <linux/types.h> #include "e1000_hw.h" #include "e1000_i210.h"
drivers/net/ethernet/intel/igb/e1000_nvm.c +2 -2
@@ -1,9 +1,9 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright(c) 2007 - 2018 Intel Corporation. */ -#include <linux/if_ether.h> +#include <linux/bitfield.h> #include <linux/delay.h> - +#include <linux/if_ether.h> #include "e1000_mac.h" #include "e1000_nvm.h"
drivers/net/ethernet/intel/igb/e1000_phy.c +2 -2
@@ -1,9 +1,9 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright(c) 2007 - 2018 Intel Corporation. */ -#include <linux/if_ether.h> +#include <linux/bitfield.h> #include <linux/delay.h> - +#include <linux/if_ether.h> #include "e1000_mac.h" #include "e1000_phy.h"
drivers/net/ethernet/intel/igbvf/netdev.c +14 -14
@@ -3,25 +3,25 @@#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt -#include <linux/module.h> -#include <linux/types.h> -#include <linux/init.h> -#include <linux/pci.h> -#include <linux/vmalloc.h> -#include <linux/pagemap.h> +#include <linux/bitfield.h> #include <linux/delay.h> -#include <linux/netdevice.h> -#include <linux/tcp.h> -#include <linux/ipv6.h> -#include <linux/slab.h> -#include <net/checksum.h> -#include <net/ip6_checksum.h> -#include <linux/mii.h> #include <linux/ethtool.h> #include <linux/if_vlan.h> +#include <linux/init.h> +#include <linux/ipv6.h> +#include <linux/mii.h> +#include <linux/module.h> +#include <linux/netdevice.h> +#include <linux/pagemap.h> +#include <linux/pci.h> #include <linux/prefetch.h> #include <linux/sctp.h> - +#include <linux/slab.h> +#include <linux/tcp.h> +#include <linux/types.h> +#include <linux/vmalloc.h> +#include <net/checksum.h> +#include <net/ip6_checksum.h> #include "igbvf.h" char igbvf_driver_name[] ="igbvf" ;
drivers/net/ethernet/intel/igc/igc_i225.c +1 -0
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright (c) 2018 Intel Corporation */ +#include <linux/bitfield.h> #include <linux/delay.h> #include "igc_hw.h"
drivers/net/ethernet/intel/igc/igc_phy.c +1 -0
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright (c) 2018 Intel Corporation */ +#include <linux/bitfield.h> #include "igc_phy.h" /**
include/linux/avf/virtchnl.h +1 -0
@@ -5,6 +5,7 @@#define _VIRTCHNL_H_#include <linux/bitops.h> +#include <linux/bits.h> #include <linux/overflow.h> #include <uapi/linux/if_ether.h>
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 141/353 ice: fix pre-shifted bit usage
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jesse Brandeburg <[email protected]>
[ Upstream commit 7173be21ae29ef50ada42fd4464056a9d3f55bb3 ]
While converting to FIELD_PREP() and FIELD_GET(), it was noticed that some of the RSS defines had *included* the shift in their definitions. This is completely outside of normal, such that a developer could easily make a mistake and shift at the usage site (like when using FIELD_PREP()).
Rename the defines and set them to the "pre-shifted values" so they match the template the driver normally uses for masks and the member bits of the mask, which also allows the driver to use FIELD_PREP correctly with these values. Use GENMASK() for this changed MASK value.
Do the same for the VLAN EMODE defines as well.
--- drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 10 +++++----- drivers/net/ethernet/intel/ice/ice_lib.c | 3 ++- .../net/ethernet/intel/ice/ice_vsi_vlan_lib.c | 16 +++++++++++----- 3 files changed, 18 insertions(+), 11 deletions(-)
drivers/net/ethernet/intel/ice/ice_adminq_cmd.h +5 -5
@@ -421,10 +421,10 @@ struct ice_aqc_vsi_props {#define ICE_AQ_VSI_INNER_VLAN_INSERT_PVID BIT(2)#define ICE_AQ_VSI_INNER_VLAN_EMODE_S 3#define ICE_AQ_VSI_INNER_VLAN_EMODE_M (0x3 << ICE_AQ_VSI_INNER_VLAN_EMODE_S) -#define ICE_AQ_VSI_INNER_VLAN_EMODE_STR_BOTH (0x0 << ICE_AQ_VSI_INNER_VLAN_EMODE_S) -#define ICE_AQ_VSI_INNER_VLAN_EMODE_STR_UP (0x1 << ICE_AQ_VSI_INNER_VLAN_EMODE_S) -#define ICE_AQ_VSI_INNER_VLAN_EMODE_STR (0x2 << ICE_AQ_VSI_INNER_VLAN_EMODE_S) -#define ICE_AQ_VSI_INNER_VLAN_EMODE_NOTHING (0x3 << ICE_AQ_VSI_INNER_VLAN_EMODE_S) +#define ICE_AQ_VSI_INNER_VLAN_EMODE_STR_BOTH 0x0U +#define ICE_AQ_VSI_INNER_VLAN_EMODE_STR_UP 0x1U +#define ICE_AQ_VSI_INNER_VLAN_EMODE_STR 0x2U +#define ICE_AQ_VSI_INNER_VLAN_EMODE_NOTHING 0x3Uu8 inner_vlan_reserved2[3 ];/* ingress egress up sections */ __le32 ingress_table;/* bitmap, 3 bits per up */
@@ -490,7 +490,7 @@ struct ice_aqc_vsi_props {#define ICE_AQ_VSI_Q_OPT_RSS_GBL_LUT_S 2#define ICE_AQ_VSI_Q_OPT_RSS_GBL_LUT_M (0xF << ICE_AQ_VSI_Q_OPT_RSS_GBL_LUT_S)#define ICE_AQ_VSI_Q_OPT_RSS_HASH_S 6 -#define ICE_AQ_VSI_Q_OPT_RSS_HASH_M (0x3 << ICE_AQ_VSI_Q_OPT_RSS_HASH_S) +#define ICE_AQ_VSI_Q_OPT_RSS_HASH_M GENMASK(7, 6)#define ICE_AQ_VSI_Q_OPT_RSS_HASH_TPLZ 0x0U#define ICE_AQ_VSI_Q_OPT_RSS_HASH_SYM_TPLZ 0x1U#define ICE_AQ_VSI_Q_OPT_RSS_HASH_XOR 0x2U
drivers/net/ethernet/intel/ice/ice_lib.c +2 -1
@@ -979,7 +979,8 @@ static void ice_set_dflt_vsi_ctx(struct ice_hw *hw, struct ice_vsi_ctx *ctxt)*/ if (ice_is_dvm_ena (hw)) { ctxt->info.inner_vlan_flags |= -ICE_AQ_VSI_INNER_VLAN_EMODE_NOTHING ; +FIELD_PREP (ICE_AQ_VSI_INNER_VLAN_EMODE_M , +ICE_AQ_VSI_INNER_VLAN_EMODE_NOTHING ); ctxt->info.outer_vlan_flags = (ICE_AQ_VSI_OUTER_VLAN_TX_MODE_ALL << ICE_AQ_VSI_OUTER_VLAN_TX_MODE_S) &
drivers/net/ethernet/intel/ice/ice_vsi_vlan_lib.c +11 -5
@@ -131,6 +131,7 @@ static int ice_vsi_manage_vlan_stripping(struct ice_vsi *vsi, bool ena) {struct ice_hw *hw = &vsi->back->hw;struct ice_vsi_ctx *ctxt; +u8 *ivf;int err;/* do not allow modifying VLAN stripping when a port VLAN is configured
@@ -143,19 +144,24 @@ static int ice_vsi_manage_vlan_stripping(struct ice_vsi *vsi, bool ena)if (!ctxt)return -ENOMEM ; + ivf = &ctxt->info.inner_vlan_flags; +/* Here we are configuring what the VSI should do with the VLAN tag in * the Rx packet. We can either leave the tag in the packet or put it in * the Rx descriptor. */ -if (ena) +if (ena) {/* Strip VLAN tag from Rx packet and put it in the desc */ - ctxt->info.inner_vlan_flags =ICE_AQ_VSI_INNER_VLAN_EMODE_STR_BOTH ; -else + *ivf =FIELD_PREP (ICE_AQ_VSI_INNER_VLAN_EMODE_M , +ICE_AQ_VSI_INNER_VLAN_EMODE_STR_BOTH ); + }else {/* Disable stripping. Leave tag in packet */ - ctxt->info.inner_vlan_flags =ICE_AQ_VSI_INNER_VLAN_EMODE_NOTHING ; + *ivf =FIELD_PREP (ICE_AQ_VSI_INNER_VLAN_EMODE_M , +ICE_AQ_VSI_INNER_VLAN_EMODE_NOTHING ); + }/* Allow all packets untagged/tagged */ - ctxt->info.inner_vlan_flags |=ICE_AQ_VSI_INNER_VLAN_TX_MODE_ALL ; + *ivf |=ICE_AQ_VSI_INNER_VLAN_TX_MODE_ALL ; ctxt->info.valid_sections =cpu_to_le16 (ICE_AQ_VSI_PROP_VLAN_VALID );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 142/353 arm64: dts: amlogic: fix format for s4 uart node
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xianwei Zhao <[email protected]>
[ Upstream commit eb54ef36282f670c704ed5af8593da62bebba80d ]
Aliases use lowercase letters and place status in end.
--- arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dts | 4 ++-- arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dts +2 -2
@@ -15,7 +15,7 @@ #size-cells = <2>; aliases { - serial0 = &uart_B; + serial0 = &uart_b; }; memory@0 {
@@ -25,7 +25,7 @@ }; -&uart_B { +&uart_b { status = "okay"; };
arch/arm64/boot/dts/amlogic/meson-s4.dtsi +2 -2
@@ -126,14 +126,14 @@ <10 11 12 13 14 15 16 17 18 19 20 21>; }; - uart_B: serial@7a000 { + uart_b: serial@7a000 { compatible = "amlogic,meson-s4-uart", "amlogic,meson-ao-uart"; reg = <0x0 0x7a000 0x0 0x18>; interrupts = <GIC_SPI 169 IRQ_TYPE_EDGE_RISING>; - status = "disabled"; clocks = <&xtal>, <&xtal>, <&xtal>; clock-names = "xtal", "pclk", "baud"; + status = "disabled"; }; reset: reset-controller@2000 {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 143/353 wifi: rtl8xxxu: Add additional USB IDs for RTL8192EU devices
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zenm Chen <[email protected]>
[ Upstream commit 4e87ca403e2008b9e182239e1abbf6876a55eb33 ]
Add additional USB IDs found in the vendor driver from
https://github.com/Mange/rtl8192eu-linux-driver to support more RTL8192EU devices.
--- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +12 -0
@@ -7961,6 +7961,18 @@ static const struct usb_device_id dev_table[] = { .driver_info = (unsigned long)&rtl8192eu_fops}, {USB_DEVICE_AND_INTERFACE_INFO(USB_VENDOR_ID_REALTEK, 0x818c, 0xff, 0xff, 0xff), .driver_info = (unsigned long)&rtl8192eu_fops}, +/* D-Link DWA-131 rev C1 */ +{USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x3312, 0xff, 0xff, 0xff), + .driver_info = (unsigned long)&rtl8192eu_fops}, +/* TP-Link TL-WN8200ND V2 */ +{USB_DEVICE_AND_INTERFACE_INFO(0x2357, 0x0126, 0xff, 0xff, 0xff), + .driver_info = (unsigned long)&rtl8192eu_fops}, +/* Mercusys MW300UM */ +{USB_DEVICE_AND_INTERFACE_INFO(0x2c4e, 0x0100, 0xff, 0xff, 0xff), + .driver_info = (unsigned long)&rtl8192eu_fops}, +/* Mercusys MW300UH */ +{USB_DEVICE_AND_INTERFACE_INFO(0x2c4e, 0x0104, 0xff, 0xff, 0xff), + .driver_info = (unsigned long)&rtl8192eu_fops}, #endif { } };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 144/353 wifi: rtw89: coex: Fix wrong Wi-Fi role info and FDDT parameter members
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ching-Te Ku <[email protected]>
[ Upstream commit acc55d7dd4de525ac07e43e90ea3cc630677ec8a ]
The Wi-Fi firmware 29.29.X should use version 2 role info format. FDDT mechanism version 5 use the same cell members to judge traffic situation, don't need to add another new format.
--- drivers/net/wireless/realtek/rtw89/coex.c | 4 ++-- drivers/net/wireless/realtek/rtw89/core.h | 12 +++--------- 2 files changed, 5 insertions(+), 11 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +2 -2
@@ -131,7 +131,7 @@ static const struct rtw89_btc_ver rtw89_btc_ver_defs[] = { .fcxbtcrpt = 105, .fcxtdma = 3, .fcxslots = 1, .fcxcysta = 5, .fcxstep = 3, .fcxnullsta = 2, .fcxmreg = 2, .fcxgpiodbg = 1, .fcxbtver = 1, .fcxbtscan = 2, .fcxbtafh = 2, .fcxbtdevinfo = 1, - .fwlrole = 1, .frptmap = 3, .fcxctrl = 1, + .fwlrole = 2, .frptmap = 3, .fcxctrl = 1, .info_buf = 1800, .max_role_num = 6, }, {RTL8852C, RTW89_FW_VER_CODE(0, 27, 57, 0),
@@ -159,7 +159,7 @@ static const struct rtw89_btc_ver rtw89_btc_ver_defs[] = { .fcxbtcrpt = 105, .fcxtdma = 3, .fcxslots = 1, .fcxcysta = 5, .fcxstep = 3, .fcxnullsta = 2, .fcxmreg = 2, .fcxgpiodbg = 1, .fcxbtver = 1, .fcxbtscan = 2, .fcxbtafh = 2, .fcxbtdevinfo = 1, - .fwlrole = 1, .frptmap = 3, .fcxctrl = 1, + .fwlrole = 2, .frptmap = 3, .fcxctrl = 1, .info_buf = 1800, .max_role_num = 6, }, {RTL8852B, RTW89_FW_VER_CODE(0, 29, 14, 0),
drivers/net/wireless/realtek/rtw89/core.h +3 -9
@@ -2294,12 +2294,6 @@ struct rtw89_btc_fbtc_fddt_cell_status {u8 state_phase;/* [0:3] train state, [4:7] train phase */ } __packed; -struct rtw89_btc_fbtc_fddt_cell_status_v5 { -s8 wl_tx_pwr; -s8 bt_tx_pwr; -s8 bt_rx_gain; -} __packed; -struct rtw89_btc_fbtc_cysta_v3 {/* statistics for cycles */ u8 fver;u8 rsvd;
@@ -2363,9 +2357,9 @@ struct rtw89_btc_fbtc_cysta_v5 { /* statistics for cycles */struct rtw89_btc_fbtc_cycle_a2dp_empty_info a2dp_ept;struct rtw89_btc_fbtc_a2dp_trx_stat_v4 a2dp_trx[BTC_CYCLE_SLOT_MAX ];struct rtw89_btc_fbtc_cycle_fddt_info_v5 fddt_trx[BTC_CYCLE_SLOT_MAX ]; -struct rtw89_btc_fbtc_fddt_cell_status_v5 fddt_cells[FDD_TRAIN_WL_DIRECTION ] - [FDD_TRAIN_WL_RSSI_LEVEL ] - [FDD_TRAIN_BT_RSSI_LEVEL ]; +struct rtw89_btc_fbtc_fddt_cell_status fddt_cells[FDD_TRAIN_WL_DIRECTION ] + [FDD_TRAIN_WL_RSSI_LEVEL ] + [FDD_TRAIN_BT_RSSI_LEVEL ];__le32 except_map; } __packed;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 145/353 libbpf: Fix NULL pointer dereference in bpf_object__collect_prog_relos
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mingyi Zhang <[email protected]>
[ Upstream commit fc3a5534e2a8855427403113cbeb54af5837bbe0 ]
An issue occurred while reading an ELF file in libbpf.c during fuzzing:
Program received signal SIGSEGV, Segmentation fault.
0x0000000000958e97 in bpf_object.collect_prog_relos () at libbpf.c:4206
4206 in libbpf.c
(gdb) bt
#0 0x0000000000958e97 in bpf_object.collect_prog_relos () at libbpf.c:4206
#1 0x000000000094f9d6 in bpf_object.collect_relos () at libbpf.c:6706
#2 0x000000000092bef3 in bpf_object_open () at libbpf.c:7437
#3 0x000000000092c046 in bpf_object.open_mem () at libbpf.c:7497
#4 0x0000000000924afa in LLVMFuzzerTestOneInput () at fuzz/bpf-object-fuzzer.c:16
#5 0x000000000060be11 in testblitz_engine::fuzzer::Fuzzer::run_one ()
#6 0x000000000087ad92 in tracing::span::Span::in_scope ()
#7 0x00000000006078aa in testblitz_engine::fuzzer::util::walkdir ()
#8 0x00000000005f3217 in testblitz_engine::entrypoint::main::{{closure}} ()
#9 0x00000000005f2601 in main ()
(gdb)scn_data was null at this code(tools/lib/bpf/src/libbpf.c):
if (rel->r_offset % BPF_INSN_SZ || rel->r_offset >= scn_data->d_size) {The scn_data is derived from the code above:
scn = elf_sec_by_idx(obj, sec_idx); scn_data = elf_sec_data(obj, scn); relo_sec_name = elf_sec_str(obj, shdr->sh_name); sec_name = elf_sec_name(obj, scn); if (!relo_sec_name || !sec_name)// don't check whether scn_data is NULL return -EINVAL;
In certain special scenarios, such as reading a malformed ELF file, it is possible that scn_data may be a null pointer
--- tools/lib/bpf/libbpf.c | 2 ++ 1 file changed, 2 insertions(+)
tools/lib/bpf/libbpf.c +2 -0
@@ -4344,6 +4344,8 @@ bpf_object__collect_prog_relos(struct bpf_object *obj, Elf64_Shdr *shdr, Elf_Dat scn =elf_sec_by_idx (obj, sec_idx); scn_data =elf_sec_data (obj, scn); +if (!scn_data) +return -LIBBPF_ERRNO__FORMAT ; relo_sec_name =elf_sec_str (obj, shdr->sh_name); sec_name =elf_sec_name (obj, scn);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 146/353 wifi: rtlwifi: rtl8723{be,ae}: using calculate_bit_shift()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Su Hui <[email protected]>
[ Upstream commit 5c16618bc06a41ad68fd8499a21d35ef57ca06c2 ]
Using calculate_bit_shift() to replace rtl8723_phy_calculate_bit_shift(). And fix an undefined bitwise shift behavior problem.
--- drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.c | 6 +++--- drivers/net/wireless/realtek/rtlwifi/rtl8723be/phy.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.c +3 -3
@@ -49,7 +49,7 @@ u32 rtl8723e_phy_query_rf_reg(struct ieee80211_hw *hw, rfpath, regaddr); } - bitshift =rtl8723_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); readback_value = (original_value & bitmask) >> bitshift;spin_unlock (&rtlpriv->locks.rf_lock);
@@ -80,7 +80,7 @@ void rtl8723e_phy_set_rf_reg(struct ieee80211_hw *hw, original_value =rtl8723_phy_rf_serial_read (hw, rfpath, regaddr); - bitshift =rtl8723_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); data = ((original_value & (~bitmask)) | (data << bitshift));
@@ -89,7 +89,7 @@ void rtl8723e_phy_set_rf_reg(struct ieee80211_hw *hw,rtl8723_phy_rf_serial_write (hw, rfpath, regaddr, data); }else {if (bitmask !=RFREG_OFFSET_MASK ) { - bitshift =rtl8723_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); data = ((original_value & (~bitmask)) | (data << bitshift));
drivers/net/wireless/realtek/rtlwifi/rtl8723be/phy.c +2 -2
@@ -41,7 +41,7 @@ u32 rtl8723be_phy_query_rf_reg(struct ieee80211_hw *hw, enum radio_path rfpath,spin_lock (&rtlpriv->locks.rf_lock); original_value =rtl8723_phy_rf_serial_read (hw, rfpath, regaddr); - bitshift =rtl8723_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); readback_value = (original_value & bitmask) >> bitshift;spin_unlock (&rtlpriv->locks.rf_lock);
@@ -68,7 +68,7 @@ void rtl8723be_phy_set_rf_reg(struct ieee80211_hw *hw, enum radio_path path,if (bitmask !=RFREG_OFFSET_MASK ) { original_value =rtl8723_phy_rf_serial_read (hw, path, regaddr); - bitshift =rtl8723_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); data = ((original_value & (~bitmask)) | (data << bitshift)); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 147/353 wifi: cfg80211: free beacon_ies when overridden from hidden BSS
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Berg <[email protected]>
[ Upstream commit 32af9a9e1069e55bc02741fb00ac9d0ca1a2eaef ]
This is a more of a cosmetic fix. The branch will only be taken if proberesp_ies is set, which implies that beacon_ies is not set unless we are connected to an AP that just did a channel switch. And, in that case we should have found the BSS in the internal storage to begin with.
--- net/wireless/scan.c | 4 ++++ 1 file changed, 4 insertions(+)
net/wireless/scan.c +4 -0
@@ -1864,8 +1864,12 @@ __cfg80211_bss_update(struct cfg80211_registered_device *rdev,list_add (&new->hidden_list, &hidden->hidden_list); hidden->refcount++; + + ies = (void *)rcu_dereference (new->pub.beacon_ies);rcu_assign_pointer (new->pub.beacon_ies, hidden->pub.beacon_ies); +if (ies) +kfree_rcu (ies, rcu_head); } }else {/*
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 148/353 Bluetooth: qca: Set both WIDEBAND_SPEECH and LE_STATES quirks for QCA2066
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zijun Hu <[email protected]>
[ Upstream commit 5d192b697c7417254cdd9edc3d5e9e0364eb9045 ]
Set both WIDEBAND_SPEECH_SUPPORTED and VALID_LE_STATES quirks for QCA2066.
--- drivers/bluetooth/hci_qca.c | 1 + 1 file changed, 1 insertion(+)
drivers/bluetooth/hci_qca.c +1 -0
@@ -2039,6 +2039,7 @@ static const struct qca_device_data qca_soc_data_wcn3998 __maybe_unused = {static const struct qca_device_data qca_soc_data_qca2066__maybe_unused = { .soc_type =QCA_QCA2066 , .num_vregs =0 , + .capabilities =QCA_CAP_WIDEBAND_SPEECH |QCA_CAP_VALID_LE_STATES , };static const struct qca_device_data qca_soc_data_qca6390__maybe_unused = {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 149/353 Bluetooth: ISO: Avoid creating child socket if PA sync is terminating
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Iulia Tanasescu <[email protected]>
[ Upstream commit 9f150019f176078144b02c4b9b9dbe7fd5a2fcc3 ]
When a PA sync socket is closed, the associated hcon is also unlinked and cleaned up. If there are no other hcons marked with the HCI_CONN_PA_SYNC flag, HCI_OP_LE_PA_TERM_SYNC is sent to controller.
Between the time of the command and the moment PA sync is terminated in controller, residual BIGInfo reports might continue to come. This causes a new PA sync hcon to be added, and a new socket to be notified to user space.
This commit fixs this by adding a flag on a Broadcast listening socket to mark when the PA sync child has been closed.
This flag is checked when BIGInfo reports are indicated in iso_connect_ind, to avoid recreating a hcon and socket if residual reports arrive before PA sync is terminated.
--- net/bluetooth/iso.c | 51 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 48 insertions(+), 3 deletions(-)
net/bluetooth/iso.c +48 -3
@@ -54,6 +54,7 @@ static void iso_sock_kill(struct sock *sk);enum {BT_SK_BIG_SYNC ,BT_SK_PA_SYNC , +BT_SK_PA_SYNC_TERM , };struct iso_pinfo {
@@ -82,6 +83,11 @@ static bool iso_match_sid(struct sock *sk, void *data);static bool iso_match_sync_handle (struct sock *sk,void *data);static void iso_sock_disconn (struct sock *sk); +typedef bool (*iso_sock_match_t )(struct sock *sk,void *data); + +static struct sock *iso_get_sock_listen (bdaddr_t *src,bdaddr_t *dst, +iso_sock_match_t match,void *data); +/* ---- ISO timers ---- */ #define ISO_CONN_TIMEOUT (HZ * 40)#define ISO_DISCONN_TIMEOUT (HZ * 2)
@@ -190,10 +196,21 @@ static void iso_chan_del(struct sock *sk, int err)sock_set_flag (sk,SOCK_ZAPPED ); } +static bool iso_match_conn_sync_handle (struct sock *sk,void *data) +{ +struct hci_conn *hcon = data; + +if (test_bit (BT_SK_PA_SYNC , &iso_pi (sk)->flags)) +return false; + +return hcon->sync_handle ==iso_pi (sk)->sync_handle; +} +static void iso_conn_del (struct hci_conn *hcon,int err) {struct iso_conn *conn = hcon->iso_data;struct sock *sk; +struct sock *parent;if (!conn)return ;
@@ -209,6 +226,25 @@ static void iso_conn_del(struct hci_conn *hcon, int err)if (sk) {lock_sock (sk); + +/* While a PA sync hcon is in the process of closing, +* mark parent socket with a flag, so that any residual +* BIGInfo adv reports that arrive before PA sync is +* terminated are not processed anymore. +*/ +if (test_bit (BT_SK_PA_SYNC , &iso_pi (sk)->flags)) { + parent =iso_get_sock_listen (&hcon->src, + &hcon->dst, + iso_match_conn_sync_handle, + hcon); + +if (parent) { +set_bit (BT_SK_PA_SYNC_TERM , + &iso_pi (parent)->flags); +sock_put (parent); + } + } +iso_sock_clear_timer (sk);iso_chan_del (sk, err);release_sock (sk);
@@ -545,8 +581,6 @@ static struct sock *__iso_get_sock_listen_by_sid(bdaddr_t *ba, bdaddr_t *bc,return NULL ; } -typedef bool (*iso_sock_match_t )(struct sock *sk,void *data); -/* Find socket listening: * source bdaddr (Unicast) * destination bdaddr (Broadcast only)
@@ -1759,9 +1793,20 @@ int iso_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr, __u8 *flags)/* Try to get PA sync listening socket, if it exists */ sk =iso_get_sock_listen (&hdev->bdaddr, bdaddr, iso_match_pa_sync_flag,NULL ); -if (!sk) + +if (!sk) { sk =iso_get_sock_listen (&hdev->bdaddr, bdaddr, iso_match_sync_handle, ev2); + +/* If PA Sync is in process of terminating, +* do not handle any more BIGInfo adv reports. +*/ + +if (sk &&test_bit (BT_SK_PA_SYNC_TERM , + &iso_pi (sk)->flags)) +return lm; + } +if (sk) {int err;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 150/353 Bluetooth: hci_sync: fix BR/EDR wakeup bug
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: clancy shang <[email protected]>
[ Upstream commit d4b70ba1eab450eff9c5ef536f07c01d424b7eda ]
when Bluetooth set the event mask and enter suspend, the controller has hci mode change event coming, it cause controller can not enter sleep mode. so it should to set the hci mode change event mask before enter suspend.
--- net/bluetooth/hci_sync.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
net/bluetooth/hci_sync.c +6 -4
@@ -3800,12 +3800,14 @@ static int hci_set_event_mask_sync(struct hci_dev *hdev)if (lmp_bredr_capable (hdev)) { events[4 ] |=0x01 ;/* Flow Specification Complete */ -/* Don't set Disconnect Complete when suspended as that -* would wakeup the host when disconnecting due to -* suspend. +/* Don't set Disconnect Complete and mode change when +* suspended as that would wakeup the host when disconnecting +* due to suspend. */ -if (hdev->suspended) +if (hdev->suspended) { events[0 ] &=0xef ; + events[2 ] &=0xf7 ; + } }else {/* Use a different default for LE-only devices */ memset (events,0 ,sizeof (events));
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 151/353 Bluetooth: L2CAP: Fix possible multiple reject send
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Frédéric Danis <[email protected]>
[ Upstream commit 96a3398b467ab8aada3df2f3a79f4b7835d068b8 ]
In case of an incomplete command or a command with a null identifier 2 reject packets will be sent, one with the identifier and one with 0. Consuming the data of the command will prevent it.
This allows to send a reject packet for each corrupted command in a multi-command packet.
--- net/bluetooth/l2cap_core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/bluetooth/l2cap_core.c +2 -1
@@ -6526,7 +6526,8 @@ static inline void l2cap_sig_channel(struct l2cap_conn *conn,if (len > skb->len || !cmd->ident) {BT_DBG ("corrupted command" );l2cap_sig_send_rej (conn, cmd->ident); -break ; +skb_pull (skb, len > skb->len ? skb->len : len); +continue ; } err =l2cap_bredr_sig_cmd (conn, cmd, len, skb->data);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 152/353 net/smc: disable SEID on non-s390 archs where virtual ISM may be used
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wen Gu <[email protected]>
[ Upstream commit c6b8b8eb49904018e22e4e4b1fa502e57dc747d9 ]
The system EID (SEID) is an internal EID used by SMC-D to represent the s390 physical machine that OS is executing on. On s390 architecture, it predefined by fixed string and part of cpuid and is enabled regardless of whether underlay device is virtual ISM or platform firmware ISM.
However on non-s390 architectures where SMC-D can be used with virtual ISM devices, there is no similar information to identify physical machines, especially in virtualization scenarios. So in such cases, SEID is forcibly disabled and the user-defined UEID will be used to represent the communicable space.
--- net/smc/smc_clc.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
net/smc/smc_clc.c +14 -0
@@ -155,10 +155,12 @@ static int smc_clc_ueid_remove(char *ueid) rc =0 ; } } +#if IS_ENABLED (CONFIG_S390 )if (!rc && !smc_clc_eid_table.ueid_cnt) { smc_clc_eid_table.seid_enabled =1 ; rc = -EAGAIN ;/* indicate success and enabling of seid */ } +#endif write_unlock (&smc_clc_eid_table.lock);return rc; }
@@ -273,22 +275,30 @@ int smc_nl_dump_seid(struct sk_buff *skb, struct netlink_callback *cb)int smc_nl_enable_seid (struct sk_buff *skb,struct genl_info *info) { +#if IS_ENABLED (CONFIG_S390 )write_lock (&smc_clc_eid_table.lock); smc_clc_eid_table.seid_enabled =1 ;write_unlock (&smc_clc_eid_table.lock);return 0 ; +#else +return -EOPNOTSUPP ; +#endif }int smc_nl_disable_seid (struct sk_buff *skb,struct genl_info *info) {int rc =0 ; +#if IS_ENABLED (CONFIG_S390 )write_lock (&smc_clc_eid_table.lock);if (!smc_clc_eid_table.ueid_cnt) rc = -ENOENT ;else smc_clc_eid_table.seid_enabled =0 ;write_unlock (&smc_clc_eid_table.lock); +#else + rc = -EOPNOTSUPP ; +#endif return rc; }
@@ -1269,7 +1279,11 @@ void __init smc_clc_init(void)INIT_LIST_HEAD (&smc_clc_eid_table.list);rwlock_init (&smc_clc_eid_table.lock); smc_clc_eid_table.ueid_cnt =0 ; +#if IS_ENABLED (CONFIG_S390 ) smc_clc_eid_table.seid_enabled =1 ; +#else + smc_clc_eid_table.seid_enabled =0 ; +#endif }void smc_clc_exit (void )
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 153/353 bridge: cfm: fix enum typo in br_cc_ccm_tx_parse
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lin Ma <[email protected]>
[ Upstream commit c2b2ee36250d967c21890cb801e24af4b6a9eaa5 ]
It appears that there is a typo in the code where the nlattr array is being parsed with policy br_cfm_cc_ccm_tx_policy, but the instance is being accessed via IFLA_BRIDGE_CFM_CC_RDI_INSTANCE, which is associated with the policy br_cfm_cc_rdi_policy.
This problem was introduced by commit 2be665c3940d ("bridge: cfm: Netlink SET configuration Interface.").
Though it seems like a harmless typo since these two enum owns the exact same value (1 here), it is quite misleading hence fix it by using the correct enum IFLA_BRIDGE_CFM_CC_CCM_TX_INSTANCE here.
--- net/bridge/br_cfm_netlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/bridge/br_cfm_netlink.c +1 -1
@@ -362,7 +362,7 @@ static int br_cc_ccm_tx_parse(struct net_bridge *br, struct nlattr *attr,memset (&tx_info,0 ,sizeof (tx_info)); - instance =nla_get_u32 (tb[IFLA_BRIDGE_CFM_CC_RDI_INSTANCE ]); + instance =nla_get_u32 (tb[IFLA_BRIDGE_CFM_CC_CCM_TX_INSTANCE ]);nla_memcpy (&tx_info.dmac.addr, tb[IFLA_BRIDGE_CFM_CC_CCM_TX_DMAC ],sizeof (tx_info.dmac.addr));
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 154/353 arm64: dts: sprd: Add clock reference for pll2 on UMS512
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chunyan Zhang <[email protected]>
[ Upstream commit 829e3e70fe72edc084fbfc4964669594ebe427ce ]
Fix below dtbs_check warning:
'clocks' is a dependency of 'clock-names'
--- arch/arm64/boot/dts/sprd/ums512.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/sprd/ums512.dtsi +1 -0
@@ -291,6 +291,7 @@ pll2: clock-controller@0 { compatible = "sprd,ums512-gc-pll"; reg = <0x0 0x100>; + clocks = <&ext_26m>; clock-names = "ext-26m"; #clock-cells = <1>; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 155/353 arm64: dts: sprd: Change UMS512 idle-state nodename to match bindings
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chunyan Zhang <[email protected]>
[ Upstream commit 1cff7243334f851b7dddf450abdaa6223a7a28e3 ]
Fix below dtbs_check warning:
idle-states: 'core-pd' does not match any of the regexes: '^(cpu|cluster)-', 'pinctrl-[0-9]+'
--- arch/arm64/boot/dts/sprd/ums512.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/sprd/ums512.dtsi +1 -1
@@ -113,7 +113,7 @@ idle-states { entry-method = "psci"; - CORE_PD: core-pd { + CORE_PD: cpu-pd { compatible = "arm,idle-state"; entry-latency-us = <4000>; exit-latency-us = <4000>;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 156/353 i40e: Fix VF disable behavior to block all traffic
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrii Staikov <[email protected]>
[ Upstream commit 31deb12e85c35ddd2c037f0107d05d8674cab2c0 ]
Currently, if a VF is disabled using the
'ip link set dev $ETHX vf $VF_NUM state disable' command, the VF is still able to receive traffic.
Fix the behavior of the 'ip link set dev $ETHX vf $VF_NUM state disable' to completely shutdown the VF's queues making it entirely disabled and not able to receive or send any traffic.
Modify the behavior of the 'ip link set $ETHX vf $VF_NUM state enable' command to make a VF do reinitialization bringing the queues back up.
--- .../ethernet/intel/i40e/i40e_virtchnl_pf.c | 32 +++++++++++++++++++ .../ethernet/intel/i40e/i40e_virtchnl_pf.h | 1 + 2 files changed, 33 insertions(+)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +32 -0
@@ -2607,6 +2607,14 @@ static int i40e_vc_enable_queues_msg(struct i40e_vf *vf, u8 *msg)int aq_ret =0 ;int i; +if (vf->is_disabled_from_host) { + aq_ret = -EPERM ; +dev_info (&pf->pdev->dev, +"Admin has disabled VF %d, will not enable queues\n" , + vf->vf_id); + goto error_param; + } +if (!test_bit (I40E_VF_STATE_ACTIVE , &vf->vf_states)) { aq_ret = -EINVAL ; goto error_param;
@@ -4734,9 +4742,12 @@ int i40e_ndo_set_vf_link_state(struct net_device *netdev, int vf_id, int link)struct i40e_link_status *ls = &pf->hw.phy.link_info;struct virtchnl_pf_event pfe;struct i40e_hw *hw = &pf->hw; +struct i40e_vsi *vsi; +unsigned long q_map;struct i40e_vf *vf;int abs_vf_id;int ret =0 ; +int tmp;if (test_and_set_bit (__I40E_VIRTCHNL_OP_PENDING, pf->state)) {dev_warn (&pf->pdev->dev,"Unable to configure VFs, other operation is pending.\n" );
@@ -4759,17 +4770,38 @@ int i40e_ndo_set_vf_link_state(struct net_device *netdev, int vf_id, int link)switch (link) {case IFLA_VF_LINK_STATE_AUTO : vf->link_forced = false; + vf->is_disabled_from_host = false; +/* reset needed to reinit VF resources */ +i40e_vc_reset_vf (vf, true);i40e_set_vf_link_state (vf, &pfe, ls);break ;case IFLA_VF_LINK_STATE_ENABLE : vf->link_forced = true; vf->link_up = true; + vf->is_disabled_from_host = false; +/* reset needed to reinit VF resources */ +i40e_vc_reset_vf (vf, true);i40e_set_vf_link_state (vf, &pfe, ls);break ;case IFLA_VF_LINK_STATE_DISABLE : vf->link_forced = true; vf->link_up = false;i40e_set_vf_link_state (vf, &pfe, ls); + + vsi = pf->vsi[vf->lan_vsi_idx]; + q_map =BIT (vsi->num_queue_pairs) -1 ; + + vf->is_disabled_from_host = true; + +/* Try to stop both Tx&Rx rings even if one of the calls fails +* to ensure we stop the rings even in case of errors. +* If any of them returns with an error then the first +* error that occurred will be returned. +*/ + tmp =i40e_ctrl_vf_tx_rings (vsi, q_map, false); + ret =i40e_ctrl_vf_rx_rings (vsi, q_map, false); + + ret = tmp ? tmp : ret;break ;default : ret = -EINVAL ;
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h +1 -0
@@ -100,6 +100,7 @@ struct i40e_vf {bool link_forced;bool link_up;/* only valid if VF link is forced */ bool spoofchk; +bool is_disabled_from_host;/* PF ctrl of VF enable/disable */ u16 num_vlan;/* ADq related variables */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 157/353 octeontx2-af: Fix max NPC MCAM entry check while validating ref_entry
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Suman Ghosh <[email protected]>
[ Upstream commit 4ebb1f95e0c3c3e0eec5bb21aa43097580c4b6e4 ]
As of today, the last MCAM entry was not getting allocated because of a <= check with the max_bmap count. This patch modifies that and if the requested entry is greater than the available entries then set it to the max value.
--- drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c +6 -7
@@ -2678,18 +2678,17 @@ int rvu_mbox_handler_npc_mcam_alloc_entry(struct rvu *rvu, rsp->entry =NPC_MCAM_ENTRY_INVALID ; rsp->free_count =0 ; -/* Check if ref_entry is within range */ -if (req->priority && req->ref_entry >= mcam->bmap_entries) { -dev_err (rvu->dev,"%s: reference entry %d is out of range\n" , - __func__, req->ref_entry); -return NPC_MCAM_INVALID_REQ ; - } +/* Check if ref_entry is greater that the range +* then set it to max value. +*/ +if (req->ref_entry > mcam->bmap_entries) + req->ref_entry = mcam->bmap_entries;/* ref_entry can't be '0' if requested priority is high. * Can't be last entry if requested priority is low. */ if ((!req->ref_entry && req->priority ==NPC_MCAM_HIGHER_PRIO ) || - ((req->ref_entry == (mcam->bmap_entries -1 )) && + ((req->ref_entry == mcam->bmap_entries) && req->priority ==NPC_MCAM_LOWER_PRIO ))return NPC_MCAM_INVALID_REQ ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 158/353 net: kcm: fix direct access to bv_len
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mina Almasry <[email protected]>
[ Upstream commit b15a4cfe100b9acd097d3ae7052448bd1cdc2a3b ]
Minor fix for kcm: code wanting to access the fields inside an skb frag should use the skb_frag_*() helpers, instead of accessing the fields directly.
--- net/kcm/kcmsock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/kcm/kcmsock.c +1 -1
@@ -634,7 +634,7 @@ static int kcm_write_msgs(struct kcm_sock *kcm) msize =0 ;for (i =0 ; i <skb_shinfo (skb)->nr_frags; i++) - msize +=skb_shinfo (skb)->frags[i].bv_len; + msize +=skb_frag_size (&skb_shinfo (skb)->frags[i]); iov_iter_bvec(&msg.msg_iter, ITER_SOURCE, skb_shinfo(skb)->frags, skb_shinfo(skb)->nr_frags,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 159/353 net: dsa: qca8k: put MDIO bus OF node on qca8k_mdio_register() failure
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vladimir Oltean <[email protected]>
[ Upstream commit 68e1010cda7967cfca9c8650ee1f4efcae54ab90 ]
of_get_child_by_name() gives us an OF node with an elevated refcount, which should be dropped when we're done with it. This is so that, if (of_node_check_flag(node, OF_DYNAMIC)) is true, the node's memory can eventually be freed.
There are 2 distinct paths to be considered in qca8k_mdio_register():
- devm_of_mdiobus_register() succeeds: since commit 3b73a7b8ec38 ("net:
mdio_bus: add refcounting for fwnodes to mdiobus"), the MDIO core treats this well.
- devm_of_mdiobus_register() or anything up to that point fails: it is the duty of the qca8k driver to release the OF node.
This change addresses the second case by making sure that the OF node reference is not leaked.
The "mdio" node may be NULL, but of_node_put(NULL) is safe.
--- drivers/net/dsa/qca/qca8k-8xxx.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-)
drivers/net/dsa/qca/qca8k-8xxx.c +16 -5
@@ -949,10 +949,15 @@ qca8k_mdio_register(struct qca8k_priv *priv)struct dsa_switch *ds = priv->ds;struct device_node *mdio;struct mii_bus *bus; +int err; + + mdio =of_get_child_by_name (priv->dev->of_node,"mdio" ); bus =devm_mdiobus_alloc (ds->dev); -if (!bus) -return -ENOMEM ; +if (!bus) { + err = -ENOMEM ; + goto out_put_node; + } bus->priv = (void *)priv; snprintf(bus->id, MII_BUS_ID_SIZE, "qca8k-%d.%d",
@@ -962,12 +967,12 @@ qca8k_mdio_register(struct qca8k_priv *priv) ds->user_mii_bus = bus;/* Check if the devicetree declare the port:phy mapping */ - mdio =of_get_child_by_name (priv->dev->of_node,"mdio" );if (of_device_is_available (mdio)) { bus->name ="qca8k user mii" ; bus->read = qca8k_internal_mdio_read; bus->write = qca8k_internal_mdio_write; -return devm_of_mdiobus_register (priv->dev, bus, mdio); + err =devm_of_mdiobus_register (priv->dev, bus, mdio); + goto out_put_node; }/* If a mapping can't be found the legacy mapping is used,
@@ -976,7 +981,13 @@ qca8k_mdio_register(struct qca8k_priv *priv) bus->name ="qca8k-legacy user mii" ; bus->read = qca8k_legacy_mdio_read; bus->write = qca8k_legacy_mdio_write; -return devm_mdiobus_register (priv->dev, bus); + + err =devm_mdiobus_register (priv->dev, bus); + +out_put_node: +of_node_put (mdio); + +return err; } static int
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 160/353 ARM: dts: usr8200: Fix phy registers
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Linus Walleij <[email protected]>
[ Upstream commit 18a1ee9d716d355361da2765f87dbbadcdea03bf ]
The MV88E6060 switch has internal PHY registers at MDIO addresses 0x00..0x04. Tie each port to the corresponding PHY.
--- .../ixp/intel-ixp42x-usrobotics-usr8200.dts | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+)
arch/arm/boot/dts/intel/ixp/intel-ixp42x-usrobotics-usr8200.dts +22 -0
@@ -165,6 +165,24 @@ #address-cells = <1>; #size-cells = <0>; + /* + * PHY 0..4 are internal to the MV88E6060 switch but appear + * as independent devices. + */ + phy0: ethernet-phy@0 { + reg = <0>; + }; + phy1: ethernet-phy@1 { + reg = <1>; + }; + phy2: ethernet-phy@2 { + reg = <2>; + }; + phy3: ethernet-phy@3 { + reg = <3>; + }; + + /* Altima AMI101L used by the WAN port */ phy9: ethernet-phy@9 { reg = <9>; };
@@ -181,21 +199,25 @@ port@0 { reg = <0>; label = "lan1"; + phy-handle = <&phy0>; }; port@1 { reg = <1>; label = "lan2"; + phy-handle = <&phy1>; }; port@2 { reg = <2>; label = "lan3"; + phy-handle = <&phy2>; }; port@3 { reg = <3>; label = "lan4"; + phy-handle = <&phy3>; }; port@5 {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 161/353 f2fs: fix to check return value of f2fs_reserve_new_block()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
[ Upstream commit 956fa1ddc132e028f3b7d4cf17e6bfc8cb36c7fd ]
Let's check return value of f2fs_reserve_new_block() in do_recover_data() rather than letting it fails silently.
Also refactoring check condition on return value of f2fs_reserve_new_block() as below:
- trigger f2fs_bug_on() only for ENOSPC case;
- use do-while statement to avoid redundant codes;
--- fs/f2fs/recovery.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-)
fs/f2fs/recovery.c +17 -6
@@ -712,7 +712,16 @@ static int do_recover_data(struct f2fs_sb_info *sbi, struct inode *inode,*/ if (dest ==NEW_ADDR ) {f2fs_truncate_data_blocks_range (&dn,1 ); -f2fs_reserve_new_block (&dn); +do { + err =f2fs_reserve_new_block (&dn); +if (err == -ENOSPC ) { +f2fs_bug_on (sbi,1 ); +break ; + } + }while (err && +IS_ENABLED (CONFIG_F2FS_FAULT_INJECTION )); +if (err) + goto err;continue ; }
@@ -720,12 +729,14 @@ static int do_recover_data(struct f2fs_sb_info *sbi, struct inode *inode,if (f2fs_is_valid_blkaddr (sbi, dest,META_POR )) {if (src ==NULL_ADDR ) { - err =f2fs_reserve_new_block (&dn); -while (err && -IS_ENABLED (CONFIG_F2FS_FAULT_INJECTION )) +do { err =f2fs_reserve_new_block (&dn); -/* We should not get -ENOSPC */ -f2fs_bug_on (sbi, err); +if (err == -ENOSPC ) { +f2fs_bug_on (sbi,1 ); +break ; + } + }while (err && +IS_ENABLED (CONFIG_F2FS_FAULT_INJECTION ));if (err) goto err; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 162/353 ALSA: hda: Refer to correct stream index at loops
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit 26257869672fd4a06a60c2da841e15fb2cb47bbe ]
In a couple of loops over the all streams, we check the bitmap against the loop counter. A more correct reference would be, however, the index of each stream, instead.
This patch corrects the check of bitmaps to the stream index.
Note that this change doesn't fix anything for now; all existing drivers set up the stream indices properly, hence the loop count is always equal with the stream index. That said, this change is only for consistency.
--- sound/hda/hdac_stream.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
sound/hda/hdac_stream.c +3 -6
@@ -671,17 +671,15 @@ void snd_hdac_stream_timecounter_init(struct hdac_stream *azx_dev,struct hdac_stream *s;bool inited = false;u64 cycle_last =0 ; -int i =0 ;list_for_each_entry (s, &bus->stream_list, list) { -if (streams & (1 << i)) { +if ((streams & (1 << s->index))) {azx_timecounter_init (s, inited, cycle_last);if (!inited) { inited = true; cycle_last = s->tc.cycle_last; } } - i++; }snd_pcm_gettime (runtime, &runtime->trigger_tstamp);
@@ -726,14 +724,13 @@ void snd_hdac_stream_sync(struct hdac_stream *azx_dev, bool start, unsigned int streams) {struct hdac_bus *bus = azx_dev->bus; -int i, nwait, timeout; +int nwait, timeout;struct hdac_stream *s;for (timeout =5000 ; timeout; timeout--) { nwait =0 ; - i =0 ;list_for_each_entry (s, &bus->stream_list, list) { -if (!(streams & (1 << i++))) +if (!(streams & (1 << s->index)))continue ;if (start) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 163/353 ASoC: doc: Fix undefined SND_SOC_DAPM_NOPM argument
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cristian Ciocaltea <[email protected]>
[ Upstream commit 67c7666fe808c3a7af3cc6f9d0a3dd3acfd26115 ]
The virtual widget example makes use of an undefined SND_SOC_DAPM_NOPM argument passed to SND_SOC_DAPM_MIXER(). Replace with the correct SND_SOC_NOPM definition.
--- Documentation/sound/soc/dapm.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/sound/soc/dapm.rst +1 -1
@@ -234,7 +234,7 @@ corresponding soft power control. In this case it is necessary to create a virtual widget - a widget with no control bits e.g. :: - SND_SOC_DAPM_MIXER("AC97 Mixer", SND_SOC_DAPM_NOPM, 0, 0, NULL, 0), + SND_SOC_DAPM_MIXER("AC97 Mixer", SND_SOC_NOPM, 0, 0, NULL, 0), This can be used to merge to signal paths together in software.
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 164/353 fast_dput(): handle underflows gracefully
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Al Viro <[email protected]>
[ Upstream commit 504e08cebe1d4e1efe25f915234f646e74a364a8 ]
If refcount is less than 1, we should just warn, unlock dentry and return true, so that the caller doesn't try to do anything else.
Taking care of that leaves the rest of "lockref_put_return() has failed" case equivalent to "decrement refcount and rejoin the normal slow path after the point where we grab ->d_lock".
NOTE: lockref_put_return() is strictly a fastpath thing - unlike the rest of lockref primitives, it does not contain a fallback. Caller (and it looks like fast_dput() is the only legitimate one in the entire kernel) has to do that itself. Reasons for lockref_put_return() failures:
* ->d_lock held by somebody
* refcount <= 0
* ... or an architecture not supporting lockref use of
cmpxchg - sparc, anything non-SMP, config with spinlock debugging...
We could add a fallback, but it would be a clumsy API - we'd have to distinguish between:
(1) refcount > 1 - decremented, lock not held on return
(2) refcount < 1 - left alone, probably no sense to hold the lock
(3) refcount is 1, no cmphxcg - decremented, lock held on return
(4) refcount is 1, cmphxcg supported - decremented, lock *NOT* held on return.
We want to return with no lock held in case (4); that's the whole point of that thing. We very much do not want to have the fallback in case (3) return without a lock, since the caller might have to retake it in that case.
So it wouldn't be more convenient than doing the fallback in the caller and it would be very easy to screw up, especially since the test coverage would suck - no way to test (3) and (4) on the same kernel build.
--- fs/dcache.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
fs/dcache.c +4 -3
@@ -787,12 +787,12 @@ static inline bool fast_dput(struct dentry *dentry)*/ if (unlikely (ret <0 )) {spin_lock (&dentry->d_lock); -if (dentry->d_lockref.count >1 ) { - dentry->d_lockref.count--; +if (WARN_ON_ONCE (dentry->d_lockref.count <=0 )) {spin_unlock (&dentry->d_lock);return true; } -return false; + dentry->d_lockref.count--; + goto locked; }/*
@@ -850,6 +850,7 @@ static inline bool fast_dput(struct dentry *dentry)* else could have killed it and marked it dead. Either way, we * don't need to do anything else. */ +locked:if (dentry->d_lockref.count) {spin_unlock (&dentry->d_lock);return true;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 165/353 reiserfs: Avoid touching renamed directory if parent does not change
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
[ Upstream commit 49db9b1b86a82448dfaf3fcfefcf678dee56c8ed ]
The VFS will not be locking moved directory if its parent does not change. Change reiserfs rename code to avoid touching renamed directory if its parent does not change as without locking that can corrupt the filesystem.
--- fs/reiserfs/namei.c | 54 ++++++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 25 deletions(-)
fs/reiserfs/namei.c +29 -25
@@ -1324,8 +1324,8 @@ static int reiserfs_rename(struct mnt_idmap *idmap,struct inode *old_inode, *new_dentry_inode;struct reiserfs_transaction_handle th;int jbegin_count; -umode_t old_inode_mode;unsigned long savelink =1 ; +bool update_dir_parent = false;if (flags & ~RENAME_NOREPLACE )return -EINVAL ;
@@ -1375,8 +1375,7 @@ static int reiserfs_rename(struct mnt_idmap *idmap,return -ENOENT ; } - old_inode_mode = old_inode->i_mode; -if (S_ISDIR (old_inode_mode)) { +if (S_ISDIR (old_inode->i_mode)) {/* * make sure that directory being renamed has correct ".." * and that its new parent directory has not too many links
@@ -1389,24 +1388,28 @@ static int reiserfs_rename(struct mnt_idmap *idmap, } } -/* -* directory is renamed, its parent directory will be changed, -* so find ".." entry -*/ - dot_dot_de.de_gen_number_bit_string =NULL ; - retval = -reiserfs_find_entry (old_inode,".." ,2 , &dot_dot_entry_path, +if (old_dir != new_dir) { +/* +* directory is renamed, its parent directory will be +* changed, so find ".." entry +*/ + dot_dot_de.de_gen_number_bit_string =NULL ; + retval = +reiserfs_find_entry (old_inode,".." ,2 , + &dot_dot_entry_path, &dot_dot_de); -pathrelse (&dot_dot_entry_path); -if (retval !=NAME_FOUND ) { -reiserfs_write_unlock (old_dir->i_sb); -return -EIO ; - } +pathrelse (&dot_dot_entry_path); +if (retval !=NAME_FOUND ) { +reiserfs_write_unlock (old_dir->i_sb); +return -EIO ; + } -/* inode number of .. must equal old_dir->i_ino */ -if (dot_dot_de.de_objectid != old_dir->i_ino) { -reiserfs_write_unlock (old_dir->i_sb); -return -EIO ; +/* inode number of .. must equal old_dir->i_ino */ +if (dot_dot_de.de_objectid != old_dir->i_ino) { +reiserfs_write_unlock (old_dir->i_sb); +return -EIO ; + } + update_dir_parent = true; } }
@@ -1486,7 +1489,7 @@ static int reiserfs_rename(struct mnt_idmap *idmap,reiserfs_prepare_for_journal (old_inode->i_sb, new_de.de_bh,1 ); - if (S_ISDIR(old_inode->i_mode)) { + if (update_dir_parent) { if ((retval = search_by_entry_key(new_dir->i_sb, &dot_dot_de.de_entry_key,
@@ -1534,14 +1537,14 @@ static int reiserfs_rename(struct mnt_idmap *idmap, new_de.de_bh);reiserfs_restore_prepared_buffer (old_inode->i_sb, old_de.de_bh); -if (S_ISDIR (old_inode_mode)) +if (update_dir_parent)reiserfs_restore_prepared_buffer (old_inode-> i_sb, dot_dot_de. de_bh);continue ; } -if (S_ISDIR (old_inode_mode)) { +if (update_dir_parent) {if (item_moved (&dot_dot_ih, &dot_dot_entry_path) || !entry_points_to_object (".." ,2 , &dot_dot_de, old_dir)) {
@@ -1559,7 +1562,7 @@ static int reiserfs_rename(struct mnt_idmap *idmap, } } -RFALSE (S_ISDIR (old_inode_mode) && +RFALSE (update_dir_parent && !buffer_journal_prepared (dot_dot_de.de_bh),"" );break ;
@@ -1592,11 +1595,12 @@ static int reiserfs_rename(struct mnt_idmap *idmap, savelink = new_dentry_inode->i_nlink; } -if (S_ISDIR (old_inode_mode)) { +if (update_dir_parent) {/* adjust ".." of renamed directory */ set_ino_in_dir_entry (&dot_dot_de,INODE_PKEY (new_dir));journal_mark_dirty (&th, dot_dot_de.de_bh); - + } +if (S_ISDIR (old_inode->i_mode)) {/* * there (in new_dir) was no directory, so it got new link * (".." of renamed directory)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 166/353 ocfs2: Avoid touching renamed directory if parent does not change
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
[ Upstream commit 9d618d19b29c2943527e3a43da0a35aea91062fc ]
The VFS will not be locking moved directory if its parent does not change. Change ocfs2 rename code to avoid touching renamed directory if its parent does not change as without locking that can corrupt the filesystem.
--- fs/ocfs2/namei.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
fs/ocfs2/namei.c +5 -3
@@ -1336,7 +1336,7 @@ static int ocfs2_rename(struct mnt_idmap *idmap, goto bail; } -if (S_ISDIR (old_inode->i_mode)) { +if (S_ISDIR (old_inode->i_mode) && new_dir != old_dir) {u64 old_inode_parent; update_dot_dot =1 ;
@@ -1353,8 +1353,7 @@ static int ocfs2_rename(struct mnt_idmap *idmap, goto bail; } -if (!new_inode && new_dir != old_dir && - new_dir->i_nlink >=ocfs2_link_max (osb)) { +if (!new_inode && new_dir->i_nlink >=ocfs2_link_max (osb)) { status = -EMLINK ; goto bail; }
@@ -1601,6 +1600,9 @@ static int ocfs2_rename(struct mnt_idmap *idmap,mlog_errno (status); goto bail; } + } + +if (S_ISDIR (old_inode->i_mode)) {drop_nlink (old_dir);if (new_inode) {drop_nlink (new_inode);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 167/353 drm/msm/a690: Fix reg values for a690
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Danylo Piliaiev <[email protected]>
[ Upstream commit 07e6de738aa6f0e873463e9ca88bdb7081c4bfd4 ]
KGSL doesn't support a690 so all reg values were the same as on a660. Now we know the values and they are different from the windows driver.
This fixes hangs on D3D12 games and some CTS tests.
Patchwork: https://patchwork.freedesktop.org/patch/568931/
--- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-)
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +13 -10
@@ -1312,6 +1312,7 @@ static void a6xx_set_ubwc_config(struct msm_gpu *gpu)if (adreno_is_a650 (adreno_gpu) ||adreno_is_a660 (adreno_gpu) || +adreno_is_a690 (adreno_gpu) ||adreno_is_a730 (adreno_gpu) ||adreno_is_a740_family (adreno_gpu)) {/* TODO: get ddr type from bootloader and use 2 for LPDDR4 */
@@ -1321,13 +1322,6 @@ static void a6xx_set_ubwc_config(struct msm_gpu *gpu) uavflagprd_inv =2 ; } -if (adreno_is_a690 (adreno_gpu)) { - hbb_lo =2 ; - amsbc =1 ; - rgb565_predicator =1 ; - uavflagprd_inv =2 ; - } -if (adreno_is_7c3 (adreno_gpu)) { hbb_lo =1 ; amsbc =1 ;
@@ -1741,7 +1735,9 @@ static int hw_init(struct msm_gpu *gpu)/* Setting the primFifo thresholds default values, * and vccCacheSkipDis=1 bit (0x200) for A640 and newer */ -if (adreno_is_a650 (adreno_gpu) ||adreno_is_a660 (adreno_gpu) ||adreno_is_a690 (adreno_gpu)) +if (adreno_is_a690 (adreno_gpu)) +gpu_write (gpu,REG_A6XX_PC_DBG_ECO_CNTL ,0x00800200 ); +else if (adreno_is_a650 (adreno_gpu) ||adreno_is_a660 (adreno_gpu))gpu_write (gpu,REG_A6XX_PC_DBG_ECO_CNTL ,0x00300200 );else if (adreno_is_a640_family (adreno_gpu) ||adreno_is_7c3 (adreno_gpu))gpu_write (gpu,REG_A6XX_PC_DBG_ECO_CNTL ,0x00200200 );
@@ -1775,6 +1771,8 @@ static int hw_init(struct msm_gpu *gpu)if (adreno_is_a730 (adreno_gpu) ||adreno_is_a740_family (adreno_gpu))gpu_write (gpu,REG_A6XX_RBBM_INTERFACE_HANG_INT_CNTL , (1 <<30 ) |0xcfffff ); +else if (adreno_is_a690 (adreno_gpu)) +gpu_write (gpu,REG_A6XX_RBBM_INTERFACE_HANG_INT_CNTL , (1 <<30 ) |0x4fffff );else if (adreno_is_a619 (adreno_gpu))gpu_write (gpu,REG_A6XX_RBBM_INTERFACE_HANG_INT_CNTL , (1 <<30 ) |0x3fffff );else if (adreno_is_a610 (adreno_gpu))
@@ -1808,12 +1806,17 @@ static int hw_init(struct msm_gpu *gpu)a6xx_set_cp_protect (gpu);if (adreno_is_a660_family (adreno_gpu)) { -gpu_write (gpu,REG_A6XX_CP_CHICKEN_DBG ,0x1 ); +if (adreno_is_a690 (adreno_gpu)) +gpu_write (gpu,REG_A6XX_CP_CHICKEN_DBG ,0x00028801 ); +else +gpu_write (gpu,REG_A6XX_CP_CHICKEN_DBG ,0x1 );gpu_write (gpu,REG_A6XX_RBBM_GBIF_CLIENT_QOS_CNTL ,0x0 ); } +if (adreno_is_a690 (adreno_gpu)) +gpu_write (gpu,REG_A6XX_UCHE_CMDQ_CONFIG ,0x90 );/* Set dualQ + disable afull for A660 GPU */ -if (adreno_is_a660 (adreno_gpu)) +else if (adreno_is_a660 (adreno_gpu))gpu_write (gpu,REG_A6XX_UCHE_CMDQ_CONFIG ,0x66906 );else if (adreno_is_a7xx (adreno_gpu)) gpu_write(gpu, REG_A6XX_UCHE_CMDQ_CONFIG,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 168/353 RDMA/IPoIB: Fix error code return in ipoib_mcast_join
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jack Wang <[email protected]>
[ Upstream commit 753fff78f430704548f45eda52d6d55371a52c0f ]
Return the error code in case of ib_sa_join_multicast fail.
--- drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 1 + 1 file changed, 1 insertion(+)
drivers/infiniband/ulp/ipoib/ipoib_multicast.c +1 -0
@@ -546,6 +546,7 @@ static int ipoib_mcast_join(struct net_device *dev, struct ipoib_mcast *mcast)spin_unlock_irq (&priv->lock);complete (&mcast->done);spin_lock_irq (&priv->lock); +return ret; }return 0 ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 169/353 drm/panel-edp: Add override_edid_mode quirk for generic edp
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hsin-Yi Wang <[email protected]>
[ Upstream commit 9f7843b515811aea6c56527eb195b622e9c01f12 ]
Generic edp gets mode from edid. However, some panels report incorrect mode in this way, resulting in glitches on panel. Introduce a new quirk additional_mode to the generic edid to pick a correct hardcoded mode.
--- drivers/gpu/drm/panel/panel-edp.c | 48 +++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 3 deletions(-)
drivers/gpu/drm/panel/panel-edp.c +45 -3
@@ -203,6 +203,9 @@ struct edp_panel_entry {/** @name: Name of this panel (for printing to logs). */ const char *name; + +/** @override_edid_mode: Override the mode obtained by edid. */ +const struct drm_display_mode *override_edid_mode; };struct panel_edp {
@@ -301,6 +304,24 @@ static unsigned int panel_edp_get_display_modes(struct panel_edp *panel,return num; } +static int panel_edp_override_edid_mode (struct panel_edp *panel, +struct drm_connector *connector, +const struct drm_display_mode *override_mode) +{ +struct drm_display_mode *mode; + + mode =drm_mode_duplicate (connector->dev, override_mode); +if (!mode) { +dev_err (panel->base.dev,"failed to add additional mode\n" ); +return 0 ; + } + + mode->type |=DRM_MODE_TYPE_DRIVER |DRM_MODE_TYPE_PREFERRED ; +drm_mode_set_name (mode); +drm_mode_probed_add (connector, mode); +return 1 ; +} +static int panel_edp_get_non_edid_modes (struct panel_edp *panel,struct drm_connector *connector) {
@@ -568,6 +589,9 @@ static int panel_edp_get_modes(struct drm_panel *panel, {struct panel_edp *p =to_panel_edp (panel);int num =0 ; +bool has_override_edid_mode = p->detected_panel && + p->detected_panel !=ERR_PTR (-EINVAL ) && + p->detected_panel->override_edid_mode;/* probe EDID if a DDC bus is available */ if (p->ddc) {
@@ -575,9 +599,18 @@ static int panel_edp_get_modes(struct drm_panel *panel,if (!p->edid) p->edid =drm_get_edid (connector, p->ddc); - -if (p->edid) - num +=drm_add_edid_modes (connector, p->edid); +if (p->edid) { +if (has_override_edid_mode) { +/* +* override_edid_mode is specified. Use +* override_edid_mode instead of from edid. +*/ + num +=panel_edp_override_edid_mode (p, connector, + p->detected_panel->override_edid_mode); + }else { + num +=drm_add_edid_modes (connector, p->edid); + } + }pm_runtime_mark_last_busy (panel->dev);pm_runtime_put_autosuspend (panel->dev);
@@ -1830,6 +1863,15 @@ static const struct panel_delay delay_200_500_e200 = { .delay = _delay \ } +#define EDP_PANEL_ENTRY2 (vend_chr_0, vend_chr_1, vend_chr_2, product_id, _delay, _name, _mode) \ +{ \ + .name = _name, \ + .panel_id = drm_edid_encode_panel_id(vend_chr_0, vend_chr_1, vend_chr_2, \ + product_id), \ + .delay = _delay, \ + .override_edid_mode = _mode \ +} +/* * This table is used to figure out power sequencing delays for panels that * are detected by EDID. Entries here may point to entries in the
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 170/353 drm/bridge: anx7625: Fix Set HPD irq detect window to 2ms
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xin Ji <[email protected]>
[ Upstream commit e3af7053de3f685c96158373bc234b2feca1f160 ]
Polling firmware HPD GPIO status, set HPD irq detect window to 2ms after firmware HPD GPIO initial done
--- drivers/gpu/drm/bridge/analogix/anx7625.c | 51 ++++++++++++++++------- drivers/gpu/drm/bridge/analogix/anx7625.h | 4 ++ 2 files changed, 40 insertions(+), 15 deletions(-)
drivers/gpu/drm/bridge/analogix/anx7625.c +36 -15
@@ -1298,10 +1298,32 @@ static void anx7625_config(struct anx7625_data *ctx) XTAL_FRQ_SEL, XTAL_FRQ_27M); } +static int anx7625_hpd_timer_config (struct anx7625_data *ctx) +{ +int ret; + +/* Set irq detect window to 2ms */ + ret =anx7625_reg_write (ctx, ctx->i2c.tx_p2_client, +HPD_DET_TIMER_BIT0_7 ,HPD_TIME &0xFF ); + ret |=anx7625_reg_write (ctx, ctx->i2c.tx_p2_client, +HPD_DET_TIMER_BIT8_15 , + (HPD_TIME >>8 ) &0xFF ); + ret |=anx7625_reg_write (ctx, ctx->i2c.tx_p2_client, +HPD_DET_TIMER_BIT16_23 , + (HPD_TIME >>16 ) &0xFF ); + +return ret; +} + +static int anx7625_read_hpd_gpio_config_status (struct anx7625_data *ctx) +{ +return anx7625_reg_read (ctx, ctx->i2c.rx_p0_client,GPIO_CTRL_2 ); +} +static void anx7625_disable_pd_protocol (struct anx7625_data *ctx) {struct device *dev = ctx->dev; -int ret; +int ret, val;/* Reset main ocm */ ret =anx7625_reg_write (ctx, ctx->i2c.rx_p0_client,0x88 ,0x40 );
@@ -1315,6 +1337,19 @@ static void anx7625_disable_pd_protocol(struct anx7625_data *ctx)DRM_DEV_DEBUG_DRIVER (dev,"disable PD feature fail.\n" ); else DRM_DEV_DEBUG_DRIVER(dev, "disable PD feature succeeded.\n"); + +/* +* Make sure the HPD GPIO already be configured after OCM release before +* setting HPD detect window register. Here we poll the status register +* at maximum 40ms, then config HPD irq detect window register +*/ +readx_poll_timeout (anx7625_read_hpd_gpio_config_status, + ctx, val, + ((val &HPD_SOURCE ) || (val <0 )), +2000 ,2000 *20 ); + +/* Set HPD irq detect window to 2ms */ +anx7625_hpd_timer_config (ctx); }static int anx7625_ocm_loading_check (struct anx7625_data *ctx)
@@ -1437,20 +1472,6 @@ static void anx7625_start_dp_work(struct anx7625_data *ctx)static int anx7625_read_hpd_status_p0 (struct anx7625_data *ctx) { -int ret; - -/* Set irq detect window to 2ms */ - ret =anx7625_reg_write (ctx, ctx->i2c.tx_p2_client, -HPD_DET_TIMER_BIT0_7 ,HPD_TIME &0xFF ); - ret |=anx7625_reg_write (ctx, ctx->i2c.tx_p2_client, -HPD_DET_TIMER_BIT8_15 , - (HPD_TIME >>8 ) &0xFF ); - ret |=anx7625_reg_write (ctx, ctx->i2c.tx_p2_client, -HPD_DET_TIMER_BIT16_23 , - (HPD_TIME >>16 ) &0xFF ); -if (ret <0 ) -return ret; -return anx7625_reg_read (ctx, ctx->i2c.rx_p0_client,SYSTEM_STSTUS ); }
drivers/gpu/drm/bridge/analogix/anx7625.h +4 -0
@@ -259,6 +259,10 @@#define AP_MIPI_RX_EN BIT(5)/* 1: MIPI RX input in 0: no RX in */ #define AP_DISABLE_PD BIT(6)#define AP_DISABLE_DISPLAY BIT(7) + +#define GPIO_CTRL_2 0x49 +#define HPD_SOURCE BIT(6) +/***************************************************************/ /* Register definition of device address 0x84 */ #define MIPI_PHY_CONTROL_3 0x03
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 171/353 drm/amd/display: Fix tiled display misalignment
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Meenakshikumar Somasundaram <[email protected]>
[ Upstream commit c4b8394e76adba4f50a3c2696c75b214a291e24a ]
[Why]
When otg workaround is applied during clock update, otgs of tiled display went out of sync.
[How]
To call dc_trigger_sync() after clock update to sync otgs again.
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc.c +4 -0
@@ -1964,6 +1964,10 @@ static enum dc_status dc_commit_state_no_check(struct dc *dc, struct dc_state *cwait_for_no_pipes_pending (dc, context);/* pplib is notified if disp_num changed */ dc->hwss.optimize_bandwidth (dc, context); +/* Need to do otg sync again as otg could be out of sync due to otg +* workaround applied during clock update +*/ +dc_trigger_sync (dc, context); }if (dc->hwss.update_dsc_pg)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 172/353 f2fs: fix write pointers on zoned device after roll forward
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jaegeuk Kim <[email protected]>
[ Upstream commit 9dad4d964291295ef48243d4e03972b85138bc9f ]
1. do roll forward recovery
2. update current segments pointers
3. fix the entire zones' write pointers
4. do checkpoint
--- fs/f2fs/recovery.c | 2 ++ 1 file changed, 2 insertions(+)
fs/f2fs/recovery.c +2 -0
@@ -917,6 +917,8 @@ int f2fs_recover_fsync_data(struct f2fs_sb_info *sbi, bool check_only)if (!err && fix_curseg_write_pointer && !f2fs_readonly (sbi->sb) &&f2fs_sb_has_blkzoned (sbi)) { err =f2fs_fix_curseg_write_pointer (sbi); +if (!err) + err =f2fs_check_write_pointer (sbi); ret = err; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 173/353 ASoC: amd: Add new dmi entries for acp5x platform
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Venkata Prasad Potturu <[email protected]>
[ Upstream commit c3ab23a10771bbe06300e5374efa809789c65455 ]
Add sys_vendor and product_name dmi entries for acp5x platform.
--- sound/soc/amd/acp-config.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
sound/soc/amd/acp-config.c +14 -1
@@ -3,7 +3,7 @@// This file is provided under a dual BSD/GPLv2 license. When using or // redistributing this file, you may do so under either license. // -// Copyright(c) 2021 Advanced Micro Devices, Inc. +// Copyright(c) 2021, 2023 Advanced Micro Devices, Inc. // // Authors: Ajit Kumar Pandey <[email protected]> //
@@ -47,6 +47,19 @@ static const struct config_entry config_table[] = { {} }, }, + { + .flags = FLAG_AMD_LEGACY, + .device = ACP_PCI_DEV_ID, + .dmi_table = (const struct dmi_system_id []) { + { + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Valve" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"Jupiter" ), + }, + }, + {} + }, + }, { .flags = FLAG_AMD_SOF, .device = ACP_PCI_DEV_ID,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 174/353 drm/amd/display: initialize all the dpm levels stutter latency
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Charlene Liu <[email protected]>
[ Upstream commit 885c71ad791c1709f668a37f701d33e6872a902f ]
Fix issue when override level bigger than default. Levels 5, 6, and 7 had zero stutter latency, this is because override level being initialized after stutter latency inits.
--- drivers/gpu/drm/amd/display/dc/dml2/dml2_translation_helper.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dml2/dml2_translation_helper.c +3 -1
@@ -341,6 +341,9 @@ void dml2_init_soc_states(struct dml2_context *dml2, const struct dc *in_dc,break ; } +if (dml2->config.bbox_overrides.clks_table.num_states) + p->in_states->num_states = dml2->config.bbox_overrides.clks_table.num_states; +/* Override from passed values, if available */ for (i =0 ; i < p->in_states->num_states; i++) {if (dml2->config.bbox_overrides.sr_exit_latency_us) {
@@ -397,7 +400,6 @@ void dml2_init_soc_states(struct dml2_context *dml2, const struct dc *in_dc, }/* Copy clocks tables entries, if available */ if (dml2->config.bbox_overrides.clks_table.num_states) { - p->in_states->num_states = dml2->config.bbox_overrides.clks_table.num_states;for (i =0 ; i < dml2->config.bbox_overrides.clks_table.num_entries_per_clk.num_dcfclk_levels; i++) { p->in_states->state_array[i].dcfclk_mhz = dml2->config.bbox_overrides.clks_table.clk_entries[i].dcfclk_mhz;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 175/353 drm/amd/display: Fix MST PBN/X.Y value calculations
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilya Bakoulin <[email protected]>
[ Upstream commit 94bbf802efd0a8f13147d6664af6e653637340a8 ]
Changing PBN calculation to be more in line with spec. We don't need to inflate PBN_NATIVE value by the 1.006 margin, since that is already taken care of in the get_pbn_per_slot function.
--- drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/display/dc/link/link_dpms.c +8 -5
@@ -1061,18 +1061,21 @@ static struct fixed31_32 get_pbn_from_bw_in_kbps(uint64_t kbps)uint32_t denominator =1 ;/* -* margin 5300ppm + 300ppm ~ 0.6% as per spec, factor is 1.006 +* The 1.006 factor (margin 5300ppm + 300ppm ~ 0.6% as per spec) is not +* required when determining PBN/time slot utilization on the link between +* us and the branch, since that overhead is already accounted for in +* the get_pbn_per_slot function. +* * The unit of 54/64Mbytes/sec is an arbitrary unit chosen based on * common multiplier to render an integer PBN for all link rate/lane * counts combinations * calculate -* peak_kbps *= (1006/1000) * peak_kbps *= (64/54) -* peak_kbps *= 8 convert to bytes +* peak_kbps /= (8 * 1000) convert to bytes */ - numerator =64 *PEAK_FACTOR_X1000 ; - denominator =54 *8 *1000 *1000 ; + numerator =64 ; + denominator =54 *8 *1000 ; kbps *= numerator; peak_kbps =dc_fixpt_from_fraction (kbps, denominator);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 176/353 drm/amd/display: Fix disable_otg_wa logic
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicholas Susanto <[email protected]>
[ Upstream commit 2ce156482a6fef349d2eba98e5070c412d3af662 ]
[Why]
When switching to another HDMI mode, we are unnecesarilly disabling/enabling FIFO causing both HPO and DIG registers to be set at the same time when only HPO is supposed to be set.
This can lead to a system hang the next time we change refresh rates as there are cases when we don't disable OTG/FIFO but FIFO is enabled when it isn't supposed to be.
[How]
Removing the enable/disable FIFO entirely.
--- .../gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 8 -------- 1 file changed, 8 deletions(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c +0 -8
@@ -126,21 +126,13 @@ static void dcn35_disable_otg_wa(struct clk_mgr *clk_mgr_base, struct dc_state *continue ;if (pipe->stream && (pipe->stream->dpms_off ||dc_is_virtual_signal (pipe->stream->signal) || !pipe->stream->link_enc)) { -struct stream_encoder *stream_enc = pipe->stream_res.stream_enc; -if (disable) { -if (stream_enc && stream_enc->funcs->disable_fifo) - pipe->stream_res.stream_enc->funcs->disable_fifo (stream_enc); -if (pipe->stream_res.tg && pipe->stream_res.tg->funcs->immediate_disable_crtc) pipe->stream_res.tg->funcs->immediate_disable_crtc (pipe->stream_res.tg);reset_sync_context_for_pipe (dc, context, i); }else { pipe->stream_res.tg->funcs->enable_crtc (pipe->stream_res.tg); - -if (stream_enc && stream_enc->funcs->enable_fifo) - pipe->stream_res.stream_enc->funcs->enable_fifo (stream_enc); } } }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 177/353 drm/amd/display: Fix Replay Desync Error IRQ handler
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dennis Chan <[email protected]>
[ Upstream commit dd5c6362ddcd8bdb07704faff8648593885ecfa1 ]
In previous case, Replay didn't identify the IRQ type, This commit fixes the issues for the interrupt.
--- .../display/dc/link/protocols/link_dp_irq_handler.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_irq_handler.c +6 -6
@@ -190,9 +190,6 @@ static void handle_hpd_irq_replay_sink(struct dc_link *link)/*AMD Replay version reuse DP_PSR_ERROR_STATUS for REPLAY_ERROR status.*/ union psr_error_status replay_error_status; -if (link->replay_settings.config.force_disable_desync_error_check) -return ; -if (!link->replay_settings.replay_feature_enabled)return ;
@@ -210,9 +207,6 @@ static void handle_hpd_irq_replay_sink(struct dc_link *link) &replay_error_status.raw, sizeof(replay_error_status.raw)); -if (replay_configuration.bits.DESYNC_ERROR_STATUS) - link->replay_settings.config.received_desync_error_hpd =1 ; - link->replay_settings.config.replay_error_status.bits.LINK_CRC_ERROR = replay_error_status.bits.LINK_CRC_ERROR; link->replay_settings.config.replay_error_status.bits.DESYNC_ERROR =
@@ -225,6 +219,12 @@ static void handle_hpd_irq_replay_sink(struct dc_link *link) link->replay_settings.config.replay_error_status.bits.STATE_TRANSITION_ERROR) {bool allow_active; +if (link->replay_settings.config.replay_error_status.bits.DESYNC_ERROR) + link->replay_settings.config.received_desync_error_hpd =1 ; + +if (link->replay_settings.config.force_disable_desync_error_check) +return ; +/* Acknowledge and clear configuration bits */ dm_helpers_dp_write_dpcd( link->ctx,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 178/353 drm/amd/display: add support for DTO genarated dscclk
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wenjing Liu <[email protected]>
[ Upstream commit 08a32addf17317b9fac55be9b31275cbf6e41fb7 ]
Current implementation will choose to use refclk as dscclk. This is not recommended by hardware team as refclk is a fixed value which could cause unnecessary power consumption or it could be not enough for large DSC timings. So we are adding new interfaces so we could switch to use dynamically generated DSCCLK by DTO. So DSCCLK is programmable based on current pixel clock and dispclk.
--- .../amd/display/dc/hwss/dcn32/dcn32_hwseq.c | 25 +++++++++++++++++ drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 4 +++ .../gpu/drm/amd/display/dc/link/link_dpms.c | 27 ++++++++++++++++++- 3 files changed, 55 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c +25 -0
@@ -995,9 +995,22 @@ static int calc_mpc_flow_ctrl_cnt(const struct dc_stream_state *stream,static void update_dsc_on_stream (struct pipe_ctx *pipe_ctx,bool enable) {struct display_stream_compressor *dsc = pipe_ctx->stream_res.dsc; +struct dc *dc = pipe_ctx->stream->ctx->dc;struct dc_stream_state *stream = pipe_ctx->stream;struct pipe_ctx *odm_pipe;int opp_cnt =1 ; +struct dccg *dccg = dc->res_pool->dccg; +/* It has been found that when DSCCLK is lower than 16Mhz, we will get DCN +* register access hung. When DSCCLk is based on refclk, DSCCLk is always a +* fixed value higher than 16Mhz so the issue doesn't occur. When DSCCLK is +* generated by DTO, DSCCLK would be based on 1/3 dispclk. For small timings +* with DSC such as 480p60Hz, the dispclk could be low enough to trigger +* this problem. We are implementing a workaround here to keep using dscclk +* based on fixed value refclk when timing is smaller than 3x16Mhz (i.e +* 48Mhz) pixel clock to avoid hitting this problem. +*/ +bool should_use_dto_dscclk = (dccg->funcs->set_dto_dscclk !=NULL ) && + stream->timing.pix_clk_100hz >480000 ;ASSERT (dsc);for (odm_pipe = pipe_ctx->next_odm_pipe; odm_pipe; odm_pipe = odm_pipe->next_odm_pipe)
@@ -1020,12 +1033,16 @@ static void update_dsc_on_stream(struct pipe_ctx *pipe_ctx, bool enable) dsc->funcs->dsc_set_config (dsc, &dsc_cfg, &dsc_optc_cfg); dsc->funcs->dsc_enable (dsc, pipe_ctx->stream_res.opp->inst); +if (should_use_dto_dscclk) + dccg->funcs->set_dto_dscclk (dccg, dsc->inst);for (odm_pipe = pipe_ctx->next_odm_pipe; odm_pipe; odm_pipe = odm_pipe->next_odm_pipe) {struct display_stream_compressor *odm_dsc = odm_pipe->stream_res.dsc;ASSERT (odm_dsc); odm_dsc->funcs->dsc_set_config (odm_dsc, &dsc_cfg, &dsc_optc_cfg); odm_dsc->funcs->dsc_enable (odm_dsc, odm_pipe->stream_res.opp->inst); +if (should_use_dto_dscclk) + dccg->funcs->set_dto_dscclk (dccg, odm_dsc->inst); } dsc_cfg.dc_dsc_cfg.num_slices_h *= opp_cnt; dsc_cfg.pic_width *= opp_cnt;
@@ -1045,9 +1062,13 @@ static void update_dsc_on_stream(struct pipe_ctx *pipe_ctx, bool enable) OPTC_DSC_DISABLED, 0, 0);/* disable DSC block */ +if (dccg->funcs->set_ref_dscclk) + dccg->funcs->set_ref_dscclk (dccg, pipe_ctx->stream_res.dsc->inst); dsc->funcs->dsc_disable (pipe_ctx->stream_res.dsc);for (odm_pipe = pipe_ctx->next_odm_pipe; odm_pipe; odm_pipe = odm_pipe->next_odm_pipe) {ASSERT (odm_pipe->stream_res.dsc); +if (dccg->funcs->set_ref_dscclk) + dccg->funcs->set_ref_dscclk (dccg, odm_pipe->stream_res.dsc->inst); odm_pipe->stream_res.dsc->funcs->dsc_disable (odm_pipe->stream_res.dsc); } }
@@ -1130,6 +1151,10 @@ void dcn32_update_odm(struct dc *dc, struct dc_state *context, struct pipe_ctx *if (!pipe_ctx->next_odm_pipe && current_pipe_ctx->next_odm_pipe && current_pipe_ctx->next_odm_pipe->stream_res.dsc) {struct display_stream_compressor *dsc = current_pipe_ctx->next_odm_pipe->stream_res.dsc; +struct dccg *dccg = dc->res_pool->dccg; + +if (dccg->funcs->set_ref_dscclk) + dccg->funcs->set_ref_dscclk (dccg, dsc->inst);/* disconnect DSC block from stream */ dsc->funcs->dsc_disconnect (dsc); }
drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h +4 -0
@@ -201,6 +201,10 @@ struct dccg_funcs {struct dccg *dccg, enum streamclk_source src, uint32_t otg_inst); +void (*set_dto_dscclk)( +struct dccg *dccg, +uint32_t dsc_inst); + void (*set_ref_dscclk)(struct dccg *dccg, uint32_t dsc_inst); };#endif //__DAL_DCCG_H__
drivers/gpu/drm/amd/display/dc/link/link_dpms.c +26 -1
@@ -776,10 +776,26 @@ static bool dp_set_dsc_on_rx(struct pipe_ctx *pipe_ctx, bool enable)*/ void link_set_dsc_on_stream (struct pipe_ctx *pipe_ctx,bool enable) { +/* TODO: Move this to HWSS as this is hardware programming sequence not a +* link layer sequence +*/ struct display_stream_compressor *dsc = pipe_ctx->stream_res.dsc; +struct dc *dc = pipe_ctx->stream->ctx->dc;struct dc_stream_state *stream = pipe_ctx->stream;struct pipe_ctx *odm_pipe;int opp_cnt =1 ; +struct dccg *dccg = dc->res_pool->dccg; +/* It has been found that when DSCCLK is lower than 16Mhz, we will get DCN +* register access hung. When DSCCLk is based on refclk, DSCCLk is always a +* fixed value higher than 16Mhz so the issue doesn't occur. When DSCCLK is +* generated by DTO, DSCCLK would be based on 1/3 dispclk. For small timings +* with DSC such as 480p60Hz, the dispclk could be low enough to trigger +* this problem. We are implementing a workaround here to keep using dscclk +* based on fixed value refclk when timing is smaller than 3x16Mhz (i.e +* 48Mhz) pixel clock to avoid hitting this problem. +*/ +bool should_use_dto_dscclk = (dccg->funcs->set_dto_dscclk !=NULL ) && + stream->timing.pix_clk_100hz >480000 ;DC_LOGGER_INIT (dsc->ctx->logger);for (odm_pipe = pipe_ctx->next_odm_pipe; odm_pipe; odm_pipe = odm_pipe->next_odm_pipe)
@@ -802,11 +818,15 @@ void link_set_dsc_on_stream(struct pipe_ctx *pipe_ctx, bool enable) dsc->funcs->dsc_set_config (dsc, &dsc_cfg, &dsc_optc_cfg); dsc->funcs->dsc_enable (dsc, pipe_ctx->stream_res.opp->inst); +if (should_use_dto_dscclk) + dccg->funcs->set_dto_dscclk (dccg, dsc->inst);for (odm_pipe = pipe_ctx->next_odm_pipe; odm_pipe; odm_pipe = odm_pipe->next_odm_pipe) {struct display_stream_compressor *odm_dsc = odm_pipe->stream_res.dsc; odm_dsc->funcs->dsc_set_config (odm_dsc, &dsc_cfg, &dsc_optc_cfg); odm_dsc->funcs->dsc_enable (odm_dsc, odm_pipe->stream_res.opp->inst); +if (should_use_dto_dscclk) + dccg->funcs->set_dto_dscclk (dccg, odm_dsc->inst); } dsc_cfg.dc_dsc_cfg.num_slices_h *= opp_cnt; dsc_cfg.pic_width *= opp_cnt;
@@ -856,9 +876,14 @@ void link_set_dsc_on_stream(struct pipe_ctx *pipe_ctx, bool enable) }/* disable DSC block */ +if (dccg->funcs->set_ref_dscclk) + dccg->funcs->set_ref_dscclk (dccg, pipe_ctx->stream_res.dsc->inst); pipe_ctx->stream_res.dsc->funcs->dsc_disable (pipe_ctx->stream_res.dsc); -for (odm_pipe = pipe_ctx->next_odm_pipe; odm_pipe; odm_pipe = odm_pipe->next_odm_pipe) +for (odm_pipe = pipe_ctx->next_odm_pipe; odm_pipe; odm_pipe = odm_pipe->next_odm_pipe) { +if (dccg->funcs->set_ref_dscclk) + dccg->funcs->set_ref_dscclk (dccg, odm_pipe->stream_res.dsc->inst); odm_pipe->stream_res.dsc->funcs->dsc_disable (odm_pipe->stream_res.dsc); + } } }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 179/353 drm/drm_file: fix use of uninitialized variable
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomi Valkeinen <[email protected]>
[ Upstream commit 1d3062fad9c7313fff9970a88e0538a24480ffb8 ]
smatch reports:
drivers/gpu/drm/drm_file.c:967 drm_show_memory_stats() error: uninitialized symbol 'supported_status'.
'supported_status' is only set in one code path. I'm not familiar with the code to say if that path will always be ran in real life, but whether that is the case or not, I think it is good to initialize 'supported_status' to 0 to silence the warning (and possibly fix a bug).
--- drivers/gpu/drm/drm_file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/drm_file.c +1 -1
@@ -958,7 +958,7 @@ void drm_show_memory_stats(struct drm_printer *p, struct drm_file *file) {struct drm_gem_object *obj;struct drm_memory_stats status = {}; -enum drm_gem_object_status supported_status; +enum drm_gem_object_status supported_status =0 ;int id;spin_lock (&file->table_lock);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 180/353 drm/framebuffer: Fix use of uninitialized variable
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomi Valkeinen <[email protected]>
[ Upstream commit f9af8f0c1dc567a5a6a6318ff324c45d80d4a60f ]
smatch reports:
drivers/gpu/drm/drm_framebuffer.c:654 drm_mode_getfb2_ioctl() error: uninitialized symbol 'ret'.
'ret' is possibly not set when there are no errors, causing the error above. I can't say if that ever happens in real-life, but in any case I think it is good to initialize 'ret' to 0.
--- drivers/gpu/drm/drm_framebuffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/drm_framebuffer.c +1 -1
@@ -552,7 +552,7 @@ int drm_mode_getfb2_ioctl(struct drm_device *dev,struct drm_mode_fb_cmd2 *r = data;struct drm_framebuffer *fb;unsigned int i; -int ret; +int ret =0 ;if (!drm_core_check_feature (dev,DRIVER_MODESET ))return -EINVAL ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 181/353 drm/mipi-dsi: Fix detach call without attach
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomi Valkeinen <[email protected]>
[ Upstream commit 90d50b8d85834e73536fdccd5aa913b30494fef0 ]
It's been reported that DSI host driver's detach can be called without the attach ever happening:
https://lore.kernel.org/all/[email protected]/
After reading the code, I think this is what happens:
We have a DSI host defined in the device tree and a DSI peripheral under that host (i.e. an i2c device using the DSI as data bus doesn't exhibit this behavior).
The host driver calls mipi_dsi_host_register(), which causes (via a few functions) mipi_dsi_device_add() to be called for the DSI peripheral. So now we have a DSI device under the host, but attach hasn't been called.
Normally the probing of the devices continues, and eventually the DSI peripheral's driver will call mipi_dsi_attach(), attaching the peripheral.
However, if the host driver's probe encounters an error after calling mipi_dsi_host_register(), and before the peripheral has called mipi_dsi_attach(), the host driver will do cleanups and return an error from its probe function. The cleanups include calling mipi_dsi_host_unregister().
mipi_dsi_host_unregister() will call two functions for all its DSI peripheral devices: mipi_dsi_detach() and mipi_dsi_device_unregister(). The latter makes sense, as the device exists, but the former may be wrong as attach has not necessarily been done.
To fix this, track the attached state of the peripheral, and only detach from mipi_dsi_host_unregister() if the peripheral was attached.
Note that I have only tested this with a board with an i2c DSI peripheral, not with a "pure" DSI peripheral.
However, slightly related, the unregister machinery still seems broken. E.g. if the DSI host driver is unbound, it'll detach and unregister the DSI peripherals. After that, when the DSI peripheral driver unbound it'll call detach either directly or using the devm variant, leading to a crash. And probably the driver will crash if it happens, for some reason, to try to send a message via the DSI bus.
But that's another topic.
--- drivers/gpu/drm/drm_mipi_dsi.c | 17 +++++++++++++++-- include/drm/drm_mipi_dsi.h | 2 ++ 2 files changed, 17 insertions(+), 2 deletions(-)
drivers/gpu/drm/drm_mipi_dsi.c +15 -2
@@ -347,7 +347,8 @@ static int mipi_dsi_remove_device_fn(struct device *dev, void *priv) {struct mipi_dsi_device *dsi =to_mipi_dsi_device (dev); -mipi_dsi_detach (dsi); +if (dsi->attached) +mipi_dsi_detach (dsi);mipi_dsi_device_unregister (dsi);return 0 ;
@@ -370,11 +371,18 @@ EXPORT_SYMBOL(mipi_dsi_host_unregister);int mipi_dsi_attach (struct mipi_dsi_device *dsi) {const struct mipi_dsi_host_ops *ops = dsi->host->ops; +int ret;if (!ops || !ops->attach)return -ENOSYS ; -return ops->attach (dsi->host, dsi); + ret = ops->attach (dsi->host, dsi); +if (ret) +return ret; + + dsi->attached = true; + +return 0 ; }EXPORT_SYMBOL (mipi_dsi_attach);
@@ -386,9 +394,14 @@ int mipi_dsi_detach(struct mipi_dsi_device *dsi) {const struct mipi_dsi_host_ops *ops = dsi->host->ops; +if (WARN_ON (!dsi->attached)) +return -EINVAL ; +if (!ops || !ops->detach)return -ENOSYS ; + dsi->attached = false; +return ops->detach (dsi->host, dsi); }EXPORT_SYMBOL (mipi_dsi_detach);
include/drm/drm_mipi_dsi.h +2 -0
@@ -168,6 +168,7 @@ struct mipi_dsi_device_info {* struct mipi_dsi_device - DSI peripheral device * @host: DSI host for this peripheral * @dev: driver model device node for this peripheral +* @attached: the DSI device has been successfully attached * @name: DSI peripheral chip type * @channel: virtual channel assigned to the peripheral * @format: pixel format for video mode
@@ -184,6 +185,7 @@ struct mipi_dsi_device_info {struct mipi_dsi_device {struct mipi_dsi_host *host;struct device dev; +bool attached;char name[DSI_DEV_NAME_SIZE ];unsigned int channel;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 182/353 media: stk1160: Fixed high volume of stk1160_dbg messages
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ghanshyam Agrawal <[email protected]>
[ Upstream commit b3695e86d25aafbe175dd51f6aaf6f68d341d590 ]
The function stk1160_dbg gets called too many times, which causes the output to get flooded with messages. Since stk1160_dbg uses printk, it is now replaced with printk_ratelimited.
--- drivers/media/usb/stk1160/stk1160-video.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/media/usb/stk1160/stk1160-video.c +2 -3
@@ -107,8 +107,7 @@ void stk1160_copy_video(struct stk1160 *dev, u8 *src, int len)/* * TODO: These stk1160_dbg are very spammy! -* We should 1) check why we are getting them -* and 2) add ratelimit. +* We should check why we are getting them. * * UPDATE: One of the reasons (the only one?) for getting these * is incorrect standard (mismatch between expected and configured).
@@ -151,7 +150,7 @@ void stk1160_copy_video(struct stk1160 *dev, u8 *src, int len)/* Let the bug hunt begin! sanity checks! */ if (lencopy <0 ) { -stk1160_dbg ("copy skipped: negative lencopy\n" ); +printk_ratelimited (KERN_DEBUG "copy skipped: negative lencopy\n" );return ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 183/353 media: rockchip: rga: fix swizzling for RGB formats
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Tretter <[email protected]>
[ Upstream commit 9e7dc39260edac180c206bb6149595a40eabae3e ]
When using 32 bit RGB formats, the RGA on the rk3568 produces wrong colors as the wrong color channels are read or written. The reason is that the format description for the channel swizzeling is wrong and the wrong bits are configured. For example, when converting ARGB32 to NV12, the alpha channel is used as blue channel.. This doesn't happen if the color format is the same on both sides.
Fix the color_swap settings of the formats to correctly handle 32 bit RGB formats.
For RGA_COLOR_FMT_XBGR8888, the RGA_COLOR_ALPHA_SWAP bit doesn't have an effect. Thus, it isn't possible to handle the V4L2_PIX_FMT_XRGB32. Thus, it is removed from the list of supported formats.
--- drivers/media/platform/rockchip/rga/rga.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-)
drivers/media/platform/rockchip/rga/rga.c +3 -12
@@ -184,25 +184,16 @@ static int rga_setup_ctrls(struct rga_ctx *ctx)static struct rga_fmt formats[] = { { .fourcc =V4L2_PIX_FMT_ARGB32 , - .color_swap =RGA_COLOR_RB_SWAP , + .color_swap =RGA_COLOR_ALPHA_SWAP , .hw_format =RGA_COLOR_FMT_ABGR8888 , .depth =32 , .uv_factor =1 , .y_div =1 , .x_div =1 , }, - { - .fourcc =V4L2_PIX_FMT_XRGB32 , - .color_swap =RGA_COLOR_RB_SWAP , - .hw_format =RGA_COLOR_FMT_XBGR8888 , - .depth =32 , - .uv_factor =1 , - .y_div =1 , - .x_div =1 , - }, { .fourcc =V4L2_PIX_FMT_ABGR32 , - .color_swap =RGA_COLOR_ALPHA_SWAP , + .color_swap =RGA_COLOR_RB_SWAP , .hw_format =RGA_COLOR_FMT_ABGR8888 , .depth =32 , .uv_factor =1 ,
@@ -211,7 +202,7 @@ static struct rga_fmt formats[] = { }, { .fourcc = V4L2_PIX_FMT_XBGR32, - .color_swap = RGA_COLOR_ALPHA_SWAP, + .color_swap = RGA_COLOR_RB_SWAP, .hw_format = RGA_COLOR_FMT_XBGR8888, .depth = 32, .uv_factor = 1,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 184/353 PCI: add INTEL_HDA_ARL to pci_ids.h
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pierre-Louis Bossart <[email protected]>
[ Upstream commit 5ec42bf04d72fd6d0a6855810cc779e0ee31dfd7 ]
The PCI ID insertion follows the increasing order in the table, but this hardware follows MTL (MeteorLake).
--- include/linux/pci_ids.h | 1 + 1 file changed, 1 insertion(+)
include/linux/pci_ids.h +1 -0
@@ -3065,6 +3065,7 @@#define PCI_DEVICE_ID_INTEL_82443GX_0 0x71a0#define PCI_DEVICE_ID_INTEL_82443GX_2 0x71a2#define PCI_DEVICE_ID_INTEL_82372FB_1 0x7601 +#define PCI_DEVICE_ID_INTEL_HDA_ARL 0x7728#define PCI_DEVICE_ID_INTEL_HDA_RPL_S 0x7a50#define PCI_DEVICE_ID_INTEL_HDA_ADL_S 0x7ad0#define PCI_DEVICE_ID_INTEL_HDA_MTL 0x7e28
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 185/353 ALSA: hda: Intel: add HDA_ARL PCI ID support
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pierre-Louis Bossart <[email protected]>
[ Upstream commit a31014ebad617868c246d3985ff80d891f03711e ]
Yet another PCI ID.
--- sound/pci/hda/hda_intel.c | 2 ++ 1 file changed, 2 insertions(+)
sound/pci/hda/hda_intel.c +2 -0
@@ -2504,6 +2504,8 @@ static const struct pci_device_id azx_ids[] = { { PCI_DEVICE_DATA(INTEL, HDA_LNL_P, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },/* Arrow Lake-S */ { PCI_DEVICE_DATA(INTEL, HDA_ARL_S, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) }, +/* Arrow Lake */ + { PCI_DEVICE_DATA(INTEL, HDA_ARL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },/* Apollolake (Broxton-P) */ { PCI_DEVICE_DATA(INTEL, HDA_APL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON) },/* Gemini-Lake */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 186/353 ALSA: hda: intel-dspcfg: add filters for ARL-S and ARL
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pierre-Louis Bossart <[email protected]>
[ Upstream commit 7a9d6bbe8a663c817080be55d9fecf19a4a8fd8f ]
Same usual filters, SOF is required for DMIC and/or SoundWire support.
--- sound/hda/intel-dsp-config.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
sound/hda/intel-dsp-config.c +10 -0
@@ -521,6 +521,16 @@ static const struct config_entry config_table[] = { .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, .device = PCI_DEVICE_ID_INTEL_HDA_MTL, }, + /* ArrowLake-S */ + { + .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, + .device = PCI_DEVICE_ID_INTEL_HDA_ARL_S, + }, + /* ArrowLake */ + { + .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, + .device = PCI_DEVICE_ID_INTEL_HDA_ARL, + }, #endif /* Lunar Lake */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 187/353 drm/msm/dp: Add DisplayPort controller for SM8650
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Neil Armstrong <[email protected]>
[ Upstream commit 1b2d98bdd7b7c64265732f5f0dace4c52c9ba8a8 ]
The Qualcomm SM8650 platform comes with a DisplayPort controller with a different base offset than the previous SM8550 SoC, add support for this in the DisplayPort driver.
Patchwork: https://patchwork.freedesktop.org/patch/571132/
--- drivers/gpu/drm/msm/dp/dp_display.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/msm/dp/dp_display.c +6 -0
@@ -170,6 +170,11 @@ static const struct msm_dp_desc sm8350_dp_descs[] = { {} }; +static const struct msm_dp_desc sm8650_dp_descs[] = { + { .io_start =0x0af54000 , .id =MSM_DP_CONTROLLER_0 , .connector_type = DRM_MODE_CONNECTOR_DisplayPort }, + {} +}; +static const struct of_device_id dp_dt_match[] = { { .compatible ="qcom,sc7180-dp" , .data = &sc7180_dp_descs }, { .compatible ="qcom,sc7280-dp" , .data = &sc7280_dp_descs },
@@ -180,6 +185,7 @@ static const struct of_device_id dp_dt_match[] = { { .compatible = "qcom,sc8280xp-edp", .data = &sc8280xp_edp_descs }, { .compatible = "qcom,sdm845-dp", .data = &sc7180_dp_descs }, { .compatible = "qcom,sm8350-dp", .data = &sm8350_dp_descs }, + { .compatible = "qcom,sm8650-dp", .data = &sm8650_dp_descs }, {} };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 188/353 media: uvcvideo: Fix power line control for a Chicony camera
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ricardo Ribalda <[email protected]>
[ Upstream commit dba3e701917a4cce92920f8ccb9fa4d4ee5ac07e ]
The device does not implement the control properly.
Fixes v4l2-compliance error:
info: checking control 'Power Line Frequency' (0x00980918)
fail: v4l2-test-controls.cpp(552): could not set valid menu item 3
--- drivers/media/usb/uvc/uvc_driver.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/media/usb/uvc/uvc_driver.c +9 -0
@@ -2592,6 +2592,15 @@ static const struct usb_device_id uvc_ids[] = { .bInterfaceSubClass = 1, .bInterfaceProtocol = 0, .driver_info = (kernel_ulong_t)&uvc_ctrl_power_line_limited }, +/* Chicony Electronics Co., Ltd Integrated Camera */ + { .match_flags = USB_DEVICE_ID_MATCH_DEVICE + | USB_DEVICE_ID_MATCH_INT_INFO, + .idVendor = 0x04f2, + .idProduct = 0xb67c, + .bInterfaceClass = USB_CLASS_VIDEO, + .bInterfaceSubClass = 1, + .bInterfaceProtocol = UVC_PC_PROTOCOL_15, + .driver_info = (kernel_ulong_t)&uvc_ctrl_power_line_uvc11 },/* Chicony EasyCamera */ { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 189/353 media: uvcvideo: Fix power line control for SunplusIT camera
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ricardo Ribalda <[email protected]>
[ Upstream commit 6180056b0e0c097dad5d1569dcd661eaf509ea43 ]
The device does not implement the power line frequency control correctly. It is a UVC 1.5 device, but implements the control as a UVC 1.1 device.
Add the corresponding control mapping override.
Bus 003 Device 002: ID 2b7e:b752 SunplusIT Inc HD Camera Device Descriptor:
bLength 18
bDescriptorType 1
bcdUSB 2.01
bDeviceClass 239 Miscellaneous Device
bDeviceSubClass 2
bDeviceProtocol 1 Interface Association
bMaxPacketSize0 64
idVendor 0x2b7e
idProduct 0xb752
bcdDevice 0.04
iManufacturer 1 SunplusIT Inc iProduct 2 HD Camera iSerial 3 01.00.00 bNumConfigurations 1
--- drivers/media/usb/uvc/uvc_driver.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/media/usb/uvc/uvc_driver.c +9 -0
@@ -3003,6 +3003,15 @@ static const struct usb_device_id uvc_ids[] = { .bInterfaceSubClass = 1, .bInterfaceProtocol = 0, .driver_info = UVC_INFO_QUIRK(UVC_QUIRK_FORCE_BPP) }, +/* SunplusIT Inc HD Camera */ + { .match_flags = USB_DEVICE_ID_MATCH_DEVICE + | USB_DEVICE_ID_MATCH_INT_INFO, + .idVendor = 0x2b7e, + .idProduct = 0xb752, + .bInterfaceClass = USB_CLASS_VIDEO, + .bInterfaceSubClass = 1, + .bInterfaceProtocol = UVC_PC_PROTOCOL_15, + .driver_info = (kernel_ulong_t)&uvc_ctrl_power_line_uvc11 },/* Lenovo Integrated Camera */ { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 190/353 media: rkisp1: Drop IRQF_SHARED
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomi Valkeinen <[email protected]>
[ Upstream commit 85d2a31fe4d9be1555f621ead7a520d8791e0f74 ]
In all known platforms the ISP has dedicated IRQ lines, but for some reason the driver uses IRQF_SHARED.
Supporting IRQF_SHARED properly requires handling interrupts even when our device is disabled, and the driver does not handle this. To avoid adding such code, and to be sure the driver won't accidentally be used in a platform with shared interrupts, let's drop the IRQF_SHARED flag.
--- drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c +1 -1
@@ -542,7 +542,7 @@ static int rkisp1_probe(struct platform_device *pdev)if (irq <0 )return irq; - ret =devm_request_irq (dev, irq, info->isrs[i].isr,IRQF_SHARED , + ret =devm_request_irq (dev, irq, info->isrs[i].isr,0 ,dev_driver_string (dev), dev);if (ret) {dev_err (dev,"request irq failed: %d\n" , ret);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 191/353 media: rkisp1: Fix IRQ handler return values
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomi Valkeinen <[email protected]>
[ Upstream commit 3eb7910e1b16a2c136be26a8380f21469225b2f6 ]
The IRQ handler rkisp1_isr() calls sub-handlers, all of which returns an irqreturn_t value, but rkisp1_isr() ignores those values and always returns IRQ_HANDLED.
Fix this by collecting the return values, and returning IRQ_HANDLED or IRQ_NONE as appropriate.
--- .../media/platform/rockchip/rkisp1/rkisp1-dev.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c +12 -4
@@ -442,17 +442,25 @@ static int rkisp1_entities_register(struct rkisp1_device *rkisp1)static irqreturn_t rkisp1_isr (int irq,void *ctx) { +irqreturn_t ret =IRQ_NONE ; +/* * Call rkisp1_capture_isr() first to handle the frame that * potentially completed using the current frame_sequence number before * it is potentially incremented by rkisp1_isp_isr() in the vertical * sync. */ -rkisp1_capture_isr (irq, ctx); -rkisp1_isp_isr (irq, ctx); -rkisp1_csi_isr (irq, ctx); -return IRQ_HANDLED ; +if (rkisp1_capture_isr (irq, ctx) ==IRQ_HANDLED ) + ret =IRQ_HANDLED ; + +if (rkisp1_isp_isr (irq, ctx) ==IRQ_HANDLED ) + ret =IRQ_HANDLED ; + +if (rkisp1_csi_isr (irq, ctx) ==IRQ_HANDLED ) + ret =IRQ_HANDLED ; + +return ret; }static const char *const px30_isp_clks[] = {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 192/353 media: rkisp1: Store IRQ lines
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomi Valkeinen <[email protected]>
[ Upstream commit 0753874617de883c6d4da903142f334f76a75d70 ]
Store the IRQ lines used by the driver for easy access. These are needed in future patches which fix IRQ race issues.
--- .../platform/rockchip/rkisp1/rkisp1-common.h | 11 ++++++++++- .../media/platform/rockchip/rkisp1/rkisp1-dev.c | 17 +++++++++++++---- 2 files changed, 23 insertions(+), 5 deletions(-)
drivers/media/platform/rockchip/rkisp1/rkisp1-common.h +10 -1
@@ -61,6 +61,14 @@ struct dentry; RKISP1_CIF_ISP_EXP_END | \ RKISP1_CIF_ISP_HIST_MEASURE_RDY) +/* IRQ lines */ +enum rkisp1_irq_line { +RKISP1_IRQ_ISP =0 , +RKISP1_IRQ_MI , +RKISP1_IRQ_MIPI , +RKISP1_NUM_IRQS , +}; +/* enum for the resizer pads */ enum rkisp1_rsz_pad {RKISP1_RSZ_PAD_SINK ,
@@ -423,7 +431,6 @@ struct rkisp1_debug {* struct rkisp1_device - ISP platform device * * @base_addr: base register address -* @irq: the irq number * @dev: a pointer to the struct device * @clk_size: number of clocks * @clks: array of clocks
@@ -441,6 +448,7 @@ struct rkisp1_debug {* @stream_lock: serializes {start/stop}_streaming callbacks between the capture devices. * @debug: debug params to be exposed on debugfs * @info: version-specific ISP information +* @irqs: IRQ line numbers */ struct rkisp1_device {void __iomem *base_addr;
@@ -461,6 +469,7 @@ struct rkisp1_device {struct mutex stream_lock;/* serialize {start/stop}_streaming cb between capture devices */ struct rkisp1_debug debug;const struct rkisp1_info *info; +int irqs[RKISP1_NUM_IRQS ]; };/*
drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c +13 -4
@@ -114,6 +114,7 @@struct rkisp1_isr_data {const char *name;irqreturn_t (*isr)(int irq,void *ctx); +u32 line_mask; };/* ----------------------------------------------------------------------------
@@ -471,9 +472,9 @@ static const char * const px30_isp_clks[] = { };static const struct rkisp1_isr_data px30_isp_isrs[] = { - {"isp" , rkisp1_isp_isr }, - {"mi" , rkisp1_capture_isr }, - {"mipi" , rkisp1_csi_isr }, + {"isp" , rkisp1_isp_isr,BIT (RKISP1_IRQ_ISP ) }, + {"mi" , rkisp1_capture_isr,BIT (RKISP1_IRQ_MI ) }, + {"mipi" , rkisp1_csi_isr,BIT (RKISP1_IRQ_MIPI ) }, };static const struct rkisp1_info px30_isp_info = {
@@ -492,7 +493,7 @@ static const char * const rk3399_isp_clks[] = { };static const struct rkisp1_isr_data rk3399_isp_isrs[] = { - {NULL , rkisp1_isr }, + {NULL , rkisp1_isr,BIT (RKISP1_IRQ_ISP ) |BIT (RKISP1_IRQ_MI ) |BIT (RKISP1_IRQ_MIPI ) }, };static const struct rkisp1_info rk3399_isp_info = {
@@ -543,6 +544,9 @@ static int rkisp1_probe(struct platform_device *pdev)if (IS_ERR (rkisp1->base_addr))return PTR_ERR (rkisp1->base_addr); +for (unsigned int il =0 ; il <ARRAY_SIZE (rkisp1->irqs); ++il) + rkisp1->irqs[il] =-1 ; +for (i =0 ; i < info->isr_size; i++) { irq = info->isrs[i].name ? platform_get_irq_byname(pdev, info->isrs[i].name)
@@ -550,6 +554,11 @@ static int rkisp1_probe(struct platform_device *pdev)if (irq <0 )return irq; +for (unsigned int il =0 ; il <ARRAY_SIZE (rkisp1->irqs); ++il) { +if (info->isrs[i].line_mask &BIT (il)) + rkisp1->irqs[il] = irq; + } + ret =devm_request_irq (dev, irq, info->isrs[i].isr,0 ,dev_driver_string (dev), dev);if (ret) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 193/353 media: rkisp1: Fix IRQ disable race issue
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomi Valkeinen <[email protected]>
[ Upstream commit 870565f063a58576e8a4529f122cac4325c6b395 ]
In rkisp1_isp_stop() and rkisp1_csi_disable() the driver masks the interrupts and then apparently assumes that the interrupt handler won't be running, and proceeds in the stop procedure. This is not the case, as the interrupt handler can already be running, which would lead to the ISP being disabled while the interrupt handler handling a captured frame.
This brings up two issues: 1) the ISP could be powered off while the interrupt handler is still running and accessing registers, leading to board lockup, and 2) the interrupt handler code and the code that disables the streaming might do things that conflict.
It is not clear to me if 2) causes a real issue, but 1) can be seen with a suitable delay (or printk in my case) in the interrupt handler, leading to board lockup.
--- .../platform/rockchip/rkisp1/rkisp1-csi.c | 14 ++++++++++++- .../platform/rockchip/rkisp1/rkisp1-isp.c | 20 ++++++++++++++++--- 2 files changed, 30 insertions(+), 4 deletions(-)
drivers/media/platform/rockchip/rkisp1/rkisp1-csi.c +13 -1
@@ -125,8 +125,20 @@ static void rkisp1_csi_disable(struct rkisp1_csi *csi)struct rkisp1_device *rkisp1 = csi->rkisp1;u32 val; -/* Mask and clear interrupts. */ +/* Mask MIPI interrupts. */ rkisp1_write (rkisp1,RKISP1_CIF_MIPI_IMSC ,0 ); + +/* Flush posted writes */ +rkisp1_read (rkisp1,RKISP1_CIF_MIPI_IMSC ); + +/* +* Wait until the IRQ handler has ended. The IRQ handler may get called +* even after this, but it will return immediately as the MIPI +* interrupts have been masked. +*/ +synchronize_irq (rkisp1->irqs[RKISP1_IRQ_MIPI ]); + +/* Clear MIPI interrupt status */ rkisp1_write (rkisp1,RKISP1_CIF_MIPI_ICR , ~0 ); val =rkisp1_read (rkisp1,RKISP1_CIF_MIPI_CTRL );
drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c +17 -3
@@ -254,11 +254,25 @@ static void rkisp1_isp_stop(struct rkisp1_isp *isp)* ISP(mi) stop in mi frame end -> Stop ISP(mipi) -> * Stop ISP(isp) ->wait for ISP isp off */ -/* stop and clear MI and ISP interrupts */ -rkisp1_write (rkisp1,RKISP1_CIF_ISP_IMSC ,0 ); -rkisp1_write (rkisp1,RKISP1_CIF_ISP_ICR , ~0 ); +/* Mask MI and ISP interrupts */ +rkisp1_write (rkisp1,RKISP1_CIF_ISP_IMSC ,0 );rkisp1_write (rkisp1,RKISP1_CIF_MI_IMSC ,0 ); + +/* Flush posted writes */ +rkisp1_read (rkisp1,RKISP1_CIF_MI_IMSC ); + +/* +* Wait until the IRQ handler has ended. The IRQ handler may get called +* even after this, but it will return immediately as the MI and ISP +* interrupts have been masked. +*/ +synchronize_irq (rkisp1->irqs[RKISP1_IRQ_ISP ]); +if (rkisp1->irqs[RKISP1_IRQ_ISP ] != rkisp1->irqs[RKISP1_IRQ_MI ]) +synchronize_irq (rkisp1->irqs[RKISP1_IRQ_MI ]); + +/* Clear MI and ISP interrupt status */ +rkisp1_write (rkisp1,RKISP1_CIF_ISP_ICR , ~0 );rkisp1_write (rkisp1,RKISP1_CIF_MI_ICR , ~0 );/* stop ISP */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 194/353 media: rkisp1: resizer: Stop manual allocation of v4l2_subdev_state
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Laurent Pinchart <[email protected]>
[ Upstream commit efa28efd9cba015f8c3d88123527c3c3cfcd13d0 ]
Supported media bus codes on the resizer sink pad are identical to the ISP source pad. The .enum_mbus_code() handler thus delegates the enumeration to the ISP's operation. This is problematic for two reasons:
- Format enumeration on the ISP source pad is dependent on the format configured on the ISP sink pad for the same subdev state (TRY or ACTIVE), while format enumeration on the resizer sink pad should return all formats supported by the resizer subdev, regardless of the ISP configuration.
- Delegating the operation involves creating a fake v4l2_subdev_state on the stack to pass to the ISP .enum_mbus_code() handler. This gets in the way of evolution of both the ISP enumeration handler and, more generally, the V4L2 subdev state infrastructure.
Fix those two issues by implementing format enumeration manually for the resizer.
--- .../platform/rockchip/rkisp1/rkisp1-resizer.c | 38 ++++++++++++------- 1 file changed, 24 insertions(+), 14 deletions(-)
drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c +24 -14
@@ -335,12 +335,8 @@ static int rkisp1_rsz_enum_mbus_code(struct v4l2_subdev *sd, {struct rkisp1_resizer *rsz = container_of(sd, struct rkisp1_resizer, sd); -struct v4l2_subdev_pad_config dummy_cfg; -struct v4l2_subdev_state pad_state = { - .pads = &dummy_cfg - }; -u32 pad = code->pad; -int ret; +unsigned int index = code->index; +unsigned int i;if (code->pad ==RKISP1_RSZ_PAD_SRC ) {/* supported mbus codes on the src are the same as in the capture */
@@ -360,15 +356,29 @@ static int rkisp1_rsz_enum_mbus_code(struct v4l2_subdev *sd,return 0 ; } -/* supported mbus codes on the sink pad are the same as isp src pad */ - code->pad =RKISP1_ISP_PAD_SOURCE_VIDEO ; - ret =v4l2_subdev_call (&rsz->rkisp1->isp.sd, pad, enum_mbus_code, - &pad_state, code); +/* +* Supported mbus codes on the sink pad are the same as on the ISP +* source pad. +*/ +for (i =0 ; ; i++) { +const struct rkisp1_mbus_info *fmt = +rkisp1_mbus_info_get_by_index (i); -/* restore pad */ - code->pad = pad; - code->flags =0 ; -return ret; +if (!fmt) +break ; + +if (!(fmt->direction &RKISP1_ISP_SD_SRC )) +continue ; + +if (!index) { + code->code = fmt->mbus_code; +return 0 ; + } + + index--; + } + +return -EINVAL ; } static int rkisp1_rsz_init_config(struct v4l2_subdev *sd,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 195/353 hwmon: (nct6775) Fix fan speed set failure in automatic mode
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xing Tong Wu <[email protected]>
[ Upstream commit 8b3800256abad20e91c2698607f9b28591407b19 ]
Setting the fan speed is only valid in manual mode; it is not possible to set the fan's speed in automatic mode.
Return error when attempting to set the fan speed in automatic mode.
--- drivers/hwmon/nct6775-core.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/hwmon/nct6775-core.c +7 -0
@@ -2553,6 +2553,13 @@ store_pwm(struct device *dev, struct device_attribute *attr, const char *buf,int err;u16 reg; +/* +* The fan control mode should be set to manual if the user wants to adjust +* the fan speed. Otherwise, it will fail to set. +*/ +if (index ==0 && data->pwm_enable[nr] > manual) +return -EBUSY ; + err =kstrtoul (buf,10 , &val);if (err <0 )return err;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 196/353 hwmon: (hp-wmi-sensors) Fix failure to load on EliteDesk 800 G6
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: James Seo <[email protected]>
[ Upstream commit c9ba592580947b81f33f514320aeef02ddc001fd ]
The EliteDesk 800 G6 stores a raw WMI string within the ACPI object in its BIOS corresponding to one instance of HPBIOS_PlatformEvents.Name. This is evidently a valid way of representing a WMI data item as far as the Microsoft ACPI-WMI mapper is concerned, but is preventing the driver from loading.
This seems quite rare, but add support for such strings. Treating this as a quirk pretty much means adding that support anyway.
Also clean up an oversight in update_numeric_sensor_from_wobj() in which the result of hp_wmi_strdup() was being used without error checking.
--- drivers/hwmon/hp-wmi-sensors.c | 127 ++++++++++++++++++++++++++++----- 1 file changed, 111 insertions(+), 16 deletions(-)
drivers/hwmon/hp-wmi-sensors.c +111 -16
@@ -17,6 +17,8 @@* Available: https://github.com/linuxhw/ACPI * [4] P. Rohár, "bmfdec - Decompile binary MOF file (BMF) from WMI buffer", * 2017. [Online]. Available: https://github.com/pali/bmfdec +* [5] Microsoft Corporation, "Driver-Defined WMI Data Items", 2017. [Online]. +* Available: https://learn.microsoft.com/en-us/windows-hardware/drivers/kernel/driver-defined-wmi-data-items */ #include <linux/acpi.h>
@@ -24,6 +26,7 @@#include <linux/hwmon.h> #include <linux/jiffies.h> #include <linux/mutex.h> +#include <linux/nls.h> #include <linux/units.h> #include <linux/wmi.h>
@@ -395,6 +398,50 @@ struct hp_wmi_sensors {struct mutex lock;/* Lock polling WMI and driver state changes. */ }; +static bool is_raw_wmi_string (const u8 *pointer,u32 length) +{ +const u16 *ptr; +u16 len; + +/* WMI strings are length-prefixed UTF-16 [5]. */ +if (length <=sizeof (*ptr)) +return false; + + length -=sizeof (*ptr); + ptr = (const u16 *)pointer; + len = *ptr; + +return len <= length && !(len &1 ); +} + +static char *convert_raw_wmi_string (const u8 *buf) +{ +const wchar_t *src; +unsigned int cps; +unsigned int len; +char *dst; +int i; + + src = (const wchar_t *)buf; + +/* Count UTF-16 code points. Exclude trailing null padding. */ + cps = *src /sizeof (*src); +while (cps && !src[cps]) + cps--; + +/* Each code point becomes up to 3 UTF-8 characters. */ + len =min (cps *3 ,HP_WMI_MAX_STR_SIZE -1 ); + + dst =kmalloc ((len +1 ) *sizeof (*dst),GFP_KERNEL ); +if (!dst) +return NULL ; + + i =utf16s_to_utf8s (++src, cps,UTF16_LITTLE_ENDIAN , dst, len); + dst[i] ='\0' ; + +return dst; +} +/* hp_wmi_strdup - devm_kstrdup, but length-limited */ static char *hp_wmi_strdup (struct device *dev,const char *src) {
@@ -412,6 +459,23 @@ static char *hp_wmi_strdup(struct device *dev, const char *src)return dst; } +/* hp_wmi_wstrdup - hp_wmi_strdup, but for a raw WMI string */ +static char *hp_wmi_wstrdup (struct device *dev,const u8 *buf) +{ +char *src; +char *dst; + + src =convert_raw_wmi_string (buf); +if (!src) +return NULL ; + + dst =hp_wmi_strdup (dev,strim (src));/* Note: Copy is trimmed. */ + +kfree (src); + +return dst; +} +/* * hp_wmi_get_wobj - poll WMI for a WMI object instance * @guid: WMI object GUID
@@ -462,8 +526,14 @@ static int check_wobj(const union acpi_object *wobj,for (prop =0 ; prop <= last_prop; prop++) { type = elements[prop].type; valid_type = property_map[prop]; -if (type != valid_type) +if (type != valid_type) { +if (type ==ACPI_TYPE_BUFFER && + valid_type ==ACPI_TYPE_STRING && +is_raw_wmi_string (elements[prop].buffer.pointer, + elements[prop].buffer.length)) +continue ;return -EINVAL ; + } }return 0 ;
@@ -480,7 +550,9 @@ static int extract_acpi_value(struct device *dev,break ;case ACPI_TYPE_STRING : - *out_string =hp_wmi_strdup (dev,strim (element->string.pointer)); + *out_string = element->type ==ACPI_TYPE_BUFFER ? +hp_wmi_wstrdup (dev, element->buffer.pointer) : +hp_wmi_strdup (dev,strim (element->string.pointer));if (!*out_string)return -ENOMEM ;break ;
@@ -861,7 +933,9 @@ update_numeric_sensor_from_wobj(struct device *dev, {const union acpi_object *elements;const union acpi_object *element; -const char *string; +const char *new_string; +char *trimmed; +char *string;bool is_new;int offset;u8 size;
@@ -885,11 +959,21 @@ update_numeric_sensor_from_wobj(struct device *dev, offset = is_new ? size -1 :-2 ; element = &elements[HP_WMI_PROPERTY_CURRENT_STATE + offset]; - string =strim (element->string.pointer); - -if (strcmp (string, nsensor->current_state)) { -devm_kfree (dev, nsensor->current_state); - nsensor->current_state =hp_wmi_strdup (dev, string); + string = element->type ==ACPI_TYPE_BUFFER ? +convert_raw_wmi_string (element->buffer.pointer) : + element->string.pointer; + +if (string) { + trimmed =strim (string); +if (strcmp (trimmed, nsensor->current_state)) { + new_string =hp_wmi_strdup (dev, trimmed); +if (new_string) { +devm_kfree (dev, nsensor->current_state); + nsensor->current_state = new_string; + } + } +if (element->type ==ACPI_TYPE_BUFFER ) +kfree (string); }/* Old variant: -2 (not -1) because it lacks the Size property. */
@@ -996,11 +1080,15 @@ static int check_event_wobj(const union acpi_object *wobj) HP_WMI_EVENT_PROPERTY_STATUS); } -static int populate_event_from_wobj (struct hp_wmi_event *event, +static int populate_event_from_wobj (struct device *dev, +struct hp_wmi_event *event,union acpi_object *wobj) {int prop =HP_WMI_EVENT_PROPERTY_NAME ;union acpi_object *element; +acpi_object_type type; +char *string; +u32 value;int err; err =check_event_wobj (wobj);
@@ -1009,20 +1097,24 @@ static int populate_event_from_wobj(struct hp_wmi_event *event, element = wobj->package.elements; -/* Extracted strings are NOT device-managed copies. */ -for (; prop <=HP_WMI_EVENT_PROPERTY_CATEGORY ; prop++, element++) { + type = hp_wmi_event_property_map[prop]; + + err =extract_acpi_value (dev, element, type, &value, &string); +if (err) +return err; +switch (prop) {case HP_WMI_EVENT_PROPERTY_NAME : - event->name =strim (element->string.pointer); + event->name = string;break ;case HP_WMI_EVENT_PROPERTY_DESCRIPTION : - event->description =strim (element->string.pointer); + event->description = string;break ;case HP_WMI_EVENT_PROPERTY_CATEGORY : - event->category = element->integer.value; + event->category = value;break ;default :
@@ -1511,8 +1603,8 @@ static void hp_wmi_notify(u32 value, void *context)struct acpi_buffer out = {ACPI_ALLOCATE_BUFFER ,NULL };struct hp_wmi_sensors *state = context;struct device *dev = &state->wdev->dev; +struct hp_wmi_event event = {};struct hp_wmi_info *fan_info; -struct hp_wmi_event event;union acpi_object *wobj;acpi_status err;int event_type;
@@ -1546,7 +1638,7 @@ static void hp_wmi_notify(u32 value, void *context) wobj = out.pointer; - err =populate_event_from_wobj (&event, wobj); + err =populate_event_from_wobj (dev, &event, wobj);if (err) {dev_warn (dev,"Bad event data (ACPI type %d)\n" , wobj->type); goto out_free_wobj;
@@ -1577,6 +1669,9 @@ static void hp_wmi_notify(u32 value, void *context) out_free_wobj:kfree (wobj); +devm_kfree (dev, event.name); +devm_kfree (dev, event.description); + out_unlock:mutex_unlock (&state->lock); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 197/353 f2fs: fix to tag gcing flag on page during block migration
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
[ Upstream commit 4961acdd65c956e97c1a000c82d91a8c1cdbe44b ]
It needs to add missing gcing flag on page during block migration, in order to garantee migrated data be persisted during checkpoint, otherwise out-of-order persistency between data and node may cause data corruption after SPOR.
Similar issue was fixed by commit 2d1fe8a86bf5 ("f2fs: fix to tag gcing flag on page during file defragment").
--- fs/f2fs/compress.c | 4 +++- fs/f2fs/file.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-)
fs/f2fs/compress.c +3 -1
@@ -1036,8 +1036,10 @@ static void set_cluster_dirty(struct compress_ctx *cc)int i;for (i =0 ; i < cc->cluster_size; i++) -if (cc->rpages[i]) +if (cc->rpages[i]) {set_page_dirty (cc->rpages[i]); +set_page_private_gcing (cc->rpages[i]); + } } static int prepare_compress_overwrite(struct compress_ctx *cc,
fs/f2fs/file.c +2 -0
@@ -1317,6 +1317,7 @@ static int __clone_blkaddrs(struct inode *src_inode, struct inode *dst_inode, }memcpy_page (pdst,0 , psrc,0 ,PAGE_SIZE );set_page_dirty (pdst); +set_page_private_gcing (pdst);f2fs_put_page (pdst,1 );f2fs_put_page (psrc,1 );
@@ -4059,6 +4060,7 @@ static int redirty_blocks(struct inode *inode, pgoff_t page_idx, int len)f2fs_bug_on (F2FS_I_SB (inode), !page);set_page_dirty (page); +set_page_private_gcing (page);f2fs_put_page (page,1 );f2fs_put_page (page,0 ); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 198/353 drm/exynos: Call drm_atomic_helper_shutdown() at shutdown/unbind time
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Douglas Anderson <[email protected]>
[ Upstream commit 16ac5b21b31b439f03cdf44c153c5f5af94fb3eb ]
Based on grepping through the source code this driver appears to be missing a call to drm_atomic_helper_shutdown() at system shutdown time and at driver unbind time. Among other things, this means that if a panel is in use that it won't be cleanly powered off at system shutdown time.
The fact that we should call drm_atomic_helper_shutdown() in the case of OS shutdown/restart and at driver remove (or unbind) time comes straight out of the kernel doc "driver instance overview" in drm_drv.c.
A few notes about this fix:
- When adding drm_atomic_helper_shutdown() to the unbind path, I added it after drm_kms_helper_poll_fini() since that's when other drivers seemed to have it.
- Technically with a previous patch, ("drm/atomic-helper:
drm_atomic_helper_shutdown(NULL) should be a noop"), we don't actually need to check to see if our "drm" pointer is NULL before calling drm_atomic_helper_shutdown(). We'll leave the "if" test in, though, so that this patch can land without any dependencies. It could potentially be removed later.
- This patch also makes sure to set the drvdata to NULL in the case of bind errors to make sure that shutdown can't access freed data.
--- drivers/gpu/drm/exynos/exynos_drm_drv.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/gpu/drm/exynos/exynos_drm_drv.c +11 -0
@@ -300,6 +300,7 @@ static int exynos_drm_bind(struct device *dev)drm_mode_config_cleanup (drm);exynos_drm_cleanup_dma (drm);kfree (private); +dev_set_drvdata (dev,NULL ); err_free_drm:drm_dev_put (drm);
@@ -313,6 +314,7 @@ static void exynos_drm_unbind(struct device *dev)drm_dev_unregister (drm);drm_kms_helper_poll_fini (drm); +drm_atomic_helper_shutdown (drm);component_unbind_all (drm->dev, drm);drm_mode_config_cleanup (drm);
@@ -350,9 +352,18 @@ static int exynos_drm_platform_remove(struct platform_device *pdev)return 0 ; } +static void exynos_drm_platform_shutdown (struct platform_device *pdev) +{ +struct drm_device *drm =platform_get_drvdata (pdev); + +if (drm) +drm_atomic_helper_shutdown (drm); +} +static struct platform_driver exynos_drm_platform_driver = { .probe = exynos_drm_platform_probe, .remove = exynos_drm_platform_remove, + .shutdown = exynos_drm_platform_shutdown, .driver = { .name ="exynos-drm" , .pm = &exynos_drm_pm_ops,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 199/353 IB/ipoib: Fix mcast list locking
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Vacek <[email protected]>
[ Upstream commit 4f973e211b3b1c6d36f7c6a19239d258856749f9 ]
Releasing the priv->lock while iterating the priv->multicast_list in ipoib_mcast_join_task() opens a window for ipoib_mcast_dev_flush() to remove the items while in the middle of iteration. If the mcast is removed while the lock was dropped, the for loop spins forever resulting in a hard lockup (as was reported on RHEL 4.18.0-372.75.1.el8_6 kernel):
Task A (kworker/u72:2 below) | Task B (kworker/u72:0 below)
-----------------------------------+-----------------------------------
ipoib_mcast_join_task(work) | ipoib_ib_dev_flush_light(work)
spin_lock_irq(&priv->lock) | __ipoib_ib_dev_flush(priv, ...)
list_for_each_entry(mcast, | ipoib_mcast_dev_flush(dev = priv->dev)
&priv->multicast_list, list) |
ipoib_mcast_join(dev, mcast) |
spin_unlock_irq(&priv->lock) |
| spin_lock_irqsave(&priv->lock, flags)
| list_for_each_entry_safe(mcast, tmcast,
| &priv->multicast_list, list)
| list_del(&mcast->list);
| list_add_tail(&mcast->list, &remove_list)
| spin_unlock_irqrestore(&priv->lock, flags)
spin_lock_irq(&priv->lock) |
| ipoib_mcast_remove_list(&remove_list)
(Here, `mcast` is no longer on the | list_for_each_entry_safe(mcast, tmcast,
`priv->multicast_list` and we keep | remove_list, list)
spinning on the `remove_list` of | >>> wait_for_completion(&mcast->done)
the other thread which is blocked |
and the list is still valid on |it's stack.)
Fix this by keeping the lock held and changing to GFP_ATOMIC to prevent eventual sleeps.
Unfortunately we could not reproduce the lockup and confirm this fix but based on the code review I think this fix should address such lockups.
crash> bc 31
PID: 747 TASK: ff1c6a1a007e8000 CPU: 31 COMMAND: "kworker/u72:2"
--
[exception RIP: ipoib_mcast_join_task+0x1b1]
RIP: ffffffffc0944ac1 RSP: ff646f199a8c7e00 RFLAGS: 00000002
RAX: 0000000000000000 RBX: ff1c6a1a04dc82f8 RCX: 0000000000000000
work (&priv->mcast_task{,.work})
RDX: ff1c6a192d60ac68 RSI: 0000000000000286 RDI: ff1c6a1a04dc8000
&mcast->list
RBP: ff646f199a8c7e90 R8: ff1c699980019420 R9: ff1c6a1920c9a000
R10: ff646f199a8c7e00 R11: ff1c6a191a7d9800 R12: ff1c6a192d60ac00
mcast
R13: ff1c6a1d82200000 R14: ff1c6a1a04dc8000 R15: ff1c6a1a04dc82d8
dev priv (&priv->lock) &priv->multicast_list (aka head)
ORIG_RAX: ffffffffffffffff CS: 0010 SS: 0018--- drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/infiniband/ulp/ipoib/ipoib_multicast.c +1 -5
@@ -531,21 +531,17 @@ static int ipoib_mcast_join(struct net_device *dev, struct ipoib_mcast *mcast)if (test_bit (IPOIB_MCAST_FLAG_SENDONLY , &mcast->flags)) rec.join_state =SENDONLY_FULLMEMBER_JOIN ; } -spin_unlock_irq (&priv->lock); multicast =ib_sa_join_multicast (&ipoib_sa_client, priv->ca, priv->port, - &rec, comp_mask,GFP_KERNEL , + &rec, comp_mask,GFP_ATOMIC , ipoib_mcast_join_complete, mcast); -spin_lock_irq (&priv->lock);if (IS_ERR (multicast)) { ret =PTR_ERR (multicast);ipoib_warn (priv,"ib_sa_join_multicast failed, status %d\n" , ret);/* Requeue this join task with a backoff delay */ __ipoib_mcast_schedule_join_thread (priv, mcast,1 );clear_bit (IPOIB_MCAST_FLAG_BUSY , &mcast->flags); -spin_unlock_irq (&priv->lock);complete (&mcast->done); -spin_lock_irq (&priv->lock);return ret; }return 0 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 200/353 media: amphion: remove mutext lock in condition of wait_event
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ming Qian <[email protected]>
[ Upstream commit f9c8ddce2fe3b767582f299d03fc8fb85943568c ]
mutext_lock should not be called in condition of wait_event, otherwise, when CONFIG_DEBUG_ATOMIC_SLEEP is enabled, we may meet the following warning:
do not call blocking ops when !TASK_RUNNING; state=2
WARNING: CPU: 5 PID: 741 at kernel/sched/core.c:9859 __might_sleep+0x80/0xa4 Hardware name: Freescale i.MX8QM MEK (DT) pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : __might_sleep+0x80/0xa4 lr : __might_sleep+0x80/0xa4 sp : ffffffc0123738a0 x29: ffffffc0123738a0 x28: ffffffc009194c48 x27: ffffffc00bbc1050 x26: ffffff8814b282f0 x25: ffffff8814b280d0 x24: ffffff8814b28080 x23: 0000000000000001 x22: 0000000000000032 x21: ffffffc00bbc1000 x20: 000000000000011b x19: ffffffc009324670 x18: 00000000fffffffd x17: 30303c5b20746120 x16: 74657320323d6574 x15: 617473203b474e49 x14: 00058b5b8b9aa1f1 x13: ffffffc00903cda0 x12: 00000000d744fcc9 x11: 000000000000001c x10: 00000000000009a0 x9 : ffffffc0090201f4 x8 : ffffff8828245000 x7 : 0000000000000001 x6 : 0000000000000001 x5 : 00000000410fd080 x4 : 0000000000000002 x3 : ffffff8815aab4c8 x2 : 0000000000000000 x1 : 0000000000000000 x0 : ffffff8828244600 Call trace: __might_sleep+0x80/0xa4 mutex_lock+0x2c/0x80 sync_session_response+0x110/0x310 vpu_session_send_cmd+0x18c/0x244 vpu_session_start+0x38/0x70 vdec_start_session+0x1b4/0x3e0 vpu_vb2_start_streaming+0xa0/0x1c4 vb2_start_streaming+0x74/0x160 vb2_core_qbuf+0x488/0x650 vb2_qbuf+0x9c/0x100 v4l2_m2m_qbuf+0x7c/0x224 v4l2_m2m_ioctl_qbuf+0x20/0x2c v4l_qbuf+0x50/0x6c __video_do_ioctl+0x174/0x3f0 video_usercopy+0x210/0x7cc video_ioctl2+0x20/0x30 v4l2_ioctl+0x48/0x6c
we need to refine check_is_responsed() to remove the mutext_lock, each cmd has a monotonically increasing id, and cmds are executed sequentially, so we can check the id of the last reponsed cmd, then determine whether a command has been responded or not.
--- drivers/media/platform/amphion/vpu.h | 3 ++- drivers/media/platform/amphion/vpu_cmds.c | 28 ++++++++--------------- drivers/media/platform/amphion/vpu_v4l2.c | 1 + 3 files changed, 12 insertions(+), 20 deletions(-)
drivers/media/platform/amphion/vpu.h +2 -1
@@ -154,7 +154,6 @@ struct vpu_core {struct vpu_mbox tx_type;struct vpu_mbox tx_data;struct vpu_mbox rx; -unsigned long cmd_seq;wait_queue_head_t ack_wq;struct completion cmp;
@@ -253,6 +252,8 @@ struct vpu_inst {struct list_head cmd_q;void *pending; +unsigned long cmd_seq; +atomic_long_t last_response_cmd;struct vpu_inst_ops *ops;const struct vpu_format *formats;
drivers/media/platform/amphion/vpu_cmds.c +9 -19
@@ -32,6 +32,7 @@ struct vpu_cmd_t {struct vpu_cmd_request *request;struct vpu_rpc_event *pkt;unsigned long key; +atomic_long_t *last_response_cmd; };static struct vpu_cmd_request vpu_cmd_requests[] = {
@@ -115,6 +116,8 @@ static void vpu_free_cmd(struct vpu_cmd_t *cmd) {if (!cmd)return ; +if (cmd->last_response_cmd) +atomic_long_set (cmd->last_response_cmd, cmd->key);vfree (cmd->pkt);vfree (cmd); }
@@ -172,7 +175,8 @@ static int vpu_request_cmd(struct vpu_inst *inst, u32 id, void *data,return -ENOMEM ;mutex_lock (&core->cmd_lock); - cmd->key = core->cmd_seq++; + cmd->key = ++inst->cmd_seq; + cmd->last_response_cmd = &inst->last_response_cmd;if (key) *key = cmd->key;if (sync)
@@ -246,26 +250,12 @@ void vpu_clear_request(struct vpu_inst *inst)static bool check_is_responsed (struct vpu_inst *inst,unsigned long key) { -struct vpu_core *core = inst->core; -struct vpu_cmd_t *cmd; -bool flag = true; +unsigned long last_response =atomic_long_read (&inst->last_response_cmd); -mutex_lock (&core->cmd_lock); - cmd = inst->pending; -if (cmd && key == cmd->key) { - flag = false; - goto exit; - } -list_for_each_entry (cmd, &inst->cmd_q, list) { -if (key == cmd->key) { - flag = false; -break ; - } - } -exit: -mutex_unlock (&core->cmd_lock); +if (key <= last_response && (last_response - key) < (ULONG_MAX >>1 )) +return true; -return flag; +return false; }static int sync_session_response (struct vpu_inst *inst,unsigned long key,long timeout,int try)
drivers/media/platform/amphion/vpu_v4l2.c +1 -0
@@ -716,6 +716,7 @@ int vpu_v4l2_open(struct file *file, struct vpu_inst *inst) func = &vpu->decoder;atomic_set (&inst->ref_count,0 ); +atomic_long_set (&inst->last_response_cmd,0 );vpu_inst_get (inst); inst->vpu = vpu; inst->core =vpu_request_core (vpu, inst->type);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 201/353 media: ddbridge: fix an error code problem in ddb_probe
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Su Hui <[email protected]>
[ Upstream commit 09b4195021be69af1e1936cca995712a6d0f2562 ]
Error code is assigned to 'stat', return 'stat' rather than '-1'.
--- drivers/media/pci/ddbridge/ddbridge-main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/pci/ddbridge/ddbridge-main.c +1 -1
@@ -238,7 +238,7 @@ static int ddb_probe(struct pci_dev *pdev,ddb_unmap (dev);pci_set_drvdata (pdev,NULL );pci_disable_device (pdev); -return -1 ; +return stat; }/****************************************************************************/
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 202/353 media: ov2740: Fix hts value
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
[ Upstream commit 3735228bbe3511f844e03dfcc4003fadb59dde23 ]
HTS must be more then width, so the 1080 value clearly is wrong, this is then corrected with some weird math dividing clocks in to_pixels_per_line() which results in the hts getting multiplied by 2, resulting in 2160.
Instead just directly set hts to the correct value of 2160 and drop to_pixels_per_line().
--- drivers/media/i2c/ov2740.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-)
drivers/media/i2c/ov2740.c +3 -14
@@ -310,7 +310,7 @@ static const struct ov2740_mode supported_modes[] = { { .width = 1932, .height = 1092, - .hts = 1080, + .hts = 2160, .vts_def = OV2740_VTS_DEF, .vts_min = OV2740_VTS_MIN, .reg_list = {
@@ -357,15 +357,6 @@ static u64 to_pixel_rate(u32 f_index)return pixel_rate; } -static u64 to_pixels_per_line (u32 hts,u32 f_index) -{ -u64 ppl = hts *to_pixel_rate (f_index); - -do_div (ppl,OV2740_SCLK ); - -return ppl; -} -static int ov2740_read_reg (struct ov2740 *ov2740,u16 reg,u16 len,u32 *val) {struct i2c_client *client =v4l2_get_subdevdata (&ov2740->sd);
@@ -598,8 +589,7 @@ static int ov2740_init_controls(struct ov2740 *ov2740)V4L2_CID_VBLANK , vblank_min, vblank_max, 1, vblank_default); - h_blank =to_pixels_per_line (cur_mode->hts, cur_mode->link_freq_index); - h_blank -= cur_mode->width; + h_blank = cur_mode->hts - cur_mode->width; ov2740->hblank =v4l2_ctrl_new_std (ctrl_hdlr, &ov2740_ctrl_ops,V4L2_CID_HBLANK , h_blank, h_blank,1 , h_blank);
@@ -842,8 +832,7 @@ static int ov2740_set_format(struct v4l2_subdev *sd, mode->vts_min - mode->height, OV2740_VTS_MAX - mode->height, 1, vblank_def);__v4l2_ctrl_s_ctrl (ov2740->vblank, vblank_def); - h_blank =to_pixels_per_line (mode->hts, mode->link_freq_index) - - mode->width; + h_blank = mode->hts - mode->width;__v4l2_ctrl_modify_range (ov2740->hblank, h_blank, h_blank,1 , h_blank);return 0 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 203/353 media: i2c: imx335: Fix hblank min/max values
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kieran Bingham <[email protected]>
[ Upstream commit d7b95ad7a8d56248dfc34f861e445fad7a4004f4 ]
The V4L2_CID_HBLANK control is marked as readonly and can only be a single value.
Set the minimum and maximum value to match the mode value.
--- drivers/media/i2c/imx335.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/i2c/imx335.c +2 -2
@@ -962,8 +962,8 @@ static int imx335_init_controls(struct imx335 *imx335) imx335->hblank_ctrl =v4l2_ctrl_new_std (ctrl_hdlr, &imx335_ctrl_ops,V4L2_CID_HBLANK , -IMX335_REG_MIN , -IMX335_REG_MAX , + mode->hblank, + mode->hblank,1 , mode->hblank);if (imx335->hblank_ctrl) imx335->hblank_ctrl->flags |=V4L2_CTRL_FLAG_READ_ONLY ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 204/353 drm/amd/display: For prefetch mode > 0, extend prefetch if possible
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alvin Lee <[email protected]>
[ Upstream commit dd4e4bb28843393065eed279e869fac248d03f0f ]
[Description]
For mode programming we want to extend the prefetch as much as possible (up to oto, or as long as we can for equ) if we're not already applying the 60us prefetch requirement. This is to avoid intermittent underflow issues during prefetch.
The prefetch extension is applied under the following scenarios:
1. We're in prefetch mode 1 (i.e. we don't support MCLK switch in blank)
2. We're using subvp or drr methods of p-state switch, in which case we we don't care if prefetch takes up more of the blanking time
Mode programming typically chooses the smallest prefetch time possible (i.e. highest bandwidth during prefetch) presumably to create margin between p-states / c-states that happen in vblank and prefetch. Therefore we only apply this prefetch extension when p-state in vblank is not required (UCLK p-states take up the most vblank time).
--- .../dc/dml/dcn32/display_mode_vba_32.c | 3 ++ .../dc/dml/dcn32/display_mode_vba_util_32.c | 33 +++++++++++++++---- .../dc/dml/dcn32/display_mode_vba_util_32.h | 1 + 3 files changed, 31 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c +3 -0
@@ -813,6 +813,8 @@ static void DISPCLKDPPCLKDCFCLKDeepSleepPrefetchParametersWatermarksAndPerforman (v->DRAMSpeedPerState[mode_lib->vba.VoltageLevel] <=MEM_STROBE_FREQ_MHZ || v->DCFCLKPerState[mode_lib->vba.VoltageLevel] <=DCFCLK_FREQ_EXTRA_PREFETCH_REQ_MHZ ) ? mode_lib->vba.ip.min_prefetch_in_strobe_us :0 , + mode_lib->vba.PrefetchModePerState[mode_lib->vba.VoltageLevel][mode_lib->vba.maxMpcComb] >0 || mode_lib->vba.DRAMClockChangeRequirementFinal == false, +/* Output */ &v->DSTXAfterScaler[k], &v->DSTYAfterScaler[k],
@@ -3317,6 +3319,7 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l v->SwathHeightCThisState[k], v->TWait, (v->DRAMSpeedPerState[i] <=MEM_STROBE_FREQ_MHZ || v->DCFCLKState[i][j] <=DCFCLK_FREQ_EXTRA_PREFETCH_REQ_MHZ ) ? mode_lib->vba.ip.min_prefetch_in_strobe_us :0 , + mode_lib->vba.PrefetchModePerState[i][j] >0 || mode_lib->vba.DRAMClockChangeRequirementFinal == false,/* Output */ &v->dummy_vars.dml32_ModeSupportAndSystemConfigurationFull.DSTXAfterScaler[k],
drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_util_32.c +27 -6
@@ -3423,6 +3423,7 @@ bool dml32_CalculatePrefetchSchedule(unsigned int SwathHeightC, double TWait, double TPreReq, + bool ExtendPrefetchIfPossible,/* Output */ double *DSTXAfterScaler, double *DSTYAfterScaler,
@@ -3892,12 +3893,32 @@ bool dml32_CalculatePrefetchSchedule(/* Clamp to oto for bandwidth calculation */ LinesForPrefetchBandwidth = dst_y_prefetch_oto; }else { - *DestinationLinesForPrefetch = dst_y_prefetch_equ; - TimeForFetchingMetaPTE = Tvm_equ; - TimeForFetchingRowInVBlank = Tr0_equ; - *PrefetchBandwidth = prefetch_bw_equ; -/* Clamp to equ for bandwidth calculation */ - LinesForPrefetchBandwidth = dst_y_prefetch_equ; +/* For mode programming we want to extend the prefetch as much as possible +* (up to oto, or as long as we can for equ) if we're not already applying +* the 60us prefetch requirement. This is to avoid intermittent underflow +* issues during prefetch. +* +* The prefetch extension is applied under the following scenarios: +* 1. We're in prefetch mode > 0 (i.e. we don't support MCLK switch in blank) +* 2. We're using subvp or drr methods of p-state switch, in which case we +* we don't care if prefetch takes up more of the blanking time +* +* Mode programming typically chooses the smallest prefetch time possible +* (i.e. highest bandwidth during prefetch) presumably to create margin between +* p-states / c-states that happen in vblank and prefetch. Therefore we only +* apply this prefetch extension when p-state in vblank is not required (UCLK +* p-states take up the most vblank time). +*/ +if (ExtendPrefetchIfPossible && TPreReq ==0 && VStartup < MaxVStartup) { + MyError = true; + }else { + *DestinationLinesForPrefetch = dst_y_prefetch_equ; + TimeForFetchingMetaPTE = Tvm_equ; + TimeForFetchingRowInVBlank = Tr0_equ; + *PrefetchBandwidth = prefetch_bw_equ; +/* Clamp to equ for bandwidth calculation */ + LinesForPrefetchBandwidth = dst_y_prefetch_equ; + } } *DestinationLinesToRequestVMInVBlank =dml_ceil (4.0 * TimeForFetchingMetaPTE / LineTime,1.0 ) /4.0 ;
drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_util_32.h +1 -0
@@ -747,6 +747,7 @@ bool dml32_CalculatePrefetchSchedule(unsigned int SwathHeightC, double TWait, double TPreReq, + bool ExtendPrefetchIfPossible,/* Output */ double *DSTXAfterScaler, double *DSTYAfterScaler,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 205/353 drm/amd/display: Force p-state disallow if leaving no plane config
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alvin Lee <[email protected]>
[ Upstream commit 9a902a9073c287353e25913c0761bfed49d75a88 ]
[Description]
- When we're in a no plane config, DCN is always asserting P-State allow
- This creates a scenario where the P-State blackout can start just as VUPDATE takes place and transitions the DCN config to a one where one or more HUBP's are active which can result in underflow
- To fix this issue, force p-state disallow and unforce after the transition from no planes case -> one or more planes active
--- .../amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+)
drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c +20 -0
@@ -1877,6 +1877,8 @@ void dcn20_program_front_end_for_ctx(int i;struct dce_hwseq *hws = dc->hwseq;DC_LOGGER_INIT (dc->ctx->logger); +unsigned int prev_hubp_count =0 ; +unsigned int hubp_count =0 ;if (resource_is_pipe_topology_changed (dc->current_state, context))resource_log_pipe_topology_update (dc, context);
@@ -1894,6 +1896,20 @@ void dcn20_program_front_end_for_ctx( } } +for (i =0 ; i < dc->res_pool->pipe_count; i++) { +if (dc->current_state->res_ctx.pipe_ctx[i].plane_state) + prev_hubp_count++; +if (context->res_ctx.pipe_ctx[i].plane_state) + hubp_count++; + } + +if (prev_hubp_count ==0 && hubp_count >0 ) { +if (dc->res_pool->hubbub->funcs->force_pstate_change_control) + dc->res_pool->hubbub->funcs->force_pstate_change_control ( + dc->res_pool->hubbub, true, false); +udelay (500 ); + } +/* Set pipe update flags and lock pipes */ for (i =0 ; i < dc->res_pool->pipe_count; i++) dcn20_detect_pipe_changes(&dc->current_state->res_ctx.pipe_ctx[i],
@@ -2039,6 +2055,10 @@ void dcn20_post_unlock_program_front_end( } } +if (dc->res_pool->hubbub->funcs->force_pstate_change_control) + dc->res_pool->hubbub->funcs->force_pstate_change_control ( + dc->res_pool->hubbub, false, false); +for (i =0 ; i < dc->res_pool->pipe_count; i++) {struct pipe_ctx *pipe = &context->res_ctx.pipe_ctx[i];
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 206/353 drm/amdkfd: fix mes set shader debugger process management
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jonathan Kim <[email protected]>
[ Upstream commit bd33bb1409b494558a2935f7bbc7842def957fcd ]
MES provides the driver a call to explicitly flush stale process memory within the MES to avoid a race condition that results in a fatal memory violation.
When SET_SHADER_DEBUGGER is called, the driver passes a memory address that represents a process context address MES uses to keep track of future per-process calls.
Normally, MES will purge its process context list when the last queue has been removed. The driver, however, can call SET_SHADER_DEBUGGER regardless of whether a queue has been added or not.
If SET_SHADER_DEBUGGER has been called with no queues as the last call prior to process termination, the passed process context address will still reside within MES.
On a new process call to SET_SHADER_DEBUGGER, the driver may end up passing an identical process context address value (based on per-process gpu memory address) to MES but is now pointing to a new allocated buffer object during KFD process creation. Since the MES is unaware of this, access of the passed address points to the stale object within MES and triggers a fatal memory violation.
The solution is for KFD to explicitly flush the process context address from MES on process termination.
Note that the flush call and the MES debugger calls use the same MES interface but are separated as KFD calls to avoid conflicting with each other.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 31 +++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h | 10 +++--- .../amd/amdkfd/kfd_process_queue_manager.c | 1 + drivers/gpu/drm/amd/include/mes_v11_api_def.h | 3 +- 4 files changed, 40 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c +31 -0
@@ -886,6 +886,11 @@ int amdgpu_mes_set_shader_debugger(struct amdgpu_device *adev, op_input.op =MES_MISC_OP_SET_SHADER_DEBUGGER ; op_input.set_shader_debugger.process_context_addr = process_context_addr; op_input.set_shader_debugger.flags.u32all = flags; + +/* use amdgpu mes_flush_shader_debugger instead */ +if (op_input.set_shader_debugger.flags.process_ctx_flush) +return -EINVAL ; + op_input.set_shader_debugger.spi_gdbg_per_vmid_cntl = spi_gdbg_per_vmid_cntl;memcpy (op_input.set_shader_debugger.tcp_watch_cntl, tcp_watch_cntl,sizeof (op_input.set_shader_debugger.tcp_watch_cntl));
@@ -905,6 +910,32 @@ int amdgpu_mes_set_shader_debugger(struct amdgpu_device *adev,return r; } +int amdgpu_mes_flush_shader_debugger (struct amdgpu_device *adev, +uint64_t process_context_addr) +{ +struct mes_misc_op_input op_input = {0 }; +int r; + +if (!adev->mes.funcs->misc_op) { +DRM_ERROR ("mes flush shader debugger is not supported!\n" ); +return -EINVAL ; + } + + op_input.op =MES_MISC_OP_SET_SHADER_DEBUGGER ; + op_input.set_shader_debugger.process_context_addr = process_context_addr; + op_input.set_shader_debugger.flags.process_ctx_flush = true; + +amdgpu_mes_lock (&adev->mes); + + r = adev->mes.funcs->misc_op (&adev->mes, &op_input); +if (r) +DRM_ERROR ("failed to set_shader_debugger\n" ); + +amdgpu_mes_unlock (&adev->mes); + +return r; +} + static void amdgpu_mes_ring_to_queue_props(struct amdgpu_device *adev, struct amdgpu_ring *ring,
drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h +6 -4
@@ -291,9 +291,10 @@ struct mes_misc_op_input {uint64_t process_context_addr;union {struct { -uint64_t single_memop :1 ; -uint64_t single_alu_op :1 ; -uint64_t reserved:30 ; +uint32_t single_memop :1 ; +uint32_t single_alu_op :1 ; +uint32_t reserved:29 ; +uint32_t process_ctx_flush:1 ; };uint32_t u32all; } flags;
@@ -369,7 +370,8 @@ int amdgpu_mes_set_shader_debugger(struct amdgpu_device *adev,const uint32_t *tcp_watch_cntl, uint32_t flags, bool trap_en); - +int amdgpu_mes_flush_shader_debugger (struct amdgpu_device *adev, +uint64_t process_context_addr); int amdgpu_mes_add_ring(struct amdgpu_device *adev, int gang_id, int queue_type, int idx, struct amdgpu_mes_ctx_data *ctx_data,
drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c +1 -0
@@ -87,6 +87,7 @@ void kfd_process_dequeue_from_device(struct kfd_process_device *pdd)return ; dev->dqm->ops.process_termination (dev->dqm, &pdd->qpd); +amdgpu_mes_flush_shader_debugger (dev->adev, pdd->proc_ctx_gpu_addr); pdd->already_dequeued = true; }
drivers/gpu/drm/amd/include/mes_v11_api_def.h +2 -1
@@ -571,7 +571,8 @@ struct SET_SHADER_DEBUGGER {struct {uint32_t single_memop :1 ;/* SQ_DEBUG.single_memop */ uint32_t single_alu_op :1 ;/* SQ_DEBUG.single_alu_op */ -uint32_t reserved :30 ; +uint32_t reserved :29 ; +uint32_t process_ctx_flush :1 ; };uint32_t u32all; } flags;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 207/353 drm/msm/dpu: enable writeback on SM8350
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit c2949a49dfe960e952400029e14751dceff79d38 ]
Enable WB2 hardware block, enabling writeback support on this platform.
Patchwork: https://patchwork.freedesktop.org/patch/570188/
--- .../drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h +18 -0
@@ -31,6 +31,7 @@ static const struct dpu_mdp_cfg sm8350_mdp = { [DPU_CLK_CTRL_DMA1] = { .reg_off = 0x2b4, .bit_off = 8 }, [DPU_CLK_CTRL_DMA2] = { .reg_off = 0x2bc, .bit_off = 8 }, [DPU_CLK_CTRL_DMA3] = { .reg_off = 0x2c4, .bit_off = 8 }, + [DPU_CLK_CTRL_WB2] = { .reg_off = 0x2bc, .bit_off = 16 }, [DPU_CLK_CTRL_REG_DMA] = { .reg_off = 0x2bc, .bit_off = 20 }, }, };
@@ -298,6 +299,21 @@ static const struct dpu_dsc_cfg sm8350_dsc[] = { }, }; +static const struct dpu_wb_cfg sm8350_wb[] = { + { + .name ="wb_2" , .id =WB_2 , + .base =0x65000 , .len =0x2c8 , + .features =WB_SM8250_MASK , + .format_list = wb2_formats, + .num_formats =ARRAY_SIZE (wb2_formats), + .clk_ctrl =DPU_CLK_CTRL_WB2 , + .xin_id =6 , + .vbif_idx =VBIF_RT , + .maxlinewidth =4096 , + .intr_wb_done =DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,4 ), + }, +}; +static const struct dpu_intf_cfg sm8350_intf[] = { { .name ="intf_0" , .id =INTF_0 ,
@@ -393,6 +409,8 @@ const struct dpu_mdss_cfg dpu_sm8350_cfg = { .dsc = sm8350_dsc, .merge_3d_count = ARRAY_SIZE(sm8350_merge_3d), .merge_3d = sm8350_merge_3d, + .wb_count = ARRAY_SIZE(sm8350_wb), + .wb = sm8350_wb, .intf_count = ARRAY_SIZE(sm8350_intf), .intf = sm8350_intf, .vbif_count = ARRAY_SIZE(sdm845_vbif),
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 208/353 drm/msm/dpu: enable writeback on SM8450
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit eaa647cdbf2e357b4a14903f2f1e47ed9c4f8df3 ]
Enable WB2 hardware block, enabling writeback support on this platform.
Patchwork: https://patchwork.freedesktop.org/patch/570187/
--- .../drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h +18 -0
@@ -32,6 +32,7 @@ static const struct dpu_mdp_cfg sm8450_mdp = { [DPU_CLK_CTRL_DMA1] = { .reg_off = 0x2b4, .bit_off = 8 }, [DPU_CLK_CTRL_DMA2] = { .reg_off = 0x2bc, .bit_off = 8 }, [DPU_CLK_CTRL_DMA3] = { .reg_off = 0x2c4, .bit_off = 8 }, + [DPU_CLK_CTRL_WB2] = { .reg_off = 0x2bc, .bit_off = 16 }, [DPU_CLK_CTRL_REG_DMA] = { .reg_off = 0x2bc, .bit_off = 20 }, }, };
@@ -316,6 +317,21 @@ static const struct dpu_dsc_cfg sm8450_dsc[] = { }, }; +static const struct dpu_wb_cfg sm8450_wb[] = { + { + .name ="wb_2" , .id =WB_2 , + .base =0x65000 , .len =0x2c8 , + .features =WB_SM8250_MASK , + .format_list = wb2_formats, + .num_formats =ARRAY_SIZE (wb2_formats), + .clk_ctrl =DPU_CLK_CTRL_WB2 , + .xin_id =6 , + .vbif_idx =VBIF_RT , + .maxlinewidth =4096 , + .intr_wb_done =DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,4 ), + }, +}; +static const struct dpu_intf_cfg sm8450_intf[] = { { .name ="intf_0" , .id =INTF_0 ,
@@ -411,6 +427,8 @@ const struct dpu_mdss_cfg dpu_sm8450_cfg = { .dsc = sm8450_dsc, .merge_3d_count = ARRAY_SIZE(sm8450_merge_3d), .merge_3d = sm8450_merge_3d, + .wb_count = ARRAY_SIZE(sm8450_wb), + .wb = sm8450_wb, .intf_count = ARRAY_SIZE(sm8450_intf), .intf = sm8450_intf, .vbif_count = ARRAY_SIZE(sdm845_vbif),
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 209/353 drm/msm/dpu: Ratelimit framedone timeout msgs
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rob Clark <[email protected]>
[ Upstream commit 2b72e50c62de60ad2d6bcd86aa38d4ccbdd633f2 ]
When we start getting these, we get a *lot*. So ratelimit it to not flood dmesg.
Patchwork: https://patchwork.freedesktop.org/patch/571584/
--- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 5 ++++- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 1 + 2 files changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +4 -1
@@ -39,6 +39,9 @@#define DPU_ERROR_ENC (e, fmt, ...) DPU_ERROR("enc%d " fmt,\ (e) ? (e)->base.base.id : -1, ##__VA_ARGS__) +#define DPU_ERROR_ENC_RATELIMITED (e, fmt, ...) DPU_ERROR_RATELIMITED("enc%d " fmt,\ + (e) ? (e)->base.base.id : -1, ##__VA_ARGS__) +/* * Two to anticipate panels that can do cmd/vid dynamic switching * plan is to create all possible physical encoder types, and switch between
@@ -2339,7 +2342,7 @@ static void dpu_encoder_frame_done_timeout(struct timer_list *t)return ; } -DPU_ERROR_ENC (dpu_enc,"frame done timeout\n" ); +DPU_ERROR_ENC_RATELIMITED (dpu_enc,"frame done timeout\n" ); event =DPU_ENCODER_FRAME_EVENT_ERROR ;trace_dpu_enc_frame_done_timeout (DRMID (drm_enc), event);
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +1 -0
@@ -51,6 +51,7 @@ } while (0)#define DPU_ERROR (fmt, ...) pr_err("[dpu error]" fmt, ##__VA_ARGS__) +#define DPU_ERROR_RATELIMITED (fmt, ...) pr_err_ratelimited("[dpu error]" fmt, ##__VA_ARGS__)/** * ktime_compare_safe - compare two ktime structures
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 210/353 drm/msm/dpu: fix writeback programming for YUV cases
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Abhinav Kumar <[email protected]>
[ Upstream commit 79caf2f2202b9eaad3a5a726e4b33807f67d0f1b ]
For YUV cases, setting the required format bits was missed out in the register programming. Lets fix it now in preparation of adding YUV formats support for writeback.
changes in v2:
- dropped the fixes tag as its not a fix but adding new functionality
Patchwork: https://patchwork.freedesktop.org/patch/571814/
--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c +3 -0
@@ -87,6 +87,9 @@ static void dpu_hw_wb_setup_format(struct dpu_hw_wb *ctx, dst_format |=BIT (14 );/* DST_ALPHA_X */ } +if (DPU_FORMAT_IS_YUV (fmt)) + dst_format |=BIT (15 ); + pattern = (fmt->element[3 ] <<24 ) | (fmt->element[2 ] <<16 ) | (fmt->element[1] << 8) |
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 211/353 drm/msm/dpu: Add mutex lock in control vblank irq
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paloma Arellano <[email protected]>
[ Upstream commit 45284ff733e4caf6c118aae5131eb7e7cf3eea5a ]
Add a mutex lock to control vblank irq to synchronize vblank enable/disable operations happening from different threads to prevent race conditions while registering/unregistering the vblank irq callback.
v4: -Removed vblank_ctl_lock from dpu_encoder_virt, so it is only a
parameter of dpu_encoder_phys.
-Switch from atomic refcnt to a simple int counter as mutex has now been added
v3: Mistakenly did not change wording in last version. It is done now.
v2: Slightly changed wording of commit message
Patchwork: https://patchwork.freedesktop.org/patch/571854/
--- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 1 - .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h | 4 ++- .../drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 32 ++++++++++++------ .../drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 33 ++++++++++++------- 4 files changed, 47 insertions(+), 23 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +0 -1
@@ -2500,7 +2500,6 @@ void dpu_encoder_phys_init(struct dpu_encoder_phys *phys_enc, phys_enc->enc_spinlock = p->enc_spinlock; phys_enc->enable_state =DPU_ENC_DISABLED ; -atomic_set (&phys_enc->vblank_refcount,0 );atomic_set (&phys_enc->pending_kickoff_cnt,0 );atomic_set (&phys_enc->pending_ctlstart_cnt,0 );
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h +3 -1
@@ -155,6 +155,7 @@ enum dpu_intr_idx {* @hw_wb: Hardware interface to the wb registers * @dpu_kms: Pointer to the dpu_kms top level * @cached_mode: DRM mode cached at mode_set time, acted on in enable +* @vblank_ctl_lock: Vblank ctl mutex lock to protect vblank_refcount * @enabled: Whether the encoder has enabled and running a mode * @split_role: Role to play in a split-panel configuration * @intf_mode: Interface mode
@@ -183,11 +184,12 @@ struct dpu_encoder_phys {struct dpu_hw_wb *hw_wb;struct dpu_kms *dpu_kms;struct drm_display_mode cached_mode; +struct mutex vblank_ctl_lock;enum dpu_enc_split_role split_role;enum dpu_intf_mode intf_mode;spinlock_t *enc_spinlock;enum dpu_enc_enable_state enable_state; -atomic_t vblank_refcount; +int vblank_refcount;atomic_t vsync_cnt;atomic_t underrun_cnt;atomic_t pending_ctlstart_cnt;
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c +22 -10
@@ -244,7 +244,8 @@ static int dpu_encoder_phys_cmd_control_vblank_irq(return -EINVAL ; } - refcount =atomic_read (&phys_enc->vblank_refcount); +mutex_lock (&phys_enc->vblank_ctl_lock); + refcount = phys_enc->vblank_refcount;/* Slave encoders don't report vblank */ if (!dpu_encoder_phys_cmd_is_master (phys_enc))
@@ -260,16 +261,24 @@ static int dpu_encoder_phys_cmd_control_vblank_irq( phys_enc->hw_pp->idx -PINGPONG_0 , enable ? "true" : "false", refcount); -if (enable &&atomic_inc_return (&phys_enc->vblank_refcount) ==1 ) - ret =dpu_core_irq_register_callback (phys_enc->dpu_kms, - phys_enc->irq[INTR_IDX_RDPTR ], - dpu_encoder_phys_cmd_te_rd_ptr_irq, - phys_enc); -else if (!enable &&atomic_dec_return (&phys_enc->vblank_refcount) ==0 ) - ret =dpu_core_irq_unregister_callback (phys_enc->dpu_kms, - phys_enc->irq[INTR_IDX_RDPTR ]); +if (enable) { +if (phys_enc->vblank_refcount ==0 ) + ret =dpu_core_irq_register_callback (phys_enc->dpu_kms, + phys_enc->irq[INTR_IDX_RDPTR ], + dpu_encoder_phys_cmd_te_rd_ptr_irq, + phys_enc); +if (!ret) + phys_enc->vblank_refcount++; + }else if (!enable) { +if (phys_enc->vblank_refcount ==1 ) + ret =dpu_core_irq_unregister_callback (phys_enc->dpu_kms, + phys_enc->irq[INTR_IDX_RDPTR ]); +if (!ret) + phys_enc->vblank_refcount--; + } end: +mutex_unlock (&phys_enc->vblank_ctl_lock);if (ret) { DRM_ERROR("vblank irq err id:%u pp:%d ret:%d, enable %s/%d\n", DRMID(phys_enc->parent),
@@ -285,7 +294,7 @@ static void dpu_encoder_phys_cmd_irq_control(struct dpu_encoder_phys *phys_enc, {trace_dpu_enc_phys_cmd_irq_ctrl (DRMID (phys_enc->parent), phys_enc->hw_pp->idx -PINGPONG_0 , - enable,atomic_read (&phys_enc->vblank_refcount)); + enable, phys_enc->vblank_refcount);if (enable) { dpu_core_irq_register_callback(phys_enc->dpu_kms,
@@ -763,6 +772,9 @@ struct dpu_encoder_phys *dpu_encoder_phys_cmd_init(dpu_encoder_phys_init (phys_enc, p); +mutex_init (&phys_enc->vblank_ctl_lock); + phys_enc->vblank_refcount =0 ; +dpu_encoder_phys_cmd_init_ops (&phys_enc->ops); phys_enc->intf_mode =INTF_MODE_CMD ; cmd_enc->stream_sel =0 ;
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c +22 -11
@@ -364,7 +364,8 @@ static int dpu_encoder_phys_vid_control_vblank_irq(int ret =0 ;int refcount; - refcount =atomic_read (&phys_enc->vblank_refcount); +mutex_lock (&phys_enc->vblank_ctl_lock); + refcount = phys_enc->vblank_refcount;/* Slave encoders don't report vblank */ if (!dpu_encoder_phys_vid_is_master (phys_enc))
@@ -377,18 +378,26 @@ static int dpu_encoder_phys_vid_control_vblank_irq( }DRM_DEBUG_VBL ("id:%u enable=%d/%d\n" ,DRMID (phys_enc->parent), enable, -atomic_read (&phys_enc->vblank_refcount)); + refcount); -if (enable &&atomic_inc_return (&phys_enc->vblank_refcount) ==1 ) - ret =dpu_core_irq_register_callback (phys_enc->dpu_kms, - phys_enc->irq[INTR_IDX_VSYNC ], - dpu_encoder_phys_vid_vblank_irq, - phys_enc); -else if (!enable &&atomic_dec_return (&phys_enc->vblank_refcount) ==0 ) - ret =dpu_core_irq_unregister_callback (phys_enc->dpu_kms, - phys_enc->irq[INTR_IDX_VSYNC ]); +if (enable) { +if (phys_enc->vblank_refcount ==0 ) + ret =dpu_core_irq_register_callback (phys_enc->dpu_kms, + phys_enc->irq[INTR_IDX_VSYNC ], + dpu_encoder_phys_vid_vblank_irq, + phys_enc); +if (!ret) + phys_enc->vblank_refcount++; + }else if (!enable) { +if (phys_enc->vblank_refcount ==1 ) + ret =dpu_core_irq_unregister_callback (phys_enc->dpu_kms, + phys_enc->irq[INTR_IDX_VSYNC ]); +if (!ret) + phys_enc->vblank_refcount--; + } end: +mutex_unlock (&phys_enc->vblank_ctl_lock);if (ret) { DRM_ERROR("failed: id:%u intf:%d ret:%d enable:%d refcnt:%d\n", DRMID(phys_enc->parent),
@@ -618,7 +627,7 @@ static void dpu_encoder_phys_vid_irq_control(struct dpu_encoder_phys *phys_enc,trace_dpu_enc_phys_vid_irq_ctrl (DRMID (phys_enc->parent), phys_enc->hw_intf->idx -INTF_0 , enable, -atomic_read (&phys_enc->vblank_refcount)); + phys_enc->vblank_refcount);if (enable) { ret =dpu_encoder_phys_vid_control_vblank_irq (phys_enc, true);
@@ -713,6 +722,8 @@ struct dpu_encoder_phys *dpu_encoder_phys_vid_init(DPU_DEBUG_VIDENC (phys_enc,"\n" );dpu_encoder_phys_init (phys_enc, p); +mutex_init (&phys_enc->vblank_ctl_lock); + phys_enc->vblank_refcount =0 ;dpu_encoder_phys_vid_init_ops (&phys_enc->ops); phys_enc->intf_mode =INTF_MODE_VIDEO ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 212/353 drm/amdgpu: fix ftrace event amdgpu_bo_move always move on same heap
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wang, Beyond <[email protected]>
[ Upstream commit 94aeb4117343d072e3a35b9595bcbfc0058ee724 ]
Issue: during evict or validate happened on amdgpu_bo, the 'from' and 'to' is always same in ftrace event of amdgpu_bo_move
where calling the 'trace_amdgpu_bo_move', the comment says move_notify is called before move happens, but actually it is called after move happens, here the new_mem is same as bo->resource
Fix: move trace_amdgpu_bo_move from move_notify to amdgpu_bo_move
--- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 13 +------------ drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 4 +--- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 5 +++-- 3 files changed, 5 insertions(+), 17 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +1 -12
@@ -1245,19 +1245,15 @@ int amdgpu_bo_get_metadata(struct amdgpu_bo *bo, void *buffer,* amdgpu_bo_move_notify - notification about a memory move * @bo: pointer to a buffer object * @evict: if this move is evicting the buffer from the graphics address space -* @new_mem: new information of the bufer object * * Marks the corresponding &amdgpu_bo buffer object as invalid, also performs * bookkeeping. * TTM driver callback which is called when ttm moves a buffer. */ -void amdgpu_bo_move_notify (struct ttm_buffer_object *bo, -bool evict, -struct ttm_resource *new_mem) +void amdgpu_bo_move_notify (struct ttm_buffer_object *bo,bool evict) {struct amdgpu_device *adev =amdgpu_ttm_adev (bo->bdev);struct amdgpu_bo *abo; -struct ttm_resource *old_mem = bo->resource;if (!amdgpu_bo_is_amdgpu_bo (bo))return ;
@@ -1274,13 +1270,6 @@ void amdgpu_bo_move_notify(struct ttm_buffer_object *bo,/* remember the eviction */ if (evict)atomic64_inc (&adev->num_evictions); - -/* update statistics */ -if (!new_mem) -return ; - -/* move_notify is called before move happens */ -trace_amdgpu_bo_move (abo, new_mem->mem_type, old_mem->mem_type); } void amdgpu_bo_get_memory(struct amdgpu_bo *bo,
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h +1 -3
@@ -344,9 +344,7 @@ int amdgpu_bo_set_metadata (struct amdgpu_bo *bo, void *metadata,int amdgpu_bo_get_metadata (struct amdgpu_bo *bo,void *buffer,size_t buffer_size,uint32_t *metadata_size,uint64_t *flags); -void amdgpu_bo_move_notify (struct ttm_buffer_object *bo, -bool evict, -struct ttm_resource *new_mem); +void amdgpu_bo_move_notify (struct ttm_buffer_object *bo,bool evict);void amdgpu_bo_release_notify (struct ttm_buffer_object *bo);vm_fault_t amdgpu_bo_fault_reserve_notify (struct ttm_buffer_object *bo); void amdgpu_bo_fence(struct amdgpu_bo *bo, struct dma_fence *fence,
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +3 -2
@@ -545,10 +545,11 @@ static int amdgpu_bo_move(struct ttm_buffer_object *bo, bool evict,return r; } +trace_amdgpu_bo_move (abo, new_mem->mem_type, old_mem->mem_type); out:/* update statistics */ atomic64_add (bo->base.size, &adev->num_bytes_moved); -amdgpu_bo_move_notify (bo, evict, new_mem); +amdgpu_bo_move_notify (bo, evict);return 0 ; }
@@ -1553,7 +1554,7 @@ static int amdgpu_ttm_access_memory(struct ttm_buffer_object *bo,static void amdgpu_bo_delete_mem_notify (struct ttm_buffer_object *bo) { -amdgpu_bo_move_notify (bo, false,NULL ); +amdgpu_bo_move_notify (bo, false); }static struct ttm_device_funcs amdgpu_bo_driver = {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 213/353 clk: hi3620: Fix memory leak in hi3620_mmc_clk_init()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuan-Wei Chiu <[email protected]>
[ Upstream commit bfbea9e5667cfa9552c3d88f023386f017f6c308 ]
In cases where kcalloc() fails for the 'clk_data->clks' allocation, the code path does not handle the failure gracefully, potentially leading to a memory leak. This fix ensures proper cleanup by freeing the allocated memory for 'clk_data' before returning.
--- drivers/clk/hisilicon/clk-hi3620.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/clk/hisilicon/clk-hi3620.c +3 -1
@@ -466,8 +466,10 @@ static void __init hi3620_mmc_clk_init(struct device_node *node)return ; clk_data->clks =kcalloc (num,sizeof (*clk_data->clks),GFP_KERNEL ); -if (!clk_data->clks) +if (!clk_data->clks) { +kfree (clk_data);return ; + }for (i =0 ; i < num; i++) {struct hisi_mmc_clock *mmc_clk = &hi3620_mmc_clks[i];
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 214/353 clk: mmp: pxa168: Fix memory leak in pxa168_clk_init()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuan-Wei Chiu <[email protected]>
[ Upstream commit 2fbabea626b6467eb4e6c4cb7a16523da12e43b4 ]
In cases where mapping of mpmu/apmu/apbc registers fails, the code path does not handle the failure gracefully, potentially leading to a memory leak. This fix ensures proper cleanup by freeing the allocated memory for 'pxa_unit' before returning.
--- drivers/clk/mmp/clk-of-pxa168.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/clk/mmp/clk-of-pxa168.c +3 -0
@@ -308,18 +308,21 @@ static void __init pxa168_clk_init(struct device_node *np) pxa_unit->mpmu_base =of_iomap (np,0 );if (!pxa_unit->mpmu_base) {pr_err ("failed to map mpmu registers\n" ); +kfree (pxa_unit);return ; } pxa_unit->apmu_base =of_iomap (np,1 );if (!pxa_unit->apmu_base) {pr_err ("failed to map apmu registers\n" ); +kfree (pxa_unit);return ; } pxa_unit->apbc_base =of_iomap (np,2 );if (!pxa_unit->apbc_base) {pr_err ("failed to map apbc registers\n" ); +kfree (pxa_unit);return ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 215/353 watchdog: starfive: add lock annotations to fix context imbalances
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ben Dooks <[email protected]>
[ Upstream commit f77999887235f8c378af343df11a6bcedda5b284 ]
Add the necessary __acquires() and __releases() to the functions that take and release the wdt lock to avoid the following sparse warnings:
drivers/watchdog/starfive-wdt.c:204:13: warning: context imbalance in 'starfive_wdt_unlock' - wrong count at exit drivers/watchdog/starfive-wdt.c:212:9: warning: context imbalance in 'starfive_wdt_lock' - unexpected unlock
--- drivers/watchdog/starfive-wdt.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/watchdog/starfive-wdt.c +2 -0
@@ -202,12 +202,14 @@ static u32 starfive_wdt_ticks_to_sec(struct starfive_wdt *wdt, u32 ticks)/* Write unlock-key to unlock. Write other value to lock. */ static void starfive_wdt_unlock (struct starfive_wdt *wdt) + __acquires(&wdt->lock) {spin_lock (&wdt->lock);writel (wdt->variant->unlock_key, wdt->base + wdt->variant->unlock); }static void starfive_wdt_lock (struct starfive_wdt *wdt) + __releases(&wdt->lock) {writel (~wdt->variant->unlock_key, wdt->base + wdt->variant->unlock);spin_unlock (&wdt->lock);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 216/353 watchdog: it87_wdt: Keep WDTCTRL bit 3 unmodified for IT8784/IT8786
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Werner Fischer <[email protected]>
[ Upstream commit d12971849d71781c1e4ffd1117d4878ce233d319 ]
WDTCTRL bit 3 sets the mode choice for the clock input of IT8784/IT8786. Some motherboards require this bit to be set to 1 (= PCICLK mode), otherwise the watchdog functionality gets broken. The BIOS of those motherboards sets WDTCTRL bit 3 already to 1.
Instead of setting all bits of WDTCTRL to 0 by writing 0x00 to it, keep bit 3 of it unchanged for IT8784/IT8786 chips. In this way, bit 3 keeps the status as set by the BIOS of the motherboard.
Watchdog tests have been successful with this patch with the following systems:
IT8784: Thomas-Krenn LES plus v2 (YANLING YL-KBRL2 V2)
IT8786: Thomas-Krenn LES plus v3 (YANLING YL-CLU L2)
IT8786: Thomas-Krenn LES network 6L v2 (YANLING YL-CLU6L)
--- drivers/watchdog/it87_wdt.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
drivers/watchdog/it87_wdt.c +13 -1
@@ -256,6 +256,7 @@ static struct watchdog_device wdt_dev = {static int __init it87_wdt_init (void ) {u8 chip_rev; +u8 ctrl;int rc; rc =superio_enter ();
@@ -315,7 +316,18 @@ static int __init it87_wdt_init(void)superio_select (GPIO );superio_outb (WDT_TOV1 ,WDTCFG ); -superio_outb (0x00 ,WDTCTRL ); + +switch (chip_type) { +case IT8784_ID : +case IT8786_ID : + ctrl =superio_inb (WDTCTRL ); + ctrl &=0x08 ; +superio_outb (ctrl,WDTCTRL ); +break ; +default : +superio_outb (0x00 ,WDTCTRL ); + } +superio_exit ();if (timeout <1 || timeout > max_units *60 ) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 217/353 accel/habanalabs: add support for Gaudi2C device
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oded Gabbay <[email protected]>
[ Upstream commit 42422993cf28d456778ee9168d73758ec037cd51 ]
Gaudi2 with PCI revision ID with the value of '3' represents Gaudi2C device and should be detected and initialized as Gaudi2.
--- drivers/accel/habanalabs/common/device.c | 3 +++ drivers/accel/habanalabs/common/habanalabs.h | 2 ++ drivers/accel/habanalabs/common/habanalabs_drv.c | 3 +++ drivers/accel/habanalabs/common/mmu/mmu.c | 1 + drivers/accel/habanalabs/common/sysfs.c | 3 +++ drivers/accel/habanalabs/include/hw_ip/pci/pci_general.h | 1 + 6 files changed, 13 insertions(+)
drivers/accel/habanalabs/common/device.c +3 -0
@@ -853,6 +853,9 @@ static int device_early_init(struct hl_device *hdev)gaudi2_set_asic_funcs (hdev);strscpy (hdev->asic_name,"GAUDI2B" ,sizeof (hdev->asic_name));break ; +case ASIC_GAUDI2C : +gaudi2_set_asic_funcs (hdev); +strscpy (hdev->asic_name,"GAUDI2C" ,sizeof (hdev->asic_name));break ;default : dev_err(hdev->dev, "Unrecognized ASIC type %d\n",
drivers/accel/habanalabs/common/habanalabs.h +2 -0
@@ -1262,6 +1262,7 @@ struct hl_dec {* @ASIC_GAUDI_SEC: Gaudi secured device (HL-2000). * @ASIC_GAUDI2: Gaudi2 device. * @ASIC_GAUDI2B: Gaudi2B device. +* @ASIC_GAUDI2C: Gaudi2C device. */ enum hl_asic_type {ASIC_INVALID ,
@@ -1270,6 +1271,7 @@ enum hl_asic_type {ASIC_GAUDI_SEC ,ASIC_GAUDI2 ,ASIC_GAUDI2B , + ASIC_GAUDI2C, };struct hl_cs_parser ;
drivers/accel/habanalabs/common/habanalabs_drv.c +3 -0
@@ -141,6 +141,9 @@ static enum hl_asic_type get_asic_type(struct hl_device *hdev)case REV_ID_B : asic_type =ASIC_GAUDI2B ;break ; +case REV_ID_C : + asic_type =ASIC_GAUDI2C ; +break ;default :break ; }
drivers/accel/habanalabs/common/mmu/mmu.c +1 -0
@@ -596,6 +596,7 @@ int hl_mmu_if_set_funcs(struct hl_device *hdev)break ;case ASIC_GAUDI2 :case ASIC_GAUDI2B : +case ASIC_GAUDI2C :/* MMUs in Gaudi2 are always host resident */ hl_mmu_v2_hr_set_funcs (hdev, &hdev->mmu_func[MMU_HR_PGT ]);break ;
drivers/accel/habanalabs/common/sysfs.c +3 -0
@@ -251,6 +251,9 @@ static ssize_t device_type_show(struct device *dev,case ASIC_GAUDI2B : str ="GAUDI2B" ;break ; +case ASIC_GAUDI2C : + str ="GAUDI2C" ; +break ;default :dev_err (hdev->dev,"Unrecognized ASIC type %d\n" , hdev->asic_type);
drivers/accel/habanalabs/include/hw_ip/pci/pci_general.h +1 -0
@@ -25,6 +25,7 @@ enum hl_revision_id {REV_ID_INVALID =0x00 ,REV_ID_A =0x01 ,REV_ID_B =0x02 , +REV_ID_C =0x03 };#endif /* INCLUDE_PCI_GENERAL_H_ */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 218/353 accel/habanalabs: fix EQ heartbeat mechanism
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Farah Kassabri <[email protected]>
[ Upstream commit d1958dce5ab6a3e089c60cf474e8c9b7e96e70ad ]
Stop rescheduling another heartbeat check when EQ heartbeat check fails as it generates confusing logs in dmesg that the heartbeat fails.
--- drivers/accel/habanalabs/common/device.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/accel/habanalabs/common/device.c +7 -7
@@ -1044,18 +1044,19 @@ static bool is_pci_link_healthy(struct hl_device *hdev)return (vendor_id ==PCI_VENDOR_ID_HABANALABS ); } -static void hl_device_eq_heartbeat (struct hl_device *hdev) +static int hl_device_eq_heartbeat_check (struct hl_device *hdev) { -u64 event_mask =HL_NOTIFIER_EVENT_DEVICE_RESET |HL_NOTIFIER_EVENT_DEVICE_UNAVAILABLE ;struct asic_fixed_properties *prop = &hdev->asic_prop;if (!prop->cpucp_info.eq_health_check_supported) -return ; +return 0 ;if (hdev->eq_heartbeat_received) hdev->eq_heartbeat_received = false;else -hl_device_cond_reset (hdev,HL_DRV_RESET_HARD , event_mask); +return -EIO ; + +return 0 ; }static void hl_device_heartbeat (struct work_struct *work)
@@ -1072,10 +1073,9 @@ static void hl_device_heartbeat(struct work_struct *work)/* * For EQ health check need to check if driver received the heartbeat eq event * in order to validate the eq is working. +* Only if both the EQ is healthy and we managed to send the next heartbeat reschedule. */ -hl_device_eq_heartbeat (hdev); - -if (!hdev->asic_funcs->send_heartbeat (hdev)) +if ((!hl_device_eq_heartbeat_check (hdev)) && (!hdev->asic_funcs->send_heartbeat (hdev))) goto reschedule;if (hl_device_operational (hdev,NULL ))
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 219/353 accel/habanalabs/gaudi2: fix undef opcode reporting
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dafna Hirschfeld <[email protected]>
[ Upstream commit 0ec346779644039c4c05cfa7f071b1a24e54d8d9 ]
currently the undefined opcode event bit in set only for lower cp and only if 'write_enable' is true. It should be set anyway and for all streams in order to report that event to userspace.
--- drivers/accel/habanalabs/gaudi2/gaudi2.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/accel/habanalabs/gaudi2/gaudi2.c +6 -8
@@ -7929,21 +7929,19 @@ static int gaudi2_handle_qman_err_generic(struct hl_device *hdev, u16 event_type error_count++; } -if (i ==QMAN_STREAMS && error_count) { -/* check for undefined opcode */ -if (glbl_sts_val &PDMA0_QM_GLBL_ERR_STS_CP_UNDEF_CMD_ERR_MASK && - hdev->captured_err_info.undef_opcode.write_enable) { +/* check for undefined opcode */ +if (glbl_sts_val &PDMA0_QM_GLBL_ERR_STS_CP_UNDEF_CMD_ERR_MASK ) { + *event_mask |=HL_NOTIFIER_EVENT_UNDEFINED_OPCODE ; +if (hdev->captured_err_info.undef_opcode.write_enable) {memset (&hdev->captured_err_info.undef_opcode,0 ,sizeof (hdev->captured_err_info.undef_opcode)); - - hdev->captured_err_info.undef_opcode.write_enable = false; hdev->captured_err_info.undef_opcode.timestamp =ktime_get (); hdev->captured_err_info.undef_opcode.engine_id = gaudi2_queue_id_to_engine_id[qid_base]; - *event_mask |=HL_NOTIFIER_EVENT_UNDEFINED_OPCODE ; } -handle_lower_qman_data_on_err (hdev, qman_base, *event_mask); +if (i ==QMAN_STREAMS ) +handle_lower_qman_data_on_err (hdev, qman_base, *event_mask); } }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 220/353 drm/amd/display: make flip_timestamp_in_us a 64-bit variable
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Josip Pavic <[email protected]>
[ Upstream commit 6fb12518ca58412dc51054e2a7400afb41328d85 ]
[Why]
This variable currently overflows after about 71 minutes. This doesn't cause any known functional issues but it does make debugging more difficult.
[How]
Make it a 64-bit variable.
--- drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dc_hw_types.h +1 -1
@@ -244,7 +244,7 @@ enum pixel_format {#define DC_MAX_DIRTY_RECTS 3struct dc_flip_addrs {struct dc_plane_address address; -unsigned int flip_timestamp_in_us; +unsigned long long flip_timestamp_in_us;bool flip_immediate;/* TODO: add flip duration for FreeSync */ bool triplebuffer_flips;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 221/353 drm/amd/display: fix usb-c connector_type
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Allen Pan <[email protected]>
[ Upstream commit 0d26644bc57d8737c8e2fb3145366f7d0b941935 ]
[why]
BIOS switches to use USB-C connector type 0x18, but VBIOS's objectInfo table not supported yet. driver needs to patch it based on enc_cap from system integration info table.
--- .../gpu/drm/amd/display/dc/dcn35/dcn35_dio_link_encoder.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dio_link_encoder.c +5 -0
@@ -256,6 +256,10 @@ void dcn35_link_encoder_construct( enc10->base.features.flags.bits.IS_UHBR10_CAPABLE = bp_cap_info.DP_UHBR10_EN; enc10->base.features.flags.bits.IS_UHBR13_5_CAPABLE = bp_cap_info.DP_UHBR13_5_EN; enc10->base.features.flags.bits.IS_UHBR20_CAPABLE = bp_cap_info.DP_UHBR20_EN; +if (bp_cap_info.DP_IS_USB_C) { +/*BIOS not switch to use CONNECTOR_ID_USBC = 24 yet*/ + enc10->base.features.flags.bits.DP_IS_USB_C =1 ; + } }else { DC_LOG_WARNING("%s: Failed to get encoder_cap_info from VBIOS with error code %d!\n",
@@ -264,4 +268,5 @@ void dcn35_link_encoder_construct( }if (enc10->base.ctx->dc->debug.hdmi20_disable) enc10->base.features.flags.bits.HDMI_6GB_EN =0 ; + }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 222/353 drm/amd/display: Fix lightup regression with DP2 single display configs
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Strauss <[email protected]>
[ Upstream commit 5a82b8d6c05f9b30828ede1b103b9ee5cb5c912e ]
[WHY]
Previous fix for multiple displays downstream of DP2 MST hub caused regression
[HOW]
Match sink IDs instead of sink struct addresses
--- drivers/gpu/drm/amd/display/dc/dml2/dml2_utils.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/gpu/drm/amd/display/dc/dml2/dml2_utils.c +8 -0
@@ -157,6 +157,14 @@ bool is_dp2p0_output_encoder(const struct pipe_ctx *pipe_ctx) {/* If this assert is hit then we have a link encoder dynamic management issue */ ASSERT (pipe_ctx->stream_res.hpo_dp_stream_enc ? pipe_ctx->link_res.hpo_dp_link_enc !=NULL : true); +/* Count MST hubs once by treating only 1st remote sink in topology as an encoder */ +if (pipe_ctx->stream->link && pipe_ctx->stream->link->remote_sinks[0 ]) { +return (pipe_ctx->stream_res.hpo_dp_stream_enc && + pipe_ctx->link_res.hpo_dp_link_enc && +dc_is_dp_signal (pipe_ctx->stream->signal) && + (pipe_ctx->stream->link->remote_sinks[0 ]->sink_id == pipe_ctx->stream->sink->sink_id)); + } +return (pipe_ctx->stream_res.hpo_dp_stream_enc && pipe_ctx->link_res.hpo_dp_link_enc &&dc_is_dp_signal (pipe_ctx->stream->signal));
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 223/353 drm/amd/display: Only clear symclk otg flag for HDMI
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alvin Lee <[email protected]>
[ Upstream commit dff45f03f508c92cd8eb2050e27b726726b8ae0b ]
[Description]
There is a corner case where the symclk otg flag is cleared when disabling the phantom pipe for subvp (because the phantom and main pipe share the same link). This is undesired because we need the maintain the correct symclk otg flag state for the main pipe.
For now only clear the flag only for HDMI signal type, since it's only set for HDMI signal type (phantom is virtual). The ideal solution is to not clear it if the stream is phantom but currently there's a bug that doesn't allow us to do this. Once this issue is fixed the proper fix can be implemented.
--- drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 3 ++- drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 3 ++- drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 3 ++- drivers/gpu/drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.c | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +2 -1
@@ -2124,7 +2124,8 @@ static void dce110_reset_hw_ctx_wrap(BREAK_TO_DEBUGGER (); } pipe_ctx_old->stream_res.tg->funcs->disable_crtc (pipe_ctx_old->stream_res.tg); - pipe_ctx_old->stream->link->phy_state.symclk_ref_cnts.otg =0 ; +if (dc_is_hdmi_tmds_signal (pipe_ctx_old->stream->signal)) + pipe_ctx_old->stream->link->phy_state.symclk_ref_cnts.otg =0 ; pipe_ctx_old->plane_res.mi->funcs->free_mem_input ( pipe_ctx_old->plane_res.mi, dc->current_state->stream_count);
drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c +2 -1
@@ -1057,7 +1057,8 @@ static void dcn10_reset_back_end_for_pipe(if (pipe_ctx->stream_res.tg->funcs->set_drr) pipe_ctx->stream_res.tg->funcs->set_drr ( pipe_ctx->stream_res.tg,NULL ); - pipe_ctx->stream->link->phy_state.symclk_ref_cnts.otg =0 ; +if (dc_is_hdmi_tmds_signal (pipe_ctx->stream->signal)) + pipe_ctx->stream->link->phy_state.symclk_ref_cnts.otg =0 ; }for (i =0 ; i < dc->res_pool->pipe_count; i++)
drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c +2 -1
@@ -2610,7 +2610,8 @@ static void dcn20_reset_back_end_for_pipe(* the case where the same symclk is shared across multiple otg * instances */ - link->phy_state.symclk_ref_cnts.otg =0 ; +if (dc_is_hdmi_tmds_signal (pipe_ctx->stream->signal)) + link->phy_state.symclk_ref_cnts.otg =0 ;if (link->phy_state.symclk_state ==SYMCLK_ON_TX_OFF ) { link_hwss->disable_link_output (link, &pipe_ctx->link_res, pipe_ctx->stream->signal);
drivers/gpu/drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.c +2 -1
@@ -523,7 +523,8 @@ static void dcn31_reset_back_end_for_pipe(if (pipe_ctx->stream_res.tg->funcs->set_odm_bypass) pipe_ctx->stream_res.tg->funcs->set_odm_bypass ( pipe_ctx->stream_res.tg, &pipe_ctx->stream->timing); - pipe_ctx->stream->link->phy_state.symclk_ref_cnts.otg =0 ; +if (dc_is_hdmi_tmds_signal (pipe_ctx->stream->signal)) + pipe_ctx->stream->link->phy_state.symclk_ref_cnts.otg =0 ;if (pipe_ctx->stream_res.tg->funcs->set_drr) pipe_ctx->stream_res.tg->funcs->set_drr(
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 224/353 clk: imx: scu: Fix memory leak in __imx_clk_gpr_scu()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuan-Wei Chiu <[email protected]>
[ Upstream commit 21c0efbcb45cf94724d17b040ebc03fcd4a81f22 ]
In cases where imx_clk_is_resource_owned() returns false, the code path does not handle the failure gracefully, potentially leading to a memory leak. This fix ensures proper cleanup by freeing the allocated memory for 'clk_node' before returning.
--- drivers/clk/imx/clk-scu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/clk/imx/clk-scu.c +3 -1
@@ -886,8 +886,10 @@ struct clk_hw *__imx_clk_gpr_scu(const char *name, const char * const *parent_nareturn ERR_PTR (-EINVAL ); } -if (!imx_clk_is_resource_owned (rsrc_id)) +if (!imx_clk_is_resource_owned (rsrc_id)) { +kfree (clk_node);return NULL ; + } clk =kzalloc (sizeof (*clk),GFP_KERNEL );if (!clk) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 225/353 clk: imx: clk-imx8qxp: fix LVDS bypass, pixel and phy clocks
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexander Stein <[email protected]>
[ Upstream commit 3f5f63adeea7e7aa715e101ffe4b4ac9705f9664 ]
To be compatible with SCU firmware based on 1.15 a different clock routing for LVDS is needed.
--- drivers/clk/imx/clk-imx8qxp.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-)
drivers/clk/imx/clk-imx8qxp.c +20 -4
@@ -66,6 +66,22 @@ static const char * const lcd_pxl_sels[] = { "lcd_pxl_bypass_div_clk", }; +static const char *const lvds0_sels[] = { +"clk_dummy" , +"clk_dummy" , +"clk_dummy" , +"clk_dummy" , +"mipi0_lvds_bypass_clk" , +}; + +static const char *const lvds1_sels[] = { +"clk_dummy" , +"clk_dummy" , +"clk_dummy" , +"clk_dummy" , +"mipi1_lvds_bypass_clk" , +}; +static const char *const mipi_sels[] = {"clk_dummy" ,"clk_dummy" ,
@@ -207,9 +223,9 @@ static int imx8qxp_clk_probe(struct platform_device *pdev)/* MIPI-LVDS SS */ imx_clk_scu ("mipi0_bypass_clk" ,IMX_SC_R_MIPI_0 ,IMX_SC_PM_CLK_BYPASS );imx_clk_scu ("mipi0_pixel_clk" ,IMX_SC_R_MIPI_0 ,IMX_SC_PM_CLK_PER ); -imx_clk_scu ("mipi0_lvds_pixel_clk" ,IMX_SC_R_LVDS_0 ,IMX_SC_PM_CLK_MISC2 );imx_clk_scu ("mipi0_lvds_bypass_clk" ,IMX_SC_R_LVDS_0 ,IMX_SC_PM_CLK_BYPASS ); -imx_clk_scu ("mipi0_lvds_phy_clk" ,IMX_SC_R_LVDS_0 ,IMX_SC_PM_CLK_MISC3 ); +imx_clk_scu2 ("mipi0_lvds_pixel_clk" , lvds0_sels,ARRAY_SIZE (lvds0_sels),IMX_SC_R_LVDS_0 ,IMX_SC_PM_CLK_MISC2 ); +imx_clk_scu2 ("mipi0_lvds_phy_clk" , lvds0_sels,ARRAY_SIZE (lvds0_sels),IMX_SC_R_LVDS_0 ,IMX_SC_PM_CLK_MISC3 );imx_clk_scu2 ("mipi0_dsi_tx_esc_clk" , mipi_sels,ARRAY_SIZE (mipi_sels),IMX_SC_R_MIPI_0 ,IMX_SC_PM_CLK_MST_BUS );imx_clk_scu2 ("mipi0_dsi_rx_esc_clk" , mipi_sels,ARRAY_SIZE (mipi_sels),IMX_SC_R_MIPI_0 ,IMX_SC_PM_CLK_SLV_BUS );imx_clk_scu2 ("mipi0_dsi_phy_clk" , mipi_sels,ARRAY_SIZE (mipi_sels),IMX_SC_R_MIPI_0 ,IMX_SC_PM_CLK_PHY );
@@ -219,9 +235,9 @@ static int imx8qxp_clk_probe(struct platform_device *pdev)imx_clk_scu ("mipi1_bypass_clk" ,IMX_SC_R_MIPI_1 ,IMX_SC_PM_CLK_BYPASS );imx_clk_scu ("mipi1_pixel_clk" ,IMX_SC_R_MIPI_1 ,IMX_SC_PM_CLK_PER ); -imx_clk_scu ("mipi1_lvds_pixel_clk" ,IMX_SC_R_LVDS_1 ,IMX_SC_PM_CLK_MISC2 );imx_clk_scu ("mipi1_lvds_bypass_clk" ,IMX_SC_R_LVDS_1 ,IMX_SC_PM_CLK_BYPASS ); -imx_clk_scu ("mipi1_lvds_phy_clk" ,IMX_SC_R_LVDS_1 ,IMX_SC_PM_CLK_MISC3 ); +imx_clk_scu2 ("mipi1_lvds_pixel_clk" , lvds1_sels,ARRAY_SIZE (lvds1_sels),IMX_SC_R_LVDS_1 ,IMX_SC_PM_CLK_MISC2 ); +imx_clk_scu2 ("mipi1_lvds_phy_clk" , lvds1_sels,ARRAY_SIZE (lvds1_sels),IMX_SC_R_LVDS_1 ,IMX_SC_PM_CLK_MISC3 );imx_clk_scu2 ("mipi1_dsi_tx_esc_clk" , mipi_sels,ARRAY_SIZE (mipi_sels),IMX_SC_R_MIPI_1 ,IMX_SC_PM_CLK_MST_BUS );imx_clk_scu2 ("mipi1_dsi_rx_esc_clk" , mipi_sels,ARRAY_SIZE (mipi_sels),IMX_SC_R_MIPI_1 ,IMX_SC_PM_CLK_SLV_BUS );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 226/353 drm/amdgpu: Fix ecc irq enable/disable unpaired
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stanley.Yang <[email protected]>
[ Upstream commit a32c6f7f5737cc7e31cd7ad5133f0d96fca12ea6 ]
The ecc_irq is disabled while GPU mode2 reset suspending process, but not be enabled during GPU mode2 reset resume process.
Changed from V1:
only do sdma/gfx ras_late_init in aldebaran_mode2_restore_ip delete amdgpu_ras_late_resume function
Changed from V2:
check umc ras supported before put ecc_irq
--- drivers/gpu/drm/amd/amdgpu/aldebaran.c | 26 +++++++++++++++++++++++++- drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 4 ++++ drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 5 +++++ drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 4 ++++ 4 files changed, 38 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/aldebaran.c +25 -1
@@ -330,6 +330,7 @@ aldebaran_mode2_restore_hwcontext(struct amdgpu_reset_control *reset_ctl, {struct list_head *reset_device_list = reset_context->reset_device_list;struct amdgpu_device *tmp_adev =NULL ; +struct amdgpu_ras *con;int r;if (reset_device_list ==NULL )
@@ -355,7 +356,30 @@ aldebaran_mode2_restore_hwcontext(struct amdgpu_reset_control *reset_ctl,*/ amdgpu_register_gpu_instance (tmp_adev); -/* Resume RAS */ +/* Resume RAS, ecc_irq */ + con =amdgpu_ras_get_context (tmp_adev); +if (!amdgpu_sriov_vf (tmp_adev) && con) { +if (tmp_adev->sdma.ras && + tmp_adev->sdma.ras->ras_block.ras_late_init) { + r = tmp_adev->sdma.ras->ras_block.ras_late_init (tmp_adev, + &tmp_adev->sdma.ras->ras_block.ras_comm); +if (r) { +dev_err (tmp_adev->dev,"SDMA failed to execute ras_late_init! ret:%d\n" , r); + goto end; + } + } + +if (tmp_adev->gfx.ras && + tmp_adev->gfx.ras->ras_block.ras_late_init) { + r = tmp_adev->gfx.ras->ras_block.ras_late_init (tmp_adev, + &tmp_adev->gfx.ras->ras_block.ras_comm); +if (r) { +dev_err (tmp_adev->dev,"GFX failed to execute ras_late_init! ret:%d\n" , r); + goto end; + } + } + } +amdgpu_ras_resume (tmp_adev);/* Update PSP FW topology after reset */
drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +4 -0
@@ -1041,6 +1041,10 @@ static int gmc_v10_0_hw_fini(void *handle)amdgpu_irq_put (adev, &adev->gmc.vm_fault,0 ); +if (adev->gmc.ecc_irq.funcs && +amdgpu_ras_is_supported (adev,AMDGPU_RAS_BLOCK__UMC )) +amdgpu_irq_put (adev, &adev->gmc.ecc_irq,0 ); +return 0 ; }
drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c +5 -0
@@ -941,6 +941,11 @@ static int gmc_v11_0_hw_fini(void *handle) }amdgpu_irq_put (adev, &adev->gmc.vm_fault,0 ); + +if (adev->gmc.ecc_irq.funcs && +amdgpu_ras_is_supported (adev,AMDGPU_RAS_BLOCK__UMC )) +amdgpu_irq_put (adev, &adev->gmc.ecc_irq,0 ); +gmc_v11_0_gart_disable (adev);return 0 ;
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +4 -0
@@ -2381,6 +2381,10 @@ static int gmc_v9_0_hw_fini(void *handle)amdgpu_irq_put (adev, &adev->gmc.vm_fault,0 ); +if (adev->gmc.ecc_irq.funcs && +amdgpu_ras_is_supported (adev,AMDGPU_RAS_BLOCK__UMC )) +amdgpu_irq_put (adev, &adev->gmc.ecc_irq,0 ); +return 0 ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 227/353 drm/amd/display: Fix minor issues in BW Allocation Phase2
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Meenakshikumar Somasundaram <[email protected]>
[ Upstream commit aa5dc05340eb97486a631ce6bccb8d020bf6b56b ]
[Why]
Fix minor issues in BW Allocation Phase2.
[How]
- In set_usb4_req_bw_req(), link->dpia_bw_alloc_config.response_ready flag should be reset before writing DPCD REQUEST_BW.
- Fix the granularity for value of 2 in get_bw_granularity().
- Removed bandwidth allocation support display fw boot option as the fw would read feature enable status from bios.
- Clean up DPIA_EST_BW_CHANGED and DPIA_BW_REQ_SUCCESS cases in dpia_handle_bw_alloc_response().
- Removed allocate_usb4_bw and deallocate_usb4_bw.
- Optimized loop in get_lowest_dpia_index().
- Updated link_dp_dpia_allocate_usb4_bandwidth_for_stream() and set_usb4_req_bw_req() to always issue request bw.
--- .../dc/link/protocols/link_dp_dpia_bw.c | 221 ++++++++---------- .../dc/link/protocols/link_dp_dpia_bw.h | 4 +- 2 files changed, 101 insertions(+), 124 deletions(-)
drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_dpia_bw.c +99 -122
@@ -50,6 +50,7 @@ static bool get_bw_alloc_proceed_flag(struct dc_link *tmp) && tmp->hpd_status && tmp->dpia_bw_alloc_config.bw_alloc_enabled); } +static void reset_bw_alloc_struct (struct dc_link *link) { link->dpia_bw_alloc_config.bw_alloc_enabled = false;
@@ -59,6 +60,11 @@ static void reset_bw_alloc_struct(struct dc_link *link) link->dpia_bw_alloc_config.bw_granularity =0 ; link->dpia_bw_alloc_config.response_ready = false; } + +#define BW_GRANULARITY_0 4 // 0.25 Gbps +#define BW_GRANULARITY_1 2 // 0.5 Gbps +#define BW_GRANULARITY_2 1 // 1 Gbps +static uint8_t get_bw_granularity (struct dc_link *link) {uint8_t bw_granularity =0 ;
@@ -71,16 +77,20 @@ static uint8_t get_bw_granularity(struct dc_link *link)switch (bw_granularity &0x3 ) {case 0 : - bw_granularity =4 ; + bw_granularity =BW_GRANULARITY_0 ;break ;case 1 : + bw_granularity =BW_GRANULARITY_1 ; +break ; +case 2 :default : - bw_granularity =2 ; + bw_granularity =BW_GRANULARITY_2 ;break ; }return bw_granularity; } +static int get_estimated_bw (struct dc_link *link) {uint8_t bw_estimated_bw =0 ;
@@ -93,31 +103,7 @@ static int get_estimated_bw(struct dc_link *link)return bw_estimated_bw * (Kbps_TO_Gbps / link->dpia_bw_alloc_config.bw_granularity); } -static bool allocate_usb4_bw (int *stream_allocated_bw,int bw_needed,struct dc_link *link) -{ -if (bw_needed >0 ) - *stream_allocated_bw += bw_needed; - -return true; -} -static bool deallocate_usb4_bw (int *stream_allocated_bw,int bw_to_dealloc,struct dc_link *link) -{ -bool ret = false; - -if (*stream_allocated_bw >0 ) { - *stream_allocated_bw -= bw_to_dealloc; - ret = true; - }else { -//Do nothing for now - ret = true; - } -// Unplug so reset values -if (!link->hpd_status) -reset_bw_alloc_struct (link); - -return ret; -}/* * Read all New BW alloc configuration ex: estimated_bw, allocated_bw, * granuality, Driver_ID, CM_Group, & populate the BW allocation structs
@@ -128,7 +114,12 @@ static void init_usb4_bw_struct(struct dc_link *link)// Init the known values link->dpia_bw_alloc_config.bw_granularity =get_bw_granularity (link); link->dpia_bw_alloc_config.estimated_bw =get_estimated_bw (link); + +DC_LOG_DEBUG ("%s: bw_granularity(%d), estimated_bw(%d)\n" , + __func__, link->dpia_bw_alloc_config.bw_granularity, + link->dpia_bw_alloc_config.estimated_bw); } +static uint8_t get_lowest_dpia_index (struct dc_link *link) {const struct dc *dc_struct = link->dc;
@@ -141,12 +132,15 @@ static uint8_t get_lowest_dpia_index(struct dc_link *link) dc_struct->links[i]->ep_type != DISPLAY_ENDPOINT_USB4_DPIA) continue; -if (idx > dc_struct->links[i]->link_index) +if (idx > dc_struct->links[i]->link_index) { idx = dc_struct->links[i]->link_index; +break ; + } }return idx; } +/* * Get the Max Available BW or Max Estimated BW for each Host Router *
@@ -186,6 +180,7 @@ static int get_host_router_total_bw(struct dc_link *link, uint8_t type)return total_bw; } +/* * Cleanup function for when the dpia is unplugged to reset struct * and perform any required clean up
@@ -194,42 +189,50 @@ static int get_host_router_total_bw(struct dc_link *link, uint8_t type)* * return: none */ -static bool dpia_bw_alloc_unplug (struct dc_link *link) +static void dpia_bw_alloc_unplug (struct dc_link *link) { -if (!link) -return true; - -return deallocate_usb4_bw (&link->dpia_bw_alloc_config.sink_allocated_bw, - link->dpia_bw_alloc_config.sink_allocated_bw, link); +if (link) { +DC_LOG_DEBUG ("%s: resetting bw alloc config for link(%d)\n" , + __func__, link->link_index); + link->dpia_bw_alloc_config.sink_allocated_bw =0 ; +reset_bw_alloc_struct (link); + } } +static void set_usb4_req_bw_req (struct dc_link *link,int req_bw) {uint8_t requested_bw;uint32_t temp; -// 1. Add check for this corner case #1 -if (req_bw > link->dpia_bw_alloc_config.estimated_bw) +/* Error check whether request bw greater than allocated */ +if (req_bw > link->dpia_bw_alloc_config.estimated_bw) { +DC_LOG_ERROR ("%s: Request bw greater than estimated bw for link(%d)\n" , + __func__, link->link_index); req_bw = link->dpia_bw_alloc_config.estimated_bw; + } temp = req_bw * link->dpia_bw_alloc_config.bw_granularity; requested_bw = temp / Kbps_TO_Gbps; -// Always make sure to add more to account for floating points +/* Always make sure to add more to account for floating points */ if (temp % Kbps_TO_Gbps) ++requested_bw; -// 2. Add check for this corner case #2 +/* Error check whether requested and allocated are equal */ req_bw = requested_bw * (Kbps_TO_Gbps / link->dpia_bw_alloc_config.bw_granularity); -if (req_bw == link->dpia_bw_alloc_config.sink_allocated_bw) -return ; +if (req_bw == link->dpia_bw_alloc_config.sink_allocated_bw) { +DC_LOG_ERROR ("%s: Request bw equals to allocated bw for link(%d)\n" , + __func__, link->link_index); + } -if (core_link_write_dpcd ( + link->dpia_bw_alloc_config.response_ready = false;// Reset flag +core_link_write_dpcd ( link,REQUESTED_BW , &requested_bw, -sizeof (uint8_t )) ==DC_OK ) - link->dpia_bw_alloc_config.response_ready = false;// Reset flag +sizeof (uint8_t )); } +/* * Return the response_ready flag from dc_link struct *
@@ -241,6 +244,7 @@ static bool get_cm_response_ready_flag(struct dc_link *link) {return link->dpia_bw_alloc_config.response_ready; } +// ------------------------------------------------------------------ // PUBLIC FUNCTIONS // ------------------------------------------------------------------
@@ -277,27 +281,27 @@ bool link_dp_dpia_set_dptx_usb4_bw_alloc_support(struct dc_link *link) DPTX_BW_ALLOCATION_MODE_CONTROL, &response, sizeof(uint8_t)) != DC_OK) { - DC_LOG_DEBUG("%s: **** FAILURE Enabling DPtx BW Allocation Mode Support ***\n", - __func__); + DC_LOG_DEBUG("%s: FAILURE Enabling DPtx BW Allocation Mode Support for link(%d)\n", + __func__, link->link_index); } else {// SUCCESS Enabled DPtx BW Allocation Mode Support - link->dpia_bw_alloc_config.bw_alloc_enabled = true; -DC_LOG_DEBUG ("%s: **** SUCCESS Enabling DPtx BW Allocation Mode Support ***\n" , - __func__); +DC_LOG_DEBUG ("%s: SUCCESS Enabling DPtx BW Allocation Mode Support for link(%d)\n" , + __func__, link->link_index); ret = true;init_usb4_bw_struct (link); + link->dpia_bw_alloc_config.bw_alloc_enabled = true; } } out:return ret; } +void dpia_handle_bw_alloc_response (struct dc_link *link,uint8_t bw,uint8_t result) {int bw_needed =0 ;int estimated =0 ; -int host_router_total_estimated_bw =0 ;if (!get_bw_alloc_proceed_flag ((link)))return ;
@@ -306,14 +310,22 @@ void dpia_handle_bw_alloc_response(struct dc_link *link, uint8_t bw, uint8_t rescase DPIA_BW_REQ_FAILED : -DC_LOG_DEBUG ("%s: *** *** BW REQ FAILURE for DP-TX Request *** ***\n" , __func__); +/* +* Ideally, we shouldn't run into this case as we always validate available +* bandwidth and request within that limit +*/ + estimated = bw * (Kbps_TO_Gbps / link->dpia_bw_alloc_config.bw_granularity); -// Update the new Estimated BW value updated by CM - link->dpia_bw_alloc_config.estimated_bw = - bw * (Kbps_TO_Gbps / link->dpia_bw_alloc_config.bw_granularity); +DC_LOG_ERROR ("%s: BW REQ FAILURE for DP-TX Request for link(%d)\n" , + __func__, link->link_index); +DC_LOG_ERROR ("%s: current estimated_bw(%d), new estimated_bw(%d)\n" , + __func__, link->dpia_bw_alloc_config.estimated_bw, estimated); +/* Update the new Estimated BW value updated by CM */ + link->dpia_bw_alloc_config.estimated_bw = estimated; + +/* Allocate the previously requested bandwidth */ set_usb4_req_bw_req (link, link->dpia_bw_alloc_config.estimated_bw); - link->dpia_bw_alloc_config.response_ready = false;/* * If FAIL then it is either:
@@ -326,68 +338,34 @@ void dpia_handle_bw_alloc_response(struct dc_link *link, uint8_t bw, uint8_t rescase DPIA_BW_REQ_SUCCESS : -DC_LOG_DEBUG ("%s: *** BW REQ SUCCESS for DP-TX Request ***\n" , __func__); - -// 1. SUCCESS 1st time before any Pruning is done -// 2. SUCCESS after prev. FAIL before any Pruning is done -// 3. SUCCESS after Pruning is done but before enabling link - bw_needed = bw * (Kbps_TO_Gbps / link->dpia_bw_alloc_config.bw_granularity); -// 1. -if (!link->dpia_bw_alloc_config.sink_allocated_bw) { - -allocate_usb4_bw (&link->dpia_bw_alloc_config.sink_allocated_bw, bw_needed, link); - link->dpia_bw_alloc_config.sink_verified_bw = - link->dpia_bw_alloc_config.sink_allocated_bw; +DC_LOG_DEBUG ("%s: BW REQ SUCCESS for DP-TX Request for link(%d)\n" , + __func__, link->link_index); +DC_LOG_DEBUG ("%s: current allocated_bw(%d), new allocated_bw(%d)\n" , + __func__, link->dpia_bw_alloc_config.sink_allocated_bw, bw_needed); -// SUCCESS from first attempt -if (link->dpia_bw_alloc_config.sink_allocated_bw > - link->dpia_bw_alloc_config.sink_max_bw) - link->dpia_bw_alloc_config.sink_verified_bw = - link->dpia_bw_alloc_config.sink_max_bw; - } -// 3. -else if (link->dpia_bw_alloc_config.sink_allocated_bw) { - -// Find out how much do we need to de-alloc -if (link->dpia_bw_alloc_config.sink_allocated_bw > bw_needed) -deallocate_usb4_bw (&link->dpia_bw_alloc_config.sink_allocated_bw, - link->dpia_bw_alloc_config.sink_allocated_bw - bw_needed, link); -else -allocate_usb4_bw (&link->dpia_bw_alloc_config.sink_allocated_bw, - bw_needed - link->dpia_bw_alloc_config.sink_allocated_bw, link); - } - -// 4. If this is the 2nd sink then any unused bw will be reallocated to master DPIA -// => check if estimated_bw changed + link->dpia_bw_alloc_config.sink_allocated_bw = bw_needed; link->dpia_bw_alloc_config.response_ready = true;break ;case DPIA_EST_BW_CHANGED : -DC_LOG_DEBUG ("%s: *** ESTIMATED BW CHANGED for DP-TX Request ***\n" , __func__); - estimated = bw * (Kbps_TO_Gbps / link->dpia_bw_alloc_config.bw_granularity); - host_router_total_estimated_bw =get_host_router_total_bw (link,HOST_ROUTER_BW_ESTIMATED ); -// 1. If due to unplug of other sink -if (estimated == host_router_total_estimated_bw) { -// First update the estimated & max_bw fields -if (link->dpia_bw_alloc_config.estimated_bw < estimated) - link->dpia_bw_alloc_config.estimated_bw = estimated; - } -// 2. If due to realloc bw btw 2 dpia due to plug OR realloc unused Bw -else { -// We lost estimated bw usually due to plug event of other dpia - link->dpia_bw_alloc_config.estimated_bw = estimated; - } +DC_LOG_DEBUG ("%s: ESTIMATED BW CHANGED for link(%d)\n" , + __func__, link->link_index); +DC_LOG_DEBUG ("%s: current estimated_bw(%d), new estimated_bw(%d)\n" , + __func__, link->dpia_bw_alloc_config.estimated_bw, estimated); + + link->dpia_bw_alloc_config.estimated_bw = estimated;break ;case DPIA_BW_ALLOC_CAPS_CHANGED : -DC_LOG_DEBUG ("%s: *** BW ALLOC CAPABILITY CHANGED for DP-TX Request ***\n" , __func__); +DC_LOG_ERROR ("%s: BW ALLOC CAPABILITY CHANGED to Disabled for link(%d)\n" , + __func__, link->link_index); link->dpia_bw_alloc_config.bw_alloc_enabled = false;break ; }
@@ -409,11 +387,11 @@ int dpia_handle_usb4_bandwidth_allocation_for_link(struct dc_link *link, int peaset_usb4_req_bw_req (link, link->dpia_bw_alloc_config.sink_max_bw);do { -if (!(timeout >0 )) +if (timeout >0 ) timeout--;else break ; -fsleep (10 *1000 ); +msleep (10 ); }while (!get_cm_response_ready_flag (link));if (!timeout)
@@ -428,37 +406,36 @@ int dpia_handle_usb4_bandwidth_allocation_for_link(struct dc_link *link, int pea out:return ret; } -int link_dp_dpia_allocate_usb4_bandwidth_for_stream (struct dc_link *link,int req_bw) + +bool link_dp_dpia_allocate_usb4_bandwidth_for_stream (struct dc_link *link,int req_bw) { -int ret =0 ; +bool ret = false;uint8_t timeout =10 ; +DC_LOG_DEBUG ("%s: ENTER: link(%d), hpd_status(%d), current allocated_bw(%d), req_bw(%d)\n" , + __func__, link->link_index, link->hpd_status, + link->dpia_bw_alloc_config.sink_allocated_bw, req_bw); +if (!get_bw_alloc_proceed_flag (link)) goto out; -/* -* Sometimes stream uses same timing parameters as the already -* allocated max sink bw so no need to re-alloc -*/ -if (req_bw != link->dpia_bw_alloc_config.sink_allocated_bw) { -set_usb4_req_bw_req (link, req_bw); -do { -if (!(timeout >0 )) - timeout--; -else -break ; -udelay (10 *1000 ); - }while (!get_cm_response_ready_flag (link)); +set_usb4_req_bw_req (link, req_bw); +do { +if (timeout >0 ) + timeout--; +else +break ; +msleep (10 ); + }while (!get_cm_response_ready_flag (link)); -if (!timeout) - ret =0 ;// ERROR TIMEOUT waiting for response for allocating bw -else if (link->dpia_bw_alloc_config.sink_allocated_bw >0 ) - ret =get_host_router_total_bw (link,HOST_ROUTER_BW_ALLOCATED ); - } +if (timeout) + ret = true; out: +DC_LOG_DEBUG ("%s: EXIT: timeout(%d), ret(%d)\n" , __func__, timeout, ret);return ret; } +bool dpia_validate_usb4_bw (struct dc_link **link,int *bw_needed_per_dpia,const unsigned int num_dpias) {bool ret = true;
drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_dpia_bw.h +2 -2
@@ -59,9 +59,9 @@ bool link_dp_dpia_set_dptx_usb4_bw_alloc_support(struct dc_link *link);* @link: pointer to the dc_link struct instance * @req_bw: Bw requested by the stream * -* return: allocated bw else return 0 +* return: true if allocated successfully */ -int link_dp_dpia_allocate_usb4_bandwidth_for_stream (struct dc_link *link,int req_bw); +bool link_dp_dpia_allocate_usb4_bandwidth_for_stream (struct dc_link *link,int req_bw);/* * Handle the USB4 BW Allocation related functionality here:
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 228/353 drm/amdgpu: Let KFD sync with VM fences
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Felix Kuehling <[email protected]>
[ Upstream commit ec9ba4821fa52b5efdbc4cdf0a77497990655231 ]
Change the rules for amdgpu_sync_resv to let KFD synchronize with VM fences on page table reservations. This fixes intermittent memory corruption after evictions when using amdgpu_vm_handle_moved to update page tables for VM mappings managed through render nodes.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c +2 -1
@@ -191,7 +191,8 @@ static bool amdgpu_sync_test_fence(struct amdgpu_device *adev,/* Never sync to VM updates either. */ if (fence_owner ==AMDGPU_FENCE_OWNER_VM && - owner !=AMDGPU_FENCE_OWNER_UNDEFINED ) + owner !=AMDGPU_FENCE_OWNER_UNDEFINED && + owner !=AMDGPU_FENCE_OWNER_KFD )return false;/* Ignore fences depending on the sync mode */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 229/353 Re-revert "drm/amd/display: Enable Replay for static screen use cases"
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ivan Lipski <[email protected]>
[ Upstream commit d6398866a6b47e92319ef6efdb0126a4fbb7796a ]
This reverts commit 44e60b14d5a72f91fd0bdeae8da59ae37a3ca8e5.
Since, it causes a regression in which eDP displays with PSR support, but no Replay support (Sink support <= 0x03), fail to enable PSR and consequently all IGT amd_psr tests fail. So, revert this until a more suitable fix can be found.
This got brought back accidently with the backmerge.
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 22 ------------------- .../amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 9 +------- drivers/gpu/drm/amd/include/amd_shared.h | 2 -- 3 files changed, 1 insertion(+), 32 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0 -22
@@ -65,7 +65,6 @@#include "amdgpu_dm_debugfs.h" #endif #include "amdgpu_dm_psr.h" -#include "amdgpu_dm_replay.h" #include "ivsrcid/ivsrcid_vislands30.h"
@@ -4348,7 +4347,6 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)enum dc_connection_type new_connection_type = dc_connection_none;const struct dc_plane_cap *plane;bool psr_feature_enabled = false; -bool replay_feature_enabled = false;int max_overlay = dm->dc->caps.max_slave_planes; dm->display_indexes_num = dm->dc->caps.max_streams;
@@ -4460,20 +4458,6 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev) } } -if (!(amdgpu_dc_debug_mask &DC_DISABLE_REPLAY )) { -switch (adev->ip_versions[DCE_HWIP ][0 ]) { -case IP_VERSION (3 ,1 ,4 ): -case IP_VERSION (3 ,1 ,5 ): -case IP_VERSION (3 ,1 ,6 ): -case IP_VERSION (3 ,2 ,0 ): -case IP_VERSION (3 ,2 ,1 ): - replay_feature_enabled = true; -break ; -default : - replay_feature_enabled = amdgpu_dc_feature_mask &DC_REPLAY_MASK ; -break ; - } - }/* loops over all connectors on the board */ for (i =0 ; i < link_cnt; i++) {struct dc_link *link =NULL ;
@@ -4522,12 +4506,6 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)amdgpu_dm_update_connector_after_detect (aconnector);setup_backlight_device (dm, aconnector); -/* -* Disable psr if replay can be enabled -*/ -if (replay_feature_enabled &&amdgpu_dm_setup_replay (link, aconnector)) - psr_feature_enabled = false; -if (psr_feature_enabled)amdgpu_dm_set_psr_caps (link);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c +1 -8
@@ -29,7 +29,6 @@#include "dc.h" #include "amdgpu.h" #include "amdgpu_dm_psr.h" -#include "amdgpu_dm_replay.h" #include "amdgpu_dm_crtc.h" #include "amdgpu_dm_plane.h" #include "amdgpu_dm_trace.h"
@@ -124,12 +123,7 @@ static void amdgpu_dm_crtc_vblank_control_worker(struct work_struct *work)* fill_dc_dirty_rects(). */ if (vblank_work->stream && vblank_work->stream->link) { -/* -* Prioritize replay, instead of psr -*/ -if (vblank_work->stream->link->replay_settings.replay_feature_enabled) -amdgpu_dm_replay_enable (vblank_work->stream, false); -else if (vblank_work->enable) { +if (vblank_work->enable) {if (vblank_work->stream->link->psr_settings.psr_version <DC_PSR_VERSION_SU_1 && vblank_work->stream->link->psr_settings.psr_allow_active)amdgpu_dm_psr_disable (vblank_work->stream);
@@ -138,7 +132,6 @@ static void amdgpu_dm_crtc_vblank_control_worker(struct work_struct *work)#ifdef CONFIG_DRM_AMD_SECURE_DISPLAY !amdgpu_dm_crc_window_is_activated(&vblank_work->acrtc->base) && #endif - vblank_work->stream->link->panel_config.psr.disallow_replay && vblank_work->acrtc->dm_irq_params.allow_psr_entry) {amdgpu_dm_psr_enable (vblank_work->stream); }
drivers/gpu/drm/amd/include/amd_shared.h +0 -2
@@ -244,7 +244,6 @@ enum DC_FEATURE_MASK {DC_DISABLE_LTTPR_DP2_0 = (1 <<6 ),//0x40, disabled by default DC_PSR_ALLOW_SMU_OPT = (1 <<7 ),//0x80, disabled by default DC_PSR_ALLOW_MULTI_DISP_OPT = (1 << 8), //0x100, disabled by default - DC_REPLAY_MASK = (1 << 9), //0x200, disabled by default for dcn < 3.1.4 }; enum DC_DEBUG_MASK {
@@ -255,7 +254,6 @@ enum DC_DEBUG_MASK {DC_DISABLE_PSR =0x10 ,DC_FORCE_SUBVP_MCLK_SWITCH =0x20 ,DC_DISABLE_MPO =0x40 , -DC_DISABLE_REPLAY =0x50 , DC_ENABLE_DPIA_TRACE = 0x80, };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 230/353 drm/amdgpu: Fix possible NULL dereference in amdgpu_ras_query_error_status_helper()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Srinivasan Shanmugam <[email protected]>
[ Upstream commit b8d55a90fd55b767c25687747e2b24abd1ef8680 ]
Return invalid error code -EINVAL for invalid block id.
Fixes the below:
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c:1183 amdgpu_ras_query_error_status_helper() error: we previously assumed 'info' could be null (see line 1176)
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +3 -0
@@ -1174,6 +1174,9 @@ static int amdgpu_ras_query_error_status_helper(struct amdgpu_device *adev,enum amdgpu_ras_block blk = info ? info->head.block :AMDGPU_RAS_BLOCK_COUNT ;struct amdgpu_ras_block_object *block_obj =NULL ; +if (blk ==AMDGPU_RAS_BLOCK_COUNT ) +return -EINVAL ; +if (error_query_mode ==AMDGPU_RAS_INVALID_ERROR_QUERY )return -EINVAL ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 231/353 drm/amdgpu: Fix variable mca_funcs dereferenced before NULL check in amdgpu_mca_smu_get_mca_entry()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Srinivasan Shanmugam <[email protected]>
[ Upstream commit 4f32504a2f85a7b40fe149436881381f48e9c0c0 ]
Fixes the below:
drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c:377 amdgpu_mca_smu_get_mca_entry() warn: variable dereferenced before check 'mca_funcs' (see line 368)
357 int amdgpu_mca_smu_get_mca_entry(struct amdgpu_device *adev,
enum amdgpu_mca_error_type type,
358 int idx, struct mca_bank_entry *entry)
359 {
360 const struct amdgpu_mca_smu_funcs *mca_funcs =
adev->mca.mca_funcs;
361 int count;
362
363 switch (type) {
364 case AMDGPU_MCA_ERROR_TYPE_UE:
365 count = mca_funcs->max_ue_count;
mca_funcs is dereferenced here.
366 break;
367 case AMDGPU_MCA_ERROR_TYPE_CE:
368 count = mca_funcs->max_ce_count;
mca_funcs is dereferenced here.
369 break;
370 default:
371 return -EINVAL;
372 }
373
374 if (idx >= count)
375 return -EINVAL;
376
377 if (mca_funcs && mca_funcs->mca_get_mca_entry)
^^^^^^^^^
Checked too late!
--- drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c +4 -4
@@ -351,6 +351,9 @@ int amdgpu_mca_smu_get_mca_entry(struct amdgpu_device *adev, enum amdgpu_mca_errconst struct amdgpu_mca_smu_funcs *mca_funcs = adev->mca.mca_funcs;int count; +if (!mca_funcs || !mca_funcs->mca_get_mca_entry) +return -EOPNOTSUPP ; +switch (type) {case AMDGPU_MCA_ERROR_TYPE_UE : count = mca_funcs->max_ue_count;
@@ -365,10 +368,7 @@ int amdgpu_mca_smu_get_mca_entry(struct amdgpu_device *adev, enum amdgpu_mca_errif (idx >= count)return -EINVAL ; -if (mca_funcs && mca_funcs->mca_get_mca_entry) -return mca_funcs->mca_get_mca_entry (adev, type, idx, entry); - -return -EOPNOTSUPP ; +return mca_funcs->mca_get_mca_entry (adev, type, idx, entry); }#if defined(CONFIG_DEBUG_FS )
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 232/353 drm/amdgpu: Fix *fw from request_firmware() not released in amdgpu_ucode_request()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Srinivasan Shanmugam <[email protected]>
[ Upstream commit 13a1851f923d9a7a78a477497295c2dfd16ad4a4 ]
Fixes the below:drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c:1404 amdgpu_ucode_request() warn: '*fw' from request_firmware() not released on lines: 1404.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c +5 -1
@@ -1397,9 +1397,13 @@ int amdgpu_ucode_request(struct amdgpu_device *adev, const struct firmware **fw,if (err)return -ENODEV ; + err =amdgpu_ucode_validate (*fw); -if (err) +if (err) {dev_dbg (adev->dev,"\"%s\" failed to validate\n" , fw_name); +release_firmware (*fw); + *fw =NULL ; + }return err; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 233/353 drm/amdgpu: Drop fence check in to_amdgpu_amdkfd_fence()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Srinivasan Shanmugam <[email protected]>
[ Upstream commit bf2ad4fb8adca89374b54b225d494e0b1956dbea ]
Return value of container_of(...) can't be null, so null check is not required for 'fence'. Hence drop its NULL check.
Fixes the below:drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c:93 to_amdgpu_amdkfd_fence() warn: can 'fence' even be NULL?
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c +1 -1
@@ -90,7 +90,7 @@ struct amdgpu_amdkfd_fence *to_amdgpu_amdkfd_fence(struct dma_fence *f)return NULL ; fence = container_of(f, struct amdgpu_amdkfd_fence, base); -if (fence && f->ops == &amdkfd_fence_ops) +if (f->ops == &amdkfd_fence_ops)return fence;return NULL ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 234/353 drm/amdkfd: Fix iterator used outside loop in kfd_add_peer_prop()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Srinivasan Shanmugam <[email protected]>
[ Upstream commit b1a428b45dc7e47c7acc2ad0d08d8a6dda910c4c ]
Fix the following about iterator use:drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:1456 kfd_add_peer_prop() warn: iterator used outside loop: 'iolink3'
--- drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 24 ++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_topology.c +13 -11
@@ -1452,17 +1452,19 @@ static int kfd_add_peer_prop(struct kfd_topology_device *kdev,/* CPU->CPU link*/ cpu_dev =kfd_topology_device_by_proximity_domain (iolink1->node_to);if (cpu_dev) { -list_for_each_entry (iolink3, &cpu_dev->io_link_props, list) -if (iolink3->node_to == iolink2->node_to) -break ; - - props->weight += iolink3->weight; - props->min_latency += iolink3->min_latency; - props->max_latency += iolink3->max_latency; - props->min_bandwidth =min (props->min_bandwidth, - iolink3->min_bandwidth); - props->max_bandwidth =min (props->max_bandwidth, - iolink3->max_bandwidth); +list_for_each_entry (iolink3, &cpu_dev->io_link_props, list) { +if (iolink3->node_to != iolink2->node_to) +continue ; + + props->weight += iolink3->weight; + props->min_latency += iolink3->min_latency; + props->max_latency += iolink3->max_latency; + props->min_bandwidth =min (props->min_bandwidth, + iolink3->min_bandwidth); + props->max_bandwidth =min (props->max_bandwidth, + iolink3->max_bandwidth); +break ; + } }else {WARN (1 ,"CPU node not found" ); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 235/353 drm/amdgpu: apply the RV2 system aperture fix to RN/CZN as well
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
[ Upstream commit 16783d8ef08448815e149e40c82fc1e1fc41ddbf ]
These chips needs the same fix. This was previously not seen on then since the AGP aperture expanded the system aperture, but this showed up again when AGP was disabled.
--- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 4 +++- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c | 4 +++- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 4 +++- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 ++++++-- 4 files changed, 15 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +3 -1
@@ -102,7 +102,9 @@ static void gfxhub_v1_0_init_system_aperture_regs(struct amdgpu_device *adev)WREG32_SOC15_RLC (GC ,0 , mmMC_VM_SYSTEM_APERTURE_LOW_ADDR,min (adev->gmc.fb_start, adev->gmc.agp_start) >>18 ); -if (adev->apu_flags &AMD_APU_IS_RAVEN2 ) +if (adev->apu_flags & (AMD_APU_IS_RAVEN2 | +AMD_APU_IS_RENOIR | +AMD_APU_IS_GREEN_SARDINE ))/* * Raven2 has a HW issue that it is unable to use the * vram which is out of MC_VM_SYSTEM_APERTURE_HIGH_ADDR.
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c +3 -1
@@ -139,7 +139,9 @@ gfxhub_v1_2_xcc_init_system_aperture_regs(struct amdgpu_device *adev,WREG32_SOC15_RLC (GC ,GET_INST (GC , i), regMC_VM_SYSTEM_APERTURE_LOW_ADDR,min (adev->gmc.fb_start, adev->gmc.agp_start) >>18 ); -if (adev->apu_flags &AMD_APU_IS_RAVEN2 ) +if (adev->apu_flags & (AMD_APU_IS_RAVEN2 | +AMD_APU_IS_RENOIR | +AMD_APU_IS_GREEN_SARDINE ))/* * Raven2 has a HW issue that it is unable to use the * vram which is out of MC_VM_SYSTEM_APERTURE_HIGH_ADDR.
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +3 -1
@@ -96,7 +96,9 @@ static void mmhub_v1_0_init_system_aperture_regs(struct amdgpu_device *adev)WREG32_SOC15 (MMHUB ,0 , mmMC_VM_SYSTEM_APERTURE_LOW_ADDR,min (adev->gmc.fb_start, adev->gmc.agp_start) >>18 ); -if (adev->apu_flags &AMD_APU_IS_RAVEN2 ) +if (adev->apu_flags & (AMD_APU_IS_RAVEN2 | +AMD_APU_IS_RENOIR | +AMD_APU_IS_GREEN_SARDINE ))/* * Raven2 has a HW issue that it is unable to use the vram which * is out of MC_VM_SYSTEM_APERTURE_HIGH_ADDR. So here is the
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +6 -2
@@ -1257,7 +1257,9 @@ static void mmhub_read_system_context(struct amdgpu_device *adev, struct dc_phy_/* AGP aperture is disabled */ if (agp_bot > agp_top) { logical_addr_low = adev->gmc.fb_start >>18 ; -if (adev->apu_flags &AMD_APU_IS_RAVEN2 ) +if (adev->apu_flags & (AMD_APU_IS_RAVEN2 | +AMD_APU_IS_RENOIR | +AMD_APU_IS_GREEN_SARDINE ))/* * Raven2 has a HW issue that it is unable to use the vram which * is out of MC_VM_SYSTEM_APERTURE_HIGH_ADDR. So here is the
@@ -1269,7 +1271,9 @@ static void mmhub_read_system_context(struct amdgpu_device *adev, struct dc_phy_ logical_addr_high = adev->gmc.fb_end >>18 ; }else { logical_addr_low =min (adev->gmc.fb_start, adev->gmc.agp_start) >>18 ; -if (adev->apu_flags &AMD_APU_IS_RAVEN2 ) +if (adev->apu_flags & (AMD_APU_IS_RAVEN2 | +AMD_APU_IS_RENOIR | +AMD_APU_IS_GREEN_SARDINE ))/* * Raven2 has a HW issue that it is unable to use the vram which * is out of MC_VM_SYSTEM_APERTURE_HIGH_ADDR. So here is the
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 236/353 ALSA: hda/conexant: Fix headset auto detect fail in cx8070 and SN6140
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: bo liu <[email protected]>
[ Upstream commit 7aeb259086487417f0fecf66e325bee133e8813a ]
When OMTP headset plugin the headset jack of CX8070 and SN6160 sound cards, the headset type detection circuit will recognize the headset type as CTIA. At this point, plugout and plugin the headset will get the correct headset type as OMTP.
The reason for the failure of headset type recognition is that the sound card creation will enable the VREF voltage of the headset mic, which interferes with the headset type automatic detection circuit. Plugout and plugin the headset will restart the headset detection and get the correct headset type.
The patch is disable the VREF voltage when the headset is not present, and will enable the VREF voltage when the headset is present.
--- sound/pci/hda/patch_conexant.c | 115 ++++++++++++++++++++++++++++++++- 1 file changed, 113 insertions(+), 2 deletions(-)
sound/pci/hda/patch_conexant.c +113 -2
@@ -21,6 +21,12 @@#include "hda_jack.h" #include "hda_generic.h" +enum { +CX_HEADSET_NOPRESENT =0 , +CX_HEADSET_PARTPRESENT , +CX_HEADSET_ALLPRESENT , +}; +struct conexant_spec {struct hda_gen_spec gen;
@@ -42,7 +48,8 @@ struct conexant_spec {unsigned int gpio_led;unsigned int gpio_mute_led_mask;unsigned int gpio_mic_led_mask; - +unsigned int headset_present_flag; +bool is_cx8070_sn6140; };
@@ -164,6 +171,27 @@ static void cxt_init_gpio_led(struct hda_codec *codec) } } +static void cx_fixup_headset_recog (struct hda_codec *codec) +{ +unsigned int mic_persent; + +/* fix some headset type recognize fail issue, such as EDIFIER headset */ +/* set micbiasd output current comparator threshold from 66% to 55%. */ +snd_hda_codec_write (codec,0x1c ,0 ,0x320 ,0x010 ); +/* set OFF voltage for DFET from -1.2V to -0.8V, set headset micbias registor +* value adjustment trim from 2.2K ohms to 2.0K ohms. +*/ +snd_hda_codec_write (codec,0x1c ,0 ,0x3b0 ,0xe10 ); +/* fix reboot headset type recognize fail issue */ + mic_persent =snd_hda_codec_read (codec,0x19 ,0 ,AC_VERB_GET_PIN_SENSE ,0x0 ); +if (mic_persent &AC_PINSENSE_PRESENCE ) +/* enable headset mic VREF */ +snd_hda_codec_write (codec,0x19 ,0 ,AC_VERB_SET_PIN_WIDGET_CONTROL ,0x24 ); +else +/* disable headset mic VREF */ +snd_hda_codec_write (codec,0x19 ,0 ,AC_VERB_SET_PIN_WIDGET_CONTROL ,0x20 ); +} +static int cx_auto_init (struct hda_codec *codec) {struct conexant_spec *spec = codec->spec;
@@ -174,6 +202,9 @@ static int cx_auto_init(struct hda_codec *codec)cxt_init_gpio_led (codec);snd_hda_apply_fixup (codec,HDA_FIXUP_ACT_INIT ); +if (spec->is_cx8070_sn6140) +cx_fixup_headset_recog (codec); +return 0 ; }
@@ -192,6 +223,77 @@ static void cx_auto_free(struct hda_codec *codec)snd_hda_gen_free (codec); } +static void cx_process_headset_plugin (struct hda_codec *codec) +{ +unsigned int val; +unsigned int count =0 ; + +/* Wait headset detect done. */ +do { + val =snd_hda_codec_read (codec,0x1c ,0 ,0xca0 ,0x0 ); +if (val &0x080 ) { +codec_dbg (codec,"headset type detect done!\n" ); +break ; + } +msleep (20 ); + count++; + }while (count <3 ); + val =snd_hda_codec_read (codec,0x1c ,0 ,0xcb0 ,0x0 ); +if (val &0x800 ) { +codec_dbg (codec,"headset plugin, type is CTIA\n" ); +snd_hda_codec_write (codec,0x19 ,0 ,AC_VERB_SET_PIN_WIDGET_CONTROL ,0x24 ); + }else if (val &0x400 ) { +codec_dbg (codec,"headset plugin, type is OMTP\n" ); +snd_hda_codec_write (codec,0x19 ,0 ,AC_VERB_SET_PIN_WIDGET_CONTROL ,0x24 ); + }else { +codec_dbg (codec,"headphone plugin\n" ); + } +} + +static void cx_update_headset_mic_vref (struct hda_codec *codec,unsigned int res) +{ +unsigned int phone_present, mic_persent, phone_tag, mic_tag; +struct conexant_spec *spec = codec->spec; + +/* In cx8070 and sn6140, the node 16 can only be config to headphone or disabled, +* the node 19 can only be config to microphone or disabled. +* Check hp&mic tag to process headset pulgin&plugout. +*/ + phone_tag =snd_hda_codec_read (codec,0x16 ,0 ,AC_VERB_GET_UNSOLICITED_RESPONSE ,0x0 ); + mic_tag =snd_hda_codec_read (codec,0x19 ,0 ,AC_VERB_GET_UNSOLICITED_RESPONSE ,0x0 ); +if ((phone_tag & (res >>AC_UNSOL_RES_TAG_SHIFT )) || + (mic_tag & (res >>AC_UNSOL_RES_TAG_SHIFT ))) { + phone_present =snd_hda_codec_read (codec,0x16 ,0 ,AC_VERB_GET_PIN_SENSE ,0x0 ); +if (!(phone_present &AC_PINSENSE_PRESENCE )) {/* headphone plugout */ + spec->headset_present_flag =CX_HEADSET_NOPRESENT ; +snd_hda_codec_write (codec,0x19 ,0 ,AC_VERB_SET_PIN_WIDGET_CONTROL ,0x20 ); +return ; + } +if (spec->headset_present_flag ==CX_HEADSET_NOPRESENT ) { + spec->headset_present_flag =CX_HEADSET_PARTPRESENT ; + }else if (spec->headset_present_flag ==CX_HEADSET_PARTPRESENT ) { + mic_persent =snd_hda_codec_read (codec,0x19 ,0 , +AC_VERB_GET_PIN_SENSE ,0x0 ); +/* headset is present */ +if ((phone_present &AC_PINSENSE_PRESENCE ) && + (mic_persent &AC_PINSENSE_PRESENCE )) { +cx_process_headset_plugin (codec); + spec->headset_present_flag =CX_HEADSET_ALLPRESENT ; + } + } + } +} + +static void cx_jack_unsol_event (struct hda_codec *codec,unsigned int res) +{ +struct conexant_spec *spec = codec->spec; + +if (spec->is_cx8070_sn6140) +cx_update_headset_mic_vref (codec, res); + +snd_hda_jack_unsol_event (codec, res); +} +#ifdef CONFIG_PM static int cx_auto_suspend (struct hda_codec *codec) {
@@ -205,7 +307,7 @@ static const struct hda_codec_ops cx_auto_patch_ops = { .build_pcms = snd_hda_gen_build_pcms, .init = cx_auto_init, .free = cx_auto_free, - .unsol_event = snd_hda_jack_unsol_event, + .unsol_event = cx_jack_unsol_event, #ifdef CONFIG_PM .suspend = cx_auto_suspend, .check_power_status = snd_hda_gen_check_power_status,
@@ -1042,6 +1144,15 @@ static int patch_conexant_auto(struct hda_codec *codec) codec->spec = spec; codec->patch_ops = cx_auto_patch_ops; +/* init cx8070/sn6140 flag and reset headset_present_flag */ +switch (codec->core.vendor_id) { +case 0x14f11f86 : +case 0x14f11f87 : + spec->is_cx8070_sn6140 = true; + spec->headset_present_flag =CX_HEADSET_NOPRESENT ; +break ; + } +cx_auto_parse_eapd (codec); spec->gen.own_eapd_ctl =1 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 237/353 pinctrl: baytrail: Fix types of config value in byt_pin_config_set()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andy Shevchenko <[email protected]>
[ Upstream commit 1a856a22e6036c5f0d6da7568b4550270f989038 ]
When unpacked, the config value is split to two of different types. Fix the types accordingly.
--- drivers/pinctrl/intel/pinctrl-baytrail.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/pinctrl/intel/pinctrl-baytrail.c +2 -1
@@ -918,13 +918,14 @@ static int byt_pin_config_set(struct pinctrl_dev *pctl_dev, unsigned int num_configs) {struct intel_pinctrl *vg =pinctrl_dev_get_drvdata (pctl_dev); -unsigned int param, arg;void __iomem *conf_reg =byt_gpio_reg (vg, offset,BYT_CONF0_REG );void __iomem *val_reg =byt_gpio_reg (vg, offset,BYT_VAL_REG );void __iomem *db_reg =byt_gpio_reg (vg, offset,BYT_DEBOUNCE_REG );u32 conf, val, db_pulse, debounce; +enum pin_config_param param;unsigned long flags;int i, ret =0 ; +u32 arg;raw_spin_lock_irqsave (&byt_lock, flags);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 238/353 leds: trigger: panic: Dont register panic notifier if creating the trigger failed
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Heiner Kallweit <[email protected]>
[ Upstream commit afacb21834bb02785ddb0c3ec197208803b74faa ]
It doesn't make sense to register the panic notifier if creating the panic trigger failed.
--- drivers/leds/trigger/ledtrig-panic.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/leds/trigger/ledtrig-panic.c +4 -1
@@ -64,10 +64,13 @@ static long led_panic_blink(int state)static int __init ledtrig_panic_init (void ) { +led_trigger_register_simple ("panic" , &trigger); +if (!trigger) +return -ENOMEM ; +atomic_notifier_chain_register (&panic_notifier_list, &led_trigger_panic_nb); -led_trigger_register_simple ("panic" , &trigger); panic_blink = led_panic_blink;return 0 ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 239/353 um: Fix naming clash between UML and scheduler
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anton Ivanov <[email protected]>
[ Upstream commit 541d4e4d435c8b9bfd29f70a1da4a2db97794e0a ]
__cant_sleep was already used and exported by the scheduler. The name had to be changed to a UML specific one.
--- arch/um/include/shared/kern_util.h | 2 +- arch/um/kernel/process.c | 2 +- arch/um/os-Linux/helper.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-)
arch/um/include/shared/kern_util.h +1 -1
@@ -50,7 +50,7 @@ extern void do_uml_exitcalls(void);* Are we disallowed to sleep? Used to choose between GFP_KERNEL and * GFP_ATOMIC. */ -extern int __cant_sleep (void ); +extern int __uml_cant_sleep (void );extern int get_current_pid (void );extern int copy_from_user_proc (void *to,void *from,int size);extern char *uml_strdup (const char *string);
arch/um/kernel/process.c +1 -1
@@ -220,7 +220,7 @@ void arch_cpu_idle(void)um_idle_sleep (); } -int __cant_sleep (void ) { +int __uml_cant_sleep (void ) {return in_atomic () ||irqs_disabled () ||in_interrupt ();/* Is in_interrupt() really needed? */ }
arch/um/os-Linux/helper.c +3 -3
@@ -46,7 +46,7 @@ int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv)unsigned long stack, sp;int pid, fds[2 ], ret, n; - stack =alloc_stack (0 ,__cant_sleep ()); + stack =alloc_stack (0 ,__uml_cant_sleep ());if (stack ==0 )return -ENOMEM ;
@@ -70,7 +70,7 @@ int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv) data.pre_data = pre_data; data.argv = argv; data.fd = fds[1 ]; - data.buf =__cant_sleep () ?uml_kmalloc (PATH_MAX ,UM_GFP_ATOMIC ) : + data.buf =__uml_cant_sleep () ?uml_kmalloc (PATH_MAX ,UM_GFP_ATOMIC ) :uml_kmalloc (PATH_MAX ,UM_GFP_KERNEL ); pid =clone (helper_child, (void *) sp,CLONE_VM , &data);if (pid <0 ) {
@@ -121,7 +121,7 @@ int run_helper_thread(int (*proc)(void *), void *arg, unsigned int flags,unsigned long stack, sp;int pid, status, err; - stack =alloc_stack (0 ,__cant_sleep ()); + stack =alloc_stack (0 ,__uml_cant_sleep ());if (stack ==0 )return -ENOMEM ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 240/353 um: Dont use vfprintf() for os_info()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Berg <[email protected]>
[ Upstream commit 236f9fe39b02c15fa5530b53e9cca48354394389 ]
The threads allocated inside the kernel have only a single page of stack. Unfortunately, the vfprintf function in standard glibc may use too much stack-space, overflowing it.
To make os_info safe to be used by helper threads, use the kernel vscnprintf function into a smallish buffer and write out the information to stderr.
--- arch/um/os-Linux/util.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)
arch/um/os-Linux/util.c +17 -2
@@ -173,23 +173,38 @@ __uml_setup("quiet", quiet_cmd_param,"quiet\n" " Turns off information messages during boot.\n\n"); +/* +* The os_info/os_warn functions will be called by helper threads. These +* have a very limited stack size and using the libc formatting functions +* may overflow the stack. +* So pull in the kernel vscnprintf and use that instead with a fixed +* on-stack buffer. +*/ +int vscnprintf (char *buf,size_t size,const char *fmt,va_list args); +void os_info (const char *fmt, ...) { +char buf[256 ];va_list list; +int len;if (quiet_info)return ;va_start (list, fmt); -vfprintf (stderr, fmt, list); + len =vscnprintf (buf,sizeof (buf), fmt, list); +fwrite (buf, len,1 , stderr);va_end (list); }void os_warn (const char *fmt, ...) { +char buf[256 ];va_list list; +int len;va_start (list, fmt); -vfprintf (stderr, fmt, list); + len =vscnprintf (buf,sizeof (buf), fmt, list); +fwrite (buf, len,1 , stderr);va_end (list); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 241/353 um: net: Fix return type of uml_net_start_xmit()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nathan Chancellor <[email protected]>
[ Upstream commit 7d748f60a4b82b50bf25fad1bd42d33f049f76aa ]
With clang's kernel control flow integrity (kCFI, CONFIG_CFI_CLANG), indirect call targets are validated against the expected function pointer prototype to make sure the call target is valid to help mitigate ROP attacks. If they are not identical, there is a failure at run time, which manifests as either a kernel panic or thread getting killed. A warning in clang aims to catch these at compile time, which reveals:
arch/um/drivers/net_kern.c:353:21: warning: incompatible function pointer types initializing 'netdev_tx_t (*)(struct sk_buff *, struct net_device *)' (aka 'enum netdev_tx (*)(struct sk_buff *, struct net_device *)') with an expression of type 'int (struct sk_buff *, struct net_device *)' [-Wincompatible-function-pointer-types-strict]
353 | .ndo_start_xmit = uml_net_start_xmit,
| ^~~~~~~~~~~~~~~~~~
1 warning generated.
->ndo_start_xmit() in 'struct net_device_ops' expects a return type of 'netdev_tx_t', not 'int'. Adjust the return type of uml_net_start_xmit() to match the prototype's to resolve the warning. While UML does not currently implement support for kCFI, it could in the future, which means this warning becomes a fatal CFI failure at run time.
--- arch/um/drivers/net_kern.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/um/drivers/net_kern.c +1 -1
@@ -204,7 +204,7 @@ static int uml_net_close(struct net_device *dev)return 0 ; } -static int uml_net_start_xmit (struct sk_buff *skb,struct net_device *dev) +static netdev_tx_t uml_net_start_xmit (struct sk_buff *skb,struct net_device *dev) {struct uml_net_private *lp =netdev_priv (dev);unsigned long flags;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 242/353 um: time-travel: fix time corruption
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit abe4eaa8618bb36c2b33e9cdde0499296a23448c ]
In 'basic' time-travel mode (without =inf-cpu or =ext), we still get timer interrupts. These can happen at arbitrary points in time, i.e. while in timer_read(), which pushes time forward just a little bit. Then, if we happen to get the interrupt after calculating the new time to push to, but before actually finishing that, the interrupt will set the time to a value that's incompatible with the forward, and we'll crash because time goes backwards when we do the forwarding.
Fix this by reading the time_travel_time, calculating the adjustment, and doing the adjustment all with interrupts disabled.
--- arch/um/kernel/time.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-)
arch/um/kernel/time.c +27 -5
@@ -432,9 +432,29 @@ static void time_travel_update_time(unsigned long long next, bool idle)time_travel_del_event (&ne); } +static void time_travel_update_time_rel (unsigned long long offs) +{ +unsigned long flags; + +/* +* Disable interrupts before calculating the new time so +* that a real timer interrupt (signal) can't happen at +* a bad time e.g. after we read time_travel_time but +* before we've completed updating the time. +*/ +local_irq_save (flags); +time_travel_update_time (time_travel_time + offs, false); +local_irq_restore (flags); +} +void time_travel_ndelay (unsigned long nsec) { -time_travel_update_time (time_travel_time + nsec, false); +/* +* Not strictly needed to use _rel() version since this is +* only used in INFCPU/EXT modes, but it doesn't hurt and +* is more readable too. +*/ +time_travel_update_time_rel (nsec); }EXPORT_SYMBOL (time_travel_ndelay);
@@ -568,7 +588,11 @@ static void time_travel_set_start(void)#define time_travel_time 0#define time_travel_ext_waiting 0 -static inline void time_travel_update_time (unsigned long long ns,bool retearly) +static inline void time_travel_update_time (unsigned long long ns,bool idle) +{ +} + +static inline void time_travel_update_time_rel (unsigned long long offs) { }
@@ -720,9 +744,7 @@ static u64 timer_read(struct clocksource *cs)*/ if (!irqs_disabled () && !in_interrupt () && !in_softirq () && !time_travel_ext_waiting) -time_travel_update_time (time_travel_time + -TIMER_MULTIPLIER , - false); +time_travel_update_time_rel (TIMER_MULTIPLIER );return time_travel_time /TIMER_MULTIPLIER ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 243/353 i3c: master: cdns: Update maximum prescaler value for i2c clock
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Harshit Shah <[email protected]>
[ Upstream commit 374c13f9080a1b9835a5ed3e7bea93cf8e2dc262 ]
As per the Cadence IP document fixed the I2C clock divider value limit from 16 bits instead of 10 bits. Without this change setting up the I2C clock to low frequencies will not work as the prescaler value might be greater than 10 bit number.
I3C clock divider value is 10 bits only. Updating the macro names for both.
--- drivers/i3c/master/i3c-master-cdns.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/i3c/master/i3c-master-cdns.c +4 -3
@@ -76,7 +76,8 @@#define PRESCL_CTRL0 0x14#define PRESCL_CTRL0_I2C (x) ((x) << 16)#define PRESCL_CTRL0_I3C (x) (x) -#define PRESCL_CTRL0_MAX GENMASK(9, 0) +#define PRESCL_CTRL0_I3C_MAX GENMASK(9, 0) +#define PRESCL_CTRL0_I2C_MAX GENMASK(15, 0)#define PRESCL_CTRL1 0x18#define PRESCL_CTRL1_PP_LOW_MASK GENMASK(15, 8)
@@ -1233,7 +1234,7 @@ static int cdns_i3c_master_bus_init(struct i3c_master_controller *m)return -EINVAL ; pres =DIV_ROUND_UP (sysclk_rate, (bus->scl_rate.i3c *4 )) -1 ; -if (pres >PRESCL_CTRL0_MAX ) +if (pres >PRESCL_CTRL0_I3C_MAX )return -ERANGE ; bus->scl_rate.i3c = sysclk_rate / ((pres +1 ) *4 );
@@ -1246,7 +1247,7 @@ static int cdns_i3c_master_bus_init(struct i3c_master_controller *m) max_i2cfreq = bus->scl_rate.i2c; pres = (sysclk_rate / (max_i2cfreq *5 )) -1 ; -if (pres >PRESCL_CTRL0_MAX ) +if (pres >PRESCL_CTRL0_I2C_MAX )return -ERANGE ; bus->scl_rate.i2c = sysclk_rate / ((pres +1 ) *5 );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 244/353 ACPI: resource: Add DMI quirks for ASUS Vivobook E1504GA and E1504GAB
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ben Mayo <[email protected]>
[ Upstream commit d2aaf19965045f70bb2ece514399cdc6fcce2e73 ]
Asus Vivobook E1504GA and E1504GAB notebooks are affected by bug #216158 (DSDT specifies the kbd IRQ as level active-low and using the override changes this to rising edge, stopping the keyboard from working).
Users of these notebooks do not have a working keyboard unless they add their DMI information to the struct irq1_level_low_skip_override array and compile a custom kernel.
Add support for these computers to the Linux kernel without requiring the end-user to recompile the kernel.
--- drivers/acpi/resource.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/acpi/resource.c +14 -0
@@ -482,6 +482,20 @@ static const struct dmi_system_id irq1_level_low_skip_override[] = { DMI_MATCH(DMI_BOARD_NAME, "B2502CBA"), }, }, + { +/* Asus Vivobook E1504GA */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"ASUSTeK COMPUTER INC." ), + DMI_MATCH(DMI_BOARD_NAME, "E1504GA"), + }, + }, + { +/* Asus Vivobook E1504GAB */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"ASUSTeK COMPUTER INC." ), + DMI_MATCH(DMI_BOARD_NAME, "E1504GAB"), + }, + }, {/* LG Electronics 17U70P */ .matches = {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 245/353 ACPI: resource: Skip IRQ override on ASUS ExpertBook B1502CGA
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Maltsev <[email protected]>
[ Upstream commit e315e8692f7922cd1b2a26bd7a1741cc8ce77085 ]
Like the ASUS ExpertBook B1502CBA and various ASUS laptops, the ASUS ExpertBook B1502CGA has an ACPI DSDT table that describes IRQ 1 as ActiveLow while the kernel overrides it to Edge_High.
$ sudo dmesg | grep DMI
[ 0.000000] DMI: ASUSTeK COMPUTER INC. ASUS EXPERTBOOK B1502CGA_B1502CGA/B1502CGA, BIOS B1502CGA.303 06/05/2023
$ grep -A 40 PS2K dsdt.dsl | grep IRQ -A 1
IRQ (Level, ActiveLow, Exclusive, )
{1}This prevents the keyboard from working. To fix this issue, add this laptop to the skip_override_table so that the kernel does not override IRQ 1.
--- drivers/acpi/resource.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/acpi/resource.c +7 -0
@@ -461,6 +461,13 @@ static const struct dmi_system_id irq1_level_low_skip_override[] = { DMI_MATCH(DMI_BOARD_NAME, "B1502CBA"), }, }, + { +/* Asus ExpertBook B1502CGA */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"ASUSTeK COMPUTER INC." ), + DMI_MATCH(DMI_BOARD_NAME, "B1502CGA"), + }, + }, {/* Asus ExpertBook B2402CBA */ .matches = {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 246/353 riscv: Make XIP bootable again
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Frederik Haxel <[email protected]>
[ Upstream commit 66f1e68093979816a23412a3fad066f5bcbc0360 ]
Currently, the XIP kernel seems to fail to boot due to missing XIP_FIXUP and a wrong page_offset value. A superfluous XIP_FIXUP has also been removed.
--- arch/riscv/kernel/head.S | 1 + arch/riscv/mm/init.c | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-)
arch/riscv/kernel/head.S +1 -0
@@ -89,6 +89,7 @@ relocate_enable_mmu: /* Compute satp for kernel page tables, but don't load it yet */ srl a2, a0, PAGE_SHIFT la a1, satp_mode + XIP_FIXUP_OFFSET a1 REG_L a1, 0(a1) or a2, a2, a1
arch/riscv/mm/init.c +6 -2
@@ -174,6 +174,9 @@ void __init mem_init(void)/* Limit the memory size via mem. */ static phys_addr_t memory_limit; +#ifdef CONFIG_XIP_KERNEL +#define memory_limit (*(phys_addr_t *)XIP_FIXUP(&memory_limit)) +#endif /* CONFIG_XIP_KERNEL */ static int __init early_mem (char *p) {
@@ -952,7 +955,7 @@ static void __init create_fdt_early_page_table(uintptr_t fix_fdt_va,* setup_vm_final installs the linear mapping. For 32-bit kernel, as the * kernel is mapped in the linear mapping, that makes no difference. */ - dtb_early_va =kernel_mapping_pa_to_va (XIP_FIXUP (dtb_pa)); + dtb_early_va =kernel_mapping_pa_to_va (dtb_pa);#endif dtb_early_pa = dtb_pa;
@@ -1055,9 +1058,9 @@ asmlinkage void __init setup_vm(uintptr_t dtb_pa)#endif kernel_map.virt_addr =KERNEL_LINK_ADDR + kernel_map.virt_offset; - kernel_map.page_offset =_AC (CONFIG_PAGE_OFFSET ,UL );#ifdef CONFIG_XIP_KERNEL + kernel_map.page_offset =PAGE_OFFSET_L3 ; kernel_map.xiprom = (uintptr_t )CONFIG_XIP_PHYS_ADDR ; kernel_map.xiprom_sz = (uintptr_t )(&_exiprom) - (uintptr_t )(&_xiprom);
@@ -1067,6 +1070,7 @@ asmlinkage void __init setup_vm(uintptr_t dtb_pa) kernel_map.va_kernel_xip_pa_offset = kernel_map.virt_addr - kernel_map.xiprom;#else + kernel_map.page_offset =_AC (CONFIG_PAGE_OFFSET ,UL ); kernel_map.phys_addr = (uintptr_t )(&_start); kernel_map.size = (uintptr_t )(&_end) - kernel_map.phys_addr;#endif
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 247/353 xen/gntdev: Fix the abuse of underlying struct page in DMA-buf import
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oleksandr Tyshchenko <[email protected]>
[ Upstream commit 2d2db7d40254d5fb53b11ebd703cd1ed0c5de7a1 ]
DO NOT access the underlying struct page of an sg table exported by DMA-buf in dmabuf_imp_to_refs(), this is not allowed. Please see drivers/dma-buf/dma-buf.c:mangle_sg_table() for details.
Fortunately, here (for special Xen device) we can avoid using pages and calculate gfns directly from dma addresses provided by the sg table.
--- drivers/xen/gntdev-dmabuf.c | 50 ++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 25 deletions(-)
drivers/xen/gntdev-dmabuf.c +25 -25
@@ -11,6 +11,7 @@#include <linux/kernel.h> #include <linux/errno.h> #include <linux/dma-buf.h> +#include <linux/dma-direct.h> #include <linux/slab.h> #include <linux/types.h> #include <linux/uaccess.h>
@@ -50,7 +51,7 @@ struct gntdev_dmabuf {/* Number of pages this buffer has. */ int nr_pages; -/* Pages of this buffer. */ +/* Pages of this buffer (only for dma-buf export). */ struct page **pages; };
@@ -484,7 +485,7 @@ static int dmabuf_exp_from_refs(struct gntdev_priv *priv, int flags,/* DMA buffer import support. */ static int -dmabuf_imp_grant_foreign_access (struct page **pages,u32 *refs, +dmabuf_imp_grant_foreign_access (unsigned long *gfns,u32 *refs,int count,int domid) {grant_ref_t priv_gref_head;
@@ -507,7 +508,7 @@ dmabuf_imp_grant_foreign_access(struct page **pages, u32 *refs, }gnttab_grant_foreign_access_ref (cur_ref, domid, -xen_page_to_gfn (pages[i]),0 ); + gfns[i],0 ); refs[i] = cur_ref; }
@@ -529,7 +530,6 @@ static void dmabuf_imp_end_foreign_access(u32 *refs, int count)static void dmabuf_imp_free_storage (struct gntdev_dmabuf *gntdev_dmabuf) { -kfree (gntdev_dmabuf->pages);kfree (gntdev_dmabuf->u.imp.refs);kfree (gntdev_dmabuf); }
@@ -549,12 +549,6 @@ static struct gntdev_dmabuf *dmabuf_imp_alloc_storage(int count)if (!gntdev_dmabuf->u.imp.refs) goto fail; - gntdev_dmabuf->pages =kcalloc (count, -sizeof (gntdev_dmabuf->pages[0 ]), -GFP_KERNEL ); -if (!gntdev_dmabuf->pages) - goto fail; - gntdev_dmabuf->nr_pages = count;for (i =0 ; i < count; i++)
@@ -576,7 +570,8 @@ dmabuf_imp_to_refs(struct gntdev_dmabuf_priv *priv, struct device *dev,struct dma_buf *dma_buf;struct dma_buf_attachment *attach;struct sg_table *sgt; -struct sg_page_iter sg_iter; +struct sg_dma_page_iter sg_iter; +unsigned long *gfns;int i; dma_buf =dma_buf_get (fd);
@@ -624,26 +619,31 @@ dmabuf_imp_to_refs(struct gntdev_dmabuf_priv *priv, struct device *dev, gntdev_dmabuf->u.imp.sgt = sgt; -/* Now convert sgt to array of pages and check for page validity. */ + gfns =kcalloc (count,sizeof (*gfns),GFP_KERNEL ); +if (!gfns) { + ret =ERR_PTR (-ENOMEM ); + goto fail_unmap; + } + +/* +* Now convert sgt to array of gfns without accessing underlying pages. +* It is not allowed to access the underlying struct page of an sg table +* exported by DMA-buf, but since we deal with special Xen dma device here +* (not a normal physical one) look at the dma addresses in the sg table +* and then calculate gfns directly from them. +*/ i =0 ; -for_each_sgtable_page (sgt, &sg_iter,0 ) { -struct page *page =sg_page_iter_page (&sg_iter); -/* -* Check if page is valid: this can happen if we are given -* a page from VRAM or other resources which are not backed -* by a struct page. -*/ -if (!pfn_valid (page_to_pfn (page))) { - ret =ERR_PTR (-EINVAL ); - goto fail_unmap; - } +for_each_sgtable_dma_page (sgt, &sg_iter,0 ) { +dma_addr_t addr =sg_page_iter_dma_address (&sg_iter); +unsigned long pfn =bfn_to_pfn (XEN_PFN_DOWN (dma_to_phys (dev, addr))); - gntdev_dmabuf->pages[i++] = page; + gfns[i++] =pfn_to_gfn (pfn); } - ret =ERR_PTR (dmabuf_imp_grant_foreign_access (gntdev_dmabuf->pages, + ret =ERR_PTR (dmabuf_imp_grant_foreign_access (gfns, gntdev_dmabuf->u.imp.refs, count, domid)); +kfree (gfns);if (IS_ERR (ret)) goto fail_end_access;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 248/353 mfd: ti_am335x_tscadc: Fix TI SoC dependencies
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Robinson <[email protected]>
[ Upstream commit 284d16c456e5d4b143f375b8ccc4038ab3f4ee0f ]
The ti_am335x_tscadc is specific to some TI SoCs, update the dependencies for those SoCs and compile testing.
--- drivers/mfd/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/mfd/Kconfig +1 -0
@@ -1483,6 +1483,7 @@ config MFD_SYSCON config MFD_TI_AM335X_TSCADC tristate "TI ADC / Touch Screen chip support" + depends on ARCH_OMAP2PLUS || ARCH_K3 || COMPILE_TEST select MFD_CORE select REGMAP select REGMAP_MMIO
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 249/353 mailbox: arm_mhuv2: Fix a bug for mhuv2_sender_interrupt
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xiaowu.ding <[email protected]>
[ Upstream commit ee01c0b4384d19ecc5dfa7db3fd4303f965c3eba ]
Message Handling Unit version is v2.1.
When arm_mhuv2 working with the data protocol transfer mode. We have split one mhu into two channels, and every channel include four channel windows, the two channels share one gic spi interrupt.
There is a problem with the sending scenario.
The first channel will take up 0-3 channel windows, and the second channel take up 4-7 channel windows. When the first channel send the data, and the receiver will clear all the four channels status. Although we only enabled the interrupt on the last channel window with register CH_INT_EN,the register CHCOMB_INT_ST0 will be 0xf, not be 0x8. Currently we just clear the last channel windows int status with the data proctol mode.So after that,the CHCOMB_INT_ST0 status will be 0x7, not be the 0x0.
Then the second channel send the data, the receiver read the data, clear all the four channel windows status, trigger the sender interrupt. But currently the CHCOMB_INT_ST0 register will be 0xf7, get_irq_chan_comb function will always return the first channel.
So this patch clear all channel windows int status to avoid this interrupt confusion.
--- drivers/mailbox/arm_mhuv2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/mailbox/arm_mhuv2.c +2 -1
@@ -553,7 +553,8 @@ static irqreturn_t mhuv2_sender_interrupt(int irq, void *data) priv = chan->con_priv;if (!IS_PROTOCOL_DOORBELL (priv)) { -writel_relaxed (1 , &mhu->send->ch_wn[priv->ch_wn_idx + priv->windows -1 ].int_clr); +for (i =0 ; i < priv->windows; i++) +writel_relaxed (1 , &mhu->send->ch_wn[priv->ch_wn_idx + i].int_clr);if (chan->cl) {mbox_chan_txdone (chan,0 );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 250/353 PCI: Only override AMD USB controller if required
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guilherme G. Piccoli <[email protected]>
[ Upstream commit e585a37e5061f6d5060517aed1ca4ccb2e56a34c ]
By running a Van Gogh device (Steam Deck), the following message was noticed in the kernel log:
pci 0000:04:00.3: PCI class overridden (0x0c03fe -> 0x0c03fe) so dwc3 driver can claim this instead of xhci
Effectively this means the quirk executed but changed nothing, since the class of this device was already the proper one (likely adjusted by newer firmware versions).
Check and perform the override only if necessary.
--- drivers/pci/quirks.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/pci/quirks.c +7 -4
@@ -702,10 +702,13 @@ static void quirk_amd_dwc_class(struct pci_dev *pdev) {u32 class = pdev->class; -/* Use "USB Device (not host controller)" class */ - pdev->class =PCI_CLASS_SERIAL_USB_DEVICE ; -pci_info (pdev,"PCI class overridden (%#08x -> %#08x) so dwc3 driver can claim this instead of xhci\n" , - class, pdev->class); +if (class !=PCI_CLASS_SERIAL_USB_DEVICE ) { +/* Use "USB Device (not host controller)" class */ + pdev->class =PCI_CLASS_SERIAL_USB_DEVICE ; +pci_info (pdev, +"PCI class overridden (%#08x -> %#08x) so dwc3 driver can claim this instead of xhci\n" , + class, pdev->class); + } }DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_NL_USB , quirk_amd_dwc_class);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 251/353 PCI: switchtec: Fix stdev_release() crash after surprise hot remove
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Stodden <[email protected]>
[ Upstream commit df25461119d987b8c81d232cfe4411e91dcabe66 ]
A PCI device hot removal may occur while stdev->cdev is held open. The call to stdev_release() then happens during close or exit, at a point way past switchtec_pci_remove(). Otherwise the last ref would vanish with the trailing put_device(), just before return.
At that later point in time, the devm cleanup has already removed the stdev->mmio_mrpc mapping. Also, the stdev->pdev reference was not a counted one. Therefore, in DMA mode, the iowrite32() in stdev_release() will cause a fatal page fault, and the subsequent dma_free_coherent(), if reached, would pass a stale &stdev->pdev->dev pointer.
Fix by moving MRPC DMA shutdown into switchtec_pci_remove(), after stdev_kill(). Counting the stdev->pdev ref is now optional, but may prevent future accidents.
Reproducible via the script at
https://lore.kernel.org/r/[email protected]
--- drivers/pci/switch/switchtec.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-)
drivers/pci/switch/switchtec.c +17 -8
@@ -1308,13 +1308,6 @@ static void stdev_release(struct device *dev) {struct switchtec_dev *stdev =to_stdev (dev); -if (stdev->dma_mrpc) { -iowrite32 (0 , &stdev->mmio_mrpc->dma_en); -flush_wc_buf (stdev); -writeq (0 , &stdev->mmio_mrpc->dma_addr); -dma_free_coherent (&stdev->pdev->dev,sizeof (*stdev->dma_mrpc), - stdev->dma_mrpc, stdev->dma_mrpc_dma_addr); - }kfree (stdev); }
@@ -1358,7 +1351,7 @@ static struct switchtec_dev *stdev_create(struct pci_dev *pdev)return ERR_PTR (-ENOMEM ); stdev->alive = true; - stdev->pdev = pdev; + stdev->pdev =pci_dev_get (pdev);INIT_LIST_HEAD (&stdev->mrpc_queue);mutex_init (&stdev->mrpc_mutex); stdev->mrpc_busy =0 ;
@@ -1391,6 +1384,7 @@ static struct switchtec_dev *stdev_create(struct pci_dev *pdev)return stdev; err_put: +pci_dev_put (stdev->pdev);put_device (&stdev->dev);return ERR_PTR (rc); }
@@ -1644,6 +1638,18 @@ static int switchtec_init_pci(struct switchtec_dev *stdev,return 0 ; } +static void switchtec_exit_pci (struct switchtec_dev *stdev) +{ +if (stdev->dma_mrpc) { +iowrite32 (0 , &stdev->mmio_mrpc->dma_en); +flush_wc_buf (stdev); +writeq (0 , &stdev->mmio_mrpc->dma_addr); +dma_free_coherent (&stdev->pdev->dev,sizeof (*stdev->dma_mrpc), + stdev->dma_mrpc, stdev->dma_mrpc_dma_addr); + stdev->dma_mrpc =NULL ; + } +} +static int switchtec_pci_probe (struct pci_dev *pdev,const struct pci_device_id *id) {
@@ -1703,6 +1709,9 @@ static void switchtec_pci_remove(struct pci_dev *pdev)ida_free (&switchtec_minor_ida,MINOR (stdev->dev.devt));dev_info (&stdev->dev,"unregistered.\n" );stdev_kill (stdev); +switchtec_exit_pci (stdev); +pci_dev_put (stdev->pdev); + stdev->pdev =NULL ;put_device (&stdev->dev); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 252/353 perf cs-etm: Bump minimum OpenCSD version to ensure a bugfix is present
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: James Clark <[email protected]>
[ Upstream commit 2dbba30fd69b604802a9535b74bddb5bcca23793 ]
Since commit d927ef5004ef ("perf cs-etm: Add exception level consistency check"), the exception that was added to Perf will be triggered unless the following bugfix from OpenCSD is present:
- _Version 1.2.1_:
- __Bugfix__:
ETM4x / ETE - output of context elements to client can in some circumstances be delayed until after subsequent atoms have been processed leading to incorrect memory decode access via the client callbacks. Fixed to flush context elements immediately they are committed.
Rather than remove the assert and silently fail, just increase the minimum version requirement to avoid hard to debug issues and regressions.
--- tools/build/feature/test-libopencsd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/build/feature/test-libopencsd.c +2 -2
@@ -4,9 +4,9 @@/* * Check OpenCSD library version is sufficient to provide required features */ -#define OCSD_MIN_VER ((1 << 16) | (1 << 8) | (1)) +#define OCSD_MIN_VER ((1 << 16) | (2 << 8) | (1))#if !defined(OCSD_VER_NUM ) || (OCSD_VER_NUM <OCSD_MIN_VER ) -#error "OpenCSD >= 1.1.1 is required" +#error "OpenCSD >= 1.2.1 is required"#endif int main (void )
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 253/353 xhci: fix possible null pointer deref during xhci urb enqueue
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mathias Nyman <[email protected]>
[ Upstream commit e2e2aacf042f52854c92775b7800ba668e0bdfe4 ]
There is a short gap between urb being submitted and actually added to the endpoint queue (linked). If the device is disconnected during this time then usb core is not yet aware of the pending urb, and device may be freed just before xhci_urq_enqueue() continues, dereferencing the freed device.
Freeing the device is protected by the xhci spinlock, so make sure we take and keep the lock while checking that device exists, dereference it, and add the urb to the queue.
Remove the unnecessary URB check, usb core checks it before calling xhci_urb_enqueue()
--- drivers/usb/host/xhci.c | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-)
drivers/usb/host/xhci.c +23 -17
@@ -1522,24 +1522,7 @@ static int xhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flagstruct urb_priv *urb_priv;int num_tds; -if (!urb) -return -EINVAL ; - ret =xhci_check_args (hcd, urb->dev, urb->ep, - true, true, __func__); -if (ret <=0 ) -return ret ? ret : -EINVAL ; - - slot_id = urb->dev->slot_id; ep_index =xhci_get_endpoint_index (&urb->ep->desc); - ep_state = &xhci->devs[slot_id]->eps[ep_index].ep_state; - -if (!HCD_HW_ACCESSIBLE (hcd)) -return -ESHUTDOWN ; - -if (xhci->devs[slot_id]->flags &VDEV_PORT_ERROR ) { -xhci_dbg (xhci,"Can't queue urb, port error, link inactive\n" ); -return -ENODEV ; - }if (usb_endpoint_xfer_isoc (&urb->ep->desc)) num_tds = urb->number_of_packets;
@@ -1578,12 +1561,35 @@ static int xhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flagspin_lock_irqsave (&xhci->lock, flags); + ret =xhci_check_args (hcd, urb->dev, urb->ep, + true, true, __func__); +if (ret <=0 ) { + ret = ret ? ret : -EINVAL ; + goto free_priv; + } + + slot_id = urb->dev->slot_id; + +if (!HCD_HW_ACCESSIBLE (hcd)) { + ret = -ESHUTDOWN ; + goto free_priv; + } + +if (xhci->devs[slot_id]->flags &VDEV_PORT_ERROR ) { +xhci_dbg (xhci,"Can't queue urb, port error, link inactive\n" ); + ret = -ENODEV ; + goto free_priv; + } +if (xhci->xhc_state &XHCI_STATE_DYING ) {xhci_dbg (xhci,"Ep 0x%x: URB %p submitted for non-responsive xHCI host.\n" , urb->ep->desc.bEndpointAddress, urb); ret = -ESHUTDOWN ; goto free_priv; } + + ep_state = &xhci->devs[slot_id]->eps[ep_index].ep_state; +if (*ep_state & (EP_GETTING_STREAMS |EP_GETTING_NO_STREAMS )) {xhci_warn (xhci,"WARN: Can't enqueue URB, ep in streams transition state %x\n" , *ep_state);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 254/353 extcon: fix possible name leak in extcon_dev_register()
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yaxiong Tian <[email protected]>
[ Upstream commit e66523c72c9aae0ff0dae6859eb77b04de1e8e5f ]
In the error path after calling dev_set_name(), the device name is leaked. To fix this, moving dev_set_name() after the error path and before device_register.
--- drivers/extcon/extcon.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/extcon/extcon.c +1 -2
@@ -1280,8 +1280,6 @@ int extcon_dev_register(struct extcon_dev *edev) edev->id = ret; -dev_set_name (&edev->dev,"extcon%d" , edev->id); - ret =extcon_alloc_cables (edev);if (ret <0 ) goto err_alloc_cables;
@@ -1310,6 +1308,7 @@ int extcon_dev_register(struct extcon_dev *edev)RAW_INIT_NOTIFIER_HEAD (&edev->nh_all);dev_set_drvdata (&edev->dev, edev); +dev_set_name (&edev->dev,"extcon%d" , edev->id); edev->state =0 ; ret =device_register (&edev->dev);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 255/353 usb: hub: Replace hardcoded quirk value with BIT() macro
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hardik Gajjar <[email protected]>
[ Upstream commit 6666ea93d2c422ebeb8039d11e642552da682070 ]
This patch replaces the hardcoded quirk value in the macro with BIT().
--- drivers/usb/core/hub.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/core/hub.c +2 -2
@@ -47,8 +47,8 @@#define USB_VENDOR_TEXAS_INSTRUMENTS 0x0451#define USB_PRODUCT_TUSB8041_USB3 0x8140#define USB_PRODUCT_TUSB8041_USB2 0x8142 -#define HUB_QUIRK_CHECK_PORT_AUTOSUSPEND 0x01 -#define HUB_QUIRK_DISABLE_AUTOSUSPEND 0x02 +#define HUB_QUIRK_CHECK_PORT_AUTOSUSPEND BIT(0) +#define HUB_QUIRK_DISABLE_AUTOSUSPEND BIT(1)#define USB_TP_TRANSMISSION_DELAY 40/* ns */ #define USB_TP_TRANSMISSION_DELAY_MAX 65535/* ns */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 256/353 usb: hub: Add quirk to decrease IN-ep poll interval for Microchip USB491x hub
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hardik Gajjar <[email protected]>
[ Upstream commit 855d75cf8311fee156fabb5639bb53757ca83dd4 ]
There is a potential delay in notifying Linux USB drivers of downstream USB bus activity when connecting a high-speed or superSpeed device via the Microchip USB491x hub. This delay is due to the fixed bInterval value of 12 in the silicon of the Microchip USB491x hub.
Microchip requested to ignore the device descriptor and decrease that value to 9 as it was too late to modify that in silicon.
This patch speeds up the USB enummeration process that helps to pass Apple Carplay certifications and improve the User experience when utilizing the USB device via Microchip Multihost USB491x Hub.
A new hub quirk HUB_QUIRK_REDUCE_FRAME_INTR_BINTERVAL speeds up the notification process for Microchip USB491x hub by limiting the maximum bInterval value to 9.
--- drivers/usb/core/hub.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)
drivers/usb/core/hub.c +29 -0
@@ -47,12 +47,18 @@#define USB_VENDOR_TEXAS_INSTRUMENTS 0x0451#define USB_PRODUCT_TUSB8041_USB3 0x8140#define USB_PRODUCT_TUSB8041_USB2 0x8142 +#define USB_VENDOR_MICROCHIP 0x0424 +#define USB_PRODUCT_USB4913 0x4913 +#define USB_PRODUCT_USB4914 0x4914 +#define USB_PRODUCT_USB4915 0x4915#define HUB_QUIRK_CHECK_PORT_AUTOSUSPEND BIT(0)#define HUB_QUIRK_DISABLE_AUTOSUSPEND BIT(1) +#define HUB_QUIRK_REDUCE_FRAME_INTR_BINTERVAL BIT(2)#define USB_TP_TRANSMISSION_DELAY 40/* ns */ #define USB_TP_TRANSMISSION_DELAY_MAX 65535/* ns */ #define USB_PING_RESPONSE_TIME 400/* ns */ +#define USB_REDUCE_FRAME_INTR_BINTERVAL 9/* Protect struct usb_device->state and ->children members * Note: Both are also protected by ->dev.sem, except that ->state can
@@ -1904,6 +1910,14 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id)usb_autopm_get_interface_no_resume (intf); } +if ((id->driver_info &HUB_QUIRK_REDUCE_FRAME_INTR_BINTERVAL ) && + desc->endpoint[0 ].desc.bInterval >USB_REDUCE_FRAME_INTR_BINTERVAL ) { + desc->endpoint[0 ].desc.bInterval = +USB_REDUCE_FRAME_INTR_BINTERVAL ; +/* Tell the HCD about the interrupt ep's new bInterval */ +usb_set_interface (hdev,0 ,0 ); + } +if (hub_configure (hub, &desc->endpoint[0 ].desc) >=0 ) {onboard_hub_create_pdevs (hdev, &hub->onboard_hub_devs);
@@ -5895,6 +5909,21 @@ static const struct usb_device_id hub_id_table[] = { .idVendor = USB_VENDOR_TEXAS_INSTRUMENTS, .idProduct = USB_PRODUCT_TUSB8041_USB3, .driver_info = HUB_QUIRK_DISABLE_AUTOSUSPEND}, + { .match_flags = USB_DEVICE_ID_MATCH_VENDOR + | USB_DEVICE_ID_MATCH_PRODUCT, + .idVendor = USB_VENDOR_MICROCHIP, + .idProduct = USB_PRODUCT_USB4913, + .driver_info = HUB_QUIRK_REDUCE_FRAME_INTR_BINTERVAL}, + { .match_flags = USB_DEVICE_ID_MATCH_VENDOR + | USB_DEVICE_ID_MATCH_PRODUCT, + .idVendor = USB_VENDOR_MICROCHIP, + .idProduct = USB_PRODUCT_USB4914, + .driver_info = HUB_QUIRK_REDUCE_FRAME_INTR_BINTERVAL}, + { .match_flags = USB_DEVICE_ID_MATCH_VENDOR + | USB_DEVICE_ID_MATCH_PRODUCT, + .idVendor = USB_VENDOR_MICROCHIP, + .idProduct = USB_PRODUCT_USB4915, + .driver_info = HUB_QUIRK_REDUCE_FRAME_INTR_BINTERVAL}, { .match_flags = USB_DEVICE_ID_MATCH_DEV_CLASS, .bDeviceClass = USB_CLASS_HUB}, { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 257/353 selftests/sgx: Fix linker script asserts
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jo Van Bulck <[email protected]>
[ Upstream commit 9fd552ee32c6c1e27c125016b87d295bea6faea7 ]
DEFINED only considers symbols, not section names. Hence, replace the check for .got.plt with the _GLOBAL_OFFSET_TABLE_ symbol and remove other (non-essential) asserts.
--- tools/testing/selftests/sgx/test_encl.lds | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
tools/testing/selftests/sgx/test_encl.lds +1 -5
@@ -34,8 +34,4 @@ SECTIONS } } -ASSERT(!DEFINED(.altinstructions), "ALTERNATIVES are not supported in enclaves") -ASSERT(!DEFINED(.altinstr_replacement), "ALTERNATIVES are not supported in enclaves") -ASSERT(!DEFINED(.discard.retpoline_safe), "RETPOLINE ALTERNATIVES are not supported in enclaves") -ASSERT(!DEFINED(.discard.nospec), "RETPOLINE ALTERNATIVES are not supported in enclaves") -ASSERT(!DEFINED(.got.plt), "Libcalls are not supported in enclaves") +ASSERT(!DEFINED(_GLOBAL_OFFSET_TABLE_), "Libcalls through GOT are not supported in enclaves")
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 258/353 tty: allow TIOCSLCKTRMIOS with CAP_CHECKPOINT_RESTORE
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adrian Reber <[email protected]>
[ Upstream commit e0f25b8992345aa5f113da2815f5add98738c611 ]
The capability CAP_CHECKPOINT_RESTORE was introduced to allow non-root users to checkpoint and restore processes as non-root with CRIU.
This change extends CAP_CHECKPOINT_RESTORE to enable the CRIU option '--shell-job' as non-root. CRIU's man-page describes the '--shell-job' option like this:
Allow one to dump shell jobs. This implies the restored task will inherit session and process group ID from the criu itself. This option also allows to migrate a single external tty connection, to migrate applications like top.
TIOCSLCKTRMIOS can only be done if the process has CAP_SYS_ADMIN and this change extends it to CAP_SYS_ADMIN or CAP_CHECKPOINT_RESTORE.
With this change it is possible to checkpoint and restore processes which have a tty connection as non-root if CAP_CHECKPOINT_RESTORE is set.
--- drivers/tty/tty_ioctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/tty/tty_ioctl.c +2 -2
@@ -844,7 +844,7 @@ int tty_mode_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg) ret = -EFAULT ;return ret;case TIOCSLCKTRMIOS : -if (!capable (CAP_SYS_ADMIN )) +if (!checkpoint_restore_ns_capable (&init_user_ns))return -EPERM ;copy_termios_locked (real_tty, &kterm); if (user_termios_to_kernel_termios(&kterm,
@@ -861,7 +861,7 @@ int tty_mode_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg) ret = -EFAULT ;return ret;case TIOCSLCKTRMIOS : -if (!capable (CAP_SYS_ADMIN )) +if (!checkpoint_restore_ns_capable (&init_user_ns))return -EPERM ;copy_termios_locked (real_tty, &kterm); if (user_termios_to_kernel_termios_1(&kterm,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 259/353 tty: serial: 8250: Set RS422 interface by default to fix Moxa RS422/RS485 PCIe boards
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Crescent CY Hsieh <[email protected]>
[ Upstream commit 43f012df3c1e979966524f79b5371fde6545488a ]
MOXA PCIe RS422/RS485 boards will not function by default because of the initial default serial interface of all MOXA PCIe boards is set to RS232.
This patch fixes the problem above by setting the initial default serial interface to RS422 for those MOXA RS422/RS485 PCIe boards.
--- drivers/tty/serial/8250/8250_pci.c | 58 +++++++++++++++++++++++++++++- 1 file changed, 57 insertions(+), 1 deletion(-)
drivers/tty/serial/8250/8250_pci.c +57 -1
@@ -19,6 +19,7 @@#include <linux/serial_core.h> #include <linux/8250_pci.h> #include <linux/bitops.h> +#include <linux/bitfield.h> #include <asm/byteorder.h> #include <asm/io.h>
@@ -1970,6 +1971,20 @@ pci_sunix_setup(struct serial_private *priv,#define MOXA_GPIO_PIN2 BIT(2) +#define MOXA_RS232 0x00 +#define MOXA_RS422 0x01 +#define MOXA_RS485_4W 0x0B +#define MOXA_RS485_2W 0x0F +#define MOXA_UIR_OFFSET 0x04 +#define MOXA_EVEN_RS_MASK GENMASK(3, 0) +#define MOXA_ODD_RS_MASK GENMASK(7, 4) + +enum { +MOXA_SUPP_RS232 =BIT (0 ), +MOXA_SUPP_RS422 =BIT (1 ), +MOXA_SUPP_RS485 =BIT (2 ), +}; +static bool pci_moxa_is_mini_pcie (unsigned short device) { if (device == PCI_DEVICE_ID_MOXA_CP102N ||
@@ -1983,13 +1998,54 @@ static bool pci_moxa_is_mini_pcie(unsigned short device)return false; } +static unsigned int pci_moxa_supported_rs (struct pci_dev *dev) +{ +switch (dev->device &0x0F00 ) { +case 0x0000 : +case 0x0600 : +return MOXA_SUPP_RS232 ; +case 0x0100 : +return MOXA_SUPP_RS232 |MOXA_SUPP_RS422 |MOXA_SUPP_RS485 ; +case 0x0300 : +return MOXA_SUPP_RS422 |MOXA_SUPP_RS485 ; + } +return 0 ; +} + +static int pci_moxa_set_interface (const struct pci_dev *dev, +unsigned int port_idx, +u8 mode) +{ +resource_size_t iobar_addr =pci_resource_start (dev,2 ); +resource_size_t UIR_addr = iobar_addr +MOXA_UIR_OFFSET + port_idx /2 ; +u8 val; + + val =inb (UIR_addr); + +if (port_idx %2 ) { + val &= ~MOXA_ODD_RS_MASK ; + val |=FIELD_PREP (MOXA_ODD_RS_MASK , mode); + }else { + val &= ~MOXA_EVEN_RS_MASK ; + val |=FIELD_PREP (MOXA_EVEN_RS_MASK , mode); + } +outb (val, UIR_addr); + +return 0 ; +} +static int pci_moxa_init (struct pci_dev *dev) {unsigned short device = dev->device;resource_size_t iobar_addr =pci_resource_start (dev,2 ); -unsigned int num_ports = (device &0x00F0 ) >>4 ; +unsigned int num_ports = (device &0x00F0 ) >>4 , i;u8 val; +if (!(pci_moxa_supported_rs (dev) &MOXA_SUPP_RS232 )) { +for (i =0 ; i < num_ports; ++i) +pci_moxa_set_interface (dev, i,MOXA_RS422 ); + } +/* * Enable hardware buffer to prevent break signal output when system boots up. * This hardware buffer is only supported on Mini PCIe series.
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 260/353 fs/kernfs/dir: obey S_ISGID
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Max Kellermann <[email protected]>
[ Upstream commit 5133bee62f0ea5d4c316d503cc0040cac5637601 ]
Handling of S_ISGID is usually done by inode_init_owner() in all other filesystems, but kernfs doesn't use that function. In kernfs, struct kernfs_node is the primary data structure, and struct inode is only created from it on demand. Therefore, inode_init_owner() can't be used and we need to imitate its behavior.
S_ISGID support is useful for the cgroup filesystem; it allows subtrees managed by an unprivileged process to retain a certain owner gid, which then enables sharing access to the subtree with another unprivileged process.
--
v1 -> v2: minor coding style fix (comment)
--- fs/kernfs/dir.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
fs/kernfs/dir.c +12 -0
@@ -676,6 +676,18 @@ struct kernfs_node *kernfs_new_node(struct kernfs_node *parent, {struct kernfs_node *kn; +if (parent->mode &S_ISGID ) { +/* this code block imitates inode_init_owner() for +* kernfs +*/ + +if (parent->iattr) + gid = parent->iattr->ia_gid; + +if (flags &KERNFS_DIR ) + mode |=S_ISGID ; + } + kn =__kernfs_new_node (kernfs_root (parent), parent, name, mode, uid, gid, flags);if (kn) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 261/353 spmi: mediatek: Fix UAF on device remove
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yu-Che Cheng <[email protected]>
[ Upstream commit e821d50ab5b956ed0effa49faaf29912fd4106d9 ]
The pmif driver data that contains the clocks is allocated along with spmi_controller.
On device remove, spmi_controller will be freed first, and then devres , including the clocks, will be cleanup.
This leads to UAF because putting the clocks will access the clocks in the pmif driver data, which is already freed along with spmi_controller.
This can be reproduced by enabling DEBUG_TEST_DRIVER_REMOVE and building the kernel with KASAN.
Fix the UAF issue by using unmanaged clk_bulk_get() and putting the clocks before freeing spmi_controller.
--- drivers/spmi/spmi-mtk-pmif.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/spmi/spmi-mtk-pmif.c +5 -2
@@ -475,7 +475,7 @@ static int mtk_spmi_probe(struct platform_device *pdev)for (i =0 ; i < arb->nclks; i++) arb->clks[i].id = pmif_clock_names[i]; - err =devm_clk_bulk_get (&pdev->dev, arb->nclks, arb->clks); + err =clk_bulk_get (&pdev->dev, arb->nclks, arb->clks);if (err) {dev_err (&pdev->dev,"Failed to get clocks: %d\n" , err); goto err_put_ctrl;
@@ -484,7 +484,7 @@ static int mtk_spmi_probe(struct platform_device *pdev) err =clk_bulk_prepare_enable (arb->nclks, arb->clks);if (err) {dev_err (&pdev->dev,"Failed to enable clocks: %d\n" , err); - goto err_put_ctrl; + goto err_put_clks; } ctrl->cmd = pmif_arb_cmd;
@@ -510,6 +510,8 @@ static int mtk_spmi_probe(struct platform_device *pdev) err_domain_remove:clk_bulk_disable_unprepare (arb->nclks, arb->clks); +err_put_clks: +clk_bulk_put (arb->nclks, arb->clks); err_put_ctrl:spmi_controller_put (ctrl);return err;
@@ -521,6 +523,7 @@ static void mtk_spmi_remove(struct platform_device *pdev)struct pmif *arb =spmi_controller_get_drvdata (ctrl);clk_bulk_disable_unprepare (arb->nclks, arb->clks); +clk_bulk_put (arb->nclks, arb->clks);spmi_controller_remove (ctrl);spmi_controller_put (ctrl); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 262/353 staging: vme_user: Fix the issue of return the wrong error code
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Piro Yang <[email protected]>
[ Upstream commit 5090a4bc2a2f04b7693b49500ad1287e8d0fb6c3 ]
Fix the issue of returning the -ENOSYS error code when an error occurs.
The error code of -ENOSYS indicates Invalid system call number, but there is not system call error. So replace -ENOSYS error code by the return -EINVAL error code.
--- drivers/staging/vme_user/vme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/vme_user/vme.c +1 -1
@@ -341,7 +341,7 @@ int vme_slave_set(struct vme_resource *resource, int enabled,if (!bridge->slave_set) {dev_err (bridge->parent,"Function not supported\n" ); -return -ENOSYS ; +return -EINVAL ; } if (!(((image->address_attr & aspace) == aspace) &&
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 263/353 PCI: Fix 64GT/s effective data rate calculation
In reply to Greg Kroah-Hartman6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
[ Upstream commit ac4f1897fa5433a1b07a625503a91b6aa9d7e643 ]
Unlike the lower rates, the PCIe 64GT/s Data Rate uses 1b/1b encoding, not 128b/130b (PCIe r6.1 sec 1.2, Table 1-1). Correct the PCIE_SPEED2MBS_ENC() calculation to reflect that.
--- drivers/pci/pci.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/pci.h +1 -1
@@ -272,7 +272,7 @@ void pci_bus_put(struct pci_bus *bus);/* PCIe speed to Mb/s reduced by encoding overhead */ #define PCIE_SPEED2MBS_ENC (speed) \ - ((speed) == PCIE_SPEED_64_0GT ? 64000*128/130 : \ + ((speed) == PCIE_SPEED_64_0GT ? 64000*1/1 : \ (speed) == PCIE_SPEED_32_0GT ? 32000*128/130 : \ (speed) == PCIE_SPEED_16_0GT ? 16000*128/130 : \ (speed) == PCIE_SPEED_8_0GT ? 8000*128/130 : \
Signature · 1 line
2.43.0