[rc3,01/30] target/avr: Add basic parameters for new AVR platform
diff mbox series

Message ID 1580079311-20447-2-git-send-email-aleksandar.markovic@rt-rk.com
State New
Headers show
Series
  • target/avr merger
Related show

Commit Message

Aleksandar Markovic Jan. 26, 2020, 10:54 p.m. UTC
From: Michael Rolnik <mrolnik@gmail.com>

This includes definitions of various basic parameters needed
for integration of a new platform into QEMU.

Co-developed-by: Michael Rolnik <mrolnik@gmail.com>
Co-developed-by: Sarah Harris <S.E.Harris@kent.ac.uk>
Signed-off-by: Michael Rolnik <mrolnik@gmail.com>
Signed-off-by: Sarah Harris <S.E.Harris@kent.ac.uk>
Signed-off-by: Michael Rolnik <mrolnik@gmail.com>
Acked-by: Igor Mammedov <imammedo@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Aleksandar Markovic <aleksandar.m.mail@gmail.com>
---
 target/avr/cpu-param.h | 37 ++++++++++++++++++++++++++
 target/avr/cpu.h       | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 109 insertions(+)
 create mode 100644 target/avr/cpu-param.h
 create mode 100644 target/avr/cpu.h

Comments

Michael Rolnik Jan. 27, 2020, 8:54 a.m. UTC | #1
Thanks for you help guys.

On Mon, Jan 27, 2020 at 12:55 AM Aleksandar Markovic <
aleksandar.markovic@rt-rk.com> wrote:

> From: Michael Rolnik <mrolnik@gmail.com>
>
> This includes definitions of various basic parameters needed
> for integration of a new platform into QEMU.
>
> Co-developed-by: Michael Rolnik <mrolnik@gmail.com>
> Co-developed-by: Sarah Harris <S.E.Harris@kent.ac.uk>
> Signed-off-by: Michael Rolnik <mrolnik@gmail.com>
> Signed-off-by: Sarah Harris <S.E.Harris@kent.ac.uk>
> Signed-off-by: Michael Rolnik <mrolnik@gmail.com>
> Acked-by: Igor Mammedov <imammedo@redhat.com>
> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> Signed-off-by: Aleksandar Markovic <aleksandar.m.mail@gmail.com>
> ---
>  target/avr/cpu-param.h | 37 ++++++++++++++++++++++++++
>  target/avr/cpu.h       | 72
> ++++++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 109 insertions(+)
>  create mode 100644 target/avr/cpu-param.h
>  create mode 100644 target/avr/cpu.h
>
> diff --git a/target/avr/cpu-param.h b/target/avr/cpu-param.h
> new file mode 100644
> index 0000000..0c29ce4
> --- /dev/null
> +++ b/target/avr/cpu-param.h
> @@ -0,0 +1,37 @@
> +/*
> + * QEMU AVR CPU
> + *
> + * Copyright (c) 2019 Michael Rolnik
> + *
> + * This library is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Lesser General Public
> + * License as published by the Free Software Foundation; either
> + * version 2.1 of the License, or (at your option) any later version.
> + *
> + * This library is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> + * Lesser General Public License for more details.
> + *
> + * You should have received a copy of the GNU Lesser General Public
> + * License along with this library; if not, see
> + * <http://www.gnu.org/licenses/lgpl-2.1.html>
> + */
> +
> +#ifndef AVR_CPU_PARAM_H
> +#define AVR_CPU_PARAM_H
> +
> +#define TARGET_LONG_BITS 32
> +/*
> + * TARGET_PAGE_BITS cannot be more than 8 bits because
> + * 1.  all IO registers occupy [0x0000 .. 0x00ff] address range, and they
> + *     should be implemented as a device and not memory
> + * 2.  SRAM starts at the address 0x0100
> + */
> +#define TARGET_PAGE_BITS 8
> +#define TARGET_PHYS_ADDR_SPACE_BITS 24
> +#define TARGET_VIRT_ADDR_SPACE_BITS 24
> +#define NB_MMU_MODES 2
> +
> +
> +#endif
> diff --git a/target/avr/cpu.h b/target/avr/cpu.h
> new file mode 100644
> index 0000000..d122611
> --- /dev/null
> +++ b/target/avr/cpu.h
> @@ -0,0 +1,72 @@
> +/*
> + * QEMU AVR CPU
> + *
> + * Copyright (c) 2019 Michael Rolnik
> + *
> + * This library is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Lesser General Public
> + * License as published by the Free Software Foundation; either
> + * version 2.1 of the License, or (at your option) any later version.
> + *
> + * This library is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> + * Lesser General Public License for more details.
> + *
> + * You should have received a copy of the GNU Lesser General Public
> + * License along with this library; if not, see
> + * <http://www.gnu.org/licenses/lgpl-2.1.html>
> + */
> +
> +#ifndef QEMU_AVR_CPU_H
> +#define QEMU_AVR_CPU_H
> +
> +#include "cpu-qom.h"
> +#include "exec/cpu-defs.h"
> +
> +#define TCG_GUEST_DEFAULT_MO 0
> +#define AVR_CPU_TYPE_SUFFIX "-" TYPE_AVR_CPU
> +#define AVR_CPU_TYPE_NAME(name) (name AVR_CPU_TYPE_SUFFIX)
> +#define CPU_RESOLVING_TYPE TYPE_AVR_CPU
> +
> +/*
> + * AVR has two memory spaces, data & code.
> + * e.g. both have 0 address
> + * ST/LD instructions access data space
> + * LPM/SPM and instruction fetching access code memory space
> + */
> +#define MMU_CODE_IDX 0
> +#define MMU_DATA_IDX 1
> +
> +#define EXCP_RESET 1
> +#define EXCP_INT(n) (EXCP_RESET + (n) + 1)
> +
> +/* Number of CPU registers */
> +#define NUMBER_OF_CPU_REGISTERS 32
> +/* Number of IO registers accessible by ld/st/in/out */
> +#define NUMBER_OF_IO_REGISTERS 64
> +
> +/*
> + * Offsets of AVR memory regions in host memory space.
> + *
> + * This is needed because the AVR has separate code and data address
> + * spaces that both have start from zero but have to go somewhere in
> + * host memory.
> + *
> + * It's also useful to know where some things are, like the IO registers.
> + */
> +/* Flash program memory */
> +#define OFFSET_CODE 0x00000000
> +/* CPU registers, IO registers, and SRAM */
> +#define OFFSET_DATA 0x00800000
> +/* CPU registers specifically, these are mapped at the start of data */
> +#define OFFSET_CPU_REGISTERS OFFSET_DATA
> +/*
> + * IO registers, including status register, stack pointer, and memory
> + * mapped peripherals, mapped just after CPU registers
> + */
> +#define OFFSET_IO_REGISTERS (OFFSET_DATA + NUMBER_OF_CPU_REGISTERS)
> +
> +#define EF_AVR_MACH 0x7F
> +
> +#endif /* !defined (QEMU_AVR_CPU_H) */
> --
> 2.7.4
>
>
Michael Rolnik Jan. 28, 2020, 1:25 p.m. UTC | #2
Hi all.

I am totally lost in the email.
Are there any action items for me / someone else ?

Regards,
Michael Rolnik


On Mon, Jan 27, 2020 at 10:54 AM Michael Rolnik <mrolnik@gmail.com> wrote:

