* [GIT PULL] ARM: mvebu: drivers for v4.9 (#1)
From: Gregory CLEMENT @ 2016-09-21 10:18 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
Here is the second tentative of first pull request for drivers for
mvebu for v4.9.
This time both patches received their Acked-by.
Gregory
The following changes since commit 29b4817d4018df78086157ea3a55c1d9424a7cfc:
Linux 4.8-rc1 (2016-08-07 18:18:00 -0700)
are available in the git repository at:
git://git.infradead.org/linux-mvebu.git tags/mvebu-drivers-4.9-1
for you to fetch changes up to c336dc7dac0747f6a4901bcd5a497e1b3fb265d7:
pinctrl: mvebu: orion5x: Generalise mv88f5181l support for 88f5181 (2016-09-21 11:49:18 +0200)
----------------------------------------------------------------
mvebu drivers for 4.9 (part 1)
- Add pinctrl and clk support for the Orion5x SoC mv88f5181 variant
----------------------------------------------------------------
Jamie Lentin (2):
clk: mvebu: Add clk support for the orion5x SoC mv88f5181
pinctrl: mvebu: orion5x: Generalise mv88f5181l support for 88f5181
.../devicetree/bindings/clock/mvebu-core-clock.txt | 1 +
.../bindings/pinctrl/marvell,orion-pinctrl.txt | 4 +-
drivers/clk/mvebu/orion.c | 70 ++++++++++++++++++++++
drivers/pinctrl/mvebu/pinctrl-orion.c | 23 +++----
4 files changed, 86 insertions(+), 12 deletions(-)
^ permalink raw reply
* [GIT PULL] ARM: mvebu: soc for v4.9 (#1)
From: Gregory CLEMENT @ 2016-09-21 10:19 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
Here is the second tentative of first pull request for soc for mvebu
for v4.9.
The PCI related patch have been discarded.
Gregory
The following changes since commit 29b4817d4018df78086157ea3a55c1d9424a7cfc:
Linux 4.8-rc1 (2016-08-07 18:18:00 -0700)
are available in the git repository at:
git://git.infradead.org/linux-mvebu.git tags/mvebu-soc-4.9-1
for you to fetch changes up to 77a1c68a96f4e018860033f3827602014a4f1663:
ARM: orion5x: remove extraneous NO_IRQ (2016-09-14 16:36:20 +0200)
----------------------------------------------------------------
mvebu soc for 4.9 (part 1)
- irq cleanup for old mvebu SoC
----------------------------------------------------------------
Arnd Bergmann (4):
ARM: mv78xx0: simplify ethernet device creation
ARM: mvebu/orion: remove NO_IRQ check from device init
ARM: orion: simplify orion_ge00_switch_init
ARM: orion5x: remove extraneous NO_IRQ
arch/arm/mach-mv78xx0/common.c | 9 +--
arch/arm/mach-orion5x/common.c | 4 +-
arch/arm/mach-orion5x/common.h | 2 +-
arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 4 +-
arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 5 +-
arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 6 +-
arch/arm/mach-orion5x/wnr854t-setup.c | 4 +-
arch/arm/mach-orion5x/wrt350n-v2-setup.c | 4 +-
arch/arm/plat-orion/common.c | 85 +++++++++++-----------------
arch/arm/plat-orion/include/plat/common.h | 10 +---
10 files changed, 51 insertions(+), 82 deletions(-)
^ permalink raw reply
* [PATCH] KVM: arm/arm64: timer: Fix hw sync for user space irqchip path
From: Christoffer Dall @ 2016-09-21 10:23 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <57E171AF.1080903@arm.com>
On Tue, Sep 20, 2016 at 06:28:15PM +0100, Marc Zyngier wrote:
> Alex,
>
> On 16/09/16 06:16, Alexander Graf wrote:
> > While adding the new vgic implementation, apparently nobody tested
> > the non-vgic path where user space controls the vgic, so two functions
> > slipped through the cracks that get called in generic code but don't
> > check whether hardware support is enabled.
> >
> > This patch guards them with proper checks to ensure we only try to
> > use vgic data structures if they are available. Without this, I get
> > a stack trace:
> >
> > [ 74.363037] Unable to handle kernel paging request at virtual address ffffffffffffffe8
> > [...]
> > [ 74.929654] [<ffff000008824bcc>] _raw_spin_lock+0x1c/0x58
> > [ 74.935133] [<ffff0000080b7f20>] kvm_vgic_flush_hwstate+0x88/0x288
> > [ 74.941406] [<ffff0000080ab0b4>] kvm_arch_vcpu_ioctl_run+0xfc/0x630
> > [ 74.947766] [<ffff0000080a15bc>] kvm_vcpu_ioctl+0x2f4/0x710
> > [ 74.953420] [<ffff0000082788a8>] do_vfs_ioctl+0xb0/0x728
> > [ 74.958807] [<ffff000008278fb4>] SyS_ioctl+0x94/0xa8
> > [ 74.963844] [<ffff000008083744>] el0_svc_naked+0x38/0x3c
> >
> > Fixes: 0919e84c0
> > Cc: stable at vger.kernel.org
> > Signed-off-by: Alexander Graf <agraf@suse.de>
> > ---
> > virt/kvm/arm/vgic/vgic.c | 6 ++++++
> > 1 file changed, 6 insertions(+)
> >
> > diff --git a/virt/kvm/arm/vgic/vgic.c b/virt/kvm/arm/vgic/vgic.c
> > index e83b7fe..9f312ba 100644
> > --- a/virt/kvm/arm/vgic/vgic.c
> > +++ b/virt/kvm/arm/vgic/vgic.c
> > @@ -645,6 +645,9 @@ next:
> > /* Sync back the hardware VGIC state into our emulation after a guest's run. */
> > void kvm_vgic_sync_hwstate(struct kvm_vcpu *vcpu)
> > {
> > + if (!vcpu->kvm->arch.vgic.enabled)
> > + return;
> > +
> > vgic_process_maintenance_interrupt(vcpu);
> > vgic_fold_lr_state(vcpu);
> > vgic_prune_ap_list(vcpu);
> > @@ -653,6 +656,9 @@ void kvm_vgic_sync_hwstate(struct kvm_vcpu *vcpu)
> > /* Flush our emulation state into the GIC hardware before entering the guest. */
> > void kvm_vgic_flush_hwstate(struct kvm_vcpu *vcpu)
> > {
> > + if (!vcpu->kvm->arch.vgic.enabled)
> > + return;
> > +
this is not correct, because it checks if the distributor is enabled,
not if the vgic as a thing in KVM is enabled. (The distributor can be
disabled, but a VCPU should still be able to EOI an active interrupt,
for example).
So this check should be
if (!vgic_initialized(vcpu->kvm))
return;
> > spin_lock(&vcpu->arch.vgic_cpu.ap_list_lock);
> > vgic_flush_lr_state(vcpu);
> > spin_unlock(&vcpu->arch.vgic_cpu.ap_list_lock);
> >
>
> I hate that fix, because it papers over the fact that we have uninitialized
> structures all over the shop, and that's not exactly great.
I'm not completely convinced about this, because we have
vgic_initialized() checks in the arch timer code as well, and I can't
easily figure out if initializing all data structures etc. to a shim
would work for all vgic interactions.
Basically, I think we have a choice between
(1) locate *all* entry points to the gic code, and make sure they're
guarded with vgic_initialized(), or
(2) do something like you suggest and still go through all interactions
between the vgic and the rest of the system and ensure that whatever
shim/empty data structures we've allocated, actually end up doing the
right thing.
My gut feeling is to lean towards (1), but I don't feel overly strongly
about that.
FWIW: A few comments on the patch below:
>
> How about the following instead:
>
> diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
> index c94b90d..0961128 100644
> --- a/arch/arm/kvm/arm.c
> +++ b/arch/arm/kvm/arm.c
> @@ -472,6 +472,9 @@ static int kvm_vcpu_first_run_init(struct kvm_vcpu *vcpu)
> return ret;
> }
>
> + if (unlikely(!irqchip_in_kernel(kvm)))
> + kvm_no_vgic_init(kvm);
> +
> /*
> * Enable the arch timers only if we have an in-kernel VGIC
> * and it has been properly initialized, since we cannot handle
> diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h
> index bb46c03..1b70b1e 100644
> --- a/include/kvm/arm_vgic.h
> +++ b/include/kvm/arm_vgic.h
> @@ -327,4 +327,6 @@ int kvm_send_userspace_msi(struct kvm *kvm, struct kvm_msi *msi);
> */
> int kvm_vgic_setup_default_irq_routing(struct kvm *kvm);
>
> +void kvm_no_vgic_init(struct kvm *kvm);
> +
> #endif /* __KVM_ARM_VGIC_H */
> diff --git a/virt/kvm/arm/vgic/vgic-init.c b/virt/kvm/arm/vgic/vgic-init.c
> index 83777c1..7b8f12b 100644
> --- a/virt/kvm/arm/vgic/vgic-init.c
> +++ b/virt/kvm/arm/vgic/vgic-init.c
> @@ -151,9 +151,11 @@ static int kvm_vgic_dist_init(struct kvm *kvm, unsigned int nr_spis)
> INIT_LIST_HEAD(&dist->lpi_list_head);
> spin_lock_init(&dist->lpi_list_lock);
>
> - dist->spis = kcalloc(nr_spis, sizeof(struct vgic_irq), GFP_KERNEL);
> - if (!dist->spis)
> - return -ENOMEM;
> + if (nr_spis) {
> + dist->spis = kcalloc(nr_spis, sizeof(struct vgic_irq), GFP_KERNEL);
> + if (!dist->spis)
> + return -ENOMEM;
> + }
Don't we still end up with dist->spis pointing to nothing if there
hasn't been an init and nr_spis == 0 ?
Perhaps that's not a problem, but I don't easily understand which parts
of the vgic structure we must initialize and which we don't.
>
> /*
> * In the following code we do not take the irq struct lock since
> @@ -325,6 +327,21 @@ int vgic_lazy_init(struct kvm *kvm)
> return ret;
> }
>
> +void kvm_no_vgic_init(struct kvm *kvm)
> +{
> + mutex_lock(&kvm->lock);
> + if (unlikely(!vgic_initialized(kvm))) {
> + struct kvm_vcpu *vcpu;
> + int i;
> +
> + kvm_vgic_dist_init(kvm, 0);
I think you need to check the return value here, unless the rationale is
that when passing 0 as the second argument, it cannot fail. That's a
pretty brittle construct though, IMHO.
> + kvm_for_each_vcpu(i, vcpu, kvm)
> + kvm_vgic_vcpu_init(vcpu);
> + kvm->arch.vgic.initialized = true;
> + }
> + mutex_unlock(&kvm->lock);
> +}
> +
> /* RESOURCE MAPPING */
>
> /**
>
Thanks,
-Christoffer
^ permalink raw reply
* [PATCH v8 1/4] soc: mediatek: Refine scpsys to support multiple platform
From: Matthias Brugger @ 2016-09-21 10:25 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1468911883-41882-2-git-send-email-jamesjj.liao@mediatek.com>
On 19/07/16 09:04, James Liao wrote:
> Refine scpsys driver common code to support multiple SoC / platform.
>
> Signed-off-by: James Liao <jamesjj.liao@mediatek.com>
> Reviewed-by: Kevin Hilman <khilman@baylibre.com>
> ---
> drivers/soc/mediatek/mtk-scpsys.c | 363 +++++++++++++++++++++++---------------
> 1 file changed, 220 insertions(+), 143 deletions(-)
>
> diff --git a/drivers/soc/mediatek/mtk-scpsys.c b/drivers/soc/mediatek/mtk-scpsys.c
> index 837effe..1f3555a 100644
> --- a/drivers/soc/mediatek/mtk-scpsys.c
> +++ b/drivers/soc/mediatek/mtk-scpsys.c
> @@ -11,17 +11,15 @@
> * GNU General Public License for more details.
> */
> #include <linux/clk.h>
> -#include <linux/delay.h>
> +#include <linux/init.h>
> #include <linux/io.h>
> -#include <linux/kernel.h>
> #include <linux/mfd/syscon.h>
> -#include <linux/init.h>
> #include <linux/of_device.h>
> #include <linux/platform_device.h>
> #include <linux/pm_domain.h>
> -#include <linux/regmap.h>
> -#include <linux/soc/mediatek/infracfg.h>
> #include <linux/regulator/consumer.h>
> +#include <linux/soc/mediatek/infracfg.h>
> +
> #include <dt-bindings/power/mt8173-power.h>
>
> #define SPM_VDE_PWR_CON 0x0210
> @@ -34,6 +32,7 @@
> #define SPM_MFG_2D_PWR_CON 0x02c0
> #define SPM_MFG_ASYNC_PWR_CON 0x02c4
> #define SPM_USB_PWR_CON 0x02cc
> +
> #define SPM_PWR_STATUS 0x060c
> #define SPM_PWR_STATUS_2ND 0x0610
>
> @@ -55,12 +54,12 @@
> #define PWR_STATUS_USB BIT(25)
>
> enum clk_id {
> - MT8173_CLK_NONE,
> - MT8173_CLK_MM,
> - MT8173_CLK_MFG,
> - MT8173_CLK_VENC,
> - MT8173_CLK_VENC_LT,
> - MT8173_CLK_MAX,
> + CLK_NONE,
> + CLK_MM,
> + CLK_MFG,
> + CLK_VENC,
> + CLK_VENC_LT,
> + CLK_MAX,
> };
>
> #define MAX_CLKS 2
> @@ -76,98 +75,6 @@ struct scp_domain_data {
> bool active_wakeup;
> };
>
> -static const struct scp_domain_data scp_domain_data[] = {
> - [MT8173_POWER_DOMAIN_VDEC] = {
> - .name = "vdec",
> - .sta_mask = PWR_STATUS_VDEC,
> - .ctl_offs = SPM_VDE_PWR_CON,
> - .sram_pdn_bits = GENMASK(11, 8),
> - .sram_pdn_ack_bits = GENMASK(12, 12),
> - .clk_id = {MT8173_CLK_MM},
> - },
> - [MT8173_POWER_DOMAIN_VENC] = {
> - .name = "venc",
> - .sta_mask = PWR_STATUS_VENC,
> - .ctl_offs = SPM_VEN_PWR_CON,
> - .sram_pdn_bits = GENMASK(11, 8),
> - .sram_pdn_ack_bits = GENMASK(15, 12),
> - .clk_id = {MT8173_CLK_MM, MT8173_CLK_VENC},
> - },
> - [MT8173_POWER_DOMAIN_ISP] = {
> - .name = "isp",
> - .sta_mask = PWR_STATUS_ISP,
> - .ctl_offs = SPM_ISP_PWR_CON,
> - .sram_pdn_bits = GENMASK(11, 8),
> - .sram_pdn_ack_bits = GENMASK(13, 12),
> - .clk_id = {MT8173_CLK_MM},
> - },
> - [MT8173_POWER_DOMAIN_MM] = {
> - .name = "mm",
> - .sta_mask = PWR_STATUS_DISP,
> - .ctl_offs = SPM_DIS_PWR_CON,
> - .sram_pdn_bits = GENMASK(11, 8),
> - .sram_pdn_ack_bits = GENMASK(12, 12),
> - .clk_id = {MT8173_CLK_MM},
> - .bus_prot_mask = MT8173_TOP_AXI_PROT_EN_MM_M0 |
> - MT8173_TOP_AXI_PROT_EN_MM_M1,
> - },
> - [MT8173_POWER_DOMAIN_VENC_LT] = {
> - .name = "venc_lt",
> - .sta_mask = PWR_STATUS_VENC_LT,
> - .ctl_offs = SPM_VEN2_PWR_CON,
> - .sram_pdn_bits = GENMASK(11, 8),
> - .sram_pdn_ack_bits = GENMASK(15, 12),
> - .clk_id = {MT8173_CLK_MM, MT8173_CLK_VENC_LT},
> - },
> - [MT8173_POWER_DOMAIN_AUDIO] = {
> - .name = "audio",
> - .sta_mask = PWR_STATUS_AUDIO,
> - .ctl_offs = SPM_AUDIO_PWR_CON,
> - .sram_pdn_bits = GENMASK(11, 8),
> - .sram_pdn_ack_bits = GENMASK(15, 12),
> - .clk_id = {MT8173_CLK_NONE},
> - },
> - [MT8173_POWER_DOMAIN_USB] = {
> - .name = "usb",
> - .sta_mask = PWR_STATUS_USB,
> - .ctl_offs = SPM_USB_PWR_CON,
> - .sram_pdn_bits = GENMASK(11, 8),
> - .sram_pdn_ack_bits = GENMASK(15, 12),
> - .clk_id = {MT8173_CLK_NONE},
> - .active_wakeup = true,
> - },
> - [MT8173_POWER_DOMAIN_MFG_ASYNC] = {
> - .name = "mfg_async",
> - .sta_mask = PWR_STATUS_MFG_ASYNC,
> - .ctl_offs = SPM_MFG_ASYNC_PWR_CON,
> - .sram_pdn_bits = GENMASK(11, 8),
> - .sram_pdn_ack_bits = 0,
> - .clk_id = {MT8173_CLK_MFG},
> - },
> - [MT8173_POWER_DOMAIN_MFG_2D] = {
> - .name = "mfg_2d",
> - .sta_mask = PWR_STATUS_MFG_2D,
> - .ctl_offs = SPM_MFG_2D_PWR_CON,
> - .sram_pdn_bits = GENMASK(11, 8),
> - .sram_pdn_ack_bits = GENMASK(13, 12),
> - .clk_id = {MT8173_CLK_NONE},
> - },
> - [MT8173_POWER_DOMAIN_MFG] = {
> - .name = "mfg",
> - .sta_mask = PWR_STATUS_MFG,
> - .ctl_offs = SPM_MFG_PWR_CON,
> - .sram_pdn_bits = GENMASK(13, 8),
> - .sram_pdn_ack_bits = GENMASK(21, 16),
> - .clk_id = {MT8173_CLK_NONE},
> - .bus_prot_mask = MT8173_TOP_AXI_PROT_EN_MFG_S |
> - MT8173_TOP_AXI_PROT_EN_MFG_M0 |
> - MT8173_TOP_AXI_PROT_EN_MFG_M1 |
> - MT8173_TOP_AXI_PROT_EN_MFG_SNOOP_OUT,
> - },
> -};
> -
> -#define NUM_DOMAINS ARRAY_SIZE(scp_domain_data)
> -
> struct scp;
>
> struct scp_domain {
> @@ -179,7 +86,7 @@ struct scp_domain {
> };
>
> struct scp {
> - struct scp_domain domains[NUM_DOMAINS];
> + struct scp_domain *domains;
> struct genpd_onecell_data pd_data;
> struct device *dev;
> void __iomem *base;
> @@ -408,57 +315,69 @@ static bool scpsys_active_wakeup(struct device *dev)
> return scpd->data->active_wakeup;
> }
>
> -static int scpsys_probe(struct platform_device *pdev)
> +static void init_clks(struct platform_device *pdev, struct clk *clk[CLK_MAX])
> +{
> + enum clk_id clk_ids[] = {
> + CLK_MM,
> + CLK_MFG,
> + CLK_VENC,
> + CLK_VENC_LT
> + };
> +
> + static const char * const clk_names[] = {
> + "mm",
> + "mfg",
> + "venc",
> + "venc_lt",
> + };
> +
> + int i;
> +
> + for (i = 0; i < ARRAY_SIZE(clk_ids); i++)
> + clk[clk_ids[i]] = devm_clk_get(&pdev->dev, clk_names[i]);
Should be:
for (i = CLK_NONE + 1; i < CLK_MAX; i++)
then we can get rid of clk_ids[].
> +}
> +
> +static struct scp *init_scp(struct platform_device *pdev,
> + const struct scp_domain_data *scp_domain_data, int num)
> {
> struct genpd_onecell_data *pd_data;
> struct resource *res;
> - int i, j, ret;
> + int i, j;
> struct scp *scp;
> - struct clk *clk[MT8173_CLK_MAX];
> + struct clk *clk[CLK_MAX];
>
> scp = devm_kzalloc(&pdev->dev, sizeof(*scp), GFP_KERNEL);
> if (!scp)
> - return -ENOMEM;
> + return ERR_PTR(-ENOMEM);
>
> scp->dev = &pdev->dev;
>
> res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> scp->base = devm_ioremap_resource(&pdev->dev, res);
> if (IS_ERR(scp->base))
> - return PTR_ERR(scp->base);
> -
> - pd_data = &scp->pd_data;
> -
> - pd_data->domains = devm_kzalloc(&pdev->dev,
> - sizeof(*pd_data->domains) * NUM_DOMAINS, GFP_KERNEL);
> - if (!pd_data->domains)
> - return -ENOMEM;
> -
> - clk[MT8173_CLK_MM] = devm_clk_get(&pdev->dev, "mm");
> - if (IS_ERR(clk[MT8173_CLK_MM]))
> - return PTR_ERR(clk[MT8173_CLK_MM]);
> -
> - clk[MT8173_CLK_MFG] = devm_clk_get(&pdev->dev, "mfg");
> - if (IS_ERR(clk[MT8173_CLK_MFG]))
> - return PTR_ERR(clk[MT8173_CLK_MFG]);
> -
> - clk[MT8173_CLK_VENC] = devm_clk_get(&pdev->dev, "venc");
> - if (IS_ERR(clk[MT8173_CLK_VENC]))
> - return PTR_ERR(clk[MT8173_CLK_VENC]);
> -
> - clk[MT8173_CLK_VENC_LT] = devm_clk_get(&pdev->dev, "venc_lt");
> - if (IS_ERR(clk[MT8173_CLK_VENC_LT]))
> - return PTR_ERR(clk[MT8173_CLK_VENC_LT]);
> + return ERR_CAST(scp->base);
>
> scp->infracfg = syscon_regmap_lookup_by_phandle(pdev->dev.of_node,
> "infracfg");
> if (IS_ERR(scp->infracfg)) {
> dev_err(&pdev->dev, "Cannot find infracfg controller: %ld\n",
> PTR_ERR(scp->infracfg));
> - return PTR_ERR(scp->infracfg);
> + return ERR_CAST(scp->infracfg);
> }
>
> - for (i = 0; i < NUM_DOMAINS; i++) {
> + scp->domains = devm_kzalloc(&pdev->dev,
> + sizeof(*scp->domains) * num, GFP_KERNEL);
> + if (!scp->domains)
> + return ERR_PTR(-ENOMEM);
> +
> + pd_data = &scp->pd_data;
> +
> + pd_data->domains = devm_kzalloc(&pdev->dev,
> + sizeof(*pd_data->domains) * num, GFP_KERNEL);
> + if (!pd_data->domains)
> + return ERR_PTR(-ENOMEM);
> +
While at it, please leave this block of code between
devm_ioremap_resource(...) and syscon_regmap_lookup_by_phandle(...)
Thanks,
Matthias
^ permalink raw reply
* [PATCH v2 0/9] dmaengine: ti drivers: enable COMPILE_TESTing
From: Peter Ujfalusi @ 2016-09-21 10:26 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
Changes since v1:
- added the compiler warning message to ti-dma-crossbar enum type patch
- moved the Kconfig patches at the end of the seris
The following series will enable unconditional COMPILE_TEST coverage for the
following drivers: omap-dma, edma and ti-dma-crossbar
The series includes fixes noticed when compiling the drivers for x86_64 and
aarch64.
Replaces the patch Vinod sent to enable partial compile testing for omap-dma:
http://www.spinics.net/lists/dmaengine/msg11025.html
Regards,
Peter
---
Peter Ujfalusi (9):
dmaengine: edma: Add missing MODULE_DEVICE_TABLE() for of_device_id
structs
dmaengine: edma: Use enum for eDMA binding type (legacy vs TPCC)
dmaengine: edma: Use correct type for of_find_property() third
parameter
dmaengine/ARM: omap-dma: Fix the DMAengine compile test on non OMAP
configs
dmaengine: ti-dma-crossbar: Correct type for of_find_property() third
parameter
dmaengine: ti-dma-crossbar: Use enum for crossbar type
dmaengine: edma: enable COMPILE_TEST
dmaengine: omap-dma: enable COMPILE_TEST
dmaengine: ti-dma-crossbar: enable COMPILE_TEST
drivers/dma/Kconfig | 8 ++++----
drivers/dma/edma.c | 15 ++++++++++-----
drivers/dma/ti-dma-crossbar.c | 12 +++++++-----
include/linux/omap-dma.h | 19 +++++++++++++++++++
4 files changed, 40 insertions(+), 14 deletions(-)
--
2.10.0
^ permalink raw reply
* [PATCH v2 1/9] dmaengine: edma: Add missing MODULE_DEVICE_TABLE() for of_device_id structs
From: Peter Ujfalusi @ 2016-09-21 10:26 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20160921102637.24845-1-peter.ujfalusi@ti.com>
The MODULE_DEVICE_TABLE() were missing from the driver for the of_device_id
structures.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
drivers/dma/edma.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c
index 3d277fa76c1a..c2098a4b4dcf 100644
--- a/drivers/dma/edma.c
+++ b/drivers/dma/edma.c
@@ -274,11 +274,13 @@ static const struct of_device_id edma_of_ids[] = {
},
{}
};
+MODULE_DEVICE_TABLE(of, edma_of_ids);
static const struct of_device_id edma_tptc_of_ids[] = {
{ .compatible = "ti,edma3-tptc", },
{}
};
+MODULE_DEVICE_TABLE(of, edma_tptc_of_ids);
static inline unsigned int edma_read(struct edma_cc *ecc, int offset)
{
--
2.10.0
^ permalink raw reply related
* [PATCH v2 2/9] dmaengine: edma: Use enum for eDMA binding type (legacy vs TPCC)
From: Peter Ujfalusi @ 2016-09-21 10:26 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20160921102637.24845-1-peter.ujfalusi@ti.com>
Fixes the following warning when compiling the driver for 64bit
architectures (x86_64 for example):
drivers/dma/edma.c:2185:16: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
if (match && (u32)match->data == EDMA_BINDING_TPCC)
^
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
drivers/dma/edma.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c
index c2098a4b4dcf..4c8818278fcc 100644
--- a/drivers/dma/edma.c
+++ b/drivers/dma/edma.c
@@ -261,8 +261,11 @@ static const struct edmacc_param dummy_paramset = {
.ccnt = 1,
};
-#define EDMA_BINDING_LEGACY 0
-#define EDMA_BINDING_TPCC 1
+enum edma_binding_type {
+ EDMA_BINDING_LEGACY = 0,
+ EDMA_BINDING_TPCC,
+};
+
static const struct of_device_id edma_of_ids[] = {
{
.compatible = "ti,edma3",
@@ -2184,7 +2187,8 @@ static int edma_probe(struct platform_device *pdev)
const struct of_device_id *match;
match = of_match_node(edma_of_ids, node);
- if (match && (u32)match->data == EDMA_BINDING_TPCC)
+ if (match &&
+ (enum edma_binding_type)match->data == EDMA_BINDING_TPCC)
legacy_mode = false;
info = edma_setup_info_from_dt(dev, legacy_mode);
--
2.10.0
^ permalink raw reply related
* [PATCH v2 3/9] dmaengine: edma: Use correct type for of_find_property() third parameter
From: Peter Ujfalusi @ 2016-09-21 10:26 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20160921102637.24845-1-peter.ujfalusi@ti.com>
The correct type is int and not for the third parameter of
of_find_property().
Fixes compilation for 64bit architectures (x86_64, aarch64).
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
drivers/dma/edma.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c
index 4c8818278fcc..16c0bb92fa4d 100644
--- a/drivers/dma/edma.c
+++ b/drivers/dma/edma.c
@@ -2024,8 +2024,7 @@ static struct edma_soc_info *edma_setup_info_from_dt(struct device *dev,
{
struct edma_soc_info *info;
struct property *prop;
- size_t sz;
- int ret;
+ int sz, ret;
info = devm_kzalloc(dev, sizeof(struct edma_soc_info), GFP_KERNEL);
if (!info)
--
2.10.0
^ permalink raw reply related
* [PATCH v2 4/9] dmaengine/ARM: omap-dma: Fix the DMAengine compile test on non OMAP configs
From: Peter Ujfalusi @ 2016-09-21 10:26 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20160921102637.24845-1-peter.ujfalusi@ti.com>
The DMAengine driver for omap-dma use three function calls from the
plat-omap legacy driver. When the DMAengine driver is built when ARCH_OMAP
is not set, the compilation will fail due to missing symbols.
Add empty inline functions to allow the DMAengine driver to be compiled
with COMPILE_TEST.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
include/linux/omap-dma.h | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/include/linux/omap-dma.h b/include/linux/omap-dma.h
index 1d99b61adc65..290081620b3e 100644
--- a/include/linux/omap-dma.h
+++ b/include/linux/omap-dma.h
@@ -297,6 +297,7 @@ struct omap_system_dma_plat_info {
#define dma_omap15xx() __dma_omap15xx(d)
#define dma_omap16xx() __dma_omap16xx(d)
+#if defined(CONFIG_ARCH_OMAP)
extern struct omap_system_dma_plat_info *omap_get_plat_info(void);
extern void omap_set_dma_priority(int lch, int dst_port, int priority);
@@ -355,4 +356,22 @@ static inline int omap_lcd_dma_running(void)
}
#endif
+#else /* CONFIG_ARCH_OMAP */
+
+static inline struct omap_system_dma_plat_info *omap_get_plat_info(void)
+{
+ return NULL;
+}
+
+static inline int omap_request_dma(int dev_id, const char *dev_name,
+ void (*callback)(int lch, u16 ch_status, void *data),
+ void *data, int *dma_ch)
+{
+ return -ENODEV;
+}
+
+static inline void omap_free_dma(int ch) { }
+
+#endif /* CONFIG_ARCH_OMAP */
+
#endif /* __LINUX_OMAP_DMA_H */
--
2.10.0
^ permalink raw reply related
* [PATCH v2 5/9] dmaengine: ti-dma-crossbar: Correct type for of_find_property() third parameter
From: Peter Ujfalusi @ 2016-09-21 10:26 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20160921102637.24845-1-peter.ujfalusi@ti.com>
The correct type is int and not for the third parameter of
of_find_property().
Fixes compilation for 64bit architectures (x86_64, aarch64).
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
drivers/dma/ti-dma-crossbar.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/dma/ti-dma-crossbar.c b/drivers/dma/ti-dma-crossbar.c
index 5ae294b256a7..e4f3bd1ae264 100644
--- a/drivers/dma/ti-dma-crossbar.c
+++ b/drivers/dma/ti-dma-crossbar.c
@@ -311,7 +311,7 @@ static int ti_dra7_xbar_probe(struct platform_device *pdev)
struct property *prop;
struct resource *res;
u32 safe_val;
- size_t sz;
+ int sz;
void __iomem *iomem;
int i, ret;
--
2.10.0
^ permalink raw reply related
* [PATCH v2 6/9] dmaengine: ti-dma-crossbar: Use enum for crossbar type
From: Peter Ujfalusi @ 2016-09-21 10:26 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20160921102637.24845-1-peter.ujfalusi@ti.com>
Fixes compiler warnings on 64bit architectures:
drivers/dma/ti-dma-crossbar.c: In function ?ti_dra7_xbar_probe?:
drivers/dma/ti-dma-crossbar.c:398:21: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
xbar->dma_offset = (u32)match->data;
^
drivers/dma/ti-dma-crossbar.c: In function ?ti_dma_xbar_probe?:
drivers/dma/ti-dma-crossbar.c:431:10: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
switch ((u32)match->data) {
^
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
drivers/dma/ti-dma-crossbar.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/dma/ti-dma-crossbar.c b/drivers/dma/ti-dma-crossbar.c
index e4f3bd1ae264..876e4ccaf033 100644
--- a/drivers/dma/ti-dma-crossbar.c
+++ b/drivers/dma/ti-dma-crossbar.c
@@ -16,8 +16,10 @@
#include <linux/of_device.h>
#include <linux/of_dma.h>
-#define TI_XBAR_DRA7 0
-#define TI_XBAR_AM335X 1
+enum ti_xbar_type {
+ TI_XBAR_DRA7 = 0,
+ TI_XBAR_AM335X,
+};
static const struct of_device_id ti_dma_xbar_match[] = {
{
@@ -395,7 +397,7 @@ static int ti_dra7_xbar_probe(struct platform_device *pdev)
xbar->dmarouter.dev = &pdev->dev;
xbar->dmarouter.route_free = ti_dra7_xbar_free;
- xbar->dma_offset = (u32)match->data;
+ xbar->dma_offset = (enum ti_xbar_type)match->data;
mutex_init(&xbar->mutex);
platform_set_drvdata(pdev, xbar);
@@ -428,7 +430,7 @@ static int ti_dma_xbar_probe(struct platform_device *pdev)
if (unlikely(!match))
return -EINVAL;
- switch ((u32)match->data) {
+ switch ((enum ti_xbar_type)match->data) {
case TI_XBAR_DRA7:
ret = ti_dra7_xbar_probe(pdev);
break;
--
2.10.0
^ permalink raw reply related
* [PATCH v2 7/9] dmaengine: edma: enable COMPILE_TEST
From: Peter Ujfalusi @ 2016-09-21 10:26 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20160921102637.24845-1-peter.ujfalusi@ti.com>
To get more coverage, enable COMPILE_TEST for this driver.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
drivers/dma/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index fe2dbb811e19..4348249b943a 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -515,7 +515,7 @@ config TI_DMA_CROSSBAR
config TI_EDMA
bool "TI EDMA support"
- depends on ARCH_DAVINCI || ARCH_OMAP || ARCH_KEYSTONE
+ depends on ARCH_DAVINCI || ARCH_OMAP || ARCH_KEYSTONE || COMPILE_TEST
select DMA_ENGINE
select DMA_VIRTUAL_CHANNELS
select TI_DMA_CROSSBAR if ARCH_OMAP
--
2.10.0
^ permalink raw reply related
* [PATCH v2 8/9] dmaengine: omap-dma: enable COMPILE_TEST
From: Peter Ujfalusi @ 2016-09-21 10:26 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20160921102637.24845-1-peter.ujfalusi@ti.com>
To get more coverage, enable COMPILE_TEST for this driver.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
drivers/dma/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index 4348249b943a..84647d6cb2f4 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -130,7 +130,7 @@ config DMA_JZ4780
config DMA_OMAP
tristate "OMAP DMA support"
- depends on ARCH_OMAP
+ depends on ARCH_OMAP || COMPILE_TEST
select DMA_ENGINE
select DMA_VIRTUAL_CHANNELS
select TI_DMA_CROSSBAR if SOC_DRA7XX
--
2.10.0
^ permalink raw reply related
* [PATCH v2 9/9] dmaengine: ti-dma-crossbar: enable COMPILE_TEST
From: Peter Ujfalusi @ 2016-09-21 10:26 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20160921102637.24845-1-peter.ujfalusi@ti.com>
To get more coverage, enable COMPILE_TEST for this driver.
When compile testing eDMA or omap-dma, select also the ti-dma-crossbar so
it is also covered by the compile testing.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
drivers/dma/Kconfig | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index 84647d6cb2f4..1c11628062ad 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -133,7 +133,7 @@ config DMA_OMAP
depends on ARCH_OMAP || COMPILE_TEST
select DMA_ENGINE
select DMA_VIRTUAL_CHANNELS
- select TI_DMA_CROSSBAR if SOC_DRA7XX
+ select TI_DMA_CROSSBAR if (SOC_DRA7XX || COMPILE_TEST)
config DMA_SA11X0
tristate "SA-11x0 DMA support"
@@ -518,7 +518,7 @@ config TI_EDMA
depends on ARCH_DAVINCI || ARCH_OMAP || ARCH_KEYSTONE || COMPILE_TEST
select DMA_ENGINE
select DMA_VIRTUAL_CHANNELS
- select TI_DMA_CROSSBAR if ARCH_OMAP
+ select TI_DMA_CROSSBAR if (ARCH_OMAP || COMPILE_TEST)
default n
help
Enable support for the TI EDMA controller. This DMA
--
2.10.0
^ permalink raw reply related
* [PATCH v10 0/4] ACPI: parse the SPCR table
From: Aleksey Makarov @ 2016-09-21 10:27 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20160905123617.18775-1-aleksey.makarov@linaro.org>
On 09/05/2016 03:36 PM, Aleksey Makarov wrote:
> 'ARM Server Base Boot Requirements' [1] mentions SPCR (Serial Port Console
> Redirection Table) [2] as a mandatory ACPI table that specifies the
> configuration of serial console.
>
> Move "earlycon" early_param handling to earlycon.c to parse this option once
>
> Parse SPCR table, setup earlycon and register specified console.
>
> Enable parsing this table on ARM64. Earlycon should be set up as early as
> possible. ACPI boot tables are mapped in
> arch/arm64/kernel/acpi.c:acpi_boot_table_init() called from setup_arch() and
> that's where we parse spcr. So it has to be opted-in per-arch. When
> ACPI_SPCR_TABLE is defined initialization of DT earlycon is deferred until the
> DT/ACPI decision is done.
>
> Implement console_match() for pl011.
Hi Greg,
Can you consider picking this series for 4.9 please?
Thank you
Aleksey Makarov
> Based on the work by Leif Lindholm [3]
> Thanks to Peter Hurley for explaining how this should work.
>
> Should be applied to v4.8-rc5
> Tested on QEMU and ThunderX.
> SPCR support is included in QEMU's ARM64 mach-virt since 2.4 release.
>
> v10:
> - rebase to v4.8-rc5
> - fix the issue with comparing the console name in pl011_console_match()
> (Russell King)
> - fix build on sh arch (kbuild test robot)
> - add Acked-by: Russell King <rmk+kernel@armlinux.org.uk> for 4/4
> - add Tested-by: Christopher Covington <cov@codeaurora.org>
>
> v9:
> https://lkml.kernel.org/g/20160811153152.755-1-aleksey.makarov at linaro.org
> - rebase to v4.8-rc1
> - fix compilation for !CONFIG_SERIAL_EARLYCON case
> - add Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> for ACPI part
> - move constant check out of loop (Yury Norov)
> - add '\n' to info message
>
> v8:
> https://lkml.kernel.org/g/1463749405-11640-1-git-send-email-aleksey.makarov at linaro.org
> - rebase to next-20160520
> - remove the patch "ACPICA: Headers: Add new constants for the DBG2 ACPI table"
> as it have got to linux-next
> - add Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Reviewed-by:
> Peter Hurley <peter@hurleysoftware.com> (but see below)
> - fix the patch "serial: pl011: add console matching function". The patch by
> Christopher Covington [4] specifies that SBSA uart does 32-bit access to
> registers and this breaks the match function. In this series the function
> was changed to match when SPCR specifies both mmio32 and mmio access.
> I removed Acked-by: Greg from this patch because of these changes.
>
> v7:
> https://lkml.kernel.org/g/1459431629-27934-1-git-send-email-aleksey.makarov at linaro.org
> - add Acked-by: Rob Herring for "of/serial: move earlycon early_param handling
> to serial"
> - call DT earlycon initialization from the arch ACPI code, not from parse_spcr()
> (Rafael J. Wysocki)
> - fix a few minor issues (Rafael J. Wysocki)
>
> v6:
> https://lkml.kernel.org/g/1458823925-19560-1-git-send-email-aleksey.makarov at linaro.org
> - add documentation for parse_spcr() functioin (Yury Norov)
> - don't initialize err variable (Yury Norov)
> - add __initdata for the earlycon_init_is_deferred flag variable
> - rename the function exported in "of/serial: move earlycon early_param handling
> to serial" to avoid clash with the function from arch/microblaze/kernel/prom.c
> - defer initialization of DT earlycon until DT/ACPI decision is made
> (Rob Herring, Peter Hurley)
> - use snprintf instead of sprintf (Andy Shevchenko)
> - drop patch that adds EARLYCON_DECLARE for pl011 as EARLYCON_DECLARE is
> equivalent to OF_EARLYCON_DECLARE for 4.6+ (Peter Hurley). This means that
> SPCR earlycon will not work on the kernels before 4.6
>
> v5:
> https://lkml.kernel.org/g/1458643595-14719-1-git-send-email-aleksey.makarov at linaro.org
> - drop patch "serial: pl011: use ACPI SPCR to setup 32-bit access" because
> it is ugly. Also because Christopher Covington came with a better solution [4]
> - remove error message when the table is not provided by ACPI (Andy Shevchenko)
> - rewrite spcr.c following the suggestions by Peter Hurley
> - add console_match() for pl011 in a separate patch
> - add EARLYCON_DECLARE for pl011 in a separate patch
> - add patch "of/serial: move earlycon early_param handling to serial" from
> the GDB2 series
>
> v4:
> https://lkml.kernel.org/g/1456747355-15692-1-git-send-email-aleksey.makarov at linaro.org
> - drop patch "ACPI: change __init to __ref for early_acpi_os_unmap_memory()"
> ACPI developers work on a new API and asked not to do that.
> Instead, use acpi_get_table_with_size()/early_acpi_os_unmap_memory() once
> and cache the result. (Lv Zheng)
> - fix some style issues (Yury Norov)
>
> v3:
> https://lkml.kernel.org/g/1455559532-8305-1-git-send-email-aleksey.makarov at linaro.org
>
> Greg Kroah-Hartman did not like v2 so I have rewritten this patchset:
>
> - drop acpi_match() member of struct console
> - drop implementations of this member for pl011 and 8250
> - drop the patch that renames some vars in printk.c as it is not needed anymore
> - drop patch that introduces system wide acpi_table_parse2().
> Instead introduce a custom acpi_table_parse_spcr() in spcr.c
>
> Instead of introducing a new match_acpi() member of struct console,
> this patchset introduces a new function acpi_console_check().
> This function is called when a new uart is registered at serial_core.c
> the same way OF code checks for console. If the registered uart is the
> console specified by SPCR table, this function calls add_preferred_console()
>
> The restrictions of this approach are:
>
> - only serial consoles can be set up
> - only consoles specified by the memory/io address can be set up
> (SPCR can specify devices by PCI id/PCI address)
>
> v2:
> https://lkml.kernel.org/g/1455299022-11641-1-git-send-email-aleksey.makarov at linaro.org
> - don't use SPCR if user specified console in command line
> - fix initialization order of newcon->index = 0
> - rename some variables at printk.c (Joe Perches, Peter Hurley)
> - enable ACPI_SPCR_TABLE in a separate patch (Andy Shevchenko)
> - remove the retry loop for console registering (Peter Hurley).
> Instead, obtain SPCR with acpi_get_table(). That works after
> call to acpi_early_init() i. e. in any *_initcall()
> - describe design decision behind introducing acpi_match() (Peter Hurley)
> - fix compilation for x86 + ACPI (Graeme Gregory)
> - introduce DBG2 constants in a separate patch (Andy Shevchenko)
> - fix a typo in DBG2 constants (Andy Shevchenko)
> - add ACPI_DBG2_ARM_SBSA_32BIT constant (Christopher Covington)
> - add support for ACPI_DBG2_ARM_SBSA_* consoles (Christopher Covington)
> - add documentation for functions
> - add a patch that uses SPCR to find if SBSA serial driver should use 32-bit
> accessor functions (Christopher Covington)
> - change __init to __ref for early_acpi_os_unmap_memory() in a separate patch
> - introduce acpi_table_parse2() in a separate patch
> - fix fetching the SPCR table early (Mark Salter)
> - add a patch from Mark Salter that introduces support for matching 8250-based
> consoles
>
> v1:
> https://lkml.kernel.org/g/1453722324-22407-1-git-send-email-aleksey.makarov at linaro.org
>
> [1] http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.den0044a/index.html
> [2] https://msdn.microsoft.com/en-us/library/windows/hardware/dn639132(v=vs.85).aspx
> [3] https://lkml.kernel.org/g/1441716217-23786-1-git-send-email-leif.lindholm at linaro.org
> [4] https://lkml.kernel.org/g/1457415800-8799-1-git-send-email-cov at codeaurora.org
>
> Aleksey Makarov (3):
> ACPI: parse SPCR and enable matching console
> ARM64: ACPI: enable ACPI_SPCR_TABLE
> serial: pl011: add console matching function
>
> Leif Lindholm (1):
> of/serial: move earlycon early_param handling to serial
>
> arch/arm64/Kconfig | 1 +
> arch/arm64/kernel/acpi.c | 11 +++-
> drivers/acpi/Kconfig | 3 ++
> drivers/acpi/Makefile | 1 +
> drivers/acpi/spcr.c | 111 ++++++++++++++++++++++++++++++++++++++++
> drivers/of/fdt.c | 11 +---
> drivers/tty/serial/amba-pl011.c | 55 ++++++++++++++++++++
> drivers/tty/serial/earlycon.c | 19 ++++++-
> include/linux/acpi.h | 6 +++
> include/linux/of_fdt.h | 3 ++
> include/linux/serial_core.h | 9 +++-
> 11 files changed, 216 insertions(+), 14 deletions(-)
> create mode 100644 drivers/acpi/spcr.c
>
^ permalink raw reply
* [RFC PATCH 2/8] thread_info: allow custom in-task thread_info
From: Mark Rutland @ 2016-09-21 10:28 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <CALCETrUDWiDmLbMqw9sQYEzvDuSVfmT_UscxQXfmf8YYyTOC=Q@mail.gmail.com>
Hi Andy,
On Fri, Sep 16, 2016 at 08:11:14AM -0700, Andy Lutomirski wrote:
> > On Thu, Sep 15, 2016 at 11:37:47AM -0700, Andy Lutomirski wrote:
> > Just to check, what do you mean to happen with the flags field? Should
> > that always be in the generic thread_info? e.g.
> >
> > struct thread_info {
> > u32 flags;
> > #ifdef arch_thread_info
> > struct arch_thread_info arch_ti;
> > #endif
> > };
>
> Exactly. Possibly with a comment that using thread_struct should be
> preferred and that arch_thread_info should be used only if some header
> file requires access via current_thread_info() or task_thread_info().
While fixing up these patches, I realised that I'm somewhat concerned by
flags becoming a u32 (where it was previously an unsigned long for
arm64).
The generic {test,set,*}_ti_thread_flag() helpers use the usual bitops,
which perform accesses of sizeof(unsigned long) at a time, and for arm64
these need to be naturally-aligned.
We happen to get that alignment from subsequent fields in task_struct
and/or thread_info, and for arm64 we don't seem to have a problem with
tearing, but it feels somewhat fragile, and leaves me uneasy.
Looking at the git log, it seems that x86 also use unsigned long until
commit affa219b60a11b32 ("x86: change thread_info's flag field back to
32 bits"), where if I'm reading correctly, this was done to get rid of
unnecessary padding. With THREAD_INFO_IN_STACK, thread_info::flags is
immediately followed by a long on x86, so we save no padding.
Given all that, can we make the generic thread_info::flags an unsigned
long, matching what the thread flag helpers implicitly assume?
Thanks,
Mark.
^ permalink raw reply
* [RFC PATCH 0/8] arm64: move thread_info off of the task stack
From: Mark Rutland @ 2016-09-21 10:31 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <f954c330-fb58-5f8f-1d66-5bbcd0d9dadb@redhat.com>
On Tue, Sep 20, 2016 at 06:26:54PM -0700, Laura Abbott wrote:
> On 09/15/2016 06:49 AM, Mark Rutland wrote:
> >Building atop of Andy's work on x86 and generic code, these patches move
> >arm64's thread_info off of the stack and into task_struct. This protects
> >thread_info from corruption in the face of stack overflow, and serves as
> >a step towards fully robust stack overflow handling will be addressed by
> >subsequent patches.
> >
> >In contrast to x86, we can't place some critical data such as
> >preempt_count in percpu variables, and we must store these in some
> >per-task location. This, compounded with the way headers are organised
> >conspires to require us to still define our own thread_info. I
> >understand that the longer term plan is to kill off thread_info
> >entirely, hence I'm sending this as an RFC so we can figure out if/how
> >we can achieve that.
> >
> >These patches are based on Andy's x86/vmap_stack branch [1,2], and I've
> >pushed a copy to me arm64/ti-stack-split branch [3,4]. The result of
> >these patches boots happily on platforms within reach of my desk, but
> >has not seen much stressing so far.
>
> FWIW, I used your ti-stack-split branch while running some kernel builds
> and it seems to work well enough. You can take that as a Tested-by or I
> can re-test with a non-RFC version.
Thanks for testing, and many thanks for the offer!
Based on Andy's feedback some core bits are changing, and I'm hoping to
have a non-RFC version out soon once I've fixed up the remaining
fallout. I'll make sure you're Cc'd!
Thanks,
Mark.
^ permalink raw reply
* [PATCH v2 2/9] dmaengine: edma: Use enum for eDMA binding type (legacy vs TPCC)
From: Arnd Bergmann @ 2016-09-21 10:31 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20160921102637.24845-3-peter.ujfalusi@ti.com>
On Wednesday, September 21, 2016 1:26:30 PM CEST Peter Ujfalusi wrote:
> diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c
> index c2098a4b4dcf..4c8818278fcc 100644
> --- a/drivers/dma/edma.c
> +++ b/drivers/dma/edma.c
> @@ -261,8 +261,11 @@ static const struct edmacc_param dummy_paramset = {
> .ccnt = 1,
> };
>
> -#define EDMA_BINDING_LEGACY 0
> -#define EDMA_BINDING_TPCC 1
> +enum edma_binding_type {
> + EDMA_BINDING_LEGACY = 0,
> + EDMA_BINDING_TPCC,
> +};
> +
> static const struct of_device_id edma_of_ids[] = {
> {
> .compatible = "ti,edma3",
> @@ -2184,7 +2187,8 @@ static int edma_probe(struct platform_device *pdev)
> const struct of_device_id *match;
>
> match = of_match_node(edma_of_ids, node);
> - if (match && (u32)match->data == EDMA_BINDING_TPCC)
> + if (match &&
> + (enum edma_binding_type)match->data == EDMA_BINDING_TPCC)
> legacy_mode = false;
>
> info = edma_setup_info_from_dt(dev, legacy_mode);
> --
> 2.10.0
>
Are you sure this works on all architectures? IIRC the size of an enum
is implementation defined, so this could still fail sometimes.
I tend to use 'uintptr_t' for the cast instead.
Arnd
^ permalink raw reply
* [PATCH] iommu/io-pgtable-arm: Using for_each_set_bit to simplify the code
From: Robin Murphy @ 2016-09-21 10:35 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1474436491-26220-1-git-send-email-wangkefeng.wang@huawei.com>
On 21/09/16 06:41, Kefeng Wang wrote:
> Using for_each_set_bit() to simplify the code.
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
> ---
> drivers/iommu/io-pgtable-arm-v7s.c | 5 +----
> drivers/iommu/io-pgtable-arm.c | 5 +----
> 2 files changed, 2 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/iommu/io-pgtable-arm-v7s.c b/drivers/iommu/io-pgtable-arm-v7s.c
> index def8ca1..f23821b 100644
> --- a/drivers/iommu/io-pgtable-arm-v7s.c
> +++ b/drivers/iommu/io-pgtable-arm-v7s.c
> @@ -789,8 +789,7 @@ static int __init arm_v7s_do_selftests(void)
> * Distinct mappings of different granule sizes.
> */
> iova = 0;
> - i = find_first_bit(&cfg.pgsize_bitmap, BITS_PER_LONG);
> - while (i != BITS_PER_LONG) {
> + for_each_set_bit(i, &cfg.pgsize_bitmap, BITS_PER_LONG) {
> size = 1UL << i;
> if (ops->map(ops, iova, iova, size, IOMMU_READ |
> IOMMU_WRITE |
> @@ -807,8 +806,6 @@ static int __init arm_v7s_do_selftests(void)
> return __FAIL(ops);
>
> iova += SZ_16M;
> - i++;
> - i = find_next_bit(&cfg.pgsize_bitmap, BITS_PER_LONG, i);
> loopnr++;
> }
>
> diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c
> index f5c90e1..8c3dfb7 100644
> --- a/drivers/iommu/io-pgtable-arm.c
> +++ b/drivers/iommu/io-pgtable-arm.c
> @@ -980,8 +980,7 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
> * Distinct mappings of different granule sizes.
> */
> iova = 0;
> - j = find_first_bit(&cfg->pgsize_bitmap, BITS_PER_LONG);
> - while (j != BITS_PER_LONG) {
> + for_each_set_bit(j, &cfg->pgsize_bitmap, BITS_PER_LONG) {
> size = 1UL << j;
>
> if (ops->map(ops, iova, iova, size, IOMMU_READ |
> @@ -999,8 +998,6 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
> return __FAIL(ops, i);
>
> iova += SZ_1G;
> - j++;
> - j = find_next_bit(&cfg->pgsize_bitmap, BITS_PER_LONG, j);
> }
>
> /* Partial unmap */
>
^ permalink raw reply
* [PATCH v10 0/4] ACPI: parse the SPCR table
From: Greg Kroah-Hartman @ 2016-09-21 10:37 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <25d32778-e708-6763-7cb2-4ddbeebc844b@linaro.org>
On Wed, Sep 21, 2016 at 01:27:30PM +0300, Aleksey Makarov wrote:
>
>
> On 09/05/2016 03:36 PM, Aleksey Makarov wrote:
> > 'ARM Server Base Boot Requirements' [1] mentions SPCR (Serial Port Console
> > Redirection Table) [2] as a mandatory ACPI table that specifies the
> > configuration of serial console.
> >
> > Move "earlycon" early_param handling to earlycon.c to parse this option once
> >
> > Parse SPCR table, setup earlycon and register specified console.
> >
> > Enable parsing this table on ARM64. Earlycon should be set up as early as
> > possible. ACPI boot tables are mapped in
> > arch/arm64/kernel/acpi.c:acpi_boot_table_init() called from setup_arch() and
> > that's where we parse spcr. So it has to be opted-in per-arch. When
> > ACPI_SPCR_TABLE is defined initialization of DT earlycon is deferred until the
> > DT/ACPI decision is done.
> >
> > Implement console_match() for pl011.
>
> Hi Greg,
>
> Can you consider picking this series for 4.9 please?
I thought you asked Rafael to take them, they are not in my queue
anymore because of that. Don't try to shop-around for maintainers
please, that's kind of rude...
greg k-h
^ permalink raw reply
* [PATCH] tty/serial: atmel: fix fractional baud rate computation
From: Nicolas Ferre @ 2016-09-21 10:44 UTC (permalink / raw)
To: linux-arm-kernel
From: Alexey Starikovskiy <aystarik@gmail.com>
The problem with previous code was it rounded values in wrong
place and produced wrong baud rate in some cases.
Signed-off-by: Alexey Starikovskiy <aystarik@gmail.com>
[nicolas.ferre at atmel.com: port to newer kernel and add commit log]
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---
drivers/tty/serial/atmel_serial.c | 10 ++++++----
include/linux/atmel_serial.h | 1 +
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
index 5f550d9feed9..fd8aa1f4ba78 100644
--- a/drivers/tty/serial/atmel_serial.c
+++ b/drivers/tty/serial/atmel_serial.c
@@ -2170,13 +2170,15 @@ static void atmel_set_termios(struct uart_port *port, struct ktermios *termios,
* accurately. This feature is enabled only when using normal mode.
* baudrate = selected clock / (8 * (2 - OVER) * (CD + FP / 8))
* Currently, OVER is always set to 0 so we get
- * baudrate = selected clock (16 * (CD + FP / 8))
+ * baudrate = selected clock / (16 * (CD + FP / 8))
+ * then
+ * 8 CD + FP = selected clock / (2 * baudrate)
*/
if (atmel_port->has_frac_baudrate &&
(mode & ATMEL_US_USMODE) == ATMEL_US_USMODE_NORMAL) {
- div = DIV_ROUND_CLOSEST(port->uartclk, baud);
- cd = div / 16;
- fp = DIV_ROUND_CLOSEST(div % 16, 2);
+ div = DIV_ROUND_CLOSEST(port->uartclk, baud * 2);
+ cd = div >> 3;
+ fp = div & ATMEL_US_FP_MASK;
} else {
cd = uart_get_divisor(port, baud);
}
diff --git a/include/linux/atmel_serial.h b/include/linux/atmel_serial.h
index f8e452aa48d7..bd2560502f3c 100644
--- a/include/linux/atmel_serial.h
+++ b/include/linux/atmel_serial.h
@@ -119,6 +119,7 @@
#define ATMEL_US_BRGR 0x20 /* Baud Rate Generator Register */
#define ATMEL_US_CD GENMASK(15, 0) /* Clock Divider */
#define ATMEL_US_FP_OFFSET 16 /* Fractional Part */
+#define ATMEL_US_FP_MASK 0x7
#define ATMEL_US_RTOR 0x24 /* Receiver Time-out Register for USART */
#define ATMEL_UA_RTOR 0x28 /* Receiver Time-out Register for UART */
--
2.9.0
^ permalink raw reply related
* [PATCH 5/5] arm64: Add uprobe support
From: Pratyush Anand @ 2016-09-21 11:00 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20160920165946.GA19353@e104818-lin.cambridge.arm.com>
Hi Catalin,
Thanks for your review.
On 20/09/2016:05:59:46 PM, Catalin Marinas wrote:
> Hi Pratyush,
>
> On Tue, Aug 02, 2016 at 11:00:09AM +0530, Pratyush Anand wrote:
> > --- a/arch/arm64/include/asm/debug-monitors.h
> > +++ b/arch/arm64/include/asm/debug-monitors.h
> > @@ -70,6 +70,9 @@
> > #define BRK64_ESR_MASK 0xFFFF
> > #define BRK64_ESR_KPROBES 0x0004
> > #define BRK64_OPCODE_KPROBES (AARCH64_BREAK_MON | (BRK64_ESR_KPROBES << 5))
> > +/* uprobes BRK opcodes with ESR encoding */
> > +#define BRK64_ESR_UPROBES 0x0008
> > +#define BRK64_OPCODE_UPROBES (AARCH64_BREAK_MON | (BRK64_ESR_UPROBES << 5))
>
> You can use 0x0005 as immediate, we don't need individual bits here.
OK. will define BRK64_ESR_UPROBES as 0x0005
>
> > --- a/arch/arm64/include/asm/probes.h
> > +++ b/arch/arm64/include/asm/probes.h
> > @@ -35,4 +35,8 @@ struct arch_specific_insn {
> > };
> > #endif
> >
> > +#ifdef CONFIG_UPROBES
> > +typedef u32 uprobe_opcode_t;
> > +#endif
>
> We don't need #ifdef around this typedef. Also, all the other
> architectures seem to have this typedef in asm/uprobes.h.
kprobe_opcode_t was defined here, so I defined it here as well. But yes, it
would be good to move it to asm/uprobes.h to keep in sync with other arch.
>
> > --- a/arch/arm64/include/asm/ptrace.h
> > +++ b/arch/arm64/include/asm/ptrace.h
> > @@ -217,6 +217,14 @@ int valid_user_regs(struct user_pt_regs *regs, struct task_struct *task);
> >
> > #include <asm-generic/ptrace.h>
> >
> > +#define procedure_link_pointer(regs) ((regs)->regs[30])
> > +
> > +static inline void procedure_link_pointer_set(struct pt_regs *regs,
> > + unsigned long val)
> > +{
> > + procedure_link_pointer(regs) = val;
> > +}
>
> Do you need these macro and function here? It seems that they are only
> used in arch_uretprobe_hijack_return_addr(), so you can just expand them
> in there, no need for additional definitions.
I introduced it to keep sync with other register usage like
instruction_pointer_set().
I have used it in uprobe code only, but I think, we can have a patch to modify
following code, which can use them as well.
arch/arm64/kernel/probes/kprobes.c: ri->ret_addr = (kprobe_opcode_t *)regs->regs[30];
arch/arm64/kernel/probes/kprobes.c: regs->regs[30] = (long)&kretprobe_trampoline;
arch/arm64/kernel/process.c: lr = regs->regs[30];
arch/arm64/kernel/signal.c: __put_user_error(regs->regs[30], &sf->lr, err);
arch/arm64/kernel/signal.c: regs->regs[30] = (unsigned long)sigtramp;
>
> > --- a/arch/arm64/include/asm/thread_info.h
> > +++ b/arch/arm64/include/asm/thread_info.h
> > @@ -109,6 +109,7 @@ static inline struct thread_info *current_thread_info(void)
> > #define TIF_NEED_RESCHED 1
> > #define TIF_NOTIFY_RESUME 2 /* callback before returning to user */
> > #define TIF_FOREIGN_FPSTATE 3 /* CPU's FP state is not current's */
> > +#define TIF_UPROBE 5 /* uprobe breakpoint or singlestep */
>
> Nitpick: you can just use 4 until we cover this gap.
Hummm..as stated in commit log, Shi Yang suggested to define TIF_UPROBE as 5 in
stead of 4, since 4 has already been used in -rt kernel. May be, I can put a
comment in code as well.
Or, keep it 4 and -rt kernel will change their definitions. I am OK with both.
let me know.
>
> > --- /dev/null
> > +++ b/arch/arm64/include/asm/uprobes.h
> > @@ -0,0 +1,37 @@
> > +/*
> > + * Copyright (C) 2014-2015 Pratyush Anand <panand@redhat.com>
> > + *
> > + * This program is free software; you can redistribute it and/or modify
> > + * it under the terms of the GNU General Public License version 2 as
> > + * published by the Free Software Foundation.
> > + */
> > +
> > +#ifndef _ASM_UPROBES_H
> > +#define _ASM_UPROBES_H
> > +
> > +#include <asm/debug-monitors.h>
> > +#include <asm/insn.h>
> > +#include <asm/probes.h>
> > +
> > +#define MAX_UINSN_BYTES AARCH64_INSN_SIZE
> > +
> > +#define UPROBE_SWBP_INSN BRK64_OPCODE_UPROBES
> > +#define UPROBE_SWBP_INSN_SIZE 4
>
> Nitpick: for consistency, just use AARCH64_INSN_SIZE.
OK
>
> > +#define UPROBE_XOL_SLOT_BYTES MAX_UINSN_BYTES
> > +
> > +struct arch_uprobe_task {
> > + unsigned long saved_fault_code;
> > +};
> > +
> > +struct arch_uprobe {
> > + union {
> > + u8 insn[MAX_UINSN_BYTES];
> > + u8 ixol[MAX_UINSN_BYTES];
> > + };
> > + struct arch_probe_insn api;
> > + bool simulate;
> > +};
> > +
> > +extern void flush_uprobe_xol_access(struct page *page, unsigned long uaddr,
> > + void *kaddr, unsigned long len);
>
> I don't think we need this. It doesn't seem to be used anywhere other
> than the arm64 uprobes.c file. So I would rather expose
> sync_icache_aliases(), similarly to __sync_icache_dcache().
OK.
>
> > --- a/arch/arm64/kernel/entry.S
> > +++ b/arch/arm64/kernel/entry.S
> > @@ -688,7 +688,8 @@ ret_fast_syscall:
> > ldr x1, [tsk, #TI_FLAGS] // re-check for syscall tracing
> > and x2, x1, #_TIF_SYSCALL_WORK
> > cbnz x2, ret_fast_syscall_trace
> > - and x2, x1, #_TIF_WORK_MASK
> > + mov x2, #_TIF_WORK_MASK
> > + and x2, x1, x2
>
> Is this needed because _TIF_WORK_MASK cannot work as an immediate value
> to 'and'? We could reorder the TIF bits, they are not exposed to user to
> have ABI implications.
_TIF_WORK_MASK is defined as follows:
#define _TIF_WORK_MASK (_TIF_NEED_RESCHED | _TIF_SIGPENDING | \
_TIF_NOTIFY_RESUME | _TIF_FOREIGN_FPSTATE | \
_TIF_UPROBE)
Re-ordering will not help, because 0-3 have already been used by previous
definitions. Only way to use immediate value could be if, TIF_UPROBE is defined
as 4.
>
> > cbnz x2, work_pending
> > enable_step_tsk x1, x2
> > kernel_exit 0
> > @@ -718,7 +719,8 @@ work_resched:
> > ret_to_user:
> > disable_irq // disable interrupts
> > ldr x1, [tsk, #TI_FLAGS]
> > - and x2, x1, #_TIF_WORK_MASK
> > + mov x2, #_TIF_WORK_MASK
> > + and x2, x1, x2
> > cbnz x2, work_pending
> > enable_step_tsk x1, x2
> > kernel_exit 0
>
> Same here.
>
> > --- /dev/null
> > +++ b/arch/arm64/kernel/probes/uprobes.c
> > @@ -0,0 +1,227 @@
> > +/*
> > + * Copyright (C) 2014-2015 Pratyush Anand <panand@redhat.com>
> > + *
> > + * This program is free software; you can redistribute it and/or modify
> > + * it under the terms of the GNU General Public License version 2 as
> > + * published by the Free Software Foundation.
> > + */
> > +#include <linux/highmem.h>
> > +#include <linux/ptrace.h>
> > +#include <linux/uprobes.h>
> > +
> > +#include "decode-insn.h"
> > +
> > +#define UPROBE_INV_FAULT_CODE UINT_MAX
> > +
> > +void arch_uprobe_copy_ixol(struct page *page, unsigned long vaddr,
> > + void *src, unsigned long len)
> > +{
> > + void *xol_page_kaddr = kmap_atomic(page);
> > + void *dst = xol_page_kaddr + (vaddr & ~PAGE_MASK);
> > +
> > + preempt_disable();
>
> kmap_atomic() already disabled preemption.
Yes..will remove.
>
> > +
> > + /* Initialize the slot */
> > + memcpy(dst, src, len);
> > +
> > + /* flush caches (dcache/icache) */
> > + flush_uprobe_xol_access(page, vaddr, dst, len);
>
> Just use sync_icache_aliases() here (once exposed in an arm64 header).
OK.
>
> > +
> > + preempt_enable();
> > +
> > + kunmap_atomic(xol_page_kaddr);
> > +}
> > +
> > +unsigned long uprobe_get_swbp_addr(struct pt_regs *regs)
> > +{
> > + return instruction_pointer(regs);
> > +}
> > +
> > +int arch_uprobe_analyze_insn(struct arch_uprobe *auprobe, struct mm_struct *mm,
> > + unsigned long addr)
> > +{
> > + probe_opcode_t insn;
> > +
> > + /* TODO: Currently we do not support AARCH32 instruction probing */
>
> Is there a way to check (not necessarily in this file) that we don't
> probe 32-bit tasks?
- Well, I do not have complete idea about it that, how it can be done. I think
we can not check that just by looking a single bit in an instruction.
My understanding is that, we can only know about it when we are executing the
instruction, by reading pstate, but that would not be useful for uprobe
instruction analysis.
I hope, instruction encoding for aarch32 and aarch64 are different, and by
analyzing for all types of aarch32 instructions, we will be able to decide
that whether instruction is 32 bit trace-able or not. Accordingly, we can use
either BRK or BKPT instruction for breakpoint generation.
>
> > + if (!IS_ALIGNED(addr, AARCH64_INSN_SIZE))
> > + return -EINVAL;
> > +
> > + insn = *(probe_opcode_t *)(&auprobe->insn[0]);
> > +
> > + switch (arm_probe_decode_insn(insn, &auprobe->api)) {
> > + case INSN_REJECTED:
> > + return -EINVAL;
> > +
> > + case INSN_GOOD_NO_SLOT:
> > + auprobe->simulate = true;
> > + break;
> > +
> > + case INSN_GOOD:
> > + default:
> > + break;
>
> Nitpick, we don't need case INSN_GOOD as well since default would cover
> it (that's unless you want to change default to BUG()).
we will not have other than these 3, so need to introduce BUG(). I will remove
INSN_GOOD.
>
> > + }
> > +
> > + return 0;
> > +}
> > +
> > +int arch_uprobe_pre_xol(struct arch_uprobe *auprobe, struct pt_regs *regs)
> > +{
> > + struct uprobe_task *utask = current->utask;
> > +
> > + /* saved fault code is restored in post_xol */
> > + utask->autask.saved_fault_code = current->thread.fault_code;
>
> Does the current->thread.fault_code has any meaning here? We use it in
> the arm64 code when delivering a signal to user but I don't think that's
> the case here, we are handling a breakpoint instruction and there isn't
> anything that set the fault_code.
Correct, they will just having garbage values. will remove.
>
> > +
> > + /* An invalid fault code between pre/post xol event */
> > + current->thread.fault_code = UPROBE_INV_FAULT_CODE;
> > +
> > + /* Instruction point to execute ol */
> > + instruction_pointer_set(regs, utask->xol_vaddr);
> > +
> > + user_enable_single_step(current);
> > +
> > + return 0;
> > +}
> > +
> > +int arch_uprobe_post_xol(struct arch_uprobe *auprobe, struct pt_regs *regs)
> > +{
> > + struct uprobe_task *utask = current->utask;
> > +
> > + WARN_ON_ONCE(current->thread.fault_code != UPROBE_INV_FAULT_CODE);
> > +
> > + /* restore fault code */
> > + current->thread.fault_code = utask->autask.saved_fault_code;
>
> Same here, I don't think this needs restoring if it wasn't meaningful in
> the first place.
OK.
~Pratyush
^ permalink raw reply
* [PATCH 2/4] ARM: tegra: nyan: Use external control for bq24735 charger
From: Paul Kocialkowski @ 2016-09-21 11:03 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <baca958f-1db6-b9f2-ce94-c523f21d6769@nvidia.com>
Le mercredi 21 septembre 2016 ? 11:10 +0100, Jon Hunter a ?crit?:
> On 21/09/16 08:56, Paul Kocialkowski wrote:
>
> ...
>
> > Sure, this is exported at: /sys/class/power_supply/bq24735 at 5-0009
> > Also, note that the power-supply next branch[2] has some more fixes for the
> > bq24735 driver.
>
> I tested the bq24735 on next-20160919 without any of your changes and?
> when connecting or disconnecting the charger I see the following panic.
> Do you see this?
I have not encountered that, but have been basing my work off the latest rc, not
linux-next.
> / # [???30.120384] Unable to handle kernel NULL pointer dereference at virtual
> address 00000004
> [???30.128489] pgd = c0004000
> [???30.131187] [00000004] *pgd=00000000
> [???30.134759] Internal error: Oops: 17 [#1] PREEMPT SMP ARM
> [???30.140141] Modules linked in:
> [???30.143192] CPU: 1 PID: 71 Comm: kworker/1:1 Not tainted 4.8.0-rc6-next-
> 20160919-00002-gbc9771827865-dirty #574
> [???30.153254] Hardware name: NVIDIA Tegra SoC (Flattened Device Tree)
> [???30.159509] Workqueue: events power_supply_changed_work
> [???30.164723] task: ee19f880 task.stack: ee1a0000
> [???30.169239] PC is at sbs_external_power_changed+0x50/0x5c
> [???30.174624] LR is at mod_timer+0x194/0x270
> [???30.178705] pc : [<c05b0c58>]????lr : [<c017cda0>]????psr: 60000113
> [???30.178705] sp : ee1a1eb8??ip : 80000000??fp : ee8e3680
> [???30.190155] r10: eef98580??r9 : 00000000??r8 : 00000000
> [???30.195363] r7 : ee303000??r6 : c05afef8??r5 : ee3e03f8??r4 : ee3e03d0
> [???30.201872] r3 : 00000000??r2 : 00000000??r1 : 40000193??r0 : 00000001
> [???30.208382] Flags: nZCv??IRQs on??FIQs on??Mode SVC_32??ISA ARM??Segment
> none
> [???30.215497] Control: 10c5387d??Table: adcf006a??DAC: 00000051
> [???30.221226] Process kworker/1:1 (pid: 71, stack limit = 0xee1a0210)
> [???30.227474] Stack: (0xee1a1eb8 to 0xee1a2000)
> [???30.231816]
> 1ea0:???????????????????????????????????????????????????????edc0bc00 ee303000
> [???30.239973] 1ec0: c05afef8 c05aff2c edc0bc20 c045ec1c eef95c80 eef95c80
> 00000001 eea82d5c
> [???30.248136] 1ee0: edc0bd98 00000000 ee3031c0 ee303218 c0eab740 c05afcc4
> ee8e3680 ee3031c0
> [???30.256296] 1f00: eef9b800 00000000 eef98580 c0135824 eef98598 c0e02100
> eef98580 ee8e3698
> [???30.264453] 1f20: 00000008 eef98598 c0e02100 ee1a0000 eef98580 c0135a74
> ee840f80 ee8e3680
> [???30.272610] 1f40: c0135a3c 00000000 ee840f80 ee8e3680 c0135a3c 00000000
> 00000000 00000000
> [???30.280766] 1f60: 00000000 c013af18 00000000 00000000 00000000 ee8e3680
> 00000000 00000000
> [???30.288922] 1f80: ee1a1f80 ee1a1f80 00000000 00000000 ee1a1f90 ee1a1f90
> ee1a1fac ee840f80
> [???30.297078] 1fa0: c013ae3c 00000000 00000000 c01078b8 00000000 00000000
> 00000000 00000000
> [???30.305234] 1fc0: 00000000 00000000 00000000 00000000 00000000 00000000
> 00000000 00000000
> [???30.313389] 1fe0: 00000000 00000000 00000000 00000000 00000013 00000000
> 00000000 00000000
> [???30.321555] [<c05b0c58>] (sbs_external_power_changed) from [<c05aff2c>]
> (__power_supply_changed_work+0x34/0x3c)
> [???30.331623] [<c05aff2c>] (__power_supply_changed_work) from [<c045ec1c>]
> (class_for_each_device+0x4c/0xb4)
> [???30.341254] [<c045ec1c>] (class_for_each_device) from [<c05afcc4>]
> (power_supply_changed_work+0x5c/0xb0)
> [???30.350713] [<c05afcc4>] (power_supply_changed_work) from [<c0135824>]
> (process_one_work+0x124/0x33c)
> [???30.359912] [<c0135824>] (process_one_work) from [<c0135a74>]
> (worker_thread+0x38/0x4d4)
> [???30.367983] [<c0135a74>] (worker_thread) from [<c013af18>]
> (kthread+0xdc/0xf4)
> [???30.375187] [<c013af18>] (kthread) from [<c01078b8>]
> (ret_from_fork+0x14/0x3c)
> [???30.382391] Code: e5911000 e3a00004 ebee0b88 e5943008 (e5933004)?
> [???30.388504] ---[ end trace 083d55597e9a2254 ]---
> [???30.393140] Unable to handle kernel paging request at virtual address
> ffffffec
> [???30.400342] pgd = c0004000
> [???30.403038] [ffffffec] *pgd=afffd861, *pte=00000000, *ppte=00000000
> [???30.409309] Internal error: Oops: 37 [#2] PREEMPT SMP ARM
> [???30.414690] Modules linked in:
> [???30.417738] CPU: 1 PID: 71 Comm: kworker/1:1 Tainted:
> G??????D?????????4.8.0-rc6-next-20160919-00002-gbc9771827865-dirty #574
> [???30.429013] Hardware name: NVIDIA Tegra SoC (Flattened Device Tree)
> [???30.435265] task: ee19f880 task.stack: ee1a0000
> [???30.439782] PC is at kthread_data+0x4/0xc
> [???30.443779] LR is at wq_worker_sleeping+0x8/0xc8
> [???30.448381] pc : [<c013b8a8>]????lr : [<c01366e0>]????psr: 20000193
> [???30.448381] sp : ee1a1c58??ip : eef98f28??fp : ee1a1cb4
> [???30.459836] r10: eef98a00??r9 : c0e5f000??r8 : c0d9ea00
> [???30.465048] r7 : ee19fcc8??r6 : c0e02e08??r5 : ee19f880??r4 : eef98a00
> [???30.471556] r3 : 00000000??r2 : 00000020??r1 : 00000000??r0 : ee19f880
> [???30.478066] Flags: nzCv??IRQs off??FIQs on??Mode SVC_32??ISA ARM??Segment
> none
> [???30.485268] Control: 10c5387d??Table: adcf006a??DAC: 00000051
> [???30.490998] Process kworker/1:1 (pid: 71, stack limit = 0xee1a0210)
> [???30.497247] Stack: (0xee1a1c58 to 0xee1a2000)
> [???30.501590]
> 1c40:???????????????????????????????????????????????????????eef98a00 c0833a68
> [???30.509747] 1c60: 00000001 ee117a44 c0d99280 a0000193 00000000 c0833d4c
> 00000001 ee117a44
> [???30.517904] 1c80: 00000000 ee117540 ee19f880 c01faf3c 00000000 ee1a0000
> ee1a18ec 00000001
> [???30.526060] 1ca0: ee1a1cc8 ee19fc40 c05b0c5c 00000001 ee1a1cc4 c0833d4c
> ee19f880 ee1a18ec
> [???30.534217] 1cc0: ee85d3c0 c012277c ee1a1cc8 ee1a1cc8 00000000 c0e5e2c4
> c0e07638 ee1a1e68
> [???30.542374] 1ce0: 60000113 0000000b c05b0c5c 00000001 c05b0c5a c010b6f8
> ee1a0210 0000000b
> [???30.550530] 1d00: c0e07638 ee1a0000 bf000000 00000008 65000000 31313935
> 20303030 30613365
> [???30.558687] 1d20: 34303030 65626520 38623065 35652038 30333439 28203830
> 33393565 34303033
> [???30.566843] 1d40: 00002029 c01b63c4 c0004000 00000004 ee1a1e68 00000017
> 00000000 00000017
> [???30.575000] 1d60: 00000004 eef98580 ee8e3680 c011a424 00000004 c0115c20
> ee19f880 00000000
> [???30.583156] 1d80: ee19f900 ee2ecd80 ee19f880 c014a55c c014a460 ee19f880
> eef98a00 00000000
> [???30.591312] 1da0: a0000193 c0e07efc 00000017 c0115888 00000004 ee1a1e68
> ee1a0000 eef98580
> [???30.599469] 1dc0: ee8e3680 c01012ac 1514622a 00000000 ee19f900 c0149578
> eef98a00 ee19f900
> [???30.607626] 1de0: 00000001 00000000 eef98a38 00000000 000043e1 c014e11c
> ee2ecd00 ee19f900
> [???30.615781] 1e00: 00000010 00000000 00000006 00000000 00000000 edc45440
> c0d992c4 00000000
> [???30.623938] 1e20: 00000001 00000000 00000000 00000001 00004b4e 00000000
> 00000001 c0e5f000
> [???30.632095] 1e40: 00000000 00000000 ee19f900 ee19f900 c05b0c58 60000113
> ffffffff ee1a1e9c
> [???30.640251] 1e60: 00000000 c010bd78 00000001 40000193 00000000 00000000
> ee3e03d0 ee3e03f8
> [???30.648408] 1e80: c05afef8 ee303000 00000000 00000000 eef98580 ee8e3680
> 80000000 ee1a1eb8
> [???30.656566] 1ea0: c017cda0 c05b0c58 60000113 ffffffff 00000051 00000000
> edc0bc00 ee303000
> [???30.664722] 1ec0: c05afef8 c05aff2c edc0bc20 c045ec1c eef95c80 eef95c80
> 00000001 eea82d5c
> [???30.672886] 1ee0: edc0bd98 00000000 ee3031c0 ee303218 c0eab740 c05afcc4
> ee8e3680 ee3031c0
> [???30.681045] 1f00: eef9b800 00000000 eef98580 c0135824 eef98598 c0e02100
> eef98580 ee8e3698
> [???30.689202] 1f20: 00000008 eef98598 c0e02100 ee1a0000 eef98580 c0135a74
> ee840f80 ee8e3680
> [???30.697358] 1f40: c0135a3c 00000000 ee840f80 ee8e3680 c0135a3c 00000000
> 00000000 00000000
> [???30.705515] 1f60: 00000000 c013af18 00000000 00000000 00000000 ee8e3680
> 00000000 00000000
> [???30.713672] 1f80: ee1a1f80 ee1a1f80 00000001 00010001 ee1a1f90 ee1a1f90
> ee1a1fac ee840f80
> [???30.721827] 1fa0: c013ae3c 00000000 00000000 c01078b8 00000000 00000000
> 00000000 00000000
> [???30.729983] 1fc0: 00000000 00000000 00000000 00000000 00000000 00000000
> 00000000 00000000
> [???30.738140] 1fe0: 00000000 00000000 00000000 00000000 00000013 00000000
> 00000000 00000000
> [???30.746304] [<c013b8a8>] (kthread_data) from [<c01366e0>]
> (wq_worker_sleeping+0x8/0xc8)
> [???30.754292] [<c01366e0>] (wq_worker_sleeping) from [<c0833a68>]
> (__schedule+0x45c/0x6f0)
> [???30.762364] [<c0833a68>] (__schedule) from [<c0833d4c>]
> (schedule+0x50/0xb4)
> [???30.769394] [<c0833d4c>] (schedule) from [<c012277c>] (do_exit+0x6e8/0xa90)
> [???30.776340] [<c012277c>] (do_exit) from [<c010b6f8>] (die+0x470/0x488)
> [???30.782853] [<c010b6f8>] (die) from [<c011a424>]
> (__do_kernel_fault.part.0+0x64/0x1e4)
> [???30.790751] [<c011a424>] (__do_kernel_fault.part.0) from [<c0115c20>]
> (do_page_fault+0x398/0x3a4)
> [???30.799601] [<c0115c20>] (do_page_fault) from [<c01012ac>]
> (do_DataAbort+0x38/0xb8)
> [???30.807238] [<c01012ac>] (do_DataAbort) from [<c010bd78>]
> (__dabt_svc+0x58/0x80)
> [???30.814613] Exception stack(0xee1a1e68 to 0xee1a1eb0)
> [???30.819650] 1e60:???????????????????00000001 40000193 00000000 00000000
> ee3e03d0 ee3e03f8
> [???30.827807] 1e80: c05afef8 ee303000 00000000 00000000 eef98580 ee8e3680
> 80000000 ee1a1eb8
> [???30.835962] 1ea0: c017cda0 c05b0c58 60000113 ffffffff
> [???30.841002] [<c010bd78>] (__dabt_svc) from [<c05b0c58>]
> (sbs_external_power_changed+0x50/0x5c)
> [???30.849593] [<c05b0c58>] (sbs_external_power_changed) from [<c05aff2c>]
> (__power_supply_changed_work+0x34/0x3c)
> [???30.859660] [<c05aff2c>] (__power_supply_changed_work) from [<c045ec1c>]
> (class_for_each_device+0x4c/0xb4)
> [???30.869291] [<c045ec1c>] (class_for_each_device) from [<c05afcc4>]
> (power_supply_changed_work+0x5c/0xb0)
> [???30.878762] [<c05afcc4>] (power_supply_changed_work) from [<c0135824>]
> (process_one_work+0x124/0x33c)
> [???30.887963] [<c0135824>] (process_one_work) from [<c0135a74>]
> (worker_thread+0x38/0x4d4)
> [???30.896034] [<c0135a74>] (worker_thread) from [<c013af18>]
> (kthread+0xdc/0xf4)
> [???30.903240] [<c013af18>] (kthread) from [<c01078b8>]
> (ret_from_fork+0x14/0x3c)
> [???30.910443] Code: e34c00a4 ebff90d2 eafffff2 e5903418 (e5130014)?
> [???30.916520] ---[ end trace 083d55597e9a2255 ]---
> [???30.921122] Fixing recursive fault but reboot is needed!
>
>
--
Paul Kocialkowski, developer of low-level free software for embedded devices
Website: https://www.paulk.fr/
Coding blog: https://code.paulk.fr/
Git repositories: https://git.paulk.fr/ https://git.code.paulk.fr/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: This is a digitally signed message part
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20160921/e1152088/attachment.sig>
^ permalink raw reply
* [PATCH] usb: dwc3: host: inherit dma configuration from parent dev
From: Sriram Dash @ 2016-09-21 11:06 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <3189648.KnWLgq0lTY@wuerfel>
From: linux-usb-owner@vger.kernel.org [mailto:linux-usb-owner at vger.kernel.org]
>On Wednesday, September 7, 2016 1:24:07 PM CEST Felipe Balbi wrote:
>>
>> Hi,
>>
>> Arnd Bergmann <arnd@arndb.de> writes:
>>
>> [...]
>>
>> > Regarding the DMA configuration that you mention in
>> > ci_hdrc_add_device(), I think we should replace
>> >
>> > pdev->dev.dma_mask = dev->dma_mask;
>> > pdev->dev.dma_parms = dev->dma_parms;
>> > dma_set_coherent_mask(&pdev->dev, dev->coherent_dma_mask);
>> >
>> > with of_dma_configure(), which has the chance to configure more than
>> > just those three, as the dma API might look into different aspects:
>> >
>> > - iommu specific configuration
>> > - cache coherency information
>> > - bus type
>> > - dma offset
>> > - dma_map_ops pointer
>> >
>> > We try to handle everything in of_dma_configure() at configuration
>> > time, and that would be the place to add anything else that we might
>> > need in the future.
>>
>> There are a couple problems with this:
>>
>> 1) won't work for PCI-based systems.
>>
>> DWC3 is used in production PCI-based HW and also in Synopsys HAPS DX
>> platform (FPGA that appears like a PCI card to host PC)
>
>Right, I was specifically talking about the code in chipidea here, which I think is
>never used on the PCI bus, and how the current code is broken. We can probably do
>better than of_dma_configure() (see below), but it would be an improvement.
>
>> 2) not very robust solution
>>
>> of_dma_configure() will hardcode 32-bit DMA dmask for xhci-plat
>> because that's not created by DT. The only reason why this works at
>> all is because of the default 32-bit dma mask thing :-) So, how is it
>> any different than copying 32-bit dma mask from parent?
>
>The idea here is that you pass in the parent of_node along with the child device
>pointer, so it would behave exactly like the parent already does.
>The difference is that it also handles all the other attributes besides the mask.
>
>However, to summarize the discussion so far, I agree that
>of_dma_configure() is not the solution to these problems, and I think we can do
>much better:
>
>Splitting the usb_bus->controller field into the Linux-internal device (used for the
>sysfs hierarchy, for printks and for power management) and a new pointer (used for
>DMA, DT enumeration and phy lookup) probably covers all that we really need.
>
>I've prototyped it below, with the dwc3, xhci and chipidea changes together with
>the core changes. I've surely made mistakes there and don't expect it to work out
>of the box, but this should give an idea of how I think this can all be solved in the
>least invasive way.
>
Hello Arnd,
We tried this patch on NXP platforms (ls2085 and ls1043) which use dwc3
controller without any glue layer. On first go, this did not work. But after
minimal reworks mention snippet below, we are able to verify that the USB
was working OK.
drivers/usb/host/xhci-mem.c | 12 ++++++------
drivers/usb/host/xhci.c | 20 ++++++++++----------
- struct device *dev = xhci_to_hcd(xhci)->self.controller;
+ struct device *dev = xhci_to_hcd(xhci)->self.sysdev;
We believe the patch needs little modification to work or there might be chances
we may have missed something. Any idea?
Regards,
Sriram
>I noticed that the gadget interface already has a way to handle the DMA allocation
>by device, so I added that in as well.
>
>Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>
> drivers/usb/chipidea/core.c | 4 ----
> drivers/usb/chipidea/host.c | 3 ++-
> drivers/usb/chipidea/udc.c | 8 ++++----
> drivers/usb/core/buffer.c | 12 ++++++------
> drivers/usb/core/hcd.c | 48 +++++++++++++++++++++++++++++------------------
>-
> drivers/usb/core/usb.c | 16 ++++++++--------
> drivers/usb/dwc3/core.c | 28 +++++++++++++++-------------
> drivers/usb/dwc3/core.h | 1 +
> drivers/usb/dwc3/dwc3-exynos.c | 10 ----------
> drivers/usb/dwc3/dwc3-st.c | 1 -
> drivers/usb/dwc3/ep0.c | 8 ++++----
> drivers/usb/dwc3/gadget.c | 34 +++++++++++++++++-----------------
> drivers/usb/dwc3/host.c | 13 ++++---------
> drivers/usb/host/ehci-fsl.c | 4 ++--
> drivers/usb/host/xhci-plat.c | 32 +++++++++++++++++++++++++-------
> include/linux/usb.h | 1 +
> include/linux/usb/hcd.h | 3 +++
>
>diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c index
>69426e644d17..dff69837b349 100644
>--- a/drivers/usb/chipidea/core.c
>+++ b/drivers/usb/chipidea/core.c
>@@ -833,10 +833,6 @@ struct platform_device *ci_hdrc_add_device(struct device
>*dev,
> }
>
> pdev->dev.parent = dev;
>- pdev->dev.dma_mask = dev->dma_mask;
>- pdev->dev.dma_parms = dev->dma_parms;
>- dma_set_coherent_mask(&pdev->dev, dev->coherent_dma_mask);
>-
> ret = platform_device_add_resources(pdev, res, nres);
> if (ret)
> goto err;
>diff --git a/drivers/usb/chipidea/host.c b/drivers/usb/chipidea/host.c index
>053bac9d983c..40d29c4d7772 100644
>--- a/drivers/usb/chipidea/host.c
>+++ b/drivers/usb/chipidea/host.c
>@@ -113,7 +113,8 @@ static int host_start(struct ci_hdrc *ci)
> if (usb_disabled())
> return -ENODEV;
>
>- hcd = usb_create_hcd(&ci_ehci_hc_driver, ci->dev, dev_name(ci->dev));
>+ hcd = __usb_create_hcd(&ci_ehci_hc_driver, ci->dev->parent,
>+ ci->dev, dev_name(ci->dev), NULL);
> if (!hcd)
> return -ENOMEM;
>
>diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c index
>0f692fcda638..4cbfff7934c6 100644
>--- a/drivers/usb/chipidea/udc.c
>+++ b/drivers/usb/chipidea/udc.c
>@@ -424,7 +424,7 @@ static int _hardware_enqueue(struct ci_hw_ep *hwep,
>struct ci_hw_req *hwreq)
>
> hwreq->req.status = -EALREADY;
>
>- ret = usb_gadget_map_request(&ci->gadget, &hwreq->req, hwep->dir);
>+ ret = usb_gadget_map_request_by_dev(&ci->dev->parent, &hwreq->req,
>+hwep->dir);
> if (ret)
> return ret;
>
>@@ -604,7 +604,7 @@ static int _hardware_dequeue(struct ci_hw_ep *hwep,
>struct ci_hw_req *hwreq)
> list_del_init(&node->td);
> }
>
>- usb_gadget_unmap_request(&hwep->ci->gadget, &hwreq->req, hwep-
>>dir);
>+ usb_gadget_unmap_request_by_dev(&hwep->ci->dev->parent, &hwreq-
>>req,
>+hwep->dir);
>
> hwreq->req.actual += actual;
>
>@@ -1898,13 +1898,13 @@ static int udc_start(struct ci_hdrc *ci)
> INIT_LIST_HEAD(&ci->gadget.ep_list);
>
> /* alloc resources */
>- ci->qh_pool = dma_pool_create("ci_hw_qh", dev,
>+ ci->qh_pool = dma_pool_create("ci_hw_qh", dev->parent,
> sizeof(struct ci_hw_qh),
> 64, CI_HDRC_PAGE_SIZE);
> if (ci->qh_pool == NULL)
> return -ENOMEM;
>
>- ci->td_pool = dma_pool_create("ci_hw_td", dev,
>+ ci->td_pool = dma_pool_create("ci_hw_td", dev->parent,
> sizeof(struct ci_hw_td),
> 64, CI_HDRC_PAGE_SIZE);
> if (ci->td_pool == NULL) {
>diff --git a/drivers/usb/core/buffer.c b/drivers/usb/core/buffer.c index
>98e39f91723a..1e41ef7f3c1f 100644
>--- a/drivers/usb/core/buffer.c
>+++ b/drivers/usb/core/buffer.c
>@@ -63,7 +63,7 @@ int hcd_buffer_create(struct usb_hcd *hcd)
> int i, size;
>
> if (!IS_ENABLED(CONFIG_HAS_DMA) ||
>- (!hcd->self.controller->dma_mask &&
>+ (!hcd->self.sysdev->dma_mask &&
> !(hcd->driver->flags & HCD_LOCAL_MEM)))
> return 0;
>
>@@ -72,7 +72,7 @@ int hcd_buffer_create(struct usb_hcd *hcd)
> if (!size)
> continue;
> snprintf(name, sizeof(name), "buffer-%d", size);
>- hcd->pool[i] = dma_pool_create(name, hcd->self.controller,
>+ hcd->pool[i] = dma_pool_create(name, hcd->self.sysdev,
> size, size, 0);
> if (!hcd->pool[i]) {
> hcd_buffer_destroy(hcd);
>@@ -127,7 +127,7 @@ void *hcd_buffer_alloc(
>
> /* some USB hosts just use PIO */
> if (!IS_ENABLED(CONFIG_HAS_DMA) ||
>- (!bus->controller->dma_mask &&
>+ (!bus->sysdev->dma_mask &&
> !(hcd->driver->flags & HCD_LOCAL_MEM))) {
> *dma = ~(dma_addr_t) 0;
> return kmalloc(size, mem_flags);
>@@ -137,7 +137,7 @@ void *hcd_buffer_alloc(
> if (size <= pool_max[i])
> return dma_pool_alloc(hcd->pool[i], mem_flags, dma);
> }
>- return dma_alloc_coherent(hcd->self.controller, size, dma, mem_flags);
>+ return dma_alloc_coherent(hcd->self.sysdev, size, dma, mem_flags);
> }
>
> void hcd_buffer_free(
>@@ -154,7 +154,7 @@ void hcd_buffer_free(
> return;
>
> if (!IS_ENABLED(CONFIG_HAS_DMA) ||
>- (!bus->controller->dma_mask &&
>+ (!bus->sysdev->dma_mask &&
> !(hcd->driver->flags & HCD_LOCAL_MEM))) {
> kfree(addr);
> return;
>@@ -166,5 +166,5 @@ void hcd_buffer_free(
> return;
> }
> }
>- dma_free_coherent(hcd->self.controller, size, addr, dma);
>+ dma_free_coherent(hcd->self.sysdev, size, addr, dma);
> }
>diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index
>746c47d86cf5..70d48941f8f4 100644
>--- a/drivers/usb/core/hcd.c
>+++ b/drivers/usb/core/hcd.c
>@@ -1072,6 +1072,7 @@ static void usb_deregister_bus (struct usb_bus *bus)
>static int register_root_hub(struct usb_hcd *hcd) {
> struct device *parent_dev = hcd->self.controller;
>+ struct device *sysdev = hcd->self.sysdev;
> struct usb_device *usb_dev = hcd->self.root_hub;
> const int devnum = 1;
> int retval;
>@@ -1118,7 +1119,7 @@ static int register_root_hub(struct usb_hcd *hcd)
> /* Did the HC die before the root hub was registered? */
> if (HCD_DEAD(hcd))
> usb_hc_died (hcd); /* This time clean up */
>- usb_dev->dev.of_node = parent_dev->of_node;
>+ usb_dev->dev.of_node = sysdev->of_node;
> }
> mutex_unlock(&usb_bus_idr_lock);
>
>@@ -1464,19 +1465,19 @@ void usb_hcd_unmap_urb_for_dma(struct usb_hcd
>*hcd, struct urb *urb)
> dir = usb_urb_dir_in(urb) ? DMA_FROM_DEVICE : DMA_TO_DEVICE;
> if (IS_ENABLED(CONFIG_HAS_DMA) &&
> (urb->transfer_flags & URB_DMA_MAP_SG))
>- dma_unmap_sg(hcd->self.controller,
>+ dma_unmap_sg(hcd->self.sysdev,
> urb->sg,
> urb->num_sgs,
> dir);
> else if (IS_ENABLED(CONFIG_HAS_DMA) &&
> (urb->transfer_flags & URB_DMA_MAP_PAGE))
>- dma_unmap_page(hcd->self.controller,
>+ dma_unmap_page(hcd->self.sysdev,
> urb->transfer_dma,
> urb->transfer_buffer_length,
> dir);
> else if (IS_ENABLED(CONFIG_HAS_DMA) &&
> (urb->transfer_flags & URB_DMA_MAP_SINGLE))
>- dma_unmap_single(hcd->self.controller,
>+ dma_unmap_single(hcd->self.sysdev,
> urb->transfer_dma,
> urb->transfer_buffer_length,
> dir);
>@@ -1519,11 +1520,11 @@ int usb_hcd_map_urb_for_dma(struct usb_hcd *hcd,
>struct urb *urb,
> return ret;
> if (IS_ENABLED(CONFIG_HAS_DMA) && hcd->self.uses_dma) {
> urb->setup_dma = dma_map_single(
>- hcd->self.controller,
>+ hcd->self.sysdev,
> urb->setup_packet,
> sizeof(struct usb_ctrlrequest),
> DMA_TO_DEVICE);
>- if (dma_mapping_error(hcd->self.controller,
>+ if (dma_mapping_error(hcd->self.sysdev,
> urb->setup_dma))
> return -EAGAIN;
> urb->transfer_flags |= URB_SETUP_MAP_SINGLE; @@ -
>1554,7 +1555,7 @@ int usb_hcd_map_urb_for_dma(struct usb_hcd *hcd, struct urb
>*urb,
> }
>
> n = dma_map_sg(
>- hcd->self.controller,
>+ hcd->self.sysdev,
> urb->sg,
> urb->num_sgs,
> dir);
>@@ -1569,12 +1570,12 @@ int usb_hcd_map_urb_for_dma(struct usb_hcd *hcd,
>struct urb *urb,
> } else if (urb->sg) {
> struct scatterlist *sg = urb->sg;
> urb->transfer_dma = dma_map_page(
>- hcd->self.controller,
>+ hcd->self.sysdev,
> sg_page(sg),
> sg->offset,
> urb->transfer_buffer_length,
> dir);
>- if (dma_mapping_error(hcd->self.controller,
>+ if (dma_mapping_error(hcd->self.sysdev,
> urb->transfer_dma))
> ret = -EAGAIN;
> else
>@@ -1584,11 +1585,11 @@ int usb_hcd_map_urb_for_dma(struct usb_hcd *hcd,
>struct urb *urb,
> ret = -EAGAIN;
> } else {
> urb->transfer_dma = dma_map_single(
>- hcd->self.controller,
>+ hcd->self.sysdev,
> urb->transfer_buffer,
> urb->transfer_buffer_length,
> dir);
>- if (dma_mapping_error(hcd->self.controller,
>+ if (dma_mapping_error(hcd->self.sysdev,
> urb->transfer_dma))
> ret = -EAGAIN;
> else
>@@ -2510,8 +2511,8 @@ static void init_giveback_urb_bh(struct giveback_urb_bh
>*bh)
> * Return: On success, a pointer to the created and initialized HCD structure.
> * On failure (e.g. if memory is unavailable), %NULL.
> */
>-struct usb_hcd *usb_create_shared_hcd(const struct hc_driver *driver,
>- struct device *dev, const char *bus_name,
>+struct usb_hcd *__usb_create_hcd(const struct hc_driver *driver,
>+ struct device *sysdev, struct device *dev, const char *bus_name,
> struct usb_hcd *primary_hcd)
> {
> struct usb_hcd *hcd;
>@@ -2552,8 +2553,9 @@ struct usb_hcd *usb_create_shared_hcd(const struct
>hc_driver *driver,
>
> usb_bus_init(&hcd->self);
> hcd->self.controller = dev;
>+ hcd->self.sysdev = sysdev;
> hcd->self.bus_name = bus_name;
>- hcd->self.uses_dma = (dev->dma_mask != NULL);
>+ hcd->self.uses_dma = (sysdev->dma_mask != NULL);
>
> init_timer(&hcd->rh_timer);
> hcd->rh_timer.function = rh_timer_func; @@ -2568,6 +2570,14 @@ struct
>usb_hcd *usb_create_shared_hcd(const struct hc_driver *driver,
> "USB Host Controller";
> return hcd;
> }
>+EXPORT_SYMBOL_GPL(__usb_create_hcd);
>+
>+struct usb_hcd *usb_create_shared_hcd(const struct hc_driver *driver,
>+ struct device *dev, const char *bus_name,
>+ struct usb_hcd *primary_hcd)
>+{
>+ return __usb_create_hcd(driver, dev, dev, bus_name, primary_hcd); }
> EXPORT_SYMBOL_GPL(usb_create_shared_hcd);
>
> /**
>@@ -2587,7 +2597,7 @@ EXPORT_SYMBOL_GPL(usb_create_shared_hcd);
> struct usb_hcd *usb_create_hcd(const struct hc_driver *driver,
> struct device *dev, const char *bus_name) {
>- return usb_create_shared_hcd(driver, dev, bus_name, NULL);
>+ return __usb_create_hcd(driver, dev, dev, bus_name, NULL);
> }
> EXPORT_SYMBOL_GPL(usb_create_hcd);
>
>@@ -2714,7 +2724,7 @@ int usb_add_hcd(struct usb_hcd *hcd,
> struct usb_device *rhdev;
>
> if (IS_ENABLED(CONFIG_USB_PHY) && !hcd->usb_phy) {
>- struct usb_phy *phy = usb_get_phy_dev(hcd->self.controller, 0);
>+ struct usb_phy *phy = usb_get_phy_dev(hcd->self.sysdev, 0);
>
> if (IS_ERR(phy)) {
> retval = PTR_ERR(phy);
>@@ -2732,7 +2742,7 @@ int usb_add_hcd(struct usb_hcd *hcd,
> }
>
> if (IS_ENABLED(CONFIG_GENERIC_PHY) && !hcd->phy) {
>- struct phy *phy = phy_get(hcd->self.controller, "usb");
>+ struct phy *phy = phy_get(hcd->self.sysdev, "usb");
>
> if (IS_ERR(phy)) {
> retval = PTR_ERR(phy);
>@@ -2780,7 +2790,7 @@ int usb_add_hcd(struct usb_hcd *hcd,
> */
> retval = hcd_buffer_create(hcd);
> if (retval != 0) {
>- dev_dbg(hcd->self.controller, "pool alloc failed\n");
>+ dev_dbg(hcd->self.sysdev, "pool alloc failed\n");
> goto err_create_buf;
> }
>
>@@ -2790,7 +2800,7 @@ int usb_add_hcd(struct usb_hcd *hcd,
>
> rhdev = usb_alloc_dev(NULL, &hcd->self, 0);
> if (rhdev == NULL) {
>- dev_err(hcd->self.controller, "unable to allocate root hub\n");
>+ dev_err(hcd->self.sysdev, "unable to allocate root hub\n");
> retval = -ENOMEM;
> goto err_allocate_root_hub;
> }
>diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c index
>5e80697ef952..199f67ae8857 100644
>--- a/drivers/usb/core/usb.c
>+++ b/drivers/usb/core/usb.c
>@@ -440,8 +440,8 @@ struct usb_device *usb_alloc_dev(struct usb_device
>*parent,
> dev->dev.bus = &usb_bus_type;
> dev->dev.type = &usb_device_type;
> dev->dev.groups = usb_device_groups;
>- dev->dev.dma_mask = bus->controller->dma_mask;
>- set_dev_node(&dev->dev, dev_to_node(bus->controller));
>+ dev->dev.dma_mask = bus->sysdev->dma_mask;
>+ set_dev_node(&dev->dev, dev_to_node(bus->sysdev));
> dev->state = USB_STATE_ATTACHED;
> dev->lpm_disable_count = 1;
> atomic_set(&dev->urbnum, 0);
>@@ -789,7 +789,7 @@ struct urb *usb_buffer_map(struct urb *urb)
> if (!urb
> || !urb->dev
> || !(bus = urb->dev->bus)
>- || !(controller = bus->controller))
>+ || !(controller = bus->sysdev))
> return NULL;
>
> if (controller->dma_mask) {
>@@ -827,7 +827,7 @@ void usb_buffer_dmasync(struct urb *urb)
> || !(urb->transfer_flags &
>URB_NO_TRANSFER_DMA_MAP)
> || !urb->dev
> || !(bus = urb->dev->bus)
>- || !(controller = bus->controller))
>+ || !(controller = bus->sysdev))
> return;
>
> if (controller->dma_mask) {
>@@ -861,7 +861,7 @@ void usb_buffer_unmap(struct urb *urb)
> || !(urb->transfer_flags &
>URB_NO_TRANSFER_DMA_MAP)
> || !urb->dev
> || !(bus = urb->dev->bus)
>- || !(controller = bus->controller))
>+ || !(controller = bus->sysdev))
> return;
>
> if (controller->dma_mask) {
>@@ -911,7 +911,7 @@ int usb_buffer_map_sg(const struct usb_device *dev, int
>is_in,
>
> if (!dev
> || !(bus = dev->bus)
>- || !(controller = bus->controller)
>+ || !(controller = bus->sysdev)
> || !controller->dma_mask)
> return -EINVAL;
>
>@@ -947,7 +947,7 @@ void usb_buffer_dmasync_sg(const struct usb_device *dev,
>int is_in,
>
> if (!dev
> || !(bus = dev->bus)
>- || !(controller = bus->controller)
>+ || !(controller = bus->sysdev)
> || !controller->dma_mask)
> return;
>
>@@ -975,7 +975,7 @@ void usb_buffer_unmap_sg(const struct usb_device *dev,
>int is_in,
>
> if (!dev
> || !(bus = dev->bus)
>- || !(controller = bus->controller)
>+ || !(controller = bus->sysdev)
> || !controller->dma_mask)
> return;
>
>diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index
>35d092456bec..08db66c64c66 100644
>--- a/drivers/usb/dwc3/core.c
>+++ b/drivers/usb/dwc3/core.c
>@@ -25,6 +25,7 @@
> #include <linux/slab.h>
> #include <linux/spinlock.h>
> #include <linux/platform_device.h>
>+#include <linux/pci.h>
> #include <linux/pm_runtime.h>
> #include <linux/interrupt.h>
> #include <linux/ioport.h>
>@@ -178,7 +179,7 @@ static void dwc3_frame_length_adjustment(struct dwc3
>*dwc) static void dwc3_free_one_event_buffer(struct dwc3 *dwc,
> struct dwc3_event_buffer *evt)
> {
>- dma_free_coherent(dwc->dev, evt->length, evt->buf, evt->dma);
>+ dma_free_coherent(dwc->sysdev, evt->length, evt->buf, evt->dma);
> }
>
> /**
>@@ -200,7 +201,7 @@ static struct dwc3_event_buffer
>*dwc3_alloc_one_event_buffer(struct dwc3 *dwc,
>
> evt->dwc = dwc;
> evt->length = length;
>- evt->buf = dma_alloc_coherent(dwc->dev, length,
>+ evt->buf = dma_alloc_coherent(dwc->sysdev, length,
> &evt->dma, GFP_KERNEL);
> if (!evt->buf)
> return ERR_PTR(-ENOMEM);
>@@ -319,11 +320,11 @@ static int dwc3_setup_scratch_buffers(struct dwc3 *dwc)
> if (!WARN_ON(dwc->scratchbuf))
> return 0;
>
>- scratch_addr = dma_map_single(dwc->dev, dwc->scratchbuf,
>+ scratch_addr = dma_map_single(dwc->sysdev, dwc->scratchbuf,
> dwc->nr_scratch * DWC3_SCRATCHBUF_SIZE,
> DMA_BIDIRECTIONAL);
>- if (dma_mapping_error(dwc->dev, scratch_addr)) {
>- dev_err(dwc->dev, "failed to map scratch buffer\n");
>+ if (dma_mapping_error(dwc->sysdev, scratch_addr)) {
>+ dev_err(dwc->sysdev, "failed to map scratch buffer\n");
> ret = -EFAULT;
> goto err0;
> }
>@@ -347,7 +348,7 @@ static int dwc3_setup_scratch_buffers(struct dwc3 *dwc)
> return 0;
>
> err1:
>- dma_unmap_single(dwc->dev, dwc->scratch_addr, dwc->nr_scratch *
>+ dma_unmap_single(dwc->sysdev, dwc->scratch_addr, dwc->nr_scratch *
> DWC3_SCRATCHBUF_SIZE, DMA_BIDIRECTIONAL);
>
> err0:
>@@ -366,7 +367,7 @@ static void dwc3_free_scratch_buffers(struct dwc3 *dwc)
> if (!WARN_ON(dwc->scratchbuf))
> return;
>
>- dma_unmap_single(dwc->dev, dwc->scratch_addr, dwc->nr_scratch *
>+ dma_unmap_single(dwc->sysdev, dwc->scratch_addr, dwc->nr_scratch *
> DWC3_SCRATCHBUF_SIZE, DMA_BIDIRECTIONAL);
> kfree(dwc->scratchbuf);
> }
>@@ -846,6 +847,13 @@ static int dwc3_probe(struct platform_device *pdev)
> dwc = PTR_ALIGN(mem, DWC3_ALIGN_MASK + 1);
> dwc->mem = mem;
> dwc->dev = dev;
>+#ifdef CONFIG_PCI
>+ /* TODO: or some other way of detecting this? */
>+ if (dwc->dev->parent && dwc->dev->parent->bus == &pci_bus_type)
>+ dwc->sysdev = dwc->dev->parent;
>+ else
>+#endif
>+ dwc->sysdev = dwc->dev;
>
> res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> if (!res) {
>@@ -949,12 +957,6 @@ static int dwc3_probe(struct platform_device *pdev)
>
> spin_lock_init(&dwc->lock);
>
>- if (!dev->dma_mask) {
>- dev->dma_mask = dev->parent->dma_mask;
>- dev->dma_parms = dev->parent->dma_parms;
>- dma_set_coherent_mask(dev, dev->parent-
>>coherent_dma_mask);
>- }
>-
> pm_runtime_set_active(dev);
> pm_runtime_use_autosuspend(dev);
> pm_runtime_set_autosuspend_delay(dev,
>DWC3_DEFAULT_AUTOSUSPEND_DELAY); diff --git a/drivers/usb/dwc3/core.h
>b/drivers/usb/dwc3/core.h index 45d6de5107c7..2fbc92143ab9 100644
>--- a/drivers/usb/dwc3/core.h
>+++ b/drivers/usb/dwc3/core.h
>@@ -823,6 +823,7 @@ struct dwc3 {
> spinlock_t lock;
>
> struct device *dev;
>+ struct device *sysdev;
>
> struct platform_device *xhci;
> struct resource xhci_resources[DWC3_XHCI_RESOURCES_NUM];
>diff --git a/drivers/usb/dwc3/dwc3-exynos.c b/drivers/usb/dwc3/dwc3-exynos.c
>index 2f1fb7e7aa54..e27899bb5706 100644
>--- a/drivers/usb/dwc3/dwc3-exynos.c
>+++ b/drivers/usb/dwc3/dwc3-exynos.c
>@@ -20,7 +20,6 @@
> #include <linux/kernel.h>
> #include <linux/slab.h>
> #include <linux/platform_device.h>
>-#include <linux/dma-mapping.h>
> #include <linux/clk.h>
> #include <linux/usb/otg.h>
> #include <linux/usb/usb_phy_generic.h>
>@@ -117,15 +116,6 @@ static int dwc3_exynos_probe(struct platform_device
>*pdev)
> if (!exynos)
> return -ENOMEM;
>
>- /*
>- * Right now device-tree probed devices don't get dma_mask set.
>- * Since shared usb code relies on it, set it here for now.
>- * Once we move to full device tree support this will vanish off.
>- */
>- ret = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(32));
>- if (ret)
>- return ret;
>-
> platform_set_drvdata(pdev, exynos);
>
> exynos->dev = dev;
>diff --git a/drivers/usb/dwc3/dwc3-st.c b/drivers/usb/dwc3/dwc3-st.c index
>89a2f712fdfe..4d7439cb8cd8 100644
>--- a/drivers/usb/dwc3/dwc3-st.c
>+++ b/drivers/usb/dwc3/dwc3-st.c
>@@ -218,7 +218,6 @@ static int st_dwc3_probe(struct platform_device *pdev)
> if (IS_ERR(regmap))
> return PTR_ERR(regmap);
>
>- dma_set_coherent_mask(dev, dev->coherent_dma_mask);
> dwc3_data->dev = dev;
> dwc3_data->regmap = regmap;
>
>diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c index
>ae4c5e89c134..9cda9ee91b9d 100644
>--- a/drivers/usb/dwc3/ep0.c
>+++ b/drivers/usb/dwc3/ep0.c
>@@ -974,8 +974,8 @@ static void __dwc3_ep0_do_control_data(struct dwc3
>*dwc,
> u32 transfer_size = 0;
> u32 maxpacket;
>
>- ret = usb_gadget_map_request(&dwc->gadget, &req->request,
>- dep->number);
>+ ret = usb_gadget_map_request_by_dev(dwc->sysdev,
>+ &req->request, dep->number);
> if (ret) {
> dwc3_trace(trace_dwc3_ep0, "failed to map request");
> return;
>@@ -1002,8 +1002,8 @@ static void __dwc3_ep0_do_control_data(struct dwc3
>*dwc,
> dwc->ep0_bounce_addr, transfer_size,
> DWC3_TRBCTL_CONTROL_DATA, false);
> } else {
>- ret = usb_gadget_map_request(&dwc->gadget, &req->request,
>- dep->number);
>+ ret = usb_gadget_map_request_by_dev(dwc->sysdev,
>+ &req->request, dep->number);
> if (ret) {
> dwc3_trace(trace_dwc3_ep0, "failed to map request");
> return;
>diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index
>122e64df2f4d..77d62ce4547f 100644
>--- a/drivers/usb/dwc3/gadget.c
>+++ b/drivers/usb/dwc3/gadget.c
>@@ -192,8 +192,8 @@ void dwc3_gadget_giveback(struct dwc3_ep *dep, struct
>dwc3_request *req,
> if (dwc->ep0_bounced && dep->number == 0)
> dwc->ep0_bounced = false;
> else
>- usb_gadget_unmap_request(&dwc->gadget, &req->request,
>- req->direction);
>+ usb_gadget_unmap_request_by_dev(dwc->sysdev,
>+ &req->request, req->direction);
>
> trace_dwc3_gadget_giveback(req);
>
>@@ -371,7 +371,7 @@ static int dwc3_alloc_trb_pool(struct dwc3_ep *dep)
> if (dep->trb_pool)
> return 0;
>
>- dep->trb_pool = dma_alloc_coherent(dwc->dev,
>+ dep->trb_pool = dma_alloc_coherent(dwc->sysdev,
> sizeof(struct dwc3_trb) * DWC3_TRB_NUM,
> &dep->trb_pool_dma, GFP_KERNEL);
> if (!dep->trb_pool) {
>@@ -387,7 +387,7 @@ static void dwc3_free_trb_pool(struct dwc3_ep *dep) {
> struct dwc3 *dwc = dep->dwc;
>
>- dma_free_coherent(dwc->dev, sizeof(struct dwc3_trb) *
>DWC3_TRB_NUM,
>+ dma_free_coherent(dwc->sysdev, sizeof(struct dwc3_trb) *
>DWC3_TRB_NUM,
> dep->trb_pool, dep->trb_pool_dma);
>
> dep->trb_pool = NULL;
>@@ -1027,8 +1027,8 @@ static int __dwc3_gadget_kick_transfer(struct dwc3_ep
>*dep, u16 cmd_param)
> * here and stop, unmap, free and del each of the linked
> * requests instead of what we do now.
> */
>- usb_gadget_unmap_request(&dwc->gadget, &req->request,
>- req->direction);
>+ usb_gadget_unmap_request_by_dev(dwc->sysdev,
>+ &req->request, req->direction);
> list_del(&req->list);
> return ret;
> }
>@@ -1113,8 +1113,8 @@ static int __dwc3_gadget_ep_queue(struct dwc3_ep
>*dep, struct dwc3_request *req)
> * This will also avoid Host cancelling URBs due to too
> * many NAKs.
> */
>- ret = usb_gadget_map_request(&dwc->gadget, &req->request,
>- dep->direction);
>+ ret = usb_gadget_map_request_by_dev(dwc->sysdev,
>+ &req->request, dep->direction);
> if (ret)
> return ret;
>
>@@ -2953,7 +2953,7 @@ int dwc3_gadget_init(struct dwc3 *dwc)
>
> dwc->irq_gadget = irq;
>
>- dwc->ctrl_req = dma_alloc_coherent(dwc->dev, sizeof(*dwc->ctrl_req),
>+ dwc->ctrl_req = dma_alloc_coherent(dwc->sysdev,
>+sizeof(*dwc->ctrl_req),
> &dwc->ctrl_req_addr, GFP_KERNEL);
> if (!dwc->ctrl_req) {
> dev_err(dwc->dev, "failed to allocate ctrl request\n"); @@ -2961,7
>+2961,7 @@ int dwc3_gadget_init(struct dwc3 *dwc)
> goto err0;
> }
>
>- dwc->ep0_trb = dma_alloc_coherent(dwc->dev, sizeof(*dwc->ep0_trb) * 2,
>+ dwc->ep0_trb = dma_alloc_coherent(dwc->sysdev, sizeof(*dwc->ep0_trb)
>*
>+2,
> &dwc->ep0_trb_addr, GFP_KERNEL);
> if (!dwc->ep0_trb) {
> dev_err(dwc->dev, "failed to allocate ep0 trb\n"); @@ -2975,7
>+2975,7 @@ int dwc3_gadget_init(struct dwc3 *dwc)
> goto err2;
> }
>
>- dwc->ep0_bounce = dma_alloc_coherent(dwc->dev,
>+ dwc->ep0_bounce = dma_alloc_coherent(dwc->sysdev,
> DWC3_EP0_BOUNCE_SIZE, &dwc->ep0_bounce_addr,
> GFP_KERNEL);
> if (!dwc->ep0_bounce) {
>@@ -3047,18 +3047,18 @@ err5:
>
> err4:
> dwc3_gadget_free_endpoints(dwc);
>- dma_free_coherent(dwc->dev, DWC3_EP0_BOUNCE_SIZE,
>+ dma_free_coherent(dwc->sysdev, DWC3_EP0_BOUNCE_SIZE,
> dwc->ep0_bounce, dwc->ep0_bounce_addr);
>
> err3:
> kfree(dwc->setup_buf);
>
> err2:
>- dma_free_coherent(dwc->dev, sizeof(*dwc->ep0_trb),
>+ dma_free_coherent(dwc->sysdev, sizeof(*dwc->ep0_trb),
> dwc->ep0_trb, dwc->ep0_trb_addr);
>
> err1:
>- dma_free_coherent(dwc->dev, sizeof(*dwc->ctrl_req),
>+ dma_free_coherent(dwc->sysdev, sizeof(*dwc->ctrl_req),
> dwc->ctrl_req, dwc->ctrl_req_addr);
>
> err0:
>@@ -3073,16 +3073,16 @@ void dwc3_gadget_exit(struct dwc3 *dwc)
>
> dwc3_gadget_free_endpoints(dwc);
>
>- dma_free_coherent(dwc->dev, DWC3_EP0_BOUNCE_SIZE,
>+ dma_free_coherent(dwc->sysdev, DWC3_EP0_BOUNCE_SIZE,
> dwc->ep0_bounce, dwc->ep0_bounce_addr);
>
> kfree(dwc->setup_buf);
> kfree(dwc->zlp_buf);
>
>- dma_free_coherent(dwc->dev, sizeof(*dwc->ep0_trb),
>+ dma_free_coherent(dwc->sysdev, sizeof(*dwc->ep0_trb),
> dwc->ep0_trb, dwc->ep0_trb_addr);
>
>- dma_free_coherent(dwc->dev, sizeof(*dwc->ctrl_req),
>+ dma_free_coherent(dwc->sysdev, sizeof(*dwc->ctrl_req),
> dwc->ctrl_req, dwc->ctrl_req_addr);
> }
>
>diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c index
>f6533c68fed1..3c078e85fa98 100644
>--- a/drivers/usb/dwc3/host.c
>+++ b/drivers/usb/dwc3/host.c
>@@ -72,12 +72,7 @@ int dwc3_host_init(struct dwc3 *dwc)
> return -ENOMEM;
> }
>
>- dma_set_coherent_mask(&xhci->dev, dwc->dev->coherent_dma_mask);
>-
> xhci->dev.parent = dwc->dev;
>- xhci->dev.dma_mask = dwc->dev->dma_mask;
>- xhci->dev.dma_parms = dwc->dev->dma_parms;
>-
> dwc->xhci = xhci;
>
> ret = platform_device_add_resources(xhci, dwc->xhci_resources, @@ -
>112,9 +107,9 @@ int dwc3_host_init(struct dwc3 *dwc)
> return 0;
> err2:
> phy_remove_lookup(dwc->usb2_generic_phy, "usb2-phy",
>- dev_name(&xhci->dev));
>+ dev_name(dwc->dev));
> phy_remove_lookup(dwc->usb3_generic_phy, "usb3-phy",
>- dev_name(&xhci->dev));
>+ dev_name(dwc->dev));
> err1:
> platform_device_put(xhci);
> return ret;
>@@ -123,8 +118,8 @@ err1:
> void dwc3_host_exit(struct dwc3 *dwc)
> {
> phy_remove_lookup(dwc->usb2_generic_phy, "usb2-phy",
>- dev_name(&dwc->xhci->dev));
>+ dev_name(dwc->dev));
> phy_remove_lookup(dwc->usb3_generic_phy, "usb3-phy",
>- dev_name(&dwc->xhci->dev));
>+ dev_name(dwc->dev));
> platform_device_unregister(dwc->xhci);
> }
>diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c index
>9f5ffb629973..b2419950221f 100644
>--- a/drivers/usb/host/ehci-fsl.c
>+++ b/drivers/usb/host/ehci-fsl.c
>@@ -96,8 +96,8 @@ static int fsl_ehci_drv_probe(struct platform_device *pdev)
> }
> irq = res->start;
>
>- hcd = usb_create_hcd(&fsl_ehci_hc_driver, &pdev->dev,
>- dev_name(&pdev->dev));
>+ hcd = __usb_create_hcd(&fsl_ehci_hc_driver, &pdev->dev.parent,
>+ &pdev->dev, dev_name(&pdev->dev), NULL);
> if (!hcd) {
> retval = -ENOMEM;
> goto err1;
>diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c index
>ed56bf9ed885..c1d69e14432d 100644
>--- a/drivers/usb/host/xhci-plat.c
>+++ b/drivers/usb/host/xhci-plat.c
>@@ -14,6 +14,7 @@
> #include <linux/clk.h>
> #include <linux/dma-mapping.h>
> #include <linux/module.h>
>+#include <linux/pci.h>
> #include <linux/of.h>
> #include <linux/platform_device.h>
> #include <linux/usb/phy.h>
>@@ -139,6 +140,7 @@ static int xhci_plat_probe(struct platform_device *pdev) {
> const struct of_device_id *match;
> const struct hc_driver *driver;
>+ struct device *sysdev;
> struct xhci_hcd *xhci;
> struct resource *res;
> struct usb_hcd *hcd;
>@@ -155,22 +157,38 @@ static int xhci_plat_probe(struct platform_device *pdev)
> if (irq < 0)
> return -ENODEV;
>
>+ /*
>+ * sysdev must point to a device that is known to the system firmware
>+ * or PCI hardware. We handle these three cases here:
>+ * 1. xhci_plat comes from firmware
>+ * 2. xhci_plat is child of a device from firmware (dwc3-plat)
>+ * 3. xhci_plat is grandchild of a pci device (dwc3-pci)
>+ */
>+ sysdev = &pdev->dev;
>+ if (sysdev->parent && !sysdev->of_node && sysdev->parent->of_node)
>+ sysdev = sysdev->parent;
>+#ifdef CONFIG_PCI
>+ else if (sysdev->parent && sysdev->parent->parent &&
>+ sysdev->parent->parent->bus == &pci_bus_type)
>+ sysdev = sysdev->parent->parent;
>+#endif
>+
> /* Try to set 64-bit DMA first */
>- if (WARN_ON(!pdev->dev.dma_mask))
>+ if (WARN_ON(!sysdev->dma_mask))
> /* Platform did not initialize dma_mask */
>- ret = dma_coerce_mask_and_coherent(&pdev->dev,
>+ ret = dma_coerce_mask_and_coherent(sysdev,
> DMA_BIT_MASK(64));
> else
>- ret = dma_set_mask_and_coherent(&pdev->dev,
>DMA_BIT_MASK(64));
>+ ret = dma_set_mask_and_coherent(sysdev, DMA_BIT_MASK(64));
>
> /* If seting 64-bit DMA mask fails, fall back to 32-bit DMA mask */
> if (ret) {
>- ret = dma_set_mask_and_coherent(&pdev->dev,
>DMA_BIT_MASK(32));
>+ ret = dma_set_mask_and_coherent(sysdev, DMA_BIT_MASK(32));
> if (ret)
> return ret;
> }
>
>- hcd = usb_create_hcd(driver, &pdev->dev, dev_name(&pdev->dev));
>+ hcd = __usb_create_hcd(driver, sysdev, &pdev->dev,
>+dev_name(&pdev->dev), NULL);
> if (!hcd)
> return -ENOMEM;
>
>@@ -220,13 +238,13 @@ static int xhci_plat_probe(struct platform_device *pdev)
> goto disable_clk;
> }
>
>- if (device_property_read_bool(&pdev->dev, "usb3-lpm-capable"))
>+ if (device_property_read_bool(sysdev, "usb3-lpm-capable"))
> xhci->quirks |= XHCI_LPM_SUPPORT;
>
> if (HCC_MAX_PSA(xhci->hcc_params) >= 4)
> xhci->shared_hcd->can_do_streams = 1;
>
>- hcd->usb_phy = devm_usb_get_phy_by_phandle(&pdev->dev, "usb-phy",
>0);
>+ hcd->usb_phy = devm_usb_get_phy_by_phandle(sysdev, "usb-phy", 0);
> if (IS_ERR(hcd->usb_phy)) {
> ret = PTR_ERR(hcd->usb_phy);
> if (ret == -EPROBE_DEFER)
>diff --git a/include/linux/usb.h b/include/linux/usb.h index
>eba1f10e8cfd..f3f5d8a396e4 100644
>--- a/include/linux/usb.h
>+++ b/include/linux/usb.h
>@@ -354,6 +354,7 @@ struct usb_devmap {
> */
> struct usb_bus {
> struct device *controller; /* host/master side hardware */
>+ struct device *sysdev; /* as seen from firmware or bus */
> int busnum; /* Bus number (in order of reg) */
> const char *bus_name; /* stable id (PCI slot_name etc) */
> u8 uses_dma; /* Does the host controller use DMA? */
>diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h index
>66fc13705ab7..3860560a61bb 100644
>--- a/include/linux/usb/hcd.h
>+++ b/include/linux/usb/hcd.h
>@@ -437,6 +437,9 @@ extern int usb_hcd_alloc_bandwidth(struct usb_device
>*udev,
> struct usb_host_interface *new_alt);
> extern int usb_hcd_get_frame_number(struct usb_device *udev);
>
>+struct usb_hcd *__usb_create_hcd(const struct hc_driver *driver,
>+ struct device *sysdev, struct device *dev, const char *bus_name,
>+ struct usb_hcd *primary_hcd);
> extern struct usb_hcd *usb_create_hcd(const struct hc_driver *driver,
> struct device *dev, const char *bus_name); extern struct usb_hcd
>*usb_create_shared_hcd(const struct hc_driver *driver,
>
>--
>To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a
>message to majordomo at vger.kernel.org More majordomo info at
>http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* [PATCH v2 2/9] dmaengine: edma: Use enum for eDMA binding type (legacy vs TPCC)
From: Peter Ujfalusi @ 2016-09-21 11:07 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <7753810.Z3F41qkFaI@wuerfel>
On 09/21/16 13:31, Arnd Bergmann wrote:
> On Wednesday, September 21, 2016 1:26:30 PM CEST Peter Ujfalusi wrote:
>> diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c
>> index c2098a4b4dcf..4c8818278fcc 100644
>> --- a/drivers/dma/edma.c
>> +++ b/drivers/dma/edma.c
>> @@ -261,8 +261,11 @@ static const struct edmacc_param dummy_paramset = {
>> .ccnt = 1,
>> };
>>
>> -#define EDMA_BINDING_LEGACY 0
>> -#define EDMA_BINDING_TPCC 1
>> +enum edma_binding_type {
>> + EDMA_BINDING_LEGACY = 0,
>> + EDMA_BINDING_TPCC,
>> +};
>> +
>> static const struct of_device_id edma_of_ids[] = {
>> {
>> .compatible = "ti,edma3",
>> @@ -2184,7 +2187,8 @@ static int edma_probe(struct platform_device *pdev)
>> const struct of_device_id *match;
>>
>> match = of_match_node(edma_of_ids, node);
>> - if (match && (u32)match->data == EDMA_BINDING_TPCC)
>> + if (match &&
>> + (enum edma_binding_type)match->data == EDMA_BINDING_TPCC)
>> legacy_mode = false;
>>
>> info = edma_setup_info_from_dt(dev, legacy_mode);
>> --
>> 2.10.0
>>
>
> Are you sure this works on all architectures? IIRC the size of an enum
> is implementation defined, so this could still fail sometimes.
True, some arch have HW type for enum or something similar.
>
> I tend to use 'uintptr_t' for the cast instead.
What about keeping the defines and:
diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c
index 3e9606b08340..493fdf30e8b8 100644
--- a/drivers/dma/edma.c
+++ b/drivers/dma/edma.c
@@ -263,14 +263,19 @@ static const struct edmacc_param dummy_paramset = {
#define EDMA_BINDING_LEGACY 0
#define EDMA_BINDING_TPCC 1
+static const u32 edma_binding_type[] = {
+ [EDMA_BINDING_LEGACY] = EDMA_BINDING_LEGACY,
+ [EDMA_BINDING_TPCC] = EDMA_BINDING_TPCC,
+};
+
static const struct of_device_id edma_of_ids[] = {
{
.compatible = "ti,edma3",
- .data = (void *)EDMA_BINDING_LEGACY,
+ .data = (void *)&edma_binding_type[EDMA_BINDING_LEGACY],
},
{
.compatible = "ti,edma3-tpcc",
- .data = (void *)EDMA_BINDING_TPCC,
+ .data = (void *)&edma_binding_type[EDMA_BINDING_TPCC],
},
{}
};
@@ -2183,7 +2188,7 @@ static int edma_probe(struct platform_device *pdev)
const struct of_device_id *match;
match = of_match_node(edma_of_ids, node);
- if (match && (u32)match->data == EDMA_BINDING_TPCC)
+ if (match && (*(u32*)match->data) == EDMA_BINDING_TPCC)
legacy_mode = false;
info = edma_setup_info_from_dt(dev, legacy_mode);
same for the ti-dma-crossbar.
--
P?ter
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox