Re: [linux-yocto][linux-yocto v5.10] kernel code for marvell cn96xx
Hi Bruce, Sorry for my carelessness, the patches of the two branches are the same, but the start points are different. Please merge the branch I provided below again for preempt-rt branch. repo: linux-yocto branch: v5.10/standard/preempt-rt/cn-sdkv4.18/cn96xx Thanks, Ruiqiang The following changes since commit d532feda56688a56659a623f9d6e1e5126de6828: Merge branch 'v5.10/standard/base' into v5.10/standard/preempt-rt/cn-sdkv4.18/cn96xx (2021-02-28 22:55:12 -0500) are available in the Git repository at: https://github.com/cythe/linux.git linux-yocto/v5.10/standard/preempt-rt/cn-sdkv4.18/cn96xx for you to fetch changes up to 1841272ce4bb419e9f27d5738468230d65a4f272: octeontx2-af: Fix VF mac configuration by VF. (2021-03-05 06:41:35 +) Geetha sowjanya (3): octeontx2-af: TIM: Set conditional clock always on octeontx2-af: Use pci revision id for platform check. octeontx2-af: Add F95XXO RVU PCI revision ID Kiran Kumar K (3): octeontx2-af: add KPU support to parse NGIO protocol octeontx2-af: add KPU parse support for VLAN EXDSA octeontx2-af: add KPU changes to parse L4 for fragmented CPT packets Nalla, Pradeep (1): octeontx2-af: Multi channel in NIX promisc entry. Naveen Mamindlapalli (10): octeontx2-af: add ratelimit to limit the asynchronous err messages octeontx2-pf: Add flow classification using IP protocol octeontx2-bphy-netdev: Added RFOE LMAC stats to ethtool octeontx2-bphy-netdev: Fix ptp tx processing race condition octeontx2-bphy-netdev: Fix napi schedule issue when intf is down octeontx2-bphy-netdev: Add timeout to ptp transmit timestamp polling octeontx2-bphy-netdev: remove unnecessary check when setting INTF_DOWN flag octeontx2-af: refactor function npc_install_flow for default entry octeontx2-af: Use install flow API for promisc and broadcast entries octeontx2-af: Fix incorrect MCAM INTF configuration for NIX1 Rakesh Babu (1): octeontx2-af: Formatting debugfs entry rsrc_alloc. Rick Farrington (1): drivers: marvell: otx2-sdei-ghes: support GHES area > top-of-mem Ruiqiang Hao (1): octeontx2-af: apply the patch part delete by mistake Satheesh Paul (1): octeontx2-af: Add packet parser error codes to MCAM match key Subbaraya Sundeep (5): octeontx2-af: Disable packet TX and RX octeontx2-af: Support ESP/AH RSS hashing octeontx2-af: Do not clear TL1 mapping info octeontx2-af: Remove TOS field from MKEX TX octeontx2-af: Fix VF mac configuration by VF. drivers/net/ethernet/marvell/octeontx2/af/cgx.c|6 + drivers/net/ethernet/marvell/octeontx2/af/mbox.h |3 + drivers/net/ethernet/marvell/octeontx2/af/npc.h| 13 + .../ethernet/marvell/octeontx2/af/npc_profile.h| 7479 drivers/net/ethernet/marvell/octeontx2/af/ptp.c|4 + drivers/net/ethernet/marvell/octeontx2/af/rvu.c|5 +- drivers/net/ethernet/marvell/octeontx2/af/rvu.h| 58 +- .../net/ethernet/marvell/octeontx2/af/rvu_cpt.c|8 +- .../ethernet/marvell/octeontx2/af/rvu_debugfs.c| 48 +- .../net/ethernet/marvell/octeontx2/af/rvu_fixes.c | 13 +- .../net/ethernet/marvell/octeontx2/af/rvu_nix.c| 63 +- .../net/ethernet/marvell/octeontx2/af/rvu_npc.c| 161 +- .../net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c | 107 +- .../net/ethernet/marvell/octeontx2/af/rvu_ree.c| 16 +- .../net/ethernet/marvell/octeontx2/af/rvu_sdp.c| 16 +- .../net/ethernet/marvell/octeontx2/af/rvu_sso.c| 34 +- .../net/ethernet/marvell/octeontx2/af/rvu_tim.c|3 + .../ethernet/marvell/octeontx2/bphy/otx2_bphy_hw.h | 15 + .../marvell/octeontx2/bphy/otx2_bphy_main.c| 28 +- .../ethernet/marvell/octeontx2/bphy/otx2_cpri.c|3 +- .../ethernet/marvell/octeontx2/bphy/otx2_rfoe.c| 85 +- .../ethernet/marvell/octeontx2/bphy/otx2_rfoe.h|8 + .../marvell/octeontx2/bphy/otx2_rfoe_ethtool.c | 29 + .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 37 +- .../ethernet/marvell/octeontx2/nic/otx2_flows.c| 116 +- .../soc/marvell/octeontx2-ghes/otx2-sdei-ghes.c| 80 +- 26 files changed, 5357 insertions(+), 3081 deletions(-) From: Bruce Ashfield Sent: Friday, March 5, 2021 12:13 To: Hao, Ruiqiang Cc: Linux Yocto Subject: Re: [linux-yocto][linux-yocto v5.10] kernel code for marvell cn96xx [Please note: This e-mail is from an EXTERNAL e-mail address] On Wed, Mar 3, 2021 at 10:15 PM Ruiqiang Hao wrote: > > Hi Bruce, > > Please help to merge code into our linux-yocto repo. > > repo: > linux-yocto > branch: > v5.10/standard/cn-sdkv4.18/cn96xx I was able to merge your branch into the above (and pushed it for your reference). > v5.10/standard/preempt-rt/cn-sdkv4.18/cn96xx But I got
Re: [linux-yocto][linux-yocto v5.4/standard/ti-j72x][PATCH] net: ethernet: ti: am65-cpsw: Silence dma channel request error on -EPROBE_DEFER
merged.
Bruce
In message: [linux-yocto][linux-yocto v5.4/standard/ti-j72x][PATCH] net:
ethernet: ti: am65-cpsw: Silence dma channel request error on -EPROBE_DEFER
on 05/03/2021 Xulin Sun wrote:
> Silence dma channel request error error with dev_dbg() on -EPROBE_DEFER.
>
> To eliminate the below failed information:
> am65-cpsw-nuss 4600.ethernet: Failed to request tx dma channel -517
>
> Signed-off-by: Xulin Sun
> ---
> drivers/net/ethernet/ti/am65-cpsw-nuss.c | 6 --
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c
> b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
> index 569e47d8428d..ad12ea19bb20 100644
> --- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c
> +++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
> @@ -1571,8 +1571,10 @@ static int am65_cpsw_nuss_init_tx_chns(struct
> am65_cpsw_common *common)
> _cfg);
> if (IS_ERR(tx_chn->tx_chn)) {
> ret = PTR_ERR(tx_chn->tx_chn);
> - dev_err(dev, "Failed to request tx dma channel %d\n",
> - ret);
> + if (ret == -EPROBE_DEFER)
> + dev_dbg(dev, "Failed to request tx dma channel
> %d\n", ret);
> + else
> + dev_err(dev, "Failed to request tx dma channel
> %d\n", ret);
> goto err;
> }
>
> --
> 2.17.1
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#9510):
https://lists.yoctoproject.org/g/linux-yocto/message/9510
Mute This Topic: https://lists.yoctoproject.org/mt/81092971/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [linux-yocto][linux-yocto v5.10] kernel code for marvell cn96xx
On Wed, Mar 3, 2021 at 10:15 PM Ruiqiang Hao wrote: > > Hi Bruce, > > Please help to merge code into our linux-yocto repo. > > repo: > linux-yocto > branch: > v5.10/standard/cn-sdkv4.18/cn96xx I was able to merge your branch into the above (and pushed it for your reference). > v5.10/standard/preempt-rt/cn-sdkv4.18/cn96xx But I got multiple conflicts on this branch. build [/home/bruc...-yocto.git]> git status On branch v5.10/standard/preempt-rt/cn-sdkv4.18/cn96xx You have unmerged paths. (fix conflicts and run "git commit") (use "git merge --abort" to abort the merge) Changes to be committed: modified: drivers/net/ethernet/marvell/octeontx2/af/ptp.c modified: drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c Unmerged paths: (use "git add ..." to mark resolution) both modified: drivers/net/ethernet/marvell/octeontx2/af/cgx.c both modified: drivers/net/ethernet/marvell/octeontx2/af/mbox.h both modified: drivers/net/ethernet/marvell/octeontx2/af/npc.h both modified: drivers/net/ethernet/marvell/octeontx2/af/npc_profile.h both modified: drivers/net/ethernet/marvell/octeontx2/af/rvu.c both modified: drivers/net/ethernet/marvell/octeontx2/af/rvu.h both modified: drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c both added: drivers/net/ethernet/marvell/octeontx2/af/rvu_cpt.c both modified: drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c both added: drivers/net/ethernet/marvell/octeontx2/af/rvu_fixes.c both modified: drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c both modified: drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c both added: drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c both added: drivers/net/ethernet/marvell/octeontx2/af/rvu_ree.c both added: drivers/net/ethernet/marvell/octeontx2/af/rvu_sdp.c both added: drivers/net/ethernet/marvell/octeontx2/af/rvu_sso.c both added: drivers/net/ethernet/marvell/octeontx2/af/rvu_tim.c both added: drivers/net/ethernet/marvell/octeontx2/bphy/otx2_bphy_hw.h both added: drivers/net/ethernet/marvell/octeontx2/bphy/otx2_bphy_main.c both added: drivers/net/ethernet/marvell/octeontx2/bphy/otx2_cpri.c both added: drivers/net/ethernet/marvell/octeontx2/bphy/otx2_rfoe.c both added: drivers/net/ethernet/marvell/octeontx2/bphy/otx2_rfoe.h both added: drivers/net/ethernet/marvell/octeontx2/bphy/otx2_rfoe_ethtool.c both added: drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c both added: drivers/soc/marvell/octeontx2-ghes/otx2-sdei-ghes.c It may be that I missed your previous merge (I don't see linux-yocto/v5.10/standard/sdkv4.18/cn96xx.v3-merge) in the history, and I no longer have it in my tree for re-merging. But the 'both added', implies that I may have the base history wrong on that branch completely. Can you check on what I've managed to mix up, and send a fixup branch for me to merge ? Bruce > > Thanks, > Ruiqiang > > The following changes since commit eb27f9bd98a8f156786862624ab6f921f6916667: > > Merge branch 'linux-yocto/v5.10/standard/sdkv4.18/cn96xx.v3-merge' into > v5.10/standard/cn-sdkv4.18/cn96xx (2021-02-22 20:03:41 -0500) > > are available in the Git repository at: > > https://github.com/cythe/linux.git > linux-yocto/v5.10/standard/cn-sdkv4.18/cn96xx > > for you to fetch changes up to 371d381b6294bc04624ad76c584a37506db7228e: > > octeontx2-af: Fix VF mac configuration by VF. (2021-03-03 08:10:45 +) > > > Geetha sowjanya (3): > octeontx2-af: TIM: Set conditional clock always on > octeontx2-af: Use pci revision id for platform check. > octeontx2-af: Add F95XXO RVU PCI revision ID > > Kiran Kumar K (3): > octeontx2-af: add KPU support to parse NGIO protocol > octeontx2-af: add KPU parse support for VLAN EXDSA > octeontx2-af: add KPU changes to parse L4 for fragmented CPT packets > > Nalla, Pradeep (1): > octeontx2-af: Multi channel in NIX promisc entry. > > Naveen Mamindlapalli (10): > octeontx2-af: add ratelimit to limit the asynchronous err messages > octeontx2-pf: Add flow classification using IP protocol > octeontx2-bphy-netdev: Added RFOE LMAC stats to ethtool > octeontx2-bphy-netdev: Fix ptp tx processing race condition > octeontx2-bphy-netdev: Fix napi schedule issue when intf is down > octeontx2-bphy-netdev: Add timeout to ptp transmit timestamp polling > octeontx2-bphy-netdev: remove unnecessary check when setting INTF_DOWN > flag > octeontx2-af: refactor function npc_install_flow for default entry > octeontx2-af: Use install flow API for promisc and broadcast entries > octeontx2-af: Fix
[linux-yocto][linux-yocto v5.4/standard/ti-j72x][PATCH] net: ethernet: ti: am65-cpsw: Silence dma channel request error on -EPROBE_DEFER
Silence dma channel request error error with dev_dbg() on -EPROBE_DEFER.
To eliminate the below failed information:
am65-cpsw-nuss 4600.ethernet: Failed to request tx dma channel -517
Signed-off-by: Xulin Sun
---
drivers/net/ethernet/ti/am65-cpsw-nuss.c | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c
b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
index 569e47d8428d..ad12ea19bb20 100644
--- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c
+++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
@@ -1571,8 +1571,10 @@ static int am65_cpsw_nuss_init_tx_chns(struct
am65_cpsw_common *common)
_cfg);
if (IS_ERR(tx_chn->tx_chn)) {
ret = PTR_ERR(tx_chn->tx_chn);
- dev_err(dev, "Failed to request tx dma channel %d\n",
- ret);
+ if (ret == -EPROBE_DEFER)
+ dev_dbg(dev, "Failed to request tx dma channel
%d\n", ret);
+ else
+ dev_err(dev, "Failed to request tx dma channel
%d\n", ret);
goto err;
}
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#9508):
https://lists.yoctoproject.org/g/linux-yocto/message/9508
Mute This Topic: https://lists.yoctoproject.org/mt/81092971/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [linux-yocto v4.19/standard*/axxia] [PATCH 34/61] arm64: Use a raw spinlock in __install_bp_hardening_cb()
From: Marek Bykowski
__install_bp_hardening_cb() is called with the spinlock taken to allow each
CPU to take its turn when allocating slots. With the RT patches applied,
the spinlock becomes a mutex, and we get warnings about sleeping in
the cpu stop callback executing in the atomic context from the migration
thread. Changing to a raw spinlock resolves it.
BUG: scheduling while atomic: migration//84/0x0002
Modules linked in:
[] cpu_stopper_thread+0x9c/0x128
CPU: PID: 76 Comm: migration/8 Tainted: GW 4.19.19-rt3
#1
Hardware name: AXM56xx Victoria (DT)
Call trace:
dump_backtrace+0x0/0x168
show_stack+0x24/0x30
dump_stack+0x9c/0xd4
__schedule_bug+0x74/0xc0
__schedule+0x500/0x558
schedule+0x44/0xf0
rt_spin_lock_slowlock_locked+0x100/0x298
rt_spin_lock_slowlock+0x68/0x98
rt_spin_lock+0x60/0x70
enable_smccc_arch_workaround_1+0x154/0x270
__enable_cpu_capability+0x24/0x38
multi_cpu_stop+0x100/0x148
cpu_stopper_thread+0xa4/0x128
smpboot_thread_fn+0x1f8/0x2c0
kthread+0x104/0x130
ret_from_fork+0x10/0x1c
Signed-off-by: James Morse
Signed-off-by: Will Deacon
Signed-off-by: Marek Bykowski
Signed-off-by: John Jacques
---
arch/arm64/kernel/cpu_errata.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c
index d191ce8..589f0b3 100644
--- a/arch/arm64/kernel/cpu_errata.c
+++ b/arch/arm64/kernel/cpu_errata.c
@@ -114,10 +114,10 @@ static void install_bp_hardening_cb(bp_hardening_cb_t fn,
const char *hyp_vecs_start,
const char *hyp_vecs_end)
{
- static DEFINE_SPINLOCK(bp_lock);
+ static DEFINE_RAW_SPINLOCK(bp_lock);
int cpu, slot = -1;
- spin_lock(_lock);
+ raw_spin_lock(_lock);
for_each_possible_cpu(cpu) {
if (per_cpu(bp_hardening_data.fn, cpu) == fn) {
slot = per_cpu(bp_hardening_data.hyp_vectors_slot, cpu);
@@ -133,7 +133,7 @@ static void install_bp_hardening_cb(bp_hardening_cb_t fn,
__this_cpu_write(bp_hardening_data.hyp_vectors_slot, slot);
__this_cpu_write(bp_hardening_data.fn, fn);
- spin_unlock(_lock);
+ raw_spin_unlock(_lock);
}
#else
#define __smccc_workaround_1_smc_start NULL
--
2.7.4
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#9506):
https://lists.yoctoproject.org/g/linux-yocto/message/9506
Mute This Topic: https://lists.yoctoproject.org/mt/81082044/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [linux-yocto v4.19/standard*/axxia] [PATCH 07/61] ARM64: Enable the identity mapping to allow the MMU disabling
From: John Jacques
Add the setup_mm_for_reboot() function needed for kexec.
Signed-off-by: Geoff Levand
Signed-off-by: John Jacques
Signed-off-by: Charlie Paul
Signed-off-by: Daniel Dragomir
---
arch/arm64/mm/mmu.c | 11 +++
1 file changed, 11 insertions(+)
diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c
index 0fa5581..755adcd 100644
--- a/arch/arm64/mm/mmu.c
+++ b/arch/arm64/mm/mmu.c
@@ -660,6 +660,17 @@ void __init paging_init(void)
}
/*
+ * Enable the identity mapping to allow the MMU disabling.
+ */
+void setup_mm_for_reboot(void)
+{
+ cpu_set_reserved_ttbr0();
+ flush_tlb_all();
+ cpu_set_idmap_tcr_t0sz();
+ cpu_switch_mm(idmap_pg_dir, _mm);
+}
+
+/*
* Check whether a kernel address is valid (derived from arch/x86/).
*/
int kern_addr_valid(unsigned long addr)
--
2.7.4
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#9501):
https://lists.yoctoproject.org/g/linux-yocto/message/9501
Mute This Topic: https://lists.yoctoproject.org/mt/81082029/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [linux-yocto v4.19/standard*/axxia] [PATCH 31/61] pmu: Fix Compiler Warnings
From: John Jacques .../include/linux/pmu.h:17:31: warning: 'struct adb_request' declared inside parameter list will not be visible outside of this definition or declaration extern int pmu_request(struct adb_request *req, ^~~ Signed-off-by: John Jacques Signed-off-by: Charlie Paul Signed-off-by: Daniel Dragomir --- include/linux/pmu.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/linux/pmu.h b/include/linux/pmu.h index 9ac8fc6..bebf4680 100644 --- a/include/linux/pmu.h +++ b/include/linux/pmu.h @@ -9,6 +9,7 @@ #ifndef _LINUX_PMU_H #define _LINUX_PMU_H +#include #include -- 2.7.4 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#9505): https://lists.yoctoproject.org/g/linux-yocto/message/9505 Mute This Topic: https://lists.yoctoproject.org/mt/81082035/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [linux-yocto v4.19/standard*/axxia] [PATCH 04/61] ARM: head.S: axxia: Set the NS bit since memory is non-secure
From: John Jacques Axxia AXM55xx memory is by architecture non-secure, so set NS bit. Signed-off-by: John Jacques Signed-off-by: Charlie Paul Signed-off-by: Daniel Dragomir --- arch/arm/kernel/head.S | 4 1 file changed, 4 insertions(+) diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S index 11b94f7..2f3fe86 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S @@ -323,6 +323,10 @@ __create_page_tables: #endif #else orr r3, r3, #PMD_SECT_XN +#ifdef CONFIG_ARCH_AXXIA + /* Axxia memory is non-secure, so set NS. */ + orr r7, r7, #0x20 +#endif str r3, [r0], #4 #endif -- 2.7.4 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#9500): https://lists.yoctoproject.org/g/linux-yocto/message/9500 Mute This Topic: https://lists.yoctoproject.org/mt/81082028/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [linux-yocto v4.19/standard*/axxia] [PATCH 19/61] ARM64: entry.S: Add Fault Handling for Axxia
From: Charlie Paul The purpose is to handle SErrors (Asynchronous Aborts) caused by sRIO optional register accesses, which are not supported by the Axxia sRIO hardware. As it isn't possible to determine the cause completely, a mechanism is provided to enable or disable masking from user space. Adding a fault handler allows enumerating the sRIO buss without crashing. Signed-off-by: Charlie Paul Signed-off-by: John Jacques Signed-off-by: Daniel Dragomir --- arch/arm64/kernel/entry.S | 32 1 file changed, 32 insertions(+) diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index b582580..e9efdc3 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -509,7 +509,23 @@ el0_fiq_invalid: ENDPROC(el0_fiq_invalid) el0_error_invalid: +#ifdef CONFIG_AXXIA_FAULT + kernel_entry0 + mov x0, sp + mov x1, #0 + mrs x2, esr_el1 + bl axxia_x9xlf_fault + cmp x0, #0 + beq 1f + mov x0, sp // Return Failure + mov x1, #BAD_ERROR + mrs x2, esr_el1 + b bad_mode +1: + kernel_exit 0 // Return Success +#else inv_entry 0, BAD_ERROR +#endif ENDPROC(el0_error_invalid) #ifdef CONFIG_COMPAT @@ -531,7 +547,23 @@ el1_fiq_invalid: ENDPROC(el1_fiq_invalid) el1_error_invalid: +#ifdef CONFIG_AXXIA_FAULT + kernel_entry1 + mov x0, sp + mov x1, #1 + mrs x2, esr_el1 + bl axxia_x9xlf_fault + cmp x0, #0 + beq 1f + mov x0, sp // Return Failure + mov x1, #BAD_ERROR + mrs x2, esr_el1 + b bad_mode +1: + kernel_exit 1 +#else inv_entry 1, BAD_ERROR +#endif ENDPROC(el1_error_invalid) /* -- 2.7.4 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#9504): https://lists.yoctoproject.org/g/linux-yocto/message/9504 Mute This Topic: https://lists.yoctoproject.org/mt/81082034/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [linux-yocto v4.19/standard*/axxia] [PATCH 09/61] genirq: axxia: Fix irq_set_affinity to allow use with buslocks
From: David Mercado
Modify irq_set_affinity() to allow usage of bus locks with "slow bus" IRQ
controllers. This only affects those BSPs that use bus locks in their IRQ
controllers, such as the Intel Axxia GIC. The recommendation for this
change originated from Thomax Gleixner at Linutronix.
Signed-off-by: David Mercado
Signed-off-by: John Jacques
Signed-off-by: Charlie Paul
Signed-off-by: Daniel Dragomir
---
kernel/irq/manage.c | 17 +
1 file changed, 17 insertions(+)
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 69effb2..61763ad 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -333,6 +333,22 @@ int irq_set_affinity_locked(struct irq_data *data, const
struct cpumask *mask,
return ret;
}
+#ifdef CONFIG_ARCH_AXXIA
+int __irq_set_affinity(unsigned int irq, const struct cpumask *mask, bool
force)
+{
+ unsigned long flags;
+ struct irq_desc *desc = irq_get_desc_buslock(irq, ,
+ IRQ_GET_DESC_CHECK_GLOBAL);
+ int ret;
+
+ if (!desc)
+ return -EINVAL;
+
+ ret = irq_set_affinity_locked(irq_desc_get_irq_data(desc), mask, force);
+ irq_put_desc_busunlock(desc, flags);
+ return ret;
+}
+#else
int __irq_set_affinity(unsigned int irq, const struct cpumask *mask, bool
force)
{
struct irq_desc *desc = irq_to_desc(irq);
@@ -347,6 +363,7 @@ int __irq_set_affinity(unsigned int irq, const struct
cpumask *mask, bool force)
raw_spin_unlock_irqrestore(>lock, flags);
return ret;
}
+#endif
int irq_set_affinity_hint(unsigned int irq, const struct cpumask *m)
{
--
2.7.4
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#9502):
https://lists.yoctoproject.org/g/linux-yocto/message/9502
Mute This Topic: https://lists.yoctoproject.org/mt/81082032/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [linux-yocto v4.19/standard*/axxia] [PATCH 03/61] ARM: head.S: axxia: Allow more granularity in the starting offset
From: John Jacques For Axxia AXM55xx, the U-Boot is kept in the bottom 8M of memory, so the math in arch/arm/boot/compressed/head.S would "align" 8M to 0M and wipe out U-Boot. Without this changes, Linux has to be rather severely aligned. Signed-off-by: John Jacques Signed-off-by: Charlie Paul Signed-off-by: Daniel Dragomir --- arch/arm/boot/compressed/head.S | 12 arch/arm/kernel/head.S | 5 + 2 files changed, 17 insertions(+) diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index e205bbb..cf605eb 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S @@ -172,6 +172,8 @@ not_angel: safe_svcmode_maskall r0 msr spsr_cxsf, r9 @ Save the CPU boot mode in @ SPSR +#else + teqppc, #0x0c03 @ turn off interrupts #endif /* * Note that some cache flushing and other stuff may @@ -206,7 +208,12 @@ not_angel: mov r4, pc and r4, r4, #0xf800 /* Determine final kernel image address. */ +#ifdef CONFIG_ARCH_AXXIA + ldr r3, =TEXT_OFFSET + add r4, r4, r3 +#else add r4, r4, #TEXT_OFFSET +#endif #else ldr r4, =zreladdr #endif @@ -337,7 +344,12 @@ restart: adr r0, LC0 * of RAM and hope for the best. */ cmp r0, #1 +#ifdef CONFIG_ARCH_AXXIA + ldr r1, =TEXT_OFFSET + sub r0, r4, r1 +#else sub r0, r4, #TEXT_OFFSET +#endif bic r0, r0, #1 add r0, r0, #0x100 mov r1, r6 diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S index 90add5d..11b94f7 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S @@ -52,8 +52,13 @@ .equswapper_pg_dir, KERNEL_RAM_VADDR - PG_DIR_SIZE .macro pgtbl, rd, phys +#ifdef CONFIG_ARCH_AXXIA + ldr \rd, =(TEXT_OFFSET - PG_DIR_SIZE) + add \rd, \rd, \phys +#else add \rd, \phys, #TEXT_OFFSET sub \rd, \rd, #PG_DIR_SIZE +#endif .endm /* -- 2.7.4 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#9499): https://lists.yoctoproject.org/g/linux-yocto/message/9499 Mute This Topic: https://lists.yoctoproject.org/mt/81082027/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [PULL REQUEST] Intel Axxia updates to linux-yocto-4.19
Hello Bruce! This is the first pull request for Axxia changes on Kernel 4.19 which were ported from our 4.12 Yocto branches. We tried a better cleanup on Axxia specific changes, we reworked and better documented the necessary commits which are changing non-BSP areas. I sent only those patches on mailing list for a easier review. Please review and pull the patches from https://github.com/axxia/linux-yocto.git into git://git.yoctoproject.org/linux-yocto Pull the following branches which were rebased on latest from upstream: v4.19/standard/preempt-rt/axxia based on v4.19/standard/preempt-rt/base v4.19/standard/axxia based on v4.19/standard/base I checked all the patches with checkpatch.pl script and fixed all errors. Also, we run regression testing on each rebase to a new tag from upstream and fixed regressions if any (for axxiaarm and axxiaarm64 BSPs). Thank you, Daniel Dragomir Charlie Paul (7): genirq/cpuhotplug: axxia: Enable the force flag ARM64: entry.S: Add Fault Handling for Axxia ARM: dts: axxia: Updated SPI and UART to support DMA usb: dwc3: axxia: Add support the core clocks spi: pl022: Add enable-dma processing net: Use standard MDIO interface for AXXIA FEMAC Driver net: ethernet: Add ethtool Stats to NEMAC driver David Mercado (1): genirq: axxia: Fix irq_set_affinity to allow use with buslocks John Jacques (44): ARM: Enhance platform support for Intel Axxia AXM55xx ARM: dts: Add Axxia AXM55xx device tree files ARM: head.S: axxia: Allow more granularity in the starting offset ARM: head.S: axxia: Set the NS bit since memory is non-secure ARM: kmap: axxia: Prevent overlap for 16th core ARM64: dts: Add Axxia X9/AXM56xx and XLF/AXC67xx device tree files ARM64: Enable the identity mapping to allow the MMU disabling clk: Change Clock Definitions for Axxia AXM55xx char: hwrng: Add Axxia HW Random number generator dmaengine: Add Axxia DMA32 driver support edac: Add support for Axxia AXM56xx and AXC67xx gpio: Add custom driver for Axxia SoCs gpio: pl061: Readd removed platform data misc: Add drivers for Axxia MISC devices misc: Add a backward compatibility layer for Axxia MTC rapidio: Add support for Axxia AXM55xx and AXM56xx power: reset: Add support for Axxia DDR Retention reset usb: xhci: Add CI13612A USB driver for Axxia AXM55xx usb: dwc3: Add Axxia xHCI DWC3 USB support usb: hub: fix over-current race condition mtd: m25p80: add support for Spansion S25FL016K mtd: spi-nor: add support for Winbond W25Q128JVSIM net: ethernet: Add Intel Axxia FEMAC driver net: ethernet: Add Intel Axxia NEMAC GigE driver PCI: Add Intel Axxia PCIe host controller driver i2c: axxia: Use BIT(x) macro and fix indentation issues tty: serial: pl011: Updated Baud Rate Calcualtion pmu: Fix Compiler Warnings fs/vmfs: Adding arm vmfs file system dt-bindings: axxia: update and add documentation ARM64: dts: Add Reference to the L2 Cache in CPU Descriptions net: Pad SKBs Properly in the AXXIA FEMAC Driver net: Use eth_spb_pad() in the AXXIA NEMAC Driver net: Set Min/Max MTU for AXXIA 5500 FEMAC Driver net: Set Min/Max MTU for AXXIA 5600/6700 NEMAC Driver power: reset: Update Axxia DDR Retention Handling misc: axxia: Use the new ARM SMC Call Interface misc: axxia: Update OEM Handling for backwards compatibility i2c: axxia: Add a Lock Around i2c Transfers i2c: axxia: Allow Interrupted Transfers i2c: axxia: Change the I2C Timeout misc: Add a Lock to the Axxia MDIO Bus PCI: axxia: Support 32 Bit Endpoints arm: perf: add Cortex-A15 PMU in armv7_pmu_probe_table Marek Bykowski (9): arm64: Use a raw spinlock in __install_bp_hardening_cb() firmware: arch64: Add SMC call testing module dt-bindings: Update documentation for arm-ccn perf perf: arm-ccn: Enable stats for CCN-512 interconnect perf: arm-ccn: Allow instrumentation of arm-ccn ARM64: dts: axxia: Support CCN (cache coherent network) perf edac: axxia: Update SMC (System Memory Controller) EDAC driver bus: arm-ccn: add a new driver managing the ARM CCN interrupts bus: arm-ccn: L3 EDAC: register L3 EDAC interrupts within the core Documentation/devicetree/bindings/arm/axxia.txt|8 +- .../devicetree/bindings/arm/axxia/edac.txt | 14 + .../devicetree/bindings/arm/axxia/edac_cm.txt | 21 + .../devicetree/bindings/arm/axxia/edac_cpu.txt | 14 + .../devicetree/bindings/arm/axxia/edac_l1.txt | 15 + .../devicetree/bindings/arm/axxia/edac_l2.txt | 15 + .../devicetree/bindings/arm/axxia/edac_l3.txt | 26 + .../devicetree/bindings/clock/lsi,axm5516-clks.txt | 29 - .../devicetree/bindings/hwrng/axxia_rng.txt| 15 + .../devicetree/bindings/i2c/i2c-axxia.txt |6 +- .../devicetree/bindings/misc/axxia-mtc.txt | 15 + .../devicetree/bindings/net/axxia-femac.txt| 20 + .../devicetree/bindings/net/axxia-mdio.txt | 26 + .../devicetree/bindings/pci/intel,axxia-pcie.txt
[linux-yocto][linux-yocto v5.10/standard/sdkv5.4/xlnx-soc][PATCH] arm64: zynqmp: Move gic node to axi bus
From: Michal Simek
commit 74790cf981afd9806939427ad7701f3022ee5c06 upstream
The reason for this change is that after change from amba to axi U-Boot
started to show error like:
Unable to update property /axi/ethernet@ff0e:mac-address,
err=FDT_ERR_NOTFOUND
Unable to update property /axi/ethernet@ff0e:local-mac-address,
err=FDT_ERR_NOTFOUND
The reason is implementation in fdt_nodename_eq_() which is taken from dtc
to the kernel and to the U-Boot. Especially DTC commit d2a9da045897 ("libfdt:
Make unit address optional for finding nodes") which is in DTC from 2007.
The part of commit description is
" This is contrary to traditional OF-like finddevice() behaviour, which
allows the unit address to be omitted (which is useful when the device
name is unambiguous without the address)."
The kernel commit dfff9066e60e ("arm64: dts: zynqmp: Rename buses to be
align with simple-bus yaml") changed amba-apu/amba to axi@0/axi but
fdt_nodename_eq_() detects /axi/ as match for /axi@0/ because of commit
above.
That's why it easier to fix one DT inside the kernel by moving GIC node
from own bus to generic axi bus as is done by others SoCs. This will avoid
incorrect match because the unit address is omitted.
Reported-by: Paul Thomas
Signed-off-by: Michal Simek
Link:
https://lore.kernel.org/r/f767fe007e446a2299fda9905e75b723c650a424.1605021644.git.michal.si...@xilinx.com
---
arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 31 ++
1 file changed, 12 insertions(+), 19 deletions(-)
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
index 885a7af1c472..a7789d44e5ec 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
+++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
@@ -267,25 +267,6 @@ xlnx_aes: zynqmp_aes {
compatible = "xlnx,zynqmp-aes";
};
- amba_apu: axi@0 {
- compatible = "simple-bus";
- #address-cells = <2>;
- #size-cells = <1>;
- ranges = <0 0 0 0 0x>;
-
- gic: interrupt-controller@f901 {
- compatible = "arm,gic-400";
- #interrupt-cells = <3>;
- reg = <0x0 0xf901 0x1>,
- <0x0 0xf902 0x2>,
- <0x0 0xf904 0x2>,
- <0x0 0xf906 0x2>;
- interrupt-controller;
- interrupt-parent = <>;
- interrupts = <1 9 0xf04>;
- };
- };
-
smmu: smmu@fd80 {
compatible = "arm,mmu-500";
reg = <0x0 0xfd80 0x0 0x2>;
@@ -466,6 +447,18 @@ gpu: gpu@fd4b {
power-domains = <_firmware PD_GPU>;
};
+ gic: interrupt-controller@f901 {
+ compatible = "arm,gic-400";
+ #interrupt-cells = <3>;
+ reg = <0x0 0xf901 0x0 0x1>,
+ <0x0 0xf902 0x0 0x2>,
+ <0x0 0xf904 0x0 0x2>,
+ <0x0 0xf906 0x0 0x2>;
+ interrupt-controller;
+ interrupt-parent = <>;
+ interrupts = <1 9 0xf04>;
+ };
+
/* LPDDMA default allows only secured access. inorder to enable
* These dma channels, Users should ensure that these dma
* Channels are allowed for non secure access.
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#9497):
https://lists.yoctoproject.org/g/linux-yocto/message/9497
Mute This Topic: https://lists.yoctoproject.org/mt/81073834/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