> Thanks for you help guys.
>
> On Mon, Jan 27, 2020 at 12:55 AM Aleksandar Markovic <
> aleksandar.markovic@rt-rk.com> wrote:
>
>> From: Michael Rolnik <mrolnik@gmail.com>
>>
>> This includes definitions of various basic parameters needed
>> for integration of a new platform into QEMU.
>>
>> Co-developed-by: Michael Rolnik <mrolnik@gmail.com>
>> Co-developed-by: Sarah Harris <S.E.Harris@kent.ac.uk>
>> Signed-off-by: Michael Rolnik <mrolnik@gmail.com>
>> Signed-off-by: Sarah Harris <S.E.Harris@kent.ac.uk>
>> Signed-off-by: Michael Rolnik <mrolnik@gmail.com>
>> Acked-by: Igor Mammedov <imammedo@redhat.com>
>> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
>> Signed-off-by: Aleksandar Markovic <aleksandar.m.mail@gmail.com>
>> ---
>>  target/avr/cpu-param.h | 37 ++++++++++++++++++++++++++
>>  target/avr/cpu.h       | 72
>> ++++++++++++++++++++++++++++++++++++++++++++++++++
>>  2 files changed, 109 insertions(+)
>>  create mode 100644 target/avr/cpu-param.h
>>  create mode 100644 target/avr/cpu.h
>>
>> diff --git a/target/avr/cpu-param.h b/target/avr/cpu-param.h
>> new file mode 100644
>> index 0000000..0c29ce4
>> --- /dev/null
>> +++ b/target/avr/cpu-param.h
>> @@ -0,0 +1,37 @@
>> +/*
>> + * QEMU AVR CPU
>> + *
>> + * Copyright (c) 2019 Michael Rolnik
>> + *
>> + * This library is free software; you can redistribute it and/or
>> + * modify it under the terms of the GNU Lesser General Public
>> + * License as published by the Free Software Foundation; either
>> + * version 2.1 of the License, or (at your option) any later version.
>> + *
>> + * This library is distributed in the hope that it will be useful,
>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>> + * Lesser General Public License for more details.
>> + *
>> + * You should have received a copy of the GNU Lesser General Public
>> + * License along with this library; if not, see
>> + * <http://www.gnu.org/licenses/lgpl-2.1.html>
>> + */
>> +
>> +#ifndef AVR_CPU_PARAM_H
>> +#define AVR_CPU_PARAM_H
>> +
>> +#define TARGET_LONG_BITS 32
>> +/*
>> + * TARGET_PAGE_BITS cannot be more than 8 bits because
>> + * 1.  all IO registers occupy [0x0000 .. 0x00ff] address range, and they
>> + *     should be implemented as a device and not memory
>> + * 2.  SRAM starts at the address 0x0100
>> + */
>> +#define TARGET_PAGE_BITS 8
>> +#define TARGET_PHYS_ADDR_SPACE_BITS 24
>> +#define TARGET_VIRT_ADDR_SPACE_BITS 24
>> +#define NB_MMU_MODES 2
>> +
>> +
>> +#endif
>> diff --git a/target/avr/cpu.h b/target/avr/cpu.h
>> new file mode 100644
>> index 0000000..d122611
>> --- /dev/null
>> +++ b/target/avr/cpu.h
>> @@ -0,0 +1,72 @@
>> +/*
>> + * QEMU AVR CPU
>> + *
>> + * Copyright (c) 2019 Michael Rolnik
>> + *
>> + * This library is free software; you can redistribute it and/or
>> + * modify it under the terms of the GNU Lesser General Public
>> + * License as published by the Free Software Foundation; either
>> + * version 2.1 of the License, or (at your option) any later version.
>> + *
>> + * This library is distributed in the hope that it will be useful,
>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>> + * Lesser General Public License for more details.
>> + *
>> + * You should have received a copy of the GNU Lesser General Public
>> + * License along with this library; if not, see
>> + * <http://www.gnu.org/licenses/lgpl-2.1.html>
>> + */
>> +
>> +#ifndef QEMU_AVR_CPU_H
>> +#define QEMU_AVR_CPU_H
>> +
>> +#include "cpu-qom.h"
>> +#include "exec/cpu-defs.h"
>> +
>> +#define TCG_GUEST_DEFAULT_MO 0
>> +#define AVR_CPU_TYPE_SUFFIX "-" TYPE_AVR_CPU
>> +#define AVR_CPU_TYPE_NAME(name) (name AVR_CPU_TYPE_SUFFIX)
>> +#define CPU_RESOLVING_TYPE TYPE_AVR_CPU
>> +
>> +/*
>> + * AVR has two memory spaces, data & code.
>> + * e.g. both have 0 address
>> + * ST/LD instructions access data space
>> + * LPM/SPM and instruction fetching access code memory space
>> + */
>> +#define MMU_CODE_IDX 0
>> +#define MMU_DATA_IDX 1
>> +
>> +#define EXCP_RESET 1
>> +#define EXCP_INT(n) (EXCP_RESET + (n) + 1)
>> +
>> +/* Number of CPU registers */
>> +#define NUMBER_OF_CPU_REGISTERS 32
>> +/* Number of IO registers accessible by ld/st/in/out */
>> +#define NUMBER_OF_IO_REGISTERS 64
>> +
>> +/*
>> + * Offsets of AVR memory regions in host memory space.
>> + *
>> + * This is needed because the AVR has separate code and data address
>> + * spaces that both have start from zero but have to go somewhere in
>> + * host memory.
>> + *
>> + * It's also useful to know where some things are, like the IO registers.
>> + */
>> +/* Flash program memory */
>> +#define OFFSET_CODE 0x00000000
>> +/* CPU registers, IO registers, and SRAM */
>> +#define OFFSET_DATA 0x00800000
>> +/* CPU registers specifically, these are mapped at the start of data */
>> +#define OFFSET_CPU_REGISTERS OFFSET_DATA
>> +/*
>> + * IO registers, including status register, stack pointer, and memory
>> + * mapped peripherals, mapped just after CPU registers
>> + */
>> +#define OFFSET_IO_REGISTERS (OFFSET_DATA + NUMBER_OF_CPU_REGISTERS)
>> +
>> +#define EF_AVR_MACH 0x7F
>> +
>> +#endif /* !defined (QEMU_AVR_CPU_H) */
>> --
>> 2.7.4
>>
>>
>
> --
> Best Regards,
> Michael Rolnik
>
Aleksandar Markovic Jan. 28, 2020, 1:49 p.m. UTC | #3
On Tuesday, January 28, 2020, Michael Rolnik <mrolnik@gmail.com> wrote:

> Hi all.
>
> I am totally lost in the email.
> Are there any action items for me / someone else ?
>
> Regards,
> Michael Rolnik
>
>
I think it would be helpful if we have rc4 with two action items:

   - remove CONFIG_USER_ONLY references, and all dead code thay may have
come with it + add check in cpu.h that Philippe suggested.
   - remove "Atmel" word from all elements of the series (patch names,
messages, filenames, structure names, ...)

Needless to say that this must be done with extreme care.

I propose that Philippe do rc4.

Sincerely,
Aleksandar



