From patchwork Tue Apr 30 11:37:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 163110 Delivered-To: patch@linaro.org Received: by 2002:a92:7e86:0:0:0:0:0 with SMTP id q6csp3130494ill; Tue, 30 Apr 2019 05:01:59 -0700 (PDT) X-Google-Smtp-Source: APXvYqwXPm1MpyxXXRXJCOyEt6O6tLLffYKCxB3L0GmwaGiFTtGhKycg+Y0Zd3C4y133/YFO8kAZ X-Received: by 2002:a65:4183:: with SMTP id a3mr65730755pgq.121.1556625719877; Tue, 30 Apr 2019 05:01:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556625719; cv=none; d=google.com; s=arc-20160816; b=KYzCHsY4tJKb/vtfYMCNvv4C725gLvNfY13tDVxLPBEtcjX+1wq339BEBSKadawcjU skbPymkIMNhBXFKHVxr+/HxlMXEKDW4xi+lZgntDfcnLQZ/yc1Ea8jOnVQigsON7GHvU zf7y3WXPM2GJSRGafeEiilPf7QTFnUN71B3nQZ9k3AEKYLLSHOuguuAZYDzcsLitDSge 8ZUN8pPHOAT7Z6E1i/RmuKxWP4JmJhP5Syk1O9SZtivcp9UpFefcGqh9A7v07+HRAqV2 ryKEDRpge2RDP/rwxZwY/ben3iNVPHn2vNiXTkNA64OEsPJo77YGYMvtHtB71w/E0YIk KUMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Ot9GoE7PN3Xcsagv3xwuybkfXyuAjhkc1TmwYKFneSY=; b=DK5TYw5qveuGopRXByRpB6IhRxmZPximODolb0e7IXxoNJ8YsqJWe8DCbFEAo8K1et ZduDsn+qy28PZojH6OC94cC1sWg8JNi0oV3psFXcWhLLboACG406+NRpZqLGwsv7D1S/ 08DGZMn3RNuaQ8gKDaAp+xihA3+yPBuUwik53YlEcou79cftrFUDAU7O99OngS2wZEkM LyL6ZxDcDgBvPG9N8yBQF9TQ0sg2UTwJmoXXOdU7r5fjjnyf95RPCaSSeXssHVmOH4AT PLPr4AIbhZJYHB4qf4debkM+W8SJW1ACVRyaNeB7D6FdwKRMFsOiaWtiz+S0ygdFbCr4 UGqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=LOU+UOJp; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j4si38062195pfc.101.2019.04.30.05.01.59; Tue, 30 Apr 2019 05:01:59 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=LOU+UOJp; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728898AbfD3Loc (ORCPT + 30 others); Tue, 30 Apr 2019 07:44:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:55822 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728632AbfD3Lo3 (ORCPT ); Tue, 30 Apr 2019 07:44:29 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BAE962177B; Tue, 30 Apr 2019 11:44:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556624669; bh=TsZdpmCy1pcPB5gfC6C686aDfKiW4WLiHwcWOX4x58w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LOU+UOJp2HDKLNV0Sx/U5bhyNo4HEugxWPguMk4vTPz/S4Hv+4IXSlwvigs6MIfdo BxL+kqdCUu1nr+/zC9Hd5BHhN9gkx/sz1QMAYD1mckgnDQUMt2s6/LGg18sZuiw3qk 30PlA7Q5zp7m/9zVbTonEukynIccN1DJMinc7BJo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Baolin Wang , Linus Walleij Subject: [PATCH 4.19 027/100] gpio: eic: sprd: Fix incorrect irq type setting for the sync EIC Date: Tue, 30 Apr 2019 13:37:56 +0200 Message-Id: <20190430113610.145108698@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190430113608.616903219@linuxfoundation.org> References: <20190430113608.616903219@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Baolin Wang commit 102bbe34b31c9159e714432afd64458f6f3876d7 upstream. When setting sync EIC as IRQ_TYPE_EDGE_BOTH type, we missed to set the SPRD_EIC_SYNC_INTMODE register to 0, which means detecting edge signals. Thus this patch fixes the issue. Fixes: 25518e024e3a ("gpio: Add Spreadtrum EIC driver support") Cc: Signed-off-by: Baolin Wang Signed-off-by: Linus Walleij Signed-off-by: Greg Kroah-Hartman --- drivers/gpio/gpio-eic-sprd.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/gpio/gpio-eic-sprd.c +++ b/drivers/gpio/gpio-eic-sprd.c @@ -414,6 +414,7 @@ static int sprd_eic_irq_set_type(struct irq_set_handler_locked(data, handle_edge_irq); break; case IRQ_TYPE_EDGE_BOTH: + sprd_eic_update(chip, offset, SPRD_EIC_SYNC_INTMODE, 0); sprd_eic_update(chip, offset, SPRD_EIC_SYNC_INTBOTH, 1); irq_set_handler_locked(data, handle_edge_irq); break; From patchwork Tue Apr 30 11:38:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 163109 Delivered-To: patch@linaro.org Received: by 2002:a92:7e86:0:0:0:0:0 with SMTP id q6csp3125954ill; Tue, 30 Apr 2019 04:57:48 -0700 (PDT) X-Google-Smtp-Source: APXvYqxKP7zFBj94TdQZX14rL7+dvMPRif4cob1KK2r2oLSZGCalYcWfn5nybQ46xDZClMmW5tCU X-Received: by 2002:a62:e411:: with SMTP id r17mr24827286pfh.127.1556625468824; Tue, 30 Apr 2019 04:57:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556625468; cv=none; d=google.com; s=arc-20160816; b=qobIYepxB7aKNSzFjiBvcb7F92p0NfU33yatmmLPBHaGg8aUrA2P7loJvLiQ21Gmiv MucY/QWOA3IbSmW/jG1Yh4cpUaL90xWfH7w4jMLD+Lkg1XIPTbPrsLuKdDspzI0zx5Wi b94Z9uoRd9uCZ7NOc0DoNAYAz0xSdvfwwER1+MrYtW5NBaEBDIbC9LK3RIKznm/DNRhN R+uSB9Oq91uJRfginpCemnUq3YZRwDRELp/qdrvTegUsUwFUcR8/7oKz72ipGO1rVEsR e3ANYyWx4Hx2/8sCpdROehQqLkud3vsjcSIRnNYaN/lDEqmL2PVNkcjT9fSefITVKrhK AhVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=YOxpg7eNCu4SuWyCVOm2rKnkseQBxboeighkCRh218U=; b=xxhWeK6BaXbBsemow8ltUC1drQvmaqE0inzDSw/Fm2TleeHbGJgUIBprwxBzEAkrHv wbJPjU8el5Vcj/mgcvUmdBE58Y6QdE5a8tLk+iBPdC95eYebx4FV39p3iss9OzZug/Tv ZyCSu6UvkdJntSAcQrdveXLFhobVdRV0fb8emvXr2J8TY5eL6GYGgxftdxpP4YyyBFt0 dW6bRFwDpLOtYD5wfGbFbD84PHbkXmdY2ubnuAAwArZg9gvsFhNWAym4B3qWB85dAoJP PXOU4C84uPRVQIscOfb7yOr04czQ/vUUlIFbzQNg+bbkyLH32urMqYj+pOH8tu+tmmyb 1xEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=AWCGOzof; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p185si17651859pgp.566.2019.04.30.04.57.48; Tue, 30 Apr 2019 04:57:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=AWCGOzof; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727762AbfD3L5r (ORCPT + 30 others); Tue, 30 Apr 2019 07:57:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:33422 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728453AbfD3Lrq (ORCPT ); Tue, 30 Apr 2019 07:47:46 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B62BE2054F; Tue, 30 Apr 2019 11:47:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556624865; bh=24vZY+O6/y4ek2Var+3vq0gwG+F89pdG9TfVxl0hlnM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AWCGOzofspvmEYZgpBK4LbW1WNNUKn/nNg8ZdjYM5b9R6mTsE6LSIOwNXDbZJtM65 zsVe4oNkxm55hfKpHp6ZwRM0UkNlqLo/+F/dMNkcJP/wFBOMo5S2pLLjh/r860keM7 BpfpDtG/pUUtXApQTgA3jrOIDlmSknHBKrva649c= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Xiaofei Shen , Sneh Shah , Vinod Koul , Andrew Lunn , "David S. Miller" Subject: [PATCH 4.19 090/100] net: stmmac: move stmmac_check_ether_addr() to driver probe Date: Tue, 30 Apr 2019 13:38:59 +0200 Message-Id: <20190430113613.062637557@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190430113608.616903219@linuxfoundation.org> References: <20190430113608.616903219@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Vinod Koul [ Upstream commit b561af36b1841088552464cdc3f6371d92f17710 ] stmmac_check_ether_addr() checks the MAC address and assigns one in driver open(). In many cases when we create slave netdevice, the dev addr is inherited from master but the master dev addr maybe NULL at that time, so move this call to driver probe so that address is always valid. Signed-off-by: Xiaofei Shen Tested-by: Xiaofei Shen Signed-off-by: Sneh Shah Signed-off-by: Vinod Koul Reviewed-by: Andrew Lunn Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -2595,8 +2595,6 @@ static int stmmac_open(struct net_device u32 chan; int ret; - stmmac_check_ether_addr(priv); - if (priv->hw->pcs != STMMAC_PCS_RGMII && priv->hw->pcs != STMMAC_PCS_TBI && priv->hw->pcs != STMMAC_PCS_RTBI) { @@ -4296,6 +4294,8 @@ int stmmac_dvr_probe(struct device *devi if (ret) goto error_hw_init; + stmmac_check_ether_addr(priv); + /* Configure real RX and TX queues */ netif_set_real_num_rx_queues(ndev, priv->plat->rx_queues_to_use); netif_set_real_num_tx_queues(ndev, priv->plat->tx_queues_to_use); From patchwork Tue Apr 30 11:39:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 163103 Delivered-To: patch@linaro.org Received: by 2002:a92:7e86:0:0:0:0:0 with SMTP id q6csp3116973ill; Tue, 30 Apr 2019 04:48:02 -0700 (PDT) X-Google-Smtp-Source: APXvYqzU0S79LYhQu6cjkOB9VJ3pCvbmHYeCVvXw++wBBAqi9ilkuBEs1MxwK4XsCWXuew9oRyWy X-Received: by 2002:a17:902:b589:: with SMTP id a9mr44861627pls.66.1556624882347; Tue, 30 Apr 2019 04:48:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556624882; cv=none; d=google.com; s=arc-20160816; b=ObhUoICTfDycQINna6/MVS7F72NgHwsQDoj5tf9uLJ2t/mhIfuBrH5FmttyNuxJnph lWfxgnMThoS+IPqbtl2kfPcw4W41KE1ZmAU6yrpW1sbz98Ehune6QfEmOZc3HIvXPayb sAoJR3n+nJlbdEbx+LGRB7aBmbPBe/TCvOgg6rSED8RFddGXIpHAuL93wDDrc/r+dyDS 8Ki1Xd9C0LwXSmLUxEKq4HxwEPBMHBOO+BCqc8gvoLLlp/diCCxx0k/pNsu2CIqmFCa6 flfneJ8+wQd9zteFIYfpggGAV5nyCX07Ckxtilb7eQlwL7nF1KuMONjdllAOflSZTjYT LQVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=PIMUeIIKv3RixluFUflwDNGwl1gPh51io9RzreQBZMA=; b=OXbKjmVRwJuRiH/pklwg2VC3UE/ZE+xan4tEyRDawJbNZOkuOSMVlzBxIkghcevu80 H3H/Lf59KpphyxrpmMphMQIt4I4Ukk5G5aMuGtngQ7YTfRjURe8XtUgQImrCUN4hoBKn UmFr4G6BMuV/W2VG0mL2qp0c6mVYVIGqP2t+LE7jDn+mVFr5hyVpfyCbo+sXng30G/v/ lKj/tHSJRZCt4E4ABen2w2mtiI4gJLYLJhnVZCvfEZ+1mCRgvSEcrpXv93E+IdiJ+HtN A5hOQTBAUpjZIcxjgqrJkJIGAVghVpkEkwmLSx9mHDSmXxDO1q/dHhXfPy1Ga7oJFA+g yE5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=htdQ6KY5; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v11si11197632plo.205.2019.04.30.04.48.02; Tue, 30 Apr 2019 04:48:02 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=htdQ6KY5; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730781AbfD3LsA (ORCPT + 30 others); Tue, 30 Apr 2019 07:48:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:33752 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730772AbfD3Lr4 (ORCPT ); Tue, 30 Apr 2019 07:47:56 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2510E2054F; Tue, 30 Apr 2019 11:47:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556624875; bh=yge4E7KebFg2Quye//YHCc98uYDAOoFCwRnlY9Uh2dw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=htdQ6KY5tN52tz+9B6MQ2wb61xNYIqiZz+uxWAb7Vz3a1+fvndfEPrLAaZyH0YnMr opofe0DO+Y1onQO/yEvG86jj8tYGZgLXUNLODMh4MOey3gy5niCJ3HNkWk50V4qDfz rlFknkB9FxrZtRDdbKzweHonLTbmp9zREr3Zy/MA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yonglong Liu , Jun Xiao Subject: [PATCH 4.19 094/100] net: hns: Fix WARNING when hns modules installed Date: Tue, 30 Apr 2019 13:39:03 +0200 Message-Id: <20190430113613.268465382@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190430113608.616903219@linuxfoundation.org> References: <20190430113608.616903219@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jun Xiao Commit dfdf26babc98 upstream this patch need merge to 4.19.y stable kernel Fix Conflict:already fixed the confilct dfdf26babc98 with Yonglong Liu stable candidate:user cannot connect to the internet via hns dev by default setting without this patch we have already verified this patch on kunpeng916 platform, and it works well. Signed-off-by: Yonglong Liu Signed-off-by: Jun Xiao Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/hisilicon/hns/hns_enet.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) --- a/drivers/net/ethernet/hisilicon/hns/hns_enet.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_enet.c @@ -1169,6 +1169,12 @@ int hns_nic_init_phy(struct net_device * if (!h->phy_dev) return 0; + phy_dev->supported &= h->if_support; + phy_dev->advertising = phy_dev->supported; + + if (h->phy_if == PHY_INTERFACE_MODE_XGMII) + phy_dev->autoneg = false; + if (h->phy_if != PHY_INTERFACE_MODE_XGMII) { phy_dev->dev_flags = 0; @@ -1180,15 +1186,6 @@ int hns_nic_init_phy(struct net_device * if (unlikely(ret)) return -ENODEV; - phy_dev->supported &= h->if_support; - phy_dev->advertising = phy_dev->supported; - - if (h->phy_if == PHY_INTERFACE_MODE_XGMII) - phy_dev->autoneg = false; - - if (h->phy_if == PHY_INTERFACE_MODE_SGMII) - phy_stop(phy_dev); - return 0; }