Merge remote-tracking branch 'up/f31' into master-riscv64
Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
This commit is contained in:
commit
0eaa884d64
|
@ -1,92 +0,0 @@
|
||||||
From af4e1c5eca95bed1192d8dc45c8ed63aea2209e8 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Marcel Bocu <marcel.p.bocu@gmail.com>
|
|
||||||
Date: Mon, 22 Jul 2019 20:45:10 +0300
|
|
||||||
Subject: [PATCH] x86/amd_nb: Add PCI device IDs for family 17h, model 70h
|
|
||||||
|
|
||||||
The AMD Ryzen gen 3 processors came with a different PCI IDs for the
|
|
||||||
function 3 & 4 which are used to access the SMN interface. The root
|
|
||||||
PCI address however remained at the same address as the model 30h.
|
|
||||||
|
|
||||||
Adding the F3/F4 PCI IDs respectively to the misc and link ids appear
|
|
||||||
to be sufficient for k10temp, so let's add them and follow up on the
|
|
||||||
patch if other functions need more tweaking.
|
|
||||||
|
|
||||||
Vicki Pfau sent an identical patch after I checked that no-one had
|
|
||||||
written this patch. I would have been happy about dropping my patch but
|
|
||||||
unlike for his patch series, I had already Cc:ed the x86 people and
|
|
||||||
they already reviewed the changes. Since Vicki has not answered to
|
|
||||||
any email after his initial series, let's assume she is on vacation
|
|
||||||
and let's avoid duplication of reviews from the maintainers and merge
|
|
||||||
my series. To acknowledge Vicki's anteriority, I added her S-o-b to
|
|
||||||
the patch.
|
|
||||||
|
|
||||||
v2, suggested by Guenter Roeck and Brian Woods:
|
|
||||||
- rename from 71h to 70h
|
|
||||||
|
|
||||||
Signed-off-by: Vicki Pfau <vi@endrift.com>
|
|
||||||
Signed-off-by: Marcel Bocu <marcel.p.bocu@gmail.com>
|
|
||||||
Tested-by: Marcel Bocu <marcel.p.bocu@gmail.com>
|
|
||||||
Acked-by: Thomas Gleixner <tglx@linutronix.de>
|
|
||||||
Acked-by: Brian Woods <brian.woods@amd.com>
|
|
||||||
Acked-by: Bjorn Helgaas <bhelgaas@google.com> # pci_ids.h
|
|
||||||
|
|
||||||
Cc: Thomas Gleixner <tglx@linutronix.de>
|
|
||||||
Cc: Ingo Molnar <mingo@redhat.com>
|
|
||||||
Cc: Borislav Petkov <bp@alien8.de>
|
|
||||||
Cc: "H. Peter Anvin" <hpa@zytor.com>
|
|
||||||
Cc: x86@kernel.org
|
|
||||||
Cc: "Woods, Brian" <Brian.Woods@amd.com>
|
|
||||||
Cc: Clemens Ladisch <clemens@ladisch.de>
|
|
||||||
Cc: Jean Delvare <jdelvare@suse.com>
|
|
||||||
Cc: Guenter Roeck <linux@roeck-us.net>
|
|
||||||
Cc: linux-hwmon@vger.kernel.org
|
|
||||||
Link: https://lore.kernel.org/r/20190722174510.2179-1-marcel.p.bocu@gmail.com
|
|
||||||
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
|
|
||||||
---
|
|
||||||
arch/x86/kernel/amd_nb.c | 3 +++
|
|
||||||
include/linux/pci_ids.h | 1 +
|
|
||||||
2 files changed, 4 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c
|
|
||||||
index d63e63b7d1d9..251c795b4eb3 100644
|
|
||||||
--- a/arch/x86/kernel/amd_nb.c
|
|
||||||
+++ b/arch/x86/kernel/amd_nb.c
|
|
||||||
@@ -21,6 +21,7 @@
|
|
||||||
#define PCI_DEVICE_ID_AMD_17H_DF_F4 0x1464
|
|
||||||
#define PCI_DEVICE_ID_AMD_17H_M10H_DF_F4 0x15ec
|
|
||||||
#define PCI_DEVICE_ID_AMD_17H_M30H_DF_F4 0x1494
|
|
||||||
+#define PCI_DEVICE_ID_AMD_17H_M70H_DF_F4 0x1444
|
|
||||||
|
|
||||||
/* Protect the PCI config register pairs used for SMN and DF indirect access. */
|
|
||||||
static DEFINE_MUTEX(smn_mutex);
|
|
||||||
@@ -50,6 +51,7 @@ const struct pci_device_id amd_nb_misc_ids[] = {
|
|
||||||
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M10H_DF_F3) },
|
|
||||||
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M30H_DF_F3) },
|
|
||||||
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F3) },
|
|
||||||
+ { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F3) },
|
|
||||||
{}
|
|
||||||
};
|
|
||||||
EXPORT_SYMBOL_GPL(amd_nb_misc_ids);
|
|
||||||
@@ -63,6 +65,7 @@ static const struct pci_device_id amd_nb_link_ids[] = {
|
|
||||||
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_DF_F4) },
|
|
||||||
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M10H_DF_F4) },
|
|
||||||
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M30H_DF_F4) },
|
|
||||||
+ { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F4) },
|
|
||||||
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F4) },
|
|
||||||
{}
|
|
||||||
};
|
|
||||||
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
|
|
||||||
index c842735a4f45..4b97f427cc92 100644
|
|
||||||
--- a/include/linux/pci_ids.h
|
|
||||||
+++ b/include/linux/pci_ids.h
|
|
||||||
@@ -548,6 +548,7 @@
|
|
||||||
#define PCI_DEVICE_ID_AMD_17H_DF_F3 0x1463
|
|
||||||
#define PCI_DEVICE_ID_AMD_17H_M10H_DF_F3 0x15eb
|
|
||||||
#define PCI_DEVICE_ID_AMD_17H_M30H_DF_F3 0x1493
|
|
||||||
+#define PCI_DEVICE_ID_AMD_17H_M70H_DF_F3 0x1443
|
|
||||||
#define PCI_DEVICE_ID_AMD_CNB17H_F3 0x1703
|
|
||||||
#define PCI_DEVICE_ID_AMD_LANCE 0x2000
|
|
||||||
#define PCI_DEVICE_ID_AMD_LANCE_HOME 0x2001
|
|
||||||
--
|
|
||||||
2.21.0
|
|
||||||
|
|
|
@ -0,0 +1,153 @@
|
||||||
|
From mboxrd@z Thu Jan 1 00:00:00 1970
|
||||||
|
Return-Path: <SRS0=e2dy=XH=vger.kernel.org=selinux-owner@kernel.org>
|
||||||
|
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
|
||||||
|
aws-us-west-2-korg-lkml-1.web.codeaurora.org
|
||||||
|
X-Spam-Level:
|
||||||
|
X-Spam-Status: No, score=-15.0 required=3.0
|
||||||
|
tests=HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,
|
||||||
|
MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT
|
||||||
|
autolearn=ham autolearn_force=no version=3.4.0
|
||||||
|
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
|
||||||
|
by smtp.lore.kernel.org (Postfix) with ESMTP id 0CE63C4CEC5
|
||||||
|
for <selinux@archiver.kernel.org>; Thu, 12 Sep 2019 13:30:40 +0000 (UTC)
|
||||||
|
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
|
||||||
|
by mail.kernel.org (Postfix) with ESMTP id DC0B020CC7
|
||||||
|
for <selinux@archiver.kernel.org>; Thu, 12 Sep 2019 13:30:39 +0000 (UTC)
|
||||||
|
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
|
||||||
|
id S1732192AbfILNaj (ORCPT <rfc822;selinux@archiver.kernel.org>);
|
||||||
|
Thu, 12 Sep 2019 09:30:39 -0400
|
||||||
|
Received: from mx1.redhat.com ([209.132.183.28]:52278 "EHLO mx1.redhat.com"
|
||||||
|
rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
|
||||||
|
id S1731687AbfILNaj (ORCPT <rfc822;selinux@vger.kernel.org>);
|
||||||
|
Thu, 12 Sep 2019 09:30:39 -0400
|
||||||
|
Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197])
|
||||||
|
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
|
||||||
|
(No client certificate requested)
|
||||||
|
by mx1.redhat.com (Postfix) with ESMTPS id 97CC359465
|
||||||
|
for <selinux@vger.kernel.org>; Thu, 12 Sep 2019 13:30:38 +0000 (UTC)
|
||||||
|
Received: by mail-qt1-f197.google.com with SMTP id c8so13609684qtd.20
|
||||||
|
for <selinux@vger.kernel.org>; Thu, 12 Sep 2019 06:30:38 -0700 (PDT)
|
||||||
|
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
|
||||||
|
d=1e100.net; s=20161025;
|
||||||
|
h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version
|
||||||
|
:content-transfer-encoding;
|
||||||
|
bh=S/MIBrjCy5DTvfqPzJTJqDQQH1pDu780wgGyHs56w4k=;
|
||||||
|
b=H7fZr4X/c4ge0SXeHHRXrq3U4J60PWfSRqdCphTWxKjyLvBs8nktbJczT562oH7Hxv
|
||||||
|
hdvVjKgAzNxIXFdQetnmveDXojtHFrE21PNdo5ONQIyh35oZyrJB4ewZdUrNfbrvDc2y
|
||||||
|
ElMr/HoKEX5pY+GMJE4nzeBotlfCWU9BoAxJPUhzKA9Oib+AqDzQ0hCGH6pQY9RXRXBV
|
||||||
|
IMH21FE5dxQGtLHNCJXVxE14edDeRo8qQFWQw6ooogK7JvduuJrWBn3BmCbKz1YLTNZE
|
||||||
|
9wRXvaHFVGNhr79JrRcItTp6Sx+tZ3XY46CV+Wi6Rq1fu8MePP9zFdIQXw9wqyd+UgLa
|
||||||
|
AIlw==
|
||||||
|
X-Gm-Message-State: APjAAAXpWx500L+bZRH8M7OzuSb0aBlsvvjaBYCGvSkzojpa2nRWjtk0
|
||||||
|
cjKEj45ivsUgPW2Bbi6CGEtspqM4wmwb72z+ajR4hy5OjMT3KRh6W71HFbVPrlLYQTvse11Ax2d
|
||||||
|
wGOma7U/qIGDDYkjh/Q==
|
||||||
|
X-Received: by 2002:ac8:7b2e:: with SMTP id l14mr8094193qtu.11.1568295037636;
|
||||||
|
Thu, 12 Sep 2019 06:30:37 -0700 (PDT)
|
||||||
|
X-Google-Smtp-Source: APXvYqzybFpoaFyGZXafGEdtHCL3XllpHltaXggcIZEb7De49V/kJzm1pU6vpg1gN8HtgnB3cilLuA==
|
||||||
|
X-Received: by 2002:ac8:7b2e:: with SMTP id l14mr8094176qtu.11.1568295037442;
|
||||||
|
Thu, 12 Sep 2019 06:30:37 -0700 (PDT)
|
||||||
|
Received: from localhost.localdomain ([12.133.141.2])
|
||||||
|
by smtp.gmail.com with ESMTPSA id h68sm11848865qkd.35.2019.09.12.06.30.35
|
||||||
|
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
|
||||||
|
Thu, 12 Sep 2019 06:30:36 -0700 (PDT)
|
||||||
|
From: Jonathan Lebon <jlebon@redhat.com>
|
||||||
|
To: selinux@vger.kernel.org
|
||||||
|
Cc: Jonathan Lebon <jlebon@redhat.com>,
|
||||||
|
Victor Kamensky <kamensky@cisco.com>
|
||||||
|
Subject: [PATCH v2] selinux: allow labeling before policy is loaded
|
||||||
|
Date: Thu, 12 Sep 2019 09:30:07 -0400
|
||||||
|
Message-Id: <20190912133007.27545-1-jlebon@redhat.com>
|
||||||
|
X-Mailer: git-send-email 2.21.0
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
Sender: selinux-owner@vger.kernel.org
|
||||||
|
Precedence: bulk
|
||||||
|
List-ID: <selinux.vger.kernel.org>
|
||||||
|
X-Mailing-List: selinux@vger.kernel.org
|
||||||
|
Archived-At: <https://lore.kernel.org/selinux/20190912133007.27545-1-jlebon@redhat.com/>
|
||||||
|
List-Archive: <https://lore.kernel.org/selinux/>
|
||||||
|
List-Post: <mailto:selinux@vger.kernel.org>
|
||||||
|
|
||||||
|
Currently, the SELinux LSM prevents one from setting the
|
||||||
|
`security.selinux` xattr on an inode without a policy first being
|
||||||
|
loaded. However, this restriction is problematic: it makes it impossible
|
||||||
|
to have newly created files with the correct label before actually
|
||||||
|
loading the policy.
|
||||||
|
|
||||||
|
This is relevant in distributions like Fedora, where the policy is
|
||||||
|
loaded by systemd shortly after pivoting out of the initrd. In such
|
||||||
|
instances, all files created prior to pivoting will be unlabeled. One
|
||||||
|
then has to relabel them after pivoting, an operation which inherently
|
||||||
|
races with other processes trying to access those same files.
|
||||||
|
|
||||||
|
Going further, there are use cases for creating the entire root
|
||||||
|
filesystem on first boot from the initrd (e.g. Container Linux supports
|
||||||
|
this today[1], and we'd like to support it in Fedora CoreOS as well[2]).
|
||||||
|
One can imagine doing this in two ways: at the block device level (e.g.
|
||||||
|
laying down a disk image), or at the filesystem level. In the former,
|
||||||
|
labeling can simply be part of the image. But even in the latter
|
||||||
|
scenario, one still really wants to be able to set the right labels when
|
||||||
|
populating the new filesystem.
|
||||||
|
|
||||||
|
This patch enables this by changing behaviour in the following two ways:
|
||||||
|
1. allow `setxattr` if we're not initialized
|
||||||
|
2. don't try to set the in-core inode SID if we're not initialized;
|
||||||
|
instead leave it as `LABEL_INVALID` so that revalidation may be
|
||||||
|
attempted at a later time
|
||||||
|
|
||||||
|
Note the first hunk of this patch is mostly the same as a previously
|
||||||
|
discussed one[3], though it was part of a larger series which wasn't
|
||||||
|
accepted.
|
||||||
|
|
||||||
|
Co-developed-by: Victor Kamensky <kamensky@cisco.com>
|
||||||
|
Signed-off-by: Victor Kamensky <kamensky@cisco.com>
|
||||||
|
Signed-off-by: Jonathan Lebon <jlebon@redhat.com>
|
||||||
|
|
||||||
|
[1] https://coreos.com/os/docs/latest/root-filesystem-placement.html
|
||||||
|
[2] https://github.com/coreos/fedora-coreos-tracker/issues/94
|
||||||
|
[3] https://www.spinics.net/lists/linux-initramfs/msg04593.html
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
v2:
|
||||||
|
- return early in selinux_inode_setxattr if policy hasn't been loaded
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
security/selinux/hooks.c | 12 ++++++++++++
|
||||||
|
1 file changed, 12 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
|
||||||
|
index 94de51628..dbe96c707 100644
|
||||||
|
--- a/security/selinux/hooks.c
|
||||||
|
+++ b/security/selinux/hooks.c
|
||||||
|
@@ -3142,6 +3142,9 @@ static int selinux_inode_setxattr(struct dentry *dentry, const char *name,
|
||||||
|
return dentry_has_perm(current_cred(), dentry, FILE__SETATTR);
|
||||||
|
}
|
||||||
|
|
||||||
|
+ if (!selinux_state.initialized)
|
||||||
|
+ return (inode_owner_or_capable(inode) ? 0 : -EPERM);
|
||||||
|
+
|
||||||
|
sbsec = inode->i_sb->s_security;
|
||||||
|
if (!(sbsec->flags & SBLABEL_MNT))
|
||||||
|
return -EOPNOTSUPP;
|
||||||
|
@@ -3225,6 +3228,15 @@ static void selinux_inode_post_setxattr(struct dentry *dentry, const char *name,
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ if (!selinux_state.initialized) {
|
||||||
|
+ /* If we haven't even been initialized, then we can't validate
|
||||||
|
+ * against a policy, so leave the label as invalid. It may
|
||||||
|
+ * resolve to a valid label on the next revalidation try if
|
||||||
|
+ * we've since initialized.
|
||||||
|
+ */
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
rc = security_context_to_sid_force(&selinux_state, value, size,
|
||||||
|
&newsid);
|
||||||
|
if (rc) {
|
||||||
|
--
|
||||||
|
2.21.0
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,516 @@
|
||||||
|
From patchwork Thu Oct 3 21:50:34 2019
|
||||||
|
Content-Type: text/plain; charset="utf-8"
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Transfer-Encoding: 7bit
|
||||||
|
X-Patchwork-Submitter: =?utf-8?q?S=C3=B6ren_Moch?= <smoch@web.de>
|
||||||
|
X-Patchwork-Id: 11173461
|
||||||
|
Return-Path:
|
||||||
|
<SRS0=jVsO=X4=lists.infradead.org=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@kernel.org>
|
||||||
|
Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org
|
||||||
|
[172.30.200.123])
|
||||||
|
by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9FDE613B1
|
||||||
|
for <patchwork-linux-arm@patchwork.kernel.org>;
|
||||||
|
Thu, 3 Oct 2019 21:51:01 +0000 (UTC)
|
||||||
|
Received: from bombadil.infradead.org (bombadil.infradead.org
|
||||||
|
[198.137.202.133])
|
||||||
|
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
|
||||||
|
(No client certificate requested)
|
||||||
|
by mail.kernel.org (Postfix) with ESMTPS id 7B69C2086A
|
||||||
|
for <patchwork-linux-arm@patchwork.kernel.org>;
|
||||||
|
Thu, 3 Oct 2019 21:51:01 +0000 (UTC)
|
||||||
|
Authentication-Results: mail.kernel.org;
|
||||||
|
dkim=pass (2048-bit key) header.d=lists.infradead.org
|
||||||
|
header.i=@lists.infradead.org header.b="urDY/XN+";
|
||||||
|
dkim=fail reason="signature verification failed" (1024-bit key)
|
||||||
|
header.d=web.de header.i=@web.de header.b="mtJWe9Bf"
|
||||||
|
DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7B69C2086A
|
||||||
|
Authentication-Results: mail.kernel.org;
|
||||||
|
dmarc=none (p=none dis=none) header.from=web.de
|
||||||
|
Authentication-Results: mail.kernel.org;
|
||||||
|
spf=none
|
||||||
|
smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org
|
||||||
|
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
|
||||||
|
d=lists.infradead.org; s=bombadil.20170209; h=Sender:
|
||||||
|
Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe:
|
||||||
|
List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date:
|
||||||
|
Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date:
|
||||||
|
Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:
|
||||||
|
References:List-Owner; bh=lFYiMYcBMxmyphhrNw72C/NN1znHxWUoCJiED50SPC4=; b=urD
|
||||||
|
Y/XN+2WA8vvyESWBs6m/bzLBWZSG2TrdRGIEtY0TIXn9YXWd7vRkAWVm8GrT8FCC0eFXXfrnpBljO
|
||||||
|
x9URr69wRs5c3rgbhPO2Ayx1T0WcHFNAzIW6SffEJKnrsbUPYUE1wQ5BrAaUEVHCv0XWcTeKzg26J
|
||||||
|
mnIJaqoHpew22YkkB/8M4LGCJVaZxeX/gAd7I2FeB6tBzmBgKvKvb3P1010X4zK2POVVxtd8dAlLb
|
||||||
|
lRKl+Vj0dcjGL/WOqrDIy3vABg5Av25akdGM3SrWI0y/YOVGtSi/glUyQ7gI8pDR3uR/456zEGRjy
|
||||||
|
cVc9Y8QganXtR/CoNbBCIpll/ZAGZng==;
|
||||||
|
Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org)
|
||||||
|
by bombadil.infradead.org with esmtp (Exim 4.92.2 #3 (Red Hat Linux))
|
||||||
|
id 1iG8zx-0004iz-UO; Thu, 03 Oct 2019 21:50:57 +0000
|
||||||
|
Received: from mout.web.de ([217.72.192.78])
|
||||||
|
by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux))
|
||||||
|
id 1iG8zt-0004gY-Sh; Thu, 03 Oct 2019 21:50:55 +0000
|
||||||
|
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de;
|
||||||
|
s=dbaedf251592; t=1570139445;
|
||||||
|
bh=+slu9oigrifofLBmSnoGBXNUCdUs8UMw+gAQMYZR/OU=;
|
||||||
|
h=X-UI-Sender-Class:From:To:Cc:Subject:Date;
|
||||||
|
b=mtJWe9BfGLpk166deIOWv6NwNSVtqNu4zEFmltWTZO+Quufhq50MugB4t3PI53Dij
|
||||||
|
P75Ixq7hozzbk0+FHdq9w1smAfhLlT6WCPVlEGLVmzgVIbWf+qdMbLNHxgkPW11OH5
|
||||||
|
mvpxatuhvRgzbIbSTYrf6MF+3Mcs9GpROLzrOyrI=
|
||||||
|
X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9
|
||||||
|
Received: from platinum.fritz.box ([89.14.73.200]) by smtp.web.de (mrweb103
|
||||||
|
[213.165.67.124]) with ESMTPSA (Nemesis) id 0LdVza-1hpIko3M5i-00ikbu; Thu, 03
|
||||||
|
Oct 2019 23:50:44 +0200
|
||||||
|
From: Soeren Moch <smoch@web.de>
|
||||||
|
To: Heiko Stuebner <heiko@sntech.de>
|
||||||
|
Subject: [PATCH 1/3] arm64: dts: rockchip: fix RockPro64 vdd-log regulator
|
||||||
|
settings
|
||||||
|
Date: Thu, 3 Oct 2019 23:50:34 +0200
|
||||||
|
Message-Id: <20191003215036.15023-1-smoch@web.de>
|
||||||
|
X-Mailer: git-send-email 2.17.1
|
||||||
|
X-Provags-ID: V03:K1:sVWSznPIdgTeGmxS0/KuK5sR3zlLN0yEjQwtifgjotr6sUlPGeX
|
||||||
|
SCaKNvjkY2xrsa2JwfaH4KWsSiYOkozaZoxo4JmqSc/EwguMpI45EebjNI3cQkwrCfPim6b
|
||||||
|
02b5Xj+b3kuMwjLS4tqXGFCniDNAIH3qhHOEWovdeCy4yOGDuzQye7qcb011wpp5K3Y+zv3
|
||||||
|
u+KYJmttKbwcJdT8JijcQ==
|
||||||
|
X-Spam-Flag: NO
|
||||||
|
X-UI-Out-Filterresults: notjunk:1;V03:K0:vCe5hpyJPR8=:disR8f0omoqst11p1fIKAh
|
||||||
|
iBAK1nFXc7AmOcAiFW44MeJNXdocthJHRd3VEcy9/B9yqK/hTjhNCgBGLXvhk3UzVzVTDK802
|
||||||
|
kBf9cEBdt34sF6mLB40sUD5CXT7PaMoPa78w45lA9C3+dF/9UxU09+6fr6SVTgU3mu6Hn2JqJ
|
||||||
|
nvfqFZiqINBWoePt9nqRkkTUrqgEyMT6qHHfJUTadp6PJeCXCeirRPUqFqdJ8vx+tsSMrD+G5
|
||||||
|
fmZlzpPnl8Ky3j1gtFkLLcEAOMtAgzPfeEONvZiwK5J6n5MxwprBNRT7E07hW+xDfcQbQE0rD
|
||||||
|
8RGbx1mkzr2V92lpYcIRTNqde+Oh+/V4C4s6rQGxN+x/xws7iNpUeU9Rpv65WHyiheHZUcHs6
|
||||||
|
4n7JmhPiZXUCFzWUrmM6oJB7O70rL8WobnNCWQmNtYRuiqGautEew+TItXYvKBCtvFrALXdM+
|
||||||
|
vb1+FrU03VriEuoHeRWwPEsO45SGVwhYIsolu6CRDFU9G4a0WdORqWZVYVP+0JvpMOe/lA2zY
|
||||||
|
2rl2QFH53x1+BtBVK20hHOh7W3xtLH+WzZFsAzmnNe3+61mRhxIzHfDY3otUHd7hUG+pyyhXw
|
||||||
|
6RI9YNTvxF2AQ1rzSvvCNNtPkovfmdPvPTfO2Sqig4TRyAE9/Un4zf1wnoho8+Hqw2w2gvh2g
|
||||||
|
lFdajNupo7PiibkssZMeWpi2Yyw+Ql484vPZldLOBFiuDXWRwYHJA7n3CWPRqu4FkvqZI0woF
|
||||||
|
iWwuOPIyYV09g8L2UPq4YiXXvNXKdJWpQh/x59dBhs26HHmbaZxBvFHrUY7FWo9HRjA0t8hvE
|
||||||
|
oDTTozWqTW6xzbFzIwp0E29Vp6mciCpjiqoLv7MMTbg0U9pPnAQecIk11U33l0ZqVQyKSxq8G
|
||||||
|
Fdwl4gLqiQcP6Y/Zm2wBLvnsSffYrkTmqpiQ6RjPOPPy9GxZHTglNZP6Cr4a5N3lHKv4+rvUV
|
||||||
|
pKvy7jWH6ub53Ne6v/8q//sL+wQIbqfuTNNpvc+MI28YX7YthEldq1GRyRKJ5k4z6o2nrqUik
|
||||||
|
oRx5AuvdO3oPcAIsUwKaeuXqRrTtC9M6kdubTFXOZ8EZzZtj1unz7h3zRztMQu37AvKSyHhxt
|
||||||
|
k56zCWlbMOjoKO97tb/lVKVF80M81PnaiIOXQ9I9E3UIF2s95Wg/VbtVzkWi4oF6WwrqqO44y
|
||||||
|
sthchBfNPGC/jUAm3c9UeqBDY4lM5Ilus4dUpjvn4gcHDKMGS6iu/KEEMEuL56mRaMcwg/xXM
|
||||||
|
L5sIsGmzM7HYTjE4fJFm35NicLPlNwOqZLoaMsg==
|
||||||
|
X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3
|
||||||
|
X-CRM114-CacheID: sfid-20191003_145054_230248_23AC2987
|
||||||
|
X-CRM114-Status: UNSURE ( 9.25 )
|
||||||
|
X-CRM114-Notice: Please train this message.
|
||||||
|
X-Spam-Score: -0.9 (/)
|
||||||
|
X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary:
|
||||||
|
Content analysis details: (-0.9 points)
|
||||||
|
pts rule name description
|
||||||
|
---- ----------------------
|
||||||
|
--------------------------------------------------
|
||||||
|
0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail
|
||||||
|
provider (smoch[at]web.de)
|
||||||
|
-0.0 SPF_PASS SPF: sender matches SPF record
|
||||||
|
0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
|
||||||
|
-0.1 DKIM_VALID Message has at least one valid DKIM or DK signature
|
||||||
|
-0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from
|
||||||
|
author's domain
|
||||||
|
-0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from
|
||||||
|
envelope-from domain
|
||||||
|
0.1 DKIM_SIGNED Message has a DKIM or DK signature,
|
||||||
|
not necessarily
|
||||||
|
valid
|
||||||
|
-0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/,
|
||||||
|
low trust [217.72.192.78 listed in list.dnswl.org]
|
||||||
|
X-BeenThere: linux-arm-kernel@lists.infradead.org
|
||||||
|
X-Mailman-Version: 2.1.29
|
||||||
|
Precedence: list
|
||||||
|
List-Id: <linux-arm-kernel.lists.infradead.org>
|
||||||
|
List-Unsubscribe:
|
||||||
|
<http://lists.infradead.org/mailman/options/linux-arm-kernel>,
|
||||||
|
<mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe>
|
||||||
|
List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/>
|
||||||
|
List-Post: <mailto:linux-arm-kernel@lists.infradead.org>
|
||||||
|
List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help>
|
||||||
|
List-Subscribe:
|
||||||
|
<http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>,
|
||||||
|
<mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe>
|
||||||
|
Cc: linux-rockchip@lists.infradead.org, Soeren Moch <smoch@web.de>,
|
||||||
|
linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset="us-ascii"
|
||||||
|
Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org>
|
||||||
|
Errors-To:
|
||||||
|
linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org
|
||||||
|
|
||||||
|
The RockPro64 schematic [1] page 18 states a min voltage of 0.8V and a
|
||||||
|
max voltage of 1.4V for the VDD_LOG pwm regulator. However, there is an
|
||||||
|
additional note that the pwm parameter needs to be modified.
|
||||||
|
From the schematics a voltage range of 0.8V to 1.7V can be calculated.
|
||||||
|
Additional voltage measurements on the board show that this fix indeed
|
||||||
|
leads to the correct voltage, while without this fix the voltage was set
|
||||||
|
too high.
|
||||||
|
|
||||||
|
[1] http://files.pine64.org/doc/rockpro64/rockpro64_v21-SCH.pdf
|
||||||
|
|
||||||
|
Fixes: e4f3fb490967 ("arm64: dts: rockchip: add initial dts support for Rockpro64")
|
||||||
|
Signed-off-by: Soeren Moch <smoch@web.de>
|
||||||
|
---
|
||||||
|
Cc: Heiko Stuebner <heiko@sntech.de>
|
||||||
|
Cc: linux-rockchip@lists.infradead.org
|
||||||
|
Cc: linux-arm-kernel@lists.infradead.org
|
||||||
|
Cc: linux-kernel@vger.kernel.org
|
||||||
|
---
|
||||||
|
arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
--
|
||||||
|
2.17.1
|
||||||
|
|
||||||
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
|
||||||
|
index 0401d4ec1f45..845eb070b5b0 100644
|
||||||
|
--- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
|
||||||
|
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
|
||||||
|
@@ -173,7 +173,7 @@
|
||||||
|
regulator-always-on;
|
||||||
|
regulator-boot-on;
|
||||||
|
regulator-min-microvolt = <800000>;
|
||||||
|
- regulator-max-microvolt = <1400000>;
|
||||||
|
+ regulator-max-microvolt = <1700000>;
|
||||||
|
vin-supply = <&vcc5v0_sys>;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
From patchwork Thu Oct 3 21:50:35 2019
|
||||||
|
Content-Type: text/plain; charset="utf-8"
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Transfer-Encoding: 7bit
|
||||||
|
X-Patchwork-Submitter: =?utf-8?q?S=C3=B6ren_Moch?= <smoch@web.de>
|
||||||
|
X-Patchwork-Id: 11173469
|
||||||
|
Return-Path:
|
||||||
|
<SRS0=jVsO=X4=lists.infradead.org=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@kernel.org>
|
||||||
|
Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org
|
||||||
|
[172.30.200.123])
|
||||||
|
by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5975A76
|
||||||
|
for <patchwork-linux-arm@patchwork.kernel.org>;
|
||||||
|
Thu, 3 Oct 2019 21:51:41 +0000 (UTC)
|
||||||
|
Received: from bombadil.infradead.org (bombadil.infradead.org
|
||||||
|
[198.137.202.133])
|
||||||
|
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
|
||||||
|
(No client certificate requested)
|
||||||
|
by mail.kernel.org (Postfix) with ESMTPS id E5CD92133F
|
||||||
|
for <patchwork-linux-arm@patchwork.kernel.org>;
|
||||||
|
Thu, 3 Oct 2019 21:51:40 +0000 (UTC)
|
||||||
|
Authentication-Results: mail.kernel.org;
|
||||||
|
dkim=pass (2048-bit key) header.d=lists.infradead.org
|
||||||
|
header.i=@lists.infradead.org header.b="aIzQ/7Xd";
|
||||||
|
dkim=fail reason="signature verification failed" (1024-bit key)
|
||||||
|
header.d=web.de header.i=@web.de header.b="cmtE0euk"
|
||||||
|
DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E5CD92133F
|
||||||
|
Authentication-Results: mail.kernel.org;
|
||||||
|
dmarc=none (p=none dis=none) header.from=web.de
|
||||||
|
Authentication-Results: mail.kernel.org;
|
||||||
|
spf=none
|
||||||
|
smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org
|
||||||
|
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
|
||||||
|
d=lists.infradead.org; s=bombadil.20170209; h=Sender:
|
||||||
|
Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe:
|
||||||
|
List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References:
|
||||||
|
In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID:
|
||||||
|
Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc
|
||||||
|
:Resent-Message-ID:List-Owner;
|
||||||
|
bh=1Ja1XJBYc2rMTJo1j3aWlo4ggxMpTccXfhnANJoFXgY=; b=aIzQ/7XdT4Dm/qBnxRPzUbll2w
|
||||||
|
+n6AExDbccfUt23EF39R3wxjN3Y1Apw4+gGY7pruuVEJUqZtMi/llXHhDQ8hfCughA/ul1Tw1OOuw
|
||||||
|
MdhrxvxV35qrfTIRGY5ZWD1bXE2jh5w65I6NUHqvoXdC8pXxgd55P2RS4TCGPlqt9mo+0i+/E/wmN
|
||||||
|
11Za83+GgoXTvJdukL/nDZOY19RYk1SmkjyvMwU3JHraN2osMq9ct+NQMZWalPOMgC6SrU7+eEvMC
|
||||||
|
Gxip1cUJ1f6bIUhuIikgD83hJeX+xmzblFy8fdqxostMpqcn+bhQfyeIAzwRGCFIWjQyNtmnlC5n+
|
||||||
|
UXRYljnQ==;
|
||||||
|
Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org)
|
||||||
|
by bombadil.infradead.org with esmtp (Exim 4.92.2 #3 (Red Hat Linux))
|
||||||
|
id 1iG90Y-0005J7-RT; Thu, 03 Oct 2019 21:51:34 +0000
|
||||||
|
Received: from mout.web.de ([212.227.17.11])
|
||||||
|
by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux))
|
||||||
|
id 1iG8zv-0004gv-AV; Thu, 03 Oct 2019 21:50:57 +0000
|
||||||
|
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de;
|
||||||
|
s=dbaedf251592; t=1570139445;
|
||||||
|
bh=Kn0TuCilrYfaGPMHgSwOwV8cx+fxujsxvbyRlPzXJ8o=;
|
||||||
|
h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;
|
||||||
|
b=cmtE0euk/irI14sTr6wSajU7DkGxBMrgNowkeu6VcNZvW3f0N4hhG8ItwhpI0YpTh
|
||||||
|
8lzeG8VnZoKFq/TjpSg5uwCrqPWpS10ZdCAyg2gD2AFDHFNrJYOXdAz36LgORPmGbW
|
||||||
|
V5MeWcSytSaC+XTNGoV1tvq3jSY9Mv9Bl83T95nw=
|
||||||
|
X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9
|
||||||
|
Received: from platinum.fritz.box ([89.14.73.200]) by smtp.web.de (mrweb103
|
||||||
|
[213.165.67.124]) with ESMTPSA (Nemesis) id 0MfYj1-1iVD2M15x5-00P6D9; Thu, 03
|
||||||
|
Oct 2019 23:50:45 +0200
|
||||||
|
From: Soeren Moch <smoch@web.de>
|
||||||
|
To: Heiko Stuebner <heiko@sntech.de>
|
||||||
|
Subject: [PATCH 2/3] arm64: dts: rockchip: fix RockPro64 sdhci settings
|
||||||
|
Date: Thu, 3 Oct 2019 23:50:35 +0200
|
||||||
|
Message-Id: <20191003215036.15023-2-smoch@web.de>
|
||||||
|
X-Mailer: git-send-email 2.17.1
|
||||||
|
In-Reply-To: <20191003215036.15023-1-smoch@web.de>
|
||||||
|
References: <20191003215036.15023-1-smoch@web.de>
|
||||||
|
X-Provags-ID: V03:K1:B7ZztmDbKfGYru8Phbjqw2pez33XX2FSpU8BwevUN/gNPgO8fUz
|
||||||
|
Mai6ERMM+Am8U/N9uGjHbwMNeghFPQW7/5jXUjBypLLZwSwWLX/bmfozsCdhRyF473wRV6y
|
||||||
|
spAcVmzJIceDsbk8eJUfuek7itb3S1FXU0GIz+J8Kq+NUgmS2uain/rtAWa5uIY4abpsNPZ
|
||||||
|
xoT1S8+2Brauk0we7S4Yw==
|
||||||
|
X-Spam-Flag: NO
|
||||||
|
X-UI-Out-Filterresults: notjunk:1;V03:K0:Fx3wTDvJkB4=:V0/tzMx03qqKbK8T7SQOWI
|
||||||
|
9oNjxL17k927PeGDNqyW09+kBTsivpZYFEY55iOLZQv/pcGoOi5Xb6AcCBYKMiTRyhraVXwye
|
||||||
|
XKQOQIxWQimyx0etxkPkyvp/uyl2YBSavT6nSF+kTgN7t+SgVJNTyrLv+eMPwmzkEkIJQdCU5
|
||||||
|
V1mtMudj13veu2CM7XQHE0kPcRVBw26Tay25FSXUsMl40Ha8HuKe+8mnjZQsVgdcSVG8xSVQ3
|
||||||
|
jZmjAH1ehBHemYGNbgyMUp4e1f4HcPWsLUuWF7UKPu9TbSACPtxiuV32C66ptioz4kPPQ5siy
|
||||||
|
ectJM+L471sJFLXv55j5x/Nkgj3PfaxjEVTdSm+P4K/6H5hfWWRp82n3BenrB1d+6VFEhsO+u
|
||||||
|
JnBewMKGVVfdh5O5JtioJ0k+pSM0S42OwzaNZd/cNJ9dAIKjhMH2vyEvbZezZocTcofxDukVp
|
||||||
|
gjfr4Mm1dVwDaazXLJEkMEToo5SOcAmmV6FsW/ivupt+fLuexl4Oo6lD4BIV1OKMoVIpr1dBn
|
||||||
|
kMgHVJneAh+yrmtQvAzjUwD5AC8O9qu5jZf+j/jmDX+rL6TANZS3ia8aI9JMpxtGKjzii+6iD
|
||||||
|
U3WMamIS9EBYCuXWR0fUXwzkylZVpKJj8OLQyl4z4hBJ1mYflKFVTDvqir/+XPgIgMB0W62oA
|
||||||
|
jjHIRSmMdnYgJBjR2DmfERbvRA+CoadWdHgQCy9O7RysmAZL++rd9wX+HfiOgKhPho8G66nvR
|
||||||
|
mz3xPqQHcPpbLXgz2xr3tF3itCBwtwuC1YVf1AN0cg7UdiskrXLDx2UesrDqApECFUNx3vPYD
|
||||||
|
Fknt9SE0EqaerIgseAeXAAJcmIn4pvUio9sTKyC1oKt0ojx0CpOhF2/alKQx9sLCfNJpqSSLx
|
||||||
|
Nn0sPBZCgbq0fI3Y+qGctkGUZCbS/yode78mXh4C/fHyf0VA1gJLGVo8R18or9Zpk5asg1hBp
|
||||||
|
gLIG+YYUC0a1HSlF0zIeTiYeXkOeLiEBn65QzM0DJSLVcPG5G5HR8/s0AbXXpAsX62BRHA4jk
|
||||||
|
yWxcY7I9ZJ8iKPjZgyr1+Q5dqidladBAq1qWsHy7X0xQTJn+CC4y2jrpjxYOsym5sLnj76U90
|
||||||
|
CHjUybKWdmPaaENk6I/jdwCrzqRU3MJERrz9IdsxepZZYpwXIWpH6KBrNOX4zm1FINpUtxgdx
|
||||||
|
9VajcWzh3pSIG5rAfJiTartXpAvyOMcZeG6dJkNoUWslE74gCsm4LFbqAGrsdx7oExx57Guae
|
||||||
|
1ASgkma3Lp4s45yCKgQP7X/0hLVXqE1uQeloYqg==
|
||||||
|
X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3
|
||||||
|
X-CRM114-CacheID: sfid-20191003_145055_661636_5577849E
|
||||||
|
X-CRM114-Status: UNSURE ( 9.52 )
|
||||||
|
X-CRM114-Notice: Please train this message.
|
||||||
|
X-Spam-Score: -0.9 (/)
|
||||||
|
X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary:
|
||||||
|
Content analysis details: (-0.9 points)
|
||||||
|
pts rule name description
|
||||||
|
---- ----------------------
|
||||||
|
--------------------------------------------------
|
||||||
|
-0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/,
|
||||||
|
low trust [212.227.17.11 listed in list.dnswl.org]
|
||||||
|
0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail
|
||||||
|
provider (smoch[at]web.de)
|
||||||
|
-0.0 SPF_PASS SPF: sender matches SPF record
|
||||||
|
0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
|
||||||
|
-0.1 DKIM_VALID Message has at least one valid DKIM or DK signature
|
||||||
|
-0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from
|
||||||
|
author's domain
|
||||||
|
-0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from
|
||||||
|
envelope-from domain
|
||||||
|
0.1 DKIM_SIGNED Message has a DKIM or DK signature,
|
||||||
|
not necessarily
|
||||||
|
valid
|
||||||
|
X-BeenThere: linux-arm-kernel@lists.infradead.org
|
||||||
|
X-Mailman-Version: 2.1.29
|
||||||
|
Precedence: list
|
||||||
|
List-Id: <linux-arm-kernel.lists.infradead.org>
|
||||||
|
List-Unsubscribe:
|
||||||
|
<http://lists.infradead.org/mailman/options/linux-arm-kernel>,
|
||||||
|
<mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe>
|
||||||
|
List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/>
|
||||||
|
List-Post: <mailto:linux-arm-kernel@lists.infradead.org>
|
||||||
|
List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help>
|
||||||
|
List-Subscribe:
|
||||||
|
<http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>,
|
||||||
|
<mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe>
|
||||||
|
Cc: linux-rockchip@lists.infradead.org, Soeren Moch <smoch@web.de>,
|
||||||
|
linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset="us-ascii"
|
||||||
|
Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org>
|
||||||
|
Errors-To:
|
||||||
|
linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org
|
||||||
|
|
||||||
|
The RockPro64 schematics [1], [2] show that the rk3399 EMMC_STRB pin is
|
||||||
|
connected to the RESET pin instead of the DATA_STROBE pin of the eMMC module.
|
||||||
|
So the data strobe cannot be used for its intended purpose on this board,
|
||||||
|
and so the HS400 eMMC mode is not functional. Limit the controller to HS200.
|
||||||
|
|
||||||
|
[1] http://files.pine64.org/doc/rockpro64/rockpro64_v21-SCH.pdf
|
||||||
|
[2] http://files.pine64.org/doc/rock64/PINE64_eMMC_Module_20170719.pdf
|
||||||
|
|
||||||
|
Fixes: e4f3fb490967 ("arm64: dts: rockchip: add initial dts support for Rockpro64")
|
||||||
|
Signed-off-by: Soeren Moch <smoch@web.de>
|
||||||
|
---
|
||||||
|
Cc: Heiko Stuebner <heiko@sntech.de>
|
||||||
|
Cc: linux-rockchip@lists.infradead.org
|
||||||
|
Cc: linux-arm-kernel@lists.infradead.org
|
||||||
|
Cc: linux-kernel@vger.kernel.org
|
||||||
|
---
|
||||||
|
arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts | 3 +--
|
||||||
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||||
|
|
||||||
|
--
|
||||||
|
2.17.1
|
||||||
|
|
||||||
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
|
||||||
|
index 845eb070b5b0..2e44dae4865a 100644
|
||||||
|
--- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
|
||||||
|
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
|
||||||
|
@@ -636,8 +636,7 @@
|
||||||
|
|
||||||
|
&sdhci {
|
||||||
|
bus-width = <8>;
|
||||||
|
- mmc-hs400-1_8v;
|
||||||
|
- mmc-hs400-enhanced-strobe;
|
||||||
|
+ mmc-hs200-1_8v;
|
||||||
|
non-removable;
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
|
||||||
|
From patchwork Fri Oct 4 20:32:13 2019
|
||||||
|
Content-Type: text/plain; charset="utf-8"
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Transfer-Encoding: 7bit
|
||||||
|
X-Patchwork-Submitter: =?utf-8?q?S=C3=B6ren_Moch?= <smoch@web.de>
|
||||||
|
X-Patchwork-Id: 11175275
|
||||||
|
Return-Path:
|
||||||
|
<SRS0=D5dO=X5=lists.infradead.org=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@kernel.org>
|
||||||
|
Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org
|
||||||
|
[172.30.200.123])
|
||||||
|
by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DB53776
|
||||||
|
for <patchwork-linux-arm@patchwork.kernel.org>;
|
||||||
|
Fri, 4 Oct 2019 20:32:36 +0000 (UTC)
|
||||||
|
Received: from bombadil.infradead.org (bombadil.infradead.org
|
||||||
|
[198.137.202.133])
|
||||||
|
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
|
||||||
|
(No client certificate requested)
|
||||||
|
by mail.kernel.org (Postfix) with ESMTPS id B885821D81
|
||||||
|
for <patchwork-linux-arm@patchwork.kernel.org>;
|
||||||
|
Fri, 4 Oct 2019 20:32:36 +0000 (UTC)
|
||||||
|
Authentication-Results: mail.kernel.org;
|
||||||
|
dkim=pass (2048-bit key) header.d=lists.infradead.org
|
||||||
|
header.i=@lists.infradead.org header.b="Kyzudsgx";
|
||||||
|
dkim=fail reason="signature verification failed" (1024-bit key)
|
||||||
|
header.d=web.de header.i=@web.de header.b="LF1if5y/"
|
||||||
|
DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B885821D81
|
||||||
|
Authentication-Results: mail.kernel.org;
|
||||||
|
dmarc=none (p=none dis=none) header.from=web.de
|
||||||
|
Authentication-Results: mail.kernel.org;
|
||||||
|
spf=none
|
||||||
|
smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org
|
||||||
|
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
|
||||||
|
d=lists.infradead.org; s=bombadil.20170209; h=Sender:
|
||||||
|
Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe:
|
||||||
|
List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date:
|
||||||
|
Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date:
|
||||||
|
Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:
|
||||||
|
References:List-Owner; bh=dHmD7+pyTraHtU6tNX3vZnXR737wGLCZLdWRfkYFpi0=; b=Kyz
|
||||||
|
udsgxHfoJqpjf89AdGuslY1w4pUpYO7aJ6+VJuDnsGLufBp9F4+yxX7UHhyIbWqlaegelJ+Z3a0CN
|
||||||
|
vdb7065nXi+ggnq64pCIXY8ZyS13Nc+lpmpFoEMEyvxgrNdu38SJaLj5s8LUMJdZENP1j8kLESEa4
|
||||||
|
8VbV9r7X+GwBf2aBERsF9+vxV3D+49ULxCaDv5mLVRX+5nM8d/AEPJqyBnLYh/i7j/31rk6aH26dY
|
||||||
|
4TdVsdvTnm2Ck6zIcHEDX22Eq2vlcw1U8WdctFzzfHSDsWFGAvVvWPwnSe0h7niizqbqLO3cC2WOT
|
||||||
|
2ttragRnBvdMCd1TD/sRdBnoOj946RQ==;
|
||||||
|
Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org)
|
||||||
|
by bombadil.infradead.org with esmtp (Exim 4.92.2 #3 (Red Hat Linux))
|
||||||
|
id 1iGUFf-0002b8-O6; Fri, 04 Oct 2019 20:32:35 +0000
|
||||||
|
Received: from mout.web.de ([217.72.192.78])
|
||||||
|
by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux))
|
||||||
|
id 1iGUFc-0002ac-RO; Fri, 04 Oct 2019 20:32:34 +0000
|
||||||
|
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de;
|
||||||
|
s=dbaedf251592; t=1570221145;
|
||||||
|
bh=x/DBaa+r9mxjwAjUssLHup4baAiO0UG/yVrLOutxWsg=;
|
||||||
|
h=X-UI-Sender-Class:From:To:Cc:Subject:Date;
|
||||||
|
b=LF1if5y/7T4QYPyiawCf94aYJcnXUc1aL405rucwF10cabjCghlaJXN/uO8vszdOl
|
||||||
|
pJS9oYcF8l9BmR4yT8PVrUWeMZYyAGpt9jc7syVqksEP91IhyUph/X/QnrJzecxDXx
|
||||||
|
1vehZNdcbWFN/q59sUmwmzsDfjka3LhL7znEDfv0=
|
||||||
|
X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9
|
||||||
|
Received: from platinum.fritz.box ([77.191.3.29]) by smtp.web.de (mrweb103
|
||||||
|
[213.165.67.124]) with ESMTPSA (Nemesis) id 0LetQh-1hlnfS19m3-00qhBK; Fri, 04
|
||||||
|
Oct 2019 22:32:25 +0200
|
||||||
|
From: Soeren Moch <smoch@web.de>
|
||||||
|
To: Heiko Stuebner <heiko@sntech.de>
|
||||||
|
Subject: [PATCH v2] arm64: dts: rockchip: fix RockPro64 sdmmc settings
|
||||||
|
Date: Fri, 4 Oct 2019 22:32:13 +0200
|
||||||
|
Message-Id: <20191004203213.4995-1-smoch@web.de>
|
||||||
|
X-Mailer: git-send-email 2.17.1
|
||||||
|
X-Provags-ID: V03:K1:1I5fDQkIZVn2LdNRnwDfp8md+rO+2Vp/TSL6bgE19S+U7e8RlmF
|
||||||
|
EhFJGxdLBOeBh6Du3qsKPexxIxstJER4ErQMtp1m6HJoiQsEne8w+BrsSwO0Wh30laTuPec
|
||||||
|
sK6/onl3zLo9YFphxcEW9zEFFPKS60lWUADP6OIr07s0FyO6OanEsEx+RHULWedKrDDKbbW
|
||||||
|
4W1V/uNb/1JyOY4IW4Qow==
|
||||||
|
X-Spam-Flag: NO
|
||||||
|
X-UI-Out-Filterresults: notjunk:1;V03:K0:ICsnY7aMJQ4=:5/WFKM85bWZHZp/krlqXXa
|
||||||
|
JGKxGv3pOO7ubUb+8TvRSP6RJu3y4QxXOJWL/6bmP5fpRZvWD3UZl7gdjPlA+nLBC8i2W/+dO
|
||||||
|
zdVsBndquXxgZt1sQulCc5ZMhkMIh6ThPnQnHBB+oy1YPivo6dPcxncbjvbgb0+O0i7ydHoXj
|
||||||
|
9ZiON6aJCfh7U6zRf7GSQSUu25BEz2Oyo8z8ITYVI+YANji74gj8tiobps8fVES9iDrL6irbj
|
||||||
|
dhL1JHZOJxr/fK6Z51SzaBX3usndL2ldDDzJI/TWTeKygsqRVom91DOy93TS2/y3+qdVSvYHG
|
||||||
|
Ohp2hB9xJxVXu2IJoD0BlEEMMMLGLXsi9R8z0GYiCaG43z0zSRDzc0SdumQ7fznh8D2k2mmMR
|
||||||
|
FPMSML/uY/JqWBSj1nTV4nmpdVeLGEuANsCwJoXq+NOlXAaU2K5vXwSSoNPY9+ned+268R90G
|
||||||
|
28MCRcCSpFU0YrPun9sMM9fy/3pD3PKjGmTMDoOQHOlF7mYi796LT/8J7kAw2TK7XILqRP0/V
|
||||||
|
2RJz031b8L1r3Hptl0OD20z+eYtpFmPPsa7q2+CmsKLprUxrdBx+xgC4poof91mOYwsQAqLBc
|
||||||
|
X6ljlMxZ+BwxkNf4QTipd4dhMcUuTrIO5BxXx02nG9XMwrHIx5zHBaMz9KAnyxHt7Q1BVocqi
|
||||||
|
Wv4JyFhARvR526ogFn1aXu7KJxyBeM87BW5J2a4fsaeGrQlrMViuc6VzaSV/jHDJ8Hu1i+i6O
|
||||||
|
Mfgqc4+EEuoFxKT4vfCmaYNX+2Jn2t1jXf1Km1+AE05VCFEkhmo4ogflTJ1fsf5NrX4fyoZcU
|
||||||
|
vFlEQyR6Msy3TXJGZfVmHSdTV1BnTSIMMDUfgJHO+Gwuw3t0J0xITHeF/6VebU/APujrOpRqS
|
||||||
|
bvEoHl729Odz0/0o7HK+5fctl7UktilntlJkCQnUzVl12NrTOrdFeZNU8jvm/PyK7U6UlWVva
|
||||||
|
iIjHQxfZqOOCb7no9+gZ0+OXFguVTBdHUsDbdI8rMTY3l1xXsLKc0wZoBvGtJkydtkZxQ7K8r
|
||||||
|
yvGgesqk8DaEJSzOL1rSStkQBqE7gHuApTovSRLe9nn2uA0UNabEYbwP3mmZ2A8X02EZ3m7Yu
|
||||||
|
SjpYxwom+3lHLwSTaYCSoGEe/zKKwZBQ/I3sRnuKEGJwMT2Ph7UWe/OohBaLf5VDopnWXL3iP
|
||||||
|
D5waU3h0q0iVYGMjc75FAtIpG/uPJAVIAouxPQa4k0aoqU7IzGd2dCky/LxxSob/H7k4Bu4Vq
|
||||||
|
sjEKSF7D5Grbp7B0vKAQvqgdUg6ohIjG5LGVLRQ==
|
||||||
|
X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3
|
||||||
|
X-CRM114-CacheID: sfid-20191004_133233_182966_B73EA9A6
|
||||||
|
X-CRM114-Status: UNSURE ( 6.77 )
|
||||||
|
X-CRM114-Notice: Please train this message.
|
||||||
|
X-Spam-Score: -0.9 (/)
|
||||||
|
X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary:
|
||||||
|
Content analysis details: (-0.9 points)
|
||||||
|
pts rule name description
|
||||||
|
---- ----------------------
|
||||||
|
--------------------------------------------------
|
||||||
|
0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail
|
||||||
|
provider (smoch[at]web.de)
|
||||||
|
-0.0 SPF_PASS SPF: sender matches SPF record
|
||||||
|
0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
|
||||||
|
-0.1 DKIM_VALID Message has at least one valid DKIM or DK signature
|
||||||
|
-0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from
|
||||||
|
author's domain
|
||||||
|
-0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from
|
||||||
|
envelope-from domain
|
||||||
|
0.1 DKIM_SIGNED Message has a DKIM or DK signature,
|
||||||
|
not necessarily
|
||||||
|
valid
|
||||||
|
-0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/,
|
||||||
|
low trust [217.72.192.78 listed in list.dnswl.org]
|
||||||
|
X-BeenThere: linux-arm-kernel@lists.infradead.org
|
||||||
|
X-Mailman-Version: 2.1.29
|
||||||
|
Precedence: list
|
||||||
|
List-Id: <linux-arm-kernel.lists.infradead.org>
|
||||||
|
List-Unsubscribe:
|
||||||
|
<http://lists.infradead.org/mailman/options/linux-arm-kernel>,
|
||||||
|
<mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe>
|
||||||
|
List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/>
|
||||||
|
List-Post: <mailto:linux-arm-kernel@lists.infradead.org>
|
||||||
|
List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help>
|
||||||
|
List-Subscribe:
|
||||||
|
<http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>,
|
||||||
|
<mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe>
|
||||||
|
Cc: linux-rockchip@lists.infradead.org, Soeren Moch <smoch@web.de>,
|
||||||
|
linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset="us-ascii"
|
||||||
|
Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org>
|
||||||
|
Errors-To:
|
||||||
|
linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org
|
||||||
|
|
||||||
|
According to the RockPro64 schematic [1] the rk3399 sdmmc controller is
|
||||||
|
connected to a microSD (TF card) slot. Remove the cap-mmc-highspeed
|
||||||
|
property of the sdmmc controller, since no mmc card can be connected here.
|
||||||
|
|
||||||
|
[1] http://files.pine64.org/doc/rockpro64/rockpro64_v21-SCH.pdf
|
||||||
|
|
||||||
|
Fixes: e4f3fb490967 ("arm64: dts: rockchip: add initial dts support for Rockpro64")
|
||||||
|
Signed-off-by: Soeren Moch <smoch@web.de>
|
||||||
|
---
|
||||||
|
Cc: Heiko Stuebner <heiko@sntech.de>
|
||||||
|
Cc: linux-rockchip@lists.infradead.org
|
||||||
|
Cc: linux-arm-kernel@lists.infradead.org
|
||||||
|
Cc: linux-kernel@vger.kernel.org
|
||||||
|
---
|
||||||
|
arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts | 1 -
|
||||||
|
1 file changed, 1 deletion(-)
|
||||||
|
|
||||||
|
--
|
||||||
|
2.17.1
|
||||||
|
|
||||||
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
|
||||||
|
index 2e44dae4865a..6ec4d273a39b 100644
|
||||||
|
--- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
|
||||||
|
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
|
||||||
|
@@ -624,7 +624,6 @@
|
||||||
|
|
||||||
|
&sdmmc {
|
||||||
|
bus-width = <4>;
|
||||||
|
- cap-mmc-highspeed;
|
||||||
|
cap-sd-highspeed;
|
||||||
|
cd-gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
|
||||||
|
disable-wp;
|
|
@ -0,0 +1,176 @@
|
||||||
|
From patchwork Sat Sep 21 13:14:57 2019
|
||||||
|
Content-Type: text/plain; charset="utf-8"
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Transfer-Encoding: 7bit
|
||||||
|
X-Patchwork-Submitter: Hugh Cole-Baker <sigmaris@gmail.com>
|
||||||
|
X-Patchwork-Id: 11155461
|
||||||
|
Return-Path:
|
||||||
|
<SRS0=JTnI=XQ=lists.infradead.org=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@kernel.org>
|
||||||
|
Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org
|
||||||
|
[172.30.200.123])
|
||||||
|
by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E1D6015E6
|
||||||
|
for <patchwork-linux-arm@patchwork.kernel.org>;
|
||||||
|
Sat, 21 Sep 2019 13:15:24 +0000 (UTC)
|
||||||
|
Received: from bombadil.infradead.org (bombadil.infradead.org
|
||||||
|
[198.137.202.133])
|
||||||
|
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
|
||||||
|
(No client certificate requested)
|
||||||
|
by mail.kernel.org (Postfix) with ESMTPS id B3213208C0
|
||||||
|
for <patchwork-linux-arm@patchwork.kernel.org>;
|
||||||
|
Sat, 21 Sep 2019 13:15:24 +0000 (UTC)
|
||||||
|
Authentication-Results: mail.kernel.org;
|
||||||
|
dkim=pass (2048-bit key) header.d=lists.infradead.org
|
||||||
|
header.i=@lists.infradead.org header.b="W5WNb2TT";
|
||||||
|
dkim=fail reason="signature verification failed" (2048-bit key)
|
||||||
|
header.d=gmail.com header.i=@gmail.com header.b="aEQ/uRYv"
|
||||||
|
DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B3213208C0
|
||||||
|
Authentication-Results: mail.kernel.org;
|
||||||
|
dmarc=fail (p=none dis=none) header.from=gmail.com
|
||||||
|
Authentication-Results: mail.kernel.org;
|
||||||
|
spf=none
|
||||||
|
smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org
|
||||||
|
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
|
||||||
|
d=lists.infradead.org; s=bombadil.20170209; h=Sender:
|
||||||
|
Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe:
|
||||||
|
List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date:
|
||||||
|
Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date:
|
||||||
|
Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:
|
||||||
|
References:List-Owner; bh=QLfO79ztbvlytyrABYnU/Ie8WNhDlpOUcFlxv1bWAE0=; b=W5W
|
||||||
|
Nb2TTjjSFXpARxovU0gOdO72UtLrMdXbc9I5OSMOqQEbYRXyDnfj5yxtTPyEDEdPNIP0C+CINfgqP
|
||||||
|
i7tvTWHEJ+WLQl6W5x9rWLoj02r3L2huGNpc5wjq+YZe20bFzs9eRe1leAnmghM8UAnvP496rcA18
|
||||||
|
haBwaAQzZoECuKW3x+uDJ5eehlnL9OhnPUXpYYaOLBBiBg0jOPFlA/FIMUzY7IXRQrlzgSVcAN6pR
|
||||||
|
Ls+x5RBZZyQQqm9RfmChVRfa2NKhWD/TjnjLEfCYB0IovxrY3ar4mLmYeGm9ladShqqfLX8zhY0+8
|
||||||
|
OaTRBY64J4Yfk8owMuN7Rr+D4O12ndQ==;
|
||||||
|
Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org)
|
||||||
|
by bombadil.infradead.org with esmtp (Exim 4.92.2 #3 (Red Hat Linux))
|
||||||
|
id 1iBfEN-0002Op-RP; Sat, 21 Sep 2019 13:15:19 +0000
|
||||||
|
Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341])
|
||||||
|
by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux))
|
||||||
|
id 1iBfEL-0002O9-AK; Sat, 21 Sep 2019 13:15:18 +0000
|
||||||
|
Received: by mail-wm1-x341.google.com with SMTP id p7so5200464wmp.4;
|
||||||
|
Sat, 21 Sep 2019 06:15:14 -0700 (PDT)
|
||||||
|
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
|
||||||
|
h=from:to:cc:subject:date:message-id;
|
||||||
|
bh=CUIiObmZUoLOjlcmGuE4Z8qsrk1peXb9nnaXkFScf1o=;
|
||||||
|
b=aEQ/uRYvCsbX944pwrZC5Zi5+pI6s/P143IvpXdlQXMblp/gr0TEwvb4/jIY8KcTPb
|
||||||
|
h+OCadPSshMmMPvaxG+aDklS4bI+8UV1JUuif5+/cH6ND7u1pCPlRypNjKUUSwZlcfVY
|
||||||
|
fmOmGc8jEjdrmt2rxdLStr2mvlAdNsGDr/SrNSboflvindXVGUKuxoMwkhXbfAgD7kXD
|
||||||
|
ds2xaFd7dONWCaZm0mLYpGcfY18vZi6cbUNr7JCDZAZ7y8bfR+bZaJZLCL3MaN0W9/8b
|
||||||
|
tqoH4C7+jAVoy4HWXeff+DTBMlGe4VHPROBfJn0KzOOWdKjEpBrMct/Vjc06IqQSo+hy
|
||||||
|
Tt8g==
|
||||||
|
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
|
||||||
|
d=1e100.net; s=20161025;
|
||||||
|
h=x-gm-message-state:from:to:cc:subject:date:message-id;
|
||||||
|
bh=CUIiObmZUoLOjlcmGuE4Z8qsrk1peXb9nnaXkFScf1o=;
|
||||||
|
b=h+cy8eJs/UTeiJzt803DJY4bgVbfMVP/Z49o/wr03kqhpNI9ydIH+ar2zzI2iWexpM
|
||||||
|
ZzgUMv/1GPmqL5YPESh7p9gigoIQ5a7lDX7pO7mqxC0PNyeyZKSsrNhMZLKEZkErPY1f
|
||||||
|
8IhO3DYPn2TROfHNhrKazqoojHc845188c8sTkxVvAf6AmfwYAMl9ca12NZBmVQR36NN
|
||||||
|
XhN4VYehR2XAzE9AcGOTZvyBa9ebhSMG7u5Q/OiSAckDPmZ6B26Px96jwwRvRW/PBfPB
|
||||||
|
yiXMvWNnRqBaIx9cdHDFXEMccoB/3RNR//uNJmlHwCy6Kn0F7toMgVi8AauCtbUQsgwQ
|
||||||
|
cIpg==
|
||||||
|
X-Gm-Message-State: APjAAAVE1l4BxwL8Z1YLGXAhzhm5VGSZTLQmSXQg6+3ibumsSm+bxwaN
|
||||||
|
BBaU69sXBc8Y2h20jUfrC6I=
|
||||||
|
X-Google-Smtp-Source:
|
||||||
|
APXvYqwjrERzxUIeZTPWyTYAXdg1ZTPDKGaLOeQoXI2vdua+67gV4Ml3mGFKjPE7ijQS8GUVUSa4Hw==
|
||||||
|
X-Received: by 2002:a05:600c:295d:: with SMTP id
|
||||||
|
n29mr6713359wmd.36.1569071712994;
|
||||||
|
Sat, 21 Sep 2019 06:15:12 -0700 (PDT)
|
||||||
|
Received: from apple.sigmaris.info ([84.93.172.212])
|
||||||
|
by smtp.gmail.com with ESMTPSA id g11sm5676349wmh.45.2019.09.21.06.15.11
|
||||||
|
(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);
|
||||||
|
Sat, 21 Sep 2019 06:15:12 -0700 (PDT)
|
||||||
|
From: Hugh Cole-Baker <sigmaris@gmail.com>
|
||||||
|
To: devicetree@vger.kernel.org
|
||||||
|
Subject: [PATCH] arm64: dts: rockchip: fix Rockpro64 RK808 interrupt line
|
||||||
|
Date: Sat, 21 Sep 2019 14:14:57 +0100
|
||||||
|
Message-Id: <20190921131457.36258-1-sigmaris@gmail.com>
|
||||||
|
X-Mailer: git-send-email 2.17.2 (Apple Git-113)
|
||||||
|
X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3
|
||||||
|
X-CRM114-CacheID: sfid-20190921_061517_383773_FFE10321
|
||||||
|
X-CRM114-Status: GOOD ( 13.01 )
|
||||||
|
X-Spam-Score: -0.2 (/)
|
||||||
|
X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary:
|
||||||
|
Content analysis details: (-0.2 points)
|
||||||
|
pts rule name description
|
||||||
|
---- ----------------------
|
||||||
|
--------------------------------------------------
|
||||||
|
-0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/,
|
||||||
|
no trust [2a00:1450:4864:20:0:0:0:341 listed in]
|
||||||
|
[list.dnswl.org]
|
||||||
|
0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
|
||||||
|
0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail
|
||||||
|
provider (sigmaris[at]gmail.com)
|
||||||
|
-0.0 SPF_PASS SPF: sender matches SPF record
|
||||||
|
-0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from
|
||||||
|
author's domain
|
||||||
|
0.1 DKIM_SIGNED Message has a DKIM or DK signature,
|
||||||
|
not necessarily
|
||||||
|
valid
|
||||||
|
-0.1 DKIM_VALID Message has at least one valid DKIM or DK signature
|
||||||
|
-0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from
|
||||||
|
envelope-from domain
|
||||||
|
X-BeenThere: linux-arm-kernel@lists.infradead.org
|
||||||
|
X-Mailman-Version: 2.1.29
|
||||||
|
Precedence: list
|
||||||
|
List-Id: <linux-arm-kernel.lists.infradead.org>
|
||||||
|
List-Unsubscribe:
|
||||||
|
<http://lists.infradead.org/mailman/options/linux-arm-kernel>,
|
||||||
|
<mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe>
|
||||||
|
List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/>
|
||||||
|
List-Post: <mailto:linux-arm-kernel@lists.infradead.org>
|
||||||
|
List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help>
|
||||||
|
List-Subscribe:
|
||||||
|
<http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>,
|
||||||
|
<mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe>
|
||||||
|
Cc: Mark Rutland <mark.rutland@arm.com>, Heiko Stuebner <heiko@sntech.de>,
|
||||||
|
Akash Gajjar <Akash_Gajjar@mentor.com>, linux-kernel@vger.kernel.org,
|
||||||
|
linux-rockchip@lists.infradead.org, Rob Herring <robh+dt@kernel.org>,
|
||||||
|
Hugh Cole-Baker <sigmaris@gmail.com>, linux-arm-kernel@lists.infradead.org
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset="us-ascii"
|
||||||
|
Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org>
|
||||||
|
Errors-To:
|
||||||
|
linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org
|
||||||
|
|
||||||
|
Fix the pinctrl and interrupt specifier for RK808 to use GPIO3_B2. On the
|
||||||
|
Rockpro64 schematic [1] page 16, it shows GPIO3_B2 used for the interrupt
|
||||||
|
line PMIC_INT_L from the RK808, and there's a note which translates as:
|
||||||
|
"PMU termination GPIO1_C5 changed to this".
|
||||||
|
|
||||||
|
Tested by setting an RTC wakealarm and checking /proc/interrupts counters.
|
||||||
|
Without this patch, neither the rockchip_gpio_irq counter for the RK808,
|
||||||
|
nor the RTC alarm counter increment when the alarm time is reached.
|
||||||
|
With this patch, both interrupt counters increment by 1 as expected.
|
||||||
|
|
||||||
|
[1] http://files.pine64.org/doc/rockpro64/rockpro64_v21-SCH.pdf
|
||||||
|
|
||||||
|
Fixes: e4f3fb4 ("arm64: dts: rockchip: add initial dts support for Rockpro64")
|
||||||
|
Signed-off-by: Hugh Cole-Baker <sigmaris@gmail.com>
|
||||||
|
---
|
||||||
|
arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts | 6 +++---
|
||||||
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
|
||||||
|
index 0401d4ec1f45..c27d8a6ae1c5 100644
|
||||||
|
--- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
|
||||||
|
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
|
||||||
|
@@ -247,8 +247,8 @@
|
||||||
|
rk808: pmic@1b {
|
||||||
|
compatible = "rockchip,rk808";
|
||||||
|
reg = <0x1b>;
|
||||||
|
- interrupt-parent = <&gpio1>;
|
||||||
|
- interrupts = <21 IRQ_TYPE_LEVEL_LOW>;
|
||||||
|
+ interrupt-parent = <&gpio3>;
|
||||||
|
+ interrupts = <10 IRQ_TYPE_LEVEL_LOW>;
|
||||||
|
#clock-cells = <1>;
|
||||||
|
clock-output-names = "xin32k", "rk808-clkout2";
|
||||||
|
pinctrl-names = "default";
|
||||||
|
@@ -574,7 +574,7 @@
|
||||||
|
|
||||||
|
pmic {
|
||||||
|
pmic_int_l: pmic-int-l {
|
||||||
|
- rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
|
||||||
|
+ rockchip,pins = <3 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>;
|
||||||
|
};
|
||||||
|
|
||||||
|
vsel1_gpio: vsel1-gpio {
|
|
@ -0,0 +1,51 @@
|
||||||
|
From e5ccb943712d261b8ebb3e8ac92a82be4b244ce4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Robinson <pbrobinson@gmail.com>
|
||||||
|
Date: Sun, 6 Oct 2019 14:44:25 +0100
|
||||||
|
Subject: [PATCH] arm64: tegra186: enable USB on Jetson-TX2
|
||||||
|
|
||||||
|
Based on the following patch series:
|
||||||
|
https://www.spinics.net/lists/linux-tegra/msg44216.html
|
||||||
|
|
||||||
|
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||||
|
---
|
||||||
|
arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 4 ++--
|
||||||
|
arch/arm64/boot/dts/nvidia/tegra186.dtsi | 1 +
|
||||||
|
2 files changed, 3 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts b/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts
|
||||||
|
index bdace01561ba..2e6195764268 100644
|
||||||
|
--- a/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts
|
||||||
|
+++ b/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts
|
||||||
|
@@ -115,7 +115,7 @@
|
||||||
|
};
|
||||||
|
|
||||||
|
padctl@3520000 {
|
||||||
|
- status = "disabled";
|
||||||
|
+ status = "okay";
|
||||||
|
|
||||||
|
avdd-pll-erefeut-supply = <&vdd_1v8_pll>;
|
||||||
|
avdd-usb-supply = <&vdd_3v3_sys>;
|
||||||
|
@@ -193,7 +193,7 @@
|
||||||
|
};
|
||||||
|
|
||||||
|
usb@3530000 {
|
||||||
|
- status = "disabled";
|
||||||
|
+ status = "okay";
|
||||||
|
|
||||||
|
phys = <&{/padctl@3520000/pads/usb2/lanes/usb2-0}>,
|
||||||
|
<&{/padctl@3520000/pads/usb2/lanes/usb2-1}>,
|
||||||
|
diff --git a/arch/arm64/boot/dts/nvidia/tegra186.dtsi b/arch/arm64/boot/dts/nvidia/tegra186.dtsi
|
||||||
|
index 47cd831fcf44..abdc81f555b9 100644
|
||||||
|
--- a/arch/arm64/boot/dts/nvidia/tegra186.dtsi
|
||||||
|
+++ b/arch/arm64/boot/dts/nvidia/tegra186.dtsi
|
||||||
|
@@ -525,6 +525,7 @@
|
||||||
|
<0x0 0x03538000 0x0 0x1000>;
|
||||||
|
reg-names = "hcd", "fpci";
|
||||||
|
|
||||||
|
+ iommus = <&smmu TEGRA186_SID_XUSB_HOST>;
|
||||||
|
interrupts = <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
|
--
|
||||||
|
2.21.0
|
||||||
|
|
|
@ -1898,16 +1898,20 @@ index 573b2055173c..7cc95a8bdf8d 100644
|
||||||
|
|
||||||
op_p = __sysrq_get_key_op(key);
|
op_p = __sysrq_get_key_op(key);
|
||||||
if (op_p) {
|
if (op_p) {
|
||||||
|
- /*
|
||||||
|
- * Should we check for enabled operations (/proc/sysrq-trigger
|
||||||
|
- * should not) and is the invoked operation enabled?
|
||||||
|
- */
|
||||||
|
- if (!check_mask || sysrq_on_mask(op_p->enable_mask)) {
|
||||||
+ /* Ban synthetic events from some sysrq functionality */
|
+ /* Ban synthetic events from some sysrq functionality */
|
||||||
+ if ((from == SYSRQ_FROM_PROC || from == SYSRQ_FROM_SYNTHETIC) &&
|
+ if ((from == SYSRQ_FROM_PROC || from == SYSRQ_FROM_SYNTHETIC) &&
|
||||||
+ op_p->enable_mask & SYSRQ_DISABLE_USERSPACE)
|
+ op_p->enable_mask & SYSRQ_DISABLE_USERSPACE) {
|
||||||
+ printk("This sysrq operation is disabled from userspace.\n");
|
+ printk("This sysrq operation is disabled from userspace.\n");
|
||||||
/*
|
+ } else if (from == SYSRQ_FROM_KERNEL || sysrq_on_mask(op_p->enable_mask)) {
|
||||||
* Should we check for enabled operations (/proc/sysrq-trigger
|
+ /*
|
||||||
* should not) and is the invoked operation enabled?
|
+ * Should we check for enabled operations (/proc/sysrq-trigger
|
||||||
*/
|
+ * should not) and is the invoked operation enabled?
|
||||||
- if (!check_mask || sysrq_on_mask(op_p->enable_mask)) {
|
+ */
|
||||||
+ if (from == SYSRQ_FROM_KERNEL || sysrq_on_mask(op_p->enable_mask)) {
|
|
||||||
pr_info("%s\n", op_p->action_msg);
|
pr_info("%s\n", op_p->action_msg);
|
||||||
console_loglevel = orig_log_level;
|
console_loglevel = orig_log_level;
|
||||||
op_p->handler(key);
|
op_p->handler(key);
|
||||||
|
|
|
@ -0,0 +1,171 @@
|
||||||
|
From b91ee4aa2a2199ba4d4650706c272985a5a32d80 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ori Nimron <orinimron123@gmail.com>
|
||||||
|
Date: Fri, 20 Sep 2019 09:35:45 +0200
|
||||||
|
Subject: mISDN: enforce CAP_NET_RAW for raw sockets
|
||||||
|
|
||||||
|
When creating a raw AF_ISDN socket, CAP_NET_RAW needs to be checked
|
||||||
|
first.
|
||||||
|
|
||||||
|
Signed-off-by: Ori Nimron <orinimron123@gmail.com>
|
||||||
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||||
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||||
|
---
|
||||||
|
drivers/isdn/mISDN/socket.c | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/drivers/isdn/mISDN/socket.c b/drivers/isdn/mISDN/socket.c
|
||||||
|
index c6ba37df4b9d..dff4132b3702 100644
|
||||||
|
--- a/drivers/isdn/mISDN/socket.c
|
||||||
|
+++ b/drivers/isdn/mISDN/socket.c
|
||||||
|
@@ -754,6 +754,8 @@ base_sock_create(struct net *net, struct socket *sock, int protocol, int kern)
|
||||||
|
|
||||||
|
if (sock->type != SOCK_RAW)
|
||||||
|
return -ESOCKTNOSUPPORT;
|
||||||
|
+ if (!capable(CAP_NET_RAW))
|
||||||
|
+ return -EPERM;
|
||||||
|
|
||||||
|
sk = sk_alloc(net, PF_ISDN, GFP_KERNEL, &mISDN_proto, kern);
|
||||||
|
if (!sk)
|
||||||
|
--
|
||||||
|
cgit 1.2-0.3.lf.el7
|
||||||
|
|
||||||
|
|
||||||
|
From 6cc03e8aa36c51f3b26a0d21a3c4ce2809c842ac Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ori Nimron <orinimron123@gmail.com>
|
||||||
|
Date: Fri, 20 Sep 2019 09:35:46 +0200
|
||||||
|
Subject: appletalk: enforce CAP_NET_RAW for raw sockets
|
||||||
|
|
||||||
|
When creating a raw AF_APPLETALK socket, CAP_NET_RAW needs to be checked
|
||||||
|
first.
|
||||||
|
|
||||||
|
Signed-off-by: Ori Nimron <orinimron123@gmail.com>
|
||||||
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||||
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||||
|
---
|
||||||
|
net/appletalk/ddp.c | 5 +++++
|
||||||
|
1 file changed, 5 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c
|
||||||
|
index 4072e9d394d6..b41375d4d295 100644
|
||||||
|
--- a/net/appletalk/ddp.c
|
||||||
|
+++ b/net/appletalk/ddp.c
|
||||||
|
@@ -1023,6 +1023,11 @@ static int atalk_create(struct net *net, struct socket *sock, int protocol,
|
||||||
|
*/
|
||||||
|
if (sock->type != SOCK_RAW && sock->type != SOCK_DGRAM)
|
||||||
|
goto out;
|
||||||
|
+
|
||||||
|
+ rc = -EPERM;
|
||||||
|
+ if (sock->type == SOCK_RAW && !kern && !capable(CAP_NET_RAW))
|
||||||
|
+ goto out;
|
||||||
|
+
|
||||||
|
rc = -ENOMEM;
|
||||||
|
sk = sk_alloc(net, PF_APPLETALK, GFP_KERNEL, &ddp_proto, kern);
|
||||||
|
if (!sk)
|
||||||
|
--
|
||||||
|
cgit 1.2-0.3.lf.el7
|
||||||
|
|
||||||
|
|
||||||
|
From 0614e2b73768b502fc32a75349823356d98aae2c Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ori Nimron <orinimron123@gmail.com>
|
||||||
|
Date: Fri, 20 Sep 2019 09:35:47 +0200
|
||||||
|
Subject: ax25: enforce CAP_NET_RAW for raw sockets
|
||||||
|
|
||||||
|
When creating a raw AF_AX25 socket, CAP_NET_RAW needs to be checked
|
||||||
|
first.
|
||||||
|
|
||||||
|
Signed-off-by: Ori Nimron <orinimron123@gmail.com>
|
||||||
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||||
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||||
|
---
|
||||||
|
net/ax25/af_ax25.c | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
|
||||||
|
index ca5207767dc2..bb222b882b67 100644
|
||||||
|
--- a/net/ax25/af_ax25.c
|
||||||
|
+++ b/net/ax25/af_ax25.c
|
||||||
|
@@ -855,6 +855,8 @@ static int ax25_create(struct net *net, struct socket *sock, int protocol,
|
||||||
|
break;
|
||||||
|
|
||||||
|
case SOCK_RAW:
|
||||||
|
+ if (!capable(CAP_NET_RAW))
|
||||||
|
+ return -EPERM;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
return -ESOCKTNOSUPPORT;
|
||||||
|
--
|
||||||
|
cgit 1.2-0.3.lf.el7
|
||||||
|
|
||||||
|
|
||||||
|
From e69dbd4619e7674c1679cba49afd9dd9ac347eef Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ori Nimron <orinimron123@gmail.com>
|
||||||
|
Date: Fri, 20 Sep 2019 09:35:48 +0200
|
||||||
|
Subject: ieee802154: enforce CAP_NET_RAW for raw sockets
|
||||||
|
|
||||||
|
When creating a raw AF_IEEE802154 socket, CAP_NET_RAW needs to be
|
||||||
|
checked first.
|
||||||
|
|
||||||
|
Signed-off-by: Ori Nimron <orinimron123@gmail.com>
|
||||||
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||||
|
Acked-by: Stefan Schmidt <stefan@datenfreihafen.org>
|
||||||
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||||
|
---
|
||||||
|
net/ieee802154/socket.c | 3 +++
|
||||||
|
1 file changed, 3 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/net/ieee802154/socket.c b/net/ieee802154/socket.c
|
||||||
|
index badc5cfe4dc6..d93d4531aa9b 100644
|
||||||
|
--- a/net/ieee802154/socket.c
|
||||||
|
+++ b/net/ieee802154/socket.c
|
||||||
|
@@ -1008,6 +1008,9 @@ static int ieee802154_create(struct net *net, struct socket *sock,
|
||||||
|
|
||||||
|
switch (sock->type) {
|
||||||
|
case SOCK_RAW:
|
||||||
|
+ rc = -EPERM;
|
||||||
|
+ if (!capable(CAP_NET_RAW))
|
||||||
|
+ goto out;
|
||||||
|
proto = &ieee802154_raw_prot;
|
||||||
|
ops = &ieee802154_raw_ops;
|
||||||
|
break;
|
||||||
|
--
|
||||||
|
cgit 1.2-0.3.lf.el7
|
||||||
|
|
||||||
|
|
||||||
|
From 3a359798b176183ef09efb7a3dc59abad1cc7104 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ori Nimron <orinimron123@gmail.com>
|
||||||
|
Date: Fri, 20 Sep 2019 09:35:49 +0200
|
||||||
|
Subject: nfc: enforce CAP_NET_RAW for raw sockets
|
||||||
|
|
||||||
|
When creating a raw AF_NFC socket, CAP_NET_RAW needs to be checked
|
||||||
|
first.
|
||||||
|
|
||||||
|
Signed-off-by: Ori Nimron <orinimron123@gmail.com>
|
||||||
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||||
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||||
|
---
|
||||||
|
net/nfc/llcp_sock.c | 7 +++++--
|
||||||
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/net/nfc/llcp_sock.c b/net/nfc/llcp_sock.c
|
||||||
|
index 9b8742947aff..8dfea26536c9 100644
|
||||||
|
--- a/net/nfc/llcp_sock.c
|
||||||
|
+++ b/net/nfc/llcp_sock.c
|
||||||
|
@@ -1004,10 +1004,13 @@ static int llcp_sock_create(struct net *net, struct socket *sock,
|
||||||
|
sock->type != SOCK_RAW)
|
||||||
|
return -ESOCKTNOSUPPORT;
|
||||||
|
|
||||||
|
- if (sock->type == SOCK_RAW)
|
||||||
|
+ if (sock->type == SOCK_RAW) {
|
||||||
|
+ if (!capable(CAP_NET_RAW))
|
||||||
|
+ return -EPERM;
|
||||||
|
sock->ops = &llcp_rawsock_ops;
|
||||||
|
- else
|
||||||
|
+ } else {
|
||||||
|
sock->ops = &llcp_sock_ops;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
sk = nfc_llcp_sock_alloc(sock, sock->type, GFP_ATOMIC, kern);
|
||||||
|
if (sk == NULL)
|
||||||
|
--
|
||||||
|
cgit 1.2-0.3.lf.el7
|
||||||
|
|
|
@ -0,0 +1,586 @@
|
||||||
|
From patchwork Wed Oct 2 12:28:23 2019
|
||||||
|
Content-Type: text/plain; charset="utf-8"
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Transfer-Encoding: 7bit
|
||||||
|
X-Patchwork-Submitter: Thierry Reding <thierry.reding@gmail.com>
|
||||||
|
X-Patchwork-Id: 1170631
|
||||||
|
Return-Path: <linux-gpio-owner@vger.kernel.org>
|
||||||
|
X-Original-To: incoming@patchwork.ozlabs.org
|
||||||
|
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
|
||||||
|
Authentication-Results: ozlabs.org;
|
||||||
|
spf=none (mailfrom) smtp.mailfrom=vger.kernel.org
|
||||||
|
(client-ip=209.132.180.67; helo=vger.kernel.org;
|
||||||
|
envelope-from=linux-gpio-owner@vger.kernel.org;
|
||||||
|
receiver=<UNKNOWN>)
|
||||||
|
Authentication-Results: ozlabs.org;
|
||||||
|
dmarc=pass (p=none dis=none) header.from=gmail.com
|
||||||
|
Authentication-Results: ozlabs.org; dkim=pass (2048-bit key;
|
||||||
|
unprotected) header.d=gmail.com header.i=@gmail.com
|
||||||
|
header.b="Xe4ozWCs"; dkim-atps=neutral
|
||||||
|
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
|
||||||
|
by ozlabs.org (Postfix) with ESMTP id 46jwR31mYjz9sPl
|
||||||
|
for <incoming@patchwork.ozlabs.org>;
|
||||||
|
Wed, 2 Oct 2019 22:28:31 +1000 (AEST)
|
||||||
|
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
|
||||||
|
id S1725875AbfJBM2a (ORCPT <rfc822;incoming@patchwork.ozlabs.org>);
|
||||||
|
Wed, 2 Oct 2019 08:28:30 -0400
|
||||||
|
Received: from mail-wr1-f67.google.com ([209.85.221.67]:42402 "EHLO
|
||||||
|
mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
|
||||||
|
with ESMTP id S1725848AbfJBM23 (ORCPT
|
||||||
|
<rfc822; linux-gpio@vger.kernel.org>); Wed, 2 Oct 2019 08:28:29 -0400
|
||||||
|
Received: by mail-wr1-f67.google.com with SMTP id n14so19415351wrw.9;
|
||||||
|
Wed, 02 Oct 2019 05:28:28 -0700 (PDT)
|
||||||
|
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
|
||||||
|
h=from:to:cc:subject:date:message-id:mime-version
|
||||||
|
:content-transfer-encoding;
|
||||||
|
bh=qP9mbplmTy0EguziRYmdZKFvmKZpgiY1goXlhQxV0/8=;
|
||||||
|
b=Xe4ozWCsxpb6DK1agUyM9eUxlP6G03BBFhI5g4JErak3F1hsMTKXmoyANoMKXxS+UF
|
||||||
|
OWRiAkrVC3cQOJczX/+7HhZQ8bMC3apl96os1jO6/JWJEP2BHZpDAF0bRyJQdbd0lmMA
|
||||||
|
afH1TDc/aCLYhrc6UF4IMSf4Noe9cSvoyQYpo0qgpxktdn7I/jv5ztIFWEVBOuEfDveP
|
||||||
|
hKAmMRuOGlokBd9/+TirOM307HbJYDWAZ8Wko3G+bYcw41RSULf9eN0mQPLmeF/+J9tC
|
||||||
|
XwaypBneeu3VeCmfU/DxP1duZ3pCcnwOu5nrzdHsS6ow28T2CVk8VvAAZGEU1cUIX4Z+
|
||||||
|
+hkw==
|
||||||
|
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
|
||||||
|
d=1e100.net; s=20161025;
|
||||||
|
h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version
|
||||||
|
:content-transfer-encoding;
|
||||||
|
bh=qP9mbplmTy0EguziRYmdZKFvmKZpgiY1goXlhQxV0/8=;
|
||||||
|
b=akVGfKDGN9KlaS7GfDnHx98C2QeedcAeu8RIoCS8uh0twWVOZMZKbUY6M/2HaZKsPI
|
||||||
|
38mOkZ2CRPyO1EzbpI9UU6hHXfohMTHuWX0pTdvkFXn+TfZPAxJa1fVRhHgOcknkhb/U
|
||||||
|
JBzse/qoFFdlsRK3kY6I+0R1YyyAD2SDlzfax4U6ew8DL0icpWegiNEXnIno/7b6sIt2
|
||||||
|
9u9PEHk+1AdQkgS/tVRAFdVg6rrYMbUFkh1JAYsEED71D2IR38JmdUfjsW0Bi1aohXuz
|
||||||
|
F8LOoB0G33BszHljgknOYlHF4tPGDitMVI+giV3UgwXEWHKFgimUJKOb1nyg+4fcVOLO
|
||||||
|
2g1g==
|
||||||
|
X-Gm-Message-State: APjAAAX5YpK/Xf8BgNQ7EyD7TzARRLtN4fRfLcEXIT3fZkDHf5xGyxPi
|
||||||
|
jnbTBpi+UDekDgGOQiVnsoo=
|
||||||
|
X-Google-Smtp-Source: APXvYqw9HA6mSwE4O/MajE0OyTuT/xQaPqMRcrU+p/RXgMiP+Q297cH5ORneUFjHbOQpwrdgestsJw==
|
||||||
|
X-Received: by 2002:adf:fe05:: with SMTP id n5mr2716992wrr.355.1570019307315;
|
||||||
|
Wed, 02 Oct 2019 05:28:27 -0700 (PDT)
|
||||||
|
Received: from localhost (p2E5BE2CE.dip0.t-ipconnect.de. [46.91.226.206])
|
||||||
|
by smtp.gmail.com with ESMTPSA id
|
||||||
|
e17sm5719759wma.15.2019.10.02.05.28.25
|
||||||
|
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
|
||||||
|
Wed, 02 Oct 2019 05:28:26 -0700 (PDT)
|
||||||
|
From: Thierry Reding <thierry.reding@gmail.com>
|
||||||
|
To: Linus Walleij <linus.walleij@linaro.org>,
|
||||||
|
Bartosz Golaszewski <bgolaszewski@baylibre.com>
|
||||||
|
Cc: Timo Alho <talho@nvidia.com>, linux-gpio@vger.kernel.org,
|
||||||
|
linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org
|
||||||
|
Subject: [PATCH 1/3] gpio: max77620: Use correct unit for debounce times
|
||||||
|
Date: Wed, 2 Oct 2019 14:28:23 +0200
|
||||||
|
Message-Id: <20191002122825.3948322-1-thierry.reding@gmail.com>
|
||||||
|
X-Mailer: git-send-email 2.23.0
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Sender: linux-gpio-owner@vger.kernel.org
|
||||||
|
Precedence: bulk
|
||||||
|
List-ID: <linux-gpio.vger.kernel.org>
|
||||||
|
X-Mailing-List: linux-gpio@vger.kernel.org
|
||||||
|
|
||||||
|
From: Thierry Reding <treding@nvidia.com>
|
||||||
|
|
||||||
|
The gpiod_set_debounce() function takes the debounce time in
|
||||||
|
microseconds. Adjust the switch/case values in the MAX77620 GPIO to use
|
||||||
|
the correct unit.
|
||||||
|
|
||||||
|
Signed-off-by: Thierry Reding <treding@nvidia.com>
|
||||||
|
---
|
||||||
|
drivers/gpio/gpio-max77620.c | 6 +++---
|
||||||
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/drivers/gpio/gpio-max77620.c b/drivers/gpio/gpio-max77620.c
|
||||||
|
index 47d05e357e61..faf86ea9c51a 100644
|
||||||
|
--- a/drivers/gpio/gpio-max77620.c
|
||||||
|
+++ b/drivers/gpio/gpio-max77620.c
|
||||||
|
@@ -192,13 +192,13 @@ static int max77620_gpio_set_debounce(struct max77620_gpio *mgpio,
|
||||||
|
case 0:
|
||||||
|
val = MAX77620_CNFG_GPIO_DBNC_None;
|
||||||
|
break;
|
||||||
|
- case 1 ... 8:
|
||||||
|
+ case 1000 ... 8000:
|
||||||
|
val = MAX77620_CNFG_GPIO_DBNC_8ms;
|
||||||
|
break;
|
||||||
|
- case 9 ... 16:
|
||||||
|
+ case 9000 ... 16000:
|
||||||
|
val = MAX77620_CNFG_GPIO_DBNC_16ms;
|
||||||
|
break;
|
||||||
|
- case 17 ... 32:
|
||||||
|
+ case 17000 ... 32000:
|
||||||
|
val = MAX77620_CNFG_GPIO_DBNC_32ms;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
|
||||||
|
From patchwork Wed Oct 2 12:28:24 2019
|
||||||
|
Content-Type: text/plain; charset="utf-8"
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Transfer-Encoding: 7bit
|
||||||
|
X-Patchwork-Submitter: Thierry Reding <thierry.reding@gmail.com>
|
||||||
|
X-Patchwork-Id: 1170635
|
||||||
|
Return-Path: <linux-gpio-owner@vger.kernel.org>
|
||||||
|
X-Original-To: incoming@patchwork.ozlabs.org
|
||||||
|
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
|
||||||
|
Authentication-Results: ozlabs.org;
|
||||||
|
spf=none (mailfrom) smtp.mailfrom=vger.kernel.org
|
||||||
|
(client-ip=209.132.180.67; helo=vger.kernel.org;
|
||||||
|
envelope-from=linux-gpio-owner@vger.kernel.org;
|
||||||
|
receiver=<UNKNOWN>)
|
||||||
|
Authentication-Results: ozlabs.org;
|
||||||
|
dmarc=pass (p=none dis=none) header.from=gmail.com
|
||||||
|
Authentication-Results: ozlabs.org; dkim=pass (2048-bit key;
|
||||||
|
unprotected) header.d=gmail.com header.i=@gmail.com
|
||||||
|
header.b="ZNLKx8UP"; dkim-atps=neutral
|
||||||
|
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
|
||||||
|
by ozlabs.org (Postfix) with ESMTP id 46jwRG4D1Dz9sPj
|
||||||
|
for <incoming@patchwork.ozlabs.org>;
|
||||||
|
Wed, 2 Oct 2019 22:28:42 +1000 (AEST)
|
||||||
|
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
|
||||||
|
id S1726684AbfJBM2d (ORCPT <rfc822;incoming@patchwork.ozlabs.org>);
|
||||||
|
Wed, 2 Oct 2019 08:28:33 -0400
|
||||||
|
Received: from mail-wr1-f66.google.com ([209.85.221.66]:43919 "EHLO
|
||||||
|
mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
|
||||||
|
with ESMTP id S1725848AbfJBM2c (ORCPT
|
||||||
|
<rfc822; linux-gpio@vger.kernel.org>); Wed, 2 Oct 2019 08:28:32 -0400
|
||||||
|
Received: by mail-wr1-f66.google.com with SMTP id q17so19436519wrx.10;
|
||||||
|
Wed, 02 Oct 2019 05:28:30 -0700 (PDT)
|
||||||
|
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
|
||||||
|
h=from:to:cc:subject:date:message-id:in-reply-to:references
|
||||||
|
:mime-version:content-transfer-encoding;
|
||||||
|
bh=iB2sFoZ4x2KF5IYNHgeqY98wXl2bB2JULeTFtyoqdVY=;
|
||||||
|
b=ZNLKx8UP+ukUsboEbPQ9oqLgg5M+37mex1mpr0SgaI7zjToRbmdCJL/chPAEK2r7t8
|
||||||
|
C+RcBU7oQnbO3L1hTZQh1VyMX84xXmn0x8g7AskW0bydPo29O2lwBgM9BeNJiMt7gaS7
|
||||||
|
LtCbNGe/ttaTfoTsJSOmpLgAJLVJ7mpN5r3h18HtAYcsB5NqjcgFF1yFZ9FvmXOIhxAm
|
||||||
|
1MxDJ7tO9pJbc4JQ8iR/yPEsCNibvlX1qtkuBUWdy6aJHG4CkqIbqb+V+84d3R5bsmoe
|
||||||
|
sDx7f/mMbJ6cF7dCarqOe47Quscz7UkGw/gZywhaYNS/7p6JBvKDCe0bbruzj3MEXMRy
|
||||||
|
2tlw==
|
||||||
|
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
|
||||||
|
d=1e100.net; s=20161025;
|
||||||
|
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
|
||||||
|
:references:mime-version:content-transfer-encoding;
|
||||||
|
bh=iB2sFoZ4x2KF5IYNHgeqY98wXl2bB2JULeTFtyoqdVY=;
|
||||||
|
b=E8tcBQ6lyFYE0z3JyOT1cT/Bgc194gfYXxSrFLZnHENJjrNz2Ijr9mgmTvanMcmLgs
|
||||||
|
qvPIH6L5rKKzPpmhxkGCVNMunQuR3U4+g4lCHaJuDE3QikN/dAMpfidmgej7UBcnxYXq
|
||||||
|
c8yhdhWsg36bVdUYmTdrPVNYayH3WqNj6h3724+nRQnwGs5Y+emoWuhckIBZQR2fJd3Z
|
||||||
|
jEEmej1F2QBBv4/Cf7RoOd9BVX1DFI3LgOoGADQcGnuCW/+2clFWp860wnWLGdTGqPKI
|
||||||
|
KCaPoNOzFDkbQCyhebPt8recsiTexB8AmRdTCOszf/TYQwmlvVUUSVqdwY4/P2N0uAGO
|
||||||
|
8kOA==
|
||||||
|
X-Gm-Message-State: APjAAAVWUbix6mCYosiAjDRWTB69Pz3baQGdU6UKJJJba2d6nCyRFzs3
|
||||||
|
w1iyx5KVIbR84BwLezjxgUk=
|
||||||
|
X-Google-Smtp-Source: APXvYqylRlhdhO5L5gTZTUh+KEGBPZYsf15BqzctBqRpCy2v75DzIQkOOs8h+NZd8ePk6530OH8SlA==
|
||||||
|
X-Received: by 2002:adf:f112:: with SMTP id r18mr2493221wro.88.1570019309276;
|
||||||
|
Wed, 02 Oct 2019 05:28:29 -0700 (PDT)
|
||||||
|
Received: from localhost (p2E5BE2CE.dip0.t-ipconnect.de. [46.91.226.206])
|
||||||
|
by smtp.gmail.com with ESMTPSA id
|
||||||
|
h17sm10777194wme.6.2019.10.02.05.28.28
|
||||||
|
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
|
||||||
|
Wed, 02 Oct 2019 05:28:28 -0700 (PDT)
|
||||||
|
From: Thierry Reding <thierry.reding@gmail.com>
|
||||||
|
To: Linus Walleij <linus.walleij@linaro.org>,
|
||||||
|
Bartosz Golaszewski <bgolaszewski@baylibre.com>
|
||||||
|
Cc: Timo Alho <talho@nvidia.com>, linux-gpio@vger.kernel.org,
|
||||||
|
linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org
|
||||||
|
Subject: [PATCH 2/3] gpio: max77620: Do not allocate IRQs upfront
|
||||||
|
Date: Wed, 2 Oct 2019 14:28:24 +0200
|
||||||
|
Message-Id: <20191002122825.3948322-2-thierry.reding@gmail.com>
|
||||||
|
X-Mailer: git-send-email 2.23.0
|
||||||
|
In-Reply-To: <20191002122825.3948322-1-thierry.reding@gmail.com>
|
||||||
|
References: <20191002122825.3948322-1-thierry.reding@gmail.com>
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Sender: linux-gpio-owner@vger.kernel.org
|
||||||
|
Precedence: bulk
|
||||||
|
List-ID: <linux-gpio.vger.kernel.org>
|
||||||
|
X-Mailing-List: linux-gpio@vger.kernel.org
|
||||||
|
|
||||||
|
From: Thierry Reding <treding@nvidia.com>
|
||||||
|
|
||||||
|
regmap_add_irq_chip() will try to allocate all of the IRQ descriptors
|
||||||
|
upfront if passed a non-zero irq_base parameter. However, the intention
|
||||||
|
is to allocate IRQ descriptors on an as-needed basis if possible. Pass 0
|
||||||
|
instead of -1 to fix that use-case.
|
||||||
|
|
||||||
|
Signed-off-by: Thierry Reding <treding@nvidia.com>
|
||||||
|
---
|
||||||
|
drivers/gpio/gpio-max77620.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/drivers/gpio/gpio-max77620.c b/drivers/gpio/gpio-max77620.c
|
||||||
|
index faf86ea9c51a..c58b56e5291e 100644
|
||||||
|
--- a/drivers/gpio/gpio-max77620.c
|
||||||
|
+++ b/drivers/gpio/gpio-max77620.c
|
||||||
|
@@ -304,7 +304,7 @@ static int max77620_gpio_probe(struct platform_device *pdev)
|
||||||
|
}
|
||||||
|
|
||||||
|
ret = devm_regmap_add_irq_chip(&pdev->dev, chip->rmap, gpio_irq,
|
||||||
|
- IRQF_ONESHOT, -1,
|
||||||
|
+ IRQF_ONESHOT, 0,
|
||||||
|
&max77620_gpio_irq_chip,
|
||||||
|
&chip->gpio_irq_data);
|
||||||
|
if (ret < 0) {
|
||||||
|
|
||||||
|
From patchwork Wed Oct 2 12:28:25 2019
|
||||||
|
Content-Type: text/plain; charset="utf-8"
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Transfer-Encoding: 7bit
|
||||||
|
X-Patchwork-Submitter: Thierry Reding <thierry.reding@gmail.com>
|
||||||
|
X-Patchwork-Id: 1170633
|
||||||
|
Return-Path: <linux-gpio-owner@vger.kernel.org>
|
||||||
|
X-Original-To: incoming@patchwork.ozlabs.org
|
||||||
|
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
|
||||||
|
Authentication-Results: ozlabs.org;
|
||||||
|
spf=none (mailfrom) smtp.mailfrom=vger.kernel.org
|
||||||
|
(client-ip=209.132.180.67; helo=vger.kernel.org;
|
||||||
|
envelope-from=linux-gpio-owner@vger.kernel.org;
|
||||||
|
receiver=<UNKNOWN>)
|
||||||
|
Authentication-Results: ozlabs.org;
|
||||||
|
dmarc=pass (p=none dis=none) header.from=gmail.com
|
||||||
|
Authentication-Results: ozlabs.org; dkim=pass (2048-bit key;
|
||||||
|
unprotected) header.d=gmail.com header.i=@gmail.com
|
||||||
|
header.b="TsA9TpB7"; dkim-atps=neutral
|
||||||
|
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
|
||||||
|
by ozlabs.org (Postfix) with ESMTP id 46jwRD5mmDz9sPq
|
||||||
|
for <incoming@patchwork.ozlabs.org>;
|
||||||
|
Wed, 2 Oct 2019 22:28:40 +1000 (AEST)
|
||||||
|
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
|
||||||
|
id S1727456AbfJBM2f (ORCPT <rfc822;incoming@patchwork.ozlabs.org>);
|
||||||
|
Wed, 2 Oct 2019 08:28:35 -0400
|
||||||
|
Received: from mail-wm1-f66.google.com ([209.85.128.66]:34525 "EHLO
|
||||||
|
mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
|
||||||
|
with ESMTP id S1726682AbfJBM2e (ORCPT
|
||||||
|
<rfc822; linux-gpio@vger.kernel.org>); Wed, 2 Oct 2019 08:28:34 -0400
|
||||||
|
Received: by mail-wm1-f66.google.com with SMTP id y135so4823030wmc.1;
|
||||||
|
Wed, 02 Oct 2019 05:28:32 -0700 (PDT)
|
||||||
|
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
|
||||||
|
h=from:to:cc:subject:date:message-id:in-reply-to:references
|
||||||
|
:mime-version:content-transfer-encoding;
|
||||||
|
bh=CBafHZOcPLRsPg6HMh6RW3fmvKDiW2MODjit57xEepE=;
|
||||||
|
b=TsA9TpB72Q02EPmaBqcc4zzucsjsdc5mtjgAgTak5YrKh+mRT2HMioWeCxrLu5Cl+6
|
||||||
|
66PhcUzrRtOnct3yEqC1hueFX+K8TsDr1bJq2f3L5LqA9rYz5Hdk93jVmwyEKtrPUOa5
|
||||||
|
DNgu/r4ppuWX/d9nuLpVLcFGOzWYjz/GSfyRm/B0MNSsiIFx/VfjsK6OQk48uN2gyMPf
|
||||||
|
LsirANA0HYZPyXaUFBkchtTE71HqGFSIzJGUSVGm12Z26puMZ9GiUid1l1XJjdDuFfhU
|
||||||
|
3k9TQnvLEpZDHArb2G8JrwRI8fRZ/OBDLPyKvH/EEdDYa/FfJOzliZBqMgVFpXpXGTZ6
|
||||||
|
7YAw==
|
||||||
|
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
|
||||||
|
d=1e100.net; s=20161025;
|
||||||
|
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
|
||||||
|
:references:mime-version:content-transfer-encoding;
|
||||||
|
bh=CBafHZOcPLRsPg6HMh6RW3fmvKDiW2MODjit57xEepE=;
|
||||||
|
b=MVU3M5NDj2W8TitA2MM98hE9Vgb07UODtrRolwf9TaeTgf2XRMgYAWr9v5zaHvBU2q
|
||||||
|
4q/HPqbn0WAW3OBfSQLW6CFcdiHOkjfR+r8tKHpNMNBbeDrj1DeeKE/A25plLXxg+Ypz
|
||||||
|
1bKJe6DPvjIqLvrpVmPADaRtsAkgDFTt/h41ti2uTwS5xq4qEf1mwz6lFyJkGyf+Qjb5
|
||||||
|
pnViJ3Lv89RLBvJwWj0j2t/EzzznPZn9xP663YkNrUNRYrAM7ZBauvK7kMyf8LnKo96E
|
||||||
|
+niJu7OV4PnRspOC8AS3PPM4DHGctXZl6QMcJ1LyPwBkd8EHJioV1iDJKqHQIbxew46f
|
||||||
|
AzCA==
|
||||||
|
X-Gm-Message-State: APjAAAWbRYKoHNSgs+vkRdoNeam2jbbuVKAFxN3ysahEdBul5DIjNFsz
|
||||||
|
JRjkPkilW+LPTwy2EmDLNUE=
|
||||||
|
X-Google-Smtp-Source: APXvYqyfSTFvcH9+iLVzVGJ5KDEauN0ssdr9eBfIIdRWe8prWnP7KBGuKItc0GAk8lMLMDzdLKlWtw==
|
||||||
|
X-Received: by 2002:a1c:7306:: with SMTP id d6mr2864027wmb.62.1570019311374;
|
||||||
|
Wed, 02 Oct 2019 05:28:31 -0700 (PDT)
|
||||||
|
Received: from localhost (p2E5BE2CE.dip0.t-ipconnect.de. [46.91.226.206])
|
||||||
|
by smtp.gmail.com with ESMTPSA id
|
||||||
|
90sm3179450wrr.1.2019.10.02.05.28.30
|
||||||
|
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
|
||||||
|
Wed, 02 Oct 2019 05:28:30 -0700 (PDT)
|
||||||
|
From: Thierry Reding <thierry.reding@gmail.com>
|
||||||
|
To: Linus Walleij <linus.walleij@linaro.org>,
|
||||||
|
Bartosz Golaszewski <bgolaszewski@baylibre.com>
|
||||||
|
Cc: Timo Alho <talho@nvidia.com>, linux-gpio@vger.kernel.org,
|
||||||
|
linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org
|
||||||
|
Subject: [PATCH 3/3] gpio: max77620: Fix interrupt handling
|
||||||
|
Date: Wed, 2 Oct 2019 14:28:25 +0200
|
||||||
|
Message-Id: <20191002122825.3948322-3-thierry.reding@gmail.com>
|
||||||
|
X-Mailer: git-send-email 2.23.0
|
||||||
|
In-Reply-To: <20191002122825.3948322-1-thierry.reding@gmail.com>
|
||||||
|
References: <20191002122825.3948322-1-thierry.reding@gmail.com>
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Sender: linux-gpio-owner@vger.kernel.org
|
||||||
|
Precedence: bulk
|
||||||
|
List-ID: <linux-gpio.vger.kernel.org>
|
||||||
|
X-Mailing-List: linux-gpio@vger.kernel.org
|
||||||
|
|
||||||
|
From: Timo Alho <talho@nvidia.com>
|
||||||
|
|
||||||
|
The interrupt-related register fields on the MAX77620 GPIO controller
|
||||||
|
share registers with GPIO related fields. If the IRQ chip is implemented
|
||||||
|
with regmap-irq, this causes the IRQ controller code to overwrite fields
|
||||||
|
previously configured by the GPIO controller code.
|
||||||
|
|
||||||
|
Two examples where this causes problems are the NVIDIA Jetson TX1 and
|
||||||
|
Jetson TX2 boards, where some of the GPIOs are used to enable vital
|
||||||
|
power regulators. The MAX77620 GPIO controller also provides the USB OTG
|
||||||
|
ID pin. If configured as an interrupt, this causes some of the
|
||||||
|
regulators to be powered off.
|
||||||
|
|
||||||
|
Signed-off-by: Timo Alho <talho@nvidia.com>
|
||||||
|
Signed-off-by: Thierry Reding <treding@nvidia.com>
|
||||||
|
---
|
||||||
|
drivers/gpio/gpio-max77620.c | 231 ++++++++++++++++++-----------------
|
||||||
|
1 file changed, 117 insertions(+), 114 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/drivers/gpio/gpio-max77620.c b/drivers/gpio/gpio-max77620.c
|
||||||
|
index c58b56e5291e..c5b64a4ac172 100644
|
||||||
|
--- a/drivers/gpio/gpio-max77620.c
|
||||||
|
+++ b/drivers/gpio/gpio-max77620.c
|
||||||
|
@@ -18,109 +18,115 @@ struct max77620_gpio {
|
||||||
|
struct gpio_chip gpio_chip;
|
||||||
|
struct regmap *rmap;
|
||||||
|
struct device *dev;
|
||||||
|
+ struct mutex buslock; /* irq_bus_lock */
|
||||||
|
+ unsigned int irq_type[8];
|
||||||
|
+ bool irq_enabled[8];
|
||||||
|
};
|
||||||
|
|
||||||
|
-static const struct regmap_irq max77620_gpio_irqs[] = {
|
||||||
|
- [0] = {
|
||||||
|
- .reg_offset = 0,
|
||||||
|
- .mask = MAX77620_IRQ_LVL2_GPIO_EDGE0,
|
||||||
|
- .type = {
|
||||||
|
- .type_rising_val = MAX77620_CNFG_GPIO_INT_RISING,
|
||||||
|
- .type_falling_val = MAX77620_CNFG_GPIO_INT_FALLING,
|
||||||
|
- .type_reg_mask = MAX77620_CNFG_GPIO_INT_MASK,
|
||||||
|
- .type_reg_offset = 0,
|
||||||
|
- .types_supported = IRQ_TYPE_EDGE_BOTH,
|
||||||
|
- },
|
||||||
|
- },
|
||||||
|
- [1] = {
|
||||||
|
- .reg_offset = 0,
|
||||||
|
- .mask = MAX77620_IRQ_LVL2_GPIO_EDGE1,
|
||||||
|
- .type = {
|
||||||
|
- .type_rising_val = MAX77620_CNFG_GPIO_INT_RISING,
|
||||||
|
- .type_falling_val = MAX77620_CNFG_GPIO_INT_FALLING,
|
||||||
|
- .type_reg_mask = MAX77620_CNFG_GPIO_INT_MASK,
|
||||||
|
- .type_reg_offset = 1,
|
||||||
|
- .types_supported = IRQ_TYPE_EDGE_BOTH,
|
||||||
|
- },
|
||||||
|
- },
|
||||||
|
- [2] = {
|
||||||
|
- .reg_offset = 0,
|
||||||
|
- .mask = MAX77620_IRQ_LVL2_GPIO_EDGE2,
|
||||||
|
- .type = {
|
||||||
|
- .type_rising_val = MAX77620_CNFG_GPIO_INT_RISING,
|
||||||
|
- .type_falling_val = MAX77620_CNFG_GPIO_INT_FALLING,
|
||||||
|
- .type_reg_mask = MAX77620_CNFG_GPIO_INT_MASK,
|
||||||
|
- .type_reg_offset = 2,
|
||||||
|
- .types_supported = IRQ_TYPE_EDGE_BOTH,
|
||||||
|
- },
|
||||||
|
- },
|
||||||
|
- [3] = {
|
||||||
|
- .reg_offset = 0,
|
||||||
|
- .mask = MAX77620_IRQ_LVL2_GPIO_EDGE3,
|
||||||
|
- .type = {
|
||||||
|
- .type_rising_val = MAX77620_CNFG_GPIO_INT_RISING,
|
||||||
|
- .type_falling_val = MAX77620_CNFG_GPIO_INT_FALLING,
|
||||||
|
- .type_reg_mask = MAX77620_CNFG_GPIO_INT_MASK,
|
||||||
|
- .type_reg_offset = 3,
|
||||||
|
- .types_supported = IRQ_TYPE_EDGE_BOTH,
|
||||||
|
- },
|
||||||
|
- },
|
||||||
|
- [4] = {
|
||||||
|
- .reg_offset = 0,
|
||||||
|
- .mask = MAX77620_IRQ_LVL2_GPIO_EDGE4,
|
||||||
|
- .type = {
|
||||||
|
- .type_rising_val = MAX77620_CNFG_GPIO_INT_RISING,
|
||||||
|
- .type_falling_val = MAX77620_CNFG_GPIO_INT_FALLING,
|
||||||
|
- .type_reg_mask = MAX77620_CNFG_GPIO_INT_MASK,
|
||||||
|
- .type_reg_offset = 4,
|
||||||
|
- .types_supported = IRQ_TYPE_EDGE_BOTH,
|
||||||
|
- },
|
||||||
|
- },
|
||||||
|
- [5] = {
|
||||||
|
- .reg_offset = 0,
|
||||||
|
- .mask = MAX77620_IRQ_LVL2_GPIO_EDGE5,
|
||||||
|
- .type = {
|
||||||
|
- .type_rising_val = MAX77620_CNFG_GPIO_INT_RISING,
|
||||||
|
- .type_falling_val = MAX77620_CNFG_GPIO_INT_FALLING,
|
||||||
|
- .type_reg_mask = MAX77620_CNFG_GPIO_INT_MASK,
|
||||||
|
- .type_reg_offset = 5,
|
||||||
|
- .types_supported = IRQ_TYPE_EDGE_BOTH,
|
||||||
|
- },
|
||||||
|
- },
|
||||||
|
- [6] = {
|
||||||
|
- .reg_offset = 0,
|
||||||
|
- .mask = MAX77620_IRQ_LVL2_GPIO_EDGE6,
|
||||||
|
- .type = {
|
||||||
|
- .type_rising_val = MAX77620_CNFG_GPIO_INT_RISING,
|
||||||
|
- .type_falling_val = MAX77620_CNFG_GPIO_INT_FALLING,
|
||||||
|
- .type_reg_mask = MAX77620_CNFG_GPIO_INT_MASK,
|
||||||
|
- .type_reg_offset = 6,
|
||||||
|
- .types_supported = IRQ_TYPE_EDGE_BOTH,
|
||||||
|
- },
|
||||||
|
- },
|
||||||
|
- [7] = {
|
||||||
|
- .reg_offset = 0,
|
||||||
|
- .mask = MAX77620_IRQ_LVL2_GPIO_EDGE7,
|
||||||
|
- .type = {
|
||||||
|
- .type_rising_val = MAX77620_CNFG_GPIO_INT_RISING,
|
||||||
|
- .type_falling_val = MAX77620_CNFG_GPIO_INT_FALLING,
|
||||||
|
- .type_reg_mask = MAX77620_CNFG_GPIO_INT_MASK,
|
||||||
|
- .type_reg_offset = 7,
|
||||||
|
- .types_supported = IRQ_TYPE_EDGE_BOTH,
|
||||||
|
- },
|
||||||
|
- },
|
||||||
|
-};
|
||||||
|
+static irqreturn_t max77620_gpio_irqhandler(int irq, void *data)
|
||||||
|
+{
|
||||||
|
+ struct max77620_gpio *gpio = data;
|
||||||
|
+ unsigned int value, offset;
|
||||||
|
+ unsigned long pending;
|
||||||
|
+ int err;
|
||||||
|
+
|
||||||
|
+ err = regmap_read(gpio->rmap, MAX77620_REG_IRQ_LVL2_GPIO, &value);
|
||||||
|
+ if (err < 0) {
|
||||||
|
+ dev_err(gpio->dev, "REG_IRQ_LVL2_GPIO read failed: %d\n", err);
|
||||||
|
+ return IRQ_NONE;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ pending = value;
|
||||||
|
+
|
||||||
|
+ for_each_set_bit(offset, &pending, 8) {
|
||||||
|
+ unsigned int virq;
|
||||||
|
+
|
||||||
|
+ virq = irq_find_mapping(gpio->gpio_chip.irq.domain, offset);
|
||||||
|
+ handle_nested_irq(virq);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return IRQ_HANDLED;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static void max77620_gpio_irq_mask(struct irq_data *data)
|
||||||
|
+{
|
||||||
|
+ struct gpio_chip *chip = irq_data_get_irq_chip_data(data);
|
||||||
|
+ struct max77620_gpio *gpio = gpiochip_get_data(chip);
|
||||||
|
+
|
||||||
|
+ gpio->irq_enabled[data->hwirq] = false;
|
||||||
|
+}
|
||||||
|
|
||||||
|
-static const struct regmap_irq_chip max77620_gpio_irq_chip = {
|
||||||
|
- .name = "max77620-gpio",
|
||||||
|
- .irqs = max77620_gpio_irqs,
|
||||||
|
- .num_irqs = ARRAY_SIZE(max77620_gpio_irqs),
|
||||||
|
- .num_regs = 1,
|
||||||
|
- .num_type_reg = 8,
|
||||||
|
- .irq_reg_stride = 1,
|
||||||
|
- .type_reg_stride = 1,
|
||||||
|
- .status_base = MAX77620_REG_IRQ_LVL2_GPIO,
|
||||||
|
- .type_base = MAX77620_REG_GPIO0,
|
||||||
|
+static void max77620_gpio_irq_unmask(struct irq_data *data)
|
||||||
|
+{
|
||||||
|
+ struct gpio_chip *chip = irq_data_get_irq_chip_data(data);
|
||||||
|
+ struct max77620_gpio *gpio = gpiochip_get_data(chip);
|
||||||
|
+
|
||||||
|
+ gpio->irq_enabled[data->hwirq] = true;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int max77620_gpio_set_irq_type(struct irq_data *data, unsigned int type)
|
||||||
|
+{
|
||||||
|
+ struct gpio_chip *chip = irq_data_get_irq_chip_data(data);
|
||||||
|
+ struct max77620_gpio *gpio = gpiochip_get_data(chip);
|
||||||
|
+ unsigned int irq_type;
|
||||||
|
+
|
||||||
|
+ switch (type) {
|
||||||
|
+ case IRQ_TYPE_EDGE_RISING:
|
||||||
|
+ irq_type = MAX77620_CNFG_GPIO_INT_RISING;
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
+ case IRQ_TYPE_EDGE_FALLING:
|
||||||
|
+ irq_type = MAX77620_CNFG_GPIO_INT_FALLING;
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
+ case IRQ_TYPE_EDGE_BOTH:
|
||||||
|
+ irq_type = MAX77620_CNFG_GPIO_INT_RISING |
|
||||||
|
+ MAX77620_CNFG_GPIO_INT_FALLING;
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
+ default:
|
||||||
|
+ return -EINVAL;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ gpio->irq_type[data->hwirq] = irq_type;
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static void max77620_gpio_bus_lock(struct irq_data *data)
|
||||||
|
+{
|
||||||
|
+ struct gpio_chip *chip = irq_data_get_irq_chip_data(data);
|
||||||
|
+ struct max77620_gpio *gpio = gpiochip_get_data(chip);
|
||||||
|
+
|
||||||
|
+ mutex_lock(&gpio->buslock);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static void max77620_gpio_bus_sync_unlock(struct irq_data *data)
|
||||||
|
+{
|
||||||
|
+ struct gpio_chip *chip = irq_data_get_irq_chip_data(data);
|
||||||
|
+ struct max77620_gpio *gpio = gpiochip_get_data(chip);
|
||||||
|
+ unsigned int value, offset = data->hwirq;
|
||||||
|
+ int err;
|
||||||
|
+
|
||||||
|
+ value = gpio->irq_enabled[offset] ? gpio->irq_type[offset] : 0;
|
||||||
|
+
|
||||||
|
+ err = regmap_update_bits(gpio->rmap, GPIO_REG_ADDR(offset),
|
||||||
|
+ MAX77620_CNFG_GPIO_INT_MASK, value);
|
||||||
|
+ if (err < 0)
|
||||||
|
+ dev_err(chip->parent, "failed to update interrupt mask: %d\n",
|
||||||
|
+ err);
|
||||||
|
+
|
||||||
|
+ mutex_unlock(&gpio->buslock);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static struct irq_chip max77620_gpio_irqchip = {
|
||||||
|
+ .name = "max77620-gpio",
|
||||||
|
+ .irq_mask = max77620_gpio_irq_mask,
|
||||||
|
+ .irq_unmask = max77620_gpio_irq_unmask,
|
||||||
|
+ .irq_set_type = max77620_gpio_set_irq_type,
|
||||||
|
+ .irq_bus_lock = max77620_gpio_bus_lock,
|
||||||
|
+ .irq_bus_sync_unlock = max77620_gpio_bus_sync_unlock,
|
||||||
|
+ .flags = IRQCHIP_MASK_ON_SUSPEND,
|
||||||
|
};
|
||||||
|
|
||||||
|
static int max77620_gpio_dir_input(struct gpio_chip *gc, unsigned int offset)
|
||||||
|
@@ -254,14 +260,6 @@ static int max77620_gpio_set_config(struct gpio_chip *gc, unsigned int offset,
|
||||||
|
return -ENOTSUPP;
|
||||||
|
}
|
||||||
|
|
||||||
|
-static int max77620_gpio_to_irq(struct gpio_chip *gc, unsigned int offset)
|
||||||
|
-{
|
||||||
|
- struct max77620_gpio *mgpio = gpiochip_get_data(gc);
|
||||||
|
- struct max77620_chip *chip = dev_get_drvdata(mgpio->dev->parent);
|
||||||
|
-
|
||||||
|
- return regmap_irq_get_virq(chip->gpio_irq_data, offset);
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
static int max77620_gpio_probe(struct platform_device *pdev)
|
||||||
|
{
|
||||||
|
struct max77620_chip *chip = dev_get_drvdata(pdev->dev.parent);
|
||||||
|
@@ -287,7 +285,6 @@ static int max77620_gpio_probe(struct platform_device *pdev)
|
||||||
|
mgpio->gpio_chip.direction_output = max77620_gpio_dir_output;
|
||||||
|
mgpio->gpio_chip.set = max77620_gpio_set;
|
||||||
|
mgpio->gpio_chip.set_config = max77620_gpio_set_config;
|
||||||
|
- mgpio->gpio_chip.to_irq = max77620_gpio_to_irq;
|
||||||
|
mgpio->gpio_chip.ngpio = MAX77620_GPIO_NR;
|
||||||
|
mgpio->gpio_chip.can_sleep = 1;
|
||||||
|
mgpio->gpio_chip.base = -1;
|
||||||
|
@@ -303,15 +300,21 @@ static int max77620_gpio_probe(struct platform_device *pdev)
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
- ret = devm_regmap_add_irq_chip(&pdev->dev, chip->rmap, gpio_irq,
|
||||||
|
- IRQF_ONESHOT, 0,
|
||||||
|
- &max77620_gpio_irq_chip,
|
||||||
|
- &chip->gpio_irq_data);
|
||||||
|
+ mutex_init(&mgpio->buslock);
|
||||||
|
+
|
||||||
|
+ gpiochip_irqchip_add_nested(&mgpio->gpio_chip, &max77620_gpio_irqchip,
|
||||||
|
+ 0, handle_edge_irq, IRQ_TYPE_NONE);
|
||||||
|
+
|
||||||
|
+ ret = request_threaded_irq(gpio_irq, NULL, max77620_gpio_irqhandler,
|
||||||
|
+ IRQF_ONESHOT, "max77620-gpio", mgpio);
|
||||||
|
if (ret < 0) {
|
||||||
|
- dev_err(&pdev->dev, "Failed to add gpio irq_chip %d\n", ret);
|
||||||
|
+ dev_err(&pdev->dev, "failed to request IRQ: %d\n", ret);
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ gpiochip_set_nested_irqchip(&mgpio->gpio_chip, &max77620_gpio_irqchip,
|
||||||
|
+ gpio_irq);
|
||||||
|
+
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
|
@ -1,87 +0,0 @@
|
||||||
From patchwork Tue Sep 24 10:30:57 2019
|
|
||||||
Content-Type: text/plain; charset="utf-8"
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Transfer-Encoding: 7bit
|
|
||||||
X-Patchwork-Submitter: Luca Coelho <luca@coelho.fi>
|
|
||||||
X-Patchwork-Id: 11158395
|
|
||||||
X-Patchwork-Delegate: kvalo@adurom.com
|
|
||||||
Return-Path: <SRS0=l3ON=XT=vger.kernel.org=linux-wireless-owner@kernel.org>
|
|
||||||
Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org
|
|
||||||
[172.30.200.123])
|
|
||||||
by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 62FF3112B
|
|
||||||
for <patchwork-linux-wireless@patchwork.kernel.org>;
|
|
||||||
Tue, 24 Sep 2019 10:31:06 +0000 (UTC)
|
|
||||||
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
|
|
||||||
by mail.kernel.org (Postfix) with ESMTP id 4AA4E214D9
|
|
||||||
for <patchwork-linux-wireless@patchwork.kernel.org>;
|
|
||||||
Tue, 24 Sep 2019 10:31:06 +0000 (UTC)
|
|
||||||
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
|
|
||||||
id S2409468AbfIXKbF (ORCPT
|
|
||||||
<rfc822;patchwork-linux-wireless@patchwork.kernel.org>);
|
|
||||||
Tue, 24 Sep 2019 06:31:05 -0400
|
|
||||||
Received: from paleale.coelho.fi ([176.9.41.70]:44742 "EHLO
|
|
||||||
farmhouse.coelho.fi" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org
|
|
||||||
with ESMTP id S2387644AbfIXKbF (ORCPT
|
|
||||||
<rfc822;linux-wireless@vger.kernel.org>);
|
|
||||||
Tue, 24 Sep 2019 06:31:05 -0400
|
|
||||||
Received: from [91.156.6.193] (helo=redipa.ger.corp.intel.com)
|
|
||||||
by farmhouse.coelho.fi with esmtpsa
|
|
||||||
(TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256)
|
|
||||||
(Exim 4.92)
|
|
||||||
(envelope-from <luca@coelho.fi>)
|
|
||||||
id 1iCi63-0005Je-8E; Tue, 24 Sep 2019 13:31:03 +0300
|
|
||||||
From: Luca Coelho <luca@coelho.fi>
|
|
||||||
To: kvalo@codeaurora.org
|
|
||||||
Cc: linux-wireless@vger.kernel.org
|
|
||||||
Date: Tue, 24 Sep 2019 13:30:57 +0300
|
|
||||||
Message-Id: <20190924103057.17147-1-luca@coelho.fi>
|
|
||||||
X-Mailer: git-send-email 2.23.0
|
|
||||||
MIME-Version: 1.0
|
|
||||||
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on farmhouse.coelho.fi
|
|
||||||
X-Spam-Level:
|
|
||||||
X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00,
|
|
||||||
URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2
|
|
||||||
Subject: [PATCH v5.4] iwlwifi: fw: don't send GEO_TX_POWER_LIMIT command to FW
|
|
||||||
version 36
|
|
||||||
Sender: linux-wireless-owner@vger.kernel.org
|
|
||||||
Precedence: bulk
|
|
||||||
List-ID: <linux-wireless.vger.kernel.org>
|
|
||||||
X-Mailing-List: linux-wireless@vger.kernel.org
|
|
||||||
|
|
||||||
From: Luca Coelho <luciano.coelho@intel.com>
|
|
||||||
|
|
||||||
The intention was to have the GEO_TX_POWER_LIMIT command in FW version
|
|
||||||
36 as well, but not all 8000 family got this feature enabled. The
|
|
||||||
8000 family is the only one using version 36, so skip this version
|
|
||||||
entirely. If we try to send this command to the firmwares that do not
|
|
||||||
support it, we get a BAD_COMMAND response from the firmware.
|
|
||||||
|
|
||||||
This fixes https://bugzilla.kernel.org/show_bug.cgi?id=204151.
|
|
||||||
|
|
||||||
Cc: stable@vger.kernel.org # 4.19+
|
|
||||||
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
|
|
||||||
---
|
|
||||||
drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 8 +++++---
|
|
||||||
1 file changed, 5 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
|
|
||||||
index 014eca6596e2..32a5e4e5461f 100644
|
|
||||||
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
|
|
||||||
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
|
|
||||||
@@ -889,11 +889,13 @@ static bool iwl_mvm_sar_geo_support(struct iwl_mvm *mvm)
|
|
||||||
* firmware versions. Unfortunately, we don't have a TLV API
|
|
||||||
* flag to rely on, so rely on the major version which is in
|
|
||||||
* the first byte of ucode_ver. This was implemented
|
|
||||||
- * initially on version 38 and then backported to 36, 29 and
|
|
||||||
- * 17.
|
|
||||||
+ * initially on version 38 and then backported to29 and 17.
|
|
||||||
+ * The intention was to have it in 36 as well, but not all
|
|
||||||
+ * 8000 family got this feature enabled. The 8000 family is
|
|
||||||
+ * the only one using version 36, so skip this version
|
|
||||||
+ * entirely.
|
|
||||||
*/
|
|
||||||
return IWL_UCODE_SERIAL(mvm->fw->ucode_ver) >= 38 ||
|
|
||||||
- IWL_UCODE_SERIAL(mvm->fw->ucode_ver) == 36 ||
|
|
||||||
IWL_UCODE_SERIAL(mvm->fw->ucode_ver) == 29 ||
|
|
||||||
IWL_UCODE_SERIAL(mvm->fw->ucode_ver) == 17;
|
|
||||||
}
|
|
41
kernel.spec
41
kernel.spec
|
@ -56,7 +56,7 @@ Summary: The Linux kernel
|
||||||
%if 0%{?released_kernel}
|
%if 0%{?released_kernel}
|
||||||
|
|
||||||
# Do we have a -stable update to apply?
|
# Do we have a -stable update to apply?
|
||||||
%define stable_update 1
|
%define stable_update 5
|
||||||
# Set rpm version accordingly
|
# Set rpm version accordingly
|
||||||
%if 0%{?stable_update}
|
%if 0%{?stable_update}
|
||||||
%define stablerev %{stable_update}
|
%define stablerev %{stable_update}
|
||||||
|
@ -566,10 +566,21 @@ Patch305: ARM-tegra-usb-no-reset.patch
|
||||||
# https://patchwork.kernel.org/project/linux-mmc/list/?submitter=71861
|
# https://patchwork.kernel.org/project/linux-mmc/list/?submitter=71861
|
||||||
Patch306: arm-sdhci-esdhc-imx-fixes.patch
|
Patch306: arm-sdhci-esdhc-imx-fixes.patch
|
||||||
|
|
||||||
|
# https://patchwork.kernel.org/patch/11173461/
|
||||||
|
Patch307: arm64-dts-rockchip-fix-RockPro64-vdd-log-regulator-settings.patch
|
||||||
|
# https://patchwork.kernel.org/patch/11155461/
|
||||||
|
Patch308: arm64-dts-rockchip-fix-Rockpro64-RK808-interrupt-line.patch
|
||||||
|
|
||||||
# Tegra bits
|
# Tegra bits
|
||||||
Patch320: arm64-tegra-jetson-tx1-fixes.patch
|
Patch320: arm64-tegra-jetson-tx1-fixes.patch
|
||||||
# https://www.spinics.net/lists/linux-tegra/msg43110.html
|
# https://www.spinics.net/lists/linux-tegra/msg43110.html
|
||||||
Patch321: arm64-tegra-Jetson-TX2-Allow-bootloader-to-configure.patch
|
Patch321: arm64-tegra-Jetson-TX2-Allow-bootloader-to-configure.patch
|
||||||
|
# https://patchwork.kernel.org/patch/11171225/
|
||||||
|
Patch322: mfd-max77620-Do-not-allocate-IRQs-upfront.patch
|
||||||
|
# https://patchwork.ozlabs.org/patch/1170631/
|
||||||
|
Patch323: gpio-max77620-Use-correct-unit-for-debounce-times.patch
|
||||||
|
# https://www.spinics.net/lists/linux-tegra/msg44216.html
|
||||||
|
Patch325: arm64-tegra186-enable-USB-on-Jetson-TX2.patch
|
||||||
|
|
||||||
# QCom laptop bits
|
# QCom laptop bits
|
||||||
# https://patchwork.kernel.org/patch/11133827/
|
# https://patchwork.kernel.org/patch/11133827/
|
||||||
|
@ -593,16 +604,12 @@ Patch503: KEYS-Make-use-of-platform-keyring-for-module-signature.patch
|
||||||
# rhbz 1753099
|
# rhbz 1753099
|
||||||
Patch504: dwc3-fix.patch
|
Patch504: dwc3-fix.patch
|
||||||
|
|
||||||
# https://patchwork.kernel.org/patch/11158395/
|
|
||||||
Patch505: iwlwifi-fw-don-t-send-GEO_TX_POWER_LIMIT-command-to-FW-version-36.patch
|
|
||||||
|
|
||||||
# new ids
|
|
||||||
Patch506: 0001-x86-amd_nb-Add-PCI-device-IDs-for-family-17h-model-7.patch
|
|
||||||
|
|
||||||
# rhbz 1752961
|
# rhbz 1752961
|
||||||
Patch507: v2-1-2-efi-tpm-Don-t-access-event--count-when-it-isn-t-mapped..patch
|
Patch507: v2-1-2-efi-tpm-Don-t-access-event--count-when-it-isn-t-mapped..patch
|
||||||
Patch508: v3-tpm-only-set-efi_tpm_final_log_size-after-successful-event-log-parsing.patch
|
Patch508: v3-tpm-only-set-efi_tpm_final_log_size-after-successful-event-log-parsing.patch
|
||||||
|
|
||||||
|
Patch509: PATCH-v2-selinux-allow-labeling-before-policy-is-loaded.patch
|
||||||
|
|
||||||
# RISC-V SECCOMP support v2 (posted on linux-riscv)
|
# RISC-V SECCOMP support v2 (posted on linux-riscv)
|
||||||
# http://lists.infradead.org/pipermail/linux-riscv/2019-August/006235.html
|
# http://lists.infradead.org/pipermail/linux-riscv/2019-August/006235.html
|
||||||
#Patch550: 0001-riscv-add-SECCOMP-support.patch
|
#Patch550: 0001-riscv-add-SECCOMP-support.patch
|
||||||
|
@ -1813,6 +1820,26 @@ fi
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Oct 08 2019 Laura Abbott <labbott@redhat.com> - 5.3.5-300
|
||||||
|
- Linux v5.3.5
|
||||||
|
|
||||||
|
* Mon Oct 7 2019 Laura Abbott <labbott@redhat.com>
|
||||||
|
- selinux fix (rhbz 1758597)
|
||||||
|
|
||||||
|
* Mon Oct 7 2019 Peter Robinson <pbrobinson@fedoraproject.org> 5.3.4-300
|
||||||
|
- Linux v5.3.4
|
||||||
|
|
||||||
|
* Sun Oct 6 2019 Peter Robinson <pbrobinson@fedoraproject.org>
|
||||||
|
- Fixes for RockPro64
|
||||||
|
- Fixes for Jetson-TX series devices
|
||||||
|
|
||||||
|
* Thu Oct 03 2019 Justin M. Forbes <jforbes@fedoraproject.org>
|
||||||
|
- Fix CVE-2019-17052 CVE-2019-17053 CVE-2019-17054 CVE-2019-17055 CVE-2019-17056
|
||||||
|
(rhbz 1758239 1758240 1758242 1758243 1758245 1758246 1758248 1758249 1758256 1758257)
|
||||||
|
|
||||||
|
* Tue Oct 01 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.3.2-300
|
||||||
|
- Linux v5.3.2
|
||||||
|
|
||||||
* Mon Sep 30 2019 Laura Abbott <labbott@redhat.com>
|
* Mon Sep 30 2019 Laura Abbott <labbott@redhat.com>
|
||||||
- Fix for tpm crashes (rhbz 1752961)
|
- Fix for tpm crashes (rhbz 1752961)
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,183 @@
|
||||||
|
From patchwork Wed Oct 2 14:43:18 2019
|
||||||
|
Content-Type: text/plain; charset="utf-8"
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Transfer-Encoding: 7bit
|
||||||
|
X-Patchwork-Submitter: Thierry Reding <thierry.reding@gmail.com>
|
||||||
|
X-Patchwork-Id: 11171225
|
||||||
|
Return-Path:
|
||||||
|
<SRS0=hIqC=X3=lists.infradead.org=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@kernel.org>
|
||||||
|
Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org
|
||||||
|
[172.30.200.123])
|
||||||
|
by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C771E1747
|
||||||
|
for <patchwork-linux-arm@patchwork.kernel.org>;
|
||||||
|
Wed, 2 Oct 2019 14:45:14 +0000 (UTC)
|
||||||
|
Received: from bombadil.infradead.org (bombadil.infradead.org
|
||||||
|
[198.137.202.133])
|
||||||
|
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
|
||||||
|
(No client certificate requested)
|
||||||
|
by mail.kernel.org (Postfix) with ESMTPS id 9703B21D81
|
||||||
|
for <patchwork-linux-arm@patchwork.kernel.org>;
|
||||||
|
Wed, 2 Oct 2019 14:45:14 +0000 (UTC)
|
||||||
|
Authentication-Results: mail.kernel.org;
|
||||||
|
dkim=pass (2048-bit key) header.d=lists.infradead.org
|
||||||
|
header.i=@lists.infradead.org header.b="LCP5OdWP";
|
||||||
|
dkim=fail reason="signature verification failed" (2048-bit key)
|
||||||
|
header.d=gmail.com header.i=@gmail.com header.b="ahoJ80fO"
|
||||||
|
DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9703B21D81
|
||||||
|
Authentication-Results: mail.kernel.org;
|
||||||
|
dmarc=fail (p=none dis=none) header.from=gmail.com
|
||||||
|
Authentication-Results: mail.kernel.org;
|
||||||
|
spf=none
|
||||||
|
smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org
|
||||||
|
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
|
||||||
|
d=lists.infradead.org; s=bombadil.20170209; h=Sender:
|
||||||
|
Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post:
|
||||||
|
List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To
|
||||||
|
:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:
|
||||||
|
Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:
|
||||||
|
List-Owner; bh=csIWPoJz7RR9msf1imaCNOLXiDPcaRmxRKjOL8gMaXM=; b=LCP5OdWPpIBxJz
|
||||||
|
tSNffGBZI2pwLSarAvmqKIowLW5LghNe3CVQh7HM3sIR+IqrUtTSXi/0EEQAQORrYHSnR4zrDlubl
|
||||||
|
8IIqIetbgOrEmYRpHQxWZV/Z0p5JTdvNVeOiR63CuFbjz/h9UXPWOiLZijU1eZfSN2UuEJWxzoWMF
|
||||||
|
CsXxW+3rZ3os8AAa9x0lt6gGLwAPEPrxP44q4AJTVp3q+cD7GTXHu0F2ZT2flxES+cFF2/cPg2GiM
|
||||||
|
yR5j7GNMDhdxFKjGp8qcDhfCKx/0jF0DofnC4JsVlN0R25HdwYHzdHhysk8ca7JxLIMJlgXsgM5aY
|
||||||
|
4XUIEB/0CjoPtdbP+8yw==;
|
||||||
|
Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org)
|
||||||
|
by bombadil.infradead.org with esmtp (Exim 4.92.2 #3 (Red Hat Linux))
|
||||||
|
id 1iFfsO-0006Nf-SR; Wed, 02 Oct 2019 14:45:12 +0000
|
||||||
|
Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443])
|
||||||
|
by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux))
|
||||||
|
id 1iFfqd-0003rK-EL
|
||||||
|
for linux-arm-kernel@lists.infradead.org; Wed, 02 Oct 2019 14:43:47 +0000
|
||||||
|
Received: by mail-wr1-x443.google.com with SMTP id w12so19991081wro.5
|
||||||
|
for <linux-arm-kernel@lists.infradead.org>;
|
||||||
|
Wed, 02 Oct 2019 07:43:21 -0700 (PDT)
|
||||||
|
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
|
||||||
|
h=from:to:cc:subject:date:message-id:mime-version
|
||||||
|
:content-transfer-encoding;
|
||||||
|
bh=y9l/1MkRoZLCyZNPXaR5fzwvTbuyIzYA20JLtWuhYR4=;
|
||||||
|
b=ahoJ80fONPxwQPqvbuQRAba40syj0YJFK3SbqTxd0FOzhs1n3WTvNd/gHQ+2WK5WwB
|
||||||
|
8joqipXveUGBgePR1RwHR0oQyDAumewRmSMStvhyCHPeo154CNqZfGQNlbNlRng2QJqd
|
||||||
|
1/Sq8GNJ1DjcLifpHWbCC9LoK5U3UkvdIWHPFx0cqJ+ENvPHkYPr2FdpaZ8jxuJta3TT
|
||||||
|
dplkNk0AsL/tc33KBJbKUSlnYppX878WQXUvnhdB+TRmr5R3dtc5Ewc0TH4h7V1SXTly
|
||||||
|
GiNnbbCc+BKzzqk9PTo/Pqf5dzWcpNDBA1GUkzQZDTXOXXUzBjnlrTaQctjSdE6meWfJ
|
||||||
|
JbDw==
|
||||||
|
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
|
||||||
|
d=1e100.net; s=20161025;
|
||||||
|
h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version
|
||||||
|
:content-transfer-encoding;
|
||||||
|
bh=y9l/1MkRoZLCyZNPXaR5fzwvTbuyIzYA20JLtWuhYR4=;
|
||||||
|
b=m4CouDn44ioMScPU+9h/V5vlxCAt0m4CSZKRu3pcsThkHE6u1TeKieaoBr1mh1qnIv
|
||||||
|
YS+V9Cd7osJa8R8USg+SJkEaSSarOn4kUq2MPTgMMmvKb63SSCCs0QD44nwEBAjIgMd/
|
||||||
|
/akFUOMTGQBnN7P8Iq3KWI00bVJLeoVWmqtQPkLFI1cIRrkCKTF4jh6b+i6xsiT8t2rd
|
||||||
|
l6WPsWnKkqUmPAqzpmLJ9bmSsiGBBFUexUJDcQnskkx6tTBzFhyNtpsbq6VdcY2mS3LR
|
||||||
|
rgGbisZRFdLvdZfGhmPX1hRgDoiHQLuWNAv49LtJtR7/CjNFmsKr4MBg1ydz0uO01Axr
|
||||||
|
zoIQ==
|
||||||
|
X-Gm-Message-State: APjAAAXPZ9a+CEGZKeL6T+FXZoBRFrxryg3xujpPFnNpjznB8ehsaTI0
|
||||||
|
P6wL6cWqK9IRnS17Y/YRAb4=
|
||||||
|
X-Google-Smtp-Source:
|
||||||
|
APXvYqyETp8FIXhzzDrv+mhfzHhU0D9h3bcpLQ9oRbkEYPG7JvxLk5RVWx/ooYmku2+exI6oXsHTnA==
|
||||||
|
X-Received: by 2002:a5d:4dd0:: with SMTP id f16mr2905889wru.85.1570027400467;
|
||||||
|
Wed, 02 Oct 2019 07:43:20 -0700 (PDT)
|
||||||
|
Received: from localhost (p2E5BE2CE.dip0.t-ipconnect.de. [46.91.226.206])
|
||||||
|
by smtp.gmail.com with ESMTPSA id z125sm10251381wme.37.2019.10.02.07.43.19
|
||||||
|
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
|
||||||
|
Wed, 02 Oct 2019 07:43:19 -0700 (PDT)
|
||||||
|
From: Thierry Reding <thierry.reding@gmail.com>
|
||||||
|
To: Lee Jones <lee.jones@linaro.org>
|
||||||
|
Subject: [PATCH] mfd: max77620: Do not allocate IRQs upfront
|
||||||
|
Date: Wed, 2 Oct 2019 16:43:18 +0200
|
||||||
|
Message-Id: <20191002144318.140365-1-thierry.reding@gmail.com>
|
||||||
|
X-Mailer: git-send-email 2.23.0
|
||||||
|
MIME-Version: 1.0
|
||||||
|
X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3
|
||||||
|
X-CRM114-CacheID: sfid-20191002_074330_018855_CC323A91
|
||||||
|
X-CRM114-Status: GOOD ( 11.81 )
|
||||||
|
X-Spam-Score: -0.2 (/)
|
||||||
|
X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary:
|
||||||
|
Content analysis details: (-0.2 points)
|
||||||
|
pts rule name description
|
||||||
|
---- ----------------------
|
||||||
|
--------------------------------------------------
|
||||||
|
-0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/,
|
||||||
|
no trust [2a00:1450:4864:20:0:0:0:443 listed in]
|
||||||
|
[list.dnswl.org]
|
||||||
|
-0.0 SPF_PASS SPF: sender matches SPF record
|
||||||
|
0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
|
||||||
|
0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail
|
||||||
|
provider (thierry.reding[at]gmail.com)
|
||||||
|
-0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from
|
||||||
|
envelope-from domain
|
||||||
|
0.1 DKIM_SIGNED Message has a DKIM or DK signature,
|
||||||
|
not necessarily
|
||||||
|
valid
|
||||||
|
-0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from
|
||||||
|
author's domain
|
||||||
|
-0.1 DKIM_VALID Message has at least one valid DKIM or DK signature
|
||||||
|
X-BeenThere: linux-arm-kernel@lists.infradead.org
|
||||||
|
X-Mailman-Version: 2.1.29
|
||||||
|
Precedence: list
|
||||||
|
List-Id: <linux-arm-kernel.lists.infradead.org>
|
||||||
|
List-Unsubscribe:
|
||||||
|
<http://lists.infradead.org/mailman/options/linux-arm-kernel>,
|
||||||
|
<mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe>
|
||||||
|
List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/>
|
||||||
|
List-Post: <mailto:linux-arm-kernel@lists.infradead.org>
|
||||||
|
List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help>
|
||||||
|
List-Subscribe:
|
||||||
|
<http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>,
|
||||||
|
<mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe>
|
||||||
|
Cc: linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org,
|
||||||
|
linux-arm-kernel@lists.infradead.org
|
||||||
|
Content-Type: text/plain; charset="us-ascii"
|
||||||
|
Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org>
|
||||||
|
Errors-To:
|
||||||
|
linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org
|
||||||
|
|
||||||
|
From: Thierry Reding <treding@nvidia.com>
|
||||||
|
|
||||||
|
regmap_add_irq_chip() will try to allocate all of the IRQ descriptors
|
||||||
|
upfront if passed a non-zero irq_base parameter. However, the intention
|
||||||
|
is to allocate IRQ descriptors on an as-needed basis if possible. Pass 0
|
||||||
|
instead of -1 to fix that use-case.
|
||||||
|
|
||||||
|
Signed-off-by: Thierry Reding <treding@nvidia.com>
|
||||||
|
---
|
||||||
|
drivers/mfd/max77620.c | 5 ++---
|
||||||
|
include/linux/mfd/max77620.h | 1 -
|
||||||
|
2 files changed, 2 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/drivers/mfd/max77620.c b/drivers/mfd/max77620.c
|
||||||
|
index a851ff473a44..c7ed5c353553 100644
|
||||||
|
--- a/drivers/mfd/max77620.c
|
||||||
|
+++ b/drivers/mfd/max77620.c
|
||||||
|
@@ -507,7 +507,6 @@ static int max77620_probe(struct i2c_client *client,
|
||||||
|
|
||||||
|
i2c_set_clientdata(client, chip);
|
||||||
|
chip->dev = &client->dev;
|
||||||
|
- chip->irq_base = -1;
|
||||||
|
chip->chip_irq = client->irq;
|
||||||
|
chip->chip_id = (enum max77620_chip_id)id->driver_data;
|
||||||
|
|
||||||
|
@@ -545,8 +544,8 @@ static int max77620_probe(struct i2c_client *client,
|
||||||
|
|
||||||
|
max77620_top_irq_chip.irq_drv_data = chip;
|
||||||
|
ret = devm_regmap_add_irq_chip(chip->dev, chip->rmap, client->irq,
|
||||||
|
- IRQF_ONESHOT | IRQF_SHARED,
|
||||||
|
- chip->irq_base, &max77620_top_irq_chip,
|
||||||
|
+ IRQF_ONESHOT | IRQF_SHARED, 0,
|
||||||
|
+ &max77620_top_irq_chip,
|
||||||
|
&chip->top_irq_data);
|
||||||
|
if (ret < 0) {
|
||||||
|
dev_err(chip->dev, "Failed to add regmap irq: %d\n", ret);
|
||||||
|
diff --git a/include/linux/mfd/max77620.h b/include/linux/mfd/max77620.h
|
||||||
|
index 12ba157cb83f..f552ef5b1100 100644
|
||||||
|
--- a/include/linux/mfd/max77620.h
|
||||||
|
+++ b/include/linux/mfd/max77620.h
|
||||||
|
@@ -329,7 +329,6 @@ struct max77620_chip {
|
||||||
|
struct regmap *rmap;
|
||||||
|
|
||||||
|
int chip_irq;
|
||||||
|
- int irq_base;
|
||||||
|
|
||||||
|
/* chip id */
|
||||||
|
enum max77620_chip_id chip_id;
|
2
sources
2
sources
|
@ -1,2 +1,2 @@
|
||||||
SHA512 (linux-5.3.tar.xz) = 6b5edef47c319a3fa7f6c20a3e0903a5acd89ec75e32dc5f99adcb60c9fe118ea312722d9c3d27e2e3900afa2455afb86e83a8b6bb131009bc79ddbe6fb0595d
|
SHA512 (linux-5.3.tar.xz) = 6b5edef47c319a3fa7f6c20a3e0903a5acd89ec75e32dc5f99adcb60c9fe118ea312722d9c3d27e2e3900afa2455afb86e83a8b6bb131009bc79ddbe6fb0595d
|
||||||
SHA512 (patch-5.3.1.xz) = 7145c90530c49635a6270d3021f423b34f57d2058a3083f1d11b9ed1ab72cb4e5a30a3794bc490304d14423bd7e74b296f4027ade844f09d861d830449edc198
|
SHA512 (patch-5.3.5.xz) = 70555da6275237bd6fe0514e2e49052f36af87fbae4919a464285dcdc9b84443995264762248496e44291800b2398a45bcf3fa3459a631f162cfdd915b972d9f
|
||||||
|
|
Loading…
Reference in New Issue