>
> On Mon, Jan 27, 2020 at 10:54 AM Michael Rolnik <mrolnik@gmail.com> wrote:
>
>> Thanks for you help guys.
>>
>> On Mon, Jan 27, 2020 at 12:55 AM Aleksandar Markovic <
>> aleksandar.markovic@rt-rk.com> wrote:
>>
>>> From: Michael Rolnik <mrolnik@gmail.com>
>>>
>>> This includes definitions of various basic parameters needed
>>> for integration of a new platform into QEMU.
>>>
>>> Co-developed-by: Michael Rolnik <mrolnik@gmail.com>
>>> Co-developed-by: Sarah Harris <S.E.Harris@kent.ac.uk>
>>> Signed-off-by: Michael Rolnik <mrolnik@gmail.com>
>>> Signed-off-by: Sarah Harris <S.E.Harris@kent.ac.uk>
>>> Signed-off-by: Michael Rolnik <mrolnik@gmail.com>
>>> Acked-by: Igor Mammedov <imammedo@redhat.com>
>>> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>>> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
>>> Signed-off-by: Aleksandar Markovic <aleksandar.m.mail@gmail.com>
>>> ---
>>>  target/avr/cpu-param.h | 37 ++++++++++++++++++++++++++
>>>  target/avr/cpu.h       | 72 ++++++++++++++++++++++++++++++
>>> ++++++++++++++++++++
>>>  2 files changed, 109 insertions(+)
>>>  create mode 100644 target/avr/cpu-param.h
>>>  create mode 100644 target/avr/cpu.h
>>>
>>> diff --git a/target/avr/cpu-param.h b/target/avr/cpu-param.h
>>> new file mode 100644
>>> index 0000000..0c29ce4
>>> --- /dev/null
>>> +++ b/target/avr/cpu-param.h
>>> @@ -0,0 +1,37 @@
>>> +/*
>>> + * QEMU AVR CPU
>>> + *
>>> + * Copyright (c) 2019 Michael Rolnik
>>> + *
>>> + * This library is free software; you can redistribute it and/or
>>> + * modify it under the terms of the GNU Lesser General Public
>>> + * License as published by the Free Software Foundation; either
>>> + * version 2.1 of the License, or (at your option) any later version.
>>> + *
>>> + * This library is distributed in the hope that it will be useful,
>>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>>> + * Lesser General Public License for more details.
>>> + *
>>> + * You should have received a copy of the GNU Lesser General Public
>>> + * License along with this library; if not, see
>>> + * <http://www.gnu.org/licenses/lgpl-2.1.html>
>>> + */
>>> +
>>> +#ifndef AVR_CPU_PARAM_H
>>> +#define AVR_CPU_PARAM_H
>>> +
>>> +#define TARGET_LONG_BITS 32
>>> +/*
>>> + * TARGET_PAGE_BITS cannot be more than 8 bits because
>>> + * 1.  all IO registers occupy [0x0000 .. 0x00ff] address range, and
>>> they
>>> + *     should be implemented as a device and not memory
>>> + * 2.  SRAM starts at the address 0x0100
>>> + */
>>> +#define TARGET_PAGE_BITS 8
>>> +#define TARGET_PHYS_ADDR_SPACE_BITS 24
>>> +#define TARGET_VIRT_ADDR_SPACE_BITS 24
>>> +#define NB_MMU_MODES 2
>>> +
>>> +
>>> +#endif
>>> diff --git a/target/avr/cpu.h b/target/avr/cpu.h
>>> new file mode 100644
>>> index 0000000..d122611
>>> --- /dev/null
>>> +++ b/target/avr/cpu.h
>>> @@ -0,0 +1,72 @@
>>> +/*
>>> + * QEMU AVR CPU
>>> + *
>>> + * Copyright (c) 2019 Michael Rolnik
>>> + *
>>> + * This library is free software; you can redistribute it and/or
>>> + * modify it under the terms of the GNU Lesser General Public
>>> + * License as published by the Free Software Foundation; either
>>> + * version 2.1 of the License, or (at your option) any later version.
>>> + *
>>> + * This library is distributed in the hope that it will be useful,
>>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>>> + * Lesser General Public License for more details.
>>> + *
>>> + * You should have received a copy of the GNU Lesser General Public
>>> + * License along with this library; if not, see
>>> + * <http://www.gnu.org/licenses/lgpl-2.1.html>
>>> + */
>>> +
>>> +#ifndef QEMU_AVR_CPU_H
>>> +#define QEMU_AVR_CPU_H
>>> +
>>> +#include "cpu-qom.h"
>>> +#include "exec/cpu-defs.h"
>>> +
>>> +#define TCG_GUEST_DEFAULT_MO 0
>>> +#define AVR_CPU_TYPE_SUFFIX "-" TYPE_AVR_CPU
>>> +#define AVR_CPU_TYPE_NAME(name) (name AVR_CPU_TYPE_SUFFIX)
>>> +#define CPU_RESOLVING_TYPE TYPE_AVR_CPU
>>> +
>>> +/*
>>> + * AVR has two memory spaces, data & code.
>>> + * e.g. both have 0 address
>>> + * ST/LD instructions access data space
>>> + * LPM/SPM and instruction fetching access code memory space
>>> + */
>>> +#define MMU_CODE_IDX 0
>>> +#define MMU_DATA_IDX 1
>>> +
>>> +#define EXCP_RESET 1
>>> +#define EXCP_INT(n) (EXCP_RESET + (n) + 1)
>>> +
>>> +/* Number of CPU registers */
>>> +#define NUMBER_OF_CPU_REGISTERS 32
>>> +/* Number of IO registers accessible by ld/st/in/out */
>>> +#define NUMBER_OF_IO_REGISTERS 64
>>> +
>>> +/*
>>> + * Offsets of AVR memory regions in host memory space.
>>> + *
>>> + * This is needed because the AVR has separate code and data address
>>> + * spaces that both have start from zero but have to go somewhere in
>>> + * host memory.
>>> + *
>>> + * It's also useful to know where some things are, like the IO
>>> registers.
>>> + */
>>> +/* Flash program memory */
>>> +#define OFFSET_CODE 0x00000000
>>> +/* CPU registers, IO registers, and SRAM */
>>> +#define OFFSET_DATA 0x00800000
>>> +/* CPU registers specifically, these are mapped at the start of data */
>>> +#define OFFSET_CPU_REGISTERS OFFSET_DATA
>>> +/*
>>> + * IO registers, including status register, stack pointer, and memory
>>> + * mapped peripherals, mapped just after CPU registers
>>> + */
>>> +#define OFFSET_IO_REGISTERS (OFFSET_DATA + NUMBER_OF_CPU_REGISTERS)
>>> +
>>> +#define EF_AVR_MACH 0x7F
>>> +
>>> +#endif /* !defined (QEMU_AVR_CPU_H) */
>>> --
>>> 2.7.4
>>>
>>>
>>
>> --
>> Best Regards,
>> Michael Rolnik
>>
>
>
> --
> Best Regards,
> Michael Rolnik
>
Michael Rolnik Jan. 28, 2020, 3:10 p.m. UTC | #4
Sounds good to me.

On Tue, Jan 28, 2020 at 3:49 PM Aleksandar Markovic <
aleksandar.m.mail@gmail.com> wrote:

