On Tue, Mar 14, 2023 at 09:11:19PM -0700, Bjorn Andersson wrote: > On Fri, Mar 03, 2023 at 01:09:08PM -0800, Elliot Berman wrote: > > > > > > On 2/14/2023 10:52 AM, Elliot Berman wrote: > > > > > > > > > On 2/14/2023 9:23 AM, Bjorn Andersson wrote: > > > > On Tue, Feb 14, 2023 at 09:58:44AM +0100, Greg Kroah-Hartman wrote: > > > > > On Mon, Feb 13, 2023 at 01:44:17PM -0800, Bjorn Andersson wrote: > > > > > > On Mon, Feb 13, 2023 at 10:18:29AM -0800, Elliot Berman wrote: > > > > > > > The maximum VMID for assign_mem is 63. Use a u64 to represent this > > > > > > > bitmap instead of architecture-dependent "unsigned int" > > > > > > > which varies in > > > > > > > size on 32-bit and 64-bit platforms. > > > > > > > > > > > > > > Acked-by: Kalle Valo <kvalo@xxxxxxxxxx> (ath10k) > > > > > > > Tested-by: Gokul krishna Krishnakumar <quic_gokukris@xxxxxxxxxxx> > > > > > > > Signed-off-by: Elliot Berman <quic_eberman@xxxxxxxxxxx> > > > > > > > > > > > > Reviewed-by: Bjorn Andersson <andersson@xxxxxxxxxx> > > > > > > > > > > > > @Greg, would you mind taking this through your tree for v6.3, you > > > > > > already have a related change in fastrpc.c in your tree... > > > > > > > > > > I tried, but it doesn't apply to my char-misc tree at all: > > > > > > > > > > checking file drivers/firmware/qcom_scm.c > > > > > Hunk #1 succeeded at 898 (offset -7 lines). > > > > > Hunk #2 succeeded at 915 (offset -7 lines). > > > > > Hunk #3 succeeded at 930 (offset -7 lines). > > > > > checking file drivers/misc/fastrpc.c > > > > > checking file drivers/net/wireless/ath/ath10k/qmi.c > > > > > checking file drivers/remoteproc/qcom_q6v5_mss.c > > > > > Hunk #1 succeeded at 227 (offset -8 lines). > > > > > Hunk #2 succeeded at 404 (offset -10 lines). > > > > > Hunk #3 succeeded at 939 with fuzz 1 (offset -28 lines). > > > > > checking file drivers/remoteproc/qcom_q6v5_pas.c > > > > > Hunk #1 FAILED at 94. > > > > > 1 out of 1 hunk FAILED > > > > > checking file drivers/soc/qcom/rmtfs_mem.c > > > > > Hunk #1 succeeded at 30 (offset -1 lines). > > > > > can't find file to patch at input line 167 > > > > > Perhaps you used the wrong -p or --strip option? > > > > > The text leading up to this was: > > > > > -------------------------- > > > > > |diff --git a/include/linux/firmware/qcom/qcom_scm.h > > > > > b/include/linux/firmware/qcom/qcom_scm.h > > > > > |index 1e449a5d7f5c..250ea4efb7cb 100644 > > > > > |--- a/include/linux/firmware/qcom/qcom_scm.h > > > > > |+++ b/include/linux/firmware/qcom/qcom_scm.h > > > > > -------------------------- > > > > > > > > > > What tree is this patch made against? > > > > > > > > > > > > > Sorry about that, I missed the previous changes in qcom_q6v5_pas in the > > > > remoteproc tree. Elliot said he based it on linux-next, so I expect that > > > > it will merge fine on top of -rc1, once that arrives. > > > > > > > > > > Yes, this patch applies on next-20230213. I guess there are enough > > > changes were coming from QCOM side (via Bjorn's qcom tree) as well as > > > the fastrpc change (via Greg's char-misc tree). > > > > > > Let me know if I should do anything once -rc1 arrives. Happy to post > > > version on the -rc1 if it helps. > > > > > > > The patch now applies on tip of Linus's tree and on char-misc. > > Greg, I have a couple more patches in the scm driver in my inbox. Would > you be okay with me pulling this through the Qualcomm tree for v6.4? Please do!
