* Re: [PATCH 1/2] Add sw2_sw4 voltage table to cpcap regulator.
From: Mark Brown @ 2018-07-23 17:01 UTC (permalink / raw)
To: Peter Geis
Cc: girdwood, robh+dt, mark.rutland, linux-kernel, devicetree,
linux-tegra
In-Reply-To: <d38d3fea-dc7d-09fe-651e-386b36befde1@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 605 bytes --]
On Fri, Jul 20, 2018 at 08:43:49PM -0400, Peter Geis wrote:
> SW2 and SW4 use a shared table to provide voltage to the cpu core and
> devices on Tegra hardware.
> Added this table to the cpcap regulator driver as the first step to
> supporting this device on Tegra.
This fails to apply with:
Applying: Add sw2_sw4 voltage table to cpcap regulator.
.git/rebase-apply/patch:37: trailing whitespace.
1437500, 1450000,
error: corrupt patch at line 38
Patch failed at 0001 Add sw2_sw4 voltage table to cpcap regulator.
Please check and resend.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply
* [PATCH v2 2/4] staging:fsl-mc: Move DPIO from staging to drivers/soc/fsl
From: Roy Pledge @ 2018-07-23 17:00 UTC (permalink / raw)
To: devel, linux-arm-kernel, gregkh, leoyang.li
Cc: laurentiu.tudor, ruxandra.radulescu, horia.geanta, linux-kernel,
arnd, catalin.marinas, robin.murphy, Roy Pledge
In-Reply-To: <20180723170025.2259-1-roy.pledge@nxp.com>
Move the NXP DPIO (Datapath I/O Driver) out of the
drivers/staging directory and into the drivers/soc/fsl directory.
The DPIO driver enables access to Queue and Buffer Manager (QBMAN)
hardware on NXP DPAA2 devices. This is a prerequisite to moving the
DPAA2 Ethernet driver out of staging.
Signed-off-by: Roy Pledge <roy.pledge@nxp.com>
---
MAINTAINERS | 2 +-
drivers/crypto/caam/sg_sw_qm2.h | 2 +-
drivers/crypto/caam/sg_sw_sec4.h | 2 +-
drivers/soc/fsl/Kconfig | 10 ++++++++++
drivers/soc/fsl/Makefile | 1 +
drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/Makefile | 0
drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-cmd.h | 0
drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-driver.c | 2 +-
drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-driver.txt | 0
drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-service.c | 2 +-
drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.c | 0
drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.h | 0
drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/qbman-portal.c | 2 +-
drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/qbman-portal.h | 2 +-
drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h | 4 ++--
drivers/staging/fsl-mc/bus/Kconfig | 9 ---------
drivers/staging/fsl-mc/bus/Makefile | 2 --
{drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-fd.h | 0
.../staging/fsl-mc/include => include/soc/fsl}/dpaa2-global.h | 0
{drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-io.h | 0
20 files changed, 20 insertions(+), 20 deletions(-)
rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/Makefile (100%)
rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-cmd.h (100%)
rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-driver.c (99%)
rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-driver.txt (100%)
rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-service.c (99%)
rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.c (100%)
rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.h (100%)
rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/qbman-portal.c (99%)
rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/qbman-portal.h (99%)
rename {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-fd.h (100%)
rename {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-global.h (100%)
rename {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-io.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 0fe4228..34ce842 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4418,7 +4418,7 @@ DPAA2 DATAPATH I/O (DPIO) DRIVER
M: Roy Pledge <Roy.Pledge@nxp.com>
L: linux-kernel@vger.kernel.org
S: Maintained
-F: drivers/staging/fsl-mc/bus/dpio
+F: drivers/soc/fsl/dpio
DPAA2 ETHERNET DRIVER
M: Ioana Radulescu <ruxandra.radulescu@nxp.com>
diff --git a/drivers/crypto/caam/sg_sw_qm2.h b/drivers/crypto/caam/sg_sw_qm2.h
index 31b4407..b5b4c12 100644
--- a/drivers/crypto/caam/sg_sw_qm2.h
+++ b/drivers/crypto/caam/sg_sw_qm2.h
@@ -35,7 +35,7 @@
#ifndef _SG_SW_QM2_H_
#define _SG_SW_QM2_H_
-#include "../../../drivers/staging/fsl-mc/include/dpaa2-fd.h"
+#include <soc/fsl/dpaa2-fd.h>
static inline void dma_to_qm_sg_one(struct dpaa2_sg_entry *qm_sg_ptr,
dma_addr_t dma, u32 len, u16 offset)
diff --git a/drivers/crypto/caam/sg_sw_sec4.h b/drivers/crypto/caam/sg_sw_sec4.h
index e586ffa..dbfa9fc 100644
--- a/drivers/crypto/caam/sg_sw_sec4.h
+++ b/drivers/crypto/caam/sg_sw_sec4.h
@@ -12,7 +12,7 @@
#include "ctrl.h"
#include "regs.h"
#include "sg_sw_qm2.h"
-#include "../../../drivers/staging/fsl-mc/include/dpaa2-fd.h"
+#include <soc/fsl/dpaa2-fd.h>
struct sec4_sg_entry {
u64 ptr;
diff --git a/drivers/soc/fsl/Kconfig b/drivers/soc/fsl/Kconfig
index 7a9fb9b..c17bf38 100644
--- a/drivers/soc/fsl/Kconfig
+++ b/drivers/soc/fsl/Kconfig
@@ -16,3 +16,13 @@ config FSL_GUTS
Initially only reading SVR and registering soc device are supported.
Other guts accesses, such as reading RCW, should eventually be moved
into this driver as well.
+
+config FSL_MC_DPIO
+ tristate "QorIQ DPAA2 DPIO driver"
+ depends on FSL_MC_BUS
+ help
+ Driver for the DPAA2 DPIO object. A DPIO provides queue and
+ buffer management facilities for software to interact with
+ other DPAA2 objects. This driver does not expose the DPIO
+ objects individually, but groups them under a service layer
+ API.
diff --git a/drivers/soc/fsl/Makefile b/drivers/soc/fsl/Makefile
index 44b3beb..803ef1b 100644
--- a/drivers/soc/fsl/Makefile
+++ b/drivers/soc/fsl/Makefile
@@ -6,3 +6,4 @@ obj-$(CONFIG_FSL_DPAA) += qbman/
obj-$(CONFIG_QUICC_ENGINE) += qe/
obj-$(CONFIG_CPM) += qe/
obj-$(CONFIG_FSL_GUTS) += guts.o
+obj-$(CONFIG_FSL_MC_DPIO) += dpio/
diff --git a/drivers/staging/fsl-mc/bus/dpio/Makefile b/drivers/soc/fsl/dpio/Makefile
similarity index 100%
rename from drivers/staging/fsl-mc/bus/dpio/Makefile
rename to drivers/soc/fsl/dpio/Makefile
diff --git a/drivers/staging/fsl-mc/bus/dpio/dpio-cmd.h b/drivers/soc/fsl/dpio/dpio-cmd.h
similarity index 100%
rename from drivers/staging/fsl-mc/bus/dpio/dpio-cmd.h
rename to drivers/soc/fsl/dpio/dpio-cmd.h
diff --git a/drivers/staging/fsl-mc/bus/dpio/dpio-driver.c b/drivers/soc/fsl/dpio/dpio-driver.c
similarity index 99%
rename from drivers/staging/fsl-mc/bus/dpio/dpio-driver.c
rename to drivers/soc/fsl/dpio/dpio-driver.c
index 11a90a9..b60b77b 100644
--- a/drivers/staging/fsl-mc/bus/dpio/dpio-driver.c
+++ b/drivers/soc/fsl/dpio/dpio-driver.c
@@ -16,7 +16,7 @@
#include <linux/io.h>
#include <linux/fsl/mc.h>
-#include "../../include/dpaa2-io.h"
+#include <soc/fsl/dpaa2-io.h>
#include "qbman-portal.h"
#include "dpio.h"
diff --git a/drivers/staging/fsl-mc/bus/dpio/dpio-driver.txt b/drivers/soc/fsl/dpio/dpio-driver.txt
similarity index 100%
rename from drivers/staging/fsl-mc/bus/dpio/dpio-driver.txt
rename to drivers/soc/fsl/dpio/dpio-driver.txt
diff --git a/drivers/staging/fsl-mc/bus/dpio/dpio-service.c b/drivers/soc/fsl/dpio/dpio-service.c
similarity index 99%
rename from drivers/staging/fsl-mc/bus/dpio/dpio-service.c
rename to drivers/soc/fsl/dpio/dpio-service.c
index 14ed2be..9b17f72 100644
--- a/drivers/staging/fsl-mc/bus/dpio/dpio-service.c
+++ b/drivers/soc/fsl/dpio/dpio-service.c
@@ -6,7 +6,7 @@
*/
#include <linux/types.h>
#include <linux/fsl/mc.h>
-#include "../../include/dpaa2-io.h"
+#include <soc/fsl/dpaa2-io.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/platform_device.h>
diff --git a/drivers/staging/fsl-mc/bus/dpio/dpio.c b/drivers/soc/fsl/dpio/dpio.c
similarity index 100%
rename from drivers/staging/fsl-mc/bus/dpio/dpio.c
rename to drivers/soc/fsl/dpio/dpio.c
diff --git a/drivers/staging/fsl-mc/bus/dpio/dpio.h b/drivers/soc/fsl/dpio/dpio.h
similarity index 100%
rename from drivers/staging/fsl-mc/bus/dpio/dpio.h
rename to drivers/soc/fsl/dpio/dpio.h
diff --git a/drivers/staging/fsl-mc/bus/dpio/qbman-portal.c b/drivers/soc/fsl/dpio/qbman-portal.c
similarity index 99%
rename from drivers/staging/fsl-mc/bus/dpio/qbman-portal.c
rename to drivers/soc/fsl/dpio/qbman-portal.c
index 116fafb..cf1d448 100644
--- a/drivers/staging/fsl-mc/bus/dpio/qbman-portal.c
+++ b/drivers/soc/fsl/dpio/qbman-portal.c
@@ -8,7 +8,7 @@
#include <asm/cacheflush.h>
#include <linux/io.h>
#include <linux/slab.h>
-#include "../../include/dpaa2-global.h"
+#include <soc/fsl/dpaa2-global.h>
#include "qbman-portal.h"
diff --git a/drivers/staging/fsl-mc/bus/dpio/qbman-portal.h b/drivers/soc/fsl/dpio/qbman-portal.h
similarity index 99%
rename from drivers/staging/fsl-mc/bus/dpio/qbman-portal.h
rename to drivers/soc/fsl/dpio/qbman-portal.h
index 69db3c8..89d1dd9 100644
--- a/drivers/staging/fsl-mc/bus/dpio/qbman-portal.h
+++ b/drivers/soc/fsl/dpio/qbman-portal.h
@@ -7,7 +7,7 @@
#ifndef __FSL_QBMAN_PORTAL_H
#define __FSL_QBMAN_PORTAL_H
-#include "../../include/dpaa2-fd.h"
+#include <soc/fsl/dpaa2-fd.h>
struct dpaa2_dq;
struct qbman_swp;
diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h
index 9269cb0..f2917b5 100644
--- a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h
+++ b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h
@@ -37,8 +37,8 @@
#include <linux/if_vlan.h>
#include <linux/fsl/mc.h>
-#include "../../fsl-mc/include/dpaa2-io.h"
-#include "../../fsl-mc/include/dpaa2-fd.h"
+#include <soc/fsl/dpaa2-io.h>
+#include <soc/fsl/dpaa2-fd.h>
#include "dpni.h"
#include "dpni-cmd.h"
diff --git a/drivers/staging/fsl-mc/bus/Kconfig b/drivers/staging/fsl-mc/bus/Kconfig
index 3424530..90f234d 100644
--- a/drivers/staging/fsl-mc/bus/Kconfig
+++ b/drivers/staging/fsl-mc/bus/Kconfig
@@ -5,12 +5,3 @@
# Copyright (C) 2014-2016 Freescale Semiconductor, Inc.
#
-config FSL_MC_DPIO
- tristate "QorIQ DPAA2 DPIO driver"
- depends on FSL_MC_BUS
- help
- Driver for the DPAA2 DPIO object. A DPIO provides queue and
- buffer management facilities for software to interact with
- other DPAA2 objects. This driver does not expose the DPIO
- objects individually, but groups them under a service layer
- API.
diff --git a/drivers/staging/fsl-mc/bus/Makefile b/drivers/staging/fsl-mc/bus/Makefile
index 21d8ebc..2141e4b 100644
--- a/drivers/staging/fsl-mc/bus/Makefile
+++ b/drivers/staging/fsl-mc/bus/Makefile
@@ -5,5 +5,3 @@
# Copyright (C) 2014 Freescale Semiconductor, Inc.
#
-# MC DPIO driver
-obj-$(CONFIG_FSL_MC_DPIO) += dpio/
diff --git a/drivers/staging/fsl-mc/include/dpaa2-fd.h b/include/soc/fsl/dpaa2-fd.h
similarity index 100%
rename from drivers/staging/fsl-mc/include/dpaa2-fd.h
rename to include/soc/fsl/dpaa2-fd.h
diff --git a/drivers/staging/fsl-mc/include/dpaa2-global.h b/include/soc/fsl/dpaa2-global.h
similarity index 100%
rename from drivers/staging/fsl-mc/include/dpaa2-global.h
rename to include/soc/fsl/dpaa2-global.h
diff --git a/drivers/staging/fsl-mc/include/dpaa2-io.h b/include/soc/fsl/dpaa2-io.h
similarity index 100%
rename from drivers/staging/fsl-mc/include/dpaa2-io.h
rename to include/soc/fsl/dpaa2-io.h
--
2.7.4
^ permalink raw reply related
* Re: [PATCH v3] PCI: Check for PCIe downtraining conditions
From: Alex G. @ 2018-07-23 17:01 UTC (permalink / raw)
To: Tal Gilboa, Bjorn Helgaas
Cc: bhelgaas, alex_gagniuc, austin_bolen, shyam_iyer, keith.busch,
linux-pci, linux-kernel, Jeff Kirsher, Ariel Elior, Michael Chan,
Ganesh Goudar, Tariq Toukan, Jakub Kicinski, Dave Airlie,
Alex Deucher
In-Reply-To: <9d752b75-eab2-6fd1-f9da-09985966436c@mellanox.com>
On 07/23/2018 12:21 AM, Tal Gilboa wrote:
> On 7/19/2018 6:49 PM, Alex G. wrote:
>>
>>
>> On 07/18/2018 08:38 AM, Tal Gilboa wrote:
>>> On 7/16/2018 5:17 PM, Bjorn Helgaas wrote:
>>>> [+cc maintainers of drivers that already use pcie_print_link_status()
>>>> and GPU folks]
>> [snip]
>>>>
>>>>> + /* Multi-function PCIe share the same link/status. */
>>>>> + if ((PCI_FUNC(dev->devfn) != 0) || dev->is_virtfn)
>>>>> + return;
>>>>> +
>>>>> + pcie_print_link_status(dev);
>>>>> +}
>>>
>>> Is this function called by default for every PCIe device? What about
>>> VFs? We make an exception for them on our driver since a VF doesn't
>>> have access to the needed information in order to provide a
>>> meaningful message.
>>
>> I'm assuming VF means virtual function. pcie_print_link_status()
>> doesn't care if it's passed a virtual function. It will try to do its
>> job. That's why I bail out three lines above, with 'dev->is_virtfn'
>> check.
>>
>> Alex
>
> That's the point - we don't want to call pcie_print_link_status() for
> virtual functions. We make the distinction in our driver. If you want to
> change the code to call this function by default it shouldn't affect the
> current usage.
I'm not understanding very well what you're asking. I understand you
want to avoid printing this message on virtual functions, and that's
already taken care of. I'm also not changing current behavior. Let's
get v2 out and start the discussion again based on that.
Alex
^ permalink raw reply
* [PATCH v2 4/4] drivers/soc/fsl/dpio: Convert DPIO documentation to .rst
From: Roy Pledge @ 2018-07-23 17:00 UTC (permalink / raw)
To: devel, linux-arm-kernel, gregkh, leoyang.li
Cc: laurentiu.tudor, ruxandra.radulescu, horia.geanta, linux-kernel,
arnd, catalin.marinas, robin.murphy, Roy Pledge
In-Reply-To: <20180723170025.2259-1-roy.pledge@nxp.com>
Convert the Datapath I/O documentation to .rst format
and move to the Documation/networking/dpaa2 directory
Signed-off-by: Roy Pledge <roy.pledge@nxp.com>
---
.../networking/dpaa2/dpio-driver.rst | 30 +++++++++++++++++++---
Documentation/networking/dpaa2/index.rst | 1 +
2 files changed, 28 insertions(+), 3 deletions(-)
rename drivers/soc/fsl/dpio/dpio-driver.txt => Documentation/networking/dpaa2/dpio-driver.rst (94%)
diff --git a/drivers/soc/fsl/dpio/dpio-driver.txt b/Documentation/networking/dpaa2/dpio-driver.rst
similarity index 94%
rename from drivers/soc/fsl/dpio/dpio-driver.txt
rename to Documentation/networking/dpaa2/dpio-driver.rst
index 72ba9da..3a33a33 100644
--- a/drivers/soc/fsl/dpio/dpio-driver.txt
+++ b/Documentation/networking/dpaa2/dpio-driver.rst
@@ -1,7 +1,16 @@
-Copyright 2016 NXP
+.. include:: <isonum.txt>
+
+DPAA2 DPIO (Data Path I/O) Overview
+===================================
+
+:Copyright: |copy| 2015 Freescale Semiconductor Inc.
+:Copyright: |copy| 2018 NXP
+
+This document provides an overview of the Freescale DPAA2 DPIO
+drivers
Introduction
-------------
+============
A DPAA2 DPIO (Data Path I/O) is a hardware object that provides
interfaces to enqueue and dequeue frames to/from network interfaces
@@ -27,8 +36,11 @@ provides services that:
The Linux DPIO driver consists of 3 primary components--
DPIO object driver-- fsl-mc driver that manages the DPIO object
+
DPIO service-- provides APIs to other Linux drivers for services
+
QBman portal interface-- sends portal commands, gets responses
+::
fsl-mc other
bus drivers
@@ -45,8 +57,9 @@ The Linux DPIO driver consists of 3 primary components--
|
hardware
+
The diagram below shows how the DPIO driver components fit with the other
-DPAA2 Linux driver components:
+DPAA2 Linux driver components::
+------------+
| OS Network |
| Stack |
@@ -98,20 +111,29 @@ DPIO service (dpio-service.c, dpaa2-io.h)
Notification handling
dpaa2_io_service_register()
+
dpaa2_io_service_deregister()
+
dpaa2_io_service_rearm()
Queuing
dpaa2_io_service_pull_fq()
+
dpaa2_io_service_pull_channel()
+
dpaa2_io_service_enqueue_fq()
+
dpaa2_io_service_enqueue_qd()
+
dpaa2_io_store_create()
+
dpaa2_io_store_destroy()
+
dpaa2_io_store_next()
Buffer pool management
dpaa2_io_service_release()
+
dpaa2_io_service_acquire()
QBman portal interface (qbman-portal.c)
@@ -120,7 +142,9 @@ QBman portal interface (qbman-portal.c)
The qbman-portal component provides APIs to do the low level hardware
bit twiddling for operations such as:
-initializing Qman software portals
+
-building and sending portal commands
+
-portal interrupt configuration and processing
The qbman-portal APIs are not public to other drivers, and are
diff --git a/Documentation/networking/dpaa2/index.rst b/Documentation/networking/dpaa2/index.rst
index 4c6586c..10bea11 100644
--- a/Documentation/networking/dpaa2/index.rst
+++ b/Documentation/networking/dpaa2/index.rst
@@ -6,3 +6,4 @@ DPAA2 Documentation
:maxdepth: 1
overview
+ dpio-driver
--
2.7.4
^ permalink raw reply related
* [PATCH v2 3/4] drivers/staging: Remove fsl-mc driver from staging
From: Roy Pledge @ 2018-07-23 17:00 UTC (permalink / raw)
To: devel, linux-arm-kernel, gregkh, leoyang.li
Cc: laurentiu.tudor, ruxandra.radulescu, horia.geanta, linux-kernel,
arnd, catalin.marinas, robin.murphy, Roy Pledge
In-Reply-To: <20180723170025.2259-1-roy.pledge@nxp.com>
Remove the staging/drivers/fsl-mc directory from the staging
area now that all the components have been moved to the main
kernel areas.
Signed-off-by: Roy Pledge <roy.pledge@nxp.com>
---
drivers/staging/Kconfig | 2 --
drivers/staging/Makefile | 1 -
drivers/staging/fsl-mc/Kconfig | 2 --
drivers/staging/fsl-mc/Makefile | 3 ---
drivers/staging/fsl-mc/bus/Kconfig | 7 -------
drivers/staging/fsl-mc/bus/Makefile | 7 -------
6 files changed, 22 deletions(-)
delete mode 100644 drivers/staging/fsl-mc/Kconfig
delete mode 100644 drivers/staging/fsl-mc/Makefile
delete mode 100644 drivers/staging/fsl-mc/bus/Kconfig
delete mode 100644 drivers/staging/fsl-mc/bus/Makefile
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 75a4804..47b61c3 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -92,8 +92,6 @@ source "drivers/staging/clocking-wizard/Kconfig"
source "drivers/staging/fbtft/Kconfig"
-source "drivers/staging/fsl-mc/Kconfig"
-
source "drivers/staging/fsl-dpaa2/Kconfig"
source "drivers/staging/wilc1000/Kconfig"
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index e84959a..bfef8f2 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -37,7 +37,6 @@ obj-$(CONFIG_CRYPTO_SKEIN) += skein/
obj-$(CONFIG_UNISYSSPAR) += unisys/
obj-$(CONFIG_COMMON_CLK_XLNX_CLKWZRD) += clocking-wizard/
obj-$(CONFIG_FB_TFT) += fbtft/
-obj-$(CONFIG_FSL_MC_BUS) += fsl-mc/
obj-$(CONFIG_FSL_DPAA2) += fsl-dpaa2/
obj-$(CONFIG_WILC1000) += wilc1000/
obj-$(CONFIG_MOST) += most/
diff --git a/drivers/staging/fsl-mc/Kconfig b/drivers/staging/fsl-mc/Kconfig
deleted file mode 100644
index 3002229..0000000
--- a/drivers/staging/fsl-mc/Kconfig
+++ /dev/null
@@ -1,2 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-source "drivers/staging/fsl-mc/bus/Kconfig"
diff --git a/drivers/staging/fsl-mc/Makefile b/drivers/staging/fsl-mc/Makefile
deleted file mode 100644
index 1468388..0000000
--- a/drivers/staging/fsl-mc/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Freescale Management Complex (MC) bus drivers
-obj-$(CONFIG_FSL_MC_BUS) += bus/
diff --git a/drivers/staging/fsl-mc/bus/Kconfig b/drivers/staging/fsl-mc/bus/Kconfig
deleted file mode 100644
index 90f234d..0000000
--- a/drivers/staging/fsl-mc/bus/Kconfig
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-#
-# DPAA2 fsl-mc bus
-#
-# Copyright (C) 2014-2016 Freescale Semiconductor, Inc.
-#
-
diff --git a/drivers/staging/fsl-mc/bus/Makefile b/drivers/staging/fsl-mc/bus/Makefile
deleted file mode 100644
index 2141e4b..0000000
--- a/drivers/staging/fsl-mc/bus/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-#
-# Freescale Management Complex (MC) bus drivers
-#
-# Copyright (C) 2014 Freescale Semiconductor, Inc.
-#
-
--
2.7.4
^ permalink raw reply related
* Re: [Qemu-devel] [PATCH v3 33/40] elf: Relax MIPS' elf_check_arch() to accept EM_NANOMIPS too
From: Richard Henderson @ 2018-07-23 17:01 UTC (permalink / raw)
To: Stefan Markovic, qemu-devel
Cc: laurent, riku.voipio, philippe.mathieu.daude, aurelien, amarkovic,
smarkovic, pjovanovic, pburton
In-Reply-To: <1532004912-13899-34-git-send-email-stefan.markovic@rt-rk.com>
On 07/19/2018 05:55 AM, Stefan Markovic wrote:
> From: Aleksandar Markovic <amarkovic@wavecomp.com>
>
> Starting from nanoMIPS introduction, machine variant can be
> EM_MIPS or EM_NANOMIPS.
>
> Signed-off-by: Aleksandar Markovic <amarkovic@wavecomp.com>
> Signed-off-by: Stefan Markovic <smarkovic@wavecomp.com>
> ---
> linux-user/elfload.c | 2 ++
> 1 file changed, 2 insertions(+)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply
* [PATCH] packagegroup-core-full-cmdline: clean up system-services dependencies
From: Ross Burton @ 2018-07-23 17:01 UTC (permalink / raw)
To: openembedded-core
The 'system services' packagegroup depends on a number of packages which are not
system services, so remove them from the list.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
.../packagegroups/packagegroup-core-full-cmdline.bb | 8 --------
1 file changed, 8 deletions(-)
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb b/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb
index 1b938fb849c..e8616880248 100644
--- a/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb
@@ -133,16 +133,8 @@ RDEPENDS_packagegroup-core-full-cmdline-multiuser = "\
RDEPENDS_packagegroup-core-full-cmdline-sys-services = "\
at \
- bzip2 \
cronie \
- dbus \
- elfutils \
- gzip \
- less \
logrotate \
nfs-utils \
- pciutils \
rpcbind \
- tcp-wrappers \
- tzdata \
"
--
2.11.0
^ permalink raw reply related
* [PATCH v2 1/4] staging: fsl-dpaa2/eth: move generic FD defines to DPIO
From: Roy Pledge @ 2018-07-23 17:00 UTC (permalink / raw)
To: devel, linux-arm-kernel, gregkh, leoyang.li
Cc: laurentiu.tudor, ruxandra.radulescu, horia.geanta, linux-kernel,
arnd, catalin.marinas, robin.murphy
In-Reply-To: <20180723170025.2259-1-roy.pledge@nxp.com>
From: Horia Geantă <horia.geanta@nxp.com>
Previous commits:
commit 6e2387e8f19e ("staging: fsl-dpaa2/eth: Add Freescale DPAA2
Ethernet driver")
commit 39163c0ce0f4 ("staging: fsl-dpaa2/eth: Errors checking update")
have added bits that are not specific to the WRIOP accelerator.
Move these where they belong (in DPIO) such that other accelerators
can make use of them.
Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
Acked-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
---
drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c | 4 ++--
drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h | 18 +++++-------------
drivers/staging/fsl-mc/include/dpaa2-fd.h | 12 ++++++++++++
3 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c
index 3963717..d5f0ac5 100644
--- a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c
+++ b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c
@@ -455,7 +455,7 @@ static int build_sg_fd(struct dpaa2_eth_priv *priv,
dpaa2_fd_set_format(fd, dpaa2_fd_sg);
dpaa2_fd_set_addr(fd, addr);
dpaa2_fd_set_len(fd, skb->len);
- dpaa2_fd_set_ctrl(fd, DPAA2_FD_CTRL_PTA | DPAA2_FD_CTRL_PTV1);
+ dpaa2_fd_set_ctrl(fd, FD_CTRL_PTA | FD_CTRL_PTV1);
if (priv->tx_tstamp && skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)
enable_tx_tstamp(fd, sgt_buf);
@@ -508,7 +508,7 @@ static int build_single_fd(struct dpaa2_eth_priv *priv,
dpaa2_fd_set_offset(fd, (u16)(skb->data - buffer_start));
dpaa2_fd_set_len(fd, skb->len);
dpaa2_fd_set_format(fd, dpaa2_fd_single);
- dpaa2_fd_set_ctrl(fd, DPAA2_FD_CTRL_PTA | DPAA2_FD_CTRL_PTV1);
+ dpaa2_fd_set_ctrl(fd, FD_CTRL_PTA | FD_CTRL_PTV1);
if (priv->tx_tstamp && skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)
enable_tx_tstamp(fd, buffer_start);
diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h
index 905a4e6..9269cb0 100644
--- a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h
+++ b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h
@@ -124,21 +124,13 @@ struct dpaa2_eth_swa {
#define DPAA2_FD_FRC_FAICFDV 0x0400
/* Error bits in FD CTRL */
-#define DPAA2_FD_CTRL_UFD 0x00000004
-#define DPAA2_FD_CTRL_SBE 0x00000008
-#define DPAA2_FD_CTRL_FSE 0x00000020
-#define DPAA2_FD_CTRL_FAERR 0x00000040
-
-#define DPAA2_FD_RX_ERR_MASK (DPAA2_FD_CTRL_SBE | \
- DPAA2_FD_CTRL_FAERR)
-#define DPAA2_FD_TX_ERR_MASK (DPAA2_FD_CTRL_UFD | \
- DPAA2_FD_CTRL_SBE | \
- DPAA2_FD_CTRL_FSE | \
- DPAA2_FD_CTRL_FAERR)
+#define DPAA2_FD_RX_ERR_MASK (FD_CTRL_SBE | FD_CTRL_FAERR)
+#define DPAA2_FD_TX_ERR_MASK (FD_CTRL_UFD | \
+ FD_CTRL_SBE | \
+ FD_CTRL_FSE | \
+ FD_CTRL_FAERR)
/* Annotation bits in FD CTRL */
-#define DPAA2_FD_CTRL_PTA 0x00800000
-#define DPAA2_FD_CTRL_PTV1 0x00400000
#define DPAA2_FD_CTRL_ASAL 0x00020000 /* ASAL = 128B */
/* Frame annotation status */
diff --git a/drivers/staging/fsl-mc/include/dpaa2-fd.h b/drivers/staging/fsl-mc/include/dpaa2-fd.h
index b55b89b..2576aba 100644
--- a/drivers/staging/fsl-mc/include/dpaa2-fd.h
+++ b/drivers/staging/fsl-mc/include/dpaa2-fd.h
@@ -67,6 +67,18 @@ struct dpaa2_fd {
#define SG_FINAL_FLAG_MASK 0x1
#define SG_FINAL_FLAG_SHIFT 15
+/* Error bits in FD CTRL */
+#define FD_CTRL_ERR_MASK 0x000000FF
+#define FD_CTRL_UFD 0x00000004
+#define FD_CTRL_SBE 0x00000008
+#define FD_CTRL_FLC 0x00000010
+#define FD_CTRL_FSE 0x00000020
+#define FD_CTRL_FAERR 0x00000040
+
+/* Annotation bits in FD CTRL */
+#define FD_CTRL_PTA 0x00800000
+#define FD_CTRL_PTV1 0x00400000
+
enum dpaa2_fd_format {
dpaa2_fd_single = 0,
dpaa2_fd_list,
--
2.7.4
^ permalink raw reply related
* [PATCH v2 0/4] staging/fsl-mc/bus: Move DPIO from staging to drivers/soc/fsl
From: Roy Pledge @ 2018-07-23 17:00 UTC (permalink / raw)
To: devel, linux-arm-kernel, gregkh, leoyang.li
Cc: laurentiu.tudor, ruxandra.radulescu, horia.geanta, linux-kernel,
arnd, catalin.marinas, robin.murphy, Roy Pledge
Move the NXP DPIO (Datapath I/O driver) from the staging/fsl-mc/bus/dpio
directory to the drivers/soc/fsl directory.
The DPIO driver enables access to the Queue and Buffer Managemer (QBMAN)
hardware of NXP DPAA2 devices. This is a prerequiste for moving the DPAA2
Ethernet device driver from the staging directory.
Horia Geantă (1):
staging: fsl-dpaa2/eth: move generic FD defines to DPIO
Roy Pledge (3):
staging:fsl-mc: Move DPIO from staging to drivers/soc/fsl
drivers/staging: Remove fsl-mc driver from staging
drivers/soc/fsl/dpio: Convert DPIO documentation to .rst
.../networking/dpaa2/dpio-driver.rst | 30 +++++++++++++++++++---
Documentation/networking/dpaa2/index.rst | 1 +
MAINTAINERS | 2 +-
drivers/crypto/caam/sg_sw_qm2.h | 2 +-
drivers/crypto/caam/sg_sw_sec4.h | 2 +-
drivers/soc/fsl/Kconfig | 10 ++++++++
drivers/soc/fsl/Makefile | 1 +
.../{staging/fsl-mc/bus => soc/fsl}/dpio/Makefile | 0
.../fsl-mc/bus => soc/fsl}/dpio/dpio-cmd.h | 0
.../fsl-mc/bus => soc/fsl}/dpio/dpio-driver.c | 2 +-
.../fsl-mc/bus => soc/fsl}/dpio/dpio-service.c | 2 +-
.../{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.c | 0
.../{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.h | 0
.../fsl-mc/bus => soc/fsl}/dpio/qbman-portal.c | 2 +-
.../fsl-mc/bus => soc/fsl}/dpio/qbman-portal.h | 2 +-
drivers/staging/Kconfig | 2 --
drivers/staging/Makefile | 1 -
drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c | 4 +--
drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h | 22 +++++-----------
drivers/staging/fsl-mc/Kconfig | 2 --
drivers/staging/fsl-mc/Makefile | 3 ---
drivers/staging/fsl-mc/bus/Kconfig | 16 ------------
drivers/staging/fsl-mc/bus/Makefile | 9 -------
.../fsl-mc/include => include/soc/fsl}/dpaa2-fd.h | 12 +++++++++
.../include => include/soc/fsl}/dpaa2-global.h | 0
.../fsl-mc/include => include/soc/fsl}/dpaa2-io.h | 0
26 files changed, 67 insertions(+), 60 deletions(-)
rename drivers/staging/fsl-mc/bus/dpio/dpio-driver.txt => Documentation/networking/dpaa2/dpio-driver.rst (94%)
rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/Makefile (100%)
rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-cmd.h (100%)
rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-driver.c (99%)
rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-service.c (99%)
rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.c (100%)
rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.h (100%)
rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/qbman-portal.c (99%)
rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/qbman-portal.h (99%)
delete mode 100644 drivers/staging/fsl-mc/Kconfig
delete mode 100644 drivers/staging/fsl-mc/Makefile
delete mode 100644 drivers/staging/fsl-mc/bus/Kconfig
delete mode 100644 drivers/staging/fsl-mc/bus/Makefile
rename {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-fd.h (97%)
rename {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-global.h (100%)
rename {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-io.h (100%)
--
2.7.4
^ permalink raw reply
* [PATCH] nvme: if_ready checks to fail io to deleting controller
From: Ewan D. Milne @ 2018-07-23 17:00 UTC (permalink / raw)
In-Reply-To: <20180720224948.3953-1-jsmart2021@gmail.com>
On Fri, 2018-07-20@15:49 -0700, James Smart wrote:
> The revised if_ready checks skipped over the case of returning
> error when the controller is being deleted. Instead it was returning
> BUSY, which caused the ios to retry, which caused the ns delete to
> hang waiting for the ios to drain.
>
> Stack trace of hang looks like:
> kworker/u64:2 D 0 74 2 0x80000000
> Workqueue: nvme-delete-wq nvme_delete_ctrl_work [nvme_core]
> Call Trace:
> ? __schedule+0x26d/0x820
> schedule+0x32/0x80
> blk_mq_freeze_queue_wait+0x36/0x80
> ? remove_wait_queue+0x60/0x60
> blk_cleanup_queue+0x72/0x160
> nvme_ns_remove+0x106/0x140 [nvme_core]
> nvme_remove_namespaces+0x7e/0xa0 [nvme_core]
> nvme_delete_ctrl_work+0x4d/0x80 [nvme_core]
> process_one_work+0x160/0x350
> worker_thread+0x1c3/0x3d0
> kthread+0xf5/0x130
> ? process_one_work+0x350/0x350
> ? kthread_bind+0x10/0x10
> ret_from_fork+0x1f/0x30
>
> Extend nvmf_fail_nonready_command() to supply the controller pointer
> so that the controller state can be looked at. Fail any io to a
> controller that is deleting.
>
> Fixes: 3bc32bb1186c ("nvme-fabrics: refactor queue ready check")
> Fixes: 35897b920c8a ("nvme-fabrics: fix and refine state checks in __nvmf_check_ready")
> Signed-off-by: James Smart <james.smart at broadcom.com>
>
> ---
> This should go into 4.18 if possible, which is where the prior
> two patches were merged.
> ---
> drivers/nvme/host/fabrics.c | 10 +++++++---
> drivers/nvme/host/fabrics.h | 3 ++-
> drivers/nvme/host/fc.c | 2 +-
> drivers/nvme/host/rdma.c | 2 +-
> drivers/nvme/target/loop.c | 2 +-
> 5 files changed, 12 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/nvme/host/fabrics.c b/drivers/nvme/host/fabrics.c
> index 903eb4545e26..f7efe5a58cc7 100644
> --- a/drivers/nvme/host/fabrics.c
> +++ b/drivers/nvme/host/fabrics.c
> @@ -539,14 +539,18 @@ static struct nvmf_transport_ops *nvmf_lookup_transport(
> /*
> * For something we're not in a state to send to the device the default action
> * is to busy it and retry it after the controller state is recovered. However,
> - * anything marked for failfast or nvme multipath is immediately failed.
> + * if the controller is deleting or if anything is marked for failfast or
> + * nvme multipath it is immediately failed.
> *
> * Note: commands used to initialize the controller will be marked for failfast.
> * Note: nvme cli/ioctl commands are marked for failfast.
> */
> -blk_status_t nvmf_fail_nonready_command(struct request *rq)
> +blk_status_t nvmf_fail_nonready_command(struct nvme_ctrl *ctrl,
> + struct request *rq)
> {
> - if (!blk_noretry_request(rq) && !(rq->cmd_flags & REQ_NVME_MPATH))
> + if (ctrl->state != NVME_CTRL_DELETING &&
> + ctrl->state != NVME_CTRL_DEAD &&
> + !blk_noretry_request(rq) && !(rq->cmd_flags & REQ_NVME_MPATH))
> return BLK_STS_RESOURCE;
> nvme_req(rq)->status = NVME_SC_ABORT_REQ;
> return BLK_STS_IOERR;
> diff --git a/drivers/nvme/host/fabrics.h b/drivers/nvme/host/fabrics.h
> index e1818a27aa2d..aa2fdb2a2e8f 100644
> --- a/drivers/nvme/host/fabrics.h
> +++ b/drivers/nvme/host/fabrics.h
> @@ -162,7 +162,8 @@ void nvmf_unregister_transport(struct nvmf_transport_ops *ops);
> void nvmf_free_options(struct nvmf_ctrl_options *opts);
> int nvmf_get_address(struct nvme_ctrl *ctrl, char *buf, int size);
> bool nvmf_should_reconnect(struct nvme_ctrl *ctrl);
> -blk_status_t nvmf_fail_nonready_command(struct request *rq);
> +blk_status_t nvmf_fail_nonready_command(struct nvme_ctrl *ctrl,
> + struct request *rq);
> bool __nvmf_check_ready(struct nvme_ctrl *ctrl, struct request *rq,
> bool queue_live);
>
> diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
> index 9cc33752539a..611e70cae754 100644
> --- a/drivers/nvme/host/fc.c
> +++ b/drivers/nvme/host/fc.c
> @@ -2273,7 +2273,7 @@ nvme_fc_queue_rq(struct blk_mq_hw_ctx *hctx,
>
> if (ctrl->rport->remoteport.port_state != FC_OBJSTATE_ONLINE ||
> !nvmf_check_ready(&queue->ctrl->ctrl, rq, queue_ready))
> - return nvmf_fail_nonready_command(rq);
> + return nvmf_fail_nonready_command(&queue->ctrl->ctrl, rq);
>
> ret = nvme_setup_cmd(ns, rq, sqe);
> if (ret)
> diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
> index 13a6064e4794..0805fa6215ee 100644
> --- a/drivers/nvme/host/rdma.c
> +++ b/drivers/nvme/host/rdma.c
> @@ -1702,7 +1702,7 @@ static blk_status_t nvme_rdma_queue_rq(struct blk_mq_hw_ctx *hctx,
> WARN_ON_ONCE(rq->tag < 0);
>
> if (!nvmf_check_ready(&queue->ctrl->ctrl, rq, queue_ready))
> - return nvmf_fail_nonready_command(rq);
> + return nvmf_fail_nonready_command(&queue->ctrl->ctrl, rq);
>
> dev = queue->device->dev;
> ib_dma_sync_single_for_cpu(dev, sqe->dma,
> diff --git a/drivers/nvme/target/loop.c b/drivers/nvme/target/loop.c
> index af7fbf4132b0..9908082b32c4 100644
> --- a/drivers/nvme/target/loop.c
> +++ b/drivers/nvme/target/loop.c
> @@ -162,7 +162,7 @@ static blk_status_t nvme_loop_queue_rq(struct blk_mq_hw_ctx *hctx,
> blk_status_t ret;
>
> if (!nvmf_check_ready(&queue->ctrl->ctrl, req, queue_ready))
> - return nvmf_fail_nonready_command(req);
> + return nvmf_fail_nonready_command(&queue->ctrl->ctrl, req);
>
> ret = nvme_setup_cmd(ns, req, &iod->cmd);
> if (ret)
Yes, that fixes it. The problem is fairly easy to reproduce with actual NVMe/FC hardware:
while (true) do
nvme connect -t fc -a "nn-0x20000090fac7dbce:pn-0x10000090fac7dbce" -w "nn-0x20000090fac7dacc:pn-0x10000090fac7dacc" -n testnqn
nvme disconnect -d nvme1n1
done
would typically fail in 30 or so iterations on my machines.
Tested-by: Ewan D. Milne <emilne at redhat.com>
Reviewed-by: Ewan D. Milne <emilne at redhat.com>
^ permalink raw reply
* [Buildroot] [PATCH 1/1] mbedtls: bump to version 2.7.4
From: Fabrice Fontaine @ 2018-07-23 17:00 UTC (permalink / raw)
To: buildroot
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/mbedtls/mbedtls.hash | 6 +++---
package/mbedtls/mbedtls.mk | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/package/mbedtls/mbedtls.hash b/package/mbedtls/mbedtls.hash
index 16f03fb7d8..cf347d299f 100644
--- a/package/mbedtls/mbedtls.hash
+++ b/package/mbedtls/mbedtls.hash
@@ -1,5 +1,5 @@
-# From https://tls.mbed.org/tech-updates/releases/mbedtls-2.9.0-2.7.3-and-2.1.12-released
-sha1 8352f6713a9ee695f6f19e893c0e85941af71967 mbedtls-2.7.3-apache.tgz
-sha256 05282af7d95fedb2430c248ffe3081646800b8dae9071f8da11a07100963d765 mbedtls-2.7.3-apache.tgz
+# From https://tls.mbed.org/tech-updates/releases/mbedtls-2.11.0-2.7.4-and-2.1.13-released
+sha1 20394e353050992c5f9699da7c9a336bd2ed2dea mbedtls-2.7.4-apache.tgz
+sha256 34e164d49500e377970c5f6761a146078baae0e086ec88cdcfeb9c96878a38f5 mbedtls-2.7.4-apache.tgz
# Locally calculated
sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache-2.0.txt
diff --git a/package/mbedtls/mbedtls.mk b/package/mbedtls/mbedtls.mk
index e6012dcb3f..ab415dd0b8 100644
--- a/package/mbedtls/mbedtls.mk
+++ b/package/mbedtls/mbedtls.mk
@@ -5,7 +5,7 @@
################################################################################
MBEDTLS_SITE = https://tls.mbed.org/code/releases
-MBEDTLS_VERSION = 2.7.3
+MBEDTLS_VERSION = 2.7.4
MBEDTLS_SOURCE = mbedtls-$(MBEDTLS_VERSION)-apache.tgz
MBEDTLS_CONF_OPTS = \
-DENABLE_PROGRAMS=$(if $(BR2_PACKAGE_MBEDTLS_PROGRAMS),ON,OFF) \
--
2.14.1
^ permalink raw reply related
* [PATCH v2 4/4] drivers/soc/fsl/dpio: Convert DPIO documentation to .rst
From: Roy Pledge @ 2018-07-23 17:00 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20180723170025.2259-1-roy.pledge@nxp.com>
Convert the Datapath I/O documentation to .rst format
and move to the Documation/networking/dpaa2 directory
Signed-off-by: Roy Pledge <roy.pledge@nxp.com>
---
.../networking/dpaa2/dpio-driver.rst | 30 +++++++++++++++++++---
Documentation/networking/dpaa2/index.rst | 1 +
2 files changed, 28 insertions(+), 3 deletions(-)
rename drivers/soc/fsl/dpio/dpio-driver.txt => Documentation/networking/dpaa2/dpio-driver.rst (94%)
diff --git a/drivers/soc/fsl/dpio/dpio-driver.txt b/Documentation/networking/dpaa2/dpio-driver.rst
similarity index 94%
rename from drivers/soc/fsl/dpio/dpio-driver.txt
rename to Documentation/networking/dpaa2/dpio-driver.rst
index 72ba9da..3a33a33 100644
--- a/drivers/soc/fsl/dpio/dpio-driver.txt
+++ b/Documentation/networking/dpaa2/dpio-driver.rst
@@ -1,7 +1,16 @@
-Copyright 2016 NXP
+.. include:: <isonum.txt>
+
+DPAA2 DPIO (Data Path I/O) Overview
+===================================
+
+:Copyright: |copy| 2015 Freescale Semiconductor Inc.
+:Copyright: |copy| 2018 NXP
+
+This document provides an overview of the Freescale DPAA2 DPIO
+drivers
Introduction
-------------
+============
A DPAA2 DPIO (Data Path I/O) is a hardware object that provides
interfaces to enqueue and dequeue frames to/from network interfaces
@@ -27,8 +36,11 @@ provides services that:
The Linux DPIO driver consists of 3 primary components--
DPIO object driver-- fsl-mc driver that manages the DPIO object
+
DPIO service-- provides APIs to other Linux drivers for services
+
QBman portal interface-- sends portal commands, gets responses
+::
fsl-mc other
bus drivers
@@ -45,8 +57,9 @@ The Linux DPIO driver consists of 3 primary components--
|
hardware
+
The diagram below shows how the DPIO driver components fit with the other
-DPAA2 Linux driver components:
+DPAA2 Linux driver components::
+------------+
| OS Network |
| Stack |
@@ -98,20 +111,29 @@ DPIO service (dpio-service.c, dpaa2-io.h)
Notification handling
dpaa2_io_service_register()
+
dpaa2_io_service_deregister()
+
dpaa2_io_service_rearm()
Queuing
dpaa2_io_service_pull_fq()
+
dpaa2_io_service_pull_channel()
+
dpaa2_io_service_enqueue_fq()
+
dpaa2_io_service_enqueue_qd()
+
dpaa2_io_store_create()
+
dpaa2_io_store_destroy()
+
dpaa2_io_store_next()
Buffer pool management
dpaa2_io_service_release()
+
dpaa2_io_service_acquire()
QBman portal interface (qbman-portal.c)
@@ -120,7 +142,9 @@ QBman portal interface (qbman-portal.c)
The qbman-portal component provides APIs to do the low level hardware
bit twiddling for operations such as:
-initializing Qman software portals
+
-building and sending portal commands
+
-portal interrupt configuration and processing
The qbman-portal APIs are not public to other drivers, and are
diff --git a/Documentation/networking/dpaa2/index.rst b/Documentation/networking/dpaa2/index.rst
index 4c6586c..10bea11 100644
--- a/Documentation/networking/dpaa2/index.rst
+++ b/Documentation/networking/dpaa2/index.rst
@@ -6,3 +6,4 @@ DPAA2 Documentation
:maxdepth: 1
overview
+ dpio-driver
--
2.7.4
^ permalink raw reply related
* [PATCH v2 3/4] drivers/staging: Remove fsl-mc driver from staging
From: Roy Pledge @ 2018-07-23 17:00 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20180723170025.2259-1-roy.pledge@nxp.com>
Remove the staging/drivers/fsl-mc directory from the staging
area now that all the components have been moved to the main
kernel areas.
Signed-off-by: Roy Pledge <roy.pledge@nxp.com>
---
drivers/staging/Kconfig | 2 --
drivers/staging/Makefile | 1 -
drivers/staging/fsl-mc/Kconfig | 2 --
drivers/staging/fsl-mc/Makefile | 3 ---
drivers/staging/fsl-mc/bus/Kconfig | 7 -------
drivers/staging/fsl-mc/bus/Makefile | 7 -------
6 files changed, 22 deletions(-)
delete mode 100644 drivers/staging/fsl-mc/Kconfig
delete mode 100644 drivers/staging/fsl-mc/Makefile
delete mode 100644 drivers/staging/fsl-mc/bus/Kconfig
delete mode 100644 drivers/staging/fsl-mc/bus/Makefile
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 75a4804..47b61c3 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -92,8 +92,6 @@ source "drivers/staging/clocking-wizard/Kconfig"
source "drivers/staging/fbtft/Kconfig"
-source "drivers/staging/fsl-mc/Kconfig"
-
source "drivers/staging/fsl-dpaa2/Kconfig"
source "drivers/staging/wilc1000/Kconfig"
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index e84959a..bfef8f2 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -37,7 +37,6 @@ obj-$(CONFIG_CRYPTO_SKEIN) += skein/
obj-$(CONFIG_UNISYSSPAR) += unisys/
obj-$(CONFIG_COMMON_CLK_XLNX_CLKWZRD) += clocking-wizard/
obj-$(CONFIG_FB_TFT) += fbtft/
-obj-$(CONFIG_FSL_MC_BUS) += fsl-mc/
obj-$(CONFIG_FSL_DPAA2) += fsl-dpaa2/
obj-$(CONFIG_WILC1000) += wilc1000/
obj-$(CONFIG_MOST) += most/
diff --git a/drivers/staging/fsl-mc/Kconfig b/drivers/staging/fsl-mc/Kconfig
deleted file mode 100644
index 3002229..0000000
--- a/drivers/staging/fsl-mc/Kconfig
+++ /dev/null
@@ -1,2 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-source "drivers/staging/fsl-mc/bus/Kconfig"
diff --git a/drivers/staging/fsl-mc/Makefile b/drivers/staging/fsl-mc/Makefile
deleted file mode 100644
index 1468388..0000000
--- a/drivers/staging/fsl-mc/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Freescale Management Complex (MC) bus drivers
-obj-$(CONFIG_FSL_MC_BUS) += bus/
diff --git a/drivers/staging/fsl-mc/bus/Kconfig b/drivers/staging/fsl-mc/bus/Kconfig
deleted file mode 100644
index 90f234d..0000000
--- a/drivers/staging/fsl-mc/bus/Kconfig
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-#
-# DPAA2 fsl-mc bus
-#
-# Copyright (C) 2014-2016 Freescale Semiconductor, Inc.
-#
-
diff --git a/drivers/staging/fsl-mc/bus/Makefile b/drivers/staging/fsl-mc/bus/Makefile
deleted file mode 100644
index 2141e4b..0000000
--- a/drivers/staging/fsl-mc/bus/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-#
-# Freescale Management Complex (MC) bus drivers
-#
-# Copyright (C) 2014 Freescale Semiconductor, Inc.
-#
-
--
2.7.4
^ permalink raw reply related
* [PATCH v2 2/4] staging:fsl-mc: Move DPIO from staging to drivers/soc/fsl
From: Roy Pledge @ 2018-07-23 17:00 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20180723170025.2259-1-roy.pledge@nxp.com>
Move the NXP DPIO (Datapath I/O Driver) out of the
drivers/staging directory and into the drivers/soc/fsl directory.
The DPIO driver enables access to Queue and Buffer Manager (QBMAN)
hardware on NXP DPAA2 devices. This is a prerequisite to moving the
DPAA2 Ethernet driver out of staging.
Signed-off-by: Roy Pledge <roy.pledge@nxp.com>
---
MAINTAINERS | 2 +-
drivers/crypto/caam/sg_sw_qm2.h | 2 +-
drivers/crypto/caam/sg_sw_sec4.h | 2 +-
drivers/soc/fsl/Kconfig | 10 ++++++++++
drivers/soc/fsl/Makefile | 1 +
drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/Makefile | 0
drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-cmd.h | 0
drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-driver.c | 2 +-
drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-driver.txt | 0
drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-service.c | 2 +-
drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.c | 0
drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.h | 0
drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/qbman-portal.c | 2 +-
drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/qbman-portal.h | 2 +-
drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h | 4 ++--
drivers/staging/fsl-mc/bus/Kconfig | 9 ---------
drivers/staging/fsl-mc/bus/Makefile | 2 --
{drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-fd.h | 0
.../staging/fsl-mc/include => include/soc/fsl}/dpaa2-global.h | 0
{drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-io.h | 0
20 files changed, 20 insertions(+), 20 deletions(-)
rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/Makefile (100%)
rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-cmd.h (100%)
rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-driver.c (99%)
rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-driver.txt (100%)
rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-service.c (99%)
rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.c (100%)
rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.h (100%)
rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/qbman-portal.c (99%)
rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/qbman-portal.h (99%)
rename {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-fd.h (100%)
rename {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-global.h (100%)
rename {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-io.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 0fe4228..34ce842 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4418,7 +4418,7 @@ DPAA2 DATAPATH I/O (DPIO) DRIVER
M: Roy Pledge <Roy.Pledge@nxp.com>
L: linux-kernel at vger.kernel.org
S: Maintained
-F: drivers/staging/fsl-mc/bus/dpio
+F: drivers/soc/fsl/dpio
DPAA2 ETHERNET DRIVER
M: Ioana Radulescu <ruxandra.radulescu@nxp.com>
diff --git a/drivers/crypto/caam/sg_sw_qm2.h b/drivers/crypto/caam/sg_sw_qm2.h
index 31b4407..b5b4c12 100644
--- a/drivers/crypto/caam/sg_sw_qm2.h
+++ b/drivers/crypto/caam/sg_sw_qm2.h
@@ -35,7 +35,7 @@
#ifndef _SG_SW_QM2_H_
#define _SG_SW_QM2_H_
-#include "../../../drivers/staging/fsl-mc/include/dpaa2-fd.h"
+#include <soc/fsl/dpaa2-fd.h>
static inline void dma_to_qm_sg_one(struct dpaa2_sg_entry *qm_sg_ptr,
dma_addr_t dma, u32 len, u16 offset)
diff --git a/drivers/crypto/caam/sg_sw_sec4.h b/drivers/crypto/caam/sg_sw_sec4.h
index e586ffa..dbfa9fc 100644
--- a/drivers/crypto/caam/sg_sw_sec4.h
+++ b/drivers/crypto/caam/sg_sw_sec4.h
@@ -12,7 +12,7 @@
#include "ctrl.h"
#include "regs.h"
#include "sg_sw_qm2.h"
-#include "../../../drivers/staging/fsl-mc/include/dpaa2-fd.h"
+#include <soc/fsl/dpaa2-fd.h>
struct sec4_sg_entry {
u64 ptr;
diff --git a/drivers/soc/fsl/Kconfig b/drivers/soc/fsl/Kconfig
index 7a9fb9b..c17bf38 100644
--- a/drivers/soc/fsl/Kconfig
+++ b/drivers/soc/fsl/Kconfig
@@ -16,3 +16,13 @@ config FSL_GUTS
Initially only reading SVR and registering soc device are supported.
Other guts accesses, such as reading RCW, should eventually be moved
into this driver as well.
+
+config FSL_MC_DPIO
+ tristate "QorIQ DPAA2 DPIO driver"
+ depends on FSL_MC_BUS
+ help
+ Driver for the DPAA2 DPIO object. A DPIO provides queue and
+ buffer management facilities for software to interact with
+ other DPAA2 objects. This driver does not expose the DPIO
+ objects individually, but groups them under a service layer
+ API.
diff --git a/drivers/soc/fsl/Makefile b/drivers/soc/fsl/Makefile
index 44b3beb..803ef1b 100644
--- a/drivers/soc/fsl/Makefile
+++ b/drivers/soc/fsl/Makefile
@@ -6,3 +6,4 @@ obj-$(CONFIG_FSL_DPAA) += qbman/
obj-$(CONFIG_QUICC_ENGINE) += qe/
obj-$(CONFIG_CPM) += qe/
obj-$(CONFIG_FSL_GUTS) += guts.o
+obj-$(CONFIG_FSL_MC_DPIO) += dpio/
diff --git a/drivers/staging/fsl-mc/bus/dpio/Makefile b/drivers/soc/fsl/dpio/Makefile
similarity index 100%
rename from drivers/staging/fsl-mc/bus/dpio/Makefile
rename to drivers/soc/fsl/dpio/Makefile
diff --git a/drivers/staging/fsl-mc/bus/dpio/dpio-cmd.h b/drivers/soc/fsl/dpio/dpio-cmd.h
similarity index 100%
rename from drivers/staging/fsl-mc/bus/dpio/dpio-cmd.h
rename to drivers/soc/fsl/dpio/dpio-cmd.h
diff --git a/drivers/staging/fsl-mc/bus/dpio/dpio-driver.c b/drivers/soc/fsl/dpio/dpio-driver.c
similarity index 99%
rename from drivers/staging/fsl-mc/bus/dpio/dpio-driver.c
rename to drivers/soc/fsl/dpio/dpio-driver.c
index 11a90a9..b60b77b 100644
--- a/drivers/staging/fsl-mc/bus/dpio/dpio-driver.c
+++ b/drivers/soc/fsl/dpio/dpio-driver.c
@@ -16,7 +16,7 @@
#include <linux/io.h>
#include <linux/fsl/mc.h>
-#include "../../include/dpaa2-io.h"
+#include <soc/fsl/dpaa2-io.h>
#include "qbman-portal.h"
#include "dpio.h"
diff --git a/drivers/staging/fsl-mc/bus/dpio/dpio-driver.txt b/drivers/soc/fsl/dpio/dpio-driver.txt
similarity index 100%
rename from drivers/staging/fsl-mc/bus/dpio/dpio-driver.txt
rename to drivers/soc/fsl/dpio/dpio-driver.txt
diff --git a/drivers/staging/fsl-mc/bus/dpio/dpio-service.c b/drivers/soc/fsl/dpio/dpio-service.c
similarity index 99%
rename from drivers/staging/fsl-mc/bus/dpio/dpio-service.c
rename to drivers/soc/fsl/dpio/dpio-service.c
index 14ed2be..9b17f72 100644
--- a/drivers/staging/fsl-mc/bus/dpio/dpio-service.c
+++ b/drivers/soc/fsl/dpio/dpio-service.c
@@ -6,7 +6,7 @@
*/
#include <linux/types.h>
#include <linux/fsl/mc.h>
-#include "../../include/dpaa2-io.h"
+#include <soc/fsl/dpaa2-io.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/platform_device.h>
diff --git a/drivers/staging/fsl-mc/bus/dpio/dpio.c b/drivers/soc/fsl/dpio/dpio.c
similarity index 100%
rename from drivers/staging/fsl-mc/bus/dpio/dpio.c
rename to drivers/soc/fsl/dpio/dpio.c
diff --git a/drivers/staging/fsl-mc/bus/dpio/dpio.h b/drivers/soc/fsl/dpio/dpio.h
similarity index 100%
rename from drivers/staging/fsl-mc/bus/dpio/dpio.h
rename to drivers/soc/fsl/dpio/dpio.h
diff --git a/drivers/staging/fsl-mc/bus/dpio/qbman-portal.c b/drivers/soc/fsl/dpio/qbman-portal.c
similarity index 99%
rename from drivers/staging/fsl-mc/bus/dpio/qbman-portal.c
rename to drivers/soc/fsl/dpio/qbman-portal.c
index 116fafb..cf1d448 100644
--- a/drivers/staging/fsl-mc/bus/dpio/qbman-portal.c
+++ b/drivers/soc/fsl/dpio/qbman-portal.c
@@ -8,7 +8,7 @@
#include <asm/cacheflush.h>
#include <linux/io.h>
#include <linux/slab.h>
-#include "../../include/dpaa2-global.h"
+#include <soc/fsl/dpaa2-global.h>
#include "qbman-portal.h"
diff --git a/drivers/staging/fsl-mc/bus/dpio/qbman-portal.h b/drivers/soc/fsl/dpio/qbman-portal.h
similarity index 99%
rename from drivers/staging/fsl-mc/bus/dpio/qbman-portal.h
rename to drivers/soc/fsl/dpio/qbman-portal.h
index 69db3c8..89d1dd9 100644
--- a/drivers/staging/fsl-mc/bus/dpio/qbman-portal.h
+++ b/drivers/soc/fsl/dpio/qbman-portal.h
@@ -7,7 +7,7 @@
#ifndef __FSL_QBMAN_PORTAL_H
#define __FSL_QBMAN_PORTAL_H
-#include "../../include/dpaa2-fd.h"
+#include <soc/fsl/dpaa2-fd.h>
struct dpaa2_dq;
struct qbman_swp;
diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h
index 9269cb0..f2917b5 100644
--- a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h
+++ b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h
@@ -37,8 +37,8 @@
#include <linux/if_vlan.h>
#include <linux/fsl/mc.h>
-#include "../../fsl-mc/include/dpaa2-io.h"
-#include "../../fsl-mc/include/dpaa2-fd.h"
+#include <soc/fsl/dpaa2-io.h>
+#include <soc/fsl/dpaa2-fd.h>
#include "dpni.h"
#include "dpni-cmd.h"
diff --git a/drivers/staging/fsl-mc/bus/Kconfig b/drivers/staging/fsl-mc/bus/Kconfig
index 3424530..90f234d 100644
--- a/drivers/staging/fsl-mc/bus/Kconfig
+++ b/drivers/staging/fsl-mc/bus/Kconfig
@@ -5,12 +5,3 @@
# Copyright (C) 2014-2016 Freescale Semiconductor, Inc.
#
-config FSL_MC_DPIO
- tristate "QorIQ DPAA2 DPIO driver"
- depends on FSL_MC_BUS
- help
- Driver for the DPAA2 DPIO object. A DPIO provides queue and
- buffer management facilities for software to interact with
- other DPAA2 objects. This driver does not expose the DPIO
- objects individually, but groups them under a service layer
- API.
diff --git a/drivers/staging/fsl-mc/bus/Makefile b/drivers/staging/fsl-mc/bus/Makefile
index 21d8ebc..2141e4b 100644
--- a/drivers/staging/fsl-mc/bus/Makefile
+++ b/drivers/staging/fsl-mc/bus/Makefile
@@ -5,5 +5,3 @@
# Copyright (C) 2014 Freescale Semiconductor, Inc.
#
-# MC DPIO driver
-obj-$(CONFIG_FSL_MC_DPIO) += dpio/
diff --git a/drivers/staging/fsl-mc/include/dpaa2-fd.h b/include/soc/fsl/dpaa2-fd.h
similarity index 100%
rename from drivers/staging/fsl-mc/include/dpaa2-fd.h
rename to include/soc/fsl/dpaa2-fd.h
diff --git a/drivers/staging/fsl-mc/include/dpaa2-global.h b/include/soc/fsl/dpaa2-global.h
similarity index 100%
rename from drivers/staging/fsl-mc/include/dpaa2-global.h
rename to include/soc/fsl/dpaa2-global.h
diff --git a/drivers/staging/fsl-mc/include/dpaa2-io.h b/include/soc/fsl/dpaa2-io.h
similarity index 100%
rename from drivers/staging/fsl-mc/include/dpaa2-io.h
rename to include/soc/fsl/dpaa2-io.h
--
2.7.4
^ permalink raw reply related
* [PATCH v2 1/4] staging: fsl-dpaa2/eth: move generic FD defines to DPIO
From: Roy Pledge @ 2018-07-23 17:00 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20180723170025.2259-1-roy.pledge@nxp.com>
From: Horia Geant? <horia.geanta@nxp.com>
Previous commits:
commit 6e2387e8f19e ("staging: fsl-dpaa2/eth: Add Freescale DPAA2
Ethernet driver")
commit 39163c0ce0f4 ("staging: fsl-dpaa2/eth: Errors checking update")
have added bits that are not specific to the WRIOP accelerator.
Move these where they belong (in DPIO) such that other accelerators
can make use of them.
Signed-off-by: Horia Geant? <horia.geanta@nxp.com>
Acked-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
---
drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c | 4 ++--
drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h | 18 +++++-------------
drivers/staging/fsl-mc/include/dpaa2-fd.h | 12 ++++++++++++
3 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c
index 3963717..d5f0ac5 100644
--- a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c
+++ b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c
@@ -455,7 +455,7 @@ static int build_sg_fd(struct dpaa2_eth_priv *priv,
dpaa2_fd_set_format(fd, dpaa2_fd_sg);
dpaa2_fd_set_addr(fd, addr);
dpaa2_fd_set_len(fd, skb->len);
- dpaa2_fd_set_ctrl(fd, DPAA2_FD_CTRL_PTA | DPAA2_FD_CTRL_PTV1);
+ dpaa2_fd_set_ctrl(fd, FD_CTRL_PTA | FD_CTRL_PTV1);
if (priv->tx_tstamp && skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)
enable_tx_tstamp(fd, sgt_buf);
@@ -508,7 +508,7 @@ static int build_single_fd(struct dpaa2_eth_priv *priv,
dpaa2_fd_set_offset(fd, (u16)(skb->data - buffer_start));
dpaa2_fd_set_len(fd, skb->len);
dpaa2_fd_set_format(fd, dpaa2_fd_single);
- dpaa2_fd_set_ctrl(fd, DPAA2_FD_CTRL_PTA | DPAA2_FD_CTRL_PTV1);
+ dpaa2_fd_set_ctrl(fd, FD_CTRL_PTA | FD_CTRL_PTV1);
if (priv->tx_tstamp && skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)
enable_tx_tstamp(fd, buffer_start);
diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h
index 905a4e6..9269cb0 100644
--- a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h
+++ b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h
@@ -124,21 +124,13 @@ struct dpaa2_eth_swa {
#define DPAA2_FD_FRC_FAICFDV 0x0400
/* Error bits in FD CTRL */
-#define DPAA2_FD_CTRL_UFD 0x00000004
-#define DPAA2_FD_CTRL_SBE 0x00000008
-#define DPAA2_FD_CTRL_FSE 0x00000020
-#define DPAA2_FD_CTRL_FAERR 0x00000040
-
-#define DPAA2_FD_RX_ERR_MASK (DPAA2_FD_CTRL_SBE | \
- DPAA2_FD_CTRL_FAERR)
-#define DPAA2_FD_TX_ERR_MASK (DPAA2_FD_CTRL_UFD | \
- DPAA2_FD_CTRL_SBE | \
- DPAA2_FD_CTRL_FSE | \
- DPAA2_FD_CTRL_FAERR)
+#define DPAA2_FD_RX_ERR_MASK (FD_CTRL_SBE | FD_CTRL_FAERR)
+#define DPAA2_FD_TX_ERR_MASK (FD_CTRL_UFD | \
+ FD_CTRL_SBE | \
+ FD_CTRL_FSE | \
+ FD_CTRL_FAERR)
/* Annotation bits in FD CTRL */
-#define DPAA2_FD_CTRL_PTA 0x00800000
-#define DPAA2_FD_CTRL_PTV1 0x00400000
#define DPAA2_FD_CTRL_ASAL 0x00020000 /* ASAL = 128B */
/* Frame annotation status */
diff --git a/drivers/staging/fsl-mc/include/dpaa2-fd.h b/drivers/staging/fsl-mc/include/dpaa2-fd.h
index b55b89b..2576aba 100644
--- a/drivers/staging/fsl-mc/include/dpaa2-fd.h
+++ b/drivers/staging/fsl-mc/include/dpaa2-fd.h
@@ -67,6 +67,18 @@ struct dpaa2_fd {
#define SG_FINAL_FLAG_MASK 0x1
#define SG_FINAL_FLAG_SHIFT 15
+/* Error bits in FD CTRL */
+#define FD_CTRL_ERR_MASK 0x000000FF
+#define FD_CTRL_UFD 0x00000004
+#define FD_CTRL_SBE 0x00000008
+#define FD_CTRL_FLC 0x00000010
+#define FD_CTRL_FSE 0x00000020
+#define FD_CTRL_FAERR 0x00000040
+
+/* Annotation bits in FD CTRL */
+#define FD_CTRL_PTA 0x00800000
+#define FD_CTRL_PTV1 0x00400000
+
enum dpaa2_fd_format {
dpaa2_fd_single = 0,
dpaa2_fd_list,
--
2.7.4
^ permalink raw reply related
* [PATCH v2 0/4] staging/fsl-mc/bus: Move DPIO from staging to drivers/soc/fsl
From: Roy Pledge @ 2018-07-23 17:00 UTC (permalink / raw)
To: linux-arm-kernel
Move the NXP DPIO (Datapath I/O driver) from the staging/fsl-mc/bus/dpio
directory to the drivers/soc/fsl directory.
The DPIO driver enables access to the Queue and Buffer Managemer (QBMAN)
hardware of NXP DPAA2 devices. This is a prerequiste for moving the DPAA2
Ethernet device driver from the staging directory.
Horia Geant? (1):
staging: fsl-dpaa2/eth: move generic FD defines to DPIO
Roy Pledge (3):
staging:fsl-mc: Move DPIO from staging to drivers/soc/fsl
drivers/staging: Remove fsl-mc driver from staging
drivers/soc/fsl/dpio: Convert DPIO documentation to .rst
.../networking/dpaa2/dpio-driver.rst | 30 +++++++++++++++++++---
Documentation/networking/dpaa2/index.rst | 1 +
MAINTAINERS | 2 +-
drivers/crypto/caam/sg_sw_qm2.h | 2 +-
drivers/crypto/caam/sg_sw_sec4.h | 2 +-
drivers/soc/fsl/Kconfig | 10 ++++++++
drivers/soc/fsl/Makefile | 1 +
.../{staging/fsl-mc/bus => soc/fsl}/dpio/Makefile | 0
.../fsl-mc/bus => soc/fsl}/dpio/dpio-cmd.h | 0
.../fsl-mc/bus => soc/fsl}/dpio/dpio-driver.c | 2 +-
.../fsl-mc/bus => soc/fsl}/dpio/dpio-service.c | 2 +-
.../{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.c | 0
.../{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.h | 0
.../fsl-mc/bus => soc/fsl}/dpio/qbman-portal.c | 2 +-
.../fsl-mc/bus => soc/fsl}/dpio/qbman-portal.h | 2 +-
drivers/staging/Kconfig | 2 --
drivers/staging/Makefile | 1 -
drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c | 4 +--
drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h | 22 +++++-----------
drivers/staging/fsl-mc/Kconfig | 2 --
drivers/staging/fsl-mc/Makefile | 3 ---
drivers/staging/fsl-mc/bus/Kconfig | 16 ------------
drivers/staging/fsl-mc/bus/Makefile | 9 -------
.../fsl-mc/include => include/soc/fsl}/dpaa2-fd.h | 12 +++++++++
.../include => include/soc/fsl}/dpaa2-global.h | 0
.../fsl-mc/include => include/soc/fsl}/dpaa2-io.h | 0
26 files changed, 67 insertions(+), 60 deletions(-)
rename drivers/staging/fsl-mc/bus/dpio/dpio-driver.txt => Documentation/networking/dpaa2/dpio-driver.rst (94%)
rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/Makefile (100%)
rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-cmd.h (100%)
rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-driver.c (99%)
rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio-service.c (99%)
rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.c (100%)
rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/dpio.h (100%)
rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/qbman-portal.c (99%)
rename drivers/{staging/fsl-mc/bus => soc/fsl}/dpio/qbman-portal.h (99%)
delete mode 100644 drivers/staging/fsl-mc/Kconfig
delete mode 100644 drivers/staging/fsl-mc/Makefile
delete mode 100644 drivers/staging/fsl-mc/bus/Kconfig
delete mode 100644 drivers/staging/fsl-mc/bus/Makefile
rename {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-fd.h (97%)
rename {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-global.h (100%)
rename {drivers/staging/fsl-mc/include => include/soc/fsl}/dpaa2-io.h (100%)
--
2.7.4
^ permalink raw reply
* [Intel-wired-lan] [RFC 00/13] Feature updates for ice
From: Shannon Nelson @ 2018-07-23 16:59 UTC (permalink / raw)
To: intel-wired-lan
In-Reply-To: <20180720205353.13296-1-anirudh.venkataramanan@intel.com>
On 7/20/2018 1:53 PM, Anirudh Venkataramanan wrote:
> This patch series includes new features and implementation updates
> for the ice driver.
Same comment - roll these into the initial patchset.
sln
>
> Akeem G Abodunrin (1):
> ice: Introduce SERVICE_DIS flag and service routine functions
>
> Anirudh Venkataramanan (5):
> ice: Minor updates to Tx scheduler code
> ice: Prevent control queue operations during reset
> ice: Refactor switch rule management structures and functions
> ice: Refactor VSI allocation, deletion and rebuild flow
> ice: Clean up register file
>
> Brett Creeley (1):
> ice: Make ice_vsi_kill_vlan return an error code
>
> Chinh Cao (1):
> ice: Implement handlers for ethtool PHY/link operations
>
> Hieu Tran (1):
> ice: Enable firmware logging during device initialization.
>
> Md Fahad Iqbal Polash (1):
> ice: Implement ice_bridge_getlink and ice_bridge_setlink
>
> Phani R Burra (1):
> ice: Get both device and function capabilities
>
> Sudheer Mogilappagari (1):
> ice: Add support for Tx hang, Tx timeout and malicious driver
> detection
>
> Zhenning Xiao (1):
> ice: Code optimization for ice_fill_sw_rule()
>
> drivers/net/ethernet/intel/ice/ice.h | 7 +
> drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 94 +-
> drivers/net/ethernet/intel/ice/ice_common.c | 361 +++++-
> drivers/net/ethernet/intel/ice/ice_common.h | 15 +-
> drivers/net/ethernet/intel/ice/ice_controlq.c | 3 +
> drivers/net/ethernet/intel/ice/ice_ethtool.c | 805 +++++++++++++-
> drivers/net/ethernet/intel/ice/ice_hw_autogen.h | 456 ++++----
> drivers/net/ethernet/intel/ice/ice_main.c | 967 +++++++++++++---
> drivers/net/ethernet/intel/ice/ice_sched.c | 117 +-
> drivers/net/ethernet/intel/ice/ice_status.h | 1 +
> drivers/net/ethernet/intel/ice/ice_switch.c | 1356 ++++++++++++++---------
> drivers/net/ethernet/intel/ice/ice_switch.h | 50 +-
> drivers/net/ethernet/intel/ice/ice_txrx.c | 1 +
> drivers/net/ethernet/intel/ice/ice_txrx.h | 1 +
> drivers/net/ethernet/intel/ice/ice_type.h | 42 +-
> 15 files changed, 3157 insertions(+), 1119 deletions(-)
>
^ permalink raw reply
* Re: [Qemu-devel] [PATCH v3 32/40] elf: Add nanoMIPS specific variations in ELF header fields
From: Richard Henderson @ 2018-07-23 16:59 UTC (permalink / raw)
To: Stefan Markovic, qemu-devel
Cc: laurent, riku.voipio, philippe.mathieu.daude, aurelien, amarkovic,
smarkovic, pjovanovic, pburton
In-Reply-To: <1532004912-13899-33-git-send-email-stefan.markovic@rt-rk.com>
On 07/19/2018 05:55 AM, Stefan Markovic wrote:
> From: Aleksandar Markovic <amarkovic@wavecomp.com>
>
> Add nanoMIPS-related values in ELF header fields as specified in
> nanoMIPS' "ELF ABI Supplement".
>
> Signed-off-by: Aleksandar Markovic <amarkovic@wavecomp.com>
> Signed-off-by: Stefan Markovic <smarkovic@wavecomp.com>
> ---
> include/elf.h | 20 ++++++++++++++++++++
> 1 file changed, 20 insertions(+)
None of these values have made it upstream to binutils yet,
so I can't double-check them. However,
Acked-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply
* WARNING in untrack_pfn
From: syzbot @ 2018-07-23 16:59 UTC (permalink / raw)
To: dan.j.williams, dave.jiang, haozhong.zhang, hpa, linux-kernel,
mingo, pbonzini, rkrcmar, syzkaller-bugs, tglx, x86
Hello,
syzbot found the following crash on:
HEAD commit: 89cf55353308 Add linux-next specific files for 20180720
git tree: linux-next
console output: https://syzkaller.appspot.com/x/log.txt?x=127e408c400000
kernel config: https://syzkaller.appspot.com/x/.config?x=a9641a83a066bb43
dashboard link: https://syzkaller.appspot.com/bug?extid=e1a4f80c370d2381e49f
compiler: gcc (GCC) 8.0.1 20180413 (experimental)
syzkaller repro:https://syzkaller.appspot.com/x/repro.syz?x=158f8f70400000
IMPORTANT: if you fix the bug, please add the following tag to the commit:
Reported-by: syzbot+e1a4f80c370d2381e49f@syzkaller.appspotmail.com
RBP: 000000000072bea0 R08: 0000000020000180 R09: 0000000000000000
R10: 0000000020000040 R11: 0000000000000246 R12: 0000000000000008
R13: 00000000004bb85d R14: 00000000004c8d28 R15: 0000000000000037
CPU: 0 PID: 4581 Comm: syz-executor7 Not tainted 4.18.0-rc5-next-20180720+
#12
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS
Google 01/01/2011
WARNING: CPU: 1 PID: 4578 at arch/x86/mm/pat.c:1039 untrack_pfn+0x2ac/0x310
arch/x86/mm/pat.c:1039
Call Trace:
Kernel panic - not syncing: panic_on_warn set ...
__dump_stack lib/dump_stack.c:77 [inline]
dump_stack+0x1c9/0x2b4 lib/dump_stack.c:113
fail_dump lib/fault-inject.c:51 [inline]
should_fail.cold.4+0xa/0x11 lib/fault-inject.c:149
__should_failslab+0x124/0x180 mm/failslab.c:32
should_failslab+0x9/0x14 mm/slab_common.c:1557
slab_pre_alloc_hook mm/slab.h:423 [inline]
slab_alloc mm/slab.c:3378 [inline]
kmem_cache_alloc+0x2af/0x760 mm/slab.c:3552
anon_vma_alloc mm/rmap.c:82 [inline]
anon_vma_fork+0x192/0x960 mm/rmap.c:341
dup_mmap kernel/fork.c:476 [inline]
dup_mm kernel/fork.c:1250 [inline]
copy_mm kernel/fork.c:1305 [inline]
copy_process.part.41+0x6705/0x73d0 kernel/fork.c:1819
copy_process kernel/fork.c:1628 [inline]
_do_fork+0x291/0x12a0 kernel/fork.c:2117
__do_sys_clone kernel/fork.c:2224 [inline]
__se_sys_clone kernel/fork.c:2218 [inline]
__x64_sys_clone+0xbf/0x150 kernel/fork.c:2218
do_syscall_64+0x1b9/0x820 arch/x86/entry/common.c:290
entry_SYSCALL_64_after_hwframe+0x49/0xbe
RIP: 0033:0x455ab9
Code: 1d ba fb ff c3 66 2e 0f 1f 84 00 00 00 00 00 66 90 48 89 f8 48 89 f7
48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff
ff 0f 83 eb b9 fb ff c3 66 2e 0f 1f 84 00 00 00 00
RSP: 002b:00007ffea9330498 EFLAGS: 00000246 ORIG_RAX: 0000000000000038
RAX: ffffffffffffffda RBX: 00000000011b5914 RCX: 0000000000455ab9
RDX: 00000000200000c0 RSI: 0000000020000080 RDI: 0000000000000000
RBP: 000000000072bea0 R08: 0000000020000180 R09: 0000000000000000
R10: 0000000020000040 R11: 0000000000000246 R12: 0000000000000008
R13: 00000000004bb85d R14: 00000000004c8d28 R15: 0000000000000037
CPU: 1 PID: 4578 Comm: syz-executor0 Not tainted 4.18.0-rc5-next-20180720+
#12
FAULT_INJECTION: forcing a failure.
name failslab, interval 1, probability 0, space 0, times 0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS
Google 01/01/2011
Call Trace:
__dump_stack lib/dump_stack.c:77 [inline]
dump_stack+0x1c9/0x2b4 lib/dump_stack.c:113
panic+0x238/0x4e7 kernel/panic.c:184
__warn.cold.8+0x163/0x1ba kernel/panic.c:536
report_bug+0x252/0x2d0 lib/bug.c:186
fixup_bug arch/x86/kernel/traps.c:178 [inline]
do_error_trap+0x1fc/0x4d0 arch/x86/kernel/traps.c:296
do_invalid_op+0x1b/0x20 arch/x86/kernel/traps.c:316
invalid_op+0x14/0x20 arch/x86/entry/entry_64.S:996
RIP: 0010:untrack_pfn+0x2ac/0x310 arch/x86/mm/pat.c:1039
Code: 5e 41 5f 5d c3 e8 14 50 45 00 4c 89 ee 4c 89 ff e8 59 e3 ff ff e8 04
50 45 00 4d 85 e4 0f 85 72 ff ff ff eb 9e e8 f4 4f 45 00 <0f> 0b eb 95 4c
89 e7 e8 88 1a 84 00 e9 92 fe ff ff 48 8b bd 28 ff
RSP: 0018:ffff8801b485ee00 EFLAGS: 00010293
RAX: ffff8801b2b10100 RBX: 1ffff1003690bdc2 RCX: ffffffff81375594
RDX: 0000000000000000 RSI: ffffffff813756cc RDI: 0000000000000005
RBP: ffff8801b485eed8 R08: ffff8801b2b10100 R09: 0000000000000000
R10: ffffed003655e021 R11: ffff8801b2af010b R12: ffff8801b2918460
R13: 00000000ffffffea R14: ffff8801b485eeb0 R15: 0000000000000000
unmap_single_vma+0x1c5/0x310 mm/memory.c:1538
unmap_vmas+0x120/0x1f0 mm/memory.c:1589
exit_mmap+0x2b5/0x5a0 mm/mmap.c:3113
__mmput kernel/fork.c:977 [inline]
mmput+0x265/0x620 kernel/fork.c:998
dup_mm kernel/fork.c:1265 [inline]
copy_mm kernel/fork.c:1305 [inline]
copy_process.part.41+0x2b1e/0x73d0 kernel/fork.c:1819
copy_process kernel/fork.c:1628 [inline]
_do_fork+0x291/0x12a0 kernel/fork.c:2117
__do_sys_clone kernel/fork.c:2224 [inline]
__se_sys_clone kernel/fork.c:2218 [inline]
__x64_sys_clone+0xbf/0x150 kernel/fork.c:2218
do_syscall_64+0x1b9/0x820 arch/x86/entry/common.c:290
entry_SYSCALL_64_after_hwframe+0x49/0xbe
RIP: 0033:0x455ab9
Code: 1d ba fb ff c3 66 2e 0f 1f 84 00 00 00 00 00 66 90 48 89 f8 48 89 f7
48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff
ff 0f 83 eb b9 fb ff c3 66 2e 0f 1f 84 00 00 00 00
RSP: 002b:00007ffdd193e648 EFLAGS: 00000246 ORIG_RAX: 0000000000000038
RAX: ffffffffffffffda RBX: 0000000000b34914 RCX: 0000000000455ab9
RDX: 00000000200000c0 RSI: 0000000020000080 RDI: 0000000000000000
RBP: 000000000072bea0 R08: 0000000020000180 R09: 0000000000000000
R10: 0000000020000040 R11: 0000000000000246 R12: 0000000000000008
R13: 00000000004bb85d R14: 00000000004c8d28 R15: 0000000000000037
CPU: 0 PID: 4576 Comm: syz-executor1 Not tainted 4.18.0-rc5-next-20180720+
#12
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS
Google 01/01/2011
Call Trace:
__dump_stack lib/dump_stack.c:77 [inline]
dump_stack+0x1c9/0x2b4 lib/dump_stack.c:113
fail_dump lib/fault-inject.c:51 [inline]
should_fail.cold.4+0xa/0x11 lib/fault-inject.c:149
__should_failslab+0x124/0x180 mm/failslab.c:32
should_failslab+0x9/0x14 mm/slab_common.c:1557
slab_pre_alloc_hook mm/slab.h:423 [inline]
slab_alloc mm/slab.c:3378 [inline]
kmem_cache_alloc+0x47/0x760 mm/slab.c:3552
anon_vma_chain_alloc mm/rmap.c:129 [inline]
anon_vma_clone+0x140/0x740 mm/rmap.c:269
anon_vma_fork+0xf0/0x960 mm/rmap.c:332
dup_mmap kernel/fork.c:476 [inline]
dup_mm kernel/fork.c:1250 [inline]
copy_mm kernel/fork.c:1305 [inline]
copy_process.part.41+0x6705/0x73d0 kernel/fork.c:1819
copy_process kernel/fork.c:1628 [inline]
_do_fork+0x291/0x12a0 kernel/fork.c:2117
__do_sys_clone kernel/fork.c:2224 [inline]
__se_sys_clone kernel/fork.c:2218 [inline]
__x64_sys_clone+0xbf/0x150 kernel/fork.c:2218
do_syscall_64+0x1b9/0x820 arch/x86/entry/common.c:290
entry_SYSCALL_64_after_hwframe+0x49/0xbe
RIP: 0033:0x455ab9
Code: 1d ba fb ff c3 66 2e 0f 1f 84 00 00 00 00 00 66 90 48 89 f8 48 89 f7
48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff
ff 0f 83 eb b9 fb ff c3 66 2e 0f 1f 84 00 00 00 00
RSP: 002b:00007fff66d3e588 EFLAGS: 00000246 ORIG_RAX: 0000000000000038
RAX: ffffffffffffffda RBX: 0000000000cfa914 RCX: 0000000000455ab9
RDX: 00000000200000c0 RSI: 0000000020000080 RDI: 0000000000000000
RBP: 000000000072bea0 R08: 0000000020000180 R09: 0000000000000000
R10: 0000000020000040 R11: 0000000000000246 R12: 0000000000000008
R13: 00000000004bb85d R14: 00000000004c8d28 R15: 0000000000000037
Dumping ftrace buffer:
(ftrace buffer empty)
Kernel Offset: disabled
Rebooting in 86400 seconds..
---
This bug is generated by a bot. It may contain errors.
See https://goo.gl/tpsmEJ for more information about syzbot.
syzbot engineers can be reached at syzkaller@googlegroups.com.
syzbot will keep track of this bug report. See:
https://goo.gl/tpsmEJ#bug-status-tracking for how to communicate with
syzbot.
syzbot can test patches for this bug, for details see:
https://goo.gl/tpsmEJ#testing-patches
^ permalink raw reply
* Re: [PATCH] ARM: dts: r8a77470: Add PFC support
From: Simon Horman @ 2018-07-23 15:56 UTC (permalink / raw)
To: Biju Das
Cc: Rob Herring, Mark Rutland, Magnus Damm, Chris Paterson,
Fabrizio Castro, devicetree, linux-renesas-soc
In-Reply-To: <1532092186-3313-1-git-send-email-biju.das@bp.renesas.com>
On Fri, Jul 20, 2018 at 02:09:46PM +0100, Biju Das wrote:
> Define the generic R8A77470 part of the PFC device node.
>
> Signed-off-by: Biju Das <biju.das@bp.renesas.com>
> Reviewed-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
> ---
> Commit 73dacc3403436fc2 ("pinctrl: sh-pfc: Add r8a77470 PFC support")
> is in Linus' tree
> ---
> arch/arm/boot/dts/r8a77470.dtsi | 5 +++++
> 1 file changed, 5 insertions(+)
Thanks,
This looks fine to me but I will wait to see if there are other reviews
before applying.
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
^ permalink raw reply
* [PATCH 1/2] automation: add debian unstable images
From: Wei Liu @ 2018-07-23 16:57 UTC (permalink / raw)
To: Xen-devel; +Cc: Wei Liu, Doug Goldstein
In-Reply-To: <20180723165735.911-1-wei.liu2@citrix.com>
This will get us the latest toolchain available in Debian.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
automation/build/debian/unstable-i386.dockerfile | 50 ++++++++++++++++++++++++
automation/build/debian/unstable.dockerfile | 48 +++++++++++++++++++++++
2 files changed, 98 insertions(+)
create mode 100644 automation/build/debian/unstable-i386.dockerfile
create mode 100644 automation/build/debian/unstable.dockerfile
diff --git a/automation/build/debian/unstable-i386.dockerfile b/automation/build/debian/unstable-i386.dockerfile
new file mode 100644
index 0000000000..ffb9f11daa
--- /dev/null
+++ b/automation/build/debian/unstable-i386.dockerfile
@@ -0,0 +1,50 @@
+FROM i386/debian:unstable
+LABEL maintainer.name="The Xen Project" \
+ maintainer.email="xen-devel@lists.xenproject.org"
+
+ENV DEBIAN_FRONTEND=noninteractive
+ENV USER root
+
+RUN mkdir /build
+WORKDIR /build
+
+ENTRYPOINT ["linux32"]
+
+# build depends
+RUN apt-get update && \
+ apt-get --quiet --yes install \
+ build-essential \
+ zlib1g-dev \
+ libncurses5-dev \
+ libssl-dev \
+ python2.7-dev \
+ xorg-dev \
+ uuid-dev \
+ libyajl-dev \
+ libaio-dev \
+ libglib2.0-dev \
+ clang \
+ libpixman-1-dev \
+ pkg-config \
+ flex \
+ bison \
+ gettext \
+ acpica-tools \
+ bin86 \
+ bcc \
+ liblzma-dev \
+ libc6-dev \
+ libnl-3-dev \
+ ocaml-nox \
+ libfindlib-ocaml-dev \
+ markdown \
+ transfig \
+ pandoc \
+ checkpolicy \
+ wget \
+ git \
+ nasm \
+ && \
+ apt-get autoremove -y && \
+ apt-get clean && \
+ rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/*
diff --git a/automation/build/debian/unstable.dockerfile b/automation/build/debian/unstable.dockerfile
new file mode 100644
index 0000000000..0ba0c056d8
--- /dev/null
+++ b/automation/build/debian/unstable.dockerfile
@@ -0,0 +1,48 @@
+FROM debian:unstable
+LABEL maintainer.name="The Xen Project" \
+ maintainer.email="xen-devel@lists.xenproject.org"
+
+ENV DEBIAN_FRONTEND=noninteractive
+ENV USER root
+
+RUN mkdir /build
+WORKDIR /build
+
+# build depends
+RUN apt-get update && \
+ apt-get --quiet --yes install \
+ build-essential \
+ zlib1g-dev \
+ libncurses5-dev \
+ libssl-dev \
+ python2.7-dev \
+ xorg-dev \
+ uuid-dev \
+ libyajl-dev \
+ libaio-dev \
+ libglib2.0-dev \
+ clang \
+ libpixman-1-dev \
+ pkg-config \
+ flex \
+ bison \
+ gettext \
+ acpica-tools \
+ bin86 \
+ bcc \
+ liblzma-dev \
+ libc6-dev-i386 \
+ libnl-3-dev \
+ ocaml-nox \
+ libfindlib-ocaml-dev \
+ markdown \
+ transfig \
+ pandoc \
+ checkpolicy \
+ wget \
+ git \
+ nasm \
+ && \
+ apt-get autoremove -y && \
+ apt-get clean && \
+ rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/*
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related
* [PATCH 2/2] automation: build with debian unstable
From: Wei Liu @ 2018-07-23 16:57 UTC (permalink / raw)
To: Xen-devel; +Cc: Wei Liu, Doug Goldstein
In-Reply-To: <20180723165735.911-1-wei.liu2@citrix.com>
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
.gitlab-ci.yml | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 64 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 682e48ef51..8aae194136 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -103,6 +103,70 @@ debian-stretch-gcc-debug:
debug: y
XEN_TARGET_ARCH: x86_64
+debian-unstable-clang:
+ <<: *build
+ variables:
+ <<: *clang
+ CONTAINER: debian:unstable
+ debug: n
+ XEN_TARGET_ARCH: x86_64
+
+debian-unstable-clang-debug:
+ <<: *build
+ variables:
+ <<: *clang
+ CONTAINER: debian:unstable
+ debug: y
+ XEN_TARGET_ARCH: x86_64
+
+debian-unstable-gcc:
+ <<: *build
+ variables:
+ <<: *gcc
+ CONTAINER: debian:unstable
+ debug: n
+ XEN_TARGET_ARCH: x86_64
+
+debian-unstable-gcc-debug:
+ <<: *build
+ variables:
+ <<: *gcc
+ CONTAINER: debian:unstable
+ debug: y
+ XEN_TARGET_ARCH: x86_64
+
+debian-unstable-32-clang:
+ <<: *build
+ variables:
+ <<: *clang
+ CONTAINER: debian:unstable-i386
+ debug: n
+ XEN_TARGET_ARCH: x86_32
+
+debian-unstable-32-clang-debug:
+ <<: *build
+ variables:
+ <<: *clang
+ CONTAINER: debian:unstable-i386
+ debug: y
+ XEN_TARGET_ARCH: x86_32
+
+debian-unstable-32-gcc:
+ <<: *build
+ variables:
+ <<: *gcc
+ CONTAINER: debian:unstable-i386
+ debug: n
+ XEN_TARGET_ARCH: x86_32
+
+debian-unstable-32-gcc-debug:
+ <<: *build
+ variables:
+ <<: *gcc
+ CONTAINER: debian:unstable-i386
+ debug: y
+ XEN_TARGET_ARCH: x86_32
+
# Ubuntu Trusty's Clang is 3.4 while Xen requires 3.5
ubuntu-trusty-gcc:
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related
* [PATCH 0/2] automation: build test with debian unstable
From: Wei Liu @ 2018-07-23 16:57 UTC (permalink / raw)
To: Xen-devel; +Cc: Wei Liu, Doug Goldstein
Using unstable gets us the latest toolchain available in Debian.
See: https://gitlab.com/liuw/xen/pipelines/26330873
Wei Liu (2):
automation: add debian unstable images
automation: build with debian unstable
.gitlab-ci.yml | 64 ++++++++++++++++++++++++
automation/build/debian/unstable-i386.dockerfile | 50 ++++++++++++++++++
automation/build/debian/unstable.dockerfile | 48 ++++++++++++++++++
3 files changed, 162 insertions(+)
create mode 100644 automation/build/debian/unstable-i386.dockerfile
create mode 100644 automation/build/debian/unstable.dockerfile
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply
* Re: [PATCH v2 2/4] iio: vcnl4000: add VCNL4010 device id
From: Tomas Novotny @ 2018-07-23 16:57 UTC (permalink / raw)
To: Jonathan Cameron
Cc: linux-iio, Hartmut Knaack, Lars-Peter Clausen,
Peter Meerwald-Stadler
In-Reply-To: <20180721180537.0c33fc19@archlinux>
Hi Jonathan,
On Sat, 21 Jul 2018 18:05:37 +0100
Jonathan Cameron <jic23@kernel.org> wrote:
> On Tue, 17 Jul 2018 18:46:53 +0200
> Tomas Novotny <tomas@novotny.cz> wrote:
>
> > The driver already supports VCNL4010/20 devices. The supported features
> > and detectable product id are the same, so add shared id for them.
> >
> > Signed-off-by: Tomas Novotny <tomas@novotny.cz>
>
> I'm not totally getting why we need this... See below.
>
> > ---
> > drivers/iio/light/vcnl4000.c | 8 ++++++++
> > 1 file changed, 8 insertions(+)
> >
> > diff --git a/drivers/iio/light/vcnl4000.c b/drivers/iio/light/vcnl4000.c
> > index 32c0b531395f..0688214fc152 100644
> > --- a/drivers/iio/light/vcnl4000.c
> > +++ b/drivers/iio/light/vcnl4000.c
> > @@ -48,6 +48,7 @@
> >
> > enum vcnl4000_device_ids {
> > VCNL4000,
> > + VCNL4010,
> > };
> >
> > struct vcnl4000_data {
> > @@ -68,6 +69,7 @@ struct vcnl4000_chip_spec {
> >
> > static const struct i2c_device_id vcnl4000_id[] = {
> > { "vcnl4000", VCNL4000 },
> > + { "vcnl4010", VCNL4010 },
> { "vcnl4010", VCLN4000 }, then rest of the patch has no purpose
>
> Also, should list the vcnl4020 id with the same enum entry to
> explicitly support that one.
ok, I will add it.
> It would have made sense if we had split the ID checking to
> verify we had the one we thought we had... Not sure it really
> matters if they are identical in all visible ways, but at least
> it would have pointed out you didn't have what you thought you had.
As you pointed out in the next patch, I should explain the reason of this
patch here. I will do it in v3.
Thanks,
Tomas
> Jonathan
>
>
> > { }
> > };
> > MODULE_DEVICE_TABLE(i2c, vcnl4000_id);
> > @@ -157,6 +159,12 @@ static const struct vcnl4000_chip_spec vcnl4000_chip_spec_cfg[] = {
> > .measure_light = vcnl4000_measure_light,
> > .measure_proximity = vcnl4000_measure_proximity,
> > },
> > + [VCNL4010] = {
> > + .prod = "VCNL4010/4020",
> > + .init = vcnl4000_init,
> > + .measure_light = vcnl4000_measure_light,
> > + .measure_proximity = vcnl4000_measure_proximity,
> > + },
> > };
> >
> > static const struct iio_chan_spec vcnl4000_channels[] = {
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply
* [Intel-wired-lan] [RFC 08/13] ice: Don't explicitly set port_vlan_bits to 0
From: Shannon Nelson @ 2018-07-23 16:57 UTC (permalink / raw)
To: intel-wired-lan
In-Reply-To: <20180720195446.4346-9-anirudh.venkataramanan@intel.com>
On 7/20/2018 12:54 PM, Anirudh Venkataramanan wrote:
> From: Brett Creeley <brett.creeley@intel.com>
>
> This patch fixes the following smatch warning originally reported by
> Dan Carpenter:
> ice_set_dflt_vsi_ctx() warn: odd binop '0x0 & 0x18'
>
> In ice_set_dflt_vsi_ctx() we are currently doing logic that is intended
> to explicitly clear bits 3 and 4 for port_vlan_flags. Clearing these
> bits results in legacy behavior (showing VLAN, DEI, and UP) in the
> descriptors. The issue was this was reporting the Smatch error shown
> below. To fix this remove this logic because the port_vlan_flags field
There is no "smatch warning shown below"
> is set to 0 initially by memset so by default we have the correct legacy
> behavior for bits 3 and 4. A comment was added above where we set
> port_vlan_flags in ice_set_dflt_vsi_ctx() to note that this is the
> desired behavior.
>
> Signed-off-by: Brett Creeley <brett.creeley@intel.com>
> [Anirudh Venkataramanan <anirudh.venkataramanan@intel.com> cleaned up commit message]
This would be a better comment after the "---". Check you other patches
as well for this.
> Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>
> ---
> drivers/net/ethernet/intel/ice/ice_main.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
> index feeca75912ec..586c6e615a98 100644
> --- a/drivers/net/ethernet/intel/ice/ice_main.c
> +++ b/drivers/net/ethernet/intel/ice/ice_main.c
> @@ -1367,14 +1367,13 @@ static void ice_set_dflt_vsi_ctx(struct ice_vsi_ctx *ctxt)
> ctxt->info.sw_flags = ICE_AQ_VSI_SW_FLAG_SRC_PRUNE;
> /* Traffic from VSI can be sent to LAN */
> ctxt->info.sw_flags2 = ICE_AQ_VSI_SW_FLAG_LAN_ENA;
> - /* Allow all packets untagged/tagged */
> + /* By default bits 3 and 4 in port_vlan_flags are 0's which results in
> + * legacy behavior (show VLAN, DEI, and UP) in descriptor. Also, allow
> + * all packets untagged/tagged.
> + */
> ctxt->info.port_vlan_flags = ((ICE_AQ_VSI_PVLAN_MODE_ALL &
> ICE_AQ_VSI_PVLAN_MODE_M) >>
> ICE_AQ_VSI_PVLAN_MODE_S);
> - /* Show VLAN/UP from packets in Rx descriptors */
> - ctxt->info.port_vlan_flags |= ((ICE_AQ_VSI_PVLAN_EMOD_STR_BOTH &
> - ICE_AQ_VSI_PVLAN_EMOD_M) >>
> - ICE_AQ_VSI_PVLAN_EMOD_S);
> /* Have 1:1 UP mapping for both ingress/egress tables */
> table |= ICE_UP_TABLE_TRANSLATE(0, 0);
> table |= ICE_UP_TABLE_TRANSLATE(1, 1);
>
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.