>
>
> On Tuesday, January 28, 2020, Michael Rolnik <mrolnik@gmail.com> wrote:
>
>> Hi all.
>>
>> I am totally lost in the email.
>> Are there any action items for me / someone else ?
>>
>> Regards,
>> Michael Rolnik
>>
>>
> I think it would be helpful if we have rc4 with two action items:
>
>    - remove CONFIG_USER_ONLY references, and all dead code thay may have
> come with it + add check in cpu.h that Philippe suggested.
>    - remove "Atmel" word from all elements of the series (patch names,
> messages, filenames, structure names, ...)
>
> Needless to say that this must be done with extreme care.
>
> I propose that Philippe do rc4.
>
> Sincerely,
> Aleksandar
>
>
>
>>
>> On Mon, Jan 27, 2020 at 10:54 AM Michael Rolnik <mrolnik@gmail.com>
>> wrote:
>>
>>> Thanks for you help guys.
>>>
>>> On Mon, Jan 27, 2020 at 12:55 AM Aleksandar Markovic <
>>> aleksandar.markovic@rt-rk.com> wrote:
>>>
>>>> From: Michael Rolnik <mrolnik@gmail.com>
>>>>
>>>> This includes definitions of various basic parameters needed
>>>> for integration of a new platform into QEMU.
>>>>
>>>> Co-developed-by: Michael Rolnik <mrolnik@gmail.com>
>>>> Co-developed-by: Sarah Harris <S.E.Harris@kent.ac.uk>
>>>> Signed-off-by: Michael Rolnik <mrolnik@gmail.com>
>>>> Signed-off-by: Sarah Harris <S.E.Harris@kent.ac.uk>
>>>> Signed-off-by: Michael Rolnik <mrolnik@gmail.com>
>>>> Acked-by: Igor Mammedov <imammedo@redhat.com>
>>>> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>>>> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
>>>> Signed-off-by: Aleksandar Markovic <aleksandar.m.mail@gmail.com>
>>>> ---
>>>>  target/avr/cpu-param.h | 37 ++++++++++++++++++++++++++
>>>>  target/avr/cpu.h       | 72
>>>> ++++++++++++++++++++++++++++++++++++++++++++++++++
>>>>  2 files changed, 109 insertions(+)
>>>>  create mode 100644 target/avr/cpu-param.h
>>>>  create mode 100644 target/avr/cpu.h
>>>>
>>>> diff --git a/target/avr/cpu-param.h b/target/avr/cpu-param.h
>>>> new file mode 100644
>>>> index 0000000..0c29ce4
>>>> --- /dev/null
>>>> +++ b/target/avr/cpu-param.h
>>>> @@ -0,0 +1,37 @@
>>>> +/*
>>>> + * QEMU AVR CPU
>>>> + *
>>>> + * Copyright (c) 2019 Michael Rolnik
>>>> + *
>>>> + * This library is free software; you can redistribute it and/or
>>>> + * modify it under the terms of the GNU Lesser General Public
>>>> + * License as published by the Free Software Foundation; either
>>>> + * version 2.1 of the License, or (at your option) any later version.
>>>> + *
>>>> + * This library is distributed in the hope that it will be useful,
>>>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>>>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>>>> + * Lesser General Public License for more details.
>>>> + *
>>>> + * You should have received a copy of the GNU Lesser General Public
>>>> + * License along with this library; if not, see
>>>> + * <http://www.gnu.org/licenses/lgpl-2.1.html>
>>>> + */
>>>> +
>>>> +#ifndef AVR_CPU_PARAM_H
>>>> +#define AVR_CPU_PARAM_H
>>>> +
>>>> +#define TARGET_LONG_BITS 32
>>>> +/*
>>>> + * TARGET_PAGE_BITS cannot be more than 8 bits because
>>>> + * 1.  all IO registers occupy [0x0000 .. 0x00ff] address range, and
>>>> they
>>>> + *     should be implemented as a device and not memory
>>>> + * 2.  SRAM starts at the address 0x0100
>>>> + */
>>>> +#define TARGET_PAGE_BITS 8
>>>> +#define TARGET_PHYS_ADDR_SPACE_BITS 24
>>>> +#define TARGET_VIRT_ADDR_SPACE_BITS 24
>>>> +#define NB_MMU_MODES 2
>>>> +
>>>> +
>>>> +#endif
>>>> diff --git a/target/avr/cpu.h b/target/avr/cpu.h
>>>> new file mode 100644
>>>> index 0000000..d122611
>>>> --- /dev/null
>>>> +++ b/target/avr/cpu.h
>>>> @@ -0,0 +1,72 @@
>>>> +/*
>>>> + * QEMU AVR CPU
>>>> + *
>>>> + * Copyright (c) 2019 Michael Rolnik
>>>> + *
>>>> + * This library is free software; you can redistribute it and/or
>>>> + * modify it under the terms of the GNU Lesser General Public
>>>> + * License as published by the Free Software Foundation; either
>>>> + * version 2.1 of the License, or (at your option) any later version.
>>>> + *
>>>> + * This library is distributed in the hope that it will be useful,
>>>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>>>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>>>> + * Lesser General Public License for more details.
>>>> + *
>>>> + * You should have received a copy of the GNU Lesser General Public
>>>> + * License along with this library; if not, see
>>>> + * <http://www.gnu.org/licenses/lgpl-2.1.html>
>>>> + */
>>>> +
>>>> +#ifndef QEMU_AVR_CPU_H
>>>> +#define QEMU_AVR_CPU_H
>>>> +
>>>> +#include "cpu-qom.h"
>>>> +#include "exec/cpu-defs.h"
>>>> +
>>>> +#define TCG_GUEST_DEFAULT_MO 0
>>>> +#define AVR_CPU_TYPE_SUFFIX "-" TYPE_AVR_CPU
>>>> +#define AVR_CPU_TYPE_NAME(name) (name AVR_CPU_TYPE_SUFFIX)
>>>> +#define CPU_RESOLVING_TYPE TYPE_AVR_CPU
>>>> +
>>>> +/*
>>>> + * AVR has two memory spaces, data & code.
>>>> + * e.g. both have 0 address
>>>> + * ST/LD instructions access data space
>>>> + * LPM/SPM and instruction fetching access code memory space
>>>> + */
>>>> +#define MMU_CODE_IDX 0
>>>> +#define MMU_DATA_IDX 1
>>>> +
>>>> +#define EXCP_RESET 1
>>>> +#define EXCP_INT(n) (EXCP_RESET + (n) + 1)
>>>> +
>>>> +/* Number of CPU registers */
>>>> +#define NUMBER_OF_CPU_REGISTERS 32
>>>> +/* Number of IO registers accessible by ld/st/in/out */
>>>> +#define NUMBER_OF_IO_REGISTERS 64
>>>> +
>>>> +/*
>>>> + * Offsets of AVR memory regions in host memory space.
>>>> + *
>>>> + * This is needed because the AVR has separate code and data address
>>>> + * spaces that both have start from zero but have to go somewhere in
>>>> + * host memory.
>>>> + *
>>>> + * It's also useful to know where some things are, like the IO
>>>> registers.
>>>> + */
>>>> +/* Flash program memory */
>>>> +#define OFFSET_CODE 0x00000000
>>>> +/* CPU registers, IO registers, and SRAM */
>>>> +#define OFFSET_DATA 0x00800000
>>>> +/* CPU registers specifically, these are mapped at the start of data */
>>>> +#define OFFSET_CPU_REGISTERS OFFSET_DATA
>>>> +/*
>>>> + * IO registers, including status register, stack pointer, and memory
>>>> + * mapped peripherals, mapped just after CPU registers
>>>> + */
>>>> +#define OFFSET_IO_REGISTERS (OFFSET_DATA + NUMBER_OF_CPU_REGISTERS)
>>>> +
>>>> +#define EF_AVR_MACH 0x7F
>>>> +
>>>> +#endif /* !defined (QEMU_AVR_CPU_H) */
>>>> --
>>>> 2.7.4
>>>>
>>>>
>>>
>>> --
>>> Best Regards,
>>> Michael Rolnik
>>>
>>
>>
>> --
>> Best Regards,
>> Michael Rolnik
>>
>
Aleksandar Markovic Jan. 28, 2020, 6:01 p.m. UTC | #5
Works for me too.

16:10 Uto, 28.01.2020. Michael Rolnik <mrolnik@gmail.com> је написао/ла:

