ARM: dts: sun8i-a83t-tbs-a711: HM5065 doesn't like such a high voltage
Subsystems (5)
Sasha Levin
maintainerPATCH 1/13 ARM: dts: sun8i-a83t-tbs-a711: HM5065 doesn't like such a high voltage
From: Ondrej Jirman <[email protected]>
[ Upstream commit a40550952c000667b20082d58077bc647da6c890 ]
Lowering the voltage solves the quick image degradation over time (minutes), that was probably caused by overheating.
--- arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts +2 -2
@@ -318,8 +318,8 @@ }; ®_dldo3 { - regulator-min-microvolt = <2800000>; - regulator-max-microvolt = <2800000>; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; regulator-name = "vdd-csi"; };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 2/13 bus: sunxi-rsb: Return correct data when mixing 16-bit and 8-bit reads
From: Ondrej Jirman <[email protected]>
[ Upstream commit a43ab30dcd4a1abcdd0d2461bf1cf7c0817f6cd3 ]
When doing a 16-bit read that returns data in the MSB byte, the RSB_DATA register will keep the MSB byte unchanged when doing the following 8-bit read. sunxi_rsb_read() will then return a result that contains high byte from 16-bit read mixed with the 8-bit result.
The consequence is that after this happens the PMIC's regmap will look like this: (0x33 is the high byte from the 16-bit read)
% cat /sys/kernel/debug/regmap/sunxi-rsb-3a3/registers 00: 33
01: 33
02: 33
03: 33
04: 33
05: 33
06: 33
07: 33
08: 33
09: 33
0a: 33
0b: 33
0c: 33
0d: 33
0e: 33
[snip]
Fix this by masking the result of the read with the correct mask based on the size of the read. There are no 16-bit users in the mainline kernel, so this doesn't need to get into the stable tree.
--- drivers/bus/sunxi-rsb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/bus/sunxi-rsb.c +1 -1
@@ -345,7 +345,7 @@ static int sunxi_rsb_read(struct sunxi_rsb *rsb, u8 rtaddr, u8 addr,if (ret) goto unlock; - *buf =readl (rsb->regs +RSB_DATA ); + *buf =readl (rsb->regs +RSB_DATA ) &GENMASK (len *8 -1 ,0 ); unlock:mutex_unlock (&rsb->lock);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 3/13 rxrpc: Abstract out the calculation of whether there's Tx space
In reply to Sasha LevinFrom: David Howells <[email protected]>
[ Upstream commit 158fe6665389964a1de212818b4a5c52b7f7aff4 ]
Abstract out the calculation of there being sufficient Tx buffer space. This is reproduced several times in the rxrpc sendmsg code.
--- net/rxrpc/sendmsg.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-)
net/rxrpc/sendmsg.c +18 -9
@@ -21,6 +21,21 @@#include <net/af_rxrpc.h> #include "ar-internal.h" +/* +* Return true if there's sufficient Tx queue space. +*/ +static bool rxrpc_check_tx_space (struct rxrpc_call *call,rxrpc_seq_t *_tx_win) +{ +unsigned int win_size = + min_t(unsigned int, call->tx_winsize, + call->cong_cwnd + call->cong_extra); +rxrpc_seq_t tx_win =READ_ONCE (call->tx_hard_ack); + +if (_tx_win) + *_tx_win = tx_win; +return call->tx_top - tx_win < win_size; +} +/* * Wait for space to appear in the Tx queue or a signal to occur. */
@@ -30,9 +45,7 @@ static int rxrpc_wait_for_tx_window_intr(struct rxrpc_sock *rx, {for (;;) {set_current_state (TASK_INTERRUPTIBLE ); -if (call->tx_top - call->tx_hard_ack < - min_t(unsigned int, call->tx_winsize, - call->cong_cwnd + call->cong_extra)) +if (rxrpc_check_tx_space (call,NULL ))return 0 ;if (call->state >=RXRPC_CALL_COMPLETE )
@@ -72,9 +85,7 @@ static int rxrpc_wait_for_tx_window_nonintr(struct rxrpc_sock *rx,set_current_state (TASK_UNINTERRUPTIBLE ); tx_win =READ_ONCE (call->tx_hard_ack); -if (call->tx_top - tx_win < - min_t(unsigned int, call->tx_winsize, - call->cong_cwnd + call->cong_extra)) +if (rxrpc_check_tx_space (call, &tx_win))return 0 ;if (call->state >=RXRPC_CALL_COMPLETE )
@@ -305,9 +316,7 @@ static int rxrpc_send_data(struct rxrpc_sock *rx,_debug ("alloc" ); -if (call->tx_top - call->tx_hard_ack >= - min_t(unsigned int, call->tx_winsize, - call->cong_cwnd + call->cong_extra)) { +if (!rxrpc_check_tx_space (call,NULL )) { ret = -EAGAIN ;if (msg->msg_flags &MSG_DONTWAIT ) goto maybe_error;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 4/13 rxrpc: Fix sendmsg(MSG_WAITALL) handling
In reply to Sasha LevinFrom: David Howells <[email protected]>
[ Upstream commit 498b577660f08cef5d9e78e0ed6dcd4c0939e98c ]
Fix the handling of sendmsg() with MSG_WAITALL for userspace to round the timeout for when a signal occurs up to at least two jiffies as a 1 jiffy timeout may end up being effectively 0 if jiffies wraps at the wrong time.
--- net/rxrpc/sendmsg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/rxrpc/sendmsg.c +2 -2
@@ -75,8 +75,8 @@ static int rxrpc_wait_for_tx_window_nonintr(struct rxrpc_sock *rx, rtt =READ_ONCE (call->peer->rtt); rtt2 =nsecs_to_jiffies64 (rtt) *2 ; -if (rtt2 <1 ) - rtt2 =1 ; +if (rtt2 <2 ) + rtt2 =2 ; timeout = rtt2; tx_start =READ_ONCE (call->tx_hard_ack);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 5/13 net: vxge: fix wrong __VA_ARGS__ usage
In reply to Sasha LevinFrom: Zheng Wei <[email protected]>
[ Upstream commit b317538c47943f9903860d83cc0060409e12d2ff ]
printk in macro vxge_debug_ll uses __VA_ARGS__ without "##" prefix, it causes a build error when there is no variable arguments(e.g. only fmt is specified.).
--- drivers/net/ethernet/neterion/vxge/vxge-config.h | 2 +- drivers/net/ethernet/neterion/vxge/vxge-main.h | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-)
drivers/net/ethernet/neterion/vxge/vxge-config.h +1 -1
@@ -2065,7 +2065,7 @@ vxge_hw_vpath_strip_fcs_check(struct __vxge_hw_device *hldev, u64 vpath_mask);if ((level >=VXGE_ERR &&VXGE_COMPONENT_LL &VXGE_DEBUG_ERR_MASK ) || \ (level >=VXGE_TRACE &&VXGE_COMPONENT_LL &VXGE_DEBUG_TRACE_MASK ))\if ((mask &VXGE_DEBUG_MASK ) == mask) \ -printk (fmt"\n" , __VA_ARGS__); \ + printk(fmt "\n", ##__VA_ARGS__); \ } while (0) #else#define vxge_debug_ll (level, mask, fmt, ...)
drivers/net/ethernet/neterion/vxge/vxge-main.h +7 -7
@@ -452,49 +452,49 @@ int vxge_fw_upgrade(struct vxgedev *vdev, char *fw_name, int override);#if (VXGE_DEBUG_LL_CONFIG &VXGE_DEBUG_MASK )#define vxge_debug_ll_config (level, fmt, ...) \ - vxge_debug_ll(level, VXGE_DEBUG_LL_CONFIG, fmt, __VA_ARGS__) + vxge_debug_ll(level, VXGE_DEBUG_LL_CONFIG, fmt, ##__VA_ARGS__)#else #define vxge_debug_ll_config (level, fmt, ...)#endif #if (VXGE_DEBUG_INIT &VXGE_DEBUG_MASK )#define vxge_debug_init (level, fmt, ...) \ - vxge_debug_ll(level, VXGE_DEBUG_INIT, fmt, __VA_ARGS__) + vxge_debug_ll(level, VXGE_DEBUG_INIT, fmt, ##__VA_ARGS__)#else #define vxge_debug_init (level, fmt, ...)#endif #if (VXGE_DEBUG_TX &VXGE_DEBUG_MASK )#define vxge_debug_tx (level, fmt, ...) \ - vxge_debug_ll(level, VXGE_DEBUG_TX, fmt, __VA_ARGS__) + vxge_debug_ll(level, VXGE_DEBUG_TX, fmt, ##__VA_ARGS__)#else #define vxge_debug_tx (level, fmt, ...)#endif #if (VXGE_DEBUG_RX &VXGE_DEBUG_MASK )#define vxge_debug_rx (level, fmt, ...) \ - vxge_debug_ll(level, VXGE_DEBUG_RX, fmt, __VA_ARGS__) + vxge_debug_ll(level, VXGE_DEBUG_RX, fmt, ##__VA_ARGS__)#else #define vxge_debug_rx (level, fmt, ...)#endif #if (VXGE_DEBUG_MEM &VXGE_DEBUG_MASK )#define vxge_debug_mem (level, fmt, ...) \ - vxge_debug_ll(level, VXGE_DEBUG_MEM, fmt, __VA_ARGS__) + vxge_debug_ll(level, VXGE_DEBUG_MEM, fmt, ##__VA_ARGS__)#else #define vxge_debug_mem (level, fmt, ...)#endif #if (VXGE_DEBUG_ENTRYEXIT &VXGE_DEBUG_MASK )#define vxge_debug_entryexit (level, fmt, ...) \ - vxge_debug_ll(level, VXGE_DEBUG_ENTRYEXIT, fmt, __VA_ARGS__) + vxge_debug_ll(level, VXGE_DEBUG_ENTRYEXIT, fmt, ##__VA_ARGS__)#else #define vxge_debug_entryexit (level, fmt, ...)#endif #if (VXGE_DEBUG_INTR &VXGE_DEBUG_MASK )#define vxge_debug_intr (level, fmt, ...) \ - vxge_debug_ll(level, VXGE_DEBUG_INTR, fmt, __VA_ARGS__) + vxge_debug_ll(level, VXGE_DEBUG_INTR, fmt, ##__VA_ARGS__)#else #define vxge_debug_intr (level, fmt, ...)#endif
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 6/13 hinic: fix a bug of waitting for IO stopped
In reply to Sasha LevinFrom: Luo bin <[email protected]>
[ Upstream commit 96758117dc528e6d84bd23d205e8cf7f31eda029 ]
it's unreliable for fw to check whether IO is stopped, so driver wait for enough time to ensure IO process is done in hw before freeing resources
--- .../net/ethernet/huawei/hinic/hinic_hw_dev.c | 51 +------------------ 1 file changed, 2 insertions(+), 49 deletions(-)
drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c +2 -49
@@ -370,50 +370,6 @@ static int wait_for_db_state(struct hinic_hwdev *hwdev)return -EFAULT ; } -static int wait_for_io_stopped (struct hinic_hwdev *hwdev) -{ -struct hinic_cmd_io_status cmd_io_status; -struct hinic_hwif *hwif = hwdev->hwif; -struct pci_dev *pdev = hwif->pdev; -struct hinic_pfhwdev *pfhwdev; -unsigned long end; -u16 out_size; -int err; - -if (!HINIC_IS_PF (hwif) && !HINIC_IS_PPF (hwif)) { -dev_err (&pdev->dev,"Unsupported PCI Function type\n" ); -return -EINVAL ; - } - - pfhwdev = container_of(hwdev, struct hinic_pfhwdev, hwdev); - - cmd_io_status.func_idx =HINIC_HWIF_FUNC_IDX (hwif); - - end = jiffies +msecs_to_jiffies (IO_STATUS_TIMEOUT ); -do { - err =hinic_msg_to_mgmt (&pfhwdev->pf_to_mgmt,HINIC_MOD_COMM , -HINIC_COMM_CMD_IO_STATUS_GET , - &cmd_io_status,sizeof (cmd_io_status), - &cmd_io_status, &out_size, -HINIC_MGMT_MSG_SYNC ); -if ((err) || (out_size !=sizeof (cmd_io_status))) { -dev_err (&pdev->dev,"Failed to get IO status, ret = %d\n" , - err); -return err; - } - -if (cmd_io_status.status ==IO_STOPPED ) { -dev_info (&pdev->dev,"IO stopped\n" ); -return 0 ; - } - -msleep (20 ); - }while (time_before (jiffies, end)); - -dev_err (&pdev->dev,"Wait for IO stopped - Timeout\n" ); -return -ETIMEDOUT ; -} -/** * clear_io_resource - set the IO resources as not active in the NIC * @hwdev: the NIC HW device
@@ -433,11 +389,8 @@ static int clear_io_resources(struct hinic_hwdev *hwdev)return -EINVAL ; } - err =wait_for_io_stopped (hwdev); -if (err) { -dev_err (&pdev->dev,"IO has not stopped yet\n" ); -return err; - } +/* sleep 100ms to wait for firmware stopping I/O */ +msleep (100 ); cmd_clear_io_res.func_idx =HINIC_HWIF_FUNC_IDX (hwif);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 7/13 hinic: fix wrong para of wait_for_completion_timeout
In reply to Sasha LevinFrom: Luo bin <[email protected]>
[ Upstream commit 0da7c322f116210ebfdda59c7da663a6fc5e9cc8 ]
the second input parameter of wait_for_completion_timeout should be jiffies instead of millisecond
--- drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.c | 3 ++- drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-)
drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.c +2 -1
@@ -398,7 +398,8 @@ static int cmdq_sync_cmd_direct_resp(struct hinic_cmdq *cmdq,spin_unlock_bh (&cmdq->cmdq_lock); -if (!wait_for_completion_timeout (&done,CMDQ_TIMEOUT )) { +if (!wait_for_completion_timeout (&done, +msecs_to_jiffies (CMDQ_TIMEOUT ))) {spin_lock_bh (&cmdq->cmdq_lock);if (cmdq->errcode[curr_prod_idx] == &errcode)
drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c +3 -2
@@ -52,7 +52,7 @@#define MSG_NOT_RESP 0xFFFF -#define MGMT_MSG_TIMEOUT 1000 +#define MGMT_MSG_TIMEOUT 5000#define mgmt_to_pfhwdev (pf_mgmt) \ container_of(pf_mgmt, struct hinic_pfhwdev, pf_to_mgmt)
@@ -276,7 +276,8 @@ static int msg_to_mgmt_sync(struct hinic_pf_to_mgmt *pf_to_mgmt, goto unlock_sync_msg; } -if (!wait_for_completion_timeout (recv_done,MGMT_MSG_TIMEOUT )) { +if (!wait_for_completion_timeout (recv_done, +msecs_to_jiffies (MGMT_MSG_TIMEOUT ))) {dev_err (&pdev->dev,"MGMT timeout, MSG id = %d\n" , msg_id); err = -ETIMEDOUT ; goto unlock_sync_msg;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 8/13 netfilter: nf_tables: Allow set back-ends to report partial overlaps on insertion
In reply to Sasha LevinFrom: Pablo Neira Ayuso <[email protected]>
[ Upstream commit 8c2d45b2b65ca1f215244be1c600236e83f9815f ]
Currently, the -EEXIST return code of ->insert() callbacks is ambiguous: it might indicate that a given element (including intervals) already exists as such, or that the new element would clash with existing ones.
If identical elements already exist, the front-end is ignoring this without returning error, in case NLM_F_EXCL is not set. However, if the new element can't be inserted due an overlap, we should report this to the user.
To this purpose, allow set back-ends to return -ENOTEMPTY on collision with existing elements, translate that to -EEXIST, and return that to userspace, no matter if NLM_F_EXCL was set.
--- net/netfilter/nf_tables_api.c | 5 +++++ 1 file changed, 5 insertions(+)
net/netfilter/nf_tables_api.c +5 -0
@@ -4527,6 +4527,11 @@ static int nft_add_set_elem(struct nft_ctx *ctx, struct nft_set *set, err = -EBUSY ; else if (!(nlmsg_flags & NLM_F_EXCL)) err =0 ; + }else if (err == -ENOTEMPTY ) { +/* ENOTEMPTY reports overlapping between this element +* and an existing one. +*/ + err = -EEXIST ; } goto err5; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 9/13 netfilter: nft_set_rbtree: Introduce and use nft_rbtree_interval_start()
In reply to Sasha LevinFrom: Stefano Brivio <[email protected]>
[ Upstream commit 6f7c9caf017be8ab0fe3b99509580d0793bf0833 ]
Replace negations of nft_rbtree_interval_end() with a new helper, nft_rbtree_interval_start(), wherever this helps to visualise the problem at hand, that is, for all the occurrences except for the comparison against given flags in __nft_rbtree_get().
This gets especially useful in the next patch.
--- net/netfilter/nft_set_rbtree.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
net/netfilter/nft_set_rbtree.c +11 -6
@@ -36,6 +36,11 @@ static bool nft_rbtree_interval_end(const struct nft_rbtree_elem *rbe) (*nft_set_ext_flags (&rbe->ext) &NFT_SET_ELEM_INTERVAL_END ); } +static bool nft_rbtree_interval_start (const struct nft_rbtree_elem *rbe) +{ +return !nft_rbtree_interval_end (rbe); +} +static bool nft_rbtree_equal (const struct nft_set *set,const void *this,const struct nft_rbtree_elem *interval) {
@@ -67,7 +72,7 @@ static bool __nft_rbtree_lookup(const struct net *net, const struct nft_set *setif (interval &&nft_rbtree_equal (set, this, interval) &&nft_rbtree_interval_end (rbe) && - !nft_rbtree_interval_end (interval)) +nft_rbtree_interval_start (interval))continue ; interval = rbe; }else if (d >0 )
@@ -92,7 +97,7 @@ static bool __nft_rbtree_lookup(const struct net *net, const struct nft_set *setif (set->flags &NFT_SET_INTERVAL && interval !=NULL &&nft_set_elem_active (&interval->ext, genmask) && - !nft_rbtree_interval_end (interval)) { +nft_rbtree_interval_start (interval)) { *ext = &interval->ext;return true; }
@@ -221,9 +226,9 @@ static int __nft_rbtree_insert(const struct net *net, const struct nft_set *set, p = &parent->rb_right; else {if (nft_rbtree_interval_end (rbe) && - !nft_rbtree_interval_end (new)) { +nft_rbtree_interval_start (new)) { p = &parent->rb_left; - }else if (!nft_rbtree_interval_end (rbe) && + }else if (nft_rbtree_interval_start (rbe) &&nft_rbtree_interval_end (new)) { p = &parent->rb_right; }else if (nft_set_elem_active (&rbe->ext, genmask)) {
@@ -314,10 +319,10 @@ static void *nft_rbtree_deactivate(const struct net *net, parent = parent->rb_right; else {if (nft_rbtree_interval_end (rbe) && - !nft_rbtree_interval_end (this)) { +nft_rbtree_interval_start (this)) { parent = parent->rb_left;continue ; - }else if (!nft_rbtree_interval_end (rbe) && + }else if (nft_rbtree_interval_start (rbe) &&nft_rbtree_interval_end (this)) { parent = parent->rb_right;continue ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 10/13 netfilter: nft_set_rbtree: Detect partial overlaps on insertion
In reply to Sasha LevinFrom: Stefano Brivio <[email protected]>
[ Upstream commit 7c84d41416d836ef7e533bd4d64ccbdf40c5ac70 ]
...and return -ENOTEMPTY to the front-end in this case, instead of proceeding. Currently, nft takes care of checking for these cases and not sending them to the kernel, but if we drop the set_overlap() call in nft we can end up in situations like:
# nft add table t
# nft add set t s '{ type inet_service ; flags interval ; }'
# nft add element t s '{ 1 - 5 }'
# nft add element t s '{ 6 - 10 }'
# nft add element t s '{ 4 - 7 }'
# nft list set t s
table ip t {
set s {
type inet_service
flags interval
elements = { 1-3, 4-5, 6-7 }
}
}This change has the primary purpose of making the behaviour consistent with nft_set_pipapo, but is also functional to avoid inconsistent behaviour if userspace sends overlapping elements for any reason.
v2: When we meet the same key data in the tree, as start element while
inserting an end element, or as end element while inserting a start element, actually check that the existing element is active, before resetting the overlap flag (Pablo Neira Ayuso)
--- net/netfilter/nft_set_rbtree.c | 70 ++++++++++++++++++++++++++++++++-- 1 file changed, 67 insertions(+), 3 deletions(-)
net/netfilter/nft_set_rbtree.c +67 -3
@@ -210,8 +210,43 @@ static int __nft_rbtree_insert(const struct net *net, const struct nft_set *set,u8 genmask =nft_genmask_next (net);struct nft_rbtree_elem *rbe;struct rb_node *parent, **p; +bool overlap = false;int d; +/* Detect overlaps as we descend the tree. Set the flag in these cases: +* +* a1. |__ _ _? >|__ _ _ (insert start after existing start) +* a2. _ _ __>| ?_ _ __| (insert end before existing end) +* a3. _ _ ___| ?_ _ _>| (insert end after existing end) +* a4. >|__ _ _ _ _ __| (insert start before existing end) +* +* and clear it later on, as we eventually reach the points indicated by +* '?' above, in the cases described below. We'll always meet these +* later, locally, due to tree ordering, and overlaps for the intervals +* that are the closest together are always evaluated last. +* +* b1. |__ _ _! >|__ _ _ (insert start after existing end) +* b2. _ _ __>| !_ _ __| (insert end before existing start) +* b3. !_____>| (insert end after existing start) +* +* Case a4. resolves to b1.: +* - if the inserted start element is the leftmost, because the '0' +* element in the tree serves as end element +* - otherwise, if an existing end is found. Note that end elements are +* always inserted after corresponding start elements. +* +* For a new, rightmost pair of elements, we'll hit cases b1. and b3., +* in that order. +* +* The flag is also cleared in two special cases: +* +* b4. |__ _ _!|<_ _ _ (insert start right before existing end) +* b5. |__ _ >|!__ _ _ (insert end right after existing start) +* +* which always happen as last step and imply that no further +* overlapping is possible. +*/ + parent =NULL ; p = &priv->root.rb_node;while (*p !=NULL ) {
@@ -220,17 +255,42 @@ static int __nft_rbtree_insert(const struct net *net, const struct nft_set *set, d =memcmp (nft_set_ext_key (&rbe->ext),nft_set_ext_key (&new->ext), set->klen); -if (d <0 ) +if (d <0 ) { p = &parent->rb_left; -else if (d >0 ) + +if (nft_rbtree_interval_start (new)) { + overlap =nft_rbtree_interval_start (rbe) && +nft_set_elem_active (&rbe->ext, + genmask); + }else { + overlap =nft_rbtree_interval_end (rbe) && +nft_set_elem_active (&rbe->ext, + genmask); + } + }else if (d >0 ) { p = &parent->rb_right; -else { + +if (nft_rbtree_interval_end (new)) { + overlap =nft_rbtree_interval_end (rbe) && +nft_set_elem_active (&rbe->ext, + genmask); + }else if (nft_rbtree_interval_end (rbe) && +nft_set_elem_active (&rbe->ext, genmask)) { + overlap = true; + } + }else {if (nft_rbtree_interval_end (rbe) &&nft_rbtree_interval_start (new)) { p = &parent->rb_left; + +if (nft_set_elem_active (&rbe->ext, genmask)) + overlap = false; }else if (nft_rbtree_interval_start (rbe) &&nft_rbtree_interval_end (new)) { p = &parent->rb_right; + +if (nft_set_elem_active (&rbe->ext, genmask)) + overlap = false; }else if (nft_set_elem_active (&rbe->ext, genmask)) { *ext = &rbe->ext;return -EEXIST ;
@@ -239,6 +299,10 @@ static int __nft_rbtree_insert(const struct net *net, const struct nft_set *set, } } } + +if (overlap) +return -ENOTEMPTY ; +rb_link_node_rcu (&new->node, parent, p);rb_insert_color (&new->node, &priv->root);return 0 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 11/13 cxgb4/ptp: pass the sign of offset delta in FW CMD
In reply to Sasha LevinFrom: Raju Rangoju <[email protected]>
[ Upstream commit 50e0d28d3808146cc19b0d5564ef4ba9e5bf3846 ]
cxgb4_ptp_fineadjtime() doesn't pass the signedness of offset delta in FW_PTP_CMD. Fix it by passing correct sign.
--- drivers/net/ethernet/chelsio/cxgb4/cxgb4_ptp.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/chelsio/cxgb4/cxgb4_ptp.c +3 -0
@@ -246,6 +246,9 @@ static int cxgb4_ptp_fineadjtime(struct adapter *adapter, s64 delta) FW_PTP_CMD_PORTID_V(0)); c.retval_len16 =cpu_to_be32 (FW_CMD_LEN16_V (sizeof (c) /16 )); c.u.ts.sc =FW_PTP_SC_ADJ_FTIME ; + c.u.ts.sign = (delta <0 ) ?1 :0 ; +if (delta <0 ) + delta = -delta; c.u.ts.tm =cpu_to_be64 (delta); err =t4_wr_mbox (adapter, adapter->mbox, &c,sizeof (c),NULL );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 12/13 qlcnic: Fix bad kzalloc null test
In reply to Sasha LevinFrom: Xu Wang <[email protected]>
[ Upstream commit bcaeb886ade124331a6f3a5cef34a3f1484c0a03 ]
In qlcnic_83xx_get_reset_instruction_template, the variable of null test is bad, so correct it.
--- drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c +1 -1
@@ -1720,7 +1720,7 @@ static int qlcnic_83xx_get_reset_instruction_template(struct qlcnic_adapter *p_d ahw->reset.seq_error =0 ; ahw->reset.buff =kzalloc (QLC_83XX_RESTART_TEMPLATE_SIZE ,GFP_KERNEL ); -if (p_dev->ahw->reset.buff ==NULL ) +if (ahw->reset.buff ==NULL )return -ENOMEM ; p_buff = p_dev->ahw->reset.buff;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 13/13 i2c: st: fix missing struct parameter description
In reply to Sasha LevinFrom: Alain Volmat <[email protected]>
[ Upstream commit f491c6687332920e296d0209e366fe2ca7eab1c6 ]
Fix a missing struct parameter description to allow warning free W=1 compilation.
--- drivers/i2c/busses/i2c-st.c | 1 + 1 file changed, 1 insertion(+)
drivers/i2c/busses/i2c-st.c +1 -0
@@ -437,6 +437,7 @@ static void st_i2c_wr_fill_tx_fifo(struct st_i2c_dev *i2c_dev)/** * st_i2c_rd_fill_tx_fifo() - Fill the Tx FIFO in read mode * @i2c_dev: Controller's private data +* @max: Maximum amount of data to fill into the Tx FIFO * * This functions fills the Tx FIFO with fixed pattern when * in read mode to trigger clock.
Signature · 1 line
2.20.1