6.3.13-rc1 review
Subsystems (9)
Greg Kroah-Hartman
maintainerPATCH 130/431 wifi: cfg80211: fix regulatory disconnect with OCB/NAN
In reply to Greg Kroah-HartmanFrom: Johannes Berg <[email protected]>
[ Upstream commit e8c2af660ba0790afd14d5cbc2fd05c6dc85e207 ]
Since regulatory disconnect was added, OCB and NAN interface types were added, which made it completely unusable for any driver that allowed OCB/NAN. Add OCB/NAN (though NAN doesn't do anything, we don't have any info) and also remove all the logic that opts out, so it won't be broken again if/when new interface types are added.
--- include/net/regulatory.h | 13 +------------ net/wireless/core.c | 16 ---------------- net/wireless/reg.c | 14 ++++++++++---- 3 files changed, 11 insertions(+), 32 deletions(-)
include/net/regulatory.h +1 -12
@@ -140,17 +140,6 @@ struct regulatory_request {* otherwise initiating radiation is not allowed. This will enable the * relaxations enabled under the CFG80211_REG_RELAX_NO_IR configuration * option -* @REGULATORY_IGNORE_STALE_KICKOFF: the regulatory core will _not_ make sure -* all interfaces on this wiphy reside on allowed channels. If this flag -* is not set, upon a regdomain change, the interfaces are given a grace -* period (currently 60 seconds) to disconnect or move to an allowed -* channel. Interfaces on forbidden channels are forcibly disconnected. -* Currently these types of interfaces are supported for enforcement: -* NL80211_IFTYPE_ADHOC, NL80211_IFTYPE_STATION, NL80211_IFTYPE_AP, -* NL80211_IFTYPE_AP_VLAN, NL80211_IFTYPE_MONITOR, -* NL80211_IFTYPE_P2P_CLIENT, NL80211_IFTYPE_P2P_GO, -* NL80211_IFTYPE_P2P_DEVICE. The flag will be set by default if a device -* includes any modes unsupported for enforcement checking. * @REGULATORY_WIPHY_SELF_MANAGED: for devices that employ wiphy-specific * regdom management. These devices will ignore all regdom changes not * originating from their own wiphy.
@@ -177,7 +166,7 @@ enum ieee80211_regulatory_flags {REGULATORY_COUNTRY_IE_FOLLOW_POWER =BIT (3 ),REGULATORY_COUNTRY_IE_IGNORE =BIT (4 ),REGULATORY_ENABLE_RELAX_NO_IR =BIT (5 ), -REGULATORY_IGNORE_STALE_KICKOFF =BIT (6 ), +/* reuse bit 6 next time */ REGULATORY_WIPHY_SELF_MANAGED = BIT(7), };
net/wireless/core.c +0 -16
@@ -721,22 +721,6 @@ int wiphy_register(struct wiphy *wiphy)return -EINVAL ; } -/* -* if a wiphy has unsupported modes for regulatory channel enforcement, -* opt-out of enforcement checking -*/ -if (wiphy->interface_modes & ~(BIT (NL80211_IFTYPE_STATION ) | -BIT (NL80211_IFTYPE_P2P_CLIENT ) | -BIT (NL80211_IFTYPE_AP ) | -BIT (NL80211_IFTYPE_MESH_POINT ) | -BIT (NL80211_IFTYPE_P2P_GO ) | -BIT (NL80211_IFTYPE_ADHOC ) | -BIT (NL80211_IFTYPE_P2P_DEVICE ) | -BIT (NL80211_IFTYPE_NAN ) | -BIT (NL80211_IFTYPE_AP_VLAN ) | -BIT (NL80211_IFTYPE_MONITOR ))) - wiphy->regulatory_flags |=REGULATORY_IGNORE_STALE_KICKOFF ; - if (WARN_ON((wiphy->regulatory_flags & REGULATORY_WIPHY_SELF_MANAGED) && (wiphy->regulatory_flags & (REGULATORY_CUSTOM_REG |
net/wireless/reg.c +10 -4
@@ -2391,9 +2391,17 @@ static bool reg_wdev_chan_valid(struct wiphy *wiphy, struct wireless_dev *wdev)case NL80211_IFTYPE_P2P_DEVICE :/* no enforcement required */ break ; +case NL80211_IFTYPE_OCB : +if (!wdev->u.ocb.chandef.chan) +continue ; + chandef = wdev->u.ocb.chandef; +break ; +case NL80211_IFTYPE_NAN : +/* we have no info, but NAN is also pretty universal */ +continue ;default :/* others not implemented for now */ -WARN_ON (1 ); +WARN_ON_ONCE (1 );break ; }
@@ -2452,9 +2460,7 @@ static void reg_check_chans_work(struct work_struct *work)rtnl_lock ();list_for_each_entry (rdev, &cfg80211_rdev_list, list) -if (!(rdev->wiphy.regulatory_flags & -REGULATORY_IGNORE_STALE_KICKOFF )) -reg_leave_invalid_chans (&rdev->wiphy); +reg_leave_invalid_chans (&rdev->wiphy);rtnl_unlock (); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 131/431 wifi: ieee80211: Fix the common size calculation for reconfiguration ML
In reply to Greg Kroah-HartmanFrom: Ilan Peer <[email protected]>
[ Upstream commit ce6e1f600b0cfc563a7d607de702262a58cd835d ]
The common information length is found in the first octet of the common information.
--- include/linux/ieee80211.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
include/linux/ieee80211.h +1 -4
@@ -4592,15 +4592,12 @@ static inline u8 ieee80211_mle_common_size(const u8 *data)case IEEE80211_ML_CONTROL_TYPE_BASIC :case IEEE80211_ML_CONTROL_TYPE_PREQ :case IEEE80211_ML_CONTROL_TYPE_TDLS : +case IEEE80211_ML_CONTROL_TYPE_RECONF :/* * The length is the first octet pointed by mle->variable so no * need to add anything */ break ; -case IEEE80211_ML_CONTROL_TYPE_RECONF : -if (control &IEEE80211_MLC_RECONF_PRES_MLD_MAC_ADDR ) - common +=ETH_ALEN ; -return common;case IEEE80211_ML_CONTROL_TYPE_PRIO_ACCESS :if (control &IEEE80211_MLC_PRIO_ACCESS_PRES_AP_MLD_MAC_ADDR ) common +=ETH_ALEN ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 132/431 mmc: Add MMC_QUIRK_BROKEN_SD_CACHE for Kingston Canvas Go Plus from 11/2019
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit c467c8f081859d4f4ca4eee4fba54bb5d85d6c97 ]
This microSD card never clears Flush Cache bit after cache flush has been started in sd_flush_cache(). This leads e.g. to failure to mount file system. Add a quirk which disables the SD cache for this specific card from specific manufacturing date of 11/2019, since on newer dated cards from 05/2023 the cache flush works correctly.
--- drivers/mmc/core/card.h | 30 +++++++++++++++++++++++------- drivers/mmc/core/quirks.h | 13 +++++++++++++ drivers/mmc/core/sd.c | 2 +- include/linux/mmc/card.h | 1 + 4 files changed, 38 insertions(+), 8 deletions(-)
drivers/mmc/core/card.h +23 -7
@@ -53,6 +53,10 @@ struct mmc_fixup {unsigned int manfid;unsigned short oemid; +/* Manufacturing date */ +unsigned short year; +unsigned char month; +/* SDIO-specific fields. You can use SDIO_ANY_ID here of course */ u16 cis_vendor, cis_device;
@@ -68,6 +72,8 @@ struct mmc_fixup {#define CID_MANFID_ANY (-1u)#define CID_OEMID_ANY ((unsigned short) -1) +#define CID_YEAR_ANY ((unsigned short) -1) +#define CID_MONTH_ANY ((unsigned char) -1)#define CID_NAME_ANY (NULL)#define EXT_CSD_REV_ANY (-1u)
@@ -81,17 +87,21 @@ struct mmc_fixup {#define CID_MANFID_APACER 0x27#define CID_MANFID_KINGSTON 0x70#define CID_MANFID_HYNIX 0x90 +#define CID_MANFID_KINGSTON_SD 0x9F#define CID_MANFID_NUMONYX 0xFE#define END_FIXUP { NULL } -#define _FIXUP_EXT (_name, _manfid, _oemid, _rev_start, _rev_end, \ - _cis_vendor, _cis_device, \ - _fixup, _data, _ext_csd_rev) \ +#define _FIXUP_EXT (_name, _manfid, _oemid, _year, _month, \ + _rev_start, _rev_end, \ + _cis_vendor, _cis_device, \ + _fixup, _data, _ext_csd_rev) \ { \ .name = (_name), \ .manfid = (_manfid), \ .oemid = (_oemid), \ + .year = (_year), \ + .month = (_month), \ .rev_start = (_rev_start), \ .rev_end = (_rev_end), \ .cis_vendor = (_cis_vendor), \
@@ -103,8 +113,8 @@ struct mmc_fixup {#define MMC_FIXUP_REV (_name, _manfid, _oemid, _rev_start, _rev_end, \ _fixup, _data, _ext_csd_rev) \ - _FIXUP_EXT(_name, _manfid, \ - _oemid, _rev_start, _rev_end, \ + _FIXUP_EXT(_name, _manfid, _oemid, CID_YEAR_ANY, CID_MONTH_ANY, \ + _rev_start, _rev_end, \ SDIO_ANY_ID, SDIO_ANY_ID, \ _fixup, _data, _ext_csd_rev) \
@@ -118,8 +128,9 @@ struct mmc_fixup { _ext_csd_rev)#define SDIO_FIXUP (_vendor, _device, _fixup, _data) \ - _FIXUP_EXT(CID_NAME_ANY, CID_MANFID_ANY, \ - CID_OEMID_ANY, 0, -1ull, \ + _FIXUP_EXT(CID_NAME_ANY, CID_MANFID_ANY, CID_OEMID_ANY, \ + CID_YEAR_ANY, CID_MONTH_ANY, \ + 0, -1ull, \ _vendor, _device, \ _fixup, _data, EXT_CSD_REV_ANY) \
@@ -264,4 +275,9 @@ static inline int mmc_card_broken_sd_discard(const struct mmc_card *c) return c->quirks & MMC_QUIRK_BROKEN_SD_DISCARD; } +static inline int mmc_card_broken_sd_cache (const struct mmc_card *c) +{ +return c->quirks &MMC_QUIRK_BROKEN_SD_CACHE ; +} +#endif
drivers/mmc/core/quirks.h +13 -0
@@ -53,6 +53,15 @@ static const struct mmc_fixup __maybe_unused mmc_blk_fixups[] = {MMC_FIXUP ("MMC32G" ,CID_MANFID_TOSHIBA ,CID_OEMID_ANY , add_quirk_mmc,MMC_QUIRK_BLK_NO_CMD23 ), +/* +* Kingston Canvas Go! Plus microSD cards never finish SD cache flush. +* This has so far only been observed on cards from 11/2019, while new +* cards from 2023/05 do not exhibit this behavior. +*/ +_FIXUP_EXT ("SD64G" ,CID_MANFID_KINGSTON_SD ,0x5449 ,2019 ,11 , +0 ,-1ull ,SDIO_ANY_ID ,SDIO_ANY_ID , add_quirk_sd, + MMC_QUIRK_BROKEN_SD_CACHE, EXT_CSD_REV_ANY), +/* * Some SD cards lockup while using CMD23 multiblock transfers. */
@@ -209,6 +218,10 @@ static inline void mmc_fixup_device(struct mmc_card *card,if (f->of_compatible && !mmc_fixup_of_compatible_match (card, f->of_compatible))continue ; +if (f->year !=CID_YEAR_ANY && f->year != card->cid.year) +continue ; +if (f->month !=CID_MONTH_ANY && f->month != card->cid.month) +continue ;dev_dbg (&card->dev,"calling %ps\n" , f->vendor_fixup); f->vendor_fixup (card, f->data);
drivers/mmc/core/sd.c +1 -1
@@ -1170,7 +1170,7 @@ static int sd_parse_ext_reg_perf(struct mmc_card *card, u8 fno, u8 page, card->ext_perf.feature_support |=SD_EXT_PERF_HOST_MAINT ;/* Cache support at bit 0. */ -if (reg_buf[4 ] &BIT (0 )) +if ((reg_buf[4 ] &BIT (0 )) && !mmc_card_broken_sd_cache (card)) card->ext_perf.feature_support |=SD_EXT_PERF_CACHE ;/* Command queue support indicated via queue depth bits (0 to 4). */
include/linux/mmc/card.h +1 -0
@@ -294,6 +294,7 @@ struct mmc_card {#define MMC_QUIRK_TRIM_BROKEN (1<<12)/* Skip trim */ #define MMC_QUIRK_BROKEN_HPI (1<<13)/* Disable broken HPI support */ #define MMC_QUIRK_BROKEN_SD_DISCARD (1<<14)/* Disable broken SD discard support */ +#define MMC_QUIRK_BROKEN_SD_CACHE (1<<15)/* Disable broken SD cache support */ bool reenable_cmdq;/* Re-enable Command Queue */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 133/431 wifi: iwlwifi: mvm: indicate HW decrypt for beacon protection
In reply to Greg Kroah-HartmanFrom: Johannes Berg <[email protected]>
[ Upstream commit 2db72b8a700943aa54dce0aabe6ff1b72b615162 ]
We've already done the 'decryption' here, so tell
mac80211 it need not do it again.
--- drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c +6 -3
@@ -274,7 +274,8 @@ static void iwl_mvm_get_signal_strength(struct iwl_mvm *mvm,static int iwl_mvm_rx_mgmt_prot (struct ieee80211_sta *sta,struct ieee80211_hdr *hdr,struct iwl_rx_mpdu_desc *desc, -u32 status) +u32 status, +struct ieee80211_rx_status *stats) {struct iwl_mvm_sta *mvmsta;struct iwl_mvm_vif *mvmvif;
@@ -303,8 +304,10 @@ static int iwl_mvm_rx_mgmt_prot(struct ieee80211_sta *sta,/* good cases */ if (likely (status &IWL_RX_MPDU_STATUS_MIC_OK && - !(status &IWL_RX_MPDU_STATUS_REPLAY_ERROR ))) + !(status &IWL_RX_MPDU_STATUS_REPLAY_ERROR ))) { + stats->flag |=RX_FLAG_DECRYPTED ;return 0 ; + }if (!sta)return -1 ;
@@ -373,7 +376,7 @@ static int iwl_mvm_rx_crypto(struct iwl_mvm *mvm, struct ieee80211_sta *sta,if (unlikely (ieee80211_is_mgmt (hdr->frame_control) && !ieee80211_has_protected (hdr->frame_control))) -return iwl_mvm_rx_mgmt_prot (sta, hdr, desc, status); +return iwl_mvm_rx_mgmt_prot (sta, hdr, desc, status, stats);if (!ieee80211_has_protected (hdr->frame_control) || (status & IWL_RX_MPDU_STATUS_SEC_MASK) ==
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 134/431 wifi: ath9k: convert msecs to jiffies where needed
In reply to Greg Kroah-HartmanFrom: Dmitry Antipov <[email protected]>
[ Upstream commit 2aa083acea9f61be3280184384551178f510ff51 ]
Since 'ieee80211_queue_delayed_work()' expects timeout in jiffies and not milliseconds, 'msecs_to_jiffies()' should be used in 'ath_restart_work()' and '__ath9k_flush()'.
--- drivers/net/wireless/ath/ath9k/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath9k/main.c +2 -2
@@ -203,7 +203,7 @@ void ath_cancel_work(struct ath_softc *sc)void ath_restart_work (struct ath_softc *sc) {ieee80211_queue_delayed_work (sc->hw, &sc->hw_check_work, -ATH_HW_CHECK_POLL_INT ); +msecs_to_jiffies (ATH_HW_CHECK_POLL_INT ));if (AR_SREV_9340 (sc->sc_ah) ||AR_SREV_9330 (sc->sc_ah)) ieee80211_queue_delayed_work(sc->hw, &sc->hw_pll_work,
@@ -2240,7 +2240,7 @@ void __ath9k_flush(struct ieee80211_hw *hw, u32 queues, bool drop, }ieee80211_queue_delayed_work (hw, &sc->hw_check_work, -ATH_HW_CHECK_POLL_INT ); +msecs_to_jiffies (ATH_HW_CHECK_POLL_INT )); }static bool ath9k_tx_frames_pending (struct ieee80211_hw *hw)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 135/431 bpf: Factor out socket lookup functions for the TC hookpoint.
In reply to Greg Kroah-HartmanFrom: Gilad Sever <[email protected]>
[ Upstream commit 6e98730bc0b44acaf86eccc75f823128aa9c9e79 ]
Change BPF helper socket lookup functions to use TC specific variants:bpf_tc_sk_lookup_tcp() / bpf_tc_sk_lookup_udp() / bpf_tc_skc_lookup_tcp() instead of sharing implementation with the cg / sk_skb hooking points. This allows introducing a separate logic for the TC flow.
The tc functions are identical to the original code.
Stable-dep-of: 9a5cb79762e0 ("bpf: Fix bpf socket lookup from tc/xdp to respect socket VRF bindings")
--- net/core/filter.c | 63 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 60 insertions(+), 3 deletions(-)
net/core/filter.c +60 -3
@@ -6701,6 +6701,63 @@ static const struct bpf_func_proto bpf_sk_lookup_udp_proto = { .arg5_type = ARG_ANYTHING, }; +BPF_CALL_5(bpf_tc_skc_lookup_tcp, struct sk_buff *, skb, + struct bpf_sock_tuple *, tuple, u32, len, u64, netns_id, u64, flags) +{ +return (unsigned long )bpf_skc_lookup (skb, tuple, len,IPPROTO_TCP , + netns_id, flags); +} + +static const struct bpf_func_proto bpf_tc_skc_lookup_tcp_proto = { + .func = bpf_tc_skc_lookup_tcp, + .gpl_only = false, + .pkt_access = true, + .ret_type =RET_PTR_TO_SOCK_COMMON_OR_NULL , + .arg1_type =ARG_PTR_TO_CTX , + .arg2_type =ARG_PTR_TO_MEM |MEM_RDONLY , + .arg3_type =ARG_CONST_SIZE , + .arg4_type =ARG_ANYTHING , + .arg5_type =ARG_ANYTHING , +}; + +BPF_CALL_5(bpf_tc_sk_lookup_tcp, struct sk_buff *, skb, + struct bpf_sock_tuple *, tuple, u32, len, u64, netns_id, u64, flags) +{ +return (unsigned long )bpf_sk_lookup (skb, tuple, len,IPPROTO_TCP , + netns_id, flags); +} + +static const struct bpf_func_proto bpf_tc_sk_lookup_tcp_proto = { + .func = bpf_tc_sk_lookup_tcp, + .gpl_only = false, + .pkt_access = true, + .ret_type =RET_PTR_TO_SOCKET_OR_NULL , + .arg1_type =ARG_PTR_TO_CTX , + .arg2_type =ARG_PTR_TO_MEM |MEM_RDONLY , + .arg3_type =ARG_CONST_SIZE , + .arg4_type =ARG_ANYTHING , + .arg5_type =ARG_ANYTHING , +}; + +BPF_CALL_5(bpf_tc_sk_lookup_udp, struct sk_buff *, skb, + struct bpf_sock_tuple *, tuple, u32, len, u64, netns_id, u64, flags) +{ +return (unsigned long )bpf_sk_lookup (skb, tuple, len,IPPROTO_UDP , + netns_id, flags); +} + +static const struct bpf_func_proto bpf_tc_sk_lookup_udp_proto = { + .func = bpf_tc_sk_lookup_udp, + .gpl_only = false, + .pkt_access = true, + .ret_type =RET_PTR_TO_SOCKET_OR_NULL , + .arg1_type =ARG_PTR_TO_CTX , + .arg2_type =ARG_PTR_TO_MEM |MEM_RDONLY , + .arg3_type =ARG_CONST_SIZE , + .arg4_type =ARG_ANYTHING , + .arg5_type =ARG_ANYTHING , +}; + BPF_CALL_1(bpf_sk_release, struct sock *, sk) {if (sk &&sk_is_refcounted (sk))
@@ -7954,9 +8011,9 @@ tc_cls_act_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)#endif #ifdef CONFIG_INET case BPF_FUNC_sk_lookup_tcp: -return &bpf_sk_lookup_tcp_proto; +return &bpf_tc_sk_lookup_tcp_proto;case BPF_FUNC_sk_lookup_udp: -return &bpf_sk_lookup_udp_proto; +return &bpf_tc_sk_lookup_udp_proto;case BPF_FUNC_sk_release:return &bpf_sk_release_proto;case BPF_FUNC_tcp_sock:
@@ -7964,7 +8021,7 @@ tc_cls_act_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)case BPF_FUNC_get_listener_sock:return &bpf_get_listener_sock_proto;case BPF_FUNC_skc_lookup_tcp: -return &bpf_skc_lookup_tcp_proto; +return &bpf_tc_skc_lookup_tcp_proto;case BPF_FUNC_tcp_check_syncookie:return &bpf_tcp_check_syncookie_proto;case BPF_FUNC_skb_ecn_set_ce:
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 136/431 bpf: Call __bpf_sk_lookup()/__bpf_skc_lookup() directly via TC hookpoint
In reply to Greg Kroah-HartmanFrom: Gilad Sever <[email protected]>
[ Upstream commit 97fbfeb86917bdbe9c41d5143e335a929147f405 ]
skb->dev always exists in the tc flow. There is no need to use bpf_skc_lookup(), bpf_sk_lookup() from this code path.
This change facilitates fixing the tc flow to be VRF aware.
Stable-dep-of: 9a5cb79762e0 ("bpf: Fix bpf socket lookup from tc/xdp to respect socket VRF bindings")
--- net/core/filter.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-)
net/core/filter.c +18 -6
@@ -6704,8 +6704,12 @@ static const struct bpf_func_proto bpf_sk_lookup_udp_proto = { BPF_CALL_5(bpf_tc_skc_lookup_tcp, struct sk_buff *, skb, struct bpf_sock_tuple *, tuple, u32, len, u64, netns_id, u64, flags) { -return (unsigned long )bpf_skc_lookup (skb, tuple, len,IPPROTO_TCP , - netns_id, flags); +struct net *caller_net =dev_net (skb->dev); +int ifindex = skb->dev->ifindex; + +return (unsigned long )__bpf_skc_lookup (skb, tuple, len, caller_net, + ifindex,IPPROTO_TCP , netns_id, + flags); }static const struct bpf_func_proto bpf_tc_skc_lookup_tcp_proto = {
@@ -6723,8 +6727,12 @@ static const struct bpf_func_proto bpf_tc_skc_lookup_tcp_proto = { BPF_CALL_5(bpf_tc_sk_lookup_tcp, struct sk_buff *, skb, struct bpf_sock_tuple *, tuple, u32, len, u64, netns_id, u64, flags) { -return (unsigned long )bpf_sk_lookup (skb, tuple, len,IPPROTO_TCP , - netns_id, flags); +struct net *caller_net =dev_net (skb->dev); +int ifindex = skb->dev->ifindex; + +return (unsigned long )__bpf_sk_lookup (skb, tuple, len, caller_net, + ifindex,IPPROTO_TCP , netns_id, + flags); }static const struct bpf_func_proto bpf_tc_sk_lookup_tcp_proto = {
@@ -6742,8 +6750,12 @@ static const struct bpf_func_proto bpf_tc_sk_lookup_tcp_proto = { BPF_CALL_5(bpf_tc_sk_lookup_udp, struct sk_buff *, skb, struct bpf_sock_tuple *, tuple, u32, len, u64, netns_id, u64, flags) { -return (unsigned long )bpf_sk_lookup (skb, tuple, len,IPPROTO_UDP , - netns_id, flags); +struct net *caller_net =dev_net (skb->dev); +int ifindex = skb->dev->ifindex; + +return (unsigned long )__bpf_sk_lookup (skb, tuple, len, caller_net, + ifindex,IPPROTO_UDP , netns_id, + flags); }static const struct bpf_func_proto bpf_tc_sk_lookup_udp_proto = {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 137/431 bpf: Fix bpf socket lookup from tc/xdp to respect socket VRF bindings
In reply to Greg Kroah-HartmanFrom: Gilad Sever <[email protected]>
[ Upstream commit 9a5cb79762e0eda17ca15c2a6eaca4622383c21c ]
When calling bpf_sk_lookup_tcp(), bpf_sk_lookup_udp() or bpf_skc_lookup_tcp() from tc/xdp ingress, VRF socket bindings aren't respoected, i.e. unbound sockets are returned, and bound sockets aren't found.
VRF binding is determined by the sdif argument to sk_lookup(), however when called from tc the IP SKB control block isn't initialized and thus inet{,6}_sdif() always returns 0.
Fix by calculating sdif for the tc/xdp flows by observing the device's l3 enslaved state.
The cg/sk_skb hooking points which are expected to support inet{,6}_sdif() pass sdif=-1 which makes __bpf_skc_lookup() use the existing logic.
--- include/linux/netdevice.h | 9 +++++ net/core/filter.c | 69 ++++++++++++++++++++++----------------- 2 files changed, 48 insertions(+), 30 deletions(-)
include/linux/netdevice.h +9 -0
@@ -5063,6 +5063,15 @@ static inline bool netif_is_l3_slave(const struct net_device *dev)return dev->priv_flags &IFF_L3MDEV_SLAVE ; } +static inline int dev_sdif (const struct net_device *dev) +{ +#ifdef CONFIG_NET_L3_MASTER_DEV +if (netif_is_l3_slave (dev)) +return dev->ifindex; +#endif +return 0 ; +} +static inline bool netif_is_bridge_master (const struct net_device *dev) {return dev->priv_flags &IFF_EBRIDGE ;
net/core/filter.c +39 -30
171 lines not on this page · raw message
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 138/431 can: length: fix bitstuffing count
In reply to Greg Kroah-HartmanFrom: Vincent Mailhol <[email protected]>
[ Upstream commit 9fde4c557f78ee2f3626e92b4089ce9d54a2573a ]
The Stuff Bit Count is always coded on 4 bits [1]. Update the Stuff Bit Count size accordingly.
In addition, the CRC fields of CAN FD Frames contain stuff bits at fixed positions called fixed stuff bits [2]. The CRC field starts with a fixed stuff bit and then has another fixed stuff bit after each fourth bit [2], which allows us to derive this formula:
FSB count = 1 + round_down(len(CRC field)/4)
The length of the CRC field is [1]:
len(CRC field) = len(Stuff Bit Count) + len(CRC)
= 4 + len(CRC)
with len(CRC) either 17 or 21 bits depending of the payload length.
In conclusion, for CRC17:
FSB count = 1 + round_down((4 + 17)/4)
= 6
and for CRC 21:
FSB count = 1 + round_down((4 + 21)/4)
= 7
Add a Fixed Stuff bits (FSB) field with above values and update CANFD_FRAME_OVERHEAD_SFF and CANFD_FRAME_OVERHEAD_EFF accordingly.
[1] ISO 11898-1:2015 section 10.4.2.6 "CRC field":
The CRC field shall contain the CRC sequence followed by a recessive CRC delimiter. For FD Frames, the CRC field shall also contain the stuff count.
Stuff count
If FD Frames, the stuff count shall be at the beginning of the CRC field. It shall consist of the stuff bit count modulo 8 in a 3-bit gray code followed by a parity bit [...]
[2] ISO 11898-1:2015 paragraph 10.5 "Frame coding":
In the CRC field of FD Frames, the stuff bits shall be inserted at fixed positions; they are called fixed stuff bits. There shall be a fixed stuff bit before the first bit of the stuff count, even if the last bits of the preceding field are a sequence of five consecutive bits of identical value, there shall be only the fixed stuff bit, there shall not be two consecutive stuff bits. A further fixed stuff bit shall be inserted after each fourth bit of the CRC field [...]
--- include/linux/can/length.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
include/linux/can/length.h +8 -6
@@ -69,17 +69,18 @@* Error Status Indicator (ESI) 1 * Data length code (DLC) 4 * Data field 0...512 -* Stuff Bit Count (SBC) 0...16: 4 20...64:5 +* Stuff Bit Count (SBC) 4 * CRC 0...16: 17 20...64:21 * CRC delimiter (CD) 1 +* Fixed Stuff bits (FSB) 0...16: 6 20...64:7 * ACK slot (AS) 1 * ACK delimiter (AD) 1 * End-of-frame (EOF) 7 * Inter frame spacing 3 * -* assuming CRC21, rounded up and ignoring bitstuffing +* assuming CRC21, rounded up and ignoring dynamic bitstuffing */ -#define CANFD_FRAME_OVERHEAD_SFF DIV_ROUND_UP(61, 8) +#define CANFD_FRAME_OVERHEAD_SFF DIV_ROUND_UP(67, 8)/* * Size of a CAN-FD Extended Frame
@@ -98,17 +99,18 @@* Error Status Indicator (ESI) 1 * Data length code (DLC) 4 * Data field 0...512 -* Stuff Bit Count (SBC) 0...16: 4 20...64:5 +* Stuff Bit Count (SBC) 4 * CRC 0...16: 17 20...64:21 * CRC delimiter (CD) 1 +* Fixed Stuff bits (FSB) 0...16: 6 20...64:7 * ACK slot (AS) 1 * ACK delimiter (AD) 1 * End-of-frame (EOF) 7 * Inter frame spacing 3 * -* assuming CRC21, rounded up and ignoring bitstuffing +* assuming CRC21, rounded up and ignoring dynamic bitstuffing */ -#define CANFD_FRAME_OVERHEAD_EFF DIV_ROUND_UP(80, 8) +#define CANFD_FRAME_OVERHEAD_EFF DIV_ROUND_UP(86, 8)/* * Maximum size of a Classical CAN frame
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 139/431 can: kvaser_pciefd: Add function to set skb hwtstamps
In reply to Greg Kroah-HartmanFrom: Jimmy Assarsson <[email protected]>
[ Upstream commit 2d55e9f9b4427e1ad59b974f2267767aac3788d3 ]
Add new function, kvaser_pciefd_set_skb_timestamp(), to set skb hwtstamps.
Stable-dep-of: ec681b91befa ("can: kvaser_pciefd: Set hardware timestamp on transmitted packets")
--- drivers/net/can/kvaser_pciefd.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-)
drivers/net/can/kvaser_pciefd.c +10 -17
@@ -538,6 +538,13 @@ static int kvaser_pciefd_set_tx_irq(struct kvaser_pciefd_can *can)return 0 ; } +static inline void kvaser_pciefd_set_skb_timestamp (const struct kvaser_pciefd *pcie, +struct sk_buff *skb,u64 timestamp) +{ +skb_hwtstamps (skb)->hwtstamp = +ns_to_ktime (div_u64 (timestamp *1000 , pcie->freq_to_ticks_div)); +} +static void kvaser_pciefd_setup_controller (struct kvaser_pciefd_can *can) {u32 mode;
@@ -1171,7 +1178,6 @@ static int kvaser_pciefd_handle_data_packet(struct kvaser_pciefd *pcie,struct canfd_frame *cf;struct can_priv *priv;struct net_device_stats *stats; -struct skb_shared_hwtstamps *shhwtstamps;u8 ch_id = (p->header[1 ] >>KVASER_PCIEFD_PACKET_CHID_SHIFT ) &0x7 ;if (ch_id >= pcie->nr_channels)
@@ -1214,12 +1220,7 @@ static int kvaser_pciefd_handle_data_packet(struct kvaser_pciefd *pcie, stats->rx_bytes += cf->len; } stats->rx_packets++; - - shhwtstamps =skb_hwtstamps (skb); - - shhwtstamps->hwtstamp = -ns_to_ktime (div_u64 (p->timestamp *1000 , - pcie->freq_to_ticks_div)); +kvaser_pciefd_set_skb_timestamp (pcie, skb, p->timestamp);return netif_rx (skb); }
@@ -1282,7 +1283,6 @@ static int kvaser_pciefd_rx_error_frame(struct kvaser_pciefd_can *can,struct net_device *ndev = can->can.dev;struct sk_buff *skb;struct can_frame *cf =NULL ; -struct skb_shared_hwtstamps *shhwtstamps;struct net_device_stats *stats = &ndev->stats; old_state = can->can.state;
@@ -1323,10 +1323,7 @@ static int kvaser_pciefd_rx_error_frame(struct kvaser_pciefd_can *can,return -ENOMEM ; } - shhwtstamps =skb_hwtstamps (skb); - shhwtstamps->hwtstamp = -ns_to_ktime (div_u64 (p->timestamp *1000 , - can->kv_pcie->freq_to_ticks_div)); +kvaser_pciefd_set_skb_timestamp (can->kv_pcie, skb, p->timestamp); cf->can_id |=CAN_ERR_BUSERROR |CAN_ERR_CNT ; cf->data[6 ] = bec.txerr;
@@ -1374,7 +1371,6 @@ static int kvaser_pciefd_handle_status_resp(struct kvaser_pciefd_can *can,struct net_device *ndev = can->can.dev;struct sk_buff *skb;struct can_frame *cf; -struct skb_shared_hwtstamps *shhwtstamps; skb =alloc_can_err_skb (ndev, &cf);if (!skb) {
@@ -1394,10 +1390,7 @@ static int kvaser_pciefd_handle_status_resp(struct kvaser_pciefd_can *can, cf->can_id |=CAN_ERR_RESTARTED ; } - shhwtstamps =skb_hwtstamps (skb); - shhwtstamps->hwtstamp = -ns_to_ktime (div_u64 (p->timestamp *1000 , - can->kv_pcie->freq_to_ticks_div)); +kvaser_pciefd_set_skb_timestamp (can->kv_pcie, skb, p->timestamp); cf->data[6 ] = bec.txerr; cf->data[7 ] = bec.rxerr;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 140/431 can: kvaser_pciefd: Set hardware timestamp on transmitted packets
In reply to Greg Kroah-HartmanFrom: Jimmy Assarsson <[email protected]>
[ Upstream commit ec681b91befa982477e24a150dd6452427fe6473 ]
Set hardware timestamp on transmitted packets.
--- drivers/net/can/kvaser_pciefd.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/net/can/kvaser_pciefd.c +10 -2
@@ -1519,6 +1519,7 @@ static void kvaser_pciefd_handle_nack_packet(struct kvaser_pciefd_can *can,if (skb) { cf->can_id |=CAN_ERR_BUSERROR ; +kvaser_pciefd_set_skb_timestamp (can->kv_pcie, skb, p->timestamp);netif_rx (skb); }else { stats->rx_dropped++;
@@ -1550,8 +1551,15 @@ static int kvaser_pciefd_handle_ack_packet(struct kvaser_pciefd *pcie,netdev_dbg (can->can.dev,"Packet was flushed\n" ); }else {int echo_idx = p->header[0 ] &KVASER_PCIEFD_PACKET_SEQ_MSK ; -int dlc =can_get_echo_skb (can->can.dev, echo_idx,NULL ); -u8 count =ioread32 (can->reg_base + +int dlc; +u8 count; +struct sk_buff *skb; + + skb = can->can.echo_skb[echo_idx]; +if (skb) +kvaser_pciefd_set_skb_timestamp (pcie, skb, p->timestamp); + dlc =can_get_echo_skb (can->can.dev, echo_idx,NULL ); + count =ioread32 (can->reg_base +KVASER_PCIEFD_KCAN_TX_NPACKETS_REG ) &0xff ; if (count < KVASER_PCIEFD_CAN_TX_MAX_COUNT &&
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 141/431 net: stmmac: fix double serdes powerdown
In reply to Greg Kroah-HartmanFrom: Bartosz Golaszewski <[email protected]>
[ Upstream commit c4fc88ad2a765224a648db8ab35f125e120fe41b ]
Commit 49725ffc15fc ("net: stmmac: power up/down serdes in stmmac_open/release") correctly added a call to the serdes_powerdown() callback to stmmac_release() but did not remove the one from stmmac_remove() which leads to a doubled call to serdes_powerdown().
This can lead to all kinds of problems: in the case of the qcom ethqos driver, it caused an unbalanced regulator disable splat.
--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 ------ 1 file changed, 6 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +0 -6
@@ -7394,12 +7394,6 @@ void stmmac_dvr_remove(struct device *dev)netif_carrier_off (ndev);unregister_netdev (ndev); -/* Serdes power down needs to happen after VLAN filter -* is deleted that is triggered by unregister_netdev(). -*/ -if (priv->plat->serdes_powerdown) - priv->plat->serdes_powerdown (ndev, priv->plat->bsp_priv); -#ifdef CONFIG_DEBUG_FS stmmac_exit_fs (ndev);#endif
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 142/431 netlink: fix potential deadlock in netlink_set_err()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 8d61f926d42045961e6b65191c09e3678d86a9cf ]
syzbot reported a possible deadlock in netlink_set_err() [1]
A similar issue was fixed in commit 1d482e666b8e ("netlink: disable IRQs for netlink_lock_table()") in netlink_lock_table()
This patch adds IRQ safety to netlink_set_err() and __netlink_diag_dump() which were not covered by cited commit.
[1]
WARNING: possible irq lock inversion dependency detected 6.4.0-rc6-syzkaller-00240-g4e9f0ec38852 #0 Not tainted
syz-executor.2/23011 just changed the state of lock:ffffffff8e1a7a58 (nl_table_lock){.+.?}-{2:2}, at: netlink_set_err+0x2e/0x3a0 net/netlink/af_netlink.c:1612 but this lock was taken by another, SOFTIRQ-safe lock in the past:
(&local->queue_stop_reason_lock){..-.}-{2:2}
and interrupts could create inverse lock ordering between them.
other info that might help us debug this:
Possible interrupt unsafe locking scenario:
CPU0 CPU1
---- ----
lock(nl_table_lock);
local_irq_disable();
lock(&local->queue_stop_reason_lock);
lock(nl_table_lock);
<Interrupt>
lock(&local->queue_stop_reason_lock);*** DEADLOCK ***
--- net/netlink/af_netlink.c | 5 +++-- net/netlink/diag.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-)
net/netlink/af_netlink.c +3 -2
@@ -1600,6 +1600,7 @@ static int do_one_set_err(struct sock *sk, struct netlink_set_err_data *p)int netlink_set_err (struct sock *ssk,u32 portid,u32 group,int code) {struct netlink_set_err_data info; +unsigned long flags;struct sock *sk;int ret =0 ;
@@ -1609,12 +1610,12 @@ int netlink_set_err(struct sock *ssk, u32 portid, u32 group, int code)/* sk->sk_err wants a positive error value */ info.code = -code; -read_lock (&nl_table_lock); +read_lock_irqsave (&nl_table_lock, flags);sk_for_each_bound (sk, &nl_table[ssk->sk_protocol].mc_list) ret +=do_one_set_err (sk, &info); -read_unlock (&nl_table_lock); +read_unlock_irqrestore (&nl_table_lock, flags);return ret; }EXPORT_SYMBOL (netlink_set_err);
net/netlink/diag.c +3 -2
@@ -94,6 +94,7 @@ static int __netlink_diag_dump(struct sk_buff *skb, struct netlink_callback *cb,struct net *net =sock_net (skb->sk);struct netlink_diag_req *req;struct netlink_sock *nlsk; +unsigned long flags;struct sock *sk;int num =2 ;int ret =0 ;
@@ -152,7 +153,7 @@ static int __netlink_diag_dump(struct sk_buff *skb, struct netlink_callback *cb, num++; mc_list: -read_lock (&nl_table_lock); +read_lock_irqsave (&nl_table_lock, flags);sk_for_each_bound (sk, &tbl->mc_list) {if (sk_hashed (sk))continue ;
@@ -173,7 +174,7 @@ static int __netlink_diag_dump(struct sk_buff *skb, struct netlink_callback *cb, } num++; } -read_unlock (&nl_table_lock); +read_unlock_irqrestore (&nl_table_lock, flags); done: cb->args[0 ] = num;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 143/431 netlink: do not hard code device address lenth in fdb dumps
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit aa5406950726e336c5c9585b09799a734b6e77bf ]
syzbot reports that some netdev devices do not have a six bytes address [1]
Replace ETH_ALEN by dev->addr_len.
[1] (Case of a device where dev->addr_len = 4)
BUG: KMSAN: kernel-infoleak in instrument_copy_to_user include/linux/instrumented.h:114 [inline] BUG: KMSAN: kernel-infoleak in copyout+0xb8/0x100 lib/iov_iter.c:169 instrument_copy_to_user include/linux/instrumented.h:114 [inline] copyout+0xb8/0x100 lib/iov_iter.c:169 _copy_to_iter+0x6d8/0x1d00 lib/iov_iter.c:536 copy_to_iter include/linux/uio.h:206 [inline] simple_copy_to_iter+0x68/0xa0 net/core/datagram.c:513 __skb_datagram_iter+0x123/0xdc0 net/core/datagram.c:419 skb_copy_datagram_iter+0x5c/0x200 net/core/datagram.c:527 skb_copy_datagram_msg include/linux/skbuff.h:3960 [inline] netlink_recvmsg+0x4ae/0x15a0 net/netlink/af_netlink.c:1970 sock_recvmsg_nosec net/socket.c:1019 [inline] sock_recvmsg net/socket.c:1040 [inline] ____sys_recvmsg+0x283/0x7f0 net/socket.c:2722 ___sys_recvmsg+0x223/0x840 net/socket.c:2764 do_recvmmsg+0x4f9/0xfd0 net/socket.c:2858 __sys_recvmmsg net/socket.c:2937 [inline] __do_sys_recvmmsg net/socket.c:2960 [inline] __se_sys_recvmmsg net/socket.c:2953 [inline] __x64_sys_recvmmsg+0x397/0x490 net/socket.c:2953 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x41/0xc0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd
Uninit was stored to memory at:
__nla_put lib/nlattr.c:1009 [inline] nla_put+0x1c6/0x230 lib/nlattr.c:1067 nlmsg_populate_fdb_fill+0x2b8/0x600 net/core/rtnetlink.c:4071 nlmsg_populate_fdb net/core/rtnetlink.c:4418 [inline] ndo_dflt_fdb_dump+0x616/0x840 net/core/rtnetlink.c:4456 rtnl_fdb_dump+0x14ff/0x1fc0 net/core/rtnetlink.c:4629 netlink_dump+0x9d1/0x1310 net/netlink/af_netlink.c:2268 netlink_recvmsg+0xc5c/0x15a0 net/netlink/af_netlink.c:1995 sock_recvmsg_nosec+0x7a/0x120 net/socket.c:1019 ____sys_recvmsg+0x664/0x7f0 net/socket.c:2720 ___sys_recvmsg+0x223/0x840 net/socket.c:2764 do_recvmmsg+0x4f9/0xfd0 net/socket.c:2858 __sys_recvmmsg net/socket.c:2937 [inline] __do_sys_recvmmsg net/socket.c:2960 [inline] __se_sys_recvmmsg net/socket.c:2953 [inline] __x64_sys_recvmmsg+0x397/0x490 net/socket.c:2953 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x41/0xc0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd
Uninit was created at:
slab_post_alloc_hook+0x12d/0xb60 mm/slab.h:716 slab_alloc_node mm/slub.c:3451 [inline] __kmem_cache_alloc_node+0x4ff/0x8b0 mm/slub.c:3490 kmalloc_trace+0x51/0x200 mm/slab_common.c:1057 kmalloc include/linux/slab.h:559 [inline] __hw_addr_create net/core/dev_addr_lists.c:60 [inline] __hw_addr_add_ex+0x2e5/0x9e0 net/core/dev_addr_lists.c:118 __dev_mc_add net/core/dev_addr_lists.c:867 [inline] dev_mc_add+0x9a/0x130 net/core/dev_addr_lists.c:885 igmp6_group_added+0x267/0xbc0 net/ipv6/mcast.c:680 ipv6_mc_up+0x296/0x3b0 net/ipv6/mcast.c:2754 ipv6_mc_remap+0x1e/0x30 net/ipv6/mcast.c:2708 addrconf_type_change net/ipv6/addrconf.c:3731 [inline] addrconf_notify+0x4d3/0x1d90 net/ipv6/addrconf.c:3699 notifier_call_chain kernel/notifier.c:93 [inline] raw_notifier_call_chain+0xe4/0x430 kernel/notifier.c:461 call_netdevice_notifiers_info net/core/dev.c:1935 [inline] call_netdevice_notifiers_extack net/core/dev.c:1973 [inline] call_netdevice_notifiers+0x1ee/0x2d0 net/core/dev.c:1987 bond_enslave+0xccd/0x53f0 drivers/net/bonding/bond_main.c:1906 do_set_master net/core/rtnetlink.c:2626 [inline] rtnl_newlink_create net/core/rtnetlink.c:3460 [inline] __rtnl_newlink net/core/rtnetlink.c:3660 [inline] rtnl_newlink+0x378c/0x40e0 net/core/rtnetlink.c:3673 rtnetlink_rcv_msg+0x16a6/0x1840 net/core/rtnetlink.c:6395 netlink_rcv_skb+0x371/0x650 net/netlink/af_netlink.c:2546 rtnetlink_rcv+0x34/0x40 net/core/rtnetlink.c:6413 netlink_unicast_kernel net/netlink/af_netlink.c:1339 [inline] netlink_unicast+0xf28/0x1230 net/netlink/af_netlink.c:1365 netlink_sendmsg+0x122f/0x13d0 net/netlink/af_netlink.c:1913 sock_sendmsg_nosec net/socket.c:724 [inline] sock_sendmsg net/socket.c:747 [inline] ____sys_sendmsg+0x999/0xd50 net/socket.c:2503 ___sys_sendmsg+0x28d/0x3c0 net/socket.c:2557 __sys_sendmsg net/socket.c:2586 [inline] __do_sys_sendmsg net/socket.c:2595 [inline] __se_sys_sendmsg net/socket.c:2593 [inline] __x64_sys_sendmsg+0x304/0x490 net/socket.c:2593 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x41/0xc0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd
Bytes 2856-2857 of 3500 are uninitialized Memory access of size 3500 starts at ffff888018d99104 Data copied to user address 0000000020000480
--- net/core/rtnetlink.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/core/rtnetlink.c +4 -4
@@ -4093,7 +4093,7 @@ static int nlmsg_populate_fdb_fill(struct sk_buff *skb, ndm->ndm_ifindex = dev->ifindex; ndm->ndm_state = ndm_state; -if (nla_put (skb,NDA_LLADDR ,ETH_ALEN , addr)) +if (nla_put (skb,NDA_LLADDR , dev->addr_len, addr)) goto nla_put_failure;if (vid)if (nla_put (skb,NDA_VLAN ,sizeof (u16), &vid))
@@ -4107,10 +4107,10 @@ static int nlmsg_populate_fdb_fill(struct sk_buff *skb,return -EMSGSIZE ; } -static inline size_t rtnl_fdb_nlmsg_size (void ) +static inline size_t rtnl_fdb_nlmsg_size (const struct net_device *dev) {return NLMSG_ALIGN (sizeof (struct ndmsg )) + -nla_total_size (ETH_ALEN ) +/* NDA_LLADDR */ +nla_total_size (dev->addr_len) +/* NDA_LLADDR */ nla_total_size (sizeof (u16)) +/* NDA_VLAN */ 0 ; }
@@ -4122,7 +4122,7 @@ static void rtnl_fdb_notify(struct net_device *dev, u8 *addr, u16 vid, int type,struct sk_buff *skb;int err = -ENOBUFS ; - skb =nlmsg_new (rtnl_fdb_nlmsg_size (),GFP_ATOMIC ); + skb =nlmsg_new (rtnl_fdb_nlmsg_size (dev),GFP_ATOMIC );if (!skb) goto errout;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 144/431 bonding: do not assume skb mac_header is set
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 6a940abdef3162e5723f1495b8a49859d1708f79 ]
Drivers must not assume in their ndo_start_xmit() that skbs have their mac_header set. skb->data is all what is needed.
bonding seems to be one of the last offender as caught by syzbot:
WARNING: CPU: 1 PID: 12155 at include/linux/skbuff.h:2907 skb_mac_offset include/linux/skbuff.h:2913 [inline] WARNING: CPU: 1 PID: 12155 at include/linux/skbuff.h:2907 bond_xmit_hash drivers/net/bonding/bond_main.c:4170 [inline] WARNING: CPU: 1 PID: 12155 at include/linux/skbuff.h:2907 bond_xmit_3ad_xor_slave_get drivers/net/bonding/bond_main.c:5149 [inline] WARNING: CPU: 1 PID: 12155 at include/linux/skbuff.h:2907 bond_3ad_xor_xmit drivers/net/bonding/bond_main.c:5186 [inline] WARNING: CPU: 1 PID: 12155 at include/linux/skbuff.h:2907 __bond_start_xmit drivers/net/bonding/bond_main.c:5442 [inline] WARNING: CPU: 1 PID: 12155 at include/linux/skbuff.h:2907 bond_start_xmit+0x14ab/0x19d0 drivers/net/bonding/bond_main.c:5470 Modules linked in: CPU: 1 PID: 12155 Comm: syz-executor.3 Not tainted 6.1.30-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 05/25/2023 RIP: 0010:skb_mac_header include/linux/skbuff.h:2907 [inline] RIP: 0010:skb_mac_offset include/linux/skbuff.h:2913 [inline] RIP: 0010:bond_xmit_hash drivers/net/bonding/bond_main.c:4170 [inline] RIP: 0010:bond_xmit_3ad_xor_slave_get drivers/net/bonding/bond_main.c:5149 [inline] RIP: 0010:bond_3ad_xor_xmit drivers/net/bonding/bond_main.c:5186 [inline] RIP: 0010:__bond_start_xmit drivers/net/bonding/bond_main.c:5442 [inline] RIP: 0010:bond_start_xmit+0x14ab/0x19d0 drivers/net/bonding/bond_main.c:5470 Code: 8b 7c 24 30 e8 76 dd 1a 01 48 85 c0 74 0d 48 89 c3 e8 29 67 2e fe e9 15 ef ff ff e8 1f 67 2e fe e9 10 ef ff ff e8 15 67 2e fe <0f> 0b e9 45 f8 ff ff e8 09 67 2e fe e9 dc fa ff ff e8 ff 66 2e fe RSP: 0018:ffffc90002fff6e0 EFLAGS: 00010283 RAX: ffffffff835874db RBX: 000000000000ffff RCX: 0000000000040000 RDX: ffffc90004dcf000 RSI: 00000000000000b5 RDI: 00000000000000b6 RBP: ffffc90002fff8b8 R08: ffffffff83586d16 R09: ffffffff83586584 R10: 0000000000000007 R11: ffff8881599fc780 R12: ffff88811b6a7b7e R13: 1ffff110236d4f6f R14: ffff88811b6a7ac0 R15: 1ffff110236d4f76 FS: 00007f2e9eb47700(0000) GS:ffff8881f6b00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000001b2e421000 CR3: 000000010e6d4000 CR4: 00000000003526e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> [<ffffffff8471a49f>] netdev_start_xmit include/linux/netdevice.h:4925 [inline] [<ffffffff8471a49f>] __dev_direct_xmit+0x4ef/0x850 net/core/dev.c:4380 [<ffffffff851d845b>] dev_direct_xmit include/linux/netdevice.h:3043 [inline] [<ffffffff851d845b>] packet_direct_xmit+0x18b/0x300 net/packet/af_packet.c:284 [<ffffffff851c7472>] packet_snd net/packet/af_packet.c:3112 [inline] [<ffffffff851c7472>] packet_sendmsg+0x4a22/0x64d0 net/packet/af_packet.c:3143 [<ffffffff8467a4b2>] sock_sendmsg_nosec net/socket.c:716 [inline] [<ffffffff8467a4b2>] sock_sendmsg net/socket.c:736 [inline] [<ffffffff8467a4b2>] __sys_sendto+0x472/0x5f0 net/socket.c:2139 [<ffffffff8467a715>] __do_sys_sendto net/socket.c:2151 [inline] [<ffffffff8467a715>] __se_sys_sendto net/socket.c:2147 [inline] [<ffffffff8467a715>] __x64_sys_sendto+0xe5/0x100 net/socket.c:2147 [<ffffffff8553071f>] do_syscall_x64 arch/x86/entry/common.c:50 [inline] [<ffffffff8553071f>] do_syscall_64+0x2f/0x50 arch/x86/entry/common.c:80 [<ffffffff85600087>] entry_SYSCALL_64_after_hwframe+0x63/0xcd
--- drivers/net/bonding/bond_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/bonding/bond_main.c +1 -1
@@ -4171,7 +4171,7 @@ u32 bond_xmit_hash(struct bonding *bond, struct sk_buff *skb)return skb->hash;return __bond_xmit_hash (bond, skb, skb->data, skb->protocol, -skb_mac_offset (skb),skb_network_offset (skb), +0 ,skb_network_offset (skb),skb_headlen (skb)); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 145/431 selftests: rtnetlink: remove netdevsim device after ipsec offload test
In reply to Greg Kroah-HartmanFrom: Sabrina Dubroca <[email protected]>
[ Upstream commit 5f789f103671fec3733ebe756e56adf15c90c21d ]
On systems where netdevsim is built-in or loaded before the test starts, kci_test_ipsec_offload doesn't remove the netdevsim device it created during the test.
--- tools/testing/selftests/net/rtnetlink.sh | 1 + 1 file changed, 1 insertion(+)
tools/testing/selftests/net/rtnetlink.sh +1 -0
@@ -835,6 +835,7 @@ EOF fi # clean up any leftovers + echo 0 > /sys/bus/netdevsim/del_device $probed && rmmod netdevsim if [ $ret -ne 0 ]; then
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 146/431 gtp: Fix use-after-free in __gtp_encap_destroy().
In reply to Greg Kroah-HartmanFrom: Kuniyuki Iwashima <[email protected]>
[ Upstream commit ce3aee7114c575fab32a5e9e939d4bbb3dcca79f ]
syzkaller reported use-after-free in __gtp_encap_destroy(). [0]
It shows the same process freed sk and touched it illegally.
Commit e198987e7dd7 ("gtp: fix suspicious RCU usage") added lock_sock() and release_sock() in __gtp_encap_destroy() to protect sk->sk_user_data, but release_sock() is called after sock_put() releases the last refcnt.
[0]:
BUG: KASAN: slab-use-after-free in instrument_atomic_read_write include/linux/instrumented.h:96 [inline] BUG: KASAN: slab-use-after-free in atomic_try_cmpxchg_acquire include/linux/atomic/atomic-instrumented.h:541 [inline] BUG: KASAN: slab-use-after-free in queued_spin_lock include/asm-generic/qspinlock.h:111 [inline] BUG: KASAN: slab-use-after-free in do_raw_spin_lock include/linux/spinlock.h:186 [inline] BUG: KASAN: slab-use-after-free in __raw_spin_lock_bh include/linux/spinlock_api_smp.h:127 [inline] BUG: KASAN: slab-use-after-free in _raw_spin_lock_bh+0x75/0xe0 kernel/locking/spinlock.c:178 Write of size 4 at addr ffff88800dbef398 by task syz-executor.2/2401 CPU: 1 PID: 2401 Comm: syz-executor.2 Not tainted 6.4.0-rc5-01219-gfa0e21fa4443 #2 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.16.0-0-gd239552ce722-prebuilt.qemu.org 04/01/2014 Call Trace: <TASK> __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0x72/0xa0 lib/dump_stack.c:106 print_address_description mm/kasan/report.c:351 [inline] print_report+0xcc/0x620 mm/kasan/report.c:462 kasan_report+0xb2/0xe0 mm/kasan/report.c:572 check_region_inline mm/kasan/generic.c:181 [inline] kasan_check_range+0x39/0x1c0 mm/kasan/generic.c:187 instrument_atomic_read_write include/linux/instrumented.h:96 [inline] atomic_try_cmpxchg_acquire include/linux/atomic/atomic-instrumented.h:541 [inline] queued_spin_lock include/asm-generic/qspinlock.h:111 [inline] do_raw_spin_lock include/linux/spinlock.h:186 [inline] __raw_spin_lock_bh include/linux/spinlock_api_smp.h:127 [inline] _raw_spin_lock_bh+0x75/0xe0 kernel/locking/spinlock.c:178 spin_lock_bh include/linux/spinlock.h:355 [inline] release_sock+0x1f/0x1a0 net/core/sock.c:3526 gtp_encap_disable_sock drivers/net/gtp.c:651 [inline] gtp_encap_disable+0xb9/0x220 drivers/net/gtp.c:664 gtp_dev_uninit+0x19/0x50 drivers/net/gtp.c:728 unregister_netdevice_many_notify+0x97e/0x1520 net/core/dev.c:10841 rtnl_delete_link net/core/rtnetlink.c:3216 [inline] rtnl_dellink+0x3c0/0xb30 net/core/rtnetlink.c:3268 rtnetlink_rcv_msg+0x450/0xb10 net/core/rtnetlink.c:6423 netlink_rcv_skb+0x15d/0x450 net/netlink/af_netlink.c:2548 netlink_unicast_kernel net/netlink/af_netlink.c:1339 [inline] netlink_unicast+0x700/0x930 net/netlink/af_netlink.c:1365 netlink_sendmsg+0x91c/0xe30 net/netlink/af_netlink.c:1913 sock_sendmsg_nosec net/socket.c:724 [inline] sock_sendmsg+0x1b7/0x200 net/socket.c:747 ____sys_sendmsg+0x75a/0x990 net/socket.c:2493 ___sys_sendmsg+0x11d/0x1c0 net/socket.c:2547 __sys_sendmsg+0xfe/0x1d0 net/socket.c:2576 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3f/0x90 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x72/0xdc RIP: 0033:0x7f1168b1fe5d Code: ff c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 73 9f 1b 00 f7 d8 64 89 01 48 RSP: 002b:00007f1167edccc8 EFLAGS: 00000246 ORIG_RAX: 000000000000002e RAX: ffffffffffffffda RBX: 00000000004bbf80 RCX: 00007f1168b1fe5d RDX: 0000000000000000 RSI: 00000000200002c0 RDI: 0000000000000003 RBP: 00000000004bbf80 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 R13: 000000000000000b R14: 00007f1168b80530 R15: 0000000000000000 </TASK> Allocated by task 1483: kasan_save_stack+0x22/0x50 mm/kasan/common.c:45 kasan_set_track+0x25/0x30 mm/kasan/common.c:52 __kasan_slab_alloc+0x59/0x70 mm/kasan/common.c:328 kasan_slab_alloc include/linux/kasan.h:186 [inline] slab_post_alloc_hook mm/slab.h:711 [inline] slab_alloc_node mm/slub.c:3451 [inline] slab_alloc mm/slub.c:3459 [inline] __kmem_cache_alloc_lru mm/slub.c:3466 [inline] kmem_cache_alloc+0x16d/0x340 mm/slub.c:3475 sk_prot_alloc+0x5f/0x280 net/core/sock.c:2073 sk_alloc+0x34/0x6c0 net/core/sock.c:2132 inet6_create net/ipv6/af_inet6.c:192 [inline] inet6_create+0x2c7/0xf20 net/ipv6/af_inet6.c:119 __sock_create+0x2a1/0x530 net/socket.c:1535 sock_create net/socket.c:1586 [inline] __sys_socket_create net/socket.c:1623 [inline] __sys_socket_create net/socket.c:1608 [inline] __sys_socket+0x137/0x250 net/socket.c:1651 __do_sys_socket net/socket.c:1664 [inline] __se_sys_socket net/socket.c:1662 [inline] __x64_sys_socket+0x72/0xb0 net/socket.c:1662 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3f/0x90 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x72/0xdc Freed by task 2401: kasan_save_stack+0x22/0x50 mm/kasan/common.c:45 kasan_set_track+0x25/0x30 mm/kasan/common.c:52 kasan_save_free_info+0x2e/0x50 mm/kasan/generic.c:521 ____kasan_slab_free mm/kasan/common.c:236 [inline] ____kasan_slab_free mm/kasan/common.c:200 [inline] __kasan_slab_free+0x10c/0x1b0 mm/kasan/common.c:244 kasan_slab_free include/linux/kasan.h:162 [inline] slab_free_hook mm/slub.c:1781 [inline] slab_free_freelist_hook mm/slub.c:1807 [inline] slab_free mm/slub.c:3786 [inline] kmem_cache_free+0xb4/0x490 mm/slub.c:3808 sk_prot_free net/core/sock.c:2113 [inline] __sk_destruct+0x500/0x720 net/core/sock.c:2207 sk_destruct+0xc1/0xe0 net/core/sock.c:2222 __sk_free+0xed/0x3d0 net/core/sock.c:2233 sk_free+0x7c/0xa0 net/core/sock.c:2244 sock_put include/net/sock.h:1981 [inline] __gtp_encap_destroy+0x165/0x1b0 drivers/net/gtp.c:634 gtp_encap_disable_sock drivers/net/gtp.c:651 [inline] gtp_encap_disable+0xb9/0x220 drivers/net/gtp.c:664 gtp_dev_uninit+0x19/0x50 drivers/net/gtp.c:728 unregister_netdevice_many_notify+0x97e/0x1520 net/core/dev.c:10841 rtnl_delete_link net/core/rtnetlink.c:3216 [inline] rtnl_dellink+0x3c0/0xb30 net/core/rtnetlink.c:3268 rtnetlink_rcv_msg+0x450/0xb10 net/core/rtnetlink.c:6423 netlink_rcv_skb+0x15d/0x450 net/netlink/af_netlink.c:2548 netlink_unicast_kernel net/netlink/af_netlink.c:1339 [inline] netlink_unicast+0x700/0x930 net/netlink/af_netlink.c:1365 netlink_sendmsg+0x91c/0xe30 net/netlink/af_netlink.c:1913 sock_sendmsg_nosec net/socket.c:724 [inline] sock_sendmsg+0x1b7/0x200 net/socket.c:747 ____sys_sendmsg+0x75a/0x990 net/socket.c:2493 ___sys_sendmsg+0x11d/0x1c0 net/socket.c:2547 __sys_sendmsg+0xfe/0x1d0 net/socket.c:2576 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3f/0x90 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x72/0xdc The buggy address belongs to the object at ffff88800dbef300 which belongs to the cache UDPv6 of size 1344
The buggy address is located 152 bytes inside of
freed 1344-byte region [ffff88800dbef300, ffff88800dbef840)
The buggy address belongs to the physical page:
page:00000000d31bfed5 refcount:1 mapcount:0 mapping:0000000000000000 index:0xffff88800dbeed40 pfn:0xdbe8 head:00000000d31bfed5 order:3 entire_mapcount:0 nr_pages_mapped:0 pincount:0 memcg:ffff888008ee0801
flags: 0x100000000010200(slab|head|node=0|zone=1)page_type: 0xffffffff()
raw: 0100000000010200 ffff88800c7a3000 dead000000000122 0000000000000000
raw: ffff88800dbeed40 0000000080160015 00000001ffffffff ffff888008ee0801
page dumped because: kasan: bad access detected
Memory state around the buggy address:
ffff88800dbef280: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
ffff88800dbef300: fa fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
>ffff88800dbef380: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
^
ffff88800dbef400: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
ffff88800dbef480: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb--- drivers/net/gtp.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/gtp.c +2 -0
@@ -631,7 +631,9 @@ static void __gtp_encap_destroy(struct sock *sk) gtp->sk1u =NULL ;udp_sk (sk)->encap_type =0 ;rcu_assign_sk_user_data (sk,NULL ); +release_sock (sk);sock_put (sk); +return ; }release_sock (sk); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 147/431 net: axienet: Move reset before 64-bit DMA detection
In reply to Greg Kroah-HartmanFrom: Maxim Kochetkov <[email protected]>
[ Upstream commit f1bc9fc4a06de0108e0dca2a9a7e99ba1fc632f9 ]
64-bit DMA detection will fail if axienet was started before (by boot loader, boot ROM, etc). In this state axienet will not start properly. XAXIDMA_TX_CDESC_OFFSET + 4 register (MM2S_CURDESC_MSB) is used to detect 64-bit DMA capability here. But datasheet says: When DMACR.RS is 1 (axienet is in enabled state), CURDESC_PTR becomes Read Only (RO) and is used to fetch the first descriptor. So iowrite32()/ioread32() trick to this register to detect 64-bit DMA will not work.
So move axienet reset before 64-bit DMA detection.
--- drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/net/ethernet/xilinx/xilinx_axienet_main.c +5 -5
@@ -2042,6 +2042,11 @@ static int axienet_probe(struct platform_device *pdev) goto cleanup_clk; } +/* Reset core now that clocks are enabled, prior to accessing MDIO */ + ret =__axienet_device_reset (lp); +if (ret) + goto cleanup_clk; +/* Autodetect the need for 64-bit DMA pointers. * When the IP is configured for a bus width bigger than 32 bits, * writing the MSB registers is mandatory, even if they are all 0.
@@ -2096,11 +2101,6 @@ static int axienet_probe(struct platform_device *pdev) lp->coalesce_count_tx =XAXIDMA_DFT_TX_THRESHOLD ; lp->coalesce_usec_tx =XAXIDMA_DFT_TX_USEC ; -/* Reset core now that clocks are enabled, prior to accessing MDIO */ - ret =__axienet_device_reset (lp); -if (ret) - goto cleanup_clk; - ret =axienet_mdio_setup (lp);if (ret) dev_warn(&pdev->dev,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 148/431 ocfs2: Fix use of slab data with sendpage
In reply to Greg Kroah-HartmanFrom: David Howells <[email protected]>
[ Upstream commit 86d7bd6e66e9925f0f04a7bcf3c92c05fdfefb5a ]
ocfs2 uses kzalloc() to allocate buffers for o2net_hand, o2net_keep_req and o2net_keep_resp and then passes these to sendpage. This isn't really allowed as the lifetime of slab objects is not controlled by page ref - though in this case it will probably work. sendmsg() with MSG_SPLICE_PAGES will, however, print a warning and give an error.
Fix it to use folio_alloc() instead to allocate a buffer for the handshake message, keepalive request and reply messages.
--- fs/ocfs2/cluster/tcp.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-)
fs/ocfs2/cluster/tcp.c +12 -11
@@ -2087,18 +2087,24 @@ void o2net_stop_listening(struct o2nm_node *node)int o2net_init (void ) { +struct folio *folio; +void *p;unsigned long i;o2quo_init (); -o2net_debugfs_init (); - o2net_hand =kzalloc (sizeof (struct o2net_handshake ),GFP_KERNEL ); - o2net_keep_req =kzalloc (sizeof (struct o2net_msg ),GFP_KERNEL ); - o2net_keep_resp =kzalloc (sizeof (struct o2net_msg ),GFP_KERNEL ); -if (!o2net_hand || !o2net_keep_req || !o2net_keep_resp) + folio =folio_alloc (GFP_KERNEL | __GFP_ZERO,0 ); +if (!folio) goto out; + p =folio_address (folio); + o2net_hand = p; + p +=sizeof (struct o2net_handshake ); + o2net_keep_req = p; + p +=sizeof (struct o2net_msg ); + o2net_keep_resp = p; + o2net_hand->protocol_version =cpu_to_be64 (O2NET_PROTOCOL_VERSION ); o2net_hand->connector_id =cpu_to_be64 (1 );
@@ -2124,9 +2130,6 @@ int o2net_init(void)return 0 ; out: -kfree (o2net_hand); -kfree (o2net_keep_req); -kfree (o2net_keep_resp);o2net_debugfs_exit ();o2quo_exit ();return -ENOMEM ;
@@ -2135,8 +2138,6 @@ int o2net_init(void)void o2net_exit (void ) {o2quo_exit (); -kfree (o2net_hand); -kfree (o2net_keep_req); -kfree (o2net_keep_resp);o2net_debugfs_exit (); +folio_put (virt_to_folio (o2net_hand)); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 149/431 sfc: fix crash when reading stats while NIC is resetting
In reply to Greg Kroah-HartmanFrom: Edward Cree <[email protected]>
[ Upstream commit d1b355438b8325a486f087e506d412c4e852f37b ]
efx_net_stats() (.ndo_get_stats64) can be called during an ethtool
selftest, during which time nic_data->mc_stats is NULL as the NIC has been fini'd. In this case do not attempt to fetch the latest stats from the hardware, else we will crash on a NULL dereference:
BUG: kernel NULL pointer dereference, address: 0000000000000038
RIP efx_nic_update_stats
abridged calltrace:
efx_ef10_update_stats_pf
efx_net_stats
dev_get_stats
dev_seq_printf_statsSkipping the read is safe, we will simply give out stale stats. To ensure that the free in efx_ef10_fini_nic() does not race against
efx_ef10_update_stats_pf(), which could cause a TOCTTOU bug, take the efx->stats_lock in fini_nic (it is already held across update_stats).
--- drivers/net/ethernet/sfc/ef10.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
drivers/net/ethernet/sfc/ef10.c +10 -3
@@ -1297,8 +1297,10 @@ static void efx_ef10_fini_nic(struct efx_nic *efx) {struct efx_ef10_nic_data *nic_data = efx->nic_data; +spin_lock_bh (&efx->stats_lock);kfree (nic_data->mc_stats); nic_data->mc_stats =NULL ; +spin_unlock_bh (&efx->stats_lock); }static int efx_ef10_init_nic (struct efx_nic *efx)
@@ -1852,9 +1854,14 @@ static size_t efx_ef10_update_stats_pf(struct efx_nic *efx, u64 *full_stats,efx_ef10_get_stat_mask (efx, mask); -efx_nic_copy_stats (efx, nic_data->mc_stats); -efx_nic_update_stats (efx_ef10_stat_desc,EF10_STAT_COUNT , - mask, stats, nic_data->mc_stats, false); +/* If NIC was fini'd (probably resetting), then we can't read +* updated stats right now. +*/ +if (nic_data->mc_stats) { +efx_nic_copy_stats (efx, nic_data->mc_stats); +efx_nic_update_stats (efx_ef10_stat_desc,EF10_STAT_COUNT , + mask, stats, nic_data->mc_stats, false); + }/* Update derived statistics */ efx_nic_fix_nodesc_drop_stat(efx,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 150/431 net: nfc: Fix use-after-free caused by nfc_llcp_find_local
In reply to Greg Kroah-HartmanFrom: Lin Ma <[email protected]>
[ Upstream commit 6709d4b7bc2e079241fdef15d1160581c5261c10 ]
This commit fixes several use-after-free that caused by function nfc_llcp_find_local(). For example, one UAF can happen when below buggy time window occurs.
// nfc_genl_llc_get_params | // nfc_unregister_device
|
dev = nfc_get_device(idx); | device_lock(...)
if (!dev) | dev->shutting_down = true;
return -ENODEV; | device_unlock(...);
|
device_lock(...); | // nfc_llcp_unregister_device
| nfc_llcp_find_local()
nfc_llcp_find_local(...); |
| local_cleanup()
if (!local) { |
rc = -ENODEV; | // nfc_llcp_local_put
goto exit; | kref_put(.., local_release)
} |
| // local_release
| list_del(&local->list)
// nfc_genl_send_params | kfree()
local->dev->idx !!!UAF!!! |
|and the crash trace for the one of the discussed UAF like:
BUG: KASAN: slab-use-after-free in nfc_genl_llc_get_params+0x72f/0x780 net/nfc/netlink.c:1045 Read of size 8 at addr ffff888105b0e410 by task 20114 Call Trace: <TASK> __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0x72/0xa0 lib/dump_stack.c:106 print_address_description mm/kasan/report.c:319 [inline] print_report+0xcc/0x620 mm/kasan/report.c:430 kasan_report+0xb2/0xe0 mm/kasan/report.c:536 nfc_genl_send_params net/nfc/netlink.c:999 [inline] nfc_genl_llc_get_params+0x72f/0x780 net/nfc/netlink.c:1045 genl_family_rcv_msg_doit.isra.0+0x1ee/0x2e0 net/netlink/genetlink.c:968 genl_family_rcv_msg net/netlink/genetlink.c:1048 [inline] genl_rcv_msg+0x503/0x7d0 net/netlink/genetlink.c:1065 netlink_rcv_skb+0x161/0x430 net/netlink/af_netlink.c:2548 genl_rcv+0x28/0x40 net/netlink/genetlink.c:1076 netlink_unicast_kernel net/netlink/af_netlink.c:1339 [inline] netlink_unicast+0x644/0x900 net/netlink/af_netlink.c:1365 netlink_sendmsg+0x934/0xe70 net/netlink/af_netlink.c:1913 sock_sendmsg_nosec net/socket.c:724 [inline] sock_sendmsg+0x1b6/0x200 net/socket.c:747 ____sys_sendmsg+0x6e9/0x890 net/socket.c:2501 ___sys_sendmsg+0x110/0x1b0 net/socket.c:2555 __sys_sendmsg+0xf7/0x1d0 net/socket.c:2584 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3f/0x90 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x72/0xdc RIP: 0033:0x7f34640a2389 RSP: 002b:00007f3463415168 EFLAGS: 00000246 ORIG_RAX: 000000000000002e RAX: ffffffffffffffda RBX: 00007f34641c1f80 RCX: 00007f34640a2389 RDX: 0000000000000000 RSI: 0000000020000240 RDI: 0000000000000006 RBP: 00007f34640ed493 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 R13: 00007ffe38449ecf R14: 00007f3463415300 R15: 0000000000022000 </TASK> Allocated by task 20116: kasan_save_stack+0x22/0x50 mm/kasan/common.c:45 kasan_set_track+0x25/0x30 mm/kasan/common.c:52 ____kasan_kmalloc mm/kasan/common.c:374 [inline] __kasan_kmalloc+0x7f/0x90 mm/kasan/common.c:383 kmalloc include/linux/slab.h:580 [inline] kzalloc include/linux/slab.h:720 [inline] nfc_llcp_register_device+0x49/0xa40 net/nfc/llcp_core.c:1567 nfc_register_device+0x61/0x260 net/nfc/core.c:1124 nci_register_device+0x776/0xb20 net/nfc/nci/core.c:1257 virtual_ncidev_open+0x147/0x230 drivers/nfc/virtual_ncidev.c:148 misc_open+0x379/0x4a0 drivers/char/misc.c:165 chrdev_open+0x26c/0x780 fs/char_dev.c:414 do_dentry_open+0x6c4/0x12a0 fs/open.c:920 do_open fs/namei.c:3560 [inline] path_openat+0x24fe/0x37e0 fs/namei.c:3715 do_filp_open+0x1ba/0x410 fs/namei.c:3742 do_sys_openat2+0x171/0x4c0 fs/open.c:1356 do_sys_open fs/open.c:1372 [inline] __do_sys_openat fs/open.c:1388 [inline] __se_sys_openat fs/open.c:1383 [inline] __x64_sys_openat+0x143/0x200 fs/open.c:1383 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3f/0x90 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x72/0xdc Freed by task 20115: kasan_save_stack+0x22/0x50 mm/kasan/common.c:45 kasan_set_track+0x25/0x30 mm/kasan/common.c:52 kasan_save_free_info+0x2e/0x50 mm/kasan/generic.c:521 ____kasan_slab_free mm/kasan/common.c:236 [inline] ____kasan_slab_free mm/kasan/common.c:200 [inline] __kasan_slab_free+0x10a/0x190 mm/kasan/common.c:244 kasan_slab_free include/linux/kasan.h:162 [inline] slab_free_hook mm/slub.c:1781 [inline] slab_free_freelist_hook mm/slub.c:1807 [inline] slab_free mm/slub.c:3787 [inline] __kmem_cache_free+0x7a/0x190 mm/slub.c:3800 local_release net/nfc/llcp_core.c:174 [inline] kref_put include/linux/kref.h:65 [inline] nfc_llcp_local_put net/nfc/llcp_core.c:182 [inline] nfc_llcp_local_put net/nfc/llcp_core.c:177 [inline] nfc_llcp_unregister_device+0x206/0x290 net/nfc/llcp_core.c:1620 nfc_unregister_device+0x160/0x1d0 net/nfc/core.c:1179 virtual_ncidev_close+0x52/0xa0 drivers/nfc/virtual_ncidev.c:163 __fput+0x252/0xa20 fs/file_table.c:321 task_work_run+0x174/0x270 kernel/task_work.c:179 resume_user_mode_work include/linux/resume_user_mode.h:49 [inline] exit_to_user_mode_loop kernel/entry/common.c:171 [inline] exit_to_user_mode_prepare+0x108/0x110 kernel/entry/common.c:204 __syscall_exit_to_user_mode_work kernel/entry/common.c:286 [inline] syscall_exit_to_user_mode+0x21/0x50 kernel/entry/common.c:297 do_syscall_64+0x4c/0x90 arch/x86/entry/common.c:86 entry_SYSCALL_64_after_hwframe+0x72/0xdc Last potentially related work creation: kasan_save_stack+0x22/0x50 mm/kasan/common.c:45 __kasan_record_aux_stack+0x95/0xb0 mm/kasan/generic.c:491 kvfree_call_rcu+0x29/0xa80 kernel/rcu/tree.c:3328 drop_sysctl_table+0x3be/0x4e0 fs/proc/proc_sysctl.c:1735 unregister_sysctl_table.part.0+0x9c/0x190 fs/proc/proc_sysctl.c:1773 unregister_sysctl_table+0x24/0x30 fs/proc/proc_sysctl.c:1753 neigh_sysctl_unregister+0x5f/0x80 net/core/neighbour.c:3895 addrconf_notify+0x140/0x17b0 net/ipv6/addrconf.c:3684 notifier_call_chain+0xbe/0x210 kernel/notifier.c:87 call_netdevice_notifiers_info+0xb5/0x150 net/core/dev.c:1937 call_netdevice_notifiers_extack net/core/dev.c:1975 [inline] call_netdevice_notifiers net/core/dev.c:1989 [inline] dev_change_name+0x3c3/0x870 net/core/dev.c:1211 dev_ifsioc+0x800/0xf70 net/core/dev_ioctl.c:376 dev_ioctl+0x3d9/0xf80 net/core/dev_ioctl.c:542 sock_do_ioctl+0x160/0x260 net/socket.c:1213 sock_ioctl+0x3f9/0x670 net/socket.c:1316 vfs_ioctl fs/ioctl.c:51 [inline] __do_sys_ioctl fs/ioctl.c:870 [inline] __se_sys_ioctl fs/ioctl.c:856 [inline] __x64_sys_ioctl+0x19e/0x210 fs/ioctl.c:856 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3f/0x90 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x72/0xdc The buggy address belongs to the object at ffff888105b0e400 which belongs to the cache kmalloc-1k of size 1024
The buggy address is located 16 bytes inside of
freed 1024-byte region [ffff888105b0e400, ffff888105b0e800)
The buggy address belongs to the physical page:
head:ffffea000416c200 order:3 entire_mapcount:0 nr_pages_mapped:0 pincount:0
flags: 0x200000000010200(slab|head|node=0|zone=2)
raw: 0200000000010200 ffff8881000430c0 ffffea00044c7010 ffffea0004510e10
raw: 0000000000000000 00000000000a000a 00000001ffffffff 0000000000000000
page dumped because: kasan: bad access detected
Memory state around the buggy address:
ffff888105b0e300: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
ffff888105b0e380: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
>ffff888105b0e400: fa fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
^
ffff888105b0e480: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
ffff888105b0e500: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fbIn summary, this patch solves those use-after-free by
1. Re-implement the nfc_llcp_find_local(). The current version does not grab the reference when getting the local from the linked list. For example, the llcp_sock_bind() gets the reference like below:
// llcp_sock_bind()
local = nfc_llcp_find_local(dev); // A
..... \
| raceable
..... /
llcp_sock->local = nfc_llcp_local_get(local); // BThere is an apparent race window that one can drop the reference and free the local object fetched in (A) before (B) gets the reference.
2. Some callers of the nfc_llcp_find_local() do not grab the reference at all. For example, the nfc_genl_llc_{{get/set}_params/sdreq} functions. We add the nfc_llcp_local_put() for them. Moreover, we add the necessary error handling function to put the reference.
3. Add the nfc_llcp_remove_local() helper. The local object is removed from the linked list in local_release() when all reference is gone. This patch removes it when nfc_llcp_unregister_device() is called.
Therefore, every caller of nfc_llcp_find_local() will get a reference even when the nfc_llcp_unregister_device() is called. This promises no use-after-free for the local object is ever possible.
--- net/nfc/llcp.h | 1 - net/nfc/llcp_commands.c | 12 +++++++--- net/nfc/llcp_core.c | 49 +++++++++++++++++++++++++++++++++++------ net/nfc/llcp_sock.c | 18 ++++++++------- net/nfc/netlink.c | 20 ++++++++++++----- net/nfc/nfc.h | 1 + 6 files changed, 77 insertions(+), 24 deletions(-)
net/nfc/llcp.h +0 -1
@@ -201,7 +201,6 @@ void nfc_llcp_sock_link(struct llcp_sock_list *l, struct sock *s);void nfc_llcp_sock_unlink (struct llcp_sock_list *l,struct sock *s);void nfc_llcp_socket_remote_param_init (struct nfc_llcp_sock *sock);struct nfc_llcp_local *nfc_llcp_find_local (struct nfc_dev *dev); -struct nfc_llcp_local *nfc_llcp_local_get (struct nfc_llcp_local *local);int nfc_llcp_local_put (struct nfc_llcp_local *local);u8 nfc_llcp_get_sdp_ssap (struct nfc_llcp_local *local,struct nfc_llcp_sock *sock);
net/nfc/llcp_commands.c +9 -3
@@ -359,6 +359,7 @@ int nfc_llcp_send_symm(struct nfc_dev *dev)struct sk_buff *skb;struct nfc_llcp_local *local;u16 size =0 ; +int err; local =nfc_llcp_find_local (dev);if (local ==NULL )
@@ -368,8 +369,10 @@ int nfc_llcp_send_symm(struct nfc_dev *dev) size += dev->tx_headroom + dev->tx_tailroom +NFC_HEADER_SIZE ; skb =alloc_skb (size,GFP_KERNEL ); -if (skb ==NULL ) -return -ENOMEM ; +if (skb ==NULL ) { + err = -ENOMEM ; + goto out; + }skb_reserve (skb, dev->tx_headroom +NFC_HEADER_SIZE );
@@ -379,8 +382,11 @@ int nfc_llcp_send_symm(struct nfc_dev *dev)nfc_llcp_send_to_raw_sock (local, skb,NFC_DIRECTION_TX ); -return nfc_data_exchange (dev, local->target_idx, skb, + err =nfc_data_exchange (dev, local->target_idx, skb, nfc_llcp_recv, local); +out: +nfc_llcp_local_put (local); +return err; }int nfc_llcp_send_connect (struct nfc_llcp_sock *sock)
net/nfc/llcp_core.c +42 -7
123 lines not on this page · raw message
net/nfc/llcp_sock.c +10 -8
@@ -99,7 +99,7 @@ static int llcp_sock_bind(struct socket *sock, struct sockaddr *addr, int alen) } llcp_sock->dev = dev; - llcp_sock->local =nfc_llcp_local_get (local); + llcp_sock->local = local; llcp_sock->nfc_protocol = llcp_addr.nfc_protocol; llcp_sock->service_name_len = min_t(unsigned int, llcp_addr.service_name_len,
@@ -186,7 +186,7 @@ static int llcp_raw_sock_bind(struct socket *sock, struct sockaddr *addr, } llcp_sock->dev = dev; - llcp_sock->local =nfc_llcp_local_get (local); + llcp_sock->local = local; llcp_sock->nfc_protocol = llcp_addr.nfc_protocol;nfc_llcp_sock_link (&local->raw_sockets, sk);
@@ -696,22 +696,22 @@ static int llcp_sock_connect(struct socket *sock, struct sockaddr *_addr,if (dev->dep_link_up == false) { ret = -ENOLINK ;device_unlock (&dev->dev); - goto put_dev; + goto sock_llcp_put_local; }device_unlock (&dev->dev);if (local->rf_mode ==NFC_RF_INITIATOR && addr->target_idx != local->target_idx) { ret = -ENOLINK ; - goto put_dev; + goto sock_llcp_put_local; } llcp_sock->dev = dev; - llcp_sock->local =nfc_llcp_local_get (local); + llcp_sock->local = local; llcp_sock->ssap =nfc_llcp_get_local_ssap (local);if (llcp_sock->ssap ==LLCP_SAP_MAX ) { ret = -ENOMEM ; - goto sock_llcp_put_local; + goto sock_llcp_nullify; } llcp_sock->reserved_ssap = llcp_sock->ssap;
@@ -757,11 +757,13 @@ static int llcp_sock_connect(struct socket *sock, struct sockaddr *_addr, sock_llcp_release:nfc_llcp_put_ssap (local, llcp_sock->ssap); -sock_llcp_put_local: -nfc_llcp_local_put (llcp_sock->local); +sock_llcp_nullify: llcp_sock->local =NULL ; llcp_sock->dev =NULL ; +sock_llcp_put_local: +nfc_llcp_local_put (local); + put_dev:nfc_put_device (dev);
net/nfc/netlink.c +15 -5
@@ -1039,11 +1039,14 @@ static int nfc_genl_llc_get_params(struct sk_buff *skb, struct genl_info *info) msg =nlmsg_new (NLMSG_DEFAULT_SIZE ,GFP_KERNEL );if (!msg) { rc = -ENOMEM ; - goto exit; + goto put_local; } rc =nfc_genl_send_params (msg, local, info->snd_portid, info->snd_seq); +put_local: +nfc_llcp_local_put (local); + exit:device_unlock (&dev->dev);
@@ -1105,7 +1108,7 @@ static int nfc_genl_llc_set_params(struct sk_buff *skb, struct genl_info *info)if (info->attrs[NFC_ATTR_LLC_PARAM_LTO ]) {if (dev->dep_link_up) { rc = -EINPROGRESS ; - goto exit; + goto put_local; } local->lto =nla_get_u8 (info->attrs[NFC_ATTR_LLC_PARAM_LTO ]);
@@ -1117,6 +1120,9 @@ static int nfc_genl_llc_set_params(struct sk_buff *skb, struct genl_info *info)if (info->attrs[NFC_ATTR_LLC_PARAM_MIUX ]) local->miux =cpu_to_be16 (miux); +put_local: +nfc_llcp_local_put (local); + exit:device_unlock (&dev->dev);
@@ -1172,7 +1178,7 @@ static int nfc_genl_llc_sdreq(struct sk_buff *skb, struct genl_info *info)if (rc !=0 ) { rc = -EINVAL ; - goto exit; + goto put_local; }if (!sdp_attrs[NFC_SDP_ATTR_URI ])
@@ -1191,7 +1197,7 @@ static int nfc_genl_llc_sdreq(struct sk_buff *skb, struct genl_info *info) sdreq =nfc_llcp_build_sdreq_tlv (tid, uri, uri_len);if (sdreq ==NULL ) { rc = -ENOMEM ; - goto exit; + goto put_local; } tlvs_len += sdreq->tlv_len;
@@ -1201,10 +1207,14 @@ static int nfc_genl_llc_sdreq(struct sk_buff *skb, struct genl_info *info)if (hlist_empty (&sdreq_list)) { rc = -EINVAL ; - goto exit; + goto put_local; } rc =nfc_llcp_send_snl_sdreq (local, &sdreq_list, tlvs_len); + +put_local: +nfc_llcp_local_put (local); + exit:device_unlock (&dev->dev);
net/nfc/nfc.h +1 -0
@@ -52,6 +52,7 @@ int nfc_llcp_set_remote_gb(struct nfc_dev *dev, const u8 *gb, u8 gb_len);u8 *nfc_llcp_general_bytes (struct nfc_dev *dev,size_t *general_bytes_len);int nfc_llcp_data_received (struct nfc_dev *dev,struct sk_buff *skb);struct nfc_llcp_local *nfc_llcp_find_local (struct nfc_dev *dev); +int nfc_llcp_local_put (struct nfc_llcp_local *local);int __init nfc_llcp_init (void );void nfc_llcp_exit (void );void nfc_llcp_free_sdp_tlv (struct nfc_llcp_sdp_tlv *sdp);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 151/431 lib/ts_bm: reset initial match offset for every block of text
In reply to Greg Kroah-HartmanFrom: Jeremy Sowden <[email protected]>
[ Upstream commit 6f67fbf8192da80c4db01a1800c7fceaca9cf1f9 ]
The shift variable which indicates the offset in the string at which to start matching the pattern is initialized to bm->patlen - 1, but it is not reset when a new block is retrieved. This means the implemen- tation may start looking at later and later positions in each successive block and miss occurrences of the pattern at the beginning. E.g., consider a HTTP packet held in a non-linear skb, where the HTTP request line occurs in the second block:
[... 52 bytes of packet headers ...]
GET /bmtest HTTP/1.1\r\nHost: www.example.com\r\n\r\n
and the pattern is "GET /bmtest".
Once the first block comprising the packet headers has been examined, shift will be pointing to somewhere near the end of the block, and so when the second block is examined the request line at the beginning will be missed.
Reinitialize the variable for each new block.
--- lib/ts_bm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
lib/ts_bm.c +3 -1
@@ -60,10 +60,12 @@ static unsigned int bm_find(struct ts_config *conf, struct ts_state *state)struct ts_bm *bm =ts_config_priv (conf);unsigned int i, text_len, consumed = state->offset;const u8 *text; -int shift = bm->patlen -1 , bs; +int bs;const u8 icase = conf->flags &TS_IGNORECASE ;for (;;) { +int shift = bm->patlen -1 ; + text_len = conf->get_next_block (consumed, &text, conf, state);if (unlikely (text_len ==0 ))
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 152/431 netfilter: conntrack: dccp: copy entire header to stack buffer, not just basic one
In reply to Greg Kroah-HartmanFrom: Florian Westphal <[email protected]>
[ Upstream commit ff0a3a7d52ff7282dbd183e7fc29a1fe386b0c30 ]
Eric Dumazet says:
nf_conntrack_dccp_packet() has an unique:
dh = skb_header_pointer(skb, dataoff, sizeof(_dh), &_dh);
And nothing more is 'pulled' from the packet, depending on the content. dh->dccph_doff, and/or dh->dccph_x ...)
So dccp_ack_seq() is happily reading stuff past the _dh buffer.
BUG: KASAN: stack-out-of-bounds in nf_conntrack_dccp_packet+0x1134/0x11c0 Read of size 4 at addr ffff000128f66e0c by task syz-executor.2/29371
[..]
Fix this by increasing the stack buffer to also include room for the extra sequence numbers and all the known dccp packet type headers, then pull again after the initial validation of the basic header.
While at it, mark packets invalid that lack 48bit sequence bit but where RFC says the type MUST use them.
Compile tested only.
v2: first skb_header_pointer() now needs to adjust the size to
only pull the generic header. (Eric)
Heads-up: I intend to remove dccp conntrack support later this year.
--- net/netfilter/nf_conntrack_proto_dccp.c | 52 +++++++++++++++++++++++-- 1 file changed, 49 insertions(+), 3 deletions(-)
net/netfilter/nf_conntrack_proto_dccp.c +49 -3
@@ -432,9 +432,19 @@ static bool dccp_error(const struct dccp_hdr *dh, struct sk_buff *skb, unsigned int dataoff, const struct nf_hook_state *state) { +static const unsigned long require_seq48 =1 <<DCCP_PKT_REQUEST | +1 <<DCCP_PKT_RESPONSE | +1 <<DCCP_PKT_CLOSEREQ | +1 <<DCCP_PKT_CLOSE | +1 <<DCCP_PKT_RESET | +1 <<DCCP_PKT_SYNC | +1 <<DCCP_PKT_SYNCACK ;unsigned int dccp_len = skb->len - dataoff;unsigned int cscov;const char *msg; +u8 type; + +BUILD_BUG_ON (DCCP_PKT_INVALID >=BITS_PER_LONG );if (dh->dccph_doff *4 <sizeof (struct dccp_hdr ) || dh->dccph_doff *4 > dccp_len) {
@@ -459,34 +469,70 @@ static bool dccp_error(const struct dccp_hdr *dh, goto out_invalid; } -if (dh->dccph_type >=DCCP_PKT_INVALID ) { + type = dh->dccph_type; +if (type >=DCCP_PKT_INVALID ) { msg ="nf_ct_dccp: reserved packet type " ; goto out_invalid; } + +if (test_bit (type, &require_seq48) && !dh->dccph_x) { + msg ="nf_ct_dccp: type lacks 48bit sequence numbers" ; + goto out_invalid; + } +return false; out_invalid:nf_l4proto_log_invalid (skb, state,IPPROTO_DCCP ,"%s" , msg);return true; } +struct nf_conntrack_dccp_buf { +struct dccp_hdr dh;/* generic header part */ +struct dccp_hdr_ext ext;/* optional depending dh->dccph_x */ +union {/* depends on header type */ +struct dccp_hdr_ack_bits ack; +struct dccp_hdr_request req; +struct dccp_hdr_response response; +struct dccp_hdr_reset rst; + } u; +}; + +static struct dccp_hdr * +dccp_header_pointer (const struct sk_buff *skb,int offset,const struct dccp_hdr *dh, +struct nf_conntrack_dccp_buf *buf) +{ +unsigned int hdrlen =__dccp_hdr_len (dh); + +if (hdrlen >sizeof (*buf)) +return NULL ; + +return skb_header_pointer (skb, offset, hdrlen, buf); +} +int nf_conntrack_dccp_packet (struct nf_conn *ct,struct sk_buff *skb,unsigned int dataoff,enum ip_conntrack_info ctinfo,const struct nf_hook_state *state) {enum ip_conntrack_dir dir =CTINFO2DIR (ctinfo); -struct dccp_hdr _dh, *dh; +struct nf_conntrack_dccp_buf _dh;u_int8_t type, old_state, new_state;enum ct_dccp_roles role;unsigned int *timeouts; +struct dccp_hdr *dh; - dh =skb_header_pointer (skb, dataoff,sizeof (_dh), &_dh); + dh =skb_header_pointer (skb, dataoff,sizeof (*dh), &_dh.dh);if (!dh)return NF_DROP ;if (dccp_error (dh, skb, dataoff, state))return -NF_ACCEPT ; +/* pull again, including possible 48 bit sequences and subtype header */ + dh =dccp_header_pointer (skb, dataoff, dh, &_dh); +if (!dh) +return NF_DROP ; + type = dh->dccph_type;if (!nf_ct_is_confirmed (ct) && !dccp_new (ct, skb, dh, state))return -NF_ACCEPT ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 153/431 netfilter: nf_conntrack_sip: fix the ct_sip_parse_numerical_param() return value.
In reply to Greg Kroah-HartmanFrom: Ilia.Gavrilov <[email protected]>
[ Upstream commit f188d30087480eab421cd8ca552fb15f55d57f4d ]
ct_sip_parse_numerical_param() returns only 0 or 1 now.
But process_register_request() and process_register_response() imply checking for a negative value if parsing of a numerical header parameter failed.
The invocation in nf_nat_sip() looks correct:
if (ct_sip_parse_numerical_param(...) > 0 &&
...) { ... }
Make the return value of the function ct_sip_parse_numerical_param() a tristate to fix all the cases
a) return 1 if value is found; *val is set
b) return 0 if value is not found; *val is unchanged
c) return -1 on error; *val is undefined
Found by InfoTeCS on behalf of Linux Verification Center (linuxtesting.org) with SVACE.
--- net/netfilter/nf_conntrack_sip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nf_conntrack_sip.c +1 -1
@@ -611,7 +611,7 @@ int ct_sip_parse_numerical_param(const struct nf_conn *ct, const char *dptr, start +=strlen (name); *val =simple_strtoul (start, &end,0 );if (start == end) -return 0 ; +return -1 ;if (matchoff && matchlen) { *matchoff = start - dptr; *matchlen = end - start;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 154/431 ipvlan: Fix return value of ipvlan_queue_xmit()
In reply to Greg Kroah-HartmanFrom: Cambda Zhu <[email protected]>
[ Upstream commit 8a9922e7be6d042fa00f894c376473b17a162b66 ]
ipvlan_queue_xmit() should return NET_XMIT_XXX, but ipvlan_xmit_mode_l2/l3() returns rx_handler_result_t or NET_RX_XXX in some cases. ipvlan_rcv_frame() will only return RX_HANDLER_CONSUMED in ipvlan_xmit_mode_l2/l3() because 'local' is true. It's equal to NET_XMIT_SUCCESS. But dev_forward_skb() can return NET_RX_SUCCESS or NET_RX_DROP, and returning NET_RX_DROP(NET_XMIT_DROP) will increase both ipvlan and ipvlan->phy_dev drops counter.
The skb to forward can be treated as xmitted successfully. This patch makes ipvlan_queue_xmit() return NET_XMIT_SUCCESS for forward skb.
--- drivers/net/ipvlan/ipvlan_core.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/net/ipvlan/ipvlan_core.c +6 -3
@@ -585,7 +585,8 @@ static int ipvlan_xmit_mode_l3(struct sk_buff *skb, struct net_device *dev)consume_skb (skb);return NET_XMIT_DROP ; } -return ipvlan_rcv_frame (addr, &skb, true); +ipvlan_rcv_frame (addr, &skb, true); +return NET_XMIT_SUCCESS ; } } out:
@@ -611,7 +612,8 @@ static int ipvlan_xmit_mode_l2(struct sk_buff *skb, struct net_device *dev)consume_skb (skb);return NET_XMIT_DROP ; } -return ipvlan_rcv_frame (addr, &skb, true); +ipvlan_rcv_frame (addr, &skb, true); +return NET_XMIT_SUCCESS ; } } skb =skb_share_check (skb,GFP_ATOMIC );
@@ -623,7 +625,8 @@ static int ipvlan_xmit_mode_l2(struct sk_buff *skb, struct net_device *dev)* the skb for the main-dev. At the RX side we just return * RX_PASS for it to be processed further on the stack. */ -return dev_forward_skb (ipvlan->phy_dev, skb); +dev_forward_skb (ipvlan->phy_dev, skb); +return NET_XMIT_SUCCESS ; }else if (is_multicast_ether_addr (eth->h_dest)) {skb_reset_mac_header (skb);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 155/431 net: dsa: avoid suspicious RCU usage for synced VLAN-aware MAC addresses
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
[ Upstream commit d06f925f13976ab82167c93467c70a337a0a3cda ]
When using the felix driver (the only one which supports UC filtering and MC filtering) as a DSA master for a random other DSA switch, one can see the following stack trace when the downstream switch ports join a VLAN-aware bridge:
=============================
WARNING: suspicious RCU usage
-----------------------------net/8021q/vlan_core.c:238 suspicious rcu_dereference_protected() usage!
stack backtrace: Workqueue: dsa_ordered dsa_slave_switchdev_event_work Call trace: lockdep_rcu_suspicious+0x170/0x210 vlan_for_each+0x8c/0x188 dsa_slave_sync_uc+0x128/0x178 __hw_addr_sync_dev+0x138/0x158 dsa_slave_set_rx_mode+0x58/0x70 __dev_set_rx_mode+0x88/0xa8 dev_uc_add+0x74/0xa0 dsa_port_bridge_host_fdb_add+0xec/0x180 dsa_slave_switchdev_event_work+0x7c/0x1c8 process_one_work+0x290/0x568
What it's saying is that vlan_for_each() expects rtnl_lock() context and it's not getting it, when it's called from the DSA master's ndo_set_rx_mode().
The caller of that - dsa_slave_set_rx_mode() - is the slave DSA interface's dsa_port_bridge_host_fdb_add() which comes from the deferred dsa_slave_switchdev_event_work().
We went to great lengths to avoid the rtnl_lock() context in that call path in commit 0faf890fc519 ("net: dsa: drop rtnl_lock from dsa_slave_switchdev_event_work"), and calling rtnl_lock() is simply not an option due to the possibility of deadlocking when calling dsa_flush_workqueue() from the call paths that do hold rtnl_lock() - basically all of them.
So, when the DSA master calls vlan_for_each() from its ndo_set_rx_mode(), the state of the 8021q driver on this device is really not protected from concurrent access by anything.
Looking at net/8021q/, I don't think that vlan_info->vid_list was particularly designed with RCU traversal in mind, so introducing an RCU read-side form of vlan_for_each() - vlan_for_each_rcu() - won't be so easy, and it also wouldn't be exactly what we need anyway.
In general I believe that the solution isn't in net/8021q/ anyway; vlan_for_each() is not cut out for this task. DSA doesn't need rtnl_lock() to be held per se - since it's not a netdev state change that we're blocking, but rather, just concurrent additions/removals to a VLAN list. We don't even need sleepable context - the callback of vlan_for_each() just schedules deferred work.
The proposed escape is to remove the dependency on vlan_for_each() and to open-code a non-sleepable, rtnl-free alternative to that, based on copies of the VLAN list modified from .ndo_vlan_rx_add_vid() and .ndo_vlan_rx_kill_vid().
--- include/net/dsa.h | 12 +++++-- net/dsa/dsa.c | 2 +- net/dsa/slave.c | 84 ++++++++++++++++++++++++++++++++--------------- net/dsa/switch.c | 4 +-- net/dsa/switch.h | 3 ++ 5 files changed, 74 insertions(+), 31 deletions(-)
include/net/dsa.h +10 -2
@@ -329,9 +329,17 @@ struct dsa_port {struct list_head fdbs;struct list_head mdbs; -/* List of VLANs that CPU and DSA ports are members of. */ struct mutex vlans_lock; -struct list_head vlans; +union { +/* List of VLANs that CPU and DSA ports are members of. +* Access to this is serialized by the sleepable @vlans_lock. +*/ +struct list_head vlans; +/* List of VLANs that user ports are members of. +* Access to this is serialized by netif_addr_lock_bh(). +*/ +struct list_head user_vlans; + }; };/* TODO: ideally DSA ports would have a single dp->link_dp member,
net/dsa/dsa.c +1 -1
@@ -1105,7 +1105,7 @@ static struct dsa_port *dsa_port_touch(struct dsa_switch *ds, int index)mutex_init (&dp->vlans_lock);INIT_LIST_HEAD (&dp->fdbs);INIT_LIST_HEAD (&dp->mdbs); -INIT_LIST_HEAD (&dp->vlans); +INIT_LIST_HEAD (&dp->vlans);/* also initializes &dp->user_vlans */ INIT_LIST_HEAD (&dp->list);list_add_tail (&dp->list, &dst->ports);
net/dsa/slave.c +58 -26
182 lines not on this page · raw message
net/dsa/switch.c +2 -2
@@ -634,8 +634,8 @@ static bool dsa_port_host_vlan_match(struct dsa_port *dp,return false; } -static struct dsa_vlan *dsa_vlan_find (struct list_head *vlan_list, -const struct switchdev_obj_port_vlan *vlan) +struct dsa_vlan *dsa_vlan_find (struct list_head *vlan_list, +const struct switchdev_obj_port_vlan *vlan) {struct dsa_vlan *v;
net/dsa/switch.h +3 -0
@@ -111,6 +111,9 @@ struct dsa_notifier_master_state_info {bool operational; }; +struct dsa_vlan *dsa_vlan_find (struct list_head *vlan_list, +const struct switchdev_obj_port_vlan *vlan); +int dsa_tree_notify (struct dsa_switch_tree *dst,unsigned long e,void *v);int dsa_broadcast (unsigned long e,void *v);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 156/431 netlink: Add __sock_i_ino() for __netlink_diag_dump().
In reply to Greg Kroah-HartmanFrom: Kuniyuki Iwashima <[email protected]>
[ Upstream commit 25a9c8a4431c364f97f75558cb346d2ad3f53fbb ]
syzbot reported a warning in __local_bh_enable_ip(). [0]
Commit 8d61f926d420 ("netlink: fix potential deadlock in netlink_set_err()") converted read_lock(&nl_table_lock) to read_lock_irqsave() in __netlink_diag_dump() to prevent a deadlock.
However, __netlink_diag_dump() calls sock_i_ino() that uses read_lock_bh() and read_unlock_bh(). If CONFIG_TRACE_IRQFLAGS=y, read_unlock_bh() finally enables IRQ even though it should stay disabled until the following read_unlock_irqrestore().
Using read_lock() in sock_i_ino() would trigger a lockdep splat in another place that was fixed in commit f064af1e500a ("net: fix a lockdep splat"), so let's add __sock_i_ino() that would be safe to use under BH disabled.
[0]:
WARNING: CPU: 0 PID: 5012 at kernel/softirq.c:376 __local_bh_enable_ip+0xbe/0x130 kernel/softirq.c:376 Modules linked in: CPU: 0 PID: 5012 Comm: syz-executor487 Not tainted 6.4.0-rc7-syzkaller-00202-g6f68fc395f49 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 05/27/2023 RIP: 0010:__local_bh_enable_ip+0xbe/0x130 kernel/softirq.c:376 Code: 45 bf 01 00 00 00 e8 91 5b 0a 00 e8 3c 15 3d 00 fb 65 8b 05 ec e9 b5 7e 85 c0 74 58 5b 5d c3 65 8b 05 b2 b6 b4 7e 85 c0 75 a2 <0f> 0b eb 9e e8 89 15 3d 00 eb 9f 48 89 ef e8 6f 49 18 00 eb a8 0f RSP: 0018:ffffc90003a1f3d0 EFLAGS: 00010046 RAX: 0000000000000000 RBX: 0000000000000201 RCX: 1ffffffff1cf5996 RDX: 0000000000000000 RSI: 0000000000000201 RDI: ffffffff8805c6f3 RBP: ffffffff8805c6f3 R08: 0000000000000001 R09: ffff8880152b03a3 R10: ffffed1002a56074 R11: 0000000000000005 R12: 00000000000073e4 R13: dffffc0000000000 R14: 0000000000000002 R15: 0000000000000000 FS: 0000555556726300(0000) GS:ffff8880b9800000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000000000045ad50 CR3: 000000007c646000 CR4: 00000000003506f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> sock_i_ino+0x83/0xa0 net/core/sock.c:2559 __netlink_diag_dump+0x45c/0x790 net/netlink/diag.c:171 netlink_diag_dump+0xd6/0x230 net/netlink/diag.c:207 netlink_dump+0x570/0xc50 net/netlink/af_netlink.c:2269 __netlink_dump_start+0x64b/0x910 net/netlink/af_netlink.c:2374 netlink_dump_start include/linux/netlink.h:329 [inline] netlink_diag_handler_dump+0x1ae/0x250 net/netlink/diag.c:238 __sock_diag_cmd net/core/sock_diag.c:238 [inline] sock_diag_rcv_msg+0x31e/0x440 net/core/sock_diag.c:269 netlink_rcv_skb+0x165/0x440 net/netlink/af_netlink.c:2547 sock_diag_rcv+0x2a/0x40 net/core/sock_diag.c:280 netlink_unicast_kernel net/netlink/af_netlink.c:1339 [inline] netlink_unicast+0x547/0x7f0 net/netlink/af_netlink.c:1365 netlink_sendmsg+0x925/0xe30 net/netlink/af_netlink.c:1914 sock_sendmsg_nosec net/socket.c:724 [inline] sock_sendmsg+0xde/0x190 net/socket.c:747 ____sys_sendmsg+0x71c/0x900 net/socket.c:2503 ___sys_sendmsg+0x110/0x1b0 net/socket.c:2557 __sys_sendmsg+0xf7/0x1c0 net/socket.c:2586 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x39/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd RIP: 0033:0x7f5303aaabb9 Code: 28 c3 e8 2a 14 00 00 66 2e 0f 1f 84 00 00 00 00 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 c0 ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007ffc7506e548 EFLAGS: 00000246 ORIG_RAX: 000000000000002e RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f5303aaabb9 RDX: 0000000000000000 RSI: 0000000020000180 RDI: 0000000000000003 RBP: 00007f5303a6ed60 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 00007f5303a6edf0 R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000 </TASK>
--- include/net/sock.h | 1 + net/core/sock.c | 17 ++++++++++++++--- net/netlink/diag.c | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-)
include/net/sock.h +1 -0
@@ -2100,6 +2100,7 @@ static inline void sock_graft(struct sock *sk, struct socket *parent) }kuid_t sock_i_uid (struct sock *sk); +unsigned long __sock_i_ino (struct sock *sk);unsigned long sock_i_ino (struct sock *sk);static inline kuid_t sock_net_uid (const struct net *net,const struct sock *sk)
net/core/sock.c +14 -3
@@ -2555,13 +2555,24 @@ kuid_t sock_i_uid(struct sock *sk) }EXPORT_SYMBOL (sock_i_uid); -unsigned long sock_i_ino (struct sock *sk) +unsigned long __sock_i_ino (struct sock *sk) {unsigned long ino; -read_lock_bh (&sk->sk_callback_lock); +read_lock (&sk->sk_callback_lock); ino = sk->sk_socket ?SOCK_INODE (sk->sk_socket)->i_ino :0 ; -read_unlock_bh (&sk->sk_callback_lock); +read_unlock (&sk->sk_callback_lock); +return ino; +} +EXPORT_SYMBOL (__sock_i_ino); + +unsigned long sock_i_ino (struct sock *sk) +{ +unsigned long ino; + +local_bh_disable (); + ino =__sock_i_ino (sk); +local_bh_enable ();return ino; }EXPORT_SYMBOL (sock_i_ino);
net/netlink/diag.c +1 -1
@@ -168,7 +168,7 @@ static int __netlink_diag_dump(struct sk_buff *skb, struct netlink_callback *cb, NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq, NLM_F_MULTI, - sock_i_ino(sk)) < 0) { + __sock_i_ino(sk)) < 0) { ret =1 ;break ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 157/431 drm/amd/display: Add logging for display MALL refresh setting
In reply to Greg Kroah-HartmanFrom: Wesley Chalmers <[email protected]>
[ Upstream commit cd8f067a46d34dee3188da184912ae3d64d98444 ]
[WHY]
Add log entry for when display refresh from MALL
settings are sent to SMU.
--- .../drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.c +3 -0
@@ -312,6 +312,9 @@ void dcn30_smu_set_display_refresh_from_mall(struct clk_mgr_internal *clk_mgr, b/* bits 8:7 for cache timer scale, bits 6:1 for cache timer delay, bit 0 = 1 for enable, = 0 for disable */ uint32_t param = (cache_timer_scale <<7 ) | (cache_timer_delay <<1 ) | (enable ?1 :0 ); +smu_print ("SMU Set display refresh from mall: enable = %d, cache_timer_delay = %d, cache_timer_scale = %d\n" , + enable, cache_timer_delay, cache_timer_scale); +dcn30_smu_send_msg_with_param (clk_mgr, DALSMC_MSG_SetDisplayRefreshFromMall, param,NULL ); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 158/431 drm/amd/display: fix is_timing_changed() prototype
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 3306ba4b60b2f3d9ac6bddc587a4d702e1ba2224 ]
Three functions in the amdgpu display driver cause -Wmissing-prototype warnings:
drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_resource.c:1858:6: error: no previous prototype for 'is_timing_changed' [-Werror=missing-prototypes]
is_timing_changed() is actually meant to be a global symbol, but needs a proper name and prototype.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 5 ++--- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 6 +++--- drivers/gpu/drm/amd/display/dc/dc.h | 3 +++ 3 files changed, 8 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +2 -3
@@ -48,8 +48,7 @@#endif #include "dc/dcn20/dcn20_resource.h" -bool is_timing_changed (struct dc_stream_state *cur_stream, -struct dc_stream_state *new_stream); +#define PEAK_FACTOR_X1000 1006 static ssize_t dm_dp_aux_transfer(struct drm_dp_aux *aux,
@@ -1426,7 +1425,7 @@ int pre_validate_dsc(struct drm_atomic_state *state,struct dc_stream_state *stream = dm_state->context->streams[i];if (local_dc_state->streams[i] && -is_timing_changed (stream, local_dc_state->streams[i])) { +dc_is_timing_changed (stream, local_dc_state->streams[i])) {DRM_INFO_ONCE ("crtc[%d] needs mode_changed\n" , i); }else {int ind =find_crtc_index_in_state_by_stream (state, stream);
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +3 -3
@@ -1878,7 +1878,7 @@ bool dc_add_all_planes_for_stream(return add_all_planes_for_stream (dc, stream, &set,1 , context); } -bool is_timing_changed (struct dc_stream_state *cur_stream, +bool dc_is_timing_changed (struct dc_stream_state *cur_stream,struct dc_stream_state *new_stream) {if (cur_stream ==NULL )
@@ -1903,7 +1903,7 @@ static bool are_stream_backends_same(if (stream_a ==NULL || stream_b ==NULL )return false; -if (is_timing_changed (stream_a, stream_b)) +if (dc_is_timing_changed (stream_a, stream_b))return false;if (stream_a->signal != stream_b->signal)
@@ -3527,7 +3527,7 @@ bool pipe_need_reprogram(if (pipe_ctx_old->stream_res.stream_enc != pipe_ctx->stream_res.stream_enc)return true; -if (is_timing_changed (pipe_ctx_old->stream, pipe_ctx->stream)) +if (dc_is_timing_changed (pipe_ctx_old->stream, pipe_ctx->stream))return true;if (pipe_ctx_old->stream->dpms_off != pipe_ctx->stream->dpms_off)
drivers/gpu/drm/amd/display/dc/dc.h +3 -0
@@ -2223,4 +2223,7 @@ void dc_process_dmub_dpia_hpd_int_enable(const struct dc *dc,/* Disable acc mode Interfaces */ void dc_disable_accelerated_mode (struct dc *dc); +bool dc_is_timing_changed (struct dc_stream_state *cur_stream, +struct dc_stream_state *new_stream); +#endif /* DC_INTERFACE_H_ */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 159/431 radeon: avoid double free in ci_dpm_init()
In reply to Greg Kroah-HartmanFrom: Nikita Zhandarovich <[email protected]>
[ Upstream commit 20c3dffdccbd494e0dd631d1660aeecbff6775f2 ]
Several calls to ci_dpm_fini() will attempt to free resources that either have been freed before or haven't been allocated yet. This may lead to undefined or dangerous behaviour.
For instance, if r600_parse_extended_power_table() fails, it might call r600_free_extended_power_table() as will ci_dpm_fini() later during error handling.
Fix this by only freeing pointers to objects previously allocated.
Found by Linux Verification Center (linuxtesting.org) with static analysis tool SVACE.
--- drivers/gpu/drm/radeon/ci_dpm.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-)
drivers/gpu/drm/radeon/ci_dpm.c +20 -8
@@ -5517,6 +5517,7 @@ static int ci_parse_power_table(struct radeon_device *rdev)u8 frev, crev;u8 *power_state_offset;struct ci_ps *ps; +int ret;if (!atom_parse_data_header (mode_info->atom_context, index,NULL , &frev, &crev, &data_offset))
@@ -5546,11 +5547,15 @@ static int ci_parse_power_table(struct radeon_device *rdev) non_clock_array_index = power_state->v2.nonClockInfoIndex; non_clock_info = (struct _ATOM_PPLIB_NONCLOCK_INFO *) &non_clock_info_array->nonClockInfo[non_clock_array_index]; -if (!rdev->pm.power_state[i].clock_info) -return -EINVAL ; +if (!rdev->pm.power_state[i].clock_info) { + ret = -EINVAL ; + goto err_free_ps; + } ps =kzalloc (sizeof (struct ci_ps ),GFP_KERNEL ); -if (ps ==NULL ) -return -ENOMEM ; +if (ps ==NULL ) { + ret = -ENOMEM ; + goto err_free_ps; + } rdev->pm.dpm.ps[i].ps_priv = ps; ci_parse_pplib_non_clock_info(rdev, &rdev->pm.dpm.ps[i], non_clock_info,
@@ -5590,6 +5595,12 @@ static int ci_parse_power_table(struct radeon_device *rdev) }return 0 ; + +err_free_ps: +for (i =0 ; i < rdev->pm.dpm.num_ps; i++) +kfree (rdev->pm.dpm.ps[i].ps_priv); +kfree (rdev->pm.dpm.ps); +return ret; } static int ci_get_vbios_boot_values(struct radeon_device *rdev,
@@ -5678,25 +5689,26 @@ int ci_dpm_init(struct radeon_device *rdev) ret =ci_get_vbios_boot_values (rdev, &pi->vbios_boot_state);if (ret) { -ci_dpm_fini (rdev); +kfree (rdev->pm.dpm.priv);return ret; } ret =r600_get_platform_caps (rdev);if (ret) { -ci_dpm_fini (rdev); +kfree (rdev->pm.dpm.priv);return ret; } ret =r600_parse_extended_power_table (rdev);if (ret) { -ci_dpm_fini (rdev); +kfree (rdev->pm.dpm.priv);return ret; } ret =ci_parse_power_table (rdev);if (ret) { -ci_dpm_fini (rdev); +kfree (rdev->pm.dpm.priv); +r600_free_extended_power_table (rdev);return ret; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 160/431 drm/amd/display: Explicitly specify update type per plane info change
In reply to Greg Kroah-HartmanFrom: Nicholas Kazlauskas <[email protected]>
[ Upstream commit 710cc1e7cd461446a9325c9bd1e9a54daa462952 ]
[Why]
The bit for flip addr is being set causing the determination for FAST vs MEDIUM to always return MEDIUM when plane info is provided as a surface update. This causes extreme stuttering for the typical atomic update path on Linux.
[How]
Don't use update_flags->raw for determining FAST vs MEDIUM. It's too fragile to changes like this.
Explicitly specify the update type per update flag instead. It's not as clever as checking the bits itself but at least it's correct.
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 3 --- 1 file changed, 3 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc.c +0 -3
@@ -2540,9 +2540,6 @@ static enum surface_update_type det_surfenum surface_update_type overall_type =UPDATE_TYPE_FAST ;union surface_update_flags *update_flags = &u->surface->update_flags; -if (u->flip_addr) - update_flags->bits.addr_update =1 ; -if (!is_surface_in_context (context, u->surface) || u->surface->force_full_update) { update_flags->raw =0xFFFFFFFF ;return UPDATE_TYPE_FULL ;
Greg Kroah-Hartman
maintainerPATCH 161/431 bootmem: remove the vmemmap pages from kmemleak in free_bootmem_page
In reply to Greg Kroah-HartmanFrom: Liu Shixin <[email protected]>
commit 028725e73375a1ff080bbdf9fb503306d0116f28 upstream.
commit dd0ff4d12dd2 ("bootmem: remove the vmemmap pages from kmemleak in put_page_bootmem") fix an overlaps existing problem of kmemleak. But the problem still existed when HAVE_BOOTMEM_INFO_NODE is disabled, because in this case, free_bootmem_page() will call free_reserved_page() directly.
Fix the problem by adding kmemleak_free_part() in free_bootmem_page() when HAVE_BOOTMEM_INFO_NODE is disabled.
--- include/linux/bootmem_info.h | 2 ++ 1 file changed, 2 insertions(+)
include/linux/bootmem_info.h +2 -0
@@ -3,6 +3,7 @@#define __LINUX_BOOTMEM_INFO_H#include <linux/mm.h> +#include <linux/kmemleak.h> /* * Types for free bootmem stored in page->lru.next. These have to be in
@@ -59,6 +60,7 @@ static inline void get_page_bootmem(unsistatic inline void free_bootmem_page (struct page *page) { +kmemleak_free_part (page_to_virt (page),PAGE_SIZE );free_reserved_page (page); }#endif
Greg Kroah-Hartman
maintainerPATCH 162/431 drm/i915/guc: More debug print updates - GuC SLPC
In reply to Greg Kroah-HartmanFrom: John Harrison <[email protected]>
[ Upstream commit 9847ffce9b5f83a7707504b0127aeb6a05dbd378 ]
Update a bunch more debug prints to use the new GT based scheme.
v2: Also change prints to use %pe for error values (MichalW).
Stable-dep-of: 55f9720dbf23 ("drm/i915/guc/slpc: Provide sysfs for efficient freq")
--- drivers/gpu/drm/i915/gt/uc/intel_guc_rc.c | 8 +-- drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 61 ++++++++------------- 2 files changed, 26 insertions(+), 43 deletions(-)
drivers/gpu/drm/i915/gt/uc/intel_guc_rc.c +4 -4
@@ -6,6 +6,7 @@#include <linux/string_helpers.h> #include "intel_guc_rc.h" +#include "intel_guc_print.h" #include "gt/intel_gt.h" #include "i915_drv.h"
@@ -59,13 +60,12 @@ static int __guc_rc_control(struct intel_guc *guc, bool enable) ret =guc_action_control_gucrc (guc, enable);if (ret) { -i915_probe_error (guc_to_gt (guc)->i915,"Failed to %s GuC RC (%pe)\n" , -str_enable_disable (enable),ERR_PTR (ret)); +guc_probe_error (guc,"Failed to %s RC (%pe)\n" , +str_enable_disable (enable),ERR_PTR (ret));return ret; } -drm_info (>->i915->drm,"GuC RC: %s\n" , -str_enabled_disabled (enable)); +guc_info (guc,"RC %s\n" ,str_enabled_disabled (enable));return 0 ; }
drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c +22 -39
191 lines not on this page · raw message
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 163/431 drm/i915/guc/slpc: Provide sysfs for efficient freq
In reply to Greg Kroah-HartmanFrom: Vinay Belgaumkar <[email protected]>
[ Upstream commit 55f9720dbf23ed640a51ea5564c22305efa8a467 ]
SLPC enables use of efficient freq at init by default. It is possible for GuC to request frequencies that are higher than the 'software' max if user has set it lower than the efficient level.
Scenarios/tests that require strict fixing of freq below the efficient level will need to disable it through this interface.
v2: Keep just one interface to toggle sysfs. With this, user will be completely responsible for toggling efficient frequency if need be. There will be no implicit disabling when user sets min < RP1 (Ashutosh)
v3: Remove unused label, review comments (Ashutosh)
v4: Toggle efficient freq usage in SLPC selftest and checkpatch fixes
v5: Review comments (Andi) and add a separate patch for selftest updates
--- drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 35 +++++++++++++++++ drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 38 +++++++++++++------ drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h | 1 + .../gpu/drm/i915/gt/uc/intel_guc_slpc_types.h | 1 + 4 files changed, 64 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c +35 -0
@@ -451,6 +451,33 @@ static ssize_t punit_req_freq_mhz_show(struct kobject *kobj,return sysfs_emit (buff,"%u\n" , preq); } +static ssize_t slpc_ignore_eff_freq_show (struct kobject *kobj, +struct kobj_attribute *attr, +char *buff) +{ +struct intel_gt *gt =intel_gt_sysfs_get_drvdata (kobj, attr->attr.name); +struct intel_guc_slpc *slpc = >->uc.guc.slpc; + +return sysfs_emit (buff,"%u\n" , slpc->ignore_eff_freq); +} + +static ssize_t slpc_ignore_eff_freq_store (struct kobject *kobj, +struct kobj_attribute *attr, +const char *buff,size_t count) +{ +struct intel_gt *gt =intel_gt_sysfs_get_drvdata (kobj, attr->attr.name); +struct intel_guc_slpc *slpc = >->uc.guc.slpc; +int err; +u32 val; + + err =kstrtou32 (buff,0 , &val); +if (err) +return err; + + err =intel_guc_slpc_set_ignore_eff_freq (slpc, val); +return err ?: count; +} +struct intel_gt_bool_throttle_attr {struct attribute attr; ssize_t (*show)(struct kobject *kobj, struct kobj_attribute *attr,
@@ -663,6 +690,8 @@ static struct kobj_attribute attr_media_freq_factor_scale =INTEL_GT_ATTR_RO (media_RP0_freq_mhz);INTEL_GT_ATTR_RO (media_RPn_freq_mhz); +INTEL_GT_ATTR_RW (slpc_ignore_eff_freq); +static const struct attribute *media_perf_power_attrs[] = { &attr_media_freq_factor.attr, &attr_media_freq_factor_scale.attr,
@@ -744,6 +773,12 @@ void intel_gt_sysfs_pm_init(struct intel_gt *gt, struct kobject *kobj)if (ret)gt_warn (gt,"failed to create punit_req_freq_mhz sysfs (%pe)" ,ERR_PTR (ret)); +if (intel_uc_uses_guc_slpc (>->uc)) { + ret =sysfs_create_file (kobj, &attr_slpc_ignore_eff_freq.attr); +if (ret) +gt_warn (gt,"failed to create ignore_eff_freq sysfs (%pe)" ,ERR_PTR (ret)); + } +if (i915_mmio_reg_valid (intel_gt_perf_limit_reasons_reg (gt))) { ret =sysfs_create_files (kobj, throttle_reason_attrs);if (ret)
drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c +27 -11
@@ -277,6 +277,7 @@ int intel_guc_slpc_init(struct intel_guc_slpc *slpc) slpc->max_freq_softlimit =0 ; slpc->min_freq_softlimit =0 ; + slpc->ignore_eff_freq = false; slpc->min_is_rpmax = false; slpc->boost_freq =0 ;
@@ -457,6 +458,29 @@ int intel_guc_slpc_get_max_freq(struct intel_guc_slpc *slpc, u32 *val)return ret; } +int intel_guc_slpc_set_ignore_eff_freq (struct intel_guc_slpc *slpc,bool val) +{ +struct drm_i915_private *i915 =slpc_to_i915 (slpc); +intel_wakeref_t wakeref; +int ret; + +mutex_lock (&slpc->lock); + wakeref =intel_runtime_pm_get (&i915->runtime_pm); + + ret =slpc_set_param (slpc, +SLPC_PARAM_IGNORE_EFFICIENT_FREQUENCY , + val); +if (ret) +guc_probe_error (slpc_to_guc (slpc),"Failed to set efficient freq(%d): %pe\n" , + val,ERR_PTR (ret)); +else + slpc->ignore_eff_freq = val; + +intel_runtime_pm_put (&i915->runtime_pm, wakeref); +mutex_unlock (&slpc->lock); +return ret; +} +/** * intel_guc_slpc_set_min_freq() - Set min frequency limit for SLPC. * @slpc: pointer to intel_guc_slpc.
@@ -482,16 +506,6 @@ int intel_guc_slpc_set_min_freq(struct intel_guc_slpc *slpc, u32 val)mutex_lock (&slpc->lock); wakeref =intel_runtime_pm_get (&i915->runtime_pm); -/* Ignore efficient freq if lower min freq is requested */ - ret =slpc_set_param (slpc, -SLPC_PARAM_IGNORE_EFFICIENT_FREQUENCY , - val < slpc->rp1_freq); -if (ret) { -guc_probe_error (slpc_to_guc (slpc),"Failed to toggle efficient freq: %pe\n" , -ERR_PTR (ret)); - goto out; - } - ret =slpc_set_param (slpc,SLPC_PARAM_GLOBAL_MIN_GT_UNSLICE_FREQ_MHZ , val);
@@ -499,7 +513,6 @@ int intel_guc_slpc_set_min_freq(struct intel_guc_slpc *slpc, u32 val)if (!ret) slpc->min_freq_softlimit = val; -out:intel_runtime_pm_put (&i915->runtime_pm, wakeref);mutex_unlock (&slpc->lock);
@@ -752,6 +765,9 @@ int intel_guc_slpc_enable(struct intel_guc_slpc *slpc)/* Set cached media freq ratio mode */ intel_guc_slpc_set_media_ratio_mode (slpc, slpc->media_ratio_mode); +/* Set cached value of ignore efficient freq */ +intel_guc_slpc_set_ignore_eff_freq (slpc, slpc->ignore_eff_freq); +return 0 ; }
drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h +1 -0
@@ -46,5 +46,6 @@ void intel_guc_slpc_boost(struct intel_guc_slpc *slpc);void intel_guc_slpc_dec_waiters (struct intel_guc_slpc *slpc);int intel_guc_slpc_unset_gucrc_mode (struct intel_guc_slpc *slpc);int intel_guc_slpc_override_gucrc_mode (struct intel_guc_slpc *slpc,u32 mode); +int intel_guc_slpc_set_ignore_eff_freq (struct intel_guc_slpc *slpc,bool val);#endif
drivers/gpu/drm/i915/gt/uc/intel_guc_slpc_types.h +1 -0
@@ -31,6 +31,7 @@ struct intel_guc_slpc {/* frequency softlimits */ u32 min_freq_softlimit;u32 max_freq_softlimit; +bool ignore_eff_freq;/* cached media ratio mode */ u32 media_ratio_mode;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 164/431 drm/bridge: it6505: Move a variable assignment behind a null pointer check in receive_timing_debugfs_show()
In reply to Greg Kroah-HartmanFrom: Markus Elfring <[email protected]>
[ Upstream commit 0be05a75de2916421e88e0d64b001984f54df0bd ]
The address of a data structure member was determined before a corresponding null pointer check in the implementation of the function “receive_timing_debugfs_show”.
Thus avoid the risk for undefined behaviour by moving the assignment for the variable “vid” behind the null pointer check.
This issue was detected by using the Coccinelle software.
--- drivers/gpu/drm/bridge/ite-it6505.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/bridge/ite-it6505.c +2 -1
@@ -3195,7 +3195,7 @@ static ssize_t receive_timing_debugfs_show(struct file *file, char __user *buf, size_t len, loff_t *ppos) { struct it6505 *it6505 = file->private_data; -struct drm_display_mode *vid = &it6505->video_info; +struct drm_display_mode *vid;u8 read_buf[READ_BUFFER_SIZE ];u8 *str = read_buf, *end = read_buf +READ_BUFFER_SIZE ;ssize_t ret, count;
@@ -3204,6 +3204,7 @@ static ssize_t receive_timing_debugfs_show(struct file *file, char __user *buf,return -ENODEV ;it6505_calc_video_info (it6505); + vid = &it6505->video_info; str +=scnprintf (str, end - str,"---video timing---\n" ); str +=scnprintf (str, end - str,"PCLK:%d.%03dMHz\n" , vid->clock /1000 , vid->clock %1000 );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 165/431 Input: drv260x - sleep between polling GO bit
In reply to Greg Kroah-HartmanFrom: Luca Weiss <[email protected]>
[ Upstream commit efef661dfa6bf8cbafe4cd6a97433fcef0118967 ]
When doing the initial startup there's no need to poll without any delay and spam the I2C bus.
Let's sleep 15ms between each attempt, which is the same time as used in the vendor driver.
--- drivers/input/misc/drv260x.c | 1 + 1 file changed, 1 insertion(+)
drivers/input/misc/drv260x.c +1 -0
@@ -435,6 +435,7 @@ static int drv260x_init(struct drv260x_data *haptics) } do { + usleep_range(15000, 15500); error = regmap_read(haptics->regmap, DRV260X_GO, &cal_buf); if (error) { dev_err(&haptics->client->dev,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 166/431 Input: cyttsp4_core - change del_timer_sync() to timer_shutdown_sync()
In reply to Greg Kroah-HartmanFrom: Duoming Zhou <[email protected]>
[ Upstream commit dbe836576f12743a7d2d170ad4ad4fd324c4d47a ]
The watchdog_timer can schedule tx_timeout_task and watchdog_work can also arm watchdog_timer. The process is shown below:
----------- timer schedules work ------------cyttsp4_watchdog_timer() //timer handler
schedule_work(&cd->watchdog_work)
----------- work arms timer ------------ cyttsp4_watchdog_work() //workqueue callback function
cyttsp4_start_wd_timer()
mod_timer(&cd->watchdog_timer, ...)
Although del_timer_sync() and cancel_work_sync() are called in cyttsp4_remove(), the timer and workqueue could still be rearmed. As a result, the possible use after free bugs could happen. The process is shown below:
(cleanup routine) | (timer and workqueue routine)
cyttsp4_remove() | cyttsp4_watchdog_timer() //timer
cyttsp4_stop_wd_timer() | schedule_work()
del_timer_sync() |
| cyttsp4_watchdog_work() //worker
| cyttsp4_start_wd_timer()
| mod_timer()
cancel_work_sync() |
| cyttsp4_watchdog_timer() //timer
| schedule_work()
del_timer_sync() |
kfree(cd) //FREE |
| cyttsp4_watchdog_work() // reschedule!
| cd-> //USEThis patch changes del_timer_sync() to timer_shutdown_sync(), which could prevent rearming of the timer from the workqueue.
--- drivers/input/touchscreen/cyttsp4_core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/input/touchscreen/cyttsp4_core.c +1 -2
@@ -1263,9 +1263,8 @@ static void cyttsp4_stop_wd_timer(struct cyttsp4 *cd)* Ensure we wait until the watchdog timer * running on a different CPU finishes */ -del_timer_sync (&cd->watchdog_timer); +timer_shutdown_sync (&cd->watchdog_timer);cancel_work_sync (&cd->watchdog_work); -del_timer_sync (&cd->watchdog_timer); }static void cyttsp4_watchdog_timer (struct timer_list *t)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 167/431 drm/bridge: ti-sn65dsi83: Fix enable error path
In reply to Greg Kroah-HartmanFrom: Alexander Stein <[email protected]>
[ Upstream commit 8a91b29f1f50ce7742cdbe5cf11d17f128511f3f ]
If PLL locking failed, the regulator needs to be disabled again.
--- drivers/gpu/drm/bridge/ti-sn65dsi83.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/bridge/ti-sn65dsi83.c +1 -0
@@ -478,6 +478,7 @@ static void sn65dsi83_atomic_enable(struct drm_bridge *bridge,dev_err (ctx->dev,"failed to lock PLL, ret=%i\n" , ret);/* On failure, disable PLL again and exit. */ regmap_write (ctx->regmap,REG_RC_PLL_EN ,0x00 ); +regulator_disable (ctx->vcc);return ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 168/431 drm/bridge: tc358768: always enable HS video mode
In reply to Greg Kroah-HartmanFrom: Francesco Dolcini <[email protected]>
[ Upstream commit 75a8aeac2573ab258c53676eba9b3796ea691988 ]
Always enable HS video mode setting the TXMD bit, without this change no video output is present with DSI sinks that are setting MIPI_DSI_MODE_LPM flag (tested with LT8912B DSI-HDMI bridge).
Previously the driver was enabling HS mode only when the DSI sink was not explicitly setting the MIPI_DSI_MODE_LPM, however this is not correct.
The MIPI_DSI_MODE_LPM is supposed to indicate that the sink is willing to receive data in low power mode, however clearing the TC358768_DSI_CONTROL_TXMD bit will make the TC358768 send video in LP mode that is not the intended behavior.
--- drivers/gpu/drm/bridge/tc358768.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/bridge/tc358768.c +1 -2
@@ -866,8 +866,7 @@ static void tc358768_bridge_pre_enable(struct drm_bridge *bridge) val =TC358768_DSI_CONFW_MODE_SET |TC358768_DSI_CONFW_ADDR_DSI_CONTROL ; val |= (dsi_dev->lanes -1 ) <<1 ; -if (!(dsi_dev->mode_flags &MIPI_DSI_MODE_LPM )) - val |=TC358768_DSI_CONTROL_TXMD ; + val |=TC358768_DSI_CONTROL_TXMD ;if (!(mode_flags &MIPI_DSI_CLOCK_NON_CONTINUOUS )) val |=TC358768_DSI_CONTROL_HSCKMD ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 169/431 drm/bridge: tc358768: fix PLL parameters computation
In reply to Greg Kroah-HartmanFrom: Francesco Dolcini <[email protected]>
[ Upstream commit 6a4020b4c63911977aaf8047f904a300d15de739 ]
According to Toshiba documentation the PLL input clock after the divider should be not less than 4MHz, fix the PLL parameters computation accordingly.
--- drivers/gpu/drm/bridge/tc358768.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/bridge/tc358768.c +5 -1
@@ -334,13 +334,17 @@ static int tc358768_calc_pll(struct tc358768_priv *priv,u32 fbd;for (fbd =0 ; fbd <512 ; ++fbd) { -u32 pll, diff; +u32 pll, diff, pll_in; pll = (u32 )div_u64 ((u64 )refclk * (fbd +1 ), divisor);if (pll >= max_pll || pll < min_pll)continue ; + pll_in = (u32 )div_u64 ((u64 )refclk, prd +1 ); +if (pll_in <4000000 ) +continue ; + diff =max (pll, target_pll) -min (pll, target_pll);if (diff < best_diff) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 170/431 drm/bridge: tc358768: fix PLL target frequency
In reply to Greg Kroah-HartmanFrom: Francesco Dolcini <[email protected]>
[ Upstream commit ffd2e4bbea626d565b9817312b0fcfb382fecb88 ]
Correctly compute the PLL target frequency, the current formula works correctly only when the input bus width is 24bit, actually to properly compute the PLL target frequency what is relevant is the bits-per-pixel on the DSI link.
No regression expected since the DSI format is currently hard-coded as MIPI_DSI_FMT_RGB888.
--- drivers/gpu/drm/bridge/tc358768.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/bridge/tc358768.c +5 -3
@@ -146,6 +146,7 @@ struct tc358768_priv {u32 pd_lines;/* number of Parallel Port Input Data Lines */ u32 dsi_lanes;/* number of DSI Lanes */ +u32 dsi_bpp;/* number of Bits Per Pixel over DSI */ /* Parameters for PLL programming */ u32 fbd;/* PLL feedback divider */
@@ -284,12 +285,12 @@ static void tc358768_hw_disable(struct tc358768_priv *priv)static u32 tc358768_pll_to_pclk (struct tc358768_priv *priv,u32 pll_clk) { -return (u32 )div_u64 ((u64 )pll_clk * priv->dsi_lanes, priv->pd_lines); +return (u32 )div_u64 ((u64 )pll_clk * priv->dsi_lanes, priv->dsi_bpp); }static u32 tc358768_pclk_to_pll (struct tc358768_priv *priv,u32 pclk) { -return (u32 )div_u64 ((u64 )pclk * priv->pd_lines, priv->dsi_lanes); +return (u32 )div_u64 ((u64 )pclk * priv->dsi_bpp, priv->dsi_lanes); } static int tc358768_calc_pll(struct tc358768_priv *priv,
@@ -426,6 +427,7 @@ static int tc358768_dsi_host_attach(struct mipi_dsi_host *host, priv->output.panel = panel; priv->dsi_lanes = dev->lanes; + priv->dsi_bpp =mipi_dsi_pixel_format_to_bpp (dev->format);/* get input ep (port0/endpoint0) */ ret = -EINVAL ;
@@ -437,7 +439,7 @@ static int tc358768_dsi_host_attach(struct mipi_dsi_host *host, }if (ret) - priv->pd_lines =mipi_dsi_pixel_format_to_bpp (dev->format); + priv->pd_lines = priv->dsi_bpp;drm_bridge_add (&priv->bridge);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 171/431 drm/bridge: tc358768: fix TCLK_ZEROCNT computation
In reply to Greg Kroah-HartmanFrom: Francesco Dolcini <[email protected]>
[ Upstream commit f9cf811374f42fca31ac34aaf59ee2ae72b89879 ]
Correct computation of TCLK_ZEROCNT register.
This register must be set to a value that ensure that (TCLK-PREPARECNT + TCLK-ZERO) > 300ns
with the actual value of (TCLK-PREPARECNT + TCLK-ZERO) being
(1 to 2) + (TCLK_ZEROCNT + 1)) x HSByteClkCycle + (PHY output delay)
with PHY output delay being about
(2 to 3) x MIPIBitClk cycle in the BitClk conversion.
--- drivers/gpu/drm/bridge/tc358768.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/bridge/tc358768.c +4 -4
@@ -742,10 +742,10 @@ static void tc358768_bridge_pre_enable(struct drm_bridge *bridge)/* 38ns < TCLK_PREPARE < 95ns */ val =tc358768_ns_to_cnt (65 , dsibclk_nsk) -1 ; -/* TCLK_PREPARE > 300ns */ - val2 =tc358768_ns_to_cnt (300 +tc358768_to_ns (3 * ui_nsk), - dsibclk_nsk); - val |= (val2 -tc358768_to_ns (phy_delay_nsk - dsibclk_nsk)) <<8 ; +/* TCLK_PREPARE + TCLK_ZERO > 300ns */ + val2 =tc358768_ns_to_cnt (300 -tc358768_to_ns (2 * ui_nsk), + dsibclk_nsk) -2 ; + val |= val2 <<8 ;dev_dbg (priv->dev,"TCLK_HEADERCNT: 0x%x\n" , val);tc358768_write (priv,TC358768_TCLK_HEADERCNT , val);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 172/431 drm/bridge: tc358768: Add atomic_get_input_bus_fmts() implementation
In reply to Greg Kroah-HartmanFrom: Francesco Dolcini <[email protected]>
[ Upstream commit cec5ccef85bd0128cf895612de54a9d21d2015d0 ]
Add atomic_get_input_bus_fmts() implementation, tc358768 has a parallel RGB input interface with the actual bus format depending on the amount of parallel input data lines.
Without this change when the tc358768 is used with less than 24bit the color mapping is completely wrong.
Stable-dep-of: ee18698e212b ("drm/bridge: tc358768: fix TCLK_TRAILCNT computation")
--- drivers/gpu/drm/bridge/tc358768.c | 44 +++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+)
drivers/gpu/drm/bridge/tc358768.c +44 -0
@@ -9,6 +9,7 @@#include <linux/gpio/consumer.h> #include <linux/i2c.h> #include <linux/kernel.h> +#include <linux/media-bus-format.h> #include <linux/module.h> #include <linux/regmap.h> #include <linux/regulator/consumer.h>
@@ -918,6 +919,44 @@ static void tc358768_bridge_enable(struct drm_bridge *bridge) } } +#define MAX_INPUT_SEL_FORMATS 1 + +static u32 * +tc358768_atomic_get_input_bus_fmts (struct drm_bridge *bridge, +struct drm_bridge_state *bridge_state, +struct drm_crtc_state *crtc_state, +struct drm_connector_state *conn_state, +u32 output_fmt, +unsigned int *num_input_fmts) +{ +struct tc358768_priv *priv =bridge_to_tc358768 (bridge); +u32 *input_fmts; + + *num_input_fmts =0 ; + + input_fmts =kcalloc (MAX_INPUT_SEL_FORMATS ,sizeof (*input_fmts), +GFP_KERNEL ); +if (!input_fmts) +return NULL ; + +switch (priv->pd_lines) { +case 16 : + input_fmts[0 ] =MEDIA_BUS_FMT_RGB565_1X16 ; +break ; +case 18 : + input_fmts[0 ] =MEDIA_BUS_FMT_RGB666_1X18 ; +break ; +default : +case 24 : + input_fmts[0 ] =MEDIA_BUS_FMT_RGB888_1X24 ; +break ; + }; + + *num_input_fmts =MAX_INPUT_SEL_FORMATS ; + +return input_fmts; +} +static const struct drm_bridge_funcs tc358768_bridge_funcs = { .attach = tc358768_bridge_attach, .mode_valid = tc358768_bridge_mode_valid,
@@ -925,6 +964,11 @@ static const struct drm_bridge_funcs tc358768_bridge_funcs = { .enable = tc358768_bridge_enable, .disable = tc358768_bridge_disable, .post_disable = tc358768_bridge_post_disable, + + .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state, + .atomic_reset = drm_atomic_helper_bridge_reset, + .atomic_get_input_bus_fmts = tc358768_atomic_get_input_bus_fmts, };static const struct drm_bridge_timings default_tc358768_timings = {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 173/431 drm/bridge: tc358768: fix TCLK_TRAILCNT computation
In reply to Greg Kroah-HartmanFrom: Francesco Dolcini <[email protected]>
[ Upstream commit ee18698e212b1659dd0850d7e2ae0f22e16ed3d3 ]
Correct computation of TCLK_TRAILCNT register.
The driver does not implement non-continuous clock mode, so the actual value doesn't make a practical difference yet. However this change also ensures that the value does not write to reserved registers bits in case of under/overflow.
This register must be set to a value that ensures that
TCLK-TRAIL > 60ns
and
TEOT <= (105 ns + 12 x UI)
with the actual value of TCLK-TRAIL being
(TCLK_TRAILCNT + (1 to 2)) xHSByteClkCycle +
(2 + (1 to 2)) * HSBYTECLKCycle - (PHY output delay)
with PHY output delay being about
(2 to 3) x MIPIBitClk cycle in the BitClk conversion.
--- drivers/gpu/drm/bridge/tc358768.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/bridge/tc358768.c +5 -3
@@ -10,6 +10,7 @@#include <linux/i2c.h> #include <linux/kernel.h> #include <linux/media-bus-format.h> +#include <linux/minmax.h> #include <linux/module.h> #include <linux/regmap.h> #include <linux/regulator/consumer.h>
@@ -639,6 +640,7 @@ static void tc358768_bridge_pre_enable(struct drm_bridge *bridge)struct mipi_dsi_device *dsi_dev = priv->output.dev;unsigned long mode_flags = dsi_dev->mode_flags;u32 val, val2, lptxcnt, hact, data_type; +s32 raw_val;const struct drm_display_mode *mode;u32 dsibclk_nsk, dsiclk_nsk, ui_nsk, phy_delay_nsk;u32 dsiclk, dsibclk, video_start;
@@ -750,9 +752,9 @@ static void tc358768_bridge_pre_enable(struct drm_bridge *bridge)dev_dbg (priv->dev,"TCLK_HEADERCNT: 0x%x\n" , val);tc358768_write (priv,TC358768_TCLK_HEADERCNT , val); -/* TCLK_TRAIL > 60ns + 3*UI */ - val =60 +tc358768_to_ns (3 * ui_nsk); - val =tc358768_ns_to_cnt (val, dsibclk_nsk) -5 ; +/* TCLK_TRAIL > 60ns AND TEOT <= 105 ns + 12*UI */ + raw_val =tc358768_ns_to_cnt (60 +tc358768_to_ns (2 * ui_nsk), dsibclk_nsk) -5 ; + val =clamp (raw_val,0 ,127 );dev_dbg (priv->dev,"TCLK_TRAILCNT: 0x%x\n" , val);tc358768_write (priv,TC358768_TCLK_TRAILCNT , val);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 174/431 drm/bridge: tc358768: fix THS_ZEROCNT computation
In reply to Greg Kroah-HartmanFrom: Francesco Dolcini <[email protected]>
[ Upstream commit 77a089328da791118af9692543a5eedc79eb5fd4 ]
Correct computation of THS_ZEROCNT register.
This register must be set to a value that ensure that THS_PREPARE + THS_ZERO > 145ns + 10*UI
with the actual value of (THS_PREPARE + THS_ZERO) being
((1 to 2) + 1 + (TCLK_ZEROCNT + 1) + (3 to 4)) x ByteClk cycle +
+ HSByteClk x (2 + (1 to 2)) + (PHY delay)
with PHY delay being about
(8 + (5 to 6)) x MIPIBitClk cycle in the BitClk conversion.
--- drivers/gpu/drm/bridge/tc358768.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/bridge/tc358768.c +4 -3
@@ -761,9 +761,10 @@ static void tc358768_bridge_pre_enable(struct drm_bridge *bridge)/* 40ns + 4*UI < THS_PREPARE < 85ns + 6*UI */ val =50 +tc358768_to_ns (4 * ui_nsk); val =tc358768_ns_to_cnt (val, dsibclk_nsk) -1 ; -/* THS_ZERO > 145ns + 10*UI */ - val2 =tc358768_ns_to_cnt (145 -tc358768_to_ns (ui_nsk), dsibclk_nsk); - val |= (val2 -tc358768_to_ns (phy_delay_nsk)) <<8 ; +/* THS_PREPARE + THS_ZERO > 145ns + 10*UI */ + raw_val =tc358768_ns_to_cnt (145 -tc358768_to_ns (3 * ui_nsk), dsibclk_nsk) -10 ; + val2 =clamp (raw_val,0 ,127 ); + val |= val2 <<8 ;dev_dbg (priv->dev,"THS_HEADERCNT: 0x%x\n" , val);tc358768_write (priv,TC358768_THS_HEADERCNT , val);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 175/431 drm/bridge: tc358768: fix TXTAGOCNT computation
In reply to Greg Kroah-HartmanFrom: Francesco Dolcini <[email protected]>
[ Upstream commit 3666aad8185af8d0ce164fd3c4974235417d6d0b ]
Correct computation of TXTAGOCNT register.
This register must be set to a value that ensure that the TTA-GO period = (4 x TLPX)
with the actual value of TTA-GO being
4 x (TXTAGOCNT + 1) x (HSByteClk cycle)
--- drivers/gpu/drm/bridge/tc358768.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/bridge/tc358768.c +1 -1
@@ -796,7 +796,7 @@ static void tc358768_bridge_pre_enable(struct drm_bridge *bridge)/* TXTAGOCNT[26:16] RXTASURECNT[10:0] */ val =tc358768_to_ns ((lptxcnt +1 ) * dsibclk_nsk *4 ); - val =tc358768_ns_to_cnt (val, dsibclk_nsk) -1 ; + val =tc358768_ns_to_cnt (val, dsibclk_nsk) /4 -1 ; val2 =tc358768_ns_to_cnt (tc358768_to_ns ((lptxcnt +1 ) * dsibclk_nsk), dsibclk_nsk) -2 ; val = val <<16 | val2;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 176/431 drm/bridge: tc358768: fix THS_TRAILCNT computation
In reply to Greg Kroah-HartmanFrom: Francesco Dolcini <[email protected]>
[ Upstream commit bac7842cd179572e8e0fc2d7b5254e40c6e9e057 ]
Correct computation of THS_TRAILCNT register.
This register must be set to a value that ensure that THS_TRAIL > 60 ns + 4 x UI
andTHS_TRAIL > 8 x UI
andTHS_TRAIL < TEOT
with
TEOT = 105 ns + (12 x UI)
with the actual value of THS_TRAIL being
(1 + THS_TRAILCNT) x ByteClk cycle + ((1 to 2) + 2) xHSBYTECLK cycle +
- (PHY output delay)
with PHY output delay being about
(8 + (5 to 6)) x MIPIBitClk cycle in the BitClk conversion.
--- drivers/gpu/drm/bridge/tc358768.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/bridge/tc358768.c +4 -3
@@ -780,9 +780,10 @@ static void tc358768_bridge_pre_enable(struct drm_bridge *bridge)dev_dbg (priv->dev,"TCLK_POSTCNT: 0x%x\n" , val);tc358768_write (priv,TC358768_TCLK_POSTCNT , val); -/* 60ns + 4*UI < THS_PREPARE < 105ns + 12*UI */ - val =tc358768_ns_to_cnt (60 +tc358768_to_ns (15 * ui_nsk), - dsibclk_nsk) -5 ; +/* max(60ns + 4*UI, 8*UI) < THS_TRAILCNT < 105ns + 12*UI */ + raw_val =tc358768_ns_to_cnt (60 +tc358768_to_ns (18 * ui_nsk), + dsibclk_nsk) -4 ; + val =clamp (raw_val,0 ,15 );dev_dbg (priv->dev,"THS_TRAILCNT: 0x%x\n" , val);tc358768_write (priv,TC358768_THS_TRAILCNT , val);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 177/431 drm/vram-helper: fix function names in vram helper doc
In reply to Greg Kroah-HartmanFrom: Luc Ma <[email protected]>
[ Upstream commit b8e392245105b50706f18418054821e71e637288 ]
Refer to drmm_vram_helper_init() instead of the non-existent drmm_vram_helper_alloc_mm().
--- drivers/gpu/drm/drm_gem_vram_helper.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/drm_gem_vram_helper.c +3 -3
@@ -45,7 +45,7 @@ static const struct drm_gem_object_funcs drm_gem_vram_object_funcs;* the frame's scanout buffer or the cursor image. If there's no more space * left in VRAM, inactive GEM objects can be moved to system memory. * -* To initialize the VRAM helper library call drmm_vram_helper_alloc_mm(). +* To initialize the VRAM helper library call drmm_vram_helper_init(). * The function allocates and initializes an instance of &struct drm_vram_mm * in &struct drm_device.vram_mm . Use &DRM_GEM_VRAM_DRIVER to initialize * &struct drm_driver and &DRM_VRAM_MM_FILE_OPERATIONS to initialize
@@ -73,7 +73,7 @@ static const struct drm_gem_object_funcs drm_gem_vram_object_funcs;* // setup device, vram base and size * // ... * -* ret = drmm_vram_helper_alloc_mm(dev, vram_base, vram_size); +* ret = drmm_vram_helper_init(dev, vram_base, vram_size); * if (ret) * return ret; * return 0;
@@ -86,7 +86,7 @@ static const struct drm_gem_object_funcs drm_gem_vram_object_funcs;* to userspace. * * You don't have to clean up the instance of VRAM MM. -* drmm_vram_helper_alloc_mm() is a managed interface that installs a +* drmm_vram_helper_init() is a managed interface that installs a * clean-up handler to run during the DRM device's release. * * For drawing or scanout operations, rsp. buffer objects have to be pinned
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 178/431 ARM: dts: BCM5301X: Drop "clock-names" from the SPI node
In reply to Greg Kroah-HartmanFrom: Rafał Miłecki <[email protected]>
[ Upstream commit d3c8e2c5757153bbfad70019ec1decbca86f3def ]
There is no such property in the SPI controller binding documentation. Also Linux driver doesn't look for it.
This fixes:arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dtb: spi@18029200: Unevaluated properties are not allowed ('clock-names' was unexpected)
From schema: Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.yaml
--- arch/arm/boot/dts/bcm5301x.dtsi | 1 - 1 file changed, 1 deletion(-)
arch/arm/boot/dts/bcm5301x.dtsi +0 -1
@@ -542,7 +542,6 @@ spi@18029200 { "spi_lr_session_done", "spi_lr_overread"; clocks = <&iprocmed>; - clock-names = "iprocmed"; num-cs = <2>; #address-cells = <1>; #size-cells = <0>;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 179/431 ARM: dts: meson8b: correct uart_B and uart_C clock references
In reply to Greg Kroah-HartmanFrom: [email protected] <[email protected]>
[ Upstream commit d542ce8d4769cdef6a7bc3437e59cfed9c68f0e4 ]
With the current device tree for meson8b, uarts B (e.g. available on pins 8/10 on Odroid-C1) and C (pins 3/5 on Odroid-C1) do not work, because they are relying on incorrect clocks. Change the references of pclk to the correct CLKID, to allow use of the two uarts.
--- arch/arm/boot/dts/meson8b.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/meson8b.dtsi +2 -2
@@ -740,13 +740,13 @@ &uart_A { &uart_B { compatible = "amlogic,meson8b-uart"; - clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>; + clocks = <&xtal>, <&clkc CLKID_UART1>, <&clkc CLKID_CLK81>; clock-names = "xtal", "pclk", "baud"; }; &uart_C { compatible = "amlogic,meson8b-uart"; - clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>; + clocks = <&xtal>, <&clkc CLKID_UART2>, <&clkc CLKID_CLK81>; clock-names = "xtal", "pclk", "baud"; };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 180/431 clk: vc5: Fix .driver_data content in i2c_device_id
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit be3471c5bd9b921c9adfab7948e8021611639164 ]
The .driver_data content in i2c_device_id table must match the .data content in of_device_id table, else device_get_match_data() would return bogus value on i2c_device_id match. Align the two tables.
The i2c_device_id table is now converted from of_device_id using '[email protected] = "idt,\([^"]\+"\), .data = \(.*\)@"\1, .driver_data = (kernel_ulong_t)\2@'
--- drivers/clk/clk-versaclock5.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/clk/clk-versaclock5.c +8 -8
@@ -1271,14 +1271,14 @@ static const struct vc5_chip_info idt_5p49v6975_info = { };static const struct i2c_device_id vc5_id[] = { - {"5p49v5923" , .driver_data =IDT_VC5_5P49V5923 }, - {"5p49v5925" , .driver_data =IDT_VC5_5P49V5925 }, - {"5p49v5933" , .driver_data =IDT_VC5_5P49V5933 }, - {"5p49v5935" , .driver_data =IDT_VC5_5P49V5935 }, - {"5p49v60" , .driver_data =IDT_VC6_5P49V60 }, - {"5p49v6901" , .driver_data =IDT_VC6_5P49V6901 }, - {"5p49v6965" , .driver_data =IDT_VC6_5P49V6965 }, - {"5p49v6975" , .driver_data =IDT_VC6_5P49V6975 }, + {"5p49v5923" , .driver_data = (kernel_ulong_t)&idt_5p49v5923_info }, + {"5p49v5925" , .driver_data = (kernel_ulong_t)&idt_5p49v5925_info }, + {"5p49v5933" , .driver_data = (kernel_ulong_t)&idt_5p49v5933_info }, + {"5p49v5935" , .driver_data = (kernel_ulong_t)&idt_5p49v5935_info }, + {"5p49v60" , .driver_data = (kernel_ulong_t)&idt_5p49v60_info }, + {"5p49v6901" , .driver_data = (kernel_ulong_t)&idt_5p49v6901_info }, + {"5p49v6965" , .driver_data = (kernel_ulong_t)&idt_5p49v6965_info }, + {"5p49v6975" , .driver_data = (kernel_ulong_t)&idt_5p49v6975_info }, { } };MODULE_DEVICE_TABLE (i2c, vc5_id);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 181/431 clk: vc7: Fix .driver_data content in i2c_device_id
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit b5e10beeafaa3266559c582dde7534ae3fe8cefb ]
The .driver_data content in i2c_device_id table must match the .data content in of_device_id table, else device_get_match_data() would return bogus value on i2c_device_id match. Align the two tables.
The i2c_device_id table is now converted from of_device_id using
'[email protected] = "renesas,\([^"]\+"\), .data = \(.*\)@"\1, .driver_data = (kernel_ulong_t)\2@'
--- drivers/clk/clk-versaclock7.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/clk-versaclock7.c +1 -1
@@ -1282,7 +1282,7 @@ static const struct regmap_config vc7_regmap_config = { };static const struct i2c_device_id vc7_i2c_id[] = { - {"rc21008a" ,VC7_RC21008A }, + {"rc21008a" , .driver_data = (kernel_ulong_t)&vc7_rc21008a_info }, {} };MODULE_DEVICE_TABLE (i2c, vc7_i2c_id);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 182/431 clk: rs9: Check for vendor/device ID
In reply to Greg Kroah-HartmanFrom: Alexander Stein <[email protected]>
[ Upstream commit da751726ff2ad2322d81316ebf6aadb22dfad0d8 ]
This is in preparation to support additional devices which have different IDs as well as a slightly different register layout.
Stable-dep-of: ad527ca87e4e ("clk: rs9: Fix .driver_data content in i2c_device_id")
--- drivers/clk/clk-renesas-pcie.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)
drivers/clk/clk-renesas-pcie.c +24 -0
@@ -45,6 +45,13 @@#define RS9_REG_DID 0x6#define RS9_REG_BCP 0x7 +#define RS9_REG_VID_IDT 0x01 + +#define RS9_REG_DID_TYPE_FGV (0x0 << RS9_REG_DID_TYPE_SHIFT) +#define RS9_REG_DID_TYPE_DBV (0x1 << RS9_REG_DID_TYPE_SHIFT) +#define RS9_REG_DID_TYPE_DMV (0x2 << RS9_REG_DID_TYPE_SHIFT) +#define RS9_REG_DID_TYPE_SHIFT 0x6 +/* Supported Renesas 9-series models. */ enum rs9_model {RENESAS_9FGV0241 ,
@@ -54,6 +61,7 @@ enum rs9_model {struct rs9_chip_info {const enum rs9_model model;unsigned int num_clks; +u8 did; };struct rs9_driver_data {
@@ -270,6 +278,7 @@ static int rs9_probe(struct i2c_client *client) {unsigned char name[5 ] ="DIF0" ;struct rs9_driver_data *rs9; +unsigned int vid, did;struct clk_hw *hw;int i, ret;
@@ -306,6 +315,20 @@ static int rs9_probe(struct i2c_client *client)if (ret <0 )return ret; + ret =regmap_read (rs9->regmap,RS9_REG_VID , &vid); +if (ret <0 ) +return ret; + + ret =regmap_read (rs9->regmap,RS9_REG_DID , &did); +if (ret <0 ) +return ret; + +if (vid !=RS9_REG_VID_IDT || did != rs9->chip_info->did) +return dev_err_probe (&client->dev, -ENODEV , +"Incorrect VID/DID: %#02x, %#02x. Expected %#02x, %#02x\n" , + vid, did,RS9_REG_VID_IDT , + rs9->chip_info->did); +/* Register clock */ for (i =0 ; i < rs9->chip_info->num_clks; i++) {snprintf (name,5 ,"DIF%d" , i);
@@ -349,6 +372,7 @@ static int __maybe_unused rs9_resume(struct device *dev)static const struct rs9_chip_info renesas_9fgv0241_info = { .model =RENESAS_9FGV0241 , .num_clks =2 , + .did =RS9_REG_DID_TYPE_FGV |0x02 , };static const struct i2c_device_id rs9_id[] = {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 183/431 clk: rs9: Support device specific dif bit calculation
In reply to Greg Kroah-HartmanFrom: Alexander Stein <[email protected]>
[ Upstream commit 603df193ec5174ff81c32cf1a78b7819ce984b8c ]
The calculation DIFx is BIT(n) +1 is only true for 9FGV0241. With additional devices this is getting more complicated. Support a base bit for the DIF calculation, currently only devices with consecutive bits are supported, e.g. the 6-channel device needs additional logic.
Stable-dep-of: ad527ca87e4e ("clk: rs9: Fix .driver_data content in i2c_device_id")
--- drivers/clk/clk-renesas-pcie.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-)
drivers/clk/clk-renesas-pcie.c +19 -13
@@ -18,7 +18,6 @@#include <linux/regmap.h> #define RS9_REG_OE 0x0 -#define RS9_REG_OE_DIF_OE (n) BIT((n) + 1)#define RS9_REG_SS 0x1#define RS9_REG_SS_AMP_0V6 0x0#define RS9_REG_SS_AMP_0V7 0x1
@@ -31,9 +30,6 @@#define RS9_REG_SS_SSC_MASK (3 << 3)#define RS9_REG_SS_SSC_LOCK BIT(5)#define RS9_REG_SR 0x2 -#define RS9_REG_SR_2V0_DIF (n) 0 -#define RS9_REG_SR_3V0_DIF (n) BIT((n) + 1) -#define RS9_REG_SR_DIF_MASK (n) BIT((n) + 1)#define RS9_REG_REF 0x3#define RS9_REG_REF_OE BIT(4)#define RS9_REG_REF_OD BIT(5)
@@ -160,17 +156,27 @@ static const struct regmap_config rs9_regmap_config = { .reg_read = rs9_regmap_i2c_read, }; +static u8 rs9_calc_dif (const struct rs9_driver_data *rs9,int idx) +{ +enum rs9_model model = rs9->chip_info->model; + +if (model ==RENESAS_9FGV0241 ) +return BIT (idx) +1 ; + +return 0 ; +} +static int rs9_get_output_config (struct rs9_driver_data *rs9,int idx) {struct i2c_client *client = rs9->client; +u8 dif =rs9_calc_dif (rs9, idx);unsigned char name[5 ] ="DIF0" ;struct device_node *np;int ret;u32 sr;/* Set defaults */ - rs9->clk_dif_sr &= ~RS9_REG_SR_DIF_MASK (idx); - rs9->clk_dif_sr |=RS9_REG_SR_3V0_DIF (idx); + rs9->clk_dif_sr |= dif;snprintf (name,5 ,"DIF%d" , idx); np =of_get_child_by_name (client->dev.of_node, name);
@@ -182,11 +188,9 @@ static int rs9_get_output_config(struct rs9_driver_data *rs9, int idx)of_node_put (np);if (!ret) {if (sr ==2000000 ) {/* 2V/ns */ - rs9->clk_dif_sr &= ~RS9_REG_SR_DIF_MASK (idx); - rs9->clk_dif_sr |=RS9_REG_SR_2V0_DIF (idx); + rs9->clk_dif_sr &= ~dif; }else if (sr ==3000000 ) {/* 3V/ns (default) */ - rs9->clk_dif_sr &= ~RS9_REG_SR_DIF_MASK (idx); - rs9->clk_dif_sr |=RS9_REG_SR_3V0_DIF (idx); + rs9->clk_dif_sr |= dif; }else ret =dev_err_probe (&client->dev, -EINVAL ,"Invalid renesas,slew-rate value\n" );
@@ -257,11 +261,13 @@ static void rs9_update_config(struct rs9_driver_data *rs9) }for (i =0 ; i < rs9->chip_info->num_clks; i++) { -if (rs9->clk_dif_sr &RS9_REG_SR_3V0_DIF (i)) +u8 dif =rs9_calc_dif (rs9, i); + +if (rs9->clk_dif_sr & dif)continue ; -regmap_update_bits (rs9->regmap,RS9_REG_SR ,RS9_REG_SR_3V0_DIF (i), - rs9->clk_dif_sr &RS9_REG_SR_3V0_DIF (i)); +regmap_update_bits (rs9->regmap,RS9_REG_SR , dif, + rs9->clk_dif_sr & dif); } }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 184/431 clk: rs9: Add support for 9FGV0441
In reply to Greg Kroah-HartmanFrom: Alexander Stein <[email protected]>
[ Upstream commit e44fdd114cc3c872aa5157c6b3a190bcf92a9ffb ]
This model is similar to 9FGV0241, but the DIFx bits start at bit 0.
Stable-dep-of: ad527ca87e4e ("clk: rs9: Fix .driver_data content in i2c_device_id")
--- drivers/clk/clk-renesas-pcie.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
drivers/clk/clk-renesas-pcie.c +13 -1
@@ -6,6 +6,7 @@* - 9FGV/9DBV/9DMV/9FGL/9DML/9QXL/9SQ * Currently supported: * - 9FGV0241 +* - 9FGV0441 * * Copyright (C) 2022 Marek Vasut <[email protected]> */
@@ -51,6 +52,7 @@/* Supported Renesas 9-series models. */ enum rs9_model {RENESAS_9FGV0241 , +RENESAS_9FGV0441 , };/* Structure to describe features of a particular 9-series model */
@@ -64,7 +66,7 @@ struct rs9_driver_data {struct i2c_client *client;struct regmap *regmap;const struct rs9_chip_info *chip_info; -struct clk_hw *clk_dif[2 ]; +struct clk_hw *clk_dif[4 ];u8 pll_amplitude;u8 pll_ssc;u8 clk_dif_sr;
@@ -162,6 +164,8 @@ static u8 rs9_calc_dif(const struct rs9_driver_data *rs9, int idx)if (model ==RENESAS_9FGV0241 )return BIT (idx) +1 ; +else if (model ==RENESAS_9FGV0441 ) +return BIT (idx);return 0 ; }
@@ -381,14 +385,22 @@ static const struct rs9_chip_info renesas_9fgv0241_info = { .did = RS9_REG_DID_TYPE_FGV | 0x02, }; +static const struct rs9_chip_info renesas_9fgv0441_info = { + .model =RENESAS_9FGV0441 , + .num_clks =4 , + .did =RS9_REG_DID_TYPE_FGV |0x04 , +}; +static const struct i2c_device_id rs9_id[] = { {"9fgv0241" , .driver_data =RENESAS_9FGV0241 }, + {"9fgv0441" , .driver_data =RENESAS_9FGV0441 }, { } };MODULE_DEVICE_TABLE (i2c, rs9_id);static const struct of_device_id clk_rs9_of_match[] = { { .compatible ="renesas,9fgv0241" , .data = &renesas_9fgv0241_info }, + { .compatible ="renesas,9fgv0441" , .data = &renesas_9fgv0441_info }, { } };MODULE_DEVICE_TABLE (of, clk_rs9_of_match);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 185/431 clk: rs9: Fix .driver_data content in i2c_device_id
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit ad527ca87e4ea42d7baad2ce710b44069287931b ]
The .driver_data content in i2c_device_id table must match the .data content in of_device_id table, else device_get_match_data() would return bogus value on i2c_device_id match. Align the two tables.
The i2c_device_id table is now converted from of_device_id using
'[email protected] = "renesas,\([^"]\+"\), .data = \(.*\)@"\1, .driver_data = (kernel_ulong_t)\2@'
--- drivers/clk/clk-renesas-pcie.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/clk-renesas-pcie.c +2 -2
@@ -392,8 +392,8 @@ static const struct rs9_chip_info renesas_9fgv0441_info = { };static const struct i2c_device_id rs9_id[] = { - {"9fgv0241" , .driver_data =RENESAS_9FGV0241 }, - {"9fgv0441" , .driver_data =RENESAS_9FGV0441 }, + {"9fgv0241" , .driver_data = (kernel_ulong_t)&renesas_9fgv0241_info }, + {"9fgv0441" , .driver_data = (kernel_ulong_t)&renesas_9fgv0441_info }, { } };MODULE_DEVICE_TABLE (i2c, rs9_id);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 186/431 Input: adxl34x - do not hardcode interrupt trigger type
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit e96220bce5176ed2309f77f061dcc0430b82b25e ]
Instead of hardcoding IRQ trigger type to IRQF_TRIGGER_HIGH, let's respect the settings specified in the firmware description.
--- drivers/input/misc/adxl34x.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/input/misc/adxl34x.c +1 -2
@@ -817,8 +817,7 @@ struct adxl34x *adxl34x_probe(struct device *dev, int irq,AC_WRITE (ac,POWER_CTL ,0 ); err =request_threaded_irq (ac->irq,NULL , adxl34x_irq, -IRQF_TRIGGER_HIGH |IRQF_ONESHOT , -dev_name (dev), ac); +IRQF_ONESHOT ,dev_name (dev), ac);if (err) {dev_err (dev,"irq %d busy?\n" , ac->irq); goto err_free_mem;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 187/431 drm: sun4i_tcon: use devm_clk_get_enabled in `sun4i_tcon_init_clocks`
In reply to Greg Kroah-HartmanFrom: XuDong Liu <[email protected]>
[ Upstream commit 123ee07ba5b7123e0ce0e0f9d64938026c16a2ce ]
Smatch reports:drivers/gpu/drm/sun4i/sun4i_tcon.c:805 sun4i_tcon_init_clocks() warn:
'tcon->clk' from clk_prepare_enable() not released on lines: 792,801.
In the function sun4i_tcon_init_clocks(), tcon->clk and tcon->sclk0 are not disabled in the error handling, which affects the release of these variable. Although sun4i_tcon_bind(), which calls sun4i_tcon_init_clocks(), use sun4i_tcon_free_clocks to disable the variables mentioned, but the error handling branch of sun4i_tcon_init_clocks() ignores the required disable process.
To fix this issue, use the devm_clk_get_enabled to automatically balance enable and disabled calls. As original implementation use sun4i_tcon_free_clocks() to disable clk explicitly, we delete the related calls and error handling that are no longer needed.
--- drivers/gpu/drm/sun4i/sun4i_tcon.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-)
drivers/gpu/drm/sun4i/sun4i_tcon.c +4 -15
@@ -778,21 +778,19 @@ static irqreturn_t sun4i_tcon_handler(int irq, void *private)static int sun4i_tcon_init_clocks (struct device *dev,struct sun4i_tcon *tcon) { - tcon->clk =devm_clk_get (dev,"ahb" ); + tcon->clk =devm_clk_get_enabled (dev,"ahb" );if (IS_ERR (tcon->clk)) {dev_err (dev,"Couldn't get the TCON bus clock\n" );return PTR_ERR (tcon->clk); } -clk_prepare_enable (tcon->clk);if (tcon->quirks->has_channel_0) { - tcon->sclk0 =devm_clk_get (dev,"tcon-ch0" ); + tcon->sclk0 =devm_clk_get_enabled (dev,"tcon-ch0" );if (IS_ERR (tcon->sclk0)) {dev_err (dev,"Couldn't get the TCON channel 0 clock\n" );return PTR_ERR (tcon->sclk0); } } -clk_prepare_enable (tcon->sclk0);if (tcon->quirks->has_channel_1) { tcon->sclk1 =devm_clk_get (dev,"tcon-ch1" );
@@ -805,12 +803,6 @@ static int sun4i_tcon_init_clocks(struct device *dev,return 0 ; } -static void sun4i_tcon_free_clocks (struct sun4i_tcon *tcon) -{ -clk_disable_unprepare (tcon->sclk0); -clk_disable_unprepare (tcon->clk); -} -static int sun4i_tcon_init_irq (struct device *dev,struct sun4i_tcon *tcon) {
@@ -1223,14 +1215,14 @@ static int sun4i_tcon_bind(struct device *dev, struct device *master, ret =sun4i_tcon_init_regmap (dev, tcon);if (ret) {dev_err (dev,"Couldn't init our TCON regmap\n" ); - goto err_free_clocks; + goto err_assert_reset; }if (tcon->quirks->has_channel_0) { ret =sun4i_dclk_create (dev, tcon);if (ret) {dev_err (dev,"Couldn't create our TCON dot clock\n" ); - goto err_free_clocks; + goto err_assert_reset; } }
@@ -1293,8 +1285,6 @@ static int sun4i_tcon_bind(struct device *dev, struct device *master, err_free_dotclock:if (tcon->quirks->has_channel_0)sun4i_dclk_free (tcon); -err_free_clocks: -sun4i_tcon_free_clocks (tcon); err_assert_reset:reset_control_assert (tcon->lcd_rst);return ret;
@@ -1308,7 +1298,6 @@ static void sun4i_tcon_unbind(struct device *dev, struct device *master,list_del (&tcon->list);if (tcon->quirks->has_channel_0)sun4i_dclk_free (tcon); -sun4i_tcon_free_clocks (tcon); }static const struct component_ops sun4i_tcon_ops = {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 188/431 drm/panel: sharp-ls043t1le01: adjust mode settings
In reply to Greg Kroah-HartmanFrom: Dmitry Baryshkov <[email protected]>
[ Upstream commit dee23b2c9e3ff46d59c5d45e1436eceb878e7c9a ]
Using current settings causes panel flickering on APQ8074 dragonboard. Adjust panel settings to follow the vendor-provided mode. This also enables MIPI_DSI_MODE_VIDEO_SYNC_PULSE, which is also specified by the vendor dtsi for the mentioned dragonboard.
--- drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c +6 -5
@@ -192,15 +192,15 @@ static int sharp_nt_panel_enable(struct drm_panel *panel) }static const struct drm_display_mode default_mode = { - .clock =41118 , + .clock = (540 +48 +32 +80 ) * (960 +3 +10 +15 ) *60 /1000 , .hdisplay =540 , .hsync_start =540 +48 , - .hsync_end =540 +48 +80 , - .htotal =540 +48 +80 +32 , + .hsync_end =540 +48 +32 , + .htotal =540 +48 +32 +80 , .vdisplay =960 , .vsync_start =960 +3 , - .vsync_end =960 +3 +15 , - .vtotal =960 +3 +15 +1 , + .vsync_end =960 +3 +10 , + .vtotal =960 +3 +10 +15 , }; static int sharp_nt_panel_get_modes(struct drm_panel *panel,
@@ -280,6 +280,7 @@ static int sharp_nt_panel_probe(struct mipi_dsi_device *dsi) dsi->lanes =2 ; dsi->format =MIPI_DSI_FMT_RGB888 ; dsi->mode_flags =MIPI_DSI_MODE_VIDEO | +MIPI_DSI_MODE_VIDEO_SYNC_PULSE |MIPI_DSI_MODE_VIDEO_HSE |MIPI_DSI_CLOCK_NON_CONTINUOUS |MIPI_DSI_MODE_NO_EOT_PACKET ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 189/431 driver: soc: xilinx: use _safe loop iterator to avoid a use after free
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit c58da0ba3e5c86e51e2c1557afaf6f71e00c4533 ]
The hash_for_each_possible() loop dereferences "eve_data" to get the next item on the list. However the loop frees eve_data so it leads to a use after free. Use hash_for_each_possible_safe() instead.
--- drivers/soc/xilinx/xlnx_event_manager.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/soc/xilinx/xlnx_event_manager.c +4 -2
@@ -192,11 +192,12 @@ static int xlnx_remove_cb_for_suspend(event_cb_func_t cb_fun)struct registered_event_data *eve_data;struct agent_cb *cb_pos;struct agent_cb *cb_next; +struct hlist_node *tmp; is_need_to_unregister = false;/* Check for existing entry in hash table for given cb_type */ -hash_for_each_possible (reg_driver_map, eve_data, hentry,PM_INIT_SUSPEND_CB ) { +hash_for_each_possible_safe (reg_driver_map, eve_data, tmp, hentry,PM_INIT_SUSPEND_CB ) {if (eve_data->cb_type ==PM_INIT_SUSPEND_CB ) {/* Delete the list of callback */ list_for_each_entry_safe (cb_pos, cb_next, &eve_data->cb_list_head, list) {
@@ -228,11 +229,12 @@ static int xlnx_remove_cb_for_notify_event(const u32 node_id, const u32 event,u64 key = ((u64 )node_id <<32U ) | (u64 )event;struct agent_cb *cb_pos;struct agent_cb *cb_next; +struct hlist_node *tmp; is_need_to_unregister = false;/* Check for existing entry in hash table for given key id */ -hash_for_each_possible (reg_driver_map, eve_data, hentry, key) { +hash_for_each_possible_safe (reg_driver_map, eve_data, tmp, hentry, key) {if (eve_data->key == key) {/* Delete the list of callback */ list_for_each_entry_safe (cb_pos, cb_next, &eve_data->cb_list_head, list) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 190/431 ASoC: dt-bindings: mediatek,mt8188-afe: correct clock name
In reply to Greg Kroah-HartmanFrom: Trevor Wu <[email protected]>
[ Upstream commit 1e4fe75e9746be8e40c57132bb3fba1ce3dd24af ]
The original clock names are different from the list in driver code. Correct the mismatched binding names in the patch.
Because no mt8188 upstream dts exists, it doesn't affect the existing dts file.
--- .../bindings/sound/mediatek,mt8188-afe.yaml | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-)
Documentation/devicetree/bindings/sound/mediatek,mt8188-afe.yaml +18 -18
@@ -63,15 +63,15 @@ properties: - const: apll12_div2 - const: apll12_div3 - const: apll12_div9 - - const: a1sys_hp_sel - - const: aud_intbus_sel - - const: audio_h_sel - - const: audio_local_bus_sel - - const: dptx_m_sel - - const: i2so1_m_sel - - const: i2so2_m_sel - - const: i2si1_m_sel - - const: i2si2_m_sel + - const: top_a1sys_hp + - const: top_aud_intbus + - const: top_audio_h + - const: top_audio_local_bus + - const: top_dptx + - const: top_i2so1 + - const: top_i2so2 + - const: top_i2si1 + - const: top_i2si2 - const: adsp_audio_26m mediatek,etdm-in1-cowork-source:
@@ -193,15 +193,15 @@ examples: "apll12_div2", "apll12_div3", "apll12_div9", - "a1sys_hp_sel", - "aud_intbus_sel", - "audio_h_sel", - "audio_local_bus_sel", - "dptx_m_sel", - "i2so1_m_sel", - "i2so2_m_sel", - "i2si1_m_sel", - "i2si2_m_sel", + "top_a1sys_hp", + "top_aud_intbus", + "top_audio_h", + "top_audio_local_bus", + "top_dptx", + "top_i2so1", + "top_i2so2", + "top_i2si1", + "top_i2si2", "adsp_audio_26m"; };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 191/431 ASoC: Intel: sof_sdw: remove SOF_SDW_TGL_HDMI for MeteorLake devices
In reply to Greg Kroah-HartmanFrom: Bard Liao <[email protected]>
[ Upstream commit 0db94947c9d3da16aa31d152b7d26fab78b02cb9 ]
Topologies support three HDMI links on MeteorLake devices only.
--- sound/soc/intel/boards/sof_sdw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/intel/boards/sof_sdw.c +1 -1
@@ -413,7 +413,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { .matches = { DMI_MATCH(DMI_PRODUCT_FAMILY, "Intel_mtlrvp"), }, - .driver_data = (void *)(RT711_JD1 | SOF_SDW_TGL_HDMI), + .driver_data = (void *)(RT711_JD1), }, {} };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 192/431 drm/vkms: isolate pixel conversion functionality
In reply to Greg Kroah-HartmanFrom: Maíra Canal <[email protected]>
[ Upstream commit 322d716a3e8a74fb75cd0f657647be4df253fd2f ]
Currently, the pixel conversion functions repeat the same loop to iterate the rows. Instead of repeating the same code for each pixel format, create a function to wrap the loop and isolate the pixel conversion functionality.
Stable-dep-of: ab87f558dcfb ("drm/vkms: Fix RGB565 pixel conversion")
--- drivers/gpu/drm/vkms/vkms_composer.c | 4 +- drivers/gpu/drm/vkms/vkms_drv.h | 4 +- drivers/gpu/drm/vkms/vkms_formats.c | 125 +++++++++++---------------- drivers/gpu/drm/vkms/vkms_formats.h | 2 +- drivers/gpu/drm/vkms/vkms_plane.c | 2 +- 5 files changed, 56 insertions(+), 81 deletions(-)
drivers/gpu/drm/vkms/vkms_composer.c +2 -2
@@ -99,7 +99,7 @@ static void blend(struct vkms_writeback_job *wb,if (!check_y_limit (plane[i]->frame_info, y))continue ; - plane[i]->plane_read (stage_buffer, plane[i]->frame_info, y); +vkms_compose_row (stage_buffer, plane[i], y);pre_mul_alpha_blend (plane[i]->frame_info, stage_buffer, output_buffer); }
@@ -118,7 +118,7 @@ static int check_format_funcs(struct vkms_crtc_state *crtc_state,u32 n_active_planes = crtc_state->num_active_planes;for (size_t i =0 ; i < n_active_planes; i++) -if (!planes[i]->plane_read) +if (!planes[i]->pixel_read)return -1 ;if (active_wb && !active_wb->wb_write)
drivers/gpu/drm/vkms/vkms_drv.h +2 -2
@@ -56,8 +56,7 @@ struct vkms_writeback_job {struct vkms_plane_state {struct drm_shadow_plane_state base;struct vkms_frame_info *frame_info; -void (*plane_read)(struct line_buffer *buffer, -const struct vkms_frame_info *frame_info,int y); +void (*pixel_read)(u8 *src_buffer,struct pixel_argb_u16 *out_pixel); };struct vkms_plane {
@@ -155,6 +154,7 @@ int vkms_verify_crc_source(struct drm_crtc *crtc, const char *source_name,/* Composer Support */ void vkms_composer_worker (struct work_struct *work);void vkms_set_composer (struct vkms_output *out,bool enabled); +void vkms_compose_row (struct line_buffer *stage_buffer,struct vkms_plane_state *plane,int y);/* Writeback */ int vkms_enable_writeback_connector (struct vkms_device *vkmsdev);
drivers/gpu/drm/vkms/vkms_formats.c +50 -75
157 lines not on this page · raw message
drivers/gpu/drm/vkms/vkms_formats.h +1 -1
@@ -5,7 +5,7 @@#include "vkms_drv.h" -void *get_frame_to_line_function (u32 format); +void *get_pixel_conversion_function (u32 format);void *get_line_to_frame_function (u32 format);
drivers/gpu/drm/vkms/vkms_plane.c +1 -1
@@ -123,7 +123,7 @@ static void vkms_plane_atomic_update(struct drm_plane *plane, frame_info->offset = fb->offsets[0 ]; frame_info->pitch = fb->pitches[0 ]; frame_info->cpp = fb->format->cpp[0 ]; - vkms_plane_state->plane_read =get_frame_to_line_function (fmt); + vkms_plane_state->pixel_read =get_pixel_conversion_function (fmt); } static int vkms_plane_atomic_check(struct drm_plane *plane,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 193/431 drm: Add fixed-point helper to get rounded integer values
In reply to Greg Kroah-HartmanFrom: Maíra Canal <[email protected]>
[ Upstream commit 8b25320887d7feac98875546ea0f521628b745bb ]
Create a new fixed-point helper to allow us to return the rounded value of our fixed point value.
[v2]:
* Create the function drm_fixp2int_round() (Melissa Wen).
[v3]:
* Use drm_fixp2int() instead of shifting manually (Arthur Grillo).
Stable-dep-of: ab87f558dcfb ("drm/vkms: Fix RGB565 pixel conversion")
--- include/drm/drm_fixed.h | 6 ++++++ 1 file changed, 6 insertions(+)
include/drm/drm_fixed.h +6 -0
@@ -71,6 +71,7 @@ static inline u32 dfixed_div(fixed20_12 A, fixed20_12 B) }#define DRM_FIXED_POINT 32 +#define DRM_FIXED_POINT_HALF 16#define DRM_FIXED_ONE (1ULL << DRM_FIXED_POINT)#define DRM_FIXED_DECIMAL_MASK (DRM_FIXED_ONE - 1)#define DRM_FIXED_DIGITS_MASK (~DRM_FIXED_DECIMAL_MASK)
@@ -87,6 +88,11 @@ static inline int drm_fixp2int(s64 a)return ((s64 )a) >>DRM_FIXED_POINT ; } +static inline int drm_fixp2int_round (s64 a) +{ +return drm_fixp2int (a + (1 << (DRM_FIXED_POINT_HALF -1 ))); +} +static inline int drm_fixp2int_ceil (s64 a) {if (a >0 )
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 194/431 drm/vkms: Fix RGB565 pixel conversion
In reply to Greg Kroah-HartmanFrom: Maíra Canal <[email protected]>
[ Upstream commit ab87f558dcfb2562c3497e89600dec798a446665 ]
Currently, the pixel conversion isn't rounding the fixed-point values before assigning it to the RGB coefficients, which is causing the IGT pixel-format tests to fail. So, use the drm_fixp2int_round() fixed-point helper to round the values when assigning it to the RGB coefficients.
Tested with igt@kms_plane@pixel-format and igt@kms_plane@pixel-format-source-clamping.
[v2]:
* Use drm_fixp2int_round() to fix the pixel conversion instead of casting the values to s32 (Melissa Wen).
--- drivers/gpu/drm/vkms/vkms_formats.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/vkms/vkms_formats.c +6 -6
@@ -97,9 +97,9 @@ static void RGB565_to_argb_u16(u8 *src_pixels, struct pixel_argb_u16 *out_pixel)s64 fp_b =drm_int2fixp (rgb_565 &0x1f ); out_pixel->a = (u16 )0xffff ; - out_pixel->r =drm_fixp2int (drm_fixp_mul (fp_r, fp_rb_ratio)); - out_pixel->g =drm_fixp2int (drm_fixp_mul (fp_g, fp_g_ratio)); - out_pixel->b =drm_fixp2int (drm_fixp_mul (fp_b, fp_rb_ratio)); + out_pixel->r =drm_fixp2int_round (drm_fixp_mul (fp_r, fp_rb_ratio)); + out_pixel->g =drm_fixp2int_round (drm_fixp_mul (fp_g, fp_g_ratio)); + out_pixel->b =drm_fixp2int_round (drm_fixp_mul (fp_b, fp_rb_ratio)); }void vkms_compose_row (struct line_buffer *stage_buffer,struct vkms_plane_state *plane,int y)
@@ -216,9 +216,9 @@ static void argb_u16_to_RGB565(struct vkms_frame_info *frame_info,s64 fp_g =drm_int2fixp (in_pixels[x].g);s64 fp_b =drm_int2fixp (in_pixels[x].b); -u16 r =drm_fixp2int (drm_fixp_div (fp_r, fp_rb_ratio)); -u16 g =drm_fixp2int (drm_fixp_div (fp_g, fp_g_ratio)); -u16 b =drm_fixp2int (drm_fixp_div (fp_b, fp_rb_ratio)); +u16 r =drm_fixp2int_round (drm_fixp_div (fp_r, fp_rb_ratio)); +u16 g =drm_fixp2int_round (drm_fixp_div (fp_g, fp_g_ratio)); +u16 b =drm_fixp2int_round (drm_fixp_div (fp_b, fp_rb_ratio)); *dst_pixels =cpu_to_le16 (r <<11 | g <<5 | b); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 195/431 ARM: dts: stm32: Move ethernet MAC EEPROM from SoM to carrier boards
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit 9660efc2af37f3c12dc6e6a5511ad99e0addc297 ]
The ethernet MAC EEPROM is not populated on the SoM itself, it has to be populated on each carrier board. Move the EEPROM into the correct place in DTs, i.e. the carrier board DTs. Add label to the EEPROM too.
--- arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi | 6 ++++++ arch/arm/boot/dts/stm32mp15xx-dhcor-drc-compact.dtsi | 6 ++++++ arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi | 6 ------ arch/arm/boot/dts/stm32mp15xx-dhcor-testbench.dtsi | 8 ++++++++ 4 files changed, 20 insertions(+), 6 deletions(-)
arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi +6 -0
@@ -321,6 +321,12 @@ adv7513_i2s0: endpoint { }; }; }; + + dh_mac_eeprom: eeprom@53 { + compatible = "atmel,24c02"; + reg = <0x53>; + pagesize = <16>; + }; }; <dc {
arch/arm/boot/dts/stm32mp15xx-dhcor-drc-compact.dtsi +6 -0
@@ -192,6 +192,12 @@ eeprom@50 { reg = <0x50>; pagesize = <16>; }; + + dh_mac_eeprom: eeprom@53 { + compatible = "atmel,24c02"; + reg = <0x53>; + pagesize = <16>; + }; }; &sdmmc1 { /* MicroSD */
arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi +0 -6
@@ -213,12 +213,6 @@ watchdog { status = "disabled"; }; }; - - eeprom@53 { - compatible = "atmel,24c02"; - reg = <0x53>; - pagesize = <16>; - }; }; &ipcc {
arch/arm/boot/dts/stm32mp15xx-dhcor-testbench.dtsi +8 -0
@@ -90,6 +90,14 @@ phy0: ethernet-phy@7 { }; }; +&i2c4 { + dh_mac_eeprom: eeprom@53 { + compatible = "atmel,24c02"; + reg = <0x53>; + pagesize = <16>; + }; +}; + &sdmmc1 { pinctrl-names = "default", "opendrain", "sleep"; pinctrl-0 = <&sdmmc1_b4_pins_a &sdmmc1_dir_pins_b>;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 196/431 bus: ti-sysc: Fix dispc quirk masking bool variables
In reply to Greg Kroah-HartmanFrom: Tony Lindgren <[email protected]>
[ Upstream commit f620596fa347170852da499e778a5736d79a4b79 ]
Fix warning drivers/bus/ti-sysc.c:1806 sysc_quirk_dispc()
warn: masking a bool.
While at it let's add a comment for what were doing to make the code a bit easier to follow.
--- drivers/bus/ti-sysc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/bus/ti-sysc.c +2 -2
@@ -1814,7 +1814,7 @@ static u32 sysc_quirk_dispc(struct sysc *ddata, int dispc_offset,if (!ddata->module_va)return -EIO ; -/* DISP_CONTROL */ +/* DISP_CONTROL, shut down lcd and digit on disable if enabled */ val =sysc_read (ddata, dispc_offset +0x40 ); lcd_en = val & lcd_en_mask; digit_en = val & digit_en_mask;
@@ -1826,7 +1826,7 @@ static u32 sysc_quirk_dispc(struct sysc *ddata, int dispc_offset,else irq_mask |=BIT (2 ) |BIT (3 );/* EVSYNC bits */ } -if (disable & (lcd_en | digit_en)) +if (disable && (lcd_en || digit_en))sysc_write (ddata, dispc_offset +0x40 , val & ~(lcd_en_mask | digit_en_mask));
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 197/431 arm64: dts: microchip: sparx5: do not use PSCI on reference boards
In reply to Greg Kroah-HartmanFrom: Robert Marko <[email protected]>
[ Upstream commit 70be83708c925b3f72c508e4756e48ad2330c830 ]
PSCI is not implemented on SparX-5 at all, there is no ATF and U-boot that is shipped does not implement it as well.
I have tried flashing the latest BSP 2022.12 U-boot which did not work. After contacting Microchip, they confirmed that there is no ATF for the SoC nor PSCI implementation which is unfortunate in 2023.
So, disable PSCI as otherwise kernel crashes as soon as it tries probing PSCI with, and the crash is only visible if earlycon is used.
Since PSCI is not implemented, switch core bringup to use spin-tables which are implemented in the vendor U-boot and actually work.
Tested on PCB134 with eMMC (VSC5640EV).
--- arch/arm64/boot/dts/microchip/sparx5.dtsi | 2 +- arch/arm64/boot/dts/microchip/sparx5_pcb_common.dtsi | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/microchip/sparx5.dtsi +1 -1
@@ -61,7 +61,7 @@ arm-pmu { interrupt-affinity = <&cpu0>, <&cpu1>; }; - psci { + psci: psci { compatible = "arm,psci-0.2"; method = "smc"; };
arch/arm64/boot/dts/microchip/sparx5_pcb_common.dtsi +12 -0
@@ -6,6 +6,18 @@ /dts-v1/; #include "sparx5.dtsi" +&psci { + status = "disabled"; +}; + +&cpu0 { + enable-method = "spin-table"; +}; + +&cpu1 { + enable-method = "spin-table"; +}; + &uart0 { status = "okay"; };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 198/431 drm/bridge: tc358767: Switch to devm MIPI-DSI helpers
In reply to Greg Kroah-HartmanFrom: Alexander Stein <[email protected]>
[ Upstream commit f47d6140b7a4c858d82d263e7577ff6fb5279a9c ]
DSI device registering and attaching needs to be undone upon deregistration. This fixes module unload/load.
--- drivers/gpu/drm/bridge/tc358767.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/bridge/tc358767.c +2 -2
@@ -1890,7 +1890,7 @@ static int tc_mipi_dsi_host_attach(struct tc_data *tc)if (dsi_lanes <0 )return dsi_lanes; - dsi =mipi_dsi_device_register_full (host, &info); + dsi =devm_mipi_dsi_device_register_full (dev, host, &info);if (IS_ERR (dsi))return dev_err_probe (dev,PTR_ERR (dsi),"failed to create dsi device\n" );
@@ -1901,7 +1901,7 @@ static int tc_mipi_dsi_host_attach(struct tc_data *tc) dsi->format =MIPI_DSI_FMT_RGB888 ; dsi->mode_flags =MIPI_DSI_MODE_VIDEO |MIPI_DSI_MODE_VIDEO_SYNC_PULSE ; - ret =mipi_dsi_attach (dsi); + ret =devm_mipi_dsi_attach (dev, dsi);if (ret <0 ) {dev_err (dev,"failed to attach dsi to host: %d\n" , ret);return ret;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 199/431 clk: imx: scu: use _safe list iterator to avoid a use after free
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 632c60ecd25dbacee54d5581fe3aeb834b57010a ]
This loop is freeing "clk" so it needs to use list_for_each_entry_safe(). Otherwise it dereferences a freed variable to get the next item on the loop.
--- drivers/clk/imx/clk-scu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/imx/clk-scu.c +2 -2
@@ -707,11 +707,11 @@ struct clk_hw *imx_clk_scu_alloc_dev(const char *name,void imx_clk_scu_unregister (void ) { -struct imx_scu_clk_node *clk; +struct imx_scu_clk_node *clk, *n;int i;for (i =0 ; i <IMX_SC_R_LAST ; i++) { -list_for_each_entry (clk, &imx_scu_clks[i], node) { +list_for_each_entry_safe (clk, n, &imx_scu_clks[i], node) {clk_hw_unregister (clk->hw);kfree (clk); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 200/431 hwmon: (f71882fg) prevent possible division by zero
In reply to Greg Kroah-HartmanFrom: Nikita Zhandarovich <[email protected]>
[ Upstream commit 0babf89c9cca7e074d6e59893e462e4886f481cc ]
In the unlikely event that something goes wrong with the device and its registers, the fan_from_reg() function may return 0. This value will cause a division-by-zero error in the show_pwm() function.
To prevent this, test the value of fan_from_reg(data->fan_full_speed[nr]) against 0 before performing the division. If the division-by-zero error is avoided, assign 0 to the val variable.
Found by Linux Verification Center (linuxtesting.org) with static analysis tool SVACE.
--- drivers/hwmon/f71882fg.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/hwmon/f71882fg.c +5 -2
@@ -1096,8 +1096,11 @@ static ssize_t show_pwm(struct device *dev, val = data->pwm[nr]; else {/* RPM mode */ - val =255 *fan_from_reg (data->fan_target[nr]) - /fan_from_reg (data->fan_full_speed[nr]); +if (fan_from_reg (data->fan_full_speed[nr])) + val =255 *fan_from_reg (data->fan_target[nr]) + /fan_from_reg (data->fan_full_speed[nr]); +else + val =0 ; }mutex_unlock (&data->update_lock);return sprintf (buf,"%d\n" , val);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 201/431 RDMA/bnxt_re: Disable/kill tasklet only if it is enabled
In reply to Greg Kroah-HartmanFrom: Selvin Xavier <[email protected]>
[ Upstream commit ab112ee7899d6171da5acd77a7ed7ae103f488de ]
When the ulp hook to start the IRQ fails because the rings are not available, tasklets are not enabled. In this case when the driver is unloaded, driver calls CREQ tasklet_kill. This causes an indefinite hang as the tasklet is not enabled.
Driver shouldn't call tasklet_kill if it is not enabled. So using the creq->requested and nq->requested flags to identify if both tasklets/irqs are registered. Checking this flag while scheduling the tasklet from ISR. Also, added a cleanup for disabling tasklet, in case request_irq fails during start_irq.
Check for return value for bnxt_qplib_rcfw_start_irq and in case the bnxt_qplib_rcfw_start_irq fails, return bnxt_re_start_irq without attempting to start NQ IRQs.
--- drivers/infiniband/hw/bnxt_re/main.c | 12 +++++++++--- drivers/infiniband/hw/bnxt_re/qplib_fp.c | 16 ++++++++++------ drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 14 +++++++++----- 3 files changed, 28 insertions(+), 14 deletions(-)
drivers/infiniband/hw/bnxt_re/main.c +9 -3
@@ -283,15 +283,21 @@ static void bnxt_re_start_irq(void *handle, struct bnxt_msix_entry *ent)for (indx =0 ; indx < rdev->num_msix; indx++) rdev->en_dev->msix_entries[indx].vector = ent[indx].vector; -bnxt_qplib_rcfw_start_irq (rcfw, msix_ent[BNXT_RE_AEQ_IDX ].vector, - false); + rc =bnxt_qplib_rcfw_start_irq (rcfw, msix_ent[BNXT_RE_AEQ_IDX ].vector, + false); +if (rc) { +ibdev_warn (&rdev->ibdev,"Failed to reinit CREQ\n" ); +return ; + }for (indx =BNXT_RE_NQ_IDX ; indx < rdev->num_msix; indx++) { nq = &rdev->nq[indx -1 ]; rc =bnxt_qplib_nq_start_irq (nq, indx -1 , msix_ent[indx].vector, false); -if (rc) +if (rc) {ibdev_warn (&rdev->ibdev,"Failed to reinit NQ index %d\n" , indx -1 ); +return ; + } } }
drivers/infiniband/hw/bnxt_re/qplib_fp.c +10 -6
@@ -405,6 +405,9 @@ static irqreturn_t bnxt_qplib_nq_irq(int irq, void *dev_instance)void bnxt_qplib_nq_stop_irq (struct bnxt_qplib_nq *nq,bool kill) { +if (!nq->requested) +return ; +tasklet_disable (&nq->nq_tasklet);/* Mask h/w interrupt */ bnxt_qplib_ring_nq_db (&nq->nq_db.dbinfo, nq->res->cctx, false);
@@ -412,11 +415,10 @@ void bnxt_qplib_nq_stop_irq(struct bnxt_qplib_nq *nq, bool kill)synchronize_irq (nq->msix_vec);if (kill)tasklet_kill (&nq->nq_tasklet); -if (nq->requested) { -irq_set_affinity_hint (nq->msix_vec,NULL ); -free_irq (nq->msix_vec, nq); - nq->requested = false; - } + +irq_set_affinity_hint (nq->msix_vec,NULL ); +free_irq (nq->msix_vec, nq); + nq->requested = false; }void bnxt_qplib_disable_nq (struct bnxt_qplib_nq *nq)
@@ -455,8 +457,10 @@ int bnxt_qplib_nq_start_irq(struct bnxt_qplib_nq *nq, int nq_indx,snprintf (nq->name,sizeof (nq->name),"bnxt_qplib_nq-%d" , nq_indx); rc =request_irq (nq->msix_vec, bnxt_qplib_nq_irq,0 , nq->name, nq); -if (rc) +if (rc) { +tasklet_disable (&nq->nq_tasklet);return rc; + }cpumask_clear (&nq->mask);cpumask_set_cpu (nq_indx, &nq->mask);
drivers/infiniband/hw/bnxt_re/qplib_rcfw.c +9 -5
@@ -635,6 +635,10 @@ void bnxt_qplib_rcfw_stop_irq(struct bnxt_qplib_rcfw *rcfw, bool kill)struct bnxt_qplib_creq_ctx *creq; creq = &rcfw->creq; + +if (!creq->requested) +return ; +tasklet_disable (&creq->creq_tasklet);/* Mask h/w interrupts */ bnxt_qplib_ring_nq_db (&creq->creq_db.dbinfo, rcfw->res->cctx, false);
@@ -643,10 +647,8 @@ void bnxt_qplib_rcfw_stop_irq(struct bnxt_qplib_rcfw *rcfw, bool kill)if (kill)tasklet_kill (&creq->creq_tasklet); -if (creq->requested) { -free_irq (creq->msix_vec, rcfw); - creq->requested = false; - } +free_irq (creq->msix_vec, rcfw); + creq->requested = false; }void bnxt_qplib_disable_rcfw_channel (struct bnxt_qplib_rcfw *rcfw)
@@ -692,8 +694,10 @@ int bnxt_qplib_rcfw_start_irq(struct bnxt_qplib_rcfw *rcfw, int msix_vector,tasklet_enable (&creq->creq_tasklet); rc =request_irq (creq->msix_vec, bnxt_qplib_creq_irq,0 ,"bnxt_qplib_creq" , rcfw); -if (rc) +if (rc) { +tasklet_disable (&creq->creq_tasklet);return rc; + } creq->requested = true;bnxt_qplib_ring_nq_db (&creq->creq_db.dbinfo, rcfw->res->cctx, true);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 202/431 RDMA/bnxt_re: Fix to remove unnecessary return labels
In reply to Greg Kroah-HartmanFrom: Kalesh AP <[email protected]>
[ Upstream commit 9b3ee47796f529e5bc31a355d6cb756d68a7079a ]
If there is no cleanup needed then just return directly. This cleans up the code and improve readability.
--- drivers/infiniband/hw/bnxt_re/qplib_fp.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/infiniband/hw/bnxt_re/qplib_fp.c +2 -5
@@ -1605,7 +1605,7 @@ static int bnxt_qplib_put_inline(struct bnxt_qplib_qp *qp, il_src = (void *)wqe->sg_list[indx].addr; t_len += len;if (t_len > qp->max_inline_data) - goto bad; +return -ENOMEM ;while (len) {if (pull_dst) { pull_dst = false;
@@ -1629,8 +1629,6 @@ static int bnxt_qplib_put_inline(struct bnxt_qplib_qp *qp, }return t_len; -bad: -return -ENOMEM ; } static u32 bnxt_qplib_put_sges(struct bnxt_qplib_hwq *hwq,
@@ -2060,7 +2058,7 @@ int bnxt_qplib_create_cq(struct bnxt_qplib_res *res, struct bnxt_qplib_cq *cq) hwq_attr.sginfo = &cq->sg_info; rc =bnxt_qplib_alloc_init_hwq (&cq->hwq, &hwq_attr);if (rc) - goto exit; +return rc;RCFW_CMD_PREP (req,CREATE_CQ , cmd_flags);
@@ -2101,7 +2099,6 @@ int bnxt_qplib_create_cq(struct bnxt_qplib_res *res, struct bnxt_qplib_cq *cq) fail:bnxt_qplib_free_hwq (res, &cq->hwq); -exit:return rc; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 203/431 RDMA/bnxt_re: Use unique names while registering interrupts
In reply to Greg Kroah-HartmanFrom: Kalesh AP <[email protected]>
[ Upstream commit ff2e4bfd162cf66a112a81509e419805add44d64 ]
bnxt_re currently uses the names "bnxt_qplib_creq" and "bnxt_qplib_nq-0" while registering IRQs. There is no way to distinguish the IRQs of different device ports when there are multiple IB devices registered. This could make the scenarios worse where one want to pin IRQs of a device port to certain CPUs.
Fixed the code to use unique names which has PCI BDF information while registering interrupts like: "bnxt_re-nq-0@pci:0000:65:00.0" and "bnxt_re-creq@pci:0000:65:00.1".
--- drivers/infiniband/hw/bnxt_re/qplib_fp.c | 12 ++++++++++-- drivers/infiniband/hw/bnxt_re/qplib_fp.h | 2 +- drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 15 +++++++++++++-- drivers/infiniband/hw/bnxt_re/qplib_rcfw.h | 1 + 4 files changed, 25 insertions(+), 5 deletions(-)
drivers/infiniband/hw/bnxt_re/qplib_fp.c +10 -2
@@ -418,6 +418,8 @@ void bnxt_qplib_nq_stop_irq(struct bnxt_qplib_nq *nq, bool kill)irq_set_affinity_hint (nq->msix_vec,NULL );free_irq (nq->msix_vec, nq); +kfree (nq->name); + nq->name =NULL ; nq->requested = false; }
@@ -444,6 +446,7 @@ void bnxt_qplib_disable_nq(struct bnxt_qplib_nq *nq)int bnxt_qplib_nq_start_irq (struct bnxt_qplib_nq *nq,int nq_indx,int msix_vector,bool need_init) { +struct bnxt_qplib_res *res = nq->res;int rc;if (nq->requested)
@@ -455,9 +458,14 @@ int bnxt_qplib_nq_start_irq(struct bnxt_qplib_nq *nq, int nq_indx,else tasklet_enable (&nq->nq_tasklet); -snprintf (nq->name,sizeof (nq->name),"bnxt_qplib_nq-%d" , nq_indx); + nq->name =kasprintf (GFP_KERNEL ,"bnxt_re-nq-%d@pci:%s" , + nq_indx,pci_name (res->pdev)); +if (!nq->name) +return -ENOMEM ; rc =request_irq (nq->msix_vec, bnxt_qplib_nq_irq,0 , nq->name, nq);if (rc) { +kfree (nq->name); + nq->name =NULL ;tasklet_disable (&nq->nq_tasklet);return rc; }
@@ -471,7 +479,7 @@ int bnxt_qplib_nq_start_irq(struct bnxt_qplib_nq *nq, int nq_indx, nq->msix_vec, nq_indx); } nq->requested = true; -bnxt_qplib_ring_nq_db (&nq->nq_db.dbinfo, nq->res->cctx, true); +bnxt_qplib_ring_nq_db (&nq->nq_db.dbinfo, res->cctx, true);return rc; }
drivers/infiniband/hw/bnxt_re/qplib_fp.h +1 -1
@@ -471,7 +471,7 @@ typedef int (*srqn_handler_t)(struct bnxt_qplib_nq *nq,struct bnxt_qplib_nq {struct pci_dev *pdev;struct bnxt_qplib_res *res; -char name[32 ]; +char *name;struct bnxt_qplib_hwq hwq;struct bnxt_qplib_nq_db nq_db;u16 ring_id;
drivers/infiniband/hw/bnxt_re/qplib_rcfw.c +13 -2
@@ -648,6 +648,8 @@ void bnxt_qplib_rcfw_stop_irq(struct bnxt_qplib_rcfw *rcfw, bool kill)tasklet_kill (&creq->creq_tasklet);free_irq (creq->msix_vec, rcfw); +kfree (creq->irq_name); + creq->irq_name =NULL ; creq->requested = false; }
@@ -680,9 +682,11 @@ int bnxt_qplib_rcfw_start_irq(struct bnxt_qplib_rcfw *rcfw, int msix_vector, bool need_init) {struct bnxt_qplib_creq_ctx *creq; +struct bnxt_qplib_res *res;int rc; creq = &rcfw->creq; + res = rcfw->res;if (creq->requested)return -EFAULT ;
@@ -692,15 +696,22 @@ int bnxt_qplib_rcfw_start_irq(struct bnxt_qplib_rcfw *rcfw, int msix_vector,tasklet_setup (&creq->creq_tasklet, bnxt_qplib_service_creq); else tasklet_enable(&creq->creq_tasklet); + + creq->irq_name =kasprintf (GFP_KERNEL ,"bnxt_re-creq@pci:%s" , +pci_name (res->pdev)); +if (!creq->irq_name) +return -ENOMEM ; rc =request_irq (creq->msix_vec, bnxt_qplib_creq_irq,0 , -"bnxt_qplib_creq" , rcfw); + creq->irq_name, rcfw);if (rc) { +kfree (creq->irq_name); + creq->irq_name =NULL ;tasklet_disable (&creq->creq_tasklet);return rc; } creq->requested = true; -bnxt_qplib_ring_nq_db (&creq->creq_db.dbinfo, rcfw->res->cctx, true); +bnxt_qplib_ring_nq_db (&creq->creq_db.dbinfo, res->cctx, true);return 0 ; }
drivers/infiniband/hw/bnxt_re/qplib_rcfw.h +1 -0
@@ -174,6 +174,7 @@ struct bnxt_qplib_creq_ctx {u16 ring_id;int msix_vec;bool requested;/*irq handler installed */ +char *irq_name; };/* RCFW Communication Channels */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 204/431 RDMA/bnxt_re: Remove a redundant check inside bnxt_re_update_gid
In reply to Greg Kroah-HartmanFrom: Kalesh AP <[email protected]>
[ Upstream commit b989f90cef0af48aa5679b6a75476371705ec53c ]
The NULL check inside bnxt_re_update_gid() always return false. If sgid_tbl->tbl is not allocated, then dev_init would have failed.
--- drivers/infiniband/hw/bnxt_re/main.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/infiniband/hw/bnxt_re/main.c +1 -7
@@ -1010,12 +1010,6 @@ static int bnxt_re_update_gid(struct bnxt_re_dev *rdev)if (!ib_device_try_get (&rdev->ibdev))return 0 ; -if (!sgid_tbl) { -ibdev_err (&rdev->ibdev,"QPLIB: SGID table not allocated" ); - rc = -EINVAL ; - goto out; - } -for (index =0 ; index < sgid_tbl->active; index++) { gid_idx = sgid_tbl->hw_id[index];
@@ -1033,7 +1027,7 @@ static int bnxt_re_update_gid(struct bnxt_re_dev *rdev) rc =bnxt_qplib_update_sgid (sgid_tbl, &gid, gid_idx, rdev->qplib_res.netdev->dev_addr); } -out: +ib_device_put (&rdev->ibdev);return rc; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 205/431 RDMA/bnxt_re: Fix to remove an unnecessary log
In reply to Greg Kroah-HartmanFrom: Kalesh AP <[email protected]>
[ Upstream commit 43774bc156614346fe5dacabc8e8c229167f2536 ]
During destroy_qp, driver sets the qp handle in the existing CQEs belonging to the QP being destroyed to NULL. As a result, a poll_cq after destroy_qp can report unnecessary messages. Remove this noise from system logs.
--- drivers/infiniband/hw/bnxt_re/qplib_fp.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/infiniband/hw/bnxt_re/qplib_fp.c +1 -4
@@ -2734,11 +2734,8 @@ static int bnxt_qplib_cq_process_terminal(struct bnxt_qplib_cq *cq, qp = (struct bnxt_qplib_qp *)((unsigned long )le64_to_cpu (hwcqe->qp_handle)); -if (!qp) { -dev_err (&cq->hwq.pdev->dev, -"FP: CQ Process terminal qp is NULL\n" ); +if (!qp)return -EINVAL ; - }/* Must block new posting of SQ and RQ */ qp->state =CMDQ_MODIFY_QP_NEW_STATE_ERR ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 206/431 drm/msm/dsi: dont allow enabling 14nm VCO with unprogrammed rate
In reply to Greg Kroah-HartmanFrom: Dmitry Baryshkov <[email protected]>
[ Upstream commit 1e0a97f84d73ea1182740f62069690c7f3271abb ]
If the dispcc uses CLK_OPS_PARENT_ENABLE (e.g. on QCM2290), CCF can try enabling VCO before the rate has been programmed. This can cause clock lockups and/or other boot issues. Program the VCO to the minimal PLL rate if the read rate is 0 Hz.
Patchwork: https://patchwork.freedesktop.org/patch/534813/
--- drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c +3 -0
@@ -539,6 +539,9 @@ static int dsi_pll_14nm_vco_prepare(struct clk_hw *hw)if (unlikely (pll_14nm->phy->pll_on))return 0 ; +if (dsi_pll_14nm_vco_recalc_rate (hw,VCO_REF_CLK_RATE ) ==0 ) +dsi_pll_14nm_vco_set_rate (hw, pll_14nm->phy->cfg->min_pll_rate,VCO_REF_CLK_RATE ); +dsi_phy_write (base + REG_DSI_14nm_PHY_PLL_VREF_CFG1,0x10 );dsi_phy_write (cmn_base + REG_DSI_14nm_PHY_CMN_PLL_CNTRL,1 );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 207/431 drm/msm/disp/dpu: get timing engine status from intf status register
In reply to Greg Kroah-HartmanFrom: Vinod Polimera <[email protected]>
[ Upstream commit e3969eadc8ee78a5bdca65b8ed0a421a359e4090 ]
Recommended way of reading the interface timing gen status is via status register. Timing gen status register will give a reliable status of the interface especially during ON/OFF transitions. This support was added from DPU version 5.0.0.
Patchwork: https://patchwork.freedesktop.org/patch/524724/
Stable-dep-of: a7129231edf3 ("drm/msm/dpu: Set DPU_DATA_HCTL_EN for in INTF_SC7180_MASK")
--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 3 ++- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 12 +++++++----- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 8 +++++++- 3 files changed, 16 insertions(+), 7 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +2 -1
@@ -94,7 +94,8 @@#define INTF_SDM845_MASK (0) -#define INTF_SC7180_MASK BIT(DPU_INTF_INPUT_CTRL) | BIT(DPU_INTF_TE) +#define INTF_SC7180_MASK \ + (BIT(DPU_INTF_INPUT_CTRL) | BIT(DPU_INTF_TE) | BIT(DPU_INTF_STATUS_SUPPORTED))#define INTF_SC7280_MASK INTF_SC7180_MASK | BIT(DPU_DATA_HCTL_EN)
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +7 -5
@@ -214,17 +214,19 @@ enum {/** * INTF sub-blocks -* @DPU_INTF_INPUT_CTRL Supports the setting of pp block from which -* pixel data arrives to this INTF -* @DPU_INTF_TE INTF block has TE configuration support -* @DPU_DATA_HCTL_EN Allows data to be transferred at different rate -than video timing +* @DPU_INTF_INPUT_CTRL Supports the setting of pp block from which +* pixel data arrives to this INTF +* @DPU_INTF_TE INTF block has TE configuration support +* @DPU_DATA_HCTL_EN Allows data to be transferred at different rate +* than video timing +* @DPU_INTF_STATUS_SUPPORTED INTF block has INTF_STATUS register * @DPU_INTF_MAX */ enum {DPU_INTF_INPUT_CTRL =0x1 ,DPU_INTF_TE ,DPU_DATA_HCTL_EN , +DPU_INTF_STATUS_SUPPORTED ,DPU_INTF_MAX };
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c +7 -1
@@ -57,6 +57,7 @@#define INTF_PROG_FETCH_START 0x170#define INTF_PROG_ROT_START 0x174#define INTF_MUX 0x25C +#define INTF_STATUS 0x26C#define INTF_CFG_ACTIVE_H_EN BIT(29)#define INTF_CFG_ACTIVE_V_EN BIT(30)
@@ -292,8 +293,13 @@ static void dpu_hw_intf_get_status( struct intf_status *s) {struct dpu_hw_blk_reg_map *c = &intf->hw; +unsigned long cap = intf->cap->features; + +if (cap &BIT (DPU_INTF_STATUS_SUPPORTED )) + s->is_en =DPU_REG_READ (c,INTF_STATUS ) &BIT (0 ); +else + s->is_en =DPU_REG_READ (c,INTF_TIMING_ENGINE_EN ); - s->is_en =DPU_REG_READ (c,INTF_TIMING_ENGINE_EN ); s->is_prog_fetch_en = !!(DPU_REG_READ (c,INTF_CONFIG ) &BIT (31 ));if (s->is_en) { s->frame_count =DPU_REG_READ (c,INTF_FRAME_COUNT );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 208/431 drm/msm/dpu: Set DPU_DATA_HCTL_EN for in INTF_SC7180_MASK
In reply to Greg Kroah-HartmanFrom: Konrad Dybcio <[email protected]>
[ Upstream commit a7129231edf329a00e92dbd2d741f6da728a4a06 ]
DPU5 and newer targets enable this unconditionally. Move it from the SC7280 mask to the SC7180 one.
Patchwork: https://patchwork.freedesktop.org/patch/538159/
--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +5 -2
@@ -95,9 +95,12 @@#define INTF_SDM845_MASK (0)#define INTF_SC7180_MASK \ - (BIT(DPU_INTF_INPUT_CTRL) | BIT(DPU_INTF_TE) | BIT(DPU_INTF_STATUS_SUPPORTED)) + (BIT(DPU_INTF_INPUT_CTRL) | \ + BIT(DPU_INTF_TE) | \ + BIT(DPU_INTF_STATUS_SUPPORTED) | \ + BIT(DPU_DATA_HCTL_EN)) -#define INTF_SC7280_MASK INTF_SC7180_MASK | BIT(DPU_DATA_HCTL_EN) +#define INTF_SC7280_MASK (INTF_SC7180_MASK)#define IRQ_SDM845_MASK (BIT(MDP_SSPP_TOP0_INTR) | \ BIT(MDP_SSPP_TOP0_INTR2) | \
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 209/431 drm/nouveau: dispnv50: fix missing-prototypes warning
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 504e72ed3a1b1c0d4450712a42ae6070d3a05a8e ]
nv50_display_create() is declared in another header, along with a couple of declarations that are now outdated:
drivers/gpu/drm/nouveau/dispnv50/disp.c:2517:1: error: no previous prototype for 'nv50_display_create'
--- drivers/gpu/drm/nouveau/dispnv50/disp.c | 1 + drivers/gpu/drm/nouveau/nv50_display.h | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-)
drivers/gpu/drm/nouveau/dispnv50/disp.c +1 -0
@@ -64,6 +64,7 @@#include "nouveau_connector.h" #include "nouveau_encoder.h" #include "nouveau_fence.h" +#include "nv50_display.h" #include <subdev/bios/dp.h>
drivers/gpu/drm/nouveau/nv50_display.h +1 -3
@@ -31,7 +31,5 @@#include "nouveau_reg.h" int nv50_display_create (struct drm_device *); -void nv50_display_destroy (struct drm_device *); -int nv50_display_init (struct drm_device *); -void nv50_display_fini (struct drm_device *); +#endif /* __NV50_DISPLAY_H__ */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 210/431 iommu/virtio: Detach domain on endpoint release
In reply to Greg Kroah-HartmanFrom: Jean-Philippe Brucker <[email protected]>
[ Upstream commit 809d0810e3520da669d231303608cdf5fe5c1a70 ]
When an endpoint is released, for example a PCIe VF being destroyed or a function hot-unplugged, it should be detached from its domain. Send a DETACH request.
--- drivers/iommu/virtio-iommu.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)
drivers/iommu/virtio-iommu.c +24 -0
@@ -788,6 +788,29 @@ static int viommu_attach_dev(struct iommu_domain *domain, struct device *dev)return 0 ; } +static void viommu_detach_dev (struct viommu_endpoint *vdev) +{ +int i; +struct virtio_iommu_req_detach req; +struct viommu_domain *vdomain = vdev->vdomain; +struct iommu_fwspec *fwspec =dev_iommu_fwspec_get (vdev->dev); + +if (!vdomain) +return ; + + req = (struct virtio_iommu_req_detach ) { + .head.type =VIRTIO_IOMMU_T_DETACH , + .domain =cpu_to_le32 (vdomain->id), + }; + +for (i =0 ; i < fwspec->num_ids; i++) { + req.endpoint =cpu_to_le32 (fwspec->ids[i]); +WARN_ON (viommu_send_req_sync (vdev->viommu, &req,sizeof (req))); + } + vdomain->nr_endpoints--; + vdev->vdomain =NULL ; +} +static int viommu_map_pages (struct iommu_domain *domain,unsigned long iova,phys_addr_t paddr,size_t pgsize,size_t pgcount,int prot,gfp_t gfp,size_t *mapped)
@@ -990,6 +1013,7 @@ static void viommu_release_device(struct device *dev) {struct viommu_endpoint *vdev =dev_iommu_priv_get (dev); +viommu_detach_dev (vdev);iommu_put_resv_regions (dev, &vdev->resv_regions);kfree (vdev); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 211/431 iommu/virtio: Return size mapped for a detached domain
In reply to Greg Kroah-HartmanFrom: Jean-Philippe Brucker <[email protected]>
[ Upstream commit 7061b6af34686e7e2364b7240cfb061293218f2d ]
When map() is called on a detached domain, the domain does not exist in the device so we do not send a MAP request, but we do update the internal mapping tree, to be replayed on the next attach. Since this constitutes a successful iommu_map() call, return *mapped in this case too.
--- drivers/iommu/virtio-iommu.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-)
drivers/iommu/virtio-iommu.c +17 -16
@@ -833,25 +833,26 @@ static int viommu_map_pages(struct iommu_domain *domain, unsigned long iova,if (ret)return ret; - map = (struct virtio_iommu_req_map ) { - .head.type =VIRTIO_IOMMU_T_MAP , - .domain =cpu_to_le32 (vdomain->id), - .virt_start =cpu_to_le64 (iova), - .phys_start =cpu_to_le64 (paddr), - .virt_end =cpu_to_le64 (end), - .flags =cpu_to_le32 (flags), - }; - -if (!vdomain->nr_endpoints) -return 0 ; +if (vdomain->nr_endpoints) { + map = (struct virtio_iommu_req_map ) { + .head.type =VIRTIO_IOMMU_T_MAP , + .domain =cpu_to_le32 (vdomain->id), + .virt_start =cpu_to_le64 (iova), + .phys_start =cpu_to_le64 (paddr), + .virt_end =cpu_to_le64 (end), + .flags =cpu_to_le32 (flags), + }; - ret =viommu_send_req_sync (vdomain->viommu, &map,sizeof (map)); -if (ret) -viommu_del_mappings (vdomain, iova, end); -else if (mapped) + ret =viommu_send_req_sync (vdomain->viommu, &map,sizeof (map)); +if (ret) { +viommu_del_mappings (vdomain, iova, end); +return ret; + } + } +if (mapped) *mapped = size; -return ret; +return 0 ; } static size_t viommu_unmap_pages(struct iommu_domain *domain, unsigned long iova,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 212/431 clk: renesas: rzg2l: Fix CPG_SIPLL5_CLK1 register write
In reply to Greg Kroah-HartmanFrom: Biju Das <[email protected]>
[ Upstream commit d1c20885d3b01e6a62e920af4b227abd294d22f3 ]
As per the RZ/G2L HW(Rev.1.30 May2023) manual, there are no "write enable" bits in the CPG_SIPLL5_CLK1 register. So fix the CPG_SIPLL5_CLK register write by removing the "write enable" bits.
--- drivers/clk/renesas/rzg2l-cpg.c | 6 ++---- drivers/clk/renesas/rzg2l-cpg.h | 3 --- 2 files changed, 2 insertions(+), 7 deletions(-)
drivers/clk/renesas/rzg2l-cpg.c +2 -4
@@ -603,10 +603,8 @@ static int rzg2l_cpg_sipll5_set_rate(struct clk_hw *hw, }/* Output clock setting 1 */ -writel (CPG_SIPLL5_CLK1_POSTDIV1_WEN |CPG_SIPLL5_CLK1_POSTDIV2_WEN | -CPG_SIPLL5_CLK1_REFDIV_WEN | (params.pl5_postdiv1 <<0 ) | - (params.pl5_postdiv2 <<4 ) | (params.pl5_refdiv <<8 ), - priv->base +CPG_SIPLL5_CLK1 ); +writel ((params.pl5_postdiv1 <<0 ) | (params.pl5_postdiv2 <<4 ) | + (params.pl5_refdiv <<8 ), priv->base +CPG_SIPLL5_CLK1 );/* Output clock setting, SSCG modulation value setting 3 */ writel ((params.pl5_fracin <<8 ), priv->base +CPG_SIPLL5_CLK3 );
drivers/clk/renesas/rzg2l-cpg.h +0 -3
@@ -32,9 +32,6 @@#define CPG_SIPLL5_STBY_RESETB_WEN BIT(16)#define CPG_SIPLL5_STBY_SSCG_EN_WEN BIT(18)#define CPG_SIPLL5_STBY_DOWNSPREAD_WEN BIT(20) -#define CPG_SIPLL5_CLK1_POSTDIV1_WEN BIT(16) -#define CPG_SIPLL5_CLK1_POSTDIV2_WEN BIT(20) -#define CPG_SIPLL5_CLK1_REFDIV_WEN BIT(24)#define CPG_SIPLL5_CLK4_RESV_LSB (0xFF)#define CPG_SIPLL5_MON_PLL5_LOCK BIT(4)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 213/431 ARM: dts: gta04: Move model property out of pinctrl node
In reply to Greg Kroah-HartmanFrom: Tony Lindgren <[email protected]>
[ Upstream commit 4ffec92e70ac5097b9f67ec154065305b16a3b46 ]
The model property should be at the top level, let's move it out of the pinctrl node.
--- arch/arm/boot/dts/omap3-gta04a5one.dts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm/boot/dts/omap3-gta04a5one.dts +3 -1
@@ -5,9 +5,11 @@ #include "omap3-gta04a5.dts" -&omap3_pmx_core { +/ { model = "Goldelico GTA04A5/Letux 2804 with OneNAND"; +}; +&omap3_pmx_core { gpmc_pins: pinmux_gpmc_pins { pinctrl-single,pins = <
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 214/431 drm/bridge: anx7625: Prevent endless probe loop
In reply to Greg Kroah-HartmanFrom: Nícolas F. R. A. Prado <[email protected]>
[ Upstream commit 1464e48d69ab7a50a377c9d39f5e5eb3cee2722e ]
During probe, the driver registers i2c dummy devices and populates the aux bus, which registers a device for the panel. After doing that, the driver can still defer probe if needed. This ordering of operations is troublesome however, because the deferred probe work will retry probing all pending devices every time a new device is registered. Therefore, if modules need to be loaded in order to satisfy the dependencies for this driver to complete probe, the kernel will stall, since it'll keep trying to probe the anx7625 driver, but never succeed, given that modules would only be loaded after the deferred probe work completes.
Two changes are required to avoid this issue:
* Move of_find_mipi_dsi_host_by_node(), which can defer probe, to before anx7625_register_i2c_dummy_clients() and devm_of_dp_aux_populate_ep_devices(), which register devices.
* Make use of the done_probing callback when populating the aux bus, so that the bridge registration is only done after the panel is probed. This is required because the panel might need to defer probe, but the aux bus population needs the i2c dummy devices working, so this call couldn't just be moved to an earlier point in probe. One caveat is that if the panel is described outside the aux bus, the probe loop issue can still happen, but we don't have a way to avoid it in that case since there's no callback available.
With this patch applied, it's possible to boot on
mt8192-asurada-spherion with
CONFIG_DRM_ANALOGIX_ANX7625=yCONFIG_MTK_MMSYS=mCONFIG_BACKLIGHT_PWM=y
and also with
CONFIG_DRM_ANALOGIX_ANX7625=yCONFIG_MTK_MMSYS=yCONFIG_BACKLIGHT_PWM=m
--- drivers/gpu/drm/bridge/analogix/anx7625.c | 128 +++++++++++++++------- 1 file changed, 88 insertions(+), 40 deletions(-)
drivers/gpu/drm/bridge/analogix/anx7625.c +88 -40
@@ -1687,6 +1687,14 @@ static int anx7625_parse_dt(struct device *dev,if (of_property_read_bool (np,"analogix,audio-enable" )) pdata->audio_en =1 ; +return 0 ; +} + +static int anx7625_parse_dt_panel (struct device *dev, +struct anx7625_platform_data *pdata) +{ +struct device_node *np = dev->of_node; + pdata->panel_bridge =devm_drm_of_get_bridge (dev, np,1 ,0 );if (IS_ERR (pdata->panel_bridge)) {if (PTR_ERR (pdata->panel_bridge) == -ENODEV ) {
@@ -2032,7 +2040,7 @@ static int anx7625_register_audio(struct device *dev, struct anx7625_data *ctx)return 0 ; } -static int anx7625_attach_dsi (struct anx7625_data *ctx) +static int anx7625_setup_dsi_device (struct anx7625_data *ctx) {struct mipi_dsi_device *dsi;struct device *dev = &ctx->client->dev;
@@ -2042,9 +2050,6 @@ static int anx7625_attach_dsi(struct anx7625_data *ctx) .channel = 0, .node = NULL, }; -int ret; - -DRM_DEV_DEBUG_DRIVER (dev,"attach dsi\n" ); host =of_find_mipi_dsi_host_by_node (ctx->pdata.mipi_host_node);if (!host) {
@@ -2065,14 +2070,24 @@ static int anx7625_attach_dsi(struct anx7625_data *ctx)MIPI_DSI_MODE_VIDEO_HSE |MIPI_DSI_HS_PKT_END_ALIGNED ; - ret =devm_mipi_dsi_attach (dev, dsi); + ctx->dsi = dsi; + +return 0 ; +} + +static int anx7625_attach_dsi (struct anx7625_data *ctx) +{ +struct device *dev = &ctx->client->dev; +int ret; + +DRM_DEV_DEBUG_DRIVER (dev,"attach dsi\n" ); + + ret =devm_mipi_dsi_attach (dev, ctx->dsi);if (ret) {DRM_DEV_ERROR (dev,"fail to attach dsi to host.\n" );return ret; } - ctx->dsi = dsi; -DRM_DEV_DEBUG_DRIVER (dev,"attach dsi succeeded.\n" );return 0 ;
@@ -2560,6 +2575,40 @@ static void anx7625_runtime_disable(void *data)pm_runtime_disable (data); } +static int anx7625_link_bridge (struct drm_dp_aux *aux) +{ + struct anx7625_data *platform = container_of(aux, struct anx7625_data, aux); +struct device *dev = aux->dev; +int ret; + + ret =anx7625_parse_dt_panel (dev, &platform->pdata); +if (ret) { +DRM_DEV_ERROR (dev,"fail to parse DT for panel : %d\n" , ret); +return ret; + } + + platform->bridge.funcs = &anx7625_bridge_funcs; + platform->bridge.of_node = dev->of_node; +if (!anx7625_of_panel_on_aux_bus (dev)) + platform->bridge.ops |=DRM_BRIDGE_OP_EDID ; +if (!platform->pdata.panel_bridge) + platform->bridge.ops |=DRM_BRIDGE_OP_HPD | +DRM_BRIDGE_OP_DETECT ; + platform->bridge.type = platform->pdata.panel_bridge ? + DRM_MODE_CONNECTOR_eDP : + DRM_MODE_CONNECTOR_DisplayPort; + +drm_bridge_add (&platform->bridge); + +if (!platform->pdata.is_dpi) { + ret =anx7625_attach_dsi (platform); +if (ret) +drm_bridge_remove (&platform->bridge); + } + +return ret; +} +static int anx7625_i2c_probe (struct i2c_client *client) {struct anx7625_data *platform;
@@ -2634,6 +2683,24 @@ static int anx7625_i2c_probe(struct i2c_client *client) platform->aux.wait_hpd_asserted = anx7625_wait_hpd_asserted;drm_dp_aux_init (&platform->aux); + ret =anx7625_parse_dt (dev, pdata); +if (ret) { +if (ret != -EPROBE_DEFER ) +DRM_DEV_ERROR (dev,"fail to parse DT : %d\n" , ret); + goto free_wq; + } + +if (!platform->pdata.is_dpi) { + ret =anx7625_setup_dsi_device (platform); +if (ret <0 ) + goto free_wq; + } + +/* +* Registering the i2c devices will retrigger deferred probe, so it +* needs to be done after calls that might return EPROBE_DEFER, +* otherwise we can get an infinite loop. +*/ if (anx7625_register_i2c_dummy_clients (platform, client) !=0 ) { ret = -ENOMEM ;DRM_DEV_ERROR (dev,"fail to reserve I2C bus.\n" );
@@ -2648,13 +2715,21 @@ static int anx7625_i2c_probe(struct i2c_client *client)if (ret) goto free_wq; -devm_of_dp_aux_populate_ep_devices (&platform->aux); - - ret =anx7625_parse_dt (dev, pdata); +/* +* Populating the aux bus will retrigger deferred probe, so it needs to +* be done after calls that might return EPROBE_DEFER, otherwise we can +* get an infinite loop. +*/ + ret =devm_of_dp_aux_populate_bus (&platform->aux, anx7625_link_bridge);if (ret) { -if (ret != -EPROBE_DEFER ) -DRM_DEV_ERROR (dev,"fail to parse DT : %d\n" , ret); - goto free_wq; +if (ret != -ENODEV ) { +DRM_DEV_ERROR (dev,"failed to populate aux bus : %d\n" , ret); + goto free_wq; + } + + ret =anx7625_link_bridge (&platform->aux); +if (ret) + goto free_wq; }if (!platform->pdata.low_power_mode) {
@@ -2667,27 +2742,6 @@ static int anx7625_i2c_probe(struct i2c_client *client)if (platform->pdata.intp_irq)queue_work (platform->workqueue, &platform->work); - platform->bridge.funcs = &anx7625_bridge_funcs; - platform->bridge.of_node = client->dev.of_node; -if (!anx7625_of_panel_on_aux_bus (&client->dev)) - platform->bridge.ops |=DRM_BRIDGE_OP_EDID ; -if (!platform->pdata.panel_bridge) - platform->bridge.ops |=DRM_BRIDGE_OP_HPD | -DRM_BRIDGE_OP_DETECT ; - platform->bridge.type = platform->pdata.panel_bridge ? - DRM_MODE_CONNECTOR_eDP : - DRM_MODE_CONNECTOR_DisplayPort; - -drm_bridge_add (&platform->bridge); - -if (!platform->pdata.is_dpi) { - ret =anx7625_attach_dsi (platform); -if (ret) { -DRM_DEV_ERROR (dev,"Fail to attach to dsi : %d\n" , ret); - goto unregister_bridge; - } - } -if (platform->pdata.audio_en)anx7625_register_audio (dev, platform);
@@ -2695,12 +2749,6 @@ static int anx7625_i2c_probe(struct i2c_client *client)return 0 ; -unregister_bridge: -drm_bridge_remove (&platform->bridge); - -if (!platform->pdata.low_power_mode) -pm_runtime_put_sync_suspend (&client->dev); - free_wq:if (platform->workqueue)destroy_workqueue (platform->workqueue);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 215/431 ARM/mfd/gpio: Fixup TPS65010 regression on OMAP1 OSK1
In reply to Greg Kroah-HartmanFrom: Linus Walleij <[email protected]>
[ Upstream commit c32c81f3dbdfd68f6ab20a29ad86f811aed36e4e ]
Aaro reports problems on the OSK1 board after we altered the dynamic base for GPIO allocations.
It appears this happens because the OMAP driver now allocates GPIO numbers dynamically, so all that is references by number is a bit up in the air.
Let's bite the bullet and try to just move the gpio_chip in the tps65010 MFD driver over to using dynamic allocations. Alter everything in the OSK1 board file to use a GPIO descriptor table and lookups.
Utilize the NULL device to define some board-specific GPIO lookups and use these to immediately look up the same GPIOs, convert to IRQ numbers and pass as resources to the devices. This is ugly but should work.
The .setup() callback for tps65010 was used for some GPIO hogging, but since the OSK1 is the only user in the entire kernel we can alter the signatures to something that is helpful and make a clean transition.
--- arch/arm/mach-omap1/board-osk.c | 139 ++++++++++++++++++++++---------- drivers/mfd/tps65010.c | 14 ++-- include/linux/mfd/tps65010.h | 11 +-- 3 files changed, 104 insertions(+), 60 deletions(-)
arch/arm/mach-omap1/board-osk.c +95 -44
@@ -25,7 +25,8 @@* with this program; if not, write to the Free Software Foundation, Inc., * 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> +#include <linux/gpio/driver.h> #include <linux/gpio/machine.h> #include <linux/kernel.h> #include <linux/init.h>
@@ -64,13 +65,12 @@/* TPS65010 has four GPIOs. nPG and LED2 can be treated like GPIOs with * alternate pin configurations for hardware-controlled blinking. */ -#define OSK_TPS_GPIO_BASE (OMAP_MAX_GPIO_LINES + 16 /* MPUIO */) -# define OSK_TPS_GPIO_USB_PWR_EN (OSK_TPS_GPIO_BASE + 0) -# define OSK_TPS_GPIO_LED_D3 (OSK_TPS_GPIO_BASE + 1) -# define OSK_TPS_GPIO_LAN_RESET (OSK_TPS_GPIO_BASE + 2) -# define OSK_TPS_GPIO_DSP_PWR_EN (OSK_TPS_GPIO_BASE + 3) -# define OSK_TPS_GPIO_LED_D9 (OSK_TPS_GPIO_BASE + 4) -# define OSK_TPS_GPIO_LED_D2 (OSK_TPS_GPIO_BASE + 5) +#define OSK_TPS_GPIO_USB_PWR_EN 0 +#define OSK_TPS_GPIO_LED_D3 1 +#define OSK_TPS_GPIO_LAN_RESET 2 +#define OSK_TPS_GPIO_DSP_PWR_EN 3 +#define OSK_TPS_GPIO_LED_D9 4 +#define OSK_TPS_GPIO_LED_D2 5static struct mtd_partition osk_partitions[] = {/* bootloader (U-Boot, etc) in first sector */
@@ -174,11 +174,20 @@ static const struct gpio_led tps_leds[] = {/* NOTE: D9 and D2 have hardware blink support. * Also, D9 requires non-battery power. */ - { .gpio = OSK_TPS_GPIO_LED_D9, .name = "d9", - .default_trigger = "disk-activity", }, - { .gpio = OSK_TPS_GPIO_LED_D2, .name = "d2", }, - { .gpio = OSK_TPS_GPIO_LED_D3, .name = "d3", .active_low = 1, - .default_trigger = "heartbeat", }, + { .name = "d9", .default_trigger = "disk-activity", }, + { .name = "d2", }, + { .name = "d3", .default_trigger = "heartbeat", }, +}; + +static struct gpiod_lookup_table tps_leds_gpio_table = { + .dev_id = "leds-gpio", + .table = { + /* Use local offsets on TPS65010 */ + GPIO_LOOKUP_IDX("tps65010", OSK_TPS_GPIO_LED_D9, NULL, 0, GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("tps65010", OSK_TPS_GPIO_LED_D2, NULL, 1, GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("tps65010", OSK_TPS_GPIO_LED_D3, NULL, 2, GPIO_ACTIVE_LOW), + { } + }, }; static struct gpio_led_platform_data tps_leds_data = {
@@ -192,29 +201,34 @@ static struct platform_device osk5912_tps_leds = { .dev.platform_data = &tps_leds_data, }; -static int osk_tps_setup (struct i2c_client *client,void *context) +/* The board just hold these GPIOs hogged from setup to teardown */ +static struct gpio_desc *eth_reset; +static struct gpio_desc *vdd_dsp; + +static int osk_tps_setup (struct i2c_client *client,struct gpio_chip *gc) { +struct gpio_desc *d;if (!IS_BUILTIN (CONFIG_TPS65010 ))return -ENOSYS ;/* Set GPIO 1 HIGH to disable VBUS power supply; * OHCI driver powers it up/down as needed. */ -gpio_request (OSK_TPS_GPIO_USB_PWR_EN ,"n_vbus_en" ); -gpio_direction_output (OSK_TPS_GPIO_USB_PWR_EN ,1 ); + d =gpiochip_request_own_desc (gc,OSK_TPS_GPIO_USB_PWR_EN ,"n_vbus_en" , +GPIO_ACTIVE_HIGH ,GPIOD_OUT_HIGH );/* Free the GPIO again as the driver will request it */ -gpio_free (OSK_TPS_GPIO_USB_PWR_EN ); +gpiochip_free_own_desc (d);/* Set GPIO 2 high so LED D3 is off by default */ tps65010_set_gpio_out_value (GPIO2 ,HIGH );/* Set GPIO 3 low to take ethernet out of reset */ -gpio_request (OSK_TPS_GPIO_LAN_RESET ,"smc_reset" ); -gpio_direction_output (OSK_TPS_GPIO_LAN_RESET ,0 ); + eth_reset =gpiochip_request_own_desc (gc,OSK_TPS_GPIO_LAN_RESET ,"smc_reset" , +GPIO_ACTIVE_HIGH ,GPIOD_OUT_LOW );/* GPIO4 is VDD_DSP */ -gpio_request (OSK_TPS_GPIO_DSP_PWR_EN ,"dsp_power" ); -gpio_direction_output (OSK_TPS_GPIO_DSP_PWR_EN ,1 ); + vdd_dsp =gpiochip_request_own_desc (gc,OSK_TPS_GPIO_DSP_PWR_EN ,"dsp_power" , +GPIO_ACTIVE_HIGH ,GPIOD_OUT_HIGH );/* REVISIT if DSP support isn't configured, power it off ... */ /* Let LED1 (D9) blink; leds-gpio may override it */
@@ -232,15 +246,22 @@ static int osk_tps_setup(struct i2c_client *client, void *context)/* register these three LEDs */ osk5912_tps_leds.dev.parent = &client->dev; +gpiod_add_lookup_table (&tps_leds_gpio_table);platform_device_register (&osk5912_tps_leds);return 0 ; } +static void osk_tps_teardown (struct i2c_client *client,struct gpio_chip *gc) +{ +gpiochip_free_own_desc (eth_reset); +gpiochip_free_own_desc (vdd_dsp); +} +static struct tps65010_board tps_board = { - .base =OSK_TPS_GPIO_BASE , .outmask =0x0f , .setup = osk_tps_setup, + .teardown = osk_tps_teardown, };static struct i2c_board_info __initdata osk_i2c_board_info[] = {
@@ -263,11 +284,6 @@ static void __init osk_init_smc91x(void) {u32 l; -if ((gpio_request (0 ,"smc_irq" )) <0 ) { -printk ("Error requesting gpio 0 for smc91x irq\n" ); -return ; - } -/* Check EMIFS wait states to fix errors with SMC_GET_PKT_HDR */ l =omap_readl (EMIFS_CCS (1 )); l |=0x3 ;
@@ -279,10 +295,6 @@ static void __init osk_init_cf(int seg)struct resource *res = &osk5912_cf_resources[1 ];omap_cfg_reg (M7_1610_GPIO62 ); -if ((gpio_request (62 ,"cf_irq" )) <0 ) { -printk ("Error requesting gpio 62 for CF irq\n" ); -return ; - }switch (seg) {/* NOTE: CS0 could be configured too ... */
@@ -308,18 +320,17 @@ static void __init osk_init_cf(int seg) seg, omap_readl(EMIFS_CCS(seg)), omap_readl(EMIFS_ACS(seg)));omap_writel (0x0004a1b3 ,EMIFS_CCS (seg));/* synch mode 4 etc */ omap_writel (0x00000000 ,EMIFS_ACS (seg));/* OE hold/setup */ - -/* the CF I/O IRQ is really active-low */ -irq_set_irq_type (gpio_to_irq (62 ),IRQ_TYPE_EDGE_FALLING ); }static struct gpiod_lookup_table osk_usb_gpio_table = { .dev_id ="ohci" , .table = {/* Power GPIO on the I2C-attached TPS65010 */ -GPIO_LOOKUP ("tps65010" ,0 ,"power" ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP ("tps65010" ,OSK_TPS_GPIO_USB_PWR_EN ,"power" , +GPIO_ACTIVE_HIGH ),GPIO_LOOKUP (OMAP_GPIO_LABEL ,9 ,"overcurrent" ,GPIO_ACTIVE_HIGH ), + { } }, };
@@ -341,8 +352,25 @@ static struct omap_usb_config osk_usb_config __initdata = {#define EMIFS_CS3_VAL (0x88013141) +static struct gpiod_lookup_table osk_irq_gpio_table = { + .dev_id =NULL , + .table = { +/* GPIO used for SMC91x IRQ */ +GPIO_LOOKUP (OMAP_GPIO_LABEL ,0 ,"smc_irq" , +GPIO_ACTIVE_HIGH ), +/* GPIO used for CF IRQ */ +GPIO_LOOKUP ("gpio-48-63" ,14 ,"cf_irq" , +GPIO_ACTIVE_HIGH ), +/* GPIO used by the TPS65010 chip */ +GPIO_LOOKUP ("mpuio" ,1 ,"tps65010" , +GPIO_ACTIVE_HIGH ), + { } + }, +}; +static void __init osk_init (void ) { +struct gpio_desc *d;u32 l;osk_init_smc91x ();
@@ -359,10 +387,31 @@ static void __init osk_init(void) osk_flash_resource.end = osk_flash_resource.start =omap_cs3_phys (); osk_flash_resource.end +=SZ_32M -1 ; - osk5912_smc91x_resources[1 ].start =gpio_to_irq (0 ); - osk5912_smc91x_resources[1 ].end =gpio_to_irq (0 ); - osk5912_cf_resources[0 ].start =gpio_to_irq (62 ); - osk5912_cf_resources[0 ].end =gpio_to_irq (62 ); + +/* +* Add the GPIOs to be used as IRQs and immediately look them up +* to be passed as an IRQ resource. This is ugly but should work +* until the day we convert to device tree. +*/ +gpiod_add_lookup_table (&osk_irq_gpio_table); + + d =gpiod_get (NULL ,"smc_irq" ,GPIOD_IN ); +if (IS_ERR (d)) { +pr_err ("Unable to get SMC IRQ GPIO descriptor\n" ); + }else { +irq_set_irq_type (gpiod_to_irq (d),IRQ_TYPE_EDGE_RISING ); + osk5912_smc91x_resources[1 ] =DEFINE_RES_IRQ (gpiod_to_irq (d)); + } + + d =gpiod_get (NULL ,"cf_irq" ,GPIOD_IN ); +if (IS_ERR (d)) { +pr_err ("Unable to get CF IRQ GPIO descriptor\n" ); + }else { +/* the CF I/O IRQ is really active-low */ +irq_set_irq_type (gpiod_to_irq (d),IRQ_TYPE_EDGE_FALLING ); + osk5912_cf_resources[0 ] =DEFINE_RES_IRQ (gpiod_to_irq (d)); + } +platform_add_devices (osk5912_devices,ARRAY_SIZE (osk5912_devices)); l =omap_readl (USB_TRANSCEIVER_CTRL );
@@ -372,13 +421,15 @@ static void __init osk_init(void)gpiod_add_lookup_table (&osk_usb_gpio_table);omap1_usb_init (&osk_usb_config); +omap_serial_init (); +/* irq for tps65010 chip */ /* bootloader effectively does: omap_cfg_reg(U19_1610_MPUIO1); */ -if (gpio_request (OMAP_MPUIO (1 ),"tps65010" ) ==0 ) -gpio_direction_input (OMAP_MPUIO (1 )); - -omap_serial_init (); - osk_i2c_board_info[0 ].irq =gpio_to_irq (OMAP_MPUIO (1 )); + d =gpiod_get (NULL ,"tps65010" ,GPIOD_IN ); +if (IS_ERR (d)) +pr_err ("Unable to get TPS65010 IRQ GPIO descriptor\n" ); +else + osk_i2c_board_info[0 ].irq =gpiod_to_irq (d);omap_register_i2c_bus (1 ,400 , osk_i2c_board_info,ARRAY_SIZE (osk_i2c_board_info)); }
drivers/mfd/tps65010.c +5 -9
@@ -506,12 +506,8 @@ static void tps65010_remove(struct i2c_client *client)struct tps65010 *tps =i2c_get_clientdata (client);struct tps65010_board *board =dev_get_platdata (&client->dev); -if (board && board->teardown) { -int status = board->teardown (client, board->context); -if (status <0 ) -dev_dbg (&client->dev,"board %s %s err %d\n" , -"teardown" , client->name, status); - } +if (board && board->teardown) + board->teardown (client, &tps->chip);if (client->irq >0 )free_irq (client->irq, tps);cancel_delayed_work_sync (&tps->work);
@@ -619,7 +615,7 @@ static int tps65010_probe(struct i2c_client *client) tps, DEBUG_FOPS);/* optionally register GPIOs */ -if (board && board->base !=0 ) { +if (board) { tps->outmask = board->outmask; tps->chip.label = client->name;
@@ -632,7 +628,7 @@ static int tps65010_probe(struct i2c_client *client)/* NOTE: only partial support for inputs; nyet IRQs */ tps->chip.get = tps65010_gpio_get; - tps->chip.base = board->base; + tps->chip.base =-1 ; tps->chip.ngpio =7 ; tps->chip.can_sleep =1 ;
@@ -641,7 +637,7 @@ static int tps65010_probe(struct i2c_client *client)dev_err (&client->dev,"can't add gpiochip, err %d\n" , status); else if (board->setup) { - status = board->setup (client, board->context); + status = board->setup (client, &tps->chip);if (status <0 ) { dev_dbg(&client->dev, "board %s %s err %d\n",
include/linux/mfd/tps65010.h +4 -7
@@ -28,6 +28,8 @@#ifndef __LINUX_I2C_TPS65010_H#define __LINUX_I2C_TPS65010_H +struct gpio_chip ; +/* * ---------------------------------------------------------------------------- * Registers, all 8 bits
@@ -176,12 +178,10 @@ struct i2c_client;/** * struct tps65010_board - packages GPIO and LED lines -* @base: the GPIO number to assign to GPIO-1 * @outmask: bit (N-1) is set to allow GPIO-N to be used as an * (open drain) output * @setup: optional callback issued once the GPIOs are valid * @teardown: optional callback issued before the GPIOs are invalidated -* @context: optional parameter passed to setup() and teardown() * * Board data may be used to package the GPIO (and LED) lines for use * in by the generic GPIO and LED frameworks. The first four GPIOs
@@ -193,12 +193,9 @@ struct i2c_client;* devices in their initial states using these GPIOs. */ struct tps65010_board { -int base;unsigned outmask; - -int (*setup)(struct i2c_client *client,void *context); -int (*teardown)(struct i2c_client *client,void *context); -void *context; +int (*setup)(struct i2c_client *client,struct gpio_chip *gc); +void (*teardown)(struct i2c_client *client,struct gpio_chip *gc); };#endif /* __LINUX_I2C_TPS65010_H */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 216/431 ARM: omap1: Drop header on AMS Delta
In reply to Greg Kroah-HartmanFrom: Linus Walleij <[email protected]>
[ Upstream commit fa1ae0cd897b089b5cc05ab471518ad13db2d567 ]
The AMS Delta board uses GPIO descriptors exclusively and does not have any dependencies on the legacy <linux/gpio.h> header, so just drop it.
--- arch/arm/mach-omap1/board-ams-delta.c | 1 - 1 file changed, 1 deletion(-)
arch/arm/mach-omap1/board-ams-delta.c +0 -1
@@ -11,7 +11,6 @@#include <linux/gpio/driver.h> #include <linux/gpio/machine.h> #include <linux/gpio/consumer.h> -#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/input.h>
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 217/431 ARM: omap1: Remove reliance on GPIO numbers from PalmTE
In reply to Greg Kroah-HartmanFrom: Linus Walleij <[email protected]>
[ Upstream commit 4c40db6249ff1da335b276bdd6c3c3462efbc2ab ]
It appears this happens because the OMAP driver now allocates GPIO numbers dynamically, so all that is references by number is a bit up in the air.
Utilize the NULL device to define some board-specific GPIO lookups and use these to immediately look up the same GPIOs, convert to IRQ numbers and pass as resources to the devices. This is ugly but should work.
--- arch/arm/mach-omap1/board-palmte.c | 51 ++++++++++++++++++------------ 1 file changed, 31 insertions(+), 20 deletions(-)
arch/arm/mach-omap1/board-palmte.c +31 -20
@@ -13,7 +13,8 @@* * Copyright (c) 2006 Andrzej Zaborowski <[email protected]> */ -#include <linux/gpio.h> +#include <linux/gpio/machine.h> +#include <linux/gpio/consumer.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/input.h>
@@ -187,23 +188,6 @@ static struct spi_board_info palmte_spi_info[] __initdata = { }, }; -static void __init palmte_misc_gpio_setup (void ) -{ -/* Set TSC2102 PINTDAV pin as input (used by TSC2102 driver) */ -if (gpio_request (PALMTE_PINTDAV_GPIO ,"TSC2102 PINTDAV" ) <0 ) { -printk (KERN_ERR "Could not reserve PINTDAV GPIO!\n" ); -return ; - } -gpio_direction_input (PALMTE_PINTDAV_GPIO ); - -/* Set USB-or-DC-IN pin as input (unused) */ -if (gpio_request (PALMTE_USB_OR_DC_GPIO ,"USB/DC-IN" ) <0 ) { -printk (KERN_ERR "Could not reserve cable signal GPIO!\n" ); -return ; - } -gpio_direction_input (PALMTE_USB_OR_DC_GPIO ); -} -#if IS_ENABLED (CONFIG_MMC_OMAP ) static struct omap_mmc_platform_data _palmte_mmc_config = {
@@ -231,8 +215,23 @@ static void palmte_mmc_init(void)#endif /* CONFIG_MMC_OMAP */ +static struct gpiod_lookup_table palmte_irq_gpio_table = { + .dev_id =NULL , + .table = { +/* GPIO used for TSC2102 PINTDAV IRQ */ +GPIO_LOOKUP ("gpio-0-15" ,PALMTE_PINTDAV_GPIO ,"tsc2102_irq" , +GPIO_ACTIVE_HIGH ), +/* GPIO used for USB or DC input detection */ +GPIO_LOOKUP ("gpio-0-15" ,PALMTE_USB_OR_DC_GPIO ,"usb_dc_irq" , +GPIO_ACTIVE_HIGH ), + { } + }, +}; +static void __init omap_palmte_init (void ) { +struct gpio_desc *d; +/* mux pins for uarts */ omap_cfg_reg (UART1_TX );omap_cfg_reg (UART1_RTS );
@@ -243,9 +242,21 @@ static void __init omap_palmte_init(void)platform_add_devices (palmte_devices,ARRAY_SIZE (palmte_devices)); - palmte_spi_info[0 ].irq =gpio_to_irq (PALMTE_PINTDAV_GPIO ); +gpiod_add_lookup_table (&palmte_irq_gpio_table); + d =gpiod_get (NULL ,"tsc2102_irq" ,GPIOD_IN ); +if (IS_ERR (d)) +pr_err ("Unable to get TSC2102 IRQ GPIO descriptor\n" ); +else + palmte_spi_info[0 ].irq =gpiod_to_irq (d);spi_register_board_info (palmte_spi_info,ARRAY_SIZE (palmte_spi_info)); -palmte_misc_gpio_setup (); + +/* We are getting this just to set it up as input */ + d =gpiod_get (NULL ,"usb_dc_irq" ,GPIOD_IN ); +if (IS_ERR (d)) +pr_err ("Unable to get USB/DC IRQ GPIO descriptor\n" ); +else +gpiod_put (d); +omap_serial_init ();omap1_usb_init (&palmte_usb_config);omap_register_i2c_bus (1 ,100 ,NULL ,0 );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 218/431 ARM: omap1: Remove reliance on GPIO numbers from SX1
In reply to Greg Kroah-HartmanFrom: Linus Walleij <[email protected]>
[ Upstream commit 480c82daa3e41873421dc2c9e2918ad7e21d7a0b ]
It appears this happens because the OMAP driver now allocates GPIO numbers dynamically, so all that is references by number is a bit up in the air.
Utilize the NULL device to define some board-specific GPIO lookups and use these to immediately look up the same GPIOs, convert to IRQ numbers and pass as resources to the devices. This is ugly but should work.
--- arch/arm/mach-omap1/board-sx1.c | 40 +++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 7 deletions(-)
arch/arm/mach-omap1/board-sx1.c +33 -7
@@ -11,7 +11,8 @@* Maintainters : Vladimir Ananiev (aka Vovan888), Sergge * oslik.ru */ -#include <linux/gpio.h> +#include <linux/gpio/machine.h> +#include <linux/gpio/consumer.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/input.h>
@@ -304,8 +305,23 @@ static struct platform_device *sx1_devices[] __initdata = {/*-----------------------------------------*/ +static struct gpiod_lookup_table sx1_gpio_table = { + .dev_id =NULL , + .table = { +GPIO_LOOKUP ("gpio-0-15" ,1 ,"irda_off" , +GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP ("gpio-0-15" ,11 ,"switch" , +GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP ("gpio-0-15" ,15 ,"usb_on" , +GPIO_ACTIVE_HIGH ), + { } + }, +}; +static void __init omap_sx1_init (void ) { +struct gpio_desc *d; +/* mux pins for uarts */ omap_cfg_reg (UART1_TX );omap_cfg_reg (UART1_RTS );
@@ -320,15 +336,25 @@ static void __init omap_sx1_init(void)omap_register_i2c_bus (1 ,100 ,NULL ,0 );omap1_usb_init (&sx1_usb_config);sx1_mmc_init (); +gpiod_add_lookup_table (&sx1_gpio_table);/* turn on USB power */ /* sx1_setusbpower(1); can't do it here because i2c is not ready */ -gpio_request (1 ,"A_IRDA_OFF" ); -gpio_request (11 ,"A_SWITCH" ); -gpio_request (15 ,"A_USB_ON" ); -gpio_direction_output (1 ,1 );/*A_IRDA_OFF = 1 */ -gpio_direction_output (11 ,0 );/*A_SWITCH = 0 */ -gpio_direction_output (15 ,0 );/*A_USB_ON = 0 */ + d =gpiod_get (NULL ,"irda_off" ,GPIOD_OUT_HIGH ); +if (IS_ERR (d)) +pr_err ("Unable to get IRDA OFF GPIO descriptor\n" ); +else +gpiod_put (d); + d =gpiod_get (NULL ,"switch" ,GPIOD_OUT_LOW ); +if (IS_ERR (d)) +pr_err ("Unable to get SWITCH GPIO descriptor\n" ); +else +gpiod_put (d); + d =gpiod_get (NULL ,"usb_on" ,GPIOD_OUT_LOW ); +if (IS_ERR (d)) +pr_err ("Unable to get USB ON GPIO descriptor\n" ); +else +gpiod_put (d);omapfb_set_lcd_config (&sx1_lcd_config); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 219/431 ARM/mmc: Convert old mmci-omap to GPIO descriptors
In reply to Greg Kroah-HartmanFrom: Linus Walleij <[email protected]>
[ Upstream commit e519f0bb64efc2c9c8b67bb2d114dda458bdc34d ]
A recent change to the OMAP driver making it use a dynamic GPIO base created problems with some old OMAP1 board files, among them Nokia 770, SX1 and also the OMAP2 Nokia n8x0.
Fix up all instances of GPIOs being used for the MMC driver by pushing the handling of power, slot selection and MMC "cover" into the driver as optional GPIOs.
This is maybe not the most perfect solution as the MMC framework have some central handlers for some of the stuff, but it at least makes the situtation better and solves the immediate issue.
--- arch/arm/mach-omap1/board-nokia770.c | 43 ++++--------- arch/arm/mach-omap1/board-sx1-mmc.c | 1 - arch/arm/mach-omap2/board-n8x0.c | 85 ++++++++------------------ drivers/mmc/host/omap.c | 46 +++++++++++++- include/linux/platform_data/mmc-omap.h | 2 - 5 files changed, 83 insertions(+), 94 deletions(-)
arch/arm/mach-omap1/board-nokia770.c +13 -30
@@ -156,27 +156,23 @@ static struct omap_usb_config nokia770_usb_config __initdata = {#if IS_ENABLED (CONFIG_MMC_OMAP ) -#define NOKIA770_GPIO_MMC_POWER 41 -#define NOKIA770_GPIO_MMC_SWITCH 23 - -static int nokia770_mmc_set_power (struct device *dev,int slot,int power_on, -int vdd) -{ -gpio_set_value (NOKIA770_GPIO_MMC_POWER , power_on); -return 0 ; -} - -static int nokia770_mmc_get_cover_state (struct device *dev,int slot) -{ -return gpio_get_value (NOKIA770_GPIO_MMC_SWITCH ); -} +static struct gpiod_lookup_table nokia770_mmc_gpio_table = { + .dev_id ="mmci-omap.1" , + .table = { +/* Slot index 0, VSD power, GPIO 41 */ +GPIO_LOOKUP_IDX ("gpio-32-47" ,9 , +"vsd" ,0 ,GPIO_ACTIVE_HIGH ), +/* Slot index 0, switch, GPIO 23 */ +GPIO_LOOKUP_IDX ("gpio-16-31" ,7 , +"cover" ,0 ,GPIO_ACTIVE_HIGH ), + { } + }, +};static struct omap_mmc_platform_data nokia770_mmc2_data = { .nr_slots =1 , .max_freq =12000000 , .slots[0 ] = { - .set_power = nokia770_mmc_set_power, - .get_cover_state = nokia770_mmc_get_cover_state, .ocr_mask =MMC_VDD_32_33 |MMC_VDD_33_34 , .name ="mmcblk" , },
@@ -186,20 +182,7 @@ static struct omap_mmc_platform_data *nokia770_mmc_data[OMAP16XX_NR_MMC];static void __init nokia770_mmc_init (void ) { -int ret; - - ret =gpio_request (NOKIA770_GPIO_MMC_POWER ,"MMC power" ); -if (ret <0 ) -return ; -gpio_direction_output (NOKIA770_GPIO_MMC_POWER ,0 ); - - ret =gpio_request (NOKIA770_GPIO_MMC_SWITCH ,"MMC cover" ); -if (ret <0 ) { -gpio_free (NOKIA770_GPIO_MMC_POWER ); -return ; - } -gpio_direction_input (NOKIA770_GPIO_MMC_SWITCH ); - +gpiod_add_lookup_table (&nokia770_mmc_gpio_table);/* Only the second MMC controller is used */ nokia770_mmc_data[1 ] = &nokia770_mmc2_data;omap1_init_mmc (nokia770_mmc_data,OMAP16XX_NR_MMC );
arch/arm/mach-omap1/board-sx1-mmc.c +0 -1
@@ -9,7 +9,6 @@* Copyright (C) 2007 Instituto Nokia de Tecnologia - INdT */ -#include <linux/gpio.h> #include <linux/platform_device.h> #include "hardware.h"
arch/arm/mach-omap2/board-n8x0.c +26 -59
139 lines not on this page · raw message
drivers/mmc/host/omap.c +44 -2
94 lines not on this page · raw message
include/linux/platform_data/mmc-omap.h +0 -2
@@ -20,8 +20,6 @@ struct omap_mmc_platform_data {* maximum frequency on the MMC bus */ unsigned int max_freq; -/* switch the bus to a new slot */ -int (*switch_slot)(struct device *dev,int slot);/* initialize board-specific MMC functionality, can be NULL if * not supported */ int (*init)(struct device *dev);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 220/431 ARM: omap1: Exorcise the legacy GPIO header
In reply to Greg Kroah-HartmanFrom: Linus Walleij <[email protected]>
[ Upstream commit c729baa8604226a8f878296bd145ab4046c80b12 ]
After fixing all the offending users referencing the global GPIO numberspace in OMAP1, a few sites still remain including the legacy <linus/gpio.h> header for no reason.
Delete the last remaining users, and OMAP1 is free from legacy GPIO dependencies.
--- arch/arm/mach-omap1/devices.c | 1 - arch/arm/mach-omap1/gpio15xx.c | 1 - arch/arm/mach-omap1/gpio16xx.c | 1 - arch/arm/mach-omap1/irq.c | 1 - 4 files changed, 4 deletions(-)
arch/arm/mach-omap1/devices.c +0 -1
@@ -6,7 +6,6 @@*/ #include <linux/dma-mapping.h> -#include <linux/gpio.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h>
arch/arm/mach-omap1/gpio15xx.c +0 -1
@@ -8,7 +8,6 @@* Charulatha V <[email protected]> */ -#include <linux/gpio.h> #include <linux/platform_data/gpio-omap.h> #include <linux/soc/ti/omap1-soc.h> #include <asm/irq.h>
arch/arm/mach-omap1/gpio16xx.c +0 -1
@@ -8,7 +8,6 @@* Charulatha V <[email protected]> */ -#include <linux/gpio.h> #include <linux/platform_data/gpio-omap.h> #include <linux/soc/ti/omap1-io.h>
arch/arm/mach-omap1/irq.c +0 -1
@@ -35,7 +35,6 @@* with this program; if not, write to the Free Software Foundation, Inc., * 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <linux/gpio.h> #include <linux/init.h> #include <linux/module.h> #include <linux/sched.h>
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 221/431 ARM/musb: omap2: Remove global GPIO numbers from TUSB6010
In reply to Greg Kroah-HartmanFrom: Linus Walleij <[email protected]>
[ Upstream commit 8e0285ab95a9baf374f2c13eb152221c8ecb3f28 ]
The TUSB6010 (MUSB) device is picking up some GPIO lines hardcoded by number and passing on to the TUSB6010 device when registering it.
Instead of nasty workarounds, provide a GPIO descriptor table and then make the TUSB6010 MUSB glue driver pick up the GPIO lines directly, convert it to an IRQ and pass down to the MUSB driver. OMAP2 is the only system using the TUSB6010.
Stash the GPIO descriptors in the glue layer and use then to power up and down the TUSB6010 on-demand, instead of using boardfile callbacks.
Since the OMAP2 boards are the only boards using the .set_power() and .board_set_power() callbacks, we can just delete them as the power is now handled directly in the TUSB6010 glue code.
--- arch/arm/mach-omap2/board-n8x0.c | 71 ++++++++---------------------- arch/arm/mach-omap2/usb-tusb6010.c | 20 ++------- arch/arm/mach-omap2/usb-tusb6010.h | 12 +++++ drivers/usb/musb/musb_core.c | 1 - drivers/usb/musb/musb_core.h | 2 - drivers/usb/musb/tusb6010.c | 53 ++++++++++++++++------ include/linux/usb/musb.h | 13 ------ 7 files changed, 73 insertions(+), 99 deletions(-) create mode 100644 arch/arm/mach-omap2/usb-tusb6010.h
arch/arm/mach-omap2/board-n8x0.c +18 -53
@@ -10,8 +10,8 @@#include <linux/clk.h> #include <linux/delay.h> -#include <linux/gpio.h> #include <linux/gpio/machine.h> +#include <linux/gpio/consumer.h> #include <linux/init.h> #include <linux/io.h> #include <linux/irq.h>
@@ -29,13 +29,12 @@#include "common.h" #include "mmc.h" +#include "usb-tusb6010.h" #include "soc.h" #include "common-board-devices.h" #define TUSB6010_ASYNC_CS 1#define TUSB6010_SYNC_CS 4 -#define TUSB6010_GPIO_INT 58 -#define TUSB6010_GPIO_ENABLE 0#define TUSB6010_DMACHAN 0x3f#define NOKIA_N810_WIMAX (1 << 2)
@@ -62,37 +61,6 @@ static void board_check_revision(void) }#if IS_ENABLED (CONFIG_USB_MUSB_TUSB6010 ) -/* -* Enable or disable power to TUSB6010. When enabling, turn on 3.3 V and -* 1.5 V voltage regulators of PM companion chip. Companion chip will then -* provide then PGOOD signal to TUSB6010 which will release it from reset. -*/ -static int tusb_set_power (int state) -{ -int i, retval =0 ; - -if (state) { -gpio_set_value (TUSB6010_GPIO_ENABLE ,1 ); -msleep (1 ); - -/* Wait until TUSB6010 pulls INT pin down */ - i =100 ; -while (i &&gpio_get_value (TUSB6010_GPIO_INT )) { -msleep (1 ); - i--; - } - -if (!i) { -printk (KERN_ERR "tusb: powerup failed\n" ); - retval = -ENODEV ; - } - }else { -gpio_set_value (TUSB6010_GPIO_ENABLE ,0 ); -msleep (10 ); - } - -return retval; -}static struct musb_hdrc_config musb_config = { .multipoint = 1,
@@ -103,39 +71,36 @@ static struct musb_hdrc_config musb_config = {static struct musb_hdrc_platform_data tusb_data = { .mode =MUSB_OTG , - .set_power = tusb_set_power, .min_power =25 ,/* x2 = 50 mA drawn from VBUS as peripheral */ .power =100 ,/* Max 100 mA VBUS for host mode */ .config = &musb_config, }; +static struct gpiod_lookup_table tusb_gpio_table = { + .dev_id ="musb-tusb" , + .table = { +GPIO_LOOKUP ("gpio-0-15" ,0 ,"enable" , +GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP ("gpio-48-63" ,10 ,"int" , +GPIO_ACTIVE_HIGH ), + { } + }, +}; +static void __init n8x0_usb_init (void ) {int ret =0 ; -static const char announce[]__initconst =KERN_INFO "TUSB 6010\n" ; - -/* PM companion chip power control pin */ - ret =gpio_request_one (TUSB6010_GPIO_ENABLE ,GPIOF_OUT_INIT_LOW , -"TUSB6010 enable" ); -if (ret !=0 ) { -printk (KERN_ERR "Could not get TUSB power GPIO%i\n" , -TUSB6010_GPIO_ENABLE ); -return ; - } -tusb_set_power (0 ); +gpiod_add_lookup_table (&tusb_gpio_table); ret =tusb6010_setup_interface (&tusb_data,TUSB6010_REFCLK_19 ,2 , -TUSB6010_ASYNC_CS ,TUSB6010_SYNC_CS , -TUSB6010_GPIO_INT ,TUSB6010_DMACHAN ); +TUSB6010_ASYNC_CS ,TUSB6010_SYNC_CS , +TUSB6010_DMACHAN );if (ret !=0 ) - goto err; +return ; -printk (announce); +pr_info ("TUSB 6010\n" );return ; - -err: -gpio_free (TUSB6010_GPIO_ENABLE ); }#else
arch/arm/mach-omap2/usb-tusb6010.c +4 -16
@@ -11,12 +11,12 @@#include <linux/errno.h> #include <linux/delay.h> #include <linux/platform_device.h> -#include <linux/gpio.h> #include <linux/export.h> #include <linux/platform_data/usb-omap.h> #include <linux/usb/musb.h> +#include "usb-tusb6010.h" #include "gpmc.h" static u8 async_cs, sync_cs;
@@ -132,10 +132,6 @@ static struct resource tusb_resources[] = { {/* Synchronous access */ .flags = IORESOURCE_MEM, }, - {/* IRQ */ - .name = "mc", - .flags = IORESOURCE_IRQ, - }, };static u64 tusb_dmamask = ~(u32 )0 ;
@@ -154,9 +150,9 @@ static struct platform_device tusb_device = {/* this may be called only from board-*.c setup code */ int __init tusb6010_setup_interface (struct musb_hdrc_platform_data *data, -unsigned ps_refclk,unsigned waitpin, -unsigned async,unsigned sync, -unsigned irq,unsigned dmachan) +unsigned int ps_refclk,unsigned int waitpin, +unsigned int async,unsigned int sync, +unsigned int dmachan) {int status; static char error[] __initdata =
@@ -192,14 +188,6 @@ int __init tusb6010_setup_interface(struct musb_hdrc_platform_data *data,if (status <0 )return status; -/* IRQ */ - status =gpio_request_one (irq,GPIOF_IN ,"TUSB6010 irq" ); -if (status <0 ) { -printk (error,3 , status); -return status; - } - tusb_resources[2 ].start =gpio_to_irq (irq); -/* set up memory timings ... can speed them up later */ if (!ps_refclk) {printk (error,4 , status);
arch/arm/mach-omap2/usb-tusb6010.h new file +12 -0
@@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __USB_TUSB6010_H +#define __USB_TUSB6010_H + +extern int __init tusb6010_setup_interface ( +struct musb_hdrc_platform_data *data, +unsigned int ps_refclk,unsigned int waitpin, +unsigned int async_cs,unsigned int sync_cs, +unsigned int dmachan); + +#endif /* __USB_TUSB6010_H */
drivers/usb/musb/musb_core.c +0 -1
@@ -2330,7 +2330,6 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)spin_lock_init (&musb->lock);spin_lock_init (&musb->list_lock); - musb->board_set_power = plat->set_power; musb->min_power = plat->min_power; musb->ops = plat->platform_ops; musb->port_mode = plat->mode;
drivers/usb/musb/musb_core.h +0 -2
@@ -352,8 +352,6 @@ struct musb {u16 epmask;u8 nr_endpoints; -int (*board_set_power)(int state); -u8 min_power;/* vbus for periph, in mA/2 */ enum musb_mode port_mode;
drivers/usb/musb/tusb6010.c +39 -14
102 lines not on this page · raw message
include/linux/usb/musb.h +0 -13
@@ -99,9 +99,6 @@ struct musb_hdrc_platform_data {/* (HOST or OTG) program PHY for external Vbus */ unsigned extvbus:1; -/* Power the device on or off */ -int (*set_power)(int state); -/* MUSB configuration-specific details */ const struct musb_hdrc_config *config;
@@ -135,14 +132,4 @@ static inline int musb_mailbox(enum musb_vbus_id_status status)#define TUSB6010_REFCLK_24 41667/* psec/clk @ 24.0 MHz XI */ #define TUSB6010_REFCLK_19 52083/* psec/clk @ 19.2 MHz CLKIN */ -#ifdef CONFIG_ARCH_OMAP2 - -extern int __init tusb6010_setup_interface ( -struct musb_hdrc_platform_data *data, -unsigned ps_refclk,unsigned waitpin, -unsigned async_cs,unsigned sync_cs, -unsigned irq,unsigned dmachan); - -#endif /* OMAP2 */ -#endif /* __LINUX_USB_MUSB_H */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 222/431 ARM: dts: qcom: msm8974: do not use underscore in node name (again)
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 311bbc884b2edcf584b67d331be85ce43b27586f ]
Align RPM requests node with DT schema by using hyphen instead of underscore.
--- arch/arm/boot/dts/qcom-msm8974.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/qcom-msm8974.dtsi +1 -1
@@ -300,7 +300,7 @@ rpm { qcom,ipc = <&apcs 8 0>; qcom,smd-edge = <15>; - rpm_requests: rpm_requests { + rpm_requests: rpm-requests { compatible = "qcom,rpm-msm8974"; qcom,smd-channels = "rpm_requests";
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 223/431 arm64: dts: qcom: pm8998: dont use GIC_SPI for SPMI interrupts
In reply to Greg Kroah-HartmanFrom: Dmitry Baryshkov <[email protected]>
[ Upstream commit d9ef7a805a709a0b07341857d97a25598a7f92da ]
Unlike typical GIC interrupts, first cell for SPMI interrupts is the USID rather than GIC_SPI/GIC_PPI/GIC_LPI qualifier. Fix the resin interrupt to use USID value 0x0 rather than GIC_SPI define.
--- arch/arm64/boot/dts/qcom/pm8998.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/pm8998.dtsi +1 -1
@@ -55,7 +55,7 @@ pm8998_pwrkey: pwrkey { pm8998_resin: resin { compatible = "qcom,pm8941-resin"; - interrupts = <GIC_SPI 0x8 1 IRQ_TYPE_EDGE_BOTH>; + interrupts = <0x0 0x8 1 IRQ_TYPE_EDGE_BOTH>; debounce = <15625>; bias-pull-up; status = "disabled";
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 224/431 arm64: dts: qcom: ipq6018: correct qrng unit address
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 085058786a7890dd44ec623fe5ac74db870f6b93 ]
Match unit-address to reg entry to fix dtbs W=1 warnings:
Warning (simple_bus_reg): /soc/qrng@e1000: simple-bus unit address format error, expected "e3000"
--- arch/arm64/boot/dts/qcom/ipq6018.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/ipq6018.dtsi +1 -1
@@ -301,7 +301,7 @@ mdio: mdio@90000 { status = "disabled"; }; - prng: qrng@e1000 { + prng: qrng@e3000 { compatible = "qcom,prng-ee"; reg = <0x0 0x000e3000 0x0 0x1000>; clocks = <&gcc GCC_PRNG_AHB_CLK>;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 225/431 arm64: dts: qcom: msm8916: correct camss unit address
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 48798d992ce276cf0d57bf75318daf8eabd02aa4 ]
Match unit-address to reg entry to fix dtbs W=1 warnings:
Warning (simple_bus_reg): /soc@0/camss@1b00000: simple-bus unit address format error, expected "1b0ac00"
--- arch/arm64/boot/dts/qcom/msm8916.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/msm8916.dtsi +1 -1
@@ -1161,7 +1161,7 @@ dsi_phy0: phy@1a98300 { }; }; - camss: camss@1b00000 { + camss: camss@1b0ac00 { compatible = "qcom,msm8916-camss"; reg = <0x01b0ac00 0x200>, <0x01b00030 0x4>,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 226/431 arm64: dts: qcom: msm8916: correct MMC unit address
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 72644bc76d5145c098c268829554a0b98fab1de1 ]
Match unit-address to reg entry to fix dtbs W=1 warnings:
Warning (simple_bus_reg): /soc@0/mmc@7824000: simple-bus unit address format error, expected "7824900" Warning (simple_bus_reg): /soc@0/mmc@7864000: simple-bus unit address format error, expected "7864900"
--- arch/arm64/boot/dts/qcom/msm8916.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/msm8916.dtsi +2 -2
@@ -1553,7 +1553,7 @@ lpass_codec: audio-codec@771c000 { #sound-dai-cells = <1>; }; - sdhc_1: mmc@7824000 { + sdhc_1: mmc@7824900 { compatible = "qcom,msm8916-sdhci", "qcom,sdhci-msm-v4"; reg = <0x07824900 0x11c>, <0x07824000 0x800>; reg-names = "hc", "core";
@@ -1571,7 +1571,7 @@ sdhc_1: mmc@7824000 { status = "disabled"; }; - sdhc_2: mmc@7864000 { + sdhc_2: mmc@7864900 { compatible = "qcom,msm8916-sdhci", "qcom,sdhci-msm-v4"; reg = <0x07864900 0x11c>, <0x07864000 0x800>; reg-names = "hc", "core";
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 227/431 arm64: dts: qcom: msm8916: Move WCN compatible to boards
In reply to Greg Kroah-HartmanFrom: Stephan Gerhold <[email protected]>
[ Upstream commit 3244442406ff49e8f75a1f2def211c497710570f ]
On MSM8916 the wireless connectivity functionality (WiFi/Bluetooth) is split into the digital part inside the SoC and the analog RF part inside a supplementary WCN36xx chip. For MSM8916, three different options exist:
- WCN3620 (WLAN 802.11 b/g/n 2.4 GHz + Bluetooth)
- WCN3660B (WLAN 802.11 a/b/g/n 2.4/5 GHz + Bluetooth)
- WCN3680B (WLAN 802.11ac 2.4/5 GHz + Bluetooth)
Choosing one of these is up to the board vendor. This means that the compatible belongs into the board-specific DT part so people porting new boards pay attention to set the correct compatible.
Right now msm8916.dtsi sets "qcom,wcn3620" as default compatible, which does not work at all for boards that have WCN3660B or WCN3680B.
Remove the default compatible from msm8196.dtsi and move it to the board DT as follows:
- Boards with only &pronto { status = "okay"; } used the default "qcom,wcn3620" so far. They now set this explicitly for &wcnss_iris.
- Boards with &pronto { ... iris { compatible = "qcom,wcn3660b"; }}; already had an override that just moves to &wcnss_iris now.
- For msm8916-samsung-a2015-common.dtsi the WCN compatible differs for boards making use of it (a3u: wcn3620, a5u: wcn3660b, e2015: wcn3620) so the definitions move to the board-specific DT part.
Since this requires touching all the board DTs, use this as a chance to name the WCNSS-related labels consistently, so everything is grouped properly when sorted alphabetically.
No functional change, just clean-up for more clarity & easier porting. Aside from ordering the generated DTBs are identical.
Stable-dep-of: 1f9a41bb0bba ("arm64: dts: qcom: msm8916: correct WCNSS unit address")
--- arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 15 ++++++++----- .../boot/dts/qcom/msm8916-acer-a1-724.dts | 12 ++++++---- .../boot/dts/qcom/msm8916-alcatel-idol347.dts | 12 ++++++---- .../arm64/boot/dts/qcom/msm8916-asus-z00l.dts | 12 ++++++---- .../boot/dts/qcom/msm8916-gplus-fl8005a.dts | 12 ++++++---- .../arm64/boot/dts/qcom/msm8916-huawei-g7.dts | 12 ++++++---- .../boot/dts/qcom/msm8916-longcheer-l8150.dts | 12 ++++++---- .../boot/dts/qcom/msm8916-longcheer-l8910.dts | 12 ++++++---- arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi | 22 +++++++++---------- .../qcom/msm8916-samsung-a2015-common.dtsi | 4 ---- .../boot/dts/qcom/msm8916-samsung-a3u-eur.dts | 8 +++++++ .../boot/dts/qcom/msm8916-samsung-a5u-eur.dts | 14 +++++++----- .../qcom/msm8916-samsung-e2015-common.dtsi | 8 +++++++ .../dts/qcom/msm8916-samsung-gt5-common.dtsi | 16 +++++++------- .../dts/qcom/msm8916-samsung-j5-common.dtsi | 12 ++++++---- .../dts/qcom/msm8916-samsung-serranove.dts | 16 +++++++------- arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi | 12 ++++++---- .../dts/qcom/msm8916-wingtech-wt88047.dts | 12 ++++++---- arch/arm64/boot/dts/qcom/msm8916.dtsi | 13 +++++------ 19 files changed, 146 insertions(+), 90 deletions(-)
arch/arm64/boot/dts/qcom/apq8016-sbc.dts +9 -6
@@ -325,12 +325,6 @@ &pm8916_resin { linux,code = <KEY_VOLUMEDOWN>; }; -&pronto { - status = "okay"; - - firmware-name = "qcom/apq8016/wcnss.mbn"; -}; - &sdhc_1 { status = "okay";
@@ -411,10 +405,19 @@ &wcd_codec { qcom,mbhc-vthreshold-high = <75 150 237 450 500>; }; +&wcnss { + status = "okay"; + firmware-name = "qcom/apq8016/wcnss.mbn"; +}; + &wcnss_ctrl { firmware-name = "qcom/apq8016/WCNSS_qcom_wlan_nv_sbc.bin"; }; +&wcnss_iris { + compatible = "qcom,wcn3620"; +}; + /* Enable CoreSight */ &cti0 { status = "okay"; }; &cti1 { status = "okay"; };
arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts +8 -4
@@ -118,10 +118,6 @@ &pm8916_vib { status = "okay"; }; -&pronto { - status = "okay"; -}; - &sdhc_1 { pinctrl-names = "default", "sleep"; pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;
@@ -149,6 +145,14 @@ &usb_hs_phy { extcon = <&usb_id>; }; +&wcnss { + status = "okay"; +}; + +&wcnss_iris { + compatible = "qcom,wcn3620"; +}; + &smd_rpm_regulators { vdd_l1_l2_l3-supply = <&pm8916_s3>; vdd_l4_l5_l6-supply = <&pm8916_s4>;
arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts +8 -4
@@ -160,10 +160,6 @@ &pm8916_vib { status = "okay"; }; -&pronto { - status = "okay"; -}; - &sdhc_1 { status = "okay";
@@ -191,6 +187,14 @@ &usb_hs_phy { extcon = <&usb_id>; }; +&wcnss { + status = "okay"; +}; + +&wcnss_iris { + compatible = "qcom,wcn3620"; +}; + &smd_rpm_regulators { vdd_l1_l2_l3-supply = <&pm8916_s3>; vdd_l4_l5_l6-supply = <&pm8916_s4>;
arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts +8 -4
@@ -128,10 +128,6 @@ &blsp1_uart2 { status = "okay"; }; -&pronto { - status = "okay"; -}; - &sdhc_1 { status = "okay";
@@ -159,6 +155,14 @@ &usb_hs_phy { extcon = <&usb_id>; }; +&wcnss { + status = "okay"; +}; + +&wcnss_iris { + compatible = "qcom,wcn3620"; +}; + &smd_rpm_regulators { vdd_l1_l2_l3-supply = <&pm8916_s3>; vdd_l4_l5_l6-supply = <&pm8916_s4>;
arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts +8 -4
@@ -118,10 +118,6 @@ &pm8916_vib { status = "okay"; }; -&pronto { - status = "okay"; -}; - &sdhc_1 { pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>; pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;
@@ -149,6 +145,14 @@ &usb_hs_phy { extcon = <&usb_id>; }; +&wcnss { + status = "okay"; +}; + +&wcnss_iris { + compatible = "qcom,wcn3620"; +}; + &smd_rpm_regulators { vdd_l1_l2_l3-supply = <&pm8916_s3>; vdd_l4_l5_l6-supply = <&pm8916_s4>;
arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts +8 -4
@@ -227,10 +227,6 @@ &pm8916_vib { status = "okay"; }; -&pronto { - status = "okay"; -}; - &sdhc_1 { status = "okay";
@@ -312,6 +308,14 @@ &wcd_codec { qcom,hphl-jack-type-normally-open; }; +&wcnss { + status = "okay"; +}; + +&wcnss_iris { + compatible = "qcom,wcn3620"; +}; + &smd_rpm_regulators { vdd_l1_l2_l3-supply = <&pm8916_s3>; vdd_l4_l5_l6-supply = <&pm8916_s4>;
arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts +8 -4
@@ -231,10 +231,6 @@ &pm8916_vib { status = "okay"; }; -&pronto { - status = "okay"; -}; - &sdhc_1 { status = "okay";
@@ -263,6 +259,14 @@ &usb_hs_phy { extcon = <&pm8916_usbin>; }; +&wcnss { + status = "okay"; +}; + +&wcnss_iris { + compatible = "qcom,wcn3620"; +}; + &smd_rpm_regulators { vdd_l1_l2_l3-supply = <&pm8916_s3>; vdd_l4_l5_l6-supply = <&pm8916_s4>;
arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts +8 -4
@@ -99,10 +99,6 @@ &pm8916_vib { status = "okay"; }; -&pronto { - status = "okay"; -}; - &sdhc_1 { status = "okay";
@@ -130,6 +126,14 @@ &usb_hs_phy { extcon = <&usb_id>; }; +&wcnss { + status = "okay"; +}; + +&wcnss_iris { + compatible = "qcom,wcn3620"; +}; + &smd_rpm_regulators { vdd_l1_l2_l3-supply = <&pm8916_s3>; vdd_l4_l5_l6-supply = <&pm8916_s4>;
arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi +11 -11
@@ -20,17 +20,6 @@ &mpss { pll-supply = <&pm8916_l7>; }; -&pronto { - vddpx-supply = <&pm8916_l7>; - - iris { - vddxo-supply = <&pm8916_l7>; - vddrfa-supply = <&pm8916_s3>; - vddpa-supply = <&pm8916_l9>; - vdddig-supply = <&pm8916_l5>; - }; -}; - &sdhc_1 { vmmc-supply = <&pm8916_l8>; vqmmc-supply = <&pm8916_l5>;
@@ -46,6 +35,17 @@ &usb_hs_phy { v3p3-supply = <&pm8916_l13>; }; +&wcnss { + vddpx-supply = <&pm8916_l7>; +}; + +&wcnss_iris { + vddxo-supply = <&pm8916_l7>; + vddrfa-supply = <&pm8916_s3>; + vddpa-supply = <&pm8916_l9>; + vdddig-supply = <&pm8916_l5>; +}; + &rpm_requests { smd_rpm_regulators: regulators { compatible = "qcom,rpm-pm8916-regulators";
arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi +0 -4
@@ -252,10 +252,6 @@ &pm8916_resin { linux,code = <KEY_VOLUMEDOWN>; }; -&pronto { - status = "okay"; -}; - &sdhc_1 { status = "okay";
arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts +8 -0
@@ -112,6 +112,14 @@ &vibrator { status = "okay"; }; +&wcnss { + status = "okay"; +}; + +&wcnss_iris { + compatible = "qcom,wcn3620"; +}; + &msmgpio { panel_vdd3_default: panel-vdd3-default-state { pins = "gpio9";
arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts +8 -6
@@ -54,12 +54,6 @@ &clk_pwm { status = "okay"; }; -&pronto { - iris { - compatible = "qcom,wcn3660b"; - }; -}; - &touchkey { vcc-supply = <®_touch_key>; vdd-supply = <®_touch_key>;
@@ -69,6 +63,14 @@ &vibrator { status = "okay"; }; +&wcnss { + status = "okay"; +}; + +&wcnss_iris { + compatible = "qcom,wcn3660b"; +}; + &msmgpio { tkey_en_default: tkey-en-default-state { pins = "gpio97";
arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi +8 -0
@@ -58,6 +58,14 @@ &touchkey { vdd-supply = <®_touch_key>; }; +&wcnss { + status = "okay"; +}; + +&wcnss_iris { + compatible = "qcom,wcn3620"; +}; + &msmgpio { tkey_en_default: tkey-en-default-state { pins = "gpio97";
arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi +8 -8
@@ -125,14 +125,6 @@ &pm8916_usbin { status = "okay"; }; -&pronto { - status = "okay"; - - iris { - compatible = "qcom,wcn3660b"; - }; -}; - &sdhc_1 { pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>; pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;
@@ -162,6 +154,14 @@ &usb_hs_phy { extcon = <&pm8916_usbin>; }; +&wcnss { + status = "okay"; +}; + +&wcnss_iris { + compatible = "qcom,wcn3660b"; +}; + &smd_rpm_regulators { vdd_l1_l2_l3-supply = <&pm8916_s3>; vdd_l4_l5_l6-supply = <&pm8916_s4>;
arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi +8 -4
@@ -93,10 +93,6 @@ &pm8916_resin { linux,code = <KEY_VOLUMEDOWN>; }; -&pronto { - status = "okay"; -}; - &sdhc_1 { status = "okay";
@@ -124,6 +120,14 @@ &usb_hs_phy { extcon = <&muic>; }; +&wcnss { + status = "okay"; +}; + +&wcnss_iris { + compatible = "qcom,wcn3620"; +}; + &smd_rpm_regulators { vdd_l1_l2_l3-supply = <&pm8916_s3>; vdd_l4_l5_l6-supply = <&pm8916_s4>;
arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts +8 -8
@@ -272,14 +272,6 @@ &pm8916_vib { status = "okay"; }; -&pronto { - status = "okay"; - - iris { - compatible = "qcom,wcn3660b"; - }; -}; - &sdhc_1 { status = "okay";
@@ -320,6 +312,14 @@ &usb_hs_phy { extcon = <&muic>; }; +&wcnss { + status = "okay"; +}; + +&wcnss_iris { + compatible = "qcom,wcn3660b"; +}; + &smd_rpm_regulators { vdd_l1_l2_l3-supply = <&pm8916_s3>; vdd_l4_l5_l6-supply = <&pm8916_s4>;
arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi +8 -4
@@ -99,10 +99,6 @@ &pm8916_usbin { status = "okay"; }; -&pronto { - status = "okay"; -}; - &sdhc_1 { pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>; pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;
@@ -122,6 +118,14 @@ &usb_hs_phy { extcon = <&pm8916_usbin>; }; +&wcnss { + status = "okay"; +}; + +&wcnss_iris { + compatible = "qcom,wcn3620"; +}; + &smd_rpm_regulators { vdd_l1_l2_l3-supply = <&pm8916_s3>; vdd_l4_l5_l6-supply = <&pm8916_s4>;
arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts +8 -4
@@ -153,10 +153,6 @@ &pm8916_vib { status = "okay"; }; -&pronto { - status = "okay"; -}; - &sdhc_1 { status = "okay";
@@ -184,6 +180,14 @@ &usb_hs_phy { extcon = <&usb_id>; }; +&wcnss { + status = "okay"; +}; + +&wcnss_iris { + compatible = "qcom,wcn3620"; +}; + &smd_rpm_regulators { vdd_l1_l2_l3-supply = <&pm8916_s3>; vdd_l4_l5_l6-supply = <&pm8916_s4>;
arch/arm64/boot/dts/qcom/msm8916.dtsi +6 -7
@@ -1870,7 +1870,7 @@ usb_hs_phy: phy { }; }; - pronto: remoteproc@a21b000 { + wcnss: remoteproc@a21b000 { compatible = "qcom,pronto-v2-pil", "qcom,pronto"; reg = <0x0a204000 0x2000>, <0x0a202000 0x1000>, <0x0a21b000 0x3000>; reg-names = "ccu", "dxe", "pmu";
@@ -1896,9 +1896,8 @@ pronto: remoteproc@a21b000 { status = "disabled"; - iris { - compatible = "qcom,wcn3620"; - + wcnss_iris: iris { + /* Separate chip, compatible is board-specific */ clocks = <&rpmcc RPM_SMD_RF_CLK2>; clock-names = "xo"; };
@@ -1916,13 +1915,13 @@ wcnss_ctrl: wcnss { compatible = "qcom,wcnss"; qcom,smd-channels = "WCNSS_CTRL"; - qcom,mmio = <&pronto>; + qcom,mmio = <&wcnss>; - bluetooth { + wcnss_bt: bluetooth { compatible = "qcom,wcnss-bt"; }; - wifi { + wcnss_wifi: wifi { compatible = "qcom,wcnss-wlan"; interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 228/431 arm64: dts: qcom: msm8916: correct WCNSS unit address
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 1f9a41bb0bba7b373c26a6f2cc8d35cc3159c861 ]
Match unit-address to reg entry to fix dtbs W=1 warnings:
Warning (simple_bus_reg): /soc@0/remoteproc@a21b000: simple-bus unit address format error, expected "a204000"
--- arch/arm64/boot/dts/qcom/msm8916.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/msm8916.dtsi +1 -1
@@ -1870,7 +1870,7 @@ usb_hs_phy: phy { }; }; - wcnss: remoteproc@a21b000 { + wcnss: remoteproc@a204000 { compatible = "qcom,pronto-v2-pil", "qcom,pronto"; reg = <0x0a204000 0x2000>, <0x0a202000 0x1000>, <0x0a21b000 0x3000>; reg-names = "ccu", "dxe", "pmu";
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 229/431 arm64: dts: qcom: msm8953: correct IOMMU unit address
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 1c06b93461ec9df8a5878947db4a9d2d1cb72855 ]
Match unit-address to reg entry to fix dtbs W=1 warnings:
Warning (simple_bus_reg): /soc@0/iommu@1e00000: simple-bus unit address format error, expected "1e20000"
--- arch/arm64/boot/dts/qcom/msm8953.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/msm8953.dtsi +1 -1
@@ -878,7 +878,7 @@ dsi1_phy: phy@1a96400 { }; }; - apps_iommu: iommu@1e00000 { + apps_iommu: iommu@1e20000 { compatible = "qcom,msm8953-iommu", "qcom,msm-iommu-v1"; ranges = <0 0x1e20000 0x20000>;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 230/431 arm64: dts: qcom: msm8976: correct MMC unit address
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 80284797a4cb8ceae71e3c403bafc6648263a060 ]
Match unit-address to reg entry to fix dtbs W=1 warnings:
Warning (simple_bus_reg): /soc@0/mmc@7824000: simple-bus unit address format error, expected "7824900" Warning (simple_bus_reg): /soc@0/mmc@7864000: simple-bus unit address format error, expected "7864900" Warning (simple_bus_reg): /soc@0/mmc@7a24000: simple-bus unit address format error, expected "7a24900"
--- arch/arm64/boot/dts/qcom/msm8976.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/qcom/msm8976.dtsi +3 -3
@@ -821,7 +821,7 @@ spmi_bus: spmi@200f000 { cell-index = <0>; }; - sdhc_1: mmc@7824000 { + sdhc_1: mmc@7824900 { compatible = "qcom,msm8976-sdhci", "qcom,sdhci-msm-v4"; reg = <0x07824900 0x500>, <0x07824000 0x800>; reg-names = "hc", "core";
@@ -837,7 +837,7 @@ sdhc_1: mmc@7824000 { status = "disabled"; }; - sdhc_2: mmc@7864000 { + sdhc_2: mmc@7864900 { compatible = "qcom,msm8976-sdhci", "qcom,sdhci-msm-v4"; reg = <0x07864900 0x11c>, <0x07864000 0x800>; reg-names = "hc", "core";
@@ -956,7 +956,7 @@ otg: usb@78db000 { #reset-cells = <1>; }; - sdhc_3: mmc@7a24000 { + sdhc_3: mmc@7a24900 { compatible = "qcom,msm8976-sdhci", "qcom,sdhci-msm-v4"; reg = <0x07a24900 0x11c>, <0x07a24000 0x800>; reg-names = "hc", "core";
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 231/431 arm64: dts: qcom: msm8994: correct SPMI unit address
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 24f0f6a8059c7108d4ee3476c95db1e7ff4feb79 ]
Match unit-address to reg entry to fix dtbs W=1 warnings:
Warning (simple_bus_reg): /soc/spmi@fc4c0000: simple-bus unit address format error, expected "fc4cf000"
--- arch/arm64/boot/dts/qcom/msm8994.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/msm8994.dtsi +1 -1
@@ -745,7 +745,7 @@ restart@fc4ab000 { reg = <0xfc4ab000 0x4>; }; - spmi_bus: spmi@fc4c0000 { + spmi_bus: spmi@fc4cf000 { compatible = "qcom,spmi-pmic-arb"; reg = <0xfc4cf000 0x1000>, <0xfc4cb000 0x1000>,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 232/431 arm64: dts: qcom: msm8996: correct camss unit address
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit e959ced1d0e5ef0b1f66a0c2d0e1ae80790e5ca5 ]
Match unit-address to reg entry to fix dtbs W=1 warnings:
Warning (simple_bus_reg): /soc/camss@a00000: simple-bus unit address format error, expected "a34000"
--- arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/msm8996.dtsi +1 -1
@@ -2069,7 +2069,7 @@ ufsphy_lane: phy@627400 { }; }; - camss: camss@a00000 { + camss: camss@a34000 { compatible = "qcom,msm8996-camss"; reg = <0x00a34000 0x1000>, <0x00a00030 0x4>,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 233/431 arm64: dts: qcom: sdm630: correct camss unit address
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit c8b7faa7e9913a94444b3f00b6480e53a174fcfd ]
Match unit-address to reg entry to fix dtbs W=1 warnings:
Warning (simple_bus_reg): /soc/camss@ca00000: simple-bus unit address format error, expected "ca00020"
--- arch/arm64/boot/dts/qcom/sdm630.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sdm630.dtsi +1 -1
@@ -1893,7 +1893,7 @@ pil-reloc@94c { }; }; - camss: camss@ca00000 { + camss: camss@ca00020 { compatible = "qcom,sdm660-camss"; reg = <0x0ca00020 0x10>, <0x0ca30000 0x100>,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 234/431 arm64: dts: qcom: sdm845: correct camss unit address
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit a05b913a27e46926ba60ba2bcacc7ec7a8403e4c ]
Match unit-address to reg entry to fix dtbs W=1 warnings:
Warning (simple_bus_reg): /soc@0/camss@a00000: simple-bus unit address format error, expected "acb3000"
--- arch/arm64/boot/dts/qcom/sdm845.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sdm845.dtsi +1 -1
@@ -4158,7 +4158,7 @@ videocc: clock-controller@ab00000 { #reset-cells = <1>; }; - camss: camss@a00000 { + camss: camss@acb3000 { compatible = "qcom,sdm845-camss"; reg = <0 0x0acb3000 0 0x1000>,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 235/431 arm64: dts: qcom: sm6115: correct thermal-sensor unit address
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 2358b43256080459fcc5642265ed4fec75558f8c ]
Match unit-address to reg entry to fix dtbs W=1 warnings:
Warning (simple_bus_reg): /soc@0/thermal-sensor@4410000: simple-bus unit address format error, expected "4411000"
--- arch/arm64/boot/dts/qcom/sm6115.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sm6115.dtsi +1 -1
@@ -693,7 +693,7 @@ spmi_bus: spmi@1c40000 { #interrupt-cells = <4>; }; - tsens0: thermal-sensor@4410000 { + tsens0: thermal-sensor@4411000 { compatible = "qcom,sm6115-tsens", "qcom,tsens-v2"; reg = <0x0 0x04411000 0x0 0x1ff>, /* TM */ <0x0 0x04410000 0x0 0x8>; /* SROT */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 236/431 arm64: dts: qcom: sm8350: correct DMA controller unit address
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 41d6bca799b3f40d4d3c22dd4545aeac7c210e33 ]
Match unit-address to reg entry to fix dtbs W=1 warnings:
Warning (simple_bus_reg): /soc@0/dma-controller@900000: simple-bus unit address format error, expected "9800000"
--- arch/arm64/boot/dts/qcom/sm8350.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sm8350.dtsi +1 -1
@@ -892,7 +892,7 @@ spi19: spi@894000 { }; }; - gpi_dma0: dma-controller@900000 { + gpi_dma0: dma-controller@9800000 { compatible = "qcom,sm8350-gpi-dma", "qcom,sm6350-gpi-dma"; reg = <0 0x09800000 0 0x60000>; interrupts = <GIC_SPI 244 IRQ_TYPE_LEVEL_HIGH>,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 237/431 arm64: dts: qcom: sm8350: correct PCI phy unit address
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit ab98c21bc9246f421a6ae70e69f1b73cea6f85e3 ]
Match unit-address to reg entry to fix dtbs W=1 warnings:
Warning (simple_bus_reg): /soc@0/phy@1c0f000: simple-bus unit address format error, expected "1c0e000"
--- arch/arm64/boot/dts/qcom/sm8350.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sm8350.dtsi +1 -1
@@ -1625,7 +1625,7 @@ pcie1: pci@1c08000 { status = "disabled"; }; - pcie1_phy: phy@1c0f000 { + pcie1_phy: phy@1c0e000 { compatible = "qcom,sm8350-qmp-gen3x2-pcie-phy"; reg = <0 0x01c0e000 0 0x2000>; clocks = <&gcc GCC_PCIE_1_AUX_CLK>,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 238/431 arm64: dts: qcom: sm8550: add QCE IP family compatible values
In reply to Greg Kroah-HartmanFrom: Vladimir Zapolskiy <[email protected]>
[ Upstream commit e47a80784306a544a58f5c7febaaa3cc646f51a2 ]
Add a family compatible for QCE IP on SM8550 SoC, which is equal to QCE IP found on SM8150 SoC and described in the recently updated device tree bindings documentation, as well add a generic QCE IP family compatible.
Stable-dep-of: 3cbf49ef1696 ("arm64: dts: qcom: sm8550: correct crypto unit address")
--- arch/arm64/boot/dts/qcom/sm8550.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sm8550.dtsi +1 -1
@@ -1844,7 +1844,7 @@ cryptobam: dma-controller@1dc4000 { }; crypto: crypto@1de0000 { - compatible = "qcom,sm8550-qce"; + compatible = "qcom,sm8550-qce", "qcom,sm8150-qce", "qcom,qce"; reg = <0x0 0x01dfa000 0x0 0x6000>; dmas = <&cryptobam 4>, <&cryptobam 5>; dma-names = "rx", "tx";
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 239/431 arm64: dts: qcom: sm8550: correct crypto unit address
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 3cbf49ef16962ab6d99a3659cb34a33c5f147b50 ]
Match unit-address to reg entry to fix dtbs W=1 warnings:
Warning (simple_bus_reg): /soc@0/crypto@1de0000: simple-bus unit address format error, expected "1dfa000"
--- arch/arm64/boot/dts/qcom/sm8550.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sm8550.dtsi +1 -1
@@ -1843,7 +1843,7 @@ cryptobam: dma-controller@1dc4000 { <&apps_smmu 0x481 0x0>; }; - crypto: crypto@1de0000 { + crypto: crypto@1dfa000 { compatible = "qcom,sm8550-qce", "qcom,sm8150-qce", "qcom,qce"; reg = <0x0 0x01dfa000 0x0 0x6000>; dmas = <&cryptobam 4>, <&cryptobam 5>;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 240/431 arm64: dts: qcom: sm8550: correct pinctrl unit address
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 950a4fe6ec8498799d1c7bd31a489a718f94a87e ]
Match unit-address to reg entry to fix dtbs W=1 warnings:
Warning (simple_bus_reg): /soc@0/pinctrl@f000000: simple-bus unit address format error, expected "f100000"
--- arch/arm64/boot/dts/qcom/sm8550.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sm8550.dtsi +1 -1
@@ -2536,7 +2536,7 @@ spmi_bus: spmi@c400000 { #interrupt-cells = <4>; }; - tlmm: pinctrl@f000000 { + tlmm: pinctrl@f100000 { compatible = "qcom,sm8550-tlmm"; reg = <0 0x0f100000 0 0x300000>; interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 241/431 arm64: dts: qcom: sdm845-polaris: add missing touchscreen child node reg
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 4a0156b8862665a3e31c8280607388e3001ace3d ]
Add missing reg property to touchscreen child node to fix dtbs W=1 warnings:
Warning (unit_address_vs_reg): /soc@0/geniqup@ac0000/i2c@a98000/touchscreen@20/rmi4-f12@12: node has a unit name, but no reg or ranges property
--- arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts +1 -0
@@ -483,6 +483,7 @@ rmi4-f01@1 { }; rmi4-f12@12 { + reg = <0x12>; syna,rezero-wait-ms = <0xc8>; syna,clip-x-high = <0x438>; syna,clip-y-high = <0x870>;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 242/431 arm64: dts: qcom: apq8016-sbc: Fix regulator constraints
In reply to Greg Kroah-HartmanFrom: Stephan Gerhold <[email protected]>
[ Upstream commit e27654df20d77ad7549a3cf6739ebaa3aa59a088 ]
For some reason DB410c has completely bogus regulator constraints that actually just correspond to the programmable voltages which are already provided by the regulator driver. Some of them are not just outside the recommended operating conditions of the APQ8016E SoC but even exceed the absolute maximum ratings, potentially risking permanent device damage.
In practice it's not quite as dangerous thanks to the RPM firmware:
It turns out that it has its own voltage constraints and silently clamps all regulator requests. For example, requesting 3.3V for L5 (allowed by the current regulator constraints!) still results in 1.8V being programmed in the actual regulator hardware.
Experimentation with various voltages shows that the internal RPM voltage constraints roughly correspond to the safe "specified range" in the PM8916 Device Specification (rather than the "programmable range" used inside apq8016-sbc.dtsi right now).
Combine those together with some fixed voltages used in the old msm-3.10 device tree from Qualcomm to give DB410c some actually valid voltage constraints.
--- arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 64 ++++++++++++------------ 1 file changed, 32 insertions(+), 32 deletions(-)
arch/arm64/boot/dts/qcom/apq8016-sbc.dts +32 -32
@@ -447,21 +447,21 @@ &smd_rpm_regulators { vdd_l7-supply = <&pm8916_s4>; s3 { - regulator-min-microvolt = <375000>; - regulator-max-microvolt = <1562000>; + regulator-min-microvolt = <1250000>; + regulator-max-microvolt = <1350000>; }; s4 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; + regulator-min-microvolt = <1850000>; + regulator-max-microvolt = <2150000>; regulator-always-on; regulator-boot-on; }; l1 { - regulator-min-microvolt = <375000>; - regulator-max-microvolt = <1525000>; + regulator-min-microvolt = <1225000>; + regulator-max-microvolt = <1225000>; }; l2 {
@@ -470,13 +470,13 @@ l2 { }; l4 { - regulator-min-microvolt = <1750000>; - regulator-max-microvolt = <3337000>; + regulator-min-microvolt = <2050000>; + regulator-max-microvolt = <2050000>; }; l5 { - regulator-min-microvolt = <1750000>; - regulator-max-microvolt = <3337000>; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; }; l6 {
@@ -485,45 +485,45 @@ l6 { }; l7 { - regulator-min-microvolt = <1750000>; - regulator-max-microvolt = <3337000>; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; }; l8 { - regulator-min-microvolt = <1750000>; - regulator-max-microvolt = <3337000>; + regulator-min-microvolt = <2900000>; + regulator-max-microvolt = <2900000>; }; l9 { - regulator-min-microvolt = <1750000>; - regulator-max-microvolt = <3337000>; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; }; l10 { - regulator-min-microvolt = <1750000>; - regulator-max-microvolt = <3337000>; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; }; l11 { - regulator-min-microvolt = <1750000>; - regulator-max-microvolt = <3337000>; + regulator-min-microvolt = <2950000>; + regulator-max-microvolt = <2950000>; regulator-allow-set-load; regulator-system-load = <200000>; }; l12 { - regulator-min-microvolt = <1750000>; - regulator-max-microvolt = <3337000>; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <2950000>; }; l13 { - regulator-min-microvolt = <1750000>; - regulator-max-microvolt = <3337000>; + regulator-min-microvolt = <3075000>; + regulator-max-microvolt = <3075000>; }; l14 { - regulator-min-microvolt = <1750000>; - regulator-max-microvolt = <3337000>; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; }; /**
@@ -531,14 +531,14 @@ l14 { * for mezzanine boards */ l15 { - regulator-min-microvolt = <1750000>; - regulator-max-microvolt = <3337000>; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; regulator-always-on; }; l16 { - regulator-min-microvolt = <1750000>; - regulator-max-microvolt = <3337000>; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; }; l17 {
@@ -547,8 +547,8 @@ l17 { }; l18 { - regulator-min-microvolt = <1750000>; - regulator-max-microvolt = <3337000>; + regulator-min-microvolt = <2700000>; + regulator-max-microvolt = <2700000>; }; };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 243/431 arm64: dts: qcom: apq8016-sbc: Fix 1.8V power rail on LS expansion
In reply to Greg Kroah-HartmanFrom: Stephan Gerhold <[email protected]>
[ Upstream commit 5500f823db38db073d30557af159b77fb1f2bf26 ]
The 96Boards specification expects a 1.8V power rail on the low-speed expansion connector that is able to provide at least 0.18W / 100 mA. According to the DB410c hardware user manual this is done by connecting both L15 and L16 in parallel with up to 55mA each (for 110 mA total) [1].
Unfortunately the current regulator setup in the DB410c device tree does not implement the specification correctly and only provides 5 mA:
- Only L15 is marked always-on, so L16 is never enabled.
- Without specifying a load the regulator is put into LPM where it can only provide 5 mA.
Fix this by:
- Adding proper voltage constraints for L16.
- Making L16 always-on.
- Adding regulator-system-load for both L15 and L16. 100 mA should be available in total, so specify 50 mA for each. (The regulator hardware can only be in normal (55 mA) or low-power mode (5 mA) so this will actually result in the expected 110 mA total...)
--- arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/qcom/apq8016-sbc.dts +12 -4
@@ -526,19 +526,27 @@ l14 { regulator-max-microvolt = <3300000>; }; - /** - * 1.8v required on LS expansion - * for mezzanine boards + /* + * The 96Boards specification expects a 1.8V power rail on the low-speed + * expansion connector that is able to provide at least 0.18W / 100 mA. + * L15/L16 are connected in parallel to provide 55 mA each. A minimum load + * must be specified to ensure the regulators are not put in LPM where they + * would only provide 5 mA. */ l15 { regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; + regulator-system-load = <50000>; + regulator-allow-set-load; regulator-always-on; }; l16 { regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <3300000>; + regulator-max-microvolt = <1800000>; + regulator-system-load = <50000>; + regulator-allow-set-load; + regulator-always-on; }; l17 {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 244/431 drm/bridge: ti-sn65dsi83: Fix enable/disable flow to meet spec
In reply to Greg Kroah-HartmanFrom: Frieder Schrempf <[email protected]>
[ Upstream commit dd9e329af7236e34c566d3705ea32a63069b9b13 ]
The datasheet describes the following initialization flow including minimum delay times between each step:
1. DSI data lanes need to be in LP-11 and the clock lane in HS mode
2. toggle EN signal
3. initialize registers
4. enable PLL
5. soft reset
6. enable DSI stream
7. check error status register
To meet this requirement we need to make sure the host bridge's pre_enable() is called first by using the pre_enable_prev_first flag.
Furthermore we need to split enable() into pre_enable() which covers steps 2-5 from above and enable() which covers step 7 and is called after the host bridge's enable().
--- drivers/gpu/drm/bridge/ti-sn65dsi83.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)
drivers/gpu/drm/bridge/ti-sn65dsi83.c +16 -3
@@ -321,8 +321,8 @@ static u8 sn65dsi83_get_dsi_div(struct sn65dsi83 *ctx)return dsi_div -1 ; } -static void sn65dsi83_atomic_enable (struct drm_bridge *bridge, -struct drm_bridge_state *old_bridge_state) +static void sn65dsi83_atomic_pre_enable (struct drm_bridge *bridge, +struct drm_bridge_state *old_bridge_state) {struct sn65dsi83 *ctx =bridge_to_sn65dsi83 (bridge);struct drm_atomic_state *state = old_bridge_state->base.state;
@@ -485,11 +485,22 @@ static void sn65dsi83_atomic_enable(struct drm_bridge *bridge,/* Trigger reset after CSR register update. */ regmap_write (ctx->regmap,REG_RC_RESET ,REG_RC_RESET_SOFT_RESET ); +/* Wait for 10ms after soft reset as specified in datasheet */ +usleep_range (10000 ,12000 ); +} + +static void sn65dsi83_atomic_enable (struct drm_bridge *bridge, +struct drm_bridge_state *old_bridge_state) +{ +struct sn65dsi83 *ctx =bridge_to_sn65dsi83 (bridge); +unsigned int pval; +/* Clear all errors that got asserted during initialization. */ regmap_read (ctx->regmap,REG_IRQ_STAT , &pval);regmap_write (ctx->regmap,REG_IRQ_STAT , pval); -usleep_range (10000 ,12000 ); +/* Wait for 1ms and check for errors in status register */ +usleep_range (1000 ,1100 );regmap_read (ctx->regmap,REG_IRQ_STAT , &pval);if (pval)dev_err (ctx->dev,"Unexpected link status 0x%02x\n" , pval);
@@ -556,6 +567,7 @@ static const struct drm_bridge_funcs sn65dsi83_funcs = { .attach = sn65dsi83_attach, .detach = sn65dsi83_detach, .atomic_enable = sn65dsi83_atomic_enable, + .atomic_pre_enable = sn65dsi83_atomic_pre_enable, .atomic_disable = sn65dsi83_atomic_disable, .mode_valid = sn65dsi83_mode_valid,
@@ -696,6 +708,7 @@ static int sn65dsi83_probe(struct i2c_client *client) ctx->bridge.funcs = &sn65dsi83_funcs; ctx->bridge.of_node = dev->of_node; + ctx->bridge.pre_enable_prev_first = true;drm_bridge_add (&ctx->bridge); ret =sn65dsi83_host_attach (ctx);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 245/431 drm/panel: simple: fix active size for Ampire AM-480272H3TMQW-T01H
In reply to Greg Kroah-HartmanFrom: Dario Binacchi <[email protected]>
[ Upstream commit f24b49550814fdee4a98b9552e35e243ccafd4a8 ]
The previous setting was related to the overall dimension and not to the active display area.
In the "PHYSICAL SPECIFICATIONS" section, the datasheet shows the following parameters:
----------------------------------------------------------
| Item | Specifications | unit |
----------------------------------------------------------
| Display area | 98.7 (W) x 57.5 (H) | mm |
----------------------------------------------------------
| Overall dimension | 105.5(W) x 67.2(H) x 4.96(D) | mm |
----------------------------------------------------------
--- drivers/gpu/drm/panel/panel-simple.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/panel/panel-simple.c +2 -2
@@ -759,8 +759,8 @@ static const struct panel_desc ampire_am_480272h3tmqw_t01h = { .num_modes = 1, .bpc = 8, .size = { - .width = 105, - .height = 67, + .width = 99, + .height = 58, }, .bus_format = MEDIA_BUS_FMT_RGB888_1X24, };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 246/431 ARM: ep93xx: fix missing-prototype warnings
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 419013740ea1e4343d8ade535d999f59fa28e460 ]
ep93xx_clocksource_read() is only called from the file it is declared in, while ep93xx_timer_init() is declared in a header that is not included here.
arch/arm/mach-ep93xx/timer-ep93xx.c:120:13: error: no previous prototype for 'ep93xx_timer_init' arch/arm/mach-ep93xx/timer-ep93xx.c:63:5: error: no previous prototype for 'ep93xx_clocksource_read'
--- arch/arm/mach-ep93xx/timer-ep93xx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/mach-ep93xx/timer-ep93xx.c +2 -1
@@ -9,6 +9,7 @@#include <linux/io.h> #include <asm/mach/time.h> #include "soc.h" +#include "platform.h" /************************************************************************* * Timer handling for EP93xx
@@ -60,7 +61,7 @@ static u64 notrace ep93xx_read_sched_clock(void)return ret; } -u64 ep93xx_clocksource_read (struct clocksource *c) +static u64 ep93xx_clocksource_read (struct clocksource *c) {u64 ret;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 247/431 ARM: omap2: fix missing tick_broadcast() prototype
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 861bc1d2886d47bd57a2cbf2cda87fdbe3eb9d08 ]
omap2 contains a hack to define tick_broadcast() on non-SMP configurations in place of the normal SMP definition. This one causes a warning because of a missing prototype:
arch/arm/mach-omap2/board-generic.c:44:6: error: no previous prototype for 'tick_broadcast'
Make sure to always include the header with the declaration.
--- arch/arm/mach-omap2/board-generic.c | 1 + 1 file changed, 1 insertion(+)
arch/arm/mach-omap2/board-generic.c +1 -0
@@ -13,6 +13,7 @@#include <linux/of_platform.h> #include <linux/irqdomain.h> #include <linux/clocksource.h> +#include <linux/clockchips.h> #include <asm/setup.h> #include <asm/mach/arch.h>
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 248/431 arm64: dts: qcom: pm7250b: add missing spmi-vadc include
In reply to Greg Kroah-HartmanFrom: Luca Weiss <[email protected]>
[ Upstream commit 83022f6484b11a60dbf9a95a88c7ef8e59c4b19c ]
This file is using definitions from the spmi-vadc header, so we need to include it.
--- arch/arm64/boot/dts/qcom/pm7250b.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/qcom/pm7250b.dtsi +1 -0
@@ -3,6 +3,7 @@ * Copyright (C) 2022 Luca Weiss <[email protected]> */ +#include <dt-bindings/iio/qcom,spmi-vadc.h> #include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/spmi/spmi.h>
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 249/431 arm64: dts: qcom: apq8096: fix fixed regulator name property
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit c77612a07d18d4425fd8ddd532a8a9b8e1970c53 ]
Correct the typo in 'regulator-name' property.
apq8096-ifc6640.dtb: v1p05-regulator: 'regulator-name' is a required property apq8096-ifc6640.dtb: v1p05-regulator: Unevaluated properties are not allowed ('reglator-name' was unexpected)
--- arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts +2 -2
@@ -26,7 +26,7 @@ chosen { v1p05: v1p05-regulator { compatible = "regulator-fixed"; - reglator-name = "v1p05"; + regulator-name = "v1p05"; regulator-always-on; regulator-boot-on;
@@ -38,7 +38,7 @@ v1p05: v1p05-regulator { v12_poe: v12-poe-regulator { compatible = "regulator-fixed"; - reglator-name = "v12_poe"; + regulator-name = "v12_poe"; regulator-always-on; regulator-boot-on;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 250/431 arm64: dts: mediatek: mt8183: Add mediatek,broken-save-restore-fw to kukui
In reply to Greg Kroah-HartmanFrom: Douglas Anderson <[email protected]>
[ Upstream commit 42127f578ebde652d1373e0233356fbd351675c4 ]
Firmware shipped on mt8183 Chromebooks is affected by the GICR save/restore issue as described by the patch ("dt-bindings:
interrupt-controller: arm,gic-v3: Add quirk for Mediatek SoCs w/ broken FW"). Add the quirk property.
--- arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi +4 -0
@@ -292,6 +292,10 @@ dsi_out: endpoint { }; }; +&gic { + mediatek,broken-save-restore-fw; +}; + &gpu { mali-supply = <&mt6358_vgpu_reg>; sram-supply = <&mt6358_vsram_gpu_reg>;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 251/431 ARM: dts: stm32: Shorten the AV96 HDMI sound card name
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit 0cf765e598712addec34d0208cc1418c151fefb2 ]
Fix the following error in kernel log due to too long sound card name:
"
asoc-audio-graph-card sound: ASoC: driver name too long 'STM32MP1-AV96-HDMI' -> 'STM32MP1-AV96-H' "
--- arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi +1 -1
@@ -87,7 +87,7 @@ sd_switch: regulator-sd_switch { sound { compatible = "audio-graph-card"; - label = "STM32MP1-AV96-HDMI"; + label = "STM32-AV96-HDMI"; dais = <&sai2a_port>; status = "okay"; };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 252/431 memory: brcmstb_dpfe: fix testing array offset after use
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 1d9e93fad549bc38f593147479ee063f2872c170 ]
Code should first check for valid value of array offset, then use it as the index. Fixes smatch warning:
drivers/memory/brcmstb_dpfe.c:443 __send_command() error: testing array offset 'cmd' after use.
--- drivers/memory/brcmstb_dpfe.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/memory/brcmstb_dpfe.c +3 -1
@@ -434,15 +434,17 @@ static void __finalize_command(struct brcmstb_dpfe_priv *priv)static int __send_command (struct brcmstb_dpfe_priv *priv,unsigned int cmd,u32 result[]) { -const u32 *msg = priv->dpfe_api->command[cmd];void __iomem *regs = priv->regs;unsigned int i, chksum, chksum_idx; +const u32 *msg;int ret =0 ;u32 resp;if (cmd >=DPFE_CMD_MAX )return -1 ; + msg = priv->dpfe_api->command[cmd]; +mutex_lock (&priv->lock);/* Wait for DCPU to become ready */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 253/431 ARM: dts: qcom: apq8074-dragonboard: Set DMA as remotely controlled
In reply to Greg Kroah-HartmanFrom: Dmitry Baryshkov <[email protected]>
[ Upstream commit e60c230588d88036f974cec7e93361e2c4f62226 ]
Add the qcom,controlled-remotely property for the blsp2_bam controller node. This board requires this, otherwise the board stalls during the boot for some reason (most probably because TZ mishandles the protection error and keeps on looping somewhere inside).
--- arch/arm/boot/dts/qcom-apq8074-dragonboard.dts | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm/boot/dts/qcom-apq8074-dragonboard.dts +4 -0
@@ -23,6 +23,10 @@ &blsp1_uart2 { status = "okay"; }; +&blsp2_dma { + qcom,controlled-remotely; +}; + &blsp2_i2c5 { status = "okay"; clock-frequency = <200000>;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 254/431 ASoC: es8316: Increment max value for ALC Capture Target Volume control
In reply to Greg Kroah-HartmanFrom: Cristian Ciocaltea <[email protected]>
[ Upstream commit 6f073429037cd79d7311cd8236311c53f5ea8f01 ]
The following error occurs when trying to restore a previously saved ALSA mixer state (tested on a Rock 5B board):
$ alsactl --no-ucm -f /tmp/asound.state store hw:Analog $ alsactl --no-ucm -I -f /tmp/asound.state restore hw:Analog alsactl: set_control:1475: Cannot write control '2:0:0:ALC Capture Target Volume:0' : Invalid argument
According to ES8316 datasheet, the register at address 0x2B, which is related to the above mixer control, contains by default the value 0xB0. Considering the corresponding ALC target bits (ALCLVL) are 7:4, the control is initialized with 11, which is one step above the maximum value allowed by the driver:
ALCLVL | dB gain
-------+--------
0000 | -16.5 0001 | -15.0 0010 | -13.5 .... | ..... 0111 | -6.0 1000 | -4.5 1001 | -3.0 1010 | -1.5 .... | ..... 1111 | -1.5
The tests performed using the VU meter feature (--vumeter=TYPE) of arecord/aplay confirm the specs are correct and there is no measured gain if the 1011-1111 range would have been mapped to 0 dB:
dB gain | VU meter %
--------+-----------
-6.0 | 30-31
-4.5 | 35-36
-3.0 | 42-43
-1.5 | 50-51
0.0 | 50-51Increment the max value allowed for ALC Capture Target Volume control, so that it matches the hardware default. Additionally, update the related TLV to prevent an artificial extension of the dB gain range.
--- sound/soc/codecs/es8316.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
sound/soc/codecs/es8316.c +7 -2
@@ -52,7 +52,12 @@ static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(dac_vol_tlv, -9600, 50, 1); static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(adc_vol_tlv, -9600, 50, 1); static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(alc_max_gain_tlv, -650, 150, 0); static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(alc_min_gain_tlv, -1200, 150, 0); -static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(alc_target_tlv, -1650, 150, 0); + +static const SNDRV_CTL_TLVD_DECLARE_DB_RANGE(alc_target_tlv, +0 ,10 ,TLV_DB_SCALE_ITEM (-1650 ,150 ,0 ), + 11, 11, TLV_DB_SCALE_ITEM(-150, 0, 0), +); + static const SNDRV_CTL_TLVD_DECLARE_DB_RANGE(hpmixer_gain_tlv,0 ,4 ,TLV_DB_SCALE_ITEM (-1200 ,150 ,0 ), 8, 11, TLV_DB_SCALE_ITEM(-450, 150, 0),
@@ -115,7 +120,7 @@ static const struct snd_kcontrol_new es8316_snd_controls[] = { alc_max_gain_tlv),SOC_SINGLE_TLV ("ALC Capture Min Volume" ,ES8316_ADC_ALC2 ,0 ,28 ,0 , alc_min_gain_tlv), -SOC_SINGLE_TLV ("ALC Capture Target Volume" ,ES8316_ADC_ALC3 ,4 ,10 ,0 , +SOC_SINGLE_TLV ("ALC Capture Target Volume" ,ES8316_ADC_ALC3 ,4 ,11 ,0 , alc_target_tlv),SOC_SINGLE ("ALC Capture Hold Time" ,ES8316_ADC_ALC3 ,0 ,10 ,0 ), SOC_SINGLE("ALC Capture Decay Time", ES8316_ADC_ALC4, 4, 10, 0),
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 255/431 ASoC: es8316: Do not set rate constraints for unsupported MCLKs
In reply to Greg Kroah-HartmanFrom: Cristian Ciocaltea <[email protected]>
[ Upstream commit 60413129ee2b38a80347489270af7f6e1c1de4d0 ]
When using the codec through the generic audio graph card, there are at least two calls of es8316_set_dai_sysclk(), with the effect of limiting the allowed sample rates according to the MCLK/LRCK ratios supported by the codec:
1. During audio card setup, to set the initial MCLK - see asoc_simple_init_dai().
2. Before opening a stream, to update MCLK, according to the stream sample rate and the multiplication factor - see asoc_simple_hw_params().
In some cases the initial MCLK might be set to a frequency that doesn't match any of the supported ratios, e.g. 12287999 instead of 12288000, which is only 1 Hz below the supported clock, as that is what the hardware reports. This creates an empty list of rate constraints, which is further passed to snd_pcm_hw_constraint_list() via es8316_pcm_startup(), and causes the following error on the very first access of the sound card:
$ speaker-test -D hw:Analog,0 -F S16_LE -c 2 -t wav Broken configuration for playback: no configurations available: Invalid argument Setting of hwparams failed: Invalid argument
Note that all subsequent retries succeed thanks to the updated MCLK set at point 2 above, which uses a computed frequency value instead of a reading from the hardware registers. Normally this would have mitigated the issue, but es8316_pcm_startup() executes before the 2nd call to es8316_set_dai_sysclk(), hence it cannot make use of the updated constraints.
Since es8316_pcm_hw_params() performs anyway a final validation of MCLK against the stream sample rate and the supported MCLK/LRCK ratios, fix the issue by ensuring that sysclk_constraints list is only set when at least one supported sample rate is autodetected by the codec.
--- sound/soc/codecs/es8316.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
sound/soc/codecs/es8316.c +7 -7
@@ -369,13 +369,11 @@ static int es8316_set_dai_sysclk(struct snd_soc_dai *codec_dai,int count =0 ; es8316->sysclk = freq; + es8316->sysclk_constraints.list =NULL ; + es8316->sysclk_constraints.count =0 ; -if (freq ==0 ) { - es8316->sysclk_constraints.list =NULL ; - es8316->sysclk_constraints.count =0 ; - +if (freq ==0 )return 0 ; - } ret =clk_set_rate (es8316->mclk, freq);if (ret)
@@ -391,8 +389,10 @@ static int es8316_set_dai_sysclk(struct snd_soc_dai *codec_dai, es8316->allowed_rates[count++] = freq / ratio; } - es8316->sysclk_constraints.list = es8316->allowed_rates; - es8316->sysclk_constraints.count = count; +if (count) { + es8316->sysclk_constraints.list = es8316->allowed_rates; + es8316->sysclk_constraints.count = count; + }return 0 ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 256/431 ARM: dts: meson8: correct uart_B and uart_C clock references
In reply to Greg Kroah-HartmanFrom: Martin Blumenstingl <[email protected]>
[ Upstream commit 98b503c7fb13a17a47d8ebf15fa8f7c10118e75c ]
On Meson8 uart_B and uart_C do not work, because they are relying on incorrect clocks. Change the references of pclk to the correct CLKID (UART1 for uart_B and UART2 for uart_C), to allow use of the two uarts.
This was originally reported by Hans-Frieder Vogt for Meson8b [0], but the same bug is also present in meson8.dtsi
--- arch/arm/boot/dts/meson8.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/meson8.dtsi +2 -2
@@ -752,13 +752,13 @@ &uart_A { &uart_B { compatible = "amlogic,meson8-uart"; - clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>; + clocks = <&xtal>, <&clkc CLKID_UART1>, <&clkc CLKID_CLK81>; clock-names = "xtal", "pclk", "baud"; }; &uart_C { compatible = "amlogic,meson8-uart"; - clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>; + clocks = <&xtal>, <&clkc CLKID_UART2>, <&clkc CLKID_CLK81>; clock-names = "xtal", "pclk", "baud"; };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 257/431 soc/fsl/qe: fix usb.c build errors
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 7b1a78babd0d2cd27aa07255dee0c2d7ac0f31e3 ]
Fix build errors in soc/fsl/qe/usb.c when QUICC_ENGINE is not set. This happens when PPC_EP88XC is set, which selects CPM1 & CPM. When CPM is set, USB_FSL_QE can be set without QUICC_ENGINE being set. When USB_FSL_QE is set, QE_USB deafults to y, which causes build errors when QUICC_ENGINE is not set. Making QE_USB depend on QUICC_ENGINE prevents QE_USB from defaulting to y.
Fixes these build errors:
drivers/soc/fsl/qe/usb.o: in function `qe_usb_clock_set':
usb.c:(.text+0x1e): undefined reference to `qe_immr'
powerpc-linux-ld: usb.c:(.text+0x2a): undefined reference to `qe_immr'
powerpc-linux-ld: usb.c:(.text+0xbc): undefined reference to `qe_setbrg'
powerpc-linux-ld: usb.c:(.text+0xca): undefined reference to `cmxgcr_lock'
powerpc-linux-ld: usb.c:(.text+0xce): undefined reference to `cmxgcr_lock'
--- drivers/soc/fsl/qe/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/soc/fsl/qe/Kconfig +1 -0
@@ -39,6 +39,7 @@ config QE_TDM config QE_USB bool + depends on QUICC_ENGINE default y if USB_FSL_QE help QE USB Controller support
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 258/431 RDMA/irdma: avoid fortify-string warning in irdma_clr_wqes
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit b002760f877c0d91ecd3c78565b52f4bbac379dd ]
Commit df8fc4e934c1 ("kbuild: Enable -fstrict-flex-arrays=3") triggers a warning for fortified memset():
In function 'fortify_memset_chk',
inlined from 'irdma_clr_wqes' at drivers/infiniband/hw/irdma/uk.c:103:4:include/linux/fortify-string.h:493:25: error: call to '__write_overflow_field' declared with attribute warning: detected write beyond size of field (1st parameter); maybe use struct_group()? [-Werror=attribute-warning]
493 | __write_overflow_field(p_size_field, size);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~The problem here isthat the inner array only has four 8-byte elements, so clearing 4096 bytes overflows that. As this structure is part of an outer array, change the code to pass a pointer to the irdma_qp_quanta instead, and change the size argument for readability, matching the comment above it.
--- drivers/infiniband/hw/irdma/uk.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/infiniband/hw/irdma/uk.c +6 -4
@@ -93,16 +93,18 @@ static int irdma_nop_1(struct irdma_qp_uk *qp)*/ void irdma_clr_wqes (struct irdma_qp_uk *qp,u32 qp_wqe_idx) { -__le64 *wqe; +struct irdma_qp_quanta *sq;u32 wqe_idx;if (!(qp_wqe_idx &0x7F )) { wqe_idx = (qp_wqe_idx +128 ) % qp->sq_ring.size; - wqe = qp->sq_base[wqe_idx].elem; + sq = qp->sq_base + wqe_idx;if (wqe_idx) -memset (wqe, qp->swqe_polarity ?0 :0xFF ,0x1000 ); +memset (sq, qp->swqe_polarity ?0 :0xFF , +128 *sizeof (*sq));else -memset (wqe, qp->swqe_polarity ?0xFF :0 ,0x1000 ); +memset (sq, qp->swqe_polarity ?0xFF :0 , +128 *sizeof (*sq)); } }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 259/431 IB/hfi1: Fix wrong mmu_node used for user SDMA packet after invalidate
In reply to Greg Kroah-HartmanFrom: Brendan Cunningham <[email protected]>
[ Upstream commit c9358de193ecfb360c3ce75f27ce839ca0b0bc8c ]
The hfi1 user SDMA pinned-page cache will leave a stale cache entry when the cache-entry's virtual address range is invalidated but that cache entry is in-use by an outstanding SDMA request.
Subsequent user SDMA requests with buffers in or spanning the virtual address range of the stale cache entry will result in packets constructed from the wrong memory, the physical pages pointed to by the stale cache entry.
To fix this, remove mmu_rb_node cache entries from the mmu_rb_handler cache independent of the cache entry's refcount. Add 'struct kref refcount' to struct mmu_rb_node and manage mmu_rb_node lifetime with kref_get() and kref_put().
mmu_rb_node.refcount makes sdma_mmu_node.refcount redundant. Remove 'atomic_t refcount' from struct sdma_mmu_node and change sdma_mmu_node code to use mmu_rb_node.refcount.
Move the mmu_rb_handler destructor call after a wait-for-SDMA-request-completion call so mmu_rb_nodes that need mmu_rb_handler's workqueue to queue themselves up for destruction from an interrupt context may do so.
--- drivers/infiniband/hw/hfi1/ipoib_tx.c | 4 +- drivers/infiniband/hw/hfi1/mmu_rb.c | 101 ++++++++++------- drivers/infiniband/hw/hfi1/mmu_rb.h | 3 + drivers/infiniband/hw/hfi1/sdma.c | 23 +++- drivers/infiniband/hw/hfi1/sdma.h | 47 +++++--- drivers/infiniband/hw/hfi1/sdma_txreq.h | 2 + drivers/infiniband/hw/hfi1/user_sdma.c | 137 ++++++++++-------------- drivers/infiniband/hw/hfi1/user_sdma.h | 1 - drivers/infiniband/hw/hfi1/vnic_sdma.c | 4 +- 9 files changed, 177 insertions(+), 145 deletions(-)
drivers/infiniband/hw/hfi1/ipoib_tx.c +2 -2
@@ -215,11 +215,11 @@ static int hfi1_ipoib_build_ulp_payload(struct ipoib_txreq *tx,const skb_frag_t *frag = &skb_shinfo (skb)->frags[i]; ret =sdma_txadd_page (dd, -NULL , txreq,skb_frag_page (frag), frag->bv_offset, -skb_frag_size (frag)); +skb_frag_size (frag), +NULL ,NULL ,NULL );if (unlikely (ret))break ; }
drivers/infiniband/hw/hfi1/mmu_rb.c +63 -38
165 lines not on this page · raw message
drivers/infiniband/hw/hfi1/mmu_rb.h +3 -0
@@ -16,6 +16,7 @@ struct mmu_rb_node {struct rb_node node;struct mmu_rb_handler *handler;struct list_head list; +struct kref refcount; };/*
@@ -51,6 +52,8 @@ int hfi1_mmu_rb_register(void *ops_arg,void hfi1_mmu_rb_unregister (struct mmu_rb_handler *handler);int hfi1_mmu_rb_insert (struct mmu_rb_handler *handler,struct mmu_rb_node *mnode); +void hfi1_mmu_rb_release (struct kref *refcount); +void hfi1_mmu_rb_evict (struct mmu_rb_handler *handler,void *evict_arg); struct mmu_rb_node *hfi1_mmu_rb_get_first(struct mmu_rb_handler *handler, unsigned long addr,
drivers/infiniband/hw/hfi1/sdma.c +18 -5
@@ -1593,7 +1593,20 @@ static inline void sdma_unmap_desc(struct hfi1_devdata *dd, struct sdma_desc *descp) { -system_descriptor_complete (dd ,descp ); + switch (sdma_mapping_type(descp)) { + case SDMA_MAP_SINGLE: + dma_unmap_single(&dd->pcidev->dev, sdma_mapping_addr(descp), +sdma_mapping_len (descp ),DMA_TO_DEVICE ); +break ; +case SDMA_MAP_PAGE : +dma_unmap_page (&dd->pcidev->dev,sdma_mapping_addr (descp), +sdma_mapping_len (descp),DMA_TO_DEVICE ); +break ; + } + +if (descp->pinning_ctx && descp->ctx_put) + descp->ctx_put (descp->pinning_ctx); + descp->pinning_ctx =NULL ; }/*
@@ -3113,8 +3126,8 @@ int ext_coal_sdma_tx_descs(struct hfi1_devdata *dd, struct sdma_txreq *tx,/* Add descriptor for coalesce buffer */ tx->desc_limit =MAX_DESC ; -return _sdma_txadd_daddr (dd,SDMA_MAP_SINGLE ,NULL , tx, - addr, tx->tlen); +return _sdma_txadd_daddr (dd,SDMA_MAP_SINGLE , tx, + addr, tx->tlen,NULL ,NULL ,NULL ); }return 1 ;
@@ -3157,9 +3170,9 @@ int _pad_sdma_tx_descs(struct hfi1_devdata *dd, struct sdma_txreq *tx)make_tx_sdma_desc ( tx,SDMA_MAP_NONE , -NULL , dd->sdma_pad_phys, -sizeof (u32) - (tx->packet_len & (sizeof (u32) -1 ))); +sizeof (u32) - (tx->packet_len & (sizeof (u32) -1 )), +NULL ,NULL ,NULL ); tx->num_desc++;_sdma_close_tx (dd, tx);return rval;
drivers/infiniband/hw/hfi1/sdma.h +32 -15
116 lines not on this page · raw message
drivers/infiniband/hw/hfi1/sdma_txreq.h +2 -0
@@ -20,6 +20,8 @@ struct sdma_desc {/* private: don't use directly */ u64 qw[2 ];void *pinning_ctx; +/* Release reference to @pinning_ctx. May be called in interrupt context. Must not sleep. */ +void (*ctx_put)(void *ctx); };/**
drivers/infiniband/hw/hfi1/user_sdma.c +55 -82
253 lines not on this page · raw message
drivers/infiniband/hw/hfi1/user_sdma.h +0 -1
@@ -104,7 +104,6 @@ struct hfi1_user_sdma_comp_q {struct sdma_mmu_node {struct mmu_rb_node rb;struct hfi1_user_sdma_pkt_q *pq; -atomic_t refcount;struct page **pages;unsigned int npages; };
drivers/infiniband/hw/hfi1/vnic_sdma.c +2 -2
@@ -64,11 +64,11 @@ static noinline int build_vnic_ulp_payload(struct sdma_engine *sde,/* combine physically continuous fragments later? */ ret =sdma_txadd_page (sde->dd, -NULL , &tx->txreq,skb_frag_page (frag),skb_frag_off (frag), -skb_frag_size (frag)); +skb_frag_size (frag), +NULL ,NULL ,NULL );if (unlikely (ret)) goto bail_txadd; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 260/431 RDMA/hns: Fix hns_roce_table_get return value
In reply to Greg Kroah-HartmanFrom: Chengchang Tang <[email protected]>
[ Upstream commit cf5b608fb0e369c473a8303cad6ddb386505e5b8 ]
The return value of set_hem has been fixed to ENODEV, which will lead a diagnostic information missing.
--- drivers/infiniband/hw/hns/hns_roce_hem.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/infiniband/hw/hns/hns_roce_hem.c +4 -3
@@ -595,11 +595,12 @@ int hns_roce_table_get(struct hns_roce_dev *hr_dev, }/* Set HEM base address(128K/page, pa) to Hardware */ -if (hr_dev->hw->set_hem (hr_dev, table, obj,HEM_HOP_STEP_DIRECT )) { + ret = hr_dev->hw->set_hem (hr_dev, table, obj,HEM_HOP_STEP_DIRECT ); +if (ret) {hns_roce_free_hem (hr_dev, table->hem[i]); table->hem[i] =NULL ; - ret = -ENODEV ; -dev_err (dev,"set HEM base address to HW failed.\n" ); +dev_err (dev,"set HEM base address to HW failed, ret = %d.\n" , + ret); goto out; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 261/431 ARM: dts: iwg20d-q7-common: Fix backlight pwm specifier
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 0501fdec106a291c43b3c1b525cf22ab4c24b2d8 ]
make dtbs_check:
arch/arm/boot/dts/renesas/r8a7743-iwg20d-q7.dtb: backlight: pwms: [[58, 0, 5000000], [0]] is too long
From schema: Documentation/devicetree/bindings/leds/backlight/pwm-backlight.yaml
arch/arm/boot/dts/renesas/r8a7743-iwg20d-q7-dbcm-ca.dtb: backlight: pwms: [[67, 0, 5000000], [0]] is too long
From schema: Documentation/devicetree/bindings/leds/backlight/pwm-backlight.yaml
arch/arm/boot/dts/renesas/r8a7744-iwg20d-q7-dbcm-ca.dtb: backlight: pwms: [[67, 0, 5000000], [0]] is too long
From schema: Documentation/devicetree/bindings/leds/backlight/pwm-backlight.yaml
arch/arm/boot/dts/renesas/r8a7744-iwg20d-q7.dtb: backlight: pwms: [[58, 0, 5000000], [0]] is too long
From schema: Documentation/devicetree/bindings/leds/backlight/pwm-backlight.yaml
PWM specifiers referring to R-Car PWM Timer Controllers should contain only two cells.
Fix this by dropping the bogus third cell.
--- arch/arm/boot/dts/iwg20d-q7-common.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/iwg20d-q7-common.dtsi +1 -1
@@ -49,7 +49,7 @@ audio_clock: audio_clock { lcd_backlight: backlight { compatible = "pwm-backlight"; - pwms = <&pwm3 0 5000000 0>; + pwms = <&pwm3 0 5000000>; brightness-levels = <0 4 8 16 32 64 128 255>; default-brightness-level = <7>; enable-gpios = <&gpio5 14 GPIO_ACTIVE_HIGH>;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 262/431 arm64: dts: renesas: ulcb-kf: Remove flow control for SCIF1
In reply to Greg Kroah-HartmanFrom: Wolfram Sang <[email protected]>
[ Upstream commit 1a2c4e5635177939a088d22fa35c6a7032725663 ]
The schematics are misleading, the flow control is for HSCIF1. We need SCIF1 for GNSS/GPS which does not use flow control.
--- arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/arm64/boot/dts/renesas/ulcb-kf.dtsi +1 -2
@@ -367,7 +367,7 @@ hscif0_pins: hscif0 { }; scif1_pins: scif1 { - groups = "scif1_data_b", "scif1_ctrl"; + groups = "scif1_data_b"; function = "scif1"; };
@@ -397,7 +397,6 @@ &sound_clk_pins &scif1 { pinctrl-0 = <&scif1_pins>; pinctrl-names = "default"; - uart-has-rtscts; status = "okay"; };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 263/431 drm/msm/dpu: set DSC flush bit correctly at MDP CTL flush register
In reply to Greg Kroah-HartmanFrom: Kuogee Hsieh <[email protected]>
[ Upstream commit 12cef323c903bd8b13d1f6ff24a9695c2cdc360b ]
The CTL_FLUSH register should be programmed with the 22th bit (DSC_IDX) to flush the DSC hardware blocks, not the literal value of 22 (which corresponds to flushing VIG1, VIG2 and RGB1 instead).
Changes in V12:
-- split this patch out of "separate DSC flush update out of interface"
Changes in V13:
-- rewording the commit text
Changes in V14:
-- drop 'DSC" from "The DSC CTL_FLUSH register" at commit text
Patchwork: https://patchwork.freedesktop.org/patch/539496/
--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +1 -1
@@ -505,7 +505,7 @@ static void dpu_hw_ctl_intf_cfg_v1(struct dpu_hw_ctl *ctx,DPU_REG_WRITE (c,CTL_MERGE_3D_ACTIVE ,BIT (cfg->merge_3d -MERGE_3D_0 ));if (cfg->dsc) { -DPU_REG_WRITE (&ctx->hw,CTL_FLUSH ,DSC_IDX ); +DPU_REG_WRITE (&ctx->hw,CTL_FLUSH ,BIT (DSC_IDX ));DPU_REG_WRITE (c,CTL_DSC_ACTIVE , cfg->dsc); } }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 264/431 drm/msm/dpu: always clear every individual pending flush mask
In reply to Greg Kroah-HartmanFrom: Kuogee Hsieh <[email protected]>
[ Upstream commit 625cbb077007698060b12d0ae5657a4d8411b153 ]
There are two tiers of pending flush control, top level and individual hardware block. Currently only the top level of flush mask is reset to 0 but the individual pending flush masks of particular hardware blocks are left at their previous values, eventually accumulating all possible bit values and typically flushing more than necessary.
Reset all individual hardware block flush masks to 0 to avoid accidentally flushing them.
Changes in V13:
-- rewording commit text
-- add an empty space line as suggested
Changes in V14:
-- add Fixes tag
Patchwork: https://patchwork.freedesktop.org/patch/539508/
--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +3 -0
@@ -115,6 +115,9 @@ static inline void dpu_hw_ctl_clear_pending_flush(struct dpu_hw_ctl *ctx)trace_dpu_hw_ctl_clear_pending_flush (ctx->pending_flush_mask,dpu_hw_ctl_get_flush_register (ctx)); ctx->pending_flush_mask =0x0 ; + ctx->pending_intf_flush_mask =0 ; + ctx->pending_wb_flush_mask =0 ; + ctx->pending_merge_3d_flush_mask =0 ; } static inline void dpu_hw_ctl_update_pending_flush(struct dpu_hw_ctl *ctx,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 265/431 fbdev: omapfb: lcd_mipid: Fix an error handling path in mipid_spi_probe()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 79a3908d1ea6c35157a6d907b1a9d8ec06015e7a ]
If 'mipid_detect()' fails, we must free 'md' to avoid a memory leak.
--- drivers/video/fbdev/omap/lcd_mipid.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/video/fbdev/omap/lcd_mipid.c +5 -1
@@ -563,11 +563,15 @@ static int mipid_spi_probe(struct spi_device *spi) r =mipid_detect (md);if (r <0 ) -return r; + goto free_md;omapfb_register_panel (&md->panel);return 0 ; + +free_md: +kfree (md); +return r; }static void mipid_spi_remove (struct spi_device *spi)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 266/431 arm64: dts: ti: k3-j7200: Fix physical address of pin
In reply to Greg Kroah-HartmanFrom: Keerthy <[email protected]>
[ Upstream commit 3d011933000ed9054c649952d83162d24f020a93 ]
wkup_pmx splits into multiple regions. Like
wkup_pmx0 -> 13 pins (WKUP_PADCONFIG 0 - 12)
wkup_pmx1 -> 2 pins (WKUP_PADCONFIG 14 - 15)
wkup_pmx2 -> 59 pins (WKUP_PADCONFIG 26 - 84)
wkup_pmx3 -> 8 pins (WKUP_PADCONFIG 93 - 100)With this split, pin offset needs to be adjusted to match with new pmx for all pins above wkup_pmx0.
Example a pin under wkup_pmx1 should start from 0 instead of old offset(0x38 WKUP_PADCONFIG 14 offset)
J7200 Datasheet (Table 6-106, Section 6.4 Pin Multiplexing) :
https://www.ti.com/lit/ds/symlink/dra821u.pdf
--- .../dts/ti/k3-j7200-common-proc-board.dts | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-)
arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts +14 -14
@@ -83,25 +83,25 @@ vdd_sd_dv: gpio-regulator-TLV71033 { &wkup_pmx2 { mcu_cpsw_pins_default: mcu-cpsw-pins-default { pinctrl-single,pins = < - J721E_WKUP_IOPAD(0x0068, PIN_OUTPUT, 0) /* MCU_RGMII1_TX_CTL */ - J721E_WKUP_IOPAD(0x006c, PIN_INPUT, 0) /* MCU_RGMII1_RX_CTL */ - J721E_WKUP_IOPAD(0x0070, PIN_OUTPUT, 0) /* MCU_RGMII1_TD3 */ - J721E_WKUP_IOPAD(0x0074, PIN_OUTPUT, 0) /* MCU_RGMII1_TD2 */ - J721E_WKUP_IOPAD(0x0078, PIN_OUTPUT, 0) /* MCU_RGMII1_TD1 */ - J721E_WKUP_IOPAD(0x007c, PIN_OUTPUT, 0) /* MCU_RGMII1_TD0 */ - J721E_WKUP_IOPAD(0x0088, PIN_INPUT, 0) /* MCU_RGMII1_RD3 */ - J721E_WKUP_IOPAD(0x008c, PIN_INPUT, 0) /* MCU_RGMII1_RD2 */ - J721E_WKUP_IOPAD(0x0090, PIN_INPUT, 0) /* MCU_RGMII1_RD1 */ - J721E_WKUP_IOPAD(0x0094, PIN_INPUT, 0) /* MCU_RGMII1_RD0 */ - J721E_WKUP_IOPAD(0x0080, PIN_OUTPUT, 0) /* MCU_RGMII1_TXC */ - J721E_WKUP_IOPAD(0x0084, PIN_INPUT, 0) /* MCU_RGMII1_RXC */ + J721E_WKUP_IOPAD(0x0000, PIN_OUTPUT, 0) /* MCU_RGMII1_TX_CTL */ + J721E_WKUP_IOPAD(0x0004, PIN_INPUT, 0) /* MCU_RGMII1_RX_CTL */ + J721E_WKUP_IOPAD(0x0008, PIN_OUTPUT, 0) /* MCU_RGMII1_TD3 */ + J721E_WKUP_IOPAD(0x000c, PIN_OUTPUT, 0) /* MCU_RGMII1_TD2 */ + J721E_WKUP_IOPAD(0x0010, PIN_OUTPUT, 0) /* MCU_RGMII1_TD1 */ + J721E_WKUP_IOPAD(0x0014, PIN_OUTPUT, 0) /* MCU_RGMII1_TD0 */ + J721E_WKUP_IOPAD(0x0020, PIN_INPUT, 0) /* MCU_RGMII1_RD3 */ + J721E_WKUP_IOPAD(0x0024, PIN_INPUT, 0) /* MCU_RGMII1_RD2 */ + J721E_WKUP_IOPAD(0x0028, PIN_INPUT, 0) /* MCU_RGMII1_RD1 */ + J721E_WKUP_IOPAD(0x002c, PIN_INPUT, 0) /* MCU_RGMII1_RD0 */ + J721E_WKUP_IOPAD(0x0018, PIN_OUTPUT, 0) /* MCU_RGMII1_TXC */ + J721E_WKUP_IOPAD(0x001c, PIN_INPUT, 0) /* MCU_RGMII1_RXC */ >; }; mcu_mdio_pins_default: mcu-mdio1-pins-default { pinctrl-single,pins = < - J721E_WKUP_IOPAD(0x009c, PIN_OUTPUT, 0) /* (L1) MCU_MDIO0_MDC */ - J721E_WKUP_IOPAD(0x0098, PIN_INPUT, 0) /* (L4) MCU_MDIO0_MDIO */ + J721E_WKUP_IOPAD(0x0034, PIN_OUTPUT, 0) /* (L1) MCU_MDIO0_MDC */ + J721E_WKUP_IOPAD(0x0030, PIN_INPUT, 0) /* (L4) MCU_MDIO0_MDIO */ >; }; };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 267/431 Input: pm8941-powerkey - fix debounce on gen2+ PMICs
In reply to Greg Kroah-HartmanFrom: Caleb Connolly <[email protected]>
[ Upstream commit 8c9cce9cb81b5fdc6e66bf3f129727b89e8daab7 ]
Since PM8998/PM660, the power key debounce register was redefined to support shorter debounce times. On PM8941 the shortest debounce time (represented by register value 0) was 15625us, on PM8998 the shortest debounce time is 62us, with the default being 2ms.
Adjust the bit shift to correctly program debounce on PM8998 and newer.
--- drivers/input/misc/pm8941-pwrkey.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
drivers/input/misc/pm8941-pwrkey.c +15 -4
@@ -50,7 +50,10 @@#define PON_RESIN_PULL_UP BIT(0)#define PON_DBC_CTL 0x71 -#define PON_DBC_DELAY_MASK 0x7 +#define PON_DBC_DELAY_MASK_GEN1 0x7 +#define PON_DBC_DELAY_MASK_GEN2 0xf +#define PON_DBC_SHIFT_GEN1 6 +#define PON_DBC_SHIFT_GEN2 14struct pm8941_data {unsigned int pull_up_bit;
@@ -247,7 +250,7 @@ static int pm8941_pwrkey_probe(struct platform_device *pdev)struct device *parent;struct device_node *regmap_node;const __be32 *addr; -u32 req_delay; +u32 req_delay, mask, delay_shift;int error;if (of_property_read_u32 (pdev->dev.of_node,"debounce" , &req_delay))
@@ -336,12 +339,20 @@ static int pm8941_pwrkey_probe(struct platform_device *pdev) pwrkey->input->phys = pwrkey->data->phys;if (pwrkey->data->supports_debounce_config) { - req_delay = (req_delay <<6 ) /USEC_PER_SEC ; +if (pwrkey->subtype >=PON_SUBTYPE_GEN2_PRIMARY ) { + mask =PON_DBC_DELAY_MASK_GEN2 ; + delay_shift =PON_DBC_SHIFT_GEN2 ; + }else { + mask =PON_DBC_DELAY_MASK_GEN1 ; + delay_shift =PON_DBC_SHIFT_GEN1 ; + } + + req_delay = (req_delay << delay_shift) /USEC_PER_SEC ; req_delay =ilog2 (req_delay); error =regmap_update_bits (pwrkey->regmap, pwrkey->baseaddr +PON_DBC_CTL , -PON_DBC_DELAY_MASK , + mask, req_delay);if (error) { dev_err(&pdev->dev, "failed to set debounce: %d\n",
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 268/431 ARM: dts: stm32: Fix audio routing on STM32MP15xx DHCOM PDK2
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit e3f2778b1b6ced649bffdc7cbb05b80bb92f2108 ]
The audio routing flow is not correct, the flow should be from source (second element in the pair) to sink (first element in the pair). The flow now is from "HP_OUT" to "Playback", where "Playback" is source and "HP_OUT" is sink, i.e. the direction is swapped and there is no direct link between the two either.
Fill in the correct routing, where "HP_OUT" supplies the "Headphone Jack", "Line In Jack" supplies "LINE_IN" input, "Microphone Jack" supplies "MIC_IN" input and "Mic Bias" supplies "Microphone Jack".
--- arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi +7 -4
@@ -137,10 +137,13 @@ reg_panel_supply: regulator-panel-supply { sound { compatible = "audio-graph-card"; - routing = - "MIC_IN", "Capture", - "Capture", "Mic Bias", - "Playback", "HP_OUT"; + widgets = "Headphone", "Headphone Jack", + "Line", "Line In Jack", + "Microphone", "Microphone Jack"; + routing = "Headphone Jack", "HP_OUT", + "LINE_IN", "Line In Jack", + "MIC_IN", "Microphone Jack", + "Microphone Jack", "Mic Bias"; dais = <&sai2a_port &sai2b_port>; status = "okay"; };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 269/431 ARM: dts: stm32: fix i2s endpoint format property for stm32mp15xx-dkx
In reply to Greg Kroah-HartmanFrom: Olivier Moysan <[email protected]>
[ Upstream commit 076c74c592cabe4a47537fe5205b5b678bed010d ]
Use "dai-format" to configure DAI audio format as specified in audio-graph-port.yaml bindings.
--- arch/arm/boot/dts/stm32mp15xx-dkx.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/stm32mp15xx-dkx.dtsi +1 -1
@@ -438,7 +438,7 @@ &i2s2 { i2s2_port: port { i2s2_endpoint: endpoint { remote-endpoint = <&sii9022_tx_endpoint>; - format = "i2s"; + dai-format = "i2s"; mclk-fs = <256>; }; };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 270/431 hwmon: (gsc-hwmon) fix fan pwm temperature scaling
In reply to Greg Kroah-HartmanFrom: Tim Harvey <[email protected]>
[ Upstream commit a6d80df47ee2c69db99e4f2f8871aa4db154620b ]
The GSC fan pwm temperature register is in centidegrees celcius but the Linux hwmon convention is to use milidegrees celcius. Fix the scaling.
--- drivers/hwmon/gsc-hwmon.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/hwmon/gsc-hwmon.c +3 -3
@@ -82,8 +82,8 @@ static ssize_t pwm_auto_point_temp_store(struct device *dev,if (kstrtol (buf,10 , &temp))return -EINVAL ; - temp =clamp_val (temp,0 ,10000 ); - temp =DIV_ROUND_CLOSEST (temp,10 ); + temp =clamp_val (temp,0 ,100000 ); + temp =DIV_ROUND_CLOSEST (temp,100 ); regs[0 ] = temp &0xff ; regs[1 ] = (temp >>8 ) &0xff ;
@@ -100,7 +100,7 @@ static ssize_t pwm_auto_point_pwm_show(struct device *dev, {struct sensor_device_attribute *attr =to_sensor_dev_attr (devattr); -return sprintf (buf,"%d\n" ,255 * (50 + (attr->index *10 )) /100 ); +return sprintf (buf,"%d\n" ,255 * (50 + (attr->index *10 ))); } static SENSOR_DEVICE_ATTR_RO(pwm1_auto_point1_pwm, pwm_auto_point_pwm, 0);
Signature · 1 line
2.39.2