You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2024/04/22 15:46:15 UTC

(nuttx) branch master updated (5ff6362d0f -> 0aac7d929d)

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git


    from 5ff6362d0f Documentation: improve documentation about ESP32 family
     new f8ec274749 intel64/intel64_irq.c: cosmetic change
     new 71987be7ef intel64: add header for intel64_lowsetup
     new 8b09118350 intel64/intel64_handlers.c: cosmetic changes
     new 0aac7d929d intel64/arch.h: fix ist_t structure, there is no reserved5 field

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 arch/x86_64/include/intel64/arch.h                 |  3 +--
 arch/x86_64/src/intel64/intel64.h                  | 13 -----------
 arch/x86_64/src/intel64/intel64_handlers.c         | 10 +++------
 arch/x86_64/src/intel64/intel64_irq.c              |  3 ++-
 .../src/intel64/intel64_lowsetup.h}                | 26 ++++++++++++----------
 arch/x86_64/src/intel64/intel64_start.c            |  3 ++-
 6 files changed, 22 insertions(+), 36 deletions(-)
 copy arch/{arm/src/lc823450/lc823450_lowputc.h => x86_64/src/intel64/intel64_lowsetup.h} (77%)


(nuttx) 01/04: intel64/intel64_irq.c: cosmetic change

Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git

commit f8ec274749dbf42750619d7ce5963fd2d2edaebd
Author: p-szafonimateusz <p-...@xiaomi.com>
AuthorDate: Wed Apr 3 11:53:18 2024 +0200

    intel64/intel64_irq.c: cosmetic change
    
    Signed-off-by: p-szafonimateusz <p-...@xiaomi.com>
---
 arch/x86_64/src/intel64/intel64_irq.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/x86_64/src/intel64/intel64_irq.c b/arch/x86_64/src/intel64/intel64_irq.c