> Sounds good to me.
>
> On Tue, Jan 28, 2020 at 3:49 PM Aleksandar Markovic <
> aleksandar.m.mail@gmail.com> wrote:
>
>>
>>
>> On Tuesday, January 28, 2020, Michael Rolnik <mrolnik@gmail.com> wrote:
>>
>>> Hi all.
>>>
>>> I am totally lost in the email.
>>> Are there any action items for me / someone else ?
>>>
>>> Regards,
>>> Michael Rolnik
>>>
>>>
>> I think it would be helpful if we have rc4 with two action items:
>>
>>    - remove CONFIG_USER_ONLY references, and all dead code thay may have
>> come with it + add check in cpu.h that Philippe suggested.
>>    - remove "Atmel" word from all elements of the series (patch names,
>> messages, filenames, structure names, ...)
>>
>> Needless to say that this must be done with extreme care.
>>
>> I propose that Philippe do rc4.
>>
>> Sincerely,
>> Aleksandar
>>
>>
>>
>>>
>>> On Mon, Jan 27, 2020 at 10:54 AM Michael Rolnik <mrolnik@gmail.com>
>>> wrote:
>>>
>>>> Thanks for you help guys.
>>>>
>>>> On Mon, Jan 27, 2020 at 12:55 AM Aleksandar Markovic <
>>>> aleksandar.markovic@rt-rk.com> wrote:
>>>>
>>>>> From: Michael Rolnik <mrolnik@gmail.com>
>>>>>
>>>>> This includes definitions of various basic parameters needed
>>>>> for integration of a new platform into QEMU.
>>>>>
>>>>> Co-developed-by: Michael Rolnik <mrolnik@gmail.com>
>>>>> Co-developed-by: Sarah Harris <S.E.Harris@kent.ac.uk>
>>>>> Signed-off-by: Michael Rolnik <mrolnik@gmail.com>
>>>>> Signed-off-by: Sarah Harris <S.E.Harris@kent.ac.uk>
>>>>> Signed-off-by: Michael Rolnik <mrolnik@gmail.com>
>>>>> Acked-by: Igor Mammedov <imammedo@redhat.com>
>>>>> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>>>>> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
>>>>> Signed-off-by: Aleksandar Markovic <aleksandar.m.mail@gmail.com>
>>>>> ---
>>>>>  target/avr/cpu-param.h | 37 ++++++++++++++++++++++++++
>>>>>  target/avr/cpu.h       | 72
>>>>> ++++++++++++++++++++++++++++++++++++++++++++++++++
>>>>>  2 files changed, 109 insertions(+)
>>>>>  create mode 100644 target/avr/cpu-param.h
>>>>>  create mode 100644 target/avr/cpu.h
>>>>>
>>>>> diff --git a/target/avr/cpu-param.h b/target/avr/cpu-param.h
>>>>> new file mode 100644
>>>>> index 0000000..0c29ce4
>>>>> --- /dev/null
>>>>> +++ b/target/avr/cpu-param.h
>>>>> @@ -0,0 +1,37 @@
>>>>> +/*
>>>>> + * QEMU AVR CPU
>>>>> + *
>>>>> + * Copyright (c) 2019 Michael Rolnik
>>>>> + *
>>>>> + * This library is free software; you can redistribute it and/or
>>>>> + * modify it under the terms of the GNU Lesser General Public
>>>>> + * License as published by the Free Software Foundation; either
>>>>> + * version 2.1 of the License, or (at your option) any later version.
>>>>> + *
>>>>> + * This library is distributed in the hope that it will be useful,
>>>>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>>>>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>>>>> + * Lesser General Public License for more details.
>>>>> + *
>>>>> + * You should have received a copy of the GNU Lesser General Public
>>>>> + * License along with this library; if not, see
>>>>> + * <http://www.gnu.org/licenses/lgpl-2.1.html>
>>>>> + */
>>>>> +
>>>>> +#ifndef AVR_CPU_PARAM_H
>>>>> +#define AVR_CPU_PARAM_H
>>>>> +
>>>>> +#define TARGET_LONG_BITS 32
>>>>> +/*
>>>>> + * TARGET_PAGE_BITS cannot be more than 8 bits because
>>>>> + * 1.  all IO registers occupy [0x0000 .. 0x00ff] address range, and
>>>>> they
>>>>> + *     should be implemented as a device and not memory
>>>>> + * 2.  SRAM starts at the address 0x0100
>>>>> + */
>>>>> +#define TARGET_PAGE_BITS 8
>>>>> +#define TARGET_PHYS_ADDR_SPACE_BITS 24
>>>>> +#define TARGET_VIRT_ADDR_SPACE_BITS 24
>>>>> +#define NB_MMU_MODES 2
>>>>> +
>>>>> +
>>>>> +#endif
>>>>> diff --git a/target/avr/cpu.h b/target/avr/cpu.h
>>>>> new file mode 100644
>>>>> index 0000000..d122611
>>>>> --- /dev/null
>>>>> +++ b/target/avr/cpu.h
>>>>> @@ -0,0 +1,72 @@
>>>>> +/*
>>>>> + * QEMU AVR CPU
>>>>> + *
>>>>> + * Copyright (c) 2019 Michael Rolnik
>>>>> + *
>>>>> + * This library is free software; you can redistribute it and/or
>>>>> + * modify it under the terms of the GNU Lesser General Public
>>>>> + * License as published by the Free Software Foundation; either
>>>>> + * version 2.1 of the License, or (at your option) any later version.
>>>>> + *
>>>>> + * This library is distributed in the hope that it will be useful,
>>>>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>>>>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>>>>> + * Lesser General Public License for more details.
>>>>> + *
>>>>> + * You should have received a copy of the GNU Lesser General Public
>>>>> + * License along with this library; if not, see
>>>>> + * <http://www.gnu.org/licenses/lgpl-2.1.html>
>>>>> + */
>>>>> +
>>>>> +#ifndef QEMU_AVR_CPU_H
>>>>> +#define QEMU_AVR_CPU_H
>>>>> +
>>>>> +#include "cpu-qom.h"
>>>>> +#include "exec/cpu-defs.h"
>>>>> +
>>>>> +#define TCG_GUEST_DEFAULT_MO 0
>>>>> +#define AVR_CPU_TYPE_SUFFIX "-" TYPE_AVR_CPU
>>>>> +#define AVR_CPU_TYPE_NAME(name) (name AVR_CPU_TYPE_SUFFIX)
>>>>> +#define CPU_RESOLVING_TYPE TYPE_AVR_CPU
>>>>> +
>>>>> +/*
>>>>> + * AVR has two memory spaces, data & code.
>>>>> + * e.g. both have 0 address
>>>>> + * ST/LD instructions access data space
>>>>> + * LPM/SPM and instruction fetching access code memory space
>>>>> + */
>>>>> +#define MMU_CODE_IDX 0
>>>>> +#define MMU_DATA_IDX 1
>>>>> +
>>>>> +#define EXCP_RESET 1
>>>>> +#define EXCP_INT(n) (EXCP_RESET + (n) + 1)
>>>>> +
>>>>> +/* Number of CPU registers */
>>>>> +#define NUMBER_OF_CPU_REGISTERS 32
>>>>> +/* Number of IO registers accessible by ld/st/in/out */
>>>>> +#define NUMBER_OF_IO_REGISTERS 64
>>>>> +
>>>>> +/*
>>>>> + * Offsets of AVR memory regions in host memory space.
>>>>> + *
>>>>> + * This is needed because the AVR has separate code and data address
>>>>> + * spaces that both have start from zero but have to go somewhere in
>>>>> + * host memory.
>>>>> + *
>>>>> + * It's also useful to know where some things are, like the IO
>>>>> registers.
>>>>> + */
>>>>> +/* Flash program memory */
>>>>> +#define OFFSET_CODE 0x00000000
>>>>> +/* CPU registers, IO registers, and SRAM */
>>>>> +#define OFFSET_DATA 0x00800000
>>>>> +/* CPU registers specifically, these are mapped at the start of data
>>>>> */
>>>>> +#define OFFSET_CPU_REGISTERS OFFSET_DATA
>>>>> +/*
>>>>> + * IO registers, including status register, stack pointer, and memory
>>>>> + * mapped peripherals, mapped just after CPU registers
>>>>> + */
>>>>> +#define OFFSET_IO_REGISTERS (OFFSET_DATA + NUMBER_OF_CPU_REGISTERS)
>>>>> +
>>>>> +#define EF_AVR_MACH 0x7F
>>>>> +
>>>>> +#endif /* !defined (QEMU_AVR_CPU_H) */
>>>>> --
>>>>> 2.7.4
>>>>>
>>>>>
>>>>
>>>> --
>>>> Best Regards,
>>>> Michael Rolnik
>>>>
>>>
>>>
>>> --
>>> Best Regards,
>>> Michael Rolnik
>>>
>>
>
> --
> Best Regards,
> Michael Rolnik
>
Philippe Mathieu-Daudé Jan. 29, 2020, 7:38 a.m. UTC | #6
On 1/28/20 7:01 PM, Aleksandar Markovic wrote:
> Works for me too.
> 
> 
> 16:10 Uto, 28.01.2020. Michael Rolnik <mrolnik@gmail.com 
> <mailto:mrolnik@gmail.com>> је написао/ла:
> 
>     Sounds good to me.
> 
>     On Tue, Jan 28, 2020 at 3:49 PM Aleksandar Markovic
>     <aleksandar.m.mail@gmail.com <mailto:aleksandar.m.mail@gmail.com>>
>     wrote:
> 
> 
> 
>         On Tuesday, January 28, 2020, Michael Rolnik <mrolnik@gmail.com
>         <mailto:mrolnik@gmail.com>> wrote:
> 
>             Hi all.
> 
>             I am totally lost in the email.
>             Are there any action items for me / someone else ?
> 
>             Regards,
>             Michael Rolnik
> 
> 
>         I think it would be helpful if we have rc4 with two action items:
> 
>             - remove CONFIG_USER_ONLY references, and all dead code thay
>         may have come with it + add check in cpu.h that Philippe suggested.
>             - remove "Atmel" word from all elements of the series (patch
>         names, messages, filenames, structure names, ...)
> 
>         Needless to say that this must be done with extreme care.
> 
>         I propose that Philippe do rc4.

