From: Himanshu Chauhan Date: Tue, 30 Apr 2024 14:51:06 +0530 Subject: [PATCH v2 1/5] lib: sbi: fix hart_shmem_base In-Reply-To: <20240423145743.392718-2-wxjstz@126.com> References: <20240423145743.392718-1-wxjstz@126.com> <20240423145743.392718-2-wxjstz@126.com> Message-ID: <53465623-df22-4e66-a35e-087c9f99c643@ventanamicro.com> List-Id: To: opensbi@lists.infradead.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit On 23/04/24 20:27, Xiang W wrote: > When only phys_hi is equal to SBI_DBTR_SHMEM_INVALID_ADDR, it may be > a legal address. The old code would modify the legal address. > > Signed-off-by: Xiang W > --- > lib/sbi/sbi_dbtr.c | 11 ++++------- > 1 file changed, 4 insertions(+), 7 deletions(-) > > diff --git a/lib/sbi/sbi_dbtr.c b/lib/sbi/sbi_dbtr.c > index 7142fed..5b07285 100644 > --- a/lib/sbi/sbi_dbtr.c > +++ b/lib/sbi/sbi_dbtr.c > @@ -84,21 +84,18 @@ static inline void sbi_dbtr_disable_shmem(void) > > static inline void *hart_shmem_base(void) > { > - struct sbi_dbtr_shmem* shmem; > unsigned long phys_hi, phys_lo; > struct sbi_dbtr_hart_triggers_state *hs = NULL; > > hs = dbtr_get_hart_state_ptr(sbi_scratch_thishart_ptr()); > - > if (!hs) > return NULL; > > - shmem = &hs->shmem; > + phys_hi = hs->shmem.phys_hi; > + phys_lo = hs->shmem.phys_lo; > > - phys_hi = (shmem->phys_hi == SBI_DBTR_SHMEM_INVALID_ADDR > - ? shmem->phys_hi : 0); > - phys_lo = (shmem->phys_lo == SBI_DBTR_SHMEM_INVALID_ADDR > - ? 0 : shmem->phys_lo); > + if (phys_hi == SBI_DBTR_SHMEM_INVALID_ADDR && phys_hi == phys_lo) > + return NULL; > > return ((void *)(unsigned long)DBTR_SHMEM_MAKE_PHYS(phys_hi, phys_lo)); > } LGTM Reviewed-by: Himanshu Chauhan