Skip to content

Commit 2970358

Browse files
author
Alex Shi
committed
Merge tag 'v4.4.32' into linux-linaro-lsk-v4.4
 This is the 4.4.32 stable release
2 parents 62c3330 + 4dab3e4 commit 2970358

47 files changed

Lines changed: 275 additions & 150 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
VERSION = 4
22
PATCHLEVEL = 4
3-
SUBLEVEL = 31
3+
SUBLEVEL = 32
44
EXTRAVERSION =
55
NAME = Blurry Fish Butt
66

‎arch/mips/kvm/emulate.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -822,7 +822,7 @@ static void kvm_mips_invalidate_guest_tlb(struct kvm_vcpu *vcpu,
822822
bool user;
823823

824824
/* No need to flush for entries which are already invalid */
825-
if (!((tlb->tlb_lo[0] | tlb->tlb_lo[1]) & ENTRYLO_V))
825+
if (!((tlb->tlb_lo0 | tlb->tlb_lo1) & MIPS3_PG_V))
826826
return;
827827
/* User address space doesn't need flushing for KSeg2/3 changes */
828828
user = tlb->tlb_hi < KVM_GUEST_KSEG0;

‎drivers/gpu/drm/amd/amdgpu/atombios_dp.c‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -265,15 +265,27 @@ static int amdgpu_atombios_dp_get_dp_link_config(struct drm_connector *connector
265265
unsigned max_lane_num = drm_dp_max_lane_count(dpcd);
266266
unsigned lane_num, i, max_pix_clock;
267267

268-
for (lane_num = 1; lane_num <= max_lane_num; lane_num <<= 1) {
269-
for (i = 0; i < ARRAY_SIZE(link_rates) && link_rates[i] <= max_link_rate; i++) {
270-
max_pix_clock = (lane_num * link_rates[i] * 8) / bpp;
268+
if (amdgpu_connector_encoder_get_dp_bridge_encoder_id(connector) ==
269+
ENCODER_OBJECT_ID_NUTMEG) {
270+
for (lane_num = 1; lane_num <= max_lane_num; lane_num <<= 1) {
271+
max_pix_clock = (lane_num * 270000 * 8) / bpp;
271272
if (max_pix_clock >= pix_clock) {
272273
*dp_lanes = lane_num;
273-
*dp_rate = link_rates[i];
274+
*dp_rate = 270000;
274275
return 0;
275276
}
276277
}
278+
} else {
279+
for (i = 0; i < ARRAY_SIZE(link_rates) && link_rates[i] <= max_link_rate; i++) {
280+
for (lane_num = 1; lane_num <= max_lane_num; lane_num <<= 1) {
281+
max_pix_clock = (lane_num * link_rates[i] * 8) / bpp;
282+
if (max_pix_clock >= pix_clock) {
283+
*dp_lanes = lane_num;
284+
*dp_rate = link_rates[i];
285+
return 0;
286+
}
287+
}
288+
}
277289
}
278290

279291
return -EINVAL;

‎drivers/gpu/drm/radeon/atombios_dp.c‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -315,15 +315,27 @@ int radeon_dp_get_dp_link_config(struct drm_connector *connector,
315315
unsigned max_lane_num = drm_dp_max_lane_count(dpcd);
316316
unsigned lane_num, i, max_pix_clock;
317317

318-
for (lane_num = 1; lane_num <= max_lane_num; lane_num <<= 1) {
319-
for (i = 0; i < ARRAY_SIZE(link_rates) && link_rates[i] <= max_link_rate; i++) {
320-
max_pix_clock = (lane_num * link_rates[i] * 8) / bpp;
318+
if (radeon_connector_encoder_get_dp_bridge_encoder_id(connector) ==
319+
ENCODER_OBJECT_ID_NUTMEG) {
320+
for (lane_num = 1; lane_num <= max_lane_num; lane_num <<= 1) {
321+
max_pix_clock = (lane_num * 270000 * 8) / bpp;
321322
if (max_pix_clock >= pix_clock) {
322323
*dp_lanes = lane_num;
323-
*dp_rate = link_rates[i];
324+
*dp_rate = 270000;
324325
return 0;
325326
}
326327
}
328+
} else {
329+
for (i = 0; i < ARRAY_SIZE(link_rates) && link_rates[i] <= max_link_rate; i++) {
330+
for (lane_num = 1; lane_num <= max_lane_num; lane_num <<= 1) {
331+
max_pix_clock = (lane_num * link_rates[i] * 8) / bpp;
332+
if (max_pix_clock >= pix_clock) {
333+
*dp_lanes = lane_num;
334+
*dp_rate = link_rates[i];
335+
return 0;
336+
}
337+
}
338+
}
327339
}
328340

329341
return -EINVAL;

‎drivers/net/ethernet/broadcom/tg3.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18142,14 +18142,14 @@ static pci_ers_result_t tg3_io_error_detected(struct pci_dev *pdev,
1814218142

1814318143
rtnl_lock();
1814418144

18145-
/* We needn't recover from permanent error */
18146-
if (state == pci_channel_io_frozen)
18147-
tp->pcierr_recovery = true;
18148-
1814918145
/* We probably don't have netdev yet */
1815018146
if (!netdev || !netif_running(netdev))
1815118147
goto done;
1815218148

18149+
/* We needn't recover from permanent error */
18150+
if (state == pci_channel_io_frozen)
18151+
tp->pcierr_recovery = true;
18152+
1815318153
tg3_phy_stop(tp);
1815418154

1815518155
tg3_netif_stop(tp);
@@ -18246,7 +18246,7 @@ static void tg3_io_resume(struct pci_dev *pdev)
1824618246

1824718247
rtnl_lock();
1824818248

18249-
if (!netif_running(netdev))
18249+
if (!netdev || !netif_running(netdev))
1825018250
goto done;
1825118251

1825218252
tg3_full_lock(tp, 0);

‎drivers/net/ethernet/freescale/fec_main.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -944,11 +944,11 @@ fec_restart(struct net_device *ndev)
944944
* enet-mac reset will reset mac address registers too,
945945
* so need to reconfigure it.
946946
*/
947-
if (fep->quirks & FEC_QUIRK_ENET_MAC) {
948-
memcpy(&temp_mac, ndev->dev_addr, ETH_ALEN);
949-
writel(cpu_to_be32(temp_mac[0]), fep->hwp + FEC_ADDR_LOW);
950-
writel(cpu_to_be32(temp_mac[1]), fep->hwp + FEC_ADDR_HIGH);
951-
}
947+
memcpy(&temp_mac, ndev->dev_addr, ETH_ALEN);
948+
writel((__force u32)cpu_to_be32(temp_mac[0]),
949+
fep->hwp + FEC_ADDR_LOW);
950+
writel((__force u32)cpu_to_be32(temp_mac[1]),
951+
fep->hwp + FEC_ADDR_HIGH);
952952

953953
/* Clear any outstanding interrupt. */
954954
writel(0xffffffff, fep->hwp + FEC_IEVENT);

‎drivers/net/geneve.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ static struct sk_buff **geneve_gro_receive(struct sk_buff **head,
440440

441441
skb_gro_pull(skb, gh_len);
442442
skb_gro_postpull_rcsum(skb, gh, gh_len);
443-
pp = ptype->callbacks.gro_receive(head, skb);
443+
pp = call_gro_receive(ptype->callbacks.gro_receive, head, skb);
444444

445445
out_unlock:
446446
rcu_read_unlock();

‎drivers/net/vxlan.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,7 @@ static struct sk_buff **vxlan_gro_receive(struct sk_buff **head,
593593
}
594594
}
595595

596-
pp = eth_gro_receive(head, skb);
596+
pp = call_gro_receive(eth_gro_receive, head, skb);
597597

598598
out:
599599
skb_gro_remcsum_cleanup(skb, &grc);

‎drivers/of/of_reserved_mem.c‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,12 @@ static int __init __reserved_mem_alloc_size(unsigned long node,
127127
}
128128

129129
/* Need adjust the alignment to satisfy the CMA requirement */
130-
if (IS_ENABLED(CONFIG_CMA) && of_flat_dt_is_compatible(node, "shared-dma-pool"))
131-
align = max(align, (phys_addr_t)PAGE_SIZE << max(MAX_ORDER - 1, pageblock_order));
130+
if (IS_ENABLED(CONFIG_CMA) && of_flat_dt_is_compatible(node, "shared-dma-pool")) {
131+
unsigned long order =
132+
max_t(unsigned long, MAX_ORDER - 1, pageblock_order);
133+
134+
align = max(align, (phys_addr_t)PAGE_SIZE << order);
135+
}
132136

133137
prop = of_get_flat_dt_prop(node, "alloc-ranges", &len);
134138
if (prop) {

‎drivers/scsi/megaraid/megaraid_sas.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1923,7 +1923,7 @@ struct megasas_instance_template {
19231923
};
19241924

19251925
#define MEGASAS_IS_LOGICAL(scp) \
1926-
(scp->device->channel < MEGASAS_MAX_PD_CHANNELS) ? 0 : 1
1926+
((scp->device->channel < MEGASAS_MAX_PD_CHANNELS) ? 0 : 1)
19271927

19281928
#define MEGASAS_DEV_INDEX(scp) \
19291929
(((scp->device->channel % 2) * MEGASAS_MAX_DEV_PER_CHANNEL) + \

0 commit comments

Comments
 (0)