I won't have time to work on AVR this week-end and the next one (family 
plans). If I find time I prefer prioritize the raspi machine because I 
want to see some work merged before Igor "use memdev for RAM" series get 
in. So if you guys have time & motivation, go for it!

> 
>         Sincerely,
>         Aleksandar
> 
> 
>             On Mon, Jan 27, 2020 at 10:54 AM Michael Rolnik
>             <mrolnik@gmail.com <mailto:mrolnik@gmail.com>> wrote:
> 
>                 Thanks for you help guys.
> 
>                 On Mon, Jan 27, 2020 at 12:55 AM Aleksandar Markovic
>                 <aleksandar.markovic@rt-rk.com
>                 <mailto:aleksandar.markovic@rt-rk.com>> wrote:
> 
>                     From: Michael Rolnik <mrolnik@gmail.com
>                     <mailto:mrolnik@gmail.com>>
> 
>                     This includes definitions of various basic
>                     parameters needed
>                     for integration of a new platform into QEMU.
> 
>                     Co-developed-by: Michael Rolnik <mrolnik@gmail.com
>                     <mailto:mrolnik@gmail.com>>
>                     Co-developed-by: Sarah Harris <S.E.Harris@kent.ac.uk
>                     <mailto:S.E.Harris@kent.ac.uk>>
>                     Signed-off-by: Michael Rolnik <mrolnik@gmail.com
>                     <mailto:mrolnik@gmail.com>>
>                     Signed-off-by: Sarah Harris <S.E.Harris@kent.ac.uk
>                     <mailto:S.E.Harris@kent.ac.uk>>
>                     Signed-off-by: Michael Rolnik <mrolnik@gmail.com
>                     <mailto:mrolnik@gmail.com>>
>                     Acked-by: Igor Mammedov <imammedo@redhat.com
>                     <mailto:imammedo@redhat.com>>
>                     Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com
>                     <mailto:philmd@redhat.com>>
>                     Signed-off-by: Richard Henderson
>                     <richard.henderson@linaro.org
>                     <mailto:richard.henderson@linaro.org>>
>                     Signed-off-by: Aleksandar Markovic
>                     <aleksandar.m.mail@gmail.com
>                     <mailto:aleksandar.m.mail@gmail.com>>
>                     ---
>                       target/avr/cpu-param.h | 37 ++++++++++++++++++++++++++
>                       target/avr/cpu.h       | 72
>                     ++++++++++++++++++++++++++++++++++++++++++++++++++
>                       2 files changed, 109 insertions(+)
>                       create mode 100644 target/avr/cpu-param.h
>                       create mode 100644 target/avr/cpu.h
> 
>                     diff --git a/target/avr/cpu-param.h
>                     b/target/avr/cpu-param.h
>                     new file mode 100644
>                     index 0000000..0c29ce4
>                     --- /dev/null
>                     +++ b/target/avr/cpu-param.h
>                     @@ -0,0 +1,37 @@
>                     +/*
>                     + * QEMU AVR CPU
>                     + *
>                     + * Copyright (c) 2019 Michael Rolnik
>                     + *
>                     + * This library is free software; you can
>                     redistribute it and/or
>                     + * modify it under the terms of the GNU Lesser
>                     General Public
>                     + * License as published by the Free Software
>                     Foundation; either
>                     + * version 2.1 of the License, or (at your option)
>                     any later version.
>                     + *
>                     + * This library is distributed in the hope that it
>                     will be useful,
>                     + * but WITHOUT ANY WARRANTY; without even the
>                     implied warranty of
>                     + * MERCHANTABILITY or FITNESS FOR A PARTICULAR
>                     PURPOSE.  See the GNU
>                     + * Lesser General Public License for more details.
>                     + *
>                     + * You should have received a copy of the GNU
>                     Lesser General Public
>                     + * License along with this library; if not, see
>                     + * <http://www.gnu.org/licenses/lgpl-2.1.html>
>                     + */
>                     +
>                     +#ifndef AVR_CPU_PARAM_H
>                     +#define AVR_CPU_PARAM_H
>                     +
>                     +#define TARGET_LONG_BITS 32
>                     +/*
>                     + * TARGET_PAGE_BITS cannot be more than 8 bits because
>                     + * 1.  all IO registers occupy [0x0000 .. 0x00ff]
>                     address range, and they
>                     + *     should be implemented as a device and not memory
>                     + * 2.  SRAM starts at the address 0x0100
>                     + */
>                     +#define TARGET_PAGE_BITS 8
>                     +#define TARGET_PHYS_ADDR_SPACE_BITS 24
>                     +#define TARGET_VIRT_ADDR_SPACE_BITS 24
>                     +#define NB_MMU_MODES 2
>                     +
>                     +
>                     +#endif
>                     diff --git a/target/avr/cpu.h b/target/avr/cpu.h
>                     new file mode 100644
>                     index 0000000..d122611
>                     --- /dev/null
>                     +++ b/target/avr/cpu.h
>                     @@ -0,0 +1,72 @@
>                     +/*
>                     + * QEMU AVR CPU
>                     + *
>                     + * Copyright (c) 2019 Michael Rolnik
>                     + *
>                     + * This library is free software; you can
>                     redistribute it and/or
>                     + * modify it under the terms of the GNU Lesser
>                     General Public
>                     + * License as published by the Free Software
>                     Foundation; either
>                     + * version 2.1 of the License, or (at your option)
>                     any later version.
>                     + *
>                     + * This library is distributed in the hope that it
>                     will be useful,
>                     + * but WITHOUT ANY WARRANTY; without even the
>                     implied warranty of
>                     + * MERCHANTABILITY or FITNESS FOR A PARTICULAR
>                     PURPOSE.  See the GNU
>                     + * Lesser General Public License for more details.
>                     + *
>                     + * You should have received a copy of the GNU
>                     Lesser General Public
>                     + * License along with this library; if not, see
>                     + * <http://www.gnu.org/licenses/lgpl-2.1.html>
>                     + */
>                     +
>                     +#ifndef QEMU_AVR_CPU_H
>                     +#define QEMU_AVR_CPU_H
>                     +
>                     +#include "cpu-qom.h"
>                     +#include "exec/cpu-defs.h"
>                     +
>                     +#define TCG_GUEST_DEFAULT_MO 0
>                     +#define AVR_CPU_TYPE_SUFFIX "-" TYPE_AVR_CPU
>                     +#define AVR_CPU_TYPE_NAME(name) (name
>                     AVR_CPU_TYPE_SUFFIX)
>                     +#define CPU_RESOLVING_TYPE TYPE_AVR_CPU
>                     +
>                     +/*
>                     + * AVR has two memory spaces, data & code.
>                     + * e.g. both have 0 address
>                     + * ST/LD instructions access data space
>                     + * LPM/SPM and instruction fetching access code
>                     memory space
>                     + */
>                     +#define MMU_CODE_IDX 0
>                     +#define MMU_DATA_IDX 1
>                     +
>                     +#define EXCP_RESET 1
>                     +#define EXCP_INT(n) (EXCP_RESET + (n) + 1)
>                     +
>                     +/* Number of CPU registers */
>                     +#define NUMBER_OF_CPU_REGISTERS 32
>                     +/* Number of IO registers accessible by ld/st/in/out */
>                     +#define NUMBER_OF_IO_REGISTERS 64
>                     +
>                     +/*
>                     + * Offsets of AVR memory regions in host memory space.
>                     + *
>                     + * This is needed because the AVR has separate code
>                     and data address
>                     + * spaces that both have start from zero but have
>                     to go somewhere in
>                     + * host memory.
>                     + *
>                     + * It's also useful to know where some things are,
>                     like the IO registers.
>                     + */
>                     +/* Flash program memory */
>                     +#define OFFSET_CODE 0x00000000
>                     +/* CPU registers, IO registers, and SRAM */
>                     +#define OFFSET_DATA 0x00800000
>                     +/* CPU registers specifically, these are mapped at
>                     the start of data */
>                     +#define OFFSET_CPU_REGISTERS OFFSET_DATA
>                     +/*
>                     + * IO registers, including status register, stack
>                     pointer, and memory
>                     + * mapped peripherals, mapped just after CPU registers
>                     + */
>                     +#define OFFSET_IO_REGISTERS (OFFSET_DATA +
>                     NUMBER_OF_CPU_REGISTERS)
>                     +
>                     +#define EF_AVR_MACH 0x7F
>                     +
>                     +#endif /* !defined (QEMU_AVR_CPU_H) */
>                     -- 
>                     2.7.4
> 
> 
> 
>                 -- 
>                 Best Regards,
>                 Michael Rolnik
> 
> 
> 
>             -- 
>             Best Regards,
>             Michael Rolnik
> 
> 
> 
>     -- 
>     Best Regards,
>     Michael Rolnik
>
Aleksandar Markovic Jan. 29, 2020, 10:09 a.m. UTC | #7
08:38 Sre, 29.01.2020. Philippe Mathieu-Daudé <philmd@redhat.com> је
написао/ла:
>
> On 1/28/20 7:01 PM, Aleksandar Markovic wrote:
> > Works for me too.
> >
> >
> > 16:10 Uto, 28.01.2020. Michael Rolnik <mrolnik@gmail.com
> > <mailto:mrolnik@gmail.com>> је написао/ла:
> >
> >     Sounds good to me.
> >
> >     On Tue, Jan 28, 2020 at 3:49 PM Aleksandar Markovic
> >     <aleksandar.m.mail@gmail.com <mailto:aleksandar.m.mail@gmail.com>>
> >     wrote:
> >
> >
> >
> >         On Tuesday, January 28, 2020, Michael Rolnik <mrolnik@gmail.com
> >         <mailto:mrolnik@gmail.com>> wrote:
> >
> >             Hi all.
> >
> >             I am totally lost in the email.
> >             Are there any action items for me / someone else ?
> >
> >             Regards,
> >             Michael Rolnik
> >
> >
> >         I think it would be helpful if we have rc4 with two action
items:
> >
> >             - remove CONFIG_USER_ONLY references, and all dead code thay
> >         may have come with it + add check in cpu.h that Philippe
suggested.
> >             - remove "Atmel" word from all elements of the series (patch
> >         names, messages, filenames, structure names, ...)
> >
> >         Needless to say that this must be done with extreme care.
> >
> >         I propose that Philippe do rc4.
>
> I won't have time to work on AVR this week-end and the next one (family
> plans). If I find time I prefer prioritize the raspi machine because I
> want to see some work merged before Igor "use memdev for RAM" series get
> in. So if you guys have time & motivation, go for it!
>

