| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Fri, 30 Oct 2020 14:37:04 +0800
From: Tiezhu Yang <yangtiezhu@...ngson.cn>
To: Jiaxun Yang <jiaxun.yang@...goat.com>,
Thomas Bogendoerfer <tsbogend@...ha.franken.de>,
Huacai Chen <chenhc@...ote.com>
Cc: linux-mips@...r.kernel.org, linux-kernel@...r.kernel.org,
Xuefeng Li <lixuefeng@...ngson.cn>,
Lu Zeng <zenglu@...ngson.cn>,
Jianmin Lv <lvjianmin@...ngson.cn>
Subject: Re: [PATCH 4/6] MIPS: Loongson64: Add Mail_Send support for 3A4000+
CPU
On 10/30/2020 12:06 PM, Jiaxun Yang wrote:
>
>
> 在 2020/10/29 16:02, Tiezhu Yang 写道:
>> Loongson 3A4000+ CPU has per-core Mail_Send register to send mail,
>> there is no need to maintain register address of each core and node,
>> just simply specify cpu number.
>>
>> Signed-off-by: Lu Zeng <zenglu@...ngson.cn>
>> Signed-off-by: Jianmin Lv <lvjianmin@...ngson.cn>
>> Signed-off-by: Tiezhu Yang <yangtiezhu@...ngson.cn>
>> ---
>> .../include/asm/mach-loongson64/loongson_regs.h | 10 +++
>> arch/mips/loongson64/smp.c | 75
>> +++++++++++++++++-----
>> 2 files changed, 68 insertions(+), 17 deletions(-)
>>
>> diff --git a/arch/mips/include/asm/mach-loongson64/loongson_regs.h
>> b/arch/mips/include/asm/mach-loongson64/loongson_regs.h
>> index 83dbb9f..1659935 100644
>> --- a/arch/mips/include/asm/mach-loongson64/loongson_regs.h
>> +++ b/arch/mips/include/asm/mach-loongson64/loongson_regs.h
>> @@ -227,6 +227,16 @@ static inline void csr_writeq(u64 val, u32 reg)
>> #define CSR_IPI_SEND_CPU_SHIFT 16
>> #define CSR_IPI_SEND_BLOCK BIT(31)
>> +#define LOONGSON_CSR_MAIL_BUF0 0x1020
>> +#define LOONGSON_CSR_MAIL_SEND 0x1048
>> +#define CSR_MAIL_SEND_BLOCK BIT_ULL(31)
>> +#define CSR_MAIL_SEND_BOX_LOW(box) (box << 1)
>> +#define CSR_MAIL_SEND_BOX_HIGH(box) ((box << 1) + 1)
>> +#define CSR_MAIL_SEND_BOX_SHIFT 2
>> +#define CSR_MAIL_SEND_CPU_SHIFT 16
>> +#define CSR_MAIL_SEND_BUF_SHIFT 32
>> +#define CSR_MAIL_SEND_H32_MASK 0xFFFFFFFF00000000ULL
>> +
>> static inline u64 drdtime(void)
>> {
>> int rID = 0;
>> diff --git a/arch/mips/loongson64/smp.c b/arch/mips/loongson64/smp.c
>> index 7d58853..33597d2 100644
>> --- a/arch/mips/loongson64/smp.c
>> +++ b/arch/mips/loongson64/smp.c
>> @@ -54,6 +54,26 @@ static uint32_t core0_c0count[NR_CPUS];
>> u32 (*ipi_read_clear)(int cpu);
>> void (*ipi_write_action)(int cpu, u32 action);
>> +/* send mail via Mail_Send register for 3A4000+ CPU */
>> +static void csr_mail_send(uint64_t data, int cpu, int mailbox)
>> +{
>> + uint64_t val;
>> +
>> + /* send high 32 bits */
>> + val = CSR_MAIL_SEND_BLOCK;
>> + val |= (CSR_MAIL_SEND_BOX_HIGH(mailbox) <<
>> CSR_MAIL_SEND_BOX_SHIFT);
>> + val |= (cpu << CSR_MAIL_SEND_CPU_SHIFT);
>> + val |= (data & CSR_MAIL_SEND_H32_MASK);
>> + csr_writeq(val, LOONGSON_CSR_MAIL_SEND);
>> +
>> + /* send low 32 bits */
>> + val = CSR_MAIL_SEND_BLOCK;
>> + val |= (CSR_MAIL_SEND_BOX_LOW(mailbox) << CSR_MAIL_SEND_BOX_SHIFT);
>> + val |= (cpu << CSR_MAIL_SEND_CPU_SHIFT);
>> + val |= (data << CSR_MAIL_SEND_BUF_SHIFT);
>> + csr_writeq(val, LOONGSON_CSR_MAIL_SEND);
>> +};
>> +
>> static u32 csr_ipi_read_clear(int cpu)
>> {
>> u32 action;
>> @@ -348,7 +368,10 @@ static void loongson3_init_secondary(void)
>> /* Set interrupt mask, but don't enable */
>> change_c0_status(ST0_IM, imask);
>> - loongson3_ipi_write32(0xffffffff,
>> ipi_en0_regs[cpu_logical_map(cpu)]);
>> + if (cpu_has_csr() && csr_readl(LOONGSON_CSR_FEATURES) &
>> LOONGSON_CSRF_IPI)
>> + csr_writel(0xffffffff, LOONGSON_CSR_IPI_EN);
>
> Hi Tiezhu,
>
> Feature cheking is duplicated. could you please abstract them to
> callbacks and set
> them in csr_ipi probe?
Hi Jiaxun,
Thanks for your suggestion. I will do it and then send v2.
Thanks,
Tiezhu
>
> e.g.
> ipi_write_enable
>
>
>> + else
>> + loongson3_ipi_write32(0xffffffff,
>> ipi_en0_regs[cpu_logical_map(cpu)]);
>> per_cpu(cpu_state, cpu) = CPU_ONLINE;
>> cpu_set_core(&cpu_data[cpu],
>> @@ -380,8 +403,12 @@ static void loongson3_smp_finish(void)
>> write_c0_compare(read_c0_count() + mips_hpt_frequency/HZ);
>> local_irq_enable();
>> - loongson3_ipi_write64(0,
>> - ipi_mailbox_buf[cpu_logical_map(cpu)] + 0x0);
>> +
>> + if (cpu_has_csr() && csr_readl(LOONGSON_CSR_FEATURES) &
>> LOONGSON_CSRF_IPI)
>> + csr_writel(0, LOONGSON_CSR_MAIL_BUF0);
>> + else
>> + loongson3_ipi_write64(0,
>> ipi_mailbox_buf[cpu_logical_map(cpu)] + 0x0);
>> +
>
> ditto here,
> ipi_write_buf
>
>> pr_info("CPU#%d finished, CP0_ST=%x\n",
>> smp_processor_id(), read_c0_status());
>> }
>> @@ -414,12 +441,18 @@ static void __init loongson3_smp_setup(void)
>> }
>> csr_ipi_probe();
>> - ipi_set0_regs_init();
>> - ipi_clear0_regs_init();
>> - ipi_status0_regs_init();
>> - ipi_en0_regs_init();
>> - ipi_mailbox_buf_init();
>> - loongson3_ipi_write32(0xffffffff,
>> ipi_en0_regs[cpu_logical_map(0)]);
>> +
>> + if (cpu_has_csr() && csr_readl(LOONGSON_CSR_FEATURES) &
>> LOONGSON_CSRF_IPI) {
>> + csr_writel(0xffffffff, LOONGSON_CSR_IPI_EN);
>> + } else {
>> + ipi_set0_regs_init();
>> + ipi_clear0_regs_init();
>> + ipi_status0_regs_init();
>> + ipi_en0_regs_init();
>> + ipi_mailbox_buf_init();
>> + loongson3_ipi_write32(0xffffffff,
>> ipi_en0_regs[cpu_logical_map(0)]);
>> + }
>> +
>> cpu_set_core(&cpu_data[0],
>> cpu_logical_map(0) % loongson_sysconf.cores_per_package);
>> cpu_data[0].package = cpu_logical_map(0) /
>> loongson_sysconf.cores_per_package;
>> @@ -452,14 +485,22 @@ static int loongson3_boot_secondary(int cpu,
>> struct task_struct *idle)
>> pr_debug("CPU#%d, func_pc=%lx, sp=%lx, gp=%lx\n",
>> cpu, startargs[0], startargs[1], startargs[2]);
>> - loongson3_ipi_write64(startargs[3],
>> - ipi_mailbox_buf[cpu_logical_map(cpu)] + 0x18);
>> - loongson3_ipi_write64(startargs[2],
>> - ipi_mailbox_buf[cpu_logical_map(cpu)] + 0x10);
>> - loongson3_ipi_write64(startargs[1],
>> - ipi_mailbox_buf[cpu_logical_map(cpu)] + 0x8);
>> - loongson3_ipi_write64(startargs[0],
>> - ipi_mailbox_buf[cpu_logical_map(cpu)] + 0x0);
>> + if (cpu_has_csr() && csr_readl(LOONGSON_CSR_FEATURES) &
>> LOONGSON_CSRF_IPI) {
>> + csr_mail_send(startargs[3], cpu_logical_map(cpu), 3);
>> + csr_mail_send(startargs[2], cpu_logical_map(cpu), 2);
>> + csr_mail_send(startargs[1], cpu_logical_map(cpu), 1);
>> + csr_mail_send(startargs[0], cpu_logical_map(cpu), 0);
> ditto
>
> Thanks.
>
> - Jiaxun
>
>> + } else {
>> + loongson3_ipi_write64(startargs[3],
>> + ipi_mailbox_buf[cpu_logical_map(cpu)] + 0x18);
>> + loongson3_ipi_write64(startargs[2],
>> + ipi_mailbox_buf[cpu_logical_map(cpu)] + 0x10);
>> + loongson3_ipi_write64(startargs[1],
>> + ipi_mailbox_buf[cpu_logical_map(cpu)] + 0x8);
>> + loongson3_ipi_write64(startargs[0],
>> + ipi_mailbox_buf[cpu_logical_map(cpu)] + 0x0);
>> + }
>> +
>> return 0;
>> }
Powered by blists - more mailing lists