[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <59eab6d2-6710-a941-6e7d-7efe8dcf0f1b@suse.com>
Date: Tue, 25 Oct 2022 06:32:11 +0200
From: Juergen Gross <jgross@...e.com>
To: jejb@...ux.ibm.com, Sreekanth Reddy <sreekanth.reddy@...adcom.com>,
Bart Van Assche <bvanassche@....org>
Cc: Salvatore Bonaccorso <carnil@...ian.org>,
sathya.prakash@...adcom.com, suganath-prabu.subramani@...adcom.com,
"Martin K. Petersen" <martin.petersen@...cle.com>,
MPT-FusionLinux.pdl@...adcom.com, linux-scsi@...r.kernel.org,
linux-kernel@...r.kernel.org, xen-devel@...ts.xenproject.org,
adi@...egisch.at
Subject: Re: Report in downstream Debian: mpt3sas broken with xen dom0 with
update to 5.10.149 in 5.10.y.
On 24.10.22 20:50, James Bottomley wrote:
> On Mon, 2022-10-24 at 14:55 +0200, Juergen Gross wrote:
> [...]
>> Please recheck the backported patch in 5.10.y. It is _wrong_. The
>> backport
>> has:
>>
>> --- a/drivers/scsi/mpt3sas/mpt3sas_base.c
>> +++ b/drivers/scsi/mpt3sas/mpt3sas_base.c
>> @@ -2993,7 +2993,7 @@ _base_config_dma_addressing(struct
>> MPT3SAS_ADAPTER *ioc,
>> struct pci_dev *pdev)
>>
>> if (ioc->is_mcpu_endpoint ||
>> sizeof(dma_addr_t) == 4 || ioc->use_32bit_dma ||
>> - dma_get_required_mask(&pdev->dev) <= 32)
>> + dma_get_required_mask(&pdev->dev) <= DMA_BIT_MASK(32))
>> ioc->dma_mask = 32;
>> /* Set 63 bit DMA mask for all SAS3 and SAS35 controllers */
>> else if (ioc->hba_mpi_version_belonged > MPI2_VERSION)
>>
>> While the upstream patch has:
>>
>> + if (ioc->is_mcpu_endpoint || sizeof(dma_addr_t) == 4 ||
>> + dma_get_required_mask(&pdev->dev) <= 32) {
>> ioc->dma_mask = 32;
>> + coherent_dma_mask = dma_mask = DMA_BIT_MASK(32);
>>
>
> That's not the upstream commit. The quoted upstream patch in the
> stable commit is:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e0e0747de0ea3dd87cdbb0393311e17471a9baf1
>
> Which has the same diff as you quoted for the stable tree.
Hmm, something is fishy here.
Looking at the source in current HEAD of Linus' tree shows me:
static int
_base_config_dma_addressing(struct MPT3SAS_ADAPTER *ioc, struct pci_dev *pdev)
{
struct sysinfo s;
u64 coherent_dma_mask, dma_mask;
if (ioc->is_mcpu_endpoint || sizeof(dma_addr_t) == 4 ||
dma_get_required_mask(&pdev->dev) <= 32) {
ioc->dma_mask = 32;
coherent_dma_mask = dma_mask = DMA_BIT_MASK(32);
/* Set 63 bit DMA mask for all SAS3 and SAS35 controllers */
This doesn't look like commit e0e0747de0ea3dd has been applied.
git log drivers/scsi/mpt3sas/mpt3sas_base.c doesn't show it either.
git name-rev e0e0747de0ea3dd tells me it should be in v6.0-rc7.
Juergen
Download attachment "OpenPGP_0xB0DE9DD628BF132F.asc" of type "application/pgp-keys" (3099 bytes)
Download attachment "OpenPGP_signature" of type "application/pgp-signature" (496 bytes)
Powered by blists - more mailing lists