index abfa07a79b..cc82c00deb 100644
--- a/arch/x86_64/src/intel64/intel64_irq.c
+++ b/arch/x86_64/src/intel64/intel64_irq.c
@@ -358,6 +358,7 @@ legacy_pic_irq_handler(int irq, uint32_t *regs, void *arg)
 #ifndef CONFIG_ARCH_INTEL64_DISABLE_INT_INIT
 static void up_ioapic_init(void)
 {
+  uint32_t maxintr;
   int i;
 
   up_map_region((void *)IOAPIC_BASE, HUGE_PAGE_SIZE,
@@ -365,7 +366,7 @@ static void up_ioapic_init(void)
 
   /* Setup the IO-APIC, remap the interrupt to 32~ */
 
-  uint32_t maxintr = (up_ioapic_read(IOAPIC_REG_VER) >> 16) & 0xff;
+  maxintr = (up_ioapic_read(IOAPIC_REG_VER) >> 16) & 0xff;
 
   for (i = 0; i < maxintr; i++)
     {


(nuttx) 03/04: intel64/intel64_handlers.c: cosmetic changes

Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git

commit 8b09118350108c822158420cceae7c369f00eeb4
Author: p-szafonimateusz <p-...@xiaomi.com>
AuthorDate: Wed Apr 3 11:53:51 2024 +0200

    intel64/intel64_handlers.c: cosmetic changes
    
    Signed-off-by: p-szafonimateusz <p-...@xiaomi.com>
---
 arch/x86_64/src/intel64/intel64_handlers.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/arch/x86_64/src/intel64/intel64_handlers.c b/arch/x86_64/src/intel64/intel64_handlers.c
index 5b432edf57..87d1e4c74d 100644
--- a/arch/x86_64/src/intel64/intel64_handlers.c
+++ b/arch/x86_64/src/intel64/intel64_handlers.c
@@ -62,8 +62,6 @@
 #ifndef CONFIG_SUPPRESS_INTERRUPTS
 static uint64_t *common_handler(int irq, uint64_t *regs)
 {
-  board_autoled_on(LED_INIRQ);
-
   /* Current regs non-zero indicates that we are processing an interrupt;
    * g_current_regs is also used to manage interrupt level context switches.
    *
@@ -135,9 +133,9 @@ static uint64_t *common_handler(int irq, uint64_t *regs)
 
 uint64_t *isr_handler(uint64_t *regs, uint64_t irq)
 {
-#ifdef CONFIG_SUPPRESS_INTERRUPTS
   board_autoled_on(LED_INIRQ);
 
+#ifdef CONFIG_SUPPRESS_INTERRUPTS
   /* Doesn't return */
 
   PANIC();
@@ -188,7 +186,7 @@ uint64_t *isr_handler(uint64_t *regs, uint64_t irq)
 }
 
 /****************************************************************************
- * Name: isr_handler
+ * Name: irq_handler
  *
  * Description:
  *   This gets called from IRQ vector handling logic in intel64_vectors.S
@@ -197,9 +195,9 @@ uint64_t *isr_handler(uint64_t *regs, uint64_t irq)
 
 uint64_t *irq_handler(uint64_t *regs, uint64_t irq_no)
 {
-#ifdef CONFIG_SUPPRESS_INTERRUPTS
   board_autoled_on(LED_INIRQ);
 
+#ifdef CONFIG_SUPPRESS_INTERRUPTS
   /* Doesn't return */
 
   PANIC();
@@ -211,8 +209,6 @@ uint64_t *irq_handler(uint64_t *regs, uint64_t irq_no)
   uint64_t *ret;
   int irq;
 
-  board_autoled_on(LED_INIRQ);
-
   /* Get the IRQ number */
 
   irq = (int)irq_no;


(nuttx) 02/04: intel64: add header for intel64_lowsetup

Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git

commit 71987be7ef6389c8dafb905603f2883a54fd8856
Author: p-szafonimateusz <p-...@xiaomi.com>
AuthorDate: Wed Apr 3 11:53:35 2024 +0200

    intel64: add header for intel64_lowsetup
    
    Signed-off-by: p-szafonimateusz <p-...@xiaomi.com>
---
 arch/x86_64/src/intel64/intel64.h          | 13 ------
 arch/x86_64/src/intel64/intel64_lowsetup.h | 64 ++++++++++++++++++++++++++++++
 arch/x86_64/src/intel64/intel64_start.c    |  3 +-
 3 files changed, 66 insertions(+), 14 deletions(-)

diff --git a/arch/x86_64/src/intel64/intel64.h b/arch/x86_64/src/intel64/intel64.h
index b73a0ab890..40220d4c78 100644
--- a/arch/x86_64/src/intel64/intel64.h
+++ b/arch/x86_64/src/intel64/intel64.h
@@ -68,19 +68,6 @@ extern "C"
  * Public Function Prototypes
  ****************************************************************************/
 
-/****************************************************************************
- * Name: intel64_lowsetup
- *
- * Description:
- *   Called at the very beginning of _nxstart.
- *   Performs low level initializationincluding setup of the console UART.
- *   This UART done early so that the serial console is available for
- *   debugging very early in the boot sequence.
- *
- ****************************************************************************/
-
-void intel64_lowsetup(void);
-
 /****************************************************************************
  * Name: vector_*
  *
diff --git a/arch/x86_64/src/intel64/intel64_lowsetup.h b/arch/x86_64/src/intel64/intel64_lowsetup.h
new file mode 100644
index 0000000000..a50602a74b
--- /dev/null
+++ b/arch/x86_64/src/intel64/intel64_lowsetup.h
@@ -0,0 +1,64 @@
+/****************************************************************************
+ * arch/x86_64/src/intel64/intel64_lowsetup.h
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.  The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+#ifndef __ARCH_X86_64_SRC_INTEL64_INTEL64_LOWSETUP_H
+#define __ARCH_X86_64_SRC_INTEL64_INTEL64_LOWSETUP_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#ifndef __ASSEMBLY__
+
+#undef EXTERN
+#if defined(__cplusplus)
+#define EXTERN extern "C"
+extern "C"
+{
+#else
+#define EXTERN extern
+#endif
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: intel64_lowsetup
+ *
+ * Description:
+ *   Called at the very beginning of _nxstart or up_ap_boot.
+ *   Performs low level initializationincluding setup of the console UART.
+ *   This UART done early so that the serial console is available for
+ *   debugging very early in the boot sequence.
+ *
+ ****************************************************************************/
+
+void intel64_lowsetup(void);
+
+#undef EXTERN
+#if defined(__cplusplus)
+}
+#endif
+
+#endif /* __ASSEMBLY__ */
+#endif /* __ARCH_X86_64_SRC_INTEL64_INTEL64_LOWSETUP_H */
diff --git a/arch/x86_64/src/intel64/intel64_start.c b/arch/x86_64/src/intel64/intel64_start.c
index 38a4282a04..d9e50a165c 100644
--- a/arch/x86_64/src/intel64/intel64_start.c
+++ b/arch/x86_64/src/intel64/intel64_start.c
@@ -30,7 +30,8 @@
 #include <arch/multiboot2.h>
 
 #include "x86_64_internal.h"
-#include "intel64.h"
+
+#include "intel64_lowsetup.h"
 
 /****************************************************************************
  * Public Data


(nuttx) 04/04: intel64/arch.h: fix ist_t structure, there is no reserved5 field

Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git

commit 0aac7d929d5785eefb6694a0314870dbe8fb0654
Author: p-szafonimateusz <p-...@xiaomi.com>
AuthorDate: Wed Apr 3 11:53:40 2024 +0200

    intel64/arch.h: fix ist_t structure, there is no reserved5 field
    
    Signed-off-by: p-szafonimateusz <p-...@xiaomi.com>
---
 arch/x86_64/include/intel64/arch.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/x86_64/include/intel64/arch.h b/arch/x86_64/include/intel64/arch.h
index a19e862cfe..1fd022d9a6 100644
--- a/arch/x86_64/include/intel64/arch.h
+++ b/arch/x86_64/include/intel64/arch.h
@@ -349,8 +349,7 @@ begin_packed_struct struct ist_s
   uint64_t IST6;                 /* Interrupt Stack 6 */
   uint64_t IST7;                 /* Interrupt Stack 7 */
   uint64_t reserved3;            /* reserved */
-  uint64_t reserved4;            /* reserved */
-  uint16_t reserved5;            /* reserved */
+  uint16_t reserved4;            /* reserved */
   uint16_t IOPB_OFFSET;          /* IOPB_offset */
 } end_packed_struct;