OK, I am going to do and send rc4.

Yours,
Aleksandar

> >
> >         Sincerely,
> >         Aleksandar
> >
> >
> >             On Mon, Jan 27, 2020 at 10:54 AM Michael Rolnik
> >             <mrolnik@gmail.com <mailto:mrolnik@gmail.com>> wrote:
> >
> >                 Thanks for you help guys.
> >
> >                 On Mon, Jan 27, 2020 at 12:55 AM Aleksandar Markovic
> >                 <aleksandar.markovic@rt-rk.com
> >                 <mailto:aleksandar.markovic@rt-rk.com>> wrote:
> >
> >                     From: Michael Rolnik <mrolnik@gmail.com
> >                     <mailto:mrolnik@gmail.com>>
> >
> >                     This includes definitions of various basic
> >                     parameters needed
> >                     for integration of a new platform into QEMU.
> >
> >                     Co-developed-by: Michael Rolnik <mrolnik@gmail.com
> >                     <mailto:mrolnik@gmail.com>>
> >                     Co-developed-by: Sarah Harris <S.E.Harris@kent.ac.uk
> >                     <mailto:S.E.Harris@kent.ac.uk>>
> >                     Signed-off-by: Michael Rolnik <mrolnik@gmail.com
> >                     <mailto:mrolnik@gmail.com>>
> >                     Signed-off-by: Sarah Harris <S.E.Harris@kent.ac.uk
> >                     <mailto:S.E.Harris@kent.ac.uk>>
> >                     Signed-off-by: Michael Rolnik <mrolnik@gmail.com
> >                     <mailto:mrolnik@gmail.com>>
> >                     Acked-by: Igor Mammedov <imammedo@redhat.com
> >                     <mailto:imammedo@redhat.com>>
> >                     Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com
> >                     <mailto:philmd@redhat.com>>
> >                     Signed-off-by: Richard Henderson
> >                     <richard.henderson@linaro.org
> >                     <mailto:richard.henderson@linaro.org>>
> >                     Signed-off-by: Aleksandar Markovic
> >                     <aleksandar.m.mail@gmail.com
> >                     <mailto:aleksandar.m.mail@gmail.com>>
> >                     ---
> >                       target/avr/cpu-param.h | 37
++++++++++++++++++++++++++
> >                       target/avr/cpu.h       | 72
> >                     ++++++++++++++++++++++++++++++++++++++++++++++++++
> >                       2 files changed, 109 insertions(+)
> >                       create mode 100644 target/avr/cpu-param.h
> >                       create mode 100644 target/avr/cpu.h
> >
> >                     diff --git a/target/avr/cpu-param.h
> >                     b/target/avr/cpu-param.h
> >                     new file mode 100644
> >                     index 0000000..0c29ce4
> >                     --- /dev/null
> >                     +++ b/target/avr/cpu-param.h
> >                     @@ -0,0 +1,37 @@
> >                     +/*
> >                     + * QEMU AVR CPU
> >                     + *
> >                     + * Copyright (c) 2019 Michael Rolnik
> >                     + *
> >                     + * This library is free software; you can
> >                     redistribute it and/or
> >                     + * modify it under the terms of the GNU Lesser
> >                     General Public
> >                     + * License as published by the Free Software
> >                     Foundation; either
> >                     + * version 2.1 of the License, or (at your option)
> >                     any later version.
> >                     + *
> >                     + * This library is distributed in the hope that it
> >                     will be useful,
> >                     + * but WITHOUT ANY WARRANTY; without even the
> >                     implied warranty of
> >                     + * MERCHANTABILITY or FITNESS FOR A PARTICULAR
> >                     PURPOSE.  See the GNU
> >                     + * Lesser General Public License for more details.
> >                     + *
> >                     + * You should have received a copy of the GNU
> >                     Lesser General Public
> >                     + * License along with this library; if not, see
> >                     + * <http://www.gnu.org/licenses/lgpl-2.1.html>
> >                     + */
> >                     +
> >                     +#ifndef AVR_CPU_PARAM_H
> >                     +#define AVR_CPU_PARAM_H
> >                     +
> >                     +#define TARGET_LONG_BITS 32
> >                     +/*
> >                     + * TARGET_PAGE_BITS cannot be more than 8 bits
because
> >                     + * 1.  all IO registers occupy [0x0000 .. 0x00ff]
> >                     address range, and they
> >                     + *     should be implemented as a device and not
memory
> >                     + * 2.  SRAM starts at the address 0x0100
> >                     + */
> >                     +#define TARGET_PAGE_BITS 8
> >                     +#define TARGET_PHYS_ADDR_SPACE_BITS 24
> >                     +#define TARGET_VIRT_ADDR_SPACE_BITS 24
> >                     +#define NB_MMU_MODES 2
> >                     +
> >                     +
> >                     +#endif
> >                     diff --git a/target/avr/cpu.h b/target/avr/cpu.h
> >                     new file mode 100644
> >                     index 0000000..d122611
> >                     --- /dev/null
> >                     +++ b/target/avr/cpu.h
> >                     @@ -0,0 +1,72 @@
> >                     +/*
> >                     + * QEMU AVR CPU
> >                     + *
> >                     + * Copyright (c) 2019 Michael Rolnik
> >                     + *
> >                     + * This library is free software; you can
> >                     redistribute it and/or
> >                     + * modify it under the terms of the GNU Lesser
> >                     General Public
> >                     + * License as published by the Free Software
> >                     Foundation; either
> >                     + * version 2.1 of the License, or (at your option)
> >                     any later version.
> >                     + *
> >                     + * This library is distributed in the hope that it
> >                     will be useful,
> >                     + * but WITHOUT ANY WARRANTY; without even the
> >                     implied warranty of
> >                     + * MERCHANTABILITY or FITNESS FOR A PARTICULAR
> >                     PURPOSE.  See the GNU
> >                     + * Lesser General Public License for more details.
> >                     + *
> >                     + * You should have received a copy of the GNU
> >                     Lesser General Public
> >                     + * License along with this library; if not, see
> >                     + * <http://www.gnu.org/licenses/lgpl-2.1.html>
> >                     + */
> >                     +
> >                     +#ifndef QEMU_AVR_CPU_H
> >                     +#define QEMU_AVR_CPU_H
> >                     +
> >                     +#include "cpu-qom.h"
> >                     +#include "exec/cpu-defs.h"
> >                     +
> >                     +#define TCG_GUEST_DEFAULT_MO 0
> >                     +#define AVR_CPU_TYPE_SUFFIX "-" TYPE_AVR_CPU
> >                     +#define AVR_CPU_TYPE_NAME(name) (name
> >                     AVR_CPU_TYPE_SUFFIX)
> >                     +#define CPU_RESOLVING_TYPE TYPE_AVR_CPU
> >                     +
> >                     +/*
> >                     + * AVR has two memory spaces, data & code.
> >                     + * e.g. both have 0 address
> >                     + * ST/LD instructions access data space
> >                     + * LPM/SPM and instruction fetching access code
> >                     memory space
> >                     + */
> >                     +#define MMU_CODE_IDX 0
> >                     +#define MMU_DATA_IDX 1
> >                     +
> >                     +#define EXCP_RESET 1
> >                     +#define EXCP_INT(n) (EXCP_RESET + (n) + 1)
> >                     +
> >                     +/* Number of CPU registers */
> >                     +#define NUMBER_OF_CPU_REGISTERS 32
> >                     +/* Number of IO registers accessible by
ld/st/in/out */
> >                     +#define NUMBER_OF_IO_REGISTERS 64
> >                     +
> >                     +/*
> >                     + * Offsets of AVR memory regions in host memory
space.
> >                     + *
> >                     + * This is needed because the AVR has separate code
> >                     and data address
> >                     + * spaces that both have start from zero but have
> >                     to go somewhere in
> >                     + * host memory.
> >                     + *
> >                     + * It's also useful to know where some things are,
> >                     like the IO registers.
> >                     + */
> >                     +/* Flash program memory */
> >                     +#define OFFSET_CODE 0x00000000
> >                     +/* CPU registers, IO registers, and SRAM */
> >                     +#define OFFSET_DATA 0x00800000
> >                     +/* CPU registers specifically, these are mapped at
> >                     the start of data */
> >                     +#define OFFSET_CPU_REGISTERS OFFSET_DATA
> >                     +/*
> >                     + * IO registers, including status register, stack
> >                     pointer, and memory
> >                     + * mapped peripherals, mapped just after CPU
registers
> >                     + */
> >                     +#define OFFSET_IO_REGISTERS (OFFSET_DATA +
> >                     NUMBER_OF_CPU_REGISTERS)
> >                     +
> >                     +#define EF_AVR_MACH 0x7F
> >                     +
> >                     +#endif /* !defined (QEMU_AVR_CPU_H) */
> >                     --
> >                     2.7.4
> >
> >
> >
> >                 --
> >                 Best Regards,
> >                 Michael Rolnik
> >
> >
> >
> >             --
> >             Best Regards,
> >             Michael Rolnik
> >
> >
> >
> >     --
> >     Best Regards,
> >     Michael Rolnik
> >
>

Patch
diff mbox series

diff --git a/target/avr/cpu-param.h b/target/avr/cpu-param.h
new file mode 100644
index 0000000..0c29ce4
--- /dev/null
+++ b/target/avr/cpu-param.h
@@ -0,0 +1,37 @@ 
+/*
+ * QEMU AVR CPU
+ *
+ * Copyright (c) 2019 Michael Rolnik
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see
+ * <http://www.gnu.org/licenses/lgpl-2.1.html>
+ */
+
+#ifndef AVR_CPU_PARAM_H
+#define AVR_CPU_PARAM_H
+
+#define TARGET_LONG_BITS 32
+/*
+ * TARGET_PAGE_BITS cannot be more than 8 bits because
+ * 1.  all IO registers occupy [0x0000 .. 0x00ff] address range, and they
+ *     should be implemented as a device and not memory
+ * 2.  SRAM starts at the address 0x0100
+ */
+#define TARGET_PAGE_BITS 8
+#define TARGET_PHYS_ADDR_SPACE_BITS 24
+#define TARGET_VIRT_ADDR_SPACE_BITS 24
+#define NB_MMU_MODES 2
+
+
+#endif
diff --git a/target/avr/cpu.h b/target/avr/cpu.h
new file mode 100644
index 0000000..d122611
--- /dev/null
+++ b/target/avr/cpu.h
@@ -0,0 +1,72 @@ 
+/*
+ * QEMU AVR CPU
+ *
+ * Copyright (c) 2019 Michael Rolnik
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see
+ * <http://www.gnu.org/licenses/lgpl-2.1.html>
+ */
+
+#ifndef QEMU_AVR_CPU_H
+#define QEMU_AVR_CPU_H
+
+#include "cpu-qom.h"
+#include "exec/cpu-defs.h"
+
+#define TCG_GUEST_DEFAULT_MO 0
+#define AVR_CPU_TYPE_SUFFIX "-" TYPE_AVR_CPU
+#define AVR_CPU_TYPE_NAME(name) (name AVR_CPU_TYPE_SUFFIX)
+#define CPU_RESOLVING_TYPE TYPE_AVR_CPU
+
+/*
+ * AVR has two memory spaces, data & code.
+ * e.g. both have 0 address
+ * ST/LD instructions access data space
+ * LPM/SPM and instruction fetching access code memory space
+ */
+#define MMU_CODE_IDX 0
+#define MMU_DATA_IDX 1
+
+#define EXCP_RESET 1
+#define EXCP_INT(n) (EXCP_RESET + (n) + 1)
+
+/* Number of CPU registers */
+#define NUMBER_OF_CPU_REGISTERS 32
+/* Number of IO registers accessible by ld/st/in/out */
+#define NUMBER_OF_IO_REGISTERS 64
+
+/*
+ * Offsets of AVR memory regions in host memory space.
+ *
+ * This is needed because the AVR has separate code and data address
+ * spaces that both have start from zero but have to go somewhere in
+ * host memory.
+ *
+ * It's also useful to know where some things are, like the IO registers.
+ */
+/* Flash program memory */
+#define OFFSET_CODE 0x00000000
+/* CPU registers, IO registers, and SRAM */
+#define OFFSET_DATA 0x00800000
+/* CPU registers specifically, these are mapped at the start of data */
+#define OFFSET_CPU_REGISTERS OFFSET_DATA
+/*
+ * IO registers, including status register, stack pointer, and memory
+ * mapped peripherals, mapped just after CPU registers
+ */
+#define OFFSET_IO_REGISTERS (OFFSET_DATA + NUMBER_OF_CPU_REGISTERS)
+
+#define EF_AVR_MACH 0x7F
+
+#endif /* !defined (QEMU_AVR_CPU_H) */